From: yamaoka Date: Mon, 9 Jul 2001 22:52:10 +0000 (+0000) Subject: Synch with Oort Gnus. X-Git-Tag: t-gnus-6_15_4-04-quimby~20 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=ff5c531af3b8824765adf0b67d9784b50360287c;p=elisp%2Fgnus.git- Synch with Oort Gnus. --- diff --git a/ChangeLog b/ChangeLog index e94b9a0..d88dfbd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2001-07-04 Yair Friedman + + * make.bat: Use infohack.el to create info files. + 2001-07-09 Akihiro Arisawa * README.semi: Modify URI of emacs-w3m. @@ -5,10 +9,10 @@ * Mule23@1934.en: Ditto. * Mule23@1934.ja: Ditto. * lisp/nnshimbun.el: Ditto. - + * texi/gnus-ja.texi (Top, Article Treatment): Fix typo. (Web Newspaper): Modify URI of emacs-w3m. - + 2001-07-06 KITAGAWA Takurou * lisp/Makefile.in (clever): Use `if test... then' instead of diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6021697..4b155da 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,24 @@ +2001-07-09 13:00:00 ShengHuo ZHU + + * nntp.el (nntp-send-command, nntp-send-command-nodelete): + (nntp-send-command-and-decode): Use gnus-point-at-bol. + +2001-07-09 13:00:00 ShengHuo ZHU + From Paul Jarc + + * message.el (message-use-mail-followup-to): New variable. + (message-get-reply-headers): Use it. + +2001-07-04 Gerd Moellmann + + * nnheader.el (nnheader-init-server-buffer): Make sure the + *nntpd* buffer is made multibyte instead of a random buffer. + +2001-07-09 12:00:00 ShengHuo ZHU + + * gnus-sum.el (gnus-get-newsgroup-headers-xover): Get headers only + when it returns headers. + 2001-07-07 Simon Josefsson * rfc2047.el (rfc2047-encode-message-header): Skip header when @@ -65,6 +86,7 @@ * nntp.el (nntp-send-command-nodelete): ditto. * nntp.el (nntp-send-command-and-decode): ditto. +>>>>>>> 6.485 2001-06-30 YAGI Tatsuya * gnus-start.el (gnus-check-first-time-used): Use `if' instead of diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index 7075670..a4f426d 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -5219,7 +5219,7 @@ Return a list of headers that match SEQUENCE (see (nreverse headers) ;;;!!! FIXME: temporary fix for an infloop on nnimap. (if (eq 'nnimap (car (gnus-find-method-for-group group))) - (when (gnus-retrieve-headers sequence group) + (when (eq (gnus-retrieve-headers sequence group) 'headers) (gnus-get-newsgroup-headers)) (gnus-retrieve-parsed-headers sequence group)))))))) diff --git a/lisp/message.el b/lisp/message.el index 645fbb1..684ebe4 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -508,7 +508,7 @@ and respond with new To and Cc headers." :group 'message-interface :type '(choice function (const nil))) -(defcustom message-use-followup-to t +(defcustom message-use-followup-to 'ask "*Specifies what to do with Followup-To header. If nil, always ignore the header. If it is t, use its value, but query before using the \"poster\" value. If it is the symbol `ask', @@ -533,17 +533,6 @@ the value. If it is the symbol `use', always use the value." (const :tag "always" use) (const :tag "ask" ask))) -(defcustom message-use-mail-followup-to 'ask - "*Specifies what to do with Mail-Followup-To header. -If nil, always ignore the header. If it is the symbol `ask', always -query the user whether to use the value. If it is t or the symbol -`use', always use the value." - :group 'message-interface - :type '(choice (const :tag "ignore" nil) - (const :tag "maybe" t) - (const :tag "always" use) - (const :tag "ask" ask))) - ;;; XXX: 'ask and 'use are not implemented yet. (defcustom message-use-mail-reply-to 'ask "*Specifies what to do with Mail-Reply-To/Reply-To header. @@ -557,6 +546,17 @@ is never used." (const :tag "always" use) (const :tag "ask" ask))) +(defcustom message-use-mail-followup-to t + "*Specifies what to do with Mail-Followup-To header. +If nil, always ignore the header. If it is the symbol `ask', always +query the user whether to use the value. If it is t or the symbol +`use', always use the value." + :group 'message-interface + :type '(choice (const :tag "ignore" nil) + (const :tag "maybe" t) + (const :tag "always" use) + (const :tag "ask" ask))) + (defcustom message-sendmail-f-is-evil nil "*Non-nil means don't add \"-f username\" to the sendmail command line. Doing so would be even more evil than leaving it out." @@ -4860,8 +4860,7 @@ OTHER-HEADERS is an alist of header/value pairs." mrt (when message-use-mail-reply-to (message-fetch-field "mail-reply-to")) mft (when (and (not (or to-address mrt reply-to)) - (or message-use-followup-to - message-use-mail-followup-to)) + message-use-mail-followup-to) (message-fetch-field "mail-followup-to"))) ;; Handle special values of Mail-Copies-To. @@ -4902,8 +4901,7 @@ sends a copy of your response to " (if (string-match "," mct) ;; Handle Mail-Followup-To. (when (and mft - (eq (or message-use-followup-to - message-use-mail-followup-to) 'ask) + (eq message-use-mail-followup-to 'ask) (not (message-y-or-n-p (concat "Obey Mail-Followup-To: " mft "? ") t "\ You should normally obey the Mail-Followup-To: header. @@ -4933,9 +4931,8 @@ that further discussion should take place only in " (save-excursion (message-set-work-buffer) (if (and mft - message-use-followup-to wide - (or (not (eq message-use-followup-to 'ask)) + (or (not (eq message-use-mail-followup-to 'ask)) (message-y-or-n-p "Obey Mail-Followup-To? " t "\ You should normally obey the Mail-Followup-To: header. In this article, it has the value of @@ -4946,8 +4943,12 @@ which directs your response to " (if (string-match "," mft) "the specified addresses" "that address only") ". -If a message is posted to several mailing lists, Mail-Followup-To is -often used to direct the following discussion to one list only, +Most commonly, Mail-Followup-To is used by a mailing list poster to +express that responses should be sent to just the list, and not the +poster as well. + +If a message is posted to several mailing lists, Mail-Followup-To may +also be used to direct the following discussion to one list only, because discussions that are spread over several lists tend to be fragmented and very difficult to follow. @@ -5095,8 +5096,7 @@ If TO-NEWSGROUPS, use that as the new Newsgroups line." distribution (message-fetch-field "distribution") mct (when message-use-mail-copies-to (message-fetch-field "mail-copies-to")) - mft (when (or message-use-followup-to - message-use-mail-followup-to) + mft (when message-use-mail-followup-to (message-fetch-field "mail-followup-to"))) (when (and (setq gnus-warning (message-fetch-field "gnus-warning")) (string-match "<[^>]+>" gnus-warning)) @@ -5183,8 +5183,7 @@ responses here are directed to other newsgroups.")) (setq follow-to (list (cons 'Newsgroups newsgroups))))))) ;; Handle Mail-Followup-To, followup via e-mail. ((and mft - (or (not (eq (or message-use-followup-to - message-use-mail-followup-to) 'ask)) + (or (not (eq message-use-mail-followup-to 'ask)) (message-y-or-n-p (concat "Obey Mail-Followup-To: " mft "? ") t "\ You should normally obey the Mail-Followup-To: header. diff --git a/lisp/nntp.el b/lisp/nntp.el index 7b03ed3..91b10f6 100644 --- a/lisp/nntp.el +++ b/lisp/nntp.el @@ -433,7 +433,7 @@ noticing asynchronous data.") (set-buffer buffer) (goto-char pos) (if (looking-at (regexp-quote command)) - (delete-region pos (progn (forward-line 1) (point-at-bol)))) + (delete-region pos (progn (forward-line 1) (gnus-point-at-bol)))) ))) )) @@ -453,7 +453,7 @@ noticing asynchronous data.") (set-buffer buffer) (goto-char pos) (if (looking-at (regexp-quote command)) - (delete-region pos (progn (forward-line 1) (point-at-bol)))) + (delete-region pos (progn (forward-line 1) (gnus-point-at-bol)))) ))) )) @@ -478,7 +478,7 @@ noticing asynchronous data.") (set-buffer buffer) (goto-char pos) (if (looking-at (regexp-quote command)) - (delete-region pos (progn (forward-line 1) (point-at-bol)))) + (delete-region pos (progn (forward-line 1) (gnus-point-at-bol)))) ))) )) diff --git a/make.bat b/make.bat index 9e31066..6e5d96c 100755 --- a/make.bat +++ b/make.bat @@ -40,11 +40,11 @@ attrib -r %1\lisp\gnus\* copy *.el* %1\lisp\gnus :info -set EMACSINFOHACK="(while (re-search-forward \"@\\(end \\)?ifnottex\" nil t) (replace-match \"\"))" +set EMACSINFO=call %1\bin\%emacs% -no-site-file -no-init-file -batch -q -l infohack.el -f batch-makeinfo cd ..\texi -call %1\bin\%emacs% -batch -q -no-site-file message.texi -eval %EMACSINFOHACK% -f texinfo-every-node-update -f texinfo-format-buffer -f save-buffer -call %1\bin\%emacs% -batch -q -no-site-file emacs-mime.texi -eval %EMACSINFOHACK% -f texinfo-every-node-update -f texinfo-format-buffer -f save-buffer -call %1\bin\%emacs% -batch -q -no-site-file gnus.texi -eval %EMACSINFOHACK% -eval "(setq max-lisp-eval-depth 600)" -f texinfo-every-node-update -f texinfo-format-buffer -f save-buffer +%EMACSINFO% message.texi +%EMACSINFO% emacs-mime.texi +%EMACSINFO% gnus.texi if not "%2" == "copy" goto done copy gnus %1\info copy gnus-?? %1\info