From eccf9613456f3573f9dc72d3dcb59f31f9f90442 Mon Sep 17 00:00:00 2001 From: Bill Wohler Date: Wed, 25 Aug 2004 05:55:39 +0000 Subject: [PATCH] Upgraded to MH-E version 7.82. See etc/MH-E-NEWS and lisp/mh-e/ChangeLog for details. --- etc/ChangeLog | 4 ++++ etc/MH-E-NEWS | 6 ++++++ etc/NEWS | 2 +- lisp/mh-e/ChangeLog | 35 +++++++++++++++++++++++++++++++++++ lisp/mh-e/mh-acros.el | 13 +++++++------ lisp/mh-e/mh-customize.el | 7 +++++++ lisp/mh-e/mh-e.el | 5 +++-- lisp/mh-e/mh-init.el | 4 ++-- lisp/mh-e/mh-loaddefs.el | 28 ++++++++++++++-------------- lisp/mh-e/mh-mime.el | 4 +++- 10 files changed, 82 insertions(+), 26 deletions(-) diff --git a/etc/ChangeLog b/etc/ChangeLog index cd7888b1a4a..48c6da4e32d 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,7 @@ +2004-08-24 Bill Wohler + + * NEWS, MH-E-NEWS: Upgraded to MH-E version 7.82. + 2004-08-22 David Kastrup * PROBLEMS, MAILINGLISTS: Update AUCTeX information. diff --git a/etc/MH-E-NEWS b/etc/MH-E-NEWS index 32b71b1d98c..a022106f563 100644 --- a/etc/MH-E-NEWS +++ b/etc/MH-E-NEWS @@ -6,6 +6,12 @@ Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright notice and this notice are preserved. +* Changes in MH-E 7.82 + +Version 7.81 continues to address the saga surrounding the use of CL +macros in CVS Emacs and fixes the auto-detection of vanilla MH (SF +#1014781). + * Changes in MH-E 7.81 Version 7.81 fixes a `wrong-type-argument' argument error that diff --git a/etc/NEWS b/etc/NEWS index 932cf3d3fa8..c10ec4531b2 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -660,7 +660,7 @@ You can now put the init files .emacs and .emacs_SHELL under ** MH-E changes. -Upgraded to MH-E version 7.81. There have been major changes since +Upgraded to MH-E version 7.82. There have been major changes since version 5.0.2; see MH-E-NEWS for details. +++ diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog index 990291caead..dd1062da816 100644 --- a/lisp/mh-e/ChangeLog +++ b/lisp/mh-e/ChangeLog @@ -1,3 +1,38 @@ +2004-08-21 Bill Wohler + + * Released MH-E version 7.82. + + * MH-E-NEWS, README: Updated for release 7.82. + + * mh-e.el (Version, mh-version): Updated for release 7.82. + +2004-08-24 Bill Wohler + + * mh-init.el (mh-variant-set): Changed MH to mh as that's what is + emitted by `mh-variant-mh-info' (closes SF #1014781). + (mh-variant-p): Added mu-mh to docstring. + +2004-08-23 Satyaki Das + + * mh-acros.el (mh-require-cl): Remove unneeded autoloads. + (require): Add an advice to the function so that at compile time + the uncompiled file is loaded. This avoids compilation problems + when built in the Emacs tree. + + * mh-mime.el (mh-identity-pgg-default-user-id): Defvar the + variable, to avoid compiler warnings. + + * mh-e.el (mh-seq): Load mh-seq since functions defined there are + used here. Without this, the state mh-seq.elc would be loaded. + + * mh-customize.el (mh-init, mh-identity): Load mh-init and + mh-identity at compile time manually, before the corresponding + stale elc files get autoloaded. + +2004-08-21 Bill Wohler + + * mh-e.el (Version, mh-version): Added +cvs to release number. + 2004-08-21 Bill Wohler * Released MH-E version 7.81. diff --git a/lisp/mh-e/mh-acros.el b/lisp/mh-e/mh-acros.el index dd8660a8ce3..16383304503 100644 --- a/lisp/mh-e/mh-acros.el +++ b/lisp/mh-e/mh-acros.el @@ -51,12 +51,7 @@ Some versions of `cl' produce code for the expansion of \(setf (gethash ...) ...) that uses functions in `cl' at run time. This macro recognizes that and loads `cl' where appropriate." (if (eq (car (macroexpand '(setf (gethash foo bar) baz))) 'cl-puthash) - `(progn - (require 'cl) - ;; Autoloads of CL functions go here... - (autoload 'cl-puthash "cl") - (autoload 'values "cl") - (autoload 'copy-tree "cl")) + `(require 'cl) `(eval-when-compile (require 'cl)))) ;;; Macros to generate correct code for different emacs variants @@ -130,6 +125,12 @@ various structure fields. Lookup `defstruct' for more details." (list 'nth ,x z))) (quote ,struct-name)))) +(defadvice require (around mh-prefer-el activate) + "Modify `require' to load uncompiled MH-E files." + (or (featurep (ad-get-arg 0)) + (and (string-match "^mh-" (symbol-name (ad-get-arg 0))) + (load (format "%s.el" (ad-get-arg 0)) t t)) + ad-do-it)) (provide 'mh-acros) diff --git a/lisp/mh-e/mh-customize.el b/lisp/mh-e/mh-customize.el index 67a126a8327..622c457897f 100644 --- a/lisp/mh-e/mh-customize.el +++ b/lisp/mh-e/mh-customize.el @@ -78,6 +78,13 @@ (when mh-xemacs-flag (require 'mh-xemacs)) +;; XXX: Functions autoloaded from the following files are used to initialize +;; customizable variables. They are require'd here, since otherwise the +;; corresponding .elc would be loaded at compile time. +(eval-when-compile + (require 'mh-init) + (require 'mh-identity)) + (defun mh-customize (&optional delete-other-windows-flag) "Customize MH-E variables. If optional argument DELETE-OTHER-WINDOWS-FLAG is non-nil, other windows in diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el index 5cbb97b72d0..2081d49b6cd 100644 --- a/lisp/mh-e/mh-e.el +++ b/lisp/mh-e/mh-e.el @@ -5,7 +5,7 @@ ;; Author: Bill Wohler ;; Maintainer: Bill Wohler -;; Version: 7.81 +;; Version: 7.82 ;; Keywords: mail ;; This file is part of GNU Emacs. @@ -89,6 +89,7 @@ (require 'mh-utils) (require 'mh-init) (require 'mh-inc) +(require 'mh-seq) (require 'gnus-util) (require 'easymenu) @@ -96,7 +97,7 @@ (defvar font-lock-auto-fontify) (defvar font-lock-defaults) -(defconst mh-version "7.81" "Version number of MH-E.") +(defconst mh-version "7.82" "Version number of MH-E.") ;;; Autoloads (autoload 'Info-goto-node "info") diff --git a/lisp/mh-e/mh-init.el b/lisp/mh-e/mh-init.el index ac7305fa217..a975b882128 100644 --- a/lisp/mh-e/mh-init.el +++ b/lisp/mh-e/mh-init.el @@ -90,7 +90,7 @@ GNU mailutils." (cond ((mh-variant-set-variant 'nmh) (message "%s installed as MH variant" mh-variant-in-use)) - ((mh-variant-set-variant 'MH) + ((mh-variant-set-variant 'mh) (message "%s installed as MH variant" mh-variant-in-use)) ((mh-variant-set-variant 'mu-mh) (message "%s installed as MH variant" mh-variant-in-use)) @@ -145,7 +145,7 @@ If VARIANT is a symbol, select the first entry that matches that variant." ;;;###mh-autoload (defun mh-variant-p (&rest variants) "Return t if variant is any of VARIANTS. -Currently known variants are 'mh and 'nmh." +Currently known variants are 'MH, 'nmh, and 'mu-mh." (let ((variant-in-use (cadr (assoc 'variant (assoc mh-variant-in-use mh-variants))))) (not (null (member variant-in-use variants))))) diff --git a/lisp/mh-e/mh-loaddefs.el b/lisp/mh-e/mh-loaddefs.el index 6a88278a847..fd989ffa3b9 100644 --- a/lisp/mh-e/mh-loaddefs.el +++ b/lisp/mh-e/mh-loaddefs.el @@ -13,7 +13,7 @@ ;;;;;; mh-check-whom mh-insert-signature mh-to-fcc mh-to-field mh-fill-paragraph-function ;;;;;; mh-get-header-field mh-send-other-window mh-send mh-reply ;;;;;; mh-redistribute mh-forward mh-extract-rejected-mail mh-edit-again) -;;;;;; "mh-comp" "mh-comp.el" (16665 55172)) +;;;;;; "mh-comp" "mh-comp.el" (16665 53716)) ;;; Generated autoloads from mh-comp.el (autoload (quote mh-edit-again) "mh-comp" "\ @@ -183,7 +183,7 @@ If we are at the first header field go to the start of the message body." t nil) ;;;;;; mh-store-msg mh-undo-folder mh-sort-folder mh-page-digest-backwards ;;;;;; mh-page-digest mh-pipe-msg mh-pack-folder mh-list-folders ;;;;;; mh-kill-folder mh-copy-msg mh-burst-digest) "mh-funcs" "mh-funcs.el" -;;;;;; (16671 49652)) +;;;;;; (16671 48788)) ;;; Generated autoloads from mh-funcs.el (autoload (quote mh-burst-digest) "mh-funcs" "\ @@ -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" (16680 7172)) +;;;;;; "mh-identity" "mh-identity.el" (16671 57010)) ;;; Generated autoloads from mh-identity.el (autoload (quote mh-identity-make-menu) "mh-identity" "\ @@ -307,7 +307,7 @@ If the field wasn't present, the VALUE is added at the bottom of the header." ni ;;;*** ;;;### (autoloads (mh-inc-spool-list-set) "mh-inc" "mh-inc.el" (16671 -;;;;;; 49652)) +;;;;;; 48848)) ;;; Generated autoloads from mh-inc.el (autoload (quote mh-inc-spool-list-set) "mh-inc" "\ @@ -326,7 +326,7 @@ This is called after 'customize is used to alter `mh-inc-spool-list'." nil nil) ;;;;;; mh-index-parse-search-regexp mh-index-do-search mh-index-p ;;;;;; mh-index-read-data mh-index-search mh-index-create-sequences ;;;;;; mh-create-sequence-map mh-index-update-maps) "mh-index" "mh-index.el" -;;;;;; (16665 55172)) +;;;;;; (16665 53754)) ;;; Generated autoloads from mh-index.el (autoload (quote mh-index-update-maps) "mh-index" "\ @@ -582,7 +582,7 @@ system." nil nil) ;;;*** ;;;### (autoloads (mh-variants mh-variant-p mh-variant-set) "mh-init" -;;;;;; "mh-init.el" (16680 9361)) +;;;;;; "mh-init.el" (16684 6777)) ;;; Generated autoloads from mh-init.el (autoload (quote mh-variant-set) "mh-init" "\ @@ -593,7 +593,7 @@ GNU mailutils." t nil) (autoload (quote mh-variant-p) "mh-init" "\ Return t if variant is any of VARIANTS. -Currently known variants are 'mh and 'nmh." nil nil) +Currently known variants are 'MH, 'nmh, and 'mu-mh." nil nil) (autoload (quote mh-variants) "mh-init" "\ Return a list of installed variants of MH on the system. @@ -604,7 +604,7 @@ by the variable `mh-variants'." nil nil) ;;;*** ;;;### (autoloads (mh-junk-whitelist mh-junk-blacklist) "mh-junk" -;;;;;; "mh-junk.el" (16671 49652)) +;;;;;; "mh-junk.el" (16671 48929)) ;;; Generated autoloads from mh-junk.el (autoload (quote mh-junk-blacklist) "mh-junk" "\ @@ -644,7 +644,7 @@ The `mh-junk-program' option specifies the spam program in use." t nil) ;;;;;; 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" -;;;;;; (16680 7172)) +;;;;;; (16684 7323)) ;;; Generated autoloads from mh-mime.el (autoload (quote mh-compose-insertion) "mh-mime" "\ @@ -857,7 +857,7 @@ View MIME PART-INDEX externally." t nil) ;;;*** ;;;### (autoloads (mh-do-search mh-pick-do-search mh-search-folder) -;;;;;; "mh-pick" "mh-pick.el" (16671 49652)) +;;;;;; "mh-pick" "mh-pick.el" (16671 49140)) ;;; Generated autoloads from mh-pick.el (autoload (quote mh-search-folder) "mh-pick" "\ @@ -882,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" (16680 9361)) +;;;;;; mh-ps-print-msg) "mh-print" "mh-print.el" (16680 11171)) ;;; Generated autoloads from mh-print.el (autoload (quote mh-ps-print-msg) "mh-print" "\ @@ -935,7 +935,7 @@ The messages are formatted by mhl. See the variable `mhl-formfile'." t nil) ;;;;;; mh-rename-seq mh-translate-range mh-read-range mh-read-seq-default ;;;;;; mh-notate-deleted-and-refiled mh-widen mh-put-msg-in-seq ;;;;;; mh-narrow-to-seq mh-msg-is-in-seq mh-list-sequences mh-delete-seq) -;;;;;; "mh-seq" "mh-seq.el" (16668 22297)) +;;;;;; "mh-seq" "mh-seq.el" (16671 65286)) ;;; Generated autoloads from mh-seq.el (autoload (quote mh-delete-seq) "mh-seq" "\ @@ -1157,7 +1157,7 @@ Use \\\\[mh-widen] to undo this command." t nil) ;;;### (autoloads (mh-speed-add-folder mh-speed-invalidate-map mh-speed-flists ;;;;;; mh-speed-view mh-speed-toggle mh-folder-speedbar-buttons) -;;;;;; "mh-speed" "mh-speed.el" (16665 55171)) +;;;;;; "mh-speed" "mh-speed.el" (16665 53793)) ;;; Generated autoloads from mh-speed.el (autoload (quote mh-folder-speedbar-buttons) "mh-speed" "\ @@ -1196,7 +1196,7 @@ The function invalidates the latest ancestor that is present." nil nil) ;;;;;; mh-alias-grab-from-field mh-alias-add-alias mh-alias-for-from-p ;;;;;; mh-alias-address-to-alias mh-alias-letter-expand-alias mh-alias-minibuffer-confirm-address ;;;;;; mh-read-address mh-alias-reload-maybe mh-alias-reload) "mh-alias" -;;;;;; "mh-alias.el" (16671 49553)) +;;;;;; "mh-alias.el" (16671 49382)) ;;; Generated autoloads from mh-alias.el (autoload (quote mh-alias-reload) "mh-alias" "\ diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el index f952f8b80fb..72cb654dedd 100644 --- a/lisp/mh-e/mh-mime.el +++ b/lisp/mh-e/mh-mime.el @@ -583,6 +583,8 @@ automatically." (mml-insert-empty-tag 'part 'type type 'filename file 'disposition dispos 'description description))) +(defvar mh-identity-pgg-default-user-id) + (defun mh-secure-message (method mode &optional identity) "Add directive to Encrypt/Sign an entire message. METHOD should be one of: \"pgpmime\", \"pgp\", \"smime\". @@ -852,7 +854,7 @@ If message has been encoded for transfer take that into account." ;;;###mh-autoload (defun mh-toggle-mh-decode-mime-flag () "Toggle whether MH-E should decode MIME or not." - (interactive) + (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))) -- 2.39.2