From 0bd41d4b9914933495ef5f83fb8d8f174cbc4c9e Mon Sep 17 00:00:00 2001 From: yamaoka Date: Thu, 2 Jan 2003 00:08:07 +0000 Subject: [PATCH] Synch with Oort Gnus. --- lisp/ChangeLog | 38 +++++++++++++++++++++----------------- lisp/message.el | 28 ++++++++++++++-------------- 2 files changed, 35 insertions(+), 31 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cb4f1d2..967fefe 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2003-01-02 Katsumi Yamaoka + + * message.el (message-cross-post-followup-to): Fix comment. + 2003-01-01 Teodor Zlatanov * spam.el (spam-ham-marks, spam-spam-marks): changed list @@ -9,7 +13,7 @@ 2003-01-01 Raymond Scholz - * message.el (message-signature-insert-empty-line): New variable. + * message.el (message-signature-insert-empty-line): New variable. 2002-12-30 Reiner Steib @@ -37,17 +41,17 @@ * dns.el (dns-make-network-process): Comment. * gnus-sum.el (gnus-summary-display-while-building): Default to - nil. + nil. 2003-01-01 Wes Hardaker * gnus-sum.el (gnus-summary-display-while-building): New - variable. + variable. 2002-01-01 Raymond Scholz * deuglify.el (gnus-outlook-rearrange-article): Kill overlays - before rearranging the article. + before rearranging the article. 2003-01-01 Lars Magne Ingebrigtsen @@ -60,12 +64,12 @@ (message-draft-headers): New variable. * gnus-msg.el (gnus-inews-make-draft-meta-information): New - function. + function. (gnus-setup-message): Use it. * message.el (message-generate-headers-first): Doc fix. (message-setup-1): Use new function for getting which headers to - generate. + generate. (message-headers-to-generate): New function. 2003-01-01 ShengHuo ZHU @@ -129,13 +133,13 @@ when sorting by date. * gnus-art.el (gnus-article-edit-mode): New variable. - (gnus-article-setup-buffer): Warn user about discarding edits. + (gnus-article-setup-buffer): Warn user about discarding edits. * gnus-sum.el (gnus-summary-pipe-output): Clean up. (gnus-summary-pipe-output): Take a symbolic prefix to save all - headers. + headers. - * mm-uu.el (mm-uu-configure-list): Default to (shar . disabled). + * mm-uu.el (mm-uu-configure-list): Default to (shar . disabled). 2002-12-30 Reiner Steib @@ -175,13 +179,13 @@ 2002-12-30 Lars Magne Ingebrigtsen * flow-fill.el (fill-flowed): Don't infloop on too long fill - prefixes. + prefixes. * dns.el (query-dns): Protect against errors. * gnus-msg.el (gnus-article-yanked-articles): New variable. (gnus-inews-add-send-actions): Mark all answered messages as - answered. + answered. 2002-08-10 Jari Aalto @@ -200,7 +204,7 @@ 2002-12-29 Lars Magne Ingebrigtsen - * gnus-topic.el (gnus-topic-display-missing-topic): Bind entry. + * gnus-topic.el (gnus-topic-display-missing-topic): Bind entry. * message.el (message-with-reply-buffer): New macro. (message-fetch-reply-field): Use it. @@ -221,7 +225,7 @@ 2002-12-29 Jesper Harder * mml.el (mml-generate-mime-1): Reverse the order of - encoding/flowing. + encoding/flowing. 2002-12-29 Lars Magne Ingebrigtsen @@ -241,9 +245,9 @@ * gnus.el (gnus-keep-backlog): Change default to 20. * gnus-agent.el (gnus-agent-check-overview-buffer): Start from - start. + start. (gnus-agent-check-overview-buffer): Remove negative article - numbers. + numbers. * nnmail.el (nnmail-split-fancy-with-parent-ignore-groups): Doc fix. (nnmail-cache-ignore-groups): Doc fix. @@ -254,7 +258,7 @@ 2002-12-28 Lars Magne Ingebrigtsen - * gnus.el (gnus-summary-high-uncached-face): New color scheme. + * gnus.el (gnus-summary-high-uncached-face): New color scheme. 2002-12-28 Lars Magne Ingebrigtsen @@ -280,7 +284,7 @@ * mm-decode.el (mm-mailcap-command): Do not backslash-quote special chars if the mailcap file uses single quotes around %s. - From Laurent Martelli . + From Laurent Martelli . 2002-12-19 Paul Jarc diff --git a/lisp/message.el b/lisp/message.el index 0c91dd2..3678c50 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -254,7 +254,7 @@ Archives \(such as groups.googgle.com\) respect this header." ;;;###autoload (defcustom message-archive-note "X-No-Archive: Yes - save http://groups.google.com/" - "Note to insert why you wouldn't want this posting archived. + "Note to insert why you wouldn't want this posting archived. If nil, don't insert any text in the body." :type 'string :group 'message-various) @@ -284,7 +284,7 @@ Note that you can explicitly override this setting by calling :group 'message-various) ;;;###autoload -(defcustom message-fup2-note +(defcustom message-followup-to-note "Followup-To: " "Note to insert before signature to notify of follow-up only." :type 'string @@ -293,7 +293,7 @@ Note that you can explicitly override this setting by calling ;;;###autoload (defcustom message-cross-post-note-function 'message-cross-post-insert-note - "Function to use to insert note about Crosspost or Followup-To. + "Function to use to insert note about Crosspost or Followup-To. 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'. " @@ -327,7 +327,7 @@ Otherwise, most addresses look like `angles', but they look like :group 'message-headers :type 'boolean) -(defcustom message-syntax-checks +(defcustom message-syntax-checks (if message-insert-canlock '((sender . disabled)) nil) ;; Guess this one shouldn't be easy to customize... "*Controls what syntax checks should not be performed on outgoing posts. @@ -1168,7 +1168,7 @@ candidates: `empty-article' Allow you to post an empty article; `quoted-text-only' Allow you to post quoted text only; `multiple-copies' Allow you to post multiple copies; -`cancel-messages' Allow you to cancel or supersede messages from +`cancel-messages' Allow you to cancel or supersede messages from your other email addresses.") (defsubst message-gnksa-enable-p (feature) @@ -1792,13 +1792,13 @@ is used by default." ;;; Start of functions adopted from `message-utils.el'. (defun message-strip-subject-trailing-was (subject) - "Remove trailing \"(Was: )\" from subject lines. + "Remove trailing \"(Was: )\" from subject lines. Leading \"Re: \" is not stripped by this function. Use the function `message-strip-subject-re' for this." (let* ((query message-subject-trailing-was-query) (new) (found)) (setq found - (string-match + (string-match (if (eq query 'ask) message-subject-trailing-was-ask-regexp message-subject-trailing-was-regexp) @@ -1810,7 +1810,7 @@ Leading \"Re: \" is not stripped by this function. Use the function (if (eq query 'ask) (if (message-y-or-n-p "Strip `(was: )' in subject? " t - (concat + (concat "Strip `(was: )' in subject " "and use the new one instead?\n\n" "Current subject is: \"" @@ -1924,7 +1924,7 @@ With prefix-argument just set Follow-Up, don't cross-post." ;; add target-group to Newsgroups line. (cond ((and (or ;; def: cross-post, req:no - (and message-cross-post-default (not current-prefix-arg)) + (and message-cross-post-default (not current-prefix-arg)) ;; def: no-cross-post, req:yes (and (not message-cross-post-default) current-prefix-arg)) (not (string-match "poster" target-group)) @@ -1993,7 +1993,7 @@ With prefix-argument just set Follow-Up, don't cross-post." (save-excursion (let* ((old-groups (message-fetch-field "Newsgroups")) (in-old (string-match - (regexp-quote target-group) + (regexp-quote target-group) (or old-groups "")))) ;; check whether target exactly matches old Newsgroups (cond ((not old-groups) @@ -2006,7 +2006,7 @@ With prefix-argument just set Follow-Up, don't cross-post." old-groups))) ;; yes, Newsgroups line must change (message-cross-post-followup-to-header target-group) - ;; insert note whether we do cross-post or fup2 + ;; insert note whether we do cross-post or followup-to (funcall message-cross-post-note-function target-group (if (or (and message-cross-post-default @@ -2238,7 +2238,7 @@ Point is left at the beginning of the narrowed-to region." ;; mark inserted text (define-key message-mode-map "\C-c\M-m" 'message-mark-inserted-region) (define-key message-mode-map "\C-c\M-f" 'message-mark-insert-file) - + (define-key message-mode-map "\C-c\C-b" 'message-goto-body) (define-key message-mode-map "\C-c\C-i" 'message-goto-signature) (define-key message-mode-map "\C-c\C-fc" 'message-goto-mail-copies-to) @@ -6709,9 +6709,9 @@ which specify the range to operate on." (defcustom message-completion-alist (list (cons message-newgroups-header-regexp 'message-expand-group) '("^\\(Resent-\\)?\\(To\\|B?Cc\\):" . message-expand-name) - '("^\\(Reply-To\\|From\\|Mail-Followup-To\\|Mail-Copies-To\\):" + '("^\\(Reply-To\\|From\\|Mail-Followup-To\\|Mail-Copies-To\\):" . message-expand-name) - '("^\\(Disposition-Notification-To\\|Return-Receipt-To\\):" + '("^\\(Disposition-Notification-To\\|Return-Receipt-To\\):" . message-expand-name)) "Alist of (RE . FUN). Use FUN for completion on header lines matching RE." :group 'message -- 1.7.10.4