From f4aa8304bd0581f57f1ecb2fa641bf24e2c60509 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Thu, 28 Oct 2010 14:04:42 +0200 Subject: [PATCH] shr: fix alt insertion Signed-off-by: Julien Danjou --- lisp/ChangeLog | 2 ++ lisp/shr.el | 13 +++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 10ca6ce13..486999cd5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2010-10-28 Julien Danjou + * shr.el (shr-put-image): Use point even if only inserting text. + * nnir.el (nnir-run-swish-e): Remove hyrex support. 2010-10-28 Katsumi Yamaoka diff --git a/lisp/shr.el b/lisp/shr.el index 852f6cc82..403c57bb7 100644 --- a/lisp/shr.el +++ b/lisp/shr.el @@ -373,12 +373,13 @@ 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))) + (goto-char point) + (insert alt))) (defun shr-rescale-image (data) (if (or (not (fboundp 'imagemagick-types)) -- 2.25.1