mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-24 06:20:43 -08:00
Code Issues Projects Releases Wiki Activity

Add 'EMACSNATIVELOADPATH' env variable support (bug#44726)

Browse source 
* lisp/startup.el (normal-top-level): Read 'EMACSNATIVELOADPATH'
	and add entries too `comp-eln-load-path'.
	* lisp/mail/emacsbug.el (report-emacs-bug): Dump
	also 'EMACSNATIVELOADPATH'.
This commit is contained in:
Andrea Corallo 2020-11-20 00:59:00 +01:00
parent 3ae309bd59
commit a55415af7e
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lisp/mail/emacsbug.el
View file

@ -313,7 +313,7 @@ usually do not have translators for other languages.\n\n")))
(lambda (var) (lambda (var)
(let ((val (getenv var))) (let ((val (getenv var)))
(if val (insert (format " value of $%s: %s\n" var val))))) (if val (insert (format " value of $%s: %s\n" var val)))))
'("EMACSDATA" "EMACSDOC" "EMACSLOADPATH" "EMACSPATH" '("EMACSDATA" "EMACSDOC" "EMACSLOADPATH" "EMACSNATIVELOADPATH" "EMACSPATH"
"LC_ALL" "LC_COLLATE" "LC_CTYPE" "LC_MESSAGES" "LC_ALL" "LC_COLLATE" "LC_CTYPE" "LC_MESSAGES"
"LC_MONETARY" "LC_NUMERIC" "LC_TIME" "LANG" "XMODIFIERS")) "LC_MONETARY" "LC_NUMERIC" "LC_TIME" "LANG" "XMODIFIERS"))
(insert (format " locale-coding-system: %s\n" locale-coding-system)) (insert (format " locale-coding-system: %s\n" locale-coding-system))

10
lisp/startup.el
View file

@ -534,9 +534,13 @@ It is the default value of the variable `top-level'."
(setq user-emacs-directory (setq user-emacs-directory
(startup--xdg-or-homedot startup--xdg-config-home-emacs nil)) (startup--xdg-or-homedot startup--xdg-config-home-emacs nil))
(when (boundp 'comp-eln-load-path) (when (featurep 'nativecomp)
(setq comp-eln-load-path (cons (concat user-emacs-directory "eln-cache/") (let ((path-env (getenv "EMACSNATIVELOADPATH")))
comp-eln-load-path))) (when path-env
(dolist (path (split-string path-env ":"))
(unless (string= "" path)
(push path comp-eln-load-path)))))
(push (concat user-emacs-directory "eln-cache/") comp-eln-load-path))
;; Look in each dir in load-path for a subdirs.el file. If we ;; Look in each dir in load-path for a subdirs.el file. If we
;; find one, load it, which will add the appropriate subdirs of ;; find one, load it, which will add the appropriate subdirs of
;; that dir into load-path. This needs to be done before setting ;; that dir into load-path. This needs to be done before setting