diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-06-01 13:25:09 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-06-01 13:26:30 -0700 |
| commit | 1e5539e0b35d2a7fcd1f1772c4532430cb18471b (patch) | |
| tree | c4c11c574537659dacff45cc858eb6edba822451 /lisp/loadup.el | |
| parent | 4428f5a97b942652e6894f22c4c251457a1edc8b (diff) | |
| download | emacs-1e5539e0b35d2a7fcd1f1772c4532430cb18471b.tar.gz | |
Avoid delving into Git internals for version
* lisp/loadup.el (exec-path): Set it to nil later, so that
emacs-repository-get-version can invoke git commands in the PATH.
* lisp/version.el (emacs-repository--version-git-1): Remove.
(emacs-repository-get-version): Let Git do it rather than
delving into Git internals.
Diffstat (limited to 'lisp/loadup.el')
| -rw-r--r-- | lisp/loadup.el | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lisp/loadup.el b/lisp/loadup.el index db3c36d1f01..5c16464282b 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -78,10 +78,6 @@ (expand-file-name "textmodes" dir) (expand-file-name "vc" dir))))) -;; Prevent build-time PATH getting stored in the binary. -;; Mainly cosmetic, but helpful for Guix. (Bug#20330) -(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 80000))) @@ -431,6 +427,12 @@ lost after dumping"))) (message "Pure-hashed: %d strings, %d vectors, %d conses, %d bytecodes, %d others" strings vectors conses bytecodes others))) +;; Prevent build-time PATH getting stored in the binary. +;; Mainly cosmetic, but helpful for Guix. (Bug#20330) +;; Do this here, rather than earlier, so that the above code +;; can invoke Git commands and the like. +(setq exec-path nil) + ;; Avoid error if user loads some more libraries now and make sure the ;; hash-consing hash table is GC'd. (setq purify-flag nil) |