aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKatsumi Yamaoka2014-10-27 12:51:18 +0900
committerKatsumi Yamaoka2014-10-27 12:51:18 +0900
commit48ec7450255fe77ea17191c607d87e4335e17c8a (patch)
treece026180a74bbbd65964666c38000fc0d0782391
parentea1c65d4bb1aeac801d8a969715ec0a4f5b15de9 (diff)
downloademacs-48ec7450255fe77ea17191c607d87e4335e17c8a.tar.gz
emacs-48ec7450255fe77ea17191c607d87e4335e17c8a.zip
lisp/gnus/gnus.el (gnus-mode-line-buffer-identification): Don't add image data for a non-graphic display (bug#18813)
-rw-r--r--lisp/gnus/ChangeLog5
-rw-r--r--lisp/gnus/gnus.el3
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 @@
12014-10-27 Katsumi Yamaoka <yamaoka@jpl.org>
2
3 * gnus.el (gnus-mode-line-buffer-identification):
4 Don't add image data for a non-graphic display (bug#18813).
5
12014-10-24 Katsumi Yamaoka <yamaoka@jpl.org> 62014-10-24 Katsumi Yamaoka <yamaoka@jpl.org>
2 7
3 * gnus.el (gnus-mode-line-buffer-identification): Don't shadow 8 * 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."
327 (defun gnus-mode-line-buffer-identification (line) 327 (defun gnus-mode-line-buffer-identification (line)
328 (let ((str (car-safe line)) 328 (let ((str (car-safe line))
329 (load-path (append (mm-image-load-path) load-path))) 329 (load-path (append (mm-image-load-path) load-path)))
330 (if (and (stringp str) 330 (if (and (display-graphic-p)
331 (stringp str)
331 (string-match "^Gnus:" str)) 332 (string-match "^Gnus:" str))
332 (progn (add-text-properties 333 (progn (add-text-properties
333 0 5 334 0 5