From: Chong Yidong <cyd@stupidchicken.com>
Date: Sat, 4 Sep 2010 17:54:48 +0000 (-0400)
Subject: * emacs-lisp/package.el (package-directory-list): Only call file-name-nondirectory... 
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~48^2~95
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0be01d2c8655f914e522877defa7b323c8cceb9c;p=emacs.git

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

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  <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
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.