From: yamaoka Date: Mon, 3 Jul 2000 02:08:29 +0000 (+0000) Subject: T-gnus 6.14.5. X-Git-Tag: t-gnus-6_14_5-00 X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=624157b206b9697e8fb7c91105df5a657dc687a5;p=elisp%2Fgnus.git- T-gnus 6.14.5. Sync up with Gnus v5.8.7. --- diff --git a/ChangeLog b/ChangeLog index 9894084..31a3e6b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,25 @@ +2000-07-03 Katsumi Yamaoka + + * lisp/gnus-vers.el (T-gnus): Update to 6.14.5. + (gnus-revision-number): Clear to 00. + + * README.T-gnus: Update. + + * lisp/{webmail.el,rfc2047.el,qp.el,pop3.el,nnwarchive.el, + nnsoup.el,nnslashdot.el,nnml.el,nnmh.el,nnmbox.el,nnmail.el, + nnimap.el,nnheader.el,nnfolder.el,nndraft.el,nndoc.el,mml.el, + mm-view.el,mm-uu.el,mm-util.el,mm-decode.el,mm-bodies.el, + message.el,mail-source.el,lpath.el,imap.el,gnus.el,gnus-uu.el, + gnus-util.el,gnus-topic.el,gnus-sum.el,gnus-start.el,gnus-srvr.el, + gnus-soup.el,gnus-score.el,gnus-msg.el,gnus-mailcap.el, + gnus-group.el,gnus-ems.el,gnus-demon.el,gnus-cus.el,gnus-art.el, + gnus-agent.el,ChangeLog}: Sync up with Gnus v5.8.7. + + * texi/{message.texi,gnus.texi,gnus-ja.texi,ChangeLog}: Sync up + with Gnus v5.8.7. + + * contrib/rfc2015.el: New file. + 2000-06-27 Katsumi Yamaoka * lisp/gnus-vers.el (gnus-revision-number): Increment to 04. @@ -14,6 +36,7 @@ * lisp/gnus.el (gnus-news-group-p): Sync with Gnus. (gnus-select-method): Remove "*" from doc string. + (gnus-group-startup-message): Use `dino' colors. 2000-06-08 Katsumi Yamaoka @@ -32,6 +55,33 @@ * lisp/message.el (message-save-drafts): Rewrite. + * lisp/nnheader.el (nnheader-text-coding-system-for-write, + nnheader-text-coding-system): New variables, substitutes for + `mm-text-coding-system-for-write' or `mm-text-coding-system'. + + * lisp/nnmbox.el (nnmbox-active-file-coding-system, + nnmbox-file-coding-system): Use `nnheader-text-coding-system'. + * lisp/nnmail.el (nnmail-incoming-coding-system): Ditto. + * lisp/nnfolder.el (nnfolder-file-coding-system): Ditto. + (nnfolder-active-file-coding-system): Ditto. + + * lisp/mail-source.el (mail-source-text-coding-system): Remove. + (TopLevel): require `nnheader'. + + * lisp/nndraft.el (nndraft-request-article): Bind coding system to + `nnheader-text-coding-system'. + (nndraft-request-replace-article): Ditto. + * lisp/mail-source.el (mail-source-fetch-maildir): Ditto. + * lisp/gnus-uu.el (gnus-uu-save-article): Ditto. + * lisp/gnus-util.el (gnus-output-to-mail, gnus-output-to-rmail): + Ditto. + * lisp/gnus-soup.el (gnus-soup-write-prefixes): Ditto. + + * lisp/gnus-util.el (gnus-write-buffer): Bind + `file-name-coding-system' to `nnmail-pathname-coding-system'. + * lisp/gnus-start.el (gnus-slave-save-newsrc): Bind coding system + to `gnus-startup-file-coding-system'. + 2000-06-06 Katsumi Yamaoka * lisp/gnus-vers.el (gnus-revision-number): Increment to 03. @@ -74,7 +124,7 @@ 2000-05-25 Tanaka Akira - * README.semi, README.semi.ja: Update for CVS via SSH. + * README.semi, README.semi.ja: Update for CVS via SSH. 2000-05-25 Katsumi Yamaoka @@ -169,6 +219,15 @@ 2000-05-17 Katsumi Yamaoka + * lisp/nndraft.el (nndraft-request-replace-article): Replace + `mm-text-coding-system' with `mail-source-text-coding-system'; + Replace `mm-auto-save-coding-system' with + `message-draft-coding-system'. + + * lisp/mail-source.el (mail-source-fetch-maildir): Replace + `mm-text-coding-system' with `mail-source-text-coding-system'. + (mail-source-text-coding-system): New variable. + * lisp/dgnushack.el (dgnushack-texi-format): Use `output-coding-system' instead of `coding-system-for-write' when old Mule is used. diff --git a/README.T-gnus b/README.T-gnus index d3f17c9..d7a41fb 100644 --- a/README.T-gnus +++ b/README.T-gnus @@ -33,6 +33,6 @@ NEWS: * T-gnus 6.14 - this is based on Pterodactyl Gnus. - The latest T-gnus is T-gnus 6.14.4 (Based on Gnus 5.8.6). It requires + The latest T-gnus is T-gnus 6.14.5 (Based on Gnus 5.8.7). It requires SEMI/WEMI (1.13.5 or later), FLIM (1.13.1 or later), and APEL (10.0 or later). diff --git a/contrib/rfc2015.el b/contrib/rfc2015.el new file mode 100644 index 0000000..065d07d --- /dev/null +++ b/contrib/rfc2015.el @@ -0,0 +1,183 @@ +;;; rfc2015.el --- MIME Security with Pretty Good Privacy (PGP) +;; Copyright (c) 2000 Free Software Foundation, Inc. + +;; Author: Shenghuo Zhu +;; Keywords: PGP MIME + +;; This file is a part of GNU Emacs. + +;; GNU Emacs is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published +;; by the Free Software Foundation; either version 2, or (at your +;; option) any later version. + +;; GNU Emacs is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, +;; Boston, MA 02111-1307, USA. + +;;; Commentary: + +;; Usage: +;; (rfc2015-setup) +;; +;; Insert an attribute, postprocess=pgp-sign (or pgp-encrypt), into +;; the mml tag to be signed (or encrypted). + +;;; Code: + +(defvar rfc2015-decrypt-function 'mailcrypt-decrypt) +(defvar rfc2015-verify-function 'mailcrypt-verify) + +(defun rfc2015-decrypt (handle) + (let (child) + (cond + ((setq child (mm-find-part-by-type (cdr handle) + "application/octet-stream")) + (let (handles result) + (with-temp-buffer + (mm-insert-part child) + (setq result (funcall rfc2015-decrypt-function)) + (unless (car result) + (error "Decrypting error.")) + (setq handles (mm-dissect-buffer t))) + (setq gnus-article-mime-handles + (append (if (listp (car gnus-article-mime-handles)) + gnus-article-mime-handles + (list gnus-article-mime-handles)) + (if (listp (car handles)) + handles + (list handles)))) + (gnus-mime-display-part handles))) + (t + (if (y-or-n-p "Corrupted pgp-encrypted part. Abort?" ) + (error "Corrupted pgp-encrypted part.") + (gnus-mime-display-mixed (cdr handle))))))) + +;; FIXME: mm-dissect-buffer loses information of micalg and the +;; original header of signed part. + +(defun rfc2015-verify (handle) + (if (y-or-n-p "Verify signed part?" ) + (let (child result hash) + (with-temp-buffer + (unless (setq child (mm-find-part-by-type + (cdr handle) "application/pgp-signature" t)) + (error "Corrupted pgp-signature part.")) + (insert "-----BEGIN PGP SIGNED MESSAGE-----\n") + (insert (format "Hash: %s\n\n" (read-string "Hash: " "SHA1"))) + (mm-insert-part child) + (goto-char (point-max)) + (unless (bolp) + (insert "\n")) + (unless (setq child (mm-find-part-by-type + (cdr handle) "application/pgp-signature")) + (error "Corrupted pgp-signature part.")) + (mm-insert-part child) + (setq result (funcall rfc2015-verify-function)) + (unless result + (error "Verify error."))))) + (gnus-mime-display-part + (mm-find-part-by-type + (cdr handle) "application/pgp-signature" t))) + +(defvar rfc2015-mailcrypt-prefix 0) + +(defun rfc2015-mailcrypt-sign (cont) + (mailcrypt-sign rfc2015-mailcrypt-prefix) + (let ((boundary + (funcall mml-boundary-function (incf mml-multipart-number))) + (scheme-alist (funcall (or mc-default-scheme + (cdr (car mc-schemes))))) + hash) + (goto-char (point-min)) + (unless (re-search-forward (cdr (assq 'signed-begin-line scheme-alist))) + (error "Cannot find signed begin line." )) + (goto-char (match-beginning 0)) + (forward-line 1) + (unless (looking-at "Hash:[ \t]*\\([a-zA-Z0-9]+\\)") + (error "Cannot not find PGP hash." )) + (setq hash (match-string 1)) + (unless (re-search-forward "^$" nil t) + (error "Cannot not find PGP message." )) + (forward-line 1) + (delete-region (point-min) (point)) + (insert (format "Content-Type: multipart/signed; boundary=\"%s\";\n" + boundary)) + (insert (format "\tmicalg=pgp-%s; protocol=\"application/pgp-signature\"\n" + hash)) + (insert "\n") + (insert (format "--%s\n" boundary)) + (unless (re-search-forward (cdr (assq 'signed-end-line scheme-alist))) + (error "Cannot find signature part." )) + (goto-char (match-beginning 0)) + (unless (re-search-backward "^-+BEGIN" nil t) + (error "Cannot find signature part." )) + (goto-char (match-beginning 0)) + (insert (format "--%s\n" boundary)) + (insert "Content-Type: application/pgp-signature\n\n") + (goto-char (point-max)) + (insert (format "--%s--\n" boundary)) + (goto-char (point-max)))) + +(defun rfc2015-mailcrypt-encrypt (cont) + ;; FIXME: + ;; You have to input the receiptant. + (mailcrypt-encrypt rfc2015-mailcrypt-prefix) + (let ((boundary + (funcall mml-boundary-function (incf mml-multipart-number)))) + (goto-char (point-min)) + (insert (format "Content-Type: multipart/encrypted; boundary=\"%s\";\n" + boundary)) + (insert "\tprotocol=\"application/pgp-encrypted\"\n\n") + (insert (format "--%s\n" boundary)) + (insert "Content-Type: application/pgp-encrypted\n\n") + (insert "Version: 1\n\n") + (insert (format "--%s\n" boundary)) + (insert "Content-Type: application/octet-stream\n\n") + (goto-char (point-max)) + (insert (format "--%s--\n" boundary)) + (goto-char (point-max)))) + +;; The following code might be moved into mml.el or gnus-art.el. + +(defvar mml-postprocess-alist + '(("pgp-sign" . rfc2015-mailcrypt-sign) + ("pgp-encrypt" . rfc2015-mailcrypt-encrypt)) + "Alist of postprocess functions.") + +(defun mml-postprocess (cont) + (let ((pp (cdr (or (assq 'postprocess cont) + (assq 'pp cont)))) + item) + (if (and pp (setq item (assoc pp mml-postprocess-alist))) + (funcall (cdr item) cont)))) + +(defun rfc2015-setup () + (setq mml-generate-mime-postprocess-function 'mml-postprocess) +; (push '("multipart/signed" . rfc2015-verify) +; gnus-mime-multipart-functions) + (push '("multipart/encrypted" . rfc2015-decrypt) + gnus-mime-multipart-functions)) + +;; The following code might be moved into mm-decode.el. + +(defun mm-find-part-by-type (handles type &optional notp) + (let (handle) + (while handles + (if (if notp + (not (equal (mm-handle-media-type (car handles)) type)) + (equal (mm-handle-media-type (car handles)) type)) + (setq handle (car handles) + handles nil)) + (setq handles (cdr handles))) + handle)) + +(provide 'rfc2015) + +;;; rfc2015.el ends here diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 43754b3..27e082d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,7 +1,621 @@ +Sun Jul 2 15:11:35 2000 Lars Magne Ingebrigtsen + + * gnus.el: Gnus v5.8.7 is released. + +2000-05-19 06:32:52 Lars Magne Ingebrigtsen + + * mm-decode.el (mm-insert-part): Characters doubly decoded. + +2000-07-01 10:23:08 Shenghuo ZHU + + * message.el (message-do-fcc): Encode MIME. + +2000-06-28 13:52:57 Shenghuo ZHU + + * lpath.el: Fbind image-size. + +2000-06-28 Simon Josefsson + + * nnimap.el (nnimap-split-rule): Update doc with extended syntax. + (nnimap-assoc-match): New function. + (nnimap-split-find-rule): Support extended syntax. + +2000-06-28 Simon Josefsson + + * nnimap.el (nnimap-open-connection): Use port stuff. + + * gnus-util.el (gnus-netrc-machine): Add defaultport parameter, + document port and defaultport. + +2000-06-27 Paul Stodghill + + * gnus-agent.el (gnus-agent-synchronize): Kill flags buffer. + +2000-06-26 Dave Love + + * mm-decode.el (mm-image-fit-p): Use `image-size' in Emacs. + + * message.el: Remove unnecessary `require'ments. Defvar + gnus-list-identifiers when compiling. Don't try to autoload + variable `gnus-list-identifiers'. Autoload + gnus-group-name-charset. + (message-fetch-field): Don't assume `format' removes text + properties. + (message-strip-list-identifiers, message-reply, message-followup): + Require gnus-sum. + (message-mode): Tidy XEmacs conditionals. + (message-replace-chars-in-string): Use subst-char-in-string when + available. + + * gnus-xmas.el (gnus-xmas-define) : + Define if necessary. + + * gnus-art.el (gnus-article-edit-exit): Don't assume `format' + removes text properties. + + * gnus-srvr.el (gnus-browse-group-name): Likewise. + + * gnus-msg.el (gnus-copy-article-buffer): Likewise. + + * gnus-score.el (gnus-summary-score-entry): Likewise. + +2000-06-26 11:18:57 Katsumi Yamaoka + + * nnimap.el (nnimap-request-post): Fix parenthesis. + +2000-06-26 Paul Stodghill + + * message.el (message-unquote-tokens): New function. + + * gnus-msg.el (gnus-inews-do-gcc): Unquote gcc tokens. + + * nnimap.el (nnimap-request-post): Ditto. + +2000-06-21 Simon Josefsson + + * gnus.el (gnus-asynchronous): Removed (defined in gnus-async.el). + + * nnimap.el (nnimap-callback): Update for IMAP4rev1 servers (see + patch commited 2000-04-02). + +2000-06-20 Simon Josefsson + + * imap.el (imap-mailbox-examine-1): New function. + (imap-message-copyuid-1): + (imap-message-appenduid-1): Use it, instead of + `imap-mailbox-examine' which would utf-7 encode mailbox name + twice. + +2000-06-19 Dave Love + + * mm-uu.el Don't require message. Require cl when compiling. + +2000-06-17 18:58:46 Shenghuo ZHU + + * gnus-sum.el (gnus-summary-local-variables): gnus-orphan-score is + a local variable. + * gnus-sum.el (gnus-orphan-score): Move here. + +2000-06-10 09:33:36 Shenghuo ZHU + + * message.el (message-forward): Remove show-mml condition. + (message-forward-ignored-headers): Remove X-Gnus headers. + +2000-06-08 Simon Josefsson + + * gnus-cus.el (gnus-extra-group-parameters): Add uidvalidity. + +2000-06-08 12:34:26 Urban Engberg + + * gnus-demon.el (gnus-demon-scan-mail): Bind nnmail-fetched-sources. + +2000-06-08 12:27:55 Shenghuo ZHU + + * message.el (message-syntax-checks): Add type. + +2000-06-07 Dave Love + + * mm-view.el (mm-inline-image-emacs): Don't specify string for + put-image. + (mm-inline-image): Defalias, not fset. + + * gnus.el (gnus-group-startup-message): Don't specify string for + insert-image. + + * gnus-ems.el (gnus-add-minor-mode): Make it an alias if + add-minor-mode is available. + (gnus-article-display-xface): Don't specify string for + insert-image. + +2000-06-06 13:28:53 Shenghuo ZHU + + * gnus-topic.el (gnus-topic-remove-topic): Set hidden. + (gnus-topic-insert-topic-line): Use shownp. + (gnus-topic-hide-topic): Don't use hidden. + (gnus-topic-show-topic): Don't use hidden. + +2000-06-05 22:25:12 Shenghuo ZHU + + * gnus-cache.el (gnus-cache-possibly-enter-article): Bind coding + system. + * gnus-soup.el (gnus-soup-write-prefixes): Ditto. + * gnus-start.el (gnus-slave-save-newsrc): Ditto. + * gnus-util.el (gnus-output-to-rmail): Ditto. + (gnus-output-to-mail): Ditto. + (gnus-write-buffer): Ditto. + * gnus-uu.el (gnus-uu-save-article): Ditto. + +2000-06-04 15:05:16 Shenghuo ZHU + + * message.el (message-read-from-minibuffer): Typo. + +2000-06-03 13:36:46 Shenghuo ZHU + + * gnus-art.el (article-decode-charset): Override non-MIME forward + charset. + +2000-06-02 12:04:26 Shenghuo ZHU + + * mml.el (mml-quote-region): Correct the regexp. + * gnus-msg.el (gnus-summary-reply): mml-quote it. + +2000-06-02 11:57:15 Shenghuo ZHU + + * message.el (message-forward): Insert raw text. + * mml.el (mml-parse-1): Get raw text in unibyte mode. + (mml-generate-mime-1): Insert raw text in unibyte mode. + +2000-06-01 Florian Weimer + + * mm-bodies.el (mm-body-encoding): Always encoded if + `mm-use-ultra-safe-encoding' is set. + +2000-05-31 14:50:52 Shenghuo ZHU + + * mml.el (ange-ftp-name-format): Typo. + +2000-05-30 Simon Josefsson + + * gnus-start.el (gnus-get-unread-articles): If + `gnus-activate-group' and/or `gnus-check-server' return nil, don't + try to do anything on that server. + +2000-05-25 Simon Josefsson + + * gnus-group.el (gnus-group-nnimap-edit-acl): Help text updated + from latest draft. + +2000-05-08 Simon Josefsson + + * gnus-group.el (gnus-group-expire-articles-1): Make sure server + is open. + +2000-05-24 Dave Love + + * mml.el (mml-parse-file-name): Fix ange-ftp part. + +2000-05-22 Didier Verna + + * gnus.el (gnus-redefine-select-method-widget): new function, call + it once. Add an "other" entry for unknown but editable backend + name symbols. + * gnus-start.el (gnus-declare-backend): use it. + +2000-05-19 Dave Love + + * gnus-art.el (gnus-article-next-page): Revert last change. + +2000-05-19 09:56:07 Shenghuo ZHU + + * gnus-agent.el (gnus-agent-open-history): Open history in binary mode. + +2000-05-19 Dave Love + + * gnus-art.el (gnus-mime-externalize-part): Bind mm-inlined-types, + not mm-inline-large-images. + +2000-05-19 01:45:40 Shenghuo ZHU + + * mml.el (mml-parse-1): Don't test multiple-charsets within mml tag. + +2000-05-18 Dave Love + + * gnus-art.el: Use defalias, not fset. + (gnus-article-x-face-command): Don't test for xbm. + (gnus-article-next-page): Redisplay before testing point in window. + +2000-05-17 21:16:54 Shenghuo ZHU + + * gnus-group.el (gnus-group-mode-map): Add M-SPACE. + * mml.el (mml-mode-map): Comment out mml-narrow-to-part. + +2000-05-17 21:13:38 Jim Davidson + + * gnus-sum.el (gnus-summary-save-article-rmail): Use + gnus-summary-save-in-rmail. + * message.el (message-output): Ditto. + +2000-05-17 22:37:25 Katsumi Yamaoka + + * gnus-art.el (gnus-emphasize-whitespace-regexp): Doc fix. + +2000-05-17 14:03:49 Shenghuo ZHU + + * rfc2047.el (rfc2047-encode-message-header): Encode if the method + is a charset. + * message.el (message-send-news): Check group name charset. + * gnus-msg.el (gnus-post-news): Decode group name. + (gnus-inews-do-gcc): Encode group name. + +2000-05-17 10:16:32 Karl Kleinpaste + + * gnus-art.el (gnus-emphasize-whitespace-regexp): New variable. + * gnus-util.el (gnus-put-text-property-excluding-newlines): Use it. + +2000-05-17 02:25:11 Shenghuo ZHU + + * gnus-group.el (gnus-group-mark-line-p): New function. + (gnus-group-goto-group): New parameter. + (gnus-group-remove-mark): Use it. + * gnus-topic.el (gnus-topic-move-group): Ditto. + (gnus-topic-remove-group): Ditto. + +2000-05-17 00:49:09 Shenghuo ZHU + + * gnus-group.el (gnus-group-list-dormant): New function. + +2000-05-16 23:20:42 Shenghuo ZHU + + * gnus-agent.el (gnus-agent-synchronize): Use + nnheader-insert-file-contents. + (gnus-agent-save-active-1): Ditto. + (gnus-agent-write-active): Ditto. + (gnus-agent-expire): Ditto. + * gnus-cache.el (gnus-cache-read-active): Ditto. + * gnus-start.el (gnus-master-read-slave-newsrc): Ditto. + * gnus-sum.el (gnus-summary-import-article): Ditto. + + * gnus-agent.el (gnus-agent-write-servers): Bind coding-system. + (gnus-agent-save-group-info): Ditto. + (gnus-agent-save-alist): Ditto. + * gnus-util.el (gnus-make-directory): Ditto. + + * gnus-agent.el (gnus-agent-save-group-info): Disable multibyte. + +2000-05-16 21:13:24 Shenghuo ZHU + + * mml.el (mml-generate-mime-preprocess-function): New variable. + (mml-generate-mime-postprocess-function): New variable. + (mml-generate-mime-1): Use them. + +2000-05-16 18:15:24 Shenghuo ZHU + + * gnus-group.el (gnus-group-apropos): Group name charset. + * gnus-sum.el (gnus-set-mode-line): Ditto. + * gnus-group.el (gnus-group-decoded-name): New function. + (gnus-group-edit-group): Use it. + * gnus-cus.el (gnus-group-customize): Use it. + +2000-05-16 17:55:57 Karl Kleinpaste + + * gnus-util.el (gnus-put-text-property-excluding-newlines): Improve. + +2000-05-16 16:22:17 Shenghuo ZHU + + * gnus-group.el (gnus-group-name-charset-method-alist): New variable. + (gnus-group-name-charset-group-alist): Ditto. + (gnus-group-name-charset): New function. + (gnus-group-name-decode): New function. + (gnus-group-insert-group-line): Use them. + (gnus-group-prepare-flat-list-dead): Ditto. + (gnus-group-list-active): Ditto. + (gnus-group-describe-all-groups): Ditto. + (gnus-group-prepare-flat-list-dead-predicate): Ditto. + * gnus-srvr.el: (gnus-browse-foreign-server): Decode group name and + add gnus-group property. + (gnus-browse-group-name): Read gnus-group property. + +2000-05-16 15:27:08 Shenghuo ZHU + + * nnfolder.el (nnfolder-possibly-change-group): Use + file-name-coding-system instead of pathname-coding-system. + * nnmail.el (nnmail-find-file): Ditto. + (nnmail-write-region): Ditto. + * nnmh.el (nnmh-retrieve-headers): Ditto. + (nnmh-request-article): Ditto. + (nnmh-request-group): Ditto. + (nnmh-request-list): Ditto. + (nnmh-possibly-change-directory): Ditto. + (nnmh-active-number): Ditto. + * nnml.el (nnml-possibly-change-directory): Ditto. + (nnml-request-list): Ditto. + (nnml-request-article): Ditto. + (nnml-retrieve-headers): Ditto. + +2000-05-16 Simon Josefsson + + * nnimap.el (nnimap-request-accept-article): Don't unselect + mailbox if no mailbox is selected. + +2000-05-15 Per Abrahamsen + + * gnus-art.el (gnus-button-url-regexp): Revert earlier change. + Recognize domain names starting with `www.' as starting an URL. + +2000-05-15 09:46:47 Shenghuo ZHU + + * mail-source.el (mail-source-fetch-maildir): Insert "From ". + (mail-source-keyword-map): Add "subdirs" for maildir. + +2000-05-14 16:19:28 Shenghuo ZHU + + * nnmail.el (nnmail-scan-directory-mail-source-once): New variable. + (nnmail-get-new-mail): Use it. + * gnus-start.el (gnus-get-unread-articles): Ditto. + +2000-05-14 14:02:12 Shenghuo ZHU + + * gnus-sum.el (gnus-summary-edit-article): Better support for + nndraft:drafts. + * nndraft.el (nndraft-request-replace-article): New function, + bind nnmail-file-coding-system. + +2000-05-14 Dave Love + + * nnheader.el: Replace uses of `fset' with `defalias'. + (jka-compr-compression-info-list): Only defvar when compiling. + +2000-05-14 12:30:28 Shenghuo ZHU + + * webmail.el (webmail-netaddress-article): Refresh redirect. + +2000-05-13 20:41:10 Shenghuo ZHU + + * mm-view.el (mm-inline-text): w3 might not recognize utf-8. + +2000-05-13 16:49:41 Shenghuo ZHU + + * webmail.el: Translate   to SP. + +2000-05-13 13:00:17 Robin S. Socha + + * message.el (message-bounce): Doc typo. + +2000-05-13 12:25:21 Shenghuo ZHU + + * gnus-soup.el (gnus-soup-encoding-type): u is USENET news format. + (gnus-soup-store): Ditto. + (gnus-soup-send-packet): Ditto. + * nnsoup.el (nnsoup-replies-format-type): Ditto. + (nnsoup-dissect-buffer): Ditto. + (nnsoup-narrow-to-article): Ditto. + (nnsoup-make-active): Ditto + +2000-05-13 12:03:29 Shenghuo ZHU + + * message.el (message-mode): Two parameters for local-variable-p. + +2000-05-13 00:54:46 Shenghuo ZHU + + * message.el (message-strip-list-identifiers): New function. + (message-reply): Use it and use message-strip-subject-re. + (message-followup): Ditto. + * gnus-art.el (article-hide-list-identifiers): Remove more. + * gnus-sum.el (gnus-summary-remove-list-identifiers): Ditto. + +2000-05-12 22:28:54 Shenghuo ZHU + + * gnus-uu.el (gnus-uu-digest-mail-forward): Bind + mail-parset-charset and use non-numeric argument. + +2000-05-12 20:54:11 Shenghuo ZHU + + * mml.el (mml-buffer-list): New variable. + (mml-generate-new-buffer): New function. + (mml-destroy-buffers): Ditto. + (mml-insert-mime): Use them. + * gnus-msg.el (gnus-setup-message): mml-buffer leaks. + * gnus-sum.el (gnus-summary-edit-article): Ditto. + * message.el (message-mode): Ditto. + * gnus-uu.el (gnus-uu-digest-headers): Keep MIME headers. + (gnus-uu-save-article): Support show-as-mml. + * message.el (message-forward): Ditto. + +2000-05-12 15:15:55 Shenghuo ZHU + + * nndoc.el (nndoc-type-alist): mime-digest head-begin. + (nndoc-mime-digest-type-p): Locate article head precisely. + * mml.el (mml-generate-default-type): New variable. + (mml-generate-mime-1): Use it. + (mml-insert-mime-headers): Use it. + * gnus-uu.el (gnus-uu-digest-buffer): New variable. + (gnus-uu-digest-mail-forward): Use it and call message-forward + with argument digest. + (gnus-uu-save-article): Support message-forward-as-mime. + * message.el (message-forward): Add parameter digest. + * mm-decode.el (mm-dissect-default-type): New variable. + (mm-dissect-buffer): Use it. + +2000-05-11 11:08:03 Shenghuo ZHU + + * mml.el (mml-parse-singlepart-with-multiple-charsets): Set space, + newline and paragraph to nil when got a non-ascii character. Test + paragraph before newline. + +2000-05-10 12:17:58 Shenghuo ZHU + + * qp.el (quoted-printable-encode-region): Bind tab-width to 1. Set + limit to 76. + +2000-05-10 09:11:48 Lars Magne Ingebrigtsen + + * nnslashdot.el (nnslashdot-sid-strip): New function. + (nnslashdot-threaded-retrieve-headers): New format. + (nnslashdot-sane-retrieve-headers): Ditto. + (nnslashdot-request-article): Ditto. + (nnslashdot-threaded-retrieve-headers): Thread properly. + (nnslashdot-request-article): Be more lenient. + (nnslashdot-threaded-retrieve-headers): Regexp search. + +2000-05-09 13:23:50 Shenghuo ZHU + + * gnus-sum.el (gnus-with-article): Define it before use it. + +2000-05-08 22:34:19 Shenghuo ZHU + + * message.el (message-supersede): Use mime-to-mml. + * mm-decode.el (mm-insert-part): Test the buffer if no encoding. + +2000-05-08 22:34:24 Katsumi Yamaoka + + * gnus-group.el (gnus-group-list-cached): Don't use + `subst-char-in-string'. + +2000-05-08 Dave Love + + * pop3.el (pop3-open-server): Fix creating name of trace buffer. + +2000-05-08 01:07:47 Shenghuo ZHU + + * mm-decode.el (mm-interactively-view-part): Append %s if the + method is a single word. + * nnwarchive.el (nnwarchive-type-definition): Typo. + +2000-05-07 17:24:01 Shenghuo ZHU + + * gnus-group.el (gnus-group-prepare-flat-list-dead-predicate): New + function. + (gnus-group-prepare-flat-predicate): Use it. + (gnus-group-list-cached): List dead groups. + +2000-05-07 10:50:02 Shenghuo ZHU + + * gnus-art.el (article-decode-charset): Don't decode message with + format. + +2000-05-07 Florian Weimer + + * mailcap.el (mailcap-maybe-eval): Honor user request not to + evaluate the Lisp code. + +2000-05-06 17:40:20 Shenghuo ZHU + + * gnus-art.el (article-wash-html): New function. + (gnus-article-wash-html): Bind. + (gnus-article-make-menu-bar): Menu item. + * gnus-sum.el (gnus-summary-wash-map): Bind 'h'. + (gnus-summary-make-menu-bar): Menu item. + * gnus.el: Autoload. + +2000-05-06 Florian Weimer + + * gnus-uu.el (gnus-uu-unshar-warning): New variable. + (gnus-uu-unshar-article): Use it. + + * mailcap.el (mailcap-maybe-eval-warning): New variable. + (mailcap-maybe-eval): Use it. + + * gnus-msg.el (gnus-group-posting-charset-alist): Speling mistake + in docstring. + + * mml.el (mml-generate-mime-1): Small comment. + +2000-05-05 12:27:53 Shenghuo ZHU + + * gnus-art.el (article-de-base64-unreadable): New function. + (gnus-article-de-base64-unreadable): Bind. + (gnus-article-make-menu-bar): Menu item. + * gnus-sum.el (gnus-summary-wash-map): Bind '6' and 'Z'. + (gnus-summary-make-menu-bar): Menu item. + * gnus.el: Autoload. + +2000-05-05 10:32:27 Shenghuo ZHU + + * gnus-sum.el (gnus-summary-show-article): Remove en/disable multibyte. + (gnus-summary-select-article): Add en/disable multibyte. + +2000-05-05 02:47:23 Shenghuo ZHU + + * gnus-sum.el (gnus-summary-edit-article): Enable multibyte. + (gnus-summary-edit-article): New feature: editing raw articles. + +2000-05-05 00:30:12 Shenghuo ZHU + + * rfc2047.el (rfc2047-encode-region): Insert a space before encoding. + Emacs MULE can not encode adjacent iso-2022-jp and cn-gb-2312. + * gnus-msg.el (gnus-summary-mail-forward): Use unibyte buffer. + Emacs MULE can not copy some 8bit characters in multibyte buffers. + * mm-decode.el (mm-insert-part): Ditto. + +2000-05-04 17:49:04 Shenghuo ZHU + + * nndoc.el (nndoc-type-alist): Extend forward regexp. + (nndoc-forward-type-p): Ditto. + +2000-05-04 17:13:04 Shenghuo ZHU + + * mm-util.el (mm-with-unibyte-current-buffer): Set the default + value of enable-multibyte-characters. + +2000-05-04 10:31:24 Shenghuo ZHU + + * gnus-sum.el (gnus-summary-show-article): En/disable multibyte. + +2000-05-03 Dave Love + + * gnus-ems.el (gnus-article-xface-ring-internal) + (gnus-article-xface-ring-size): New variable. + (gnus-article-display-xface): Use them to cache data. Don't try + to use XPM. Set up binary coding for PBM's sake. + +2000-05-03 14:23:38 Shenghuo ZHU + + * gnus-msg.el (gnus-inews-do-gcc): Set mail-parse-charset. + * gnus-int.el (gnus-request-accept-article): Ditto. + (gnus-request-replace-article): Ditto. + * mm-util.el (mm-mime-mule-charset-alist): Add a fake mule-charset. + +2000-05-03 14:11:23 Shenghuo ZHU + + * rfc2047.el (rfc2047-encode): Test the validity of coding-system. + +2000-05-03 11:35:15 Shenghuo ZHU + + * rfc2047.el (rfc2047-encode-message-header): Encode field by + field. + * mml.el (mml-to-mime): Use message-default-charset. + (mml-preview): Narrow to headers. + * message.el (message-send-mail): Use message-default-charset. + (message-send-news): Narrow to headers; + use message-default-charset. + +2000-05-03 08:09:14 Shenghuo ZHU + + * mm-bodies.el (mm-decode-content-transfer-encoding): A better junk + detect. + * mml.el (mml-parse-singlepart-with-multiple-charsets): Save + restriction. + (mml-parse-1): Warning message. + (mml-preview): Disable multibyte. + +2000-05-03 Dave Love + + * gnus.el (gnus-group-startup-message): Add newline before image. + +2000-05-02 21:34:10 Shenghuo ZHU + + * rfc2047.el (rfc2047-encode-message-header): Check the coding-system. + * message.el (message-send-mail): Use unibyte-buffer. + (message-send-mail): Ditto. + Mon May 1 15:09:46 2000 Lars Magne Ingebrigtsen * gnus.el: Gnus v5.8.6 is released. +2000-05-01 07:45:43 Shenghuo ZHU + + * mml.el (mml-parse-1): Set no-markup-p and warn to nil. + 2000-04-28 21:14:21 Shenghuo ZHU * rfc2047.el (rfc2047-q-encoding-alist): Encode HTAB. @@ -23,7 +637,7 @@ Mon May 1 15:09:46 2000 Lars Magne Ingebrigtsen 2000-04-28 14:23:14 Shenghuo ZHU * mml.el (mml-preview): Set gnus-newsgroup-charset. - * rfc2047.el (rfc2047-encode-message-header): Encode non-ascii + * rfc2047.el (rfc2047-encode-message-header): Encode non-ascii as 8-bit. * lpath.el: Fbind image functions. @@ -59,7 +673,7 @@ Mon May 1 15:09:46 2000 Lars Magne Ingebrigtsen 2000-04-27 23:23:37 Shenghuo ZHU - * nndoc.el (nndoc-type-alist): Change forward regexp. + * nndoc.el (nndoc-type-alist): Change forward regexp. 2000-04-27 21:57:10 Shenghuo ZHU @@ -105,7 +719,7 @@ Mon May 1 15:09:46 2000 Lars Magne Ingebrigtsen * message.el (message-send-mail-partially-limit): New variable. (message-send-mail-partially): New function. (message-send-mail): Use it. - * mm-bodies.el (mm-decode-content-transfer-encoding): Remove + * mm-bodies.el (mm-decode-content-transfer-encoding): Remove all blank lines inside of base64. * mm-partial.el (mm-inline-partial): Add an option. Remove tail blank lines. @@ -137,7 +751,7 @@ Mon May 1 15:09:46 2000 Lars Magne Ingebrigtsen 2000-04-24 00:56:00 Björn Torkelsson * rfc2047.el (rfc2047-encode-message-header): Fixing typo. - + 2000-04-26 12:27:41 Shenghuo ZHU * gnus-draft.el (gnus-draft-send): Move gnus-draft-setup inside of @@ -219,14 +833,14 @@ Mon Apr 24 21:12:06 2000 Lars Magne Ingebrigtsen 2000-04-23 23:27:25 Shenghuo ZHU - * mm-view.el (mm-inline-message): Disable prepare-hook. + * mm-view.el (mm-inline-message): Disable prepare-hook. 2000-04-23 00:32:32 Lars Magne Ingebrigtsen * gnus.el: Fix copyright statements. * gnus-sum.el (gnus-alter-articles-to-read-function): New - variable. + variable. (gnus-articles-to-read): Use it. * message.el (message-get-reply-headers): Bind free variable. @@ -254,7 +868,7 @@ Mon Apr 24 21:12:06 2000 Lars Magne Ingebrigtsen 2000-04-22 14:25:05 Lars Magne Ingebrigtsen * nnweb.el (nnweb-dejanews-create-mapping): Remove the context - string. + string. (nnweb-request-group): Don't scan twice. (nnweb-request-scan): Don't nix out the hashtb. @@ -263,7 +877,7 @@ Mon Apr 24 21:12:06 2000 Lars Magne Ingebrigtsen 2000-04-22 14:12:41 David Aspinwall * gnus-art.el (gnus-button-url-regexp): New value to match naked - urls. + urls. 2000-04-22 01:23:59 Lars Magne Ingebrigtsen @@ -292,7 +906,7 @@ Mon Apr 24 21:12:06 2000 Lars Magne Ingebrigtsen 2000-03-01 Simon Josefsson - * gnus-sum.el (gnus-read-move-group-name): + * gnus-sum.el (gnus-read-move-group-name): (gnus-summary-move-article): Use `gnus-group-method' to find out what method the manually entered group belong to. `gnus-group-name-to-method' doesn't return any method parameters @@ -302,7 +916,7 @@ Mon Apr 24 21:12:06 2000 Lars Magne Ingebrigtsen 2000-04-21 22:27:15 Lars Magne Ingebrigtsen * gnus-msg.el (gnus-configure-posting-styles): Allow nil values to - override. + override. 2000-04-21 21:58:20 Kai Großjohann @@ -316,7 +930,7 @@ Mon Apr 24 21:12:06 2000 Lars Magne Ingebrigtsen 2000-04-21 21:20:32 Mike Fabian - * gnus-group.el (gnus-group-catchup-current): Doc fix. + * gnus-group.el (gnus-group-catchup-current): Doc fix. 2000-04-21 20:36:21 Lars Magne Ingebrigtsen @@ -329,7 +943,7 @@ Mon Apr 24 21:12:06 2000 Lars Magne Ingebrigtsen * gnus-xmas.el (gnus-group-add-icon): Moved here. * gnus-group.el (gnus-group-glyph-directory): Don't depend on - xmas. + xmas. (gnus-group-glyph-directory): Removed. 2000-04-21 20:26:23 Jaap-Henk Hoepman @@ -359,13 +973,13 @@ Mon Apr 24 21:12:06 2000 Lars Magne Ingebrigtsen 2000-04-21 18:20:10 Lars Magne Ingebrigtsen * mailcap.el (mailcap-mime-info): Use the first match; not the - last. + last. * gnus-agent.el (gnus-category-kill): Save the category list. 2000-04-21 16:41:50 Chris Brierley - * gnus-sum.el (gnus-summary-move-article): Do something or other. + * gnus-sum.el (gnus-summary-move-article): Do something or other. 2000-04-21 16:07:07 Lars Magne Ingebrigtsen @@ -391,7 +1005,7 @@ Mon Apr 24 21:12:06 2000 Lars Magne Ingebrigtsen 2000-04-21 15:21:30 Katsumi Yamaoka - * mm-bodies.el (mm-body-charset-encoding-alist): defcustomized. + * mm-bodies.el (mm-body-charset-encoding-alist): defcustomized. 2000-04-21 15:15:41 Lars Magne Ingebrigtsen @@ -415,7 +1029,7 @@ Mon Apr 24 21:12:06 2000 Lars Magne Ingebrigtsen 2000-04-21 14:11:39 David S. Goldberg * gnus-art.el (gnus-boring-article-headers): Work on long CCs as - well. + well. 2000-04-21 14:06:43 Rui Zhu @@ -428,7 +1042,7 @@ Mon Apr 24 21:12:06 2000 Lars Magne Ingebrigtsen * flow-fill.el (flow-fill): Fix provide. * gnus-draft.el (gnus-draft-send): Bind message-setup-hook to - nil. + nil. 2000-04-20 22:24:04 Shenghuo ZHU @@ -472,7 +1086,7 @@ Mon Apr 24 21:12:06 2000 Lars Magne Ingebrigtsen * gnus-util.el (gnus-parse-netrc): Allow "port". (gnus-netrc-machine): Take a port param. - (gnus-netrc-machine): + (gnus-netrc-machine): * gnus-art.el (gnus-request-article-this-buffer): Allow re-selecting referenced articles. @@ -482,17 +1096,17 @@ Mon Apr 24 21:12:06 2000 Lars Magne Ingebrigtsen 2000-04-20 21:03:54 William M. Perry - * mm-view.el (mm-inline-image-emacs): New function. + * mm-view.el (mm-inline-image-emacs): New function. 2000-04-20 20:44:55 Lars Magne Ingebrigtsen * mail-source.el (mail-source-delete-incoming): Change default in - cvs. + cvs. 2000-04-20 20:43:34 Kim-Minh Kaplan * gnus-art.el (gnus-mime-view-part-as-type-internal): New - function. + function. 2000-04-20 14:45:20 Lars Magne Ingebrigtsen @@ -508,7 +1122,7 @@ Mon Apr 24 21:12:06 2000 Lars Magne Ingebrigtsen 2000-04-20 02:25:39 Lars Magne Ingebrigtsen * message.el (message-generate-headers): Respect the syntax check - spec. + spec. * gnus-sum.el (gnus-remove-thread-1): Show thread. (gnus-remove-thread): Don't show all threads. @@ -530,7 +1144,7 @@ Thu Apr 20 01:39:25 2000 Lars Magne Ingebrigtsen 2000-04-14 18:50:04 Shenghuo ZHU * mm-util.el (mm-char-or-char-int-p): New alias. - * nnweb.el (nnweb-decode-entities): Check the validity of numeric + * nnweb.el (nnweb-decode-entities): Check the validity of numeric entities. 2000-04-10 Daiki Ueno @@ -543,7 +1157,7 @@ Thu Apr 20 01:39:25 2000 Lars Magne Ingebrigtsen * mail-source.el (mail-source-fetch-webmail): Use the default password provided in mail-sources; use webmail:subtype:user as the key. - + 2000-04-10 20:35:46 John Wiegley * mail-source.el (mail-source-fetch-webmail): Use @@ -587,7 +1201,7 @@ Thu Apr 20 01:39:25 2000 Lars Magne Ingebrigtsen 2000-03-20 00:12:42 Lars Magne Ingebrigtsen * nnslashdot.el (nnslashdot-request-list): Use the new slashdot - format. + format. 2000-03-16 Simon Josefsson @@ -615,7 +1229,7 @@ Thu Apr 20 01:39:25 2000 Lars Magne Ingebrigtsen 2000-03-15 Simon Josefsson * nnheader.el (nnheader-group-pathname): Make sure to return a - directory. + directory. * nnmail.el (nnmail-group-pathname): Ditto. 2000-02-08 Per Abrahamsen @@ -628,20 +1242,20 @@ Thu Apr 20 01:39:25 2000 Lars Magne Ingebrigtsen * gnus-srvr.el (gnus-server-kill-server): Offer to kill all the groups from the server. - * gnus-sum.el (gnus-summary-save-parts): Fix interactive spec. + * gnus-sum.el (gnus-summary-save-parts): Fix interactive spec. (gnus-summary-toggle-header): Update the wash status. * gnus-uu.el ((gnus-uu-extract-map "X" gnus-summary-mode-map)): Moved here. * gnus-agent.el (gnus-agent-save-group-info): Respect old - setting. + setting. * nnmail.el (nnmail-get-active): Use it. (nnmail-parse-active): New function. * mm-view.el (mm-inline-text): Support the new version of - vcard.el. + vcard.el. * gnus-sum.el (gnus-summary-move-article): Only delete article when moving junk. @@ -658,17 +1272,17 @@ Thu Apr 20 01:39:25 2000 Lars Magne Ingebrigtsen 2000-03-10 14:57:58 Lars Magne Ingebrigtsen - * message.el (message-send-mail): Protect against unloaded Gnus. + * message.el (message-send-mail): Protect against unloaded Gnus. * gnus-topic.el (gnus-topic-update-topic-line): Don't update the - parent. + parent. (gnus-topic-update-topic-line): Yes, do. (gnus-topic-goto-missing-group): Tally the correct number of unread articles before inserting the topic line. 2000-03-01 09:55:26 Lars Magne Ingebrigtsen - * nnultimate.el (nnultimate-retrieve-headers): Ignore errors. + * nnultimate.el (nnultimate-retrieve-headers): Ignore errors. 2000-02-13 13:53:08 Lars Magne Ingebrigtsen @@ -712,7 +1326,7 @@ Thu Apr 20 01:39:25 2000 Lars Magne Ingebrigtsen * qp.el (quoted-printable-decode-region): Add charset parameter. (quoted-printable-decode-string): Ditto. - + * gnus-art.el (article-de-quoted-unreadable): Use it. 2000-01-21 Simon Josefsson @@ -765,7 +1379,7 @@ Thu Apr 20 01:39:25 2000 Lars Magne Ingebrigtsen 2000-01-06 18:32:53 Lars Magne Ingebrigtsen * gnus-art.el (gnus-article-mode-map): "e" is - gnus-summary-edit-article. + gnus-summary-edit-article. 2000-01-06 18:25:37 Jari Aalto @@ -782,12 +1396,12 @@ Thu Apr 20 01:39:25 2000 Lars Magne Ingebrigtsen 2000-01-06 13:41:11 Lars Magne Ingebrigtsen - * nnfolder.el (nnfolder-read-folder): Use nnfolder-save-buffer. + * nnfolder.el (nnfolder-read-folder): Use nnfolder-save-buffer. * gnus.el: Really always pop up a new frame. * parse-time.el (parse-time-rules): Allow 100-110 to be - 2000-2010. + 2000-2010. * time-date.el (date-to-time): Don't use timezone. @@ -824,7 +1438,7 @@ Thu Apr 20 01:39:25 2000 Lars Magne Ingebrigtsen point. * gnus-group.el (gnus-fetch-group): Complete over - gnus-active-hashtb. + gnus-active-hashtb. Wed Jan 5 17:06:41 2000 Lars Magne Ingebrigtsen @@ -847,7 +1461,7 @@ Wed Jan 5 17:06:41 2000 Lars Magne Ingebrigtsen 2000-01-04 Simon Josefsson - * imap.el (imap-parse-literal): + * imap.el (imap-parse-literal): (imap-parse-flag-list): Don't care about props. (imap-parse-string): Handle quoted characters. @@ -859,7 +1473,7 @@ Wed Jan 5 17:06:41 2000 Lars Magne Ingebrigtsen (t): Changed keystroke for gnus-summary-customize-parameters. * gnus-art.el (gnus-article-mode-map): Use gnus-article-edit for - "e". + "e". (gnus-article-mode-map): No, don't. * gnus-sum.el (gnus-summary-next-subject): Don't show the thread @@ -890,7 +1504,7 @@ Wed Jan 5 17:06:41 2000 Lars Magne Ingebrigtsen 1999-12-14 10:18:30 Lars Magne Ingebrigtsen * nnslashdot.el (nnslashdot-request-article): Translate
into -

. +

. 1999-12-28 12:20:18 Shenghuo ZHU @@ -937,17 +1551,17 @@ Wed Jan 5 17:06:41 2000 Lars Magne Ingebrigtsen * message.el (message-send-mail): Bind `message-this-is-mail' and `message-posting-charset'. - (message-send-news): Dito, and honour new layout of + (message-send-news): Dito, and honour new layout of `message-posting-charset'. (message-encode-message-body): Ignore `message-posting-charset'. - + * mm-bodies.el (mm-body-encoding): Consider `message-posting-charset' when deciding whether to use 8bit. * rfc2047.el (rfc2047-encode-message-header): Back out change. (rfc2047-encodable-p): Now solely for headers; use `message-posting-charset'. - + 1999-12-20 14:10:39 Shenghuo ZHU * nnwarchive.el (nnwarchive-type-definition): Set default value. @@ -962,7 +1576,7 @@ Wed Jan 5 17:06:41 2000 Lars Magne Ingebrigtsen * gnus-cite.el (gnus-article-toggle-cited-text): Restore beg and end (referenced by instructions in `gnus-cited-opened-text-button-line-format-alist'). - + 1999-12-18 Simon Josefsson * imap.el (imap-starttls-open): Typo. @@ -975,7 +1589,7 @@ Wed Jan 5 17:06:41 2000 Lars Magne Ingebrigtsen 1999-12-18 Florian Weimer - * mml.el (mml-generate-multipart-alist): Correct default value. + * mml.el (mml-generate-multipart-alist): Correct default value. * mm-encode.el (mm-use-ultra-safe-encoding): New variable. (mm-safer-encoding): New function. @@ -1106,7 +1720,7 @@ Wed Jan 5 17:06:41 2000 Lars Magne Ingebrigtsen * nnslashdot.el (nnslashdot-date-to-date): Error proof when input is bad. - * gnus-sum.el (gnus-list-of-unread-articles): When (car read) + * gnus-sum.el (gnus-list-of-unread-articles): When (car read) is not 1. 1999-12-13 18:22:08 Shenghuo ZHU @@ -1137,15 +1751,15 @@ Wed Jan 5 17:06:41 2000 Lars Magne Ingebrigtsen * nnweb.el (nnweb-decode-entities): Decode numerical entities. (nnweb-decode-entities-string): New function. - + * nnwarchive.el (nnwarchive-decode-entities-string): Rename to nnweb-* and move to nnweb.el. * nnwarchive.el: Use nnweb-decode-entities, etc. * webmail.el: Ditto. - + * nnslashdot.el: Use nnweb-decode-entities-string. (nnslashdot-decode-entities): Remove. - + 1999-12-13 10:40:56 Eric Marsden * nnslashdot.el: Decode entities. @@ -1155,7 +1769,7 @@ Wed Jan 5 17:06:41 2000 Lars Magne Ingebrigtsen * gnus-agent.el (gnus-category-edit-groups) (gnus-category-edit-score, gnus-category-edit-predicate): Replace expansion of setf, fixed. - + 1999-12-12 12:50:30 Shenghuo ZHU * gnus-agent.el: Revoke last Dave Love's patch, because of @@ -1208,7 +1822,7 @@ Wed Jan 5 17:06:41 2000 Lars Magne Ingebrigtsen * mm-view.el (mm-inline-message): Require cl when compiling. Avoid ignore-errors at runtime. (mm-inline-text): Avoid mapc. - + 1999-12-12 10:36:51 Shenghuo ZHU * gnus-art.el (article-decode-charset): Widen is bad. @@ -1263,11 +1877,11 @@ Wed Jan 5 17:06:41 2000 Lars Magne Ingebrigtsen (mm-find-mime-charset-region): Set charsets after delete-duplicates and use find-coding-systems-region. (mm-find-charset-region): Remove composition. - + * mm-bodies.el (mm-encode-body): Use mm-charset-after. * mml.el (mml-parse-singlepart-with-multiple-charsets): Ditto. - + 1999-12-09 17:47:56 Shenghuo ZHU * mm-util.el (mm-find-mime-charset-region): Revoke last change. @@ -1303,7 +1917,7 @@ Wed Jan 5 17:06:41 2000 Lars Magne Ingebrigtsen * gnus-msg.el (gnus-group-posting-charset-alist): Use iso-8859-1 for the `de' newsgroups hierarchy, as it is common practice there. - + 1999-12-07 16:17:12 Shenghuo ZHU @@ -1355,7 +1969,7 @@ Wed Jan 5 17:06:41 2000 Lars Magne Ingebrigtsen * nnslashdot.el (nnslashdot-request-delete-group): New function. * gnus-sum.el (gnus-summary-refer-article): Work for lists with - current. + current. (gnus-refer-article-methods): New function. (gnus-summary-refer-article): Use it. @@ -1364,8 +1978,8 @@ Wed Jan 5 17:06:41 2000 Lars Magne Ingebrigtsen * nnimap.el (nnimap-retrieve-groups): Return active format. * nnimap.el (nnimap-replace-in-string): Removed. - (nnimap-request-list): - (nnimap-retrieve-groups): + (nnimap-request-list): + (nnimap-retrieve-groups): (nnimap-request-newgroups): Quote group instead of escaping SPC. 1999-12-05 Simon Josefsson @@ -1409,7 +2023,7 @@ Wed Jan 5 17:06:41 2000 Lars Magne Ingebrigtsen * gnus-msg.el (gnus-setup-message): One backtick too many. - * gnus-art.el (gnus-mime-view-part-as-type): mailcap-mime-types is + * gnus-art.el (gnus-mime-view-part-as-type): mailcap-mime-types is a function, not a variable. 1999-12-04 08:14:08 Max Froumentin @@ -1440,12 +2054,12 @@ Wed Jan 5 17:06:41 2000 Lars Magne Ingebrigtsen * nnmh.el (nnmh-be-safe): Doc fix. - * gnus-sum.el (gnus-summary-exit): Write cache active file. + * gnus-sum.el (gnus-summary-exit): Write cache active file. - * nntp.el (nntp-retrieve-headers-with-xover): Make sure the entire + * nntp.el (nntp-retrieve-headers-with-xover): Make sure the entire status line has arrived before we count it. - * mailcap.el (mailcap-mime-data): Removed save-file from audio/*. + * mailcap.el (mailcap-mime-data): Removed save-file from audio/*. * gnus-sum.el (gnus-thread-header): Fixed after indent. Whitespace problems. @@ -1521,7 +2135,7 @@ Wed Jan 5 17:06:41 2000 Lars Magne Ingebrigtsen 1999-12-04 00:38:24 Andrea Arcangeli * message.el (message-send-mail-with-sendmail): Use - message-make-address. + message-make-address. Fri Dec 3 20:34:11 1999 Lars Magne Ingebrigtsen @@ -1553,12 +2167,12 @@ Fri Dec 3 20:09:41 1999 Lars Magne Ingebrigtsen 1999-12-03 01:26:55 Lars Magne Ingebrigtsen - * gnus-art.el (gnus-button-embedded-url): Always call browse-url. + * gnus-art.el (gnus-button-embedded-url): Always call browse-url. 1999-12-02 18:00:15 Lars Magne Ingebrigtsen * nnultimate.el (nnultimate-retrieve-headers): Use - mm-with-unibyte-current-buffer. + mm-with-unibyte-current-buffer. (nnultimate-request-article): Ditto. 1999-12-02 14:57:46 Shenghuo ZHU @@ -1570,7 +2184,7 @@ Fri Dec 3 20:09:41 1999 Lars Magne Ingebrigtsen * mm-util.el (mm-with-unibyte-current-buffer): New macro. * nnweb.el (nnweb-retrieve-headers): Use it. (nnweb-request-article): Use it. - + * nnweb.el (nnweb-dejanews-create-mapping): Set a default date in case matching failed. @@ -1611,7 +2225,7 @@ Fri Dec 3 20:09:41 1999 Lars Magne Ingebrigtsen 1999-12-01 21:59:36 Lars Magne Ingebrigtsen * gnus-msg.el (gnus-configure-posting-styles): Ignore nil - signatures. + signatures. * nnweb.el (nnweb-dejanews-create-mapping): Get the data. (nnweb-dejanews-create-mapping): Do the properish date. @@ -1626,12 +2240,12 @@ Fri Dec 3 20:09:41 1999 Lars Magne Ingebrigtsen 1999-12-01 21:59:36 Lars Magne Ingebrigtsen * mm-view.el (mm-inline-message): Check whether charset is a - string. + string. * nnslashdot.el (nnslashdot-request-post): Insert

's. * message.el (message-mode-map): Changed keystroke for - message-yank-buffer. + message-yank-buffer. 1999-11-26 Hrvoje Niksic @@ -1646,7 +2260,7 @@ Fri Dec 3 20:09:41 1999 Lars Magne Ingebrigtsen 1999-12-01 21:08:48 Lars Magne Ingebrigtsen - * mm-view.el (mm-inline-message): Not the right type of charset is + * mm-view.el (mm-inline-message): Not the right type of charset is being fetched here. Let the group charset rule. (mm-inline-message): Ignore us-ascii. @@ -1693,7 +2307,7 @@ Fri Dec 3 20:09:41 1999 Lars Magne Ingebrigtsen * gnus-sum.el (gnus-summary-show-article): Support numbered ARG for charset. (gnus-summary-show-article-charset-alist): New variable. - + * mm-bodies.el (mm-decode-string): Support gnus-all and gnus-unknown. (mm-decode-body): Ditto. @@ -1713,19 +2327,19 @@ Wed Dec 1 16:31:31 1999 Lars Magne Ingebrigtsen * dgnushack.el (dgnushack-compile): No webmail under Emacs. * gnus-sum.el (gnus-summary-refer-article): Wrong interactive - spec. + spec. * gnus-msg.el (gnus-configure-posting-styles): Eval `eval'. (gnus-configure-posting-styles): No, don't. (gnus-configure-posting-styles): Allow overriding files. * gnus-art.el (gnus-header-button-alist): Use browse-url - directly. + directly. * mm-decode.el (mm-inline-media-tests): Check feature vcard. * gnus-msg.el (gnus-summary-yank-message): New command and - keystroke. + keystroke. * message.el (message-yank-buffer): New command. (message-buffers): New function. @@ -1750,7 +2364,7 @@ Wed Dec 1 16:31:31 1999 Lars Magne Ingebrigtsen 1999-11-28 20:22:37 Lars Magne Ingebrigtsen * gnus-art.el (gnus-treatment-function-alist): Do - gnus-treat-capitalize-sentences. + gnus-treat-capitalize-sentences. 1999-11-30 09:07:53 Shenghuo ZHU @@ -1769,7 +2383,7 @@ Wed Dec 1 16:31:31 1999 Lars Magne Ingebrigtsen read groups file. * nnslashdot.el (nnslashdot-request-article): Convert

to -

. +

. 1999-11-24 20:18:24 Lars Magne Ingebrigtsen @@ -1801,7 +2415,7 @@ Wed Dec 1 16:31:31 1999 Lars Magne Ingebrigtsen 1999-11-23 02:33:13 Shenghuo ZHU * webmail.el: Support mail.yahoo.com. - + * mail-source.el (mail-source-fetch-webmail): Add password check. (mail-source-keyword-map): Use `subtype'. @@ -1822,7 +2436,7 @@ Wed Dec 1 16:31:31 1999 Lars Magne Ingebrigtsen 1999-11-20 12:54:25 Lars Magne Ingebrigtsen - * nnultimate.el (nnultimate-request-list): Add fetch-time slot. + * nnultimate.el (nnultimate-request-list): Add fetch-time slot. (nnultimate-prune-days): New function. (nnultimate-create-mapping): Use it. (nnultimate-request-group): Only fetch the groups list if it has @@ -1857,16 +2471,16 @@ Wed Dec 1 16:31:31 1999 Lars Magne Ingebrigtsen * mm-uu.el (mm-uu-dissect): Use fake charset `gnus-decoded'. (mm-uu-test): Now it is in restricted region. - + * gnus-art.el (article-decode-charset): Don't mm-uu-test. - + * mm-view.el (mm-view-message): Fix buffer leak. (mm-inline-message): Support 'gnus-decoded. - + * mm-bodies.el (mm-decode-body): Ditto. * rfc2047.el (rfc2047-decode-region): Ditto. - + 1999-11-18 Matthias Andree * imap.el (require): Added autoload for base64-encode-string. @@ -1874,7 +2488,7 @@ Wed Dec 1 16:31:31 1999 Lars Magne Ingebrigtsen 1999-11-17 Per Abrahamsen * gnus.el (gnus-refer-article-method): Made list value - customizable. + customizable. 1999-11-17 13:09:37 Shenghuo ZHU @@ -1924,7 +2538,7 @@ Wed Dec 1 16:31:31 1999 Lars Magne Ingebrigtsen * gnus.el (gnus-refer-article-method): Doc fix. * gnus-sum.el: Do not accept a prefix. - (gnus-summary-refer-article): Accept a list of select methods. + (gnus-summary-refer-article): Accept a list of select methods. 1999-11-15 21:28:40 Shenghuo ZHU @@ -1977,7 +2591,7 @@ Wed Dec 1 16:31:31 1999 Lars Magne Ingebrigtsen 1999-11-13 Florian Weimer - * mm-util.el (mm-find-mime-charset-region): Use UTF-8 if + * mm-util.el (mm-find-mime-charset-region): Use UTF-8 if it's available and makes sense. 1999-11-12 19:56:23 Fabrice POPINEAU @@ -1997,10 +2611,10 @@ Wed Dec 1 16:31:31 1999 Lars Magne Ingebrigtsen `defconst'. * gnus-cus.el (gnus-group-parameters): Changed from `defcustom' to - `defconst'. - Mention that it is both for group and topic parameters. + `defconst'. + Mention that it is both for group and topic parameters. (gnus-extra-topic-parameters): New constant, including `subscribe' - parameter. + parameter. (gnus-extra-group-parameters): New constant. (gnus-group-customize): Use them. @@ -2012,17 +2626,17 @@ Wed Dec 1 16:31:31 1999 Lars Magne Ingebrigtsen * gnus-int.el (gnus-server-opened): Ignore denied servers. * gnus-ems.el (gnus-mule-max-width-function): New backquote - syntax. + syntax. * nndoc.el (nndoc-mime-digest-type-p): Reinstated. * nnslashdot.el (nnslashdot-group-number): Changed default. - * nnweb.el (nnweb-dejanews-create-mapping): Work with new deja. + * nnweb.el (nnweb-dejanews-create-mapping): Work with new deja. (nnweb-dejanews-wash-article): Removed. (nnweb-type-definition): Fetch by id. - * gnus-msg.el (gnus-configure-posting-styles): Don't insert unless + * gnus-msg.el (gnus-configure-posting-styles): Don't insert unless we mean it. * nnslashdot.el (nnslashdot-group-number): Doc fix. @@ -2041,7 +2655,7 @@ Wed Dec 1 16:31:31 1999 Lars Magne Ingebrigtsen 1999-11-11 10:58:38 Lars Magne Ingebrigtsen * nnultimate.el (nnultimate-retrieve-headers): Work with american - dates. + dates. (nnultimate-retrieve-headers): Wrong ordering. 1999-11-11 07:31:51 Matt Pharr @@ -2066,12 +2680,12 @@ Wed Dec 1 16:31:31 1999 Lars Magne Ingebrigtsen 1999-11-10 12:13:30 Lars Magne Ingebrigtsen - * nnultimate.el (nnultimate-retrieve-headers): Work for multi-page + * nnultimate.el (nnultimate-retrieve-headers): Work for multi-page subjects. 1999-11-10 11:33:23 Rajappa Iyer - * gnus-salt.el (gnus-pick-article-or-thread): Don't move point. + * gnus-salt.el (gnus-pick-article-or-thread): Don't move point. 1999-11-10 05:22:56 Lars Magne Ingebrigtsen @@ -2143,7 +2757,7 @@ Wed Dec 1 16:31:31 1999 Lars Magne Ingebrigtsen (nnslashdot-generate-active): New function. (nnslashdot-request-newgroups): Use it. - * gnus-start.el (gnus-active-to-gnus-format): Intern strings group + * gnus-start.el (gnus-active-to-gnus-format): Intern strings group names. * nnslashdot.el (nnslashdot-request-newgroups): New function. @@ -2159,11 +2773,11 @@ Wed Dec 1 16:31:31 1999 Lars Magne Ingebrigtsen 1999-11-07 01:17:53 Lars Magne Ingebrigtsen - * gnus-start.el (gnus-subscribe-newsgroup-method): Doc fix. + * gnus-start.el (gnus-subscribe-newsgroup-method): Doc fix. * gnus-topic.el (gnus-subscribe-topic): New function. - * nnslashdot.el (nnslashdot-request-list): Give out extended group + * nnslashdot.el (nnslashdot-request-list): Give out extended group names. * gnus-start.el (gnus-ignored-newsgroups): Disregard bogus chars @@ -2181,10 +2795,10 @@ Wed Dec 1 16:31:31 1999 Lars Magne Ingebrigtsen * nnheader.el (nnheader-insert-header): New function. * gnus-art.el (gnus-mime-internalize-part): Bind - mm-inlined-types. + mm-inlined-types. * nndraft.el (nndraft-request-expire-articles): Do all the backup - files. + files. 1999-10-29 David S. Goldberg @@ -2213,7 +2827,7 @@ Wed Dec 1 16:31:31 1999 Lars Magne Ingebrigtsen 1999-11-06 23:16:24 Lars Magne Ingebrigtsen * gnus-art.el (gnus-article-mode-map): Use the summary article - edit. + edit. 1999-11-06 22:56:49 Jens-Ulrik Petersen @@ -2255,7 +2869,7 @@ Wed Dec 1 16:31:31 1999 Lars Magne Ingebrigtsen 1999-11-06 03:51:24 Lars Magne Ingebrigtsen - * message.el (message-newline-and-reformat): Don't insert too many + * message.el (message-newline-and-reformat): Don't insert too many newlines. (message-newline-and-reformat): Work even if not sc. @@ -2274,12 +2888,12 @@ Wed Dec 1 16:31:31 1999 Lars Magne Ingebrigtsen 1999-11-06 02:17:54 Lars Magne Ingebrigtsen * gnus-sum.el (gnus-read-move-group-name): Subscribe to the - group. + group. * message.el (message-forward): Narrow to the right header. * gnus-sum.el (gnus-summary-limit-to-age): Protect against bogus - dates. + dates. * gnus-msg.el (gnus-configure-posting-styles): Use the user-full-name function. @@ -2294,13 +2908,13 @@ Wed Dec 1 16:31:31 1999 Lars Magne Ingebrigtsen 1999-11-05 20:28:27 Lars Magne Ingebrigtsen * gnus-sum.el (gnus-cut-thread): Also cut for numberp - gnus-fetch-old-headers. + gnus-fetch-old-headers. (gnus-cut-threads): Ditto. (gnus-summary-initial-limit): Ditto. (gnus-summary-limit-children): Ditto. * gnus-msg.el (gnus-configure-posting-styles): Allow `header' - matches. + matches. 1999-11-06 Simon Josefsson @@ -2454,7 +3068,7 @@ Fri Nov 5 19:10:02 1999 Lars Magne Ingebrigtsen 1999-09-29 Shenghuo ZHU * mm-uu.el (mm-uu-forward-begin-line): Change the regexp. - (mm-uu-forward-end-line): Ditto. + (mm-uu-forward-end-line): Ditto. 1999-09-29 Didier Verna @@ -2482,11 +3096,11 @@ Fri Nov 5 19:10:02 1999 Lars Magne Ingebrigtsen * rfc1843.el (rfc1843-decode-article-body): Don't decode twice. 1999-09-10 Shenghuo ZHU - + * gnus-art.el (article-make-date-line): Add time-zone in iso8601 format. (article-date-ut): Find correct insert position. - + 1999-09-03 Shenghuo ZHU * mm-uu.el (mm-uu-dissect): Do not dissect quoted-printable @@ -2495,22 +3109,22 @@ Fri Nov 5 19:10:02 1999 Lars Magne Ingebrigtsen 1999-09-27 20:33:41 Lars Magne Ingebrigtsen * gnus-topic.el (gnus-topic-find-groups): Work for unactivated - groups. + groups. - * message.el (message-resend): Use message mode when prompting. + * message.el (message-resend): Use message mode when prompting. * gnus-art.el (article-hide-headers): Mark wash. (article-emphasize): Ditto. 1999-09-27 19:52:14 Vladimir Volovich - * message.el (message-newline-and-reformat): Work for SC. + * message.el (message-newline-and-reformat): Work for SC. 1999-09-27 19:38:33 Lars Magne Ingebrigtsen * gnus-msg.el (gnus-group-posting-charset-alist): 2047 in de.*. - * gnus-sum.el (gnus-newsgroup-ignored-charsets): Add x-unknown. + * gnus-sum.el (gnus-newsgroup-ignored-charsets): Add x-unknown. 1999-10-20 David S. Goldberg @@ -2544,21 +3158,21 @@ Mon Sep 27 15:18:05 1999 Lars Magne Ingebrigtsen buffer for params. * gnus-xmas.el (gnus-xmas-summary-recenter): Display one more - line. + line. * message.el (message-forward-ignored-headers): New variable. * gnus-art.el (gnus-article-prepare-display): Nix out - gnus-article-wash-types. + gnus-article-wash-types. * gnus-agent.el (gnus-agent-create-buffer): New function. (gnus-agent-fetch-group-1): Use it. (gnus-agent-start-fetch): Ditto. * gnus-sum.el (gnus-summary-exit): Don't use - `gnus-use-adaptive-scoring'. + `gnus-use-adaptive-scoring'. - * mail-source.el (mail-source-fetch-pop): Only store password when + * mail-source.el (mail-source-fetch-pop): Only store password when successful. * gnus-nocem.el (gnus-nocem-scan-groups): Message better. @@ -2575,7 +3189,7 @@ Mon Sep 27 15:18:05 1999 Lars Magne Ingebrigtsen * message.el (message-bounce): Work for non-MIME. * gnus.el (gnus-short-group-name): Short the right parts of the - name. + name. 1999-09-24 18:17:48 Johan Kullstam @@ -2605,7 +3219,7 @@ Mon Sep 27 15:18:05 1999 Lars Magne Ingebrigtsen 1999-09-24 18:10:56 Robert Bihlmeyer * gnus-score.el (gnus-summary-increase-score): Allow editing of - Message-ID. + Message-ID. 1999-09-08 Shenghuo ZHU @@ -2643,15 +3257,15 @@ Mon Sep 27 15:18:05 1999 Lars Magne Ingebrigtsen 1999-08-27 20:46:11 Lars Magne Ingebrigtsen - * gnus-cache.el (gnus-cache-write-active): Write full names. + * gnus-cache.el (gnus-cache-write-active): Write full names. - * gnus-util.el (gnus-write-active-file): Accept full name. + * gnus-util.el (gnus-write-active-file): Accept full name. - * mm-decode.el (mm-inlinable-p): Use string-match on the types. + * mm-decode.el (mm-inlinable-p): Use string-match on the types. (mm-assoc-string-match): New function. (mm-display-inline): Use it. - * gnus-group.el (gnus-group-set-info): Work for nil group params. + * gnus-group.el (gnus-group-set-info): Work for nil group params. * gnus-msg.el (gnus-configure-posting-styles): Allow eval. @@ -2709,7 +3323,7 @@ Fri Aug 27 13:17:48 1999 Lars Magne Ingebrigtsen 1999-08-27 15:02:58 Florian Weimer * gnus-score.el (gnus-home-score-file): Work with absolute path - names. + names. 1999-07-17 Shenghuo ZHU @@ -2761,7 +3375,7 @@ Fri Aug 27 13:17:48 1999 Lars Magne Ingebrigtsen * mml.el (mml-generate-mime-1): Insert non-text literally. - * gnus.el: Change most mm-insert-file-contents back to nnheader. + * gnus.el: Change most mm-insert-file-contents back to nnheader. 1999-07-13 Hrvoje Niksic @@ -2770,7 +3384,7 @@ Fri Aug 27 13:17:48 1999 Lars Magne Ingebrigtsen 1999-08-27 14:53:42 Oleg S. Tihonov * gnus-sum.el (gnus-group-charset-alist): Default fido7 to - koi8-r. + koi8-r. 1999-07-11 Shenghuo ZHU @@ -2779,7 +3393,7 @@ Fri Aug 27 13:17:48 1999 Lars Magne Ingebrigtsen 1999-07-11 Shenghuo ZHU - * mm-view.el (mm-inline-text): Check + * mm-view.el (mm-inline-text): Check w3-meta-content-type-charset-regexp. 1999-07-10 Simon Josefsson @@ -2807,7 +3421,7 @@ Fri Aug 27 13:17:48 1999 Lars Magne Ingebrigtsen 1999-08-27 14:38:14 Lars Magne Ingebrigtsen * gnus-group.el (gnus-group-kill-all-zombies): Only prompt when - interactive. + interactive. 1999-07-12 Shenghuo ZHU @@ -2824,7 +3438,7 @@ Fri Aug 27 13:17:48 1999 Lars Magne Ingebrigtsen 1999-08-27 14:22:39 Jon Kv - * nnfolder.el (nnfolder-request-list-newsgroups): Faster expiry. + * nnfolder.el (nnfolder-request-list-newsgroups): Faster expiry. 1999-07-10 Mike McEwan @@ -2851,15 +3465,15 @@ Fri Aug 27 13:17:48 1999 Lars Magne Ingebrigtsen 1999-07-11 11:02:03 Lars Magne Ingebrigtsen - * mm-encode.el (mm-qp-or-base64): Also consider control chars. + * mm-encode.el (mm-qp-or-base64): Also consider control chars. (mm-qp-or-base64): Reversed logic. * mm-decode.el (mm-save-part-to-file): Let coding system be - binary. + binary. 1999-07-15 Mike McEwan - * gnus-agent.el (gnus-agent-fetch-group-1): Allow 'agent-score' to + * gnus-agent.el (gnus-agent-fetch-group-1): Allow 'agent-score' to be set in topic parameters. 1999-07-10 Mike McEwan @@ -2939,7 +3553,7 @@ Fri Jul 9 19:28:29 1999 Lars Magne Ingebrigtsen 1999-07-09 18:52:22 Lars Magne Ingebrigtsen * gnus-art.el (gnus-mime-view-part-as-media): New command and - keystroke. + keystroke. * mailcap.el (mailcap-mime-types): New function. @@ -2955,7 +3569,7 @@ Fri Jul 9 19:28:29 1999 Lars Magne Ingebrigtsen 1999-07-09 18:36:21 Lars Magne Ingebrigtsen * gnus-group.el (gnus-group-make-menu-bar): Removed double bug - report. + report. 1999-07-08 Shenghuo ZHU @@ -2985,7 +3599,7 @@ Wed Jul 7 18:40:30 1999 Shenghuo ZHU 1999-07-08 08:41:10 Lars Magne Ingebrigtsen * mailcap.el (mailcap-mime-extensions): Changed patch to - text/x-patch. + text/x-patch. * mm-decode.el (mm-display-external): Wrong placement of paren. @@ -3026,19 +3640,19 @@ Wed Jul 7 13:09:51 1999 Lars Magne Ingebrigtsen * pop3.el: New version. -1999-07-05 Simon Josefsson +1999-07-05 Simon Josefsson * gnus-srvr.el (gnus-browse-foreign-server): Use read. 1999-07-07 10:37:26 Lars Magne Ingebrigtsen - * gnus-art.el (gnus-mime-display-alternative): Do treatment. + * gnus-art.el (gnus-mime-display-alternative): Do treatment. 1999-07-06 Shenghuo ZHU * gnus-util.el (gnus-write-active-file): Use real name. - * gnus-agent.el (gnus-agent-expire): Update active file + * gnus-agent.el (gnus-agent-expire): Update active file method by method. 1999-07-06 Shenghuo ZHU @@ -3091,12 +3705,12 @@ Tue Jul 6 10:59:24 1999 Lars Magne Ingebrigtsen 1999-07-06 12:30:59 Johannes Weinert - * gnus-sum.el (gnus-summary-catchup-and-exit): Doc fix. + * gnus-sum.el (gnus-summary-catchup-and-exit): Doc fix. 1999-07-06 07:41:07 Lars Magne Ingebrigtsen * nntp.el (nntp-retrieve-groups): Don't do anything when not - connected. + connected. * gnus-start.el (gnus-active-to-gnus-format): Only save active when plugged. @@ -3106,17 +3720,17 @@ Tue Jul 6 10:59:24 1999 Lars Magne Ingebrigtsen * gnus-agent.el (gnus-agent-write-active): Check whether orig sym is bound. - * gnus-msg.el (gnus-summary-mail-forward): Rename From_ lines. + * gnus-msg.el (gnus-summary-mail-forward): Rename From_ lines. - * nndoc.el (nndoc-guess-type): Remove blank lines at the start. + * nndoc.el (nndoc-guess-type): Remove blank lines at the start. * nnfolder.el (nnfolder-read-folder): Remove blank lines at the - start. + start. * message.el (message-fill-yanked-message): Remove `t' arg. * gnus-group.el (gnus-group-kill-group): Message killing of - groups. + groups. * mm-util.el (mm-preferred-coding-system): New function. (mm-mime-charset): Use it. @@ -3130,14 +3744,14 @@ Tue Jul 6 10:59:24 1999 Lars Magne Ingebrigtsen 1999-07-06 05:47:57 Lars Magne Ingebrigtsen * mm-decode.el (mm-inline-Media-tests): Changed from forms to - functions. + functions. (mm-attachment-override-p): Take a handle instead of a type. (mm-inlined-p): Ditto. (mm-automatic-display-p): Ditto, (mm-inlinable-p): Ditto. * nndraft.el (nndraft-request-expire-articles): Delete backup - files. + files. * mailcap.el (mailcap-parse-mailcap): Regexp-quote stuff. @@ -3151,7 +3765,7 @@ Tue Jul 6 10:59:24 1999 Lars Magne Ingebrigtsen * mm-decode.el (mm-inline-large-images-p): Renamed. - * gnus-art.el (article-date-ut): Always look in the current buffer + * gnus-art.el (article-date-ut): Always look in the current buffer for the Date header. * mml.el (mml-validate): New command. @@ -3209,7 +3823,7 @@ Sun Jul 4 06:31:01 1999 Lars Magne Ingebrigtsen * mml.el (mml-generate-mime-1): Ditto. * gnus.el: Use mm-insert-file-contents throughout instead of - nnheader. + nnheader. * mm-util.el (mm-insert-file-contents): New function. @@ -3308,7 +3922,7 @@ Sat Jul 3 07:35:35 1999 Lars Magne Ingebrigtsen 1999-07-03 09:15:35 Simon Josefsson * gnus-sum.el (gnus-summary-move-article): Fix something or - other. + other. 1999-06-29 Shenghuo ZHU @@ -3410,7 +4024,7 @@ Tue Jun 15 04:13:01 1999 Lars Magne Ingebrigtsen 1999-06-15 04:13:45 Lars Magne Ingebrigtsen * gnus-sum.el (gnus-summary-save-parts): Destroy handles after - usage. + usage. * nnmail.el (nnmail-get-new-mail): Save info. @@ -3420,13 +4034,13 @@ Mon Jun 14 01:15:59 1999 Lars Magne Ingebrigtsen 1999-06-14 02:46:05 Lars Magne Ingebrigtsen - * mail-source.el (mail-source-fetch-file): Use prescript-delay. + * mail-source.el (mail-source-fetch-file): Use prescript-delay. (mail-source-run-script): New function. (mail-source-fetch-pop): Use it. 1999-06-13 09:52:11 Lars Magne Ingebrigtsen - * gnus-art.el (gnus-article-setup-highlight-words): Moved here. + * gnus-art.el (gnus-article-setup-highlight-words): Moved here. Sun Jun 13 07:30:40 1999 Lars Magne Ingebrigtsen @@ -3447,7 +4061,7 @@ Sun Jun 13 07:30:40 1999 Lars Magne Ingebrigtsen * gnus-art.el (article-babel): Narrow a bit. - * gnus-agent.el (gnus-agent-get-undownloaded-list): Was too slow. + * gnus-agent.el (gnus-agent-get-undownloaded-list): Was too slow. 1999-06-12 Simon Josefsson @@ -3459,7 +4073,7 @@ Sun Jun 13 07:30:40 1999 Lars Magne Ingebrigtsen 1999-06-13 03:01:35 Lars Magne Ingebrigtsen * gnus-sum.el (gnus-summary-limit-to-extra): New command and - keystroke. + keystroke. * gnus-art.el (gnus-article-x-face-command): Ditto. @@ -3480,7 +4094,7 @@ Sun Jun 13 07:30:40 1999 Lars Magne Ingebrigtsen * gnus-util.el (gnus-parse-netrc): Skip lines with #'s. (gnus-netrc-syntax-table): Removed. - (gnus-parse-netrc): Don't use syntax table; just use whitespace. + (gnus-parse-netrc): Don't use syntax table; just use whitespace. Wed May 5 13:51:13 1999 Shenghuo ZHU @@ -3493,7 +4107,7 @@ Wed May 5 01:15:08 1999 Shenghuo ZHU 1999-06-12 07:29:39 Lars Magne Ingebrigtsen * nnmail.el (nnmail-split-incoming): Return the number of split - mails. + mails. (nnmail-process-babyl-mail-format): Ditto. (nnmail-process-unix-mail-format): Ditto. (nnmail-process-mmdf-mail-format): Ditto. @@ -3524,7 +4138,7 @@ Sun May 2 01:00:02 1999 Shenghuo ZHU * gnus-cache.el (gnus-cache-possibly-enter-article): Remove parameter `headers'. (gnus-cache-enter-article): Ditto. - (gnus-cache-update-article): Ditto. + (gnus-cache-update-article): Ditto. * gnus-sum.el (gnus-summary-move-article): Ditto. (gnus-summary-mark-article-as-unread): Ditto. (gnus-summary-mark-article): Ditto. @@ -3552,7 +4166,7 @@ Sat Jun 12 00:19:57 1999 Lars Magne Ingebrigtsen 1999-06-12 02:09:49 Lars Magne Ingebrigtsen * nndoc.el (nndoc-mime-parts-type-p): Accept space before - semicolon. + semicolon. 1999-05-24 Simon Josefsson @@ -3601,11 +4215,11 @@ Sat Jun 12 00:19:57 1999 Lars Magne Ingebrigtsen 1999-05-22 00:26:46 Lars Magne Ingebrigtsen * gnus-sum.el (gnus-summary-save-parts): New command and - keystroke. + keystroke. (gnus-summary-save-parts-1): New function. (gnus-summary-iterate): Buggy. - * mm-decode.el (mm-save-part-to-file): Made into own function. + * mm-decode.el (mm-save-part-to-file): Made into own function. 1999-05-11 05:53:16 Lars Magne Ingebrigtsen @@ -3663,24 +4277,24 @@ Sat May 1 20:27:43 1999 Lars Magne Ingebrigtsen * gnus-art.el (gnus-article-date-lapsed-new-header): Default to nil. - * qp.el (quoted-printable-encode-region): Encode whitespace at the + * qp.el (quoted-printable-encode-region): Encode whitespace at the end of lines. * message.el (message-mode): Doc fix. - * gnus-art.el (article-hide-headers): Delete the hidden headers. + * gnus-art.el (article-hide-headers): Delete the hidden headers. - * gnus-msg.el (gnus-setup-posting-charset): Default group to "". + * gnus-msg.el (gnus-setup-posting-charset): Default group to "". * gnus-art.el (article-date-ut): Rewrite. * mm-decode.el (mm-preferred-alternative-precedence): Reverse the - order. + order. * gnus-msg.el (gnus-message-insert-stylings): Remove duplicate - headers. + headers. - * gnus-art.el (gnus-article-date-lapsed-new-header): Doc fix. + * gnus-art.el (gnus-article-date-lapsed-new-header): Doc fix. 1999-04-18 Didier Verna @@ -3690,7 +4304,7 @@ Sat May 1 20:27:43 1999 Lars Magne Ingebrigtsen 1999-04-18 20:06:20 Lars Magne Ingebrigtsen * mail-source.el (mail-source-fetch-pop): Call script - asynchronously. + asynchronously. Sun Apr 18 12:40:04 1999 Lars Magne Ingebrigtsen @@ -3704,12 +4318,12 @@ Sun Apr 18 12:40:04 1999 Lars Magne Ingebrigtsen * gnus-uu.el (gnus-uu-mark-thread): Save hidden threads. - * gnus-art.el (gnus-mime-inline-part): Don't do a charset param. + * gnus-art.el (gnus-mime-inline-part): Don't do a charset param. * gnus-msg.el (gnus-bug): Use application/x-emacs-lisp. * message.el (message-generate-headers): Accept continuation - headers. + headers. 1999-04-18 10:48:57 Renaud Rioboo @@ -3723,12 +4337,12 @@ Sun Apr 18 12:40:04 1999 Lars Magne Ingebrigtsen * message.el (message-inhibit-body-encoding): Typo. (message-resend): Inhibit encoding. - * gnus-sum.el (gnus-summary-toggle-header): Decode rfc2047. + * gnus-sum.el (gnus-summary-toggle-header): Decode rfc2047. * gnus-art.el (article-remove-cr): Use re-search. * rfc2231.el (rfc2231-parse-string): Allow broken elm MIME - headers. + headers. * mm-decode.el (mm-quote-arg): Quote '. @@ -3741,10 +4355,10 @@ Sun Apr 18 12:40:04 1999 Lars Magne Ingebrigtsen 1999-04-17 18:51:54 Lars Magne Ingebrigtsen - * nnvirtual.el (nnvirtual-request-expire-articles): New function. + * nnvirtual.el (nnvirtual-request-expire-articles): New function. * gnus-group.el (gnus-group-expire-articles-1): Made into own - function. + function. Sat Apr 17 16:41:30 1999 Lars Magne Ingebrigtsen @@ -3757,7 +4371,7 @@ Sat Apr 17 16:41:30 1999 Lars Magne Ingebrigtsen 1999-04-17 18:23:50 Lars Magne Ingebrigtsen - * mm-util.el (mm-charset-synonym-alist): Remove iso-2022-jp-2 from + * mm-util.el (mm-charset-synonym-alist): Remove iso-2022-jp-2 from synonym alist. 1999-04-17 18:03:38 Adam P. Jenkins @@ -3766,7 +4380,7 @@ Sat Apr 17 16:41:30 1999 Lars Magne Ingebrigtsen 1999-04-17 18:02:05 Ettore Perazzoli - * mail-source.el (mail-source-fetch): Ask before bugging out. + * mail-source.el (mail-source-fetch): Ask before bugging out. 1999-03-19 Hrvoje Niksic @@ -3776,7 +4390,7 @@ Sat Apr 17 16:41:30 1999 Lars Magne Ingebrigtsen 1999-03-18 Simon Josefsson * gnus-sum.el (gnus-update-marks): - (gnus-update-read-articles): + (gnus-update-read-articles): (gnus-summary-expire-articles): Check server. 1999-03-16 Simon Josefsson @@ -3786,7 +4400,7 @@ Sat Apr 17 16:41:30 1999 Lars Magne Ingebrigtsen 1999-04-17 17:10:21 William M. Perry * mail-source.el (mail-source-fetch-file): Return the right - value. + value. 1999-04-17 07:52:17 Lars Magne Ingebrigtsen @@ -3806,7 +4420,7 @@ Sat Apr 17 16:41:30 1999 Lars Magne Ingebrigtsen * mail-source.el (mail-sources): New variable. - * gnus-art.el (article-remove-cr): Remove several trailing CRs. + * gnus-art.el (article-remove-cr): Remove several trailing CRs. * mm-decode.el (mm-valid-image-format-p): New function. (mm-inline-media-tests): Use it. @@ -3818,7 +4432,7 @@ Sat Apr 17 16:41:30 1999 Lars Magne Ingebrigtsen 1999-04-12 Didier Verna * nnmail.el (nnmail-article-group): in case of a group name - containing "\\n" constructs, be sure to pass the expanded value to + containing "\\n" constructs, be sure to pass the expanded value to nn*-save-mail. Sat Apr 17 05:40:45 1999 Lars Magne Ingebrigtsen @@ -3862,7 +4476,7 @@ Sat Apr 17 05:40:45 1999 Lars Magne Ingebrigtsen 1999-03-28 13:19:50 Jae-you Chung * gnus.el (gnus-short-group-name): Use - gnus-group-uncollapsed-levels. + gnus-group-uncollapsed-levels. 1999-03-28 13:11:43 Lars Magne Ingebrigtsen @@ -3875,7 +4489,7 @@ Sat Apr 17 05:40:45 1999 Lars Magne Ingebrigtsen 1999-03-14 16:09:10 Lars Magne Ingebrigtsen - * mail-source.el (mail-source-fetch-pop): Check for symbol first. + * mail-source.el (mail-source-fetch-pop): Check for symbol first. * nnheader.el (nnheader-insert-file-contents): Bind enable-local-eval to nil. @@ -3896,15 +4510,15 @@ Sat Apr 17 05:40:45 1999 Lars Magne Ingebrigtsen * nnmail.el (nnmail-split-header-length-limit): Increased. (nnmail-article-group): Allow nil. - * gnus-cite.el (gnus-cite-parse-wrapper): Inhibit point-motion. + * gnus-cite.el (gnus-cite-parse-wrapper): Inhibit point-motion. * nndoc.el (nndoc-generate-mime-parts-head): Insert real headers - first. + first. * mml.el (mml-minibuffer-read-type): Include types from - mailcap-mime-data. + mailcap-mime-data. - * nndraft.el (nndraft-request-article): Would clobber Japanese. + * nndraft.el (nndraft-request-article): Would clobber Japanese. 1999-03-05 Hrvoje Niksic @@ -3947,7 +4561,7 @@ Sat Apr 17 05:40:45 1999 Lars Magne Ingebrigtsen * gnus-picon.el (gnus-picons-x-face-file-name): Removed. (gnus-picons-convert-x-face): Removed. (gnus-picons-article-display-x-face): Removed. - (gnus-picons-x-face-sentinel): Ditto. + (gnus-picons-x-face-sentinel): Ditto. (gnus-picons-display-x-face): Ditto. Thu Mar 4 01:38:00 1999 Lars Magne Ingebrigtsen @@ -3956,7 +4570,7 @@ Thu Mar 4 01:38:00 1999 Lars Magne Ingebrigtsen 1999-03-02 16:04:30 Lars Magne Ingebrigtsen - * gnus-art.el (gnus-mm-display-part): Narrow to the part itself. + * gnus-art.el (gnus-mm-display-part): Narrow to the part itself. * gnus-sum.el (gnus-with-article): Moved here. @@ -3990,7 +4604,7 @@ Thu Mar 4 01:38:00 1999 Lars Magne Ingebrigtsen 1999-02-27 23:44:52 paul stevenson - * gnus-sum.el (gnus-summary-toggle-header): Narrow to head first. + * gnus-sum.el (gnus-summary-toggle-header): Narrow to head first. 1999-02-27 17:17:47 Lars Magne Ingebrigtsen @@ -4001,7 +4615,7 @@ Thu Mar 4 01:38:00 1999 Lars Magne Ingebrigtsen * message.el (message-mode): Doc fix. * mm-encode.el (mm-content-transfer-encoding-defaults): Use 8bit - encoding. + encoding. * gnus.el (gnus-methods-equal-p): Moved here. @@ -4012,7 +4626,7 @@ Thu Mar 4 01:38:00 1999 Lars Magne Ingebrigtsen 1999-02-27 lantz moore - * nnmail.el (nnmail-get-new-mail): honor suffix for spool-files of + * nnmail.el (nnmail-get-new-mail): honor suffix for spool-files of type directory. 1999-03-04 Robert Bihlmeyer @@ -4026,7 +4640,7 @@ Fri Feb 26 18:54:16 1999 Lars Magne Ingebrigtsen 1999-02-26 18:11:04 Lars Magne Ingebrigtsen - * gnus-cite.el (gnus-cite-toggle): Don't remove highlighting. + * gnus-cite.el (gnus-cite-toggle): Don't remove highlighting. * mml.el (mml-mode): Don't use add-minor-mode. @@ -4049,7 +4663,7 @@ Fri Feb 26 17:00:25 1999 Lars Magne Ingebrigtsen * gnus-ems.el (gnus-mule-cite-add-face): Removed. * gnus-sum.el (gnus-summary-sort-by-chars): New command and - keystroke. + keystroke. * gnus-art.el (gnus-narrow-to-page): Revert. @@ -4057,7 +4671,7 @@ Fri Feb 26 17:00:25 1999 Lars Magne Ingebrigtsen (gnus-cite-parse-maybe): Always reparse. * message.el (message-encode-message-body): Don't insert - "multipart warning". + "multipart warning". * gnus-art.el (gnus-article-treat-head-custom): New variable. @@ -4070,7 +4684,7 @@ Fri Feb 26 17:00:25 1999 Lars Magne Ingebrigtsen 1999-02-26 07:39:33 Justin Sheehy * nnmail.el (nnmail-get-new-mail): Only get mail for the one - group. + group. 1999-02-26 07:38:08 SeokChan LEE @@ -4109,7 +4723,7 @@ Fri Feb 26 17:00:25 1999 Lars Magne Ingebrigtsen * mml.el (mml-insert-buffer): New function. - * message.el (message-forward): Insert the buffer in the buffer. + * message.el (message-forward): Insert the buffer in the buffer. Sun Feb 21 01:20:50 1999 Shenghuo ZHU @@ -4128,14 +4742,14 @@ Sat Feb 20 21:34:28 1999 Lars Magne Ingebrigtsen * gnus-art.el (gnus-displaying-mime): New variable. (article-narrow-to-head): New function. - * mail-source.el (mail-source-fetch-pop): Include pre/postscript. + * mail-source.el (mail-source-fetch-pop): Include pre/postscript. Default to pop instead of pop3. 1999-02-19 16:16:04 Lars Magne Ingebrigtsen * gnus-art.el (article-hide-pgp): Goto body. - * gnus-uu.el (gnus-uu-digest-mail-forward): Don't kill buffer. + * gnus-uu.el (gnus-uu-digest-mail-forward): Don't kill buffer. * gnus-cite.el: Don't use goto-line. @@ -4169,7 +4783,7 @@ Sat Feb 20 21:34:28 1999 Lars Magne Ingebrigtsen 1999-02-19 14:40:37 Lars Magne Ingebrigtsen - * gnus-group.el (gnus-group-get-new-news): Require nnmail. + * gnus-group.el (gnus-group-get-new-news): Require nnmail. 1999-02-18 Michael Cook @@ -4206,7 +4820,7 @@ Sat Feb 20 21:34:28 1999 Lars Magne Ingebrigtsen 1999-02-11 Matt Pharr * gnus-msg.el (gnus-bug): Encode environment info as a MIME - attachment. + attachment. Thu Feb 11 04:58:51 1999 Lars Magne Ingebrigtsen diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el index d9104f4..78be9e9 100644 --- a/lisp/gnus-agent.el +++ b/lisp/gnus-agent.el @@ -443,7 +443,7 @@ Currently sends flag setting requests, if any." (when (file-exists-p (gnus-agent-lib-file "flags")) (set-buffer (get-buffer-create " *Gnus Agent flag synchronize*")) (erase-buffer) - (insert-file-contents (gnus-agent-lib-file "flags")) + (nnheader-insert-file-contents (gnus-agent-lib-file "flags")) (if (null (gnus-check-server gnus-command-method)) (message "Couldn't open server %s" (nth 1 gnus-command-method)) (while (not (eobp)) @@ -453,7 +453,8 @@ Currently sends flag setting requests, if any." (write-file (gnus-agent-lib-file "flags")) (error "Couldn't set flags from file %s" (gnus-agent-lib-file "flags")))) - (write-file (gnus-agent-lib-file "flags"))))))) + (write-file (gnus-agent-lib-file "flags"))) + (kill-buffer nil))))) ;;; ;;; Server mode commands @@ -493,8 +494,12 @@ Currently sends flag setting requests, if any." (defun gnus-agent-write-servers () "Write the alist of covered servers." (gnus-make-directory (nnheader-concat gnus-agent-directory "lib")) - (with-temp-file (nnheader-concat gnus-agent-directory "lib/servers") - (prin1 gnus-agent-covered-methods (current-buffer)))) + (let ((coding-system-for-write nnheader-file-coding-system) + (output-coding-system nnheader-file-coding-system) + (file-name-coding-system nnmail-pathname-coding-system) + (pathname-coding-system nnmail-pathname-coding-system)) + (with-temp-file (nnheader-concat gnus-agent-directory "lib/servers") + (prin1 gnus-agent-covered-methods (current-buffer))))) ;;; ;;; Summary commands @@ -633,6 +638,10 @@ the actual number of articles toggled is returned." (defun gnus-agent-save-group-info (method group active) (when (gnus-agent-method-p method) (let* ((gnus-command-method method) + (coding-system-for-write nnheader-file-coding-system) + (output-coding-system nnheader-file-coding-system) + (file-name-coding-system nnmail-pathname-coding-system) + (pathname-coding-system nnmail-pathname-coding-system) (file (gnus-agent-lib-file "active")) oactive) (gnus-make-directory (file-name-directory file)) @@ -700,7 +709,7 @@ the actual number of articles toggled is returned." (insert "\n") (let ((file (gnus-agent-lib-file "history"))) (when (file-exists-p file) - (insert-file file)) + (nnheader-insert-file-contents file)) (set (make-local-variable 'gnus-agent-file-name) file)))) (defun gnus-agent-save-history () @@ -974,15 +983,17 @@ the actual number of articles toggled is returned." (defun gnus-agent-save-alist (group &optional articles state dir) "Save the article-state alist for GROUP." - (with-temp-file (if dir - (concat dir ".agentview") - (gnus-agent-article-name ".agentview" group)) - (princ (setq gnus-agent-article-alist - (nconc gnus-agent-article-alist - (mapcar (lambda (article) (cons article state)) - articles))) - (current-buffer)) - (insert "\n"))) + (let ((file-name-coding-system nnmail-pathname-coding-system) + (pathname-coding-system nnmail-pathname-coding-system)) + (with-temp-file (if dir + (concat dir ".agentview") + (gnus-agent-article-name ".agentview" group)) + (princ (setq gnus-agent-article-alist + (nconc gnus-agent-article-alist + (mapcar (lambda (article) (cons article state)) + articles))) + (current-buffer)) + (insert "\n")))) (defun gnus-agent-article-name (article group) (concat (gnus-agent-directory) (gnus-agent-group-path group) "/" diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index 02ccf53..9e01c05 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -210,9 +210,10 @@ regexp. If it matches, the text in question is not a signature." (defcustom gnus-article-x-face-command (cond + ;; Fixme: This isn't the right thing for mixed graphical and and + ;; non-graphical frames in a session. ((and (fboundp 'image-type-available-p) - (or (image-type-available-p 'xpm) - (image-type-available-p 'xbm))) + (image-type-available-p 'xbm)) 'gnus-article-display-xface) ((and (not gnus-xemacs) window-system @@ -270,6 +271,14 @@ is the face used for highlighting." face)) :group 'gnus-article-emphasis) +(defcustom gnus-emphasize-whitespace-regexp "^[ \t]+\\|[ \t]*\n" + "A regexp to describe whitespace which should not be emphasized. +Typical values are \"^[ \\t]+\\\\|[ \\t]*\\n\" and \"[ \\t]+\\\\|[ \\t]*\\n\". +The former avoids underlining of leading and trailing whitespace, +and the latter avoids underlining any whitespace at all." + :group 'gnus-article-emphasis + :type 'regexp) + (defface gnus-emphasis-bold '((t (:bold t))) "Face used for displaying strong emphasized text (*word*)." :group 'gnus-article-emphasis) @@ -1598,7 +1607,7 @@ If PROMPT (the prefix), prompt for a coding system to use." (set-buffer gnus-summary-buffer) (error)) gnus-newsgroup-ignored-charsets)) - ct cte ctl charset) + ct cte ctl charset format) (save-excursion (save-restriction (article-narrow-to-head) @@ -1610,7 +1619,8 @@ If PROMPT (the prefix), prompt for a coding system to use." (prompt (mm-read-coding-system "Charset to decode: ")) (ctl - (mail-content-type-get ctl 'charset)))) + (mail-content-type-get ctl 'charset))) + format (and ctl (mail-content-type-get ctl 'format))) (when cte (setq cte (mail-header-strip cte))) (if (and ctl (not (string-match "/" (car ctl)))) @@ -1619,8 +1629,13 @@ If PROMPT (the prefix), prompt for a coding system to use." (forward-line 1) (save-restriction (narrow-to-region (point) (point-max)) + (if (and (eq mail-parse-charset 'gnus-decoded) + (eq (mm-body-7-or-8) '8bit)) + ;; The text code could have been decoded. + (setq charset mail-parse-charset)) (when (and (or (not ctl) - (equal (car ctl) "text/plain"))) + (equal (car ctl) "text/plain")) + (not format)) ;; article with format will decode later. (mm-decode-body charset (and cte (intern (downcase (gnus-strip-whitespace cte)))) @@ -1649,6 +1664,23 @@ or not." (article-goto-body) (quoted-printable-decode-region (point) (point-max) charset))))) +(defun article-de-base64-unreadable (&optional force) + "Translate a base64 article. +If FORCE, decode the article whether it is marked as base64 not." + (interactive (list 'force)) + (save-excursion + (let ((buffer-read-only nil) + (type (gnus-fetch-field "content-transfer-encoding")) + (charset gnus-newsgroup-charset)) + (when (or force + (and type (string-match "quoted-printable" (downcase type)))) + (article-goto-body) + (save-restriction + (narrow-to-region (point) (point-max)) + (base64-decode-region (point-min) (point-max)) + (if (mm-coding-system-p charset) + (mm-decode-coding-region (point-min) (point-max) charset))))))) + (eval-when-compile (require 'rfc1843)) @@ -1660,6 +1692,23 @@ or not." (let ((buffer-read-only nil)) (rfc1843-decode-region (point-min) (point-max))))) +(defun article-wash-html () + "Format an html article." + (interactive) + (save-excursion + (let ((buffer-read-only nil) + (charset gnus-newsgroup-charset)) + (article-goto-body) + (save-window-excursion + (save-restriction + (narrow-to-region (point) (point-max)) + (mm-setup-w3) + (let ((w3-strict-width (window-width)) + (url-standalone-mode t)) + (condition-case var + (w3-region (point-min) (point-max)) + (error)))))))) + (defun article-hide-list-identifiers () "Remove list identifies from the Subject header. The `gnus-list-identifiers' variable specifies what to do." @@ -1674,9 +1723,14 @@ The `gnus-list-identifiers' variable specifies what to do." (when regexp (goto-char (point-min)) (when (re-search-forward - (concat "^Subject: +\\(Re: +\\)?\\(" regexp " *\\)") + (concat "^Subject: +\\(\\(\\(Re: +\\)?\\(" regexp + " *\\)\\)+\\(Re: +\\)?\\)") nil t) - (delete-region (match-beginning 2) (match-end 0))))))))) + (let ((s (or (match-string 3) (match-string 5)))) + (delete-region (match-beginning 1) (match-end 1)) + (when s + (goto-char (match-beginning 1)) + (insert s)))))))))) (defun article-hide-pgp () "Remove any PGP headers and signatures in the current article." @@ -2616,17 +2670,16 @@ If variable `gnus-use-long-file-name' is non-nil, it is gfunc (cdr func)) (setq afunc func gfunc (intern (format "gnus-%s" func)))) - (fset gfunc - (if (not (fboundp afunc)) - nil - `(lambda (&optional interactive &rest args) - ,(documentation afunc t) - (interactive (list t)) - (save-excursion - (set-buffer gnus-article-buffer) - (if interactive - (call-interactively ',afunc) - (apply ',afunc args)))))))) + (defalias gfunc + (if (fboundp afunc) + `(lambda (&optional interactive &rest args) + ,(documentation afunc t) + (interactive (list t)) + (save-excursion + (set-buffer gnus-article-buffer) + (if interactive + (call-interactively ',afunc) + (apply ',afunc args)))))))) '(article-hide-headers article-hide-boring-headers article-toggle-headers @@ -2636,7 +2689,9 @@ If variable `gnus-use-long-file-name' is non-nil, it is article-remove-cr article-display-x-face article-de-quoted-unreadable + article-de-base64-unreadable article-decode-HZ + article-wash-html article-hide-list-identifiers article-hide-pgp article-strip-banner @@ -3308,7 +3363,7 @@ value of the variable `gnus-show-mime' is non-nil." (gnus-article-check-buffer) (let* ((handle (or handle (get-text-property (point) 'gnus-data))) (mm-user-display-methods nil) - (mm-inline-large-images nil) + (mm-inlined-types nil) (mail-parse-charset gnus-newsgroup-charset) (mail-parse-ignored-charsets (save-excursion (set-buffer gnus-summary-buffer) @@ -3787,7 +3842,7 @@ In no internal viewer is available, use an external viewer." (if gnus-show-mime ?m ? ) (if emphasis ?e ? ))))) -(fset 'gnus-article-hide-headers-if-wanted 'gnus-article-maybe-hide-headers) +(defalias 'gnus-article-hide-headers-if-wanted 'gnus-article-maybe-hide-headers) (defun gnus-article-maybe-hide-headers () "Hide unwanted headers if `gnus-have-all-headers' is nil. @@ -4363,7 +4418,7 @@ groups." "Exit the article editing without updating." (interactive) ;; We remove all text props from the article buffer. - (let ((buf (format "%s" (buffer-string))) + (let ((buf (buffer-substring-no-properties (point-min) (point-max))) (curbuf (current-buffer)) (p (point)) (window-start (window-start))) @@ -4477,7 +4532,7 @@ after replacing with the original article." ;;; Internal Variables: -(defcustom gnus-button-url-regexp "\\b\\(\\(s?https?\\|ftp\\|file\\|gopher\\|news\\|telnet\\|wais\\|mailto\\):\\(//[-a-zA-Z0-9_.]+:[0-9]*\\)?\\([-a-zA-Z0-9_=!?#$@~`%&*+|\\/:;.,]\\|\\w\\)+\\([-a-zA-Z0-9_=#$@~`%&*+|\\/]\\|\\w\\)\\)\\|[-a-zA-Z0-9_]+\\.[-a-zA-Z0-9_]+\\(\\.[-a-zA-Z0-9_]+[-a-zA-Z0-9_/]+\\)+" +(defcustom gnus-button-url-regexp "\\b\\(\\(www\\.\\|\\(s?https?\\|ftp\\|file\\|gopher\\|news\\|telnet\\|wais\\|mailto\\):\\)\\(//[-a-zA-Z0-9_.]+:[0-9]*\\)?\\([-a-zA-Z0-9_=!?#$@~`%&*+|\\/:;.,]\\|\\w\\)+\\([-a-zA-Z0-9_=#$@~`%&*+|\\/]\\|\\w\\)\\)" "Regular expression that matches URLs." :group 'gnus-article-buttons :type 'regexp) diff --git a/lisp/gnus-cus.el b/lisp/gnus-cus.el index 1bc3c6c..95a9c87 100644 --- a/lisp/gnus-cus.el +++ b/lisp/gnus-cus.el @@ -256,7 +256,9 @@ Each entry has the form (NAME TYPE DOC), where NAME is the parameter itself (a symbol), TYPE is the parameters type (a sexp widget), and DOC is a documentation string for the parameter.") -(defconst gnus-extra-group-parameters nil +(defconst gnus-extra-group-parameters + '((uidvalidity (string :tag "IMAP uidvalidity") "\ +Server-assigned value attached to IMAP groups, used to maintain consistency.")) "Alist of group parameters that are not also topic parameters. Each entry has the form (NAME TYPE DOC), where NAME is the parameter @@ -305,7 +307,7 @@ DOC is a documentation string for the parameter.") :tag "topic parameters" "(gnus)Topic Parameters")) (widget-insert " for <") - (widget-insert (or group topic)) + (widget-insert (gnus-group-decoded-name (or group topic))) (widget-insert "> and press ") (widget-create 'push-button :tag "done" diff --git a/lisp/gnus-demon.el b/lisp/gnus-demon.el index e3704d0..75b8765 100644 --- a/lisp/gnus-demon.el +++ b/lisp/gnus-demon.el @@ -272,7 +272,8 @@ minutes, the connection is closed." (defun gnus-demon-scan-mail () (save-window-excursion (let ((servers gnus-opened-servers) - server) + server + (nnmail-fetched-sources (list t))) (while (setq server (car (pop servers))) (and (gnus-check-backend-function 'request-scan (car server)) (or (gnus-server-opened server) diff --git a/lisp/gnus-ems.el b/lisp/gnus-ems.el index c3b6dd3..6815584 100644 --- a/lisp/gnus-ems.el +++ b/lisp/gnus-ems.el @@ -167,9 +167,9 @@ (boundp 'mark-active) mark-active)) -(defun gnus-add-minor-mode (mode name map) - (if (fboundp 'add-minor-mode) - (add-minor-mode mode name map) +(if (fboundp 'add-minor-mode) + (defalias 'gnus-add-minor-mode 'add-minor-mode) + (defun gnus-add-minor-mode (mode name map) (set (make-local-variable mode) t) (unless (assq mode minor-mode-alist) (push `(,mode ,name) minor-mode-alist)) @@ -211,40 +211,56 @@ (goto-char (point-min)) (sit-for 0)))))) +(defvar gnus-article-xface-ring-internal nil + "Cache for face data.") + +;; Worth customizing? +(defvar gnus-article-xface-ring-size 6 + "Length of the ring used for `gnus-article-xface-ring-internal'.") + (defun gnus-article-display-xface (beg end) "Display an XFace header from between BEG and END in the current article. -This requires support for XPM or XBM images in your Emacs and the -external programs `uncompface', `icontopbm' and either `ppmtoxpm' (for -XPM support) or `ppmtoxbm' (for XBM support). On a GNU/Linux system -these might be in packages with names like `compface' or `faces-xface' -and `netpbm' or `libgr-progs', for instance. +This requires support images in your Emacs and the external programs +`uncompface', `icontopbm' and `ppmtoxbm'. On a GNU/Linux system these +might be in packages with names like `compface' or `faces-xface' and +`netpbm' or `libgr-progs', for instance. This function is for Emacs 21+. See `gnus-xmas-article-display-xface' for XEmacs." + ;; It might be worth converting uncompface's output in Lisp. + + (unless gnus-article-xface-ring-internal ; Only load ring when needed. + (setq gnus-article-xface-ring-internal + (make-ring gnus-article-xface-ring-size))) (save-excursion - (let ((cur (current-buffer)) - image type) - (when (and (fboundp 'image-type-available-p) - (cond ((image-type-available-p 'xpm) (setq type 'xpm)) - ((image-type-available-p 'xbm) (setq type 'xbm)))) - (with-temp-buffer - (insert-buffer-substring cur beg end) - (call-process-region (point-min) (point-max) "uncompface" - 'delete '(t nil)) - (goto-char (point-min)) - (insert "/* Width=48, Height=48 */\n") - (and (eq 0 (call-process-region (point-min) (point-max) "icontopbm" - 'delete '(t nil))) - (eq 0 (call-process-region (point-min) (point-max) - (if (eq type 'xpm) - "ppmtoxpm" - "pbmtoxbm") - 'delete '(t nil))) - (setq image (create-image (buffer-string) type t)))) - (when image - (goto-char (point-min)) - (re-search-forward "^From:" nil 'move) - (insert-image image " ")))))) + (let* ((cur (current-buffer)) + (data (buffer-substring beg end)) + (image (cdr-safe (assoc data (ring-elements + gnus-article-xface-ring-internal))))) + (when (if (fboundp 'display-graphic-p) + (display-graphic-p)) + (unless image + (let ((coding-system-for-read 'binary) + (coding-system-for-write 'binary)) + (with-temp-buffer + (insert data) + (and (eq 0 (call-process-region (point-min) (point-max) + "uncompface" + 'delete '(t nil))) + (goto-char (point-min)) + (progn (insert "/* Width=48, Height=48 */\n") t) + (eq 0 (call-process-region (point-min) (point-max) + "icontopbm" + 'delete '(t nil))) + (eq 0 (call-process-region (point-min) (point-max) + "pbmtoxbm" + 'delete '(t nil))) + (setq image (create-image (buffer-string) 'xbm t))))) + (ring-insert gnus-article-xface-ring-internal (cons data image)))) + (when image + (goto-char (point-min)) + (re-search-forward "^From:" nil 'move) + (insert-image image))))) (defun-maybe assoc-ignore-case (key alist) "Like `assoc', but assumes KEY is a string and ignores case when comparing." diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el index b43bef4..7367cd4 100644 --- a/lisp/gnus-group.el +++ b/lisp/gnus-group.el @@ -395,6 +395,24 @@ ticked: The number of ticked articles." :group 'gnus-group-icons :type '(repeat (cons (sexp :tag "Form") file))) +(defcustom gnus-group-name-charset-method-alist nil + "*Alist of method and the charset for group names. + +For example: + (((nntp \"news.com.cn\") . cn-gb-2312)) +" + :group 'gnus-charset + :type '(repeat (cons (sexp :tag "Method") (symbol :tag "Charset")))) + +(defcustom gnus-group-name-charset-group-alist nil + "*Alist of group regexp and the charset for group names. + +For example: + ((\"\\.com\\.cn:\" . cn-gb-2312)) +" + :group 'gnus-charset + :type '(repeat (cons (regexp :tag "Group") (symbol :tag "Charset")))) + ;;; Internal variables (defvar gnus-group-sort-alist-function 'gnus-group-sort-flat @@ -485,6 +503,7 @@ ticked: The number of ticked articles." "=" gnus-group-select-group "\r" gnus-group-select-group "\M-\r" gnus-group-quick-select-group + "\M- " gnus-group-visible-select-group [(meta control return)] gnus-group-select-group-ephemerally "j" gnus-group-jump-to-group "n" gnus-group-next-unread-group @@ -613,7 +632,8 @@ ticked: The number of ticked articles." "m" gnus-group-list-matching "M" gnus-group-list-all-matching "l" gnus-group-list-level - "c" gnus-group-list-cached) + "c" gnus-group-list-cached + "?" gnus-group-list-dormant) (gnus-define-keys (gnus-group-score-map "W" gnus-group-mode-map) "f" gnus-score-flush-cache) @@ -690,7 +710,8 @@ ticked: The number of ticked articles." ["List groups matching..." gnus-group-list-matching t] ["List all groups matching..." gnus-group-list-all-matching t] ["List active file" gnus-group-list-active t] - ["List groups with cached" gnus-group-list-cached t]) + ["List groups with cached" gnus-group-list-cached t] + ["List groups with dormant" gnus-group-list-dormant t]) ("Sort" ["Default sort" gnus-group-sort-groups t] ["Sort by method" gnus-group-sort-groups-by-method t] @@ -882,6 +903,29 @@ The following commands are available: (when gnus-carpal (gnus-carpal-setup-buffer 'group)))) +(defsubst gnus-group-name-charset (method group) + (if (null method) + (setq method (gnus-find-method-for-group group))) + (let ((item (assoc method gnus-group-name-charset-method-alist)) + (alist gnus-group-name-charset-group-alist) + result) + (if item + (cdr item) + (while (setq item (pop alist)) + (if (string-match (car item) group) + (setq alist nil + result (cdr item)))) + result))) + +(defsubst gnus-group-name-decode (string charset) + (if (and string charset (featurep 'mule)) + (decode-coding-string string charset) + string)) + +(defun gnus-group-decoded-name (string) + (let ((charset (gnus-group-name-charset nil string))) + (gnus-group-name-decode string charset))) + (defun gnus-group-list-groups (&optional level unread lowest) "List newsgroups with level LEVEL or lower that have unread articles. Default is all subscribed groups. @@ -1025,16 +1069,24 @@ If REGEXP, only list groups matching REGEXP." (when (string-match regexp group) (gnus-add-text-properties (point) (prog1 (1+ (point)) - (insert " " mark " *: " group "\n")) + (insert " " mark " *: " + (gnus-group-name-decode group + (gnus-group-name-charset + nil group)) + "\n")) (list 'gnus-group (gnus-intern-safe group gnus-active-hashtb) 'gnus-unread t 'gnus-level level)))) ;; This loop is used when listing all groups. (while groups + (setq group (pop groups)) (gnus-add-text-properties (point) (prog1 (1+ (point)) (insert " " mark " *: " - (setq group (pop groups)) "\n")) + (gnus-group-name-decode group + (gnus-group-name-charset + nil group)) + "\n")) (list 'gnus-group (gnus-intern-safe group gnus-active-hashtb) 'gnus-unread t 'gnus-level level)))))) @@ -1086,7 +1138,11 @@ If REGEXP, only list groups matching REGEXP." gnus-tmp-marked number gnus-tmp-method) "Insert a group line in the group buffer." - (let* ((gnus-tmp-active (gnus-active gnus-tmp-group)) + (let* ((gnus-tmp-method + (gnus-server-get-method gnus-tmp-group gnus-tmp-method)) + (group-name-charset (gnus-group-name-charset gnus-tmp-method + gnus-tmp-group)) + (gnus-tmp-active (gnus-active gnus-tmp-group)) (gnus-tmp-number-total (if gnus-tmp-active (1+ (- (cdr gnus-tmp-active) (car gnus-tmp-active))) @@ -1103,10 +1159,14 @@ If REGEXP, only list groups matching REGEXP." ((<= gnus-tmp-level gnus-level-unsubscribed) ?U) ((= gnus-tmp-level gnus-level-zombie) ?Z) (t ?K))) - (gnus-tmp-qualified-group (gnus-group-real-name gnus-tmp-group)) + (gnus-tmp-qualified-group + (gnus-group-name-decode (gnus-group-real-name gnus-tmp-group) + group-name-charset)) (gnus-tmp-newsgroup-description (if gnus-description-hashtb - (or (gnus-gethash gnus-tmp-group gnus-description-hashtb) "") + (or (gnus-group-name-decode + (gnus-gethash gnus-tmp-group gnus-description-hashtb) + group-name-charset) "") "")) (gnus-tmp-moderated (if (and gnus-moderated-hashtb @@ -1115,8 +1175,6 @@ If REGEXP, only list groups matching REGEXP." (gnus-tmp-moderated-string (if (eq gnus-tmp-moderated ?m) "(m)" "")) (gnus-tmp-group-icon "==&&==") - (gnus-tmp-method - (gnus-server-get-method gnus-tmp-group gnus-tmp-method)) ; (gnus-tmp-news-server (or (cadr gnus-tmp-method) "")) (gnus-tmp-news-method (or (car gnus-tmp-method) "")) (gnus-tmp-news-method-string @@ -1372,6 +1430,12 @@ If FIRST-TOO, the current line is also eligible as a target." ;; Group marking. +(defun gnus-group-mark-line-p () + (save-excursion + (beginning-of-line) + (forward-char (or (cdr (assq 'process gnus-group-mark-positions)) 2)) + (eq (char-after) gnus-process-mark))) + (defun gnus-group-mark-group (n &optional unmark no-advance) "Mark the current group." (interactive "p") @@ -1438,10 +1502,10 @@ If UNMARK, remove the mark instead." (gnus-group-set-mark group)))) (gnus-group-position-point)) -(defun gnus-group-remove-mark (group) +(defun gnus-group-remove-mark (group &optional test-marked) "Remove the process mark from GROUP and move point there. Return nil if the group isn't displayed." - (if (gnus-group-goto-group group) + (if (gnus-group-goto-group group nil test-marked) (save-excursion (gnus-group-mark-group 1 'unmark t) t) @@ -1520,7 +1584,7 @@ Take into consideration N (the prefix) and the list of marked groups." (eval `(defun gnus-group-iterate (arg ,function) "Iterate FUNCTION over all process/prefixed groups. -FUNCTION will be called with the group name as the paremeter +FUNCTION will be called with the group name as the parameter and with point over the group in question." (let ((,groups (gnus-group-process-prefix arg)) (,window (selected-window)) @@ -1711,41 +1775,56 @@ Return the name of the group if selection was successful." ;; Adjust cursor point. (gnus-group-position-point)) -(defun gnus-group-goto-group (group &optional far) +(defun gnus-group-goto-group (group &optional far test-marked) "Goto to newsgroup GROUP. -If FAR, it is likely that the group is not on the current line." +If FAR, it is likely that the group is not on the current line. +If TEST-MARKED, the line must be marked." (when group - (if far - (gnus-goto-char - (text-property-any - (point-min) (point-max) - 'gnus-group (gnus-intern-safe group gnus-active-hashtb))) - (beginning-of-line) - (cond - ;; It's quite likely that we are on the right line, so - ;; we check the current line first. - ((eq (get-text-property (point) 'gnus-group) - (gnus-intern-safe group gnus-active-hashtb)) - (point)) - ;; Previous and next line are also likely, so we check them as well. - ((save-excursion - (forward-line -1) - (eq (get-text-property (point) 'gnus-group) - (gnus-intern-safe group gnus-active-hashtb))) - (forward-line -1) - (point)) - ((save-excursion - (forward-line 1) - (eq (get-text-property (point) 'gnus-group) - (gnus-intern-safe group gnus-active-hashtb))) - (forward-line 1) - (point)) - (t - ;; Search through the entire buffer. - (gnus-goto-char - (text-property-any - (point-min) (point-max) - 'gnus-group (gnus-intern-safe group gnus-active-hashtb)))))))) + (beginning-of-line) + (cond + ;; It's quite likely that we are on the right line, so + ;; we check the current line first. + ((and (not far) + (eq (get-text-property (point) 'gnus-group) + (gnus-intern-safe group gnus-active-hashtb)) + (or (not test-marked) (gnus-group-mark-line-p))) + (point)) + ;; Previous and next line are also likely, so we check them as well. + ((and (not far) + (save-excursion + (forward-line -1) + (and (eq (get-text-property (point) 'gnus-group) + (gnus-intern-safe group gnus-active-hashtb)) + (or (not test-marked) (gnus-group-mark-line-p))))) + (forward-line -1) + (point)) + ((and (not far) + (save-excursion + (forward-line 1) + (and (eq (get-text-property (point) 'gnus-group) + (gnus-intern-safe group gnus-active-hashtb)) + (or (not test-marked) (gnus-group-mark-line-p))))) + (forward-line 1) + (point)) + (test-marked + (goto-char (point-min)) + (let (found) + (while (and (not found) + (gnus-goto-char + (text-property-any + (point) (point-max) + 'gnus-group + (gnus-intern-safe group gnus-active-hashtb)))) + (if (gnus-group-mark-line-p) + (setq found t) + (forward-line 1))) + found)) + (t + ;; Search through the entire buffer. + (gnus-goto-char + (text-property-any + (point-min) (point-max) + 'gnus-group (gnus-intern-safe group gnus-active-hashtb))))))) (defun gnus-group-next-group (n &optional silent) "Go to next N'th newsgroup. @@ -2018,7 +2097,7 @@ and NEW-NAME will be prompted for." ((eq part 'method) "select method") ((eq part 'params) "group parameters") (t "group info")) - group) + (gnus-group-decoded-name group)) `(lambda (form) (gnus-group-edit-group-done ',part ,group form))))) @@ -2388,14 +2467,14 @@ score file entries for articles to include in the group." l - lookup (mailbox is visible to LIST/LSUB commands) r - read (SELECT the mailbox, perform CHECK, FETCH, PARTIAL, SEARCH, COPY from mailbox) - s - keep seen/unseen information across sessions (STORE SEEN flag) - w - write (STORE flags other than SEEN and DELETED) + s - keep seen/unseen information across sessions (STORE \\SEEN flag) + w - write (STORE flags other than \\SEEN and \\DELETED) i - insert (perform APPEND, COPY into mailbox) p - post (send mail to submission address for mailbox, not enforced by IMAP4 itself) - c - create (CREATE new sub-mailboxes in any implementation-defined - hierarchy) - d - delete (STORE DELETED flag, perform EXPUNGE) + c - create and delete mailbox (CREATE new sub-mailboxes in any + implementation-defined hierarchy, RENAME or DELETE mailbox) + d - delete messages (STORE \\DELETED flag, perform EXPUNGE) a - administer (perform SETACL)" group) `(lambda (form) (nnimap-acl-edit @@ -2727,6 +2806,7 @@ or nil if no action could be taken." (or (gnus-group-find-parameter group 'expiry-target) nnmail-expiry-target))) (when expirable + (gnus-check-group group) (setcdr expirable (gnus-compress-sequence @@ -3076,10 +3156,14 @@ entail asking the server for the groups." group) (erase-buffer) (while groups + (setq group (pop groups)) (gnus-add-text-properties (point) (prog1 (1+ (point)) (insert " *: " - (setq group (pop groups)) "\n")) + (gnus-group-name-decode group + (gnus-group-name-charset + nil group)) + "\n")) (list 'gnus-group (gnus-intern-safe group gnus-active-hashtb) 'gnus-unread t 'gnus-level (inline (gnus-group-level group))))) @@ -3238,8 +3322,12 @@ to use." (mapatoms (lambda (group) (setq b (point)) - (insert (format " *: %-20s %s\n" (symbol-name group) - (symbol-value group))) + (let ((charset (gnus-group-name-charset nil (symbol-name group)))) + (insert (format " *: %-20s %s\n" + (gnus-group-name-decode + (symbol-name group) charset) + (gnus-group-name-decode + (symbol-value group) charset)))) (gnus-add-text-properties b (1+ b) (list 'gnus-group group 'gnus-unread t 'gnus-marked nil @@ -3281,11 +3369,13 @@ to use." (while groups ;; Groups may be entered twice into the list of groups. (when (not (string= (car groups) prev)) - (insert (setq prev (car groups)) "\n") - (when (and gnus-description-hashtb - (setq des (gnus-gethash (car groups) - gnus-description-hashtb))) - (insert " " des "\n"))) + (setq prev (car groups)) + (let ((charset (gnus-group-name-charset nil prev))) + (insert (gnus-group-name-decode prev charset) "\n") + (when (and gnus-description-hashtb + (setq des (gnus-gethash (car groups) + gnus-description-hashtb))) + (insert " " (gnus-group-name-decode des charset) "\n")))) (setq groups (cdr groups))) (goto-char (point-min)))) (pop-to-buffer obuf))) @@ -3604,10 +3694,31 @@ or `gnus-group-catchup-group-hook'." "" (gnus-time-iso8601 time)))) -(defun gnus-group-prepare-flat-predicate (level predicate &optional lowest) +(defun gnus-group-prepare-flat-list-dead-predicate + (groups level mark predicate) + (let (group) + (if predicate + ;; This loop is used when listing groups that match some + ;; regexp. + (while (setq group (pop groups)) + (when (funcall predicate group) + (gnus-add-text-properties + (point) (prog1 (1+ (point)) + (insert " " mark " *: " + (gnus-group-name-decode group + (gnus-group-name-charset + nil group)) + "\n")) + (list 'gnus-group (gnus-intern-safe group gnus-active-hashtb) + 'gnus-unread t + 'gnus-level level))))))) + +(defun gnus-group-prepare-flat-predicate (level predicate &optional lowest + dead-predicate) "List all newsgroups with unread articles of level LEVEL or lower. If LOWEST is non-nil, list all newsgroups of level LOWEST or higher. -If PREDICATE, only list groups which PREDICATE returns non-nil." +If PREDICATE, only list groups which PREDICATE returns non-nil. +If DEAD-PREDICATE, list dead groups which DEAD-PREDICATE returns non-nil." (set-buffer gnus-group-buffer) (let ((buffer-read-only nil) (newsrc (cdr gnus-newsrc-alist)) @@ -3629,6 +3740,17 @@ If PREDICATE, only list groups which PREDICATE returns non-nil." group (gnus-info-level info) (gnus-info-marks info) unread (gnus-info-method info)))) + ;; List dead groups. + (and (>= level gnus-level-zombie) (<= lowest gnus-level-zombie) + (gnus-group-prepare-flat-list-dead-predicate + (setq gnus-zombie-list (sort gnus-zombie-list 'string<)) + gnus-level-zombie ?Z + dead-predicate)) + (and (>= level gnus-level-killed) (<= lowest gnus-level-killed) + (gnus-group-prepare-flat-list-dead-predicate + (setq gnus-killed-list (sort gnus-killed-list 'string<)) + gnus-level-killed ?K dead-predicate)) + (gnus-group-set-mode-line) (setq gnus-group-list-mode (cons level t)) (gnus-run-hooks 'gnus-group-prepare-hook) @@ -3644,10 +3766,42 @@ This command may read the active file." (interactive "P") (when level (setq level (prefix-numeric-value level))) - (gnus-group-prepare-flat-predicate (or level gnus-level-killed) + (when (or (not level) (>= level gnus-level-zombie)) + (gnus-cache-open)) + (gnus-group-prepare-flat-predicate (or level gnus-level-subscribed) #'(lambda (info) (let ((marks (gnus-info-marks info))) (assq 'cache marks))) + lowest + #'(lambda (group) + (or (gnus-gethash group + gnus-cache-active-hashtb) + ;; Cache active file might use "." + ;; instead of ":". + (gnus-gethash + (mapconcat 'identity + (split-string group ":") + ".") + gnus-cache-active-hashtb)))) + (goto-char (point-min)) + (gnus-group-position-point)) + +(defun gnus-group-list-dormant (level &optional lowest) + "List all groups with dormant articles. +If the prefix LEVEL is non-nil, it should be a number that says which +level to cut off listing groups. +If LOWEST, don't list groups with level lower than LOWEST. + +This command may read the active file." + (interactive "P") + (when level + (setq level (prefix-numeric-value level))) + (when (or (not level) (>= level gnus-level-zombie)) + (gnus-cache-open)) + (gnus-group-prepare-flat-predicate (or level gnus-level-subscribed) + #'(lambda (info) + (let ((marks (gnus-info-marks info))) + (assq 'dormant marks))) lowest) (goto-char (point-min)) (gnus-group-position-point)) diff --git a/lisp/gnus-mailcap.el b/lisp/gnus-mailcap.el index 39eb7dc..a72730a 100644 --- a/lisp/gnus-mailcap.el +++ b/lisp/gnus-mailcap.el @@ -286,11 +286,42 @@ not.") (write-region (point-min) (point-max) file)) (kill-buffer (current-buffer)))) +(defvar mailcap-maybe-eval-warning + "*** WARNING *** + +This MIME part contains untrusted and possibly harmful content. +If you evaluate the Emacs Lisp code contained in it, a lot of nasty +things can happen. Please examine the code very carefully before you +instruct Emacs to evaluate it. You can browse the buffer containing +the code using \\[scroll-other-window]. + +If you are unsure what to do, please answer \"no\"." + "Text of warning message displayed by `mailcap-maybe-eval'. +Make sure that this text consists only of few text lines. Otherwise, +Gnus might fail to display all of it.") + (defun mailcap-maybe-eval () "Maybe evaluate a buffer of emacs lisp code." - (if (yes-or-no-p "This is emacs-lisp code, evaluate it? ") - (eval-buffer (current-buffer)) - (emacs-lisp-mode))) + (let ((lisp-buffer (current-buffer))) + (goto-char (point-min)) + (when + (save-window-excursion + (delete-other-windows) + (let ((buffer (get-buffer-create (generate-new-buffer-name + "*Warning*")))) + (unwind-protect + (with-current-buffer buffer + (insert (substitute-command-keys + mailcap-maybe-eval-warning)) + (goto-char (point-min)) + (display-buffer buffer) + (yes-or-no-p "This is emacs-lisp code, evaluate it? ")) + (kill-buffer buffer)))) + (eval-buffer (current-buffer))) + (when (buffer-live-p lisp-buffer) + (with-current-buffer lisp-buffer + (emacs-lisp-mode))))) + ;;; ;;; The mailcap parser diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el index 407ecf4..34d7dbd 100644 --- a/lisp/gnus-msg.el +++ b/lisp/gnus-msg.el @@ -121,7 +121,7 @@ BODY-LIST is a list of charsets which may be encoded using 8bit content-transfer encoding in the body, or one of the special values nil (always encode using quoted-printable) or t (always use 8bit). -Note that any value other tha nil for HEADER infringes some RFCs, so +Note that any value other than nil for HEADER infringes some RFCs, so use this option with care." :type '(repeat (list :tag "Permitted unencoded charsets" (choice :tag "Where" @@ -209,8 +209,8 @@ Thank you for your help in stamping out bugs. "\M-c" gnus-summary-mail-crosspost-complaint "om" gnus-summary-mail-forward "op" gnus-summary-post-forward - "Om" gnus-summary-mail-digest - "Op" gnus-summary-post-digest) + "Om" gnus-uu-digest-mail-forward + "Op" gnus-uu-digest-post-forward) (gnus-define-keys (gnus-send-bounce-map "D" gnus-summary-send-map) "b" gnus-summary-resend-bounced-mail @@ -488,9 +488,8 @@ header line with the old Message-ID." (gnus-remove-text-with-property 'x-face-mule-bitmap-image) (insert (prog1 - (format "%s" (buffer-string)) - (erase-buffer))) - ) + (buffer-substring-no-properties (point-min) (point-max)) + (erase-buffer)))) ;; Find the original headers. (set-buffer gnus-original-article-buffer) (goto-char (point-min)) @@ -521,6 +520,7 @@ header line with the old Message-ID." (article-buffer 'reply) (t 'message)) (let* ((group (or group gnus-newsgroup-name)) + (charset (gnus-group-name-charset nil group)) (pgroup group) to-address to-group mailing-list to-list newsgroup-p) @@ -531,7 +531,8 @@ header line with the old Message-ID." newsgroup-p (gnus-group-find-parameter group 'newsgroup) mailing-list (when gnus-mailing-list-groups (string-match gnus-mailing-list-groups group)) - group (gnus-group-real-name group))) + group (gnus-group-name-decode (gnus-group-real-name group) + charset))) (if (or (and to-group (gnus-news-group-p to-group)) newsgroup-p @@ -750,36 +751,36 @@ If FULL-HEADERS (the prefix), include full headers when forwarding." (if full-headers "" message-included-forward-headers))) (message-forward post)))) -;;; XXX: generate Subject and ``Topics''? -(defun gnus-summary-mail-digest (&optional n post) - "Digests and forwards all articles in this series." - (interactive "P") - (let ((subject "Digested Articles") - (articles (gnus-summary-work-articles n)) - article frame) - (gnus-setup-message 'forward - (gnus-summary-select-article) - (if post (message-news nil subject) (message-mail nil subject)) - (when (and message-use-multi-frames (cdr articles)) - (setq frame (window-frame (get-buffer-window (current-buffer))))) - (message-goto-body) - (while (setq article (pop articles)) - (save-window-excursion - (set-buffer gnus-summary-buffer) - (gnus-summary-select-article nil nil nil article) - (gnus-summary-remove-process-mark article)) - (when frame - (select-frame frame)) - (insert (mime-make-tag "message" "rfc822") "\n") - (insert-buffer-substring gnus-original-article-buffer)) - (push-mark) - (message-goto-body) - (mime-edit-enclose-digest-region (point)(mark t))))) - -(defun gnus-summary-post-digest (&optional n) - "Digest and forwards all articles in this series to a newsgroup." - (interactive "P") - (gnus-summary-mail-digest n t)) +;;;;; XXX: generate Subject and ``Topics''? +;;(defun gnus-summary-mail-digest (&optional n post) +;; "Digests and forwards all articles in this series." +;; (interactive "P") +;; (let ((subject "Digested Articles") +;; (articles (gnus-summary-work-articles n)) +;; article frame) +;; (gnus-setup-message 'forward +;; (gnus-summary-select-article) +;; (if post (message-news nil subject) (message-mail nil subject)) +;; (when (and message-use-multi-frames (cdr articles)) +;; (setq frame (window-frame (get-buffer-window (current-buffer))))) +;; (message-goto-body) +;; (while (setq article (pop articles)) +;; (save-window-excursion +;; (set-buffer gnus-summary-buffer) +;; (gnus-summary-select-article nil nil nil article) +;; (gnus-summary-remove-process-mark article)) +;; (when frame +;; (select-frame frame)) +;; (insert (mime-make-tag "message" "rfc822") "\n") +;; (insert-buffer-substring gnus-original-article-buffer)) +;; (push-mark) +;; (message-goto-body) +;; (mime-edit-enclose-digest-region (point)(mark t))))) +;; +;;(defun gnus-summary-post-digest (&optional n) +;; "Digest and forwards all articles in this series to a newsgroup." +;; (interactive "P") +;; (gnus-summary-mail-digest n t)) (defun gnus-summary-resend-message (address n) "Resend the current article to ADDRESS." @@ -1122,7 +1123,8 @@ this is a reply." (when gcc (message-remove-header "gcc") (widen) - (setq groups (message-tokenize-header gcc " ,")) + (setq groups (message-unquote-tokens + (message-tokenize-header gcc " ,"))) ;; Copy the article over to some group(s). (while (setq group (pop groups)) (gnus-check-server diff --git a/lisp/gnus-score.el b/lisp/gnus-score.el index 74f6aa4..57129eb 100644 --- a/lisp/gnus-score.el +++ b/lisp/gnus-score.el @@ -139,12 +139,6 @@ will be expired along with non-matching score entries." :group 'gnus-score-expire :type 'boolean) -(defcustom gnus-orphan-score nil - "*All orphans get this score added. Set in the score file." - :group 'gnus-score-default - :type '(choice (const nil) - integer)) - (defcustom gnus-decay-scores nil "*If non-nil, decay non-permanent scores." :group 'gnus-score-decay @@ -821,8 +815,9 @@ If optional argument `EXTRA' is non-nil, it's a non-standard overview header." ((eq type 'f) (setq match (gnus-simplify-subject-fuzzy match)))) (let ((score (gnus-score-delta-default score)) - (header (format "%s" (downcase header))) + (header (downcase header)) new) + (set-text-properties 0 (length header) nil header) (when prompt (setq match (read-string (format "Match %s on %s, %s: " @@ -837,8 +832,7 @@ If optional argument `EXTRA' is non-nil, it's a non-standard overview header." (int-to-string match) match)))) - ;; Get rid of string props. - (setq match (format "%s" match)) + (set-text-properties 0 (length match) nil match) ;; If this is an integer comparison, we transform from string to int. (when (eq (nth 2 (assoc header gnus-header-index)) 'gnus-score-integer) diff --git a/lisp/gnus-soup.el b/lisp/gnus-soup.el index 08c96c5..20a510a 100644 --- a/lisp/gnus-soup.el +++ b/lisp/gnus-soup.el @@ -67,9 +67,9 @@ The SOUP packet file name will be inserted at the %s.") ;;; Internal Variables: -(defvar gnus-soup-encoding-type ?n +(defvar gnus-soup-encoding-type ?u "*Soup encoding type. -`n' is news format, `m' is Unix mbox format, and `M' is MMDF mailbox +`u' is USENET news format, `m' is Unix mbox format, and `M' is MMDF mailbox format.") (defvar gnus-soup-index-type ?c @@ -245,7 +245,8 @@ Note -- this function hasn't been implemented yet." ;; a soup header. (setq head-line (cond - ((= gnus-soup-encoding-type ?n) + ((or (= gnus-soup-encoding-type ?u) + (= gnus-soup-encoding-type ?n)) ;;Gnus back compatibility. (format "#! rnews %d\n" (buffer-size))) ((= gnus-soup-encoding-type ?m) (while (search-forward "\nFrom " nil t) @@ -335,7 +336,9 @@ If NOT-ALL, don't pack ticked articles." (while (setq prefix (pop prefixes)) (erase-buffer) (insert (format "(setq gnus-soup-prev-prefix %d)\n" (cdr prefix))) - (gnus-write-buffer (concat (car prefix) gnus-soup-prefix-file)))))) + (gnus-write-buffer-as-coding-system + nnheader-text-coding-system + (concat (car prefix) gnus-soup-prefix-file)))))) (defun gnus-soup-pack (dir packer) (let* ((files (mapconcat 'identity @@ -513,9 +516,12 @@ Return whether the unpacking was successful." (tmp-buf (gnus-get-buffer-create " *soup send*")) beg end) (cond - ((/= (gnus-soup-encoding-format - (gnus-soup-reply-encoding (car replies))) - ?n) + ((and (/= (gnus-soup-encoding-format + (gnus-soup-reply-encoding (car replies))) + ?u) + (/= (gnus-soup-encoding-format + (gnus-soup-reply-encoding (car replies))) + ?n)) ;; Gnus back compatibility. (error "Unsupported encoding")) ((null msg-buf) t) diff --git a/lisp/gnus-srvr.el b/lisp/gnus-srvr.el index c7ae7b7..0a7304f 100644 --- a/lisp/gnus-srvr.el +++ b/lisp/gnus-srvr.el @@ -626,17 +626,17 @@ The following commands are available: (setq groups (sort groups (lambda (l1 l2) (string< (car l1) (car l2))))) - (let ((buffer-read-only nil) - (gnus-select-method nil) - name) + (let ((buffer-read-only nil) charset) (while groups - (setq group (car groups) - name (format "%s" (car group))) - (insert (if (cadr (gnus-gethash - (gnus-group-prefixed-name name method) - gnus-newsrc-hashtb)) - " " "K") - (format "%7d: " (cdr group)) name "\n") + (setq group (car groups)) + (setq charset (gnus-group-name-charset method group)) + (gnus-add-text-properties + (point) + (prog1 (1+ (point)) + (insert + (format "K%7d: %s\n" (cdr group) + (gnus-group-name-decode (car group) charset)))) + (list 'gnus-group (car group))) (setq groups (cdr groups)))) (switch-to-buffer (current-buffer)) (goto-char (point-min)) @@ -724,11 +724,12 @@ buffer. (defun gnus-browse-group-name () (save-excursion (beginning-of-line) - (when (re-search-forward ": \\(.*\\)$" (gnus-point-at-eol) t) - (gnus-group-prefixed-name - ;; Remove text props. - (format "%s" (match-string 1)) - gnus-browse-current-method)))) + (let ((name (get-text-property (point) 'gnus-group))) + (when (re-search-forward ": \\(.*\\)$" (gnus-point-at-eol) t) + (gnus-group-prefixed-name + (or name + (match-string-no-properties 1)) + gnus-browse-current-method))))) (defun gnus-browse-unsubscribe-group () "Toggle subscription of the current group in the browse buffer." diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el index e590e42..30937a7 100644 --- a/lisp/gnus-start.el +++ b/lisp/gnus-start.el @@ -1545,8 +1545,8 @@ newsgroup." (setq method (gnus-server-get-method nil method))))) (not (gnus-secondary-method-p method))) ;; These groups are foreign. Check the level. - (when (<= (gnus-info-level info) foreign-level) - (setq active (gnus-activate-group group 'scan)) + (when (and (<= (gnus-info-level info) foreign-level) + (setq active (gnus-activate-group group 'scan))) ;; Let the Gnus agent save the active file. (when (and gnus-agent gnus-plugged active) (gnus-agent-save-group-info @@ -1573,16 +1573,22 @@ newsgroup." ;; hack: `nnmail-get-new-mail' changes the mail-source depending ;; on the group, so we must perform a scan for every group ;; if the users has any directory mail sources. - (if (and (null (assq 'directory + ;; hack: if `nnmail-scan-directory-mail-source-once' is non-nil, + ;; for it scan all spool files even when the groups are + ;; not required. + (if (and + (or nnmail-scan-directory-mail-source-once + (null (assq 'directory (or mail-sources - (if (listp nnmail-spool-file) + (if (listp nnmail-spool-file) nnmail-spool-file - (list nnmail-spool-file))))) - (member method scanned-methods)) + (list nnmail-spool-file)))))) + (member method scanned-methods)) (setq active (gnus-activate-group group)) (setq active (gnus-activate-group group 'scan)) (push method scanned-methods)) - (inline (gnus-close-group group)))))) + (when active + (gnus-close-group group)))))) ;; Get the number of unread articles in the group. (cond @@ -1604,23 +1610,23 @@ newsgroup." (let* ((mg (pop retrievegroups)) (method (or (car mg) gnus-select-method)) (groups (cdr mg))) - (gnus-check-server method) - ;; Request that the backend scan its incoming messages. - (when (gnus-check-backend-function 'request-scan (car method)) - (gnus-request-scan nil method)) - (gnus-read-active-file-2 (mapcar (lambda (group) - (gnus-group-real-name group)) - groups) method) - (dolist (group groups) - (cond - ((setq active (gnus-active (gnus-info-group - (setq info (gnus-get-info group))))) - (inline (gnus-get-unread-articles-in-group info active t))) - (t - ;; The group couldn't be reached, so we nix out the number of - ;; unread articles and stuff. - (gnus-set-active group nil) - (setcar (gnus-gethash group gnus-newsrc-hashtb) t)))))) + (when (gnus-check-server method) + ;; Request that the backend scan its incoming messages. + (when (gnus-check-backend-function 'request-scan (car method)) + (gnus-request-scan nil method)) + (gnus-read-active-file-2 (mapcar (lambda (group) + (gnus-group-real-name group)) + groups) method) + (dolist (group groups) + (cond + ((setq active (gnus-active (gnus-info-group + (setq info (gnus-get-info group))))) + (inline (gnus-get-unread-articles-in-group info active t))) + (t + ;; The group couldn't be reached, so we nix out the number of + ;; unread articles and stuff. + (gnus-set-active group nil) + (setcar (gnus-gethash group gnus-newsrc-hashtb) t))))))) (gnus-message 5 "Checking new news...done"))) @@ -1805,14 +1811,14 @@ newsgroup." (gnus-check-server method) (let ((list-type (gnus-retrieve-groups groups method))) (cond ((not list-type) - (gnus-error + (gnus-error 1.2 "Cannot read partial active file from %s server." (car method))) ((eq list-type 'active) (gnus-active-to-gnus-format method gnus-active-hashtb nil t)) (t (gnus-groups-to-gnus-format method gnus-active-hashtb t))))))) - + ;; Read an active file and place the results in `gnus-active-hashtb'. (defun gnus-active-to-gnus-format (&optional method hashtb ignore-errors real-active) @@ -2632,7 +2638,8 @@ The backup file \".newsrc.eld_\" will be created before re-reading." (make-temp-name (concat gnus-current-startup-file "-slave-"))) (modes (ignore-errors (file-modes (concat gnus-current-startup-file ".eld"))))) - (gnus-write-buffer slave-name) + (gnus-write-buffer-as-coding-system + gnus-startup-file-coding-system slave-name) (when modes (set-file-modes slave-name modes))))) @@ -2662,7 +2669,7 @@ The backup file \".newsrc.eld_\" will be created before re-reading." (while slave-files (erase-buffer) (setq file (nth 1 (car slave-files))) - (insert-file-contents file) + (nnheader-insert-file-contents file) (when (condition-case () (progn (eval-buffer (current-buffer)) @@ -2781,7 +2788,8 @@ The backup file \".newsrc.eld_\" will be created before re-reading." "Declare backend NAME with ABILITIES as a Gnus backend." (setq gnus-valid-select-methods (nconc gnus-valid-select-methods - (list (apply 'list name abilities))))) + (list (apply 'list name abilities)))) + (gnus-redefine-select-method-widget)) (defun gnus-set-default-directory () "Set the default directory in the current buffer to `gnus-default-directory'. diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index 76ec96c..9378c23 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -930,6 +930,12 @@ For example: ((1 . cn-gb-2312) (2 . big5))." :type 'function :group 'gnus-summary) +(defcustom gnus-orphan-score nil + "*All orphans get this score added. Set in the score file." + :group 'gnus-score-default + :type '(choice (const nil) + integer)) + ;;; Internal variables (defvar gnus-article-mime-handles nil) @@ -1156,6 +1162,7 @@ end position and text.") gnus-score-alist gnus-current-score-file (gnus-summary-expunge-below . global) (gnus-summary-mark-below . global) + (gnus-orphan-score . global) gnus-newsgroup-active gnus-scores-exclude-files gnus-newsgroup-history gnus-newsgroup-ancient gnus-newsgroup-sparse gnus-newsgroup-process-stack @@ -1554,6 +1561,7 @@ increase the score of each group you read." "Q" gnus-article-fill-long-lines "C" gnus-article-capitalize-sentences "c" gnus-article-remove-cr + "Z" gnus-article-decode-HZ "f" gnus-article-display-x-face "l" gnus-summary-stop-page-breaking "r" gnus-summary-caesar-message @@ -1824,8 +1832,8 @@ increase the score of each group you read." ["Wide reply and yank" gnus-summary-wide-reply-with-original t] ["Mail forward" gnus-summary-mail-forward t] ["Post forward" gnus-summary-post-forward t] - ["Digest and mail" gnus-summary-mail-digest t] - ["Digest and post" gnus-summary-post-digest t] + ["Digest and mail" gnus-uu-digest-mail-forward t] + ["Digest and post" gnus-uu-digest-post-forward t] ["Resend message" gnus-summary-resend-message t] ["Send bounced mail" gnus-summary-resend-bounced-mail t] ["Send a mail" gnus-summary-mail-other-window t] @@ -4099,13 +4107,17 @@ or a straight list of headers." gnus-list-identifiers (mapconcat 'identity gnus-list-identifiers " *\\|")))) (dolist (header gnus-newsgroup-headers) - (when (string-match (concat "\\(Re: +\\)?\\(" regexp " *\\)") + (when (string-match (concat "\\(\\(\\(Re: +\\)?\\(" regexp + " *\\)\\)+\\(Re: +\\)?\\)") (mail-header-subject header)) (mail-header-set-subject header (concat (substring (mail-header-subject header) - 0 (match-beginning 2)) + 0 (match-beginning 1)) + (or + (match-string 3 (mail-header-subject header)) + (match-string 5 (mail-header-subject header))) (substring (mail-header-subject header) - (match-end 2)))))))) + (match-end 1)))))))) (defun gnus-select-newsgroup (group &optional read-all select-articles) "Select newsgroup GROUP. @@ -4482,7 +4494,11 @@ If WHERE is `summary', the summary mode line format will be used." (let* ((mformat (symbol-value (intern (format "gnus-%s-mode-line-format-spec" where)))) - (gnus-tmp-group-name gnus-newsgroup-name) + (gnus-tmp-group-name (gnus-group-name-decode + gnus-newsgroup-name + (gnus-group-name-charset + nil + gnus-newsgroup-name))) (gnus-tmp-article-number (or gnus-current-article 0)) (gnus-tmp-unread gnus-newsgroup-unreads) (gnus-tmp-unread-and-unticked (length gnus-newsgroup-unreads)) @@ -8692,6 +8708,37 @@ read." (gnus-summary-catchup all)) (gnus-summary-next-group)) +;;; +;;; with article +;;; + +(defmacro gnus-with-article (article &rest forms) + "Select ARTICLE and perform FORMS in the original article buffer. +Then replace the article with the result." + `(progn + ;; We don't want the article to be marked as read. + (let (gnus-mark-article-hook) + (gnus-summary-select-article t t nil ,article)) + (set-buffer gnus-original-article-buffer) + ,@forms + (if (not (gnus-check-backend-function + 'request-replace-article (car gnus-article-current))) + (gnus-message 5 "Read-only group; not replacing") + (unless (gnus-request-replace-article + ,article (car gnus-article-current) + (current-buffer) t) + (error "Couldn't replace article"))) + ;; The cache and backlog have to be flushed somewhat. + (when gnus-keep-backlog + (gnus-backlog-remove-article + (car gnus-article-current) (cdr gnus-article-current))) + (when gnus-use-cache + (gnus-cache-update-article + (car gnus-article-current) (cdr gnus-article-current))))) + +(put 'gnus-with-article 'lisp-indent-function 1) +(put 'gnus-with-article 'edebug-form-spec '(form body)) + ;; Thread-based commands. (defun gnus-summary-articles-in-thread (&optional article) @@ -9910,37 +9957,6 @@ groups." (call-interactively (function pgg-verify-region)))) ;;; -;;; with article -;;; - -(defmacro gnus-with-article (article &rest forms) - "Select ARTICLE and perform FORMS in the original article buffer. -Then replace the article with the result." - `(progn - ;; We don't want the article to be marked as read. - (let (gnus-mark-article-hook) - (gnus-summary-select-article t t nil ,article)) - (set-buffer gnus-original-article-buffer) - ,@forms - (if (not (gnus-check-backend-function - 'request-replace-article (car gnus-article-current))) - (gnus-message 5 "Read-only group; not replacing") - (unless (gnus-request-replace-article - ,article (car gnus-article-current) - (current-buffer) t) - (error "Couldn't replace article"))) - ;; The cache and backlog have to be flushed somewhat. - (when gnus-keep-backlog - (gnus-backlog-remove-article - (car gnus-article-current) (cdr gnus-article-current))) - (when gnus-use-cache - (gnus-cache-update-article - (car gnus-article-current) (cdr gnus-article-current))))) - -(put 'gnus-with-article 'lisp-indent-function 1) -(put 'gnus-with-article 'edebug-form-spec '(form body)) - -;;; ;;; Generic summary marking commands ;;; diff --git a/lisp/gnus-topic.el b/lisp/gnus-topic.el index 528fb5a..43a3c18 100644 --- a/lisp/gnus-topic.el +++ b/lisp/gnus-topic.el @@ -506,7 +506,7 @@ articles in the topic and its subtopics." (let ((data (cadr (gnus-topic-find-topology topic)))) (setcdr data (list (if insert 'visible 'invisible) - (if hide 'hide nil) + hide (cadddr data)))) (if total-remove (setq gnus-topic-alist @@ -545,15 +545,16 @@ articles in the topic and its subtopics." (gnus-topic-update-unreads name unread) (beginning-of-line) ;; Insert the text. - (gnus-add-text-properties - (point) - (prog1 (1+ (point)) - (eval gnus-topic-line-format-spec)) - (list 'gnus-topic (intern name) - 'gnus-topic-level level - 'gnus-topic-unread unread - 'gnus-active active-topic - 'gnus-topic-visible visiblep)))) + (if shownp + (gnus-add-text-properties + (point) + (prog1 (1+ (point)) + (eval gnus-topic-line-format-spec)) + (list 'gnus-topic (intern name) + 'gnus-topic-level level + 'gnus-topic-unread unread + 'gnus-active active-topic + 'gnus-topic-visible visiblep))))) (defun gnus-topic-update-unreads (topic unreads) (setq gnus-topic-unreads (delq (assoc topic gnus-topic-unreads) @@ -1131,13 +1132,21 @@ When used interactively, PARENT will be the topic under point." (gnus-group-list-groups) (gnus-topic-goto-topic topic)) +;; FIXME: +;; 1. When the marked groups are overlapped with the process +;; region, the behavior of move or remove is not right. +;; 2. Can't process on several marked groups with a same name, +;; because gnus-group-marked only keeps one copy. + (defun gnus-topic-move-group (n topic &optional copyp) "Move the next N groups to TOPIC. If COPYP, copy the groups instead." (interactive (list current-prefix-arg (completing-read "Move to topic: " gnus-topic-alist nil t))) - (let ((groups (gnus-group-process-prefix n)) + (let ((use-marked (and (not n) (not (gnus-region-active-p)) + gnus-group-marked t)) + (groups (gnus-group-process-prefix n)) (topicl (assoc topic gnus-topic-alist)) (start-topic (gnus-group-topic-name)) (start-group (progn (forward-line 1) (gnus-group-group-name))) @@ -1146,7 +1155,7 @@ If COPYP, copy the groups instead." (gnus-topic-move start-topic topic) (mapcar (lambda (g) - (gnus-group-remove-mark g) + (gnus-group-remove-mark g use-marked) (when (and (setq entry (assoc (gnus-current-topic) gnus-topic-alist)) (not copyp)) @@ -1159,18 +1168,24 @@ If COPYP, copy the groups instead." (gnus-topic-goto-topic start-topic)) (gnus-group-list-groups)))) -(defun gnus-topic-remove-group (&optional arg) +(defun gnus-topic-remove-group (&optional n) "Remove the current group from the topic." (interactive "P") - (gnus-group-iterate arg - (lambda (group) - (let ((topicl (assoc (gnus-current-topic) gnus-topic-alist)) - (buffer-read-only nil)) - (when (and topicl group) - (gnus-delete-line) - (gnus-delete-first group topicl)) - (gnus-topic-update-topic) - (gnus-group-position-point))))) + (let ((use-marked (and (not n) (not (gnus-region-active-p)) + gnus-group-marked t)) + (groups (gnus-group-process-prefix n))) + (mapcar + (lambda (group) + (gnus-group-remove-mark group use-marked) + (let ((topicl (assoc (gnus-current-topic) gnus-topic-alist)) + (buffer-read-only nil)) + (when (and topicl group) + (gnus-delete-line) + (gnus-delete-first group topicl)) + (gnus-topic-update-topic))) + groups) + (gnus-topic-enter-dribble) + (gnus-group-position-point))) (defun gnus-topic-copy-group (n topic) "Copy the current group to a topic." @@ -1247,13 +1262,13 @@ If COPYP, copy the groups instead." (interactive) (when (gnus-current-topic) (gnus-topic-goto-topic (gnus-current-topic)) - (gnus-topic-remove-topic nil nil 'hidden))) + (gnus-topic-remove-topic nil nil))) (defun gnus-topic-show-topic () "Show the hidden topic." (interactive) (when (gnus-group-topic-p) - (gnus-topic-remove-topic t nil 'shown))) + (gnus-topic-remove-topic t nil))) (defun gnus-topic-mark-topic (topic &optional unmark) "Mark all groups in the topic with the process mark." diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el index 366e76c..5b70701 100644 --- a/lisp/gnus-util.el +++ b/lisp/gnus-util.el @@ -570,17 +570,21 @@ Bind `print-quoted' and `print-readably' to t while printing." (defun gnus-make-directory (directory) "Make DIRECTORY (and all its parents) if it doesn't exist." - (when (and directory - (not (file-exists-p directory))) - (make-directory directory t)) + (let ((file-name-coding-system nnmail-pathname-coding-system) + (pathname-coding-system nnmail-pathname-coding-system)) + (when (and directory + (not (file-exists-p directory))) + (make-directory directory t))) t) (defun gnus-write-buffer (file) "Write the current buffer's contents to FILE." ;; Make sure the directory exists. (gnus-make-directory (file-name-directory file)) - ;; Write the buffer. - (write-region (point-min) (point-max) file nil 'quietly)) + (let ((file-name-coding-system nnmail-pathname-coding-system) + (pathname-coding-system nnmail-pathname-coding-system)) + ;; Write the buffer. + (write-region (point-min) (point-max) file nil 'quietly))) (defun gnus-write-buffer-as-binary (file) "Write the current buffer's contents to FILE without code conversion." @@ -614,7 +618,7 @@ Bind `print-quoted' and `print-readably' to t while printing." (save-excursion (save-restriction (goto-char beg) - (while (re-search-forward "[ \t]*\n" end 'move) + (while (re-search-forward gnus-emphasize-whitespace-regexp end 'move) (gnus-put-text-property beg (match-beginning 0) prop val) (setq beg (point))) (gnus-put-text-property beg (point) prop val))))) @@ -728,7 +732,8 @@ with potentially long computations." (set-buffer file-buffer) (rmail-insert-rmail-file-header) (let ((require-final-newline nil)) - (gnus-write-buffer filename))) + (gnus-write-buffer-as-coding-system + nnheader-text-coding-system filename))) (kill-buffer file-buffer)) (error "Output file does not exist"))) (set-buffer tmpbuf) @@ -779,7 +784,8 @@ with potentially long computations." (save-excursion (set-buffer file-buffer) (let ((require-final-newline nil)) - (gnus-write-buffer-as-binary filename))) + (gnus-write-buffer-as-coding-system + nnheader-text-coding-system filename))) (kill-buffer file-buffer)) (error "Output file does not exist"))) (set-buffer tmpbuf) @@ -902,8 +908,10 @@ ARG is passed to the first function." (forward-line 1)) (nreverse result))))) -(defun gnus-netrc-machine (list machine &optional port) - "Return the netrc values from LIST for MACHINE or for the default entry." +(defun gnus-netrc-machine (list machine &optional port defaultport) + "Return the netrc values from LIST for MACHINE or for the default entry. +If PORT specified, only return entries with matching port tokens. +Entries without port tokens default to DEFAULTPORT." (let ((rest list) result) (while list @@ -919,9 +927,9 @@ ARG is passed to the first function." (when result (setq result (nreverse result)) (while (and result - (not (equal (or port "nntp") + (not (equal (or port defaultport "nntp") (or (gnus-netrc-get (car result) "port") - "nntp")))) + defaultport "nntp")))) (pop result)) (car result)))) diff --git a/lisp/gnus-uu.el b/lisp/gnus-uu.el index c9ad08b..74ec1f4 100644 --- a/lisp/gnus-uu.el +++ b/lisp/gnus-uu.el @@ -294,7 +294,9 @@ so I simply dropped them." (defcustom gnus-uu-digest-headers '("^Date:" "^From:" "^To:" "^Cc:" "^Subject:" "^Message-ID:" "^Keywords:" - "^Summary:" "^References:" "^Content-Type:" "^Content-Transfer-Encoding:") + "^Summary:" "^References:" "^Content-Type:" "^Content-Transfer-Encoding:" + "^MIME-Version:" "^Content-Disposition:" "^Content-Description:" + "^Content-ID:" "^User-Agent:" "^X-Face:") "*List of regexps to match headers included in digested messages. The headers will be included in the sequence they are matched." :group 'gnus-extract @@ -348,6 +350,7 @@ didn't work, and overwrite existing files. Otherwise, ask each time." (defvar gnus-uu-default-dir gnus-article-save-directory) (defvar gnus-uu-digest-from-subject nil) +(defvar gnus-uu-digest-buffer nil) ;; Keymaps @@ -518,15 +521,13 @@ didn't work, and overwrite existing files. Otherwise, ask each time." (interactive "P") (let ((gnus-uu-save-in-digest t) (file (make-temp-name (nnheader-concat gnus-uu-tmp-dir "forward"))) - buf subject from) + gnus-uu-digest-buffer subject from) (gnus-setup-message 'forward (setq gnus-uu-digest-from-subject nil) + (setq gnus-uu-digest-buffer + (gnus-get-buffer-create " *gnus-uu-forward*")) (gnus-uu-decode-save n file) - (setq buf (switch-to-buffer - (gnus-get-buffer-create " *gnus-uu-forward*"))) - (erase-buffer) - (insert-file file) - (delete-file file) + (set-buffer gnus-uu-digest-buffer) (let ((fs gnus-uu-digest-from-subject)) (when fs (setq from (caar fs) @@ -548,15 +549,19 @@ didn't work, and overwrite existing files. Otherwise, ask each time." (if (gnus-news-group-p gnus-newsgroup-name) gnus-newsgroup-name "Various")))) - (goto-char (point-min)) - (when (re-search-forward "^Subject: ") - (delete-region (point) (gnus-point-at-eol)) - (insert subject)) - (goto-char (point-min)) - (when (re-search-forward "^From: ") - (delete-region (point) (gnus-point-at-eol)) - (insert from)) - (message-forward post)) + (mime-edit-enclose-digest-region (point-min) (point-max)) + (if post + (message-news nil (concat "[" from "] " subject)) + (message-mail nil (concat "[" from "] " subject))) + (message-goto-body) + ;; Make sure we're at the start of the line. + (unless (bolp) + (insert "\n")) + ;; Insert the forwarded buffer. + (insert-buffer gnus-uu-digest-buffer) + (kill-buffer gnus-uu-digest-buffer) + (set-text-properties (point-min) (point-max) nil) + (message-position-point)) (setq gnus-uu-digest-from-subject nil))) (defun gnus-uu-digest-post-forward (&optional n) @@ -815,7 +820,8 @@ When called interactively, prompt for REGEXP." (gnus-uu-save-separate-articles (save-excursion (set-buffer buffer) - (gnus-write-buffer + (gnus-write-buffer-as-coding-system + nnheader-text-coding-system (concat gnus-uu-saved-article-name gnus-current-article)) (cond ((eq in-state 'first) (list gnus-uu-saved-article-name 'begin)) ((eq in-state 'first-and-last) (list gnus-uu-saved-article-name @@ -848,9 +854,9 @@ When called interactively, prompt for REGEXP." (save-excursion (set-buffer (gnus-get-buffer-create "*gnus-uu-pre*")) (erase-buffer) - (insert (format - "Date: %s\nFrom: %s\nSubject: %s Digest\n\nTopics:\n" - (current-time-string) name name)))) + (unless gnus-uu-digest-buffer + (insert (format "From: %s\nSubject: %s Digest\n\n" name name))) + (insert "Topics:\n"))) (when (not (eq in-state 'end)) (setq state (list 'middle)))) (save-excursion @@ -866,12 +872,13 @@ When called interactively, prompt for REGEXP." (put-text-property (point-min) (point-max) 'intangible nil)) (goto-char (point-min)) (re-search-forward "\n\n") - ;; Quote all 30-dash lines. - (save-excursion - (while (re-search-forward "^-" nil t) - (beginning-of-line) - (delete-char 1) - (insert "- "))) + (unless gnus-uu-digest-buffer + ;; Quote all 30-dash lines. + (save-excursion + (while (re-search-forward "^-" nil t) + (beginning-of-line) + (delete-char 1) + (insert "- ")))) (setq body (buffer-substring (1- (point)) (point-max))) (narrow-to-region (point-min) (point)) (if (not (setq headers gnus-uu-digest-headers)) @@ -889,30 +896,49 @@ When called interactively, prompt for REGEXP." (1- (point))) (progn (forward-line 1) (point))))))))) (widen))) + (insert message-forward-start-separator) (insert sorthead) (goto-char (point-max)) (insert body) (goto-char (point-max)) - (insert (concat "\n" (make-string 30 ?-) "\n\n")) (goto-char beg) - (when (re-search-forward "^Subject: \\(.*\\)$" nil t) - (setq subj (buffer-substring (match-beginning 1) (match-end 1))) + (when (re-search-forward "^Subject:" nil t) + (setq subj (nnheader-decode-subject + (buffer-substring (match-end 0) (std11-field-end)))) (save-excursion (set-buffer "*gnus-uu-pre*") (insert (format " %s\n" subj))))) (when (or (eq in-state 'last) (eq in-state 'first-and-last)) - (save-excursion - (set-buffer "*gnus-uu-pre*") - (insert (format "\n\n%s\n\n" (make-string 70 ?-))) - (gnus-write-buffer gnus-uu-saved-article-name)) - (save-excursion - (set-buffer "*gnus-uu-body*") - (goto-char (point-max)) - (insert - (concat (setq end-string (format "End of %s Digest" name)) - "\n")) - (insert (concat (make-string (length end-string) ?*) "\n")) - (write-region - (point-min) (point-max) gnus-uu-saved-article-name t)) + (if gnus-uu-digest-buffer + (with-current-buffer gnus-uu-digest-buffer + (erase-buffer) + (insert-buffer "*gnus-uu-pre*") + (goto-char (point-max)) + (insert-buffer "*gnus-uu-body*")) + (save-excursion + (set-buffer "*gnus-uu-pre*") + (insert (format "\n\n%s\n\n" (make-string 70 ?-))) + (if gnus-uu-digest-buffer + (with-current-buffer gnus-uu-digest-buffer + (erase-buffer) + (insert-buffer "*gnus-uu-pre*")) + (gnus-write-buffer-as-coding-system + nnheader-text-coding-system gnus-uu-saved-article-name))) + (save-excursion + (set-buffer "*gnus-uu-body*") + (goto-char (point-max)) + (insert + (concat (setq end-string (format "End of %s Digest" name)) + "\n")) + (insert (concat (make-string (length end-string) ?*) "\n")) + (if gnus-uu-digest-buffer + (with-current-buffer gnus-uu-digest-buffer + (goto-char (point-max)) + (insert-buffer "*gnus-uu-body*")) + (let ((file-name-coding-system nnmail-pathname-coding-system) + (pathname-coding-system nnmail-pathname-coding-system)) + (write-region-as-coding-system + nnheader-text-coding-system + (point-min) (point-max) gnus-uu-saved-article-name t))))) (gnus-kill-buffer "*gnus-uu-pre*") (gnus-kill-buffer "*gnus-uu-body*") (push 'end state)) @@ -1484,6 +1510,21 @@ When called interactively, prompt for REGEXP." (cons (if (= (length files) 1) (car files) files) state) state)))) +(defvar gnus-uu-unshar-warning + "*** WARNING *** + +Shell archives are an archaic method of bundling files for distribution +across computer networks. During the unpacking process, arbitrary commands +are executed on your system, and all kinds of nasty things can happen. +Please examine the archive very carefully before you instruct Emacs to +unpack it. You can browse the archive buffer using \\[scroll-other-window]. + +If you are unsure what to do, please answer \"no\"." + "Text of warning message displayed by `gnus-uu-unshar-article'. +Make sure that this text consists only of few text lines. Otherwise, +Gnus might fail to display all of it.") + + ;; This function is used by `gnus-uu-grab-articles' to treat ;; a shared article. (defun gnus-uu-unshar-article (process-buffer in-state) @@ -1494,14 +1535,31 @@ When called interactively, prompt for REGEXP." (goto-char (point-min)) (if (not (re-search-forward gnus-uu-shar-begin-string nil t)) (setq state (list 'wrong-type)) - (beginning-of-line) - (setq start-char (point)) - (call-process-region - start-char (point-max) shell-file-name nil - (gnus-get-buffer-create gnus-uu-output-buffer-name) nil - shell-command-switch - (concat "cd " gnus-uu-work-dir " " - gnus-shell-command-separator " sh")))) + (save-window-excursion + (save-excursion + (switch-to-buffer (current-buffer)) + (delete-other-windows) + (let ((buffer (get-buffer-create (generate-new-buffer-name + "*Warning*")))) + (unless + (unwind-protect + (with-current-buffer buffer + (insert (substitute-command-keys + gnus-uu-unshar-warning)) + (goto-char (point-min)) + (display-buffer buffer) + (yes-or-no-p "This is a shell archive, unshar it? ")) + (kill-buffer buffer)) + (setq state (list 'error)))))) + (unless (memq 'error state) + (beginning-of-line) + (setq start-char (point)) + (call-process-region + start-char (point-max) shell-file-name nil + (gnus-get-buffer-create gnus-uu-output-buffer-name) nil + shell-command-switch + (concat "cd " gnus-uu-work-dir " " + gnus-shell-command-separator " sh"))))) state)) ;; Returns the name of what the shar file is going to unpack. diff --git a/lisp/gnus-vers.el b/lisp/gnus-vers.el index 74d2dc1..e447493 100644 --- a/lisp/gnus-vers.el +++ b/lisp/gnus-vers.el @@ -31,16 +31,16 @@ (require 'product) (provide 'gnus-vers) -(defconst gnus-revision-number "04" +(defconst gnus-revision-number "00" "Revision number for this version of gnus.") ;; Product information of this gnus. (product-provide 'gnus-vers (product-define "T-gnus" nil - (list 6 14 4 + (list 6 14 5 (string-to-number gnus-revision-number)))) -(defconst gnus-original-version-number "5.8.6" +(defconst gnus-original-version-number "5.8.7" "Version number for this version of Gnus.") (provide 'running-pterodactyl-gnus-0_73-or-later) diff --git a/lisp/gnus.el b/lisp/gnus.el index 62a4bc5..04924d4 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -752,15 +752,40 @@ be set in `.emacs' instead." (cond ((and (fboundp 'find-image) (display-graphic-p) - (let ((image (find-image '((:type xpm :file "gnus.xpm") - (:type xbm :file "gnus.xbm"))))) + (let ((image + (find-image + `((:type xpm :file "gnus.xpm" + :color-symbols + (("thing" . "#724214") + ("shadow" . "#1e3f03") + ("background" . ,(face-background 'default)))) + (:type xbm :file "gnus.xbm" + :foreground ,(face-foreground 'gnus-splash-face) + :background ,(face-background 'default)))))) (when image - (insert-image image " ") + (insert-image image) (goto-char (point-min)) - (while (not (eobp)) - (insert (make-string (/ (max (- (window-width) (or x 35)) 0) 2) - ?\ )) - (forward-line 1)) + (insert-char + ?\ ;; space + (max 0 (let ((cw (frame-char-width))) + (/ (+ (- (* (window-width) cw) 271) cw) 2 cw)))) + (goto-char (point-min)) + (insert gnus-product-name " " gnus-version-number + (if (zerop (string-to-number gnus-revision-number)) + "" + (concat " (r" gnus-revision-number ")")) + " based on " gnus-original-product-name " v" + gnus-original-version-number "\n") + (goto-char (point-min)) + (put-text-property (point) (gnus-point-at-eol) + 'face 'gnus-splash-face) + (insert-char ?\ ;; space + (max 0 (/ (- (window-width) (gnus-point-at-eol)) 2))) + (forward-line 1) + (insert-char + ?\n (max 0 + (let ((ch (frame-char-height))) + (/ (+ (- (* (1- (window-height)) ch) 273) ch) 2 ch)))) (setq gnus-simple-splash nil) t)))) (t @@ -1031,12 +1056,12 @@ list, Gnus will try all the methods in the list until it finds a match." :type '(choice (const :tag "default" nil) (const :tag "DejaNews" (nnweb "refer" (nnweb-type dejanews))) gnus-select-method - (repeat :menu-tag "Try multiple" + (repeat :menu-tag "Try multiple" :tag "Multiple" :value (current (nnweb "refer" (nnweb-type dejanews))) (choice :tag "Method" (const current) - (const :tag "DejaNews" + (const :tag "DejaNews" (nnweb "refer" (nnweb-type dejanews))) gnus-select-method)))) @@ -1097,11 +1122,6 @@ newsgroups." :group 'gnus-summary-marks :type 'character) -(defcustom gnus-asynchronous nil - "*If non-nil, Gnus will supply backends with data needed for async article fetching." - :group 'gnus-asynchronous - :type 'boolean) - (defcustom gnus-large-newsgroup 200 "*The number of articles which indicates a large newsgroup. If the number of articles in a newsgroup is greater than this value, @@ -1299,21 +1319,28 @@ this variable. I think." (const :format "%v " virtual) (const respool))))) -(define-widget 'gnus-select-method 'list - "Widget for entering a select method." - :value '(nntp "") - :tag "Select Method" - :args `((choice :tag "Method" - ,@(mapcar (lambda (entry) - (list 'const :format "%v\n" - (intern (car entry)))) - gnus-valid-select-methods)) - (string :tag "Address") - (repeat :tag "Options" - :inline t - (list :format "%v" - variable - (sexp :tag "Value"))))) +(defun gnus-redefine-select-method-widget () + "Recomputes the select-method widget based on the value of +`gnus-valid-select-methods'." + (define-widget 'gnus-select-method 'list + "Widget for entering a select method." + :value '(nntp "") + :tag "Select Method" + :args `((choice :tag "Method" + ,@(mapcar (lambda (entry) + (list 'const :format "%v\n" + (intern (car entry)))) + gnus-valid-select-methods) + (symbol :tag "other")) + (string :tag "Address") + (repeat :tag "Options" + :inline t + (list :format "%v" + variable + (sexp :tag "Value")))) + )) + +(gnus-redefine-select-method-widget) (defcustom gnus-updated-mode-lines '(group article summary tree) "List of buffers that should update their mode lines. @@ -1808,10 +1835,11 @@ use the article treating faculties instead. Is is described in Info node gnus-article-delete-invisible-text gnus-treat-article) ("gnus-art" :interactive t gnus-article-hide-headers gnus-article-hide-boring-headers - gnus-article-treat-overstrike + gnus-article-treat-overstrike gnus-article-remove-cr gnus-article-remove-trailing-blank-lines gnus-article-display-x-face gnus-article-decode-HZ + gnus-article-wash-html gnus-article-hide-pgp gnus-article-hide-pem gnus-article-hide-signature gnus-article-strip-leading-blank-lines gnus-article-date-local @@ -2866,7 +2894,7 @@ Allow completion over sensible values." (or (let ((opened gnus-opened-servers)) (while (and opened (not (equal (format "%s:%s" method address) - (format "%s:%s" (caaar opened) + (format "%s:%s" (caaar opened) (cadaar opened))))) (pop opened)) (caar opened)) diff --git a/lisp/imap.el b/lisp/imap.el index a690f34..919a250 100644 --- a/lisp/imap.el +++ b/lisp/imap.el @@ -138,8 +138,6 @@ (eval-when-compile (require 'cl)) (eval-when-compile (require 'static)) -(eval-when-compile - (ignore-errors (require 'sasl))) (eval-and-compile (autoload 'open-ssl-stream "ssl") @@ -152,7 +150,8 @@ (autoload 'utf7-encode "utf7") (autoload 'utf7-decode "utf7") (autoload 'format-spec "format-spec") - (autoload 'format-spec-make "format-spec")) + (autoload 'format-spec-make "format-spec") + (autoload 'sasl-digest-md5-digest-response "sasl")) ;; User variables. @@ -941,6 +940,10 @@ If EXAMINE is non-nil, do a read-only select." (imap-utf7-decode (imap-mailbox-select-1 (imap-utf7-encode mailbox) examine)))) +(defun imap-mailbox-examine-1 (mailbox &optional buffer) + (with-current-buffer (or buffer (current-buffer)) + (imap-mailbox-select-1 mailbox 'exmine))) + (defun imap-mailbox-examine (mailbox &optional buffer) "Examine MAILBOX on server in BUFFER." (imap-mailbox-select mailbox 'exmine buffer)) @@ -1279,7 +1282,7 @@ is non-nil return theese properties." (let ((old-mailbox imap-current-mailbox) (state imap-state) (imap-message-data (make-vector 2 0))) - (when (imap-mailbox-examine mailbox) + (when (imap-mailbox-examine-1 mailbox) (prog1 (and (imap-fetch "*" "UID") (list (imap-mailbox-get-1 'uidvalidity mailbox) @@ -1320,7 +1323,7 @@ first element, rest of list contain the saved articles' UIDs." (let ((old-mailbox imap-current-mailbox) (state imap-state) (imap-message-data (make-vector 2 0))) - (when (imap-mailbox-examine mailbox) + (when (imap-mailbox-examine-1 mailbox) (prog1 (and (imap-fetch "*" "UID") (list (imap-mailbox-get-1 'uidvalidity mailbox) @@ -2360,6 +2363,7 @@ Return nil if no complete line has arrived." imap-current-mailbox-p imap-mailbox-select-1 imap-mailbox-select + imap-mailbox-examine-1 imap-mailbox-examine imap-mailbox-unselect imap-mailbox-expunge diff --git a/lisp/lpath.el b/lisp/lpath.el index 5287845..49b5eae 100644 --- a/lisp/lpath.el +++ b/lisp/lpath.el @@ -49,8 +49,9 @@ find-coding-systems-for-charsets sc-cite-regexp vcard-pretty-print image-type-available-p put-image create-image display-graphic-p - find-image insert-image - make-overlay overlay-put make-symbolic-link)) + find-image insert-image image-size + make-overlay overlay-put make-symbolic-link + subst-char-in-string)) (maybe-bind '(global-face-data mark-active transient-mark-mode mouse-selection-click-count mouse-selection-click-count-buffer buffer-display-table @@ -103,14 +104,13 @@ url-generic-parse-url valid-image-instantiator-format-p babel-fetch babel-wash sc-cite-regexp put-image create-image display-graphic-p - find-image insert-image + find-image insert-image image-size vcard-pretty-print image-type-available-p coding-system-get find-coding-system find-coding-systems-for-charsets find-coding-systems-region font-lock-set-defaults function-max-args get-charset-property make-symbolic-link map-extents smiley-encode-buffer - toolbar-gnus - ))) + toolbar-gnus subst-char-in-string))) (setq load-path (cons "." load-path)) (require 'custom) diff --git a/lisp/mail-source.el b/lisp/mail-source.el index 022caa6..016fcc7 100644 --- a/lisp/mail-source.el +++ b/lisp/mail-source.el @@ -26,6 +26,7 @@ ;;; Code: (eval-when-compile (require 'cl)) +(require 'nnheader) (eval-and-compile (autoload 'pop3-movemail "pop3") (autoload 'pop3-get-message-count "pop3")) @@ -115,7 +116,8 @@ Common keywords should be listed here.") (:connection) (:authentication password)) (maildir - (:path "~/Maildir/new/") + (:path (or (getenv "MAILDIR") "~/Maildir/")) + (:subdirs ("new" "cur")) (:function)) (imap (:server (getenv "MAILHOST")) @@ -608,13 +610,36 @@ This only works when `display-time' is enabled." "Fetcher for maildir sources." (mail-source-bind (maildir source) (let ((found 0) - (mail-source-string (format "maildir:%s" path))) - (dolist (file (directory-files path t)) - (when (and (not (file-directory-p file)) - (not (if function - (funcall function file mail-source-crash-box) - (rename-file file mail-source-crash-box)))) - (incf found (mail-source-callback callback file)))) + mail-source-string) + (unless (string-match "/$" path) + (setq path (concat path "/"))) + (dolist (subdir subdirs) + (when (file-directory-p (concat path subdir)) + (setq mail-source-string (format "maildir:%s%s" path subdir)) + (dolist (file (directory-files (concat path subdir) t)) + (when (and (not (file-directory-p file)) + (not (if function + (funcall function file mail-source-crash-box) + (let ((coding-system-for-write + nnheader-text-coding-system) + (coding-system-for-read + nnheader-text-coding-system) + (output-coding-system + nnheader-text-coding-system) + (input-coding-system + nnheader-text-coding-system)) + (with-temp-file mail-source-crash-box + (insert-file-contents file) + (goto-char (point-min)) + (unless (looking-at "\n*From ") + (insert "From maildir " + (current-time-string) "\n")) + (while (re-search-forward "^From " nil t) + (replace-match ">From ")) + (goto-char (point-max)) + (insert "\n\n")) + (delete-file file))))) + (incf found (mail-source-callback callback file)))))) found))) (eval-and-compile @@ -628,8 +653,7 @@ This only works when `display-time' is enabled." (autoload 'imap-close "imap") (autoload 'imap-error-text "imap") (autoload 'imap-message-flags-add "imap") - (autoload 'imap-list-to-message-set "imap") - (autoload 'nnheader-ms-strip-cr "nnheader")) + (autoload 'imap-list-to-message-set "imap")) (defun mail-source-fetch-imap (source callback) "Fetcher for imap sources." diff --git a/lisp/message.el b/lisp/message.el index 5ba8ac0..1de2986 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -36,25 +36,20 @@ ;;; Code: -(eval-when-compile (require 'cl)) -(eval-when-compile (require 'smtp)) +(eval-when-compile + (require 'cl) + (require 'smtp) + (defvar gnus-list-identifiers)) ; gnus-sum is required where necessary (require 'mailheader) (require 'nnheader) -(require 'easymenu) -(if (string-match "XEmacs\\|Lucid" emacs-version) - (require 'mail-abbrevs) - (require 'mailabbrev)) (require 'mime-edit) (eval-when-compile (require 'static)) ;; Avoid byte-compile warnings. (eval-when-compile (require 'mail-parse) - (require 'mm-bodies) - (require 'mm-encode) - (require 'mml) - ) + (require 'mml)) (defgroup message '((user-mail-address custom-variable) (user-full-name custom-variable)) @@ -203,7 +198,8 @@ long-lines control-chars size new-text redirected-followup signature approved sender empty empty-headers message-id from subject shorten-followup-to existing-newsgroups buffer-file-name unchanged newsgroups." - :group 'message-news) + :group 'message-news + :type '(repeat sexp)) (defcustom message-required-news-headers '(From Newsgroups Subject Date Message-ID @@ -426,7 +422,7 @@ The provided functions are: :group 'message-interface :type 'regexp) -(defcustom message-forward-ignored-headers "Content-Transfer-Encoding" +(defcustom message-forward-ignored-headers "^Content-Transfer-Encoding:\\|^X-Gnus" "*All headers that match this regexp will be deleted when forwarding a message." :group 'message-forwarding :type '(choice (const :tag "None" nil) @@ -1357,6 +1353,7 @@ should be sent in several parts. If it is nil, the size is unlimited." (autoload 'mh-send-letter "mh-comp") (autoload 'gnus-point-at-eol "gnus-util") (autoload 'gnus-point-at-bol "gnus-util") + (autoload 'gnus-output-to-rmail "gnus-util") (autoload 'gnus-output-to-mail "gnus-util") (autoload 'mail-abbrev-in-expansion-header-p "mailabbrev") (autoload 'nndraft-request-associate-buffer "nndraft") @@ -1365,6 +1362,7 @@ should be sent in several parts. If it is nil, the size is unlimited." (autoload 'gnus-request-post "gnus-int") (autoload 'gnus-copy-article-buffer "gnus-msg") (autoload 'gnus-alive-p "gnus-util") + (autoload 'gnus-group-name-charset "gnus-group") (autoload 'rmail-output "rmail") (autoload 'mu-cite-original "mu-cite")) @@ -1399,9 +1397,19 @@ should be sent in several parts. If it is nil, the size is unlimited." `(delete-region (progn (beginning-of-line) (point)) (progn (forward-line ,(or n 1)) (point)))) +(defun message-unquote-tokens (elems) + "Remove leading and trailing double quotes (\") from quoted strings +in list." + (mapcar (lambda (item) + (if (string-match "^\"\\(.*\\)\"$" item) + (match-string 1 item) + item)) + elems)) + (defun message-tokenize-header (header &optional separator) "Split HEADER into a list of header elements. -\",\" is used as the separator." +SEPARATOR is a string of characters to be used as separators. \",\" +is used by default." (if (not header) nil (let ((regexp (format "[%s]+" (or separator ","))) @@ -1431,7 +1439,7 @@ should be sent in several parts. If it is nil, the size is unlimited." ((and (eq (char-after) ?\)) (not quoted)) (setq paren nil)))) - (nreverse elems))))) + (nreverse elems))))) (defun message-mail-file-mbox-p (file) "Say whether FILE looks like a Unix mbox file." @@ -1451,8 +1459,8 @@ should be sent in several parts. If it is nil, the size is unlimited." (when value (while (string-match "\n[\t ]+" value) (setq value (replace-match " " t t value))) - ;; We remove all text props. - (format "%s" value)))) + (set-text-properties 0 (length value) nil value) + value))) (defun message-narrow-to-field () "Narrow the buffer to the header on the current line." @@ -1505,6 +1513,21 @@ should be sent in several parts. If it is nil, the size is unlimited." (and (listp form) (eq (car form) 'lambda)) (byte-code-function-p form))) +(defun message-strip-list-identifiers (subject) + "Remove list identifiers in `gnus-list-identifiers'." + (require 'gnus-sum) ; for gnus-list-identifiers + (let ((regexp (if (stringp gnus-list-identifiers) + gnus-list-identifiers + (mapconcat 'identity gnus-list-identifiers " *\\|")))) + (if (string-match (concat "\\(\\(\\(Re: +\\)?\\(" regexp + " *\\)\\)+\\(Re: +\\)?\\)") subject) + (concat (substring subject 0 (match-beginning 1)) + (or (match-string 3 subject) + (match-string 5 subject)) + (substring subject + (match-end 1))) + subject))) + (defun message-strip-subject-re (subject) "Remove \"Re:\" from subject lines." (if (string-match message-subject-re-regexp subject) @@ -1838,8 +1861,15 @@ M-RET message-newline-and-reformat (break the line and reformat)." (copy-sequence message-startup-parameter-alist)) ;;(when (fboundp 'mail-hist-define-keys) ;; (mail-hist-define-keys)) - (when (string-match "XEmacs\\|Lucid" emacs-version) - (message-setup-toolbar)) + (if (featurep 'xemacs) + (message-setup-toolbar) + (set (make-local-variable 'font-lock-defaults) + '((message-font-lock-keywords + message-font-lock-keywords-1 + message-font-lock-keywords-2) + nil nil nil nil + (font-lock-mark-block-function . mark-paragraph)))) + (set (make-local-variable 'message-font-lock-last-position) nil) (easy-menu-add message-mode-menu message-mode-map) (easy-menu-add message-mode-field-menu message-mode-map) ;; Allow mail alias things. @@ -1848,14 +1878,6 @@ M-RET message-newline-and-reformat (break the line and reformat)." (mail-abbrevs-setup) (mail-aliases-setup))) (message-set-auto-save-file-name) - (unless (string-match "XEmacs" emacs-version) - (set (make-local-variable 'font-lock-defaults) - '((message-font-lock-keywords - message-font-lock-keywords-1 - message-font-lock-keywords-2) - nil nil nil nil - (font-lock-mark-block-function . mark-paragraph)))) - (set (make-local-variable 'message-font-lock-last-position) nil) (make-local-variable 'adaptive-fill-regexp) (setq adaptive-fill-regexp (concat "[ \t]*[-a-z0-9A-Z]*\\(>[ \t]*\\)+[ \t]*\\|" @@ -2843,7 +2865,8 @@ This sub function is for exclusive use of `message-send-mail'." (goto-char (point-max)) (insert "\n") (widen) - (funcall message-send-mail-function)) + (mm-with-unibyte-current-buffer + (funcall message-send-mail-function))) (setq n (+ n 1)) (setq p (pop plist)) (erase-buffer))) @@ -3091,6 +3114,7 @@ This sub function is for exclusive use of `message-send-news'." (method (if (message-functionp message-post-method) (funcall message-post-method arg) message-post-method)) + (group-name-charset (gnus-group-name-charset method "")) (message-syntax-checks (if arg (cons '(existing-newsgroups . disabled) @@ -3104,6 +3128,10 @@ This sub function is for exclusive use of `message-send-news'." (message-generate-headers message-required-news-headers) ;; Let the user do all of the above. (run-hooks 'message-header-hook)) + (if group-name-charset + (setq message-syntax-checks + (cons '(valid-newsgroups . disabled) + message-syntax-checks))) (message-cleanup-headers) (if (not (message-check-news-syntax)) nil @@ -3536,7 +3564,7 @@ This sub function is for exclusive use of `message-send-news'." "Append this article to Unix/babyl mail file.." (if (and (file-readable-p filename) (mail-file-babyl-p filename)) - (rmail-output-to-rmail-file filename t) + (gnus-output-to-rmail filename t) (gnus-output-to-mail filename t))) (defun message-cleanup-headers () @@ -4495,6 +4523,7 @@ that further discussion should take place only in " (defun message-reply (&optional to-address wide) "Start editing a reply to the article in the current buffer." (interactive) + (require 'gnus-sum) ; for gnus-list-identifiers (let ((cur (current-buffer)) from subject date references message-id follow-to @@ -4518,10 +4547,8 @@ that further discussion should take place only in " date (message-fetch-field "date") from (message-fetch-field "from") subject (or (message-fetch-field "subject") "none")) - ;; Remove any (buggy) Re:'s that are present and make a - ;; proper one. - (when (string-match message-subject-re-regexp subject) - (setq subject (substring subject (match-end 0)))) + (if gnus-list-identifiers + (setq subject (message-strip-list-identifiers subject))) (setq subject (message-make-followup-subject subject)) (when (and (setq gnus-warning (message-fetch-field "gnus-warning")) @@ -4603,8 +4630,8 @@ If TO-NEWSGROUPS, use that as the new Newsgroups line." (let ((case-fold-search t)) (string-match "world" distribution))) (setq distribution nil)) - ;; Remove any (buggy) Re:'s that are present and make a - ;; proper one. + (if gnus-list-identifiers + (setq subject (message-strip-list-identifiers subject))) (setq subject (message-make-followup-subject subject)) (widen)) @@ -5018,7 +5045,7 @@ Optional NEWS will use news to forward instead of mail." ;;;###autoload (defun message-bounce () "Re-mail the current message. -This only makes sense if the current message is a bounce message than +This only makes sense if the current message is a bounce message that contains some mail you have written which has been bounced back to you." (interactive) @@ -5319,17 +5346,20 @@ regexp varstr." ;;; Miscellaneous functions ;; stolen (and renamed) from nnheader.el -(defun message-replace-chars-in-string (string from to) - "Replace characters in STRING from FROM to TO." - (let ((string (substring string 0)) ;Copy string. - (len (length string)) - (idx 0)) - ;; Replace all occurrences of FROM with TO. - (while (< idx len) - (when (= (aref string idx) from) - (aset string idx to)) - (setq idx (1+ idx))) - string)) +(if (fboundp 'subst-char-in-string) + (defsubst message-replace-chars-in-string (string from to) + (subst-char-in-string from to string)) + (defun message-replace-chars-in-string (string from to) + "Replace characters in STRING from FROM to TO." + (let ((string (substring string 0)) ;Copy string. + (len (length string)) + (idx 0)) + ;; Replace all occurrences of FROM with TO. + (while (< idx len) + (when (= (aref string idx) from) + (aset string idx to)) + (setq idx (1+ idx))) + string))) ;;; ;;; MIME functions @@ -5385,9 +5415,9 @@ regexp varstr." (if (fboundp 'mail-abbrevs-setup) (let ((mail-abbrev-mode-regexp "") (minibuffer-setup-hook 'mail-abbrevs-setup)) - (read-from-minibuffer prompt))) - (let ((minibuffer-setup-hook 'mail-abbrev-minibuffer-setup-hook)) - (read-string prompt))) + (read-from-minibuffer prompt)) + (let ((minibuffer-setup-hook 'mail-abbrev-minibuffer-setup-hook)) + (read-string prompt)))) (defun message-save-drafts () "Postponing the message." diff --git a/lisp/mm-bodies.el b/lisp/mm-bodies.el index 8c42436..410d9f8 100644 --- a/lisp/mm-bodies.el +++ b/lisp/mm-bodies.el @@ -108,7 +108,7 @@ If no encoding was done, nil is returned." "Do Content-Transfer-Encoding and return the encoding of the current buffer." (let ((bits (mm-body-7-or-8))) (cond - ((eq bits '7bit) + ((and (not mm-use-ultra-safe-encoding) (eq bits '7bit)) bits) ((and (not mm-use-ultra-safe-encoding) (or (eq t (cdr message-posting-charset)) @@ -170,6 +170,10 @@ If no encoding was done, nil is returned." (goto-char (point-min)) (while (re-search-forward "^[\t ]*\r?\n" nil t) (delete-region (match-beginning 0) (match-end 0))) + (goto-char (point-max)) + (when (re-search-backward "^[A-Za-z0-9+/]+=*[\t ]*$" nil t) + (forward-line) + (delete-region (point) (point-max))) (point-max)))) ((memq encoding '(7bit 8bit binary)) ;; Do nothing. diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el index 7b23003..ef28aa1 100644 --- a/lisp/mm-decode.el +++ b/lisp/mm-decode.el @@ -210,6 +210,11 @@ to: (defvar mm-last-shell-command "") (defvar mm-content-id-alist nil) +;; According to RFC2046, in particular, in a digest, the default +;; Content-Type value for a body part is changed from "text/plain" to +;; "message/rfc822". +(defvar mm-dissect-default-type "text/plain") + ;;; The functions. (defun mm-dissect-buffer (&optional no-strict-mime) @@ -231,7 +236,7 @@ to: (if (or (not ctl) (not (string-match "/" (car ctl)))) (mm-dissect-singlepart - '("text/plain") + (list mm-dissect-default-type) (and cte (intern (downcase (mail-header-remove-whitespace (mail-header-remove-comments cte))))) @@ -245,7 +250,10 @@ to: result (cond ((equal type "multipart") - (cons (car ctl) (mm-dissect-multipart ctl))) + (let ((mm-dissect-default-type (if (equal subtype "digest") + "message/rfc822" + "text/plain"))) + (cons (car ctl) (mm-dissect-multipart ctl)))) (t (mm-dissect-singlepart ctl @@ -632,7 +640,7 @@ external if displayed external." (save-excursion (if (member (mm-handle-media-supertype handle) '("text" "message")) (with-temp-buffer - (insert-buffer-substring (mm-handle-buffer handle)) + (insert-buffer-substring (mm-handle-buffer handle)) (mm-decode-content-transfer-encoding (mm-handle-encoding handle) (mm-handle-media-type handle)) @@ -699,6 +707,8 @@ external if displayed external." (method (completing-read "Viewer: " methods))) (when (string= method "") (error "No method given")) + (if (string-match "^[^% \t]+$" method) + (setq method (concat method " %s"))) (mm-display-external (copy-sequence handle) method))) (defun mm-preferred-alternative (handles &optional preferred) @@ -787,10 +797,12 @@ external if displayed external." (or mm-inline-large-images (and (< (glyph-width image) (window-pixel-width)) (< (glyph-height image) (window-pixel-height)))) - ;; Let's just inline everything under Emacs 21, since the image - ;; specification there doesn't actually get the width/height - ;; until you render the image. - t))) + (let* ((size (image-size image)) + (w (car size)) + (h (cdr size))) + (or mm-inline-large-images + (and (< h (1- (window-height))) ; Don't include mode line. + (< w (window-width)))))))) (defun mm-valid-image-format-p (format) "Say whether FORMAT can be displayed natively by Emacs." diff --git a/lisp/mm-util.el b/lisp/mm-util.el index e945a2f..74cd23f 100644 --- a/lisp/mm-util.el +++ b/lisp/mm-util.el @@ -33,7 +33,10 @@ (iso-8859-3 latin-iso8859-3) (iso-8859-4 latin-iso8859-4) (iso-8859-5 cyrillic-iso8859-5) - (koi8-r cyrillic-iso8859-5) + ;; Non-mule (X)Emacs uses the last mule-charset for 8bit characters. + ;; The fake mule-charset, gnus-koi8-r, tells Gnus that the default + ;; charset is koi8-r, not iso-8859-5. + (koi8-r cyrillic-iso8859-5 gnus-koi8-r) (iso-8859-6 arabic-iso8859-6) (iso-8859-7 greek-iso8859-7) (iso-8859-8 hebrew-iso8859-8) @@ -331,7 +334,9 @@ See also `with-temp-file' and `with-output-to-string'." (coding-system-for-read mm-binary-coding-system) (coding-system-for-write mm-binary-coding-system)) (set-buffer-multibyte nil) + (setq-default enable-multibyte-characters nil) ,@forms) + (setq-default enable-multibyte-characters ,multibyte) (set-buffer-multibyte ,multibyte)))))) (put 'mm-with-unibyte-current-buffer 'lisp-indent-function 0) (put 'mm-with-unibyte-current-buffer 'edebug-form-spec '(body)) diff --git a/lisp/mm-uu.el b/lisp/mm-uu.el index 892d293..731e588 100644 --- a/lisp/mm-uu.el +++ b/lisp/mm-uu.el @@ -26,8 +26,8 @@ ;;; Code: +(eval-when-compile (require 'cl)) (require 'mail-parse) -(require 'message) (require 'nnheader) (require 'mm-decode) (require 'gnus-mailcap) diff --git a/lisp/mm-view.el b/lisp/mm-view.el index fe36cf6..6fb7289 100644 --- a/lisp/mm-view.el +++ b/lisp/mm-view.el @@ -43,7 +43,7 @@ (let ((b (point-marker)) buffer-read-only) (insert "\n") - (put-image (mm-get-image handle) b "x") + (put-image (mm-get-image handle) b) (mm-handle-set-undisplayer handle `(lambda () (remove-images ,b (1+ ,b)))))) @@ -65,8 +65,8 @@ (eval-and-compile (if (string-match "XEmacs" (emacs-version)) - (fset 'mm-inline-image 'mm-inline-image-xemacs) - (fset 'mm-inline-image 'mm-inline-image-emacs))) + (defalias 'mm-inline-image 'mm-inline-image-xemacs) + (defalias 'mm-inline-image 'mm-inline-image-emacs))) (defvar mm-w3-setup nil) (defun mm-setup-w3 () @@ -103,10 +103,11 @@ (and (boundp 'w3-meta-charset-content-type-regexp) (re-search-forward w3-meta-charset-content-type-regexp nil t))) - (setq charset (w3-coding-system-for-mime-charset - (buffer-substring-no-properties - (match-beginning 2) - (match-end 2))))) + (setq charset (or (w3-coding-system-for-mime-charset + (buffer-substring-no-properties + (match-beginning 2) + (match-end 2))) + charset))) (delete-region (point-min) (point-max)) (insert (mm-decode-string text charset)) (save-window-excursion diff --git a/lisp/mml.el b/lisp/mml.el index b966a17..d4a04b6 100644 --- a/lisp/mml.el +++ b/lisp/mml.el @@ -72,6 +72,29 @@ unknown encoding; `use-ascii': always use ASCII for those characters with unknown encoding; `multipart': always send messages with more than one charsets.") +(defvar mml-generate-mime-preprocess-function nil + "A function called before generating a mime part. +The function is called with one parameter, which is the part to be +generated.") + +(defvar mml-generate-mime-postprocess-function nil + "A function called after generating a mime part. +The function is called with one parameter, which is the generated part.") + +(defvar mml-generate-default-type "text/plain") + +(defvar mml-buffer-list nil) + +(defun mml-generate-new-buffer (name) + (let ((buf (generate-new-buffer name))) + (push buf mml-buffer-list) + buf)) + +(defun mml-destroy-buffers () + (let (kill-buffer-hook) + (mapcar 'kill-buffer mml-buffer-list) + (setq mml-buffer-list nil))) + (defun mml-parse () "Parse the current buffer as an MML document." (goto-char (point-min)) @@ -84,7 +107,7 @@ one charsets.") (defun mml-parse-1 () "Parse the current buffer as an MML document." - (let (struct tag point contents charsets warn use-ascii no-markup-p) + (let (struct tag point contents charsets warn use-ascii no-markup-p raw) (while (and (not (eobp)) (not (looking-at "<#/multipart"))) (cond @@ -95,14 +118,21 @@ one charsets.") struct)) (t (if (or (looking-at "<#part") (looking-at "<#mml")) - (setq tag (mml-read-tag)) + (setq tag (mml-read-tag) + no-markup-p nil + warn nil) (setq tag (list 'part '(type . "text/plain")) no-markup-p t warn t)) - (setq point (point) - contents (mml-read-part (eq 'mml (car tag))) - charsets (mm-find-mime-charset-region point (point))) - (when (memq nil charsets) + (setq raw (cdr (assq 'raw tag)) + point (point) + contents (if raw + (mm-with-unibyte-current-buffer + (mml-read-part (eq 'mml (car tag)))) + (mml-read-part (eq 'mml (car tag)))) + charsets (if raw nil + (mm-find-mime-charset-region point (point)))) + (when (and (not raw) (memq nil charsets)) (if (or (memq 'unknown-encoding mml-confirmation-set) (y-or-n-p "Warning: You message contains characters with unknown encoding. Really send?")) @@ -112,7 +142,9 @@ one charsets.") (setq charsets (delq nil charsets)) (setq warn nil)) (error "Edit your message to remove those characters"))) - (if (< (length charsets) 2) + (if (or raw + (eq 'mml (car tag)) + (< (length charsets) 2)) (if (or (not no-markup-p) (string-match "[^ \t\r\n]" contents)) ;; Don't create blank parts. @@ -125,7 +157,7 @@ one charsets.") (not (y-or-n-p (format - "Warning: Your message contains %d parts. Really send? " + "Warning: Your message contains more than %d parts. Really send? " (length nstruct))))) (error "Edit your message to use only one charset")) (setq struct (nconc nstruct struct))))))) @@ -136,56 +168,60 @@ one charsets.") (defun mml-parse-singlepart-with-multiple-charsets (orig-tag beg end &optional use-ascii) (save-excursion - (narrow-to-region beg end) - (goto-char (point-min)) - (let ((current (or (mm-mime-charset (mm-charset-after)) - (and use-ascii 'us-ascii))) - charset struct space newline paragraph) - (while (not (eobp)) - (cond - ;; The charset remains the same. - ((or (eq (setq charset (mm-mime-charset (mm-charset-after))) - 'us-ascii) - (and use-ascii (not charset)) - (eq charset current))) - ;; The initial charset was ascii. - ((eq current 'us-ascii) - (setq current charset - space nil - newline nil - paragraph nil)) - ;; We have a change in charsets. - (t - (push (append - orig-tag - (list (cons 'contents - (buffer-substring-no-properties - beg (or paragraph newline space (point)))))) - struct) - (setq beg (or paragraph newline space (point)) - current charset - space nil - newline nil - paragraph nil))) - ;; Compute places where it might be nice to break the part. - (cond - ((memq (following-char) '(? ?\t)) - (setq space (1+ (point)))) - ((eq (following-char) ?\n) - (setq newline (1+ (point)))) - ((and (eq (following-char) ?\n) - (not (bobp)) - (eq (char-after (1- (point))) ?\n)) - (setq paragraph (point)))) - (forward-char 1)) - ;; Do the final part. - (unless (= beg (point)) - (push (append orig-tag - (list (cons 'contents - (buffer-substring-no-properties - beg (point))))) - struct)) - struct))) + (save-restriction + (narrow-to-region beg end) + (goto-char (point-min)) + (let ((current (or (mm-mime-charset (mm-charset-after)) + (and use-ascii 'us-ascii))) + charset struct space newline paragraph) + (while (not (eobp)) + (setq charset (mm-mime-charset (mm-charset-after))) + (cond + ;; The charset remains the same. + ((eq charset 'us-ascii)) + ((or (and use-ascii (not charset)) + (eq charset current)) + (setq space nil + newline nil + paragraph nil)) + ;; The initial charset was ascii. + ((eq current 'us-ascii) + (setq current charset + space nil + newline nil + paragraph nil)) + ;; We have a change in charsets. + (t + (push (append + orig-tag + (list (cons 'contents + (buffer-substring-no-properties + beg (or paragraph newline space (point)))))) + struct) + (setq beg (or paragraph newline space (point)) + current charset + space nil + newline nil + paragraph nil))) + ;; Compute places where it might be nice to break the part. + (cond + ((memq (following-char) '(? ?\t)) + (setq space (1+ (point)))) + ((and (eq (following-char) ?\n) + (not (bobp)) + (eq (char-after (1- (point))) ?\n)) + (setq paragraph (point))) + ((eq (following-char) ?\n) + (setq newline (1+ (point))))) + (forward-char 1)) + ;; Do the final part. + (unless (= beg (point)) + (push (append orig-tag + (list (cons 'contents + (buffer-substring-no-properties + beg (point))))) + struct)) + struct)))) (defun mml-read-tag () "Read a tag and return the contents." @@ -254,111 +290,125 @@ If MML is non-nil, return the buffer up till the correspondent mml tag." (buffer-string))))) (defun mml-generate-mime-1 (cont) - (cond - ((or (eq (car cont) 'part) (eq (car cont) 'mml)) - (let (coded encoding charset filename type) - (setq type (or (cdr (assq 'type cont)) "text/plain")) - (if (member (car (split-string type "/")) '("text" "message")) - (with-temp-buffer + (save-restriction + (narrow-to-region (point) (point)) + (if mml-generate-mime-preprocess-function + (funcall mml-generate-mime-preprocess-function cont)) + (cond + ((or (eq (car cont) 'part) (eq (car cont) 'mml)) + (let ((raw (cdr (assq 'raw cont))) + coded encoding charset filename type) + (setq type (or (cdr (assq 'type cont)) "text/plain")) + (if (and (not raw) + (member (car (split-string type "/")) '("text" "message"))) + (with-temp-buffer + (cond + ((cdr (assq 'buffer cont)) + (insert-buffer-substring (cdr (assq 'buffer cont)))) + ((and (setq filename (cdr (assq 'filename cont))) + (not (equal (cdr (assq 'nofile cont)) "yes"))) + (mm-insert-file-contents filename)) + ((eq 'mml (car cont)) + (insert (cdr (assq 'contents cont)))) + (t + (save-restriction + (narrow-to-region (point) (point)) + (insert (cdr (assq 'contents cont))) + ;; Remove quotes from quoted tags. + (goto-char (point-min)) + (while (re-search-forward + "<#!+/?\\(part\\|multipart\\|external\\|mml\\)" nil t) + (delete-region (+ (match-beginning 0) 2) + (+ (match-beginning 0) 3)))))) + (cond + ((eq (car cont) 'mml) + (let ((mml-boundary (funcall mml-boundary-function + (incf mml-multipart-number))) + (mml-generate-default-type "text/plain")) + (mml-to-mime)) + (let ((mm-7bit-chars (concat mm-7bit-chars "\x1b"))) + ;; ignore 0x1b, it is part of iso-2022-jp + (setq encoding (mm-body-7-or-8)))) + ((string= (car (split-string type "/")) "message") + (let ((mm-7bit-chars (concat mm-7bit-chars "\x1b"))) + ;; ignore 0x1b, it is part of iso-2022-jp + (setq encoding (mm-body-7-or-8)))) + (t + (setq charset (mm-encode-body)) + (setq encoding (mm-body-encoding + charset (cdr (assq 'encoding cont)))))) + (setq coded (buffer-string))) + (mm-with-unibyte-buffer (cond ((cdr (assq 'buffer cont)) (insert-buffer-substring (cdr (assq 'buffer cont)))) ((and (setq filename (cdr (assq 'filename cont))) (not (equal (cdr (assq 'nofile cont)) "yes"))) - (mm-insert-file-contents filename)) - ((eq 'mml (car cont)) - (insert (cdr (assq 'contents cont)))) + (let ((coding-system-for-read mm-binary-coding-system)) + (mm-insert-file-contents filename nil nil nil nil t))) (t - (save-restriction - (narrow-to-region (point) (point)) - (insert (cdr (assq 'contents cont))) - ;; Remove quotes from quoted tags. - (goto-char (point-min)) - (while (re-search-forward - "<#!+/?\\(part\\|multipart\\|external\\|mml\\)" nil t) - (delete-region (+ (match-beginning 0) 2) - (+ (match-beginning 0) 3)))))) - (cond - ((eq (car cont) 'mml) - (let ((mml-boundary (funcall mml-boundary-function - (incf mml-multipart-number)))) - (mml-to-mime)) - (let ((mm-7bit-chars (concat mm-7bit-chars "\x1b"))) - ;; ignore 0x1b, it is part of iso-2022-jp - (setq encoding (mm-body-7-or-8)))) - ((string= (car (split-string type "/")) "message") - (let ((mm-7bit-chars (concat mm-7bit-chars "\x1b"))) - ;; ignore 0x1b, it is part of iso-2022-jp - (setq encoding (mm-body-7-or-8)))) - (t - (setq charset (mm-encode-body)) - (setq encoding (mm-body-encoding - charset (cdr (assq 'encoding cont)))))) - (setq coded (buffer-string))) - (mm-with-unibyte-buffer - (cond - ((cdr (assq 'buffer cont)) - (insert-buffer-substring (cdr (assq 'buffer cont)))) - ((and (setq filename (cdr (assq 'filename cont))) - (not (equal (cdr (assq 'nofile cont)) "yes"))) - (let ((coding-system-for-read mm-binary-coding-system)) - (mm-insert-file-contents filename nil nil nil nil t))) - (t - (insert (cdr (assq 'contents cont))))) - (setq encoding (mm-encode-buffer type) - coded (buffer-string)))) - (mml-insert-mime-headers cont type charset encoding) - (insert "\n") - (insert coded))) - ((eq (car cont) 'external) - (insert "Content-Type: message/external-body") - (let ((parameters (mml-parameter-string - cont '(expiration size permission))) - (name (cdr (assq 'name cont)))) - (when name - (setq name (mml-parse-file-name name)) - (if (stringp name) + (insert (cdr (assq 'contents cont))))) + (setq encoding (mm-encode-buffer type) + coded (buffer-string)))) + (mml-insert-mime-headers cont type charset encoding) + (insert "\n") + (mm-with-unibyte-current-buffer + (insert coded)))) + ((eq (car cont) 'external) + (insert "Content-Type: message/external-body") + (let ((parameters (mml-parameter-string + cont '(expiration size permission))) + (name (cdr (assq 'name cont)))) + (when name + (setq name (mml-parse-file-name name)) + (if (stringp name) + (mml-insert-parameter + (mail-header-encode-parameter "name" name) + "access-type=local-file") (mml-insert-parameter - (mail-header-encode-parameter "name" name) - "access-type=local-file") - (mml-insert-parameter - (mail-header-encode-parameter - "name" (file-name-nondirectory (nth 2 name))) - (mail-header-encode-parameter "site" (nth 1 name)) - (mail-header-encode-parameter - "directory" (file-name-directory (nth 2 name)))) - (mml-insert-parameter - (concat "access-type=" - (if (member (nth 0 name) '("ftp@" "anonymous@")) - "anon-ftp" - "ftp"))))) - (when parameters - (mml-insert-parameter-string - cont '(expiration size permission)))) - (insert "\n\n") - (insert "Content-Type: " (cdr (assq 'type cont)) "\n") - (insert "Content-ID: " (message-make-message-id) "\n") - (insert "Content-Transfer-Encoding: " - (or (cdr (assq 'encoding cont)) "binary")) - (insert "\n\n") - (insert (or (cdr (assq 'contents cont)))) - (insert "\n")) - ((eq (car cont) 'multipart) - (let* ((type (or (cdr (assq 'type cont)) "mixed")) - (handler (assoc type mml-generate-multipart-alist))) - (if handler - (funcall (cdr handler) cont) - ;; No specific handler. Use default one. - (let ((mml-boundary (mml-compute-boundary cont))) - (insert (format "Content-Type: multipart/%s; boundary=\"%s\"\n" - type mml-boundary)) - (setq cont (cddr cont)) - (while cont - (insert "\n--" mml-boundary "\n") - (mml-generate-mime-1 (pop cont))) - (insert "\n--" mml-boundary "--\n"))))) - (t - (error "Invalid element: %S" cont)))) + (mail-header-encode-parameter + "name" (file-name-nondirectory (nth 2 name))) + (mail-header-encode-parameter "site" (nth 1 name)) + (mail-header-encode-parameter + "directory" (file-name-directory (nth 2 name)))) + (mml-insert-parameter + (concat "access-type=" + (if (member (nth 0 name) '("ftp@" "anonymous@")) + "anon-ftp" + "ftp"))))) + (when parameters + (mml-insert-parameter-string + cont '(expiration size permission)))) + (insert "\n\n") + (insert "Content-Type: " (cdr (assq 'type cont)) "\n") + (insert "Content-ID: " (message-make-message-id) "\n") + (insert "Content-Transfer-Encoding: " + (or (cdr (assq 'encoding cont)) "binary")) + (insert "\n\n") + (insert (or (cdr (assq 'contents cont)))) + (insert "\n")) + ((eq (car cont) 'multipart) + (let* ((type (or (cdr (assq 'type cont)) "mixed")) + (mml-generate-default-type (if (equal type "digest") + "message/rfc822" + "text/plain")) + (handler (assoc type mml-generate-multipart-alist))) + (if handler + (funcall (cdr handler) cont) + ;; No specific handler. Use default one. + (let ((mml-boundary (mml-compute-boundary cont))) + (insert (format "Content-Type: multipart/%s; boundary=\"%s\"\n" + type mml-boundary)) + ;; Skip `multipart' and `type' elements. + (setq cont (cddr cont)) + (while cont + (insert "\n--" mml-boundary "\n") + (mml-generate-mime-1 (pop cont))) + (insert "\n--" mml-boundary "--\n"))))) + (t + (error "Invalid element: %S" cont))) + (if mml-generate-mime-postprocess-function + (funcall mml-generate-mime-postprocess-function cont)))) (defun mml-compute-boundary (cont) "Return a unique boundary that does not exist in CONT." @@ -413,7 +463,7 @@ If MML is non-nil, return the buffer up till the correspondent mml tag." cont '(name access-type expiration size permission))) (when (or charset parameters - (not (equal type "text/plain"))) + (not (equal type mml-generate-default-type))) (when (consp charset) (error "Can't encode a part with several charsets.")) @@ -466,13 +516,13 @@ If MML is non-nil, return the buffer up till the correspondent mml tag." (mail-header-encode-parameter (symbol-name type) value)))))) -(defvar ange-ftp-path-format) +(defvar ange-ftp-name-format) (defvar efs-path-regexp) (defun mml-parse-file-name (path) (if (if (boundp 'efs-path-regexp) (string-match efs-path-regexp path) - (if (boundp 'ange-ftp-path-format) - (string-match (car ange-ftp-path-format)))) + (if (boundp 'ange-ftp-name-format) + (string-match (car ange-ftp-name-format) path))) (list (match-string 1 path) (match-string 2 path) (substring path (1+ (match-end 2)))) path)) @@ -515,7 +565,8 @@ If MML is non-nil, return the buffer up till the correspondent mml tag." (message-encode-message-body) (save-restriction (message-narrow-to-headers-or-head) - (mail-encode-encoded-word-buffer))) + (let ((mail-parse-charset message-default-charset)) + (mail-encode-encoded-word-buffer)))) (defun mml-insert-mime (handle &optional no-markup) (let (textp buffer mmlp) @@ -523,7 +574,7 @@ If MML is non-nil, return the buffer up till the correspondent mml tag." (unless (stringp (car handle)) (unless (setq textp (equal (mm-handle-media-supertype handle) "text")) (save-excursion - (set-buffer (setq buffer (generate-new-buffer " *mml*"))) + (set-buffer (setq buffer (mml-generate-new-buffer " *mml*"))) (mm-insert-part handle) (if (setq mmlp (equal (mm-handle-media-type handle) "message/rfc822")) @@ -597,7 +648,7 @@ If MML is non-nil, return the buffer up till the correspondent mml tag." (define-key map "p" 'mml-insert-part) (define-key map "v" 'mml-validate) (define-key map "P" 'mml-preview) - (define-key map "n" 'mml-narrow-to-part) + ;;(define-key map "n" 'mml-narrow-to-part) (define-key main "\M-m" map) main)) @@ -611,7 +662,7 @@ If MML is non-nil, return the buffer up till the correspondent mml tag." ("Insert" ["Multipart" mml-insert-multipart t] ["Part" mml-insert-part t]) - ["Narrow" mml-narrow-to-part t] + ;;["Narrow" mml-narrow-to-part t] ["Quote" mml-quote-region t] ["Validate" mml-validate t] ["Preview" mml-preview t])) @@ -702,7 +753,7 @@ If MML is non-nil, return the buffer up till the correspondent mml tag." (goto-char (point-min)) ;; Quote parts. (while (re-search-forward - "<#/?!*\\(multipart\\|part\\|external\\|mml\\)" nil t) + "<#!*/?\\(multipart\\|part\\|external\\|mml\\)" nil t) ;; Insert ! after the #. (goto-char (+ (match-beginning 0) 2)) (insert "!"))))) @@ -792,7 +843,9 @@ If RAW, don't highlight the article." (interactive "P") (let ((buf (current-buffer)) (message-posting-charset (or (gnus-setup-posting-charset - (message-fetch-field "Newsgroups")) + (save-restriction + (message-narrow-to-headers-or-head) + (message-fetch-field "Newsgroups"))) message-posting-charset))) (switch-to-buffer (get-buffer-create (concat (if raw "*Raw MIME preview of " @@ -803,7 +856,8 @@ If RAW, don't highlight the article." (concat "^" (regexp-quote mail-header-separator) "\n") nil t) (replace-match "\n")) (mml-to-mime) - (unless raw + (if raw + (mm-disable-multibyte) (let ((gnus-newsgroup-charset (car message-posting-charset))) (run-hooks 'gnus-article-decode-hook) (let ((gnus-newsgroup-name "dummy")) diff --git a/lisp/nndoc.el b/lisp/nndoc.el index 363ff3c..15e10db 100644 --- a/lisp/nndoc.el +++ b/lisp/nndoc.el @@ -71,8 +71,8 @@ from the document.") (body-begin-function . nndoc-babyl-body-begin) (head-begin-function . nndoc-babyl-head-begin)) (forward - (article-begin . "^-+ \\(Start of \\)?forwarded message -+\n+") - (body-end . "^-+ End \\(of \\)?forwarded message -+$") + (article-begin . "^-+ \\(Start of \\)?forwarded message.*\n+") + (body-end . "^-+ End \\(of \\)?forwarded message.*$") (prepare-body-function . nndoc-unquote-dashes)) (rfc934 (article-begin . "^--.*\n+") @@ -87,6 +87,7 @@ from the document.") (article-transform-function . nndoc-transform-clari-briefs)) (mime-digest (article-begin . "") + (head-begin . "^ ?\n") (head-end . "^ ?$") (body-end . "") (file-end . "") @@ -432,7 +433,8 @@ from the document.") t)) (defun nndoc-forward-type-p () - (when (and (re-search-forward "^-+ Start of forwarded message -+\n+" nil t) + (when (and (re-search-forward "^-+ \\(Start of \\)?forwarded message.*\n+" + nil t) (not (re-search-forward "^Subject:.*digest" nil t)) (not (re-search-backward "^From:" nil t 2)) (not (re-search-forward "^From:" nil t 2))) @@ -526,10 +528,11 @@ from the document.") nil t) (match-beginning 1)) (setq boundary-id (match-string 1) - b-delimiter (concat "\n--" boundary-id "[\n \t]+")) + b-delimiter (concat "\n--" boundary-id "[ \t]*$")) (setq entry (assq 'mime-digest nndoc-type-alist)) (setcdr entry (list + (cons 'head-begin "^ ?\n") (cons 'head-end "^ ?$") (cons 'body-begin "^ ?\n") (cons 'article-begin b-delimiter) diff --git a/lisp/nndraft.el b/lisp/nndraft.el index e5eb42a..5bee2cf 100644 --- a/lisp/nndraft.el +++ b/lisp/nndraft.el @@ -111,7 +111,8 @@ (newest (if (file-newer-than-file-p file auto) file auto)) (nntp-server-buffer (or buffer nntp-server-buffer))) (when (and (file-exists-p newest) - (nnmail-find-file newest)) + (let ((nnmail-file-coding-system nnheader-text-coding-system)) + (nnmail-find-file newest))) (save-excursion (set-buffer nntp-server-buffer) (goto-char (point-min)) @@ -192,6 +193,12 @@ (nnoo-parent-function 'nndraft 'nnmh-request-accept-article (list group server last noinsert)))) +(deffoo nndraft-request-replace-article (article group buffer) + (nndraft-possibly-change-group group) + (let ((nnmail-file-coding-system nnheader-text-coding-system)) + (nnoo-parent-function 'nndraft 'nnmh-request-replace-article + (list article group buffer)))) + (deffoo nndraft-request-create-group (group &optional server args) (nndraft-possibly-change-group group) (if (file-exists-p nndraft-current-directory) @@ -245,8 +252,7 @@ nnmh-close-group nnmh-request-list nnmh-request-newsgroups - nnmh-request-move-article - nnmh-request-replace-article)) + nnmh-request-move-article)) (provide 'nndraft) diff --git a/lisp/nnfolder.el b/lisp/nnfolder.el index 9870186..33718e9 100644 --- a/lisp/nnfolder.el +++ b/lisp/nnfolder.el @@ -93,12 +93,10 @@ message, a huge time saver for large mailboxes.") (defvoo nnfolder-buffer-alist nil) (defvoo nnfolder-scantime-alist nil) (defvoo nnfolder-active-timestamp nil) -(defvoo nnfolder-active-file-coding-system - (if (memq system-type '(windows-nt ms-dos ms-windows)) - 'raw-text-dos 'raw-text)) +(defvoo nnfolder-active-file-coding-system nnheader-text-coding-system) (defvoo nnfolder-active-file-coding-system-for-write nnmail-active-file-coding-system) -(defvoo nnfolder-file-coding-system nnfolder-active-file-coding-system) +(defvoo nnfolder-file-coding-system nnheader-text-coding-system) (defvoo nnfolder-file-coding-system-for-write nnheader-file-coding-system "Coding system for save nnfolder file. If NIL, NNFOLDER-FILE-CODING-SYSTEM is used.") @@ -586,33 +584,52 @@ deleted. Point is left where the deleted region was." ;; Change group. (when (and group (not (equal group nnfolder-current-group))) - (nnmail-activate 'nnfolder) - (if dont-check - (setq nnfolder-current-group group - nnfolder-current-buffer nil) - ;; If we have to change groups, see if we don't already have the - ;; folder in memory. If we do, verify the modtime and destroy - ;; the folder if needed so we can rescan it. - (setq nnfolder-current-buffer - (nth 1 (assoc group nnfolder-buffer-alist))) - - ;; If the buffer is not live, make sure it isn't in the alist. If it - ;; is live, verify that nobody else has touched the file since last - ;; time. - (when (and nnfolder-current-buffer - (not (gnus-buffer-live-p nnfolder-current-buffer))) - (setq nnfolder-current-buffer nil)) - - (setq nnfolder-current-group group) - - (when (or (not nnfolder-current-buffer) - (not (verify-visited-file-modtime - nnfolder-current-buffer))) - (save-excursion - (when (setq nnfolder-current-buffer (nnfolder-read-folder group)) - (set-buffer nnfolder-current-buffer) - (push (list group nnfolder-current-buffer) - nnfolder-buffer-alist))))))) + (let ((file-name-coding-system nnmail-pathname-coding-system) + (pathname-coding-system nnmail-pathname-coding-system)) + (nnmail-activate 'nnfolder) + (when (and (not (assoc group nnfolder-group-alist)) + (not (file-exists-p + (nnfolder-group-pathname group)))) + ;; The group doesn't exist, so we create a new entry for it. + (push (list group (cons 1 0)) nnfolder-group-alist) + (nnfolder-save-active nnfolder-group-alist nnfolder-active-file)) + + (if dont-check + (setq nnfolder-current-group group + nnfolder-current-buffer nil) + (let (inf file) + ;; If we have to change groups, see if we don't already have the + ;; folder in memory. If we do, verify the modtime and destroy + ;; the folder if needed so we can rescan it. + (setq nnfolder-current-buffer + (nth 1 (assoc group nnfolder-buffer-alist))) + + ;; If the buffer is not live, make sure it isn't in the alist. If it + ;; is live, verify that nobody else has touched the file since last + ;; time. + (when (and nnfolder-current-buffer + (not (gnus-buffer-live-p nnfolder-current-buffer))) + (setq nnfolder-buffer-alist (delq inf nnfolder-buffer-alist) + nnfolder-current-buffer nil)) + + (setq nnfolder-current-group group) + + (when (or (not nnfolder-current-buffer) + (not (verify-visited-file-modtime + nnfolder-current-buffer))) + (save-excursion + (setq file (nnfolder-group-pathname group)) + ;; See whether we need to create the new file. + (unless (file-exists-p file) + (gnus-make-directory (file-name-directory file)) + (let ((nnmail-file-coding-system + (or nnfolder-file-coding-system-for-write + nnfolder-file-coding-system-for-write))) + (nnmail-write-region 1 1 file t 'nomesg))) + (when (setq nnfolder-current-buffer (nnfolder-read-folder group)) + (set-buffer nnfolder-current-buffer) + (push (list group nnfolder-current-buffer) + nnfolder-buffer-alist))))))))) (defun nnfolder-save-mail (group-art-list) "Called narrowed to an article." diff --git a/lisp/nnheader.el b/lisp/nnheader.el index 8e2b604..ccf78ff 100644 --- a/lisp/nnheader.el +++ b/lisp/nnheader.el @@ -49,6 +49,17 @@ on your system, you could say something like: \(setq nnheader-file-name-translation-alist '((?: . ?_)))") +(defvar nnheader-text-coding-system + (if (memq system-type '(windows-nt ms-dos ms-windows)) + 'raw-text-dos + 'raw-text) + "Text-safe coding system (For removing ^M). +This variable is a substitute for `mm-text-coding-system'.") + +(defvar nnheader-text-coding-system-for-write nil + "Text coding system for write. +This variable is a substitute for `mm-text-coding-system-for-write'.") + (eval-and-compile (autoload 'nnmail-message-id "nnmail") (autoload 'mail-position-on-field "sendmail") @@ -455,6 +466,7 @@ the line could be found." (let* ((file nil) (number (length articles)) (count 0) + (file-name-coding-system 'binary) (pathname-coding-system 'binary) (case-fold-search t) (cur (current-buffer)) @@ -750,7 +762,7 @@ list of headers that match SEQUENCE (see `nntp-retrieve-headers')." (erase-buffer)) (current-buffer)) -(defvar jka-compr-compression-info-list) +(eval-when-compile (defvar jka-compr-compression-info-list)) (defvar nnheader-numerical-files (if (boundp 'jka-compr-compression-info-list) (concat "\\([0-9]+\\)\\(" @@ -1075,9 +1087,9 @@ find-file-hooks, etc. "Strip all \r's from the current buffer." (nnheader-skeleton-replace "\r")) -(fset 'nnheader-run-at-time 'run-at-time) -(fset 'nnheader-cancel-timer 'cancel-timer) -(fset 'nnheader-cancel-function-timers 'cancel-function-timers) +(defalias 'nnheader-run-at-time 'run-at-time) +(defalias 'nnheader-cancel-timer 'cancel-timer) +(defalias 'nnheader-cancel-function-timers 'cancel-function-timers) (defun nnheader-Y-or-n-p (prompt) "Ask user a \"Y/n\" question. Return t if answer is neither \"n\", \"N\" nor \"C-g\"." @@ -1096,7 +1108,7 @@ find-file-hooks, etc. (message "%s(Y/n) Yes" prompt) t))) -(when (string-match "XEmacs\\|Lucid" emacs-version) +(when (string-match "XEmacs" emacs-version) (require 'nnheaderxm)) (run-hooks 'nnheader-load-hook) diff --git a/lisp/nnimap.el b/lisp/nnimap.el index f50f21e..669e9f3 100644 --- a/lisp/nnimap.el +++ b/lisp/nnimap.el @@ -37,7 +37,6 @@ ;; Todo, minor things: ;; ;; o Don't require half of Gnus -- backends should be standalone -;; o Support escape characters in `message-tokenize-header' ;; o Verify that we don't use IMAP4rev1 specific things (RFC2060 App B) ;; o Dont uid fetch 1,* in nnimap-retrive-groups (slow) ;; o Split up big fetches (1,* header especially) in smaller chunks @@ -113,10 +112,6 @@ element in each \"rule\" is the name of the IMAP mailbox, and the second is a regexp that nnimap will try to match on the header to find a fit. -The first element can also be a list. In that case, the first element -is the server the second element is the group on that server in which -the matching article will be stored. - The second element can also be a function. In that case, it will be called narrowed to the headers with the first element of the rule as the argument. It should return a non-nil value if it thinks that the @@ -124,7 +119,25 @@ mail belongs in that group. This variable can also have a function as its value, the function will be called with the headers narrowed and should return a group where it -thinks the article should be splitted to.") +thinks the article should be splitted to. See `nnimap-split-fancy'. + +To allow for different split rules on different virtual servers, and +even different split rules in different inboxes on the same server, +the syntax of this variable have been extended along the lines of: + +(setq nnimap-split-rule + '((\"my1server\" (\".*\" ((\"ding\" \"ding@gnus.org\") + (\"junk\" \"From:.*Simon\"))) + (\"my2server\" (\"INBOX\" nnimap-split-fancy)) + (\"my[34]server\" (\".*\" ((\"private\" \"To:.*Simon\") + (\"junk\" my-junk-func))))) + +The virtual server name is in fact a regexp, so that the same rules +may apply to several servers. In the example, the servers +\"my3server\" and \"my4server\" both use the same rules. Similarly, +the inbox string is also a regexp. The actual splitting rules are as +before, either a function, or a list with group/regexp or +group/function elements.") (defvar nnimap-split-predicate "UNSEEN UNDELETED" "The predicate used to find articles to split. @@ -526,15 +539,14 @@ If EXAMINE is non-nil the group is selected read-only." (imap-capability 'IMAP4rev1 nnimap-server-buffer)) (imap-close nnimap-server-buffer) (nnheader-report 'nnimap "Server %s is not IMAP4 compliant" server)) - (let (list alist user passwd) - (and (fboundp 'gnus-parse-netrc) - (setq list (gnus-parse-netrc nnimap-authinfo-file) - alist (or (and (gnus-netrc-get - (gnus-netrc-machine list server) "machine") - (gnus-netrc-machine list server)) - (gnus-netrc-machine list nnimap-address)) - user (gnus-netrc-get alist "login") - passwd (gnus-netrc-get alist "password"))) + (let* ((list (gnus-parse-netrc nnimap-authinfo-file)) + (port (if nnimap-server-port + (int-to-string nnimap-server-port) + "imap")) + (alist (or (gnus-netrc-machine list server port "imap") + (gnus-netrc-machine list nnimap-address port "imap"))) + (user (gnus-netrc-get alist "login")) + (passwd (gnus-netrc-get alist "password"))) (if (imap-authenticate user passwd nnimap-server-buffer) (prog1 (push (list server nnimap-server-buffer) @@ -612,7 +624,12 @@ function is generally only called when Gnus is shutting down." (with-current-buffer nnimap-callback-buffer (insert (with-current-buffer nnimap-server-buffer - (nnimap-demule (imap-message-get (imap-current-message) 'RFC822)))) ;xxx + (nnimap-demule + (if (imap-capability 'IMAP4rev1) + ;; xxx don't just use car? alist doesn't contain + ;; anything else now, but it might... + (nth 2 (car (imap-message-get (imap-current-message) 'BODYDETAIL))) + (imap-message-get (imap-current-message) 'RFC822))))) (nnheader-ms-strip-cr) (funcall nnimap-callback-callback-function t))) @@ -740,8 +757,9 @@ function is generally only called when Gnus is shutting down." (deffoo nnimap-request-post (&optional server) (let ((success t)) - (dolist (mbx (message-tokenize-header - (message-fetch-field "Newsgroups")) success) + (dolist (mbx (message-unquote-tokens + (message-tokenize-header + (message-fetch-field "Newsgroups") ", ")) success) (let ((to-newsgroup (gnus-group-prefixed-name mbx gnus-command-method))) (or (gnus-active to-newsgroup) (gnus-activate-group to-newsgroup) @@ -899,8 +917,19 @@ function is generally only called when Gnus is shutting down." (or nnimap-split-crosspost (throw 'split-done to-groups)))))))))) +(defun nnimap-assoc-match (key alist) + (let (element) + (while (and alist (not element)) + (if (string-match (car (car alist)) key) + (setq element (car alist))) + (setq alist (cdr alist))) + element)) + (defun nnimap-split-find-rule (server inbox) - nnimap-split-rule) + (if (listp (cadar nnimap-split-rule)) ;; extended format? + (cadr (nnimap-assoc-match inbox (cdr (nnimap-assoc-match + server nnimap-split-rule)))) + nnimap-split-rule)) (defun nnimap-split-find-inbox (server) (if (listp nnimap-split-inbox) @@ -1065,8 +1094,9 @@ function is generally only called when Gnus is shutting down." (goto-char (point-min)) (while (search-forward "\n" nil t) (replace-match "\r\n"))) - ;; next line for Cyrus server bug - (imap-mailbox-unselect nnimap-server-buffer) + ;; this 'or' is for Cyrus server bug + (or (null (imap-current-mailbox nnimap-server-buffer)) + (imap-mailbox-unselect nnimap-server-buffer)) (imap-message-append group (current-buffer) nil nil nnimap-server-buffer))) (cons group (nth 1 uid)) diff --git a/lisp/nnmail.el b/lisp/nnmail.el index 945e4a2..b4df106 100644 --- a/lisp/nnmail.el +++ b/lisp/nnmail.el @@ -199,6 +199,12 @@ This variable is obsolete; `mail-sources' should be used instead." :group 'nnmail-procmail :type 'boolean) +(defcustom nnmail-scan-directory-mail-source-once nil + "*If non-nil, scan all incoming procmail sorted mails once. +It scans low-level sorted spools even when not required." + :group 'nnmail-procmail + :type 'boolean) + (defcustom nnmail-delete-file-function 'delete-file "Function called to delete files in some mail backends." :group 'nnmail-files @@ -454,7 +460,8 @@ parameter. It should return nil, `warn' or `delete'." (defvar nnmail-file-coding-system 'raw-text "Coding system used in nnmail.") -(defvar nnmail-incoming-coding-system 'raw-text +(defvar nnmail-incoming-coding-system + nnheader-text-coding-system "Coding system used in reading inbox") (defvar nnmail-pathname-coding-system 'binary @@ -465,9 +472,10 @@ parameter. It should return nil, `warn' or `delete'." (set-buffer nntp-server-buffer) (delete-region (point-min) (point-max)) (let ((format-alist nil) - (after-insert-file-functions nil)) + (after-insert-file-functions nil)) (condition-case () (let ((auto-mode-alist (nnheader-auto-mode-alist)) + (file-name-coding-system nnmail-pathname-coding-system) (pathname-coding-system nnmail-pathname-coding-system)) (insert-file-contents-as-coding-system nnmail-file-coding-system file) @@ -1528,6 +1536,7 @@ See the documentation for the variable `nnmail-split-fancy' for documentation." nil)) ;; Hack to only fetch the contents of a single group's spool file. (when (and (eq (car source) 'directory) + (null nnmail-scan-directory-mail-source-once) group) (mail-source-bind (directory source) (setq source (append source @@ -1623,8 +1632,8 @@ See the documentation for the variable `nnmail-split-fancy' for documentation." (defun nnmail-write-region (start end filename &optional append visit lockname) "Do a `write-region', and then set the file modes." - (let ((pathname-coding-system nnmail-pathname-coding-system)) - + (let ((file-name-coding-system nnmail-pathname-coding-system) + (pathname-coding-system nnmail-pathname-coding-system)) (write-region-as-coding-system nnmail-file-coding-system start end filename append visit lockname) (set-file-modes filename nnmail-default-file-modes))) diff --git a/lisp/nnmbox.el b/lisp/nnmbox.el index 3deac05..5c3a674 100644 --- a/lisp/nnmbox.el +++ b/lisp/nnmbox.el @@ -61,11 +61,9 @@ (defvoo nnmbox-group-alist nil) (defvoo nnmbox-active-timestamp nil) -(defvoo nnmbox-file-coding-system - (if (memq system-type '(windows-nt ms-dos ms-windows)) - 'raw-text-dos 'raw-text)) +(defvoo nnmbox-file-coding-system nnheader-text-coding-system) (defvoo nnmbox-file-coding-system-for-write nil) -(defvoo nnmbox-active-file-coding-system nnmbox-file-coding-system) +(defvoo nnmbox-active-file-coding-system nnheader-text-coding-system) (defvoo nnmbox-active-file-coding-system-for-write nil) diff --git a/lisp/nnmh.el b/lisp/nnmh.el index 9b1fdbe..6551b2f 100644 --- a/lisp/nnmh.el +++ b/lisp/nnmh.el @@ -86,7 +86,8 @@ as unread by Gnus.") (large (and (numberp nnmail-large-newsgroup) (> number nnmail-large-newsgroup))) (count 0) - (pathname-coding-system 'binary) + (file-name-coding-system nnmail-pathname-coding-system) + (pathname-coding-system nnmail-pathname-coding-system) beg article) (nnmh-possibly-change-directory newsgroup server) ;; We don't support fetching by Message-ID. @@ -133,6 +134,7 @@ as unread by Gnus.") (large (and (numberp nnmail-large-newsgroup) (> number nnmail-large-newsgroup))) (count 0) + (file-name-coding-system 'binary) (pathname-coding-system 'binary) (case-fold-search t) ;;beg @@ -169,7 +171,8 @@ as unread by Gnus.") (let ((file (if (stringp id) nil (concat nnmh-current-directory (int-to-string id)))) - (pathname-coding-system 'binary) + (file-name-coding-system nnmail-pathname-coding-system) + (pathname-coding-system nnmail-pathname-coding-system) (nntp-server-buffer (or buffer nntp-server-buffer))) (and (stringp file) (file-exists-p file) @@ -181,7 +184,8 @@ as unread by Gnus.") (nnheader-init-server-buffer) (nnmh-possibly-change-directory group server) (let ((pathname (nnmail-group-pathname group nnmh-directory)) - (pathname-coding-system 'binary) + (file-name-coding-system nnmail-pathname-coding-system) + (pathname-coding-system nnmail-pathname-coding-system) dir) (cond ((not (file-directory-p pathname)) @@ -224,7 +228,8 @@ as unread by Gnus.") (deffoo nnmh-request-list (&optional server dir) (nnheader-insert "") (nnmh-possibly-change-directory nil server) - (let ((pathname-coding-system 'binary) + (let ((file-name-coding-system nnmail-pathname-coding-system) + (pathname-coding-system nnmail-pathname-coding-system) (nnmh-toplev (file-truename (or dir (file-name-as-directory nnmh-directory))))) (nnmh-request-list-1 nnmh-toplev)) @@ -439,7 +444,8 @@ as unread by Gnus.") (nnmh-open-server server)) (when newsgroup (let ((pathname (nnmail-group-pathname newsgroup nnmh-directory)) - (pathname-coding-system 'binary)) + (file-name-coding-system nnmail-pathname-coding-system) + (pathname-coding-system nnmail-pathname-coding-system)) (if (file-directory-p pathname) (setq nnmh-current-directory pathname) (error "No such newsgroup: %s" newsgroup))))) @@ -488,7 +494,8 @@ as unread by Gnus.") "Compute the next article number in GROUP." (let ((active (cadr (assoc group nnmh-group-alist))) (dir (nnmail-group-pathname group nnmh-directory)) - (pathname-coding-system 'binary) + (file-name-coding-system nnmail-pathname-coding-system) + (pathname-coding-system nnmail-pathname-coding-system) file) (unless active ;; The group wasn't known to nnmh, so we just create an active diff --git a/lisp/nnml.el b/lisp/nnml.el index bf54e8a..7d5ac45 100644 --- a/lisp/nnml.el +++ b/lisp/nnml.el @@ -105,7 +105,8 @@ all. This may very well take some time.") (let ((file nil) (number (length sequence)) (count 0) - (pathname-coding-system 'binary) + (file-name-coding-system nnmail-pathname-coding-system) + (pathname-coding-system nnmail-pathname-coding-system) beg article) (if (stringp (car sequence)) 'headers @@ -166,7 +167,8 @@ all. This may very well take some time.") (deffoo nnml-request-article (id &optional group server buffer) (nnml-possibly-change-directory group server) (let* ((nntp-server-buffer (or buffer nntp-server-buffer)) - (pathname-coding-system 'binary) + (file-name-coding-system nnmail-pathname-coding-system) + (pathname-coding-system nnmail-pathname-coding-system) path gpath group-num) (if (stringp id) (when (and (setq group-num (nnml-find-group-number id)) @@ -197,7 +199,8 @@ all. This may very well take some time.") (string-to-int (file-name-nondirectory path))))))) (deffoo nnml-request-group (group &optional server dont-check) - (let ((pathname-coding-system 'binary)) + (let ((file-name-coding-system nnmail-pathname-coding-system) + (pathname-coding-system nnmail-pathname-coding-system)) (cond ((not (nnml-possibly-change-directory group server)) (nnheader-report 'nnml "Invalid group (no such directory)")) @@ -255,7 +258,8 @@ all. This may very well take some time.") (deffoo nnml-request-list (&optional server) (save-excursion (let ((nnmail-file-coding-system nnmail-active-file-coding-system) - (pathname-coding-system 'binary)) + (file-name-coding-system nnmail-pathname-coding-system) + (pathname-coding-system nnmail-pathname-coding-system)) (nnmail-find-file nnml-active-file)) (setq nnml-group-alist (nnmail-get-active)) t)) @@ -571,7 +575,8 @@ all. This may very well take some time.") (if (not group) t (let ((pathname (nnmail-group-pathname group nnml-directory)) - (pathname-coding-system 'binary)) + (file-name-coding-system nnmail-pathname-coding-system) + (pathname-coding-system nnmail-pathname-coding-system)) (when (not (equal pathname nnml-current-directory)) (setq nnml-current-directory pathname nnml-current-group group diff --git a/lisp/nnslashdot.el b/lisp/nnslashdot.el index c19f13c..013fabc 100644 --- a/lisp/nnslashdot.el +++ b/lisp/nnslashdot.el @@ -105,7 +105,8 @@ (let ((case-fold-search t)) (erase-buffer) (when (= start 1) - (nnweb-insert (format nnslashdot-article-url sid) t) + (nnweb-insert (format nnslashdot-article-url + (nnslashdot-sid-strip sid)) t) (goto-char (point-min)) (search-forward "Posted by ") (when (looking-at "]+>\\([^<]+\\)") @@ -116,20 +117,23 @@ (forward-line 2) (setq lines (count-lines (point) - (search-forward - "A href=http://slashdot.org/article" nil t))) + (re-search-forward + "A href=\"\\(http://slashdot.org\\)?/article" nil t))) (push (cons 1 (make-full-mail-header - 1 group from date (concat "<" sid "%1@slashdot>") + 1 group from date + (concat "<" (nnslashdot-sid-strip sid) "%1@slashdot>") "" 0 lines nil nil)) headers)) (while (and (setq start (pop startats)) (< start last)) (setq point (goto-char (point-max))) (nnweb-insert - (format nnslashdot-comments-url sid nnslashdot-threshold 0 start) + (format nnslashdot-comments-url + (nnslashdot-sid-strip sid) + nnslashdot-threshold 0 start) t) (when first-comments (setq first-comments nil) @@ -164,7 +168,7 @@ (setq lines (/ (abs (- (search-forward ""))) 70)) - (forward-line 2) + (forward-line 4) (setq parent (if (looking-at ".*cid=\\([0-9]+\\)") (match-string 1) @@ -177,11 +181,11 @@ (1+ article) (concat subject " (" score ")") from date - (concat "<" sid "%" + (concat "<" (nnslashdot-sid-strip sid) "%" (number-to-string (1+ article)) "@slashdot>") (if parent - (concat "<" sid "%" + (concat "<" (nnslashdot-sid-strip sid) "%" (number-to-string (1+ (string-to-number parent))) "@slashdot>") "") @@ -205,7 +209,8 @@ (set-buffer nnslashdot-buffer) (erase-buffer) (when (= start 1) - (nnweb-insert (format nnslashdot-article-url sid) t) + (nnweb-insert (format nnslashdot-article-url + (nnslashdot-sid-strip sid)) t) (goto-char (point-min)) (search-forward "Posted by ") (when (looking-at "]+>\\([^<]+\\)") @@ -215,13 +220,14 @@ (buffer-substring (point) (1- (search-forward "<"))))) (forward-line 2) (setq lines (count-lines (point) - (search-forward - "A href=http://slashdot.org/article"))) + (re-search-forward + "A href=\"\\(http://slashdot.org\\)?/article"))) (push (cons 1 (make-full-mail-header - 1 group from date (concat "<" sid "%1@slashdot>") + 1 group from date (concat "<" (nnslashdot-sid-strip sid) + "%1@slashdot>") "" 0 lines nil nil)) headers)) (while (or (not article) @@ -231,7 +237,8 @@ (setq start (1+ article))) (setq point (goto-char (point-max))) (nnweb-insert - (format nnslashdot-comments-url sid nnslashdot-threshold 4 start) + (format nnslashdot-comments-url (nnslashdot-sid-strip sid) + nnslashdot-threshold 4 start) t) (goto-char point) (while (re-search-forward @@ -270,11 +277,11 @@ (make-full-mail-header (1+ article) (concat subject " (" score ")") from date - (concat "<" sid "%" + (concat "<" (nnslashdot-sid-strip sid) "%" (number-to-string (1+ article)) "@slashdot>") (if parent - (concat "<" sid "%" + (concat "<" (nnslashdot-sid-strip sid) "%" (number-to-string (1+ (string-to-number parent))) "@slashdot>") "") @@ -330,7 +337,7 @@ (point) (progn (re-search-forward - "

.*A href=http://slashdot\\.org/article") + "

.*A href=\"\\(http://slashdot.org\\)?/article") (match-beginning 0))))) (search-forward (format "" (1- article))) (setq contents @@ -424,7 +431,7 @@ (deffoo nnslashdot-request-post (&optional server) (nnslashdot-possibly-change-server nil server) - (let ((sid (message-fetch-field "newsgroups")) + (let ((sid (nnslashdot-sid-strip (message-fetch-field "newsgroups"))) (subject (message-fetch-field "subject")) (references (car (last (split-string (message-fetch-field "references"))))) @@ -533,6 +540,11 @@ (defun nnslashdot-lose (why) (error "Slashdot HTML has changed; please get a new version of nnslashdot")) +(defun nnslashdot-sid-strip (sid) + (if (string-match "^00/" sid) + (substring sid (match-end 0)) + sid)) + (provide 'nnslashdot) ;;; nnslashdot.el ends here diff --git a/lisp/nnsoup.el b/lisp/nnsoup.el index c21851b..8fbe994 100644 --- a/lisp/nnsoup.el +++ b/lisp/nnsoup.el @@ -48,7 +48,7 @@ (defvoo nnsoup-replies-directory (concat nnsoup-directory "replies/") "*Directory where outgoing packets will be composed.") -(defvoo nnsoup-replies-format-type ?n +(defvoo nnsoup-replies-format-type ?u ;; u is USENET news format. "*Format of the replies packages.") (defvoo nnsoup-replies-index-type ?n @@ -256,7 +256,7 @@ backend for the messages.") (nth 1 (nnsoup-article-to-area article nnsoup-current-group)))))) (cond ((= kind ?m) 'mail) - ((= kind ?n) 'news) + ((= kind ?n) 'news) (t 'unknown))))) (deffoo nnsoup-close-group (group &optional server) @@ -477,7 +477,8 @@ backend for the messages.") (goto-char (point-min)) (cond ;; rnews batch format - ((= format ?n) + ((or (= format ?u) + (= format ?n)) ;; Gnus back compatibility. (while (looking-at "^#! *rnews \\(+[0-9]+\\) *$") (forward-line 1) (push (list @@ -591,7 +592,7 @@ backend for the messages.") (let ((format (gnus-soup-encoding-format (gnus-soup-area-encoding (nth 1 area))))) (goto-char end) - (when (or (= format ?n) (= format ?m)) + (when (or (= format ?u) (= format ?n) (= format ?m)) (setq end (progn (forward-line -1) (point)))))) (set-buffer msg-buf)) (widen) @@ -767,13 +768,13 @@ backend for the messages.") (if (not (setq elem (assoc group active))) (push (list group (cons 1 lines) (list (cons 1 lines) - (vector ident group "ncm" "" lines))) + (vector ident group "ucm" "" lines))) active) (nconc elem (list (list (cons (1+ (setq min (cdadr elem))) (+ min lines)) - (vector ident group "ncm" "" lines)))) + (vector ident group "ucm" "" lines)))) (setcdr (cadr elem) (+ min lines))) (setq files (cdr files))) (nnheader-message 5 "") diff --git a/lisp/nnwarchive.el b/lisp/nnwarchive.el index f888a62..5103b55 100644 --- a/lisp/nnwarchive.el +++ b/lisp/nnwarchive.el @@ -68,9 +68,9 @@ (list-dissect . nnwarchive-egroups-list) (list-groups . nnwarchive-egroups-list-groups) (xover-url - "http://www.egroups.com/message/%s/%d" group aux) + "http://www.egroups.com/messages/%s/%d" group aux) (xover-last-url - "http://www.egroups.com/message/%s/" group) + "http://www.egroups.com/messages/%s/" group) (xover-page-size . 13) (xover-dissect . nnwarchive-egroups-xover) (article-url diff --git a/lisp/pop3.el b/lisp/pop3.el index 0c45144..dabe4ee 100644 --- a/lisp/pop3.el +++ b/lisp/pop3.el @@ -165,7 +165,7 @@ Returns the process associated with the connection. Argument PORT specifies connecting port." (let (process) (save-excursion - (set-buffer (get-buffer-create (concat " trace of POP session to %s" + (set-buffer (get-buffer-create (concat " trace of POP session to " mailhost))) (erase-buffer) (setq pop3-read-point (point-min)) diff --git a/lisp/qp.el b/lisp/qp.el index 93c3f7e..ea2a818 100644 --- a/lisp/qp.el +++ b/lisp/qp.el @@ -115,23 +115,24 @@ encode lines starting with \"From\"." (delete-char 1))))) (when (or fold mm-use-ultra-safe-encoding) ;; Fold long lines. - (goto-char (point-min)) - (while (not (eobp)) - ;; In ultra-safe mode, encode "From " at the beginning of a - ;; line. - (when mm-use-ultra-safe-encoding - (beginning-of-line) - (when (looking-at "From ") - (replace-match "From=20" nil t))) - (end-of-line) - (while (> (current-column) 72) - (beginning-of-line) - (forward-char 71);; 71 char plus an "=" - (search-backward "=" (- (point) 2) t) - (insert "=\n") - (end-of-line)) - (unless (eobp) - (forward-line))))))) + (let ((tab-width 1)) ;; HTAB is one character. + (goto-char (point-min)) + (while (not (eobp)) + ;; In ultra-safe mode, encode "From " at the beginning of a + ;; line. + (when mm-use-ultra-safe-encoding + (beginning-of-line) + (when (looking-at "From ") + (replace-match "From=20" nil t))) + (end-of-line) + (while (> (current-column) 76) ;; tab-width must be 1. + (beginning-of-line) + (forward-char 75);; 75 chars plus an "=" + (search-backward "=" (- (point) 2) t) + (insert "=\n") + (end-of-line)) + (unless (eobp) + (forward-line)))))))) (defun quoted-printable-encode-string (string) "QP-encode STRING and return the results." diff --git a/lisp/rfc2047.el b/lisp/rfc2047.el index d404285..7a86311 100644 --- a/lisp/rfc2047.el +++ b/lisp/rfc2047.el @@ -107,19 +107,23 @@ Should be called narrowed to the head of the message." (interactive "*") (save-excursion (goto-char (point-min)) - (let ((alist rfc2047-header-encoding-alist) - elem method) + (let (alist elem method) (while (not (eobp)) (save-restriction (rfc2047-narrow-to-field) (if (not (rfc2047-encodable-p)) - (if (mm-body-7-or-8) - ;; 8 bit must be decoded. - (if (car message-posting-charset) - ;; Is message-posting-charset a coding system? - (mm-encode-coding-region (point-min) (point-max) - (car message-posting-charset)))) + (if (and (eq (mm-body-7-or-8) '8bit) + (mm-multibyte-p) + (mm-coding-system-p + (car message-posting-charset))) + ;; 8 bit must be decoded. + ;; Is message-posting-charset a coding system? + (mm-encode-coding-region + (point-min) (point-max) + (car message-posting-charset))) ;; We found something that may perhaps be encoded. + (setq method nil + alist rfc2047-header-encoding-alist) (while (setq elem (pop alist)) (when (or (and (stringp (car elem)) (looking-at (car elem))) @@ -130,12 +134,17 @@ Should be called narrowed to the head of the message." ((eq method 'mime) (rfc2047-encode-region (point-min) (point-max)) (rfc2047-fold-region (point-min) (point-max))) + ((eq method 'default) + (if (and (featurep 'mule) + mail-parse-charset) + (mm-encode-coding-region (point-min) (point-max) + mail-parse-charset))) + ((mm-coding-system-p method) + (if (featurep 'mule) + (mm-encode-coding-region (point-min) (point-max) method))) ;; Hm. (t))) - (goto-char (point-max))))) - (when mail-parse-charset - (mm-encode-coding-region - (point-min) (point-max) mail-parse-charset)))) + (goto-char (point-max))))))) (defun rfc2047-encodable-p (&optional header) "Say whether the current (narrowed) buffer contains characters that need encoding in headers." @@ -215,10 +224,14 @@ Should be called narrowed to the head of the message." (if (equal (nth 2 word) current) (setq beg (nth 0 word)) (when current - (when (prog1 (and (eq beg (nth 1 word)) (nth 2 word)) - (rfc2047-encode beg end current)) - (goto-char beg) - (insert " "))) + (if (and (eq beg (nth 1 word)) (nth 2 word)) + (progn + ;; There might be a bug in Emacs Mule. + ;; A space must be inserted before encoding. + (goto-char beg) + (insert " ") + (rfc2047-encode (1+ beg) (1+ end) current)) + (rfc2047-encode beg end current))) (setq current (nth 2 word) beg (nth 0 word) end (nth 1 word)))) @@ -251,7 +264,9 @@ Should be called narrowed to the head of the message." (goto-char (min (point-max) (+ 15 (point)))) (unless (eobp) (insert "\n")))) - (mm-encode-coding-region (point-min) (point-max) mime-charset) + (if (and (mm-multibyte-p) + (mm-coding-system-p mime-charset)) + (mm-encode-coding-region (point-min) (point-max) mime-charset)) (funcall (cdr (assq encoding rfc2047-encoding-function-alist)) (point-min) (point-max)) (goto-char (point-min)) diff --git a/lisp/webmail.el b/lisp/webmail.el index bc33f3a..2110624 100644 --- a/lisp/webmail.el +++ b/lisp/webmail.el @@ -454,7 +454,8 @@ (webmail-error "article@3.1")) (delete-region (match-beginning 0) (point-max)) (nnweb-remove-markup) - (nnweb-decode-entities) + (let ((w3-html-entities (cons '(nbsp . 32) w3-html-entities))) + (nnweb-decode-entities)) (goto-char (point-min)) (while (re-search-forward "\r\n?" nil t) (replace-match "\n")) @@ -483,7 +484,8 @@ (search-forward "" nil t) (delete-region p (match-end 0))) (nnweb-remove-markup) - (nnweb-decode-entities) + (let ((w3-html-entities (cons '(nbsp . 32) w3-html-entities))) + (nnweb-decode-entities)) (goto-char (point-min)) (delete-blank-lines) (goto-char (point-min)) @@ -539,7 +541,8 @@ (if (looking-at "$") (forward-char)) (delete-region (point-min) (point)) (nnweb-remove-markup) - (nnweb-decode-entities) + (let ((w3-html-entities (cons '(nbsp . 32) w3-html-entities))) + (nnweb-decode-entities)) nil) (t (setq mime t) @@ -633,7 +636,8 @@ (search-forward "" nil t) (delete-region p (match-end 0))) (nnweb-remove-markup) - (nnweb-decode-entities) + (let ((w3-html-entities (cons '(nbsp . 32) w3-html-entities))) + (nnweb-decode-entities)) (goto-char (point-min)) (delete-blank-lines) (goto-char (point-max)) @@ -650,7 +654,8 @@ (webmail-error "article@5")) (narrow-to-region p (match-end 0)) (nnweb-remove-markup) - (nnweb-decode-entities) + (let ((w3-html-entities (cons '(nbsp . 32) w3-html-entities))) + (nnweb-decode-entities)) (goto-char (point-min)) (delete-blank-lines) (setq ct (mail-fetch-field "content-type") @@ -721,6 +726,7 @@ (webmail-error "login@1"))) (defun webmail-netaddress-list () + (webmail-refresh-redirect) (let (item id) (goto-char (point-min)) (when (re-search-forward @@ -753,7 +759,8 @@ (while (re-search-forward "
" nil t) (replace-match "\n")) (nnweb-remove-markup) - (nnweb-decode-entities) + (let ((w3-html-entities (cons '(nbsp . 32) w3-html-entities))) + (nnweb-decode-entities)) nil) (t (insert "<#part type=\"text/html\" disposition=inline>") @@ -762,6 +769,7 @@ t))) (defun webmail-netaddress-article (file id) + (webmail-refresh-redirect) (let (p p1 attachment count mime type) (save-restriction (webmail-encode-8bit) @@ -781,7 +789,8 @@ (while (search-forward "" nil t) (replace-match "\n")) (nnweb-remove-markup) - (nnweb-decode-entities) + (let ((w3-html-entities (cons '(nbsp . 32) w3-html-entities))) + (nnweb-decode-entities)) (goto-char (point-min)) (delete-blank-lines) (goto-char (point-min)) @@ -906,7 +915,8 @@ (while (search-forward "" nil t) (replace-match "\n")) (nnweb-remove-markup) - (nnweb-decode-entities) + (let ((w3-html-entities (cons '(nbsp . 32) w3-html-entities))) + (nnweb-decode-entities)) (goto-char (point-min)) (delete-blank-lines) (goto-char (point-min)) diff --git a/texi/ChangeLog b/texi/ChangeLog index 1c05270..b8ab0ea 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,33 @@ +2000-06-28 Simon Josefsson + + * gnus.texi (Splitting in IMAP): Update. + +2000-05-19 15:18:32 Dmitry Yaitskov + + * message.texi (Reply): Doc fix. + +2000-05-17 00:50:29 Shenghuo ZHU + + * gnus.texi (Listing Groups): Addition. + +2000-05-16 21:46:40 Shenghuo ZHU + + * gnus.texi (Misc Group Stuff): Addition. + (Article Washing): Ditto. + +2000-05-15 10:16:29 Shenghuo ZHU + + * gnus.texi (Mail Source Specifiers): Update maildir. + +2000-05-02 Pavel Janik + + * gnus.texi (MIME comands): Spelling fix. + +2000-05-03 21:12:05 Shenghuo ZHU + + * gnus.texi (Summary Mail Commands): Addition. + (Summary Post Commands): Ditto. + 2000-04-27 Dave Love * gnus.texi (Article Washing): Update x-face bit. diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index 6eec7d6..2de4fb3 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -2820,6 +2820,11 @@ kill $B$5$l$?%0%k!<%W$rA4$FI=<($7$^$9(B (@code{gnus-group-list-killed})$B!#@\ $B%-%c%C%7%e5-;v$r;}$D%0%k!<%W$rA4$FI=<($9$k(B (@code{gnus-group-list-cached})$B!#(B +@item A ? +@kindex A ? (Group) +@findex gnus-group-list-dormant +$BJ]N15-;v$r;}$D%0%k!<%W$rA4$FI=<($9$k(B (@code{gnus-group-list-dormant})$B!#(B + @end table @vindex gnus-permanently-visible-groups @@ -3608,8 +3613,29 @@ Gnus $B$3$N@55,I=8=$K%^%C%A$9$k%0%k!<%W$O!"$=$l$,6u$G$"$k$+$I$&$+$K4X$o(B $B$i$:!">o$K%0%k!<%W%P%C%U%!$KI=<($5$l$^$9!#(B -@end table +@item gnus-group-name-charset-method-alist +@vindex gnus-group-name-charset-method-alist +$B%0%k!<%WL>MQ$NA*BrJ}K!$HJ8;z=89g$NO"A[%j%9%H$G$9!#$3$l$O1Q;z$G$O$J$$%0%k!<(B +$B%WL>$rI=<($9$k$?$a$K;H$$$^$9!#(B + +$BNc(B: +@lisp +(setq gnus-group-name-charset-method-alist + '(((nntp "news.com.cn") . cn-gb-2312))) +@end lisp + +@item gnus-group-name-charset-group-alist +@vindex gnus-group-name-charset-group-alist +$B%0%k!<%WL>MQ$N%0%k!<%WL>$N@55,I=8=$HJ8;z=89g$NO"A[%j%9%H$G$9!#$3$l$O1Q;z(B +$B$G$O$J$$%0%k!<%WL>$rI=<($9$k$?$a$K;H$$$^$9!#(B + +$BNc(B: +@lisp +(setq gnus-group-name-charset-group-alist + '(("\\.com\\.cn:" . cn-gb-2312))) +@end lisp +@end table @node Scanning New Messages @subsection $B?7Ce%a%C%;!<%8$rC5$9(B @@ -4518,7 +4544,9 @@ Gnus $B$,$N?M$K8=:_$N5-;v$rE>Aw$7$^$9(B (@code{gnus-summary-mail-forward})$B!#(B @@ -7248,6 +7276,31 @@ CRLF $B$NAH(B ($B$9$J$o$A!"9T$N:G8e$N(B @samp{^M}) $B$r(B LF $B$KJQ49$7$^ DOS $B$N9TKv$N@$OC$r$7$^$9(B)$B!"$=$7$F$=$l$+$i;D$j$N(B CR $B$r(B LF $B$KJQ49$7$^$9(B ($B$3$l$O(B MAC $B$N9TKv$N@$OC$r$7$^$9(B) (@code{gnus-article-remove-cr})$B!#(B +@c @item W 6 +@c @kindex W 6 (Summary) +@c @findex gnus-article-de-base64-unreadable +@c Treat base64 (@code{gnus-article-de-base64-unreadable}). +@c Base64 is one common @sc{mime} encoding employed when sending non-ASCII +@c (i. e., 8-bit) articles. Note that the this is usually done +@c automatically by Gnus if the message in question has a +@c @code{Content-Transfer-Encoding} header that says that this encoding has +@c been done. + +@item W Z +@kindex W Z (Summary) +@findex gnus-article-decode-HZ +HZ $B$^$?$O(B HZP $B$r=hM}$7$^$9!#(BHZ ($B$^$?$O(B HZP) $B$OCf9q8l$N5-;v$rEAAw$9$k$H$-(B +$B$K;H$o$l$k0lHLE*$JId9f$G$9!#$3$l$O(B @samp{~@{<:Ky2;S@{#,NpJ)l6HK!#~@}} $B$N(B +$B$h$&$JE57?E*$JJ8;zNs$r:n$j$^$9!#(B + +@c @item W h +@c @kindex W h (Summary) +@c @findex gnus-article-wash-html +@c Treat HTML (@code{gnus-article-wash-html}). +@c Note that the this is usually done automatically by Gnus if the message +@c in question has a @code{Content-Type} header that says that this type +@c has been done. + @item W f @kindex W f $B!J35N,!K(B @cindex x-face @@ -9041,6 +9094,12 @@ Superseding} $B$r;2>H$7$F$/$@$5$$!#(B @code{nil} $B$G$J$1$l$P!"(B@kbd{a} $B$r$7$?$H$-$K!"(B@code{to-list} $B%0%k!<%W%Q%i(B $B%a!<%?$r$=$l$N$J$$%a!<%k%0%k!<%W$KIU$12C$($^$9!#(B +@c @item message-send-mail-partially-limit +@c @vindex message-send-mail-partially-limit +@c The limitation of messages sent as message/partial. +@c The lower bound of message size in characters, beyond which the message +@c should be sent in several parts. If it is nil, the size is unlimited. + @end table @@ -10547,7 +10606,8 @@ rm -f $TMP; $MOVEMAIL $MAIL $TMP >/dev/null && cat $TMP @item directory $B%G%#%l%/%H%j!$l$N%U%!%$%k$,(B $B@53N$K(B1$B%a!<%k$H$J$C$F$$$^$9!#(B @@ -10677,26 +10737,28 @@ maildir $B$+$i%a!<%k$r!$A(B" $B$^$9!#Aj8_Ej9F(B $B$r$7$F$$$k>l9g$O!"A4$F$N9gCW$7$?5,B'$,(B "$B>!$A(B" $B$^$9!#(B +$B$3$NJQ?t$O$=$NCM$H$7$F4X?t$r;}$D$3$H$b$G$-$^$9!#$=$N4X?t$O5-;v$N%X%C%@$N(B +$BItJ,$KHO0O$,69$a$i$l$?>uBV$G8F$P$l!"5-;v$N0\F0@h$@$H;W$&%0%k!<%W$rJV$9$b(B +$B$N$G$J$1$l$P$J$j$^$;$s!#(B@code{nnimap-split-fancy} $B$r;2>H$7$F2<$5$$!#(B + $BJ,3d%3!<%I$OI,MW$J$i%a!<%k%\%C%/%9$r:n@.$7$^$9!#(B +$B0[$J$k2>A[%5!<%P!A[%5!<%P!$Oe5-$NJ,3d$N5,(B +$BB'$NJ}$G$9!#(B + Nnmail $B$GBP1~$9$k$b$N(B: @code{nnmail-split-methods}. @item nnimap-split-predicate diff --git a/texi/gnus.texi b/texi/gnus.texi index d95afbd..6b7915a 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -2778,6 +2778,11 @@ List all groups that have names or descriptions that match a regexp @findex gnus-group-list-cached List all groups with cached articles (@code{gnus-group-list-cached}). +@item A ? +@kindex A ? (Group) +@findex gnus-group-list-dormant +List all groups with dormant articles (@code{gnus-group-list-dormant}). + @end table @vindex gnus-permanently-visible-groups @@ -3554,8 +3559,29 @@ generated. It may be used to move point around, for instance. Groups matching this regexp will always be listed in the group buffer, whether they are empty or not. -@end table +@item gnus-group-name-charset-method-alist +@vindex gnus-group-name-charset-method-alist +An alist of method and the charset for group names. It is used to show +non-ASCII group names. + +For example: +@lisp +(setq gnus-group-name-charset-method-alist + '(((nntp "news.com.cn") . cn-gb-2312))) +@end lisp + +@item gnus-group-name-charset-group-alist +@vindex gnus-group-name-charset-group-alist +An alist of regexp of group name and the charset for group names. +It is used to show non-ASCII group names. + +For example: +@lisp +(setq gnus-group-name-charset-group-alist + '(("\\.com\\.cn:" . cn-gb-2312))) +@end lisp +@end table @node Scanning New Messages @subsection Scanning New Messages @@ -4494,7 +4520,9 @@ message (@code{gnus-summary-wide-reply-with-original}). This command uses the process/prefix convention. @item S o m +@itemx C-c C-f @kindex S o m (Summary) +@kindex C-c C-f (Summary) @findex gnus-summary-mail-forward @c @icon{gnus-summary-mail-forward} Forward the current article to some other person @@ -7320,6 +7348,31 @@ Translate CRLF pairs (i. e., @samp{^M}s on the end of the lines) into LF CRs into LF (this takes care of Mac line endings) (@code{gnus-article-remove-cr}). +@item W 6 +@kindex W 6 (Summary) +@findex gnus-article-de-base64-unreadable +Treat base64 (@code{gnus-article-de-base64-unreadable}). +Base64 is one common @sc{mime} encoding employed when sending non-ASCII +(i. e., 8-bit) articles. Note that the this is usually done +automatically by Gnus if the message in question has a +@code{Content-Transfer-Encoding} header that says that this encoding has +been done. + +@item W Z +@kindex W Z (Summary) +@findex gnus-article-decode-HZ +Treat HZ or HZP (@code{gnus-article-decode-HZ}). HZ (or HZP) is one +common encoding employed when sending Chinese articles. It typically +makes strings look like @samp{~@{<:Ky2;S@{#,NpJ)l6HK!#~@}}. + +@item W h +@kindex W h (Summary) +@findex gnus-article-wash-html +Treat HTML (@code{gnus-article-wash-html}). +Note that the this is usually done automatically by Gnus if the message +in question has a @code{Content-Type} header that says that this type +has been done. + @item W f @kindex W f (Summary) @cindex x-face @@ -7704,7 +7757,7 @@ the same manner: @table @kbd @item K b @kindex K b (Summary) -Make all the @sc{mime} parts have buttons in from of them. This is +Make all the @sc{mime} parts have buttons in front of them. This is mostly useful if you wish to save (or perform other actions) on inlined parts. @@ -9390,6 +9443,12 @@ headers will be included in the sequence they are matched. If non-@code{nil}, add a @code{to-list} group parameter to mail groups that have none when you do a @kbd{a}. +@item message-send-mail-partially-limit +@vindex message-send-mail-partially-limit +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. + @end table @@ -10957,7 +11016,9 @@ Alter this script to fit find the @samp{movemail} you want to use. @item directory Get mail from several files in a directory. This is typically used when -you have procmail split the incoming mail into several files. +you have procmail split the incoming mail into several files. Setting +@code{nnmail-scan-directory-mail-source-once} to non-nil force Gnus to +scan the mail source only once. Keywords: @@ -11094,12 +11155,16 @@ Keywords: @table @code @item :path The path of the directory where the mails are stored. The default is -@samp{~/Maildir/new}. +taken from the @code{MAILDIR} environment variable or +@samp{~/Maildir/}. +@item :subdirs +The subdirectories of the Maildir. The default is +@samp{("new" "cur")}. -If you sometimes look at your mail through a pop3 daemon before fetching -them with Gnus, you may also have to fetch your mails from the -@code{cur} directory inside the maildir, like in the first example -below. +@c If you sometimes look at your mail through a pop3 daemon before fetching +@c them with Gnus, you may also have to fetch your mails from the +@c @code{cur} directory inside the maildir, like in the first example +@c below. You can also get mails from remote hosts (because maildirs don't suffer from locking problems). @@ -11109,11 +11174,11 @@ from locking problems). Two example maildir mail sources: @lisp -(maildir :path "/home/user-name/Maildir/cur") +(maildir :path "/home/user-name/Maildir/" :subdirs ("cur" "new")) @end lisp @lisp -(maildir :path "/user@@remotehost.org:~/Maildir/new") +(maildir :path "/user@@remotehost.org:~/Maildir/" :subdirs ("new")) @end lisp @item imap @@ -13625,10 +13690,30 @@ crossposting enabled. In that case, all matching rules will "win". This variable can also have a function as its value, the function will be called with the headers narrowed and should return a group where it -thinks the article should be splitted to. +thinks the article should be splitted to. See @code{nnimap-split-fancy}. The splitting code tries to create mailboxes if it need too. +To allow for different split rules on different virtual servers, and +even different split rules in different inboxes on the same server, +the syntax of this variable have been extended along the lines of: + +@lisp +(setq nnimap-split-rule + '(("my1server" (".*" (("ding" "ding@@gnus.org") + ("junk" "From:.*Simon"))) + ("my2server" ("INBOX" nnimap-split-fancy)) + ("my[34]server" (".*" (("private" "To:.*Simon") + ("junk" my-junk-func))))) +@end lisp + +The virtual server name is in fact a regexp, so that the same rules +may apply to several servers. In the example, the servers +@code{my3server} and @code{my4server} both use the same rules. +Similarly, the inbox string is also a regexp. The actual splitting +rules are as before, either a function, or a list with group/regexp or +group/function elements. + Nnmail equivalent: @code{nnmail-split-methods}. @item nnimap-split-predicate diff --git a/texi/gnusref.tex b/texi/gnusref.tex index da186fe..0ee9168 100644 --- a/texi/gnusref.tex +++ b/texi/gnusref.tex @@ -1,10 +1,4 @@ % include file for the Gnus refcard and booklet -\def\progver{5.0}\def\refver{5.0} % program and refcard versions -\def\date{16 September 1995} -\def\author{Vladimir Alexiev $<$vladimir@cs.ualberta.ca$>$} -\raggedbottom\raggedright -\newlength{\logowidth}\setlength{\logowidth}{6.861in} -\newlength{\logoheight}\setlength{\logoheight}{7.013in} \newlength{\keycolwidth} \newenvironment{keys}[1]% #1 is the widest key {\nopagebreak%\noindent% @@ -13,24 +7,29 @@ \addtolength{\keycolwidth}{-\columnwidth}% \begin{tabular}{@{}l@{\hspace{\tabcolsep}}p{-\keycolwidth}@{}}}% {\end{tabular}\\} -\catcode`\^=12 % allow ^ to be typed literally -\newcommand{\B}[1]{{\bf#1})} % bold l)etter -\def\Title{ +% uncomment the first definition if you do not want pagebreaks in maps +%\newcommand{\esamepage}{\samepage} +\newcommand{\esamepage}{} + +\newcommand*{\B}[1]{{\bf#1})} % bold l)etter + +\newcommand{\Title}{% \begin{center} {\bf\LARGE Gnus \progver\ Reference \Guide\\} %{\normalsize \Guide\ version \refver} \end{center} } -\newcommand\Logo[1]{\centerline{ +\newcommand*{\Logo}[1]{\centerline{% \makebox[\logoscale\logowidth][l]{\vbox to \logoscale\logoheight {\vfill\special{psfile=gnuslogo.#1}}\vspace{-\baselineskip}}}} -\def\CopyRight{ +\newcommand{\Copyright}{% \begin{center} Copyright \copyright\ 1995 Free Software Foundation, Inc.\\* Copyright \copyright\ 1995 \author.\\* +Copyright \copyright\ 2000 Felix Natter $<$fnatter@gmx.net$>$.\\* Created from the Gnus manual Copyright \copyright\ 1994 Lars Magne Ingebrigtsen.\\* and the Emacs Help Bindings feature (C-h b).\\* @@ -40,12 +39,12 @@ Gnus logo copyright \copyright\ 1995 Luis Fernandes.\\* Permission is granted to make and distribute copies of this reference \guide{} provided the copyright notice and this permission are preserved on all copies. Please send corrections, additions and suggestions to the -above email address. \Guide{} last edited on \date. +current maintainer's email address. \Guide{} last edited on \date. } -\def\Notes{ -\subsec{Notes} -{\samepage +\newcommand{\Notes}{% +\subsection*{Notes} +{\esamepage Gnus is complex. Currently it has some 346 interactive (user-callable) functions. Of these 279 are in the two major modes (Group and Summary/Article). Many of these functions have more than one binding, some @@ -76,44 +75,40 @@ equal level will be affected by the operation. If no prefix is given, commands will also set the default level. \quad [score] An article score. If no prefix is given, -`gnus-summary-default-score' is used. -%Some functions were not yet documented at the time of creating this -%\guide and are clearly indicated as such. -\\*[\baselineskip] +`gnus-summary-default-score' is used. \\*[\baselineskip] +% some keys \begin{keys}{C-c C-i} +M-x gnus & start Gnus. \\ +M-x gnus-no-server & start Gnus without trying to contact server. \\ C-c C-i & Go to the Gnus online {\bf info}.\\ C-c C-b & Send a Gnus {\bf bug} report.\\ \end{keys} }} -\def\GroupLevels{ -\subsec{Group Subscribedness Levels} +\newcommand{\GroupLevels}{% The table below assumes that you use the default Gnus levels. Fill your user-specific levels in the blank cells.\\[1\baselineskip] - \begin{tabular}{|c|l|l|} \hline Level & Groups & Status \\ \hline -1 & mail groups & \\ -2 & mail groups & \\ -3 & & subscribed \\ -4 & & \\ -5 & default list level & \\ +1 & draft/mail groups & \\ +2 & mail groups & \\ +3 & & subscribed \\ +4 & & \\ +5 & default list level & \\ \hline -6 & & unsubscribed \\ -7 & & \\ +6 & & unsubscribed \\ +7 & & \\ \hline -8 & & zombies \\ +8 & & zombies \\ \hline -9 & & killed \\ +9 & & killed \\ \hline -\end{tabular} -} +\end{tabular}} -\def\Marks{ -\subsec{Mark Indication Characters} -{\samepage If a command directly sets a mark, it is shown in parentheses.\\* +\newcommand{\MarkCharacters}{% +{\esamepage If a command directly sets a mark, it is shown in parentheses.\\* \newlength{\markcolwidth} \settowidth{\markcolwidth}{` '}% widest character \addtolength{\markcolwidth}{4\tabcolsep} @@ -130,8 +125,8 @@ Level & Groups & Status \\ ` ' & (M-u, M SPC, M c) Not read.\\ ! & (!, M !, M t) Ticked (interesting).\\ ? & (?, M ?) Dormant (only followups are interesting).\\ -C & (C, S c) {\bf Canceled} (only for your own articles).\\ E & (E, M e, M x) {\bf Expirable}. Only has effect in mail groups.\\ +G & (C, B DEL) Canceled article (or deleted in mailgroups).\\ \hline\hline \multicolumn{2}{|p{\markdblcolwidth}|}{The marks below mean that the article is read (killed, uninteresting), and have more or less the same effect. @@ -140,49 +135,61 @@ E & (E, M e, M x) {\bf Expirable}. Only has effect in mail groups.\\ \hline r & (d, M d, M r) Deleted (marked as {\bf read}).\\ C & (M C; M C-c; M H; c, Z c; Z n; Z C) Killed by {\bf catch-up}.\\ -O & {\bf Old} (marked read in a previous session).\\ +F & SOUPed article. See the manual.\\ +O & {\bf Old} (read in a previous session).\\ K & (k, M k; C-k, M K) {\bf Killed}.\\ +M & Article marked as read by duplicate suppression.\\ +Q & Article is part of a sparse thread (see ``Threading'' in the manual).\\ R & {\bf Read} (viewed in actuality).\\ X & Killed by a kill file.\\ Y & Killed due to low score.\\ \hline\multicolumn{2}{c}{\vspace{1ex}}\\\hline -\multicolumn{2}{|p{\markdblcolwidth}|}{{\bf Other marks}}\\ +\multicolumn{2}{|p{\markdblcolwidth}|}{{\bf Marks not affecting visibility}}\\ \hline -\# & (\#, M \#, M P p) Processable (will be affected by the next operation).\\ -A & {\bf Answered} (followed-up or replied).\\ -+ & Over default score.\\ -$-$ & Under default score.\\ -= & Has children (thread underneath it). Add `\%e' to - `gnus-summary-line-format'.\\ +\# & (\#, M \#, M P p) Processable (will be affected by the next operation). +[2]\\ +A & {\bf Answered} (followed-up or replied). [2]\\ +* & Cached. [2]\\ +S & Saved. [2]\\ ++ & Over default score. [3]\\ +$-$ & Under default score. [3]\\ +$=$ & Has children (thread underneath it). Add `\%e' to +`gnus-summary-line-format'. [3]\\ \hline \end{tabular} }} -\def\GroupMode{ -\sec{Group Mode} +\newcommand{\GroupModeGeneral}{% \begin{keys}{C-c M-C-x} -RET & (=) Select this group. [Prefix: how many (read) articles to fetch. -Positive: newest articles, negative: oldest ones.]\\ -SPC & Select this group and display the first unread article. [Same -prefix as above.]\\ +RET & (=) Enter this group. [Prefix: how many (read) articles to fetch. +Positive: newest articles, negative: oldest ones; non-numerical: fetch all articles, not just unread]\\ +M-RET & Enter group quickly.\\ +M-SPC & Same as RET but does not expunge and hide dormants.\\ +M-C-RET & Enter group without any processing, changes will not be permanent.\\ +SPC & Select this group and display the first (unread) article. [Same +prefix as above.]\\ ? & Give a very short help message.\\ $<$ & Go to the beginning of the Group buffer.\\ $>$ & Go to the end of the Group buffer.\\ , & Jump to the lowest-level group with unread articles.\\ . & Jump to the first group with unread articles.\\ -^ & Enter the Server buffer mode.\\ +xx & Enter the Server buffer mode.\\ a & Post an {\bf article} to a group.\\ b & Find {\bf bogus} groups and delete them.\\ c & Mark all unticked articles in this group as read ({\bf catch-up}). [p/p]\\ g & Check the server for new articles ({\bf get}). [level]\\ +M-g & Check the server for new articles in this group ({\bf get}). [p/p]\\ j & {\bf Jump} to a group.\\ m & {\bf Mail} a message to someone.\\ n & Go to the {\bf next} group with unread articles. [distance]\\ +M-n & Go to the {\bf next} group on the same or lower level. +[distance]\\ p & (DEL) Go to the {\bf previous} group with unread articles. [distance]\\ +M-p & Go to the {\bf previous} group on the same or lower level. [distance]\\ q & {\bf Quit} Gnus.\\ -r & Read the init file ({\bf reset}).\\ +r & Re-read the init file ({\bf reset}).\\ s & {\bf Save} the `.newsrc.eld' file (and `.newsrc' if `gnus-save-newsrc-file').\\ z & Suspend (kill all buffers of) Gnus.\\ @@ -193,89 +200,140 @@ N & Go to the {\bf next} group. [distance]\\ P & Go to the {\bf previous} group. [distance]\\ Q & {\bf Quit} Gnus without saving any startup (.newsrc) files.\\ R & {\bf Restart} Gnus.\\ -V & Display the Gnus {\bf version} number.\\ Z & Clear the dribble buffer.\\ -C-c C-d & Show the {\bf description} of this group. [Prefix: re-read it -from the server.]\\ +M-c & Clear data from group (marks and list of read articles). \\ C-c C-s & {\bf Sort} the groups by name, number of unread articles, or level (depending on `gnus-group-sort-function').\\ C-c C-x & Run all expirable articles in this group through the {\bf expiry} process.\\ C-c M-C-x & Run all articles in all groups through the {\bf expiry} process.\\ +C-c M-g & Activate all {\bf groups}.\\ +C-c C-i & Gnus online-manual ({\bf info}).\\ C-x C-t & {\bf Transpose} two groups.\\ -M-d & {\bf Describe} ALL groups. [Prefix: re-read the description from the -server.]\\ -M-f & Fetch this group's {\bf FAQ} (using ange-ftp).\\ -M-g & Check the server for new articles in this group ({\bf get}). [p/p]\\ -M-n & Go to the {\bf previous} unread group on the same or lower level. -[distance]\\ -M-p & Go to the {\bf next} unread group on the same or lower level. -[distance]\\ +H f & Fetch this group's {\bf FAQ} (using ange-ftp).\\ +H v & (V) Display the Gnus {\bf version} number.\\ +H d & (C-c C-d) Show the {\bf description} of this group +[Prefix: re-read from server].\\ +M-d & {\bf Describe} all groups. [Prefix: re-read from server]\\ \end{keys} } -\def\GroupCommands{ -\subsec{List Groups} -{\samepage -\begin{keys}{A m} -A a & (C-c C-a) List all groups whose names match a regexp ({\bf -apropos}).\\ +\newcommand{\ListGroups}{% +{\esamepage +\begin{keys}{A M} A d & List all groups whose names or {\bf descriptions} match a regexp.\\ -A k & (C-c C-l) List all {\bf killed} groups.\\ -A m & List groups that {\bf match} a regexp and have unread articles. -[level]\\ -A s & (l) List {\bf subscribed} groups with unread articles. [level]\\ -A u & (L) List all groups (including {\bf unsubscribed}). [If no prefix -is given, level 7 is the default]\\ -A z & List the {\bf zombie} groups.\\ +A k & (C-c C-l) List all {\bf killed} groups. +[Prefix: look at active-file from server]\\ +A l & List all groups on a specific level. +[Prefix: also list groups with no unread articles]\\ +A d & List all groups that have names or {\bf descriptions} matching +a regexp.\\ +A a & (C-c C-a) List all groups whose names match a regexp +({\bf apropos}).\\ +A A & List the server's active-file.\\ A M & List groups that {\bf match} a regexp.\\ +A m & List groups that {\bf match} a regexp and have unread articles. +[level]\\ +A s & (l) List all {\bf subscribed} groups with unread articles. +[level, 5 and lower is the default]\\ +A u & (L) List all groups (including read and {\bf unsubscribed}). +[level, 7 and lower is the default]\\ +A z & List all {\bf zombie} groups.\\ \end{keys} } -\subsec{Create/Edit Foreign Groups} -{\samepage +\newcommand{\CreateEditGroups}{% +{\esamepage The select methods are indicated in parentheses.\\* -\begin{keys}{G m} +\begin{keys}{G DEL} G a & Make the Gnus list {\bf archive} group. (nndir over ange-ftp)\\ +G c & {\bf Customize} this group's parameters.\\ G d & Make a {\bf directory} group (every file must be a posting and files must have numeric names). (nndir)\\ +G D & Enter a {\bf directory} as a (temporary) group. +(nneething without recording articles read)\\ G e & (M-e) {\bf Edit} this group's select method.\\ +G E & {\bf Edit} this group's info (select method, articles read, etc).\\ G f & Make a group based on a {\bf file}. (nndoc)\\ G h & Make the Gnus {\bf help} (documentation) group. (nndoc)\\ G k & Make a {\bf kiboze} group. (nnkiboze)\\ G m & {\bf Make} a new group.\\ G p & Edit this group's {\bf parameters}.\\ +G r & Rename this group (does not work with read-only groups!).\\ +G u & Create one of the groups mentioned in gnus-{\bf useful}-groups.\\ G v & Add this group to a {\bf virtual} group. [p/p]\\ -G D & Enter a {\bf directory} as a (temporary) group. (nneething without -recording articles read.)\\ -G E & {\bf Edit} this group's info (select method, articles read, etc).\\ G V & Make a new empty {\bf virtual} group. (nnvirtual)\\ +G w & Create ephemeral group based on web-search. [Prefix: make solid group +instead]\\ +G DEL & {\bf Delete} group [Prefix: delete all articles as well].\\ \end{keys} You can also create mail-groups and read your mail with Gnus (very useful -if you are subscribed to any mailing lists), using one of the methods +if you are subscribed to mailing lists), using one of the methods nnmbox, nnbabyl, nnml, nnmh, or nnfolder. Read about it in the online info (C-c C-i g Reading Mail RET). -} - -%\subsubsec{Soup Commands} -%\begin{keys}{G s w} -%G s b & gnus-group-brew-soup: not documented.\\ -%G s p & gnus-soup-pack-packet: not documented.\\ -%G s r & nnsoup-pack-replies: not documented.\\ -%G s s & gnus-soup-send-replies: not documented.\\ -%G s w & gnus-soup-save-areas: not documented.\\ -%\end{keys} +}} -\subsec{Mark Groups} +% TODO: +\newcommand{\SoupCommands}{% +\begin{keys}{G s w} +G s b & gnus-group-brew-soup: not documented.\\ +G s p & gnus-soup-pack-packet: not documented.\\ +G s r & nnsoup-pack-replies: not documented.\\ +G s s & gnus-soup-send-replies: not documented.\\ +G s w & gnus-soup-save-areas: not documented.\\ +\end{keys}} + +\newcommand{\MarkGroups}{% \begin{keys}{M m} M m & (\#) Set the process {\bf mark} on this group. [scope]\\ +M r & Mark all groups matching regular expression.\\ M u & (M-\#) Remove the process mark from this group ({\bf unmark}). [scope]\\ +M U & Remove the process mark from all groups (\textbf{umark all}).\\ M w & Mark all groups in the current region.\\ -\end{keys} - -\subsec{Unsubscribe, Kill and Yank Groups} -\begin{keys}{S w} +\end{keys}} + +\newcommand{\GroupTopicsGeneral}{% +{\esamepage +Topics are ``categories'' for groups. Press t in the group-buffer to +toggle gnus-topic-mode (C-c C-i g Group Topics RET). +\begin{keys}{C-c C-x} +T n & Prompt for topic {\bf name} and create it.\\ +T m & {\bf Move} the current group to some other topic [p/p].\\ +T j & {\bf Jump} to a topic.\\ +T c & {\bf Copy} the current group to some other topic [p/p].\\ +T D & Remove (not delete) the current group [p/p].\\ +T M & {\bf Move} all groups matching a regexp to a topic.\\ +T C & {\bf Copy} all groups matching a regexp to a topic.\\ +T H & Toggle {\bf hiding} of empty topics.\\ +T r & {\bf Rename} a topic.\\ +T DEL & Delete an empty topic.\\ +T \# & Mark all groups in the current topic with the process-mark.\\ +T M-\# & Remove the process-mark from all groups in the current topic.\\ +T TAB & (TAB) Indent current topic [Prefix: unindent].\\ +M-TAB & Unindent the current topic.\\ +RET & (SPC) Either unfold topic or enter group [level].\\ +C-c C-x & Expire all articles in current group or topic.\\ +C-k & {\bf Kill} a group or topic.\\ +C-y & {\bf Yank} a group or topic.\\ +A T & List active-file using {\bf topics}.\\ +G p & Edit topic-{\bf parameters}.\\ +\end{keys}}} + +\newcommand{\TopicSorting}{% +{\esamepage +\begin{keys}{T S m} +T S a & Sort {\bf alphabetically}.\\ +T S u & Sort by number of {\bf unread} articles.\\ +T S l & Sort by group {\bf level}.\\ +T S v & Sort by group score ({\bf value}).\\ +T S r & Sort by group {\bf rank}.\\ +T S m & Sort by {\bf method}.\\ +\end{keys}}} + +\newcommand{\SubscribeKillYankGroups}{% +{\esamepage +\begin{keys}{S C-k} S k & (C-k) {\bf Kill} this group.\\ S l & Set the {\bf level} of this group. [p/p]\\ S s & (U) Prompt for a group and toggle its {\bf subscription}.\\ @@ -283,236 +341,436 @@ S t & (u) {\bf Toggle} subscription to this group. [p/p]\\ S w & (C-w) Kill all groups in the region.\\ S y & (C-y) {\bf Yank} the last killed group.\\ S z & Kill all {\bf zombie} groups.\\ -\end{keys} -} +S C-k & Kill all groups on a certain level.\\ +\end{keys}}} -\def\SummaryMode{ -\sec{Summary Mode} %{Summary and Article Modes} -\begin{keys}{SPC} +\newcommand{\SummaryModeGeneral}{% +{\esamepage +\begin{keys}{M-RET} SPC & (A SPC, A n) Select an article, scroll it one page, move to the next one.\\ DEL & (A DEL, A p, b) Scroll this article one page back. [distance]\\ RET & Scroll this article one line forward. [distance]\\ -= & Expand the Summary window. [Prefix: shrink it to display the -Article window]\\ -$<$ & (A $<$, A b) Scroll to the beginning of this article.\\ -$>$ & (A $>$, A e) Scroll to the end of this article.\\ -\& & Execute a command on all articles matching a regexp. -[Prefix: move backwards.]\\ -j & (G g) Ask for an article number and then {\bf jump} to that summary -line.\\ -C-t & Toggle {\bf truncation} of summary lines.\\ +M-RET & Scroll this article one line backward. [distance]\\ += & Expand the Summary window (fullsize). +[Prefix: shrink to display article window]\\ +% +\& & Execute a command on all articles whose header matches a regexp. +[Prefix: move backwards]\\ M-\& & Execute a command on all articles having the process mark.\\ -M-k & Edit this group's {\bf kill} file.\\ +% M-n & (G M-n) Go to the {\bf next} summary line of an unread article. [distance]\\ M-p & (G M-p) Go to the {\bf previous} summary line of an unread article. [distance]\\ -M-r & Search through all previous articles for a regexp.\\ M-s & {\bf Search} through all subsequent articles for a regexp.\\ +M-r & Search through all previous articles for a regexp.\\ +% +A P & {\bf Postscript}-print current buffer.\\ +% +M-k & Edit this group's {\bf kill} file.\\ M-K & Edit the general {\bf kill} file.\\ -\end{keys} -} - -\def\SortSummary{ -\subsec{Sort the Summary Buffer} -\begin{keys}{C-c C-s C-a} -C-c C-s C-a & Sort the summary by {\bf author}.\\ -C-c C-s C-d & Sort the summary by {\bf date}.\\ -C-c C-s C-i & Sort the summary by article score.\\ -C-c C-s C-n & Sort the summary by article {\bf number}.\\ -C-c C-s C-s & Sort the summary by {\bf subject}.\\ -\end{keys} -} - -\def\Asubmap{ -\subsec{Article Buffer Commands} -\begin{keys}{A m} -A g & (g) (Re)fetch this article ({\bf get}). [Prefix: just show the -article.]\\ -A r & (^, A ^) Go to the parent of this article (the {\bf References} -header).\\ -M-^ & Fetch the article with a given Message-ID.\\ +% +C-t & Toggle {\bf truncation} of summary lines.\\ +Y g & Regenerate the summary-buffer.\\ +Y c & Insert all cached articles into the summary-buffer.\\ +% +M-C-e & {\bf Edit} the group-parameters.\\ +M-C-g & Customize the group-parameters.\\ +% +% article handling +% +A $<$ & ($<$, A b) Scroll to the beginning of this article.\\ +A $>$ & ($>$, A e) Scroll to the end of this article.\\ A s & (s) Perform an i{\bf search} in the article buffer.\\ -A D & (C-d) Un{\bf digestify} this article into a separate group.\\ -\end{keys} -} - -\def\Bsubmap{ -\subsec{Mail-Group Commands} -{\samepage +% +A D & (C-d) Un{\bf digestify} this article into a separate group. +[Prefix: force digest]\\ +M-C-d & Like C-d, but open several documents in nndoc-groups, wrapped +in an nnvirtual group [p/p]\\ +% +A g & (g) (Re)fetch this article ({\bf get}). [Prefix: get raw version]\\ +A r & (\^{}, A \^{}) Fetch the parent(s) of this article. +[Prefix: if positive fetch \textit{n} ancestors; +negative: fetch only the \textit{n}th ancestor]\\ +A t & {\bf Translate} this article.\\ +A R & Fetch all articles mentioned in the {\bf References}-header.\\ +A T & Fetch full \textbf{thread} in which the current article appears.\\ +M-\^{} & Fetch the article with a given Message-ID.\\ +S y & {\bf Yank} the current article into an existing message-buffer. +[p/p]\\ +\end{keys}}} + +\newcommand{\MIMESummary}{% +{\esamepage +For the commands operating on one MIME part (a subset of gnus-article-*), a +prefix selects which part to operate on. If the point is placed over a +MIME button in the article buffer, use the corresponding bindings for the +article buffer instead. +\begin{keys}{W M w} +K v & (b) {\bf View} the MIME-part.\\ +K o & {\bf Save} the MIME part.\\ +K c & {\bf Copy} the MIME part.\\ +K e & View the MIME part {\bf externally}.\\ +K i & View the MIME part {\bf internally}.\\ +K $\mid$ & Pipe the MIME part to an external command.\\ +K b & Make all the MIME parts have buttons in front of them.\\ +K m & Try to repair {\bf multipart-headers}.\\ +X m & Save all parts matching a MIME type to a directory. [p/p]\\ +M-t & Toggle the buttonized display of the article buffer.\\ +W M w & Decode RFC2047-encoded words in the article headers.\\ +W M c & Decode encoded article bodies. [Prefix: prompt for charset]\\ +W M v & View all MIME parts in the current article.\\ +\end{keys}}} + +\newcommand{\SortSummary}{% +{\esamepage +\begin{keys}{C-c C-s C-a} +C-c C-s C-a & Sort the summary-buffer by {\bf author}.\\ +C-c C-s C-d & Sort the summary-buffer by {\bf date}.\\ +C-c C-s C-i & Sort the summary-buffer by article score.\\ +C-c C-s C-l & Sort the summary-buffer by amount of lines.\\ +C-c C-s C-c & Sort the summary-buffer by length.\\ +C-c C-s C-n & Sort the summary-buffer by article {\bf number}.\\ +C-c C-s C-s & Sort the summary-buffer by {\bf subject}.\\ +\end{keys}}} + +\newcommand{\MailGroups}{% formerly \Bsubmap +{\esamepage These commands (except `B c') are only valid in a mail group.\\* \begin{keys}{B M-C-e} -B DEL & {\bf Delete} the mail article from disk (!). [p/p]\\ +B DEL & (B backspace, B delete) {\bf Delete} the mail article from disk (!). +[p/p]\\ +B B & Crosspost this article to another group.\\ B c & {\bf Copy} this article from any group to a mail group. [p/p]\\ B e & {\bf Expire} all expirable articles in this group. [p/p]\\ B i & {\bf Import} a random file into this group.\\ B m & {\bf Move} the article from one mail group to another. [p/p]\\ -B q & {\bf Query} where will the article go during fancy splitting\\ +B p & Query whether the article was posted as well.\\ +B q & {\bf Query} where the article will end up after fancy splitting\\ B r & {\bf Respool} this mail article. [p/p]\\ +B t & {\bf Trace} the fancy splitting patterns applied to this article.\\ B w & (e) Edit this article.\\ B M-C-e & {\bf Expunge} (delete from disk) all expirable articles in this group (!). [p/p]\\ -\end{keys} -}} - -\def\Gsubmap{ -\subsec{Select Articles} -{\samepage +\end{keys}}} + +\newcommand{\DraftGroup}{% formerly \Dsubmap +{\esamepage +The ``drafts''-group contains messages that have been saved but not sent +and rejected articles. \\* +\begin{keys}{B DEL} +D e & {\bf edit} message in draft group.\\ +B DEL & \textbf{Delete} message (like in mailgroup).\\ +\end{keys}}} + +\newcommand{\SelectArticles}{% formerly \Gsubmap +{\esamepage These commands select the target article. They do not understand the prefix.\\* \begin{keys}{G C-n} +h & Enter article-buffer.\\ G b & (,) Go to the {\bf best} article (the one with highest score).\\ G f & (.) Go to the {\bf first} unread article.\\ -G l & (l) Go to the {\bf last} article read.\\ G n & (n) Go to the {\bf next} unread article.\\ -p & Go to the {\bf previous} unread article.\\ -G p & {\bf Pop} an article off the summary history and go to it.\\ +G p & (p) Go to the {\bf previous} unread article.\\ +% G N & (N) Go to {\bf the} next article.\\ G P & (P) Go to the {\bf previous} article.\\ +% G C-n & (M-C-n) Go to the {\bf next} article with the same subject.\\ G C-p & (M-C-p) Go to the {\bf previous} article with the same subject.\\ +% +G l & (l) Go to the previously read article ({\bf last-read-article}).\\ +G o & Pop an article off the summary history and go to it.\\ +% +G g & Search an article via subject.\\ +G j & (j) Search an article via Message-Id or subject.\\ +\end{keys}}} + +\newcommand{\ArticleModeGeneral}{% +{\esamepage +The normal navigation keys work in Article mode. Some additional keys are:\\* +\begin{keys}{C-c RET} +C-c \^{} & Get the article with the Message-ID near point.\\ +C-c RET & Send reply to address near point.\\ +h & Go to the \textbf{header}-line of the article in the +summary-buffer.\\ +s & Go to \textbf{summary}-buffer.\\ +RET & (middle mouse button) Activate the button at point to follow +an URL or Message-ID.\\ +TAB & Move the point to the next button.\\ +M-TAB & Move point to previous button.\\ +\end{keys}}} + +\newcommand{\WashArticle}{% formerly \Wsubmap +{\esamepage +\begin{keys}{W W H} +W b & Make Message-IDs and URLs in the article mouse-clickable +{\bf buttons}.\\ +W l & (w) Remove page breaks ({\bf\^{}L}) from the article.\\ +W c & Translate CRLF-pairs to LF and then the remaining CR's to LF's.\\ +W d & Treat {\bf dumbquotes}.\\ +W f & Look for and display any X-{\bf Face} headers.\\ +W m & Toggle {\bf MIME} processing.\\ +W o & Treat {\bf overstrike} or underline (\^{}H\_) in the article.\\ +W q & Treat {\bf quoted}-printable in the article.\\ +W r & (C-c C-r) Do a Caesar {\bf rotate} (rot13) on the article.\\ +W t & (t) {\bf Toggle} display of all headers.\\ +W v & (v) Toggle permanent {\bf verbose} displaying of all headers.\\ +W w & Do word {\bf wrap} in the article.\\ +W B & Add clickable {\bf buttons} to the article headers.\\ +W C & {\bf Capitalize} first word in each sentence.\\ +W Q & Fill long lines.\\ +% +W W H & Strip certain {\bf headers} from body.\\ +% +W E l & Strip blank {\bf lines} from the beginning of the article.\\ +W E m & Replace blank lines with empty lines and remove {\bf multiple} +blank lines.\\ +W E t & Remove {\bf trailing} blank lines.\\ +W E a & Strip blank lines at the beginning and the end +(W E l, W E m and W E t).\\ +W E A & Strip {\bf all} blank lines.\\ +W E s & Strip leading blank lines from the article body.\\ +W E e & Strip trailing blank lines from the article body.\\ +% +W T u & (W T z) Display the article timestamp in GMT ({\bf UT, ZULU}).\\ +W T i & Display the article timestamp in {\bf ISO} 8601.\\ +W T l & Display the article timestamp in the {\bf local} timezone.\\ +W T s & Display according to `gnus-article-time-format'.\\ +W T e & Display the time {\bf elapsed} since it was sent.\\ +W T o & Display the {\bf original} timestamp.\\ +\end{keys}}} + +\newcommand{\HideHighlightArticle}{% +{\esamepage +\begin{keys}{W W C-c} +W W a & Hide {\bf all} unwanted parts. Calls W W h, W W s, W W C-c.\\ +W W h & Hide article {\bf headers}.\\ +W W b & Hide {\bf boring} headers.\\ +W W s & Hide {\bf signature}.\\ +W W l & Hide {\bf list} identifiers in subject-header.\\ +W W p & Hide {\bf PGP}-signatures.\\ +W W P & Hide {\bf PEM} (privacy enhanced messages).\\ +W W B & Hide banner specified by group parameter.\\ +W W c & Hide {\bf citation}.\\ +W W C-c & Hide {\bf citation} using a more intelligent algorithm.\\ +W W C & Hide cited text in articles that aren't roots.\\ +% +W e & {\bf Emphasize} article.\\ +% +W H a & Highlight {\bf all} parts. Calls W b, W H c, W H h, W H s.\\ +W H c & Highlight article {\bf citations}.\\ +W H h & Highlight article {\bf headers}.\\ +W H s & Highlight article {\bf signature}.\\ \end{keys} +For all hiding-commands: A positive prefix always hides, and a negative +prefix will show what was previously hidden. }} -\def\Hsubmap{ -\subsec{Help Commands} -\begin{keys}{H d} -H d & (C-c C-d) {\bf Describe} this group. [Prefix: re-read the description -from the server.]\\ -H f & Try to fetch the {\bf FAQ} for this group using ange-ftp.\\ -H h & Give a very short {\bf help} message.\\ -H i & (C-c C-i) Go to the Gnus online {\bf info}.\\ -H v & Display the Gnus {\bf version} number.\\ -\end{keys} -} - -\def\Msubmap{ -\subsec{Mark Articles} +\newcommand{\MIMEArticleMode}{% +{\esamepage +\begin{keys}{M-RET} +RET & (BUTTON-2) Toggle display of the MIME object.\\ +v & (M-RET) Prompt for a method and then view object using this method.\\ +o & Prompt for a filename and save the MIME object.\\ +c & {\bf Copy} the MIME object to a new buffer and display this buffer.\\ +t & View the MIME object as a different {\bf type}.\\ +$\mid$ & Pipe the MIME object to a process.\\ +\end{keys}}} + +%% end of article mode for reading .......................................... + +\newcommand{\MarkArticlesGeneral}{% formerly \Msubmap +{\esamepage \begin{keys}{M M-C-r} d & (M d, M r) Mark this article as read and move to the next one. [scope]\\ D & Mark this article as read and move to the previous one. [scope]\\ -u & (!, M !, M t) Tick this article (mark it as interesting) and move +! & (u, M !, M t) Tick this article (mark it as interesting) and move to the next one. [scope]\\ U & Tick this article and move to the previous one. [scope]\\ +M ? & (?) Mark this article as dormant (only followups are +interesting). [scope]\\ +M D & Show all {\bf dormant} articles (normally they are hidden unless they +have any followups).\\ +M M-D & Hide all {\bf dormant} articles.\\ +C-w & Mark all articles between point and mark as read.\\ M-u & (M SPC, M c) Clear all marks from this article and move to the next one. [scope]\\ M-U & Clear all marks from this article and move to the previous one. -[scope]\\ -M ? & (?) Mark this article as dormant (only followups are -interesting). [scope]\\ -M b & Set a {\bf bookmark} in this article.\\ +[scope]\\ +% M e & (E, M x) Mark this article as {\bf expirable}. [scope]\\ +% M k & (k) {\bf Kill} all articles with the same subject then select the -next one.\\ -M B & Remove the {\bf bookmark} from this article.\\ -M C & {\bf Catch-up} the articles that are not ticked.\\ -M D & Show all {\bf dormant} articles (normally they are hidden unless they -have any followups).\\ -M H & Catch-up (mark read) this group to point ({\bf here}).\\ +next unread one.\\ M K & (C-k) {\bf Kill} all articles with the same subject as this one.\\ -C-w & Mark all articles between point and mark as read.\\ -M S & (C-c M-C-s) {\bf Show} all expunged articles.\\ +% +M C & {\bf Catch-up} the articles that are not ticked and not dormant.\\ M C-c & {\bf Catch-up} all articles in this group.\\ +M H & Catch-up (mark read) this group to point (to-{\bf here}).\\ +% +M b & Set a {\bf bookmark} in this article.\\ +M B & Remove the {\bf bookmark} from this article.\\ +% M M-r & (x) Expunge all {\bf read} articles from this group.\\ -M M-D & Hide all {\bf dormant} articles.\\ M M-C-r & Expunge all articles having a given mark.\\ +M S & (C-c M-C-s) {\bf Show} all expunged articles.\\ +M M C-h & Displays some more keys doing ticking slightly differently.\\ \end{keys} +The variable `gnus-summary-goto-unread' controls what happens after a mark +has been set (C-x C-i g Setting Marks RET) +}} -\subsubsec{Mark Based on Score} -\begin{keys}{M s m} +\newcommand{\MarkByScore}{% +\begin{keys}{M V m} M V c & {\bf Clear} all marks from all high-scored articles. [score]\\ M V k & {\bf Kill} all low-scored articles. [score]\\ M V m & Mark all high-scored articles with a given {\bf mark}. [score]\\ M V u & Mark all high-scored articles as interesting (tick them). [score]\\ -\end{keys} +\end{keys}}} -\subsubsec{The Process Mark} -{\samepage -These commands set and remove the process mark \#. You only need to use +\newcommand{\ProcessMark}{% +{\esamepage +These commands set and remove the process mark (\#). You only need to use it if the set of articles you want to operate on is non-contiguous. Else use a numeric prefix.\\* \begin{keys}{M P R} -M P a & Mark {\bf all} articles (in series order).\\ M P p & (\#, M \#) Mark this article.\\ +M P u & (M-\#, M M-\#) \textbf{unmark} this article.\\ +M P b & Mark all articles in {\bf buffer}.\\ M P r & Mark all articles in the {\bf region}.\\ -M P s & Mark all articles in the current {\bf series}.\\ -M P t & Mark all articles in this (sub){\bf thread}.\\ -M P u & (M-\#, M M-\#) {\bf Unmark} this article.\\ M P R & Mark all articles matching a {\bf regexp}.\\ +M P t & Mark all articles in this (sub){\bf thread}.\\ +M P s & Mark all articles in the current {\bf series}.\\ M P S & Mark all {\bf series} that already contain a marked article.\\ -M P U & {\bf Unmark} all articles.\\ -\end{keys} -}} - -\def\Osubmap{ -\subsec{Output Articles} +M P a & Mark {\bf all} articles (in series order).\\ +M P U & \textbf{unmark} all articles.\\ +% +M P i & {\bf Invert} the list of process-marked articles.\\ +M P k & Push the current process-mark set onto stack and unmark +all articles.\\ +M P y & Pop process-mark set from stack and restore it.\\ +\end{keys}}} + +\newcommand{\Limiting}{% +{\esamepage +\begin{keys}{/M} +// & (/s) Limit the summary-buffer to articles matching {\bf subject}.\\ +/a & Limit the summary-buffer to articles matching {\bf author}.\\ +/x & Limit depending on ``extra'' headers.\\ +/u & (x) Limit to {\bf unread} articles. +[Prefix: also exclude ticked and dormant articles]\\ +/m & Limit to articles marked with specified {\bf mark}.\\ +/t & Ask for a number and exclude articles younger than that many days. +[Prefix: exclude older articles]\\ +/n & Limit to current article. [p/p]\\ +/w & Pop the previous limit off the stack and restore it. +[Prefix: pop all limits]\\ +/v & Limit to score. [score]\\ +/E & (M S) Include all expunged articles in the limit.\\ +/D & Include all dormant articles in the limit.\\ +/* & Include all cached articles in the limit.\\ +/d & Exclude all dormant articles from the limit.\\ +/M & Exclude all marked articles.\\ +/T & Include all articles from the current thread in the limit.\\ +/c & Exclude all dormant articles that have no children from the limit.\\ +/C & Mark all excluded unread articles as read. +[Prefix: also mark ticked and dormant articles]\\ +\end{keys}}} + +\newcommand{\OutputArticles}{% formerly \Osubmap +{\esamepage \begin{keys}{O m} +O o & (o, C-o) Save this article using the default article saver. [p/p]\\ +O b & Save this article's {\bf body} in plain file format [p/p]\\ O f & Save this article in plain {\bf file} format. [p/p]\\ +O F & like O f, but overwrite file's contents. [p/p]\\ O h & Save this article in {\bf mh} folder format. [p/p]\\ O m & Save this article in {\bf mail} format. [p/p]\\ -O o & (o, C-o) Save this article using the default article saver. [p/p]\\ -O p & ($\mid$) Pipe this article to a shell command. [p/p]\\ O r & Save this article in {\bf rmail} format. [p/p]\\ O v & Save this article in {\bf vm} format. [p/p]\\ -\end{keys} -} - -\def\Ssubmap{ -\subsec{Post, Followup, Reply, Forward, Cancel} -{\samepage -These commands put you in a separate post or mail buffer. After -editing the article, send it by pressing C-c C-c. If you are in a -foreign group and want to post the article using the foreign server, give -a prefix to C-c C-c.\\* +O p & ($\mid$) Pipe this article to a shell command. [p/p]\\ +\end{keys}}} + +\newcommand{\PostReplyetc}{% formerly \Ssubmap +{\esamepage +These commands put you in a separate news or mail buffer. See the section +about composing messages for more information. +%After +%editing the article, send it by pressing C-c C-c. If you are in a +%foreign group and want to post the article using the foreign server, give +%a prefix to C-c C-c.\\* \begin{keys}{S O m} -S b & {\bf Both} post a followup to this article, and send a reply.\\ -S c & (C) {\bf Cancel} this article (only works if it is your own).\\ +S p & (a) {\bf Post} an article to this group.\\ S f & (f) Post a {\bf followup} to this article.\\ +S F & (F) Post a {\bf followup} and include the original. [p/p]\\ +S o p & Forward this article as a {\bf post} to a newsgroup. +[Prefix: include all headers]\\ +S M-c & Send a complaint about excessive crossposting to the author of this +article. [p/p]\\ +% S m & (m) Send {\bf a} mail to some other person.\\ -S o m & (C-c C-f) Forward this article by {\bf mail} to a person.\\ -S o p & Forward this article as a {\bf post} to a newsgroup.\\ -S p & (a) {\bf Post} an article to this group.\\ S r & (r) Mail a {\bf reply} to the author of this article.\\ +S R & (R) Mail a {\bf reply} and include the original. [p/p]\\ +S w & Mail a {\bf wide} reply to this article.\\ +S W & Mail a {\bf wide} reply to this article.\\ +S o m & (C-c C-f) Forward this article by {\bf mail} to a person. +[Prefix: include all headers]\\ +S D b & Resend {\bf bounced} mail.\\ +S D r & {\bf Resend} mail to a different person.\\ +% +S n & Post a followup via {\bf news} even if you got the message +through mail.\\ +S N & Post a followup via {\bf news} and include the original mail. +[p/p]\\ +% +S c & (C) {\bf Cancel} this article (only works if it is your own).\\ S s & {\bf Supersede} this article with a new one (only for own -articles).\\ -S u & {\bf Uuencode} a file and post it as a series.\\ -S B & {\bf Both} post a followup, send a reply, and include the -original. [p/p]\\ -S F & (F) Post a {\bf followup} and include the original. [p/p]\\ +articles).\\ +% S O m & Digest these series and forward by {\bf mail}. [p/p]\\ S O p & Digest these series and forward as a {\bf post} to a newsgroup. [p/p]\\ -S R & (R) Mail a {\bf reply} and include the original. [p/p]\\ +% +S u & {\bf Uuencode} a file and post it as a series.\\ \end{keys} If you want to cancel or supersede an article you just posted (before it has appeared on the server), go to the *post-news* buffer, change `Message-ID' to `Cancel' or `Supersedes' and send it again with C-c C-c. }} -\def\Tsubmap{ -\subsec{Thread Commands} -\begin{keys}{T \#} +\newcommand{\Threading}{% formerly \Tsubmap +{\esamepage +\begin{keys}{T M-\#} T \# & Mark this thread with the process mark.\\ -T d & Move to the next article in this thread ({\bf down}). [distance]\\ +T M-\# & Remove process-marks from this thread.\\ +% +T t & Re-{\bf thread} the current article's thread.\\ +% movement +T n & (M-C-f) Go to the {\bf next} thread. [distance]\\ +T p & (M-C-b) Go to the {\bf previous} thread. [distance]\\ +T d & {\bf Descend} this thread. [distance]\\ +T u & Ascend this thread ({\bf up}-thread). [distance]\\ +T o & Go to the top of this thread.\\ +% +T s & {\bf Show} the thread hidden under this article.\\ T h & {\bf Hide} this (sub)thread.\\ +% T i & {\bf Increase} the score of this thread.\\ +T l & (M-C-l) {\bf Lower} the score of this thread.\\ +% T k & (M-C-k) {\bf Kill} the current (sub)thread. [Negative prefix: tick it, positive prefix: unmark it.]\\ -T l & (M-C-l) {\bf Lower} the score of this thread.\\ -T n & (M-C-f) Go to the {\bf next} thread. [distance]\\ -T p & (M-C-b) Go to the {\bf previous} thread. [distance]\\ -T s & {\bf Show} the thread hidden under this article.\\ -T u & Move to the previous article in this thread ({\bf up}). [distance]\\ +% T H & {\bf Hide} all threads.\\ T S & {\bf Show} all hidden threads.\\ T T & (M-C-t) {\bf Toggle} threading.\\ -\end{keys} -} +\end{keys}}} -\def\Vsubmap{ -\subsec{Score (Value) Commands} -{\samepage +\newcommand{\Scoring}{% formerly \Vsubmap +{\esamepage Read about Adaptive Scoring in the online info.\\* \begin{keys}{\bf A p m l} V a & {\bf Add} a new score entry, specifying all elements.\\ @@ -528,7 +786,6 @@ interface.\\ V S & Display the {\bf score} of this article.\\ \bf A p m l& Make a scoring entry based on this article.\\ \end{keys} - The four letters stand for:\\* \quad \B{A}ction: I)ncrease, L)ower;\\* \quad \B{p}art: a)utor (from), s)ubject, x)refs (cross-posting), d)ate, l)ines, @@ -548,51 +805,10 @@ t)emporary. \begin{keys}{C-c C-c} C-c C-c & Finish editing the score file.\\ C-c C-d & Insert the current {\bf date} as number of days.\\ -\end{keys} -}} - -\def\Wsubmap{ -\subsec{Wash the Article Buffer} -\begin{keys}{W C-c} -W b & Make Message-IDs and URLs in the article to mouse-clickable {\bf - buttons}.\\ -W c & Remove extra {\bf CRs} (^M) from the article.\\ -W f & Look for and display any X-{\bf Face} headers.\\ -W l & (w) Remove page breaks ({\bf^L}) from the article.\\ -W m & Toggle {\bf MIME} processing.\\ -W o & Treat {\bf overstrike} or underline (^H\_) in the article.\\ -W q & Treat {\bf quoted}-printable in the article.\\ -W r & (C-c C-r) Do a Caesar {\bf rotate} (rot13) on the article.\\ -W t & (t) {\bf Toggle} the displaying of all headers.\\ -v & Toggle permanent {\bf verbose} displaying of all headers.\\ -W w & Do word {\bf wrap} in the article.\\ -W T e & Convert the article timestamp to time {\bf elapsed} since sent.\\ -W T l & Convert the article timestamp to the {\bf local} timezone.\\ -W T u & (W T z) Convert the article timestamp to {\bf UTC} ({\bf Zulu}, -GMT).\\ -\end{keys} - -\subsubsec{Hide/Highlight Parts of the Article} -\begin{keys}{W W C-c} -W W a & Hide {\bf all} unwanted parts. Calls W W h, W W s, W W C-c.\\ -W W c & Hide article {\bf citation}.\\ -W W h & Hide article {\bf headers}.\\ -W W s & Hide article {\bf signature}.\\ -W W C-c & Hide article {\bf citation} using a more intelligent algorithm.\\ -%\end{keys} -% -%\subsubsec{Highlight Parts of the Article} -%\begin{keys}{W H A} -W H a & Highlight {\bf all} parts. Calls W b, W H c, W H h, W H s.\\ -W H c & Highlight article {\bf citation}.\\ -W H h & Highlight article {\bf headers}.\\ -W H s & Highlight article {\bf signature}.\\ -\end{keys} -} +\end{keys}}} -\def\Xsubmap{ -\subsec{Extract Series (Uudecode etc)} -{\samepage +\newcommand{\ExtractSeries}{% formerly \Xsubmap +{\esamepage Gnus recognizes if the current article is part of a series (multipart posting whose parts are identified by numbers in their subjects, e.g.{} 1/10\dots10/10) and processes the series accordingly. You can mark and @@ -621,44 +837,86 @@ C-c C-v C-v & (X v u) Uudecode and view these series. [p/p]\\ \end{keys} }} -\def\Zsubmap{ -\subsec{Exit the Current Group} +\newcommand{\ExitSummary}{% formerly \Zsubmap +{\esamepage \begin{keys}{Z G} +Z Z & (q, Z Q) Exit this group.\\ +Z E & (Q) {\bf Exit} without updating the group information.\\ +% Z c & (c) Mark all unticked articles as read ({\bf catch-up}) and exit.\\ -Z n & Mark all articles as read and go to the {\bf next} group.\\ Z C & Mark all articles as read ({\bf catch-up}) and exit.\\ -Z E & (Q) {\bf Exit} without updating the group information.\\ -Z G & (M-g) Check for new articles in this group ({\bf get}).\\ +% +Z n & Mark all articles as read and go to the {\bf next} group.\\ Z N & Exit and go to {\bf the} next group.\\ Z P & Exit and go to the {\bf previous} group.\\ +% +Z G & (M-g) Check for new articles in this group ({\bf get}).\\ Z R & Exit this group, and then enter it again ({\bf reenter}). [Prefix: select all articles, read and unread.]\\ -Z Z & (q, Z Q) Exit this group.\\ -\end{keys} -} +Z s & Update and save the dribble buffer. [Prefix: save .newsrc* as well]\\ +\end{keys}}} -\def\ArticleMode{ -\sec{Article Mode} -{\samepage -% All keys for Summary mode also work in Article mode. -The normal navigation keys work in Article mode. -Some additional keys are:\\* +\newcommand{\MsgCompositionGeneral}{% +Press C-c ? in the composition-buffer to get this information. +{\esamepage \begin{keys}{C-c C-m} -RET & (middle mouse button) Activate the button at point to follow -an URL or Message-ID.\\ -TAB & Move the point to the next button.\\ -h & (s) Go to the {\bf header} line of the article in the {\bf -summary} buffer.\\ -C-c ^ & Get the article with the Message-ID near point.\\ -C-c C-m & {\bf Mail} reply to the address near point (prefix: include the -original).\\ -\end{keys} -}} - -\def\ServerMode{ -\sec{Server Mode} -{\samepage -To enter this mode, press `^' while in Group mode.\\* +% sending +C-c C-c & Send message and exit. [Prefix: send via foreign server]\\ +C-c C-s & Send message. [Prefix: send via foreign server]\\ +C-c C-d & Don't send message (save as \textbf{draft}).\\ +C-c C-k & \textbf{Kill} message-buffer.\\ +C-c C-m & {\bf Mail} reply to the address near point. +[Prefix: include the original]\\ +% modify headers/body +C-c C-t & Paste the recipient's address into \textbf{To:}-field.\\ +C-c C-n & Insert a \textbf{Newsgroups:}-header.\\ +C-c C-o & Sort headers.\\ +C-c C-e & \textbf{Elide} region.\\ +C-c C-v & Kill everything outside region.\\ +C-c C-r & Do a \textbf{Rot-13} on the body.\\ +C-c C-w & Insert signature (from `message-signature-file').\\ +C-c C-z & Kill everything up to signature.\\ +C-c C-y & \textbf{Yank} original message.\\ +C-c C-q & Fill the yanked message.\\ +\end{keys}}} + +\newcommand{\MsgCompositionMovementArticle}{% +The following functions create the header-field if necessary. +{\esamepage +\begin{keys}{C-c C-f C-u} +C-c TAB & Move to \textbf{signature}.\\ +C-c C-b & Move to \textbf{body}.\\ +C-c C-f C-t & Move to \textbf{To:}.\\ +C-c C-f C-c & Move to \textbf{Cc:}.\\ +C-c C-f C-b & Move to \textbf{Bcc:}.\\ +C-c C-f C-w & Move to \textbf{Fcc:}.\\ +C-c C-f C-s & Move to \textbf{Subject:}.\\ +C-c C-f C-r & Move to \textbf{Reply-To:}.\\ +C-c C-f C-f & Move to \textbf{Followup-To:}.\\ +C-c C-f C-n & Move to \textbf{Newsgroups:}.\\ +C-c C-f C-u & Move to \textbf{Summary:}.\\ +C-c C-f C-k & Move to \textbf{Keywords:}.\\ +C-c C-f C-d & Move to \textbf{Distribution:}.\\ +\end{keys}}} + +\newcommand{\MsgCompositionMML}{% +{\esamepage +\begin{keys}{M-m P} +M-m f & (C-c C-a) Attach \textbf{file}.\\ +M-m b & Attach contents of \textbf{buffer}.\\ +M-m e & Attach \textbf{external} file (ftp..).\\ +M-m P & Create MIME-\textbf{preview} (new buffer).\\ +M-m v & \textbf{Validate} article.\\ +M-m p & Insert \textbf{part}.\\ +M-m m & Insert \textbf{multi}-part.\\ +M-m q & \textbf{Quote} region.\\ +% TODO: narrow headers (M-m n) ? +\end{keys}}} + +%% TODO: +\newcommand{\ServerMode}{% +{\esamepage +To enter this mode, press `\^' while in Group mode.\\* \begin{keys}{SPC} SPC & (RET) Browse this server.\\ a & {\bf Add} a new server.\\ @@ -667,13 +925,13 @@ e & {\bf Edit} a server.\\ k & {\bf Kill} this server. [scope]\\ l & {\bf List} all servers.\\ q & Return to the group buffer ({\bf quit}).\\ +s & Request that the server scan its sources for new articles.\\ +g & Request that the server regenerate its data.\\ y & {\bf Yank} the previously killed server.\\ -\end{keys} -}} +\end{keys}}} -\def\BrowseServer{ -\sec{Browse Server Mode} -{\samepage +\newcommand{\BrowseServer}{% +{\esamepage To enter this mode, press `B' while in Group mode.\\* \begin{keys}{RET} RET & Enter the current group.\\ @@ -683,5 +941,4 @@ n & Go to the {\bf next} group. [distance]\\ p & Go to the {\bf previous} group. [distance]\\ q & (l) {\bf Quit} browse mode.\\ u & Subscribe to the current group. [scope]\\ -\end{keys} -}} +\end{keys}}} diff --git a/texi/message.texi b/texi/message.texi index cb756a3..c838365 100644 --- a/texi/message.texi +++ b/texi/message.texi @@ -153,7 +153,7 @@ If you want the replies to go to the @code{Sender} instead of the (setq message-reply-to-function (lambda () (cond ((equal (mail-fetch-field "from") "somebody") - (mail-fetch-field "sender")) + (list (cons 'To (mail-fetch-field "sender")))) (t nil)))) @end lisp diff --git a/texi/postamble.tex b/texi/postamble.tex index 3b5f803..a7d0a5c 100644 --- a/texi/postamble.tex +++ b/texi/postamble.tex @@ -24,20 +24,17 @@ \thispagestyle{empty} \vfill -\begin{picture}(10,10) -\put(90,-10){\makebox(0,0)[tr]{\epsfig{figure=tmp/larsi.ps,height=3cm}}} -\end{picture} - -\hspace*{4cm}\parbox[t]{10cm}{ -This manual was written by Lars Magne Ingebrigtsen (b. 1968) who +This manual was written by Lars Magne Ingebrigtsen (1968 --- ) who resides in Oslo, Norway and poses as a student, but doesn't get much studying done, for some strange reason or other. When not worshipping at the altar of Emacs, he can often be found slouching on his couch reading while bopping his head gently to some obscure music. He does not have a cat. -Graphics by Luis Fernandes. Set in Bembo and Futura. -} +\marginpar[\vspace*{-2.5cm}\epsfig{figure=tmp/larsi.ps,height=2cm}]{\vspace*{-2.2cm}\epsfig{figure=tmp/larsi.ps,height=2.5cm}} + +Graphics by Luis Fernandes. Set in Adobe Bembo, Adobe Futura and +Bitstream Courier. \clearpage \mbox{}