mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-07 16:10:46 -08:00
Code Issues Projects Releases Wiki Activity

shr.el (shr-put-image): Use point even if only inserting text; save-excursion on alt text.

Browse source
This commit is contained in:
Julien Danjou 2010-10-28 12:45:51 +00:00 • committed by Katsumi Yamaoka
parent cfe94935c8
commit 4abff9048d
2 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lisp/gnus/ChangeLog
View file

@ -1,5 +1,9 @@
2010-10-28 Julien Danjou <julien@danjou.info>
* 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 <yamaoka@jpl.org>

14
lisp/gnus/shr.el
View file

@ -373,12 +373,14 @@ redirects somewhere else."
(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))