2001-08-18 Simon Josefsson <jas@extundo.com>

	* mml.el (mml-menu): Collapse Attach, Insert and Security submenu.

2001-08-17  Björn Torkelsson  <torkel@acc.kth.se>

	* message.el: rename "Abort Message" to "Postpone Message".
	Remove "Attach file as MIME" from Message menu, it's already in
	the MIME menu.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e835ec4..cdf1628 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2001-08-18  Simon Josefsson  <jas@extundo.com>
+
+       * mml.el (mml-menu): Collapse Attach, Insert and Security submenu.
+
+2001-08-17  Bj\e,Av\e(Brn Torkelsson  <torkel@acc.kth.se>
+
+       * message.el: rename "Abort Message" to "Postpone Message".
+       Remove "Attach file as MIME" from Message menu, it's already in
+       the MIME menu.
+
 2001-08-17 14:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * smime.el (smime-point-at-eol): eval-and-compile.

diff --git a/lisp/message.el b/lisp/message.el
index 9cae0fe..2b5678e 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -1515,14 +1515,11 @@ Point is left at the beginning of the narrowed-to region."
     ["Spellcheck" ispell-message
      ,@(if (featurep 'xemacs) '(t)
         '(:help "Spellcheck this message"))]
-    ["Attach file as MIME" mml-attach-file
-     ,@(if (featurep 'xemacs) '(t)
-        '(:help "Attach a file at point"))]
     "----"
     ["Send Message" message-send-and-exit
      ,@(if (featurep 'xemacs) '(t)
         '(:help "Send this message"))]
-    ["Abort Message" message-dont-send
+    ["Postpone Message" message-dont-send
      ,@(if (featurep 'xemacs) '(t)
         '(:help "File this draft message and exit"))]
     ["Kill Message" message-kill-buffer

diff --git a/lisp/mml.el b/lisp/mml.el
index 3da3679..bbd4338 100644 (file)
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -721,21 +721,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]
-     ["Buffer" mml-attach-buffer t]
-     ["External" mml-attach-external t])
-    ("Insert"
-     ["Multipart" mml-insert-multipart t]
-     ["Part" mml-insert-part t])
-    ("Security"
-     ["Sign PGP/MIME" mml-secure-sign-pgpmime t]
-     ["Sign S/MIME" mml-secure-sign-smime t]
-     ["Encrypt PGP/MIME" mml-secure-encrypt-pgpmime t]
-     ["Encrypt S/MIME" mml-secure-encrypt-smime t])
+    ["Attach File" mml-attach-file t]
+    ["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]
+    ["S/MIME Sign" mml-secure-sign-smime t]
+    ["S/MIME Encrypt" mml-secure-encrypt-smime t]
     ;;["Narrow" mml-narrow-to-part t]
-    ["Quote" mml-quote-region t]
-    ["Validate" mml-validate t]
+    ["Quote MML" mml-quote-region t]
+    ["Validate MML" mml-validate t]
     ["Preview" mml-preview t]))
 
 (defvar mml-mode nil