mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-30 09:00:31 -08:00
Code Issues Projects Releases Wiki Activity

Use relative names where possible in package-quickstart.el

Browse source 
package-quickstart.el hardcodes many absolute file names, which
makes it break if user-emacs-directory moves, or in other
situations.  To be slightly more robust to this, use relative
file names to packages that are located in the same directory as
package-quickstart.el.

* lisp/emacs-lisp/package.el (package--quickstart-dir,
package--quickstart-rel): Add.
(package-quickstart-refresh): Use package--quickstart-rel on
file names.  (bug#77468)
This commit is contained in:
Spencer Baugh 2025-04-02 17:21:24 -04:00 • committed by Stefan Monnier
parent 0fbba16387
commit 40b0c83988
1 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

27
lisp/emacs-lisp/package.el
View file

@ -4591,6 +4591,19 @@ activations need to be changed, such as when `package-load-list' is modified."
(delete-file (concat package-quickstart-file "c")) (delete-file (concat package-quickstart-file "c"))
(delete-file package-quickstart-file))) (delete-file package-quickstart-file)))
(defvar package--quickstart-dir nil
"Set by `package-quickstart-file' to the directory containing it.")
(defun package--quickstart-rel (file)
"Return an expr depending on `package--quickstart-dir' which evaluates to FILE.
If FILE is in `package--quickstart-dir', returns an expression that is
relative to that directory, so if that directory is moved we can still
find FILE."
(if (file-in-directory-p file package--quickstart-dir)
`(file-name-concat package--quickstart-dir ,(file-relative-name file package--quickstart-dir))
file))
(defun package-quickstart-refresh () (defun package-quickstart-refresh ()
"(Re)Generate the `package-quickstart-file'." "(Re)Generate the `package-quickstart-file'."
(interactive) (interactive)
@ -4605,7 +4618,8 @@ activations need to be changed, such as when `package-load-list' is modified."
;; aren't truncated. ;; aren't truncated.
(print-length nil) (print-length nil)
(print-level nil) (print-level nil)
(Info-directory-list '(""))) (Info-directory-list '(""))
(package--quickstart-dir nil))
(dolist (elt package-alist) (dolist (elt package-alist)
(condition-case err (condition-case err
(package-activate (car elt)) (package-activate (car elt))
@ -4617,12 +4631,16 @@ activations need to be changed, such as when `package-load-list' is modified."
(emacs-lisp-mode) ;For `syntax-ppss'. (emacs-lisp-mode) ;For `syntax-ppss'.
(insert ";;; Quickstart file to activate all packages at startup -*- lexical-binding:t -*-\n") (insert ";;; Quickstart file to activate all packages at startup -*- lexical-binding:t -*-\n")
(insert ";; ¡¡ This file is autogenerated by `package-quickstart-refresh', DO NOT EDIT !!\n\n") (insert ";; ¡¡ This file is autogenerated by `package-quickstart-refresh', DO NOT EDIT !!\n\n")
(setq package--quickstart-dir
(file-name-directory (expand-file-name package-quickstart-file)))
(insert (pp '(setq package--quickstart-dir
(file-name-directory (expand-file-name load-file-name)))))
(dolist (pkg package--quickstart-pkgs) (dolist (pkg package--quickstart-pkgs)
(let* ((file (let* ((file
;; Prefer uncompiled files (and don't accept .so files). ;; Prefer uncompiled files (and don't accept .so files).
(let ((load-suffixes '(".el" ".elc"))) (let ((load-suffixes '(".el" ".elc")))
(locate-library (package--autoloads-file-name pkg)))) (locate-library (package--autoloads-file-name pkg))))
(pfile (prin1-to-string file))) (pfile (prin1-to-string (package--quickstart-rel file))))
(insert "(let* ((load-file-name " pfile ")\ (insert "(let* ((load-file-name " pfile ")\
\(load-true-file-name load-file-name))\n") \(load-true-file-name load-file-name))\n")
(insert-file-contents file) (insert-file-contents file)
@ -4638,12 +4656,13 @@ activations need to be changed, such as when `package-load-list' is modified."
(append ',(mapcar #'package-desc-name package--quickstart-pkgs) (append ',(mapcar #'package-desc-name package--quickstart-pkgs)
package-activated-list))) package-activated-list)))
(current-buffer)) (current-buffer))
(let ((info-dirs (butlast Info-directory-list))) (let ((info-dirs
(mapcar #'package--quickstart-rel (butlast Info-directory-list))))
(when info-dirs (when info-dirs
(pp `(progn (require 'info) (pp `(progn (require 'info)
(info-initialize) (info-initialize)
(setq Info-directory-list (setq Info-directory-list
(append ',info-dirs Info-directory-list))) (append (list . ,info-dirs) Info-directory-list)))
(current-buffer)))) (current-buffer))))
;; Use `\s' instead of a space character, so this code chunk is not ;; Use `\s' instead of a space character, so this code chunk is not
;; mistaken for an actual file-local section of package.el. ;; mistaken for an actual file-local section of package.el.