Merge from origin/emacs-25

[gnu-emacs] / lisp / gnus / mm-uu.el

diff --git a/lisp/gnus/mm-uu.el b/lisp/gnus/mm-uu.el
index 3d1515e84734a1562b1aad7ffa45cf3b69134f1a..049890e2e30a4a1b070be1acc9b5ff57e0cb5c91 100644 (file)
--- a/lisp/gnus/mm-uu.el
+++ b/lisp/gnus/mm-uu.el
@@ -1,6 +1,6 @@
 ;;; mm-uu.el --- Return uu stuff as mm handles
 
-;; Copyright (C) 1998-2015 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2016 Free Software Foundation, Inc.
 
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
 ;; Keywords: postscript uudecode binhex shar forward gnatsweb pgp
@@ -249,14 +249,7 @@ To disable dissecting shar codes, for instance, add
 (defsubst mm-uu-function-2 (entry)
   (nth 5 entry))
 
-;; In Emacs 22, we could use `min-colors' in the face definition.  But Emacs
-;; 21 and XEmacs don't support it.
-(defcustom mm-uu-hide-markers
-  (< 16 (or (and (fboundp 'defined-colors)
-                (length (defined-colors)))
-           (and (fboundp 'device-color-cells)
-                (device-color-cells))
-           0))
+(defcustom mm-uu-hide-markers (< 16 (length (defined-colors)))
   "If non-nil, hide verbatim markers.
 The value should be nil on displays where the face
 `mm-uu-extract' isn't distinguishable to the face `default'."
@@ -297,12 +290,8 @@ If PROPERTIES is non-nil, PROPERTIES are applied to the buffer,
 see `set-text-properties'.  If PROPERTIES equals t, this means to
 apply the face `mm-uu-extract'."
   (let ((obuf (current-buffer))
-        (multi (and (boundp 'enable-multibyte-characters)
-                    enable-multibyte-characters))
-       (coding-system
-         ;; Might not exist in non-MULE XEmacs
-         (when (boundp 'buffer-file-coding-system)
-           buffer-file-coding-system)))
+        (multi enable-multibyte-characters)
+       (coding-system buffer-file-coding-system))
     (with-current-buffer (generate-new-buffer " *mm-uu*")
       (if multi (mm-enable-multibyte) (mm-disable-multibyte))
       (setq buffer-file-coding-system coding-system)
@@ -322,13 +311,13 @@ apply the face `mm-uu-extract'."
   (interactive)
   (if symbol (set-default symbol value))
   (setq mm-uu-beginning-regexp nil)
-  (mapcar (lambda (entry)
-            (if (mm-uu-configure-p (mm-uu-type entry) 'disabled)
+  (mapcar (lambda (mm-uu-entry)
+            (if (mm-uu-configure-p (mm-uu-type mm-uu-entry) 'disabled)
                 nil
               (setq mm-uu-beginning-regexp
                     (concat mm-uu-beginning-regexp
                             (if mm-uu-beginning-regexp "\\|")
-                            (mm-uu-beginning-regexp entry)))))
+                            (mm-uu-beginning-regexp mm-uu-entry)))))
          mm-uu-type-alist))
 
 (mm-uu-configure)
@@ -336,7 +325,7 @@ apply the face `mm-uu-extract'."
 (defvar file-name)
 (defvar start-point)
 (defvar end-point)
-(defvar entry)
+(defvar mm-uu-entry)
 
 (defun mm-uu-uu-filename ()
   (if (looking-at ".+")
@@ -523,7 +512,7 @@ apply the face `mm-uu-extract'."
        (when (and mml2015-use (null (mml2015-clear-verify-function)))
          (mm-set-handle-multipart-parameter
           mm-security-handle 'gnus-details
-          (gnus-format-message
+          (format-message
            "Clear verification not supported by `%s'.\n" mml2015-use)))
        (mml2015-extract-cleartext-signature))
       (list (mm-make-handle buf mm-uu-text-plain-type)))))
@@ -587,11 +576,11 @@ apply the face `mm-uu-extract'."
                     (not (eq charset 'ascii)))
                ;; Assume that buffer's multibyteness is turned off.
                ;; See `mml2015-pgg-clear-decrypt'.
-               (insert (mm-decode-coding-string (prog1
-                                                    (buffer-string)
-                                                  (erase-buffer)
-                                                  (mm-enable-multibyte))
-                                                charset))
+               (insert (decode-coding-string (prog1
+                                                 (buffer-string)
+                                               (erase-buffer)
+                                               (mm-enable-multibyte))
+                                             charset))
              (mm-enable-multibyte))
            (list (mm-make-handle buf mm-uu-text-plain-type)))
        (list (mm-make-handle buf '("application/pgp-encrypted")))))))
@@ -612,10 +601,10 @@ apply the face `mm-uu-extract'."
 
 (defun mm-uu-gpg-key-skip-to-last ()
   (let ((point (point))
-       (end-regexp (mm-uu-end-regexp entry))
-       (beginning-regexp (mm-uu-beginning-regexp entry)))
+       (end-regexp (mm-uu-end-regexp mm-uu-entry))
+       (beginning-regexp (mm-uu-beginning-regexp mm-uu-entry)))
     (when (and end-regexp
-              (not (mm-uu-configure-p (mm-uu-type entry) 'disabled)))
+              (not (mm-uu-configure-p (mm-uu-type mm-uu-entry) 'disabled)))
       (while (re-search-forward end-regexp nil t)
        (skip-chars-forward " \t\n\r")
        (if (looking-at beginning-regexp)