From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Kenichi Handa Newsgroups: gmane.emacs.devel Subject: some subdirs.el won't be loaded Date: Tue, 24 May 2005 22:14:31 +0900 Message-ID: NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 (generated by SEMI 1.14.3 - "Ushinoya") Content-Type: text/plain; charset=US-ASCII X-Trace: sea.gmane.org 1116941349 18007 80.91.229.2 (24 May 2005 13:29:09 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Tue, 24 May 2005 13:29:09 +0000 (UTC) Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue May 24 15:29:03 2005 Return-path: Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1DaZRJ-0006xx-M2 for ged-emacs-devel@m.gmane.org; Tue, 24 May 2005 15:27:21 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DaZRt-0004Dg-Ew for ged-emacs-devel@m.gmane.org; Tue, 24 May 2005 09:27:57 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DaZR4-0003rA-1d for emacs-devel@gnu.org; Tue, 24 May 2005 09:27:06 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DaZQs-0003lL-JU for emacs-devel@gnu.org; Tue, 24 May 2005 09:26:56 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DaZQh-0003dN-5e for emacs-devel@gnu.org; Tue, 24 May 2005 09:26:43 -0400 Original-Received: from [192.47.44.130] (helo=tsukuba.m17n.org) by monty-python.gnu.org with esmtp (TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA:24) (Exim 4.34) id 1DaZIP-0008L5-Tw for emacs-devel@gnu.org; Tue, 24 May 2005 09:18:10 -0400 Original-Received: from nfs.m17n.org (nfs.m17n.org [192.47.44.7]) by tsukuba.m17n.org (8.12.3/8.12.3/Debian-7.1) with ESMTP id j4ODHs86014804 for ; Tue, 24 May 2005 22:17:54 +0900 Original-Received: from etlken (etlken.m17n.org [192.47.44.125]) by nfs.m17n.org (8.12.3/8.12.3/Debian-7.1) with ESMTP id j4ODHrCq005861 for ; Tue, 24 May 2005 22:17:54 +0900 Original-Received: from handa by etlken with local (Exim 3.36 #1 (Debian)) id 1DaZEt-0004h0-00 for ; Tue, 24 May 2005 22:14:31 +0900 Original-To: emacs-devel@gnu.org 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) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:37568 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:37568 I found that some subdirs.el won't be loaded. It seems that the reason is this change. 2004-08-20 Stefan Monnier * 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 handa@m17n.org *************** *** 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