summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/gnus/ChangeLog6
-rw-r--r--lisp/gnus/gnus.el5
2 files changed, 9 insertions, 2 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 534ac3af69d..e659e983392 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
+2014-10-27 Katsumi Yamaoka <yamaoka@jpl.org>
+
+ * 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).
+
2014-10-27 enami tsugutomo <tsugutomo.enami@jp.sony.com>
* nnimap.el (nnimap-wait-for-response): Ignore NOOP response requested
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index b1d60de93d9..56b749f6527 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -328,8 +328,9 @@ be set in `.emacs' instead."
(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