summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-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 @@
+2000-10-31 Ken Raeburn <raeburn@gnu.org>
+
+ * 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.
+
2000-10-31 Vinicius Jose Latorre <vinicius@cpqd.com.br>
* 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 @@
;; add subdirectories to the load-path for files that might
;; get autoloaded when bootstrapping
(if (or (equal (nth 3 command-line-args) "bootstrap")
- (equal (nth 4 command-line-args) "bootstrap"))
+ (equal (nth 4 command-line-args) "bootstrap")
+ ;; in case CANNOT_DUMP
+ (equal (nth 0 command-line-args) "../src/bootstrap-emacs"))
(let ((path (car load-path)))
(setq load-path (list path
(expand-file-name "emacs-lisp" path)