* gnus-art.el (gnus-use-idna): Don't directly refer to the value of

[gnus] / lisp / mm-uu.el

diff --git a/lisp/mm-uu.el b/lisp/mm-uu.el
index e92d75a..bc182be 100644 (file)
--- a/lisp/mm-uu.el
+++ b/lisp/mm-uu.el
@@ -236,7 +236,7 @@ To disable dissecting shar codes, for instance, add
 ;; 21 and XEmacs don't support it.
 (defcustom mm-uu-hide-markers
   (< 16 (or (and (fboundp 'defined-colors)
-                (length (defined-colors)))
+                (length (eval '(defined-colors))))
            (and (fboundp 'device-color-cells)
                 (device-color-cells))
            0))
@@ -272,7 +272,7 @@ 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))
-        (coding-system
+       (coding-system
          ;; Might not exist in non-MULE XEmacs
          (when (boundp 'buffer-file-coding-system)
            buffer-file-coding-system)))
@@ -430,7 +430,12 @@ apply the face `mm-uu-extract'."
                            (cons 'filename file-name)))))
 
 (defun mm-uu-yenc-extract ()
-  (mm-make-handle (mm-uu-copy-to-buffer start-point end-point)
+  ;; This might not be exactly correct, but we sure can't get the
+  ;; binary data from the article buffer, since that's already in a
+  ;; non-binary charset.  So get it from the original article buffer. 
+  (mm-make-handle (save-excursion
+                   (set-buffer gnus-original-article-buffer)
+                   (mm-uu-copy-to-buffer start-point end-point))
                  (list (or (and file-name
                                 (string-match "\\.[^\\.]+$" file-name)
                                 (mailcap-extension-to-mime
@@ -483,9 +488,7 @@ apply the face `mm-uu-extract'."
          (mm-set-handle-multipart-parameter
           mm-security-handle 'gnus-details
           (format "Clear verification not supported by `%s'.\n" mml2015-use)))
-       (goto-char (point-min))
-       (forward-line 1)
-       (delete-region (point-min) (point)))
+       (mml2015-extract-cleartext-signature))
       (list (mm-make-handle buf mm-uu-text-plain-type)))))
 
 (defun mm-uu-pgp-signed-extract ()