aboutsummaryrefslogtreecommitdiff
blob: ffced77da83fad9162e66008f5af2d8431d21c69 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
Fix runtime failure when load-path contains a nil element.
https://bugs.gentoo.org/528664
http://thread.gmane.org/gmane.emacs.devel/176646

--- emacs-24.4-orig/lisp/startup.el
+++ emacs-24.4/lisp/startup.el
@@ -1319,6 +1319,7 @@
   (let (warned)
     (dolist (dir load-path)
       (and (not warned)
+	   (stringp dir)
 	   (string-match-p "/[._]emacs\\.d/?\\'" dir)
 	   (string-equal (file-name-as-directory (expand-file-name dir))
 			 (expand-file-name user-emacs-directory))