[Emacs-diffs] /srv/bzr/emacs/trunk r101333: * emacs-lisp/package.el (package-directory-list): Only call file-name-nondirectory on a string.

[Chong Yidong]

------------------------------------------------------------
revno: 101333
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2010-09-04 13:54:48 -0400
message:
  * emacs-lisp/package.el (package-directory-list): Only call 
file-name-nondirectory on a string.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/package.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-09-04 17:13:14 +0000
+++ b/lisp/ChangeLog    2010-09-04 17:54:48 +0000
@@ -1,3 +1,8 @@
+2010-09-04  Noorul Islam K M  <address@hidden>  (tiny change)
+
+       * emacs-lisp/package.el (package-directory-list): Only call
+       file-name-nondirectory on a string.
+
 2010-09-02  Chong Yidong  <address@hidden>
 
        * emacs-lisp/package.el (package--download-one-archive): Ensure

=== modified file 'lisp/emacs-lisp/package.el'
--- a/lisp/emacs-lisp/package.el        2010-09-04 17:13:14 +0000
+++ b/lisp/emacs-lisp/package.el        2010-09-04 17:54:48 +0000
@@ -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.