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 c39e698..ed63669 100644 (file)
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -38,6 +38,14 @@
   (autoload 'fill-flowed "flow-fill")
   (autoload 'html2text "html2text"))
 
+(defvar gnus-article-mime-handles)
+(defvar gnus-newsgroup-charset)
+(defvar smime-keys)
+(defvar w3m-cid-retrieve-function-alist)
+(defvar w3m-current-buffer)
+(defvar w3m-display-inline-images)
+(defvar w3m-minor-mode-map)
+
 (defvar mm-text-html-renderer-alist
   '((w3  . mm-inline-text-html-render-with-w3)
     (w3m . mm-inline-text-html-render-with-w3m)
@@ -490,14 +498,16 @@
                    (t
                     text)))
       (require 'font-lock)
-      ;; Inhibit font-lock this time (*-mode-hook might run
-      ;; `turn-on-font-lock') so that jit-lock may not turn off
-      ;; font-lock immediately after this.
-      (let ((font-lock-mode t))
-       (funcall mode))
-      (let ((font-lock-verbose nil))
-       ;; I find font-lock a bit too verbose.
-       (font-lock-fontify-buffer))
+      (let ((font-lock-maximum-size nil)
+           ;; Disable support modes, e.g., jit-lock, lazy-lock, etc.
+           (font-lock-mode-hook nil)
+           (font-lock-support-mode nil)
+           ;; I find font-lock a bit too verbose.
+           (font-lock-verbose nil))
+       (funcall mode)
+       ;; The mode function might have already turned on font-lock.
+       (unless (symbol-value 'font-lock-mode)
+         (font-lock-fontify-buffer)))
       ;; By default, XEmacs font-lock uses non-duplicable text
       ;; properties.  This code forces all the text properties
       ;; to be copied along with the text.
@@ -587,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)