Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-294

20 files changed, 1042 insertions, 53 deletions

diff --git a/lisp/mail/binhex.el b/lisp/mail/binhex.el
new file mode 100644
index 00000000000..c1d1316c82e
--- /dev/null
+++ b/lisp/mail/binhex.el
@@ -0,0 +1,333 @@
+;;; binhex.el --- elisp native binhex decode
+
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
+
+;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
+;; Keywords: binhex news
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; 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, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+
+;;; Code:
+
+(eval-when-compile (require 'cl))
+
+(eval-and-compile
+  (defalias 'binhex-char-int
+    (if (fboundp 'char-int)
+        'char-int
+      'identity)))
+
+(defgroup binhex nil
+  "Decoding of BinHex (binary-to-hexadecimal) data."
+  :group 'mail
+  :group 'news)
+
+(defcustom binhex-decoder-program "hexbin"
+  "*Non-nil value should be a string that names a binhex decoder.
+The program should expect to read binhex data on its standard
+input and write the converted data to its standard output."
+  :type 'string
+  :group 'binhex)
+
+(defcustom binhex-decoder-switches '("-d")
+  "*List of command line flags passed to the command `binhex-decoder-program'."
+  :group 'binhex
+  :type '(repeat string))
+
+(defcustom binhex-use-external
+  (executable-find binhex-decoder-program)
+  "*Use external binhex program."
+  :version "22.1"
+  :group 'binhex
+  :type 'boolean)
+
+(defconst binhex-alphabet-decoding-alist
+  '(( ?\! . 0) ( ?\" . 1) ( ?\# . 2) ( ?\$ . 3) ( ?\% . 4) ( ?\& . 5)
+    ( ?\' . 6) ( ?\( . 7) ( ?\) . 8) ( ?\* . 9) ( ?\+ . 10) ( ?\, . 11)
+    ( ?\- . 12) ( ?0 . 13) ( ?1 . 14) ( ?2 . 15) ( ?3 . 16) ( ?4 . 17)
+    ( ?5 . 18) ( ?6 . 19) ( ?8 . 20) ( ?9 . 21) ( ?@ . 22) ( ?A . 23)
+    ( ?B . 24) ( ?C . 25) ( ?D . 26) ( ?E . 27) ( ?F . 28) ( ?G . 29)
+    ( ?H . 30) ( ?I . 31) ( ?J . 32) ( ?K . 33) ( ?L . 34) ( ?M . 35)
+    ( ?N . 36) ( ?P . 37) ( ?Q . 38) ( ?R . 39) ( ?S . 40) ( ?T . 41)
+    ( ?U . 42) ( ?V . 43) ( ?X . 44) ( ?Y . 45) ( ?Z . 46) ( ?\[ . 47)
+    ( ?\` . 48) ( ?a . 49) ( ?b . 50) ( ?c . 51) ( ?d . 52) ( ?e . 53)
+    ( ?f . 54) ( ?h . 55) ( ?i . 56) ( ?j . 57) ( ?k . 58) ( ?l . 59)
+    ( ?m . 60) ( ?p . 61) ( ?q . 62) ( ?r . 63)))
+
+(defun binhex-char-map (char)
+  (cdr (assq char binhex-alphabet-decoding-alist)))
+
+;;;###autoload
+(defconst binhex-begin-line
+  "^:...............................................................$")
+(defconst binhex-body-line
+  "^[^:]...............................................................$")
+(defconst binhex-end-line ":$")
+
+(defvar binhex-temporary-file-directory
+  (cond ((fboundp 'temp-directory) (temp-directory))
+        ((boundp 'temporary-file-directory) temporary-file-directory)
+        ("/tmp/")))
+
+(eval-and-compile
+  (defalias 'binhex-insert-char
+    (if (featurep 'xemacs)
+        'insert-char
+      (lambda (char &optional count ignored buffer)
+        "Insert COUNT copies of CHARACTER into BUFFER."
+        (if (or (null buffer) (eq buffer (current-buffer)))
+            (insert-char char count)
+          (with-current-buffer buffer
+            (insert-char char count)))))))
+
+(defvar binhex-crc-table
+  [0  4129  8258  12387  16516  20645  24774  28903
+      33032  37161  41290  45419  49548  53677  57806  61935
+      4657  528  12915  8786  21173  17044  29431  25302
+      37689  33560  45947  41818  54205  50076  62463  58334
+      9314  13379  1056  5121  25830  29895  17572  21637
+      42346  46411  34088  38153  58862  62927  50604  54669
+      13907  9842  5649  1584  30423  26358  22165  18100
+      46939  42874  38681  34616  63455  59390  55197  51132
+      18628  22757  26758  30887  2112  6241  10242  14371
+      51660  55789  59790  63919  35144  39273  43274  47403
+      23285  19156  31415  27286  6769  2640  14899  10770
+      56317  52188  64447  60318  39801  35672  47931  43802
+      27814  31879  19684  23749  11298  15363  3168  7233
+      60846  64911  52716  56781  44330  48395  36200  40265
+      32407  28342  24277  20212  15891  11826  7761  3696
+      65439  61374  57309  53244  48923  44858  40793  36728
+      37256  33193  45514  41451  53516  49453  61774  57711
+      4224  161  12482  8419  20484  16421  28742  24679
+      33721  37784  41979  46042  49981  54044  58239  62302
+      689  4752  8947  13010  16949  21012  25207  29270
+      46570  42443  38312  34185  62830  58703  54572  50445
+      13538  9411  5280  1153  29798  25671  21540  17413
+      42971  47098  34713  38840  59231  63358  50973  55100
+      9939  14066  1681  5808  26199  30326  17941  22068
+      55628  51565  63758  59695  39368  35305  47498  43435
+      22596  18533  30726  26663  6336  2273  14466  10403
+      52093  56156  60223  64286  35833  39896  43963  48026
+      19061  23124  27191  31254  2801  6864  10931  14994
+      64814  60687  56684  52557  48554  44427  40424  36297
+      31782  27655  23652  19525  15522  11395  7392  3265
+      61215  65342  53085  57212  44955  49082  36825  40952
+      28183  32310  20053  24180  11923  16050  3793  7920])
+
+(defun binhex-update-crc (crc char &optional count)
+  (if (null count) (setq count 1))
+  (while (> count 0)
+    (setq crc (logxor (logand (lsh crc 8) 65280)
+                      (aref binhex-crc-table
+                            (logxor (logand (lsh crc -8) 255)
+                                    char)))
+          count (1- count)))
+  crc)
+
+(defun binhex-verify-crc (buffer start end)
+  (with-current-buffer buffer
+    (let ((pos start) (crc 0) (last (- end 2)))
+      (while (< pos last)
+        (setq crc (binhex-update-crc crc (char-after pos))
+              pos (1+ pos)))
+      (if (= crc (binhex-string-big-endian (buffer-substring last end)))
+          nil
+        (error "CRC error")))))
+
+(defun binhex-string-big-endian (string)
+  (let ((ret 0) (i 0) (len (length string)))
+    (while (< i len)
+      (setq ret (+ (lsh ret 8) (binhex-char-int (aref string i)))
+            i (1+ i)))
+    ret))
+
+(defun binhex-string-little-endian (string)
+  (let ((ret 0) (i 0) (shift 0) (len (length string)))
+    (while (< i len)
+      (setq ret (+ ret (lsh (binhex-char-int (aref string i)) shift))
+            i (1+ i)
+            shift (+ shift 8)))
+    ret))
+
+(defun binhex-header (buffer)
+  (with-current-buffer buffer
+    (let ((pos (point-min)) len)
+      (vector
+       (prog1
+           (setq len (binhex-char-int (char-after pos)))
+         (setq pos (1+ pos)))
+       (buffer-substring pos (setq pos (+ pos len)))
+       (prog1
+           (setq len (binhex-char-int (char-after pos)))
+         (setq pos (1+ pos)))
+       (buffer-substring pos (setq pos (+ pos 4)))
+       (buffer-substring pos (setq pos (+ pos 4)))
+       (binhex-string-big-endian
+        (buffer-substring pos (setq pos (+ pos 2))))
+       (binhex-string-big-endian
+        (buffer-substring pos (setq pos (+ pos 4))))
+       (binhex-string-big-endian
+        (buffer-substring pos (setq pos (+ pos 4))))))))
+
+(defvar binhex-last-char)
+(defvar binhex-repeat)
+
+(defun binhex-push-char (char &optional count ignored buffer)
+  (cond
+   (binhex-repeat
+    (if (eq char 0)
+        (binhex-insert-char (setq binhex-last-char 144) 1
+                            ignored buffer)
+      (binhex-insert-char binhex-last-char (- char 1)
+                          ignored buffer)
+      (setq binhex-last-char nil))
+    (setq binhex-repeat nil))
+   ((= char 144)
+    (setq binhex-repeat t))
+   (t
+    (binhex-insert-char (setq binhex-last-char char) 1 ignored buffer))))
+
+;;;###autoload
+(defun binhex-decode-region-internal (start end &optional header-only)
+  "Binhex decode region between START and END without using an external program.
+If HEADER-ONLY is non-nil only decode header and return filename."
+  (interactive "r")
+  (let ((work-buffer nil)
+        (counter 0)
+        (bits 0) (tmp t)
+        (lim 0) inputpos
+        (non-data-chars " \t\n\r:")
+        file-name-length data-fork-start
+        header
+        binhex-last-char binhex-repeat)
+    (unwind-protect
+        (save-excursion
+          (goto-char start)
+          (when (re-search-forward binhex-begin-line end t)
+            (let (default-enable-multibyte-characters)
+              (setq work-buffer (generate-new-buffer " *binhex-work*")))
+            (beginning-of-line)
+            (setq bits 0 counter 0)
+            (while tmp
+              (skip-chars-forward non-data-chars end)
+              (setq inputpos (point))
+              (end-of-line)
+              (setq lim (point))
+              (while (and (< inputpos lim)
+                          (setq tmp (binhex-char-map (char-after inputpos))))
+                (setq bits (+ bits tmp)
+                      counter (1+ counter)
+                      inputpos (1+ inputpos))
+                (cond ((= counter 4)
+                       (binhex-push-char (lsh bits -16) 1 nil work-buffer)
+                       (binhex-push-char (logand (lsh bits -8) 255) 1 nil
+                                         work-buffer)
+                       (binhex-push-char (logand bits 255) 1 nil
+                                         work-buffer)
+                       (setq bits 0 counter 0))
+                      (t (setq bits (lsh bits 6)))))
+              (if (null file-name-length)
+                  (with-current-buffer work-buffer
+                    (setq file-name-length (char-after (point-min))
+                          data-fork-start (+ (point-min)
+                                             file-name-length 22))))
+              (when (and (null header)
+                         (with-current-buffer work-buffer
+                           (>= (buffer-size) data-fork-start)))
+                (binhex-verify-crc work-buffer
+                                   (point-min) data-fork-start)
+                (setq header (binhex-header work-buffer))
+                (when header-only (setq tmp nil counter 0)))
+              (setq tmp (and tmp (not (eq inputpos end)))))
+            (cond
+             ((= counter 3)
+              (binhex-push-char (logand (lsh bits -16) 255) 1 nil
+                                work-buffer)
+              (binhex-push-char (logand (lsh bits -8) 255) 1 nil
+                                work-buffer))
+             ((= counter 2)
+              (binhex-push-char (logand (lsh bits -10) 255) 1 nil
+                                work-buffer))))
+          (if header-only nil
+            (binhex-verify-crc work-buffer
+                               data-fork-start
+                               (+ data-fork-start (aref header 6) 2))
+            (or (markerp end) (setq end (set-marker (make-marker) end)))
+            (goto-char start)
+            (insert-buffer-substring work-buffer
+                                     data-fork-start (+ data-fork-start
+                                                        (aref header 6)))
+            (delete-region (point) end)))
+      (and work-buffer (kill-buffer work-buffer)))
+    (if header (aref header 1))))
+
+;;;###autoload
+(defun binhex-decode-region-external (start end)
+  "Binhex decode region between START and END using external decoder."
+  (interactive "r")
+  (let ((cbuf (current-buffer)) firstline work-buffer status
+        (file-name (expand-file-name
+                    (concat (binhex-decode-region-internal start end t)
+                            ".data")
+                    binhex-temporary-file-directory)))
+    (save-excursion
+      (goto-char start)
+      (when (re-search-forward binhex-begin-line nil t)
+        (let ((cdir default-directory) default-process-coding-system)
+          (unwind-protect
+              (progn
+                (set-buffer (setq work-buffer
+                                  (generate-new-buffer " *binhex-work*")))
+                (buffer-disable-undo work-buffer)
+                (insert-buffer-substring cbuf firstline end)
+                (cd binhex-temporary-file-directory)
+                (apply 'call-process-region
+                       (point-min)
+                       (point-max)
+                       binhex-decoder-program
+                       nil
+                       nil
+                       nil
+                       binhex-decoder-switches))
+            (cd cdir) (set-buffer cbuf)))
+        (if (and file-name (file-exists-p file-name))
+            (progn
+              (goto-char start)
+              (delete-region start end)
+              (let (format-alist)
+                (insert-file-contents-literally file-name)))
+          (error "Can not binhex")))
+      (and work-buffer (kill-buffer work-buffer))
+      (ignore-errors
+        (if file-name (delete-file file-name))))))
+
+;;;###autoload
+(defun binhex-decode-region (start end)
+  "Binhex decode region between START and END."
+  (interactive "r")
+  (if binhex-use-external
+      (binhex-decode-region-external start end)
+    (binhex-decode-region-internal start end)))
+
+(provide 'binhex)
+
+;;; arch-tag: 8476badd-1e76-4f1d-a640-f9a38c72eed8
+;;; binhex.el ends here
diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index ce98a608665..14a0a8d4ef1 100644
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -229,6 +229,9 @@ Type SPC to scroll through this section and its subsections."))))
       (setq report-emacs-bug-orig-text (buffer-substring (point-min) (point))))
     (goto-char user-point)))
 
+(declare-function Info-menu "info" (menu-item &optional fork))
+(declare-function Info-goto-node "info" (nodename &optional fork))
+
 (defun report-emacs-bug-info ()
   "Go to the Info node on reporting Emacs bugs."
   (interactive)
diff --git a/lisp/mail/hashcash.el b/lisp/mail/hashcash.el
new file mode 100644
index 00000000000..22005ce957e
--- /dev/null
+++ b/lisp/mail/hashcash.el
@@ -0,0 +1,375 @@
+;;; hashcash.el --- Add hashcash payments to email
+
+;; Copyright (C) 2003, 2004, 2005, 2007 Free Software Foundation
+
+;; Written by: Paul Foley <mycroft@actrix.gen.nz> (1997-2002)
+;; Maintainer: Paul Foley <mycroft@actrix.gen.nz>
+;; Keywords: mail, hashcash
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; 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, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+
+;; The hashcash binary is at http://www.hashcash.org/.
+;;
+;; Call mail-add-payment to add a hashcash payment to a mail message
+;; in the current buffer.
+;;
+;; Call mail-add-payment-async after writing the addresses but before
+;; writing the mail to start calculating the hashcash payment
+;; asynchronously.
+;;
+;; The easiest way to do this automatically for all outgoing mail
+;; is to set `message-generate-hashcash' to t.  If you want more
+;; control, try the following hooks.
+;;
+;; To automatically add payments to all outgoing mail when sending:
+;;    (add-hook 'message-send-hook 'mail-add-payment)
+;;
+;; To start calculations automatically when addresses are prefilled:
+;;    (add-hook 'message-setup-hook 'mail-add-payment-async)
+;;
+;; To check whether calculations are done before sending:
+;;    (add-hook 'message-send-hook 'hashcash-wait-or-cancel)
+
+;;; Code:
+
+(defgroup hashcash nil
+  "Hashcash configuration."
+  :group 'mail)
+
+(defcustom hashcash-default-payment 20
+  "*The default number of bits to pay to unknown users.
+If this is zero, no payment header will be generated.
+See `hashcash-payment-alist'."
+  :type 'integer
+  :group 'hashcash)
+
+(defcustom hashcash-payment-alist '()
+  "*An association list mapping email addresses to payment amounts.
+Elements may consist of (ADDR AMOUNT) or (ADDR STRING AMOUNT), where
+ADDR is the email address of the intended recipient and AMOUNT is
+the value of hashcash payment to be made to that user.  STRING, if
+present, is the string to be hashed; if not present ADDR will be used."
+  :type '(repeat (choice (list :tag "Normal"
+                               (string :name "Address")
+                               (integer :name "Amount"))
+                         (list :tag "Replace hash input"
+                               (string :name "Address")
+                               (string :name "Hash input")
+                               (integer :name "Amount"))))
+  :group 'hashcash)
+
+(defcustom hashcash-default-accept-payment 20
+  "*The default minimum number of bits to accept on incoming payments."
+  :type 'integer
+  :group 'hashcash)
+
+(defcustom hashcash-accept-resources `((,user-mail-address nil))
+  "*An association list mapping hashcash resources to payment amounts.
+Resources named here are to be accepted in incoming payments.  If the
+corresponding AMOUNT is NIL, the value of `hashcash-default-accept-payment'
+is used instead."
+  :group 'hashcash)
+
+(defcustom hashcash-path (executable-find "hashcash")
+  "*The path to the hashcash binary."
+  :group 'hashcash)
+
+(defcustom hashcash-extra-generate-parameters nil
+  "*A list of parameter strings passed to `hashcash-path' when minting.
+For example, you may want to set this to '(\"-Z2\") to reduce header length."
+  :type '(repeat string)
+  :group 'hashcash)
+
+(defcustom hashcash-double-spend-database "hashcash.db"
+  "*The path to the double-spending database."
+  :group 'hashcash)
+
+(defcustom hashcash-in-news nil
+  "*Specifies whether or not hashcash payments should be made to newsgroups."
+  :type 'boolean
+  :group 'hashcash)
+
+(defvar hashcash-process-alist nil
+  "Alist of asynchronous hashcash processes and buffers.")
+
+(require 'mail-utils)
+
+(eval-and-compile
+ (if (fboundp 'point-at-bol)
+     (defalias 'hashcash-point-at-bol 'point-at-bol)
+   (defalias 'hashcash-point-at-bol 'line-beginning-position))
+
+ (if (fboundp 'point-at-eol)
+     (defalias 'hashcash-point-at-eol 'point-at-eol)
+   (defalias 'hashcash-point-at-eol 'line-end-position)))
+
+(defun hashcash-strip-quoted-names (addr)
+  (setq addr (mail-strip-quoted-names addr))
+  (if (and addr (string-match "\\`\\([^+@]+\\)\\+[^@]*\\(@.+\\)" addr))
+      (concat (match-string 1 addr) (match-string 2 addr))
+    addr))
+
+(declare-function  message-narrow-to-headers-or-head "message" ())
+(declare-function  message-fetch-field "message" (header &optional not-all))
+(declare-function  message-goto-eoh "message" ())
+(declare-function  message-narrow-to-headers "message" ())
+
+(defun hashcash-token-substring ()
+  (save-excursion
+    (let ((token ""))
+      (loop
+        (setq token
+          (concat token (buffer-substring (point) (hashcash-point-at-eol))))
+        (goto-char (hashcash-point-at-eol))
+        (forward-char 1)
+        (unless (looking-at "[ \t]") (return token))
+        (while (looking-at "[ \t]") (forward-char 1))))))
+
+(defun hashcash-payment-required (addr)
+  "Return the hashcash payment value required for the given address."
+  (let ((val (assoc addr hashcash-payment-alist)))
+    (or (nth 2 val) (nth 1 val) hashcash-default-payment)))
+
+(defun hashcash-payment-to (addr)
+  "Return the string with which hashcash payments should collide."
+  (let ((val (assoc addr hashcash-payment-alist)))
+    (or (nth 1 val) (nth 0 val) addr)))
+
+(defun hashcash-generate-payment (str val)
+  "Generate a hashcash payment by finding a VAL-bit collison on STR."
+  (if (and (> val 0)
+           hashcash-path)
+      (save-excursion
+        (set-buffer (get-buffer-create " *hashcash*"))
+        (erase-buffer)
+        (apply 'call-process hashcash-path nil t nil
+               "-m" "-q" "-b" (number-to-string val) str
+               hashcash-extra-generate-parameters)
+        (goto-char (point-min))
+        (hashcash-token-substring))
+    (error "No `hashcash' binary found")))
+
+(defun hashcash-generate-payment-async (str val callback)
+  "Generate a hashcash payment by finding a VAL-bit collison on STR.
+Return immediately.  Call CALLBACK with process and result when ready."
+  (if (and (> val 0)
+           hashcash-path)
+      (let ((process (apply 'start-process "hashcash" nil
+                            hashcash-path "-m" "-q"
+                            "-b" (number-to-string val) str
+                            hashcash-extra-generate-parameters)))
+        (setq hashcash-process-alist (cons
+                                      (cons process (current-buffer))
+                                      hashcash-process-alist))
+        (set-process-filter process `(lambda (process output)
+                                       (funcall ,callback process output))))
+    (funcall callback nil nil)))
+
+(defun hashcash-check-payment (token str val)
+  "Check the validity of a hashcash payment."
+  (if hashcash-path
+      (zerop (call-process hashcash-path nil nil nil "-c"
+                           "-d" "-f" hashcash-double-spend-database
+                           "-b" (number-to-string val)
+                           "-r" str
+                           token))
+    (progn
+      (message "No hashcash binary found")
+      (sleep-for 1)
+      nil)))
+
+(defun hashcash-version (token)
+  "Find the format version of a hashcash token."
+  ;; Version 1.2 looks like n:yymmdd:rrrrr:xxxxxxxxxxxxxxxx
+  ;;   This carries its own version number embedded in the token,
+  ;;   so no further format number changes should be necessary
+  ;;   in the X-Payment header.
+  ;;
+  ;; Version 1.1 looks like yymmdd:rrrrr:xxxxxxxxxxxxxxxx
+  ;;   You need to upgrade your hashcash binary.
+  ;;
+  ;; Version 1.0 looked like nnnnnrrrrrxxxxxxxxxxxxxxxx
+  ;;   This is no longer supported.
+  (cond ((equal (aref token 1) ?:) 1.2)
+        ((equal (aref token 6) ?:) 1.1)
+        (t (error "Unknown hashcash format version"))))
+
+(defun hashcash-already-paid-p (recipient)
+  "Check for hashcash token to RECIPIENT in current buffer."
+  (save-excursion
+    (save-restriction
+      (message-narrow-to-headers-or-head)
+      (let ((token (message-fetch-field "x-hashcash"))
+            (case-fold-search t))
+        (and (stringp token)
+             (string-match (regexp-quote recipient) token))))))
+
+;;;###autoload
+(defun hashcash-insert-payment (arg)
+  "Insert X-Payment and X-Hashcash headers with a payment for ARG"
+  (interactive "sPay to: ")
+  (unless (hashcash-already-paid-p arg)
+    (let ((pay (hashcash-generate-payment (hashcash-payment-to arg)
+                                          (hashcash-payment-required arg))))
+      (when pay
+        (insert-before-markers "X-Hashcash: " pay "\n")))))
+
+;;;###autoload
+(defun hashcash-insert-payment-async (arg)
+  "Insert X-Payment and X-Hashcash headers with a payment for ARG
+Only start calculation.  Results are inserted when ready."
+  (interactive "sPay to: ")
+  (unless (hashcash-already-paid-p arg)
+    (hashcash-generate-payment-async
+     (hashcash-payment-to arg)
+     (hashcash-payment-required arg)
+     `(lambda (process payment)
+        (hashcash-insert-payment-async-2 ,(current-buffer) process payment)))))
+
+(defun hashcash-insert-payment-async-2 (buffer process pay)
+  (when (buffer-live-p buffer)
+    (with-current-buffer buffer
+      (save-excursion
+        (save-restriction
+          (setq hashcash-process-alist (delq
+                                        (assq process hashcash-process-alist)
+                                        hashcash-process-alist))
+          (message-goto-eoh)
+          (when pay
+            (insert-before-markers "X-Hashcash: " pay)))))))
+
+(defun hashcash-cancel-async (&optional buffer)
+  "Delete any hashcash processes associated with BUFFER.
+BUFFER defaults to the current buffer."
+  (interactive)
+  (unless buffer (setq buffer (current-buffer)))
+  (let (entry)
+    (while (setq entry (rassq buffer hashcash-process-alist))
+      (delete-process (car entry))
+      (setq hashcash-process-alist
+            (delq entry hashcash-process-alist)))))
+
+(defun hashcash-wait-async (&optional buffer)
+  "Wait for asynchronous hashcash processes in BUFFER to finish.
+BUFFER defaults to the current buffer."
+  (interactive)
+  (unless buffer (setq buffer (current-buffer)))
+  (let (entry)
+    (while (setq entry (rassq buffer hashcash-process-alist))
+      (accept-process-output (car entry)))))
+
+(defun hashcash-processes-running-p (buffer)
+  "Return non-nil if hashcash processes in BUFFER are still running."
+  (rassq buffer hashcash-process-alist))
+
+(defun hashcash-wait-or-cancel ()
+  "Ask user whether to wait for hashcash processes to finish."
+  (interactive)
+  (when (hashcash-processes-running-p (current-buffer))
+    (if (y-or-n-p 
+          "Hashcash process(es) still running; wait for them to finish? ")
+        (hashcash-wait-async)
+      (hashcash-cancel-async))))
+
+;;;###autoload
+(defun hashcash-verify-payment (token &optional resource amount)
+  "Verify a hashcash payment"
+  (let* ((split (split-string token ":"))
+         (key (if (< (hashcash-version token) 1.2)
+                  (nth 1 split)
+                  (case (string-to-number (nth 0 split))
+                    (0 (nth 2 split))
+                    (1 (nth 3 split))))))
+    (cond ((null resource)
+           (let ((elt (assoc key hashcash-accept-resources)))
+             (and elt (hashcash-check-payment token (car elt)
+                        (or (cadr elt) hashcash-default-accept-payment)))))
+          ((equal token key)
+           (hashcash-check-payment token resource
+                                (or amount hashcash-default-accept-payment)))
+          (t nil))))
+
+;;;###autoload
+(defun mail-add-payment (&optional arg async)
+  "Add X-Payment: and X-Hashcash: headers with a hashcash payment
+for each recipient address.  Prefix arg sets default payment temporarily.
+Set ASYNC to t to start asynchronous calculation.  (See
+`mail-add-payment-async')."
+  (interactive "P")
+  (let ((hashcash-default-payment (if arg (prefix-numeric-value arg)
+                                    hashcash-default-payment))
+        (addrlist nil))
+    (save-excursion
+      (save-restriction
+        (message-narrow-to-headers)
+        (let ((to (hashcash-strip-quoted-names (mail-fetch-field "To" nil t)))
+              (cc (hashcash-strip-quoted-names (mail-fetch-field "Cc" nil t)))
+              (ng (hashcash-strip-quoted-names (mail-fetch-field "Newsgroups"
+                                                                 nil t))))
+          (when to
+            (setq addrlist (split-string to ",[ \t\n]*")))
+          (when cc
+            (setq addrlist (nconc addrlist (split-string cc ",[ \t\n]*"))))
+          (when (and hashcash-in-news ng)
+            (setq addrlist (nconc addrlist (split-string ng ",[ \t\n]*")))))
+        (when addrlist
+          (mapc (if async
+                    #'hashcash-insert-payment-async
+                  #'hashcash-insert-payment)
+                addrlist)))))
+  t)
+
+;;;###autoload
+(defun mail-add-payment-async (&optional arg)
+  "Add X-Payment: and X-Hashcash: headers with a hashcash payment
+for each recipient address.  Prefix arg sets default payment temporarily.
+Calculation is asynchronous."
+  (interactive "P")
+  (mail-add-payment arg t))
+
+;;;###autoload
+(defun mail-check-payment (&optional arg)
+  "Look for a valid X-Payment: or X-Hashcash: header.
+Prefix arg sets default accept amount temporarily."
+  (interactive "P")
+  (let ((hashcash-default-accept-payment (if arg (prefix-numeric-value arg)
+                                           hashcash-default-accept-payment))
+        (version (hashcash-version (hashcash-generate-payment "x" 1))))
+    (save-excursion
+      (goto-char (point-min))
+      (search-forward "\n\n")
+      (beginning-of-line)
+      (let ((end (point))
+            (ok nil))
+        (goto-char (point-min))
+        (while (and (not ok) (search-forward "X-Payment: hashcash " end t))
+          (let ((value (split-string (hashcash-token-substring) " ")))
+            (when (equal (car value) (number-to-string version))
+              (setq ok (hashcash-verify-payment (cadr value))))))
+        (goto-char (point-min))
+        (while (and (not ok) (search-forward "X-Hashcash: " end t))
+          (setq ok (hashcash-verify-payment (hashcash-token-substring))))
+        (when ok
+          (message "Payment valid"))
+        ok))))
+
+(provide 'hashcash)
+
+;;; arch-tag: 0e7fe983-a124-4392-9788-0dbcbd2c4d62
diff --git a/lisp/mail/mail-extr.el b/lisp/mail/mail-extr.el
index 209b1deacf8..9ef5a02bd26 100644
--- a/lisp/mail/mail-extr.el
+++ b/lisp/mail/mail-extr.el
@@ -1854,7 +1854,7 @@ place.  It affects how `mail-extract-address-components' works."
 ;; http://www.iso.org/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/list-en1-semic.txt
 ;; http://www.iana.org/domain-names.htm
 ;; http://www.iana.org/cctld/cctld-whois.htm
-;; Latest change: Mon Jul  8 14:21:59 CEST 2002
+;; Latest change: 2007/11/15
 
 (defconst mail-extr-all-top-level-domains
   (let ((ob (make-vector 739 0)))
@@ -1867,6 +1867,7 @@ place.  It affects how `mail-extract-address-components' works."
               (nth 1 x))))
      '(
        ;; ISO 3166 codes:
+       ("ac" "Ascension Island")
        ("ad" "Andorra")
        ("ae" "United Arab Emirates")
        ("af" "Afghanistan")
@@ -1882,6 +1883,7 @@ place.  It affects how `mail-extract-address-components' works."
        ("at" "Austria"          "The Republic of %s")
        ("au" "Australia")
        ("aw" "Aruba")
+       ("ax" "Aland Islands")
        ("az" "Azerbaijan")
        ("ba" "Bosnia-Herzegovina")
        ("bb" "Barbados")
@@ -1892,6 +1894,7 @@ place.  It affects how `mail-extract-address-components' works."
        ("bh" "Bahrain")
        ("bi" "Burundi")
        ("bj" "Benin")
+       ("bl" "Saint Barthelemy")
        ("bm" "Bermuda")
        ("bn" "Brunei Darussalam")
        ("bo" "Bolivia"          "Republic of %s")
@@ -1933,6 +1936,7 @@ place.  It affects how `mail-extract-address-components' works."
        ("er" "Eritrea")
        ("es" "Spain"            "The Kingdom of %s")
        ("et" "Ethiopia")
+       ("eu" "European Union")
        ("fi" "Finland"          "The Republic of %s")
        ("fj" "Fiji")
        ("fk" "Falkland Islands (Malvinas)")
@@ -1944,6 +1948,7 @@ place.  It affects how `mail-extract-address-components' works."
        ("gd" "Grenada")
        ("ge" "Georgia")
        ("gf" "French Guiana")
+       ("gg" "Guernsey")
        ("gh" "Ghana")
        ("gi" "Gibraltar")
        ("gl" "Greenland")
@@ -1973,6 +1978,7 @@ place.  It affects how `mail-extract-address-components' works."
        ("ir" "Iran"             "Islamic Republic of %s")
        ("is" "Iceland"          "The Republic of %s")
        ("it" "Italy"            "The Italian Republic")
+       ("je" "Jersey")
        ("jm" "Jamaica")
        ("jo" "Jordan")
        ("jp" "Japan")
@@ -2001,6 +2007,8 @@ place.  It affects how `mail-extract-address-components' works."
        ("ma" "Morocco")
        ("mc" "Monaco")
        ("md" "Moldova"          "The Republic of %s")
+       ("me" "Montenegro")
+       ("mf" "Saint Martin (French part)")
        ("mg" "Madagascar")
        ("mh" "Marshall Islands")
        ("mk" "Macedonia"        "The Former Yugoslav Republic of %s")
@@ -2049,6 +2057,7 @@ place.  It affects how `mail-extract-address-components' works."
        ("qa" "Qatar")
        ("re" "Reunion (Fr.)")           ; In .fr domain
        ("ro" "Romania")
+       ("rs" "Serbia")
        ("ru" "Russia"           "Russian Federation")
        ("rw" "Rwanda")
        ("sa" "Saudi Arabia")
@@ -2112,15 +2121,21 @@ place.  It affects how `mail-extract-address-components' works."
        ("zw" "Zimbabwe"         "Republic of %s")
        ;; Generic Domains:
        ("aero" t                "Air Transport Industry")
+       ("asia" t                "Pan-Asia and Asia Pacific community")
        ("biz" t                 "Businesses")
+       ("cat" t                 "Catalan language and culture")
        ("com" t                 "Commercial")
        ("coop" t                "Cooperative Associations")
        ("info" t                "Info")
+       ("jobs" t                "Employment")
+       ("mobi" t                "Mobile products")
        ("museum" t              "Museums")
        ("name" t                "Individuals")
        ("net" t                 "Network")
        ("org" t                 "Non-profit Organization")
-       ;;("pro" t                 "Credentialed professionals")
+       ("pro" t                 "Credentialed professionals")
+       ("tel" t                 "Contact data")
+       ("travel" t              "Travel industry")
        ;;("bitnet" t            "Because It's Time NET")
        ("gov" t                 "United States Government")
        ("edu" t                 "Educational")
diff --git a/lisp/mail/mspools.el b/lisp/mail/mspools.el
index 514bf4fe5f3..b248ba7dec1 100644
--- a/lisp/mail/mspools.el
+++ b/lisp/mail/mspools.el
@@ -246,6 +246,11 @@ Buffer is not displayed if SHOW is non-nil."
   (mspools-mode)
   )
 
+(declare-function rmail-get-new-mail "rmail" (&optional file-name))
+
+;; External.
+(declare-function vm-visit-folder "ext:vm-startup" (folder &optional read-only))
+
 (defun mspools-visit-spool ()
   "Visit the folder on the current line of the *spools* buffer."
   (interactive)
diff --git a/lisp/mail/reporter.el b/lisp/mail/reporter.el
index 596c7ee9627..24dd9ab0c35 100644
--- a/lisp/mail/reporter.el
+++ b/lisp/mail/reporter.el
@@ -168,6 +168,9 @@ composed.")
     (goto-char (1+ (nth 1 state)))
     (current-column)))
 
+(declare-function mail-position-on-field "sendmail" (field &optional soft))
+(declare-function mail-text "sendmail" ())
+
 (defun reporter-dump-variable (varsym mailbuf)
   "Pretty-print the value of the variable in symbol VARSYM.
 MAILBUF is the mail buffer being composed."
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 4a7bd12ba42..5d276f9c76a 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -184,6 +184,10 @@ please report it with \\[report-emacs-bug].")
     :group 'rmail-retrieve
     :type '(repeat (directory)))
 
+(declare-function mail-position-on-field "sendmail" (field &optional soft))
+(declare-function mail-text-start "sendmail" ())
+(declare-function rmail-update-summary "rmailsum" (&rest ignore))
+
 (defun rmail-probe (prog)
   "Determine what flavor of movemail PROG is.
 We do this by executing it with `--version' and analyzing its output."
@@ -1515,6 +1519,15 @@ original copy."
 
 ;;;; *** Rmail input ***
 
+(declare-function rmail-spam-filter "rmail-spam-filter" (msg))
+(declare-function rmail-summary-goto-msg "rmailsum" (&optional n nowarn skip-rmail))
+(declare-function rmail-summary-mark-undeleted "rmailsum" (n))
+(declare-function rmail-summary-mark-deleted "rmailsum" (&optional n undel))
+(declare-function rfc822-addresses "rfc822" (header-text))
+(declare-function mail-abbrev-make-syntax-table "mailabbrev.el" ())
+(declare-function mail-sendmail-delimit-header "sendmail" ())
+(declare-function mail-header-end "sendmail" ())
+
 ;; RLK feature not added in this version:
 ;; argument specifies inbox file or files in various ways.
 
@@ -3282,7 +3295,9 @@ and more whitespace.  The returned regular expressions contains
     (setq subject (regexp-quote subject))
     (setq subject
           (replace-regexp-in-string "[ \t\n]+" "[ \t\n]+" subject t t))
-    (concat "^Subject: "
+    ;; Some mailers insert extra spaces after "Subject:", so allow any
+    ;; amount of them.
+    (concat "^Subject:[ \t]+"
             (if (string= "\\`" (substring rmail-reply-regexp 0 2))
                 (substring rmail-reply-regexp 2)
               rmail-reply-regexp)
diff --git a/lisp/mail/rmailedit.el b/lisp/mail/rmailedit.el
index 04982aec349..02bc23fe0c5 100644
--- a/lisp/mail/rmailedit.el
+++ b/lisp/mail/rmailedit.el
@@ -49,6 +49,9 @@
 ;; Rmail Edit mode is suitable only for specially formatted data.
 (put 'rmail-edit-mode 'mode-class 'special)
 
+(declare-function rmail-summary-disable "" ())
+(declare-function rmail-summary-enable "rmailsum" ())
+
 (defun rmail-edit-mode ()
   "Major mode for editing the contents of an RMAIL message.
 The editing commands are the same as in Text mode, together with two commands
diff --git a/lisp/mail/rmailkwd.el b/lisp/mail/rmailkwd.el
index c479e35beb7..48e2246520b 100644
--- a/lisp/mail/rmailkwd.el
+++ b/lisp/mail/rmailkwd.el
@@ -86,6 +86,15 @@ Completion is performed over known labels when reading."
           rmail-last-label
         (setq rmail-last-label (rmail-make-label result t))))))
 
+(declare-function rmail-maybe-set-message-counters "rmail" ())
+(declare-function rmail-display-labels "rmail" ())
+(declare-function rmail-msgbeg "rmail" (n))
+(declare-function rmail-set-message-deleted-p "rmail" (n state))
+(declare-function rmail-message-labels-p "rmail" (msg labels))
+(declare-function rmail-show-message "rmail" (&optional n no-summary))
+(declare-function mail-comma-list-regexp "mail-utils" (labels))
+(declare-function mail-parse-comma-list "mail-utils.el" ())
+
 (defun rmail-set-label (l state &optional n)
   (with-current-buffer rmail-buffer
     (rmail-maybe-set-message-counters)
diff --git a/lisp/mail/rmailmsc.el b/lisp/mail/rmailmsc.el
index 3b7ccd72d02..67cea297f0e 100644
--- a/lisp/mail/rmailmsc.el
+++ b/lisp/mail/rmailmsc.el
@@ -30,6 +30,9 @@
 (defvar rmail-current-message)
 (defvar rmail-inbox-list)
 
+(declare-function rmail-parse-file-inboxes "rmail" ())
+(declare-function rmail-show-message "rmail" (&optional n no-summary))
+
 ;;;###autoload
 (defun set-rmail-inbox-list (file-name)
   "Set the inbox list of the current RMAIL file to FILE-NAME.
diff --git a/lisp/mail/rmailout.el b/lisp/mail/rmailout.el
index d85bfc0bfe8..1e9f8379b7b 100644
--- a/lisp/mail/rmailout.el
+++ b/lisp/mail/rmailout.el
@@ -109,6 +109,8 @@ Set `rmail-default-file' to this name as well as returning it."
                (or read-file (file-name-nondirectory default-file))
                (file-name-directory default-file)))))))
 
+(declare-function rmail-update-summary "rmailsum" (&rest ignore))
+
 ;;; There are functions elsewhere in Emacs that use this function;
 ;;; look at them before you change the calling method.
 ;;;###autoload
diff --git a/lisp/mail/rmailsort.el b/lisp/mail/rmailsort.el
index ba496a31228..bed40cd0820 100644
--- a/lisp/mail/rmailsort.el
+++ b/lisp/mail/rmailsort.el
@@ -152,6 +152,7 @@ KEYWORDS is a comma-separated list of labels."
                               n))))))
 
 ;; Basic functions
+(declare-function rmail-update-summary "rmailsum" (&rest ignore))
 
 (defun rmail-sort-messages (reverse keyfun)
   "Sort messages of current Rmail file.
diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el
index fd5931fdef9..cde289ed719 100644
--- a/lisp/mail/rmailsum.el
+++ b/lisp/mail/rmailsum.el
@@ -1323,6 +1323,13 @@ argument says to read a file name and use that file as the inbox."
     (end-of-buffer))
   (forward-line -1))
 
+(declare-function rmail-abort-edit "rmailedit" ())
+(declare-function rmail-cease-edit "rmailedit"())
+(declare-function rmail-set-label "rmailkwd" (l state &optional n))
+(declare-function rmail-output-read-file-name "rmailout" ())
+(declare-function rmail-output-read-rmail-file-name  "rmailout" ())
+(declare-function mail-send-and-exit "sendmail" (&optional arg))
+
 (defvar rmail-summary-edit-map nil)
 (if rmail-summary-edit-map
     nil
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index e8d896be246..7d66b5e7ac6 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -1744,6 +1744,9 @@ The seventh argument ACTIONS is a list of actions to take
         (message "Auto save file for draft message exists; consider M-x mail-recover"))
     initialized))
 
+(declare-function dired-view-file "dired" ())
+(declare-function dired-get-filename "dired" (&optional localp no-error-if-not-filep))
+
 (defun mail-recover-1 ()
   "Pop up a list of auto-saved draft messages so you can recover one of them."
   (interactive)
@@ -1815,6 +1818,10 @@ The seventh argument ACTIONS is a list of actions to take
               (setq buffer-file-coding-system
                     default-buffer-file-coding-system))))))))
 
+(declare-function dired-move-to-filename "dired" (&optional raise-error eol))
+(declare-function dired-get-filename "dired" (&optional localp no-error-if-not-filep))
+(declare-function dired-view-file "dired" ())
+
 (defun mail-recover ()
   "Recover interrupted mail composition from auto-save files.
 
diff --git a/lisp/mail/supercite.el b/lisp/mail/supercite.el
index 61e7d0a00eb..c0e581c0310 100644
--- a/lisp/mail/supercite.el
+++ b/lisp/mail/supercite.el
@@ -6,11 +6,8 @@
 ;; Author: 1993 Barry A. Warsaw <bwarsaw@python.org>
 ;; Maintainer:    Glenn Morris <rgm@gnu.org>
 ;; Created:       February 1993
-;; Last Modified: 1993/09/22 18:58:46
 ;; Keywords: mail, news
 
-;; supercite.el revision: 3.54
-
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
@@ -510,10 +507,7 @@ string."
 ;; ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 ;; end user configuration variables
 
-(defconst sc-version "3.1"
-  "Supercite version number.")
-(defconst sc-help-address "bug-supercite@gnu.org"
-  "Address accepting submissions of bug reports.")
+(define-obsolete-variable-alias 'sc-version 'emacs-version "23.1")
 
 (defvar sc-mail-info nil
   "Alist of mail header information gleaned from reply buffer.")
@@ -2010,7 +2004,7 @@ cited."
 If MESSAGE is non-nil (interactively, with no prefix argument),
 inserts the version string in the current buffer instead."
   (interactive (not current-prefix-arg))
-  (let ((verstr (format "Using Supercite.el %s" sc-version)))
+  (let ((verstr (format "Using Supercite.el %s" emacs-version)))
     (if message
         (message verstr)
       (insert "`sc-version' says: " verstr))))
@@ -2023,48 +2017,7 @@ more information.  Info node `(SC)Top'."
   (interactive)
   (describe-function 'sc-describe))
 
-(defun sc-submit-bug-report ()
-  "Submit a bug report on Supercite via mail."
-  (interactive)
-  (require 'reporter)
-  (and
-   (y-or-n-p "Do you want to submit a report on Supercite? ")
-   (reporter-submit-bug-report
-    sc-help-address
-    (concat "Supercite version " sc-version)
-    (list
-     'sc-attrib-selection-list
-     'sc-auto-fill-region-p
-     'sc-blank-lines-after-headers
-     'sc-citation-leader
-     'sc-citation-delimiter
-     'sc-citation-separator
-     'sc-citation-leader-regexp
-     'sc-citation-root-regexp
-     'sc-citation-nonnested-root-regexp
-     'sc-citation-delimiter-regexp
-     'sc-citation-separator-regexp
-     'sc-cite-region-limit
-     'sc-confirm-always-p
-     'sc-default-attribution
-     'sc-default-author-name
-     'sc-downcase-p
-     'sc-electric-circular-p
-     'sc-electric-references-p
-     'sc-fixup-whitespace-p
-     'sc-mail-warn-if-non-rfc822-p
-     'sc-mumble
-     'sc-name-filter-alist
-     'sc-nested-citation-p
-     'sc-nuke-mail-headers
-     'sc-nuke-mail-header-list
-     'sc-preferred-attribution-list
-     'sc-preferred-header-style
-     'sc-reference-tag-string
-     'sc-rewrite-header-list
-     'sc-titlecue-regexp
-     'sc-use-only-preference-p
-     ))))
+(define-obsolete-function-alias 'sc-submit-bug-report 'report-emacs-bug "23.1")
 
 
 ;; useful stuff
diff --git a/lisp/mail/uce.el b/lisp/mail/uce.el
index 61afd248332..5a4e01ae9fc 100644
--- a/lisp/mail/uce.el
+++ b/lisp/mail/uce.el
@@ -217,6 +217,14 @@ These are mostly meant for headers that prevent delivery errors reporting."
   :type 'string
   :group 'uce)
 
+(declare-function mail-strip-quoted-names "mail-utils" (address))
+(declare-function rmail-msg-is-pruned "rmail" ())
+(declare-function rmail-maybe-set-message-counters "rmail" ())
+(declare-function rmail-msgbeg "rmail" (n))
+(declare-function rmail-msgend "rmail" (n))
+(declare-function rmail-toggle-header "rmail" (&optional arg))
+
+
 (defun uce-reply-to-uce (&optional ignored)
   "Send reply to UCE in Rmail.
 UCE stands for unsolicited commercial email.  Function will set up reply
diff --git a/lisp/mail/undigest.el b/lisp/mail/undigest.el
index 5d6f266b3b0..9bb2f3eab90 100644
--- a/lisp/mail/undigest.el
+++ b/lisp/mail/undigest.el
@@ -153,6 +153,8 @@ See rmail-digest-methods."
       ;; Return the list of marker pairs
       (nreverse result))))
 
+(declare-function rmail-update-summary "rmailsum" (&rest ignore))
+
 ;;;###autoload
 (defun undigestify-rmail-message ()
   "Break up a digest message into its constituent messages.
diff --git a/lisp/mail/unrmail.el b/lisp/mail/unrmail.el
index f1cf85a4ffc..7ad1c69b50d 100644
--- a/lisp/mail/unrmail.el
+++ b/lisp/mail/unrmail.el
@@ -48,6 +48,8 @@ For example, invoke `emacs -batch -f batch-unrmail RMAIL'."
     (message "Done")
     (kill-emacs (if error 1 0))))
 
+(declare-function mail-strip-quoted-names "mail-utils" (address))
+
 ;;;###autoload
 (defun unrmail (file to-file)
   "Convert Rmail file FILE to system inbox format file TO-FILE."
diff --git a/lisp/mail/uudecode.el b/lisp/mail/uudecode.el
new file mode 100644
index 00000000000..9dc430e825d
--- /dev/null
+++ b/lisp/mail/uudecode.el
@@ -0,0 +1,242 @@
+;;; uudecode.el -- elisp native uudecode
+
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
+
+;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
+;; Keywords: uudecode news
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; 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, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+
+;;; Code:
+
+(eval-when-compile (require 'cl))
+
+(eval-and-compile
+  (defalias 'uudecode-char-int
+    (if (fboundp 'char-int)
+        'char-int
+      'identity)))
+
+(defgroup uudecode nil
+  "Decoding of uuencoded data."
+  :group 'mail
+  :group 'news)
+
+(defcustom uudecode-decoder-program "uudecode"
+  "*Non-nil value should be a string that names a uu decoder.
+The program should expect to read uu data on its standard
+input and write the converted data to its standard output."
+  :type 'string
+  :group 'uudecode)
+
+(defcustom uudecode-decoder-switches nil
+  "*List of command line flags passed to `uudecode-decoder-program'."
+  :group 'uudecode
+  :type '(repeat string))
+
+(defcustom uudecode-use-external
+  (executable-find uudecode-decoder-program)
+  "*Use external uudecode program."
+  :version "22.1"
+  :group 'uudecode
+  :type 'boolean)
+
+(defconst uudecode-alphabet "\040-\140")
+
+(defconst uudecode-begin-line "^begin[ \t]+[0-7][0-7][0-7][ \t]+\\(.*\\)$")
+(defconst uudecode-end-line "^end[ \t]*$")
+
+(defconst uudecode-body-line
+  (let ((i 61) (str "^M"))
+    (while (> (setq i (1- i)) 0)
+      (setq str (concat str "[^a-z]")))
+    (concat str ".?$")))
+
+(defvar uudecode-temporary-file-directory
+  (cond ((fboundp 'temp-directory) (temp-directory))
+        ((boundp 'temporary-file-directory) temporary-file-directory)
+        ("/tmp")))
+
+;;;###autoload
+(defun uudecode-decode-region-external (start end &optional file-name)
+  "Uudecode region between START and END using external program.
+If FILE-NAME is non-nil, save the result to FILE-NAME.  The program
+used is specified by `uudecode-decoder-program'."
+  (interactive "r\nP")
+  (let ((cbuf (current-buffer)) tempfile firstline status)
+    (save-excursion
+      (goto-char start)
+      (when (re-search-forward uudecode-begin-line nil t)
+        (forward-line 1)
+        (setq firstline (point))
+        (cond ((null file-name))
+              ((stringp file-name))
+              (t
+               (setq file-name (read-file-name "File to Name:"
+                                               nil nil nil
+                                               (match-string 1)))))
+        (setq tempfile (if file-name
+                           (expand-file-name file-name)
+                           (if (fboundp 'make-temp-file)
+                               (let ((temporary-file-directory
+                                      uudecode-temporary-file-directory))
+                                 (make-temp-file "uu"))
+                             (expand-file-name
+                              (make-temp-name "uu")
+                              uudecode-temporary-file-directory))))
+        (let ((cdir default-directory)
+              (default-process-coding-system
+                (if (featurep 'xemacs)
+                    ;; In XEmacs, `nil' is not a valid coding system.
+                    '(binary . binary)
+                  nil)))
+          (unwind-protect
+              (with-temp-buffer
+                (insert "begin 600 " (file-name-nondirectory tempfile) "\n")
+                (insert-buffer-substring cbuf firstline end)
+                (cd (file-name-directory tempfile))
+                (apply 'call-process-region
+                       (point-min)
+                       (point-max)
+                       uudecode-decoder-program
+                       nil
+                       nil
+                       nil
+                       uudecode-decoder-switches))
+            (cd cdir) (set-buffer cbuf)))
+        (if (file-exists-p tempfile)
+            (unless file-name
+              (goto-char start)
+              (delete-region start end)
+              (let (format-alist)
+                (insert-file-contents-literally tempfile)))
+          (message "Can not uudecode")))
+      (ignore-errors (or file-name (delete-file tempfile))))))
+
+(eval-and-compile
+  (defalias 'uudecode-string-to-multibyte
+    (cond
+     ((featurep 'xemacs)
+      'identity)
+     ((fboundp 'string-to-multibyte)
+      'string-to-multibyte)
+     (t
+      (lambda (string)
+        "Return a multibyte string with the same individual chars as string."
+        (mapconcat
+         (lambda (ch) (string-as-multibyte (char-to-string ch)))
+         string ""))))))
+
+;;;###autoload
+(defun uudecode-decode-region-internal (start end &optional file-name)
+  "Uudecode region between START and END without using an external program.
+If FILE-NAME is non-nil, save the result to FILE-NAME."
+  (interactive "r\nP")
+  (let ((done nil)
+        (counter 0)
+        (remain 0)
+        (bits 0)
+        (lim 0) inputpos result
+        (non-data-chars (concat "^" uudecode-alphabet)))
+    (save-excursion
+      (goto-char start)
+      (when (re-search-forward uudecode-begin-line nil t)
+        (cond ((null file-name))
+              ((stringp file-name))
+              (t
+               (setq file-name (expand-file-name
+                                (read-file-name "File to Name:"
+                                                nil nil nil
+                                                (match-string 1))))))
+        (forward-line 1)
+        (skip-chars-forward non-data-chars end)
+        (while (not done)
+          (setq inputpos (point))
+          (setq remain 0 bits 0 counter 0)
+          (cond
+           ((> (skip-chars-forward uudecode-alphabet end) 0)
+            (setq lim (point))
+            (setq remain
+                  (logand (- (uudecode-char-int (char-after inputpos)) 32)
+                          63))
+            (setq inputpos (1+ inputpos))
+            (if (= remain 0) (setq done t))
+            (while (and (< inputpos lim) (> remain 0))
+              (setq bits (+ bits
+                            (logand
+                             (-
+                              (uudecode-char-int (char-after inputpos)) 32)
+                             63)))
+              (if (/= counter 0) (setq remain (1- remain)))
+              (setq counter (1+ counter)
+                    inputpos (1+ inputpos))
+              (cond ((= counter 4)
+                     (setq result (cons
+                                   (concat
+                                    (char-to-string (lsh bits -16))
+                                    (char-to-string (logand (lsh bits -8) 255))
+                                    (char-to-string (logand bits 255)))
+                                   result))
+                     (setq bits 0 counter 0))
+                    (t (setq bits (lsh bits 6)))))))
+          (cond
+           (done)
+           ((> 0 remain)
+            (error "uucode line ends unexpectly")
+            (setq done t))
+           ((and (= (point) end) (not done))
+            ;;(error "uucode ends unexpectly")
+            (setq done t))
+           ((= counter 3)
+            (setq result (cons
+                          (concat
+                           (char-to-string (logand (lsh bits -16) 255))
+                           (char-to-string (logand (lsh bits -8) 255)))
+                          result)))
+           ((= counter 2)
+            (setq result (cons
+                          (char-to-string (logand (lsh bits -10) 255))
+                          result))))
+          (skip-chars-forward non-data-chars end))
+        (if file-name
+            (let (default-enable-multibyte-characters)
+              (with-temp-file file-name
+                (insert (apply 'concat (nreverse result)))))
+          (or (markerp end) (setq end (set-marker (make-marker) end)))
+          (goto-char start)
+          (if enable-multibyte-characters
+              (mapc #'(lambda (x) (insert (uudecode-string-to-multibyte x)))
+                    (nreverse result))
+            (insert (apply 'concat (nreverse result))))
+          (delete-region (point) end))))))
+
+;;;###autoload
+(defun uudecode-decode-region (start end &optional file-name)
+  "Uudecode region between START and END.
+If FILE-NAME is non-nil, save the result to FILE-NAME."
+  (if uudecode-use-external
+      (uudecode-decode-region-external start end file-name)
+    (uudecode-decode-region-internal start end file-name)))
+
+(provide 'uudecode)
+
+;;; arch-tag: e1f09ed5-62b4-4677-9f13-4e81c4fe8ce3
+;;; uudecode.el ends here
diff --git a/lisp/mail/vms-pmail.el b/lisp/mail/vms-pmail.el
index 022a8070a2e..9785fed71e6 100644
--- a/lisp/mail/vms-pmail.el
+++ b/lisp/mail/vms-pmail.el
@@ -1,3 +1,4 @@
+;; -*- no-byte-compile: t -*-
 ;;; vms-pmail.el --- use Emacs as the editor within VMS mail
 
 ;; Copyright (C) 1992, 2001, 2002, 2003, 2004, 2005,