(gnus-article-decode-hook): Add IDNA.

[gnus] / lisp / mm-view.el

diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index bde6db2..c170f18 100644 (file)
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -73,19 +73,19 @@
 (defun mm-inline-image-emacs (handle)
   (let ((b (point-marker))
        buffer-read-only)
-    (insert "\n")
     (put-image (mm-get-image handle) b)
+    (insert "\n\n")
     (mm-handle-set-undisplayer
      handle
      `(lambda ()
        (let ((b ,b)
              buffer-read-only)
-         (remove-images b (1+ b))
-         (delete-region b (1+ b)))))))
+         (remove-images b b)
+         (delete-region b (+ b 2)))))))
 
 (defun mm-inline-image-xemacs (handle)
-  (insert "\n")
-  (forward-char -1)
+  (insert "\n\n")
+  (forward-char -2)
   (let ((annot (make-annotation (mm-get-image handle) nil 'text))
        buffer-read-only)
     (mm-handle-set-undisplayer
@@ -94,7 +94,7 @@
        (let ((b ,(point-marker))
              buffer-read-only)
          (delete-annotation ,annot)
-         (delete-region (1- b) b))))
+         (delete-region (- b 2) b))))
     (set-extent-property annot 'mm t)
     (set-extent-property annot 'duplicable t)))
 
@@ -194,7 +194,8 @@
     (unless (assq 'gnus-article-mode w3m-cid-retrieve-function-alist)
       (push (cons 'gnus-article-mode 'mm-w3m-cid-retrieve)
            w3m-cid-retrieve-function-alist))
-    (setq mm-w3m-setup t)))
+    (setq mm-w3m-setup t))
+  (setq w3m-display-inline-images mm-inline-text-html-with-images))
 
 (defun mm-w3m-cid-retrieve (url &rest args)
   "Insert a content pointed by URL if it has the cid: scheme."
@@ -248,7 +249,6 @@ map.")))
          (delete-region (point-min) (point-max))
          (insert (mm-decode-string text charset)))
        (let ((w3m-safe-url-regexp mm-w3m-safe-url-regexp)
-             (w3m-display-inline-images mm-inline-text-html-with-images)
              w3m-force-redisplay)
          (w3m-region (point-min) (point-max)))
        (when mm-inline-text-html-with-w3m-keymap