aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2010-09-25 13:43:27 +0000
committerKatsumi Yamaoka2010-09-25 13:43:27 +0000
commit56d95d0231f536e64cdf67c65537d4db4593093c (patch)
tree607b80cda553aa1feced50e128c88b9cfc9cd7fe
parenta41db1075d18d0a49c1cd02e6120b23926cbd203 (diff)
downloademacs-56d95d0231f536e64cdf67c65537d4db4593093c.tar.gz
emacs-56d95d0231f536e64cdf67c65537d4db4593093c.zip
gnus-ems.el (gnus-put-image):Don't put any non-blank text into the buffer when inserting images.
-rw-r--r--lisp/gnus/ChangeLog6
-rw-r--r--lisp/gnus/gnus-ems.el2
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index bbdceb51911..65bf233c03b 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
12010-09-25 Lars Magne Ingebrigtsen <larsi@gnus.org>
2
3 * gnus-ems.el (gnus-put-image): Don't put any non-blank text into the
4 buffer when inserting images. Inserting text into the headers, for
5 instance, can make them invalid.
6
12010-09-25 Julien Danjou <julien@danjou.info> 72010-09-25 Julien Danjou <julien@danjou.info>
2 8
3 * rfc1843.el: Remove useless rfc1843-old-gnus-decode-header-function 9 * rfc1843.el: Remove useless rfc1843-old-gnus-decode-header-function
diff --git a/lisp/gnus/gnus-ems.el b/lisp/gnus/gnus-ems.el
index 7bc59bf1b69..9c395dbf24a 100644
--- a/lisp/gnus/gnus-ems.el
+++ b/lisp/gnus/gnus-ems.el
@@ -276,7 +276,7 @@
276 276
277(defun gnus-put-image (glyph &optional string category) 277(defun gnus-put-image (glyph &optional string category)
278 (let ((point (point))) 278 (let ((point (point)))
279 (insert-image glyph (or string "*")) 279 (insert-image glyph (or string " "))
280 (put-text-property point (point) 'gnus-image-category category) 280 (put-text-property point (point) 'gnus-image-category category)
281 (unless string 281 (unless string
282 (put-text-property (1- (point)) (point) 282 (put-text-property (1- (point)) (point)