Mercurial > emacs
changeset 110182:96ce91e806ec
* emacs-lisp/package.el (package-directory-list): Only call file-name-nondirectory on a string.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Sat, 04 Sep 2010 13:54:48 -0400 |
| parents | 9e17fce46124 |
| children | fe4f125a5ff8 |
| files | lisp/ChangeLog lisp/emacs-lisp/package.el |
| diffstat | 2 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Sep 04 13:13:14 2010 -0400 +++ b/lisp/ChangeLog Sat Sep 04 13:54:48 2010 -0400 @@ -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> * emacs-lisp/package.el (package--download-one-archive): Ensure
--- a/lisp/emacs-lisp/package.el Sat Sep 04 13:13:14 2010 -0400 +++ b/lisp/emacs-lisp/package.el Sat Sep 04 13:54:48 2010 -0400 @@ -260,8 +260,9 @@ ;; Defaults are subdirs named "elpa" in the site-lisp dirs. (let (result) (dolist (f load-path) - (if (equal (file-name-nondirectory f) "site-lisp") - (push (expand-file-name "elpa" f) result))) + (and (stringp f) + (equal (file-name-nondirectory f) "site-lisp") + (push (expand-file-name "elpa" f) result))) (nreverse result)) "List of additional directories containing Emacs Lisp packages. Each directory name should be absolute.