aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2014-03-14 14:00:08 -0400
committerGlenn Morris2014-03-14 14:00:08 -0400
commit3723063530471df09f28b419a472959be8363642 (patch)
tree790097c5e71a987855bee785f9683fd36e63fc79
parent459d74ef997f15db864b0ff97cddb8c7b5b3d847 (diff)
downloademacs-3723063530471df09f28b419a472959be8363642.tar.gz
emacs-3723063530471df09f28b419a472959be8363642.zip
* lisp/finder.el: Tweak previous change.
-rw-r--r--lisp/finder.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/finder.el b/lisp/finder.el
index ad4fda355ec..85db692f87e 100644
--- a/lisp/finder.el
+++ b/lisp/finder.el
@@ -177,7 +177,7 @@ from; the default is `load-path'."
177 (setq package--builtins nil) 177 (setq package--builtins nil)
178 (setq finder-keywords-hash (make-hash-table :test 'eq)) 178 (setq finder-keywords-hash (make-hash-table :test 'eq))
179 (let ((el-file-regexp "^\\([^=].*\\)\\.el\\(\\.\\(gz\\|Z\\)\\)?$") 179 (let ((el-file-regexp "^\\([^=].*\\)\\.el\\(\\.\\(gz\\|Z\\)\\)?$")
180 package-override files base-name processed 180 package-override files base-name ; processed
181 summary keywords package version entry desc) 181 summary keywords package version entry desc)
182 (dolist (d (or dirs load-path)) 182 (dolist (d (or dirs load-path))
183 (when (file-exists-p (directory-file-name d)) 183 (when (file-exists-p (directory-file-name d))
@@ -192,8 +192,8 @@ from; the default is `load-path'."
192 (unless (or (string-match finder-no-scan-regexp f) 192 (unless (or (string-match finder-no-scan-regexp f)
193 (null (setq base-name 193 (null (setq base-name
194 (and (string-match el-file-regexp f) 194 (and (string-match el-file-regexp f)
195 (intern (match-string 1 f))))) 195 (intern (match-string 1 f))))))
196 (memq base-name processed)) 196;; (memq base-name processed))
197;; There are multiple files in the tree with the same basename. 197;; There are multiple files in the tree with the same basename.
198;; So skipping files based on basename means you randomly (depending 198;; So skipping files based on basename means you randomly (depending
199;; on which order the files are traversed in) miss some packages. 199;; on which order the files are traversed in) miss some packages.