(message-tool-bar-gnome, message-tool-bar-retro): Replace mml-attach-file and

 mml-preview with mime-edit-insert-file and mime-edit-preview-message.

diff --git a/ChangeLog b/ChangeLog
index cc3dcc6..149f29e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-23  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * lisp/message.el (message-tool-bar-gnome, message-tool-bar-retro):
+       Replace mml-attach-file and mml-preview with mime-edit-insert-file
+       and mime-edit-preview-message.
+
 2006-02-22  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * etc/images/gnus/mail_send.xpm: Emacs 21 icon for
@@ -33,7 +39,7 @@
 
        * etc/images/mail/save.xpm, etc/images/mail/preview.xpm: New icons.
 
-2006-02-25  Katsumi Yamaoka  <yamaoka@jpl.org>
+2006-02-15  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * lisp/nnheader.el (mm-make-temp-file): Be always alias to
        make-temp-file.

diff --git a/lisp/message.el b/lisp/message.el
index 607c8d2..e489345 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -7461,11 +7461,11 @@ Pre-defined symbols include `message-tool-bar-gnome' and
     (message-send-and-exit "mail/send")
     (message-dont-send "mail/save-draft")
     (message-kill-buffer "close") ;; stock_cancel
-    ;;(mml-attach-file "mail/attach" mml-mode-map)
+    (mime-edit-insert-file "mail/attach" mime-edit-mode-map)
     (ispell-message "spell" nil :visible (not flyspell-mode))
     (flyspell-buffer "spell" t :visible flyspell-mode
                     :help "Flyspell whole buffer")
-    ;;(mml-preview "mail/preview" mml-mode-map)
+    (mime-edit-preview-message "mail/preview" mime-edit-mode-map)
     ;;(mml-secure-message-sign-encrypt "lock" mml-mode-map :visible nil)
     (message-insert-importance-high "important" nil :visible nil)
     (message-insert-importance-low "unimportant" nil :visible nil)
@@ -7485,9 +7485,9 @@ See `gmm-tool-bar-from-list' for details on the format of the list."
     (message-send-and-exit "gnus/mail_send")
     (message-kill-buffer "close")
     (message-dont-send "cancel")
-    ;;(mml-attach-file "attach" mml-mode-map)
+    (mime-edit-insert-file "attach" mime-edit-mode-map)
     (ispell-message "spell")
-    ;;(mml-preview "preview" mml-mode-map)
+    (mime-edit-preview-message "preview" mime-edit-mode-map)
     (message-insert-importance-high "gnus/important")
     (message-insert-importance-low "gnus/unimportant")
     (message-insert-disposition-notification-to "gnus/receipt"))