Revision: miles@gnu.org--gnu-2005/gnus--devo--0--patch-214

[gnus] / lisp / mm-view.el

diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index d6a4465..ed63669 100644 (file)
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -244,9 +244,7 @@
            (delete-region (point-min) (point-max))
            (insert (mm-decode-string text charset))))
        (let ((w3m-safe-url-regexp mm-w3m-safe-url-regexp)
-             w3m-force-redisplay
-             ;; Avoid inserting excessive newlines.
-             w3m-treat-image-size)
+             w3m-force-redisplay)
          (w3m-region (point-min) (point-max) nil charset))
        (when (and mm-inline-text-html-with-w3m-keymap
                   (boundp 'w3m-minor-mode-map)
@@ -599,9 +597,9 @@
        (cadar smime-keys)
      (smime-get-key-by-email
       (completing-read
-       (concat "Decipher using which key? "
-              (if smime-keys (concat "(default " (caar smime-keys) ") ")
-                ""))
+       (concat "Decipher using key"
+              (if smime-keys (concat "(default " (caar smime-keys) "): ")
+                ": "))
        smime-keys nil nil nil nil (car-safe (car-safe smime-keys))))))
   (goto-char (point-min))
   (while (search-forward "\r\n" nil t)