emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

some subdirs.el won't be loaded


From: Kenichi Handa
Subject: some subdirs.el won't be loaded
Date: Tue, 24 May 2005 22:14:31 +0900
User-agent: SEMI/1.14.3 (Ushinoya) FLIM/1.14.2 (Yagi-Nishiguchi) APEL/10.2 Emacs/22.0.50 (i686-pc-linux-gnu) MULE/5.0 (SAKAKI)

I found that some subdirs.el won't be loaded.  It seems that
the reason is this change.

2004-08-20  Stefan Monnier  <address@hidden>

        * startup.el (normal-top-level-add-subdirs-to-load-path):
        Avoid unnecessarily checking system-type.
        (normal-top-level): Set TERM to "dumb".  Simplify.
                                                 ^^^^^^^^

normal-top-level-add-to-load-path appends directories to
load-path destructively, but because of above change,
subdirs.el in those newly added directories are not loaded.

The diff of the above change is attached.

---
Kenichi Handa
address@hidden


***************
*** 357,388 ****
      ;; 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)
!         new)
!       (while tail
!       (push (car tail) new)
!       (condition-case nil
!           (let ((default-directory (car tail)))
!             (load (expand-file-name "subdirs.el" (car tail)) t t t)))
!       (condition-case nil
!           (let ((default-directory (car tail)))
!             (load (expand-file-name "leim-list.el" (car tail)) t t t)))
!       (setq tail (cdr tail))))
!     (if (not (eq system-type 'vax-vms))
!       (progn
!         ;; If the PWD environment variable isn't accurate, delete it.
!         (let ((pwd (getenv "PWD")))
!           (and (stringp pwd)
!                ;; Use FOO/., so that if FOO is a symlink, file-attributes
!                ;; describes the directory linked to, not FOO itself.
!                (or (equal (file-attributes
!                            (concat (file-name-as-directory pwd) "."))
!                           (file-attributes
!                            (concat (file-name-as-directory default-directory)
!                                    ".")))
!                    (setq process-environment
!                          (delete (concat "PWD=" pwd)
!                                  process-environment)))))))
      (setq default-directory (abbreviate-file-name default-directory))
      (let ((menubar-bindings-done nil))
        (unwind-protect
--- 359,383 ----
      ;; 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")))
!       (and (stringp pwd)
!            ;; Use FOO/., so that if FOO is a symlink, file-attributes
!            ;; describes the directory linked to, not FOO itself.
!            (or (equal (file-attributes
!                        (concat (file-name-as-directory pwd) "."))
!                       (file-attributes
!                        (concat (file-name-as-directory default-directory)
!                                ".")))
!                (setq process-environment
!                      (delete (concat "PWD=" pwd)
!                              process-environment))))))
      (setq default-directory (abbreviate-file-name default-directory))
      (let ((menubar-bindings-done nil))
        (unwind-protect





reply via email to

[Prev in Thread] Current Thread [Next in Thread]