emacs: Avoid setting exec-path to nil
authorFredrik Fornwall <fredrik@fornwall.net>
Thu, 31 Mar 2016 23:05:01 +0000 (19:05 -0400)
committerFredrik Fornwall <fredrik@fornwall.net>
Thu, 31 Mar 2016 23:05:01 +0000 (19:05 -0400)
packages/emacs/lisp-loadup.el.patch.beforehostbuild

index d767362..8044737 100644 (file)
@@ -1,6 +1,6 @@
 diff -u -r ../emacs-25.0.92/lisp/loadup.el ./lisp/loadup.el
 --- ../emacs-25.0.92/lisp/loadup.el    2016-03-02 05:21:42.000000000 -0500
-+++ ./lisp/loadup.el   2016-03-25 21:40:48.314906360 -0400
++++ ./lisp/loadup.el   2016-03-31 18:41:25.609790054 -0400
 @@ -1,3 +1,7 @@
 +;; Termux patch: See
 +;; https://lists.gnu.org/archive/html/bug-gnu-emacs/2016-03/msg00471.html
@@ -9,7 +9,17 @@ diff -u -r ../emacs-25.0.92/lisp/loadup.el ./lisp/loadup.el
  ;;; loadup.el --- load up standardly loaded Lisp files for Emacs
  
  ;; Copyright (C) 1985-1986, 1992, 1994, 2001-2016 Free Software
-@@ -110,6 +114,12 @@
+@@ -69,7 +73,8 @@
+ ;; Prevent build-time PATH getting stored in the binary.
+ ;; Mainly cosmetic, but helpful for Guix.  (Bug#20330)
+-(setq exec-path nil)
++;; Termux patch: Keep exec-path when running undumped:
++;; (setq exec-path nil)
+ (if (eq t purify-flag)
+     ;; Hash consing saved around 11% of pure space in my tests.
+@@ -110,6 +115,12 @@
  (load "format")
  (load "bindings")
  (load "window")  ; Needed here for `replace-buffer-in-windows'.
@@ -22,7 +32,7 @@ diff -u -r ../emacs-25.0.92/lisp/loadup.el ./lisp/loadup.el
  (setq load-source-file-function 'load-with-code-conversion)
  (load "files")
  
-@@ -465,3 +475,7 @@
+@@ -465,3 +476,7 @@
  ;; End:
  
  ;;; loadup.el ends here