2 files changed, 7 insertions, 1 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index b64d3053dfd..04253780783 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+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 (bug#18813).
+
 2014-10-24  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * gnus.el (gnus-mode-line-buffer-identification): Don't shadow
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index f07ea499ecd..c26c3b7559e 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -327,7 +327,8 @@ be set in `.emacs' instead."
       (defun gnus-mode-line-buffer-identification (line)
         (let ((str (car-safe line))
               (load-path (append (mm-image-load-path) load-path)))
-          (if (and (stringp str)
+          (if (and (display-graphic-p)
+                   (stringp str)
                    (string-match "^Gnus:" str))
               (progn (add-text-properties
                       0 5