From 7515423bc1935efeb43a85097e00f8758a7cc394 Mon Sep 17 00:00:00 2001 From: Katsumi Yamaoka Date: Mon, 27 Oct 2014 22:51:18 +0000 Subject: [PATCH] [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) --- lisp/gnus/ChangeLog | 6 ++++++ lisp/gnus/gnus.el | 5 +++-- 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 + + * 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 * 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 -- 2.39.5