diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2005-05-25 14:18:45 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2005-05-25 14:18:45 +0000 |
| commit | b6666b5f60a5c3cf5abd4e3003ed58c5042b08ff (patch) | |
| tree | 0f11e68cb61d126a11d0225ce72c633ce3f2541c | |
| parent | 7235a58f704aff3428fe11c4729e2e23e0eab7d5 (diff) | |
| download | emacs-b6666b5f60a5c3cf5abd4e3003ed58c5042b08ff.tar.gz | |
(normal-top-level): Allow modification of load-path while iterating over it.
| -rw-r--r-- | lisp/ChangeLog | 23 | ||||
| -rw-r--r-- | lisp/startup.el | 16 |
2 files changed, 25 insertions, 14 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3a87822af49..b57e18d462b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2005-05-25 Stefan Monnier <monnier@iro.umontreal.ca> + + * startup.el (normal-top-level): Allow modification of load-path while + we're iterating over it. + 2005-05-25 Juanma Barranquero <lekktu@gmail.com> * thumbs.el (thumbs-thumbsdir-max-size, thumbs-temp-file) @@ -22,15 +27,15 @@ 2005-05-24 Nick Roberts <nickrob@snap.net.nz> - * progmodes/gdb-ui.el (gdb-inferior-io-mode-map): Bind - gdb-inferior-io-eof to C-d. + * progmodes/gdb-ui.el (gdb-inferior-io-mode-map): + Bind gdb-inferior-io-eof to C-d. * dired.el (dired-dnd-popup-notice): Use message-box. 2005-05-23 Masatake YAMATO <jet@gyve.org> - * bindings.el (mode-line-major-mode-keymap): Bind - [mode-line down-mouse-1] to `mouse-major-mode-menu'. + * bindings.el (mode-line-major-mode-keymap): + Bind [mode-line down-mouse-1] to `mouse-major-mode-menu'. * faces.el (mode-line-highlight): New face. @@ -394,7 +399,7 @@ 2005-05-19 Carsten Dominik <dominik@science.uva.nl> - * textmodes/reftex.el (reftex-isearch-minor-mode): Moved the + * textmodes/reftex.el (reftex-isearch-minor-mode): Move the definition of this variable from reftex-global.el to reftex.el, because it is needed in the menu. @@ -417,8 +422,8 @@ (makefile-add-this-line-macro): Simplify and integrate into `makefile-pickup-macros. (makefile-pickup-filenames-as-targets): Simplify. - (makefile-previous-dependency, makefile-match-dependency): Don't - stumble over `::'. + (makefile-previous-dependency, makefile-match-dependency): + Don't stumble over `::'. 2005-05-19 Nick Roberts <nickrob@snap.net.nz> @@ -432,8 +437,8 @@ * help-fns.el (describe-variable): Remove hyperlinks in a variable's value as these are quite frequently inappropriate. - * follow.el (follow-submit-feedback, follow-mode): Remove - references to post-command-idle-hook. + * follow.el (follow-submit-feedback, follow-mode): + Remove references to post-command-idle-hook. 2005-05-18 Daniel Pfeiffer <occitan@esperanto.org> diff --git a/lisp/startup.el b/lisp/startup.el index b7d1a1d34df..53539c6185f 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -368,11 +368,17 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'." ;; of that dir into load-path, ;; Look for a leim-list.el file too. Loading it will register ;; available input methods. - (dolist (dir load-path) - (let ((default-directory dir)) - (load (expand-file-name "subdirs.el") t t t)) - (let ((default-directory dir)) - (load (expand-file-name "leim-list.el") t t t))) + (let ((tail load-path) dir) + (while tail + (setq dir (car tail)) + (let ((default-directory dir)) + (load (expand-file-name "subdirs.el") t t t)) + (let ((default-directory dir)) + (load (expand-file-name "leim-list.el") t t t)) + ;; We don't use a dolist loop and we put this "setq-cdr" command at + ;; the end, because the subdirs.el files may add elements to the end + ;; of load-path and we want to take it into account. + (setq tail (cdr tail)))) (unless (eq system-type 'vax-vms) ;; If the PWD environment variable isn't accurate, delete it. (let ((pwd (getenv "PWD"))) |