Commit 4abff904 authored by Julien Danjou's avatar Julien Danjou Committed by Katsumi Yamaoka
Browse files

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

parent cfe94935
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>
......
......@@ -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))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment