From 0be01d2c8655f914e522877defa7b323c8cceb9c Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sat, 4 Sep 2010 13:54:48 -0400 Subject: [PATCH] * emacs-lisp/package.el (package-directory-list): Only call file-name-nondirectory on a string. --- lisp/ChangeLog | 5 +++++ lisp/emacs-lisp/package.el | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index efec2b3fcb4..28092a6a086 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2010-09-04 Noorul Islam K M (tiny change) + + * emacs-lisp/package.el (package-directory-list): Only call + file-name-nondirectory on a string. + 2010-09-02 Chong Yidong * emacs-lisp/package.el (package--download-one-archive): Ensure 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. -- 2.39.5