diff options
| author | Efraim Flashner <[email protected]> | 2022-05-16 10:55:46 +0300 |
|---|---|---|
| committer | Efraim Flashner <[email protected]> | 2022-05-16 11:14:42 +0300 |
| commit | e5e0e283ffd92f153303401c39dfcc1d8dde4f96 (patch) | |
| tree | 82c7f8498081c1f807a0e4a25d0fd75c0e493043 /gnu/packages/patches/emacs-exec-path.patch | |
| parent | 7c204281ff0b57de59261cd7b68fab3df1c0f49c (diff) | |
| parent | 40a729a0e6f1d660b942241416c1e2c567616d4d (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/patches/emacs-exec-path.patch')
| -rw-r--r-- | gnu/packages/patches/emacs-exec-path.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gnu/packages/patches/emacs-exec-path.patch b/gnu/packages/patches/emacs-exec-path.patch index 7303599df1..9a76b0237d 100644 --- a/gnu/packages/patches/emacs-exec-path.patch +++ b/gnu/packages/patches/emacs-exec-path.patch @@ -4,13 +4,13 @@ with things like GCC being referenced. --- a/lisp/loadup.el +++ b/lisp/loadup.el -@@ -481,7 +481,8 @@ lost after dumping"))) +@@ -530,7 +530,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)))) +- (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) + (when (and (featurep 'native-compile) + (equal dump-mode "pdump")) + ;; Don't enable this before bootstrap is completed, as the |