X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/bdf36482bbea390390ae7ab1461b14b807c4fb1f..99715bbc447eb633e45ffa23b87284771ce3ac74:/lisp/mh-e/mh-mime.el

diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el
index d35e759bcd..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)