From fb3ccac454727b78061cebd2c4f133e70322c6e1 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Sun, 12 Jan 2003 23:42:08 +0000 Subject: [PATCH] T-gnus 6.15.13 (quimby) revision 00. --- ChangeLog | 8 ++++++ README.T-gnus | 2 +- README.semi | 2 +- README.semi.ja | 2 +- lisp/ChangeLog | 47 +++++++++++++++++++++++++++++++ lisp/gnus-art.el | 78 +++++++++++++++++++++++++++------------------------ lisp/gnus-cite.el | 13 +++++---- lisp/gnus-fun.el | 1 + lisp/gnus-msg.el | 53 +++++++++++++++++++++++++--------- lisp/gnus-sum.el | 1 + lisp/gnus-vers.el | 4 +-- lisp/mail-source.el | 1 - lisp/mm-decode.el | 2 +- lisp/sieve-mode.el | 1 + lisp/sieve.el | 6 ++++ texi/ChangeLog | 4 +++ texi/gnus-ja.texi | 21 ++++++++++++-- texi/gnus.texi | 20 +++++++++++-- 18 files changed, 198 insertions(+), 68 deletions(-) diff --git a/ChangeLog b/ChangeLog index 598e616..3475c34 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2003-01-12 Katsumi Yamaoka + * lisp/gnus-vers.el: T-gnus 6.15.13 (quimby) revision 00. + +2003-01-12 Katsumi Yamaoka + + * lisp/gnus-vers.el: T-gnus 6.15.12 revision 00. + +2003-01-12 Katsumi Yamaoka + * lisp/gnus-vers.el: T-gnus 6.15.12 (quimby) revision 00. 2003-01-12 Katsumi Yamaoka diff --git a/README.T-gnus b/README.T-gnus index 3e34a50..59eb2da 100644 --- a/README.T-gnus +++ b/README.T-gnus @@ -33,5 +33,5 @@ NEWS: * T-gnus 6.15 - this is based on Oort Gnus. - The latest T-gnus is T-gnus 6.15.12 (based on Oort Gnus 0.12). It + The latest T-gnus is T-gnus 6.15.13 (based on Oort Gnus 0.13). It requires SEMI 1.14, FLIM 1.14, and APEL 10.0 or later. diff --git a/README.semi b/README.semi index 31aa473..67f3bd5 100644 --- a/README.semi +++ b/README.semi @@ -4,7 +4,7 @@ What is T-gnus? =============== T-gnus is an improvement of Gnus with SEMI's MIME feature. T-gnus -6.15 is based on Oort Gnus v0.12. SEMI may stand for "SEMI is Emacs +6.15 is based on Oort Gnus v0.13. SEMI may stand for "SEMI is Emacs MIME Interface" and is developped to provide an easy interfaces for users to handle MIME message structures. For further information, refer to REASME.en of SEMI. diff --git a/README.semi.ja b/README.semi.ja index 8dbd7ed..bbfc4db 100644 --- a/README.semi.ja +++ b/README.semi.ja @@ -4,7 +4,7 @@ T-gnus とは？ ============= T-gnus は、SEMI を利用して Gnus に MIME 機能を追加するものです。 -T-gnus 6.15 は Oort Gnus v0.12 をベースにしています。SEMI は Emacs で +T-gnus 6.15 は Oort Gnus v0.13 をベースにしています。SEMI は Emacs で MIME を使えるようにするもので、MIME message の構文の構造と利用者の間を つなぐインターフェースを提供します。詳しくは、SEMI の README.en を参照 してください。 diff --git a/lisp/ChangeLog b/lisp/ChangeLog index fa19578..dc39f69 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,52 @@ 2003-01-12 Lars Magne Ingebrigtsen + * gnus.el (gnus-version-number): Bumped version. + +2003-01-12 22:02:49 Lars Magne Ingebrigtsen + + * gnus.el: Oort Gnus v0.12 is released. + +2003-01-12 Lars Magne Ingebrigtsen + + * mail-source.el (mail-sources): Removed autoload to make it + compile under XEmacs. + +2003-01-12 Raymond Scholz + + * gnus-msg.el (gnus-confirm-mail-reply-to-news): May be a + regexp or a function too. + (gnus-confirm-treat-mail-like-news): New variable. Ask for + confirmation even if the original article is mail. + +2003-01-12 Lars Magne Ingebrigtsen + + * gnus-msg.el (gnus-inews-add-send-actions): Get the right + articles to be marked when not yanking. + +2003-01-12 Fran,Agois-David Collin + + * mm-decode.el (mm-get-part): Use mm-with-unibyte-current-buffer. + +2003-01-12 Lars Magne Ingebrigtsen + + * gnus-fun.el (gnus-face-from-file): Autoload. + + * gnus-cite.el (gnus-cite-delete-overlays): Protect against more + errors. + +2003-01-12 Simon Josefsson + + * sieve.el (sieve-upload-and-bury): New. Suggested by + kai.grossjohann@uni-duisburg.de (Kai Gro,A_johann). + + * sieve-mode.el (sieve-mode-map): Bind s-u-a-b to C-c C-c. + Suggested by kai.grossjohann@uni-duisburg.de (Kai Gro,A_johann). + +2003-01-12 Lars Magne Ingebrigtsen + + * gnus-art.el (gnus-ignored-headers): Don't include the ^ and : + in every string. + * gnus.el (gnus-version-number): Bumped version number. 2003-01-12 13:46:20 Lars Magne Ingebrigtsen diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index 55c8eb4..7486309 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -115,43 +115,47 @@ :group 'gnus-article) (defcustom gnus-ignored-headers - '("^Path:" "^Expires:" "^Date-Received:" "^References:" "^Xref:" "^Lines:" - "^Relay-Version:" "^Message-ID:" "^Approved:" "^Sender:" "^Received:" - "^X-UIDL:" "^MIME-Version:" "^Return-Path:" "^In-Reply-To:" - "^Content-Type:" "^Content-Transfer-Encoding:" "^X-WebTV-Signature:" - "^X-MimeOLE:" "^X-MSMail-Priority:" "^X-Priority:" "^X-Loop:" - "^X-Authentication-Warning:" "^X-MIME-Autoconverted:" "^X-Face" - "^X-Attribution:" "^X-Originating-IP:" "^Delivered-To:" - "^NNTP-[-A-Za-z]+:" "^Distribution:" "^X-no-archive:" "^X-Trace:" - "^X-Complaints-To:" "^X-NNTP-Posting-Host:" "^X-Orig.*:" - "^Abuse-Reports-To:" "^Cache-Post-Path:" "^X-Article-Creation-Date:" - "^X-Poster:" "^X-Mail2News-Path:" "^X-Server-Date:" "^X-Cache:" - "^Originator:" "^X-Problems-To:" "^X-Auth-User:" "^X-Post-Time:" - "^X-Admin:" "^X-UID:" "^Resent-[-A-Za-z]+:" "^X-Mailing-List:" - "^Precedence:" "^Original-[-A-Za-z]+:" "^X-filename:" "^X-Orcpt:" - "^Old-Received:" "^X-Pgp" "^X-Auth:" "^X-From-Line:" - "^X-Gnus-Article-Number:" "^X-Majordomo:" "^X-Url:" "^X-Sender:" - "^MBOX-Line" "^Priority:" "^X400-[-A-Za-z]+:" - "^Status:" "^X-Gnus-Mail-Source:" "^Cancel-Lock:" - "^X-FTN" "^X-EXP32-SerialNo:" "^Encoding:" "^Importance:" - "^Autoforwarded:" "^Original-Encoded-Information-Types:" "^X-Ya-Pop3:" - "^X-Face-Version:" "^X-Vms-To:" "^X-ML-NAME:" "^X-ML-COUNT:" - "^Mailing-List:" "^X-finfo:" "^X-md5sum:" "^X-md5sum-Origin:" - "^X-Sun-Charset:" "^X-Accept-Language:" "^X-Envelope-Sender:" - "^List-[A-Za-z]+:" "^X-Listprocessor-Version:" - "^X-Received:" "^X-Distribute:" "^X-Sequence:" "^X-Juno-Line-Breaks:" - "^X-Notes-Item:" "^X-MS-TNEF-Correlator:" "^x-uunet-gateway:" - "^X-Received:" "^Content-length:" "X-precedence:" - "^X-Authenticated-User:" "^X-Comment" "^X-Report:" "^X-Abuse-Info:" - "^X-HTTP-Proxy:" "^X-Mydeja-Info:" "^X-Copyright" "^X-No-Markup:" - "^X-Abuse-Info:" "^X-From_:" "^X-Accept-Language:" "^Errors-To:" - "^X-BeenThere:" "^X-Mailman-Version:" "^List-Help:" "^List-Post:" - "^List-Subscribe:" "^List-Id:" "^List-Unsubscribe:" "^List-Archive:" - "^X-Content-length:" "^X-Posting-Agent:" "^Original-Received:" - "^X-Request-PGP:" "^X-Fingerprint:" "^X-WRIEnvto:" "^X-WRIEnvfrom:" - "^X-Virus-Scanned:" "^X-Delivery-Agent:" "^Posted-Date:" "^X-Gateway:" - "^X-Local-Origin:" "^X-Local-Destination:" "^X-UserInfo1:" - "^X-Received-Date:" "^X-Hashcash:" "^Face:") + (mapcar + (lambda (header) + (concat "^" header ":")) + '("Path" "Expires" "Date-Received" "References" "Xref" "Lines" + "Relay-Version" "Message-ID" "Approved" "Sender" "Received" + "X-UIDL" "MIME-Version" "Return-Path" "In-Reply-To" + "Content-Type" "Content-Transfer-Encoding" "X-WebTV-Signature" + "X-MimeOLE" "X-MSMail-Priority" "X-Priority" "X-Loop" + "X-Authentication-Warning" "X-MIME-Autoconverted" "X-Face" + "X-Attribution" "X-Originating-IP" "Delivered-To" + "NNTP-[-A-Za-z]+" "Distribution" "X-no-archive" "X-Trace" + "X-Complaints-To" "X-NNTP-Posting-Host" "X-Orig.*" + "Abuse-Reports-To" "Cache-Post-Path" "X-Article-Creation-Date" + "X-Poster" "X-Mail2News-Path" "X-Server-Date" "X-Cache" + "Originator" "X-Problems-To" "X-Auth-User" "X-Post-Time" + "X-Admin" "X-UID" "Resent-[-A-Za-z]+" "X-Mailing-List" + "Precedence" "Original-[-A-Za-z]+" "X-filename" "X-Orcpt" + "Old-Received" "X-Pgp" "X-Auth" "X-From-Line" + "X-Gnus-Article-Number" "X-Majordomo" "X-Url" "X-Sender" + "MBOX-Line" "Priority" "X400-[-A-Za-z]+" + "Status" "X-Gnus-Mail-Source" "Cancel-Lock" + "X-FTN" "X-EXP32-SerialNo" "Encoding" "Importance" + "Autoforwarded" "Original-Encoded-Information-Types" "X-Ya-Pop3" + "X-Face-Version" "X-Vms-To" "X-ML-NAME" "X-ML-COUNT" + "Mailing-List" "X-finfo" "X-md5sum" "X-md5sum-Origin" + "X-Sun-Charset" "X-Accept-Language" "X-Envelope-Sender" + "List-[A-Za-z]+" "X-Listprocessor-Version" + "X-Received" "X-Distribute" "X-Sequence" "X-Juno-Line-Breaks" + "X-Notes-Item" "X-MS-TNEF-Correlator" "x-uunet-gateway" + "X-Received" "Content-length" "X-precedence" + "X-Authenticated-User" "X-Comment" "X-Report" "X-Abuse-Info" + "X-HTTP-Proxy" "X-Mydeja-Info" "X-Copyright" "X-No-Markup" + "X-Abuse-Info" "X-From_" "X-Accept-Language" "Errors-To" + "X-BeenThere" "X-Mailman-Version" "List-Help" "List-Post" + "List-Subscribe" "List-Id" "List-Unsubscribe" "List-Archive" + "X-Content-length" "X-Posting-Agent" "Original-Received" + "X-Request-PGP" "X-Fingerprint" "X-WRIEnvto" "X-WRIEnvfrom" + "X-Virus-Scanned" "X-Delivery-Agent" "Posted-Date" "X-Gateway" + "X-Local-Origin" "X-Local-Destination" "X-UserInfo1" + "X-Received-Date" "X-Hashcash" "Face" "X-DMCA-Notifications" + "X-Abuse-and-DMCA-Info" "X-Postfilter")) "*All headers that start with this regexp will be hidden. This variable can also be a list of regexps of headers to be ignored. If `gnus-visible-headers' is non-nil, this variable will be ignored." diff --git a/lisp/gnus-cite.el b/lisp/gnus-cite.el index ca999e0..aca645a 100644 --- a/lisp/gnus-cite.el +++ b/lisp/gnus-cite.el @@ -668,12 +668,13 @@ See also the documentation for `gnus-article-highlight-citation'." (defun gnus-cite-delete-overlays () (dolist (overlay gnus-cite-overlay-list) - (when (or (not (gnus-overlay-end overlay)) - (and (>= (gnus-overlay-end overlay) (point-min)) - (<= (gnus-overlay-end overlay) (point-max)))) - (setq gnus-cite-overlay-list (delete overlay gnus-cite-overlay-list)) - (ignore-errors - (gnus-delete-overlay overlay))))) + (ignore-errors + (when (or (not (gnus-overlay-end overlay)) + (and (>= (gnus-overlay-end overlay) (point-min)) + (<= (gnus-overlay-end overlay) (point-max)))) + (setq gnus-cite-overlay-list (delete overlay gnus-cite-overlay-list)) + (ignore-errors + (gnus-delete-overlay overlay)))))) (defun gnus-cite-parse-wrapper () ;; Wrap chopped gnus-cite-parse. diff --git a/lisp/gnus-fun.el b/lisp/gnus-fun.el index 53499f3..cdc0506 100644 --- a/lisp/gnus-fun.el +++ b/lisp/gnus-fun.el @@ -79,6 +79,7 @@ Output to the current buffer, replace text, and don't mingle error." (format gnus-convert-image-to-x-face-command (shell-quote-argument file))))) +;;;###autoload (defun gnus-face-from-file (file) "Return an Face header based on an image file." (interactive "fImage file name:" ) diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el index a672c03..cdc0b4f 100644 --- a/lisp/gnus-msg.el +++ b/lisp/gnus-msg.el @@ -282,7 +282,23 @@ See also the `mml-default-encrypt-method' variable." (defcustom gnus-confirm-mail-reply-to-news nil "If non-nil, Gnus requests confirmation when replying to news. This is done because new users often reply by mistake when reading -news." +news. +This can also be a function receiving the group name as the only +parameter which should return non-nil iff a confirmation is needed, or +a regexp, in which case a confirmation is asked for iff the group name +matches the regexp." + :group 'gnus-message + :type '(choice (const :tag "No" nil) + (const :tag "Yes" t) + (regexp :tag "Iff group matches regexp") + (function :tag "Iff function evaluates to non-nil"))) + +(defcustom gnus-confirm-treat-mail-like-news + nil + "If non-nil, Gnus will treat mail like news with regard to confirmation +when replying by mail. See the `gnus-confirm-mail-reply-to-news' variable +for fine-tuning this. +If nil, Gnus will never ask for confirmation if replying to mail." :group 'gnus-message :type 'boolean) @@ -529,15 +545,19 @@ Gcc: header for archiving purposes." (when (not message-use-multi-frames) (message-add-action `(set-window-configuration ,winconf) 'exit 'postpone 'kill)) - (message-add-action - `(when (gnus-buffer-exists-p ,buffer) - (save-excursion - (set-buffer ,buffer) - ,(when article - (if (eq config 'forward) - `(gnus-summary-mark-article-as-forwarded ',yanked) - `(gnus-summary-mark-article-as-replied ',yanked))))) - 'send)) + (let ((to-be-marked (cond + (yanked yanked) + (article (list article)) + (t nil)))) + (message-add-action + `(when (gnus-buffer-exists-p ,buffer) + (save-excursion + (set-buffer ,buffer) + ,(when to-be-marked + (if (eq config 'forward) + `(gnus-summary-mark-article-as-forwarded ',to-be-marked) + `(gnus-summary-mark-article-as-replied ',to-be-marked))))) + 'send))) (put 'gnus-setup-message 'lisp-indent-function 1) (put 'gnus-setup-message 'edebug-form-spec '(form body)) @@ -1178,9 +1198,16 @@ If VERY-WIDE, make a very wide reply." (list (and current-prefix-arg (gnus-summary-work-articles 1)))) ;; Allow user to require confirmation before replying by mail to the - ;; author of a news article. - (when (or (not (gnus-news-group-p gnus-newsgroup-name)) - (not gnus-confirm-mail-reply-to-news) + ;; author of a news article (or mail message). + (when (or + (not (or (gnus-news-group-p gnus-newsgroup-name) + gnus-confirm-treat-mail-like-news)) + (not (cond ((stringp gnus-confirm-mail-reply-to-news) + (string-match gnus-confirm-mail-reply-to-news + gnus-newsgroup-name)) + ((functionp gnus-confirm-mail-reply-to-news) + (funcall gnus-confirm-mail-reply-to-news gnus-newsgroup-name)) + (t gnus-confirm-mail-reply-to-news))) (y-or-n-p "Really reply by mail to article author? ")) (let* ((article (if (listp (car yank)) diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index 7329a7c..ab1b740 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -1848,6 +1848,7 @@ increase the score of each group you read." (gnus-define-keys (gnus-summary-wash-display-map "D" gnus-summary-wash-map) "x" gnus-article-display-x-face + "d" gnus-article-display-face "s" gnus-treat-smiley "D" gnus-article-remove-images "f" gnus-treat-from-picon diff --git a/lisp/gnus-vers.el b/lisp/gnus-vers.el index e321b66..9ee3b06 100644 --- a/lisp/gnus-vers.el +++ b/lisp/gnus-vers.el @@ -40,10 +40,10 @@ ;; Product information of this gnus. (product-provide 'gnus-vers (product-define "T-gnus" nil - (list 6 15 12 + (list 6 15 13 (string-to-number gnus-revision-number)))) -(defconst gnus-original-version-number "0.12" +(defconst gnus-original-version-number "0.13" "Version number for this version of Gnus.") (provide 'running-pterodactyl-gnus-0_73-or-later) diff --git a/lisp/mail-source.el b/lisp/mail-source.el index 4ef4770..fd193b5 100644 --- a/lisp/mail-source.el +++ b/lisp/mail-source.el @@ -55,7 +55,6 @@ (list 'const (car a))) imap-stream-alist))) -;;;###autoload (defcustom mail-sources nil "*Where the mail backends will look for incoming mail. This variable is a list of mail source specifiers. diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el index eef4d16..49b5407 100644 --- a/lisp/mm-decode.el +++ b/lisp/mm-decode.el @@ -958,7 +958,7 @@ external if displayed external." "Return the contents of HANDLE as a string." (mm-with-unibyte-buffer (insert (with-current-buffer (mm-handle-buffer handle) - (mm-with-unibyte-current-buffer-mule4 + (mm-with-unibyte-current-buffer (buffer-string)))) (mm-decode-content-transfer-encoding (mm-handle-encoding handle) diff --git a/lisp/sieve-mode.el b/lisp/sieve-mode.el index d86ea87..944b189 100644 --- a/lisp/sieve-mode.el +++ b/lisp/sieve-mode.el @@ -159,6 +159,7 @@ (defvar sieve-mode-map (let ((map (make-sparse-keymap))) (define-key map "\C-c\C-l" 'sieve-upload) + (define-key map "\C-c\C-c" 'sieve-upload-and-bury) (define-key map "\C-c\C-m" 'sieve-manage) map) "Key map used in sieve mode.") diff --git a/lisp/sieve.el b/lisp/sieve.el index f41fa7c..edfd385 100644 --- a/lisp/sieve.el +++ b/lisp/sieve.el @@ -371,6 +371,12 @@ Server : " server ":" (or port "2000") " (message (concat "Sieve upload done. Use `C-c RET' to manage scripts.")) (message "Sieve upload failed: %s" (nth 2 err))))))) +;;;###autoload +(defun sieve-upload-and-bury (&optional name) + (interactive) + (sieve-upload name) + (bury-buffer)) + (provide 'sieve) ;; sieve.el ends here diff --git a/texi/ChangeLog b/texi/ChangeLog index a96296f..4aeb90d 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,7 @@ +2003-01-12 Lars Magne Ingebrigtsen + + * gnus.texi (Article Display): Addition. + 2003-01-11 Lars Magne Ingebrigtsen * message.texi (Header Commands): Addition. diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index b502cba..c4646f1 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -8571,6 +8571,12 @@ gnus でメールを読むことの有利な点は、単純なバグを素晴らしい不条理に置き @code{X-Face} を @code{From} ヘッダーに表示しま す (@code{gnus-article-display-x-face})。 +@item W D d +@kindex W D d (概略) +@findex gnus-article-display-face +@code{Face} を @code{From} ヘッダーに表示しま +す (@code{gnus-article-display-face})。 + @item W D s @kindex W D s (概略) @findex gnus-treat-smiley @@ -10361,9 +10367,18 @@ Superseding} を参照してください。 @item gnus-confirm-mail-reply-to-news @vindex gnus-confirm-mail-reply-to-news -非-@code{nil}だったら、ニュース記事に返信するときに gnus は確認を求めま -す。メールで返信する気は無いのに時たまぞんざいに R を押してしまう癖があ -るならば、この変数はそんなあなたのためにあります。 +これは、確認が必要である場合に非-@code{nil} を返す、唯一のパラメータとし +てグループ名を受け取る関数であることもできます。あるいは、確認を求めるべ +きグループ名に合致する正規表現です。 + +メールで返信する気は無いのに時たまぞんざいに R を押してしまう癖があるな +らば、この変数はそんなあなたのためにあります。 + +@item gnus-confirm-treat-mail-like-news +@vindex gnus-confirm-treat-mail-like-news +非-@code{nil} だったら、gnus はメールへの返信時に +も @code{gnus-confirm-mail-reply-to-news} に基づいた確認を求めます。これ +はメーリングリストをニューズグループのように扱うのに便利です。 @end table @node Posting Server diff --git a/texi/gnus.texi b/texi/gnus.texi index 984ec79..934ccc1 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -33,7 +33,7 @@ \makeindex \begin{document} -\newcommand{\gnusversionname}{Oort Gnus v0.11} +\newcommand{\gnusversionname}{Oort Gnus v0.12} \newcommand{\gnuschaptername}{} \newcommand{\gnussectionname}{} @@ -8737,6 +8737,12 @@ they'll be removed. Display an @code{X-Face} in the @code{From} header. (@code{gnus-article-display-x-face}). +@item W D d +@kindex W D d (Summary) +@findex gnus-article-display-face +Display a @code{Face} in the @code{From} header. +(@code{gnus-article-display-face}). + @item W D s @kindex W D s (Summary) @findex gnus-treat-smiley @@ -10898,10 +10904,20 @@ that have none when you do a @kbd{a}. @item gnus-confirm-mail-reply-to-news @vindex gnus-confirm-mail-reply-to-news -If non-@code{nil}, Gnus requests confirmation when replying to news. +This can also be a function receiving the group name as the only +parameter which should return non-@code{nil} if a confirmation is +needed, or a regular expression matching group names, where +confirmation is should be asked for. + If you find yourself never wanting to reply to mail, but occasionally press R anyway, this variable might be for you. +@item gnus-confirm-treat-mail-like-news +@vindex gnus-confirm-treat-mail-like-news +If non-@code{nil}, Gnus also requests confirmation according to +@code{gnus-confirm-mail-reply-to-news} when replying to mail. This is +useful for treating mailing lists like newsgroups. + @end table -- 1.7.10.4