aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Raeburn2000-10-31 15:58:25 +0000
committerKen Raeburn2000-10-31 15:58:25 +0000
commit49fc45009ec4c2a08e29e22e3ebac7551aabc84a (patch)
treece6fdc1ed2d6ce73b90aa0d443c700dab49f4b54
parent0a894bad85dd799d5c008fe21a7b4530f969029e (diff)
downloademacs-49fc45009ec4c2a08e29e22e3ebac7551aabc84a.tar.gz
emacs-49fc45009ec4c2a08e29e22e3ebac7551aabc84a.zip
* loadup.el (top level): Adjust load path if program name is
"../src/bootstrap-emacs", in case it's not dumped and thus the load path adjustment hasn't already been done.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/loadup.el4
2 files changed, 9 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 112fdfd6f4f..1c0c2c8ece1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12000-10-31 Ken Raeburn <raeburn@gnu.org>
2
3 * loadup.el (top level): Adjust load path if program name is
4 "../src/bootstrap-emacs", in case it's not dumped and thus the
5 load path adjustment hasn't already been done.
6
12000-10-31 Vinicius Jose Latorre <vinicius@cpqd.com.br> 72000-10-31 Vinicius Jose Latorre <vinicius@cpqd.com.br>
2 8
3 * ps-print.el: Fix bug on selected pages for printing. Use 9 * ps-print.el: Fix bug on selected pages for printing. Use
diff --git a/lisp/loadup.el b/lisp/loadup.el
index d97613f94b1..237ed920f60 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -31,7 +31,9 @@
31;; add subdirectories to the load-path for files that might 31;; add subdirectories to the load-path for files that might
32;; get autoloaded when bootstrapping 32;; get autoloaded when bootstrapping
33(if (or (equal (nth 3 command-line-args) "bootstrap") 33(if (or (equal (nth 3 command-line-args) "bootstrap")
34 (equal (nth 4 command-line-args) "bootstrap")) 34 (equal (nth 4 command-line-args) "bootstrap")
35 ;; in case CANNOT_DUMP
36 (equal (nth 0 command-line-args) "../src/bootstrap-emacs"))
35 (let ((path (car load-path))) 37 (let ((path (car load-path)))
36 (setq load-path (list path 38 (setq load-path (list path
37 (expand-file-name "emacs-lisp" path) 39 (expand-file-name "emacs-lisp" path)