Stefan Monnier <monnier@iro.umontreal.ca> writes:

>> Makes sense.  How about this?
>
> See comments below.
>
>> diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
>> index b9a8dacab15..1269a9c95e7 100644
>> --- a/lisp/emacs-lisp/package.el
>> +++ b/lisp/emacs-lisp/package.el
>> @@ -4591,6 +4591,14 @@ package--quickstart-maybe-refresh
>>      (delete-file (concat package-quickstart-file "c"))
>>      (delete-file package-quickstart-file)))
>>  
>> +(defun package--quickstart-relative (load-name file)
>> +  "Return an expression which evaluates to FILE while loading LOAD-NAME."
>> +  (let* ((dir (file-name-directory (expand-file-name load-name)))
>> +         (relname (file-relative-name file dir)))
>> +    (if (string-prefix-p ".." relname)
>> +        file
>> +      `(file-name-concat (file-name-directory load-file-name) ,relname))))
>
> I think I'd test "../" just in case of dirnames that start with "..".

Good catch... actually I think I should just use file-in-directory-p,
that's more self-explanatory.

> Also, could we compute (file-name-directory load-file-name)
> once at the beginning of the quickstart file instead of once per
> inlined file?

Done.

>>  (defun package-quickstart-refresh ()
>>    "(Re)Generate the `package-quickstart-file'."
>>    (interactive)
>> @@ -4605,7 +4613,8 @@ package-quickstart-refresh
>>          ;; aren't truncated.
>>          (print-length nil)
>>          (print-level nil)
>> -        (Info-directory-list '("")))
>> +        (Info-directory-list '(""))
>> +        (qs-dir (file-name-directory (expand-file-name package-quickstart-file))))
>
> AFAICT `qs-dir` is not used.

Fixed.

>> @@ -4622,7 +4631,7 @@ package-quickstart-refresh
>>                  ;; Prefer uncompiled files (and don't accept .so files).
>>                  (let ((load-suffixes '(".el" ".elc")))
>>                    (locate-library (package--autoloads-file-name pkg))))
>> -               (pfile (prin1-to-string file)))
>> +               (pfile (prin1-to-string (package--quickstart-relative package-quickstart-file file))))
>>            (insert "(let* ((load-file-name " pfile ")\
>>  \(load-true-file-name load-file-name))\n")
>>            (insert-file-contents file)
>
> I think this needs wrapping to fit within 80 columns.

Fixed.

>> @@ -4638,7 +4647,10 @@ package-quickstart-refresh
>>                    (append ',(mapcar #'package-desc-name package--quickstart-pkgs)
>>                            package-activated-list)))
>>            (current-buffer))
>> -      (let ((info-dirs (butlast Info-directory-list)))
>> +      (let ((info-dirs
>> +             (mapcar (lambda (info-dir)
>> +                       (package--quickstart-relative package-quickstart-file info-dir))
>> +                     (butlast Info-directory-list))))
>>          (when info-dirs
>>            (pp `(progn (require 'info)
>>                        (info-initialize)
>
> I think this won't work because the rest of the code does:
>
>                       (setq Info-directory-list
>                             (append ',info-dirs Info-directory-list)))
>
> so the `file-name-concat`s won't be evaluated.

Oops... I guess I didn't run info when testing this.  Fixed.