diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2015-01-23 08:26:55 +0100 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2015-01-23 08:26:55 +0100 |
| commit | 7f10f7bade537956fda28461a0cf36aa63282ce4 (patch) | |
| tree | dae9c6ab079758fe0c1a565f8031f202432fd6ee /emacs | |
| parent | Remove redundant _BSD_SOURCE macro causing warnings with glibc 2.20. (diff) | |
| download | emacs-patches-7f10f7bade537956fda28461a0cf36aa63282ce4.tar.gz emacs-patches-7f10f7bade537956fda28461a0cf36aa63282ce4.tar.bz2 emacs-patches-7f10f7bade537956fda28461a0cf36aa63282ce4.zip | |
Don't shadow load-path in gnus, bug 537156.
Diffstat (limited to 'emacs')
| -rw-r--r-- | emacs/24.4/03_all_gnus-image.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/emacs/24.4/03_all_gnus-image.patch b/emacs/24.4/03_all_gnus-image.patch new file mode 100644 index 0000000..cb46e3b --- /dev/null +++ b/emacs/24.4/03_all_gnus-image.patch @@ -0,0 +1,25 @@ +https://bugs.gentoo.org/537156 +http://debbugs.gnu.org/18813 + +commit 7515423bc1935efeb43a85097e00f8758a7cc394 +Author: Katsumi Yamaoka <yamaoka@jpl.org> +Date: Mon Oct 27 22:51:18 2014 +0000 + + [Backport] gnus.el (gnus-mode-line-buffer-identification): + Don't add image data for a non-graphic display; + Don't shadow load-path, it blocks autoloading of find-image (bug#18813) + +--- emacs-24.4-orig/lisp/gnus/gnus.el ++++ emacs-24.4/lisp/gnus/gnus.el +@@ -328,8 +328,9 @@ + (if (fboundp 'find-image) + (defun gnus-mode-line-buffer-identification (line) + (let ((str (car-safe line)) +- (load-path (mm-image-load-path))) +- (if (and (stringp str) ++ (load-path (append (mm-image-load-path) load-path))) ++ (if (and (display-graphic-p) ++ (stringp str) + (string-match "^Gnus:" str)) + (progn (add-text-properties + 0 5 |