X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/6ada44a109cf4cc63cc1afc489b6a274cb9b920f..db8d59365b5ccdca367ace2d4df5b8a2242e5765:/lisp/mh-e/mh-mime.el

diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el
index b35b1e6aac..a66db002b6 100644
--- a/lisp/mh-e/mh-mime.el
+++ b/lisp/mh-e/mh-mime.el
@@ -415,7 +415,9 @@ do the work."
         (let ((initial-size (mh-truncate-log-buffer)))
           (apply 'call-process
                  (expand-file-name command mh-progs) nil t nil
-                 (mh-list-to-string (list folder msg "-auto")))
+                 (mh-list-to-string (list folder msg "-auto"
+                                          (if (not (mh-variant-p 'nmh))
+                                              "-store"))))
           (if (> (buffer-size) initial-size)
               (save-window-excursion
                 (switch-to-buffer-other-window mh-log-buffer)
@@ -825,7 +827,9 @@ being used to highlight the signature in a MIME part."
 ;;; Button Display
 
 ;; Shush compiler.
-(eval-when-compile (mh-do-in-xemacs (defvar dots) (defvar type) (defvar ov)))
+(defvar dots)                           ; XEmacs
+(defvar type)                           ; XEmacs
+(defvar ov)                             ; XEmacs
 
 (defun mh-insert-mime-button (handle index displayed)
   "Insert MIME button for HANDLE.
@@ -870,12 +874,9 @@ by commands like \"K v\" which operate on individual MIME parts."
       (mh-funcall-if-exists overlay-put ov 'evaporate t))))
 
 ;; Shush compiler.
-(eval-when-compile
-  (when (< emacs-major-version 22)
-    (defvar  mm-verify-function-alist)
-    (defvar  mm-decrypt-function-alist))
-  (mh-do-in-xemacs
-    (defvar pressed-details)))
+(defvar mm-verify-function-alist)       ; < Emacs 22
+(defvar mm-decrypt-function-alist)      ; < Emacs 22
+(defvar pressed-details)                ; XEmacs
 
 (defun mh-insert-mime-security-button (handle)
   "Display buttons for PGP message, HANDLE."
@@ -1537,7 +1538,7 @@ a prefix argument NOCONFIRM."
     (after-find-file nil)))
 
 ;; Shush compiler.
-(eval-when-compile (defvar mh-identity-pgg-default-user-id))
+(defvar mh-identity-pgg-default-user-id)
 
 ;;;###mh-autoload
 (defun mh-mml-secure-message-encrypt (method)
@@ -1689,8 +1690,7 @@ buffer, while END defaults to the the end of the buffer."
   "Return the content type associated with the given FILENAME.
 If the \"file\" command exists and recognizes the given file,
 then its value is returned\; otherwise, the user is prompted for
-a type (see `mailcap-mime-types' and for Emacs 20,
-`mh-mime-content-types').
+a type (see `mailcap-mime-types').
 Optional argument DEFAULT is returned if a type isn't entered."
   (mailcap-parse-mimetypes)
   (let* ((default (or default
@@ -1741,9 +1741,9 @@ Returns nil if file command not on system."
     ("application/x-zip" "\.sxw" "application/vnd.sun.xml.writer")
     ("application/x-zip" "\.odg" "application/vnd.oasis.opendocument.graphics")
     ("application/x-zip" "\.odi" "application/vnd.oasis.opendocument.image")
-    ("application/x-zip" "\.odp" 
+    ("application/x-zip" "\.odp"
      "application/vnd.oasis.opendocument.presentation")
-    ("application/x-zip" "\.ods" 
+    ("application/x-zip" "\.ods"
      "application/vnd.oasis.opendocument.spreadsheet")
     ("application/x-zip" "\.odt" "application/vnd.oasis.opendocument.text"))
   "Substitutions to make for Content-Type returned from file command.