diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2010-09-04 13:54:48 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2010-09-04 13:54:48 -0400 |
| commit | 0be01d2c8655f914e522877defa7b323c8cceb9c (patch) | |
| tree | f9c5b1c78d51c7c64dc1ef5d83288e24bfcacd8a /lisp/emacs-lisp | |
| parent | ebf662f4945f64dd36e0fe62a6cb7ab63c833a2e (diff) | |
| download | emacs-0be01d2c8655f914e522877defa7b323c8cceb9c.tar.gz emacs-0be01d2c8655f914e522877defa7b323c8cceb9c.tar.bz2 emacs-0be01d2c8655f914e522877defa7b323c8cceb9c.zip | |
* emacs-lisp/package.el (package-directory-list): Only call file-name-nondirectory on a string.
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/package.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 6c5aee2a735..54c6a09dd9d 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -260,8 +260,9 @@ packages in `package-directory-list'." ;; 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. |