aboutsummaryrefslogtreecommitdiff
blob: cb46e3be0cc9a0913c98872fd891332ea73b5f0f (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
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