bug#910: leim-list.el is looked up in too many places at startup

bug#910: leim-list.el is looked up in too many places at startup

[Dan Nicolaescu]

strace emacs -Q

shows that leim-list.el is looked up in 32 locations at startup.  We
only have it in a single place.
Is this a leftover from the time when leim was distributed separately
from emacs?

It would be good if this redundant work would be avoided.

bug#910: leim-list.el is looked up in too many places at startup

[Glenn Morris]

Dan Nicolaescu wrote:

> strace emacs -Q
>
> shows that leim-list.el is looked up in 32 locations at startup. We
> only have it in a single place.  Is this a leftover from the time
> when leim was distributed separately from emacs?
>
> It would be good if this redundant work would be avoided.


It does seem superfluous. This works for me:


*** startup.el	23 Aug 2008 16:59:19 -0000	1.503
--- startup.el	10 Sep 2008 02:03:52 -0000
***************
*** 478,496 ****
      ;; Look in each dir in load-path for a subdirs.el file.
      ;; If we find one, load it, which will add the appropriate subdirs
      ;; 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))))
      ;; If the PWD environment variable isn't accurate, delete it.
      (let ((pwd (getenv "PWD")))
        (and (stringp pwd)
--- 478,501 ----
      ;; Look in each dir in load-path for a subdirs.el file.
      ;; If we find one, load it, which will add the appropriate subdirs
      ;; of that dir into load-path,
      (let ((tail load-path) dir)
        (while tail
          (setq dir (car tail))
          (let ((default-directory dir))
            (load (expand-file-name "subdirs.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))))
+     ;; Look for a leim-list.el file.  Loading it will register
+     ;; available input methods.
+     (let ((leim (expand-file-name "../leim/leim-list.el" data-directory)))
+       (condition-case nil
+ 	  (load leim nil t t)
+ 	(error
+ 	 (display-warning 'initialization
+ 			  (format "Unable to load LEIM file `%s'" leim)
+ 			  :error))))
      ;; If the PWD environment variable isn't accurate, delete it.
      (let ((pwd (getenv "PWD")))
        (and (stringp pwd)

bug#910: leim-list.el is looked up in too many places at startup

[Dan Nicolaescu]

Glenn Morris <rgm@gnu.org> writes:

  > Dan Nicolaescu wrote:
  > 
  > > strace emacs -Q
  > >
  > > shows that leim-list.el is looked up in 32 locations at startup. We
  > > only have it in a single place.  Is this a leftover from the time
  > > when leim was distributed separately from emacs?
  > >
  > > It would be good if this redundant work would be avoided.
  > 
  > 
  > It does seem superfluous. This works for me:

Thanks!

  > *** startup.el	23 Aug 2008 16:59:19 -0000	1.503
  > --- startup.el	10 Sep 2008 02:03:52 -0000
  > ***************
  > *** 478,496 ****
  >       ;; Look in each dir in load-path for a subdirs.el file.
  >       ;; If we find one, load it, which will add the appropriate subdirs
  >       ;; 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))))
  >       ;; If the PWD environment variable isn't accurate, delete it.
  >       (let ((pwd (getenv "PWD")))
  >         (and (stringp pwd)
  > --- 478,501 ----
  >       ;; Look in each dir in load-path for a subdirs.el file.
  >       ;; If we find one, load it, which will add the appropriate subdirs
  >       ;; of that dir into load-path,
  >       (let ((tail load-path) dir)
  >         (while tail
  >           (setq dir (car tail))
  >           (let ((default-directory dir))
  >             (load (expand-file-name "subdirs.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))))
  > +     ;; Look for a leim-list.el file.  Loading it will register
  > +     ;; available input methods.
  > +     (let ((leim (expand-file-name "../leim/leim-list.el" data-directory)))
               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
               This won't work when building in a separate directory:
               leim-list.el is generated in the build tree, not the
               source tree (unlike what happens for .elc files...)

bug#910: leim-list.el is looked up in too many places at startup

[Glenn Morris]

Dan Nicolaescu wrote:

>   > +     (let ((leim (expand-file-name "../leim/leim-list.el" data-directory)))
>                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
>                This won't work when building in a separate directory:
>                leim-list.el is generated in the build tree, not the
>                source tree (unlike what happens for .elc files...)

Looks like I can just use doc-directory instead of data-directory
here, and all will be well.

The only question is, if people are supposed to be able to have
multiple leim-list files, or to be able to add their own. I guess not?

bug#910: leim-list.el is looked up in too many places at startup

[Glenn Morris]

The original was also binding default-directory for some reason, so
here is a revised patch in case that matters.

Without having thought about it much, if leim-list is always loaded,
why isn't it dumped?

*** startup.el	23 Aug 2008 16:59:19 -0000	1.503
--- startup.el	10 Sep 2008 06:49:37 -0000
***************
*** 478,496 ****
      ;; Look in each dir in load-path for a subdirs.el file.
      ;; If we find one, load it, which will add the appropriate subdirs
      ;; 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))))
      ;; If the PWD environment variable isn't accurate, delete it.
      (let ((pwd (getenv "PWD")))
        (and (stringp pwd)
--- 478,505 ----
      ;; Look in each dir in load-path for a subdirs.el file.
      ;; If we find one, load it, which will add the appropriate subdirs
      ;; of that dir into load-path,
      (let ((tail load-path) dir)
        (while tail
          (setq dir (car tail))
          (let ((default-directory dir))
            (load (expand-file-name "subdirs.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))))
+     ;; Load leim-list.el to register available input methods.
+     ;; Bug#910.  We used to look for it in each directory in load-path.
+     ;; This is no longer necessary since leim is distributed with Emacs.
+     ;; doc-directory is used rather than data-directory for
+     ;; non-source-directory builds running uninstalled.
+     (let* ((leim (expand-file-name "../leim/leim-list.el" doc-directory))
+ 	   (default-directory (file-name-directory leim)))
+       (condition-case nil
+ 	  (load leim nil t t)
+ 	(error
+ 	 (display-warning 'initialization
+ 			  (format "Unable to load LEIM file `%s'" leim)
+ 			  :error))))
      ;; If the PWD environment variable isn't accurate, delete it.
      (let ((pwd (getenv "PWD")))
        (and (stringp pwd)

bug#910: leim-list.el is looked up in too many places at startup

[Andreas Schwab]

Glenn Morris <rgm@gnu.org> writes:

> Dan Nicolaescu wrote:
>
>> strace emacs -Q
>>
>> shows that leim-list.el is looked up in 32 locations at startup. We
>> only have it in a single place.  Is this a leftover from the time
>> when leim was distributed separately from emacs?
>>
>> It would be good if this redundant work would be avoided.
>
>
> It does seem superfluous.

Extensions can and do add their own leim-list.

Andreas.

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany
PGP key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

bug#910: leim-list.el is looked up in too many places at startup

[Dan Nicolaescu]

tags 910 - wontfix
quit


See http://permalink.gmane.org/gmane.emacs.devel/116301
for Handa-san's opinion on how this should be handled.