Merge from gnus--devo--0

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1400

2 files changed, 16 insertions, 0 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index ff84e0937a1..01cbd7f2a59 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-03  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * message.el (message-confirm-send): New variable to confirm sending a
+        message.
+        (message-send): Use it.
+
 2008-08-30  Teodor Zlatanov  <tzz@lifelogs.com>
 
         * gnus-spec.el (gnus-parse-simple-format): Revert last patch.
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 181d2f92177..60144932416 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -441,6 +441,13 @@ nil means let mailer mail back a message to report errors."
   :link '(custom-manual "(message)Sending Variables")
   :type 'boolean)
 
+(defcustom message-confirm-send nil
+  "Non-nil means when sending a message ask for y/n confirmation."
+  :group 'message-sending
+  :group 'message-mail
+  :link '(custom-manual "(message)Sending Variables")
+  :type 'boolean)
+
 (defcustom message-generate-new-buffers 'unique
   "*Say whether to create a new message buffer to compose a message.
 Valid values include:
@@ -3962,6 +3969,9 @@ It should typically alter the sending method in some way or other."
     (put-text-property (point-min) (point-max) 'read-only nil))
   (message-fix-before-sending)
   (run-hooks 'message-send-hook)
+  (when message-confirm-send
+    (or (y-or-n-p "Send message? ")
+        (keyboard-quit)))
   (message message-sending-message)
   (let ((alist message-send-method-alist)
         (success t)