[Emacs-diffs] Changes to emacs/lisp/gnus/message.el

[Kim F . Storm]

Index: emacs/lisp/gnus/message.el
diff -c emacs/lisp/gnus/message.el:1.70 emacs/lisp/gnus/message.el:1.71
*** emacs/lisp/gnus/message.el:1.70     Fri Jan 28 16:27:25 2005
--- emacs/lisp/gnus/message.el  Wed Feb  9 15:50:37 2005
***************
*** 135,141 ****
  
  (defcustom message-fcc-externalize-attachments nil
    "If non-nil, attachments are included as external parts in Fcc copies."
!   :version "21.4"
    :type 'boolean
    :group 'message-sending)
  
--- 135,141 ----
  
  (defcustom message-fcc-externalize-attachments nil
    "If non-nil, attachments are included as external parts in Fcc copies."
!   :version "22.1"
    :type 'boolean
    :group 'message-sending)
  
***************
*** 175,181 ****
  
  (defcustom message-insert-canlock t
    "Whether to insert a Cancel-Lock header in news postings."
!   :version "21.4"
    :group 'message-headers
    :type 'boolean)
  
--- 175,181 ----
  
  (defcustom message-insert-canlock t
    "Whether to insert a Cancel-Lock header in news postings."
!   :version "22.1"
    :group 'message-headers
    :type 'boolean)
  
***************
*** 204,210 ****
    "*Headers to be generated or prompted for when sending a message.
  Also see `message-required-news-headers' and
  `message-required-mail-headers'."
!   :version "21.4"
    :group 'message-news
    :group 'message-headers
    :link '(custom-manual "(message)Message Headers")
--- 204,210 ----
    "*Headers to be generated or prompted for when sending a message.
  Also see `message-required-news-headers' and
  `message-required-mail-headers'."
!   :version "22.1"
    :group 'message-news
    :group 'message-headers
    :link '(custom-manual "(message)Message Headers")
***************
*** 212,218 ****
  
  (defcustom message-draft-headers '(References From)
    "*Headers to be generated when saving a draft message."
!   :version "21.4"
    :group 'message-news
    :group 'message-headers
    :link '(custom-manual "(message)Message Headers")
--- 212,218 ----
  
  (defcustom message-draft-headers '(References From)
    "*Headers to be generated when saving a draft message."
!   :version "22.1"
    :group 'message-news
    :group 'message-headers
    :link '(custom-manual "(message)Message Headers")
***************
*** 300,306 ****
  `message-subject-trailing-was-query' is t, always strip the trailing
  old subject.  In this case, `message-subject-trailing-was-regexp' is
  used."
!   :version "21.4"
    :type '(choice (const :tag "never" nil)
                 (const :tag "always strip" t)
                   (const ask))
--- 300,306 ----
  `message-subject-trailing-was-query' is t, always strip the trailing
  old subject.  In this case, `message-subject-trailing-was-regexp' is
  used."
!   :version "22.1"
    :type '(choice (const :tag "never" nil)
                 (const :tag "always strip" t)
                   (const ask))
***************
*** 317,323 ****
  `message-subject-trailing-was-regexp' instead.
  
  It is okay to create some false positives here, as the user is asked."
!   :version "21.4"
    :group 'message-various
    :link '(custom-manual "(message)Message Headers")
    :type 'regexp)
--- 317,323 ----
  `message-subject-trailing-was-regexp' instead.
  
  It is okay to create some false positives here, as the user is asked."
!   :version "22.1"
    :group 'message-various
    :link '(custom-manual "(message)Message Headers")
    :type 'regexp)
***************
*** 330,336 ****
  matched against `message-subject-trailing-was-regexp' in
  `message-strip-subject-trailing-was'.  You should use a regexp creating very
  few false positives here."
!   :version "21.4"
    :group 'message-various
    :link '(custom-manual "(message)Message Headers")
    :type 'regexp)
--- 330,336 ----
  matched against `message-subject-trailing-was-regexp' in
  `message-strip-subject-trailing-was'.  You should use a regexp creating very
  few false positives here."
!   :version "22.1"
    :group 'message-various
    :link '(custom-manual "(message)Message Headers")
    :type 'regexp)
***************
*** 343,349 ****
  (defcustom message-mark-insert-begin
    "--8<---------------cut here---------------start------------->8---\n"
    "How to mark the beginning of some inserted text."
!   :version "21.4"
    :type 'string
    :link '(custom-manual "(message)Insertion Variables")
    :group 'message-various)
--- 343,349 ----
  (defcustom message-mark-insert-begin
    "--8<---------------cut here---------------start------------->8---\n"
    "How to mark the beginning of some inserted text."
!   :version "22.1"
    :type 'string
    :link '(custom-manual "(message)Insertion Variables")
    :group 'message-various)
***************
*** 352,358 ****
  (defcustom message-mark-insert-end
    "--8<---------------cut here---------------end--------------->8---\n"
    "How to mark the end of some inserted text."
!   :version "21.4"
    :type 'string
    :link '(custom-manual "(message)Insertion Variables")
    :group 'message-various)
--- 352,358 ----
  (defcustom message-mark-insert-end
    "--8<---------------cut here---------------end--------------->8---\n"
    "How to mark the end of some inserted text."
!   :version "22.1"
    :type 'string
    :link '(custom-manual "(message)Insertion Variables")
    :group 'message-various)
***************
*** 362,368 ****
    "X-No-Archive: Yes\n"
    "Header to insert when you don't want your article to be archived.
  Archives \(such as groups.google.com\) respect this header."
!   :version "21.4"
    :type 'string
    :link '(custom-manual "(message)Header Commands")
    :group 'message-various)
--- 362,368 ----
    "X-No-Archive: Yes\n"
    "Header to insert when you don't want your article to be archived.
  Archives \(such as groups.google.com\) respect this header."
!   :version "22.1"
    :type 'string
    :link '(custom-manual "(message)Header Commands")
    :group 'message-various)
***************
*** 372,378 ****
    "X-No-Archive: Yes - save http://groups.google.com/";
    "Note to insert why you wouldn't want this posting archived.
  If nil, don't insert any text in the body."
!   :version "21.4"
    :type '(radio string (const nil))
    :link '(custom-manual "(message)Header Commands")
    :group 'message-various)
--- 372,378 ----
    "X-No-Archive: Yes - save http://groups.google.com/";
    "Note to insert why you wouldn't want this posting archived.
  If nil, don't insert any text in the body."
!   :version "22.1"
    :type '(radio string (const nil))
    :link '(custom-manual "(message)Header Commands")
    :group 'message-various)
***************
*** 391,397 ****
  If nil, `message-cross-post-followup-to' will only do a followup.  Note that
  you can explicitly override this setting by calling
  `message-cross-post-followup-to' with a prefix."
!   :version "21.4"
    :type 'boolean
    :group 'message-various)
  
--- 391,397 ----
  If nil, `message-cross-post-followup-to' will only do a followup.  Note that
  you can explicitly override this setting by calling
  `message-cross-post-followup-to' with a prefix."
!   :version "22.1"
    :type 'boolean
    :group 'message-various)
  
***************
*** 399,405 ****
  (defcustom message-cross-post-note
    "Crosspost & Followup-To: "
    "Note to insert before signature to notify of cross-post and follow-up."
!   :version "21.4"
    :type 'string
    :group 'message-various)
  
--- 399,405 ----
  (defcustom message-cross-post-note
    "Crosspost & Followup-To: "
    "Note to insert before signature to notify of cross-post and follow-up."
!   :version "22.1"
    :type 'string
    :group 'message-various)
  
***************
*** 407,413 ****
  (defcustom message-followup-to-note
    "Followup-To: "
    "Note to insert before signature to notify of follow-up only."
!   :version "21.4"
    :type 'string
    :group 'message-various)
  
--- 407,413 ----
  (defcustom message-followup-to-note
    "Followup-To: "
    "Note to insert before signature to notify of follow-up only."
!   :version "22.1"
    :type 'string
    :group 'message-various)
  
***************
*** 418,424 ****
  The function will be called with four arguments.  The function should not only
  insert a note, but also ensure old notes are deleted.  See the documentation
  for `message-cross-post-insert-note'."
!   :version "21.4"
    :type 'function
    :group 'message-various)
  
--- 418,424 ----
  The function will be called with four arguments.  The function should not only
  insert a note, but also ensure old notes are deleted.  See the documentation
  for `message-cross-post-insert-note'."
!   :version "22.1"
    :type 'function
    :group 'message-various)
  
***************
*** 586,592 ****
                non-word-constituents
                "]\\)+>+\\|[ \t]*[]>|}+]\\)+"))))
    "*Regexp matching the longest possible citation prefix on a line."
!   :version "21.4"
    :group 'message-insertion
    :link '(custom-manual "(message)Insertion Variables")
    :type 'regexp)
--- 586,592 ----
                non-word-constituents
                "]\\)+>+\\|[ \t]*[]>|}+]\\)+"))))
    "*Regexp matching the longest possible citation prefix on a line."
!   :version "22.1"
    :group 'message-insertion
    :link '(custom-manual "(message)Insertion Variables")
    :type 'regexp)
***************
*** 671,677 ****
  If nil, always ignore the header.  If it is the symbol `ask', always
  query the user whether to use the value.  If it is the symbol `use',
  always use the value."
!   :version "21.4"
    :group 'message-interface
    :link '(custom-manual "(message)Mailing Lists")
    :type '(choice (const :tag "ignore" nil)
--- 671,677 ----
  If nil, always ignore the header.  If it is the symbol `ask', always
  query the user whether to use the value.  If it is the symbol `use',
  always use the value."
!   :version "22.1"
    :group 'message-interface
    :link '(custom-manual "(message)Mailing Lists")
    :type '(choice (const :tag "ignore" nil)
***************
*** 685,691 ****
  regular expressions to match lists.  These functions can be used in
  conjunction with `message-subscribed-regexps' and
  `message-subscribed-addresses'."
!   :version "21.4"
    :group 'message-interface
    :link '(custom-manual "(message)Mailing Lists")
    :type '(repeat sexp))
--- 685,691 ----
  regular expressions to match lists.  These functions can be used in
  conjunction with `message-subscribed-regexps' and
  `message-subscribed-addresses'."
!   :version "22.1"
    :group 'message-interface
    :link '(custom-manual "(message)Mailing Lists")
    :type '(repeat sexp))
***************
*** 694,700 ****
    "*A file containing addresses the user is subscribed to.
  If nil, do not look at any files to determine list subscriptions.  If
  non-nil, each line of this file should be a mailing list address."
!   :version "21.4"
    :group 'message-interface
    :link '(custom-manual "(message)Mailing Lists")
    :type '(radio file (const nil)))
--- 694,700 ----
    "*A file containing addresses the user is subscribed to.
  If nil, do not look at any files to determine list subscriptions.  If
  non-nil, each line of this file should be a mailing list address."
!   :version "22.1"
    :group 'message-interface
    :link '(custom-manual "(message)Mailing Lists")
    :type '(radio file (const nil)))
***************
*** 704,710 ****
  If nil, do not use any predefined list subscriptions.  This list of
  addresses can be used in conjunction with
  `message-subscribed-address-functions' and `message-subscribed-regexps'."
!   :version "21.4"
    :group 'message-interface
    :link '(custom-manual "(message)Mailing Lists")
    :type '(repeat string))
--- 704,710 ----
  If nil, do not use any predefined list subscriptions.  This list of
  addresses can be used in conjunction with
  `message-subscribed-address-functions' and `message-subscribed-regexps'."
!   :version "22.1"
    :group 'message-interface
    :link '(custom-manual "(message)Mailing Lists")
    :type '(repeat string))
***************
*** 714,720 ****
  If nil, do not use any predefined list subscriptions.  This list of
  regular expressions can be used in conjunction with
  `message-subscribed-address-functions' and `message-subscribed-addresses'."
!   :version "21.4"
    :group 'message-interface
    :link '(custom-manual "(message)Mailing Lists")
    :type '(repeat regexp))
--- 714,720 ----
  If nil, do not use any predefined list subscriptions.  This list of
  regular expressions can be used in conjunction with
  `message-subscribed-address-functions' and `message-subscribed-addresses'."
!   :version "22.1"
    :group 'message-interface
    :link '(custom-manual "(message)Mailing Lists")
    :type '(repeat regexp))
***************
*** 724,730 ****
  If it is the symbol `always', the posting is allowed.  If it is the
  symbol `never', the posting is not allowed.  If it is the symbol
  `ask', you are prompted."
!   :version "21.4"
    :group 'message-interface
    :link '(custom-manual "(message)Message Headers")
    :type '(choice (const always)
--- 724,730 ----
  If it is the symbol `always', the posting is allowed.  If it is the
  symbol `never', the posting is not allowed.  If it is the symbol
  `ask', you are prompted."
!   :version "22.1"
    :group 'message-interface
    :link '(custom-manual "(message)Message Headers")
    :type '(choice (const always)
***************
*** 742,748 ****
    "*Envelope-from when sending mail with sendmail.
  If this is nil, use `user-mail-address'.  If it is the symbol
  `header', use the From: header of the message."
!   :version "21.4"
    :type '(choice (string :tag "From name")
                 (const :tag "Use From: header from message" header)
                 (const :tag "Use `user-mail-address'" nil))
--- 742,748 ----
    "*Envelope-from when sending mail with sendmail.
  If this is nil, use `user-mail-address'.  If it is the symbol
  `header', use the From: header of the message."
!   :version "22.1"
    :type '(choice (string :tag "From name")
                 (const :tag "Use From: header from message" header)
                 (const :tag "Use `user-mail-address'" nil))
***************
*** 856,862 ****
      (set-keymap-parent map minibuffer-local-map)
      map)
    "Keymap for `message-read-from-minibuffer'."
!   :version "21.4")
  
  ;;;###autoload
  (defcustom message-citation-line-function 'message-insert-citation-line
--- 856,862 ----
      (set-keymap-parent map minibuffer-local-map)
      map)
    "Keymap for `message-read-from-minibuffer'."
!   :version "22.1")
  
  ;;;###autoload
  (defcustom message-citation-line-function 'message-insert-citation-line
***************
*** 883,889 ****
    "*Prefix inserted on cited or empty lines of yanked messages.
  Fix `message-cite-prefix-regexp' if it is set to an abnormal value.
  See also `message-yank-prefix'."
!   :version "21.4"
    :type 'string
    :link '(custom-manual "(message)Insertion Variables")
    :group 'message-insertion)
--- 883,889 ----
    "*Prefix inserted on cited or empty lines of yanked messages.
  Fix `message-cite-prefix-regexp' if it is set to an abnormal value.
  See also `message-yank-prefix'."
!   :version "22.1"
    :type 'string
    :link '(custom-manual "(message)Insertion Variables")
    :group 'message-insertion)
***************
*** 940,946 ****
  ;;;###autoload
  (defcustom message-signature-insert-empty-line t
    "*If non-nil, insert an empty line before the signature separator."
!   :version "21.4"
    :type 'boolean
    :link '(custom-manual "(message)Insertion Variables")
    :group 'message-insertion)
--- 940,946 ----
  ;;;###autoload
  (defcustom message-signature-insert-empty-line t
    "*If non-nil, insert an empty line before the signature separator."
!   :version "22.1"
    :type 'boolean
    :link '(custom-manual "(message)Insertion Variables")
    :group 'message-insertion)
***************
*** 1121,1127 ****
    "Regexp of headers to be hidden when composing new messages.
  This can also be a list of regexps to match headers.  Or a list
  starting with `not' and followed by regexps."
!   :version "21.4"
    :group 'message
    :link '(custom-manual "(message)Message Headers")
    :type '(repeat regexp))
--- 1121,1127 ----
    "Regexp of headers to be hidden when composing new messages.
  This can also be a list of regexps to match headers.  Or a list
  starting with `not' and followed by regexps."
!   :version "22.1"
    :group 'message
    :link '(custom-manual "(message)Message Headers")
    :type '(repeat regexp))
***************
*** 1397,1403 ****
  for a message, the subaddresses will be removed (if present) before
  the mail is sent.  All addresses in this structure should be
  downcased."
!   :version "21.4"
    :group 'message-headers
    :type '(repeat (repeat string)))
  
--- 1397,1403 ----
  for a message, the subaddresses will be removed (if present) before
  the mail is sent.  All addresses in this structure should be
  downcased."
!   :version "22.1"
    :group 'message-headers
    :type '(repeat (repeat string)))
  
***************
*** 1405,1411 ****
    "Like `mail-user-agent'.
  Except if it is nil, use Gnus native MUA; if it is t, use
  `mail-user-agent'."
!   :version "21.4"
    :type '(radio (const :tag "Gnus native"
                       :format "%t\n"
                       nil)
--- 1405,1411 ----
    "Like `mail-user-agent'.
  Except if it is nil, use Gnus native MUA; if it is t, use
  `mail-user-agent'."
!   :version "22.1"
    :type '(radio (const :tag "Gnus native"
                       :format "%t\n"
                       nil)
***************
*** 1429,1442 ****
  recipients?\" before a wide reply to multiple recipients.  If the user
  answers yes, reply to all recipients as usual.  If the user answers
  no, only reply back to the author."
!   :version "21.4"
    :group 'message-headers
    :link '(custom-manual "(message)Wide Reply")
    :type 'boolean)
  
  (defcustom message-user-fqdn nil
    "*Domain part of Messsage-Ids."
!   :version "21.4"
    :group 'message-headers
    :link '(custom-manual "(message)News Headers")
    :type '(radio (const :format "%v  " nil)
--- 1429,1442 ----
  recipients?\" before a wide reply to multiple recipients.  If the user
  answers yes, reply to all recipients as usual.  If the user answers
  no, only reply back to the author."
!   :version "22.1"
    :group 'message-headers
    :link '(custom-manual "(message)Wide Reply")
    :type 'boolean)
  
  (defcustom message-user-fqdn nil
    "*Domain part of Messsage-Ids."
!   :version "22.1"
    :group 'message-headers
    :link '(custom-manual "(message)News Headers")
    :type '(radio (const :format "%v  " nil)
***************
*** 1448,1454 ****
                                 (executable-find idna-program)
                                 'ask)
    "Whether to encode non-ASCII in domain names into ASCII according to IDNA."
!   :version "21.4"
    :group 'message-headers
    :link '(custom-manual "(message)IDNA")
    :type '(choice (const :tag "Ask" ask)
--- 1448,1454 ----
                                 (executable-find idna-program)
                                 'ask)
    "Whether to encode non-ASCII in domain names into ASCII according to IDNA."
!   :version "22.1"
    :group 'message-headers
    :link '(custom-manual "(message)IDNA")
    :type '(choice (const :tag "Ask" ask)
***************
*** 1574,1580 ****
          "\\)")
    "Regular expression that matches a valid FQDN."
    ;; see also: gnus-button-valid-fqdn-regexp
!   :version "21.4"
    :group 'message-headers
    :type 'regexp)
  
--- 1574,1580 ----
          "\\)")
    "Regular expression that matches a valid FQDN."
    ;; see also: gnus-button-valid-fqdn-regexp
!   :version "22.1"
    :group 'message-headers
    :type 'regexp)
  
***************
*** 2384,2390 ****
  packages requires these properties to be present in order to work.
  If you use one of these packages, turn this option off, and hope the
  message composition doesn't break too bad."
!   :version "21.4"
    :group 'message-various
    :link '(custom-manual "(message)Various Message Variables")
    :type 'boolean)
--- 2384,2390 ----
  packages requires these properties to be present in order to work.
  If you use one of these packages, turn this option off, and hope the
  message composition doesn't break too bad."
!   :version "22.1"
    :group 'message-various
    :link '(custom-manual "(message)Various Message Variables")
    :type 'boolean)
***************
*** 2731,2737 ****
  E.g., if this list contains a member list with elements `Cc' and `To',
  then `message-carefully-insert-headers' will not insert a `To' header
  when the message is already `Cc'ed to the recipient."
!   :version "21.4"
    :group 'message-headers
    :link '(custom-manual "(message)Message Headers")
    :type '(repeat sexp))
--- 2731,2737 ----
  E.g., if this list contains a member list with elements `Cc' and `To',
  then `message-carefully-insert-headers' will not insert a `To' header
  when the message is already `Cc'ed to the recipient."
!   :version "22.1"
    :group 'message-headers
    :link '(custom-manual "(message)Message Headers")
    :type '(repeat sexp))
***************
*** 5176,5185 ****
  If the current line has `message-yank-prefix', insert it on the new line."
    (interactive "*")
    (condition-case nil
!       (split-line message-yank-prefix) ;; Emacs 21.3.50+ supports arg.
      (error
       (split-line))))
!      
  (defun message-fill-header (header value)
    (let ((begin (point))
        (fill-column 78)
--- 5176,5185 ----
  If the current line has `message-yank-prefix', insert it on the new line."
    (interactive "*")
    (condition-case nil
!       (split-line message-yank-prefix) ;; Emacs 22.1+ supports arg.
      (error
       (split-line))))
! 
  (defun message-fill-header (header value)
    (let ((begin (point))
        (fill-column 78)
***************
*** 5281,5287 ****
  (defcustom message-beginning-of-line t
    "Whether \\<message-mode-map>\\[message-beginning-of-line]\
   goes to beginning of header values."
!   :version "21.4"
    :group 'message-buffers
    :link '(custom-manual "(message)Movement")
    :type 'boolean)
--- 5281,5287 ----
  (defcustom message-beginning-of-line t
    "Whether \\<message-mode-map>\\[message-beginning-of-line]\
   goes to beginning of header values."
!   :version "22.1"
    :group 'message-buffers
    :link '(custom-manual "(message)Movement")
    :type 'boolean)
***************
*** 6593,6606 ****
        '("^\\(Disposition-Notification-To\\|Return-Receipt-To\\):"
          . message-expand-name))
    "Alist of (RE . FUN).  Use FUN for completion on header lines matching RE."
!   :version "21.4"
    :group 'message
    :type '(alist :key-type regexp :value-type function))
  
  (defcustom message-tab-body-function nil
    "*Function to execute when `message-tab' (TAB) is executed in the body.
  If nil, the function bound in `text-mode-map' or `global-map' is executed."
!   :version "21.4"
    :group 'message
    :link '(custom-manual "(message)Various Commands")
    :type 'function)
--- 6593,6606 ----
        '("^\\(Disposition-Notification-To\\|Return-Receipt-To\\):"
          . message-expand-name))
    "Alist of (RE . FUN).  Use FUN for completion on header lines matching RE."
!   :version "22.1"
    :group 'message
    :type '(alist :key-type regexp :value-type function))
  
  (defcustom message-tab-body-function nil
    "*Function to execute when `message-tab' (TAB) is executed in the body.
  If nil, the function bound in `text-mode-map' or `global-map' is executed."
!   :version "22.1"
    :group 'message
    :link '(custom-manual "(message)Various Commands")
    :type 'function)