* emacs-lisp/package.el (package-directory-list): Only call file-name-nondirectory on a string.

This commit is contained in:
Chong Yidong 2010-09-04 13:54:48 -04:00
parent ebf662f494
commit 0be01d2c86
2 changed files with 8 additions and 2 deletions

View file

@ -1,3 +1,8 @@
2010-09-04 Noorul Islam K M <noorul@noorul.com> (tiny change)
* emacs-lisp/package.el (package-directory-list): Only call
file-name-nondirectory on a string.
2010-09-02 Chong Yidong <cyd@stupidchicken.com> 2010-09-02 Chong Yidong <cyd@stupidchicken.com>
* emacs-lisp/package.el (package--download-one-archive): Ensure * emacs-lisp/package.el (package--download-one-archive): Ensure

View file

@ -260,7 +260,8 @@ packages in `package-directory-list'."
;; Defaults are subdirs named "elpa" in the site-lisp dirs. ;; Defaults are subdirs named "elpa" in the site-lisp dirs.
(let (result) (let (result)
(dolist (f load-path) (dolist (f load-path)
(if (equal (file-name-nondirectory f) "site-lisp") (and (stringp f)
(equal (file-name-nondirectory f) "site-lisp")
(push (expand-file-name "elpa" f) result))) (push (expand-file-name "elpa" f) result)))
(nreverse result)) (nreverse result))
"List of additional directories containing Emacs Lisp packages. "List of additional directories containing Emacs Lisp packages.