# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1283622888 14400
# Node ID 96ce91e806ecf0d1d41986ea6d4306072e81f434
# Parent  9e17fce461240ad199f7a2700e5f7a796d449c0c
* emacs-lisp/package.el (package-directory-list): Only call file-name-nondirectory on a string.

diff -r 9e17fce46124 -r 96ce91e806ec lisp/ChangeLog
--- 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
diff -r 9e17fce46124 -r 96ce91e806ec lisp/emacs-lisp/package.el
--- 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.