Oops! I've misunderstood. The last change was removed.

[gnus] / lisp / gnus-uu.el

diff --git a/lisp/gnus-uu.el b/lisp/gnus-uu.el
index 41b7d4d..fce5aa7 100644 (file)
--- a/lisp/gnus-uu.el
+++ b/lisp/gnus-uu.el
@@ -1,11 +1,9 @@
-;;; gnus-uu.el --- extract, view or save (uu)encoded files from gnus
+;;; gnus-uu.el --- extract (uu)encoded files in Gnus
+;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 2000,
+;;        2001, 2002 Free Software Foundation, Inc.

 
 

-;; Copyright (C) 1985, 1986, 1987, 1993, 1994 Free Software Foundation, Inc.
-
-;; Author: Lars Ingebrigtsen <larsi@ifi.uio.no>
+;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>

 ;; Created: 2 Oct 1993
 ;; Created: 2 Oct 1993

-;; Version: v2.9.4
-;; Last Modified: 1994/10/03

 ;; Keyword: news
 
 ;; This file is part of GNU Emacs.
 ;; Keyword: news
 
 ;; This file is part of GNU Emacs.


@@ -21,757 +19,312 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License

-;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.

 
 ;;; Commentary:
 
 
 ;;; Commentary:
 

-;; All gnus-uu commands start with `C-c C-v'.
-;;
-;; Short user manual for this package:
-;;
-;; Type `C-c C-v C-v' to decode and view all articles of the current
-;; series. The defaults should be reasonable for most systems.
-;;
-;; Type `C-c C-v C-i' to toggle interactive mode. When using
-;; interactive mode, gnus-uu will which display a buffer that will let
-;; you see the suggested commands to be executed.
-;;
-;; To post an uuencoded file, type `C-c C-v p', which will enter you
-;; into a buffer analogous to the one you will get when typing `a'. Do
-;; an `M-x describe-mode' in this buffer to get a description of what
-;; this buffer lets you do.
-;;
-;; Read the documentation of the `gnus-uu' dummy function for a more
-;; complete description of what this package does and how you can
-;; customize it to fit your needs.
-;; 
-;;
-;;
-;; History
-;;
-;; v1.0: First version released Oct 2 1992.
-;;
-;; v1.1: Changed `C-c C-r' to `C-c C-e' and `C-c C-p' to `C-c C-k'.
-;; Changed (setq gnus-exit-group-hook) to (add-hook).  Removed
-;; checking for "Re:" for finding parts.
-;;
-;; v2.2: Fixed handling of currupted archives. Changed uudecoding to
-;; an asynchronous process to avoid loading tons of data into emacs
-;; buffers. No longer reads articles emacs already have aboard.  Fixed
-;; a firmer support for shar files. Made regexp searches for files
-;; more convenient. Added `C-c C-l' for editing uucode begin
-;; lines. Added multi-system decoder entry point. Added interactive
-;; view mode. Added function for decoding and saving all uuencoded
-;; articles in the current newsgroup.
-;;
-;; v2.3: After suggestions I have changed all the gnus-uu key bindings
-;; to avoid hogging all the user keys (C-c LETTER). Also added
-;; (provide) and fixed some saving stuff. First posted version to
-;; gnu.emacs.sources.
-;;
-;; v2.4: Fixed some more in the save-all category. Automatic fixing of
-;; uucode "begin" lines: names on the form of "dir/file" are
-;; translated into "dir-file". Added a function for fixing stripped
-;; uucode articles. Added binhex save.
-;;
-;; v2.5: First version copyrighted by FSF. Changed lots of
-;; documentation strings.
-;;
-;; v2.5.1: Added uuencode/posting code to post binary files. 
-;;
-;; v2.6: Thread support. gnus-uu is now able to decode uuencoded files
-;; posted in threads. gnus-uu can also post in threads. I don't know
-;; if this ability is of much use - I've never seen anyone post
-;; uuencoded files in threads.
-;;
-;; v2.7: gnus-uu is now able to decode (and view/save) multiple
-;; encoded files in one big gulp. Also added pseudo-mime support
-;; (users can use metamail to view files), posting uuencoded/mime
-;; files and various other bits and pieces.
-;;
-;; v2.7.1: New functions for decoding/saving threads bound to `C-c
-;; C-v C-j'. Handy to save entire threads, not very useful for
-;; decoding, as nobody posts encoded files in threads...
-;;
-;; v2.7.2: New functions for digesting and forwarding articles added
-;; on the suggestion of Per Abrahamsen. Also added a function for
-;; marking threads. 
-;;
-;; v2.8: Fixed saving original files in interactive mode. Fixed ask
-;; before/save after view. Fixed setting up interactive buffers. Added
-;; scanning and rescanning from interactive mode. Added the
-;; `gnus-uu-ignore-file-by-name' and `...-by-type' variables to allow
-;; users to sift files they don't want to view. At the suggestion of
-;; boris@cs.rochester.edu, `C-c C-v C-h' has been undefined to allow
-;; users to view list of binding beginning with `C-c C-v'. Fixed
-;; viewing with `gnus-uu-asynchronous' set. The
-;; "decode-and-save/view-all-articles" functions now accepts the
-;; numeric prefix to delimit the maximum number of files to be
-;; decoded.
-;;
-;; v2.9: Speeded up fetching of articles by bypassing the gnus
-;; function and going directly to `gnus-request-article'
-;; instead. Significant speed increase, especially when using a local
-;; spool. Added the `gnus-uu-universal-prefix' command (`C-c C-v C-u')
-;; to allow users to perform any job on all marked articles.
-;;
-;; v2.9.1: Disabled buffer-undo, which stopped gnus-uu from making
-;; emacs *very* large in big newsgroups.
-;;
-;; v2.9.2: A few minor bug-fixes.
-;;
-;; v2.9.3: Finally managed to fix the bug that made gnus-uu core dump
-;; emacs in huge newsgroups. The error was a result of not deleting a
-;; process that had terminated with an error, which led to
-;; select() failing miserably later. Added the `C-c C-v M-C-w' and
-;; `C-c C-v M-w' keystrokes and the `...-marked-files' functions to
-;; allow users to walk around the newsgroup and mark some articles
-;; here and there, without having to worry about marking exactly
-;; right, and then decoding all files that had had some articles
-;; marked. 
-
-;;; Code: 
+;;; Code:

 
 

-(require 'gnus)
-
-;; Binding of keys to the gnus-uu functions.
-
-(defvar gnus-uu-ctl-map nil)
-(define-prefix-command 'gnus-uu-ctl-map)
-(define-key gnus-summary-mode-map "\C-c\C-v" gnus-uu-ctl-map)
-
-(define-key gnus-uu-ctl-map "\C-v" 'gnus-uu-decode-and-view)
-(define-key gnus-uu-ctl-map "v" 'gnus-uu-decode-and-save)
-(define-key gnus-uu-ctl-map "\C-s" 'gnus-uu-shar-and-view)
-(define-key gnus-uu-ctl-map "s" 'gnus-uu-shar-and-save)
-(define-key gnus-uu-ctl-map "\C-m" 'gnus-uu-multi-decode-and-view)
-(define-key gnus-uu-ctl-map "m" 'gnus-uu-multi-decode-and-save)
-
-(define-key gnus-uu-ctl-map "\C-b" 'gnus-uu-decode-and-show-in-buffer)
-
-(define-key gnus-uu-ctl-map "u" 'gnus-summary-unmark-all-processable)
-(define-key gnus-uu-ctl-map "\C-r" 'gnus-uu-mark-by-regexp)
-(define-key gnus-uu-ctl-map "r" 'gnus-uu-mark-region)
-(define-key gnus-uu-ctl-map "t" 'gnus-uu-mark-thread)
-
-(define-key gnus-uu-ctl-map "\C-u" 'gnus-uu-marked-universal-argument)
-
-(define-key gnus-uu-ctl-map "\M-\C-v" 'gnus-uu-marked-decode-and-view)
-(define-key gnus-uu-ctl-map "\M-v" 'gnus-uu-marked-decode-and-save)
-(define-key gnus-uu-ctl-map "\M-\C-s" 'gnus-uu-marked-shar-and-view)
-(define-key gnus-uu-ctl-map "\M-s" 'gnus-uu-marked-shar-and-save)
-(define-key gnus-uu-ctl-map "\M-\C-m" 'gnus-uu-marked-multi-decode-and-view)
-(define-key gnus-uu-ctl-map "\M-m" 'gnus-uu-marked-multi-decode-and-save)
-
-(define-key gnus-uu-ctl-map "f" 'gnus-uu-digest-and-forward)
-(define-key gnus-uu-ctl-map "\M-f" 'gnus-uu-marked-digest-and-forward)
-
-(define-key gnus-uu-ctl-map "\C-i" 'gnus-uu-toggle-interactive-view)
-(define-key gnus-uu-ctl-map "\C-t" 'gnus-uu-toggle-any-variable)
-
-(define-key gnus-uu-ctl-map "\C-l" 'gnus-uu-edit-begin-line)
-
-(define-key gnus-uu-ctl-map "a" 'gnus-uu-decode-and-save-all-unread-articles)
-(define-key gnus-uu-ctl-map "w" 'gnus-uu-decode-and-save-all-articles)
-(define-key gnus-uu-ctl-map "\C-a" 'gnus-uu-decode-and-view-all-unread-articles)
-(define-key gnus-uu-ctl-map "\C-w" 'gnus-uu-decode-and-view-all-articles)
-(define-key gnus-uu-ctl-map "\M-\C-w" 'gnus-uu-decode-and-view-all-marked-files)
-(define-key gnus-uu-ctl-map "\M-w" 'gnus-uu-decode-and-save-all-marked-files)
+(eval-when-compile (require 'cl))

 
 

-(define-key gnus-uu-ctl-map "\C-j" 'gnus-uu-threaded-multi-decode-and-view)
-(define-key gnus-uu-ctl-map "j" 'gnus-uu-threaded-multi-decode-and-save)
-
-(define-key gnus-uu-ctl-map "p" 'gnus-uu-post-news)
-
-;; Dummy function gnus-uu
-
-(defun gnus-uu ()
-  "gnus-uu is a package for uudecoding and viewing articles.
-
-
-Keymap overview:
-
-By default, all gnus-uu keystrokes begin with `C-c C-v'. 
-
-There four decoding commands categories:
-All commands for viewing are `C-c C-v C-LETTER'.
-All commands for saving are `C-c C-v LETTER'.
-All commands for marked viewing are `C-c C-v C-M-LETTER'.
-All commands for marked saving are `C-c C-v M-LETTER'.
-
-\\<gnus-summary-mode-map>\\[gnus-uu-decode-and-view]\tDecode and view articles
-\\[gnus-uu-decode-and-save]\tDecode and save articles
-\\[gnus-uu-shar-and-view]\tUnshar and view articles
-\\[gnus-uu-shar-and-save]\tUnshar and save articles
-\\[gnus-uu-multi-decode-and-view]\tChoose a decoding method, decode and view articles
-\\[gnus-uu-multi-decode-and-save]\tChoose a decoding method, decode and save articles
-
-\\[gnus-uu-threaded-multi-decode-and-view]\tDecode a thread and view
-\\[gnus-uu-threaded-multi-decode-and-save]\tDecode a thread and save
-
-\\[gnus-uu-decode-and-show-in-buffer]\tDecode the current article and view the result in a buffer
-\\[gnus-uu-edit-begin-line]\tEdit the 'begin' line of an uuencoded article
-
-\\[gnus-uu-decode-and-save-all-unread-articles]\tDecode and save all unread articles
-\\[gnus-uu-decode-and-save-all-articles]\tDecode and save all articles
-\\[gnus-uu-decode-and-view-all-unread-articles]\tDecode and view all unread articles
-\\[gnus-uu-decode-and-view-all-articles]\tDecode and view all articles
-\\[gnus-uu-decode-and-view-all-marked-files]\tDecode and view all files that have had some articles marked
-\\[gnus-uu-decode-and-save-all-marked-files]\tDecode and save all files that have had some articles marked
-
-\\[gnus-uu-digest-and-forward]\tDigest and forward a series of articles
-\\[gnus-uu-marked-digest-and-forward]\tDigest and forward all marked articles
-
-\\[gnus-uu-mark-by-regexp]\tMark articles for decoding by regexp
-\\[gnus-uu-mark-thread]\tMark articles in this thread
-\\[gnus-uu-mark-region]\tMark articles all articles between point and mark
-\\[gnus-uu-marked-decode-and-view]\tDecode and view marked articles
-\\[gnus-uu-marked-decode-and-save]\tDecode and save marked articles
-\\[gnus-uu-marked-shar-and-view]\tUnshar and view marked articles
-\\[gnus-uu-marked-shar-and-save]\tUnshar and save marked articles
-\\[gnus-uu-marked-multi-decode-and-view]\tChoose decoding method, decode and view marked articles
-\\[gnus-uu-marked-multi-decode-and-save]\tChoose decoding method, decode and save marked articles
-
-\\[gnus-uu-marked-universal-argument]\tPerform any opration on all marked articles
-
-\\[gnus-uu-toggle-asynchronous]\tToggle asynchronous viewing mode
-\\[gnus-uu-toggle-query]\tToggle whether to ask before viewing a file
-\\[gnus-uu-toggle-always-ask]\tToggle whether to ask to save a file after viewing
-\\[gnus-uu-toggle-kill-carriage-return]\tToggle whether to strip trailing carriage returns
-\\[gnus-uu-toggle-interactive-view]\tToggle whether to use interactive viewing mode
-\\[gnus-uu-toggle-correct-stripped-articles]\tToggle whether to 'correct' articles
-\\[gnus-uu-toggle-view-with-metamail]\tToggle whether to use metamail for viewing 
-\\[gnus-uu-toggle-any-variable]\tToggle any of the things above
-
-\\[gnus-uu-post-news]\tPost an uuencoded article
-
-Function description:
-
-`gnus-uu-decode-and-view' will try to find all articles in the same
-series, uudecode them and view the resulting file(s).
-
-gnus-uu guesses what articles are in the series according to the
-following simplish rule: The subjects must be (nearly) identical,
-except for the last two numbers of the line. (Spaces are largely
-ignored, however.)
-
-For example: If you choose a subject called 
-  \"cat.gif (2/3)\"
-gnus-uu will find all the articles that matches
-  \"^cat.gif ([0-9]+/[0-9]+).*$\".  
-
-Subjects that are nonstandard, like 
-  \"cat.gif (2/3) Part 6 of a series\", 
-will not be properly recognized by any of the automatic viewing
-commands, and you have to mark the articles manually with '#'.
-
-`gnus-uu-decode-and-save' will do the same as
-`gnus-uu-decode-and-view', except that it will not display the
-resulting file, but save it instead.
-
-`gnus-uu-shar-and-view' and `gnus-uu-shar-and-save' are the \"shar\"
-equivalents to the uudecode functions. Instead of feeding the articles
-to uudecode, they are run through /bin/sh. Most shar files can be
-viewed and/or saved with the normal uudecode commands, which is much
-safer, as no foreign code is run.
-
-Instead of having windows popping up automatically, it can be handy to
-view files interactivly, especially when viewing archives. Use
-`gnus-uu-toggle-interactive-mode' to toggle interactive mode.
-
-`gnus-uu-mark-article' marks an article for later
-decoding/unsharing/saving/viewing. The files will be decoded in the
-sequence they were marked. To decode the files after you've marked the
-articles you are interested in, type the corresponding key strokes as
-the normal decoding commands, but put a `M-' in the last
-keystroke. For instance, to perform a standard uudecode and view, you
-would type `C-c C-v C-v'. To perform a marked uudecode and view, say
-`C-v C-v M-C-v'. All the other view and save commands are handled the
-same way; marked uudecode and save is then `C-c C-v M-v'.
-
-`gnus-uu-unmark-article' will remove the mark from a previosly marked
-article.
-
-`gnus-uu-unmark-all-articles' will remove the mark from all marked
-articles.
-
-`gnus-uu-mark-by-regexp' will prompt for a regular expression and mark
-all articles matching that regular expression.
-
-`gnus-uu-mark-thread' will mark all articles downward in the current
-thread.
-
-`gnus-uu-marked-universal-argument' will perform any operation on all
-marked articles. 
-
-There's an additional way to reach the decoding functions to make
-future expansions easier: `gnus-uu-multi-decode-and-view' and the
-corresponding save, marked view and marked save functions. You will be
-prompted for a decoding method, like uudecode, shar, binhex or plain
-save. Note that methods like binhex and save doesn't have view modes;
-even if you issue a view command (`C-c C-v C-m' and \"binhex\"),
-gnus-uu will just save the resulting binhex file.
-
-`gnus-uu-decode-and-show-in-buffer' will decode the current article
-and display the results in an emacs buffer. This might be useful if
-there's jsut some text in the current article that has been uuencoded
-by some perverse poster.
-
-`gnus-uu-decode-and-save-all-articles' looks at all the articles in
-the current newsgroup and tries to uudecode everything it can
-find. The user will be prompted for a directory where the resulting
-files (if any) will be
-saved. `gnus-uu-decode-and-save-unread-articles' does only checks
-unread articles. 
-
-`gnus-uu-decode-and-view-all-articles' does the same as the function
-above, only viewing files instead of saving them. 
-
-`gnus-uu-edit-begin-line' lets you edit the begin line of an uuencoded
-file in the current article. Useful to change a corrupted begin line.
-
-
-When using the view commands, `gnus-uu-decode-and-view' for instance,
-gnus-uu will (normally, see below) try to view the file according to
-the rules given in `gnus-uu-default-view-rules' and
-`gnus-uu-user-view-rules'. If it recognizes the file, it will display
-it immediately. If the file is some sort of archive, gnus-uu will
-attempt to unpack the archive and see if any of the files in the
-archive can be viewed. For instance, if you have a gzipped tar file
-\"pics.tar.gz\" containing the files \"pic1.jpg\" and \"pic2.gif\",
-gnus-uu will uncompress and detar the main file, and then view the two
-pictures. This unpacking process is recursive, so if the archive
-contains archives of archives, it'll all be unpacked.
-
-If the view command doesn't recognise the file type, or can't view it
-because you don't have the viewer, or can't view *any* of the files in
-the archive, the user will be asked if she wishes to have the file
-saved somewhere. Note that if the decoded file is an archive, and
-gnus-uu manages to view some of the files in the archive, it won't
-tell the user that there were some files that were unviewable. Try
-interactive view for a different approach.
-
-
-Note that gnus-uu adds a function to `gnus-exit-group-hook' to clear
-the list of marked articles and check for any generated files that
-might have escaped deletion if the user typed `C-g' during viewing.
-
-
-`gnus-uu-toggle-asynchronous' toggles the `gnus-uu-asynchronous'
-variable.
-
-`gnus-uu-toggle-query' toggles the `gnus-uu-ask-before-view'
-variable.
-
-`gnus-uu-toggle-always-ask' toggles the `gnus-uu-view-and-save'
-variable.
-
-`gnus-uu-toggle-kill-carriage-return' toggles the
-`gnus-uu-kill-carriage-return' variable.
-
-`gnus-uu-toggle-interactive-view' toggles interactive mode. If it is
-turned on, gnus-uu won't view files immediately, but will give you a
-buffer with the default commands and files and let you edit the
-commands and execute them at leisure.
-
-`gnus-uu-toggle-correct-stripped-articles' toggles whether to check
-and correct uuencoded articles that may have had trailing spaces
-stripped by mailers.
-
-`gnus-uu-toggle-view-with-metamail' toggles whether to skip the
-gnus-uu viewing methods and just guess at an content-type based on the
-file name suffix and feed it to metamail.
-
-`gnus-uu-toggle-any-variable' is an interface to the toggle commands
-listed above.
+(require 'gnus)
+(require 'gnus-art)
+(require 'message)
+(require 'gnus-msg)
+(require 'mm-decode)

 
 

+(defgroup gnus-extract nil
+  "Extracting encoded files."
+  :prefix "gnus-uu-"
+  :group 'gnus)

 
 

-Customization
+(defgroup gnus-extract-view nil
+  "Viewwing extracted files."
+  :group 'gnus-extract)

 
 

-   Rule Variables
+(defgroup gnus-extract-archive nil
+  "Extracting encoded archives."
+  :group 'gnus-extract)

 
 

-   gnus-uu uses \"rule\" variables to decide how to view a file. All
-   these variables are of the form
-  
-      (list '(regexp1 command2)
-            '(regexp2 command2)
-            ...)
-
-   `gnus-uu-user-view-rules'
-     This variable is consulted first when viewing files. If you wish
-     to use, for instance, sox to convert an .au sound file, you could
-     say something like:
-
-       (setq gnus-uu-user-view-rules
-         (list '(\"\\\\.au$\" \"sox %s -t .aiff > /dev/audio\")))
-
-   `gnus-uu-user-view-rules-end'
-     This variable is consulted if gnus-uu couldn't make any matches
-     from the user and default view rules.
-
-   `gnus-uu-user-interactive-view-rules'
-     This is the variable used instead of `gnus-uu-user-view-rules'
-     when in interactive mode.
-
-   `gnus-uu-user-interactive-view-rules-end'
-     This variable is used instead of `gnus-uu-user-view-rules-end'
-     when in interactive mode.
-
-   `gnus-uu-user-archive-rules`
-     This variable can be used to say what comamnds should be used to
-     unpack archives.
-
-   
-   Other Variables
-
-   `gnus-uu-ignore-files-by-name'
-     Files with name matching this regular expression won't be viewed.
-
-   `gnus-uu-ignore-files-by-type'
-     Files with a MIME type matching this variable won't be viewed.
-     Note that gnus-uu tries to guess what type the file is based on
-     the name. gnus-uu is not a MIME package, so this is slightly
-     kludgy.
-
-   `gnus-uu-tmp-dir'
-     Where gnus-uu does its work.
-
-   `gnus-uu-do-not-unpack-archives'
-     Non-nil means that gnus-uu won't peek inside archives looking for
-     files to dispay.
-
-   `gnus-uu-view-and-save'
-     Non-nil means that the user will always be asked to save a file
-     after viewing it.
-
-   `gnus-uu-asynchronous' 
-     Non-nil means that files will be viewed asynchronously.  This can
-     be useful if you're viewing long .mod files, for instance, which
-     often takes several minutes. Note, however, that since gnus-uu
-     doesn't ask, and if you are viewing an archive with lots of
-     viewable files, you'll get them all up more or less at once,
-     which can be confusing, to say the least. To get gnus-uu to ask
-     you before viewing a file, set the `gnus-uu-ask-before-view' 
-     variable.
-
-   `gnus-uu-ask-before-view'
-     Non-nil means that gnus-uu will ask you before viewing each file
-
-   `gnus-uu-ignore-default-view-rules'
-     Non-nil means that gnus-uu will ignore the default viewing rules.
-
-   `gnus-uu-ignore-default-archive-rules'
-     Non-nil means that gnus-uu will ignore the default archive
-     unpacking commands.
-
-   `gnus-uu-kill-carriage-return'
-     Non-nil means that gnus-uu will strip all carriage returns from
-     articles.
-
-   `gnus-uu-unmark-articles-not-decoded'
-     Non-nil means that gnus-uu will mark articles that were
-     unsuccessfully decoded as unread.
-
-   `gnus-uu-output-window-height'
-     This variable says how tall the output buffer window is to be
-     when using interactive view mode.
-
-   `gnus-uu-correct-stripped-uucode'
-     Non-nil means that gnus-uu will *try* to fix uuencoded files that
-     have had traling spaces deleted.
-
-   `gnus-uu-use-interactive-view'
-     Non-nil means that gnus-uu will use interactive viewing mode.
-
-   `gnus-uu-view-with-metamail'
-     Non-nil means that gnus-uu will ignore the viewing commands
-     defined by the rule variables and just fudge a MIME content type
-     based on the file name. The result will be fed to metamail for
-     viewing.
-
-   `gnus-uu-save-in-digest'
-     Non-nil means that gnus-uu, when asked to save without decoding,
-     will save in digests.  If this variable is nil, gnus-uu will just
-     save everything in a file without any embellishments. The
-     digesting almost conforms to RFC1153 - no easy way to specify any
-     meaningful volume and issue numbers were found, so I simply
-     dropped them.
-
-   `gnus-uu-post-include-before-composing'
-     Non-nil means that gnus-uu will ask for a file to encode before
-     you compose the article.  If this variable is t, you can either
-     include an encoded file with \\<gnus-uu-post-reply-mode-map>\\[gnus-uu-post-insert-binary-in-article] or have one included for you when you 
-     post the article.
-
-   `gnus-uu-post-length'
-     Maximum length of an article.  The encoded file will be split
-     into how many articles it takes to post the entire file.
-
-   `gnus-uu-post-threaded'
-     Non-nil means that gnus-uu will post the encoded file in a
-     thread.  This may not be smart, as no other decoder I have seen
-     are able to follow threads when collecting uuencoded
-     articles. (Well, I have seen one package that does that -
-     gnus-uu, but somehow, I don't think that counts...) Default is
-     nil.
-
-   `gnus-uu-post-separate-description'
-     Non-nil means that the description will be posted in a separate
-     article.  The first article will typically be numbered (0/x). If
-     this variable is nil, the description the user enters will be
-     included at the beginning of the first article, which will be
-     numbered (1/x). Default is t.
-"
-  (interactive)
-  )
+(defgroup gnus-extract-post nil
+  "Extracting encoded archives."
+  :prefix "gnus-uu-post"
+  :group 'gnus-extract)

 
 ;; Default viewing action rules
 
 
 ;; Default viewing action rules
 

-(defvar gnus-uu-default-view-rules 
-  (list 
-   '("\\.\\(jpe?g\\|gif\\|tiff?\\|p[pgb]m\\|xwd\\|xbm\\|pcx\\)$" "xv")
-   '("\\.tga$" "tgatoppm %s | xv -")
-   '("\\.te?xt$\\|\\.doc$\\|read.*me" "xterm -e less")
-   '("\\.\\(wav\\|aiff\\|hcom\\|u[blw]\\|s[bfw]\\|voc\\|smp\\)$" 
+(defcustom gnus-uu-default-view-rules
+  '(("\\.te?xt$\\|\\.doc$\\|read.*me\\|\\.c?$\\|\\.h$\\|\\.bat$\\|\\.asm$\\|makefile" "cat %s | sed 's/\r$//'")
+    ("\\.pas$" "cat %s | sed 's/\r$//'")
+    ("\\.[1-9]$" "groff -mandoc -Tascii %s | sed s/\b.//g")
+    ("\\.\\(jpe?g\\|gif\\|tiff?\\|p[pgb]m\\|xwd\\|xbm\\|pcx\\)$" "display")
+    ("\\.tga$" "tgatoppm %s | ee -")
+    ("\\.\\(wav\\|aiff\\|hcom\\|u[blw]\\|s[bfw]\\|voc\\|smp\\)$"

      "sox -v .5 %s -t .au -u - > /dev/audio")
      "sox -v .5 %s -t .au -u - > /dev/audio")

-   '("\\.au$" "cat %s > /dev/audio")
-   '("\\.mod$" "str32")
-   '("\\.ps$" "ghostview")
-   '("\\.dvi$" "xdvi")
-   '("\\.[1-6]$" "xterm -e groff -mandoc -Tascii")
-   '("\\.html$" "xmosaic")
-   '("\\.mpe?g$" "mpeg_play")
-   '("\\.\\(flc\\|fli\\|rle\\|iff\\|pfx\\|avi\\|sme\\|rpza\\|dl\\|qt\\|rsrc\\|mov\\)$" "xanim")
-   '("\\.\\(tar\\|arj\\|zip\\|zoo\\|arc\\|gz\\|Z\\|lzh\\|ar\\|lha\\)$" 
+    ("\\.au$" "cat %s > /dev/audio")
+    ("\\.midi?$" "playmidi -f")
+    ("\\.mod$" "str32")
+    ("\\.ps$" "ghostview")
+    ("\\.dvi$" "xdvi")
+    ("\\.html$" "xmosaic")
+    ("\\.mpe?g$" "mpeg_play")
+    ("\\.\\(flc\\|fli\\|rle\\|iff\\|pfx\\|avi\\|sme\\|rpza\\|dl\\|qt\\|rsrc\\|mov\\)$" "xanim")
+    ("\\.\\(tar\\|arj\\|zip\\|zoo\\|arc\\|gz\\|Z\\|lzh\\|ar\\|lha\\)$"

      "gnus-uu-archive"))
      "gnus-uu-archive"))

-
-  "Default actions to be taken when the user asks to view a file.  
+  "*Default actions to be taken when the user asks to view a file.

 To change the behaviour, you can either edit this variable or set
 `gnus-uu-user-view-rules' to something useful.
 
 For example:
 
 To make gnus-uu use 'xli' to display JPEG and GIF files, put the
 To change the behaviour, you can either edit this variable or set
 `gnus-uu-user-view-rules' to something useful.
 
 For example:
 
 To make gnus-uu use 'xli' to display JPEG and GIF files, put the

-following in your .emacs file
+following in your .emacs file:

 
 

-  (setq gnus-uu-user-view-rules (list '(\"jpg$\\\\|gif$\" \"xli\")))
+  (setq gnus-uu-user-view-rules '((\"jpg$\\\\|gif$\" \"xli\")))

 
 

-Both these variables are lists of lists with two string elements. The
-first string is a regular expression. If the file name matches this
+Both these variables are lists of lists with two string elements.  The
+first string is a regular expression.  If the file name matches this

 regular expression, the command in the second string is executed with
 the file as an argument.
 
 If the command string contains \"%s\", the file name will be inserted
 regular expression, the command in the second string is executed with
 the file as an argument.
 
 If the command string contains \"%s\", the file name will be inserted

-at that point in the command string. If there's no \"%s\" in the
+at that point in the command string.  If there's no \"%s\" in the

 command string, the file name will be appended to the command string
 before executing.
 
 There are several user variables to tailor the behaviour of gnus-uu to
 command string, the file name will be appended to the command string
 before executing.
 
 There are several user variables to tailor the behaviour of gnus-uu to

-your needs. First we have `gnus-uu-user-view-rules', which is the
+your needs.  First we have `gnus-uu-user-view-rules', which is the

 variable gnus-uu first consults when trying to decide how to view a
 variable gnus-uu first consults when trying to decide how to view a

-file. If this variable contains no matches, gnus-uu examines the
-default rule vaiable provided in this package. If gnus-uu finds no
+file.  If this variable contains no matches, gnus-uu examines the
+default rule variable provided in this package.  If gnus-uu finds no

 match here, it uses `gnus-uu-user-view-rules-end' to try to make a
 match here, it uses `gnus-uu-user-view-rules-end' to try to make a

-match.
-
-Unless, of course, you are using the interactive view mode. Then
-`gnus-uu-user-interactive-view-rules' and
-`gnus-uu-user-interactive-view-rules-end' will be used instead.")
-
-(defvar gnus-uu-user-view-rules nil 
-  "Variable detailing what actions are to be taken to view a file.
-See the documentation on the `gnus-uu-default-view-rules' variable for 
-details.")
-
-(defvar gnus-uu-user-view-rules-end nil
-  "Variable saying what actions are to be taken if no rule matched the file name.
-See the documentation on the `gnus-uu-default-view-rules' variable for 
-details.")
-
-(defvar gnus-uu-user-interactive-view-rules nil
-  "Variable detailing what actions are to be taken to view a file when using interactive mode.
-See the documentation on the `gnus-uu-default-view-rules' variable for 
-details.")
-
-(defvar gnus-uu-user-interactive-view-rules-end nil
-  "Variable saying what actions are to be taken if no rule matched the file name when using interactive mode.
-See the documentation on the `gnus-uu-default-view-rules' variable for 
-details.")
-
-(defvar gnus-uu-default-interactive-view-rules-begin
-  (list
-   '("\\.te?xt$\\|\\.doc$\\|read.*me\\|\\.c?$\\|\\.h$\\|\\.bat$\\|\\.asm$\\|makefile" "cat %s | sed s/\r//g")
-   '("\\.pas$" "cat %s | sed s/\r//g")
-   '("\\.[1-9]$" "groff -mandoc -Tascii %s | sed s/\b.//g")
-   ))
-
-(defvar gnus-uu-default-interactive-view-rules-end
-  (list
-   '(".*" "file")))
+match."
+  :group 'gnus-extract-view
+  :type '(repeat (group regexp (string :tag "Command"))))
+
+(defcustom gnus-uu-user-view-rules nil
+  "What actions are to be taken to view a file.
+See the documentation on the `gnus-uu-default-view-rules' variable for
+details."
+  :group 'gnus-extract-view
+  :type '(repeat (group regexp (string :tag "Command"))))
+
+(defcustom gnus-uu-user-view-rules-end
+  '(("" "file"))
+  "*What actions are to be taken if no rule matched the file name.
+See the documentation on the `gnus-uu-default-view-rules' variable for
+details."
+  :group 'gnus-extract-view
+  :type '(repeat (group regexp (string :tag "Command"))))

 
 ;; Default unpacking commands
 
 
 ;; Default unpacking commands
 

-(defvar gnus-uu-default-archive-rules 
-  (list '("\\.tar$" "tar xf")
-       '("\\.zip$" "unzip -o")
-       '("\\.ar$" "ar x")
-       '("\\.arj$" "unarj x")
-       '("\\.zoo$" "zoo -e")
-       '("\\.\\(lzh\\|lha\\)$" "lha x")
-       '("\\.Z$" "uncompress")
-       '("\\.gz$" "gunzip")
-       '("\\.arc$" "arc -x"))
-  )
-
-(defvar gnus-uu-destructive-archivers 
+(defcustom gnus-uu-default-archive-rules
+  '(("\\.tar$" "tar xf")
+    ("\\.zip$" "unzip -o")
+    ("\\.ar$" "ar x")
+    ("\\.arj$" "unarj x")
+    ("\\.zoo$" "zoo -e")
+    ("\\.\\(lzh\\|lha\\)$" "lha x")
+    ("\\.Z$" "uncompress")
+    ("\\.gz$" "gunzip")
+    ("\\.arc$" "arc -x"))
+  "*See `gnus-uu-user-archive-rules'."
+  :group 'gnus-extract-archive
+  :type '(repeat (group regexp (string :tag "Command"))))
+
+(defvar gnus-uu-destructive-archivers

   (list "uncompress" "gunzip"))
 
   (list "uncompress" "gunzip"))
 

-(defvar gnus-uu-user-archive-rules nil
+(defcustom gnus-uu-user-archive-rules nil

   "A list that can be set to override the default archive unpacking commands.
 To use, for instance, 'untar' to unpack tar files and 'zip -x' to
 unpack zip files, say the following:
   "A list that can be set to override the default archive unpacking commands.
 To use, for instance, 'untar' to unpack tar files and 'zip -x' to
 unpack zip files, say the following:

-  (setq gnus-uu-user-archive-rules 
-    (list '(\"\\\\.tar$\" \"untar\")
-          '(\"\\\\.zip$\" \"zip -x\")))")
-
-(defvar gnus-uu-ignore-files-by-name nil
-  "A regular expression saying what files should not be viewed based on name.
-If, for instance, you want gnus-uu to ignore all .au and .wav files, 
+  (setq gnus-uu-user-archive-rules
+    '((\"\\\\.tar$\" \"untar\")
+      (\"\\\\.zip$\" \"zip -x\")))"
+  :group 'gnus-extract-archive
+  :type '(repeat (group regexp (string :tag "Command"))))
+
+(defcustom gnus-uu-ignore-files-by-name nil
+  "*A regular expression saying what files should not be viewed based on name.
+If, for instance, you want gnus-uu to ignore all .au and .wav files,

 you could say something like
 
   (setq gnus-uu-ignore-files-by-name \"\\\\.au$\\\\|\\\\.wav$\")
 
 Note that this variable can be used in conjunction with the
 you could say something like
 
   (setq gnus-uu-ignore-files-by-name \"\\\\.au$\\\\|\\\\.wav$\")
 
 Note that this variable can be used in conjunction with the

-`gnus-uu-ignore-files-by-type' variable.")
-
-(defvar gnus-uu-ignore-files-by-type nil
-  "A regular expression saying what files that shouldn't be viewed, based on MIME file type.
-If, for instance, you want gnus-uu to ignore all audio files and all mpegs, 
+`gnus-uu-ignore-files-by-type' variable."
+  :group 'gnus-extract
+  :type '(choice (const :tag "off" nil)
+                (regexp :format "%v")))
+
+(defcustom gnus-uu-ignore-files-by-type nil
+  "*A regular expression saying what files that shouldn't be viewed, based on MIME file type.
+If, for instance, you want gnus-uu to ignore all audio files and all mpegs,

 you could say something like
 
   (setq gnus-uu-ignore-files-by-type \"audio/\\\\|video/mpeg\")
 
 Note that this variable can be used in conjunction with the
 you could say something like
 
   (setq gnus-uu-ignore-files-by-type \"audio/\\\\|video/mpeg\")
 
 Note that this variable can be used in conjunction with the

-`gnus-uu-ignore-files-by-name' variable.")
+`gnus-uu-ignore-files-by-name' variable."
+  :group 'gnus-extract
+  :type '(choice (const :tag "off" nil)
+                (regexp :format "%v")))

 
 ;; Pseudo-MIME support
 
 (defconst gnus-uu-ext-to-mime-list
 
 ;; Pseudo-MIME support
 
 (defconst gnus-uu-ext-to-mime-list

-  (list '("\\.gif$" "image/gif")
-       '("\\.jpe?g$" "image/jpeg")
-       '("\\.tiff?$" "image/tiff")
-       '("\\.xwd$" "image/xwd")
-       '("\\.pbm$" "image/pbm")
-       '("\\.pgm$" "image/pgm")
-       '("\\.ppm$" "image/ppm")
-       '("\\.xbm$" "image/xbm")
-       '("\\.pcx$" "image/pcx")
-       '("\\.tga$" "image/tga")
-       '("\\.ps$" "image/postscript")
-       '("\\.fli$" "video/fli")
-       '("\\.wav$" "audio/wav")
-       '("\\.aiff$" "audio/aiff")
-       '("\\.hcom$" "audio/hcom")
-       '("\\.voc$" "audio/voc")
-       '("\\.smp$" "audio/smp")
-       '("\\.mod$" "audio/mod")
-       '("\\.dvi$" "image/dvi")
-       '("\\.mpe?g$" "video/mpeg")
-       '("\\.au$" "audio/basic")
-       '("\\.\\(te?xt\\|doc\\|c\\|h\\)$" "text/plain")
-       '("\\.\\(c\\|h\\)$" "text/source")
-       '("read.*me" "text/plain")
-       '("\\.html$" "text/html")
-       '("\\.bat$" "text/bat")
-       '("\\.[1-6]$" "text/man")
-       '("\\.flc$" "video/flc")
-       '("\\.rle$" "video/rle")
-       '("\\.pfx$" "video/pfx")
-       '("\\.avi$" "video/avi")
-       '("\\.sme$" "video/sme")
-       '("\\.rpza$" "video/prza")
-       '("\\.dl$" "video/dl")
-       '("\\.qt$" "video/qt")
-       '("\\.rsrc$" "video/rsrc")
-       '("\\..*$" "unknown/unknown")))
-
-;; Various variables users may set 
-
-(defvar gnus-uu-tmp-dir "/tmp/" 
-  "Variable saying where gnus-uu is to do its work.
-Default is \"/tmp/\".")
-
-(defvar gnus-uu-do-not-unpack-archives nil 
-  "Non-nil means that gnus-uu won't peek inside archives looking for files to dispay. 
-Default is nil.")
-
-(defvar gnus-uu-view-and-save nil 
-  "Non-nil means that the user will always be asked to save a file after viewing it.
-If the variable is nil, the suer will only be asked to save if the
-viewing is unsuccessful. Default is nil.")
-
-(defvar gnus-uu-asynchronous nil
-  "Non-nil means that files will be viewed asynchronously.
-Default is nil.")
-
-(defvar gnus-uu-ask-before-view nil
-  "Non-nil means that gnus-uu will ask you before viewing each file. 
-Especially useful when `gnus-uu-asynchronous' is set. Default is
-nil.")
-
-(defvar gnus-uu-ignore-default-view-rules nil
-  "Non-nil means that gnus-uu will ignore the default viewing rules.
-Only the user viewing rules will be consulted. Default is nil.")
-
-(defvar gnus-uu-ignore-default-archive-rules nil 
-  "Non-nil means that gnus-uu will ignore the default archive unpacking commands.  
-Only the user unpacking commands will be consulted. Default is nil.")
-
-(defvar gnus-uu-kill-carriage-return t
-  "Non-nil means that gnus-uu will strip all carriage returns from articles.
-Default is t.")
-
-(defvar gnus-uu-view-with-metamail nil
-  "Non-nil means that files will be viewed with metamail.
+  '(("\\.gif$" "image/gif")
+    ("\\.jpe?g$" "image/jpeg")
+    ("\\.tiff?$" "image/tiff")
+    ("\\.xwd$" "image/xwd")
+    ("\\.pbm$" "image/pbm")
+    ("\\.pgm$" "image/pgm")
+    ("\\.ppm$" "image/ppm")
+    ("\\.xbm$" "image/xbm")
+    ("\\.pcx$" "image/pcx")
+    ("\\.tga$" "image/tga")
+    ("\\.ps$" "image/postscript")
+    ("\\.fli$" "video/fli")
+    ("\\.wav$" "audio/wav")
+    ("\\.aiff$" "audio/aiff")
+    ("\\.hcom$" "audio/hcom")
+    ("\\.voc$" "audio/voc")
+    ("\\.smp$" "audio/smp")
+    ("\\.mod$" "audio/mod")
+    ("\\.dvi$" "image/dvi")
+    ("\\.mpe?g$" "video/mpeg")
+    ("\\.au$" "audio/basic")
+    ("\\.\\(te?xt\\|doc\\|c\\|h\\)$" "text/plain")
+    ("\\.\\(c\\|h\\)$" "text/source")
+    ("read.*me" "text/plain")
+    ("\\.html$" "text/html")
+    ("\\.bat$" "text/bat")
+    ("\\.[1-6]$" "text/man")
+    ("\\.flc$" "video/flc")
+    ("\\.rle$" "video/rle")
+    ("\\.pfx$" "video/pfx")
+    ("\\.avi$" "video/avi")
+    ("\\.sme$" "video/sme")
+    ("\\.rpza$" "video/prza")
+    ("\\.dl$" "video/dl")
+    ("\\.qt$" "video/qt")
+    ("\\.rsrc$" "video/rsrc")
+    ("\\..*$" "unknown/unknown")))
+
+;; Various variables users may set
+
+(defcustom gnus-uu-tmp-dir
+  (cond ((fboundp 'temp-directory) (temp-directory))
+       ((boundp 'temporary-file-directory) temporary-file-directory)
+       ("/tmp/"))
+  "*Variable saying where gnus-uu is to do its work.
+Default is \"/tmp/\"."
+  :group 'gnus-extract
+  :type 'directory)
+
+(defcustom gnus-uu-do-not-unpack-archives nil
+  "*Non-nil means that gnus-uu won't peek inside archives looking for files to display.
+Default is nil."
+  :group 'gnus-extract-archive
+  :type 'boolean)
+
+(defcustom gnus-uu-ignore-default-view-rules nil
+  "*Non-nil means that gnus-uu will ignore the default viewing rules.
+Only the user viewing rules will be consulted.  Default is nil."
+  :group 'gnus-extract-view
+  :type 'boolean)
+
+(defcustom gnus-uu-grabbed-file-functions nil
+  "Functions run on each file after successful decoding.
+They will be called with the name of the file as the argument.
+Likely functions you can use in this list are `gnus-uu-grab-view'
+and `gnus-uu-grab-move'."
+  :group 'gnus-extract
+  :options '(gnus-uu-grab-view gnus-uu-grab-move)
+  :type 'hook)
+
+(defcustom gnus-uu-ignore-default-archive-rules nil
+  "*Non-nil means that gnus-uu will ignore the default archive unpacking commands.
+Only the user unpacking commands will be consulted.  Default is nil."
+  :group 'gnus-extract-archive
+  :type 'boolean)
+
+(defcustom gnus-uu-kill-carriage-return t
+  "*Non-nil means that gnus-uu will strip all carriage returns from articles.
+Default is t."
+  :group 'gnus-extract
+  :type 'boolean)
+
+(defcustom gnus-uu-view-with-metamail nil
+  "*Non-nil means that files will be viewed with metamail.

 The gnus-uu viewing functions will be ignored and gnus-uu will try
 The gnus-uu viewing functions will be ignored and gnus-uu will try

-to guess at a content-type based on file name suffixes. Default
-it nil.")
-
-(defvar gnus-uu-unmark-articles-not-decoded nil
-  "Non-nil means that gnus-uu will mark articles that were unsuccessfully decoded as unread. 
-Default is nil.")
-
-(defvar gnus-uu-output-window-height 20 
-  "This variable says how tall the output buffer window is to be when using interactive view mode. 
-Change it at your convenience. Default is 20.")
-
-(defvar gnus-uu-correct-stripped-uucode nil
-  "Non-nil means that gnus-uu will *try* to fix uuencoded files that have had traling spaces deleted. 
-Default is nil.")
-
-(defvar gnus-uu-use-interactive-view nil
-  "Non-nil means that gnus-uu will use interactive viewing mode.
-Gnus-uu will create a special buffer where the user may choose
-interactively which files to view and how. Default is nil.")
-
-(defvar gnus-uu-save-in-digest nil
-  "Non-nil means that gnus-uu, when asked to save without decoding, will save in digests.
-If this variable is nil, gnus-uu will just save everything in a 
-file without any embellishments. The digesting almost conforms to RFC1153 -
-no easy way to specify any meaningful volume and issue numbers were found, 
-so I simply dropped them.")
-
-(defvar gnus-uu-save-separate-articles nil
-  "Non-nil means that gnus-uu will save artilces in separate files.")
-
+to guess at a content-type based on file name suffixes.  Default
+it nil."
+  :group 'gnus-extract
+  :type 'boolean)
+
+(defcustom gnus-uu-unmark-articles-not-decoded nil
+  "*Non-nil means that gnus-uu will mark articles that were unsuccessfully decoded as unread.
+Default is nil."
+  :group 'gnus-extract
+  :type 'boolean)
+
+(defcustom gnus-uu-correct-stripped-uucode nil
+  "*Non-nil means that gnus-uu will *try* to fix uuencoded files that have had trailing spaces deleted.
+Default is nil."
+  :group 'gnus-extract
+  :type 'boolean)
+
+(defcustom gnus-uu-save-in-digest nil
+  "*Non-nil means that gnus-uu, when asked to save without decoding, will save in digests.
+If this variable is nil, gnus-uu will just save everything in a
+file without any embellishments.  The digesting almost conforms to RFC1153 -
+no easy way to specify any meaningful volume and issue numbers were found,
+so I simply dropped them."
+  :group 'gnus-extract
+  :type 'boolean)
+
+(defcustom gnus-uu-pre-uudecode-hook nil
+  "Hook run before sending a message to uudecode."
+  :group 'gnus-extract
+  :type 'hook)
+
+(defcustom gnus-uu-digest-headers
+  '("^Date:" "^From:" "^To:" "^Cc:" "^Subject:" "^Message-ID:" "^Keywords:"
+    "^Summary:" "^References:" "^Content-Type:" "^Content-Transfer-Encoding:"
+    "^MIME-Version:" "^Content-Disposition:" "^Content-Description:"
+    "^Content-ID:")
+  "*List of regexps to match headers included in digested messages.
+The headers will be included in the sequence they are matched."
+  :group 'gnus-extract
+  :type '(repeat regexp))
+
+(defcustom gnus-uu-save-separate-articles nil
+  "*Non-nil means that gnus-uu will save articles in separate files."
+  :group 'gnus-extract
+  :type 'boolean)
+
+(defcustom gnus-uu-be-dangerous 'ask
+  "*Specifies what to do if unusual situations arise during decoding.
+If nil, be as conservative as possible.  If t, ignore things that
+didn't work, and overwrite existing files.  Otherwise, ask each time."
+  :group 'gnus-extract
+  :type '(choice (const :tag "conservative" nil)
+                (const :tag "ask" ask)
+                (const :tag "liberal" t)))

 
 ;; Internal variables
 
 
 ;; Internal variables
 

-(defconst gnus-uu-begin-string "^begin[ \t]+[0-7][0-7][0-7][ \t]+\\(.*\\)$")
-(defconst gnus-uu-end-string "^end[ \t]*$")
+(defvar gnus-uu-saved-article-name nil)
+
+(defvar gnus-uu-begin-string "^begin[ \t]+0?[0-7][0-7][0-7][ \t]+\\(.*\\)$")
+(defvar gnus-uu-end-string "^end[ \t]*$")

 
 

-(defconst gnus-uu-body-line "^M")
+(defvar gnus-uu-body-line "^M")

 (let ((i 61))
   (while (> (setq i (1- i)) 0)
     (setq gnus-uu-body-line (concat gnus-uu-body-line "[^a-z]")))
 (let ((i 61))
   (while (> (setq i (1- i)) 0)
     (setq gnus-uu-body-line (concat gnus-uu-body-line "[^a-z]")))


@@ -779,677 +332,691 @@ so I simply dropped them.")
 
 ;"^M.............................................................?$"
 
 
 ;"^M.............................................................?$"
 

-(defconst gnus-uu-shar-begin-string "^#! */bin/sh")
+(defvar gnus-uu-shar-begin-string "^#! */bin/sh")

 
 (defvar gnus-uu-shar-file-name nil)
 
 (defvar gnus-uu-shar-file-name nil)

-(defconst gnus-uu-shar-name-marker "begin [0-7][0-7][0-7][ \t]+\\(\\(\\w\\|\\.\\)*\\b\\)")
+(defvar gnus-uu-shar-name-marker
+  "begin 0?[0-7][0-7][0-7][ \t]+\\(\\(\\w\\|[.\\:]\\)*\\b\\)")
+
+(defvar gnus-uu-postscript-begin-string "^%!PS-")
+(defvar gnus-uu-postscript-end-string "^%%EOF$")

 
 (defvar gnus-uu-file-name nil)
 
 (defvar gnus-uu-file-name nil)

-(defvar gnus-uu-list-of-files-decoded nil)
-(defconst gnus-uu-uudecode-process nil)
+(defvar gnus-uu-uudecode-process nil)
+(defvar gnus-uu-binhex-article-name nil)

 
 

-(defvar gnus-uu-interactive-file-list nil)
-(defvar gnus-uu-generated-file-list nil)

 (defvar gnus-uu-work-dir nil)
 
 (defvar gnus-uu-work-dir nil)
 

-(defconst gnus-uu-interactive-buffer-name "*gnus-uu interactive*")
-(defconst gnus-uu-output-buffer-name "*Gnus UU Output*")
-
-(defconst gnus-uu-highest-article-number 1)
-
-;; Interactive functions
-
-;; UUdecode and view
-
-(defun gnus-uu-decode-and-view ()
-  "UUdecodes and 'views' (if possible) the resulting file.
-'Viewing' can be any action at all, as defined in the
-`gnus-uu-file-action-list' variable. Running 'xv' on gifs and 'cat
->/dev/audio' on au files are popular actions. If the file can't be
-viewed, the user is asked if she would like to save the file instead."
-  (interactive) 
-  (gnus-uu-decode-and-view-or-save t nil))
-
-(defun gnus-uu-decode-and-save ()
-  "Decodes and saves the resulting file."
-  (interactive)
-  (gnus-uu-decode-and-view-or-save nil nil))
-
-(defun gnus-uu-marked-decode-and-view ()
-  "Decodes and views articles marked.
-The marked equivalent to `gnus-uu-decode-and-view'."
-  (interactive)
-  (gnus-uu-decode-and-view-or-save t t))
-
-(defun gnus-uu-marked-decode-and-save ()
-  "Decodes and saves articles marked.
-The marked equivalent to `gnus-uu-decode-and-save'."
-  (interactive)
-  (gnus-uu-decode-and-view-or-save nil t))
-      
-
-;; Unshar and view
-
-(defun gnus-uu-shar-and-view ()
-  "Unshars and views articles.
-The shar equivalent of `gnus-uu-decode-and-view'."
-  (interactive)
-  (gnus-uu-unshar-and-view-or-save t nil))
-
-(defun gnus-uu-shar-and-save ()
-  "Unshars and saves files.
-The shar equivalent to `gnus-uu-decode-and-save'."
-  (interactive)
-  (gnus-uu-unshar-and-view-or-save nil nil))
-
-(defun gnus-uu-marked-shar-and-view ()
-  "Unshars and views articles marked.
-The marked equivalent to `gnus-uu-shar-and-view'."
-  (interactive)
-  (gnus-uu-unshar-and-view-or-save t t))
-
-(defun gnus-uu-marked-shar-and-save ()
-  "Unshars and saves articles marked.
-The marked equivalent to `gnus-uu-shar-and-save'."
-  (interactive)
-  (gnus-uu-unshar-and-view-or-save nil t))
-
-;; Threaded decode
-
-(defun gnus-uu-threaded-decode-and-view ()
+(defvar gnus-uu-output-buffer-name " *Gnus UU Output*")
+
+(defvar gnus-uu-default-dir gnus-article-save-directory)
+(defvar gnus-uu-digest-from-subject nil)
+(defvar gnus-uu-digest-buffer nil)
+
+;; Keymaps
+
+(gnus-define-keys (gnus-uu-mark-map "P" gnus-summary-mark-map)
+  "p" gnus-summary-mark-as-processable
+  "u" gnus-summary-unmark-as-processable
+  "U" gnus-summary-unmark-all-processable
+  "v" gnus-uu-mark-over
+  "s" gnus-uu-mark-series
+  "r" gnus-uu-mark-region
+  "g" gnus-uu-unmark-region
+  "R" gnus-uu-mark-by-regexp
+  "G" gnus-uu-unmark-by-regexp
+  "t" gnus-uu-mark-thread
+  "T" gnus-uu-unmark-thread
+  "a" gnus-uu-mark-all
+  "b" gnus-uu-mark-buffer
+  "S" gnus-uu-mark-sparse
+  "k" gnus-summary-kill-process-mark
+  "y" gnus-summary-yank-process-mark
+  "w" gnus-summary-save-process-mark
+  "i" gnus-uu-invert-processable)
+
+(gnus-define-keys (gnus-uu-extract-map "X" gnus-summary-mode-map)
+  ;;"x" gnus-uu-extract-any
+  "m" gnus-summary-save-parts
+  "u" gnus-uu-decode-uu
+  "U" gnus-uu-decode-uu-and-save
+  "s" gnus-uu-decode-unshar
+  "S" gnus-uu-decode-unshar-and-save
+  "o" gnus-uu-decode-save
+  "O" gnus-uu-decode-save
+  "b" gnus-uu-decode-binhex
+  "B" gnus-uu-decode-binhex
+  "p" gnus-uu-decode-postscript
+  "P" gnus-uu-decode-postscript-and-save)
+
+(gnus-define-keys
+    (gnus-uu-extract-view-map "v" gnus-uu-extract-map)
+  "u" gnus-uu-decode-uu-view
+  "U" gnus-uu-decode-uu-and-save-view
+  "s" gnus-uu-decode-unshar-view
+  "S" gnus-uu-decode-unshar-and-save-view
+  "o" gnus-uu-decode-save-view
+  "O" gnus-uu-decode-save-view
+  "b" gnus-uu-decode-binhex-view
+  "B" gnus-uu-decode-binhex-view
+  "p" gnus-uu-decode-postscript-view
+  "P" gnus-uu-decode-postscript-and-save-view)
+
+
+;; Commands.
+
+(defun gnus-uu-decode-uu (&optional n)
+  "Uudecodes the current article."
+  (interactive "P")
+  (gnus-uu-decode-with-method 'gnus-uu-uustrip-article n))
+
+(defun gnus-uu-decode-uu-and-save (n dir)

   "Decodes and saves the resulting file."
   "Decodes and saves the resulting file."

-  (interactive)
-  (gnus-uu-threaded-decode-and-view-or-save t))
+  (interactive
+   (list current-prefix-arg
+        (file-name-as-directory
+         (read-file-name "Uudecode and save in dir: "
+                         gnus-uu-default-dir
+                         gnus-uu-default-dir t))))
+  (gnus-uu-decode-with-method 'gnus-uu-uustrip-article n dir nil nil t))
+
+(defun gnus-uu-decode-unshar (&optional n)
+  "Unshars the current article."
+  (interactive "P")
+  (gnus-uu-decode-with-method 'gnus-uu-unshar-article n nil nil 'scan t))
+
+(defun gnus-uu-decode-unshar-and-save (n dir)
+  "Unshars and saves the current article."
+  (interactive
+   (list current-prefix-arg
+        (file-name-as-directory
+         (read-file-name "Unshar and save in dir: "
+                         gnus-uu-default-dir
+                         gnus-uu-default-dir t))))
+  (gnus-uu-decode-with-method 'gnus-uu-unshar-article n dir nil 'scan t))
+
+(defun gnus-uu-decode-save (n file)
+  "Saves the current article."
+  (interactive
+   (list current-prefix-arg
+        (read-file-name
+         (if gnus-uu-save-separate-articles
+             "Save articles is dir: "
+           "Save articles in file: ")
+         gnus-uu-default-dir
+         gnus-uu-default-dir)))
+  (setq gnus-uu-saved-article-name file)
+  (gnus-uu-decode-with-method 'gnus-uu-save-article n nil t))
+
+(defun gnus-uu-decode-binhex (n dir)
+  "Unbinhexes the current article."
+  (interactive
+   (list current-prefix-arg
+        (file-name-as-directory
+         (read-file-name "Unbinhex and save in dir: "
+                         gnus-uu-default-dir
+                         gnus-uu-default-dir))))
+  (setq gnus-uu-binhex-article-name
+       (make-temp-name (concat gnus-uu-work-dir "binhex")))
+  (gnus-uu-decode-with-method 'gnus-uu-binhex-article n dir))
+
+(defun gnus-uu-decode-uu-view (&optional n)
+  "Uudecodes and views the current article."
+  (interactive "P")
+  (let ((gnus-view-pseudos (or gnus-view-pseudos 'automatic)))
+    (gnus-uu-decode-uu n)))
+
+(defun gnus-uu-decode-uu-and-save-view (n dir)
+  "Decodes, views and saves the resulting file."
+  (interactive
+   (list current-prefix-arg
+        (read-file-name "Uudecode, view and save in dir: "
+                        gnus-uu-default-dir
+                        gnus-uu-default-dir t)))
+  (let ((gnus-view-pseudos (or gnus-view-pseudos 'automatic)))
+    (gnus-uu-decode-uu-and-save n dir)))
+
+(defun gnus-uu-decode-unshar-view (&optional n)
+  "Unshars and views the current article."
+  (interactive "P")
+  (let ((gnus-view-pseudos (or gnus-view-pseudos 'automatic)))
+    (gnus-uu-decode-unshar n)))
+
+(defun gnus-uu-decode-unshar-and-save-view (n dir)
+  "Unshars and saves the current article."
+  (interactive
+   (list current-prefix-arg
+        (read-file-name "Unshar, view and save in dir: "
+                        gnus-uu-default-dir
+                        gnus-uu-default-dir t)))
+  (let ((gnus-view-pseudos (or gnus-view-pseudos 'automatic)))
+    (gnus-uu-decode-unshar-and-save n dir)))
+
+(defun gnus-uu-decode-save-view (n file)
+  "Saves and views the current article."
+  (interactive
+   (list current-prefix-arg
+        (read-file-name  (if gnus-uu-save-separate-articles
+                             "Save articles is dir: "
+                           "Save articles in file: ")
+                         gnus-uu-default-dir gnus-uu-default-dir)))
+  (let ((gnus-view-pseudos (or gnus-view-pseudos 'automatic)))
+    (gnus-uu-decode-save n file)))
+
+(defun gnus-uu-decode-binhex-view (n file)
+  "Unbinhexes and views the current article."
+  (interactive
+   (list current-prefix-arg
+        (read-file-name "Unbinhex, view and save in dir: "
+                        gnus-uu-default-dir gnus-uu-default-dir)))
+  (setq gnus-uu-binhex-article-name
+       (make-temp-name (concat gnus-uu-work-dir "binhex")))
+  (let ((gnus-view-pseudos (or gnus-view-pseudos 'automatic)))
+    (gnus-uu-decode-binhex n file)))

 
 

-(defun gnus-uu-threaded-decode-and-save ()
-  "Decodes and saves the resulting file."
-  (interactive)
-  (gnus-uu-threaded-decode-and-view-or-save nil))
-
-(defun gnus-uu-threaded-multi-decode-and-view ()
-  "Decodes and saves the resulting file."
-  (interactive)
-  (gnus-uu-threaded-multi-decode-and-view-or-save t))

 
 

-(defun gnus-uu-threaded-multi-decode-and-save ()
-  "Decodes and saves the resulting file."
-  (interactive)
-  (gnus-uu-threaded-multi-decode-and-view-or-save nil))
-
-(defun gnus-uu-threaded-decode-and-view-or-save (&optional view)
-  (gnus-summary-unmark-all-processable)
-  (gnus-uu-mark-thread)
-  (gnus-uu-decode-and-view-or-save view t))
-
-(defun gnus-uu-threaded-multi-decode-and-view-or-save (view)
-  (let (type)
-    (message "Decode type: [u]udecode, (s)har, s(a)ve, (b)inhex: ")
-    (setq type (read-char))
-    (if (not (or (= type ?u) (= type ?s) (= type ?b) (= type ?a)))
-       (error "No such decoding method '%c'" type))
-    
-    (gnus-summary-unmark-all-processable)
-    (gnus-uu-mark-thread)
-
-    (if (= type ?\r) (setq type ?u))
-    (cond ((= type ?u) (gnus-uu-decode-and-view-or-save view t))
-         ((= type ?s) (gnus-uu-unshar-and-view-or-save view t))
-         ((= type ?b) (gnus-uu-binhex-and-save view t))
-         ((= type ?a) (gnus-uu-save-articles view t))
-         (t (error "No such decoding method: %s" type)))))
-    
-
-;; Toggle commands      
-
-(defun gnus-uu-toggle-asynchronous ()
-  "This function toggles asynchronous viewing."
-  (interactive)
-  (if (setq gnus-uu-asynchronous (not gnus-uu-asynchronous))
-      (message "gnus-uu will now view files asynchronously")
-    (message "gnus-uu will now view files synchronously")))
-
-(defun gnus-uu-toggle-query ()
-  "This function toggles whether to ask before viewing or not."
-  (interactive)
-  (if (setq gnus-uu-ask-before-view (not gnus-uu-ask-before-view))
-      (message "gnus-uu will now ask before viewing")
-    (message "gnus-uu will now view without asking first")))
-
-(defun gnus-uu-toggle-always-ask ()
-  "This function toggles whether to always ask to save a file after viewing."
-  (interactive)
-  (if (setq gnus-uu-view-and-save (not gnus-uu-view-and-save))
-      (message "gnus-uu will now ask to save the file after viewing")
-    (message "gnus-uu will now not ask to save after successful viewing")))
+;; Digest and forward articles

 
 

-(defun gnus-uu-toggle-interactive-view ()
-  "This function toggles whether to use interactive view."
+(defun gnus-uu-digest-mail-forward (&optional n post)
+  "Digests and forwards all articles in this series."
+  (interactive "P")
+  (let ((gnus-uu-save-in-digest t)
+       (file (make-temp-name (nnheader-concat gnus-uu-tmp-dir "forward")))
+       (message-forward-as-mime message-forward-as-mime)
+       (mail-parse-charset gnus-newsgroup-charset)
+       (mail-parse-ignored-charsets gnus-newsgroup-ignored-charsets)
+       gnus-uu-digest-buffer subject from)
+    (if (and n (not (numberp n)))
+       (setq message-forward-as-mime (not message-forward-as-mime)
+             n nil))
+    (let ((gnus-article-reply (gnus-summary-work-articles n)))
+      (gnus-setup-message 'forward
+       (setq gnus-uu-digest-from-subject nil)
+       (setq gnus-uu-digest-buffer
+             (gnus-get-buffer-create " *gnus-uu-forward*"))
+       (gnus-uu-decode-save n file)
+       (switch-to-buffer gnus-uu-digest-buffer)
+       (let ((fs gnus-uu-digest-from-subject))
+         (when fs
+           (setq from (caar fs)
+                 subject (gnus-simplify-subject-fuzzy (cdar fs))
+                 fs (cdr fs))
+           (while (and fs (or from subject))
+             (when from
+               (unless (string= from (caar fs))
+                 (setq from nil)))
+             (when subject
+               (unless (string= (gnus-simplify-subject-fuzzy (cdar fs))
+                                subject)
+                 (setq subject nil)))
+             (setq fs (cdr fs))))
+         (unless subject
+           (setq subject "Digested Articles"))
+         (unless from
+           (setq from
+                 (if (gnus-news-group-p gnus-newsgroup-name)
+                     gnus-newsgroup-name
+                   "Various"))))
+       (goto-char (point-min))
+       (when (re-search-forward "^Subject: ")
+         (delete-region (point) (gnus-point-at-eol))
+         (insert subject))
+       (goto-char (point-min))
+       (when (re-search-forward "^From:")
+         (delete-region (point) (gnus-point-at-eol))
+         (insert " " from))
+       (let ((message-forward-decoded-p t))
+         (message-forward post t))))
+    (setq gnus-uu-digest-from-subject nil)))
+
+(defun gnus-uu-digest-post-forward (&optional n)
+  "Digest and forward to a newsgroup."
+  (interactive "P")
+  (gnus-uu-digest-mail-forward n t))
+
+;; Process marking.
+
+(defun gnus-message-process-mark (unmarkp new-marked)
+  (let ((old (- (length gnus-newsgroup-processable) (length new-marked))))
+    (message "%d mark%s %s%s"
+            (length new-marked)
+            (if (= (length new-marked) 1) "" "s")
+            (if unmarkp "removed" "added")
+            (cond
+             ((and (zerop old)
+                   (not unmarkp))
+              "")
+             (unmarkp
+              (format ", %d remain marked"
+                      (length gnus-newsgroup-processable)))
+             (t
+              (format ", %d already marked" old))))))
+
+(defun gnus-new-processable (unmarkp articles)
+  (if unmarkp
+      (gnus-intersection gnus-newsgroup-processable articles)
+    (gnus-set-difference articles gnus-newsgroup-processable)))
+
+(defun gnus-uu-mark-by-regexp (regexp &optional unmark)
+  "Set the process mark on articles whose subjects match REGEXP.
+When called interactively, prompt for REGEXP.
+Optional UNMARK non-nil means unmark instead of mark."
+  (interactive "sMark (regexp): \nP")
+  (save-excursion
+    (let* ((articles (gnus-uu-find-articles-matching regexp))
+          (new-marked (gnus-new-processable unmark articles)))
+      (while articles
+       (if unmark
+           (gnus-summary-remove-process-mark (pop articles))
+         (gnus-summary-set-process-mark (pop articles))))
+      (gnus-message-process-mark unmark new-marked)))
+  (gnus-summary-position-point))
+
+(defun gnus-uu-unmark-by-regexp (regexp)
+  "Remove the process mark from articles whose subjects match REGEXP.
+When called interactively, prompt for REGEXP."
+  (interactive "sUnmark (regexp): ")
+  (gnus-uu-mark-by-regexp regexp t))
+
+(defun gnus-uu-mark-series ()
+  "Mark the current series with the process mark."

   (interactive)
   (interactive)

-  (if (setq gnus-uu-use-interactive-view (not gnus-uu-use-interactive-view))
-      (message "gnus-uu will now use interactive view")
-    (message "gnus-uu will now use non-interactive view")))
+  (let ((articles (gnus-uu-find-articles-matching)))
+    (while articles
+      (gnus-summary-set-process-mark (car articles))
+      (setq articles (cdr articles)))
+    (message ""))
+  (gnus-summary-position-point))

 
 

-(defun gnus-uu-toggle-unmark-undecoded ()
-  "This function toggles whether to unmark articles not decoded."
-  (interactive)
-  (if (setq gnus-uu-unmark-articles-not-decoded 
-           (not gnus-uu-unmark-articles-not-decoded))
-      (message "gnus-uu will now unmark articles not decoded")
-    (message "gnus-uu will now not unmark articles not decoded")))
+(defun gnus-uu-mark-region (beg end &optional unmark)
+  "Set the process mark on all articles between point and mark."
+  (interactive "r")
+  (save-excursion
+    (goto-char beg)
+    (while (< (point) end)
+      (if unmark
+         (gnus-summary-remove-process-mark (gnus-summary-article-number))
+       (gnus-summary-set-process-mark (gnus-summary-article-number)))
+      (forward-line 1)))
+  (gnus-summary-position-point))
+
+(defun gnus-uu-unmark-region (beg end)
+  "Remove the process mark from all articles between point and mark."
+  (interactive "r")
+  (gnus-uu-mark-region beg end t))

 
 

-(defun gnus-uu-toggle-kill-carriage-return ()
-  "This function toggles the stripping of carriage returns from the articles."
+(defun gnus-uu-mark-buffer ()
+  "Set the process mark on all articles in the buffer."

   (interactive)
   (interactive)

-  (if (setq gnus-uu-kill-carriage-return (not gnus-uu-kill-carriage-return))
-      (message "gnus-uu will now strip carriage returns")
-    (message "gnus-uu won't strip carriage returns")))
+  (gnus-uu-mark-region (point-min) (point-max)))

 
 

-(defun gnus-uu-toggle-view-with-metamail ()
-  "This function toggles whether to view files with metamail."
+(defun gnus-uu-unmark-buffer ()
+  "Remove the process mark on all articles in the buffer."

   (interactive)
   (interactive)

-  (if (setq gnus-uu-view-with-metamail (not gnus-uu-view-with-metamail))
-      (message "gnus-uu will now view with metamail")
-    (message "gnus-uu will now view with the gnus-uu viewing functions")))
+  (gnus-uu-mark-region (point-min) (point-max) t))

 
 

-(defun gnus-uu-toggle-correct-stripped-uucode ()
-  "This function toggles whether to correct stripped uucode."
+(defun gnus-uu-mark-thread ()
+  "Marks all articles downwards in this thread."

   (interactive)
   (interactive)

-  (if (setq gnus-uu-correct-stripped-uucode 
-           (not gnus-uu-correct-stripped-uucode))
-      (message "gnus-uu will now correct stripped uucode")
-    (message "gnus-uu won't check and correct stripped uucode")))
-
-(defun gnus-uu-toggle-any-variable ()
-  "This function ask what variable the user wants to toggle."
+  (gnus-save-hidden-threads
+    (let ((level (gnus-summary-thread-level)))
+      (while (and (gnus-summary-set-process-mark
+                  (gnus-summary-article-number))
+                 (zerop (gnus-summary-next-subject 1 nil t))
+                 (> (gnus-summary-thread-level) level)))))
+  (gnus-summary-position-point))
+
+(defun gnus-uu-unmark-thread ()
+  "Unmarks all articles downwards in this thread."

   (interactive)
   (interactive)

-  (let (rep)
-    (message "(a)sync, (q)uery, (p)ask, (k)ill CR, (i)nteract, (u)nmark, (c)orrect, (m)eta")
-    (setq rep (read-char))
-    (if (= rep ?a)
-       (gnus-uu-toggle-asynchronous))
-    (if (= rep ?q)
-       (gnus-uu-toggle-query))
-    (if (= rep ?p)
-       (gnus-uu-toggle-always-ask))
-    (if (= rep ?k)
-       (gnus-uu-toggle-kill-carriage-return))
-    (if (= rep ?u)
-       (gnus-uu-toggle-unmark-undecoded))
-    (if (= rep ?c)
-       (gnus-uu-toggle-correct-stripped-uucode))
-    (if (= rep ?m)
-       (gnus-uu-toggle-view-with-metamail))
-    (if (= rep ?i)
-       (gnus-uu-toggle-interactive-view))))
-
-
-;; Misc interactive functions
-
-(defun gnus-uu-decode-and-show-in-buffer ()
-  "Uudecodes the current article and displays the result in a buffer.
-Might be useful if someone has, for instance, some text uuencoded in
-their sigs. (Stranger things have happened.)"
+  (let ((level (gnus-summary-thread-level)))
+    (while (and (gnus-summary-remove-process-mark
+                (gnus-summary-article-number))
+               (zerop (gnus-summary-next-subject 1))
+               (> (gnus-summary-thread-level) level))))
+  (gnus-summary-position-point))
+
+(defun gnus-uu-invert-processable ()
+  "Invert the list of process-marked articles."

   (interactive)
   (interactive)

-  (gnus-uu-initialize)
-  (let ((uu-buffer (get-buffer-create gnus-uu-output-buffer-name))
-       file-name)
+  (let ((data gnus-newsgroup-data)
+       number)

     (save-excursion
     (save-excursion

-      (and 
-       (gnus-summary-select-article)
-       (gnus-uu-grab-articles (list gnus-current-article) 
-                             'gnus-uu-uustrip-article-as)
-       (setq file-name (concat gnus-uu-work-dir gnus-uu-file-name))
-       (progn
-        (save-excursion
-          (set-buffer uu-buffer)
-          (erase-buffer)
-          (insert-file-contents file-name))
-        (set-window-buffer (get-buffer-window gnus-article-buffer) 
-                           uu-buffer)
-        (message "Showing file %s in buffer" file-name)
-        (delete-file file-name))))))
-
-(defun gnus-uu-edit-begin-line ()
-  "Edit the begin line of the current article."
-  (interactive)
-  (let ((buffer-read-only nil)
-       begin b)
+      (while data
+       (if (memq (setq number (gnus-data-number (pop data)))
+                 gnus-newsgroup-processable)
+           (gnus-summary-remove-process-mark number)
+         (gnus-summary-set-process-mark number)))))
+  (gnus-summary-position-point))
+
+(defun gnus-uu-mark-over (&optional score)
+  "Mark all articles with a score over SCORE (the prefix)."
+  (interactive "P")
+  (let ((score (or score gnus-summary-default-score 0))
+       (data gnus-newsgroup-data))

     (save-excursion
     (save-excursion

-      (gnus-summary-select-article)
-      (set-buffer gnus-article-buffer)
-      (goto-line 1)
-      (if (not (re-search-forward "begin " nil t))
-         (error "No begin line in the current article")
-       (beginning-of-line)
-       (setq b (point))
-       (end-of-line)
-       (setq begin (buffer-substring b (point)))
-       (setq begin (read-string "" begin))
-       (setq buffer-read-only nil)
-       (delete-region b (point))
-       (insert-string begin)))))
-
-
-;; Multi functions
-
-(defun gnus-uu-multi-decode-and-view ()
-  "Choose a method of decoding and then decode and view.
-This function lets the user decide what method to use for decoding.
-Other than that, it's equivalent to the other decode-and-view
-functions."
-  (interactive)
-  (gnus-uu-multi-decode-and-view-or-save t nil))
-
-(defun gnus-uu-multi-decode-and-save ()
-  "Choose a method of decoding and then decode and save.
-This function lets the user decide what method to use for decoding.
-Other than that, it's equivalent to the other decode-and-save 
-functions."
-  (interactive)
-  (gnus-uu-multi-decode-and-view-or-save nil nil))
-
-(defun gnus-uu-marked-multi-decode-and-view ()
-  "Choose a method of decoding and then decode and view the marked articles.
-This function lets the user decide what method to use for decoding.
-Other than that, it's equivalent to the other marked decode-and-view 
-functions."
-  (interactive)
-  (gnus-uu-multi-decode-and-view-or-save t t))
-
-(defun gnus-uu-marked-multi-decode-and-save ()
-  "Choose a method of decoding and then decode and save the marked articles.
-This function lets the user decide what method to use for decoding.
-Other than that, it's equivalent to the other marked decode-and-save 
-functions."
-  (interactive)
-  (gnus-uu-multi-decode-and-view-or-save nil t))
-
-(defun gnus-uu-multi-decode-and-view-or-save (view marked)
-  (let (type)
-    (message "[u]udecode, (s)har, s(a)ve, (b)inhex: ")
-    (setq type (read-char))
-    (if (= type ?\r) (setq type ?u))
-    (cond ((= type ?u) (gnus-uu-decode-and-view-or-save view marked))
-         ((= type ?s) (gnus-uu-unshar-and-view-or-save view marked))
-         ((= type ?b) (gnus-uu-binhex-and-save view marked))
-         ((= type ?a) (gnus-uu-save-articles view marked))
-         (t (error "Unknown decode method '%c'." type)))))
-
-
-;; "All articles" commands
-
-(defconst gnus-uu-rest-of-articles nil)
-(defvar gnus-uu-current-save-dir nil)
-
-(defun gnus-uu-decode-and-view-all-articles (arg)
-  "Try to decode all articles and view the result.
-ARG delimits the number of files to be decoded."
-  (interactive "p")
-  (gnus-uu-decode-and-view-or-save-all-articles arg nil t))
-
-(defun gnus-uu-decode-and-view-all-unread-articles (arg)
-  "Try to decode all unread articles and view the result.
-ARG delimits the number of files to be decoded."
-  (interactive "p")
-  (gnus-uu-decode-and-view-or-save-all-articles arg t t))
-
-(defun gnus-uu-decode-and-save-all-unread-articles (arg)
-  "Try to decode all unread articles and saves the result.
-This function reads all unread articles in the current group and sees
-whether it can uudecode the articles. The user will be prompted for an
-directory to put the resulting (if any) files.
-ARG delimits the number of files to be decoded."
-  (interactive "p")
-  (gnus-uu-decode-and-view-or-save-all-articles arg t nil))
-
-(defun gnus-uu-decode-and-save-all-articles (arg)
-  "Try to decode all articles and saves the result.
-Does the same as `gnus-uu-decode-and-save-all-unread-articles', except
-that it grabs all articles visible, unread or not.
-ARG delimits the number of files to be decoded."
-  (interactive "p")
-  (gnus-uu-decode-and-view-or-save-all-articles arg nil nil))
-
-(defun gnus-uu-decode-and-view-or-save-all-articles 
-  (limit &optional unread view article-list)
-  (gnus-uu-initialize)
-  (let ((artreg (if unread "^[ -]" "^."))
-       dir list-for-file result-files)
-
-    (if article-list
-       ()
-      (gnus-summary-mark-as-read gnus-current-article ? )
-      (goto-char 1)
-      (while (re-search-forward artreg nil t)
-       (setq article-list 
-             (cons (gnus-summary-article-number) article-list)))
-      (setq article-list (nreverse article-list))
-      (gnus-summary-mark-as-read gnus-current-article ?D))
-
-    (if (not article-list)
-       (error "No %sarticles in this newsgroup" (if unread "unread " "")))
-    (if (not view)
-       (setq dir (gnus-uu-read-directory "Where do you want the files? ")))
-
-    (if (= 1 limit) (setq limit (1+ (length article-list))))
-
-    (while (and article-list (> limit 0))
-      (setq limit (1- limit))
-      (gnus-summary-goto-article (car article-list))
-      (setq list-for-file (gnus-uu-get-list-of-articles))
-      (let ((lft list-for-file))
-       (while lft
-         (setq article-list (delq (car lft) article-list))
-         (setq gnus-newsgroup-processable (delq (car lft) 
-                                                gnus-newsgroup-processable))
-         (setq lft (cdr lft))))
-      (setq result-files 
-           (append 
-            (gnus-uu-grab-articles list-for-file 
-                                   'gnus-uu-uustrip-article-as t nil t)
-            result-files)))
-
-    (setq gnus-uu-list-of-files-decoded result-files)
-
-    (if (not result-files)
-       (error "No files after decoding"))
-
-    (if view
-       (gnus-uu-view-directory gnus-uu-work-dir gnus-uu-use-interactive-view)
-      (gnus-uu-save-directory gnus-uu-work-dir dir dir)
-      (message "Saved.")
-      (gnus-uu-check-for-generated-files))
-
-    (gnus-uu-summary-next-subject)
-
-    (if (and gnus-uu-use-interactive-view view)
-       (gnus-uu-do-interactive))
-
-    (if (or (not view) (not gnus-uu-use-interactive-view))
-       (gnus-uu-clean-up))))
-
-(defun gnus-uu-decode-and-view-all-marked-files ()
-  "This function will decode and view all files that have had one or more articles in its series marked.
-For instance, if you have marked part 2 of one series, and part 9 of
-another, this function will decode both series of articles. In other
-words, you can walk around the summary buffer and mark what series you
-want to see, and then using this function to decode all the files you
-are interested in, without worrying exactly what articles belong to
-what files."
+      (while data
+       (when (> (or (cdr (assq (gnus-data-number (car data))
+                               gnus-newsgroup-scored))
+                    gnus-summary-default-score 0)
+                score)
+         (gnus-summary-set-process-mark (caar data)))
+       (setq data (cdr data))))
+    (gnus-summary-position-point)))
+
+(defun gnus-uu-mark-sparse ()
+  "Mark all series that have some articles marked."

   (interactive)
   (interactive)

-  (if (not gnus-newsgroup-processable)
-      (error "No articles marked for decoding"))
-  (gnus-uu-decode-and-view-or-save-all-articles 
-   1 nil t (setq gnus-newsgroup-processable 
-                (nreverse gnus-newsgroup-processable))))
-
-(defun gnus-uu-decode-and-save-all-marked-files ()
-  "This function will decode and save all files that have had one or more articles in its series marked.
-For instance, if you have marked part 2 of one series, and part 9 of
-another, this function will decode both series of articles. In other
-words, you can walk around the summary buffer and mark what series you
-want to save, and then using this function to decode all the files you
-are interested in, without worrying exactly what articles belong to
-what files."
+  (let ((marked (nreverse gnus-newsgroup-processable))
+       subject articles total headers)
+    (unless marked
+      (error "No articles marked with the process mark"))
+    (setq gnus-newsgroup-processable nil)
+    (save-excursion
+      (while marked
+       (and (vectorp (setq headers
+                           (gnus-summary-article-header (car marked))))
+            (setq subject (mail-header-subject headers)
+                  articles (gnus-uu-find-articles-matching
+                            (gnus-uu-reginize-string subject))
+                  total (nconc total articles)))
+       (while articles
+         (gnus-summary-set-process-mark (car articles))
+         (setcdr marked (delq (car articles) (cdr marked)))
+         (setq articles (cdr articles)))
+       (setq marked (cdr marked)))
+      (setq gnus-newsgroup-processable (nreverse total)))
+    (gnus-summary-position-point)))
+
+(defun gnus-uu-mark-all ()
+  "Mark all articles in \"series\" order."

   (interactive)
   (interactive)

-  (if (not gnus-newsgroup-processable)
-      (error "No articles marked for decoding"))
-  (gnus-uu-decode-and-view-or-save-all-articles 
-   1 nil nil (setq gnus-newsgroup-processable 
-                  (nreverse gnus-newsgroup-processable))))
-
-
-;; Work functions
-
-; All the interactive uudecode/view/save/marked functions are interfaces
-; to this function, which does the rest.
-(defun gnus-uu-decode-and-view-or-save (view marked &optional save-dir limit)
-  (gnus-uu-initialize)
+  (setq gnus-newsgroup-processable nil)

   (save-excursion
   (save-excursion

-    (if (gnus-uu-decode-and-strip nil marked limit)
-       (progn
-         (if view 
-             (gnus-uu-view-directory gnus-uu-work-dir 
-                                     gnus-uu-use-interactive-view)
-           (gnus-uu-save-directory gnus-uu-work-dir save-dir save-dir)
-           (gnus-uu-check-for-generated-files)))))
-
-  (gnus-uu-summary-next-subject)
-
-  (if (and gnus-uu-use-interactive-view view)
-      (gnus-uu-do-interactive))
-
-  (if (or (not view) (not gnus-uu-use-interactive-view))
-      (gnus-uu-clean-up)))
-
-; Unshars and views/saves marked/unmarked articles.
-(defun gnus-uu-unshar-and-view-or-save (view marked &optional save-dir)
-  (gnus-uu-initialize)
-  (let (tar-file files)
-    (save-excursion
-      (gnus-uu-decode-and-strip t marked)
-      (if (setq gnus-uu-list-of-files-decoded 
-              (gnus-uu-directory-files gnus-uu-work-dir t))
-         (progn
-           (gnus-uu-add-file gnus-uu-list-of-files-decoded)
-           (if view 
-               (gnus-uu-view-directory gnus-uu-work-dir 
-                                       gnus-uu-use-interactive-view)
-             (gnus-uu-save-directory gnus-uu-work-dir save-dir save-dir)
-             (gnus-uu-check-for-generated-files)))))
-
-    (gnus-uu-summary-next-subject)
-
-    (if (and gnus-uu-use-interactive-view view)
-       (gnus-uu-do-interactive))
-
-    (if (or (not view) (not gnus-uu-use-interactive-view))
-       (gnus-uu-clean-up))))
-
+    (let ((data gnus-newsgroup-data)
+         number)
+      (while data
+       (when (and (not (memq (setq number (gnus-data-number (car data)))
+                             gnus-newsgroup-processable))
+                  (vectorp (gnus-data-header (car data))))
+         (gnus-summary-goto-subject number)
+         (gnus-uu-mark-series))
+       (setq data (cdr data)))))
+  (gnus-summary-position-point))
+
+;; All PostScript functions written by Erik Selberg <speed@cs.washington.edu>.
+
+(defun gnus-uu-decode-postscript (&optional n)
+  "Gets postscript of the current article."
+  (interactive "P")
+  (gnus-uu-decode-with-method 'gnus-uu-decode-postscript-article n))
+
+(defun gnus-uu-decode-postscript-view (&optional n)
+  "Gets and views the current article."
+  (interactive "P")
+  (let ((gnus-view-pseudos (or gnus-view-pseudos 'automatic)))
+    (gnus-uu-decode-postscript n)))
+
+(defun gnus-uu-decode-postscript-and-save (n dir)
+  "Extracts postscript and saves the current article."
+  (interactive
+   (list current-prefix-arg
+        (file-name-as-directory
+         (read-file-name "Save in dir: "
+                         gnus-uu-default-dir
+                         gnus-uu-default-dir t))))
+  (gnus-uu-decode-with-method 'gnus-uu-decode-postscript-article
+                             n dir nil nil t))
+
+(defun gnus-uu-decode-postscript-and-save-view (n dir)
+  "Decodes, views and saves the resulting file."
+  (interactive
+   (list current-prefix-arg
+        (read-file-name "Where do you want to save the file(s)? "
+                        gnus-uu-default-dir
+                        gnus-uu-default-dir t)))
+  (let ((gnus-view-pseudos (or gnus-view-pseudos 'automatic)))
+    (gnus-uu-decode-postscript-and-save n dir)))
+
+
+;; Internal functions.
+
+(defun gnus-uu-decode-with-method (method n &optional save not-insert
+                                         scan cdir)
+  (gnus-uu-initialize scan)
+  (when save
+    (setq gnus-uu-default-dir save))
+  ;; Create the directory we save to.
+  (when (and scan cdir save
+            (not (file-exists-p save)))
+    (make-directory save t))
+  (let ((articles (gnus-uu-get-list-of-articles n))
+       files)
+    (setq files (gnus-uu-grab-articles articles method t))
+    (let ((gnus-current-article (car articles)))
+      (when scan
+       (setq files (gnus-uu-scan-directory gnus-uu-work-dir))))
+    (when save
+      (gnus-uu-save-files files save))
+    (when (eq gnus-uu-do-not-unpack-archives nil)
+      (setq files (gnus-uu-unpack-files files)))
+    (setq files (nreverse (gnus-uu-get-actions files)))
+    (or not-insert (not gnus-insert-pseudo-articles)
+       (gnus-summary-insert-pseudos files save))))
+
+(defun gnus-uu-scan-directory (dir &optional rec)
+  "Return a list of all files under DIR."
+  (let ((files (directory-files dir t))
+       out file)
+    (while (setq file (pop files))
+      (unless (member (file-name-nondirectory file) '("." ".."))
+       (push (list (cons 'name file)
+                   (cons 'article gnus-current-article))
+             out)
+       (when (file-directory-p file)
+         (setq out (nconc (gnus-uu-scan-directory file t) out)))))
+    (if rec
+       out
+      (nreverse out))))
+
+(defun gnus-uu-save-files (files dir)
+  "Save FILES in DIR."
+  (let ((len (length files))
+       (reg (concat "^" (regexp-quote gnus-uu-work-dir)))
+       to-file file fromdir)
+    (while (setq file (cdr (assq 'name (pop files))))
+      (when (file-exists-p file)
+       (string-match reg file)
+       (setq fromdir (substring file (match-end 0)))
+       (if (file-directory-p file)
+           (gnus-make-directory (concat dir fromdir))
+         (setq to-file (concat dir fromdir))
+         (when (or (not (file-exists-p to-file))
+                   (eq gnus-uu-be-dangerous t)
+                   (and gnus-uu-be-dangerous
+                        (gnus-y-or-n-p (format "%s exists; overwrite? "
+                                               to-file))))
+           (copy-file file to-file t t)))))
+    (gnus-message 5 "Saved %d file%s" len (if (= len 1) "" "s"))))

 
 ;; Functions for saving and possibly digesting articles without
 ;; any decoding.
 
 
 ;; Functions for saving and possibly digesting articles without
 ;; any decoding.
 

-(defconst gnus-uu-saved-article-name nil)
-
-; VIEW isn't used, but is here anyway, to provide similar interface to
-; the other related functions.  If MARKED is non-nil, the list of
-; marked articles is used.  If NO-SAVE is non-nil, the articles aren't
-; actually saved in a permanent location, but the collecting is done
-; and a temporary file with the result is returned.
-(defun gnus-uu-save-articles (view marked &optional no-save)
-  (let (list-of-articles)
-    (save-excursion
-      (gnus-uu-initialize)
-      (if (not marked)
-         (setq list-of-articles (gnus-uu-get-list-of-articles))
-       (setq list-of-articles (setq gnus-newsgroup-processable 
-                                    (nreverse gnus-newsgroup-processable)))
-       (gnus-summary-unmark-all-processable))
-
-      (if (not list-of-articles)
-         (error "No list of articles"))
-
-      (if gnus-uu-save-separate-articles
-         (progn
-           (setq gnus-uu-saved-article-name 
-                 (gnus-uu-read-directory 
-                  (concat "Where do you want the files? "))))
-
-       (setq gnus-uu-saved-article-name 
-             (concat gnus-uu-work-dir 
-                     (if no-save
-                         gnus-newsgroup-name
-                       (read-file-name "Enter file name: " gnus-newsgroup-name
-                                       gnus-newsgroup-name))))
-       (gnus-uu-add-file gnus-uu-saved-article-name))
-
-      (if (and (gnus-uu-grab-articles list-of-articles 'gnus-uu-save-article t)
-              (not no-save) (not gnus-uu-save-separate-articles))
-         (gnus-uu-save-file gnus-uu-saved-article-name)
-       gnus-uu-saved-article-name))))
-
-; Function called by gnus-uu-grab-articles to treat each article.
+;; Function called by gnus-uu-grab-articles to treat each article.

 (defun gnus-uu-save-article (buffer in-state)
 (defun gnus-uu-save-article (buffer in-state)

-  (cond 
+  (cond

    (gnus-uu-save-separate-articles
     (save-excursion
       (set-buffer buffer)
    (gnus-uu-save-separate-articles
     (save-excursion
       (set-buffer buffer)

-      (write-region 1 (point-max) (concat gnus-uu-saved-article-name 
-                                         gnus-current-article))
+      (let ((coding-system-for-write mm-text-coding-system))
+       (gnus-write-buffer
+        (concat gnus-uu-saved-article-name gnus-current-article)))

       (cond ((eq in-state 'first) (list gnus-uu-saved-article-name 'begin))
       (cond ((eq in-state 'first) (list gnus-uu-saved-article-name 'begin))

-           ((eq in-state 'first-and-last) (list gnus-uu-saved-article-name 'begin 'end))
+           ((eq in-state 'first-and-last) (list gnus-uu-saved-article-name
+                                                'begin 'end))

            ((eq in-state 'last) (list 'end))
            (t (list 'middle)))))
    ((not gnus-uu-save-in-digest)
     (save-excursion
       (set-buffer buffer)
            ((eq in-state 'last) (list 'end))
            (t (list 'middle)))))
    ((not gnus-uu-save-in-digest)
     (save-excursion
       (set-buffer buffer)

-      (write-region 1 (point-max) gnus-uu-saved-article-name t)
+      (write-region (point-min) (point-max) gnus-uu-saved-article-name t)

       (cond ((eq in-state 'first) (list gnus-uu-saved-article-name 'begin))
       (cond ((eq in-state 'first) (list gnus-uu-saved-article-name 'begin))

-           ((eq in-state 'first-and-last) (list gnus-uu-saved-article-name 'begin 'end))
+           ((eq in-state 'first-and-last) (list gnus-uu-saved-article-name
+                                                'begin 'end))

            ((eq in-state 'last) (list 'end))
            (t (list 'middle)))))
            ((eq in-state 'last) (list 'end))
            (t (list 'middle)))))

-    (t
-     (let (beg subj name headers headline sorthead body end-string state)
-       (string-match "/\\([^/]*\\)$" gnus-uu-saved-article-name)
-       (setq name (substring gnus-uu-saved-article-name (match-beginning 1)
-                            (match-end 1)))
-       (if (or (eq in-state 'first) 
-              (eq in-state 'first-and-last))
-          (progn 
-            (setq state (list 'begin))
-            (save-excursion (set-buffer (get-buffer-create "*gnus-uu-body*"))
-                            (erase-buffer))
-            (save-excursion 
-              (set-buffer (get-buffer-create "*gnus-uu-pre*"))
-              (erase-buffer)
-              (insert (format 
-                       "Date: %s\nFrom: %s\nSubject: %s Digest\n\nTopics:\n"
-                       (current-time-string) name name))))
-        (if (not (eq in-state 'end))
-            (setq state (list 'middle))))
-       (save-excursion
-        (set-buffer (get-buffer "*gnus-uu-body*"))
-        (goto-char (setq beg (point-max)))
-        (save-excursion
-          (save-restriction
-            (set-buffer buffer)
-            (goto-char 1)
-            (re-search-forward "\n\n")
-            (setq body (buffer-substring (1- (point)) (point-max)))
-            (narrow-to-region 1 (point))
-            (setq headers (list "Date:" "From:" "To:" "Cc:" "Subject:"
-                                "Message-ID:" "Keywords:" "Summary:"))
-            (while headers
-              (setq headline (car headers))
-              (setq headers (cdr headers))
-              (goto-char 1)
-              (if (re-search-forward (concat "^" headline ".*$") nil t)
-                  (setq sorthead 
-                        (concat sorthead (buffer-substring 
-                                          (match-beginning 0)
-                                          (match-end 0)) "\n"))))
-            (widen)))
-        (insert sorthead)(goto-char (point-max))
-        (insert body)(goto-char (point-max))
-        (insert (concat "\n" (make-string 30 ?-) "\n\n"))
-        (goto-char beg)
-        (if (re-search-forward "^Subject: \\(.*\\)$" nil t)
-            (progn
-              (setq subj (buffer-substring (match-beginning 1) (match-end 1)))
-              (save-excursion 
-               (set-buffer (get-buffer "*gnus-uu-pre*"))
-               (insert (format "   %s\n" subj))))))
-      (if (or (eq in-state 'last)
+   (t
+    (let ((header (gnus-summary-article-header)))
+      (push (cons (mail-header-from header)
+                 (mail-header-subject header))
+           gnus-uu-digest-from-subject))
+    (let ((name (file-name-nondirectory gnus-uu-saved-article-name))
+         beg subj headers headline sorthead body end-string state)
+      (if (or (eq in-state 'first)

              (eq in-state 'first-and-last))
          (progn
              (eq in-state 'first-and-last))
          (progn

+           (setq state (list 'begin))

            (save-excursion
            (save-excursion

-             (set-buffer (get-buffer "*gnus-uu-pre*"))
-             (insert (format "\n\n%s\n\n" (make-string 70 ?-)))
-             (write-region 1 (point-max) gnus-uu-saved-article-name))
+             (set-buffer (gnus-get-buffer-create "*gnus-uu-body*"))
+             (erase-buffer))

            (save-excursion
            (save-excursion

-             (set-buffer (get-buffer "*gnus-uu-body*"))
+             (set-buffer (gnus-get-buffer-create "*gnus-uu-pre*"))
+             (erase-buffer)
+             (insert (format
+                      "Date: %s\nFrom: %s\nSubject: %s Digest\n\n"
+                      (current-time-string) name name))
+             (when (and message-forward-as-mime gnus-uu-digest-buffer)
+               (insert "<#part type=message/rfc822>\nSubject: Topics\n\n"))
+             (insert "Topics:\n")))
+       (when (not (eq in-state 'end))
+         (setq state (list 'middle))))
+      (save-excursion
+       (set-buffer "*gnus-uu-body*")
+       (goto-char (setq beg (point-max)))
+       (save-excursion
+         (save-restriction
+           (set-buffer buffer)
+           (let (buffer-read-only)
+             (gnus-set-text-properties (point-min) (point-max) nil)
+             ;; These two are necessary for XEmacs 19.12 fascism.
+             (put-text-property (point-min) (point-max) 'invisible nil)
+             (put-text-property (point-min) (point-max) 'intangible nil))
+           (when (and message-forward-as-mime
+                      message-forward-show-mml
+                      gnus-uu-digest-buffer)
+             (mm-enable-multibyte)
+             (mime-to-mml))
+           (goto-char (point-min))
+           (re-search-forward "\n\n")
+           (unless (and message-forward-as-mime gnus-uu-digest-buffer)
+             ;; Quote all 30-dash lines.
+             (save-excursion
+               (while (re-search-forward "^-" nil t)
+                 (beginning-of-line)
+                 (delete-char 1)
+                 (insert "- "))))
+           (setq body (buffer-substring (1- (point)) (point-max)))
+           (narrow-to-region (point-min) (point))
+           (if (not (setq headers gnus-uu-digest-headers))
+               (setq sorthead (buffer-substring (point-min) (point-max)))
+             (while headers
+               (setq headline (car headers))
+               (setq headers (cdr headers))
+               (goto-char (point-min))
+               (while (re-search-forward headline nil t)
+                 (setq sorthead
+                       (concat sorthead
+                               (buffer-substring
+                                (match-beginning 0)
+                                (or (and (re-search-forward "^[^ \t]" nil t)
+                                         (1- (point)))
+                                    (progn (forward-line 1) (point)))))))))
+           (widen)))
+       (if (and message-forward-as-mime gnus-uu-digest-buffer)
+         (if message-forward-show-mml
+             (progn
+               (insert "\n<#mml type=message/rfc822>\n")
+               (insert sorthead) (goto-char (point-max))
+               (insert body) (goto-char (point-max))
+               (insert "\n<#/mml>\n"))
+           (let ((buf (mml-generate-new-buffer " *mml*")))
+             (with-current-buffer buf
+               (insert sorthead)
+               (goto-char (point-min))
+               (when (re-search-forward "^Subject: \\(.*\\)$" nil t)
+                 (setq subj (buffer-substring (match-beginning 1)
+                                              (match-end 1))))
+               (goto-char (point-max))
+               (insert body))
+             (insert "\n<#part type=message/rfc822"
+                     " buffer=\"" (buffer-name buf) "\">\n")))
+         (insert sorthead) (goto-char (point-max))
+         (insert body) (goto-char (point-max))
+         (insert (concat "\n" (make-string 30 ?-) "\n\n")))
+       (goto-char beg)
+       (when (re-search-forward "^Subject: \\(.*\\)$" nil t)
+         (setq subj (buffer-substring (match-beginning 1) (match-end 1))))
+       (when subj
+         (save-excursion
+           (set-buffer "*gnus-uu-pre*")
+           (insert (format "   %s\n" subj)))))
+      (when (or (eq in-state 'last)
+               (eq in-state 'first-and-last))
+       (if (and message-forward-as-mime gnus-uu-digest-buffer)
+           (with-current-buffer gnus-uu-digest-buffer
+             (erase-buffer)
+             (insert-buffer "*gnus-uu-pre*")

              (goto-char (point-max))
              (goto-char (point-max))

-             (insert 
-              (concat (setq end-string (format "End of %s Digest" name)) 
-                      "\n"))
-             (insert (concat (make-string (length end-string) ?*) "\n"))
-             (write-region 1 (point-max) gnus-uu-saved-article-name t))
-           (kill-buffer (get-buffer "*gnus-uu-pre*"))
-           (kill-buffer (get-buffer "*gnus-uu-body*"))
-           (setq state (cons 'end state))))
+             (insert-buffer "*gnus-uu-body*"))
+         (save-excursion
+           (set-buffer "*gnus-uu-pre*")
+           (insert (format "\n\n%s\n\n" (make-string 70 ?-)))
+           (if gnus-uu-digest-buffer
+               (with-current-buffer gnus-uu-digest-buffer
+                 (erase-buffer)
+                 (insert-buffer "*gnus-uu-pre*"))
+             (let ((coding-system-for-write mm-text-coding-system))
+               (gnus-write-buffer gnus-uu-saved-article-name))))
+         (save-excursion
+           (set-buffer "*gnus-uu-body*")
+           (goto-char (point-max))
+           (insert
+            (concat (setq end-string (format "End of %s Digest" name))
+                    "\n"))
+           (insert (concat (make-string (length end-string) ?*) "\n"))
+           (if gnus-uu-digest-buffer
+               (with-current-buffer gnus-uu-digest-buffer
+                 (goto-char (point-max))
+                 (insert-buffer "*gnus-uu-body*"))
+             (let ((coding-system-for-write mm-text-coding-system)
+                   (file-name-coding-system nnmail-pathname-coding-system))
+               (write-region
+                (point-min) (point-max) gnus-uu-saved-article-name t)))))
+       (gnus-kill-buffer "*gnus-uu-pre*")
+       (gnus-kill-buffer "*gnus-uu-body*")
+       (push 'end state))

       (if (memq 'begin state)
          (cons gnus-uu-saved-article-name state)
        state)))))
 
       (if (memq 'begin state)
          (cons gnus-uu-saved-article-name state)
        state)))))
 

-;; Digest and forward articles
-
-(defun gnus-uu-digest-and-forward (&optional marked)
-  "Digests and forwards all articles in this series."
-  (interactive)
-  (let ((gnus-uu-save-in-digest t)
-       file buf)
-    (setq file (gnus-uu-save-articles nil marked t))
-    (switch-to-buffer (setq buf (get-buffer-create "*gnus-uu-forward*")))
-    (erase-buffer)
-    (delete-other-windows)
-    (erase-buffer)
-    (insert-file file)
-    (goto-char 1)
-    (bury-buffer buf)
-    (funcall gnus-mail-forward-method)))
-
-(defun gnus-uu-marked-digest-and-forward (&optional marked)
-  "Digests and forwards all marked articles."
-  (interactive)
-  (gnus-uu-digest-and-forward t))
-
+;; Binhex treatment - not very advanced.

 
 

-;; Binhex treatment - not very advanced. 
-
-(defconst gnus-uu-binhex-body-line 
+(defvar gnus-uu-binhex-body-line

   "^[^:]...............................................................$")
   "^[^:]...............................................................$")

-(defconst gnus-uu-binhex-begin-line 
+(defvar gnus-uu-binhex-begin-line

   "^:...............................................................$")
   "^:...............................................................$")

-(defconst gnus-uu-binhex-end-line
+(defvar gnus-uu-binhex-end-line

   ":$")
   ":$")

-(defvar gnus-uu-binhex-article-name nil)
-
-; This just concatenates and strips stuff from binhexed articles.
-; No actual unbinhexing takes place. VIEW is ignored.
-(defun gnus-uu-binhex-and-save (view marked)
-  (gnus-uu-initialize)
-  (let (list-of-articles)
-    (save-excursion
-      (if (not marked)
-         (setq list-of-articles (gnus-uu-get-list-of-articles))
-       (setq list-of-articles 
-             (setq gnus-newsgroup-processable 
-                   (nreverse gnus-newsgroup-processable)))
-       (gnus-summary-unmark-all-processable))
-      (if (not list-of-articles)
-         (error "No list of articles"))
-
-      (setq gnus-uu-binhex-article-name 
-           (concat gnus-uu-work-dir 
-                   (read-file-name "Enter binhex file name: " 
-                                   gnus-newsgroup-name
-                                   gnus-newsgroup-name)))
-      (gnus-uu-add-file gnus-uu-binhex-article-name)
-      (if (gnus-uu-grab-articles list-of-articles 'gnus-uu-binhex-article t)
-         (gnus-uu-save-file gnus-uu-binhex-article-name))))
-  (gnus-uu-check-for-generated-files)
-  (gnus-uu-summary-next-subject))

 
 (defun gnus-uu-binhex-article (buffer in-state)
   (let (state start-char)
     (save-excursion
       (set-buffer buffer)
       (widen)
 
 (defun gnus-uu-binhex-article (buffer in-state)
   (let (state start-char)
     (save-excursion
       (set-buffer buffer)
       (widen)

-      (goto-char 1)
-      (if (not (re-search-forward gnus-uu-binhex-begin-line nil t))
-         (if (not (re-search-forward gnus-uu-binhex-body-line nil t))
-             (setq state (list 'wrong-type))))
+      (goto-char (point-min))
+      (when (not (re-search-forward gnus-uu-binhex-begin-line nil t))
+       (when (not (re-search-forward gnus-uu-binhex-body-line nil t))
+         (setq state (list 'wrong-type))))

 
       (if (memq 'wrong-type state)
          ()
 
       (if (memq 'wrong-type state)
          ()


@@ -1461,353 +1028,241 @@ what files."
              (write-region 1 1 gnus-uu-binhex-article-name))
          (setq state (list 'middle)))
        (goto-char (point-max))
              (write-region 1 1 gnus-uu-binhex-article-name))
          (setq state (list 'middle)))
        (goto-char (point-max))

-       (re-search-backward (concat gnus-uu-binhex-body-line "\\|" 
-                                   gnus-uu-binhex-end-line) nil t)
-       (if (looking-at gnus-uu-binhex-end-line)
-           (setq state (if (memq 'begin state)
-                           (cons 'end state)
-                         (list 'end))))
+       (re-search-backward (concat gnus-uu-binhex-body-line "\\|"
+                                   gnus-uu-binhex-end-line)
+                           nil t)
+       (when (looking-at gnus-uu-binhex-end-line)
+         (setq state (if (memq 'begin state)
+                         (cons 'end state)
+                       (list 'end))))

        (beginning-of-line)
        (forward-line 1)
        (beginning-of-line)
        (forward-line 1)

-       (if (file-exists-p gnus-uu-binhex-article-name)
-           (append-to-file start-char (point) gnus-uu-binhex-article-name))))
+       (when (file-exists-p gnus-uu-binhex-article-name)
+         (mm-append-to-file start-char (point) gnus-uu-binhex-article-name))))

     (if (memq 'begin state)
        (cons gnus-uu-binhex-article-name state)
       state)))
     (if (memq 'begin state)
        (cons gnus-uu-binhex-article-name state)
       state)))

-      
-
-;; Internal view commands
-
-; This function takes two parameters. The first is name of the file to
-; be viewed. `gnus-uu-view-file' will look for an action associated
-; with the file type of the file. If it finds an appropriate action,
-; the file will be attempted displayed.
-; 
-; The second parameter specifies if the user is to be asked whether to
-; save the file if viewing is unsuccessful. t means "do not ask."
-;
-; Note that the file given will be deleted by this function, one way
-; or another. If `gnus-uu-asynchronous' is set, it won't be deleted
-; right away, but sometime later. If the user is offered to save the
-; file, it'll be moved to wherever the user wants it.
-
-; `gnus-uu-view-file' returns t if viewing is successful.
-
-(defun gnus-uu-view-file (file &optional silent)
-  (let (action did-view)
-    (cond 
-     ((not (setq action (gnus-uu-get-action file)))
-      (if (and (not silent) (not gnus-uu-use-interactive-view))
-         (progn
-           (message "Couldn't find any rule for file '%s'" file)
-           (sleep-for 2)
-           (gnus-uu-ask-to-save-file file))))
-     
-     ((and gnus-uu-use-interactive-view 
-          (not (string= (or action "") "gnus-uu-archive")))
-      (gnus-uu-enter-interactive-file (or action "") file))
-
-     (gnus-uu-ask-before-view
-      (if (y-or-n-p (format "Do you want to view %s? " file))
-         (setq did-view (gnus-uu-call-file-action file action)))
-      (message ""))
-     
-     ((setq did-view (gnus-uu-call-file-action file action)))
-
-     ((not silent)
-      (gnus-uu-ask-to-save-file file)))
-
-    (if (and (file-exists-p file) 
-            (not gnus-uu-use-interactive-view)
-            (or 
-             (not (and gnus-uu-asynchronous did-view))
-             (string= (or action  "") "gnus-uu-archive")))
-       (delete-file file))
-
-  did-view))
-
-(defun gnus-uu-call-file-action (file action)
-  (prog1
-      (if gnus-uu-asynchronous
-         (gnus-uu-call-asynchronous file action)
-       (gnus-uu-call-synchronous file action))
-    (if gnus-uu-view-and-save
-       (gnus-uu-ask-to-save-file file))))
-
-(defun gnus-uu-ask-to-save-file (file)
-  (if (y-or-n-p (format "Do you want to save the file %s? " file))
-      (gnus-uu-save-file file))
-  (message ""))
+
+;; PostScript
+
+(defun gnus-uu-decode-postscript-article (process-buffer in-state)
+  (let ((state (list 'ok))
+       start-char end-char file-name)
+    (save-excursion
+      (set-buffer process-buffer)
+      (goto-char (point-min))
+      (if (not (re-search-forward gnus-uu-postscript-begin-string nil t))
+         (setq state (list 'wrong-type))
+       (beginning-of-line)
+       (setq start-char (point))
+       (if (not (re-search-forward gnus-uu-postscript-end-string nil t))
+           (setq state (list 'wrong-type))
+         (setq end-char (point))
+         (set-buffer (gnus-get-buffer-create gnus-uu-output-buffer-name))
+         (insert-buffer-substring process-buffer start-char end-char)
+         (setq file-name (concat gnus-uu-work-dir
+                                 (cdr gnus-article-current) ".ps"))
+         (write-region (point-min) (point-max) file-name)
+         (setq state (list file-name 'begin 'end)))))
+    state))
+
+
+;; Find actions.
+
+(defun gnus-uu-get-actions (files)
+  (let ((ofiles files)
+       action name)
+    (while files
+      (setq name (cdr (assq 'name (car files))))
+      (and
+       (setq action (gnus-uu-get-action name))
+       (setcar files (nconc (list (if (string= action "gnus-uu-archive")
+                                     (cons 'action "file")
+                                   (cons 'action action))
+                                 (cons 'execute (gnus-uu-command
+                                                 action name)))
+                           (car files))))
+      (setq files (cdr files)))
+    ofiles))

 
 (defun gnus-uu-get-action (file-name)
   (let (action)
 
 (defun gnus-uu-get-action (file-name)
   (let (action)

-    (setq action 
-         (gnus-uu-choose-action 
+    (setq action
+         (gnus-uu-choose-action

           file-name
           file-name

-          (append 
-           (if (and gnus-uu-use-interactive-view 
-                    gnus-uu-user-interactive-view-rules)
-               gnus-uu-user-interactive-view-rules
-             gnus-uu-user-view-rules)
-           (if (or gnus-uu-ignore-default-view-rules 
-                   (not gnus-uu-use-interactive-view))
-               ()
-             gnus-uu-default-interactive-view-rules-begin)
-           (if gnus-uu-ignore-default-view-rules 
-               nil 
+          (append
+           gnus-uu-user-view-rules
+           (if gnus-uu-ignore-default-view-rules
+               nil

              gnus-uu-default-view-rules)
              gnus-uu-default-view-rules)

-           (if gnus-uu-use-interactive-view
-               (append gnus-uu-user-interactive-view-rules-end
-                       (if gnus-uu-ignore-default-view-rules
-                           ()
-                         gnus-uu-default-interactive-view-rules-end))
-             gnus-uu-user-view-rules-end))))
-    (if (and (not (string= (or action "") "gnus-uu-archive")) 
-            gnus-uu-view-with-metamail)
-       (if (setq action 
+           gnus-uu-user-view-rules-end)))
+    (when (and (not (string= (or action "") "gnus-uu-archive"))
+              gnus-uu-view-with-metamail)
+      (when (setq action

                  (gnus-uu-choose-action file-name gnus-uu-ext-to-mime-list))
                  (gnus-uu-choose-action file-name gnus-uu-ext-to-mime-list))

-           (setq action (format "metamail -d -b -c \"%s\"" action))))
+       (setq action (format "metamail -d -b -c \"%s\"" action))))

     action))
 
     action))
 

-; `gnus-uu-call-synchronous' takes two parameters: The name of the
-; file to be displayed and the command to display it with. Returns t
-; on success and nil if the file couldn't be displayed.
-(defun gnus-uu-call-synchronous (file-name action)
-  (let (did-view command)
-    (save-excursion
-      (set-buffer (get-buffer-create gnus-uu-output-buffer-name))
-      (erase-buffer)
-      (setq command (gnus-uu-command action file-name))
-      (message "Viewing with '%s'" command)
-      (if (not (= 0 (call-process "sh" nil t nil "-c" command)))
-         (progn
-           (goto-char 1)
-           (while (re-search-forward "\n" nil t)
-             (replace-match " "))
-           (message (concat "Error: " (buffer-substring 1 (point-max))))
-           (sit-for 2))
-       (message "")
-       (setq did-view t)))
-    did-view))
-
-; `gnus-uu-call-asyncronous' takes two parameters: The name of the
-; file to be displayed and the command to display it with. Since the
-; view command is executed asynchronously, it's kinda hard to decide
-; whether the command succeded or not, so this function always returns
-; t. It also adds "; rm -f file-name" to the end of the execution
-; string, so the file will be removed after viewing has ended.
-(defun gnus-uu-call-asynchronous (file-name action)
-  (let (command file tmp-file start)
-    (while (string-match "/" file-name start)
-      (setq start (1+ (match-beginning 0))))
-    (setq file (substring file-name start))
-    (setq tmp-file (concat gnus-uu-work-dir file))
-    (if (string= tmp-file file-name)
-       ()
-      (rename-file file-name tmp-file t)
-      (setq file-name tmp-file))
-
-    (setq command (gnus-uu-command action file-name))
-    (setq command (format "%s ; rm -f %s" command file-name))
-    (message "Viewing with %s" command)
-    (start-process "gnus-uu-view" nil "sh" "-c" command)
-    t))

 
 

-; `gnus-uu-decode-and-strip' does all the main work. It finds out what
-; articles to grab, grabs them, strips the result and decodes. If any
-; of these operations fail, it returns nil, t otherwise.  If shar is
-; t, it will pass this on to `gnus-uu-grab-articles', which will
-; (probably) unshar the articles. If use-marked is non-nil, it won't
-; try to find articles, but use the marked list.
-(defun gnus-uu-decode-and-strip (&optional shar use-marked limit)
-  (let (list-of-articles)
-    (save-excursion
+;; Functions for treating subjects and collecting series.

 
 

-      (if use-marked
-         (if (not gnus-newsgroup-processable)
-             (message "No articles marked")
-           (setq list-of-articles 
-                 (setq gnus-newsgroup-processable 
-                       (nreverse gnus-newsgroup-processable)))
-           (gnus-summary-unmark-all-processable))
-       (setq list-of-articles (gnus-uu-get-list-of-articles)))
-      
-      (and list-of-articles
-          (gnus-uu-grab-articles 
-           list-of-articles 
-           (if shar 'gnus-uu-unshar-article 'gnus-uu-uustrip-article-as)
-           t limit)))))
-
-; Takes a string and puts a \ in front of every special character;
-; ignores any leading "version numbers" thingies that they use in the
-; comp.binaries groups, and either replaces anything that looks like
-; "2/3" with "[0-9]+/[0-9]+" or, if it can't find something like that,
-; replaces the last two numbers with "[0-9]+". This, in my experience,
-; should get most postings of a series.

 (defun gnus-uu-reginize-string (string)
 (defun gnus-uu-reginize-string (string)

-  (let ((count 2)
-       (vernum "v[0-9]+[a-z][0-9]+:")
-       reg beg)
-    (save-excursion
-      (set-buffer (get-buffer-create gnus-uu-output-buffer-name))
-      (buffer-disable-undo (current-buffer))
-      (erase-buffer)
-      (insert (regexp-quote string))
-      (setq beg 1)
+  ;; Takes a string and puts a \ in front of every special character;
+  ;; replaces the last thing that looks like "2/3" with "[0-9]+/3"
+  ;; or, if it can't find something like that, tries "2 of 3", then
+  ;; finally just replaces the next to last number with "[0-9]+".
+  (save-excursion
+    (set-buffer (gnus-get-buffer-create gnus-uu-output-buffer-name))
+    (buffer-disable-undo)
+    (erase-buffer)
+    (insert (regexp-quote string))

 
 

-      (setq case-fold-search nil)
-      (goto-char 1)
-      (if (looking-at vernum)
-         (progn
-           (replace-match vernum t t)
-           (setq beg (length vernum))))
+    (setq case-fold-search nil)

 
 

-      (goto-char beg)
-      (if (re-search-forward "[ \t]*[0-9]+/[0-9]+" nil t)
-         (replace-match " [0-9]+/[0-9]+")
+    (end-of-line)
+    (if (re-search-backward "\\([^0-9]\\)[0-9]+/\\([0-9]+\\)" nil t)
+       (replace-match "\\1[0-9]+/\\2")

 
 

-       (goto-char beg)
-       (if (re-search-forward "[0-9]+[ \t]*of[ \t]*[0-9]+" nil t)
-           (replace-match "[0-9]+ of [0-9]+")
+      (end-of-line)
+      (if (re-search-backward "\\([^0-9]\\)[0-9]+[ \t]*of[ \t]*\\([0-9]+\\)"
+                             nil t)
+         (replace-match "\\1[0-9]+ of \\2")

 
 

-         (end-of-line)
-         (while (and (re-search-backward "[0-9]" nil t) (> count 0))
-            (while (and 
-                   (looking-at "[0-9]") 
-                   (< 1 (goto-char (1- (point))))))
-            (re-search-forward "[0-9]+" nil t)
-           (replace-match "[0-9]+")
-           (backward-char 5)
-           (setq count (1- count)))))
-
-      (goto-char beg)
-      (while (re-search-forward "[ \t]+" nil t)
-       (replace-match "[ \t]*" t t))
-
-      (buffer-substring 1 (point-max)))))
-
-(defsubst gnus-uu-string< (l1 l2)
+       (end-of-line)
+       (if (re-search-backward "\\([^0-9]\\)[0-9]+\\([^0-9]+\\)[0-9]+"
+                               nil t)
+           (replace-match "\\1[0-9]+\\2[0-9]+" t nil nil nil))))
+
+    (goto-char 1)
+    (while (re-search-forward "[ \t]+" nil t)
+      (replace-match "[ \t]+" t t))
+
+    (buffer-substring 1 (point-max))))
+
+(defun gnus-uu-get-list-of-articles (n)
+  ;; If N is non-nil, the article numbers of the N next articles
+  ;; will be returned.
+  ;; If any articles have been marked as processable, they will be
+  ;; returned.
+  ;; Failing that, articles that have subjects that are part of the
+  ;; same "series" as the current will be returned.
+  (let (articles)
+    (cond
+     (n
+      (setq n (prefix-numeric-value n))
+      (let ((backward (< n 0))
+           (n (abs n)))
+       (save-excursion
+         (while (and (> n 0)
+                     (push (gnus-summary-article-number)
+                           articles)
+                     (gnus-summary-search-forward nil nil backward))
+           (setq n (1- n))))
+       (nreverse articles)))
+     (gnus-newsgroup-processable
+      (reverse gnus-newsgroup-processable))
+     (t
+      (gnus-uu-find-articles-matching)))))
+
+(defun gnus-uu-string< (l1 l2)

   (string< (car l1) (car l2)))
 
   (string< (car l1) (car l2)))
 

-; Finds all articles that matches the regular expression given.
-; Returns the resulting list. SUBJECT is the regular expression to be
-; matched. If it is nil, the current article name will be used. If
-; MARK-ARTICLES is non-nil, articles found are marked. If ONLY-UNREAD
-; is non-nil, only unread articles are chose. If DO-NOT-TRANSLATE is
-; non-nil, article names are not equialized before sorting.
-(defun gnus-uu-get-list-of-articles (&optional subject mark-articles only-unread do-not-translate)
-  (let (beg end reg-subject list-of-subjects list-of-numbers art-num)
+(defun gnus-uu-find-articles-matching
+  (&optional subject only-unread do-not-translate)
+  ;; Finds all articles that matches the regexp SUBJECT.  If it is
+  ;; nil, the current article name will be used.  If ONLY-UNREAD is
+  ;; non-nil, only unread articles are chosen.  If DO-NOT-TRANSLATE is
+  ;; non-nil, article names are not equalized before sorting.
+  (let ((subject (or subject
+                    (gnus-uu-reginize-string (gnus-summary-article-subject))))
+       list-of-subjects)

     (save-excursion
     (save-excursion

-      
-; If the subject is not given, this function looks at the current subject
-; and takes that.
-
-      (if subject
-         (setq reg-subject subject)
-       (setq reg-subject 
-             (format "%s %s [0-9]+ [0-9]+[\n\r]"
-              (gnus-uu-reginize-string (gnus-summary-subject-string))
-              (if only-unread "[- ]" "."))))
-
-      (if reg-subject
-         (progn
-
-; Collect all subjects matching reg-subject.
-
-           (let ((case-fold-search t))
-             (goto-char 1)
-             (while (re-search-forward reg-subject nil t)
-               (progn
-                 (forward-line -1)
-                 (setq list-of-subjects 
-                       (cons (cons (gnus-summary-subject-string)
-                                   (gnus-summary-article-number))
-                             list-of-subjects))
-                 (forward-line 1))))
+      (when subject
+       ;; Collect all subjects matching subject.
+       (let ((case-fold-search t)
+             (data gnus-newsgroup-data)
+             subj mark d)
+         (while data
+           (setq d (pop data))
+           (and (not (gnus-data-pseudo-p d))
+                (or (not only-unread)
+                    (= (setq mark (gnus-data-mark d))
+                       gnus-unread-mark)
+                    (= mark gnus-ticked-mark)
+                    (= mark gnus-dormant-mark))
+                (setq subj (mail-header-subject (gnus-data-header d)))
+                (string-match subject subj)
+                (push (cons subj (gnus-data-number d))
+                      list-of-subjects))))
+
+       ;; Expand numbers, sort, and return the list of article
+       ;; numbers.
+       (mapcar (lambda (sub) (cdr sub))
+               (sort (gnus-uu-expand-numbers
+                      list-of-subjects
+                      (not do-not-translate))
+                     'gnus-uu-string<))))))

 
 

-; Expand all numbers in all the subjects: (hi9 -> hi0009, etc).
-
-           (setq list-of-subjects 
-                 (gnus-uu-expand-numbers list-of-subjects
-                                         (not do-not-translate)))
-
-; Sort the subjects.
-
-           (setq list-of-subjects (sort list-of-subjects 'gnus-uu-string<))
-
-; Get the article numbers from the sorted list of subjects.
-
-           (while list-of-subjects 
-             (setq art-num (cdr (car list-of-subjects)))
-             (if mark-articles (gnus-summary-mark-as-read art-num ?#))
-             (setq list-of-numbers (cons art-num list-of-numbers))
-             (setq list-of-subjects (cdr list-of-subjects)))
-
-           (setq list-of-numbers (nreverse list-of-numbers))))
-
-      list-of-numbers)))
-
-; Takes a list of strings and "expands" all numbers in all the
-; strings.  That is, this function makes all numbers equal length by
-; prepending lots of zeroes before each number. This is to ease later
-; sorting to find out what sequence the articles are supposed to be
-; decoded in. Returns the list of expanded strings.

 (defun gnus-uu-expand-numbers (string-list &optional translate)
 (defun gnus-uu-expand-numbers (string-list &optional translate)

+  ;; Takes a list of strings and "expands" all numbers in all the
+  ;; strings.  That is, this function makes all numbers equal length by
+  ;; prepending lots of zeroes before each number.  This is to ease later
+  ;; sorting to find out what sequence the articles are supposed to be
+  ;; decoded in.  Returns the list of expanded strings.

   (let ((out-list string-list)
   (let ((out-list string-list)

-       string pos num)
+       string)

     (save-excursion
     (save-excursion

-      (set-buffer (get-buffer-create gnus-uu-output-buffer-name))
-      (buffer-disable-undo (current-buffer))
+      (set-buffer (gnus-get-buffer-create gnus-uu-output-buffer-name))
+      (buffer-disable-undo)

       (while string-list
        (erase-buffer)
       (while string-list
        (erase-buffer)

-       (insert (car (car string-list)))
+       (insert (caar string-list))

        ;; Translate multiple spaces to one space.
        ;; Translate multiple spaces to one space.

-       (goto-char 1)
+       (goto-char (point-min))

        (while (re-search-forward "[ \t]+" nil t)
          (replace-match " "))
        ;; Translate all characters to "a".
        (while (re-search-forward "[ \t]+" nil t)
          (replace-match " "))
        ;; Translate all characters to "a".

-       (goto-char 1)
-       (if translate 
-           (while (re-search-forward "[A-Za-z]" nil t)
-             (replace-match "a" t t)))
+       (goto-char (point-min))
+       (when translate
+         (while (re-search-forward "[A-Za-z]" nil t)
+           (replace-match "a" t t)))

        ;; Expand numbers.
        ;; Expand numbers.

-       (goto-char 1)
+       (goto-char (point-min))

        (while (re-search-forward "[0-9]+" nil t)
        (while (re-search-forward "[0-9]+" nil t)

-         (replace-match  
-          (format "%06d" 
-                  (string-to-int (buffer-substring 
-                                  (match-beginning 0) (match-end 0))))))
+         (ignore-errors
+           (replace-match
+            (format "%06d"
+                    (string-to-int (buffer-substring
+                                    (match-beginning 0) (match-end 0)))))))

        (setq string (buffer-substring 1 (point-max)))
        (setcar (car string-list) string)
        (setq string-list (cdr string-list))))
     out-list))
 
 
        (setq string (buffer-substring 1 (point-max)))
        (setcar (car string-list) string)
        (setq string-list (cdr string-list))))
     out-list))
 
 

-;; gnus-uu-grab-article
-;
-; This is the general multi-article treatment function.  It takes a
-; list of articles to be grabbed and a function to apply to each
-; article. 
-;
-; The function to be called should take two parameters.  The first
-; parameter is the article buffer. The function should leave the
-; result, if any, in this buffer. Most treatment functions will just
-; generate files...
-;
-; The second parameter is the state of the list of articles, and can
-; have four values: `first', `middle', `last' and `first-and-last'.
-;
-; The function should return a list. The list may contain the
-; following symbols:
-; `error' if an error occurred
-; `begin' if the beginning of an encoded file has been received
-;   If the list returned contains a `begin', the first element of
-;   the list *must* be a string with the file name of the decoded
-;   file.
-; `end' if the the end of an encoded file has been received
-; `middle' if the article was a body part of an encoded file
-; `wrong-type' if the article was not a part of an encoded file
-; `ok', which can be used everything is ok
+;; `gnus-uu-grab-articles' is the general multi-article treatment
+;; function.  It takes a list of articles to be grabbed and a function
+;; to apply to each article.
+;;
+;; The function to be called should take two parameters.  The first
+;; parameter is the article buffer.  The function should leave the
+;; result, if any, in this buffer.  Most treatment functions will just
+;; generate files...
+;;
+;; The second parameter is the state of the list of articles, and can
+;; have four values: `first', `middle', `last' and `first-and-last'.
+;;
+;; The function should return a list.  The list may contain the
+;; following symbols:
+;; `error' if an error occurred
+;; `begin' if the beginning of an encoded file has been received
+;;   If the list returned contains a `begin', the first element of
+;;   the list *must* be a string with the file name of the decoded
+;;   file.
+;; `end' if the end of an encoded file has been received
+;; `middle' if the article was a body part of an encoded file
+;; `wrong-type' if the article was not a part of an encoded file
+;; `ok', which can be used everything is ok

 
 (defvar gnus-uu-has-been-grabbed nil)
 
 
 (defvar gnus-uu-has-been-grabbed nil)
 


@@ -1816,1340 +1271,849 @@ what files."
     (if (not (and gnus-uu-has-been-grabbed
                  gnus-uu-unmark-articles-not-decoded))
        ()
     (if (not (and gnus-uu-has-been-grabbed
                  gnus-uu-unmark-articles-not-decoded))
        ()

-      (if dont-unmark-last-article
-         (progn
-           (setq art (car gnus-uu-has-been-grabbed))
-           (setq gnus-uu-has-been-grabbed (cdr gnus-uu-has-been-grabbed))))
+      (when dont-unmark-last-article
+       (setq art (car gnus-uu-has-been-grabbed))
+       (setq gnus-uu-has-been-grabbed (cdr gnus-uu-has-been-grabbed)))

       (while gnus-uu-has-been-grabbed
        (gnus-summary-tick-article (car gnus-uu-has-been-grabbed) t)
        (setq gnus-uu-has-been-grabbed (cdr gnus-uu-has-been-grabbed)))
       (while gnus-uu-has-been-grabbed
        (gnus-summary-tick-article (car gnus-uu-has-been-grabbed) t)
        (setq gnus-uu-has-been-grabbed (cdr gnus-uu-has-been-grabbed)))

-      (if dont-unmark-last-article
-         (setq gnus-uu-has-been-grabbed (list art))))))
-
-; This function takes a list of articles and a function to apply to
-; each article grabbed. 
-; 
-; This function returns a list of files decoded if the grabbing and
-; the process-function has been successful and nil otherwise.
-(defun gnus-uu-grab-articles (list-of-articles process-function &optional sloppy limit no-errors)
-  (let ((state 'first) 
-       (wrong-type t)
-       has-been-begin has-been-end 
-       article result-file result-files process-state article-buffer)
- 
-    (if (not (gnus-server-opened gnus-current-select-method))
-       (progn
-         (gnus-start-news-server)
-         (gnus-request-group gnus-newsgroup-name)))
-
-    (setq gnus-uu-has-been-grabbed nil)
-
-    (while (and list-of-articles 
+      (when dont-unmark-last-article
+       (setq gnus-uu-has-been-grabbed (list art))))))
+
+;; This function takes a list of articles and a function to apply to
+;; each article grabbed.
+;;
+;; This function returns a list of files decoded if the grabbing and
+;; the process-function has been successful and nil otherwise.
+(defun gnus-uu-grab-articles (articles process-function
+                                      &optional sloppy limit no-errors)
+  (let ((state 'first)
+       (gnus-asynchronous nil)
+       (gnus-inhibit-treatment t)
+       has-been-begin article result-file result-files process-state
+       gnus-summary-display-article-function
+       gnus-article-prepare-hook gnus-display-mime-function
+       article-series files)
+
+    (while (and articles

                (not (memq 'error process-state))
                (or sloppy
                    (not (memq 'end process-state))))
 
                (not (memq 'error process-state))
                (or sloppy
                    (not (memq 'end process-state))))
 

-      (setq article (car list-of-articles))
-      (setq list-of-articles (cdr list-of-articles))
-      (setq gnus-uu-has-been-grabbed (cons article gnus-uu-has-been-grabbed))
-
-      (if (> article gnus-uu-highest-article-number) 
-         (setq gnus-uu-highest-article-number article))
+      (setq article (pop articles))
+      (when (vectorp (gnus-summary-article-header article))
+       (push article article-series)

 
 

-      (if (eq list-of-articles ()) 
+       (unless articles

          (if (eq state 'first)
              (setq state 'first-and-last)
            (setq state 'last)))
 
          (if (eq state 'first)
              (setq state 'first-and-last)
            (setq state 'last)))
 

-      (message "Getting article %d" article)
-
-      (if (not (gnus-server-opened gnus-current-select-method))
-         (progn
-           (gnus-start-news-server)
-           (gnus-request-group gnus-newsgroup-name)))
-
-      (if (not (= (or gnus-current-article 0) article))
-         (progn
-           (gnus-request-article article gnus-newsgroup-name)
-           (setq gnus-last-article gnus-current-article)
-           (setq gnus-current-article article)
-           (if (stringp nntp-server-buffer)
-               (setq article-buffer nntp-server-buffer)
-             (setq article-buffer (buffer-name nntp-server-buffer))))
-       (setq article-buffer gnus-article-buffer))
-
-      (buffer-disable-undo article-buffer)
-      (gnus-summary-mark-as-read article)
-
-      (setq process-state (funcall process-function article-buffer state))
-
-      (if (or (memq 'begin process-state)
-             (and (or (eq state 'first) (eq state 'first-and-last))
-                  (memq 'ok process-state)))
-         (progn
-           (if has-been-begin
-               (if (and result-file (file-exists-p result-file)) 
-                   (delete-file result-file)))
-           (if (memq 'begin process-state)
-               (setq result-file (car process-state)))
-           (setq has-been-begin t)
-           (setq has-been-end nil)))
-
-      (if (memq 'end process-state)
-         (progn
-           (setq gnus-uu-has-been-grabbed nil)
-           (setq result-files (cons result-file result-files))
-           (setq has-been-end t)
-           (setq has-been-begin nil)
-           (if (and limit (= (length result-files) limit))
-               (progn
-                 (setq list-of-articles nil)
-                 (setq gnus-newsgroup-processable nil)))))
+       (let ((part (gnus-uu-part-number article)))
+         (gnus-message 6 "Getting article %d%s..."
+                       article (if (string= part "") "" (concat ", " part))))
+       (gnus-summary-display-article article)

 
 

-      (if (and (or (eq state 'last) (eq state 'first-and-last))
-              (not (memq 'end process-state)))
-               (if (and result-file (file-exists-p result-file))
-                   (delete-file result-file)))
-
-      (setq result-file nil)
-
-      (if (not (memq 'wrong-type process-state))
-         (setq wrong-type nil)
-       (if gnus-uu-unmark-articles-not-decoded
-           (gnus-summary-tick-article article t)))
-
-      (if sloppy (setq wrong-type nil))
-
-      (if (and (not has-been-begin)
-              (not sloppy)
-              (or (memq 'end process-state)
-                  (memq 'middle process-state)))
-         (progn
-           (setq process-state (list 'error))
-           (message "No begin part at the beginning")
-           (sleep-for 2))
-       (setq state 'middle)))
-
-    ; Make sure the last article is put in the article buffer
-    ; & fix windows etc.
-
-    (if (not (string= article-buffer gnus-article-buffer))
+       ;; Push the article to the processing function.

        (save-excursion
        (save-excursion

-         (set-buffer (get-buffer-create gnus-article-buffer))
+         (set-buffer gnus-original-article-buffer)

          (let ((buffer-read-only nil))
          (let ((buffer-read-only nil))

-           (widen)
-           (erase-buffer)
-           (insert-buffer-substring article-buffer)
-           (goto-char 1))))
-    (run-hooks 'gnus-mark-article-hook)
-
-    (if result-files
-       ()
-      (if (not has-been-begin)
-         (if (not no-errors) (message "Wrong type file"))
-       (if (memq 'error process-state)
-           (setq result-files nil)
-         (if (not (or (memq 'ok process-state) 
-                      (memq 'end process-state)))
-             (progn
-               (if (not no-errors)
-                   (message "End of articles reached before end of file"))
-               (setq result-files nil))
-           (gnus-uu-unmark-list-of-grabbed)))))
-    (setq gnus-uu-list-of-files-decoded result-files)
+           (save-excursion
+             (set-buffer gnus-summary-buffer)
+             (setq process-state
+                   (funcall process-function
+                            gnus-original-article-buffer state)))))
+
+       (gnus-summary-remove-process-mark article)
+
+       ;; If this is the beginning of a decoded file, we push it
+       ;; on to a list.
+       (when (or (memq 'begin process-state)
+                 (and (or (eq state 'first)
+                          (eq state 'first-and-last))
+                      (memq 'ok process-state)))
+         (when has-been-begin
+           ;; If there is a `result-file' here, that means that the
+           ;; file was unsuccessfully decoded, so we delete it.
+           (when (and result-file
+                      (file-exists-p result-file)
+                      (not gnus-uu-be-dangerous)
+                      (or (eq gnus-uu-be-dangerous t)
+                          (gnus-y-or-n-p
+                           (format "Delete unsuccessfully decoded file %s"
+                                   result-file))))
+             (delete-file result-file)))
+         (when (memq 'begin process-state)
+           (setq result-file (car process-state)))
+         (setq has-been-begin t))
+
+       ;; Check whether we have decoded one complete file.
+       (when (memq 'end process-state)
+         (setq article-series nil)
+         (setq has-been-begin nil)
+         (if (stringp result-file)
+             (setq files (list result-file))
+           (setq files result-file))
+         (setq result-file (car files))
+         (while files
+           (push (list (cons 'name (pop files))
+                       (cons 'article article))
+                 result-files))
+         ;; Allow user-defined functions to be run on this file.
+         (when gnus-uu-grabbed-file-functions
+           (let ((funcs gnus-uu-grabbed-file-functions))
+             (unless (listp funcs)
+               (setq funcs (list funcs)))
+             (while funcs
+               (funcall (pop funcs) result-file))))
+         (setq result-file nil)
+         ;; Check whether we have decoded enough articles.
+         (and limit (= (length result-files) limit)
+              (setq articles nil)))
+
+       ;; If this is the last article to be decoded, and
+       ;; we still haven't reached the end, then we delete
+       ;; the partially decoded file.
+       (and (or (eq state 'last) (eq state 'first-and-last))
+            (not (memq 'end process-state))
+            result-file
+            (file-exists-p result-file)
+            (not gnus-uu-be-dangerous)
+            (or (eq gnus-uu-be-dangerous t)
+                (gnus-y-or-n-p
+                 (format "Delete incomplete file %s? " result-file)))
+            (delete-file result-file))
+
+       ;; If this was a file of the wrong sort, then
+       (when (and (or (memq 'wrong-type process-state)
+                      (memq 'error process-state))
+                  gnus-uu-unmark-articles-not-decoded)
+         (gnus-summary-tick-article article t))
+
+       ;; Set the new series state.
+       (if (and (not has-been-begin)
+                (not sloppy)
+                (or (memq 'end process-state)
+                    (memq 'middle process-state)))
+           (progn
+             (setq process-state (list 'error))
+             (gnus-message 2 "No begin part at the beginning")
+             (sleep-for 2))
+         (setq state 'middle)))
+
+      ;; When there are no result-files, then something must be wrong.
+      (if result-files
+         (message "")
+       (cond
+        ((not has-been-begin)
+         (gnus-message 2 "Wrong type file"))
+        ((memq 'error process-state)
+         (gnus-message 2 "An error occurred during decoding"))
+        ((not (or (memq 'ok process-state)
+                  (memq 'end process-state)))
+         (gnus-message 2 "End of articles reached before end of file")))
+       ;; Make unsuccessfully decoded articles unread.
+       (when gnus-uu-unmark-articles-not-decoded
+         (while article-series
+           (gnus-summary-tick-article (pop article-series) t)))))
+
+    ;; The original article buffer is hosed, shoot it down.
+    (gnus-kill-buffer gnus-original-article-buffer)
+    (setq gnus-current-article nil)

     result-files))
 
     result-files))
 

+(defun gnus-uu-grab-view (file)
+  "View FILE using the gnus-uu methods."
+  (let ((action (gnus-uu-get-action file)))
+    (gnus-execute-command
+     (if (string-match "%" action)
+        (format action file)
+       (concat action " " file))
+     (eq gnus-view-pseudos 'not-confirm))))
+
+(defun gnus-uu-grab-move (file)
+  "Move FILE to somewhere."
+  (when gnus-uu-default-dir
+    (let ((to-file (concat (file-name-as-directory gnus-uu-default-dir)
+                          (file-name-nondirectory file))))
+      (rename-file file to-file)
+      (unless (file-exists-p file)
+       (make-symbolic-link to-file file)))))
+
+(defun gnus-uu-part-number (article)
+  (let* ((header (gnus-summary-article-header article))
+        (subject (and header (mail-header-subject header)))
+        (part nil))
+    (if subject
+       (while (string-match "[0-9]+/[0-9]+\\|[0-9]+[ \t]+of[ \t]+[0-9]+"
+                            subject)
+         (setq part (match-string 0 subject))
+         (setq subject (substring subject (match-end 0)))))
+    (or part
+       (while (string-match "\\([0-9]+\\)[^0-9]+\\([0-9]+\\)" subject)
+         (setq part (match-string 0 subject))
+         (setq subject (substring subject (match-end 0)))))
+    (or part "")))
+

 (defun gnus-uu-uudecode-sentinel (process event)
   (delete-process (get-process process)))
 
 (defun gnus-uu-uudecode-sentinel (process event)
   (delete-process (get-process process)))
 

-; Uudecodes a file asynchronously.
-(defun gnus-uu-uustrip-article-as (process-buffer in-state)
-  (let ((state (list 'ok))
-       (process-connection-type nil)
-       start-char pst name-beg name-end)
-    (save-excursion
-      (set-buffer process-buffer)
-      (let ((case-fold-search nil)
-           (buffer-read-only nil))
-
-       (goto-char 1)
+(defun gnus-uu-uustrip-article (process-buffer in-state)
+  ;; Uudecodes a file asynchronously.
+  (save-excursion
+    (set-buffer process-buffer)
+    (let ((state (list 'wrong-type))
+         process-connection-type case-fold-search buffer-read-only
+         files start-char)
+      (goto-char (point-min))
+
+      ;; Deal with ^M at the end of the lines.
+      (when gnus-uu-kill-carriage-return
+       (save-excursion
+         (while (search-forward "\r" nil t)
+           (delete-backward-char 1))))

 
 

-       (if gnus-uu-kill-carriage-return
-           (progn
-             (while (search-forward "\r" nil t)
-               (delete-backward-char 1))
-             (goto-char 1)))
-
-       (if (not (re-search-forward gnus-uu-begin-string nil t))
-           (if (not (re-search-forward gnus-uu-body-line nil t))
-               (setq state (list 'wrong-type))))
-     
-       (if (memq 'wrong-type state)
-           ()
-         (beginning-of-line)
-         (setq start-char (point))
+      (while (or (re-search-forward gnus-uu-begin-string nil t)
+                (re-search-forward gnus-uu-body-line nil t))
+       (setq state (list 'ok))
+       ;; Ok, we are at the first uucoded line.
+       (beginning-of-line)
+       (setq start-char (point))

 
 

-         (if (looking-at gnus-uu-begin-string)
-             (progn 
-               (setq name-end (match-end 1))
-
-               ; Replace any slashes and spaces in file names before decoding
-               (goto-char (setq name-beg (match-beginning 1)))
-               (while (re-search-forward "/" name-end t)
-                 (replace-match ","))
-               (goto-char name-beg)
-               (while (re-search-forward " " name-end t)
-                 (replace-match "_"))
-               (goto-char name-beg)
-               (if (re-search-forward "_*$" name-end t)
-                 (replace-match ""))
-
-               (setq gnus-uu-file-name (buffer-substring name-beg name-end))
-               (and gnus-uu-uudecode-process
-                    (setq pst (process-status 
-                               (or gnus-uu-uudecode-process "nevair")))
-                    (if (or (eq pst 'stop) (eq pst 'run))
-                        (progn
-                          (delete-process gnus-uu-uudecode-process)
-                          (gnus-uu-unmark-list-of-grabbed t))))
-               (if (get-process "*uudecode*")
-                   (delete-process "*uudecode*"))
-               (setq gnus-uu-uudecode-process
-                     (start-process 
-                      "*uudecode*" 
-                      (get-buffer-create gnus-uu-output-buffer-name)
-                      "sh" "-c" 
-                      (format "cd %s ; uudecode" gnus-uu-work-dir)))
-               (set-process-sentinel 
-                gnus-uu-uudecode-process 'gnus-uu-uudecode-sentinel)
-               (setq state (list 'begin))
-               (gnus-uu-add-file (concat gnus-uu-work-dir gnus-uu-file-name)))
-           (setq state (list 'middle)))
-       
+       (if (not (looking-at gnus-uu-begin-string))
+           (setq state (list 'middle))
+         ;; This is the beginning of a uuencoded article.
+         ;; We replace certain characters that could make things messy.
+         (setq gnus-uu-file-name
+               (let ((nnheader-file-name-translation-alist
+                      '((?/ . ?,) (?  . ?_) (?* . ?_) (?$ . ?_))))
+                 (nnheader-translate-file-chars (match-string 1))))
+         (replace-match (concat "begin 644 " gnus-uu-file-name) t t)
+
+         ;; Remove any non gnus-uu-body-line right after start.
+         (forward-line 1)
+         (while (and (not (eobp))
+                     (not (looking-at gnus-uu-body-line)))
+           (gnus-delete-line))
+
+         ;; If a process is running, we kill it.
+         (when (and gnus-uu-uudecode-process
+                    (memq (process-status gnus-uu-uudecode-process)
+                          '(run stop)))
+           (delete-process gnus-uu-uudecode-process)
+           (gnus-uu-unmark-list-of-grabbed t))
+
+         ;; Start a new uudecoding process.
+         (let ((cdir default-directory))
+           (unwind-protect
+               (progn
+                 (cd gnus-uu-work-dir)
+                 (setq gnus-uu-uudecode-process
+                       (start-process
+                        "*uudecode*"
+                        (gnus-get-buffer-create gnus-uu-output-buffer-name)
+                        shell-file-name shell-command-switch
+                        (format "cd %s %s uudecode" gnus-uu-work-dir
+                                gnus-shell-command-separator))))
+             (cd cdir)))
+         (set-process-sentinel
+          gnus-uu-uudecode-process 'gnus-uu-uudecode-sentinel)
+         (setq state (list 'begin))
+         (push (concat gnus-uu-work-dir gnus-uu-file-name) files))
+
+       ;; We look for the end of the thing to be decoded.
+       (if (re-search-forward gnus-uu-end-string nil t)
+           (push 'end state)

          (goto-char (point-max))
          (goto-char (point-max))

+         (re-search-backward gnus-uu-body-line nil t))

 
 

-         (re-search-backward 
-          (concat gnus-uu-body-line "\\|" gnus-uu-end-string) nil t)
-         (beginning-of-line)
-
-         (if (looking-at gnus-uu-end-string)
-             (setq state (cons 'end state)))
-         (forward-line 1)
+       (forward-line 1)

 
 

-         (and gnus-uu-uudecode-process
-              (setq pst (process-status 
-                         (or gnus-uu-uudecode-process "nevair")))
-              (if (or (eq pst 'run) (eq pst 'stop))
-                  (progn
-                    (if gnus-uu-correct-stripped-uucode
-                        (progn
-                          (gnus-uu-check-correct-stripped-uucode 
-                           start-char (point))
-                          (goto-char (point-max))
-                          (re-search-backward 
-                           (concat gnus-uu-body-line "\\|" 
-                                   gnus-uu-end-string) 
-                           nil t)
-                          (forward-line 1)))
-
-                    (condition-case err
-                        (process-send-region gnus-uu-uudecode-process 
-                                             start-char (point))
-                      (error 
-                       (progn 
-                         (delete-process gnus-uu-uudecode-process)
-                         (message "gnus-uu: Couldn't uudecode")
-;                        (sleep-for 2)
-                         (setq state (list 'wrong-type)))))
-
-                    (if (memq 'end state)
-                        (accept-process-output gnus-uu-uudecode-process)))
-                (setq state (list 'wrong-type))))
-         (if (not gnus-uu-uudecode-process)
-             (setq state (list 'wrong-type)))))
+       (when gnus-uu-uudecode-process
+         (when (memq (process-status gnus-uu-uudecode-process) '(run stop))
+           ;; Try to correct mishandled uucode.
+           (when gnus-uu-correct-stripped-uucode
+             (gnus-uu-check-correct-stripped-uucode start-char (point)))
+           (gnus-run-hooks 'gnus-uu-pre-uudecode-hook)
+
+           ;; Send the text to the process.
+           (condition-case nil
+               (process-send-region
+                gnus-uu-uudecode-process start-char (point))
+             (error
+              (progn
+                (delete-process gnus-uu-uudecode-process)
+                (gnus-message 2 "gnus-uu: Couldn't uudecode")
+                (setq state (list 'wrong-type)))))
+
+           (if (memq 'end state)
+               (progn
+                 ;; Send an EOF, just in case.
+                 (ignore-errors
+                   (process-send-eof gnus-uu-uudecode-process))
+                 (while (memq (process-status gnus-uu-uudecode-process)
+                              '(open run))
+                   (accept-process-output gnus-uu-uudecode-process 1)))
+             (when (or (not gnus-uu-uudecode-process)
+                       (not (memq (process-status gnus-uu-uudecode-process)
+                                  '(run stop))))
+               (setq state (list 'wrong-type)))))))

 
       (if (memq 'begin state)
 
       (if (memq 'begin state)

-         (cons (concat gnus-uu-work-dir gnus-uu-file-name) state)
+         (cons (if (= (length files) 1) (car files) files) state)

        state))))
 
        state))))
 

-; This function is used by `gnus-uu-grab-articles' to treat
-; a shared article.
+(defvar gnus-uu-unshar-warning
+  "*** WARNING ***
+
+Shell archives are an archaic method of bundling files for distribution
+across computer networks.  During the unpacking process, arbitrary commands
+are executed on your system, and all kinds of nasty things can happen.
+Please examine the archive very carefully before you instruct Emacs to
+unpack it.  You can browse the archive buffer using \\[scroll-other-window].
+
+If you are unsure what to do, please answer \"no\"."
+  "Text of warning message displayed by `gnus-uu-unshar-article'.
+Make sure that this text consists only of few text lines.  Otherwise,
+Gnus might fail to display all of it.")
+
+
+;; This function is used by `gnus-uu-grab-articles' to treat
+;; a shared article.

 (defun gnus-uu-unshar-article (process-buffer in-state)
   (let ((state (list 'ok))
        start-char)
     (save-excursion
 (defun gnus-uu-unshar-article (process-buffer in-state)
   (let ((state (list 'ok))
        start-char)
     (save-excursion

-     (set-buffer process-buffer)
-     (goto-char 1)
-     (if (not (re-search-forward gnus-uu-shar-begin-string nil t))
-        (setq state (list 'wrong-type))
-       (beginning-of-line)
-       (setq start-char (point))
-       (call-process-region 
-       start-char (point-max) "sh" nil 
-       (get-buffer-create gnus-uu-output-buffer-name) nil 
-       "-c" (concat "cd " gnus-uu-work-dir " ; sh"))))
+      (set-buffer process-buffer)
+      (goto-char (point-min))
+      (if (not (re-search-forward gnus-uu-shar-begin-string nil t))
+         (setq state (list 'wrong-type))
+       (save-window-excursion
+         (save-excursion
+           (switch-to-buffer (current-buffer))
+           (delete-other-windows)
+           (let ((buffer (get-buffer-create (generate-new-buffer-name
+                                             "*Warning*"))))
+             (unless
+                 (unwind-protect
+                     (with-current-buffer buffer
+                       (insert (substitute-command-keys
+                                gnus-uu-unshar-warning))
+                       (goto-char (point-min))
+                       (display-buffer buffer)
+                       (yes-or-no-p "This is a shell archive, unshar it? "))
+                   (kill-buffer buffer))
+               (setq state (list 'error))))))
+       (unless (memq 'error state)
+         (beginning-of-line)
+         (setq start-char (point))
+         (call-process-region
+          start-char (point-max) shell-file-name nil
+          (gnus-get-buffer-create gnus-uu-output-buffer-name) nil
+          shell-command-switch
+          (concat "cd " gnus-uu-work-dir " "
+                  gnus-shell-command-separator  " sh")))))

     state))
 
     state))
 

-; Returns the name of what the shar file is going to unpack.
+;; Returns the name of what the shar file is going to unpack.

 (defun gnus-uu-find-name-in-shar ()
   (let ((oldpoint (point))
        res)
 (defun gnus-uu-find-name-in-shar ()
   (let ((oldpoint (point))
        res)

-    (goto-char 1)
-    (if (re-search-forward gnus-uu-shar-name-marker nil t)
-       (setq res (buffer-substring (match-beginning 1) (match-end 1))))
+    (goto-char (point-min))
+    (when (re-search-forward gnus-uu-shar-name-marker nil t)
+      (setq res (buffer-substring (match-beginning 1) (match-end 1))))

     (goto-char oldpoint)
     res))
 
     (goto-char oldpoint)
     res))
 

-; Returns the article number of the given subject.
-(defun gnus-uu-article-number (subject)
-  (let (end)
-    (string-match "[0-9]+[^0-9]" subject 1)
-    (setq end (match-end 0))
-    (string-to-int 
-     (substring subject (string-match "[0-9]" subject 1) end)))) 
-             
-; `gnus-uu-choose-action' chooses what action to perform given the name
-; and `gnus-uu-file-action-list'.  Returns either nil if no action is
-; found, or the name of the command to run if such a rule is found.
+;; `gnus-uu-choose-action' chooses what action to perform given the name
+;; and `gnus-uu-file-action-list'.  Returns either nil if no action is
+;; found, or the name of the command to run if such a rule is found.

 (defun gnus-uu-choose-action (file-name file-action-list &optional no-ignore)
   (let ((action-list (copy-sequence file-action-list))
 (defun gnus-uu-choose-action (file-name file-action-list &optional no-ignore)
   (let ((action-list (copy-sequence file-action-list))

+       (case-fold-search t)

        rule action)
        rule action)

-    (and 
-     (or no-ignore 
-        (and (not 
-              (and gnus-uu-ignore-files-by-name
-                   (string-match gnus-uu-ignore-files-by-name file-name)))
-             (not 
-              (and gnus-uu-ignore-files-by-type
-                   (string-match gnus-uu-ignore-files-by-type 
-                                 (or (gnus-uu-choose-action 
-                                      file-name gnus-uu-ext-to-mime-list t) 
-                                     ""))))))
+    (and
+     (unless no-ignore
+       (and (not
+            (and gnus-uu-ignore-files-by-name
+                 (string-match gnus-uu-ignore-files-by-name file-name)))
+           (not
+            (and gnus-uu-ignore-files-by-type
+                 (string-match gnus-uu-ignore-files-by-type
+                               (or (gnus-uu-choose-action
+                                    file-name gnus-uu-ext-to-mime-list t)
+                                   ""))))))

      (while (not (or (eq action-list ()) action))
        (setq rule (car action-list))
        (setq action-list (cdr action-list))
      (while (not (or (eq action-list ()) action))
        (setq rule (car action-list))
        (setq action-list (cdr action-list))

-       (if (string-match (car rule) file-name)
-          (setq action (car (cdr rule))))))
+       (when (string-match (car rule) file-name)
+        (setq action (cadr rule)))))

     action))
 
     action))
 

-(defun gnus-uu-save-directory (from-dir &optional default-dir ignore-existing)
-  (let (dir file-name command files file)
-    (setq files (directory-files from-dir t))
-    (if default-dir
-       (setq dir default-dir)
-      (setq dir (gnus-uu-read-directory 
-                (concat "Where do you want the file" 
-                        (if (< 3 (length files)) "s" "") "? "))))
-
-    (while files
-      (setq file (car files))
-      (setq files (cdr files))
-      (string-match "/[^/]*$" file)
-      (setq file-name (substring file (1+ (match-beginning 0))))
-      (if (string-match "^\\.\\.?$" file-name)
-         ()
-       (if (and (not ignore-existing) (file-exists-p (concat dir file-name)))
-           (setq file-name
-                 (read-file-name "File exists. Enter a new name: " dir 
-                                 (concat dir file-name) nil file-name))
-         (setq file-name (concat dir file-name)))
-       (rename-file file file-name t)))))
-
-; Moves the file from the tmp directory to where the user wants it.
-(defun gnus-uu-save-file (from-file-name &optional default-dir ignore-existing)
-  (let (dir file-name command)
-    (string-match "/[^/]*$" from-file-name)
-    (setq file-name (substring from-file-name (1+ (match-beginning 0))))
-    (if default-dir
-       (setq dir default-dir)
-      (setq dir (gnus-uu-read-directory "Where do you want the file? ")))
-    (if (and (not ignore-existing) (file-exists-p (concat dir file-name)))
-       (setq file-name
-             (read-file-name "File exist. Enter a new name: " dir 
-                             (concat dir file-name) nil file-name))
-      (setq file-name (concat dir file-name)))
-    (rename-file from-file-name file-name t)))
-    
-(defun gnus-uu-read-directory (prompt &optional default)
-  (let (dir ok create)
-    (while (not ok)
-      (setq ok t)
-      (setq dir (if default default
-                 (read-file-name prompt gnus-uu-current-save-dir 
-                                 gnus-uu-current-save-dir)))
-      (while (string-match "/$" dir)
-       (setq dir (substring dir 0 (match-beginning 0))))
-      (if (file-exists-p dir)
-         (if (not (file-directory-p dir))
-             (progn
-               (setq ok nil)
-               (message "%s is a file" dir)
-               (sit-for 2)))
-       (setq create ?o)
-       (while (not (or (= create ?y) (= create ?n)))
-         (message "%s: No such directory. Do you want to create it? (y/n)" 
-                  dir)
-         (setq create (read-char)))
-       (if (= create ?y) (make-directory dir))))
-    (setq gnus-uu-current-save-dir (concat dir "/"))))
-
-; Unpacks an archive and views all the files in it. Returns t if
-; viewing one or more files is successful.

 (defun gnus-uu-treat-archive (file-path)
 (defun gnus-uu-treat-archive (file-path)

+  ;; Unpacks an archive.  Returns t if unpacking is successful.

   (let ((did-unpack t)
   (let ((did-unpack t)

-       action command files file file-name dir)
-    (setq action (gnus-uu-choose-action 
+       action command dir)
+    (setq action (gnus-uu-choose-action

                  file-path (append gnus-uu-user-archive-rules
                                    (if gnus-uu-ignore-default-archive-rules
                                        nil
                                      gnus-uu-default-archive-rules))))
 
                  file-path (append gnus-uu-user-archive-rules
                                    (if gnus-uu-ignore-default-archive-rules
                                        nil
                                      gnus-uu-default-archive-rules))))
 

-    (if (not action) (error "No unpackers for the file %s" file-path))
+    (when (not action)
+      (error "No unpackers for the file %s" file-path))

 
     (string-match "/[^/]*$" file-path)
 
     (string-match "/[^/]*$" file-path)

-    (setq file-name (substring file-path (1+ (match-beginning 0))))

     (setq dir (substring file-path 0 (match-beginning 0)))
 
     (setq dir (substring file-path 0 (match-beginning 0)))
 

-    (if (gnus-uu-string-in-list action gnus-uu-destructive-archivers)
-       (copy-file file-path (concat file-path "~") t))
+    (when (member action gnus-uu-destructive-archivers)
+      (copy-file file-path (concat file-path "~") t))

 
     (setq command (format "cd %s ; %s" dir (gnus-uu-command action file-path)))
 
     (save-excursion
 
     (setq command (format "cd %s ; %s" dir (gnus-uu-command action file-path)))
 
     (save-excursion

-      (set-buffer (get-buffer-create gnus-uu-output-buffer-name))
+      (set-buffer (gnus-get-buffer-create gnus-uu-output-buffer-name))

       (erase-buffer))
 
       (erase-buffer))
 

-    (message "Unpacking: %s..." (gnus-uu-command action file-path))
+    (gnus-message 5 "Unpacking: %s..." (gnus-uu-command action file-path))

 
 

-    (if (= 0 (call-process "sh" nil 
-                          (get-buffer-create gnus-uu-output-buffer-name)
-                          nil "-c" command))
+    (if (= 0 (call-process shell-file-name nil
+                          (gnus-get-buffer-create gnus-uu-output-buffer-name)
+                          nil shell-command-switch command))

        (message "")
        (message "")

-      (if (not gnus-uu-use-interactive-view)
-         (progn
-           (message "Error during unpacking of archive")
-           (sleep-for 2)))
+      (gnus-message 2 "Error during unpacking of archive")

       (setq did-unpack nil))
 
       (setq did-unpack nil))
 

-    (if (gnus-uu-string-in-list action gnus-uu-destructive-archivers)
-       (rename-file (concat file-path "~") file-path t))
+    (when (member action gnus-uu-destructive-archivers)
+      (rename-file (concat file-path "~") file-path t))

 
     did-unpack))
 
 
     did-unpack))
 

-; Tries to view all the files in the given directory. Returns t if
-; viewing one or more files is successful.
-(defun gnus-uu-view-directory (dir &optional dont-delete-files not-top)
-  (let ((first t)
-       files file did-view ignore-files)
-    (setq files (gnus-uu-directory-files dir t))
-    (gnus-uu-add-file files)
-    (setq ignore-files files)
-    
-    (while (gnus-uu-unpack-archives 
-           files (if not-top (list ".")
-                   (if first () ignore-files)))
-      (setq first nil)
-      (gnus-uu-add-file 
-       (setq files (gnus-uu-directory-files dir t))))
-
-    (gnus-uu-add-file (gnus-uu-directory-files dir t))
-      
-    (while files
-      (setq file (car files))
-      (setq files (cdr files))
-      (if (not (string= (or (gnus-uu-get-action file) "") "gnus-uu-archive"))
-         (progn
-           (set-file-modes file 448)
-           (if (file-directory-p file)
-               (setq did-view (or (gnus-uu-view-directory file 
-                                                          dont-delete-files 
-                                                          t) 
-                                  did-view))
-             (setq did-view (or (gnus-uu-view-file file t) did-view)))))
-      (if (and (not dont-delete-files) (not gnus-uu-asynchronous) 
-              (file-exists-p file))
-         (delete-file file)))
-
-    (if (and (not gnus-uu-asynchronous) (not dont-delete-files))
-       (if (string-match "/$" dir)
-           (delete-directory (substring dir 0 (match-beginning 0)))
-         (delete-directory dir)))
-    did-view))
-

 (defun gnus-uu-dir-files (dir)
   (let ((dirs (directory-files dir t "[^/][^\\.][^\\.]?$"))
        files file)
     (while dirs
       (if (file-directory-p (setq file (car dirs)))
          (setq files (append files (gnus-uu-dir-files file)))
 (defun gnus-uu-dir-files (dir)
   (let ((dirs (directory-files dir t "[^/][^\\.][^\\.]?$"))
        files file)
     (while dirs
       (if (file-directory-p (setq file (car dirs)))
          (setq files (append files (gnus-uu-dir-files file)))

-       (setq files (cons file files)))
+       (push file files))

       (setq dirs (cdr dirs)))
     files))
 
       (setq dirs (cdr dirs)))
     files))
 

-(defun gnus-uu-directory-files-old (dir)
-  (let ((files (directory-files dir t)) f)
-    (setq f files)
-    (while (cdr f)
-      (if (string-match "/\\.\\.?$" (car (cdr f)))
-         (setcdr f (cdr (cdr f)))
-       (setq f (cdr f))))
-    (if (string-match "/\\.\\.?$" (car files)) (cdr files)
-      files)))
-
-(defun gnus-uu-unpack-archives (files &optional ignore)
-  (let (path did-unpack)
+(defun gnus-uu-unpack-files (files &optional ignore)
+  ;; Go through FILES and look for files to unpack.
+  (let* ((totfiles (gnus-uu-ls-r gnus-uu-work-dir))
+        (ofiles files)
+        file did-unpack)

     (while files
     (while files

-      (setq path (car files))
-      (setq files (cdr files))
-      (if (not (gnus-uu-string-in-list path ignore))
-         (if (string= (or (gnus-uu-get-action 
-                           (gnus-uu-name-from-path path)) "") 
-                      "gnus-uu-archive")
-             (progn
-               (if (and (not (setq did-unpack (gnus-uu-treat-archive path)))
-                        gnus-uu-use-interactive-view)
-                   (gnus-uu-enter-interactive-file 
-                    "# error during unpacking of" path))
-               (if ignore (delete-file path))))))
-    did-unpack))
-
-
-;; Manual marking
+      (setq file (cdr (assq 'name (car files))))
+      (when (and (not (member file ignore))
+                (equal (gnus-uu-get-action (file-name-nondirectory file))
+                       "gnus-uu-archive"))
+       (push file did-unpack)
+       (unless (gnus-uu-treat-archive file)
+         (gnus-message 2 "Error during unpacking of %s" file))
+       (let* ((newfiles (gnus-uu-ls-r gnus-uu-work-dir))
+              (nfiles newfiles))
+         (while nfiles
+           (unless (member (car nfiles) totfiles)
+             (push (list (cons 'name (car nfiles))
+                         (cons 'original file))
+                   ofiles))
+           (setq nfiles (cdr nfiles)))
+         (setq totfiles newfiles)))
+      (setq files (cdr files)))
+    (if did-unpack
+       (gnus-uu-unpack-files ofiles (append did-unpack ignore))
+      ofiles)))

 
 

-(defun gnus-uu-mark-by-regexp ()
-  "Asks for a regular expression and marks all articles that match."
-  (interactive)
-  (let (exp)
-    (setq exp (read-from-minibuffer "Mark (regexp): "))
-    (setq gnus-newsgroup-processable 
-         (nconc gnus-newsgroup-processable
-                 (nreverse (gnus-uu-get-list-of-articles exp t))))
-    (message "")))
-
-(defun gnus-uu-mark-region (beg end)
-  "Marks all articles between point and mark."
-  (interactive "r")
-  (let ((mark-even-if-inactive t)
-       (opoint 0)
-       tmp)
-    (save-excursion
-      (cond 
-       ((= beg end)
-       (error "Empty region."))
-       (t
-       (if (< end beg)
-           (progn 
-             (setq tmp beg)
-             (setq beg end)
-             (setq end tmp)))
-       (goto-char beg)
-       (while (and (< (point) end)
-                   (not (= (point) opoint)))
-         (setq opoint (point))
-         (gnus-summary-set-process-mark (gnus-summary-article-number))))))))
-      
-(defun gnus-uu-mark-thread ()
-  "Marks all articles downwards in this thread."
-  (interactive)
-  (beginning-of-line)
-  (let (level)
-    (if (not (search-forward ":" nil t))
-       ()
-      (setq level (current-column))
-      (gnus-summary-set-process-mark (gnus-summary-article-number))
-      (gnus-summary-search-forward)
-      (while (< level (current-column))
-       (gnus-summary-set-process-mark (gnus-summary-article-number))
-       (gnus-summary-search-forward))
-      (gnus-summary-search-backward))))
-
-(defun gnus-uu-marked-universal-argument ()
-  "Perform any operation on all marked articles.
-If you type `\\<gnus-summary-mode-map>\\[gnus-uu-decode-and-view]' and then, for instance, `u', 
-gnus-uu will perform the operation bound to `u' on all 
-marked articles."
-  (interactive)
-  (let ((articles (setq gnus-newsgroup-processable 
-                       (nreverse gnus-newsgroup-processable)))
-       key func)
-    (gnus-summary-unmark-all-processable)
-    (if (not articles)
-       (error "No articles marked"))
-    (if (not (setq func (key-binding (read-key-sequence "C-c C-v C-u"))))
-       (error "Undefined key"))
-    (while articles
-      (gnus-summary-goto-subject (car articles))
-      (command-execute func)
-      (setq articles (cdr articles)))))
-  
+(defun gnus-uu-ls-r (dir)
+  (let* ((files (gnus-uu-directory-files dir t))
+        (ofiles files))
+    (while files
+      (when (file-directory-p (car files))
+       (setq ofiles (delete (car files) ofiles))
+       (setq ofiles (append ofiles (gnus-uu-ls-r (car files)))))
+      (setq files (cdr files)))
+    ofiles))

 
 ;; Various stuff
 
 
 ;; Various stuff
 

-(defun gnus-uu-string-in-list (string list)
-  (while (and list
-             (not (string= (car list) string))
-             (setq list (cdr list))))
-  list)
-
-(defun gnus-uu-name-from-path (path)
-  (string-match "/[^/]*$" path)
-  (substring path (1+ (match-beginning 0))))
-

 (defun gnus-uu-directory-files (dir &optional full)
   (let (files out file)
     (setq files (directory-files dir full))
     (while files
       (setq file (car files))
       (setq files (cdr files))
 (defun gnus-uu-directory-files (dir &optional full)
   (let (files out file)
     (setq files (directory-files dir full))
     (while files
       (setq file (car files))
       (setq files (cdr files))

-      (if (not (string-match "/\\.\\.?$" file))
-         (setq out (cons file out))))
-    (setq out (reverse out))
+      (unless (member (file-name-nondirectory file) '("." ".."))
+       (push file out)))
+    (setq out (nreverse out))

     out))
 
 (defun gnus-uu-check-correct-stripped-uucode (start end)
     out))
 
 (defun gnus-uu-check-correct-stripped-uucode (start end)

-  (let (found beg length short)
-    (if (not gnus-uu-correct-stripped-uucode)
-       ()
-      (goto-char start)
+  (save-excursion
+    (let (found beg length)
+      (if (not gnus-uu-correct-stripped-uucode)
+         ()
+       (goto-char start)

 
 

-      (if (re-search-forward " \\|`" end t)
-         (progn
-           (goto-char start)
-           (while (not (eobp))
-             (progn
-               (if (looking-at "\n") (replace-match ""))
-               (forward-line 1))))
-           
-       (while (not (eobp))
-         (if (looking-at (concat gnus-uu-begin-string "\\|" 
-                                 gnus-uu-end-string))
-             ()
-           (if (not found)
+       (if (re-search-forward " \\|`" end t)
+           (progn
+             (goto-char start)
+             (while (not (eobp))

                (progn
                (progn

-                 (beginning-of-line)
-                 (setq beg (point))
-                 (end-of-line)
-                 (setq length (- (point) beg))))
-           (setq found t)
-           (beginning-of-line)
-           (setq beg (point))
-           (end-of-line)
-           (if (not (= length (- (point) beg)))
+                 (when (looking-at "\n")
+                   (replace-match ""))
+                 (forward-line 1))))
+
+         (while (not (eobp))
+           (if (looking-at (concat gnus-uu-begin-string "\\|"
+                                   gnus-uu-end-string))
+               ()
+             (when (not found)
+               (beginning-of-line)
+               (setq beg (point))
+               (end-of-line)
+               (setq length (- (point) beg)))
+             (setq found t)
+             (beginning-of-line)
+             (setq beg (point))
+             (end-of-line)
+             (when (not (= length (- (point) beg)))

                (insert (make-string (- length (- (point) beg)) ? ))))
                (insert (make-string (- length (- (point) beg)) ? ))))

-         (forward-line 1))))))
-
-(defun gnus-uu-initialize ()
-  (setq gnus-uu-highest-article-number 1)
-  (gnus-uu-check-for-generated-files)
-  (setq gnus-uu-tmp-dir (expand-file-name gnus-uu-tmp-dir))
-  (if (string-match "[^/]$" gnus-uu-tmp-dir) 
-      (setq gnus-uu-tmp-dir (concat gnus-uu-tmp-dir "/")))
-  (if (not (file-directory-p gnus-uu-tmp-dir))
-      (error "Temp directory %s doesn't exist" gnus-uu-tmp-dir)
-    (if (not (file-writable-p gnus-uu-tmp-dir))
-       (error "Temp directory %s can't be written to" gnus-uu-tmp-dir)))
-  (setq gnus-uu-work-dir 
-       (concat gnus-uu-tmp-dir (make-temp-name "gnus")))
-  (gnus-uu-add-file gnus-uu-work-dir)
-  (if (not (file-directory-p gnus-uu-work-dir)) 
-      (make-directory gnus-uu-work-dir))
-  (setq gnus-uu-work-dir (concat gnus-uu-work-dir "/"))
-  (setq gnus-uu-interactive-file-list nil))
-
-; Kills the temporary uu buffers, kills any processes, etc.
+           (forward-line 1)))))))
+
+(defvar gnus-uu-tmp-alist nil)
+
+(defun gnus-uu-initialize (&optional scan)
+  (let (entry)
+    (if (and (not scan)
+            (when (setq entry (assoc gnus-newsgroup-name gnus-uu-tmp-alist))
+              (if (file-exists-p (cdr entry))
+                  (setq gnus-uu-work-dir (cdr entry))
+                (setq gnus-uu-tmp-alist (delq entry gnus-uu-tmp-alist))
+                nil)))
+       t
+      (setq gnus-uu-tmp-dir (file-name-as-directory
+                            (expand-file-name gnus-uu-tmp-dir)))
+      (if (not (file-directory-p gnus-uu-tmp-dir))
+         (error "Temp directory %s doesn't exist" gnus-uu-tmp-dir)
+       (when (not (file-writable-p gnus-uu-tmp-dir))
+         (error "Temp directory %s can't be written to"
+                gnus-uu-tmp-dir)))
+
+      (setq gnus-uu-work-dir
+           (make-temp-name (concat gnus-uu-tmp-dir "gnus")))
+      (gnus-make-directory gnus-uu-work-dir)
+      (set-file-modes gnus-uu-work-dir 448)
+      (setq gnus-uu-work-dir (file-name-as-directory gnus-uu-work-dir))
+      (push (cons gnus-newsgroup-name gnus-uu-work-dir)
+           gnus-uu-tmp-alist))))
+
+
+;; Kills the temporary uu buffers, kills any processes, etc.

 (defun gnus-uu-clean-up ()
 (defun gnus-uu-clean-up ()

-  (let (buf pst)
+  (let (buf)

     (and gnus-uu-uudecode-process
     (and gnus-uu-uudecode-process

-        (setq pst (process-status (or gnus-uu-uudecode-process "nevair")))
-        (if (or (eq pst 'stop) (eq pst 'run))
-            (delete-process gnus-uu-uudecode-process)))
-    (and (not gnus-uu-asynchronous) 
-        (setq buf (get-buffer gnus-uu-output-buffer-name))
-        (kill-buffer buf))))
-
-; `gnus-uu-check-for-generated-files' deletes any generated files that
-; hasn't been deleted, if, for instance, the user terminated decoding
-; with `C-g'.
-(defun gnus-uu-check-for-generated-files ()
-  (let (file dirs)
-    (while gnus-uu-generated-file-list
-      (setq file (car gnus-uu-generated-file-list))
-      (setq gnus-uu-generated-file-list (cdr gnus-uu-generated-file-list))
-      (if (not (string-match "/\\.[\\.]?$" file))
-         (progn
-           (if (file-directory-p file)
-               (setq dirs (cons file dirs))
-             (if (file-exists-p file)
-                 (delete-file file))))))
-    (setq dirs (nreverse dirs))
-    (while dirs
-      (setq file (car dirs))
-      (setq dirs (cdr dirs))
-      (if (file-directory-p file)
-         (if (string-match "/$" file)
-             (delete-directory (substring file 0 (match-beginning 0)))
-           (delete-directory file))))))
-
-; Add a file (or a list of files) to be checked (and deleted if it/they
-; still exists upon exiting the newsgroup).
-(defun gnus-uu-add-file (file)
-  (if (stringp file)
-      (setq gnus-uu-generated-file-list 
-           (cons file gnus-uu-generated-file-list))
-    (setq gnus-uu-generated-file-list 
-         (append file gnus-uu-generated-file-list))))
-
-; Go to the next unread subject. If there is no further unread
-; subjects, go to the last subject in the buffer.
-(defun gnus-uu-summary-next-subject ()
-  (let (opi)
-    (if (not (gnus-summary-search-forward t))
-       (progn
-         (goto-char 1)
-         (sit-for 0)
-         (gnus-summary-goto-subject gnus-uu-highest-article-number)))
-
-    ; You may well find all this a bit puzzling - so do I, but I seem
-    ; to have to do something like this to move to the next unread article,
-    ; as `sit-for' seems to do some rather strange things here. Might
-    ; be a bug in my head, probably.
-    (setq opi (point))
-    (sit-for 0)
-    (goto-char opi)
-    (gnus-summary-recenter)))
-
-; Inputs an action and a file and returns a full command, putting
-; ticks round the file name and escaping any ticks in the file name.
+        (memq (process-status (or gnus-uu-uudecode-process "nevair"))
+              '(stop run))
+        (delete-process gnus-uu-uudecode-process))
+    (when (setq buf (get-buffer gnus-uu-output-buffer-name))
+      (kill-buffer buf))))
+
+;; Inputs an action and a filename and returns a full command, making sure
+;; that the filename will be treated as a single argument when the shell
+;; executes the command.

 (defun gnus-uu-command (action file)
 (defun gnus-uu-command (action file)

-  (let ((ofile ""))
-    (while (string-match "`\\|\"\\|\\$\\|\\\\" file)
-      (progn
-       (setq ofile
-             (concat ofile (substring file 0 (match-beginning 0)) "\\"
-                     (substring file (match-beginning 0) (match-end 0))))
-       (setq file (substring file (1+ (match-beginning 0))))))
-    (setq ofile (concat "\"" ofile file "\""))
+  (let ((quoted-file (mm-quote-arg file)))

     (if (string-match "%s" action)
     (if (string-match "%s" action)

-       (format action ofile)
-      (concat action " " ofile))))
-
+       (format action quoted-file)
+      (concat action " " quoted-file))))
+
+(defun gnus-uu-delete-work-dir (&optional dir)
+  "Delete recursively all files and directories under `gnus-uu-work-dir'."
+  (if dir
+      (gnus-message 7 "Deleting directory %s..." dir)
+    (setq dir gnus-uu-work-dir))
+  (when (and dir
+            (file-exists-p dir))
+    (let ((files (directory-files dir t nil t))
+         file)
+      (while (setq file (pop files))
+       (unless (member (file-name-nondirectory file) '("." ".."))
+         (if (file-directory-p file)
+             (gnus-uu-delete-work-dir file)
+           (gnus-message 9 "Deleting file %s..." file)
+           (delete-file file))))
+      (delete-directory dir)))
+  (gnus-message 7 ""))

 
 ;; Initializing
 
 ;; Initializing

-(add-hook 'gnus-exit-group-hook
-      '(lambda ()
-        (gnus-uu-clean-up)
-        (gnus-uu-check-for-generated-files)))
-
-
-;; Interactive exec mode
-
-(defvar gnus-uu-output-window nil)
-(defvar gnus-uu-mode-hook nil)
-
-(defvar gnus-uu-mode-map nil)
-(if gnus-uu-mode-map
-    ()
-  (setq gnus-uu-mode-map (make-sparse-keymap))
-  (define-key gnus-uu-mode-map "\C-c\C-x" 'gnus-uu-interactive-execute)
-  (define-key gnus-uu-mode-map "\C-c\C-v" 'gnus-uu-interactive-execute)
-  (define-key gnus-uu-mode-map "\C-m" 'gnus-uu-interactive-execute)
-  (define-key gnus-uu-mode-map "\C-c\C-c" 'gnus-uu-interactive-end)
-  (define-key gnus-uu-mode-map "\C-cs" 
-    'gnus-uu-interactive-save-current-file)
-  (define-key gnus-uu-mode-map "\C-c\C-s"
-    'gnus-uu-interactive-save-current-file-silent)
-  (define-key gnus-uu-mode-map "\C-c\C-w" 'gnus-uu-interactive-save-all-files)
-  (define-key gnus-uu-mode-map "\C-c\C-o" 'gnus-uu-interactive-save-original-file)
-  (define-key gnus-uu-mode-map "\C-c\C-r" 'gnus-uu-interactive-rescan-directory)
-  (define-key gnus-uu-mode-map "\C-cr" 'gnus-uu-interactive-scan-directory)
-  )
-
-(defun gnus-uu-interactive-set-up-windows ()
-  (let (int-buf out-buf height)
-    (gnus-configure-windows 'article)
-    (set-buffer 
-     (setq int-buf (get-buffer-create gnus-uu-interactive-buffer-name)))
-    (if (not (get-buffer-window int-buf))
-       (progn
-         (select-window (get-buffer-window gnus-article-buffer))
-         (switch-to-buffer int-buf)))
-    (setq out-buf (get-buffer-create gnus-uu-output-buffer-name))
-    (if (not (get-buffer-window out-buf))
-       (progn
-         (if (> 2 (setq height (- (window-height) 
-                                  gnus-uu-output-window-height)))
-             (setq height (/ (window-height) 2)))
-         (if (> height 2)
-             (progn
-               (setq gnus-uu-output-window (split-window nil height))
-               (set-window-buffer gnus-uu-output-window out-buf)))))))
-
-(defun gnus-uu-do-interactive (&optional dont-do-windows)
-  (if (not gnus-uu-interactive-file-list) 
-      (gnus-uu-enter-interactive-file "#" ""))
-  (if (not dont-do-windows) (gnus-uu-interactive-set-up-windows))
-  (save-excursion 
-    (set-buffer (get-buffer-create gnus-uu-output-buffer-name)) 
-    (erase-buffer))
-  (set-buffer (get-buffer-create gnus-uu-interactive-buffer-name))
-  (goto-char 1)
-  (forward-line 3)
-  (run-hooks 'gnus-uu-mode-hook))
-
-(defun gnus-uu-enter-interactive-file (action file)
-  (let (command)
-    (save-excursion
-      (set-buffer (get-buffer-create gnus-uu-interactive-buffer-name))
-      (if (not gnus-uu-interactive-file-list)
-         (progn
-           (erase-buffer)
-           (gnus-uu-mode)
-           (insert 
-            "# Press return to execute a command.
-# Press `C-c C-c' to exit interactive view.
-
-")))   
-      (setq gnus-uu-interactive-file-list
-           (cons file gnus-uu-interactive-file-list))
-;      (if (string-match (concat "^" gnus-uu-work-dir) file)
-;        (setq file (substring file (match-end 0))))
-      (setq command (gnus-uu-command action file))
-      (goto-char (point-max))
-      (insert (format "%s\n" command)))))
-
-(defun gnus-uu-interactive-execute ()
-  "Executes the command on the current line in interactive mode."
-  (interactive)
-  (let (beg out-buf command)
-    (beginning-of-line)
-    (setq beg (point))
-    (end-of-line)
-    (setq command (buffer-substring beg (point)))
-    (setq out-buf (get-buffer-create gnus-uu-output-buffer-name))
-    (save-excursion
-      (set-buffer out-buf)
-      (erase-buffer)
-      (insert (format "$ %s \n\n" command)))
-    (setq command (format "cd %s ; %s" gnus-uu-work-dir command))
-    (message "Executing...")
-    (if gnus-uu-asynchronous
-       (start-process "gnus-uu-view" out-buf "sh" "-c" command)
-      (call-process "sh" nil out-buf nil "-c" command)
-      (message ""))
-    (end-of-line)
-    (if (= (forward-line 1) 1)
-       (progn
-         (end-of-line)
-         (insert "\n")))
-    (beginning-of-line)))

 
 

-(defun gnus-uu-interactive-end ()
-  "This function exits interactive view mode and returns to summary mode."
-  (interactive)
-  (let (buf)
-    (if (windowp gnus-uu-output-window) (delete-window gnus-uu-output-window))
-    (gnus-configure-windows 'article)
-    (gnus-uu-clean-up)
-    (if (not gnus-uu-asynchronous) (gnus-uu-check-for-generated-files))
-    (setq buf (get-buffer gnus-uu-interactive-buffer-name))
-    (if gnus-article-buffer (switch-to-buffer gnus-article-buffer))
-    (if buf (kill-buffer buf))
-    (pop-to-buffer gnus-summary-buffer)))
-
-
-(defun gnus-uu-interactive-scan-directory (dir)
-  "Read any directory and view the files.
-When used in interactive mode, the files and commands will be displayed,
-as usual, in the interactive mode buffer."
-  (interactive "DDirectory: ")
-  (setq gnus-uu-interactive-file-list nil)
-  (gnus-uu-view-directory dir gnus-uu-use-interactive-view)
-  (gnus-uu-do-interactive t))
-  
-(defun gnus-uu-interactive-rescan-directory ()
-  "Reread the directory and view the files.
-When used in interactive mode, the files and commands will be displayed,
-as usual, in the interactive mode buffer."
-  (interactive)
-  (gnus-uu-interactive-scan-directory gnus-uu-work-dir))
+(add-hook 'gnus-exit-group-hook 'gnus-uu-clean-up)
+(add-hook 'gnus-exit-group-hook        'gnus-uu-delete-work-dir)

 
 

-(defun gnus-uu-interactive-save-original-file ()
-  "Saves the file from whence the file on the current line came from."
-  (interactive)
-  (let ((files gnus-uu-list-of-files-decoded)
-       (filestr "")
-       file did dir)
-    (while files
-      (setq file (car files))
-      (setq files (cdr files))
-      (if (file-exists-p file)
-         (progn
-           (if (not did)
-               (progn
-                 (setq dir (gnus-uu-read-directory 
-                            (format "Where do you want the file%s? " 
-                                    (if (> (length files) 1) "s" ""))))
-                 (setq did t)))
-           (setq filestr (concat filestr (gnus-uu-name-from-path file) " "))
-           (gnus-uu-save-file file dir t)))
-      (if did 
-         (message "Saved %s" filestr)
-       (message "Already saved.")))))
-
-(defun gnus-uu-interactive-save-current-file-silent ()
-  "Saves the file referred to on the current line in the current directory."
-  (interactive)
-  (gnus-uu-interactive-save-current-file t))
+\f

 
 

-(defun gnus-uu-interactive-save-current-file (&optional dont-ask silent)
-  "Saves the file referred to on the current line."
-  (interactive)
-  (let (files beg line file)
-    (setq files (copy-sequence gnus-uu-interactive-file-list))
-    (beginning-of-line)
-    (setq beg (point))
-    (end-of-line)
-    (setq line (buffer-substring beg (point)))
-    (while (and files
-               (not (string-match 
-                     (concat "" (regexp-quote (setq file (car files))) "")
-                     line)))
-      (setq files (cdr files)))
-    (beginning-of-line)
-    (forward-line 1)
-    (if (not files)
-       (if (not silent)
-           (progn (message "Could not find file") (sit-for 2)))
-      (gnus-uu-save-file file (if dont-ask gnus-uu-current-save-dir nil) silent)
-      (delete-region beg (point)))))
-
-(defun gnus-uu-interactive-save-all-files ()
-  "Saves all files referred to in the interactive buffer."
-  (interactive)
-  (let (dir)
-    (goto-char 1)
-    (setq dir (gnus-uu-read-directory "Where do you want the files? "))
-    (while (not (eobp))
-      (gnus-uu-interactive-save-current-file t t))))
-
-(defun gnus-uu-mode ()
-  "Major mode for editing view commands in gnus-uu.
-
-Commands:
-\\<gnus-uu-mode-map>Return, C-c C-v, C-c C-x        Execute the current command
-\\[gnus-uu-interactive-end]\tEnd interactive mode
-\\[gnus-uu-interactive-save-current-file]\tSave the current file
-\\[gnus-uu-interactive-save-current-file-silent]\tSave the current file without asking 
-\twhere to put it
-\\[gnus-uu-interactive-save-all-files]\tSave all files
-\\[gnus-uu-interactive-save-original-file]\tSave the original file: If the files
-\toriginated in an archive, the archive 
-\tfile is saved.
-\\[gnus-uu-interactive-rescan-directory]\tRescan the directory
-\\[gnus-uu-interactive-scan-directory]\tScan any directory
-"
-  (interactive)
-  (kill-all-local-variables)
-  (use-local-map gnus-uu-mode-map)   
-  (setq mode-name "gnus-uu")         
-  (setq major-mode 'gnus-uu-mode)    
-)
-
-  (define-key gnus-uu-mode-map "\C-c\C-x" 'gnus-uu-interactive-execute)
-  (define-key gnus-uu-mode-map "\C-c\C-v" 'gnus-uu-interactive-execute)
-  (define-key gnus-uu-mode-map "\C-m" 'gnus-uu-interactive-execute)
-  (define-key gnus-uu-mode-map "\C-c\C-c" 'gnus-uu-interactive-end)
-  (define-key gnus-uu-mode-map "\C-cs" 
-    'gnus-uu-interactive-save-current-file)
-  (define-key gnus-uu-mode-map "\C-c\C-s"
-    'gnus-uu-interactive-save-current-file-silent)
-  (define-key gnus-uu-mode-map "\C-c\C-a" 'gnus-uu-interactive-save-all-files)
-  (define-key gnus-uu-mode-map "\C-c\C-o" 'gnus-uu-interactive-save-original-file)
-
-
-;; Major mode for posting encoded articles.
-
-(require 'sendmail)
-(require 'rnews)
-
-; Any function that is to be used as and encoding method will take two
-; parameters: PATH-NAME and FILE-NAME. (E.g. "/home/gaga/spiral.jpg"
-; and "spiral.jpg", respectively.) The function should return nil if
-; the encoding wasn't successful.
-(defvar gnus-uu-post-encode-method 'gnus-uu-post-encode-uuencode
+;;;
+;;; uuencoded posting
+;;;
+
+;; Any function that is to be used as and encoding method will take two
+;; parameters: PATH-NAME and FILE-NAME.  (E.g. "/home/gaga/spiral.jpg"
+;; and "spiral.jpg", respectively.) The function should return nil if
+;; the encoding wasn't successful.
+(defcustom gnus-uu-post-encode-method 'gnus-uu-post-encode-uuencode

   "Function used for encoding binary files.
 There are three functions supplied with gnus-uu for encoding files:
 `gnus-uu-post-encode-uuencode', which does straight uuencoding;
   "Function used for encoding binary files.
 There are three functions supplied with gnus-uu for encoding files:
 `gnus-uu-post-encode-uuencode', which does straight uuencoding;

-`gnus-uu-post-encode-mime', which encodes with base64 and adds MIME 
-headers; and `gnus-uu-post-encode-mime-uuencode', which encodes with 
-uuencode and adds MIME headers.")
-
-(defvar gnus-uu-post-include-before-composing nil
+`gnus-uu-post-encode-mime', which encodes with base64 and adds MIME
+headers; and `gnus-uu-post-encode-mime-uuencode', which encodes with
+uuencode and adds MIME headers."
+  :group 'gnus-extract-post
+  :type '(radio (function-item gnus-uu-post-encode-uuencode)
+               (function-item gnus-uu-post-encode-mime)
+               (function-item gnus-uu-post-encode-mime-uuencode)
+               (function :tag "Other")))
+
+(defcustom gnus-uu-post-include-before-composing nil

   "Non-nil means that gnus-uu will ask for a file to encode before you compose the article.
 If this variable is t, you can either include an encoded file with
   "Non-nil means that gnus-uu will ask for a file to encode before you compose the article.
 If this variable is t, you can either include an encoded file with

-\\<gnus-uu-post-reply-mode-map>\\[gnus-uu-post-insert-binary-in-article] or have one included for you when you post the article.")
+\\[gnus-uu-post-insert-binary-in-article] or have one included for you when you post the article."
+  :group 'gnus-extract-post
+  :type 'boolean)

 
 

-(defvar gnus-uu-post-length 990
+(defcustom gnus-uu-post-length 990

   "Maximum length of an article.
 The encoded file will be split into how many articles it takes to
   "Maximum length of an article.
 The encoded file will be split into how many articles it takes to

-post the entire file.")
+post the entire file."
+  :group 'gnus-extract-post
+  :type 'integer)

 
 

-(defvar gnus-uu-post-threaded nil
+(defcustom gnus-uu-post-threaded nil

   "Non-nil means that gnus-uu will post the encoded file in a thread.
 This may not be smart, as no other decoder I have seen are able to
   "Non-nil means that gnus-uu will post the encoded file in a thread.
 This may not be smart, as no other decoder I have seen are able to

-follow threads when collecting uuencoded articles. (Well, I have seen
-one package that does that - gnus-uu, but somehow, I don't think that 
-counts...) Default is nil.")
+follow threads when collecting uuencoded articles.  (Well, I have seen
+one package that does that - gnus-uu, but somehow, I don't think that
+counts...)  The default is nil."
+  :group 'gnus-extract-post
+  :type 'boolean)

 
 

-(defvar gnus-uu-post-separate-description t
+(defcustom gnus-uu-post-separate-description t

   "Non-nil means that the description will be posted in a separate article.
   "Non-nil means that the description will be posted in a separate article.

-The first article will typically be numbered (0/x). If this variable
-is nil, the description the user enters will be included at the 
-beginning of the first article, which will be numbered (1/x). Default 
-is t.")
-
-(defconst gnus-uu-post-binary-separator "--binary follows this line--")
+The first article will typically be numbered (0/x).  If this variable
+is nil, the description the user enters will be included at the
+beginning of the first article, which will be numbered (1/x).  Default
+is t."
+  :group 'gnus-extract-post
+  :type 'boolean)
+
+(defvar gnus-uu-post-binary-separator "--binary follows this line--")

 (defvar gnus-uu-post-message-id nil)
 (defvar gnus-uu-post-inserted-file-name nil)
 (defvar gnus-uu-winconf-post-news nil)
 
 (defvar gnus-uu-post-message-id nil)
 (defvar gnus-uu-post-inserted-file-name nil)
 (defvar gnus-uu-winconf-post-news nil)
 

-; The following map and mode was taken from rnewspost.el and edited
-; somewhat.
-(defvar gnus-uu-post-reply-mode-map () "Mode map used by gnus-uu-post-reply.")
-(or gnus-uu-post-reply-mode-map
-    (progn
-      (setq gnus-uu-post-reply-mode-map (make-keymap))
-      (define-key gnus-uu-post-reply-mode-map "\C-c?" 'describe-mode)
-      (define-key gnus-uu-post-reply-mode-map "\C-c\C-f\C-d" 
-       'news-reply-distribution)
-      (define-key gnus-uu-post-reply-mode-map "\C-c\C-f\C-k" 
-       'news-reply-keywords)
-      (define-key gnus-uu-post-reply-mode-map "\C-c\C-f\C-n" 
-       'news-reply-newsgroups)
-      
-      (define-key gnus-uu-post-reply-mode-map "\C-c\C-f\C-f" 
-       'news-reply-followup-to)
-      (define-key gnus-uu-post-reply-mode-map "\C-c\C-f\C-s" 'mail-subject)
-      (define-key gnus-uu-post-reply-mode-map "\C-c\C-f\C-a" 
-       'gnus-uu-post-reply-summary)
-      (define-key gnus-uu-post-reply-mode-map "\C-c\C-r" 
-       'news-caesar-buffer-body)
-      (define-key gnus-uu-post-reply-mode-map "\C-c\C-w" 'news-reply-signature)
-      (define-key gnus-uu-post-reply-mode-map "\C-c\C-y" 
-       'news-reply-yank-original)
-      (define-key gnus-uu-post-reply-mode-map "\C-c\C-q" 
-       'mail-fill-yanked-message)
-      (define-key gnus-uu-post-reply-mode-map "\C-c\C-c" 
-       'gnus-uu-post-news-inews)
-      (define-key gnus-uu-post-reply-mode-map "\C-c\C-s" 
-       'gnus-uu-post-news-inews)
-      (define-key gnus-uu-post-reply-mode-map "\C-c\C-i" 
-       'gnus-uu-post-insert-binary-in-article)
-      ))
-
-; This mode was taken from rnewspost.el and modified slightly.
-(defun gnus-uu-post-reply-mode ()
-  "Major mode for editing binary news to be posted on USENET.
-First-time posters are asked to please read the articles in newsgroup:
-                                                     news.announce.newusers .
-
-Like news-reply-mode, which is like Text Mode, but with these
-additional commands:
-
-\\<gnus-uu-post-reply-mode-map>\\[gnus-uu-post-news-inews]  post the message.
-C-c C-f         move to a header field (and create it if there isn't):
-        C-c C-f C-n  move to Newsgroups:       C-c C-f C-s  move to Subj:
-        C-c C-f C-f  move to Followup-To:      C-c C-f C-k  move to Keywords:
-        C-c C-f C-d  move to Distribution:     C-c C-f C-a  move to Summary:
-C-c C-y  news-reply-yank-original (insert current message, in NEWS).
-C-c C-q  mail-fill-yanked-message (fill what was yanked).
-C-c C-r  caesar rotate all letters by 13 places in the article's body (rot13).
-\\[gnus-uu-post-insert-binary-in-article]  encode and include a file in this article.
-
-This mode is almost identical to news-reply-mode, but has some
-additional commands for treating encoded binary articles. In
-particular, \\[gnus-uu-post-news-inews] will ask for a file to include, if
-one hasn't been included already. It will post, first, the message
-composed, and then it will post as many additional articles it takes
-to post the entire encoded files.
-
-   Relevant Variables
-
-   `gnus-uu-post-encode-method' 
-   There are three functions supplied with gnus-uu for encoding files:
-   `gnus-uu-post-encode-uuencode', which does straight uuencoding;
-   `gnus-uu-post-encode-mime', which encodes with base64 and adds MIME 
-   headers; and `gnus-uu-post-encode-mime-uuencode', which encodes with 
-   uuencode and adds MIME headers.
- 
-   `gnus-uu-post-include-before-composing'
-   Non-nil means that gnus-uu will ask for a file to encode before you
-   compose the article.  If this variable is t, you can either include
-   an encoded file with `C-c C-i' or have one included for you when you 
-   post the article.
-
-   `gnus-uu-post-length'
-   Maximum length of an article. The encoded file will be split into how 
-   many articles it takes to post the entire file.
-
-   `gnus-uu-post-separate-description'
-   Non-nil means that the description will be posted in a separate 
-   article. The first article will typically be numbered (0/x). If 
-   this variable is nil, the description the user enters will be 
-   included at the beginning of the first article, which will be 
-   numbered (1/x). Default is t.
-
-   `gnus-uu-post-threaded'
-   Non-nil means that gnus-uu will post the encoded file in a thread.
-   This may not be smart, as no other decoder I have seen are able to
-   follow threads when collecting uuencoded articles. (Well, I have seen
-   one package that does that - gnus-uu, but somehow, I don't think that 
-   counts...) Default is nil.
-"
-  (interactive)
-  ;; require...
-  (or (fboundp 'mail-setup) (load "sendmail"))
-  (kill-all-local-variables)
-  (make-local-variable 'mail-reply-buffer)
-  (setq mail-reply-buffer nil)
-  (set-syntax-table text-mode-syntax-table)
-  (use-local-map gnus-uu-post-reply-mode-map)
-  (setq local-abbrev-table text-mode-abbrev-table)
-  (setq major-mode 'gnus-uu-post-reply-mode)
-  (setq mode-name "Gnus UU News")
-  (make-local-variable 'paragraph-separate)
-  (make-local-variable 'paragraph-start)
-  (setq paragraph-start (concat "^" mail-header-separator "$\\|"
-                               paragraph-start))
-  (setq paragraph-separate (concat "^" mail-header-separator "$\\|"
-                                  paragraph-separate))
-  (run-hooks 'text-mode-hook 'gnus-uu-post-reply-mode-hook))
-

 (defun gnus-uu-post-news ()
   "Compose an article and post an encoded file."
   (interactive)
   (setq gnus-uu-post-inserted-file-name nil)
   (setq gnus-uu-winconf-post-news (current-window-configuration))
 (defun gnus-uu-post-news ()
   "Compose an article and post an encoded file."
   (interactive)
   (setq gnus-uu-post-inserted-file-name nil)
   (setq gnus-uu-winconf-post-news (current-window-configuration))

-  (let (news-reply-mode)
-    (fset 'news-reply-mode 'gnus-uu-post-reply-mode)
-    (gnus-summary-post-news)
-    (if gnus-uu-post-include-before-composing
-       (save-excursion (setq gnus-uu-post-inserted-file-name 
-                             (gnus-uu-post-insert-binary))))))
+
+  (gnus-summary-post-news)
+
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map (current-local-map))
+    (use-local-map map))
+  ;;(local-set-key "\C-c\C-c" 'gnus-summary-edit-article-done)
+  (local-set-key "\C-c\C-c" 'gnus-uu-post-news-inews)
+  (local-set-key "\C-c\C-s" 'gnus-uu-post-news-inews)
+  (local-set-key "\C-c\C-i" 'gnus-uu-post-insert-binary-in-article)
+
+  (when gnus-uu-post-include-before-composing
+    (save-excursion (setq gnus-uu-post-inserted-file-name
+                         (gnus-uu-post-insert-binary)))))

 
 (defun gnus-uu-post-insert-binary-in-article ()
   "Inserts an encoded file in the buffer.
 The user will be asked for a file name."
   (interactive)
 
 (defun gnus-uu-post-insert-binary-in-article ()
   "Inserts an encoded file in the buffer.
 The user will be asked for a file name."
   (interactive)

-  (if (not (eq (current-buffer) (get-buffer gnus-post-news-buffer)))
-      (error "Not in post-news buffer"))
-  (save-excursion 
+  (save-excursion

     (setq gnus-uu-post-inserted-file-name (gnus-uu-post-insert-binary))))
 
     (setq gnus-uu-post-inserted-file-name (gnus-uu-post-insert-binary))))
 

-; Encodes with uuencode and substitutes all spaces with backticks.
+;; Encodes with uuencode and substitutes all spaces with backticks.

 (defun gnus-uu-post-encode-uuencode (path file-name)
 (defun gnus-uu-post-encode-uuencode (path file-name)

-  (if (gnus-uu-post-encode-file "uuencode" path file-name)
-      (progn
-       (goto-char 1)
-       (forward-line 1)
-       (while (re-search-forward " " nil t)
-         (replace-match "`"))
-       t)))
+  (when (gnus-uu-post-encode-file "uuencode" path file-name)
+    (goto-char (point-min))
+    (forward-line 1)
+    (while (re-search-forward " " nil t)
+      (replace-match "`"))
+    t))

 
 

-; Encodes with uuencode and adds MIME headers.
+;; Encodes with uuencode and adds MIME headers.

 (defun gnus-uu-post-encode-mime-uuencode (path file-name)
 (defun gnus-uu-post-encode-mime-uuencode (path file-name)

-  (if (gnus-uu-post-encode-uuencode path file-name)
-      (progn
-       (gnus-uu-post-make-mime file-name "x-uue")
-       t)))
+  (when (gnus-uu-post-encode-uuencode path file-name)
+    (gnus-uu-post-make-mime file-name "x-uue")
+    t))

 
 

-; Encodes with base64 and adds MIME headers
+;; Encodes with base64 and adds MIME headers

 (defun gnus-uu-post-encode-mime (path file-name)
 (defun gnus-uu-post-encode-mime (path file-name)

-  (if (gnus-uu-post-encode-file "mmencode" path file-name)
-      (progn
-       (gnus-uu-post-make-mime file-name "base64")
-       t)))
+  (when (zerop (call-process shell-file-name nil t nil shell-command-switch
+                            (format "%s %s -o %s" "mmencode" path file-name)))
+    (gnus-uu-post-make-mime file-name "base64")
+    t))

 
 

-; Adds MIME headers.
+;; Adds MIME headers.

 (defun gnus-uu-post-make-mime (file-name encoding)
 (defun gnus-uu-post-make-mime (file-name encoding)

-  (goto-char 1)
-  (insert (format "Content-Type: %s; name=\"%s\"\n" 
-                 (gnus-uu-choose-action file-name gnus-uu-ext-to-mime-list) 
+  (goto-char (point-min))
+  (insert (format "Content-Type: %s; name=\"%s\"\n"
+                 (gnus-uu-choose-action file-name gnus-uu-ext-to-mime-list)

                  file-name))
   (insert (format "Content-Transfer-Encoding: %s\n\n" encoding))
   (save-restriction
                  file-name))
   (insert (format "Content-Transfer-Encoding: %s\n\n" encoding))
   (save-restriction

-    (set-buffer gnus-post-news-buffer)
-    (goto-char 1)
-    (re-search-forward mail-header-separator)
-    (beginning-of-line)
+    (set-buffer gnus-message-buffer)
+    (goto-char (point-min))
+    (re-search-forward (concat "^" (regexp-quote mail-header-separator) "$"))

     (forward-line -1)
     (narrow-to-region 1 (point))
     (forward-line -1)
     (narrow-to-region 1 (point))

-    (or (mail-fetch-field "mime-version")
-       (progn
-         (widen)
-         (insert "MIME-Version: 1.0\n")))
+    (unless (mail-fetch-field "mime-version")
+      (widen)
+      (insert "MIME-Version: 1.0\n"))

     (widen)))
 
     (widen)))
 

-; Encodes a file PATH with COMMAND, leaving the result in the
-; current buffer.
+;; Encodes a file PATH with COMMAND, leaving the result in the
+;; current buffer.

 (defun gnus-uu-post-encode-file (command path file-name)
 (defun gnus-uu-post-encode-file (command path file-name)

-  (= 0 (call-process "sh" nil t nil "-c" 
+  (= 0 (call-process shell-file-name nil t nil shell-command-switch

                     (format "%s %s %s" command path file-name))))
 
 (defun gnus-uu-post-news-inews ()
   "Posts the composed news article and encoded file.
 If no file has been included, the user will be asked for a file."
   (interactive)
                     (format "%s %s %s" command path file-name))))
 
 (defun gnus-uu-post-news-inews ()
   "Posts the composed news article and encoded file.
 If no file has been included, the user will be asked for a file."
   (interactive)

-  (if (not (eq (current-buffer) (get-buffer gnus-post-news-buffer)))
-      (error "Not in post news buffer"))

 
   (let (file-name)
 
     (if gnus-uu-post-inserted-file-name
        (setq file-name gnus-uu-post-inserted-file-name)
       (setq file-name (gnus-uu-post-insert-binary)))
 
   (let (file-name)
 
     (if gnus-uu-post-inserted-file-name
        (setq file-name gnus-uu-post-inserted-file-name)
       (setq file-name (gnus-uu-post-insert-binary)))

-  
-    (if gnus-uu-post-threaded
-       (let ((gnus-required-headers 
-              (if (memq 'Message-ID gnus-required-headers)
-                  gnus-required-headers
-                (cons 'Message-ID gnus-required-headers)))
-             gnus-inews-article-hook elem)
-
-         (setq gnus-inews-article-hook (if (listp gnus-inews-article-hook)
-                                           gnus-inews-article-hook
-                                         (list gnus-inews-article-hook)))
-         (setq gnus-inews-article-hook 
-               (cons
-                '(lambda ()
-                   (save-excursion
-                     (goto-char 1)
-                     (if (re-search-forward "^Message-ID: \\(.*\\)$" nil t)
-                         (setq gnus-uu-post-message-id 
-                               (buffer-substring 
-                                (match-beginning 1) (match-end 1)))
-                       (setq gnus-uu-post-message-id nil))))
-                gnus-inews-article-hook))
-         (gnus-uu-post-encoded file-name t))
-      (gnus-uu-post-encoded file-name nil)))
+
+    (gnus-uu-post-encoded file-name gnus-uu-post-threaded))

   (setq gnus-uu-post-inserted-file-name nil)
   (setq gnus-uu-post-inserted-file-name nil)

-  (and gnus-uu-winconf-post-news
-       (set-window-configuration gnus-uu-winconf-post-news)))
-      
-; Asks for a file to encode, encodes it and inserts the result in
-; the current buffer. Returns the file name the user gave.
+  (when gnus-uu-winconf-post-news
+    (set-window-configuration gnus-uu-winconf-post-news)))
+
+;; Asks for a file to encode, encodes it and inserts the result in
+;; the current buffer.  Returns the file name the user gave.

 (defun gnus-uu-post-insert-binary ()
   (let ((uuencode-buffer-name "*uuencode buffer*")
 (defun gnus-uu-post-insert-binary ()
   (let ((uuencode-buffer-name "*uuencode buffer*")

-       file-path post-buf uubuf file-name)
+       file-path uubuf file-name)

 
 

-    (setq file-path (read-file-name 
+    (setq file-path (read-file-name

                     "What file do you want to encode? "))
                     "What file do you want to encode? "))

-    (if (not (file-exists-p file-path))
-       (error "%s: No such file" file-path))
+    (when (not (file-exists-p file-path))
+      (error "%s: No such file" file-path))

 
     (goto-char (point-max))
     (insert (format "\n%s\n" gnus-uu-post-binary-separator))
 
     (goto-char (point-max))
     (insert (format "\n%s\n" gnus-uu-post-binary-separator))

-    
-    (if (string-match "^~/" file-path)
-       (setq file-path (concat "$HOME" (substring file-path 1))))
+
+    ;; #### Unix-specific?
+    (when (string-match "^~/" file-path)
+      (setq file-path (concat "$HOME" (substring file-path 1))))
+    ;; #### Unix-specific?

     (if (string-match "/[^/]*$" file-path)
        (setq file-name (substring file-path (1+ (match-beginning 0))))
       (setq file-name file-path))
 
     (unwind-protect
        (if (save-excursion
     (if (string-match "/[^/]*$" file-path)
        (setq file-name (substring file-path (1+ (match-beginning 0))))
       (setq file-name file-path))
 
     (unwind-protect
        (if (save-excursion

-             (set-buffer (setq uubuf 
-                               (get-buffer-create uuencode-buffer-name)))
+             (set-buffer (setq uubuf
+                               (gnus-get-buffer-create uuencode-buffer-name)))

              (erase-buffer)
              (funcall gnus-uu-post-encode-method file-path file-name))
              (erase-buffer)
              (funcall gnus-uu-post-encode-method file-path file-name))

-           (insert-buffer uubuf)
+           (insert-buffer-substring uubuf)

          (error "Encoding unsuccessful"))
       (kill-buffer uubuf))
     file-name))
 
          (error "Encoding unsuccessful"))
       (kill-buffer uubuf))
     file-name))
 

-; Posts the article and all of the encoded file.
+;; Posts the article and all of the encoded file.

 (defun gnus-uu-post-encoded (file-name &optional threaded)
   (let ((send-buffer-name "*uuencode send buffer*")
        (encoded-buffer-name "*encoded buffer*")
        (top-string "[ cut here %s (%s %d/%d) %s gnus-uu ]")
        (separator (concat mail-header-separator "\n\n"))
 (defun gnus-uu-post-encoded (file-name &optional threaded)
   (let ((send-buffer-name "*uuencode send buffer*")
        (encoded-buffer-name "*encoded buffer*")
        (top-string "[ cut here %s (%s %d/%d) %s gnus-uu ]")
        (separator (concat mail-header-separator "\n\n"))

-       file uubuf length parts header i end beg
-       beg-line minlen buf post-buf whole-len beg-binary end-binary)
+       uubuf length parts header i end beg
+       beg-line minlen post-buf whole-len beg-binary end-binary)

 
     (setq post-buf (current-buffer))
 
 
     (setq post-buf (current-buffer))
 

-    (goto-char 1)
-    (if (not (re-search-forward 
-             (if gnus-uu-post-separate-description 
-                 gnus-uu-post-binary-separator 
-               mail-header-separator) nil t))
-       (error "Internal error: No binary/header separator"))
+    (goto-char (point-min))
+    (when (not (re-search-forward
+               (if gnus-uu-post-separate-description
+                   (concat "^" (regexp-quote gnus-uu-post-binary-separator)
+                           "$")
+                 (concat "^" (regexp-quote mail-header-separator) "$"))
+               nil t))
+      (error "Internal error: No binary/header separator"))

     (beginning-of-line)
     (forward-line 1)
     (setq beg-binary (point))
     (setq end-binary (point-max))
 
     (beginning-of-line)
     (forward-line 1)
     (setq beg-binary (point))
     (setq end-binary (point-max))
 

-    (save-excursion 
-      (set-buffer (setq uubuf (get-buffer-create encoded-buffer-name)))
+    (save-excursion
+      (set-buffer (setq uubuf (gnus-get-buffer-create encoded-buffer-name)))

       (erase-buffer)
       (insert-buffer-substring post-buf beg-binary end-binary)
       (erase-buffer)
       (insert-buffer-substring post-buf beg-binary end-binary)

-      (goto-char 1)
+      (goto-char (point-min))

       (setq length (count-lines 1 (point-max)))
       (setq parts (/ length gnus-uu-post-length))
       (setq length (count-lines 1 (point-max)))
       (setq parts (/ length gnus-uu-post-length))

-      (if (not (< (% length gnus-uu-post-length) 4))
-         (setq parts (1+ parts))))
+      (unless (< (% length gnus-uu-post-length) 4)
+       (incf parts)))

 
 

-    (if gnus-uu-post-separate-description
-       (forward-line -1))
-    (kill-region (point) (point-max))
+    (when gnus-uu-post-separate-description
+      (forward-line -1))
+    (delete-region (point) (point-max))

 
 

-    (goto-char 1)
-    (search-forward mail-header-separator nil t)
+    (goto-char (point-min))
+    (re-search-forward
+     (concat "^" (regexp-quote mail-header-separator) "$") nil t)

     (beginning-of-line)
     (setq header (buffer-substring 1 (point)))
 
     (beginning-of-line)
     (setq header (buffer-substring 1 (point)))
 

-    (goto-char 1)
-    (if (not gnus-uu-post-separate-description)
-       ()
-      (if (and (not threaded) (re-search-forward "^Subject: " nil t))
-         (progn
-           (end-of-line)
-           (insert (format " (0/%d)" parts))))
-      (gnus-inews-news))
+    (goto-char (point-min))
+    (when gnus-uu-post-separate-description
+      (when (re-search-forward "^Subject: " nil t)
+       (end-of-line)
+       (insert (format " (0/%d)" parts)))
+      (save-excursion
+       (message-send))
+      (setq gnus-uu-post-message-id (message-fetch-field "message-id")))

 
     (save-excursion
       (setq i 1)
       (setq beg 1)
       (while (not (> i parts))
 
     (save-excursion
       (setq i 1)
       (setq beg 1)
       (while (not (> i parts))

-       (set-buffer (get-buffer-create send-buffer-name))
+       (set-buffer (gnus-get-buffer-create send-buffer-name))

        (erase-buffer)
        (insert header)
        (erase-buffer)
        (insert header)

-       (if (and threaded gnus-uu-post-message-id)
-           (insert (format "References: %s\n" gnus-uu-post-message-id)))
+       (when (and threaded gnus-uu-post-message-id)
+         (insert "References: " gnus-uu-post-message-id "\n"))

        (insert separator)
        (setq whole-len
              (- 62 (length (format top-string "" file-name i parts ""))))
        (insert separator)
        (setq whole-len
              (- 62 (length (format top-string "" file-name i parts ""))))

-       (if (> 1 (setq minlen (/ whole-len 2)))
-           (setq minlen 1))
-       (setq 
-        beg-line 
+       (when (> 1 (setq minlen (/ whole-len 2)))
+         (setq minlen 1))
+       (setq
+        beg-line

         (format top-string
         (format top-string

-                (make-string minlen ?-) 
+                (make-string minlen ?-)

                 file-name i parts
                 file-name i parts

-                (make-string 
+                (make-string

                  (if (= 0 (% whole-len 2)) (1- minlen) minlen) ?-)))
 
                  (if (= 0 (% whole-len 2)) (1- minlen) minlen) ?-)))
 

-       (goto-char 1)
-       (if (not (re-search-forward "^Subject: " nil t))
-           ()
-         (if (not threaded)
-             (progn
-               (end-of-line)
-               (insert (format " (%d/%d)" i parts)))
-           (if (or (and (= i 2) gnus-uu-post-separate-description)
-                   (and (= i 1) (not gnus-uu-post-separate-description)))
-               (replace-match "Subject: Re: "))))
-                 
+       (goto-char (point-min))
+       (when (re-search-forward "^Subject: " nil t)
+         (end-of-line)
+         (insert (format " (%d/%d)" i parts)))
+

        (goto-char (point-max))
        (save-excursion
          (set-buffer uubuf)
        (goto-char (point-max))
        (save-excursion
          (set-buffer uubuf)


@@ -3157,36 +2121,40 @@ If no file has been included, the user will be asked for a file."
          (if (= i parts)
              (goto-char (point-max))
            (forward-line gnus-uu-post-length))
          (if (= i parts)
              (goto-char (point-max))
            (forward-line gnus-uu-post-length))

-         (if (and (= (1+ i) parts) (< (count-lines (point) (point-max)) 4))
-             (forward-line -4))
+         (when (and (= (1+ i) parts) (< (count-lines (point) (point-max)) 4))
+           (forward-line -4))

          (setq end (point)))
        (insert-buffer-substring uubuf beg end)
          (setq end (point)))
        (insert-buffer-substring uubuf beg end)

-       (insert beg-line)
-       (insert "\n")
+       (insert beg-line "\n")

        (setq beg end)
        (setq beg end)

-       (setq i (1+ i))
-       (goto-char 1)
-       (re-search-forward mail-header-separator nil t)
+       (incf i)
+       (goto-char (point-min))
+       (re-search-forward
+        (concat "^" (regexp-quote mail-header-separator) "$") nil t)

        (beginning-of-line)
        (forward-line 2)
        (beginning-of-line)
        (forward-line 2)

-       (if (re-search-forward gnus-uu-post-binary-separator nil t)
-           (progn 
-             (replace-match "")
-             (forward-line 1)))
+       (when (re-search-forward
+              (concat "^" (regexp-quote gnus-uu-post-binary-separator) "$")
+              nil t)
+         (replace-match "")
+         (forward-line 1))

        (insert beg-line)
        (insert "\n")
        (insert beg-line)
        (insert "\n")

-       (gnus-inews-news)))
+       (let (message-sent-message-via)
+         (save-excursion
+           (message-send))
+         (setq gnus-uu-post-message-id
+               (concat (message-fetch-field "references") " "
+                       (message-fetch-field "message-id"))))))

 
 

-    (and (setq buf (get-buffer send-buffer-name))
-        (kill-buffer buf))
-    (and (setq buf (get-buffer encoded-buffer-name))
-        (kill-buffer buf))
+    (gnus-kill-buffer send-buffer-name)
+    (gnus-kill-buffer encoded-buffer-name)

 
 

-    (if (not gnus-uu-post-separate-description)
-       (progn
-         (set-buffer-modified-p nil)
-         (and (fboundp 'bury-buffer) (bury-buffer))))))
+    (when (not gnus-uu-post-separate-description)
+      (set-buffer-modified-p nil)
+      (when (fboundp 'bury-buffer)
+       (bury-buffer)))))

 
 (provide 'gnus-uu)
 
 
 (provide 'gnus-uu)
 

-;; gnus-uu.el ends here
+;;; gnus-uu.el ends here