diff options
author | Ulrich Müller <ulm@gentoo.org> | 2014-11-10 08:37:04 +0100 |
---|---|---|
committer | Ulrich Müller <ulm@gentoo.org> | 2014-11-10 08:37:04 +0100 |
commit | 4b91be334a8f82cb5dc3df6d884c44eebfc605aa (patch) | |
tree | 1a7839797fb0c0d5ece409345ce86c27919a3830 | |
parent | Add PaX/xattr patch to Emacs 24.4, bug 526948. (diff) | |
download | emacs-patches-4b91be334a8f82cb5dc3df6d884c44eebfc605aa.tar.gz emacs-patches-4b91be334a8f82cb5dc3df6d884c44eebfc605aa.tar.bz2 emacs-patches-4b91be334a8f82cb5dc3df6d884c44eebfc605aa.zip |
Fix runtime failure when load-path contains a nil element, bug 528664.emacs-24.4-patches-2
-rw-r--r-- | emacs/24.4/02_all_nil-in-load-path.patch | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/emacs/24.4/02_all_nil-in-load-path.patch b/emacs/24.4/02_all_nil-in-load-path.patch new file mode 100644 index 0000000..ffced77 --- /dev/null +++ b/emacs/24.4/02_all_nil-in-load-path.patch @@ -0,0 +1,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)) |