[Emacs-diffs] /srv/bzr/emacs/trunk r102139: shr.el (shr-put-image): Use point even if only inserting text; save-excursion on alt text.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 102139
author: Julien Danjou <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Thu 2010-10-28 12:45:51 +0000
message:
  shr.el (shr-put-image): Use point even if only inserting text; save-excursion 
on alt text.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/shr.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-10-28 10:41:27 +0000
+++ b/lisp/gnus/ChangeLog       2010-10-28 12:45:51 +0000
@@ -1,5 +1,9 @@
 2010-10-28  Julien Danjou  <address@hidden>
 
+       * shr.el (shr-put-image): Use point even if only inserting text.
+       (shr-put-image): Save excursion when inserting alt text on non-graphic
+       display, so the behaviour is the same when we are on a graphic display.
+
        * nnir.el (nnir-run-swish-e): Remove hyrex support.
 
 2010-10-28  Katsumi Yamaoka  <address@hidden>

=== modified file 'lisp/gnus/shr.el'
--- a/lisp/gnus/shr.el  2010-10-26 22:08:30 +0000
+++ b/lisp/gnus/shr.el  2010-10-28 12:45:51 +0000
@@ -373,12 +373,14 @@
   (kill-buffer (current-buffer)))
 
 (defun shr-put-image (data point alt)
-  (if (not (display-graphic-p))
-      (insert alt)
-    (let ((image (ignore-errors
-                  (shr-rescale-image data))))
-      (when image
-       (put-image image point alt)))))
+  (if (display-graphic-p)
+      (let ((image (ignore-errors
+                     (shr-rescale-image data))))
+        (when image
+          (put-image image point alt)))
+    (save-excursion
+      (goto-char point)
+      (insert alt))))
 
 (defun shr-rescale-image (data)
   (if (or (not (fboundp 'imagemagick-types))