[Emacs-diffs] Changes to emacs/lisp/gnus/gnus-art.el,v

[Miles Bader]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     07/12/16 04:31:33

Index: lisp/gnus/gnus-art.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/gnus/gnus-art.el,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -b -r1.145 -r1.146
--- lisp/gnus/gnus-art.el       9 Dec 2007 02:04:18 -0000       1.145
+++ lisp/gnus/gnus-art.el       16 Dec 2007 04:31:30 -0000      1.146
@@ -2782,7 +2782,7 @@
             (or how
                 (setq how gnus-article-browse-delete-temp)))
     (when (and (eq how 'ask)
-              (y-or-n-p (format
+              (gnus-y-or-n-p (format
                          "Delete all %s temporary HTML file(s)? "
                          (length gnus-article-browse-html-temp-list)))
               (setq how t)))
@@ -2802,61 +2802,63 @@
   "View all \"text/html\" parts from LIST.
 Recurse into multiparts."
   ;; Internal function used by `gnus-article-browse-html-article'.
-  (let ((showed))
+  (let (type file charset tmp-file showed)
     ;; Find and show the html-parts.
     (dolist (handle list)
       ;; If HTML, show it:
-      (when (listp handle)
-       (cond ((and (bufferp (car handle))
-                   (string-match "text/html" (car (mm-handle-type handle))))
-              (let ((tmp-file (mm-make-temp-file
+      (cond ((not (listp handle)))
+           ((or (equal (car (setq type (mm-handle-type handle))) "text/html")
+                (and (equal (car type) "message/external-body")
+                     (setq file (or (mail-content-type-get type 'name)
+                                    (mail-content-type-get
+                                     (mm-handle-disposition handle)
+                                     'filename)))
+                     (or (mm-handle-cache handle)
+                         (condition-case code
+                             (progn (mm-extern-cache-contents handle) t)
+                           (error
+                            (gnus-message 3 "%s" (error-message-string code))
+                            (when (>= gnus-verbose 3) (sit-for 2))
+                            nil)))
+                     (progn
+                       (setq handle (mm-handle-cache handle)
+                             type (mm-handle-type handle))
+                       (equal (car type) "text/html"))))
+            (when (or (setq charset (mail-content-type-get type 'charset))
+                      (not file))
+              (setq tmp-file (mm-make-temp-file
                                ;; Do we need to care for 8.3 filenames?
-                               "mm-" nil ".html"))
-                    (charset (mail-content-type-get (mm-handle-type handle)
-                                                    'charset)))
+                              "mm-" nil ".html")))
                 (if charset
                     ;; Add a meta html tag to specify charset.
                     (mm-with-unibyte-buffer
-                      (insert (with-current-buffer (mm-handle-buffer handle)
-                                (if (eq charset 'gnus-decoded)
-                                    (mm-encode-coding-string
-                                     (buffer-string)
+                  (insert (if (eq charset 'gnus-decoded)
+                              (mm-encode-coding-string (mm-get-part handle)
                                      (setq charset 'utf-8))
-                                  (buffer-string))))
-                      (setq charset (format "\
-<meta http-equiv=\"Content-Type\" content=\"text/html; charset=%s\">"
-                                            charset))
-                      (goto-char (point-min))
-                      (let ((case-fold-search t))
-                        (cond (;; Don't modify existing meta tag.
-                               (re-search-forward "\
-<meta[\t\n\r ]+http-equiv=\"content-type\"[^>]+>"
-                                                  nil t))
-                              ((re-search-forward "<head>[\t\n\r ]*" nil t)
-                               (insert charset "\n"))
-                              (t
-                               (re-search-forward "\
-<html\\(?:[\t\n\r ]+[^>]+\\|[\t\n\r ]*\\)>[\t\n\r ]*"
-                                                  nil t)
-                               (insert "<head>\n" charset "\n</head>\n"))))
+                            (mm-get-part handle)))
+                  (if (or (mm-add-meta-html-tag handle charset)
+                          (not file))
                       (mm-write-region (point-min) (point-max)
-                                       tmp-file nil nil nil 'binary t))
-                  (mm-save-part-to-file handle tmp-file))
-                (add-to-list 'gnus-article-browse-html-temp-list tmp-file)
+                                       tmp-file nil nil nil 'binary t)
+                    (setq tmp-file nil)))
+              (when tmp-file
+                (mm-save-part-to-file handle tmp-file)))
+            (when tmp-file
+              (add-to-list 'gnus-article-browse-html-temp-list tmp-file))
                 (add-hook 'gnus-summary-prepare-exit-hook
                           'gnus-article-browse-delete-temp-files)
                 (add-hook 'gnus-exit-gnus-hook
                           (lambda  ()
                             (gnus-article-browse-delete-temp-files t)))
                 ;; FIXME: Warn if there's an <img> tag?
-                (browse-url-of-file tmp-file)
-                (setq showed t)))
+            (browse-url-of-file (or tmp-file (expand-file-name file)))
+            (setq showed t))
              ;; If multipart, recurse
              ((and (stringp (car handle))
                    (string-match "^multipart/" (car handle))
                    (setq showed
                          (or showed
-                             (gnus-article-browse-html-parts handle))))))))
+                           (gnus-article-browse-html-parts handle)))))))
     showed))
 
 ;; FIXME: Documentation in texi/gnus.texi missing.
@@ -3916,6 +3918,7 @@
 
 (defun article-verify-x-pgp-sig ()
   "Verify X-PGP-Sig."
+  ;; <ftp://ftp.isc.org/pub/pgpcontrol/FORMAT>
   (interactive)
   (if (gnus-buffer-live-p gnus-original-article-buffer)
       (let ((sig (with-current-buffer gnus-original-article-buffer
@@ -4724,8 +4727,9 @@
           (handles gnus-article-mime-handles)
           (none "(none)")
           (description
-           (mail-decode-encoded-word-string (or (mm-handle-description data)
-                                                none)))
+           (let ((desc (mm-handle-description data)))
+             (when desc
+               (mail-decode-encoded-word-string desc))))
           (filename
            (or (mail-content-type-get (mm-handle-disposition data) 'filename)
                none))
@@ -4743,7 +4747,8 @@
            "| Type:           " type "\n"
            "| Filename:       " filename "\n"
            "| Size (encoded): " bsize " Byte\n"
-           "| Description:    " description "\n"
+           (when description
+             (concat    "| Description:    " description "\n"))
            "`----\n"))
          (setcdr data
                  (cdr (mm-make-handle
@@ -8003,6 +8008,11 @@
                         gnus-article-encrypt-protocol-alist
                         nil t))
     current-prefix-arg))
+  ;; User might hit `K E' instead of `K e', so prompt once.
+  (when (and gnus-article-encrypt-protocol
+            gnus-novice-user)
+    (unless (gnus-y-or-n-p "Really encrypt article(s)? ")
+      (error "Encrypt aborted.")))
   (let ((func (cdr (assoc protocol gnus-article-encrypt-protocol-alist))))
     (unless func
       (error "Can't find the encrypt protocol %s" protocol))