[Emacs-diffs] Changes to emacs/lisp/startup.el

[Stefan Monnier]

Index: emacs/lisp/startup.el
diff -c emacs/lisp/startup.el:1.357 emacs/lisp/startup.el:1.358
*** emacs/lisp/startup.el:1.357 Mon May 16 11:33:47 2005
--- emacs/lisp/startup.el       Wed May 25 14:18:44 2005
***************
*** 368,378 ****
      ;; 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)))
      (unless (eq system-type 'vax-vms)
        ;; If the PWD environment variable isn't accurate, delete it.
        (let ((pwd (getenv "PWD")))
--- 368,384 ----
      ;; of that dir into load-path,
      ;; Look for a leim-list.el file too.  Loading it will register
      ;; available input methods.
!     (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")))