Mercurial > emacs
changeset 111218:b6601148b588
shr.el (shr-put-image): Use point even if only inserting text; save-excursion on alt text.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Thu, 28 Oct 2010 12:45:51 +0000 |
| parents | 7be484934a7c |
| children | 88ac54c22b2b |
| files | lisp/gnus/ChangeLog lisp/gnus/shr.el |
| diffstat | 2 files changed, 12 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Thu Oct 28 10:41:27 2010 +0000 +++ b/lisp/gnus/ChangeLog Thu Oct 28 12:45:51 2010 +0000 @@ -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>
--- a/lisp/gnus/shr.el Thu Oct 28 10:41:27 2010 +0000 +++ b/lisp/gnus/shr.el Thu Oct 28 12:45:51 2010 +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))