Upgraded to MH-E version 7.81.

See etc/MH-E-NEWS and lisp/mh-e/ChangeLog for details.

7 files changed, 72 insertions, 22 deletions

diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 645e9a1bd6d..990291caead 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,40 @@
+2004-08-21  Bill Wohler  <wohler@newt.com>
+
+        * Released MH-E version 7.81.
+     
+        * MH-E-NEWS, README: Updated for release 7.81.
+     
+        * mh-e.el (Version, mh-version): Updated for release 7.81.
+
+2004-08-21  Bill Wohler  <wohler@newt.com>
+
+        * release-utils (variable_changes): Check for checked-out
+        directory before proceeding. Remove temporary files. Renamed
+        --variable-update flag to --variable-changes.
+
+2004-08-16  Mark D. Baushke  <mdb@gnu.org>
+
+        * mh-mime.el (mh-toggle-mh-decode-mime-flag: New function.
+        * mh-e.el (mh-help-messages): Add [;] help string for it.
+        (mh-folder-mode-map): Add ";" key binding for it.
+
+2004-08-15  Satyaki Das  <satyaki@theforce.stanford.edu>
+
+        * mh-acros.el (mh-defstruct): Distinguishing structures created
+        by mh-defstruct just based on the number of fields is not
+        sufficient, since both the mh-thread-message and
+        mh-thread-container structures have the same length.
+
+2004-08-15  Mark D. Baushke  <mdb@gnu.org>
+
+        * mh-customize.el (mh-identity-handlers): Use ":default" instead of
+        "default" to avoid problems with "Default:" as a user defined field.
+        * mh-identity.el (mh-identity-field-handler): Ditto.
+
+2004-08-15  Bill Wohler  <wohler@newt.com>
+
+        * mh-e.el (Version, mh-version): Added +cvs to release number.
+
 2004-08-15  Bill Wohler  <wohler@newt.com>
 
         * Released MH-E version 7.4.80.
diff --git a/lisp/mh-e/mh-acros.el b/lisp/mh-e/mh-acros.el
index c409cf8d36e..dd8660a8ce3 100644
--- a/lisp/mh-e/mh-acros.el
+++ b/lisp/mh-e/mh-acros.el
@@ -121,10 +121,10 @@ various structure fields. Lookup `defstruct' for more details."
     `(progn
        (defun* ,constructor (&key ,@(mapcar* #'(lambda (x y) (list x y))
                                              field-names field-init-forms))
-         (list ,@field-names))
+         (list (quote ,struct-name) ,@field-names))
        (defun ,predicate (arg)
-         (and (consp arg) (eql (length arg) ,(length fields))))
-       ,@(loop for x from 0
+         (and (consp arg) (eq (car arg) (quote ,struct-name))))
+       ,@(loop for x from 1
                for y in field-names
                collect `(defmacro ,(intern (format "%s%s" conc-name y)) (z)
                           (list 'nth ,x z)))
diff --git a/lisp/mh-e/mh-customize.el b/lisp/mh-e/mh-customize.el
index 0cf35b3c0d9..67a126a8327 100644
--- a/lisp/mh-e/mh-customize.el
+++ b/lisp/mh-e/mh-customize.el
@@ -527,7 +527,7 @@ See `mh-auto-fields-list'."
   :group 'mh-identity)
 
 (defcustom mh-identity-handlers
-  '(("default" . mh-identity-handler-bottom)
+  '((":default" . mh-identity-handler-bottom)
     ("from" . mh-identity-handler-top)
     (":attribution-verb" . mh-identity-handler-attribution-verb)
     (":signature" . mh-identity-handler-signature)
@@ -535,9 +535,8 @@ See `mh-auto-fields-list'."
   "Handler functions for fields in `mh-identity-list'.
 This is an alist of fields (strings) and handlers (functions). Strings are
 lowercase. Use \":signature\" for Signature and \":pgg-default-user-id\" for
-GPG Key ID. The function associated with the string \"default\" is used if no
-other functions are appropriate. For this reason, don't name a header field
-\"Default\"."
+GPG Key ID. The function associated with the string \":default\" is used if no
+other functions are appropriate."
   :type '(repeat (cons (string :tag "Field") function))
   :group 'mh-identity)
 
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index 5cb7f90f1e3..5cbb97b72d0 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -5,7 +5,7 @@
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
-;; Version: 7.4.80
+;; Version: 7.81
 ;; Keywords: mail
 
 ;; This file is part of GNU Emacs.
@@ -96,7 +96,7 @@
 (defvar font-lock-auto-fontify)
 (defvar font-lock-defaults)
 
-(defconst mh-version "7.4.80" "Version number of MH-E.")
+(defconst mh-version "7.81" "Version number of MH-E.")
 
 ;;; Autoloads
 (autoload 'Info-goto-node "info")
@@ -2347,6 +2347,7 @@ If INCLUDE-INTERNAL-FLAG non-nil, include MH-E internal sequences in list."
   "'"           mh-toggle-tick
   ","           mh-header-display
   "."           mh-alt-show
+  ";"           mh-toggle-mh-decode-mime-flag
   ">"           mh-write-msg-to-file
   "?"           mh-help
   "E"           mh-extract-rejected-mail
@@ -2496,7 +2497,8 @@ If INCLUDE-INTERNAL-FLAG non-nil, include MH-E internal sequences in list."
 (defvar mh-help-messages
   '((nil "[i]nc, [.]show, [,]show all, [n]ext, [p]revious,\n"
          "[d]elete, [o]refile, e[x]ecute,\n"
-         "[s]end, [r]eply.\n"
+         "[s]end, [r]eply,\n"
+         "[;]toggle MIME decoding.\n"
          "Prefix characters:\n [F]older, [S]equence, [J]unk, MIME [K]eys,"
          "\n [T]hread, [/]limit, e[X]tract, [D]igest, [I]nc spools.")
 
diff --git a/lisp/mh-e/mh-identity.el b/lisp/mh-e/mh-identity.el
index 2b430a52fe1..be385ad09e6 100644
--- a/lisp/mh-e/mh-identity.el
+++ b/lisp/mh-e/mh-identity.el
@@ -127,7 +127,7 @@ message header."
   (or (cdr (assoc (downcase field) mh-identity-handlers))
       (and (eq (aref field 0) ?:)
            (error (format "Field %s - unknown mh-identity-handler" field)))
-      (cdr (assoc "default" mh-identity-handlers))
+      (cdr (assoc ":default" mh-identity-handlers))
       'mh-identity-handler-default))
 
 ;;;###mh-autoload
diff --git a/lisp/mh-e/mh-loaddefs.el b/lisp/mh-e/mh-loaddefs.el
index 43119b62be0..6a88278a847 100644
--- a/lisp/mh-e/mh-loaddefs.el
+++ b/lisp/mh-e/mh-loaddefs.el
@@ -261,7 +261,7 @@ Display cheat sheet for the commands of the current prefix in minibuffer." t nil
 ;;;;;;  mh-identity-insert-attribution-verb mh-identity-handler-attribution-verb
 ;;;;;;  mh-identity-handler-signature mh-identity-handler-gpg-identity
 ;;;;;;  mh-insert-identity mh-identity-list-set mh-identity-make-menu)
-;;;;;;  "mh-identity" "mh-identity.el" (16665 55172))
+;;;;;;  "mh-identity" "mh-identity.el" (16680 7172))
 ;;; Generated autoloads from mh-identity.el
 
 (autoload (quote mh-identity-make-menu) "mh-identity" "\
@@ -582,7 +582,7 @@ system." nil nil)
 ;;;***
 
 ;;;### (autoloads (mh-variants mh-variant-p mh-variant-set) "mh-init"
-;;;;;;  "mh-init.el" (16671 49652))
+;;;;;;  "mh-init.el" (16680 9361))
 ;;; Generated autoloads from mh-init.el
 
 (autoload (quote mh-variant-set) "mh-init" "\
@@ -633,17 +633,18 @@ The `mh-junk-program' option specifies the spam program in use." t nil)
 
 ;;;### (autoloads (mh-display-with-external-viewer mh-mime-inline-part
 ;;;;;;  mh-mime-save-part mh-push-button mh-press-button mh-mime-display
-;;;;;;  mh-decode-message-header mh-mime-save-parts mh-display-emphasis
-;;;;;;  mh-display-smileys mh-add-missing-mime-version-header mh-destroy-postponed-handles
-;;;;;;  mh-mime-cleanup mh-mml-directive-present-p mh-mml-secure-message-signencrypt
-;;;;;;  mh-mml-secure-message-encrypt mh-mml-secure-message-sign
-;;;;;;  mh-mml-unsecure-message mh-mml-attach-file mh-mml-query-cryptographic-method
-;;;;;;  mh-mml-forward-message mh-mml-to-mime mh-mhn-directive-present-p
-;;;;;;  mh-revert-mhn-edit mh-edit-mhn mh-mhn-compose-forw mh-mhn-compose-external-type
+;;;;;;  mh-decode-message-header mh-toggle-mh-decode-mime-flag mh-mime-save-parts
+;;;;;;  mh-display-emphasis mh-display-smileys mh-add-missing-mime-version-header
+;;;;;;  mh-destroy-postponed-handles mh-mime-cleanup mh-mml-directive-present-p
+;;;;;;  mh-mml-secure-message-signencrypt mh-mml-secure-message-encrypt
+;;;;;;  mh-mml-secure-message-sign mh-mml-unsecure-message mh-mml-attach-file
+;;;;;;  mh-mml-query-cryptographic-method mh-mml-forward-message
+;;;;;;  mh-mml-to-mime mh-mhn-directive-present-p mh-revert-mhn-edit
+;;;;;;  mh-edit-mhn mh-mhn-compose-forw mh-mhn-compose-external-type
 ;;;;;;  mh-mhn-compose-external-compressed-tar mh-mhn-compose-anon-ftp
 ;;;;;;  mh-mhn-compose-insertion mh-file-mime-type mh-have-file-command
 ;;;;;;  mh-compose-forward mh-compose-insertion) "mh-mime" "mh-mime.el"
-;;;;;;  (16665 55171))
+;;;;;;  (16680 7172))
 ;;; Generated autoloads from mh-mime.el
 
 (autoload (quote mh-compose-insertion) "mh-mime" "\
@@ -821,6 +822,9 @@ If ARG, prompt for directory, else use that specified by the variable
 mh_profile directives, since this function calls on mhstore or mhn to do the
 actual storing." t nil)
 
+(autoload (quote mh-toggle-mh-decode-mime-flag) "mh-mime" "\
+Toggle whether MH-E should decode MIME or not." t nil)
+
 (autoload (quote mh-decode-message-header) "mh-mime" "\
 Decode RFC2047 encoded message header fields." nil nil)
 
@@ -878,7 +882,7 @@ indexing program specified in `mh-index-program' is used." t nil)
 
 ;;;### (autoloads (mh-print-msg mh-ps-print-toggle-mime mh-ps-print-toggle-color
 ;;;;;;  mh-ps-print-toggle-faces mh-ps-print-msg-show mh-ps-print-msg-file
-;;;;;;  mh-ps-print-msg) "mh-print" "mh-print.el" (16671 49652))
+;;;;;;  mh-ps-print-msg) "mh-print" "mh-print.el" (16680 9361))
 ;;; Generated autoloads from mh-print.el
 
 (autoload (quote mh-ps-print-msg) "mh-print" "\
diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el
index 6b3c5793be5..f952f8b80fb 100644
--- a/lisp/mh-e/mh-mime.el
+++ b/lisp/mh-e/mh-mime.el
@@ -850,6 +850,14 @@ If message has been encoded for transfer take that into account."
                         (car ct))))))
 
 ;;;###mh-autoload
+(defun mh-toggle-mh-decode-mime-flag ()
+  "Toggle whether MH-E should decode MIME or not."
+  (interactive) 
+  (setq mh-decode-mime-flag (not mh-decode-mime-flag))
+  (mh-show nil t)
+  (message (format "(setq mh-decode-mime-flag %s)" mh-decode-mime-flag)))
+
+;;;###mh-autoload
 (defun mh-decode-message-header ()
   "Decode RFC2047 encoded message header fields."
   (when mh-decode-mime-flag