[Emacs-diffs] emacs-24 r117628: [Backport] gnus.el (gnus-mode-line-buffer-identification):

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 117628
revision-id: address@hidden
parent: address@hidden
committer: Katsumi Yamaoka <address@hidden>
branch nick: emacs-24
timestamp: Mon 2014-10-27 22:51:18 +0000
message:
  [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)
modified:
  lisp/gnus/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-1433
  lisp/gnus/gnus.el              gnus.el-20091113204419-o5vbwnq5f7feedwu-1144

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2014-10-27 00:56:22 +0000
+++ b/lisp/gnus/ChangeLog       2014-10-27 22:51:18 +0000
@@ -1,3 +1,9 @@
+2014-10-27  Katsumi Yamaoka  <address@hidden>
+
+       * 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  <address@hidden>
 
        * nnimap.el (nnimap-wait-for-response): Ignore NOOP response requested

=== modified file 'lisp/gnus/gnus.el'
--- a/lisp/gnus/gnus.el 2014-01-01 07:43:34 +0000
+++ b/lisp/gnus/gnus.el 2014-10-27 22:51:18 +0000
@@ -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