Split -request-update-info into -request-marks and -update-info.

[gnus] / lisp / message.el

diff --git a/lisp/message.el b/lisp/message.el
index a607d3a..f3697eb 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -247,6 +247,15 @@ included.  Organization and User-Agent are optional."
   :link '(custom-manual "(message)Message Headers")
   :type '(repeat sexp))
 
   :link '(custom-manual "(message)Message Headers")
   :type '(repeat sexp))
 

+(defcustom message-prune-recipient-rules nil
+  "Rules for how to prune the list of recipients when doing wide replies.
+This is a list of regexps and regexp matches."
+  :version "24.1"
+  :group 'message-mail
+  :group 'message-headers
+  :link '(custom-manual "(message)Wide Reply")
+  :type '(repeat regexp))
+

 (defcustom message-deletable-headers '(Message-ID Date Lines)
   "Headers to be deleted if they already exist and were generated by message previously."
   :group 'message-headers
 (defcustom message-deletable-headers '(Message-ID Date Lines)
   "Headers to be deleted if they already exist and were generated by message previously."
   :group 'message-headers


@@ -436,7 +445,7 @@ whitespace)."
 
 (defcustom message-interactive t
   "Non-nil means when sending a message wait for and display errors.
 
 (defcustom message-interactive t
   "Non-nil means when sending a message wait for and display errors.

-nil means let mailer mail back a message to report errors."
+A value of nil means let mailer mail back a message to report errors."

   :version "23.2"
   :group 'message-sending
   :group 'message-mail
   :version "23.2"
   :group 'message-sending
   :group 'message-mail


@@ -451,7 +460,7 @@ nil means let mailer mail back a message to report errors."
   :link '(custom-manual "(message)Sending Variables")
   :type 'boolean)
 
   :link '(custom-manual "(message)Sending Variables")
   :type 'boolean)
 

-(defcustom message-generate-new-buffers 'unique
+(defcustom message-generate-new-buffers 'unsent

   "*Say whether to create a new message buffer to compose a message.
 Valid values include:
 
   "*Say whether to create a new message buffer to compose a message.
 Valid values include:
 


@@ -474,6 +483,7 @@ function
   If this is a function, call that function with three parameters:
   The type, the To address and the group name (any of these may be nil).
   The function should return the new buffer name."
   If this is a function, call that function with three parameters:
   The type, the To address and the group name (any of these may be nil).
   The function should return the new buffer name."

+  :version "24.1"

   :group 'message-buffers
   :link '(custom-manual "(message)Message Buffers")
   :type '(choice (const nil)
   :group 'message-buffers
   :link '(custom-manual "(message)Message Buffers")
   :type '(choice (const nil)


@@ -847,8 +857,8 @@ If this is nil, use `user-mail-address'.  If it is the symbol
 
 (defcustom message-qmail-inject-args nil
   "Arguments passed to qmail-inject programs.
 
 (defcustom message-qmail-inject-args nil
   "Arguments passed to qmail-inject programs.

-This should be a list of strings, one string for each argument.  It
-may also be a function.
+This should be a list of strings, one string for each argument.
+It may also be a function.

 
 For e.g., if you wish to set the envelope sender address so that bounces
 go to the right place or to deal with listserv's usage of that address, you
 
 For e.g., if you wish to set the envelope sender address so that bounces
 go to the right place or to deal with listserv's usage of that address, you


@@ -1153,16 +1163,18 @@ these lines."
   ;; Ease the transition from mail-mode to message-mode.  See bugs#4431, 5555.
   (concat (if (and (boundp 'mail-default-reply-to)
                   (stringp mail-default-reply-to))
   ;; Ease the transition from mail-mode to message-mode.  See bugs#4431, 5555.
   (concat (if (and (boundp 'mail-default-reply-to)
                   (stringp mail-default-reply-to))

-             (format "Reply-to: %s\n" mail-default-reply-to)
-           "")
+             (format "Reply-to: %s\n" mail-default-reply-to))

          (if (and (boundp 'mail-self-blind)
                   mail-self-blind)
          (if (and (boundp 'mail-self-blind)
                   mail-self-blind)

-             (format "BCC: %s\n" user-mail-address)
-           "")
+             (format "BCC: %s\n" user-mail-address))

          (if (and (boundp 'mail-archive-file-name)
                   (stringp mail-archive-file-name))
          (if (and (boundp 'mail-archive-file-name)
                   (stringp mail-archive-file-name))

-             (format "FCC: %s\n" mail-archive-file-name)
-           ""))
+             (format "FCC: %s\n" mail-archive-file-name))
+         ;; Use the value of `mail-default-headers' if available.
+         ;; Note: as for Emacs 21, XEmacs 21.4 and 21.5, it is
+         ;; unavailable unless sendmail.el is loaded.
+         (if (boundp 'mail-default-headers)
+             mail-default-headers))

   "*A string of header lines to be inserted in outgoing mails."
   :version "23.2"
   :group 'message-headers
   "*A string of header lines to be inserted in outgoing mails."
   :version "23.2"
   :group 'message-headers


@@ -1591,11 +1603,11 @@ If you'd like to make it possible to share draft files between XEmacs
 and Emacs, you may use `iso-2022-7bit' for this value at your own risk.
 Note that the coding-system `iso-2022-7bit' isn't suitable to all data.")
 
 and Emacs, you may use `iso-2022-7bit' for this value at your own risk.
 Note that the coding-system `iso-2022-7bit' isn't suitable to all data.")
 

-(defcustom message-send-mail-partially-limit 1000000
+(defcustom message-send-mail-partially-limit nil

   "The limitation of messages sent as message/partial.
 The lower bound of message size in characters, beyond which the message
 should be sent in several parts.  If it is nil, the size is unlimited."
   "The limitation of messages sent as message/partial.
 The lower bound of message size in characters, beyond which the message
 should be sent in several parts.  If it is nil, the size is unlimited."

-  :version "21.1"
+  :version "24.1"

   :group 'message-buffers
   :link '(custom-manual "(message)Mail Variables")
   :type '(choice (const :tag "unlimited" nil)
   :group 'message-buffers
   :link '(custom-manual "(message)Mail Variables")
   :type '(choice (const :tag "unlimited" nil)


@@ -1687,13 +1699,14 @@ functionality to work."
                 (const :tag "Never" nil)
                 (const :tag "Always" t)))
 
                 (const :tag "Never" nil)
                 (const :tag "Always" t)))
 

-(defcustom message-generate-hashcash (if (executable-find "hashcash") t)
+(defcustom message-generate-hashcash (if (executable-find "hashcash") 'opportunistic)

   "*Whether to generate X-Hashcash: headers.
 If t, always generate hashcash headers.  If `opportunistic',
 only generate hashcash headers if it can be done without the user
 waiting (i.e., only asynchronously).
 
 You must have the \"hashcash\" binary installed, see `hashcash-path'."
   "*Whether to generate X-Hashcash: headers.
 If t, always generate hashcash headers.  If `opportunistic',
 only generate hashcash headers if it can be done without the user
 waiting (i.e., only asynchronously).
 
 You must have the \"hashcash\" binary installed, see `hashcash-path'."

+  :version "24.1"

   :group 'message-headers
   :link '(custom-manual "(message)Mail Headers")
   :type '(choice (const :tag "Always" t)
   :group 'message-headers
   :link '(custom-manual "(message)Mail Headers")
   :type '(choice (const :tag "Always" t)


@@ -1710,6 +1723,7 @@ You must have the \"hashcash\" binary installed, see `hashcash-path'."
 (defvar message-mime-part nil)
 (defvar message-posting-charset nil)
 (defvar message-inserted-headers nil)
 (defvar message-mime-part nil)
 (defvar message-posting-charset nil)
 (defvar message-inserted-headers nil)

+(defvar message-inhibit-ecomplete nil)

 
 ;; Byte-compiler warning
 (defvar gnus-active-hashtb)
 
 ;; Byte-compiler warning
 (defvar gnus-active-hashtb)


@@ -3223,7 +3237,7 @@ or in the synonym headers, defined by `message-header-synonyms'."
 
 (defun message-kill-to-signature (&optional arg)
   "Kill all text up to the signature.
 
 (defun message-kill-to-signature (&optional arg)
   "Kill all text up to the signature.

-If a numberic argument or prefix arg is given, leave that number
+If a numeric argument or prefix arg is given, leave that number

 of lines before the signature intact."
   (interactive "P")
   (save-excursion
 of lines before the signature intact."
   (interactive "P")
   (save-excursion


@@ -4062,7 +4076,8 @@ It should typically alter the sending method in some way or other."
        (run-hooks 'message-sent-hook))
       (message "Sending...done")
       ;; Do ecomplete address snarfing.
        (run-hooks 'message-sent-hook))
       (message "Sending...done")
       ;; Do ecomplete address snarfing.

-      (when (message-mail-alias-type-p 'ecomplete)
+      (when (and (message-mail-alias-type-p 'ecomplete)
+                (not message-inhibit-ecomplete))

        (message-put-addresses-in-ecomplete))
       ;; Mark the buffer as unmodified and delete auto-save.
       (set-buffer-modified-p nil)
        (message-put-addresses-in-ecomplete))
       ;; Mark the buffer as unmodified and delete auto-save.
       (set-buffer-modified-p nil)


@@ -5402,7 +5417,7 @@ In posting styles use `(\"Expires\" (make-expires-date 30))'."
           (* 25 25)))
   (let ((tm (current-time)))
     (concat
           (* 25 25)))
   (let ((tm (current-time)))
     (concat

-     (if (or (memq system-type '(ms-dos emx))
+     (if (or (eq system-type 'ms-dos)

             ;; message-number-base36 doesn't handle bigints.
             (floatp (user-uid)))
         (let ((user (downcase (user-login-name))))
             ;; message-number-base36 doesn't handle bigints.
             (floatp (user-uid)))
         (let ((user (downcase (user-login-name))))


@@ -5876,6 +5891,7 @@ Headers already prepared in the buffer are not modified."
                      (if formatter
                          (funcall formatter header value)
                        (insert header-string ": " value))
                      (if formatter
                          (funcall formatter header value)
                        (insert header-string ": " value))

+                     (push header-string message-inserted-headers)

                      (goto-char (message-fill-field))
                      ;; We check whether the value was ended by a
                      ;; newline.  If not, we insert one.
                      (goto-char (message-fill-field))
                      ;; We check whether the value was ended by a
                      ;; newline.  If not, we insert one.


@@ -6419,9 +6435,7 @@ are not included."
       (setq buffer-file-name (expand-file-name
                              (concat
                              (if (memq system-type
       (setq buffer-file-name (expand-file-name
                              (concat
                              (if (memq system-type

-                                       '(ms-dos ms-windows windows-nt
-                                                cygwin cygwin32 win32 w32
-                                                mswindows))
+                                       '(ms-dos windows-nt cygwin))

                                  "message"
                                "*message*")
                               (format-time-string "-%Y%m%d-%H%M%S"))
                                  "message"
                                "*message*")
                               (format-time-string "-%Y%m%d-%H%M%S"))


@@ -6521,7 +6535,7 @@ The function is called with one parameter, a cons cell ..."
 
 (defun message-get-reply-headers (wide &optional to-address address-headers)
   (let (follow-to mct never-mct to cc author mft recipients extra)
 
 (defun message-get-reply-headers (wide &optional to-address address-headers)
   (let (follow-to mct never-mct to cc author mft recipients extra)

-  ;; Find all relevant headers we need.
+    ;; Find all relevant headers we need.

     (save-restriction
       (message-narrow-to-headers-or-head)
       ;; Gmane renames "To".  Look at "Original-To", too, if it is present in
     (save-restriction
       (message-narrow-to-headers-or-head)
       ;; Gmane renames "To".  Look at "Original-To", too, if it is present in


@@ -6647,6 +6661,8 @@ want to get rid of this query permanently.")))
                (if recip
                    (setq recipients (delq recip recipients))))))))
 
                (if recip
                    (setq recipients (delq recip recipients))))))))
 

+      (setq recipients (message-prune-recipients recipients))
+

       ;; Build the header alist.  Allow the user to be asked whether
       ;; or not to reply to all recipients in a wide reply.
       (setq follow-to (list (cons 'To (cdr (pop recipients)))))
       ;; Build the header alist.  Allow the user to be asked whether
       ;; or not to reply to all recipients in a wide reply.
       (setq follow-to (list (cons 'To (cdr (pop recipients)))))


@@ -6660,6 +6676,22 @@ want to get rid of this query permanently.")))
        (push (cons 'Cc recipients) follow-to)))
     follow-to))
 
        (push (cons 'Cc recipients) follow-to)))
     follow-to))
 

+(defun message-prune-recipients (recipients)
+  (dolist (rule message-prune-recipient-rules)
+    (let ((match (car rule))
+         dup-match
+         address)
+      (dolist (recipient recipients)
+       (setq address (car recipient))
+       (when (string-match match address)
+         (setq dup-match (replace-match (cadr rule) nil nil address))
+         (dolist (recipient recipients)
+           ;; Don't delete the address that triggered this.
+           (when (and (not (eq address (car recipient)))
+                      (string-match dup-match (car recipient)))
+             (setq recipients (delq recipient recipients))))))))
+  recipients)
+

 (defcustom message-simplify-subject-functions
   '(message-strip-list-identifiers
     message-strip-subject-re
 (defcustom message-simplify-subject-functions
   '(message-strip-list-identifiers
     message-strip-subject-re


@@ -7131,22 +7163,28 @@ Optional DIGEST will use digest to forward."
 (defun message-forward-make-body-plain (forward-buffer)
   (insert
    "\n-------------------- Start of forwarded message --------------------\n")
 (defun message-forward-make-body-plain (forward-buffer)
   (insert
    "\n-------------------- Start of forwarded message --------------------\n")

-  (let ((b (point)) e)
-    (insert
-     (with-temp-buffer
-       (mm-disable-multibyte)
-       (insert
-       (with-current-buffer forward-buffer
-         (mm-with-unibyte-current-buffer (buffer-string))))
-       (mm-enable-multibyte)
-       (mime-to-mml)
-       (goto-char (point-min))
-       (when (looking-at "From ")
-        (replace-match "X-From-Line: "))
-       (buffer-string)))
+  (let ((b (point))
+       (contents (with-current-buffer forward-buffer (buffer-string)))
+       e)
+    (unless (featurep 'xemacs)
+      (unless (mm-multibyte-string-p contents)
+       (error "Attempt to insert unibyte string from the buffer \"%s\"\
+ to the multibyte buffer \"%s\""
+              (if (bufferp forward-buffer)
+                  (buffer-name forward-buffer)
+                forward-buffer)
+              (buffer-name))))
+    (insert (mm-with-multibyte-buffer
+             (insert contents)
+             (mime-to-mml)
+             (goto-char (point-min))
+             (when (looking-at "From ")
+               (replace-match "X-From-Line: "))
+             (buffer-string)))
+    (unless (bolp) (insert "\n"))

     (setq e (point))
     (insert
     (setq e (point))
     (insert

-     "\n-------------------- End of forwarded message --------------------\n")
+     "-------------------- End of forwarded message --------------------\n")

     (message-remove-ignored-headers b e)))
 
 (defun message-remove-ignored-headers (b e)
     (message-remove-ignored-headers b e)))
 
 (defun message-remove-ignored-headers (b e)


@@ -7182,18 +7220,22 @@ Optional DIGEST will use digest to forward."
   (insert "\n\n<#mml type=message/rfc822 disposition=inline>\n")
   (let ((b (point)) e)
     (if (not message-forward-decoded-p)
   (insert "\n\n<#mml type=message/rfc822 disposition=inline>\n")
   (let ((b (point)) e)
     (if (not message-forward-decoded-p)

-       (insert
-        (with-temp-buffer
-          (mm-disable-multibyte)
-          (insert
-           (with-current-buffer forward-buffer
-             (mm-with-unibyte-current-buffer (buffer-string))))
-          (mm-enable-multibyte)
-          (mime-to-mml)
-          (goto-char (point-min))
-          (when (looking-at "From ")
-            (replace-match "X-From-Line: "))
-          (buffer-string)))
+       (let ((contents (with-current-buffer forward-buffer (buffer-string))))
+         (unless (featurep 'xemacs)
+           (unless (mm-multibyte-string-p contents)
+             (error "Attempt to insert unibyte string from the buffer \"%s\"\
+ to the multibyte buffer \"%s\""
+                    (if (bufferp forward-buffer)
+                        (buffer-name forward-buffer)
+                      forward-buffer)
+                    (buffer-name))))
+         (insert (mm-with-multibyte-buffer
+                   (insert contents)
+                   (mime-to-mml)
+                   (goto-char (point-min))
+                   (when (looking-at "From ")
+                     (replace-match "X-From-Line: "))
+                   (buffer-string))))

       (save-restriction
        (narrow-to-region (point) (point))
        (mml-insert-buffer forward-buffer)
       (save-restriction
        (narrow-to-region (point) (point))
        (mml-insert-buffer forward-buffer)


@@ -7385,6 +7427,7 @@ is for the internal use."
        (replace-match "X-From-Line: "))
       ;; Send it.
       (let ((message-inhibit-body-encoding t)
        (replace-match "X-From-Line: "))
       ;; Send it.
       (let ((message-inhibit-body-encoding t)

+           (message-inhibit-ecomplete t)

            message-required-mail-headers
            message-generate-hashcash
            rfc2047-encode-encoded-words)
            message-required-mail-headers
            message-generate-hashcash
            rfc2047-encode-encoded-words)


@@ -8190,5 +8233,4 @@ Used in `message-simplify-recipients'."
 ;; coding: iso-8859-1
 ;; End:
 
 ;; coding: iso-8859-1
 ;; End:
 

-;; arch-tag: 94b32cac-4504-4b6c-8181-030ebf380ee0

 ;;; message.el ends here
 ;;; message.el ends here