diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-09-14 16:17:19 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-09-14 16:17:19 -0400 |
| commit | fa8fe90edb4efaf7d52f71516c4dcabb13d56418 (patch) | |
| tree | 8d69a1132e95845d8a3d90f1fe4d0ef04039e2f4 /gnu/packages/patches/emacs-exec-path.patch | |
| parent | 1bec03df9b60f156c657a64a323ef27f4ed14b44 (diff) | |
| parent | d60739dff2e2f5eb74173b73a5fd207ef7cd110a (diff) | |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'gnu/packages/patches/emacs-exec-path.patch')
| -rw-r--r-- | gnu/packages/patches/emacs-exec-path.patch | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/gnu/packages/patches/emacs-exec-path.patch b/gnu/packages/patches/emacs-exec-path.patch index 884fa94a64..7303599df1 100644 --- a/gnu/packages/patches/emacs-exec-path.patch +++ b/gnu/packages/patches/emacs-exec-path.patch @@ -4,15 +4,13 @@ with things like GCC being referenced. --- a/lisp/loadup.el +++ b/lisp/loadup.el -@@ -64,6 +64,11 @@ - (expand-file-name "textmodes" dir) - (expand-file-name "vc" dir))))) - -+;; Reset 'exec-path' so we don't capture the build-time $PATH in the -+;; 'emacs' executable. -+(setq-default exec-path nil) -+(setq exec-path nil) -+ - (if (eq t purify-flag) - ;; Hash consing saved around 11% of pure space in my tests. - (setq purify-flag (make-hash-table :test 'equal :size 70000))) +@@ -481,7 +481,8 @@ lost after dumping"))) + ((equal dump-mode "dump") "emacs") + ((equal dump-mode "bootstrap") "emacs") + ((equal dump-mode "pbootstrap") "bootstrap-emacs.pdmp") +- (t (error "unrecognized dump mode %s" dump-mode))))) ++ (t (error "unrecognized dump mode %s" dump-mode)))) ++ (exec-path nil)) + (message "Dumping under the name %s" output) + (condition-case () + (delete-file output) |