Fix.

[elisp/gnus.git-] / lisp / mml.el

diff --git a/lisp/mml.el b/lisp/mml.el
index 194e632..725632b 100644 (file)
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -618,6 +618,7 @@ If HANDLES is non-nil, use it instead reparsing the buffer."
     ;; Remove them, they are confusing.
     (message-remove-header "Content-Type")
     (message-remove-header "MIME-Version")
+    (message-remove-header "Content-Disposition")
     (message-remove-header "Content-Transfer-Encoding")))
 
 (defun mml-to-mime ()
@@ -705,8 +706,10 @@ If HANDLES is non-nil, use it instead reparsing the buffer."
        (map (make-sparse-keymap))
        (main (make-sparse-keymap)))
     (define-key sign "p" 'mml-secure-sign-pgpmime)
+    (define-key sign "o" 'mml-secure-sign-pgp)
     (define-key sign "s" 'mml-secure-sign-smime)
     (define-key encrypt "p" 'mml-secure-encrypt-pgpmime)
+    (define-key encrypt "o" 'mml-secure-encrypt-pgp)
     (define-key encrypt "s" 'mml-secure-encrypt-smime)
     (define-key map "f" 'mml-attach-file)
     (define-key map "b" 'mml-attach-buffer)
@@ -726,14 +729,18 @@ If HANDLES is non-nil, use it instead reparsing the buffer."
 
 (easy-menu-define
  mml-menu mml-mode-map ""
- '("Attachments"
-   ["Attach File" mml-attach-file t]
+ `("Attachments"
+   ["Attach File" mml-attach-file
+    ,@(if (featurep 'xemacs) '(t)
+       '(:help "Attach a file at point"))]
    ["Attach Buffer" mml-attach-buffer t]
    ["Attach External" mml-attach-external t]
    ["Insert Part" mml-insert-part t]
    ["Insert Multipart" mml-insert-multipart t]
    ["PGP/MIME Sign" mml-secure-sign-pgpmime t]
    ["PGP/MIME Encrypt" mml-secure-encrypt-pgpmime t]
+   ["PGP Sign" mml-secure-sign-pgp t]
+   ["PGP Encrypt" mml-secure-encrypt-pgp t]
    ["S/MIME Sign" mml-secure-sign-smime t]
    ["S/MIME Encrypt" mml-secure-encrypt-smime t]
    ;;["Narrow" mml-narrow-to-part t]
@@ -746,6 +753,8 @@ If HANDLES is non-nil, use it instead reparsing the buffer."
 
 (defun mml-mode (&optional arg)
   "Minor mode for editing MML.
+MML is the MIME Meta Language, a minor mode for composing MIME articles.
+See Info node `(emacs-mime)Composing'.
 
 \\{mml-mode-map}"
   (interactive "P")