(uudecode): Require.

(uudecode-decode-region, uudecode-decode-region-external): Don't
autoload.
(mm-uu-copy-to-buffer): Doc fix.
(mm-uu-decode-function, mm-uu-binhex-decode-function): Doc, custom
type fix.

diff --git a/lisp/gnus/mm-uu.el b/lisp/gnus/mm-uu.el
index 17ca752ceb6a0df36091e5418cc80934bb232b5b..beae8409135499f4bb675b01c0f8c0ada13af5b7 100644 (file)
--- a/lisp/gnus/mm-uu.el
+++ b/lisp/gnus/mm-uu.el
@@ -31,15 +31,15 @@
 (require 'nnheader)
 (require 'mm-decode)
 (require 'mailcap)
+(require 'uudecode)
 
 (eval-and-compile
   (autoload 'binhex-decode-region "binhex")
-  (autoload 'binhex-decode-region-external "binhex")
-  (autoload 'uudecode-decode-region "uudecode")
-  (autoload 'uudecode-decode-region-external "uudecode"))
+  (autoload 'binhex-decode-region-external "binhex"))
 
 (defun mm-uu-copy-to-buffer (from to)
-  "Copy the contents of the current buffer to a fresh buffer."
+  "Copy the contents of the current buffer to a fresh buffer.
+Return that buffer."
   (save-excursion
     (let ((obuf (current-buffer)))
       (set-buffer (generate-new-buffer " *mm-uu*"))
@@ -54,13 +54,18 @@
 (defconst mm-uu-uu-begin-line "^begin[ \t]+[0-7][0-7][0-7][ \t]+")
 (defconst mm-uu-uu-end-line "^end[ \t]*$")
 
+;; This is not the right place for this.  uudecode.el should decide
+;; whether or not to use a program with a single interface, but I
+;; guess it's too late now.  Also the default should depend on a test
+;; for the program.  -- fx
 (defcustom mm-uu-decode-function 'uudecode-decode-region
   "*Function to uudecode.
-Internal function is done in elisp by default, therefore decoding may
-appear to be horribly slow.  You can make Gnus use the external Unix
+Internal function is done in Lisp by default, therefore decoding may
+appear to be horribly slow.  You can make Gnus use an external
 decoder, such as uudecode."
-  :type '(choice (const :tag "internal" uudecode-decode-region)
-                (const :tag "external" uudecode-decode-region-external))
+  :type '(choice
+         (function-item :tag "Internal" uudecode-decode-region)
+         (function-item :tag "External" uudecode-decode-region-external))
   :group 'gnus-article-mime)
 
 (defconst mm-uu-binhex-begin-line
@@ -69,11 +74,12 @@ decoder, such as uudecode."
 
 (defcustom mm-uu-binhex-decode-function 'binhex-decode-region
   "*Function to binhex decode.
-Internal function is done in elisp by default, therefore decoding may
-appear to be horribly slow.  You can make Gnus use the external Unix
+Internal function is done in Lisp by default, therefore decoding may
+appear to be horribly slow.  You can make Gnus use an external
 decoder, such as hexbin."
-  :type '(choice (const :tag "internal" binhex-decode-region)
-                (const :tag "external" binhex-decode-region-external))
+  :type '(choice
+         (function-item :tag "Internal" binhex-decode-region)
+         (function-item :tag "External" binhex-decode-region-external))
   :group 'gnus-article-mime)
 
 (defconst mm-uu-shar-begin-line "^#! */bin/sh")