changeset 28722:a4c4a68597f5

(normal-top-level-add-to-load-path): Handle case that the default directory is not in load-path.
author Gerd Moellmann <gerd@gnu.org>
date Wed, 26 Apr 2000 17:34:37 +0000
parents b4ea18c92e38
children 67ffd6aa22da
files lisp/startup.el
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/startup.el	Wed Apr 26 17:34:09 2000 +0000
+++ b/lisp/startup.el	Wed Apr 26 17:34:37 2000 +0000
@@ -382,11 +382,15 @@
   (let ((tail load-path)
 	(thisdir (directory-file-name default-directory)))
     (while (and tail
+		;;Don't go all the way to the nil terminator.
+		(cdr tail)
 		(not (equal thisdir (car tail)))
 		(not (and (memq system-type '(ms-dos windows-nt))
 			  (equal (downcase thisdir) (downcase (car tail))))))
       (setq tail (cdr tail)))
-    (setcdr tail (append (mapcar 'expand-file-name dirs) (cdr tail)))))
+    ;;Splice the new section in.
+    (when tail
+      (setcdr tail (append (mapcar 'expand-file-name dirs) (cdr tail))))))
 
 (defun normal-top-level ()
   (if command-line-processed