From: yamaoka Date: Tue, 11 Apr 2006 22:59:31 +0000 (+0000) Subject: Merge the t-gnus-6_17-quimby branch. X-Git-Tag: t-gnus-6_17_4- X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Ft-gnus-6_17;p=elisp%2Fgnus.git- Merge the t-gnus-6_17-quimby branch. --- diff --git a/ChangeLog b/ChangeLog index 295879f..94bf7cf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,315 @@ +2006-04-11 Katsumi Yamaoka + + * lisp/gnus-vers.el: T-gnus 6.17.4. + +2006-04-11 Reiner Steib + + * README: No Gnus v0.4 is released. + +2006-04-11 Reiner Steib + + * Makefile.in (release-sign-files): Use rm -f. + (RELEASE_COMMIT_FILES): Add ./ChangeLog. + (release-bump-version): Add README. + (release-check-settings): OLD_TAG, not OLDTAG. + (release-commit): Echo command lines before prompt. + (RELEASE_COMMIT_FILES): Add README. + (OLD_PATTERN): Fix. + (release-bump-version): Fix gnusversionname substitution. + (OLD_PATTERN): Add grouping. + +2006-04-10 Reiner Steib + + * Makefile.in (GZIP_PROG): Use gzip -f. + (release-bump-version, RELEASE_COMMIT_FILES): Add README. + (release-sign-files): Remove old *.sig files. + + * README: Say "development version". Let sentences end with + double space. + +2006-04-07 Reiner Steib + + * Makefile.in (GZIP_PROG): New variable. + (release-diff): Use it. + (release-sign-files): New sign-only target. Use GPG_AGENT_INFO. + +2006-04-04 Reiner Steib + + * Makefile.in (TAR_BALL_EXTRA, release-make-tar-ball, README): + Remove; README is in CVS now. + (release-files, release-files-signed, release-cvs-export) + (release-make-tar-ball): Use $(VERSION) instead of $(TAG). + (OLD_PATTERN): Catch stable and trunk. + (CIN): New variable. + (release-files, release-files-signed, release-cvs-export) + (release-make-tar-ball, release-diff, release-post-clean): Add + CIN. + (OLD_PATTERN): Remove quotes. + (release-bump-version): Fix typo. + + * etc/images/README: Add more Emacs 22 icons. Add suggestion on + how to use those in Emacs 21. + + * etc/images/close.xpm, etc/images/cut.xpm, etc/images/home.xpm, + etc/images/index.xpm, etc/images/jump-to.xpm, etc/images/new.xpm, + etc/images/next-node.xpm, etc/images/open.xpm, + etc/images/preferences.xpm, etc/images/prev-node.xpm, + etc/images/saveas.xpm, etc/images/spell.xpm: New icons duplicated + from Emacs 22. + + * README: Addition from 5.10.6 tar ball. Clarify "beta". + Simplify Info directory setting. Update required Emacs and XEmacs + version. Use current Gnus version in examples. + +2006-03-31 Reiner Steib + + * GNUS-NEWS: Generated. + + * Makefile.in (CVS_IGNORE_FILES): Additions. + (release-files-signed): New target. + + * etc/images/README: Update separator.xpm. + +2006-03-30 Romain Francoise + + * GNUS-NEWS: Generated. + +2006-03-30 Reiner Steib + + * etc/images/separator.xpm: Update from Emacs CVS. + + * GNUS-NEWS: Generated. + +2006-03-29 Reiner Steib + + * Makefile.in (release-bump-version): Consider named Gnus versions + in replacements. + + * todo: Update "tool bar icons". + +2006-03-27 Reiner Steib + + * Makefile.in (release-revert-files): Replace + release-revert-changelog. + (release-diff): Remove garbage. + +2006-03-07 Reiner Steib + + * etc/images/README: Add GIMP script. + (attach.xpm): Move to top level. + (sort-*.xpm) Add. + + * etc/images/sort-ascending.xpm, + etc/images/sort-column-ascending.xpm, + etc/images/sort-criteria.xpm, etc/images/sort-descending.xpm, + etc/images/sort-row-ascending.xpm: New icons from GNOME 2.6. + +2006-03-10 Reiner Steib + + * Makefile.in (release-check-settings): Add status and + suggestions. + (release-files): Remove duplicate release-cvs-export. + (README): New target. + (release-files, release-make-tar-ball, release-diff): List files. + (README, release-make-tar-ball): Fix. + +2006-03-06 Reiner Steib + + * GNUS-NEWS: Generated. + + * Makefile.in (release-*): New targets. + +2006-02-28 Reiner Steib + + * todo: Remove nnweb. Add: widget for posting styles, doc string + for utility functions, LIST SUBSCRIPTIONS, divide emacs-mime.texi, + change servers. + + * etc/images/README (next-page.xpm): From Gnome, not from Emacs + 22. + + * cancel.xpm, copy.xpm, diropen.xpm, help.xpm, left-arrow.xpm, + next-page.xpm, paste.xpm, print.xpm, redo.xpm, right-arrow.xpm, + save.xpm, search.xpm: New icons duplicated from Emacs 22. + + * etc/images/README: Add these icons. + + * etc/images/README: Describe the new images. + + * etc/gnus/gnus-setup.ast, etc/gnus/news-server.ast: Use + texinfo-mode. + + * etc/images/mail/save.xpm, etc/images/mail/preview.xpm: Rename + char*. + +2006-03-03 Reiner Steib + + * xemacs.mak: Remove outdated file. Use make.bat instead. + +2006-03-02 Reiner Steib + + * make.bat: Add note about "Out of environment space" on Windows + 98 SE. Avoid `>' in echo. + +2006-02-27 Reiner Steib + + * ChangeLog, texi/ChangeLog, lisp/ChangeLog: Fix "From so-and-so" + and "(tiny change)" entries. + +2006-02-23 Katsumi Yamaoka + + * lisp/message.el (message-tool-bar-gnome, message-tool-bar-retro): + Replace mml-attach-file and mml-preview with mime-edit-insert-file + and mime-edit-preview-message. + +2006-02-22 Reiner Steib + + * etc/images/gnus/mail_send.xpm: Emacs 21 icon for + message-tool-bar-retro. + +2006-02-21 Reiner Steib + + * make.bat (:etc): Also consider images in images/mail and + images/. + + * etc/Makefile.in (install, uninstall): Also consider images in + images/mail and images/. + + * etc/images/connect.xpm, etc/images/contact.xpm, + etc/images/delete.xpm, etc/images/describe.xpm, + etc/images/disconnect.xpm, etc/images/exit.xpm, + etc/images/lock-broken.xpm, etc/images/lock-ok.xpm, + etc/images/lock.xpm, etc/images/refresh.xpm, + etc/images/gnus/toggle-subscription.xpm, + etc/images/mail/attach.xpm, etc/images/mail/compose.xpm, + etc/images/mail/copy.xpm, etc/images/mail/forward.xpm, + etc/images/mail/inbox.xpm, etc/images/mail/move.xpm, + etc/images/mail/not-spam.xpm, etc/images/mail/outbox.xpm, + etc/images/mail/reply-all.xpm, etc/images/mail/reply.xpm, + etc/images/mail/save-draft.xpm, etc/images/mail/send.xpm, + etc/images/mail/spam.xpm: New icons from GNOME 2.6. + +2006-02-21 Miguel Frasson + + * etc/images/separator.xpm: Copy of sep.xpm from AUCTeX. + +2006-02-21 Adam Sj,Ax(Bgren + + * etc/images/mail/save.xpm, etc/images/mail/preview.xpm: New icons. + +2006-02-15 Katsumi Yamaoka + + * lisp/nnheader.el (mm-make-temp-file): Be always alias to + make-temp-file. + +2006-01-26 Katsumi Yamaoka + + * Makefile.in (clean): Clean all subdirectories; remove *~. + (elclean): Remove lisp/gnus-load.el. + (distclean): Don't use sub-make to run clean; use $(MAKE) instead + of make. + + * etc/Makefile.in (clean): New rule. + (distclean): Use it; remove Makefile. + +2005-01-26 Katsumi Yamaoka + + * lisp/dgnushack.el (dgnushack-unexporting-files): Exclude + dgnuskwds.el and gnus-load.el. + + * lisp/nnheader.el (mm-subst-char-in-string): New function. + (nnheader-replace-chars-in-string): Use it. + +2005-01-25 Katsumi Yamaoka + + * lisp/nnheader.el (nnheader-image-load-path): Synch it up with + mm-image-load-path in mm-util.el. + (mm-subst-char-in-string): New function. + (nnheader-replace-chars-in-string): Use it. + +2005-01-23 Katsumi Yamaoka + + * lisp/message.el (message-tool-bar-gnome): Comment + mml-attach-file, mml-preview and mml-secure-message-sign-encrypt. + (message-tool-bar-retro): Comment mml-attach-file and mml-preview. + +2005-12-22 TSUCHIYA Masatoshi + + * lisp/gnus-namazu.el (gnus-namazu-remote-groups): Accept `t' as an + symbol that matches the method specified by `gnus-select-method'. + (gnus-namazu/make-directory-table): Follow the above change. + (gnus-namazu/call-namazu): Wrap a query string with quotes. + +2005-12-06 Katsumi Yamaoka + + * GNUS-NEWS: Generated. + +2005-10-31 Lars Magne Ingebrigtsen + + * Testing CVS setup. Yes. Yes. Yes. Yes. + +2005-10-10 Katsumi Yamaoka + + * lisp/nnheader.el (mm-delete-duplicates): New function. + +2005-10-04 Katsumi Yamaoka + + * aclocal.m4 (AC_PATH_LISPDIR): Default to .../site-lisp/gnus for + Emacs. + (AC_PATH_ETCDIR): Don't change the default value for Emacs. + + * configure: Generated. + + * Makefile.in (list-installed-shadows): New entry. + (remove-installed-shadows): New entry. + + * GNUS-NEWS: Generated. + +2005-09-28 Reiner Steib + + * todo: Remove some items that are already done. Add some new + items. Add some comments. + +2005-09-13 Katsumi Yamaoka + + * lisp/gnus-sum.el (gnus-summary-wash-map): Remove + gnus-summary-toggle-mime. + +2005-09-02 TAKAHASHI Kaoru + + * texi/ptexinfmt.el: Support @frenchspacing, @euro, @sansserif. + (texinfo-format-ordf): Fix typo. + +2005-08-10 Romain Francoise + + * GNUS-NEWS: Generated. + +2005-07-25 Katsumi Yamaoka + + * lisp/dgnushack.el: Autoload sha1 and sha1-binary for XEmacs. + +2005-07-18 Romain Francoise + + * GNUS-NEWS: Generated. + +2005-06-16 Katsumi Yamaoka + + * lisp/gnus-art.el (gnus-article-x-face-command): Remove + x-face-mule. + (gnus-treat-display-x-face): Ditto. + + * lisp/gnus-msg.el (gnus-copy-article-buffer): Don't remove bitmap + images. + + * lisp/gnus-sum.el + (gnus-summary-search-article-highlight-goto-x-face): Don't take + care of x-face-mule. + (gnus-summary-search-article-highlight-matched-text): Ditto. + (gnus-summary-search-article): Ditto. + + * lisp/gnus.el (gnus-colon-keywords): Remove. + Don't autoload x-face-mule; don't require base64. + 2005-05-01 Katsumi Yamaoka * lisp/gnus-vers.el: T-gnus 6.17.3 revision 00. @@ -365,7 +677,7 @@ * lisp/dgnushack.el (dgnushack-unexporting-files): Add legacy-gnus-agent.el. -2004-03-08 Kevin Greiner +2004-03-08 Kevin Greiner * make.bat: Make sure that gnus-load.el and sieve are writable to avoid breakage. @@ -378,10 +690,9 @@ (gnus-namazu/call-namazu): Use gnus-namazu-imap-group-prefix. (gnus-namazu/search): Support Maildir. -2004-03-01 Reiner Steib +2004-03-01 Michael Schierl (tiny change) - * make.bat: Fix directory test for Windows 9x/ME. From Michael - Schierl (tiny change). + * make.bat: Fix directory test for Windows 9x/ME. 2004-02-11 TAKAHASHI Kaoru @@ -431,9 +742,9 @@ * lisp/pop3.el (pop3-md5): Always use the built-in `md5'. -2004-01-07 Hiroshi Fujishima +2004-01-07 Hiroshi Fujishima (tiny change) - * etc/gnus-tut.txt: `G m' instead of `G V' (tiny patch). + * etc/gnus-tut.txt: `G m' instead of `G V' 2004-01-06 Katsumi Yamaoka diff --git a/ChangeLog.3 b/ChangeLog.3 index d661655..5aad465 100644 --- a/ChangeLog.3 +++ b/ChangeLog.3 @@ -1,4 +1,4 @@ -2000-12-06 Katsumi Yamaoka +2000-12-06 Katsumi Yamaoka * lisp/nnshimbun.el (TopLevel): Defalias `coding-system-category' to `get-code-mnemonic' for Mule. @@ -24,20 +24,20 @@ * texi/message-ja.texi: Use two lines for direntry. -2000-12-01 Katsumi Yamaoka +2000-12-01 Katsumi Yamaoka * lisp/dgnushack.el: Attempt to add another FLIM path to `load-path' if the module `mel' does not found. This procedure may be needed when recent FLIM 1.14 is used under old Emacsen. -2000-11-27 Katsumi Yamaoka +2000-11-27 Katsumi Yamaoka * lisp/gnus-vers.el (gnus-revision-number): Increment to 08. * lisp/message.el (message-send-mail-with-smtp): Leave the error handling in `smtp-send-buffer's own care. -2000-11-22 Katsumi Yamaoka +2000-11-22 Katsumi Yamaoka * lisp/gnus-vers.el (gnus-revision-number): Increment to 07. @@ -50,7 +50,7 @@ `x-face-decode-message-header' when Emacs 21 is running and x-face-e21 is installed. -2000-11-21 Katsumi Yamaoka +2000-11-21 Katsumi Yamaoka * lisp/message.el (message-send-mail-with-smtp): Use `smtp-send-buffer' if it exists instead of `smtp-via-smtp'. @@ -66,12 +66,12 @@ * texi/gnus-ja.texi (Drafts): Fix typo. -2000-11-14 Katsumi Yamaoka +2000-11-14 Katsumi Yamaoka * lisp/gnus-art.el (article-verify-x-pgp-sig): Autoload "mm-uu". (gnus-treat-x-pgp-sig): Default to nil. -2000-11-10 Katsumi Yamaoka +2000-11-10 Katsumi Yamaoka * Mule23@1934.en, Mule23@1934.ja, sample.lpath.el: Upgrade. @@ -84,7 +84,7 @@ (AC_CHECK_EMACS): Ignore cache. (AC_DEFINE_GNUS_PRODUCT_NAME): Cache. -2000-11-09 Katsumi Yamaoka +2000-11-09 Katsumi Yamaoka * configure: Regenerate. @@ -103,7 +103,7 @@ * lisp/lpath.el (md5): Don't bind. (url-insert-file-contents): Fbind for FSF Emacsen. -2000-11-08 Katsumi Yamaoka +2000-11-08 Katsumi Yamaoka * texi/Makefile.in (install-ja-info): Specify `EMACS' and `infodir'. @@ -172,7 +172,7 @@ for direntries. * texi/message-ja.texi: Ditto. -2000-11-06 Katsumi Yamaoka +2000-11-06 Katsumi Yamaoka * lisp/Makefile.in (install): Don't check for the file names. @@ -186,7 +186,7 @@ * lisp/gnus-topic.el (gnus-topic-rename): Use current topic as initial value for read-string. -2000-11-06 Katsumi Yamaoka +2000-11-06 Katsumi Yamaoka * lisp/Makefile.in (install): Use the lisp function `dgnushack-exported-files'. @@ -215,11 +215,11 @@ * lisp/smiley.el (smiley-deformed-regexp-alist): Modify regexp for the winking face. -2000-11-02 Katsumi Yamaoka +2000-11-02 Katsumi Yamaoka * lisp/dgnushack.el (dgnushack-make-manifest): Fix info directory. -2000-11-02 Katsumi Yamaoka +2000-11-02 Katsumi Yamaoka * Makefile.in (install-package-ja): Compile and install lisp files first. @@ -244,12 +244,12 @@ Split from `dgnushack-info-file-regexp'. (dgnushack-texi-file-regexp): Remove. -2000-11-01 Katsumi Yamaoka +2000-11-01 Katsumi Yamaoka * lisp/dgnushack.el (dgnushack-texi-format): Remove @ignore'd areas before processing. -2000-11-01 Katsumi Yamaoka +2000-11-01 Katsumi Yamaoka * lisp/gnus-vers.el (gnus-revision-number): Increment to 06. @@ -258,7 +258,7 @@ * lisp/gnus-start.el (gnus-product-read-variable-file-1): Make it talkative. -2000-10-31 Katsumi Yamaoka +2000-10-31 Katsumi Yamaoka * lisp/dgnushack.el: Bind `:key-type' and `:value-type' for old Emacsen. @@ -269,7 +269,7 @@ direntry generate probrem. (Advised by Tetsuo Tsukamoto ) -2000-10-31 Katsumi Yamaoka +2000-10-31 Katsumi Yamaoka * lisp/gnus-sum.el (gnus-summary-insert-line): Work with quoted double-quote characters. @@ -285,7 +285,7 @@ * lisp/ptexinfmt.el (texinfo-format-printindex): Mule for Windows detection fixed. -2000-10-26 Katsumi Yamaoka +2000-10-26 Katsumi Yamaoka * lisp/gnus.el (gnus-group-startup-message): Rewrite for Emacs 21. * lisp/lpath.el: Fbind `propertize'. @@ -299,12 +299,12 @@ * lisp/nnshimbun.el (nnshimbun-netbsd-get-headers): Fix regular expression to extract xover urls. -2000-10-12 Jesper Harder +2000-10-12 Jesper Harder * make.bat: Makes it possible to generate the Info files on windows again. -2000-10-11 Katsumi Yamaoka +2000-10-11 Katsumi Yamaoka * Makefile.in (info-ja, xinfo-ja): No need to use `MAKEINFO=no'. (install-info-ja, install-info, install-lisp, install-ja): New @@ -321,11 +321,11 @@ * lisp/nnshimbun.el (nnshimbun-type-definition): Fix regular expression to extract article body from `ZDNet'. -2000-10-06 Katsumi Yamaoka +2000-10-06 Katsumi Yamaoka * lisp/imap.el: Require `base64' instead of to autoload it. -2000-10-05 Katsumi Yamaoka +2000-10-05 Katsumi Yamaoka * lisp/gnus-xmas.el (gnus-xmas-group-startup-message): Don't use `gnus-point-at-eol'. @@ -340,7 +340,7 @@ `make-full-mail-header-from-decoded-header' instead of `make-full-mail-header'. -2000-10-03 Katsumi Yamaoka +2000-10-03 Katsumi Yamaoka * lisp/gnus-group.el (gnus-group-get-new-news): Update modeline using `gnus-agent-toggle-plugged' if agent is activated. @@ -353,7 +353,7 @@ * lisp/gnus-art.el (gnus-article-add-button): Quote `:button-keymap' for Mule 2.3 but it won't work. -2000-09-29 Katsumi Yamaoka +2000-09-29 Katsumi Yamaoka * lisp/message.el (message-ignored-supersedes-headers): Synch with Gnus. @@ -369,7 +369,7 @@ * lisp/ptexinfmt.el (texinfo-format-printindex): Use (featurep 'meadow) instead of `texinfmt-version'. -2000-09-25 Katsumi Yamaoka +2000-09-25 Katsumi Yamaoka * lisp/gnus-vers.el (gnus-revision-number): Increment to 05. @@ -383,7 +383,7 @@ broken-facility check, for Mule for Windows. (texinfo-format-printindex): New function. -2000-09-19 Katsumi Yamaoka +2000-09-19 Katsumi Yamaoka * lisp/gnus-msg.el (gnus-copy-article-buffer): Encode bitmap smileys to ordinary text before removing any text properties. It @@ -398,7 +398,7 @@ * lisp/gnus-art.el: Always require `wid-edit'. -2000-09-14 Katsumi Yamaoka +2000-09-14 Katsumi Yamaoka * lisp/dgnushack.el (dgnushack-compile): Don't compile gnus-ml.el when FSFmacs is running. @@ -462,19 +462,19 @@ * lisp/nnshimbun.el (nnshimbun-zdnet-get-headers): Follow changes of ZDNet. -2000-08-25 Katsumi Yamaoka +2000-08-25 Katsumi Yamaoka * lisp/gnus-vers.el (gnus-revision-number): Increment to 04. 2000-08-25 Yagi Tatsuya - Katsumi Yamaoka + Katsumi Yamaoka * lisp/nntp.el (nntp-list-options, nntp-options-subscribe, nntp-options-not-subscribe): New server variables. (nntp-request-list): Use them. * texi/gnus.texi, texi/gnus-ja.texi: Update for them. -2000-08-23 Katsumi Yamaoka +2000-08-23 Katsumi Yamaoka * lisp/gnus.el (gnus-group-startup-message): Use `image-size' to simplify the program. @@ -482,7 +482,7 @@ * lisp/gnus-group.el (gnus-group-rename-group): Inhibit renaming of zombie or killed groups. -2000-08-21 Katsumi Yamaoka +2000-08-21 Katsumi Yamaoka * lisp/nnheader.el (nnheader-replace-chars-in-string): Use `static-if'. @@ -500,7 +500,7 @@ * lisp/nnshimbun.el: Add `mew' and `xemacs' support. -2000-08-17 Katsumi Yamaoka +2000-08-17 Katsumi Yamaoka * lisp/dgnushack.el (dgnushack-texi-format): Require `ptexinfmt' instead of `texinfmt'. @@ -516,7 +516,7 @@ * lisp/ptexinfmt.el: New file imported from Wanderlust. -2000-08-09 Katsumi Yamaoka +2000-08-09 Katsumi Yamaoka * lisp/nntp.el (nntp-open-telnet): Wait for the telnet prompt before sending a command; allow the rtelnet prompt as well. @@ -524,13 +524,13 @@ * lisp/message.el (message-make-forward-subject): Remove garbage line. -2000-08-01 Katsumi Yamaoka +2000-08-01 Katsumi Yamaoka * configure: Regenerate. * aclocal.m4 (AC_CHECK_EMACS): Unset `EMACS' environment variable if it is `t'. -2000-07-24 Katsumi Yamaoka +2000-07-24 Katsumi Yamaoka * lisp/gnus-vers.el (gnus-revision-number): Increment to 03. @@ -595,7 +595,7 @@ * acinclude.m4 (AC_CHECK_W3): Fix typo. -2000-07-13 Katsumi Yamaoka +2000-07-13 Katsumi Yamaoka * configure: Regenerate with autoconf v2.14.1. * aclocal.m4: Regenerate with aclocal v1.4. @@ -613,7 +613,7 @@ * configure.in: Use them. * configure: Generate it. -2000-07-03 Katsumi Yamaoka +2000-07-03 Katsumi Yamaoka * lisp/gnus-vers.el (T-gnus): Update to 6.14.5. (gnus-revision-number): Clear to 00. @@ -635,7 +635,7 @@ * contrib/rfc2015.el: New file. -2000-06-27 Katsumi Yamaoka +2000-06-27 Katsumi Yamaoka * lisp/gnus-vers.el (gnus-revision-number): Increment to 04. @@ -647,13 +647,13 @@ * lisp/gnus-bbdb.el(gnus-bbdb/update-record): Fix to fetch last mail field. -2000-06-09 Katsumi Yamaoka +2000-06-09 Katsumi Yamaoka * 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 +2000-06-08 Katsumi Yamaoka * lisp/message.el (message-fix-before-sending): Expose all invisible text with the property `message-invisible'; don't expose @@ -666,7 +666,7 @@ (add-hook 'message-send-hook 'x-face-xmas-remove-x-face-glyph) instead. -2000-06-06 Katsumi Yamaoka +2000-06-06 Katsumi Yamaoka * lisp/message.el (message-save-drafts): Rewrite. @@ -697,7 +697,7 @@ * lisp/gnus-start.el (gnus-slave-save-newsrc): Bind coding system to `gnus-startup-file-coding-system'. -2000-06-06 Katsumi Yamaoka +2000-06-06 Katsumi Yamaoka * lisp/gnus-vers.el (gnus-revision-number): Increment to 03. @@ -730,7 +730,7 @@ (nnshimbun-nov-fix-header): New function. (nnshimbun-make-date-string): Fix for a two-digit year. -2000-05-26 Katsumi Yamaoka +2000-05-26 Katsumi Yamaoka * lisp/nnshimbun.el (nnshimbun-make-html-contents): Show X-Face. (nnshimbun-make-text-or-html-contents): Ditto. @@ -741,7 +741,7 @@ * README.semi, README.semi.ja: Update for CVS via SSH. -2000-05-25 Katsumi Yamaoka +2000-05-25 Katsumi Yamaoka * texi/gnus-ja.texi: Change coding-system to `iso-2022-7bit-ss2'. * texi/TRANSLATION.ja: Replace CRLF with LF. @@ -767,7 +767,7 @@ (nnshimbun-wired-get-all-headers): Replace regexp-opt with nnshimbun-regexp-opt. -2000-05-24 Katsumi Yamaoka +2000-05-24 Katsumi Yamaoka * lisp/gnus-group.el (gnus-group-make-shimbun-group): Complete completions. @@ -784,7 +784,7 @@ * lisp/nnshimbun.el (nnshimbun-retrieve-url): Add argument to ignore w3's cache. -2000-05-24 Katsumi Yamaoka +2000-05-24 Katsumi Yamaoka * lisp/gnus-group.el (gnus-group-make-shimbun-group): Add completion to the shimbun address; delete empty strings from @@ -812,7 +812,7 @@ * texi/gnus-ja.texi (nnshimbun): Add description. -2000-05-21 Katsumi Yamaoka +2000-05-21 Katsumi Yamaoka * lisp/gnus-vers.el (gnus-revision-number): Increment to 02. @@ -832,7 +832,7 @@ (TopLevel): Require `sasl' when compiling instead of `digest-md5'; don't autoload "digest-md5". -2000-05-17 Katsumi Yamaoka +2000-05-17 Katsumi Yamaoka * lisp/nndraft.el (nndraft-request-replace-article): Replace `mm-text-coding-system' with `mail-source-text-coding-system'; @@ -847,7 +847,7 @@ `output-coding-system' instead of `coding-system-for-write' when old Mule is used. -2000-05-16 Katsumi Yamaoka +2000-05-16 Katsumi Yamaoka * lisp/message.el (message-forward) Replace the use of `eolp' with `bolp' for detecting the start of the line. @@ -858,12 +858,12 @@ * lisp/gnus-bbdb.el (gnus-bbdb/pop-up-bbdb-buffer): Don't bind `bbdb-use-pop-up' while executing `bbdb-pop-up-bbdb-buffer'. -2000-05-10 Katsumi Yamaoka +2000-05-10 Katsumi Yamaoka * lisp/gnus-msg.el (gnus-debug): Break MIME tags from the snoopies. (gnus-bug): Insert text/plain tag at the end of the buffer. -2000-05-10 Katsumi Yamaoka +2000-05-10 Katsumi Yamaoka * lisp/gnus-vers.el (gnus-revision-number): Increment to 01. @@ -876,11 +876,11 @@ * lisp/gnus-bbdb.el (gnus-bbdb/split-mail): Support group address. (gnus-bbdb/insert-address-regexp): New function. -2000-05-09 Katsumi Yamaoka +2000-05-09 Katsumi Yamaoka * lisp/gnus-msg.el (gnus-debug): Add "nntp.el" and `defvoo'. -2000-05-08 Katsumi Yamaoka +2000-05-08 Katsumi Yamaoka * lisp/gnus-vers.el (T-gnus): Update to 6.14.4. @@ -895,7 +895,7 @@ gnus.texi,gnus-ja.texi,emacs-mime.texi,Makefile.in,ChangeLog}: Sync up with Gnus v5.8.6. -2000-04-28 Katsumi Yamaoka +2000-04-28 Katsumi Yamaoka * texi/gnus.texi, texi/gnus-ja.texi, texi/gnus-faq-ja.texi, README: You might be able to use T-gnus with the versions of XEmacs prior @@ -903,7 +903,7 @@ * contrib/timer.el: New file. Imported from fsf-compat-1.07-pkg. -2000-04-27 Katsumi Yamaoka +2000-04-27 Katsumi Yamaoka * lisp/mm-view.el (gnus-article-mime-handles): Don't bind it. @@ -918,12 +918,12 @@ * lisp/dgnushack.el: Add code to avoid mule-2.3@19.34 failing to make info from texi. Thanks to Hayashi-san. -2000-04-25 Katsumi Yamaoka +2000-04-25 Katsumi Yamaoka * lisp/dgnushack.el (union, member-if, mapcon, last): Remove compiler macros. -2000-04-24 Katsumi Yamaoka +2000-04-24 Katsumi Yamaoka * lisp/gnus-vers.el (T-gnus): Update to 6.14.3. @@ -951,7 +951,7 @@ * README: Requires XEmacs 21.1.1 and later. * texi/{gnus.texi, gnus-faq-ja.texi}: Ditto. -2000-04-20 Katsumi Yamaoka +2000-04-20 Katsumi Yamaoka * lisp/gnus-vers.el (T-gnus): Update to 6.14.2. (gnus-revision-number): Clear to 00. @@ -974,12 +974,12 @@ * contrib/{vcard.el,one-line-cookie.diff,README}: New files. -2000-04-14 Katsumi Yamaoka +2000-04-14 Katsumi Yamaoka * lisp/gnus-msg.el (gnus-summary-yank-message): Rewrite for the use of the separated message frames; use `gnus-copy-article-buffer'. -2000-04-13 Katsumi Yamaoka +2000-04-13 Katsumi Yamaoka * lisp/gnus-vers.el (gnus-revision-number): Increment to 18. (gnus-extended-version): Use `gnus-product-name' and @@ -994,7 +994,7 @@ modification. (gnus-search-or-regist-spec): Change interface. -2000-04-12 Katsumi Yamaoka +2000-04-12 Katsumi Yamaoka * lisp/gnus-art.el (gnus-article-prev-page): Bind `window-pixel-scroll-increment' to nil while scrolling for @@ -1002,7 +1002,7 @@ XEmacs 21.2.20 and later. (gnus-article-next-page): Ditto. -2000-04-12 Katsumi Yamaoka +2000-04-12 Katsumi Yamaoka * lisp/gnus-vers.el (gnus-revision-number): Increment to 17. @@ -1026,22 +1026,22 @@ * lisp/imap.el (imap-body-lines): Check Content-Type: of the article case insensitively. -2000-04-07 Katsumi Yamaoka +2000-04-07 Katsumi Yamaoka * lisp/message.el (message-cite-original): Use "unknown sender" if from field does not exist in the yanked article. -2000-04-06 Katsumi Yamaoka +2000-04-06 Katsumi Yamaoka * lisp/message.el (message-cite-original): Extract from field for the simple citation line. -2000-03-21 Katsumi Yamaoka +2000-03-21 Katsumi Yamaoka * lisp/nnimap.el (nnimap-request-article-part): Returns nil if the article does not exist. -2000-03-17 Katsumi Yamaoka +2000-03-17 Katsumi Yamaoka * lisp/gnus-vers.el (gnus-revision-number): Increment to 16. @@ -1051,7 +1051,7 @@ * lisp/imap.el (imap-ssl-open): Ditto. * lisp/gnus-start.el (gnus-product-read-variable-file-1): Ditto. -2000-03-17 Katsumi Yamaoka +2000-03-17 Katsumi Yamaoka * lisp/gnus-start.el (gnus-re-read-newsrc-el-file): New function. (gnus-read-newsrc-el-file): If it fails, attempt to re-read the @@ -1059,12 +1059,12 @@ compiled format specs in the file which may be created by the other Gnusae should be ignored. -2000-03-16 Katsumi Yamaoka +2000-03-16 Katsumi Yamaoka * lisp/gnus.el (gnus-product-variable-file-list): Use `*ctext*' when Mule 2.3 is running. -2000-03-16 Katsumi Yamaoka +2000-03-16 Katsumi Yamaoka * lisp/gnus-vers.el (gnus-revision-number): Increment to 15. @@ -1153,7 +1153,7 @@ * lisp/gnus-msg.el (gnus-inews-add-send-actions): Use `product-string'. -2000-03-09 Katsumi Yamaoka +2000-03-09 Katsumi Yamaoka * lisp/gnus.el (gnus-revision-number): Increment to 14. (gnus-compile-user-specs): New user option. @@ -1172,7 +1172,7 @@ (gnus-format-specs-compiled): Modify the form. (TopLevel): Require `alist'. -2000-03-09 Katsumi Yamaoka +2000-03-09 Katsumi Yamaoka * lisp/gnus.el (gnus-revision-number): Increment to 13. @@ -1226,7 +1226,7 @@ (gnus-summary-article-map): Bind them. (gnus-wheel-summary-scroll): Fix paren style. -2000-03-02 Katsumi Yamaoka +2000-03-02 Katsumi Yamaoka * lisp/gnus.el (gnus-revision-number): Increment to 11. @@ -1255,7 +1255,7 @@ this attribute was obsoleted in RFC2060. (nnimap-request-body): Ditto. -2000-02-29 Katsumi Yamaoka +2000-02-29 Katsumi Yamaoka * lisp/gnus.el (gnus-revision-number): Increment to 09. @@ -1302,13 +1302,13 @@ * lisp/nnimap.el (nnimap-retrieve-headers-progress): Remove confusing tabs from original header. -2000-02-02 Katsumi Yamaoka +2000-02-02 Katsumi Yamaoka * lisp/pop3.el (pop3-md5): Fset to `md5' if the module `md5' is installed. (pop3-apop): Use built-in `md5' if it exists. -2000-01-27 Katsumi Yamaoka +2000-01-27 Katsumi Yamaoka * lisp/gnus.el (gnus-revision-number): Increment to 05. @@ -1318,7 +1318,7 @@ * lisp/gnus-sum.el (gnus-summary-exit): Recenter the group buffer without redisplaying if the point is out of view. -2000-01-25 Katsumi Yamaoka +2000-01-25 Katsumi Yamaoka * lisp/gnus.el (gnus-revision-number): Increment to 04. @@ -1341,14 +1341,14 @@ gnus-offline-connect-server): Ditto. * lisp/dgnushack.el (dgnushack-make-package): Ditto. -2000-01-18 Katsumi Yamaoka +2000-01-18 Katsumi Yamaoka * lisp/gnus.el (gnus-revision-number): Increment to 03. * lisp/gnus-sum.el (gnus-summary-exit): Don't recenter the group buffer if it is called non-interactively. -2000-01-18 Katsumi Yamaoka +2000-01-18 Katsumi Yamaoka * lisp/gnus.el (gnus-revision-number): Increment to 02. @@ -1369,17 +1369,17 @@ * lisp/base64.el: Unbound base64-*-string and base64-*-region when defined by autoload. -2000-01-11 Katsumi Yamaoka +2000-01-11 Katsumi Yamaoka * lisp/gnus-sum.el (gnus-summary-reselect-current-group): Restore the original code; hide group contents while rescanning. -2000-01-07 Katsumi Yamaoka +2000-01-07 Katsumi Yamaoka * lisp/gnus-sum.el (gnus-summary-reselect-current-group): Truncate lines in the imitation buffer; turn off h-scrollbar for XEmacs. -2000-01-07 Katsumi Yamaoka +2000-01-07 Katsumi Yamaoka * lisp/gnus.el (gnus-revision-number): Increment to 01. @@ -1403,7 +1403,7 @@ * lisp/dgnushack.el (char-before): Use the byte-optimaization. -2000-01-05 Katsumi Yamaoka +2000-01-05 Katsumi Yamaoka * lisp/gnus.el (gnus-version-number): Update to 6.14.1. (gnus-revision-number): Clear to 00. @@ -1433,7 +1433,7 @@ * texi/{postamble.tex,message.texi,gnus.texi,gnus-ja.texi, emacs-mime.texi,ChangeLog}: Sync up with Gnus v5.8.3. -2000-01-05 Katsumi Yamaoka +2000-01-05 Katsumi Yamaoka * README.semi, README.semi.ja, texi/gnus-faq-ja.texi: Update for the new CVS server. @@ -1465,7 +1465,7 @@ bind `coding-system-for-read' to raw-text-dos, else bind it to binary. -1999-12-28 Katsumi Yamaoka +1999-12-28 Katsumi Yamaoka * lisp/gnus.el (gnus-revision-number): Increment to 14. @@ -1492,7 +1492,7 @@ (imap-starttls-p): Rename from `imap-tls-p'. (imap-starttls-open): Rename from `imap-tls-open'. -1999-12-21 Katsumi Yamaoka +1999-12-21 Katsumi Yamaoka * lisp/gnus.el (gnus-revision-number): Increment to 13. @@ -1505,7 +1505,7 @@ * lisp/base64.el: Restore the original code and invalidate it; use mel for the base64 codec. -1999-12-20 Katsumi Yamaoka +1999-12-20 Katsumi Yamaoka * lisp/imap.el (mel-find-function): Always require `mel' instead of the use of autoloading. Because the function `mel-find-function' @@ -1521,7 +1521,7 @@ * lisp/imap.el (base64-encode-string): Fix. May work. -1999-12-16 Katsumi Yamaoka +1999-12-16 Katsumi Yamaoka * lisp/message.el (message-goto-mail-copies-to): If the field is newly created, a string "never" is inserted in default. @@ -1531,7 +1531,7 @@ (message-mode-map): New key stroke `C-c C-f c' for the command `message-goto-mail-copies-to'. -1999-12-15 Katsumi Yamaoka +1999-12-15 Katsumi Yamaoka * lisp/gnus.el (gnus-revision-number): Increment to 12. @@ -1559,12 +1559,12 @@ macros under XEmacs. It is based on Hrvoje's advice. (member-if): New compiler macro for emulating cl function. -1999-12-14 Katsumi Yamaoka +1999-12-14 Katsumi Yamaoka * lisp/imap.el (imap-base64-encode-string): Use `static-if' instead of `static-condition-case'. -1999-12-14 Katsumi Yamaoka +1999-12-14 Katsumi Yamaoka * lisp/gnus.el (gnus-revision-number): Increment to 11. @@ -1643,7 +1643,7 @@ * lisp/read-passwd.el (read-pw-set-mail-source-passwd-cache): Ignore non-POP mail sources. -1999-12-10 Katsumi Yamaoka +1999-12-10 Katsumi Yamaoka * lisp/gnus.el (gnus-revision-number): Increment to 07. @@ -1654,12 +1654,12 @@ instead of `gnus-union'. 1999-12-10 A.Hitachi - Katsumi Yamaoka + Katsumi Yamaoka * lisp/dgnushack.el (union): New compiler macro for emulating cl function. -1999-12-10 Katsumi Yamaoka +1999-12-10 Katsumi Yamaoka * lisp/gnus-util.el: Require `gnus-ems'. (gnus-ems-redefine): Call it to redefine the functions @@ -1668,7 +1668,7 @@ * lisp/dgnushack.el (mapcon, mapc): Eliminate the redundant code. -1999-12-09 Katsumi Yamaoka +1999-12-09 Katsumi Yamaoka * lisp/gnus.el (gnus-revision-number): Increment to 06. @@ -1677,7 +1677,7 @@ * lisp/dgnushack.el (dgnushack-install-package): Preserve any file in $(PACKAGEDIR)/lisp/t-gnus if it is without .el or .elc suffix. -1999-12-09 Katsumi Yamaoka +1999-12-09 Katsumi Yamaoka * lisp/dgnushack.el (mapcon): New compiler macro for emulating cl function. @@ -1718,7 +1718,7 @@ * lisp/gnus-ofsetup.el (gnus-ofsetup-customize): Compile lambda expressions. -1999-12-08 Katsumi Yamaoka +1999-12-08 Katsumi Yamaoka * lisp/message.el (message-yank-add-new-references): Fix doc string. @@ -1734,7 +1734,7 @@ * lisp/gnus-ofsetup.el (gnus-ofsetup-gettext): Rename from `gnus-ofsetup-get-message'. -1999-12-07 Katsumi Yamaoka +1999-12-07 Katsumi Yamaoka * lisp/gnus.el (gnus-revision-number): Increment to 04. (smiley-toggle-buffer): Autoload "smiley" or "gnus-bitmap". @@ -1777,7 +1777,7 @@ * lisp/gnus-start.el (save-buffers-kill-emacs): Compile the advice at the compile time. Use `gnus-alive-p'. -1999-12-06 Katsumi Yamaoka +1999-12-06 Katsumi Yamaoka * lisp/gnus.el (gnus-revision-number): Increment to 02. @@ -1819,7 +1819,7 @@ * t-gnus-6_14: NEW PUBLIC BRANCH. 1999-12-03 Hirokazu FUKUI - Katsumi Yamaoka + Katsumi Yamaoka * lisp/gnus.el (gnus-revision-number): Increment to 01. @@ -1832,12 +1832,12 @@ possible, otherwise the functions defined in mel are used. (imap-cram-md5-auth): Use them. -1999-12-02 Katsumi Yamaoka +1999-12-02 Katsumi Yamaoka * lisp/imap.el: Remove autoload settings for `base64-decode-string' and `base64-encode-string'. -1999-12-02 Katsumi Yamaoka +1999-12-02 Katsumi Yamaoka * lisp/gnus.el (gnus-version-number): Update to 6.13.4. (gnus-revision-number): Clear to 00. @@ -1864,7 +1864,7 @@ emacs-mime.texi,Makefile.in,ChangeLog}: Sync up with Pterodactyl Gnus v0.99. -1999-12-02 Katsumi Yamaoka +1999-12-02 Katsumi Yamaoka * lisp/gnus.el (gnus-select-method): Undo (`if' -> `when'). * lisp/gnus-picon.el (gnus-picons-file-suffixes): Ditto. @@ -1873,7 +1873,7 @@ * lisp/gnus-group.el (gnus-useful-groups): Undo (`or' -> `unless'). -1999-12-01 Katsumi Yamaoka +1999-12-01 Katsumi Yamaoka * lisp/gnus.el (gnus-revision-number): Increment to 10. @@ -1920,14 +1920,14 @@ (gnus-ofsetup-resource-en): Fix doc strings. (gnus-ofsetup-resource-ja): Ditto. -1999-11-30 Katsumi Yamaoka +1999-11-30 Katsumi Yamaoka * lisp/gnus.el (gnus-revision-number): Increment to 07. * lisp/gnus-art.el (gnus-article-wash-status): Sync up with Pterodactyl Gnus v0.98. -1999-11-30 Katsumi Yamaoka +1999-11-30 Katsumi Yamaoka * lisp/nnimap.el (nnimap-request-newgroups): Don't use `member-if'. @@ -1946,7 +1946,7 @@ * lisp/gnus-art.el (gnus-emphasis-alist): Use `car' and `cdr' instead of `cadr'. -1999-11-30 Katsumi Yamaoka +1999-11-30 Katsumi Yamaoka * lisp/gnus-start.el (save-buffers-kill-emacs): Don't use the macro `when' in the body of `defadvice'. Use `if' instead. @@ -1954,12 +1954,12 @@ * lisp/dgnushack.el (last, mapc): New compiler macros for emulating cl functions. -1999-11-29 Katsumi Yamaoka +1999-11-29 Katsumi Yamaoka * lisp/gnus-start.el (gnus-after-getting-new-news-hook): Don't use the macro `when' in the arg of `defcustom'. Use `if' instead. -1999-11-27 Katsumi Yamaoka +1999-11-27 Katsumi Yamaoka * lisp/gnus.el (gnus-revision-number): Increment to 06. @@ -1977,7 +1977,7 @@ * lisp/gnus.el (gnus-version): Shows also gnus-revision-number. -1999-11-24 Katsumi Yamaoka +1999-11-24 Katsumi Yamaoka * lisp/gnus.el (gnus-revision-number): Increment to 05. @@ -1992,14 +1992,14 @@ * lisp/dgnushack.el (union, copy-list): Remove compiler macros. -1999-11-24 Katsumi Yamaoka +1999-11-24 Katsumi Yamaoka * lisp/gnus.el (gnus-revision-number): Increment to 04. * lisp/dgnushack.el (union, copy-list): New compiler macros for emulating cl functions. -1999-11-22 Katsumi Yamaoka +1999-11-22 Katsumi Yamaoka * lisp/gnus.el (gnus-revision-number): Increment to 03. (gnus-select-method): Use `condition-case' instead of @@ -2021,7 +2021,7 @@ gnus-kill.el,gnus-group.el,gnus-cite.el,gnus-async.el,gnus-art.el, gnus-agent.el,earcon.el}: Require `cl' using `eval-when-compile'. -1999-11-22 Katsumi Yamaoka +1999-11-22 Katsumi Yamaoka * lisp/gnus.el (gnus-revision-number): Increment to 02. @@ -2061,7 +2061,7 @@ (imap-ssl-open): Enclose `open-ssl-stream' with `as-binary-process'. -1999-11-19 Katsumi Yamaoka +1999-11-19 Katsumi Yamaoka * lisp/gnus.el (gnus-revision-number): Increment to 01. (gnus-select-method): Use `condition-case' instead of @@ -2107,13 +2107,13 @@ Use mail-sources instead of nnmail-spool-file. From: Toshiaki -PCX- Tanaka. -1999-11-09 Katsumi Yamaoka +1999-11-09 Katsumi Yamaoka * lisp/gnus.el (gnus-group-startup-message): Insert space before "based on". * lisp/gnus-xmas.el (gnus-xmas-group-startup-message): Ditto. -1999-11-09 Katsumi Yamaoka +1999-11-09 Katsumi Yamaoka * lisp/gnus.el (gnus-version-number): Update to 6.13.3. (gnus-revision-number): Clear to 00. @@ -2149,7 +2149,7 @@ * lisp/pop3.el (pop3-progress-message): New function. (pop3-movemail): Use it. -1999-10-28 Katsumi Yamaoka +1999-10-28 Katsumi Yamaoka * lisp/gnus.el (TopLevel): Autolaod "gnus-msg" for the function `gnus-following-method'. @@ -2160,7 +2160,7 @@ * lisp/gnus-art.el (gnus-following-method): Move to gnus-msg.el. -1999-10-26 Katsumi Yamaoka +1999-10-26 Katsumi Yamaoka * lisp/gnus.el (gnus-revision-number): Increment to 14. (TopLevel): Autoload "gnus-bitmap" instead of "smiley-mule" for the @@ -2171,7 +2171,7 @@ (gnus-article-x-face-command): Default to external command if `window-system' is nil. -1999-10-26 Katsumi Yamaoka +1999-10-26 Katsumi Yamaoka * lisp/gnus.el (gnus-revision-number): Increment to 13. (TopLevel): Rearrange autoload settings. @@ -2208,7 +2208,7 @@ when "eword-decode" is loaded. It is for X-Gnus-Offline-Backend header. -1999-10-19 Katsumi Yamaoka +1999-10-19 Katsumi Yamaoka * lisp/gnus.el (gnus-revision-number): Increment to 10. (TopLevel): Autoload "x-face-mule" and "smiley-mule" for the @@ -2243,7 +2243,7 @@ `x-face-mule' is installed. (TopLevel): Require `static' first; require `path-util'. -1999-10-18 Katsumi Yamaoka +1999-10-18 Katsumi Yamaoka * lisp/gnus.el (gnus-revision-number): Increment to 09. @@ -2272,7 +2272,7 @@ `message-font-lock-keywords'. (message-font-lock-keywords-2): Ditto. -1999-10-11 Katsumi Yamaoka +1999-10-11 Katsumi Yamaoka * lisp/gnus.el (gnus-revision-number): Increment to 08. @@ -2283,7 +2283,7 @@ (gnus-treatment-function-alist): Undo the last change. (gnus-treat-emphasize): Default to nil. -1999-10-08 Katsumi Yamaoka +1999-10-08 Katsumi Yamaoka * lisp/gnus.el (gnus-revision-number): Increment to 07. (TopLevel): Autoload "gnus-art" for the function @@ -2304,7 +2304,7 @@ (gnus-treatment-function-alist): Put `gnus-treat-hide-signature' off after `gnus-treat-highlight-signature'. -1999-10-08 Katsumi Yamaoka +1999-10-08 Katsumi Yamaoka * lisp/gnus.el (gnus-revision-number): Increment to 06. @@ -2315,16 +2315,16 @@ put `gnus-treat-emphasize' off after `gnus-treat-highlight-headers'. -1999-10-07 Yoshiki Hayashi +1999-10-07 Yoshiki Hayashi * lisp/gnus.el (gnus-revision-number): Increment to 05. -1999-10-07 Katsumi Yamaoka +1999-10-07 Katsumi Yamaoka * lisp/gnus-art.el (gnus-treat-predicate): Examine whether the argument is list or not before condition. -1999-10-07 Yoshiki Hayashi +1999-10-07 Yoshiki Hayashi * lisp/gnus-art.el (gnus-treat-predicate): Work for (typep "something"). diff --git a/ChangeLog.4 b/ChangeLog.4 index aacb375..4244bef 100644 --- a/ChangeLog.4 +++ b/ChangeLog.4 @@ -1270,7 +1270,7 @@ * etc/gnus/oort.xface (X-Face): Oort X-Face from Raymond Scholz . -2002-01-09 Katsumi Yamaoka +2002-01-09 Katsumi Yamaoka * lisp/lpath.el: Fbind `coding-system-to-mime-charset' for Mule 2. @@ -1278,7 +1278,7 @@ `rfc2047-fold-region'. (std11-fold-field): Use it. -2002-01-09 Katsumi Yamaoka +2002-01-09 Katsumi Yamaoka * lisp/gnus.el: Don't autoload "gnus-bitmap". @@ -1309,7 +1309,7 @@ * texi/gnus-ja.texi (Web Newspaper): Update the document of mime-w3m.el. -2002-01-08 Katsumi Yamaoka +2002-01-08 Katsumi Yamaoka * lisp/gnus-art.el (article-toggle-headers): Expose headers even if there is a boundary line. @@ -1324,13 +1324,13 @@ * lisp/gnus-namazu.el (gnus-namazu/highlight-words): Reimplemented. -2002-01-08 Katsumi Yamaoka +2002-01-08 Katsumi Yamaoka * lisp/nnheader.el (mail-narrow-to-head): Copy from ietf-drums.el; it should go to the beginning of the header after narrowing. (std11-extract-addresses-components): Protect against nil argument. -2002-01-08 Katsumi Yamaoka +2002-01-08 Katsumi Yamaoka * lisp/nnheader.el (mail-header-field-value): Alias to `std11-field-value'. @@ -1341,7 +1341,7 @@ * lisp/nnheader.el (mail-header-parse-addresses): New function. (std11-extract-addresses-components): New function. -2002-01-07 Katsumi Yamaoka +2002-01-07 Katsumi Yamaoka * lisp/gnus-picon.el: Don't require `mail-parse'. @@ -1354,7 +1354,7 @@ (mail-header-narrow-to-field): Alias to `std11-narrow-to-field'. (std11-narrow-to-field): New function. -2002-01-07 Katsumi Yamaoka +2002-01-07 Katsumi Yamaoka * lisp/gnus-vers.el: T-gnus 6.15.5 revision 00. @@ -1363,7 +1363,7 @@ * etc/gnus/describe-group.xpm: Set pixels of first line to background color. A bug in Emacs? -2002-01-07 Katsumi Yamaoka +2002-01-07 Katsumi Yamaoka * lisp/gnus-vers.el (gnus-revision-number): Increment to 10. @@ -1929,7 +1929,7 @@ * lisp/dgnushack.el (dgnushack-make-auto-load): Advise `make-autoload' to handle `define-derived-mode'. -2001-07-12 Katsumi Yamaoka +2001-07-12 Katsumi Yamaoka * lisp/message.el (message-yank-original): Unwind-protect while suspending font-lock. @@ -1947,12 +1947,12 @@ (message-font-lock-fence-close-regexp): Abolished. (message-font-lock-fence-open-regexp): Abolished. -2001-07-10 Katsumi Yamaoka +2001-07-10 Katsumi Yamaoka * lisp/message.el (message-font-lock-keywords-1): Replace regexp for mml tags with `mime-edit-tag-regexp'. -2001-07-10 Katsumi Yamaoka +2001-07-10 Katsumi Yamaoka * lisp/message.el (message-font-lock-keywords-2): Move definitions for cited texts and mml tags to `message-font-lock-keywords-1'. @@ -1961,7 +1961,7 @@ * texi/gnus-ja.texi (Mail Group Commands): Fix a slight mistake. -2001-07-09 Katsumi Yamaoka +2001-07-09 Katsumi Yamaoka * lisp/dgnushack.el: Add the parent directory of the directory where the APEL modules are installed to `load-path' according to @@ -1987,7 +1987,7 @@ * lisp/Makefile.in (clever): Use `if test... then' instead of `test... &&'. -2001-07-06 Katsumi Yamaoka +2001-07-06 Katsumi Yamaoka * lisp/Makefile.in (clever): Change the quoting style for the elisp form to check for XEmacs-p. @@ -1995,7 +1995,7 @@ * lisp/dgnushack.el: Require `path-util' first, and then search for the path if it is not found. -2001-07-05 Katsumi Yamaoka +2001-07-05 Katsumi Yamaoka * lisp/gnus-vers.el (gnus-revision-number): Increment to 03. @@ -2004,7 +2004,7 @@ * texi/gnus-ja.texi (Web Newspaper): Add a description how to show html documents inline. -2001-06-28 Katsumi Yamaoka +2001-06-28 Katsumi Yamaoka * texi/message-ja.texi (message-suspend-font-lock-when-citing): Add a description. @@ -2014,37 +2014,37 @@ while citing an original message. (message-suspend-font-lock-when-citing): New user option. -2001-06-25 Katsumi Yamaoka +2001-06-25 Katsumi Yamaoka * lisp/gnus-clfns.el (find-cl-run-time-functions): New implementation. -2001-06-22 Katsumi Yamaoka +2001-06-22 Katsumi Yamaoka * lisp/gnus-art.el (article-display-x-face): Don't gather X-Face fields in `gnus-original-article-buffer'. -2001-06-18 Katsumi Yamaoka +2001-06-18 Katsumi Yamaoka * lisp/nnshimbun.el (nnshimbun-find-parameter): Undo the last bogus changes; use the value of `nnshimbun-pre-fetch-article' if the value of the group parameter `prefetch-articles' is nil; do likewise for `encapsulate-images'. -2001-06-18 Katsumi Yamaoka +2001-06-18 Katsumi Yamaoka * lisp/nnshimbun.el (nnshimbun-find-parameter): Use the value of `nnshimbun-pre-fetch-article' if the value of the group parameter `prefetch-articles' is `off'; do likewise for `encapsulate-images'. -2001-06-18 Katsumi Yamaoka +2001-06-18 Katsumi Yamaoka * lisp/nnshimbun.el (nnshimbun-encapsulate-images): Fix a doc-string that both the values `off' and nil specifies not to encapsulate images. (nnshimbun-pre-fetch-article): Default to `off'. -2001-06-18 Katsumi Yamaoka +2001-06-18 Katsumi Yamaoka * lisp/nnshimbun.el (nnshimbun-encapsulate-images): Renamed from `nnshimbun-encapsulate-article'. @@ -2067,11 +2067,11 @@ parameter to control `shimbun-encapsulate-article' value when `shimbun-article' is called. -2001-06-14 Katsumi Yamaoka +2001-06-14 Katsumi Yamaoka * lisp/gnus-vers.el (gnus-revision-number): Increment to 02. -2001-06-14 Katsumi Yamaoka +2001-06-14 Katsumi Yamaoka * lisp/nnshimbun.el (nnshimbun-request-expire-articles): Use `nnshimbun-find-parameter'. @@ -2084,7 +2084,7 @@ (nnshimbun-group-parameters): Specify a parameter type as `list'. (TopLevel): Remove the local variable "-*- coding: junet; -*-". -2001-06-13 Katsumi Yamaoka +2001-06-13 Katsumi Yamaoka * lisp/nnshimbun.el (nnshimbun-group-parameters): New group parameter. It also provides the user option @@ -2099,7 +2099,7 @@ (nnshimbun-generate-nov-database): Use `nnshimbun-find-parameter'. (nnshimbun-request-expire-articles): Fixed. -2001-06-12 Katsumi Yamaoka +2001-06-12 Katsumi Yamaoka * lisp/nnshimbun.el (Gnus-p): Use `file-exists-p' instead of `locate-library' to check for the existence of mailcap.el in the @@ -2107,7 +2107,7 @@ (nnshimbun-retrieve-headers-with-nov): Remove a redundant check that I made. -2001-06-11 Katsumi Yamaoka +2001-06-11 Katsumi Yamaoka * lisp/lpath.el: Don't Fbind `xml-node-children'. @@ -2125,7 +2125,7 @@ * texi/gnus-ja.texi (Web Newspaper): Add documents about `nnshimbun-index-range'. -2001-06-11 Katsumi Yamaoka +2001-06-11 Katsumi Yamaoka * lisp/nnshimbun.el (nnshimbun-request-expire-articles): Don't refer to the variable `nnshimbun-keep-last-article', we should @@ -2139,7 +2139,7 @@ * lisp/nnshimbun.el: Remove some garbage. -2001-06-10 Katsumi Yamaoka +2001-06-10 Katsumi Yamaoka * texi/message-ja.texi: Use `iso-2022-7bit' instead of `iso-2022-7bit-ss2' to keep a compatibility between XEmacsen and @@ -2177,34 +2177,34 @@ (nnshimbun-insert-nov): Fixed condition to decide whether `X-Nnshimbun-Id' should be inseted or not. -2001-06-08 Katsumi Yamaoka +2001-06-08 Katsumi Yamaoka * lisp/nnshimbun.el (nnshimbun-expire-nov-databases): Removed. (nnshimbun-request-expire-articles): Simplified; refer to the shimbun's default expiration days. -2001-06-08 Katsumi Yamaoka +2001-06-08 Katsumi Yamaoka * lisp/lpath.el: Fbind `xml-node-children' for XEmacsen and old FSF Emacsen. -2001-06-07 Katsumi Yamaoka +2001-06-07 Katsumi Yamaoka * lisp/nnshimbun.el (nnshimbun-request-expire-articles): Prefer the group parameter `expiry-wait' when expiring a closed group. -2001-06-07 Katsumi Yamaoka +2001-06-07 Katsumi Yamaoka * lisp/nnshimbun.el (nnshimbun-request-article-1): Replace a date string in `gnus-newsgroup-data' based on the newly retrieved article. -2001-06-07 Katsumi Yamaoka +2001-06-07 Katsumi Yamaoka * lisp/nnshimbun.el (nnshimbun-request-expire-articles): Fix inhibiting the expiring. -2001-06-06 Katsumi Yamaoka +2001-06-06 Katsumi Yamaoka * lisp/nnshimbun.el (nnshimbun-expire-nov-databases): New command. (nnshimbun-request-expire-articles): New function. @@ -2215,7 +2215,7 @@ (nnshimbun-tmp-string): New internal variable. (TopLevel): Require `message' for `message-make-date'. -2001-05-30 Katsumi Yamaoka +2001-05-30 Katsumi Yamaoka * lisp/gnus-clfns.el (find-cl-run-time-functions): Remove a useless non-global var; scroll the output window automatically. @@ -2234,12 +2234,12 @@ instead of `nnheader-insert-nov'. (nnshimbun-replace-nov-entry): New function. -2001-05-29 Katsumi Yamaoka +2001-05-29 Katsumi Yamaoka * lisp/gnus-clfns.el (find-cl-run-time-functions): Add a parser for `dolist'; protect against errors. -2001-05-29 Katsumi Yamaoka +2001-05-29 Katsumi Yamaoka * lisp/nnshimbun.el (nnshimbun-retrieve-headers-with-nov): Don't use `last'. @@ -2260,7 +2260,7 @@ * texi/gnus-ja.texi (Web Newspaper): Updated. -2001-05-28 Katsumi Yamaoka +2001-05-28 Katsumi Yamaoka * lisp/dgnushack.el (dgnushack-unexporting-files): Add "nnshimbun.el" if the library "shimbun" is not found. @@ -2287,13 +2287,13 @@ * etc/Makefile.in (datadir): Set this variable, like in the other Makefile.in's. Patch from Gaute B Strokkenes . -2001-05-16 Katsumi Yamaoka +2001-05-16 Katsumi Yamaoka * lisp/dgnushack.el (dgnushack-bind-colon-keywords): Don't ignore `widget-convert-button', `widget-create' and `widget-put'; ignore `defface'. -2001-05-14 Katsumi Yamaoka +2001-05-14 Katsumi Yamaoka * lisp/gnus.el: Require `base64' if `base64-encode-string' is not a built-in function. @@ -2301,7 +2301,7 @@ * lisp/dgnushack.el (dgnushack-bind-colon-keywords): Ignore `defgroup'. -2001-05-14 Katsumi Yamaoka +2001-05-14 Katsumi Yamaoka * lisp/gnus-vers.el (gnus-revision-number): Increment to 01. @@ -2317,16 +2317,16 @@ (locate-library): Make the function to be silent for Mule. * lisp/Makefile.in (clean): Remove dgnuskwds.el. -2001-05-07 Katsumi Yamaoka +2001-05-07 Katsumi Yamaoka * lisp/message.el (message-maybe-encode): Don't use `end-of-invisible'. -2001-05-07 Katsumi Yamaoka +2001-05-07 Katsumi Yamaoka * lisp/gnus-vers.el: T-gnus 6.15.4 revision 00. -2001-04-27 Katsumi Yamaoka +2001-04-27 Katsumi Yamaoka * lisp/gnus-vers.el (gnus-revision-number): Increment to 01. @@ -2344,29 +2344,29 @@ `inhibit-read-only'. (article-hide-headers): Ditto. -2001-04-16 Katsumi Yamaoka +2001-04-16 Katsumi Yamaoka * lisp/gnus-vers.el: T-gnus 6.15.3 revision 00. -2001-04-16 Katsumi Yamaoka +2001-04-16 Katsumi Yamaoka * lisp/gnus-vers.el: T-gnus 6.15.2 revision 00. -2001-04-16 Katsumi Yamaoka +2001-04-16 Katsumi Yamaoka * lisp/gnus-vers.el: T-gnus 6.15.1 revision 00. -2001-04-13 Katsumi Yamaoka +2001-04-13 Katsumi Yamaoka * lisp/lpath.el: Fbind `xml-parse-region' for XEmacsen and old FSF Emacsen; don't bind `mh-lib-progs'. -2001-04-10 Katsumi Yamaoka +2001-04-10 Katsumi Yamaoka * lisp/nnshimbun.el: Enclose w3m stuff with `eval-and-compile'; bind `w3m-work-buffer-name' and `w3m-retrieve' when compiling. -2001-04-09 Katsumi Yamaoka +2001-04-09 Katsumi Yamaoka * lisp/gnus-vers.el (gnus-revision-number): Increment to 10. @@ -2377,7 +2377,7 @@ (nnshimbun-asahi-get-headers): Ditto. (nnshimbun-retrieve-url): Use `w3m-retrieve' if it is available. -2001-04-02 Katsumi Yamaoka +2001-04-02 Katsumi Yamaoka * lisp/gnus-msg.el (gnus-inews-yank-articles): Make it to work with multiple articles even if there is a detached minibuffer frame on @@ -2388,12 +2388,12 @@ * lisp/mm-decode.el (mm-copy-to-buffer): Copy buffer in unibyte mode. -2001-03-19 Katsumi Yamaoka +2001-03-19 Katsumi Yamaoka * lisp/gnus-kill.el (gnus-execute): Work with the extra headers. * lisp/gnus-sum.el (gnus-summary-execute-command): Ditto. -2001-03-13 Katsumi Yamaoka +2001-03-13 Katsumi Yamaoka * lisp/message.el (message-fix-before-sending): Hide again the invisible property of encoded binary data parts after checking is @@ -2406,7 +2406,7 @@ * lisp/dgnushack.el (dgnushack-compose-package): Tidy up. (dgnushack-make-load): Ditto. -2001-03-12 Katsumi Yamaoka +2001-03-12 Katsumi Yamaoka * lisp/dgnushack.el (dgnushack-compose-package): New function. (dgnushack-make-load): Add autoload for cus-load if it is missing. @@ -2417,12 +2417,12 @@ * Makefile.in (elclean): Remove custom-load.el. -2001-03-08 Katsumi Yamaoka +2001-03-08 Katsumi Yamaoka * lisp/gnus-art.el (gnus-article-prepare-display): Setup MIME entity even if `gnus-show-mime' is nil. -2001-03-08 Katsumi Yamaoka +2001-03-08 Katsumi Yamaoka * lisp/dgnushack.el: Load gnus-clfns.el after `load-path' is adjusted. @@ -2432,22 +2432,22 @@ provided in cl. * lisp/gnus-score.el (gnus-score-find-bnews): Use it as Gnus does. -2001-03-06 Katsumi Yamaoka +2001-03-06 Katsumi Yamaoka * lisp/nnshimbun.el (nnshimbun-retrieve-url): Check if `url-current-mime-charset' is bound. -2001-03-04 Katsumi Yamaoka +2001-03-04 Katsumi Yamaoka * lisp/gnus.el (gnus-info-find-node): Pretend to be `gnus-article-mode' in the article buffer. -2001-03-02 Katsumi Yamaoka +2001-03-02 Katsumi Yamaoka * lisp/nnshimbun.el (nnshimbun-kinsoku-eol-list): Simplified. (nnshimbun-kinsoku-bol-list): Ditto. -2001-03-01 Katsumi Yamaoka +2001-03-01 Katsumi Yamaoka * lisp/gnus-vers.el (gnus-revision-number): Increment to 09. @@ -2459,7 +2459,7 @@ * lisp/dgnushack.el: Load cl-macs to ensure that the macro `dolist' is defined properly. -2001-02-28 Katsumi Yamaoka +2001-02-28 Katsumi Yamaoka * lisp/nnwfm.el: Require `gnus-clfns' when compiling. * lisp/nnshimbun.el: Ditto. @@ -2484,14 +2484,14 @@ * lisp/gnus-art.el: Use `dolist' instead of `mapcar' for defining `gnus-article-read-summary-keys'. -2001-02-28 Katsumi Yamaoka +2001-02-28 Katsumi Yamaoka * lisp/gnus-art.el (gnus-article-mime-edit-article-setup): Leave the forwarded parts undecoded. (gnus-article-decode-article-as-default-mime-charset): Set the value of `default-mime-charset' buffer-locally. -2001-02-27 Katsumi Yamaoka +2001-02-27 Katsumi Yamaoka * lisp/gnus.el: Add autoloads for `gnus-summary-digest-post-forward' and @@ -2510,7 +2510,7 @@ `gnus-summary-digest-post-forward' and `gnus-summary-digest-mail-forward'. -2001-02-27 Katsumi Yamaoka +2001-02-27 Katsumi Yamaoka * lisp/gnus-sum.el (gnus-summary-show-article): Bind `gnus-inhibit-treatment' to t while fetching the raw article. @@ -2527,16 +2527,16 @@ to nil while `mime-edit-exit' is being done. (gnus-article-mime-edit-article-unwind): Turn off font-lock first. -2001-02-23 Katsumi Yamaoka +2001-02-23 Katsumi Yamaoka * lisp/dgnushack.el: Don't require `emu'. -2001-02-16 Katsumi Yamaoka +2001-02-16 Katsumi Yamaoka * lisp/message.el (message-forward-subject-author-subject): Decode `From' field. -2001-02-16 Katsumi Yamaoka +2001-02-16 Katsumi Yamaoka * lisp/gnus-vers.el (gnus-revision-number): Increment to 08. @@ -2545,7 +2545,7 @@ only a temporary fix for an infloop on nnimap. FIXME!!! (gnus-select-newsgroup): Ditto. -2001-02-16 Katsumi Yamaoka +2001-02-16 Katsumi Yamaoka * texi/gnus-ja.texi (New features in Gnus 5.8): Remove annotation about `gnus-article-display-hook.' @@ -2566,12 +2566,12 @@ `gnus-article-prepare-hook' after an article has been prepared; don't evaluate `gnus-article-display-hook'. -2001-02-15 Katsumi Yamaoka +2001-02-15 Katsumi Yamaoka * lisp/message.el (message-cite-original-without-signature): Extract from field for the simple citation line. -2001-02-14 Katsumi Yamaoka +2001-02-14 Katsumi Yamaoka * lisp/gnus-vers.el (gnus-revision-number): Increment to 07. @@ -2592,7 +2592,7 @@ * aclocal.m4 (AC_CHECK_URL): Ignore cache. -2001-02-13 Katsumi Yamaoka +2001-02-13 Katsumi Yamaoka * lisp/gnus-vers.el (gnus-revision-number): Increment to 06. @@ -2606,7 +2606,7 @@ * configure.in: Use it. -2001-02-08 Katsumi Yamaoka +2001-02-08 Katsumi Yamaoka * lisp/nnshimbun.el (nnshimbun-fml-get-headers): Fix unbalanced parentheses. @@ -2621,22 +2621,22 @@ of `xemacs'. (nnshimbun-xemacs-get-headers): Ditto. -2001-02-06 Katsumi Yamaoka +2001-02-06 Katsumi Yamaoka * README-gnus-bbdb.{en,ja}: Update the patch for BBDB v2.2. -2001-02-01 Katsumi Yamaoka +2001-02-01 Katsumi Yamaoka * texi/Makefile.in (.texi, %.info): Don't use makeinfo command when gnus-ja.texi or message-ja.texi is given. It is needed for some make command if which can not understand "%-ja:" or "%-ja.info:". -2001-01-31 Katsumi Yamaoka +2001-01-31 Katsumi Yamaoka * lisp/gnus-sum.el (gnus-summary-display-article): Replace `mm-enable-multibyte-mule4' with `set-buffer-multibyte'. -2001-01-29 Katsumi Yamaoka +2001-01-29 Katsumi Yamaoka * lisp/gnus-art.el (gnus-article-mime-edit-exit): Use `buffer-substring-no-properties' instead of `format'. @@ -2645,7 +2645,7 @@ * texi/ptexinfmt.el: Support @letterpaper and @afivepaper. -2001-01-22 Katsumi Yamaoka +2001-01-22 Katsumi Yamaoka * lisp/gnus-vers.el (gnus-revision-number): Increment to 05. @@ -2655,7 +2655,7 @@ * lisp/Makefile.in (install): Use `install-without-compiling'. (install-without-compiling): New target. -2001-01-22 Katsumi Yamaoka +2001-01-22 Katsumi Yamaoka * texi/Makefile.in (.texi, %.info, %-ja.info, %-ja): Use `infohack-texi-format'. @@ -2668,11 +2668,11 @@ * texi/ptexinfmt.el: New file. * lisp/ptexinfmt.el: Move to texi/. -2001-01-18 Katsumi Yamaoka +2001-01-18 Katsumi Yamaoka * lisp/gnus-vers.el (gnus-revision-number): Increment to 04. -2001-01-17 Katsumi Yamaoka +2001-01-17 Katsumi Yamaoka * lisp/dgnushack.el (dgnushack-make-autoloads): Do nothing if the files for autoloads already exist. @@ -2691,11 +2691,11 @@ * Makefile.in: Unset `PWD' for Meadow/NTEmacs. -2001-01-15 Jesper Harder +2001-01-15 Jesper Harder * make.bat: Fix doc. -2001-01-15 Katsumi Yamaoka +2001-01-15 Katsumi Yamaoka * lisp/nnheader.el: Require `pces', `poem' and `std11' to reduce the required value of `recursive-load-depth-limit' for Emacs 21. @@ -2713,14 +2713,14 @@ * Makefile.in (install-package-lisp): Specify EMACS=$(XEMACS). -2001-01-11 Katsumi Yamaoka +2001-01-11 Katsumi Yamaoka * lisp/gnus-msg.el (gnus-copy-article-buffer): Remove smiley extents for XEmacs 21.1 using `format'. * lisp/dgnushack.el (dgnushack-texi-format): Cancel last change. -2001-01-10 Katsumi Yamaoka +2001-01-10 Katsumi Yamaoka * lisp/gnus-vers.el (gnus-revision-number): Increment to 03. @@ -2737,21 +2737,21 @@ `gnus-bitmap'. (gnus-article-x-face-command): Don't check for xbm for x-face-e21. -2001-01-05 Katsumi Yamaoka +2001-01-05 Katsumi Yamaoka * lisp/gnus-vers.el (gnus-revision-number): Increment to 02. * lisp/dgnushack.el (dgnushack-texi-format): Remove "@anchor" if it is not supported. -2000-12-26 Katsumi Yamaoka +2000-12-26 Katsumi Yamaoka * lisp/gnus.el: Bind `:parameter-type', `:parameter-document', `:function', `:function-document', `:variable', `:variable-document', `:variable-group', `:variable-type' and `:variable-default' for old Emacsen. -2000-12-22 Katsumi Yamaoka +2000-12-22 Katsumi Yamaoka * lisp/gnus-vers.el (gnus-revision-number): Increment to 01. @@ -2770,7 +2770,7 @@ * configure.in: Add etc/Makefile. -2000-12-22 Katsumi Yamaoka +2000-12-22 Katsumi Yamaoka * lisp/gnus-msg.el (gnus-debug): Use `sit-for' in the inside of `save-excursion'. @@ -2788,7 +2788,7 @@ * README.semi.ja: Fix typo. -2000-12-21 Katsumi Yamaoka +2000-12-21 Katsumi Yamaoka * lisp/lpath.el: Fbind `compose-mail' for Mule. @@ -2797,7 +2797,7 @@ `custom-declare-face' to omit unsupported keywords when Mule is running. -2000-12-20 Katsumi Yamaoka +2000-12-20 Katsumi Yamaoka * lisp/gnus-vers.el: T-gnus 6.15.0 revision 00. @@ -2811,7 +2811,7 @@ Mule. (TopLevel): Don't require `custom' here. -2000-12-20 Jesper Harder +2000-12-20 Jesper Harder * make.bat: set max-lisp-eval-depth. diff --git a/GNUS-NEWS b/GNUS-NEWS index 01da5fd..7ead1e8 100644 --- a/GNUS-NEWS +++ b/GNUS-NEWS @@ -1,113 +1,180 @@ GNUS NEWS -- history of user-visible changes. -Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. See the end for copying conditions. Please send Gnus bug reports to bugs@gnus.org. For older news, see Gnus info node "New Features". - -* Changes in No Gnus +* Installation changes ** Upgrading from previous (stable) version if you have used No Gnus. If you have tried No Gnus (the unstable Gnus branch leading to this -release) but went back to a stable version, be careful when upgrading -to this version. In particular, you will probably want to remove the -`~/News/marks' directory (perhaps selectively), so that flags are -read from your `~/.newsrc.eld' instead of from the stale marks file, -where this release will store flags for nntp. See a later entry for -more information about nntp marks. Note that downgrading isn't safe -in general. +release) but went back to a stable version, be careful when upgrading to +this version. In particular, you will probably want to remove the +`~/News/marks' directory (perhaps selectively), so that flags are read +from your `~/.newsrc.eld' instead of from the stale marks file, where +this release will store flags for nntp. See a later entry for more +information about nntp marks. Note that downgrading isn't safe in +general. + +** Lisp files are now installed in `.../site-lisp/gnus/' by default. It +defaulted to `.../site-lisp/' formerly. In addition to this, the new +installer issues a warning if other Gnus installations which will shadow +the latest one are detected. You can then remove those shadows manually +or remove them using `make remove-installed-shadows'. + + +* New packages and libraries within Gnus -** The nntp back end store article marks in `~/News/marks'. +** Gnus includes the Emacs Lisp SASL library. -The directory can be changed using the (customizable) variable -`nntp-marks-directory', and marks can be disabled using the (back -end) variable `nntp-marks-is-evil'. The advantage of this is that -you can copy `~/News/marks' (using rsync, scp or whatever) to another -Gnus installation, and it will realize what articles you have read -and marked. The data in `~/News/marks' has priority over the same -data in `~/.newsrc.eld'. +This provides a clean API to SASL mechanisms from within Emacs. The +user visible aspects of this, compared to the earlier situation, include +support for DIGEST-MD5 and NTLM. *Note Emacs SASL: (sasl)Top. + +** ManageSieve connections uses the SASL library by default. + +The primary change this brings is support for DIGEST-MD5 and NTLM, when +the server supports it. + +** Gnus includes a password cache mechanism in password.el. + +It is enabled by default (see `password-cache'), with a short timeout of +16 seconds (see `password-cache-expiry'). If PGG is used as the PGP +back end, the PGP passphrase is managed by this mechanism. Passwords +for ManageSieve connections are managed by this mechanism, after +querying the user about whether to do so. + + +* Changes in summary and article mode + +** International host names (IDNA) can now be decoded inside article bodies +using `W i' (`gnus-summary-idna-message'). This requires that GNU Libidn +(`http://www.gnu.org/software/libidn/') has been installed. + +** Gnus now displays DNS master files sent as text/dns using dns-mode. + +** Gnus supports new limiting commands in the Summary buffer: `/ r' +(`gnus-summary-limit-to-replied') and `/ R' +(`gnus-summary-limit-to-recipient'). *Note Limiting::. + +** Gnus supports a new sort command in the Summary buffer: `C-c C-s C-t' +(`gnus-summary-sort-by-recipient'). *Note Summary Sorting::. + +** S/MIME now features LDAP user certificate searches. You need to +configure the server in `smime-ldap-host-list'. + +** URLs inside OpenPGP headers are retrieved and imported to your PGP key +ring when you click on them. ** Picons can be displayed right from the textual address, see `gnus-picon-style'. *Note Picons::. -** You can import and export your RSS subscriptions from OPML files. -*Note RSS::. +** ANSI SGR control sequences can be transformed using `W A'. + +ANSI sequences are used in some Chinese hierarchies for highlighting +articles (`gnus-article-treat-ansi-sequences'). + +** Gnus now MIME decodes articles even when they lack "MIME-Version" header. +This changes the default of `gnus-article-loose-mime'. + +** `gnus-decay-scores' can be a regexp matching score files. For example, +set it to `\\.ADAPT\\'' and only adaptive score files will be decayed. + *Note Score Decays::. + +** Strings prefixing to the `To' and `Newsgroup' headers in summary lines +when using `gnus-ignored-from-addresses' can be customized with +`gnus-summary-to-prefix' and `gnus-summary-newsgroup-prefix'. *Note To +From Newsgroups::. + +** You can replace MIME parts with external bodies. See +`gnus-mime-replace-part' and `gnus-article-replace-part'. *Note MIME +Commands::, *Note Using MIME::. ** The option `mm-fill-flowed' can be used to disable treatment of format=flowed messages. Also, flowed text is disabled when sending -inline PGP signed messages. +inline PGP signed messages. *Note Flowed text: (emacs-mime)Flowed text. -** You can now drag and drop attachments to the Message buffer. -** ANSI SGR control sequences can be transformed using `W A'. + +* Changes in Message mode -ANSI sequences are used in some Chinese hierarchies for highlighting -articles (`gnus-article-treat-ansi-sequences'). +** Gnus now supports the "hashcash" client puzzle anti-spam mechanism. Use +`(setq message-generate-hashcash t)' to enable. *Note Hashcash::. -** International host names (IDNA) can now be decoded inside article -bodies using `W i' (`gnus-summary-idna-message'). This require that -GNU Libidn (`http://www.gnu.org/software/libidn/') has been installed. +** You can now drag and drop attachments to the Message buffer. See +`mml-dnd-protocol-alist' and `mml-dnd-attach-options'. *Note MIME: +(message)MIME. -** Gnus includes an Emacs Lisp SASL library. +** The option `message-yank-empty-prefix' now controls how empty lines are +prefixed in cited text. *Note Insertion Variables: (message)Insertion +Variables. -This provide a clean API to SASL mechanisms from within Emacs. The -user visible aspects of this, compared to the earlier situation, -include support for DIGEST-MD5 and NTLM. +** Gnus uses narrowing to hide headers in Message buffers. The +`References' header is hidden by default. To make all headers visible, +use `(setq message-hidden-headers nil)'. *Note Message Headers: +(message)Message Headers. -** ManageSieve connections uses the SASL library by default. + +* Changes in back ends -The primary change this brings is support for DIGEST-MD5 and NTLM, -when the server support it. +** The nntp back end stores article marks in `~/News/marks'. -** Gnus include a password cache mechanism in password.el. +The directory can be changed using the (customizable) variable +`nntp-marks-directory', and marks can be disabled using the (back end) +variable `nntp-marks-is-evil'. The advantage of this is that you can +copy `~/News/marks' (using rsync, scp or whatever) to another Gnus +installation, and it will realize what articles you have read and +marked. The data in `~/News/marks' has priority over the same data in +`~/.newsrc.eld'. -It is enabled by default (see `password-cache'), with a short timeout -of 16 seconds (see `password-cache-expiry'). If PGG is used as the -PGP back end, the PGP passphrase is managed by this mechanism. -Passwords for ManageSieve connections are managed by this mechanism, -after quering the user about whether to do so. +** You can import and export your RSS subscriptions from OPML files. *Note +RSS::. ** IMAP identity (RFC 2971) is supported. -By default, Gnus do not send any information about itself, but you can +By default, Gnus does not send any information about itself, but you can customize it using the variable `nnimap-id'. -** The `all.SCORE' file can be edited from the group buffer using `W e'. +** The `nnrss' back end now supports multilingual text. Non-ASCII group +names for the `nnrss' groups are also supported. *Note RSS::. -** Gnus now MIME decode articles even when they lack "MIME-Version" -header. This changes the default of `gnus-article-loose-mime'. +** Retrieving mail with POP3 is supported over SSL/TLS and with StartTLS. -** Gnus now view DNS master files sent as text/dns using dns-mode. +** The nnml back end allows other compression programs beside `gzip' for +compressed message files. *Note Mail Spool::. -** Gnus now support the "hashcash" client puzzle anti-spam idea. See -the Gnus manual, section Hashcash, for more information. Use `(setq -message-generate-hashcash t)' to enable. + +* Appearance -** Gnus supports new limiting commands in the Summary buffer: `/ r' -(`gnus-summary-limit-to-replied') and `/ R' -(`gnus-summary-limit-to-recipient'). *Note Limiting::. +** The tool bar has been updated to use GNOME icons. You can also +customize the tool bar. There's no documentation in the manual yet, but +`M-x customize-apropos RET -tool-bar$' should get you started. (Only +for Emacs, not in XEmacs.) -** Gnus supports a new sort command in the Summary buffer: `C-c C-s C-t' -(`gnus-summary-sort-by-recipient'). *Note Summary Sorting:: +** The tool bar icons are now (de)activated correctly in the group buffer, +see the variable `gnus-group-update-tool-bar'. Its default value +depends on your Emacs version. -** The `nnrss' back end now supports multilingual text. Non-ASCII group -names for the `nnrss' groups are also supported. *Note RSS::. +** You can change the location of XEmacs' toolbars in Gnus buffers. See +`gnus-use-toolbar' and `message-use-toolbar'. -** URLs inside OpenPGP: headers are retrieved and imported to your PGP -key ring when you click on them. -** Gnus uses narrowing to hide headers in Message buffers. The -`References' header is hidden by default. To make all headers -visible, use `(setq message-hidden-headers nil)'. + +* Miscellaneous changes -** `gnus-decay-scores' can be a regexp matching score files. This -allows to decay only adaptive score files. *Note Score Decays::. +** Having edited the select-method for the foreign server in the server +buffer is immediately reflected to the subscription of the groups which +use the server in question. For instance, if you change +`nntp-via-address' into `bar.example.com' from `foo.example.com', Gnus +will connect to the news host by way of the intermediate host +`bar.example.com' from next time. + +** The `all.SCORE' file can be edited from the group buffer using `W e'. -** S/MIME now feature LDAP user certificate searches. You need to -configure the server in `smime-ldap-host-list'. * For older news, see Gnus info node "New Features". @@ -115,7 +182,8 @@ configure the server in `smime-ldap-host-list'. ---------------------------------------------------------------------- Copyright information: -Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. Permission is granted to anyone to make or distribute verbatim copies of this document as received, in any medium, provided that the diff --git a/Makefile.in b/Makefile.in index fbc5432..ea8cd59 100644 --- a/Makefile.in +++ b/Makefile.in @@ -35,6 +35,38 @@ EXAMINE_PACKAGEDIR = $(XEMACS) -batch -q -no-site-file -eval \ dirs (cdr dirs)))) \ (princ (or package-dir \"\")))" 2>/dev/null +GZIP_PROG = gzip -f + +# # # # # # # # # # Release variables (for maintainer only): +# +# Files removed from `cvs export' output before creating the tar-ball: +CVS_IGNORE_FILES = .cvsignore contrib/.cvsignore etc/.cvsignore \ + lisp/.cvsignore texi/.cvsignore texi/ps/.cvsignore .arch-inventory +# Name and mail address in ChangeLog format for the release commit: +COMMITTER = Lars Magne Ingebrigtsen +# CODENAME for development releases (CODENAME must have a trailing space, +# (e.g. "Oort ") +CODENAME = +# Codename initial (lower case), e.g. 'n' for "No Gnus". +CIN = +# Files with hard-coded versions numbers: +RELEASE_COMMIT_FILES = ChangeLog README \ + lisp/ChangeLog lisp/gnus.el \ + texi/ChangeLog texi/gnus.texi texi/message.texi texi/gnus-faq.texi +# Pattern matching previous version(s): +OLD_PATTERN = \(5.10.[0-9]*\|0\.[1-9][0-9]*\) +# CVS tag of the previous version: +OLD_TAG = v5-10-6 +# CVS tag of the current release: +TAG = v5-10 +# +# Procedure: +# - release-bump-version +# - release-commit +# - release-files or release-files-signed +# +# # # # # # # # # # End of release variables + all: lick info all-ja: lick info info-ja @@ -173,6 +205,12 @@ xinfo: xinfo-ja: cd texi && $(MAKE) EMACS="$(XEMACS)" ja-info +list-installed-shadows: + cd lisp && $(MAKE) EMACS="$(EMACS)" lispdir="$(lispdir)" list-installed-shadows + +remove-installed-shadows: + cd lisp && $(MAKE) EMACS="$(EMACS)" lispdir="$(lispdir)" remove-installed-shadows + uninstall: cd lisp && $(MAKE) lispdir="$(lispdir)" uninstall cd texi && $(MAKE) uninstall @@ -194,9 +232,8 @@ info-ja: cd texi && $(MAKE) EMACS=$(EMACS) ja clean: - rm -f */*.orig */*.rej *.orig *.rej - rm -f MANIFEST.* - for i in lisp texi; do (cd $$i; $(MAKE) clean); done + for i in lisp texi etc texi/ps; do (cd $$i; $(MAKE) clean); done + rm -f *.orig *.rej *~ MANIFEST.* elclean: cd lisp && rm -f *.elc auto-autoloads.el custom-load.el gnus-load.el @@ -208,7 +245,6 @@ xsome: $(MAKE) EMACS="$(XEMACS)" some distclean: clean - rm -rf *~ for i in lisp texi etc texi/ps; do (cd $$i; $(MAKE) distclean); done rm -f config.log config.status config.cache Makefile @@ -219,6 +255,129 @@ $(srcdir)/configure: $(srcdir)/configure.in Makefile: $(srcdir)/Makefile.in config.status CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status +# # # # # # # # # # Release targets (for maintainer only): + +release-check-settings: + @echo + @echo "COMMITTER = '$(COMMITTER)'" + @echo " (example: 'Foo Bar ')" + @echo "VERSION = '$(VERSION)' (example: '5.10.6')" + @echo "CODENAME = '$(CODENAME)' (example: 'No ')" + @echo "CIN = '$(CIN)' (example: 'n', codename initial)" + @echo "TAG = '$(TAG)' (example: 'v5-10-6')" + @echo "OLD_TAG = '$(OLD_TAG)' (example: 'v5-10-5')" + @echo + @if [ x"$(VERSION)" = x ]; then echo "error: No VERSION given."; exit 1; else :; fi + @if [ x"$(TAG)" = x ]; then echo "error: No TAG given."; exit 1; else :; fi + @echo + @echo Settings checked successfully. + @echo + @echo You may now make... + @echo release-bump-version + @echo release-commit + @echo release-files or release-files-signed + +# Needs GNU grep and a recent GNU sed: +release-bump-version: release-check-settings + sed -i -e '/^(defconst gnus-version-number /s,"$(OLD_PATTERN)","$(VERSION)",' lisp/gnus.el + sed -i -e '/^.newcommand{.gnusversionname}{[A-Za-z ]*Gnus v/s,$(OLD_PATTERN),$(VERSION),' texi/gnus.texi + sed -i -e '/^This manual corresponds to [A-Za-z ]*Gnus v/s,$(OLD_PATTERN),$(VERSION),' texi/gnus.texi + sed -i -e '/^corresponding to this manual is [A-Za-z ]*Gnus v/s,$(OLD_PATTERN),$(VERSION),' texi/message.texi + sed -i -e 's,/[a-z]*gnus-[0-9.]*/,/$(CIN)gnus-$(VERSION)/,' README + if [ "x$(CODENAME)" = "x" ]; then \ + sed -i -e '/The current release ($(OLD_PATTERN)) should/s,$(OLD_PATTERN),$(VERSION),' texi/gnus-faq.texi; \ + else \ + true; \ + fi + @if grep -q "$(CODENAME)Gnus v$(VERSION) is released" ChangeLog; then \ + echo "ChangeLog is already updated"; \ + else \ + sed -i -e "1s|^|`date -I` $(COMMITTER)\n\n\t* README: $(CODENAME)Gnus v$(VERSION) is released.\n\n|" ChangeLog; \ + fi + @if grep -q "$(CODENAME)Gnus v$(VERSION) is released" texi/ChangeLog; then \ + echo "texi/ChangeLog is already updated"; \ + else \ + sed -i -e "1s|^|`date -I` $(COMMITTER)\n\n\t* gnus.texi, gnus-faq.texi, message.texi: $(CODENAME)Gnus v$(VERSION) is released.\n\n|" texi/ChangeLog; \ + fi + @if grep -q "$(CODENAME)Gnus v$(VERSION) is released" lisp/ChangeLog; then \ + echo "lisp/ChangeLog is already updated"; \ + else \ + sed -i -e "1s|^|`date -I` $(COMMITTER)\n\n\t* gnus.el: $(CODENAME)Gnus v$(VERSION) is released.\n\n|" lisp/ChangeLog; \ + fi + cvs diff -U0 $(RELEASE_COMMIT_FILES); sleep 2 + +release-revert-files: + rm -i $(RELEASE_COMMIT_FILES) + cvs update $(RELEASE_COMMIT_FILES) + +release-commit: release-check-settings + @echo -e '\007' + @echo + @echo "Really do the release-commit for $(CODENAME)Gnus v$(VERSION)?" + @echo "Command line:" + @echo " " cvs commit -m "$(CODENAME)Gnus v$(VERSION) is released." $(RELEASE_COMMIT_FILES) + @echo + @echo "Hit RET to continue or Ctrl-C to abort." + @echo + @read dummy + cvs commit -m "$(CODENAME)Gnus v$(VERSION) is released." $(RELEASE_COMMIT_FILES) + @echo + @echo "Add tag $(TAG) to CVS?" + @echo "Command line:" + @echo " " cvs tag $(TAG) + @echo "Hit RET to continue or Ctrl-C to abort." + @echo + @read dummy + cvs tag $(TAG) + +release-files: release-make-tar-ball release-diff + @echo "Release files have been created:" + @ls -l $(CIN)gnus-$(VERSION).tar.gz + @ls -l $(CIN)gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff.gz + +release-files-signed: release-files release-sign-files + +# Sign prepared files: +release-sign-files: + if [ "x$$GPG_AGENT_INFO" = "x" ]; then \ + read -sp "Enter pass phrase: " phrase ; \ + gpg_opt="--passphrase-fd 0"; \ + else \ + gpg_opt=""; phrase=""; \ + fi; \ + for i in $(CIN)gnus-$(VERSION).tar.gz \ + $(CIN)gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff.gz; do \ + rm -f $$i.sig; \ + echo "$$phrase" | gpg --detach-sign $$gpg_opt $$i; \ + done; true + @ls -l $(CIN)gnus-$(VERSION).tar.gz{.sig,} + @ls -l $(CIN)gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff.gz{.sig,} + @gpg --verify $(CIN)gnus-$(VERSION).tar.gz{.sig,} + @gpg --verify $(CIN)gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff.gz{.sig,} + +release-cvs-export $(CIN)gnus-$(VERSION): release-check-settings + rm -fr $(CIN)gnus-$(VERSION) + cvs export -d $(CIN)gnus-$(VERSION) -r $(TAG) gnus + +release-make-tar-ball: $(CIN)gnus-$(VERSION) + [ -d $(CIN)gnus-$(VERSION) ] && cd $(CIN)gnus-$(VERSION) && \ + rm $(CVS_IGNORE_FILES) || true + tar zcvf $(CIN)gnus-$(VERSION).tar.gz $(CIN)gnus-$(VERSION) + ls -l $(CIN)gnus-$(VERSION).tar.gz + +# Make a diff between current and previous release. Example: +# ftp://quimby.gnus.org/pub/gnus/ding-patches/gnus-5.10.5-5.10.6.diff.gz +release-diff: release-check-settings + cvs diff -r $(OLD_TAG) -r $(TAG) | sed -e '/^\? /d' > temp.diff || true + mv temp.diff $(CIN)gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff + $(GZIP_PROG) $(CIN)gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff + ls -l $(CIN)gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff.gz + +release-post-clean: release-check-settings + rm -fr $(CIN)gnus-$(TAG) temp.diff + +# # # # # # # # # # End of release targets + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/README b/README new file mode 100644 index 0000000..dc69f8a --- /dev/null +++ b/README @@ -0,0 +1,57 @@ +This package contains a development version of Gnus. The lisp directory +contains the source lisp files, and the texi directory contains the Gnus info +pages. + +To use Gnus you first have to unpack the files, which you've obviously +done, because you are reading this. + +You should definitely byte-compile the source files. To do that, you +can simply say "./configure && make" in this directory. + +Do not say "make install". I repeat, do *NOT* say "make install". If +you say "make install" and then complain about things not working, +I'll be very annoyed. If you say "make install" and things happen to +work, that's all fine and dandy for you, but it's quite likely that it +won't. + +If you are using XEmacs, you *must* say "./configure && make EMACS=xemacs". + +Then you have to tell Emacs where Gnus is. You might put something +like + + (setq load-path (cons (expand-file-name "~/ngnus-0.4/lisp") load-path)) + (require 'gnus-load) + +in your .emacs file, or wherever you keep such things. + +To enable reading the Gnus manual, you could say something like: + + (require 'info) + (if (featurep 'xemacs) + (add-to-list 'Info-directory-list "~/ngnus-0.4/texi/") + (add-to-list 'Info-default-directory-list "~/ngnus-0.4/texi/")) + +No Gnus does absolutely not work with anything older than Emacs 21.1 or +XEmacs 21.4. + +To compile the Gnus manual, you either need a pretty new Emacs, or a +pretty new version of the texinfo tools. + +Then you do a `M-x gnus', and everything should... uhm... it should +work, but it might not. Set `debug-on-error' to t, and mail me the +backtraces, or, better yet, find out why Gnus does something wrong, +fix it, and send me the diffs. :-) + +There are four main things I want your help and input on: + +1) Startup. Does everything go smoothly, and why not? + +2) Any errors while you read news normally? + +3) Any errors if you do anything abnormal? + +4) Features you do not like, or do like, but would like to tweak a + bit, and features you would like to see. + +Send any comments and all your bug fixes/complaints to +`bugs@gnus.org'. diff --git a/README.T-gnus b/README.T-gnus index 9ce4256..0e4fe40 100644 --- a/README.T-gnus +++ b/README.T-gnus @@ -33,5 +33,5 @@ NEWS: * T-gnus 6.17 - this is based on Gnus. - The latest T-gnus is T-gnus 6.17.3 (based on No Gnus 0.3). It + The latest T-gnus is T-gnus 6.17.4 (based on No Gnus 0.4). It requires SEMI 1.14, FLIM 1.14, and APEL 10.0 or later. diff --git a/README.semi b/README.semi index 326af69..5ee97ab 100644 --- a/README.semi +++ b/README.semi @@ -27,8 +27,8 @@ http://emacs-w3m.namazu.org/ http://ei5nazha.yz.yamagata-u.ac.jp/~aito/w3m/ -How to get? (via CVS) -===================== +How to get? +=========== (0) cvs login (first time only) @@ -87,17 +87,6 @@ Major tags are following: For more detailed information, please read README.branch. -How to get? (via ftp) -===================== - - T-gnus 6.17 is available from - - ftp://ftp.jpl.org/pub/elisp/t-gnus-6.17/snapshots/ - - NOTE: These snapshots are manually created when the urge takes the - administrator of the a-ftp site, and will usually not be tested. - - How to join development ======================= diff --git a/README.semi.ja b/README.semi.ja index 5b2549e..b9bda88 100644 --- a/README.semi.ja +++ b/README.semi.ja @@ -28,8 +28,8 @@ http://emacs-w3m.namazu.org/ http://ei5nazha.yz.yamagata-u.ac.jp/~aito/w3m/ -$B\$7$/$O!"(BREADME.branch.ja $B$r;2>H$7$F$/$@$5$$!#(B -$Bl=j$+$i&6 if test "$EMACS_FLAVOR" = "xemacs"; then etcdir="\$(lispdir)/../../etc" else - etcdir="\$(lispdir)/../etc" + etcdir="\$(lispdir)/../../etc" fi fi echo "$as_me:$LINENO: result: $etcdir" >&5 diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 82ce97d..74ed0be 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,26 @@ +2006-02-11 Miles Bader + + * sendmail.el, smtpmail.el: New files, from Emacs tree. + +2005-12-22 TSUCHIYA Masatoshi + + * gnus-namazu.el (gnus-namazu-remote-groups): Accept `t' as an + symbol that matches the method specified by `gnus-select-method'. + (gnus-namazu/make-directory-table): Follow the above change. + (gnus-namazu/call-namazu): Wrap a query string with quotes. + +2005-12-05 Adrian Aichner + + * nnir.el: New variable nnir-swish-e-index-files to support + multiple swish-e index files. + * nnir.el (nnir-swish-e-index-file): Make obsolete. + * nnir.el (nnir-swish-e-index-files): New. + * nnir.el (nnir-run-swish-e): Use nnir-swish-e-index-files. + +2005-05-17 Katsumi Yamaoka + + * nnir.el (nnir): Add :group. + 2005-01-26 Steve Youngs * gpg.el: Add timer/itimer compatibility. diff --git a/contrib/README b/contrib/README index ec75436..7e8a31d 100644 --- a/contrib/README +++ b/contrib/README @@ -43,8 +43,20 @@ nnir.el one-line-cookie.diff +sendmail.el +smtpmail.el + + Copies of the corresponding files from the Emacs lisp/mail/ + directory, to provide features (occasionally) needed by Gnus which + may not be provided by the versions of these files in older Emacs + distributions. + ssl.el + Obsolete interface to OpenSSL. Completely replaced by + lisp/tls.el, which supports both GnuTLS and OpenSSL. This + file will be removed eventually. + ucs-tables.el This file provides improved Unicode functionality. It defines @@ -68,5 +80,6 @@ vcard.el xml.el - This is used for parsing RSS feeds. Part of Emacs 21.3 and - later. + This is used for parsing RSS feeds. Part of Emacs 21.3 and later. + Note that the version of this file in the Gnus contrib/ directory is + out of date with respect to the version in the Emacs tree. diff --git a/contrib/compface.el b/contrib/compface.el index 45a5709..f7d0f72 100644 --- a/contrib/compface.el +++ b/contrib/compface.el @@ -19,8 +19,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/contrib/gpg-ring.el b/contrib/gpg-ring.el index dd223bf..7938a5d 100644 --- a/contrib/gpg-ring.el +++ b/contrib/gpg-ring.el @@ -21,8 +21,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. diff --git a/contrib/gpg.el b/contrib/gpg.el index 182f79b..0e1ee73 100644 --- a/contrib/gpg.el +++ b/contrib/gpg.el @@ -21,8 +21,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/contrib/nnir.el b/contrib/nnir.el index 5d65d31..f42fdf9 100644 --- a/contrib/nnir.el +++ b/contrib/nnir.el @@ -18,8 +18,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -376,7 +376,8 @@ Add an entry here when adding a new search engine.") ;;; User Customizable Variables: (defgroup nnir nil - "Search nnmh and nnml groups in Gnus with Glimpse, freeWAIS-sf, or EWS.") + "Search nnmh and nnml groups in Gnus with Glimpse, freeWAIS-sf, or EWS." + :group 'gnus) ;; Mail backend. @@ -531,18 +532,31 @@ that it is for swish++, not Glimpse." :type '(regexp) :group 'nnir) -;; Swish-E. Next three variables Copyright (C) 2000 Christoph Conrad -;; . +;; Swish-E. ;; URL: http://sunsite.berkeley.edu/SWISH-E/ ;; New version: http://www.boe.es/swish-e +;; Variables `nnir-swish-e-index-file', `nnir-swish-e-program' and +;; `nnir-swish-e-additional-switches' +;; Copyright (C) 2000 Christoph Conrad . +(make-obsolete-variable 'nnir-swish-e-index-file + 'nnir-swish-e-index-files) (defcustom nnir-swish-e-index-file (expand-file-name "~/Mail/index.swish-e") "*Index file for swish-e. -This could be a server parameter." +This could be a server parameter. +It is never consulted once `nnir-swish-e-index-files', which should be +used instead, has been customized." :type '(file) :group 'nnir) +(defcustom nnir-swish-e-index-files + (list nnir-swish-e-index-file) + "*List of index files for swish-e. +This could be a server parameter." + :type '(repeat (file)) + :group 'nnir) + (defcustom nnir-swish-e-program "swish-e" "*Name of swish-e search executable. This cannot be a server parameter." @@ -1195,10 +1209,10 @@ Tested with swish-e-2.0.1 on Windows NT 4.0." (erase-buffer) (message "Doing swish-e query %s..." query) - (let* ((index-file + (let* ((index-files (or (nnir-read-server-parm - 'nnir-swish-e-index-file server) - (error "Missing parameter `nnir-swish-e-index-file'"))) + 'nnir-swish-e-index-files server) + (error "Missing parameter `nnir-swish-e-index-files'"))) (additional-switches (nnir-read-server-parm 'nnir-swish-e-additional-switches server)) @@ -1206,7 +1220,7 @@ Tested with swish-e-2.0.1 on Windows NT 4.0." nil ; input from /dev/null t ; output nil ; don't redisplay - "-f" ,index-file + "-f" ,@index-files ,@additional-switches "-w" ,qstring ; the query, in swish-e format diff --git a/contrib/sendmail.el b/contrib/sendmail.el new file mode 100644 index 0000000..ee512b3 --- /dev/null +++ b/contrib/sendmail.el @@ -0,0 +1,1866 @@ +;;; sendmail.el --- mail sending commands for Emacs. -*- byte-compile-dynamic: t -*- + +;; Copyright (C) 1985, 1986, 1992, 1993, 1994, 1995, 1996, 1998, 2000, +;; 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + +;; Maintainer: FSF +;; Keywords: mail + +;; This file is 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., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. + +;;; Commentary: + +;; This mode provides mail-sending facilities from within Emacs. It is +;; documented in the Emacs user's manual. + +;;; Code: +(eval-when-compile + ;; Necessary to avoid recursive `require's. + (provide 'sendmail) + (require 'rmail) + (require 'mailalias)) + +(autoload 'rfc2047-encode-string "rfc2047") + +(defgroup sendmail nil + "Mail sending commands for Emacs." + :prefix "mail-" + :group 'mail) + +(defcustom mail-setup-with-from t + "Non-nil means insert `From:' field when setting up the message." + :type 'boolean + :group 'sendmail + :version "22.1") + +;;;###autoload +(defcustom mail-from-style 'angles + "Specifies how \"From:\" fields look. + +If `nil', they contain just the return address like: + king@grassland.com +If `parens', they look like: + king@grassland.com (Elvis Parsley) +If `angles', they look like: + Elvis Parsley +If `system-default', allows the mailer to insert its default From field +derived from the envelope-from address. + +In old versions of Emacs, the `system-default' setting also caused +Emacs to pass the proper email address from `user-mail-address' +to the mailer to specify the envelope-from address. But that is now +controlled by a separate variable, `mail-specify-envelope-from'." + :type '(choice (const nil) (const parens) (const angles) + (const system-default)) + :version "20.3" + :group 'sendmail) + +;;;###autoload +(defcustom mail-specify-envelope-from nil + "If non-nil, specify the envelope-from address when sending mail. +The value used to specify it is whatever is found in +the variable `mail-envelope-from', with `user-mail-address' as fallback. + +On most systems, specifying the envelope-from address is a +privileged operation. This variable affects sendmail and +smtpmail -- if you use feedmail to send mail, see instead the +variable `feedmail-deduce-envelope-from'." + :version "21.1" + :type 'boolean + :group 'sendmail) + +(defcustom mail-envelope-from nil + "If non-nil, designate the envelope-from address when sending mail. +This only has an effect if `mail-specify-envelope-from' is non-nil. +The value should be either a string, or the symbol `header' (in +which case the contents of the \"From\" header of the message +being sent is used), or nil (in which case the value of +`user-mail-address' is used)." + :version "21.1" + :type '(choice (string :tag "From-name") + (const :tag "Use From: header from message" header) + (const :tag "Use `user-mail-address'" nil)) + :group 'sendmail) + +;;;###autoload +(defcustom mail-self-blind nil + "Non-nil means insert BCC to self in messages to be sent. +This is done when the message is initialized, +so you can remove or alter the BCC field to override the default." + :type 'boolean + :group 'sendmail) + +;;;###autoload +(defcustom mail-interactive nil + "Non-nil means when sending a message wait for and display errors. +nil means let mailer mail back a message to report errors." + :type 'boolean + :group 'sendmail) + +(defcustom mail-yank-ignored-headers + (concat "^" + (regexp-opt '("via" "mail-from" "origin" "status" "remailed" + "received" "message-id" "summary-line" "to" "subject" + "in-reply-to" "return-path" "mail-reply-to" + "mail-followup-to") "\\(?:") + ":") + "Delete these headers from old message when it's inserted in a reply." + :type 'regexp + :group 'sendmail) + +;; Prevent problems with `window-system' not having the correct value +;; when loaddefs.el is loaded. `custom-reevaluate-setting' needs the +;; standard value. +;;;###autoload +(put 'send-mail-function 'standard-value + '((if (and window-system (memq system-type '(darwin windows-nt))) + 'mailclient-send-it + 'sendmail-send-it))) + +;; Useful to set in site-init.el +;;;###autoload +(defcustom send-mail-function + (if (and window-system (memq system-type '(darwin windows-nt))) + 'mailclient-send-it + 'sendmail-send-it) + "Function to call to send the current buffer as mail. +The headers should be delimited by a line which is +not a valid RFC822 header or continuation line, +that matches the variable `mail-header-separator'. +This is used by the default mail-sending commands. See also +`message-send-mail-function' for use with the Message package." + :type '(radio (function-item sendmail-send-it :tag "Use Sendmail package") + (function-item smtpmail-send-it :tag "Use SMTPmail package") + (function-item feedmail-send-it :tag "Use Feedmail package") + (function-item mailclient-send-it :tag "Use Mailclient package") + function) + :group 'sendmail) + +;;;###autoload +(defcustom mail-header-separator "--text follows this line--" + "Line used to separate headers from text in messages being composed." + :type 'string + :group 'sendmail) + +;; Set up mail-header-separator for use as a category text property. +(put 'mail-header-separator 'rear-nonsticky '(category)) +;; This was a nice idea, for preventing accidental modification of +;; the separator. But I found it also prevented or obstructed +;; certain deliberate operations, such as copying the separator line +;; up to the top to send myself a copy of an already sent outgoing message +;; and other things. So I turned it off. --rms. +;;(put 'mail-header-separator 'read-only t) + +;;;###autoload +(defcustom mail-archive-file-name nil + "Name of file to write all outgoing messages in, or nil for none. +This can be an inbox file or an Rmail file." + :type '(choice file (const nil)) + :group 'sendmail) + +;;;###autoload +(defcustom mail-default-reply-to nil + "Address to insert as default Reply-to field of outgoing messages. +If nil, it will be initialized from the REPLYTO environment variable +when you first send mail." + :type '(choice (const nil) string) + :group 'sendmail) + +;;;###autoload +(defcustom mail-alias-file nil + "If non-nil, the name of a file to use instead of `/usr/lib/aliases'. +This file defines aliases to be expanded by the mailer; this is a different +feature from that of defining aliases in `.mailrc' to be expanded in Emacs. +This variable has no effect unless your system uses sendmail as its mailer." + :type '(choice (const nil) file) + :group 'sendmail) + +;;;###autoload +(defcustom mail-personal-alias-file "~/.mailrc" + "If non-nil, the name of the user's personal mail alias file. +This file typically should be in same format as the `.mailrc' file used by +the `Mail' or `mailx' program. +This file need not actually exist." + :type '(choice (const nil) file) + :group 'sendmail) + +;;;###autoload +(defcustom mail-setup-hook nil + "Normal hook, run each time a new outgoing mail message is initialized. +The function `mail-setup' runs this hook." + :type 'hook + :options '(fortune-to-signature spook mail-abbrevs-setup) + :group 'sendmail) + +;;;###autoload +(defvar mail-aliases t + "Alist of mail address aliases, +or t meaning should be initialized from your mail aliases file. +\(The file's name is normally `~/.mailrc', but `mail-personal-alias-file' +can specify a different file name.) +The alias definitions in the file have this form: + alias ALIAS MEANING") + +(defvar mail-alias-modtime nil + "The modification time of your mail alias file when it was last examined.") + +;;;###autoload +(defcustom mail-yank-prefix nil + "Prefix insert on lines of yanked message being replied to. +nil means use indentation." + :type '(choice (const nil) string) + :group 'sendmail) + +;;;###autoload +(defcustom mail-indentation-spaces 3 + "Number of spaces to insert at the beginning of each cited line. +Used by `mail-yank-original' via `mail-indent-citation'." + :type 'integer + :group 'sendmail) + +(defvar mail-yank-hooks nil + "Obsolete hook for modifying a citation just inserted in the mail buffer. +Each hook function can find the citation between (point) and (mark t). +And each hook function should leave point and mark around the citation +text as modified. + +This is a normal hook, misnamed for historical reasons. +It is semi-obsolete and mail agents should no longer use it.") + +;;;###autoload +(defcustom mail-citation-hook nil + "Hook for modifying a citation just inserted in the mail buffer. +Each hook function can find the citation between (point) and (mark t), +and should leave point and mark around the citation text as modified. +The hook functions can find the header of the cited message +in the variable `mail-citation-header', whether or not this is included +in the cited portion of the message. + +If this hook is entirely empty (nil), a default action is taken +instead of no action." + :type 'hook + :group 'sendmail) + +(defvar mail-citation-header nil + "While running `mail-citation-hook', this variable holds the message header. +This enables the hook functions to see the whole message header +regardless of what part of it (if any) is included in the cited text.") + +;;;###autoload +(defcustom mail-citation-prefix-regexp "[ \t]*[-a-z0-9A-Z]*>+[ \t]*\\|[ \t]*" + "Regular expression to match a citation prefix plus whitespace. +It should match whatever sort of citation prefixes you want to handle, +with whitespace before and after; it should also match just whitespace. +The default value matches citations like `foo-bar>' plus whitespace." + :type 'regexp + :group 'sendmail + :version "20.3") + +(defvar mail-abbrevs-loaded nil) +(defvar mail-mode-map + (let ((map (make-sparse-keymap))) + (define-key map "\M-\t" 'mail-complete) + (define-key map "\C-c?" 'describe-mode) + (define-key map "\C-c\C-f\C-t" 'mail-to) + (define-key map "\C-c\C-f\C-b" 'mail-bcc) + (define-key map "\C-c\C-f\C-f" 'mail-fcc) + (define-key map "\C-c\C-f\C-c" 'mail-cc) + (define-key map "\C-c\C-f\C-s" 'mail-subject) + (define-key map "\C-c\C-f\C-r" 'mail-reply-to) + (define-key map "\C-c\C-f\C-a" 'mail-mail-reply-to) ; author + (define-key map "\C-c\C-f\C-l" 'mail-mail-followup-to) ; list + (define-key map "\C-c\C-t" 'mail-text) + (define-key map "\C-c\C-y" 'mail-yank-original) + (define-key map "\C-c\C-r" 'mail-yank-region) + (define-key map [remap split-line] 'mail-split-line) + (define-key map "\C-c\C-q" 'mail-fill-yanked-message) + (define-key map "\C-c\C-w" 'mail-signature) + (define-key map "\C-c\C-v" 'mail-sent-via) + (define-key map "\C-c\C-c" 'mail-send-and-exit) + (define-key map "\C-c\C-s" 'mail-send) + (define-key map "\C-c\C-i" 'mail-attach-file) + + (define-key map [menu-bar mail] + (cons "Mail" (make-sparse-keymap "Mail"))) + + (define-key map [menu-bar mail fill] + '("Fill Citation" . mail-fill-yanked-message)) + + (define-key map [menu-bar mail yank] + '("Cite Original" . mail-yank-original)) + + (define-key map [menu-bar mail signature] + '("Insert Signature" . mail-signature)) + + (define-key map [menu-bar mail mail-sep] + '("--")) + + (define-key map [menu-bar mail cancel] + '("Cancel" . mail-dont-send)) + + (define-key map [menu-bar mail send-stay] + '("Send, Keep Editing" . mail-send)) + + (define-key map [menu-bar mail send] + '("Send Message" . mail-send-and-exit)) + + (define-key map [menu-bar headers] + (cons "Headers" (make-sparse-keymap "Move to Header"))) + + (define-key map [menu-bar headers text] + '("Text" . mail-text)) + + (define-key map [menu-bar headers expand-aliases] + '("Expand Aliases" . expand-mail-aliases)) + + (define-key map [menu-bar headers sent-via] + '("Sent Via" . mail-sent-via)) + + (define-key map [menu-bar headers mail-reply-to] + '("Mail Reply To" . mail-mail-reply-to)) + + (define-key map [menu-bar headers mail-followup-to] + '("Mail Followup To" . mail-mail-followup-to)) + + (define-key map [menu-bar headers reply-to] + '("Reply-To" . mail-reply-to)) + + (define-key map [menu-bar headers bcc] + '("Bcc" . mail-bcc)) + + (define-key map [menu-bar headers fcc] + '("Fcc" . mail-fcc)) + + (define-key map [menu-bar headers cc] + '("Cc" . mail-cc)) + + (define-key map [menu-bar headers subject] + '("Subject" . mail-subject)) + + (define-key map [menu-bar headers to] + '("To" . mail-to)) + + map)) + +(autoload 'build-mail-aliases "mailalias" + "Read mail aliases from user's personal aliases file and set `mail-aliases'." + nil) + +(autoload 'expand-mail-aliases "mailalias" + "Expand all mail aliases in suitable header fields found between BEG and END. +Suitable header fields are `To', `Cc' and `Bcc' and their `Resent-' variants. +Optional second arg EXCLUDE may be a regular expression defining text to be +removed from alias expansions." + nil) + +;;;###autoload +(defcustom mail-signature nil + "Text inserted at end of mail buffer when a message is initialized. +If t, it means to insert the contents of the file `mail-signature-file'. +If a string, that string is inserted. + (To make a proper signature, the string should begin with \\n\\n-- \\n, + which is the standard way to delimit a signature in a message.) +Otherwise, it should be an expression; it is evaluated +and should insert whatever you want to insert." + :type '(choice (const :tag "None" nil) + (const :tag "Use `.signature' file" t) + (string :tag "String to insert") + (sexp :tag "Expression to evaluate")) + :group 'sendmail) +(put 'mail-signature 'risky-local-variable t) + +;;;###autoload +(defcustom mail-signature-file "~/.signature" + "File containing the text inserted at end of mail buffer." + :type 'file + :group 'sendmail) + +;;;###autoload +(defcustom mail-default-directory "~/" + "Directory for mail buffers. +Value of `default-directory' for mail buffers. +This directory is used for auto-save files of mail buffers." + :type '(directory :tag "Directory") + :group 'sendmail + :version "22.1") + +(defvar mail-reply-action nil) +(defvar mail-send-actions nil + "A list of actions to be performed upon successful sending of a message.") +(put 'mail-reply-action 'permanent-local t) +(put 'mail-send-actions 'permanent-local t) + +;;;###autoload +(defcustom mail-default-headers nil + "A string containing header lines, to be inserted in outgoing messages. +It is inserted before you edit the message, +so you can edit or delete these lines." + :type '(choice (const nil) string) + :group 'sendmail) + +;;;###autoload +(defcustom mail-bury-selects-summary t + "If non-nil, try to show RMAIL summary buffer after returning from mail. +The functions \\[mail-send-on-exit] or \\[mail-dont-send] select +the RMAIL summary buffer before returning, if it exists and this variable +is non-nil." + :type 'boolean + :group 'sendmail) + +;;;###autoload +(defcustom mail-send-nonascii 'mime + "Specify whether to allow sending non-ASCII characters in mail. +If t, that means do allow it. nil means don't allow it. +`query' means ask the user each time. +`mime' means add an appropriate MIME header if none already present. +The default is `mime'. +Including non-ASCII characters in a mail message can be problematical +for the recipient, who may not know how to decode them properly." + :type '(choice (const t) (const nil) (const query) (const mime)) + :group 'sendmail) + +(defcustom mail-use-dsn nil + "Ask MTA for notification of failed, delayed or successful delivery. +Note that only some MTAs (currently only recent versions of Sendmail) +support Delivery Status Notification." + :group 'sendmail + :type '(repeat (radio (const :tag "Failure" failure) + (const :tag "Delay" delay) + (const :tag "Success" success))) + :version "22.1") + +;; Note: could use /usr/ucb/mail instead of sendmail; +;; options -t, and -v if not interactive. +(defvar mail-mailer-swallows-blank-line + (if (and (string-match "sparc-sun-sunos\\(\\'\\|[^5]\\)" system-configuration) + (file-readable-p "/etc/sendmail.cf") + (with-temp-buffer + (insert-file-contents "/etc/sendmail.cf") + (goto-char (point-min)) + (let ((case-fold-search nil)) + (re-search-forward "^OR\\>" nil t)))) + ;; According to RFC822, "The field-name must be composed of printable + ;; ASCII characters (i.e. characters that have decimal values between + ;; 33 and 126, except colon)", i.e. any chars except ctl chars, + ;; space, or colon. + '(looking-at "[ \t]\\|[][!\"#$%&'()*+,-./0-9;<=>?@A-Z\\\\^_`a-z{|}~]+:")) + "Set this non-nil if the system's mailer runs the header and body together. +\(This problem exists on Sunos 4 when sendmail is run in remote mode.) +The value should be an expression to test whether the problem will +actually occur.") + +(defvar mail-mode-syntax-table + (let ((st (make-syntax-table))) + ;; define-derived-mode will make it inherit from text-mode-syntax-table. + (modify-syntax-entry ?% ". " st) + st) + "Syntax table used while in `mail-mode'.") + +(defvar mail-font-lock-keywords + (eval-when-compile + (let* ((cite-chars "[>|}]") + (cite-prefix "[:alpha:]") + (cite-suffix (concat cite-prefix "0-9_.@-`'\""))) + (list '("^\\(To\\|Newsgroups\\):" . font-lock-function-name-face) + '("^\\(B?CC\\|Reply-to\\|Mail-\\(reply\\|followup\\)-to\\):" . font-lock-keyword-face) + '("^\\(Subject:\\)[ \t]*\\(.+\\)?" + (1 font-lock-comment-face) +;; (2 font-lock-type-face nil t) + ) + ;; Use EVAL to delay in case `mail-header-separator' gets changed. + '(eval . + (let ((separator (if (zerop (length mail-header-separator)) + " \\`\\' " + (regexp-quote mail-header-separator)))) + (cons (concat "^" separator "$") 'font-lock-warning-face))) + ;; Use MATCH-ANCHORED to effectively anchor the regexp left side. + `(,cite-chars + (,(concat "\\=[ \t]*" + "\\(\\(\\([" cite-prefix "]+[" cite-suffix "]*\\)?" + "\\(" cite-chars "[ \t]*\\)\\)+\\)" + "\\(.*\\)") + (beginning-of-line) (end-of-line) + (1 font-lock-comment-delimiter-face nil t) + (5 font-lock-comment-face nil t))) + '("^\\(X-[A-Za-z0-9-]+\\|In-reply-to\\):.*\\(\n[ \t]+.*\\)*$" + . font-lock-string-face)))) + "Additional expressions to highlight in Mail mode.") + + +(defun sendmail-sync-aliases () + (when mail-personal-alias-file + (let ((modtime (nth 5 (file-attributes mail-personal-alias-file)))) + (or (equal mail-alias-modtime modtime) + (setq mail-alias-modtime modtime + mail-aliases t))))) + +(defun mail-setup (to subject in-reply-to cc replybuffer actions) + (or mail-default-reply-to + (setq mail-default-reply-to (getenv "REPLYTO"))) + (sendmail-sync-aliases) + (if (eq mail-aliases t) + (progn + (setq mail-aliases nil) + (when mail-personal-alias-file + (if (file-exists-p mail-personal-alias-file) + (build-mail-aliases))))) + ;; Don't leave this around from a previous message. + (kill-local-variable 'buffer-file-coding-system) + ;; This doesn't work for enable-multibyte-characters. + ;; (kill-local-variable 'enable-multibyte-characters) + (set-buffer-multibyte default-enable-multibyte-characters) + (if current-input-method + (inactivate-input-method)) + (setq mail-send-actions actions) + (setq mail-reply-action replybuffer) + (goto-char (point-min)) + (if mail-setup-with-from + (mail-insert-from-field)) + (insert "To: ") + (save-excursion + (if to + ;; Here removed code to extract names from within <...> + ;; on the assumption that mail-strip-quoted-names + ;; has been called and has done so. + (let ((fill-prefix "\t") + (address-start (point))) + (insert to "\n") + (fill-region-as-paragraph address-start (point-max)) + (goto-char (point-max)) + (unless (bolp) + (newline))) + (newline)) + (if cc + (let ((fill-prefix "\t") + (address-start (progn (insert "CC: ") (point)))) + (insert cc "\n") + (fill-region-as-paragraph address-start (point-max)) + (goto-char (point-max)) + (unless (bolp) + (newline)))) + (if in-reply-to + (let ((fill-prefix "\t") + (fill-column 78) + (address-start (point))) + (insert "In-reply-to: " in-reply-to "\n") + (fill-region-as-paragraph address-start (point-max)) + (goto-char (point-max)) + (unless (bolp) + (newline)))) + (insert "Subject: " (or subject "") "\n") + (if mail-default-headers + (insert mail-default-headers)) + (if mail-default-reply-to + (insert "Reply-to: " mail-default-reply-to "\n")) + (if mail-self-blind + (insert "BCC: " user-mail-address "\n")) + (if mail-archive-file-name + (insert "FCC: " mail-archive-file-name "\n")) + (put-text-property (point) + (progn + (insert mail-header-separator "\n") + (1- (point))) + 'category 'mail-header-separator) + ;; Insert the signature. But remember the beginning of the message. + (if to (setq to (point))) + (cond ((eq mail-signature t) + (if (file-exists-p mail-signature-file) + (progn + (insert "\n\n-- \n") + (insert-file-contents mail-signature-file)))) + ((stringp mail-signature) + (insert mail-signature)) + (t + (eval mail-signature))) + (goto-char (point-max)) + (or (bolp) (newline))) + (if to (goto-char to)) + (or to subject in-reply-to + (set-buffer-modified-p nil)) + (run-hooks 'mail-setup-hook)) + +(defcustom mail-mode-hook nil + "Hook run by Mail mode." + :group 'sendmail + :type 'hook + :options '(footnote-mode)) + +(defvar mail-mode-abbrev-table text-mode-abbrev-table) +;;;###autoload +(define-derived-mode mail-mode text-mode "Mail" + "Major mode for editing mail to be sent. +Like Text Mode but with these additional commands: + +\\[mail-send] mail-send (send the message) +\\[mail-send-and-exit] mail-send-and-exit (send the message and exit) + +Here are commands that move to a header field (and create it if there isn't): + \\[mail-to] move to To: \\[mail-subject] move to Subject: + \\[mail-cc] move to CC: \\[mail-bcc] move to BCC: + \\[mail-fcc] move to FCC: \\[mail-reply-to] move to Reply-To: + \\[mail-mail-reply-to] move to Mail-Reply-To: + \\[mail-mail-followup-to] move to Mail-Followup-To: +\\[mail-text] mail-text (move to beginning of message text). +\\[mail-signature] mail-signature (insert `mail-signature-file' file). +\\[mail-yank-original] mail-yank-original (insert current message, in Rmail). +\\[mail-fill-yanked-message] mail-fill-yanked-message (fill what was yanked). +\\[mail-sent-via] mail-sent-via (add a Sent-via field for each To or CC). +Turning on Mail mode runs the normal hooks `text-mode-hook' and +`mail-mode-hook' (in that order)." + (make-local-variable 'mail-reply-action) + (make-local-variable 'mail-send-actions) + (setq buffer-offer-save t) + (make-local-variable 'font-lock-defaults) + (setq font-lock-defaults '(mail-font-lock-keywords t t)) + (make-local-variable 'paragraph-separate) + (make-local-variable 'normal-auto-fill-function) + (setq normal-auto-fill-function 'mail-mode-auto-fill) + (make-local-variable 'fill-paragraph-function) + (setq fill-paragraph-function 'mail-mode-fill-paragraph) + ;; Allow using comment commands to add/remove quoting (this only does + ;; anything if mail-yank-prefix is set to a non-nil value). + (set (make-local-variable 'comment-start) mail-yank-prefix) + (if mail-yank-prefix + (set (make-local-variable 'comment-start-skip) + (concat "^" (regexp-quote mail-yank-prefix) "[ \t]*"))) + (make-local-variable 'adaptive-fill-regexp) + (setq adaptive-fill-regexp + (concat "[ \t]*[-[:alnum:]]+>+[ \t]*\\|" + adaptive-fill-regexp)) + (make-local-variable 'adaptive-fill-first-line-regexp) + (setq adaptive-fill-first-line-regexp + (concat "[ \t]*[-[:alnum:]]*>+[ \t]*\\|" + adaptive-fill-first-line-regexp)) + ;; `-- ' precedes the signature. `-----' appears at the start of the + ;; lines that delimit forwarded messages. + ;; Lines containing just >= 3 dashes, perhaps after whitespace, + ;; are also sometimes used and should be separators. + (setq paragraph-separate (concat (regexp-quote mail-header-separator) + "$\\|\t*\\([-|#;>* ]\\|(?[0-9]+[.)]\\)+$" + "\\|[ \t]*[[:alnum:]]*>+[ \t]*$\\|[ \t]*$\\|" + "--\\( \\|-+\\)$\\|" + page-delimiter))) + + +(defun mail-header-end () + "Return the buffer location of the end of headers, as a number." + (save-restriction + (widen) + (save-excursion + (rfc822-goto-eoh) + (point)))) + +(defun mail-text-start () + "Return the buffer location of the start of text, as a number." + (save-restriction + (widen) + (save-excursion + (rfc822-goto-eoh) + (forward-line 1) + (point)))) + +(defun mail-sendmail-delimit-header () + "Set up whatever header delimiter convention sendmail will use. +Concretely: replace the first blank line in the header with the separator." + (rfc822-goto-eoh) + (insert mail-header-separator) + (point)) + +(defun mail-sendmail-undelimit-header () + "Remove header separator to put the message in correct form for sendmail. +Leave point at the start of the delimiter line." + (rfc822-goto-eoh) + (delete-region (point) (progn (end-of-line) (point)))) + +(defun mail-mode-auto-fill () + "Carry out Auto Fill for Mail mode. +If within the headers, this makes the new lines into continuation lines." + (if (< (point) (mail-header-end)) + (let ((old-line-start (save-excursion (beginning-of-line) (point)))) + (if (do-auto-fill) + (save-excursion + (beginning-of-line) + (while (not (eq (point) old-line-start)) + ;; Use insert-before-markers in case we're inserting + ;; before the saved value of point (which is common). + (insert-before-markers " ") + (forward-line -1)) + t))) + (do-auto-fill))) + +(defun mail-mode-fill-paragraph (arg) + ;; Do something special only if within the headers. + (if (< (point) (mail-header-end)) + (let (beg end fieldname) + (when (prog1 (re-search-backward "^[-a-zA-Z]+:" nil 'yes) + (setq beg (point))) + (setq fieldname + (downcase (buffer-substring beg (1- (match-end 0)))))) + (forward-line 1) + ;; Find continuation lines and get rid of their continuation markers. + (while (looking-at "[ \t]") + (delete-horizontal-space) + (forward-line 1)) + (setq end (point-marker)) + (goto-char beg) + ;; If this field contains addresses, + ;; make sure we can fill after each address. + (if (member fieldname + '("to" "cc" "bcc" "from" "reply-to" + "mail-reply-to" "mail-followup-to" + "resent-to" "resent-cc" "resent-bcc" + "resent-from" "resent-reply-to")) + (while (search-forward "," end t) + (or (looking-at "[ \t]") + (insert " ")))) + (fill-region-as-paragraph beg end arg) + ;; Mark all lines except the first as continuations. + (goto-char beg) + (forward-line 1) + (while (< (point) end) + (insert " ") + (forward-line 1)) + (move-marker end nil) + t))) + +;; User-level commands for sending. + +(defun mail-send-and-exit (&optional arg) + "Send message like `mail-send', then, if no errors, exit from mail buffer. +Prefix arg means don't delete this window." + (interactive "P") + (mail-send) + (mail-bury arg)) + +(defun mail-dont-send (&optional arg) + "Don't send the message you have been editing. +Prefix arg means don't delete this window." + (interactive "P") + (mail-bury arg)) + +(defun mail-bury (&optional arg) + "Bury this mail buffer." + (let ((newbuf (other-buffer (current-buffer)))) + (bury-buffer (current-buffer)) + (if (and (or (window-dedicated-p (frame-selected-window)) + (cdr (assq 'mail-dedicated-frame (frame-parameters)))) + (not (null (delq (selected-frame) (visible-frame-list))))) + (progn + (if (display-multi-frame-p) + (delete-frame (selected-frame)) + ;; The previous frame is where normally they have the + ;; RMAIL buffer displayed. + (other-frame -1))) + (let (rmail-flag summary-buffer) + (and (not arg) + (not (one-window-p)) + (with-current-buffer + (window-buffer (next-window (selected-window) 'not)) + (setq rmail-flag (eq major-mode 'rmail-mode)) + (setq summary-buffer + (and mail-bury-selects-summary + (boundp 'rmail-summary-buffer) + rmail-summary-buffer + (buffer-name rmail-summary-buffer) + (not (get-buffer-window rmail-summary-buffer)) + rmail-summary-buffer)))) + (if rmail-flag + ;; If the Rmail buffer has a summary, show that. + (if summary-buffer (switch-to-buffer summary-buffer) + (delete-window)) + (switch-to-buffer newbuf)))))) + +(defcustom mail-send-hook nil + "Hook run just before sending mail with `mail-send'." + :type 'hook + :options '(flyspell-mode-off) + :group 'sendmail) + +;;;###autoload +(defcustom mail-mailing-lists nil "\ +*List of mailing list addresses the user is subscribed to. + +The variable is used to trigger insertion of the \"Mail-Followup-To\" +header when sending a message to a mailing list." + :type '(repeat string) + :group 'sendmail) + + +(defun mail-send () + "Send the message in the current buffer. +If `mail-interactive' is non-nil, wait for success indication +or error messages, and inform user. +Otherwise any failure is reported in a message back to +the user from the mailer." + (interactive) + (if (if buffer-file-name + (y-or-n-p "Send buffer contents as mail message? ") + (or (buffer-modified-p) + (y-or-n-p "Message already sent; resend? "))) + (let ((inhibit-read-only t) + (opoint (point)) + (ml (when mail-mailing-lists + ;; The surrounding regexp assumes the use of + ;; `mail-strip-quoted-names' on addresses before matching + ;; Cannot deal with full RFC 822 freedom, but that is + ;; unlikely to be problematic. + (concat "\\(?:[[:space:];,]\\|\\`\\)" + (regexp-opt mail-mailing-lists t) + "\\(?:[[:space:];,]\\|\\'\\)")))) + ;; If there are mailing lists defined + (when ml + (save-excursion + (let* ((to (mail-fetch-field "to" nil t)) + (cc (mail-fetch-field "cc" nil t)) + (new-header-values ; To: and Cc: + (mail-strip-quoted-names + (concat to (when cc (concat ", " cc)))))) + ;; If message goes to known mailing list ... + (when (string-match ml new-header-values) + ;; Add Mail-Followup-To if none yet + (unless (mail-fetch-field "mail-followup-to") + (goto-char (mail-header-end)) + (insert "Mail-Followup-To: " + (let ((l)) + (mapc + ;; remove duplicates + '(lambda (e) + (unless (member e l) + (push e l))) + (split-string new-header-values + ",[[:space:]]+" t)) + (mapconcat 'identity l ", ")) + "\n")) + ;; Add Mail-Reply-To if none yet + (unless (mail-fetch-field "mail-reply-to") + (goto-char (mail-header-end)) + (insert "Mail-Reply-To: " + (or (mail-fetch-field "reply-to") + user-mail-address) + "\n")))))) + (unless (memq mail-send-nonascii '(t mime)) + (goto-char (point-min)) + (skip-chars-forward "\0-\177") + (or (= (point) (point-max)) + (if (eq mail-send-nonascii 'query) + (or (y-or-n-p "Message contains non-ASCII characters; send anyway? ") + (error "Aborted")) + (error "Message contains non-ASCII characters")))) + ;; Complain about any invalid line. + (goto-char (point-min)) + (while (< (point) (mail-header-end)) + (unless (looking-at "[ \t]\\|.*:\\|$") + (push-mark opoint) + (error "Invalid header line (maybe a continuation line lacks initial whitespace)")) + (forward-line 1)) + (goto-char opoint) + (run-hooks 'mail-send-hook) + (message "Sending...") + (funcall send-mail-function) + ;; Now perform actions on successful sending. + (while mail-send-actions + (condition-case nil + (apply (car (car mail-send-actions)) + (cdr (car mail-send-actions))) + (error)) + (setq mail-send-actions (cdr mail-send-actions))) + (message "Sending...done") + ;; If buffer has no file, mark it as unmodified and delete auto-save. + (if (not buffer-file-name) + (progn + (set-buffer-modified-p nil) + (delete-auto-save-file-if-necessary t)))))) + +(defun mail-envelope-from () + "Return the envelope mail address to use when sending mail. +This function uses `mail-envelope-from'." + (if (eq mail-envelope-from 'header) + (nth 1 (mail-extract-address-components + (mail-fetch-field "From"))) + mail-envelope-from)) + +;; This does the real work of sending a message via sendmail. +;; It is called via the variable send-mail-function. + +;;;###autoload +(defvar sendmail-coding-system nil + "*Coding system for encoding the outgoing mail. +This has higher priority than `default-buffer-file-coding-system' +and `default-sendmail-coding-system', +but lower priority than the local value of `buffer-file-coding-system'. +See also the function `select-message-coding-system'.") + +;;;###autoload +(defvar default-sendmail-coding-system 'iso-latin-1 + "Default coding system for encoding the outgoing mail. +This variable is used only when `sendmail-coding-system' is nil. + +This variable is set/changed by the command `set-language-environment'. +User should not set this variable manually, +instead use `sendmail-coding-system' to get a constant encoding +of outgoing mails regardless of the current language environment. +See also the function `select-message-coding-system'.") + +(defun mail-insert-from-field () + (let* ((login user-mail-address) + (fullname (user-full-name)) + (quote-fullname nil)) + (if (string-match "[^\0-\177]" fullname) + (setq fullname (rfc2047-encode-string fullname) + quote-fullname t)) + (cond ((eq mail-from-style 'angles) + (insert "From: " fullname) + (let ((fullname-start (+ (point-min) 6)) + (fullname-end (point-marker))) + (goto-char fullname-start) + ;; Look for a character that cannot appear unquoted + ;; according to RFC 822. + (if (or (re-search-forward "[^- !#-'*+/-9=?A-Z^-~]" + fullname-end 1) + quote-fullname) + (progn + ;; Quote fullname, escaping specials. + (goto-char fullname-start) + (insert "\"") + (while (re-search-forward "[\"\\]" + fullname-end 1) + (replace-match "\\\\\\&" t)) + (insert "\"")))) + (insert " <" login ">\n")) + ((eq mail-from-style 'parens) + (insert "From: " login " (") + (let ((fullname-start (point))) + (if quote-fullname + (insert "\"")) + (insert fullname) + (if quote-fullname + (insert "\"")) + (let ((fullname-end (point-marker))) + (goto-char fullname-start) + ;; RFC 822 says \ and nonmatching parentheses + ;; must be escaped in comments. + ;; Escape every instance of ()\ ... + (while (re-search-forward "[()\\]" fullname-end 1) + (replace-match "\\\\\\&" t)) + ;; ... then undo escaping of matching parentheses, + ;; including matching nested parentheses. + (goto-char fullname-start) + (while (re-search-forward + "\\(\\=\\|[^\\]\\(\\\\\\\\\\)*\\)\\\\(\\(\\([^\\]\\|\\\\\\\\\\)*\\)\\\\)" + fullname-end 1) + (replace-match "\\1(\\3)" t) + (goto-char fullname-start)))) + (insert ")\n")) + ((null mail-from-style) + (insert "From: " login "\n")) + ((eq mail-from-style 'system-default) + nil) + (t (error "Invalid value for `mail-from-style'"))))) + +(defun sendmail-send-it () + "Send the current mail buffer using the Sendmail package. +This is a suitable value for `send-mail-function'. It sends using the +external program defined by `sendmail-program'." + (require 'mail-utils) + (let ((errbuf (if mail-interactive + (generate-new-buffer " sendmail errors") + 0)) + (tembuf (generate-new-buffer " sendmail temp")) + (multibyte enable-multibyte-characters) + (case-fold-search nil) + (selected-coding (select-message-coding-system)) + resend-to-addresses + delimline + fcc-was-found + (mailbuf (current-buffer)) + (program (if (boundp 'sendmail-program) + sendmail-program + "/usr/lib/sendmail")) + ;; Examine these variables now, so that + ;; local binding in the mail buffer will take effect. + (envelope-from + (and mail-specify-envelope-from + (or (mail-envelope-from) user-mail-address)))) + (unwind-protect + (with-current-buffer tembuf + (erase-buffer) + (unless multibyte + (set-buffer-multibyte nil)) + (insert-buffer-substring mailbuf) + (goto-char (point-max)) + ;; require one newline at the end. + (or (= (preceding-char) ?\n) + (insert ?\n)) + ;; Change header-delimiter to be what sendmail expects. + (goto-char (mail-header-end)) + (delete-region (point) (progn (end-of-line) (point))) + (setq delimline (point-marker)) + (sendmail-sync-aliases) + (if mail-aliases + (expand-mail-aliases (point-min) delimline)) + (goto-char (point-min)) + ;; Ignore any blank lines in the header + (while (and (re-search-forward "\n\n\n*" delimline t) + (< (point) delimline)) + (replace-match "\n")) + (goto-char (point-min)) + ;; Look for Resent- headers. They require sending + ;; the message specially. + (let ((case-fold-search t)) + (goto-char (point-min)) + (while (re-search-forward "^Resent-\\(to\\|cc\\|bcc\\):" delimline t) + ;; Put a list of such addresses in resend-to-addresses. + (setq resend-to-addresses + (save-restriction + (narrow-to-region (point) + (save-excursion + (forward-line 1) + (while (looking-at "^[ \t]") + (forward-line 1)) + (point))) + (append (mail-parse-comma-list) + resend-to-addresses))) + ;; Delete Resent-BCC ourselves + (if (save-excursion (beginning-of-line) + (looking-at "resent-bcc")) + (delete-region (save-excursion (beginning-of-line) (point)) + (save-excursion (end-of-line) (1+ (point)))))) +;;; Apparently this causes a duplicate Sender. +;;; ;; If the From is different than current user, insert Sender. +;;; (goto-char (point-min)) +;;; (and (re-search-forward "^From:" delimline t) +;;; (progn +;;; (require 'mail-utils) +;;; (not (string-equal +;;; (mail-strip-quoted-names +;;; (save-restriction +;;; (narrow-to-region (point-min) delimline) +;;; (mail-fetch-field "From"))) +;;; (user-login-name)))) +;;; (progn +;;; (forward-line 1) +;;; (insert "Sender: " (user-login-name) "\n"))) + ;; Don't send out a blank subject line + (goto-char (point-min)) + (if (re-search-forward "^Subject:\\([ \t]*\n\\)+\\b" delimline t) + (replace-match "") + ;; This one matches a Subject just before the header delimiter. + (if (and (re-search-forward "^Subject:\\([ \t]*\n\\)+" delimline t) + (= (match-end 0) delimline)) + (replace-match ""))) + ;; Put the "From:" field in unless for some odd reason + ;; they put one in themselves. + (goto-char (point-min)) + (if (not (re-search-forward "^From:" delimline t)) + (mail-insert-from-field)) + ;; Possibly add a MIME header for the current coding system + (let (charset) + (goto-char (point-min)) + (and (eq mail-send-nonascii 'mime) + (not (re-search-forward "^MIME-version:" delimline t)) + (progn (skip-chars-forward "\0-\177") + (/= (point) (point-max))) + selected-coding + (setq charset + (coding-system-get selected-coding 'mime-charset)) + (goto-char delimline) + (insert "MIME-version: 1.0\n" + "Content-type: text/plain; charset=" + (symbol-name charset) + "\nContent-Transfer-Encoding: 8bit\n"))) + ;; Insert an extra newline if we need it to work around + ;; Sun's bug that swallows newlines. + (goto-char (1+ delimline)) + (if (eval mail-mailer-swallows-blank-line) + (newline)) + ;; Find and handle any FCC fields. + (goto-char (point-min)) + (if (re-search-forward "^FCC:" delimline t) + (progn + (setq fcc-was-found t) + (mail-do-fcc delimline))) + (if mail-interactive + (with-current-buffer errbuf + (erase-buffer)))) + (goto-char (point-min)) + (if (let ((case-fold-search t)) + (or resend-to-addresses + (re-search-forward "^To:\\|^cc:\\|^bcc:" + delimline t))) + (let* ((default-directory "/") + (coding-system-for-write selected-coding) + (args + (append (list (point-min) (point-max) + program + nil errbuf nil "-oi") + (and envelope-from + (list "-f" envelope-from)) +;;; ;; Don't say "from root" if running under su. +;;; (and (equal (user-real-login-name) "root") +;;; (list "-f" (user-login-name))) + (and mail-alias-file + (list (concat "-oA" mail-alias-file))) + (if mail-interactive + ;; These mean "report errors to terminal" + ;; and "deliver interactively" + '("-oep" "-odi") + ;; These mean "report errors by mail" + ;; and "deliver in background". + '("-oem" "-odb")) + ;; Get the addresses from the message + ;; unless this is a resend. + ;; We must not do that for a resend + ;; because we would find the original addresses. + ;; For a resend, include the specific addresses. + (or resend-to-addresses + '("-t") + ) + (if mail-use-dsn + (list "-N" (mapconcat 'symbol-name + mail-use-dsn ","))) + ) + ) + (exit-value (apply 'call-process-region args))) + (or (null exit-value) (eq 0 exit-value) + (error "Sending...failed with exit value %d" exit-value))) + (or fcc-was-found + (error "No recipients"))) + (if mail-interactive + (with-current-buffer errbuf + (goto-char (point-min)) + (while (re-search-forward "\n\n* *" nil t) + (replace-match "; ")) + (if (not (zerop (buffer-size))) + (error "Sending...failed to %s" + (buffer-substring (point-min) (point-max))))))) + (kill-buffer tembuf) + (if (bufferp errbuf) + (kill-buffer errbuf))))) + +(defun mail-do-fcc (header-end) + (unless (markerp header-end) + (error "Value of `header-end' must be a marker")) + (let (fcc-list + (rmailbuf (current-buffer)) + (time (current-time)) + (tembuf (generate-new-buffer " rmail output")) + (case-fold-search t)) + (save-excursion + (goto-char (point-min)) + (while (re-search-forward "^FCC:[ \t]*" header-end t) + (push (buffer-substring (point) + (progn + (end-of-line) + (skip-chars-backward " \t") + (point))) + fcc-list) + (delete-region (match-beginning 0) + (progn (forward-line 1) (point)))) + (set-buffer tembuf) + (erase-buffer) + ;; This initial newline is written out if the fcc file already exists. + (insert "\nFrom " (user-login-name) " " + (current-time-string time) "\n") + ;; Insert the time zone before the year. + (forward-char -1) + (forward-word -1) + (require 'mail-utils) + (insert (mail-rfc822-time-zone time) " ") + (goto-char (point-max)) + (insert-buffer-substring rmailbuf) + ;; Make sure messages are separated. + (goto-char (point-max)) + (insert ?\n) + (goto-char 2) + ;; ``Quote'' "^From " as ">From " + ;; (note that this isn't really quoting, as there is no requirement + ;; that "^[>]+From " be quoted in the same transparent way.) + (let ((case-fold-search nil)) + (while (search-forward "\nFrom " nil t) + (forward-char -5) + (insert ?>))) + (dolist (fcc fcc-list) + (let* ((buffer (find-buffer-visiting fcc)) + (curbuf (current-buffer)) + dont-write-the-file + buffer-matches-file + (beg (point-min)) (end (point-max)) + (beg2 (save-excursion (goto-char (point-min)) + (forward-line 2) (point)))) + (if buffer + ;; File is present in a buffer => append to that buffer. + (with-current-buffer buffer + (setq buffer-matches-file + (and (not (buffer-modified-p)) + (verify-visited-file-modtime buffer))) + ;; Keep the end of the accessible portion at the same place + ;; unless it is the end of the buffer. + (let ((max (if (/= (1+ (buffer-size)) (point-max)) + (point-max)))) + (unwind-protect + ;; Code below lifted from rmailout.el + ;; function rmail-output-to-rmail-file: + (let ((buffer-read-only nil) + (msg (and (boundp 'rmail-current-message) + rmail-current-message))) + ;; If MSG is non-nil, buffer is in RMAIL mode. + (if msg + (progn + ;; Append to an ordinary buffer as a + ;; Unix mail message. + (rmail-maybe-set-message-counters) + (widen) + (narrow-to-region (point-max) (point-max)) + (insert "\C-l\n0, unseen,,\n*** EOOH ***\n" + "Date: " (mail-rfc822-date) "\n") + (insert-buffer-substring curbuf beg2 end) + (insert "\n\C-_") + (goto-char (point-min)) + (widen) + (search-backward "\n\^_") + (narrow-to-region (point) (point-max)) + (rmail-count-new-messages t) + (rmail-show-message msg) + (setq max nil)) + ;; Output file not in rmail mode + ;; => just insert at the end. + (narrow-to-region (point-min) (1+ (buffer-size))) + (goto-char (point-max)) + (insert-buffer-substring curbuf beg end)) + (or buffer-matches-file + (progn + (if (y-or-n-p (format "Save file %s? " + fcc)) + (save-buffer)) + (setq dont-write-the-file t)))) + (if max (narrow-to-region (point-min) max)))))) + ;; Append to the file directly, + ;; unless we've already taken care of it. + (unless dont-write-the-file + (if (and (file-exists-p fcc) + ;; Check that the file isn't empty. We don't + ;; want to insert a newline at the start of an + ;; empty file. + (not (zerop (nth 7 (file-attributes fcc)))) + (mail-file-babyl-p fcc)) + ;; If the file is a Babyl file, + ;; convert the message to Babyl format. + (let ((coding-system-for-write + (or rmail-file-coding-system + 'emacs-mule))) + (with-current-buffer (get-buffer-create " mail-temp") + (setq buffer-read-only nil) + (erase-buffer) + (insert "\C-l\n0, unseen,,\n*** EOOH ***\nDate: " + (mail-rfc822-date) "\n") + (insert-buffer-substring curbuf beg2 end) + (insert "\n\C-_") + (write-region (point-min) (point-max) fcc t) + (erase-buffer))) + (write-region + (1+ (point-min)) (point-max) fcc t))) + (and buffer (not dont-write-the-file) + (with-current-buffer buffer + (set-visited-file-modtime)))))) + (kill-buffer tembuf))) + +(defun mail-sent-via () + "Make a Sent-via header line from each To or CC header line." + (interactive) + (save-excursion + ;; put a marker at the end of the header + (let ((end (copy-marker (mail-header-end))) + (case-fold-search t)) + (goto-char (point-min)) + ;; search for the To: lines and make Sent-via: lines from them + ;; search for the next To: line + (while (re-search-forward "^\\(to\\|cc\\):" end t) + ;; Grab this line plus all its continuations, sans the `to:'. + (let ((to-line + (buffer-substring (point) + (progn + (if (re-search-forward "^[^ \t\n]" end t) + (backward-char 1) + (goto-char end)) + (point))))) + ;; Insert a copy, with altered header field name. + (insert-before-markers "Sent-via:" to-line)))))) + +(defun mail-to () + "Move point to end of To-field." + (interactive) + (expand-abbrev) + (mail-position-on-field "To")) + +(defun mail-subject () + "Move point to end of Subject-field." + (interactive) + (expand-abbrev) + (mail-position-on-field "Subject")) + +(defun mail-cc () + "Move point to end of CC-field. Create a CC field if none." + (interactive) + (expand-abbrev) + (or (mail-position-on-field "cc" t) + (progn (mail-position-on-field "to") + (insert "\nCC: ")))) + +(defun mail-bcc () + "Move point to end of BCC-field. Create a BCC field if none." + (interactive) + (expand-abbrev) + (or (mail-position-on-field "bcc" t) + (progn (mail-position-on-field "to") + (insert "\nBCC: ")))) + +(defun mail-fcc (folder) + "Add a new FCC field, with file name completion." + (interactive "FFolder carbon copy: ") + (expand-abbrev) + (or (mail-position-on-field "fcc" t) ;Put new field after exiting FCC. + (mail-position-on-field "to")) + (insert "\nFCC: " folder)) + +(defun mail-reply-to () + "Move point to end of Reply-To-field. Create a Reply-To field if none." + (interactive) + (expand-abbrev) + (mail-position-on-field "Reply-To")) + +(defun mail-mail-reply-to () + "Move point to end of Mail-Reply-To field. +Create a Mail-Reply-To field if none." + (interactive) + (expand-abbrev) + (or (mail-position-on-field "mail-reply-to" t) + (progn (mail-position-on-field "to") + (insert "\nMail-Reply-To: ")))) + +(defun mail-mail-followup-to () + "Move point to end of Mail-Followup-To field. +Create a Mail-Followup-To field if none." + (interactive) + (expand-abbrev) + (or (mail-position-on-field "mail-followup-to" t) + (progn (mail-position-on-field "to") + (insert "\nMail-Followup-To: ")))) + +(defun mail-position-on-field (field &optional soft) + (let (end + (case-fold-search t)) + (setq end (mail-header-end)) + (goto-char (point-min)) + (if (re-search-forward (concat "^" (regexp-quote field) ":") end t) + (progn + (re-search-forward "^[^ \t]" nil 'move) + (beginning-of-line) + (skip-chars-backward "\n") + t) + (or soft + (progn (goto-char end) + (insert field ": \n") + (skip-chars-backward "\n"))) + nil))) + +(defun mail-text () + "Move point to beginning of message text." + (interactive) + (expand-abbrev) + (goto-char (mail-text-start))) + +(defun mail-signature (&optional atpoint) + "Sign letter with signature based on `mail-signature-file'. +Prefix arg means put contents at point." + (interactive "P") + (save-excursion + (or atpoint + (goto-char (point-max))) + (skip-chars-backward " \t\n") + (end-of-line) + (or atpoint + (delete-region (point) (point-max))) + (if (stringp mail-signature) + (insert mail-signature) + (insert "\n\n-- \n") + (insert-file-contents (expand-file-name mail-signature-file))))) + +(defun mail-fill-yanked-message (&optional justifyp) + "Fill the paragraphs of a message yanked into this one. +Numeric argument means justify as well." + (interactive "P") + (save-excursion + (goto-char (mail-text-start)) + (fill-individual-paragraphs (point) + (point-max) + justifyp + mail-citation-prefix-regexp))) + +(defun mail-indent-citation () + "Modify text just inserted from a message to be cited. +The inserted text should be the region. +When this function returns, the region is again around the modified text. + +Normally, indent each nonblank line `mail-indentation-spaces' spaces. +However, if `mail-yank-prefix' is non-nil, insert that prefix on each line." + (mail-yank-clear-headers (region-beginning) (region-end)) + (if (null mail-yank-prefix) + (indent-rigidly (region-beginning) (region-end) + mail-indentation-spaces) + (save-excursion + (let ((end (set-marker (make-marker) (region-end)))) + (goto-char (region-beginning)) + (while (< (point) end) + (insert mail-yank-prefix) + (forward-line 1)))))) + +(defun mail-yank-original (arg) + "Insert the message being replied to, if any (in rmail). +Puts point after the text and mark before. +Normally, indents each nonblank line ARG spaces (default 3). +However, if `mail-yank-prefix' is non-nil, insert that prefix on each line. + +Just \\[universal-argument] as argument means don't indent, insert no prefix, +and don't delete any header fields." + (interactive "P") + (if mail-reply-action + (let ((start (point)) + (original mail-reply-action)) + (and (consp original) (eq (car original) 'insert-buffer) + (setq original (nth 1 original))) + (if (consp original) + (apply (car original) (cdr original)) + ;; If the original message is in another window in the same frame, + ;; delete that window to save screen space. + ;; t means don't alter other frames. + (delete-windows-on original t) + (with-no-warnings + ;; We really want this to set mark. + (insert-buffer original)) + (set-text-properties (point) (mark t) nil)) + (if (consp arg) + nil + (goto-char start) + (let ((mail-indentation-spaces (if arg (prefix-numeric-value arg) + mail-indentation-spaces)) + ;; Avoid error in Transient Mark mode + ;; on account of mark's being inactive. + (mark-even-if-inactive t)) + (cond (mail-citation-hook + ;; Bind mail-citation-header to the inserted + ;; message's header. + (let ((mail-citation-header + (buffer-substring-no-properties + start + (save-excursion + (save-restriction + (narrow-to-region start (point-max)) + (goto-char start) + (rfc822-goto-eoh) + (point)))))) + (run-hooks 'mail-citation-hook))) + (mail-yank-hooks + (run-hooks 'mail-yank-hooks)) + (t + (mail-indent-citation))))) + ;; This is like exchange-point-and-mark, but doesn't activate the mark. + ;; It is cleaner to avoid activation, even though the command + ;; loop would deactivate the mark because we inserted text. + (goto-char (prog1 (mark t) + (set-marker (mark-marker) (point) (current-buffer)))) + (if (not (eolp)) (insert ?\n))))) + +(defun mail-yank-clear-headers (start end) + (if (< end start) + (let (temp) + (setq temp start start end end temp))) + (if mail-yank-ignored-headers + (save-excursion + (goto-char start) + (if (search-forward "\n\n" end t) + (save-restriction + (narrow-to-region start (point)) + (goto-char start) + (while (let ((case-fold-search t)) + (re-search-forward mail-yank-ignored-headers nil t)) + (beginning-of-line) + (delete-region (point) + (progn (re-search-forward "\n[^ \t]") + (forward-char -1) + (point))))))))) + +(defun mail-yank-region (arg) + "Insert the selected region from the message being replied to. +Puts point after the text and mark before. +Normally, indents each nonblank line ARG spaces (default 3). +However, if `mail-yank-prefix' is non-nil, insert that prefix on each line. + +Just \\[universal-argument] as argument means don't indent, insert no prefix, +and don't delete any header fields." + (interactive "P") + (and (consp mail-reply-action) + (eq (car mail-reply-action) 'insert-buffer) + (with-current-buffer (nth 1 mail-reply-action) + (or (mark t) + (error "No mark set: %S" (current-buffer)))) + (let ((buffer (nth 1 mail-reply-action)) + (start (point)) + ;; Avoid error in Transient Mark mode + ;; on account of mark's being inactive. + (mark-even-if-inactive t)) + ;; Insert the citation text. + (insert (with-current-buffer buffer + (buffer-substring-no-properties (point) (mark)))) + (push-mark start) + ;; Indent or otherwise annotate the citation text. + (if (consp arg) + nil + (let ((mail-indentation-spaces (if arg (prefix-numeric-value arg) + mail-indentation-spaces))) + (if mail-citation-hook + ;; Bind mail-citation-hook to the original message's header. + (let ((mail-citation-header + (with-current-buffer buffer + (buffer-substring-no-properties + (point-min) + (save-excursion + (goto-char (point-min)) + (rfc822-goto-eoh) + (point)))))) + (run-hooks 'mail-citation-hook)) + (if mail-yank-hooks + (run-hooks 'mail-yank-hooks) + (mail-indent-citation)))))))) + +(defun mail-split-line () + "Split current line, moving portion beyond point vertically down. +If the current line has `mail-yank-prefix', insert it on the new line." + (interactive "*") + (split-line mail-yank-prefix)) + + +(defun mail-attach-file (&optional file) + "Insert a file at the end of the buffer, with separator lines around it." + (interactive "fAttach file: ") + (save-excursion + (goto-char (point-max)) + (or (bolp) (newline)) + (newline) + (let ((start (point)) + middle) + (insert (format "===File %s===" file)) + (insert-char ?= (max 0 (- 60 (current-column)))) + (newline) + (setq middle (point)) + (insert "============================================================\n") + (push-mark) + (goto-char middle) + (insert-file-contents file) + (or (bolp) (newline)) + (goto-char start)))) + +;; Put these commands last, to reduce chance of lossage from quitting +;; in middle of loading the file. + +;;;###autoload (add-hook 'same-window-buffer-names "*mail*") + +;;;###autoload +(defun mail (&optional noerase to subject in-reply-to cc replybuffer actions) + "Edit a message to be sent. Prefix arg means resume editing (don't erase). +When this function returns, the buffer `*mail*' is selected. +The value is t if the message was newly initialized; otherwise, nil. + +Optionally, the signature file `mail-signature-file' can be inserted at the +end; see the variable `mail-signature'. + +\\ +While editing message, type \\[mail-send-and-exit] to send the message and exit. + +Various special commands starting with C-c are available in sendmail mode +to move to message header fields: +\\{mail-mode-map} + +If `mail-self-blind' is non-nil, a BCC to yourself is inserted +when the message is initialized. + +If `mail-default-reply-to' is non-nil, it should be an address (a string); +a Reply-to: field with that address is inserted. + +If `mail-archive-file-name' is non-nil, an FCC field with that file name +is inserted. + +The normal hook `mail-setup-hook' is run after the message is +initialized. It can add more default fields to the message. + +The first argument, NOERASE, determines what to do when there is +an existing modified `*mail*' buffer. If NOERASE is nil, the +existing mail buffer is used, and the user is prompted whether to +keep the old contents or to erase them. If NOERASE has the value +`new', a new mail buffer will be created instead of using the old +one. Any other non-nil value means to always select the old +buffer without erasing the contents. + +The second through fifth arguments, + TO, SUBJECT, IN-REPLY-TO and CC, specify if non-nil + the initial contents of those header fields. + These arguments should not have final newlines. +The sixth argument REPLYBUFFER is a buffer which contains an + original message being replied to, or else an action + of the form (FUNCTION . ARGS) which says how to insert the original. + Or it can be nil, if not replying to anything. +The seventh argument ACTIONS is a list of actions to take + if/when the message is sent. Each action looks like (FUNCTION . ARGS); + when the message is sent, we apply FUNCTION to ARGS. + This is how Rmail arranges to mark messages `answered'." + (interactive "P") +;;; This is commented out because I found it was confusing in practice. +;;; It is easy enough to rename *mail* by hand with rename-buffer +;;; if you want to have multiple mail buffers. +;;; And then you can control which messages to save. --rms. +;;; (let ((index 1) +;;; buffer) +;;; ;; If requested, look for a mail buffer that is modified and go to it. +;;; (if noerase +;;; (progn +;;; (while (and (setq buffer +;;; (get-buffer (if (= 1 index) "*mail*" +;;; (format "*mail*<%d>" index)))) +;;; (not (buffer-modified-p buffer))) +;;; (setq index (1+ index))) +;;; (if buffer (switch-to-buffer buffer) +;;; ;; If none exists, start a new message. +;;; ;; This will never re-use an existing unmodified mail buffer +;;; ;; (since index is not 1 anymore). Perhaps it should. +;;; (setq noerase nil)))) +;;; ;; Unless we found a modified message and are happy, start a new message. +;;; (if (not noerase) +;;; (progn +;;; ;; Look for existing unmodified mail buffer. +;;; (while (and (setq buffer +;;; (get-buffer (if (= 1 index) "*mail*" +;;; (format "*mail*<%d>" index)))) +;;; (buffer-modified-p buffer)) +;;; (setq index (1+ index))) +;;; ;; If none, make a new one. +;;; (or buffer +;;; (setq buffer (generate-new-buffer "*mail*"))) +;;; ;; Go there and initialize it. +;;; (switch-to-buffer buffer) +;;; (erase-buffer) +;;; (setq default-directory (expand-file-name "~/")) +;;; (auto-save-mode auto-save-default) +;;; (mail-mode) +;;; (mail-setup to subject in-reply-to cc replybuffer actions) +;;; (if (and buffer-auto-save-file-name +;;; (file-exists-p buffer-auto-save-file-name)) +;;; (message "Auto save file for draft message exists; consider M-x mail-recover")) +;;; t)) + + (if (eq noerase 'new) + (pop-to-buffer (generate-new-buffer "*mail*")) + (and noerase + (not (get-buffer "*mail*")) + (setq noerase nil)) + (pop-to-buffer "*mail*")) + + ;; Avoid danger that the auto-save file can't be written. + (let ((dir (expand-file-name + (file-name-as-directory mail-default-directory)))) + (if (file-exists-p dir) + (setq default-directory dir))) + ;; Only call auto-save-mode if necessary, to avoid changing auto-save file. + (if (or (and auto-save-default (not buffer-auto-save-file-name)) + (and (not auto-save-default) buffer-auto-save-file-name)) + (auto-save-mode auto-save-default)) + (mail-mode) + ;; Disconnect the buffer from its visited file + ;; (in case the user has actually visited a file *mail*). +;;; (set-visited-file-name nil) + (let (initialized) + (and (not (and noerase + (not (eq noerase 'new)))) + (if buffer-file-name + (if (buffer-modified-p) + (when (y-or-n-p "Buffer has unsaved changes; reinitialize it and discard them? ") + (if (y-or-n-p "Disconnect buffer from visited file? ") + (set-visited-file-name nil)) + t) + (when (y-or-n-p "Reinitialize buffer, and disconnect it from the visited file? ") + (set-visited-file-name nil) + t)) + ;; A non-file-visiting buffer. + (if (buffer-modified-p) + (y-or-n-p "Unsent message being composed; erase it? ") + t)) + (let ((inhibit-read-only t)) + (erase-buffer) + (mail-setup to subject in-reply-to cc replybuffer actions) + (setq initialized t))) + (if (and buffer-auto-save-file-name + (file-exists-p buffer-auto-save-file-name)) + (message "Auto save file for draft message exists; consider M-x mail-recover")) + initialized)) + +(defun mail-recover-1 () + "Pop up a list of auto-saved draft messages so you can recover one of them." + (interactive) + (let ((file-name (make-auto-save-file-name)) + (ls-lisp-support-shell-wildcards t) + non-random-len wildcard) + ;; Remove the random part from the auto-save-file-name, and + ;; create a wildcard which matches possible candidates. + ;; Note: this knows that make-auto-save-file-name appends + ;; "##" to the buffer name, where RANDOM-STUFF + ;; is the result of (make-temp-name ""). + (setq non-random-len + (- (length file-name) (length (make-temp-name "")) 1)) + (setq wildcard (concat (substring file-name 0 non-random-len) "*")) + (if (null (file-expand-wildcards wildcard)) + (message "There are no auto-saved drafts to recover") + ;; Bind dired-trivial-filenames to t because all auto-save file + ;; names are normally ``trivial'', so Dired will set point after + ;; all the files, at buffer bottom. We want it on the first + ;; file instead. + (let ((dired-trivial-filenames t)) + (dired-other-window wildcard (concat dired-listing-switches "t"))) + (rename-buffer "*Auto-saved Drafts*" t) + (save-excursion + (goto-char (point-min)) + (or (looking-at " Move to the draft file you want to recover,") + (let ((inhibit-read-only t)) + ;; Each line starts with a space so that Font Lock mode + ;; won't highlight the first character. + (insert "\ + Move to the draft file you want to recover, then type C-c C-c + to recover text of message whose composition was interrupted. + To browse text of a draft, type v on the draft file's line. + + You can also delete some of these files; + type d on a line to mark that file for deletion. + + List of possible auto-save files for recovery: + +")))) + (use-local-map + (let ((map (make-sparse-keymap))) + (set-keymap-parent map (current-local-map)) + map)) + (define-key (current-local-map) "v" + (lambda () + (interactive) + (let ((coding-system-for-read 'emacs-mule-unix)) + (dired-view-file)))) + (define-key (current-local-map) "\C-c\C-c" + (lambda () + (interactive) + (let ((fname (dired-get-filename)) + ;; Auto-saved files are written in the internal + ;; representation, so they should be read accordingly. + (coding-system-for-read 'emacs-mule-unix)) + (switch-to-buffer-other-window "*mail*") + (let ((buffer-read-only nil)) + (erase-buffer) + (insert-file-contents fname nil) + ;; insert-file-contents will set buffer-file-coding-system + ;; to emacs-mule, which is probably not what they want to + ;; use for sending the message. But we don't know what + ;; was its value before the buffer was killed or Emacs + ;; crashed. We therefore reset buffer-file-coding-system + ;; to the default value, so that either the default does + ;; TRT, or the user will get prompted for the right + ;; encoding when they send the message. + (setq buffer-file-coding-system + default-buffer-file-coding-system)))))))) + +(defun mail-recover () + "Recover interrupted mail composition from auto-save files. + +If the mail buffer has a current valid auto-save file, +the command recovers that file. Otherwise, it displays a +buffer showing the existing auto-saved draft messages; +you can move to one of them and type C-c C-c to recover that one." + (interactive) + ;; In case they invoke us from some random buffer... + (switch-to-buffer "*mail*") + ;; If *mail* didn't exist, set its directory, so that auto-saved + ;; drafts will be found. + (let ((dir (expand-file-name + (file-name-as-directory mail-default-directory)))) + (if (file-exists-p dir) + (setq default-directory dir))) + (or (eq major-mode 'mail-mode) + (mail-mode)) + (let ((file-name buffer-auto-save-file-name)) + (cond ((and file-name (file-exists-p file-name)) + (let ((dispbuf + ;; This used to invoke `ls' via call-process, but + ;; dired-noselect is more portable to systems where + ;; `ls' is not a standard program (it will use + ;; ls-lisp instead). + (dired-noselect file-name + (concat dired-listing-switches "t")))) + (save-selected-window + (select-window (display-buffer dispbuf t)) + (goto-char (point-min)) + (forward-line 2) + (dired-move-to-filename) + (setq dispbuf (rename-buffer "*Directory*" t))) + (if (not (yes-or-no-p + (format "Recover mail draft from auto save file %s? " + file-name))) + (error "mail-recover cancelled") + (let ((buffer-read-only nil) + (buffer-coding buffer-file-coding-system) + ;; Auto-save files are written in internal + ;; representation of non-ASCII characters. + (coding-system-for-read 'emacs-mule-unix)) + (erase-buffer) + (insert-file-contents file-name nil) + (setq buffer-file-coding-system buffer-coding))))) + (t (mail-recover-1))))) + +;;;###autoload +(defun mail-other-window (&optional noerase to subject in-reply-to cc replybuffer sendactions) + "Like `mail' command, but display mail buffer in another window." + (interactive "P") + (let ((pop-up-windows t) + (special-display-buffer-names nil) + (special-display-regexps nil) + (same-window-buffer-names nil) + (same-window-regexps nil)) + (pop-to-buffer "*mail*")) + (mail noerase to subject in-reply-to cc replybuffer sendactions)) + +;;;###autoload +(defun mail-other-frame (&optional noerase to subject in-reply-to cc replybuffer sendactions) + "Like `mail' command, but display mail buffer in another frame." + (interactive "P") + (let ((pop-up-frames t) + (special-display-buffer-names nil) + (special-display-regexps nil) + (same-window-buffer-names nil) + (same-window-regexps nil)) + (pop-to-buffer "*mail*")) + (mail noerase to subject in-reply-to cc replybuffer sendactions)) + +;; Do not add anything but external entries on this page. + +(provide 'sendmail) + +;; arch-tag: 48bc1025-d993-4d31-8d81-2a29491f0626 +;;; sendmail.el ends here diff --git a/contrib/smime-card.el b/contrib/smime-card.el new file mode 100644 index 0000000..e76bca4 --- /dev/null +++ b/contrib/smime-card.el @@ -0,0 +1,196 @@ +;;; smime-card.el --- Make smime.el work with card readers + +;; Copyright (C) 2005 Brailcom, o.p.s. +;; Author: Milan Zamazal + +;; COPYRIGHT NOTICE +;; +;; This program 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. +;; +;; This program 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 this program; if not, write to the Free Software +;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +;;; Commentary: + +;; This is a simple wrapper around smime.el allowing to use private keys stored +;; on a smard card. +;; +;; To use it, just put (require 'smime-card) to you Emacs startup file and +;; customize the variable `smime-card-file-keys'. + +;;; Code: + +(require 'smime) + +;;; Configuration + +(defcustom smime-card-file-keys '() + "Alist of certificate files and their corresponding private key card ids. +Each element of the list is of the form (FILE . KEY-ID), where FILE is a +certificate file stored on a regular file system and KEY-ID is the identifier +of the corresponding private key stored on the card. +If FILE begins with the prefix `card:', the certificate is retrieved from the +card under the id following the `card:' prefix in FILE." + :type '(alist :key-type (file :tag "Certificate file") + :value-type (string :tag "Key identifier")) + :group 'smime) + +(defcustom smime-card-fetch-certificates nil + "If non-nil, fetch certificates from the card before verifying messages." + :type 'boolean + :group 'smime) + +;;; Internals + +(defvar smime-card-key nil) + +(defun smime-card-key (keyfile) + (cdr (assoc keyfile smime-card-file-keys))) + +(defvar smime-card-engine-command + "engine dynamic -pre SO_PATH:/usr/lib/opensc/engine_pkcs11.so -pre ID:pkcs11 -pre LIST_ADD:1 -pre LOAD\n") + +(defvar smime-card-process-output "") + +(defun smime-card-process-filter (process string) + (setq smime-card-process-output (concat smime-card-process-output string))) + +(defun smime-card-wait-for-prompt (process) + (while (not (string-match "\\(OpenSSL> \\|PIN: \\)$" + smime-card-process-output)) + (unless (accept-process-output process 5) + (message "OpenSSL: Timeout") + (throw 'error nil))) + (prog1 (if (string= (match-string 1 smime-card-process-output) "PIN: ") + 'pin + t) + (setq smime-card-process-output ""))) + +(defun smime-card-call-openssl-region (b e buf &rest args) + (let* ((infile (make-temp-file "smime-card-in")) + (outfile (make-temp-file "smime-card-out")) + (cert-on-card (and (string-match "^card:\\(.*\\)$" keyfile) + (match-string 1 keyfile))) + (certfile (and cert-on-card (make-temp-file "smime-card-cert"))) + (args (append args + (list "-engine" "pkcs11" + "-keyform" "engine" + "-inkey" smime-card-key + "-in" infile "-out" outfile))) + (process (start-process "openssl" " *openssl*" smime-openssl-program))) + (unwind-protect + (catch 'error + (when certfile + (unless (= (call-process "pkcs15-tool" nil nil nil + "-r" cert-on-card "-o" certfile) + 0) + (message "pkcs15: Error") + (throw 'error nil)) + (let ((args* args)) + (while (and args* (not (string= (car args*) "-signer"))) + (setq args* (cdr args*))) + (setq args* (cdr args*)) + (when args* + (setcar args* certfile)))) + (setq smime-card-process-output "") + (set-process-filter process 'smime-card-process-filter) + (unless (eq (smime-card-wait-for-prompt process) t) + (message "OpenSSL: Error on startup") + (throw 'error nil)) + (process-send-string process smime-card-engine-command) + (unless (eq (smime-card-wait-for-prompt process) t) + (message "OpenSSL: Error in pkcs11 loading") + (throw 'error nil)) + (write-region b e infile nil 0) + (process-send-string process + (concat (mapconcat 'identity args " ") "\n")) + (let ((answer (smime-card-wait-for-prompt process))) + (cond + ((eq answer 'pin) + (process-send-string process (concat (read-passwd "Smartcard PIN: ") "\n")) + (unless (eq (smime-card-wait-for-prompt process) t) + (message "OpenSSL: Error after passphrase") + (throw 'error nil))) + ((eq answer t) + nil) + (t + (message "OpenSSL: Error in processing") + (throw 'error nil)))) + (process-send-eof process) + (with-current-buffer (car buf) + (when (= (cadr (insert-file-contents outfile)) 0) + (message "OpenSSL: Empty output") + (throw 'error nil))) + t) + (delete-file infile) + (delete-file outfile) + (when certfile (delete-file certfile)) + (delete-process process) + (kill-buffer " *openssl*")))) + +;;; smime.el advices + +(defadvice smime-sign-region (around smime-card-sign-region activate) + (let ((smime-card-key (smime-card-key (ad-get-arg 2)))) + ad-do-it)) + +(defadvice smime-decrypt-region (around smime-card-decrypt-region activate) + (let ((smime-card-key (smime-card-key (ad-get-arg 2)))) + ad-do-it)) + +(defadvice smime-call-openssl-region (around smime-card-openssl activate) + (if smime-card-key + (setq ad-return-value + (apply 'smime-card-call-openssl-region (ad-get-args 0))) + ad-do-it)) + +(defadvice smime-verify-region (around smime-card-verify-region activate) + (if smime-card-fetch-certificates + (let ((cert-ids '())) + (with-temp-buffer + (unless (= (call-process + "pkcs15-tool" nil t nil "--list-certificates") + 0) + (error "pkcs15: Certificate listing")) + (goto-char (point-min)) + (while (re-search-forward "^[\t ]+ID[ ]+: \\([0-9]+\\) *$" nil t) + (setq cert-ids (cons (match-string 1) cert-ids)))) + (let ((certfile (make-temp-file "smime-card"))) + (unwind-protect + (progn + (with-temp-file certfile + (when smime-CA-file + (insert-file-contents smime-CA-file)) + (mapc (lambda (id) + (unless (= (call-process "pkcs15-tool" nil t nil + "-r" id) + 0) + (error "pkcs15: Certificat read"))) + cert-ids)) + (let ((smime-CA-file certfile)) + ad-do-it)) + (delete-file certfile)))) + ad-do-it)) + +(defadvice mml-smime-verify (around smime-card-mml-smime-verify activate) + ;; If both smime-CA-directory and smime-CA-file are unset, `mml-smime-verify' + ;; refuses to perform certificate verification. + (let ((smime-CA-file (if smime-card-fetch-certificates + (or smime-CA-file "/dev/null") + smime-CA-file))) + ad-do-it)) + +;;; Announce + +(provide 'smime-card) + +;;; smime-card.el ends here diff --git a/contrib/smtpmail.el b/contrib/smtpmail.el new file mode 100644 index 0000000..ff38cd2 --- /dev/null +++ b/contrib/smtpmail.el @@ -0,0 +1,981 @@ +;;; smtpmail.el --- simple SMTP protocol (RFC 821) for sending mail + +;; Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. + +;; Author: Tomoji Kagatani +;; Maintainer: Simon Josefsson +;; w32 Maintainer: Brian D. Carlstrom +;; ESMTP support: Simon Leinen +;; Hacked by Mike Taylor, 11th October 1999 to add support for +;; automatically appending a domain to RCPT TO: addresses. +;; AUTH=LOGIN support: Stephen Cranefield +;; Keywords: mail + +;; This file is 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., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. + +;;; Commentary: + +;; Send Mail to smtp host from smtpmail temp buffer. + +;; Please add these lines in your .emacs(_emacs) or use customize. +;; +;;(setq send-mail-function 'smtpmail-send-it) ; if you use `mail' +;;(setq message-send-mail-function 'smtpmail-send-it) ; if you use message/Gnus +;;(setq smtpmail-default-smtp-server "YOUR SMTP HOST") +;;(setq smtpmail-local-domain "YOUR DOMAIN NAME") +;;(setq smtpmail-sendto-domain "YOUR DOMAIN NAME") +;;(setq smtpmail-debug-info t) ; only to debug problems +;;(setq smtpmail-auth-credentials ; or use ~/.authinfo +;; '(("YOUR SMTP HOST" 25 "username" "password"))) +;;(setq smtpmail-starttls-credentials +;; '(("YOUR SMTP HOST" 25 "~/.my_smtp_tls.key" "~/.my_smtp_tls.cert"))) +;; Where the 25 equals the value of `smtpmail-smtp-service', it can be an +;; integer or a string, just as long as they match (eq). + +;; To queue mail, set smtpmail-queue-mail to t and use +;; smtpmail-send-queued-mail to send. + +;; Modified by Stephen Cranefield , +;; 22/6/99, to support SMTP Authentication by the AUTH=LOGIN mechanism. +;; See http://help.netscape.com/products/server/messaging/3x/info/smtpauth.html +;; Rewritten by Simon Josefsson to use same credential variable as AUTH +;; support below. + +;; Modified by Simon Josefsson , 22/2/99, to support SMTP +;; Authentication by the AUTH mechanism. +;; See http://www.ietf.org/rfc/rfc2554.txt + +;; Modified by Simon Josefsson , 2000-10-07, to support +;; STARTTLS. Requires external program +;; ftp://ftp.opaopa.org/pub/elisp/starttls-*.tar.gz. +;; See http://www.ietf.org/rfc/rfc2246.txt, http://www.ietf.org/rfc/rfc2487.txt + +;;; Code: + +(require 'sendmail) +(autoload 'starttls-open-stream "starttls") +(autoload 'starttls-negotiate "starttls") +(autoload 'mail-strip-quoted-names "mail-utils") +(autoload 'message-make-date "message") +(autoload 'message-make-message-id "message") +(autoload 'rfc2104-hash "rfc2104") +(autoload 'netrc-parse "netrc") +(autoload 'netrc-machine "netrc") +(autoload 'netrc-get "netrc") + +;;; +(defgroup smtpmail nil + "SMTP protocol for sending mail." + :group 'mail) + + +(defcustom smtpmail-default-smtp-server nil + "*Specify default SMTP server. +This only has effect if you specify it before loading the smtpmail library." + :type '(choice (const nil) string) + :group 'smtpmail) + +(defcustom smtpmail-smtp-server + (or (getenv "SMTPSERVER") smtpmail-default-smtp-server) + "*The name of the host running SMTP server." + :type '(choice (const nil) string) + :group 'smtpmail) + +(defcustom smtpmail-smtp-service 25 + "*SMTP service port number. +The default value would be \"smtp\" or 25 ." + :type '(choice (integer :tag "Port") (string :tag "Service")) + :group 'smtpmail) + +(defcustom smtpmail-local-domain nil + "*Local domain name without a host name. +If the function (system-name) returns the full internet address, +don't define this value." + :type '(choice (const nil) string) + :group 'smtpmail) + +(defcustom smtpmail-sendto-domain nil + "*Local domain name without a host name. +This is appended (with an @-sign) to any specified recipients which do +not include an @-sign, so that each RCPT TO address is fully qualified. +\(Some configurations of sendmail require this.) + +Don't bother to set this unless you have get an error like: + Sending failed; SMTP protocol error +when sending mail, and the *trace of SMTP session to * +buffer includes an exchange like: + RCPT TO: + 501 : recipient address must contain a domain +" + :type '(choice (const nil) string) + :group 'smtpmail) + +(defcustom smtpmail-debug-info nil + "Whether to print info in buffer *trace of SMTP session to *. +See also `smtpmail-debug-verb' which determines if the SMTP protocol should +be verbose as well." + :type 'boolean + :group 'smtpmail) + +(defcustom smtpmail-debug-verb nil + "Whether this library sends the SMTP VERB command or not. +The commands enables verbose information from the SMTP server." + :type 'boolean + :group 'smtpmail) + +(defcustom smtpmail-code-conv-from nil ;; *junet* + "*smtpmail code convert from this code to *internal*..for tiny-mime.." + :type 'boolean + :group 'smtpmail) + +(defcustom smtpmail-queue-mail nil + "*Specify if mail is queued (if t) or sent immediately (if nil). +If queued, it is stored in the directory `smtpmail-queue-dir' +and sent with `smtpmail-send-queued-mail'." + :type 'boolean + :group 'smtpmail) + +(defcustom smtpmail-queue-dir "~/Mail/queued-mail/" + "*Directory where `smtpmail.el' stores queued mail." + :type 'directory + :group 'smtpmail) + +(defcustom smtpmail-auth-credentials "~/.authinfo" + "Specify username and password for servers, directly or via .netrc file. +This variable can either be a filename pointing to a file in netrc(5) +format, or list of four-element lists that contain, in order, +`servername' (a string), `port' (an integer), `user' (a string) and +`password' (a string, or nil to query the user when needed). If you +need to enter a `realm' too, add it to the user string, so that it +looks like `user@realm'." + :type '(choice file + (repeat (list (string :tag "Server") + (integer :tag "Port") + (string :tag "Username") + (choice (const :tag "Query when needed" nil) + (string :tag "Password"))))) + :version "22.1" + :group 'smtpmail) + +(defcustom smtpmail-starttls-credentials '(("" 25 "" "")) + "Specify STARTTLS keys and certificates for servers. +This is a list of four-element list with `servername' (a string), +`port' (an integer), `key' (a filename) and `certificate' (a filename)." + :type '(repeat (list (string :tag "Server") + (integer :tag "Port") + (file :tag "Key") + (file :tag "Certificate"))) + :version "21.1" + :group 'smtpmail) + +(defcustom smtpmail-warn-about-unknown-extensions nil + "*If set, print warnings about unknown SMTP extensions. +This is mainly useful for development purposes, to learn about +new SMTP extensions that might be useful to support." + :type 'boolean + :version "21.1" + :group 'smtpmail) + +(defvar smtpmail-queue-index-file "index" + "File name of queued mail index, +This is relative to `smtpmail-queue-dir'.") + +(defvar smtpmail-address-buffer) +(defvar smtpmail-recipient-address-list) + +(defvar smtpmail-queue-counter 0) + +;; Buffer-local variable. +(defvar smtpmail-read-point) + +(defvar smtpmail-queue-index (concat smtpmail-queue-dir + smtpmail-queue-index-file)) + +(defconst smtpmail-auth-supported '(cram-md5 plain login) + "List of supported SMTP AUTH mechanisms.") + +;;; +;;; +;;; + +(defvar smtpmail-mail-address nil + "Value to use for envelope-from address for mail from ambient buffer.") + +;;;###autoload +(defun smtpmail-send-it () + (let ((errbuf (if mail-interactive + (generate-new-buffer " smtpmail errors") + 0)) + (tembuf (generate-new-buffer " smtpmail temp")) + (case-fold-search nil) + delimline + (mailbuf (current-buffer)) + ;; Examine this variable now, so that + ;; local binding in the mail buffer will take effect. + (smtpmail-mail-address + (or (and mail-specify-envelope-from (mail-envelope-from)) + user-mail-address)) + (smtpmail-code-conv-from + (if enable-multibyte-characters + (let ((sendmail-coding-system smtpmail-code-conv-from)) + (select-message-coding-system))))) + (unwind-protect + (save-excursion + (set-buffer tembuf) + (erase-buffer) + (insert-buffer-substring mailbuf) + (goto-char (point-max)) + ;; require one newline at the end. + (or (= (preceding-char) ?\n) + (insert ?\n)) + ;; Change header-delimiter to be what sendmail expects. + (mail-sendmail-undelimit-header) + (setq delimline (point-marker)) +;; (sendmail-synch-aliases) + (if mail-aliases + (expand-mail-aliases (point-min) delimline)) + (goto-char (point-min)) + ;; ignore any blank lines in the header + (while (and (re-search-forward "\n\n\n*" delimline t) + (< (point) delimline)) + (replace-match "\n")) + (let ((case-fold-search t)) + ;; We used to process Resent-... headers here, + ;; but it was not done properly, and the job + ;; is done correctly in smtpmail-deduce-address-list. + ;; Don't send out a blank subject line + (goto-char (point-min)) + (if (re-search-forward "^Subject:\\([ \t]*\n\\)+\\b" delimline t) + (replace-match "") + ;; This one matches a Subject just before the header delimiter. + (if (and (re-search-forward "^Subject:\\([ \t]*\n\\)+" delimline t) + (= (match-end 0) delimline)) + (replace-match ""))) + ;; Put the "From:" field in unless for some odd reason + ;; they put one in themselves. + (goto-char (point-min)) + (if (not (re-search-forward "^From:" delimline t)) + (let* ((login smtpmail-mail-address) + (fullname (user-full-name))) + (cond ((eq mail-from-style 'angles) + (insert "From: " fullname) + (let ((fullname-start (+ (point-min) 6)) + (fullname-end (point-marker))) + (goto-char fullname-start) + ;; Look for a character that cannot appear unquoted + ;; according to RFC 822. + (if (re-search-forward "[^- !#-'*+/-9=?A-Z^-~]" + fullname-end 1) + (progn + ;; Quote fullname, escaping specials. + (goto-char fullname-start) + (insert "\"") + (while (re-search-forward "[\"\\]" + fullname-end 1) + (replace-match "\\\\\\&" t)) + (insert "\"")))) + (insert " <" login ">\n")) + ((eq mail-from-style 'parens) + (insert "From: " login " (") + (let ((fullname-start (point))) + (insert fullname) + (let ((fullname-end (point-marker))) + (goto-char fullname-start) + ;; RFC 822 says \ and nonmatching parentheses + ;; must be escaped in comments. + ;; Escape every instance of ()\ ... + (while (re-search-forward "[()\\]" fullname-end 1) + (replace-match "\\\\\\&" t)) + ;; ... then undo escaping of matching parentheses, + ;; including matching nested parentheses. + (goto-char fullname-start) + (while (re-search-forward + "\\(\\=\\|[^\\]\\(\\\\\\\\\\)*\\)\\\\(\\(\\([^\\]\\|\\\\\\\\\\)*\\)\\\\)" + fullname-end 1) + (replace-match "\\1(\\3)" t) + (goto-char fullname-start)))) + (insert ")\n")) + ((null mail-from-style) + (insert "From: " login "\n"))))) + ;; Insert a `Message-Id:' field if there isn't one yet. + (goto-char (point-min)) + (unless (re-search-forward "^Message-Id:" delimline t) + (insert "Message-Id: " (message-make-message-id) "\n")) + ;; Insert a `Date:' field if there isn't one yet. + (goto-char (point-min)) + (unless (re-search-forward "^Date:" delimline t) + (insert "Date: " (message-make-date) "\n")) + ;; Insert an extra newline if we need it to work around + ;; Sun's bug that swallows newlines. + (goto-char (1+ delimline)) + (if (eval mail-mailer-swallows-blank-line) + (newline)) + ;; Find and handle any FCC fields. + (goto-char (point-min)) + (if (re-search-forward "^FCC:" delimline t) + (mail-do-fcc delimline)) + (if mail-interactive + (with-current-buffer errbuf + (erase-buffer)))) + ;; + ;; + ;; + (setq smtpmail-address-buffer (generate-new-buffer "*smtp-mail*")) + (setq smtpmail-recipient-address-list + (smtpmail-deduce-address-list tembuf (point-min) delimline)) + (kill-buffer smtpmail-address-buffer) + + (smtpmail-do-bcc delimline) + ; Send or queue + (if (not smtpmail-queue-mail) + (if (not (null smtpmail-recipient-address-list)) + (if (not (smtpmail-via-smtp + smtpmail-recipient-address-list tembuf)) + (error "Sending failed; SMTP protocol error")) + (error "Sending failed; no recipients")) + (let* ((file-data + (expand-file-name + (format "%s_%i" + (format-time-string "%Y-%m-%d_%H:%M:%S") + (setq smtpmail-queue-counter + (1+ smtpmail-queue-counter))) + smtpmail-queue-dir)) + (file-data (convert-standard-filename file-data)) + (file-elisp (concat file-data ".el")) + (buffer-data (create-file-buffer file-data)) + (buffer-elisp (create-file-buffer file-elisp)) + (buffer-scratch "*queue-mail*")) + (unless (file-exists-p smtpmail-queue-dir) + (make-directory smtpmail-queue-dir t)) + (with-current-buffer buffer-data + (erase-buffer) + (insert-buffer-substring tembuf) + (write-file file-data) + (set-buffer buffer-elisp) + (erase-buffer) + (insert (concat + "(setq smtpmail-recipient-address-list '" + (prin1-to-string smtpmail-recipient-address-list) + ")\n")) + (write-file file-elisp) + (set-buffer (generate-new-buffer buffer-scratch)) + (insert (concat file-data "\n")) + (append-to-file (point-min) + (point-max) + smtpmail-queue-index) + ) + (kill-buffer buffer-scratch) + (kill-buffer buffer-data) + (kill-buffer buffer-elisp)))) + (kill-buffer tembuf) + (if (bufferp errbuf) + (kill-buffer errbuf))))) + +;;;###autoload +(defun smtpmail-send-queued-mail () + "Send mail that was queued as a result of setting `smtpmail-queue-mail'." + (interactive) + (with-temp-buffer + ;;; Get index, get first mail, send it, update index, get second + ;;; mail, send it, etc... + (let ((file-msg "")) + (insert-file-contents smtpmail-queue-index) + (goto-char (point-min)) + (while (not (eobp)) + (setq file-msg (buffer-substring (point) (line-end-position))) + (load file-msg) + ;; Insert the message literally: it is already encoded as per + ;; the MIME headers, and code conversions might guess the + ;; encoding wrongly. + (with-temp-buffer + (let ((coding-system-for-read 'no-conversion)) + (insert-file-contents file-msg)) + (let ((smtpmail-mail-address + (or (and mail-specify-envelope-from (mail-envelope-from)) + user-mail-address))) + (if (not (null smtpmail-recipient-address-list)) + (if (not (smtpmail-via-smtp smtpmail-recipient-address-list + (current-buffer))) + (error "Sending failed; SMTP protocol error")) + (error "Sending failed; no recipients")))) + (delete-file file-msg) + (delete-file (concat file-msg ".el")) + (delete-region (point-at-bol) (point-at-bol 2))) + (write-region (point-min) (point-max) smtpmail-queue-index)))) + +;(defun smtpmail-via-smtp (host,port,sender,destination,smtpmail-text-buffer) + +(defun smtpmail-fqdn () + (if smtpmail-local-domain + (concat (system-name) "." smtpmail-local-domain) + (system-name))) + +(defsubst smtpmail-cred-server (cred) + (nth 0 cred)) + +(defsubst smtpmail-cred-port (cred) + (nth 1 cred)) + +(defsubst smtpmail-cred-key (cred) + (nth 2 cred)) + +(defsubst smtpmail-cred-user (cred) + (nth 2 cred)) + +(defsubst smtpmail-cred-cert (cred) + (nth 3 cred)) + +(defsubst smtpmail-cred-passwd (cred) + (nth 3 cred)) + +(defun smtpmail-find-credentials (cred server port) + (catch 'done + (let ((l cred) el) + (while (setq el (pop l)) + (when (and (equal server (smtpmail-cred-server el)) + (equal port (smtpmail-cred-port el))) + (throw 'done el)))))) + +(defun smtpmail-maybe-append-domain (recipient) + (if (or (not smtpmail-sendto-domain) + (string-match "@" recipient)) + recipient + (concat recipient "@" smtpmail-sendto-domain))) + +(defun smtpmail-intersection (list1 list2) + (let ((result nil)) + (dolist (el2 list2) + (when (memq el2 list1) + (push el2 result))) + (nreverse result))) + +(defvar starttls-extra-args) +(defvar starttls-extra-arguments) + +(defun smtpmail-open-stream (process-buffer host port) + (let ((cred (smtpmail-find-credentials + smtpmail-starttls-credentials host port))) + (if (null (and cred (condition-case () + (with-no-warnings + (require 'starttls) + (call-process (if starttls-use-gnutls + starttls-gnutls-program + starttls-program))) + (error nil)))) + ;; The normal case. + (open-network-stream "SMTP" process-buffer host port) + (let* ((cred-key (smtpmail-cred-key cred)) + (cred-cert (smtpmail-cred-cert cred)) + (starttls-extra-args + (append + starttls-extra-args + (when (and (stringp cred-key) (stringp cred-cert) + (file-regular-p + (setq cred-key (expand-file-name cred-key))) + (file-regular-p + (setq cred-cert (expand-file-name cred-cert)))) + (list "--key-file" cred-key "--cert-file" cred-cert)))) + (starttls-extra-arguments + (append + starttls-extra-arguments + (when (and (stringp cred-key) (stringp cred-cert) + (file-regular-p + (setq cred-key (expand-file-name cred-key))) + (file-regular-p + (setq cred-cert (expand-file-name cred-cert)))) + (list "--x509keyfile" cred-key "--x509certfile" cred-cert))))) + (starttls-open-stream "SMTP" process-buffer host port))))) + +(defun smtpmail-try-auth-methods (process supported-extensions host port) + (let* ((mechs (cdr-safe (assoc 'auth supported-extensions))) + (mech (car (smtpmail-intersection smtpmail-auth-supported mechs))) + (cred (if (stringp smtpmail-auth-credentials) + (let* ((netrc (netrc-parse smtpmail-auth-credentials)) + (port-name (format "%s" (or port "smtp"))) + (hostentry (netrc-machine netrc host port-name + port-name))) + (when hostentry + (list host port + (netrc-get hostentry "login") + (netrc-get hostentry "password")))) + (smtpmail-find-credentials + smtpmail-auth-credentials host port))) + (passwd (when cred + (or (smtpmail-cred-passwd cred) + (read-passwd + (format "SMTP password for %s:%s: " + (smtpmail-cred-server cred) + (smtpmail-cred-port cred)))))) + ret) + (when (and cred mech) + (cond + ((eq mech 'cram-md5) + (smtpmail-send-command process (upcase (format "AUTH %s" mech))) + (if (or (null (car (setq ret (smtpmail-read-response process)))) + (not (integerp (car ret))) + (>= (car ret) 400)) + (throw 'done nil)) + (when (eq (car ret) 334) + (let* ((challenge (substring (cadr ret) 4)) + (decoded (base64-decode-string challenge)) + (hash (rfc2104-hash 'md5 64 16 passwd decoded)) + (response (concat (smtpmail-cred-user cred) " " hash)) + (encoded (base64-encode-string response))) + (smtpmail-send-command process (format "%s" encoded)) + (if (or (null (car (setq ret (smtpmail-read-response process)))) + (not (integerp (car ret))) + (>= (car ret) 400)) + (throw 'done nil))))) + ((eq mech 'login) + (smtpmail-send-command process "AUTH LOGIN") + (if (or (null (car (setq ret (smtpmail-read-response process)))) + (not (integerp (car ret))) + (>= (car ret) 400)) + (throw 'done nil)) + (smtpmail-send-command + process (base64-encode-string (smtpmail-cred-user cred))) + (if (or (null (car (setq ret (smtpmail-read-response process)))) + (not (integerp (car ret))) + (>= (car ret) 400)) + (throw 'done nil)) + (smtpmail-send-command process (base64-encode-string passwd)) + (if (or (null (car (setq ret (smtpmail-read-response process)))) + (not (integerp (car ret))) + (>= (car ret) 400)) + (throw 'done nil))) + ((eq mech 'plain) + ;; We used to send an empty initial request, and wait for an + ;; empty response, and then send the password, but this + ;; violate a SHOULD in RFC 2222 paragraph 5.1. Note that this + ;; is not sent if the server did not advertise AUTH PLAIN in + ;; the EHLO response. See RFC 2554 for more info. + (smtpmail-send-command process + (concat "AUTH PLAIN " + (base64-encode-string + (concat "\0" + (smtpmail-cred-user cred) + "\0" + passwd)))) + (if (or (null (car (setq ret (smtpmail-read-response process)))) + (not (integerp (car ret))) + (not (equal (car ret) 235))) + (throw 'done nil))) + + (t + (error "Mechanism %s not implemented" mech))) + ;; Remember the password. + (when (and (not (stringp smtpmail-auth-credentials)) + (null (smtpmail-cred-passwd cred))) + (setcar (cdr (cdr (cdr cred))) passwd))))) + +(defun smtpmail-via-smtp (recipient smtpmail-text-buffer) + (let ((process nil) + (host (or smtpmail-smtp-server + (error "`smtpmail-smtp-server' not defined"))) + (port smtpmail-smtp-service) + ;; smtpmail-mail-address should be set to the appropriate + ;; buffer-local value by the caller, but in case not: + (envelope-from (or smtpmail-mail-address + (and mail-specify-envelope-from + (mail-envelope-from)) + user-mail-address)) + response-code + greeting + process-buffer + (supported-extensions '())) + (unwind-protect + (catch 'done + ;; get or create the trace buffer + (setq process-buffer + (get-buffer-create (format "*trace of SMTP session to %s*" host))) + + ;; clear the trace buffer of old output + (with-current-buffer process-buffer + (setq buffer-undo-list t) + (erase-buffer)) + + ;; open the connection to the server + (setq process (smtpmail-open-stream process-buffer host port)) + (and (null process) (throw 'done nil)) + + ;; set the send-filter + (set-process-filter process 'smtpmail-process-filter) + + (with-current-buffer process-buffer + (set-buffer-process-coding-system 'raw-text-unix 'raw-text-unix) + (make-local-variable 'smtpmail-read-point) + (setq smtpmail-read-point (point-min)) + + + (if (or (null (car (setq greeting (smtpmail-read-response process)))) + (not (integerp (car greeting))) + (>= (car greeting) 400)) + (throw 'done nil) + ) + + (let ((do-ehlo t) + (do-starttls t)) + (while do-ehlo + ;; EHLO + (smtpmail-send-command process (format "EHLO %s" (smtpmail-fqdn))) + + (if (or (null (car (setq response-code + (smtpmail-read-response process)))) + (not (integerp (car response-code))) + (>= (car response-code) 400)) + (progn + ;; HELO + (smtpmail-send-command + process (format "HELO %s" (smtpmail-fqdn))) + + (if (or (null (car (setq response-code + (smtpmail-read-response process)))) + (not (integerp (car response-code))) + (>= (car response-code) 400)) + (throw 'done nil))) + (dolist (line (cdr (cdr response-code))) + (let ((name (mapcar (lambda (s) (intern (downcase s))) + (split-string (substring line 4) "[ ]")))) + (and (eq (length name) 1) + (setq name (car name))) + (and name + (cond ((memq (if (consp name) (car name) name) + '(verb xvrb 8bitmime onex xone + expn size dsn etrn + enhancedstatuscodes + help xusr + auth=login auth starttls)) + (setq supported-extensions + (cons name supported-extensions))) + (smtpmail-warn-about-unknown-extensions + (message "Unknown extension %s" name))))))) + + (if (and do-starttls + (smtpmail-find-credentials smtpmail-starttls-credentials host port) + (member 'starttls supported-extensions) + (numberp (process-id process))) + (progn + (smtpmail-send-command process (format "STARTTLS")) + (if (or (null (car (setq response-code (smtpmail-read-response process)))) + (not (integerp (car response-code))) + (>= (car response-code) 400)) + (throw 'done nil)) + (starttls-negotiate process) + (setq do-starttls nil)) + (setq do-ehlo nil)))) + + (smtpmail-try-auth-methods process supported-extensions host port) + + (if (or (member 'onex supported-extensions) + (member 'xone supported-extensions)) + (progn + (smtpmail-send-command process (format "ONEX")) + (if (or (null (car (setq response-code (smtpmail-read-response process)))) + (not (integerp (car response-code))) + (>= (car response-code) 400)) + (throw 'done nil)))) + + (if (and smtpmail-debug-verb + (or (member 'verb supported-extensions) + (member 'xvrb supported-extensions))) + (progn + (smtpmail-send-command process (format "VERB")) + (if (or (null (car (setq response-code (smtpmail-read-response process)))) + (not (integerp (car response-code))) + (>= (car response-code) 400)) + (throw 'done nil)))) + + (if (member 'xusr supported-extensions) + (progn + (smtpmail-send-command process (format "XUSR")) + (if (or (null (car (setq response-code (smtpmail-read-response process)))) + (not (integerp (car response-code))) + (>= (car response-code) 400)) + (throw 'done nil)))) + + ;; MAIL FROM: + (let ((size-part + (if (or (member 'size supported-extensions) + (assoc 'size supported-extensions)) + (format " SIZE=%d" + (with-current-buffer smtpmail-text-buffer + ;; size estimate: + (+ (- (point-max) (point-min)) + ;; Add one byte for each change-of-line + ;; because of CR-LF representation: + (count-lines (point-min) (point-max))))) + "")) + (body-part + (if (member '8bitmime supported-extensions) + ;; FIXME: + ;; Code should be added here that transforms + ;; the contents of the message buffer into + ;; something the receiving SMTP can handle. + ;; For a receiver that supports 8BITMIME, this + ;; may mean converting BINARY to BASE64, or + ;; adding Content-Transfer-Encoding and the + ;; other MIME headers. The code should also + ;; return an indication of what encoding the + ;; message buffer is now, i.e. ASCII or + ;; 8BITMIME. + (if nil + " BODY=8BITMIME" + "") + ""))) +; (smtpmail-send-command process (format "MAIL FROM:%s@%s" (user-login-name) (smtpmail-fqdn))) + (smtpmail-send-command process (format "MAIL FROM:<%s>%s%s" + envelope-from + size-part + body-part)) + + (if (or (null (car (setq response-code (smtpmail-read-response process)))) + (not (integerp (car response-code))) + (>= (car response-code) 400)) + (throw 'done nil) + )) + + ;; RCPT TO: + (let ((n 0)) + (while (not (null (nth n recipient))) + (smtpmail-send-command process (format "RCPT TO:<%s>" (smtpmail-maybe-append-domain (nth n recipient)))) + (setq n (1+ n)) + + (setq response-code (smtpmail-read-response process)) + (if (or (null (car response-code)) + (not (integerp (car response-code))) + (>= (car response-code) 400)) + (throw 'done nil) + ) + )) + + ;; DATA + (smtpmail-send-command process "DATA") + + (if (or (null (car (setq response-code (smtpmail-read-response process)))) + (not (integerp (car response-code))) + (>= (car response-code) 400)) + (throw 'done nil) + ) + + ;; Mail contents + (smtpmail-send-data process smtpmail-text-buffer) + + ;;DATA end "." + (smtpmail-send-command process ".") + + (if (or (null (car (setq response-code (smtpmail-read-response process)))) + (not (integerp (car response-code))) + (>= (car response-code) 400)) + (throw 'done nil) + ) + + ;;QUIT +; (smtpmail-send-command process "QUIT") +; (and (null (car (smtpmail-read-response process))) +; (throw 'done nil)) + t )) + (if process + (with-current-buffer (process-buffer process) + (smtpmail-send-command process "QUIT") + (smtpmail-read-response process) + +; (if (or (null (car (setq response-code (smtpmail-read-response process)))) +; (not (integerp (car response-code))) +; (>= (car response-code) 400)) +; (throw 'done nil) +; ) + (delete-process process) + (unless smtpmail-debug-info + (kill-buffer process-buffer))))))) + + +(defun smtpmail-process-filter (process output) + (with-current-buffer (process-buffer process) + (goto-char (point-max)) + (insert output))) + +(defun smtpmail-read-response (process) + (let ((case-fold-search nil) + (response-strings nil) + (response-continue t) + (return-value '(nil ())) + match-end) + (catch 'done + (while response-continue + (goto-char smtpmail-read-point) + (while (not (search-forward "\r\n" nil t)) + (unless (memq (process-status process) '(open run)) + (throw 'done nil)) + (accept-process-output process) + (goto-char smtpmail-read-point)) + + (setq match-end (point)) + (setq response-strings + (cons (buffer-substring smtpmail-read-point (- match-end 2)) + response-strings)) + + (goto-char smtpmail-read-point) + (if (looking-at "[0-9]+ ") + (let ((begin (match-beginning 0)) + (end (match-end 0))) + (if smtpmail-debug-info + (message "%s" (car response-strings))) + + (setq smtpmail-read-point match-end) + + ;; ignore lines that start with "0" + (if (looking-at "0[0-9]+ ") + nil + (setq response-continue nil) + (setq return-value + (cons (string-to-number + (buffer-substring begin end)) + (nreverse response-strings))))) + + (if (looking-at "[0-9]+-") + (progn (if smtpmail-debug-info + (message "%s" (car response-strings))) + (setq smtpmail-read-point match-end) + (setq response-continue t)) + (progn + (setq smtpmail-read-point match-end) + (setq response-continue nil) + (setq return-value + (cons nil (nreverse response-strings))))))) + (setq smtpmail-read-point match-end)) + return-value)) + + +(defun smtpmail-send-command (process command) + (goto-char (point-max)) + (if (= (aref command 0) ?P) + (insert "PASS \r\n") + (insert command "\r\n")) + (setq smtpmail-read-point (point)) + (process-send-string process command) + (process-send-string process "\r\n")) + +(defun smtpmail-send-data-1 (process data) + (goto-char (point-max)) + + (if (and (multibyte-string-p data) + smtpmail-code-conv-from) + (setq data (string-as-multibyte + (encode-coding-string data smtpmail-code-conv-from)))) + + (if smtpmail-debug-info + (insert data "\r\n")) + + (setq smtpmail-read-point (point)) + ;; Escape "." at start of a line + (if (eq (string-to-char data) ?.) + (process-send-string process ".")) + (process-send-string process data) + (process-send-string process "\r\n") + ) + +(defun smtpmail-send-data (process buffer) + (let ((data-continue t) sending-data) + (with-current-buffer buffer + (goto-char (point-min))) + (while data-continue + (with-current-buffer buffer + (setq sending-data (buffer-substring (point-at-bol) (point-at-eol))) + (end-of-line 2) + (setq data-continue (not (eobp)))) + (smtpmail-send-data-1 process sending-data)))) + +(defun smtpmail-deduce-address-list (smtpmail-text-buffer header-start header-end) + "Get address list suitable for smtp RCPT TO:
." + (unwind-protect + (with-current-buffer smtpmail-address-buffer + (erase-buffer) + (let + ((case-fold-search t) + (simple-address-list "") + this-line + this-line-end + addr-regexp) + (insert-buffer-substring smtpmail-text-buffer header-start header-end) + (goto-char (point-min)) + ;; RESENT-* fields should stop processing of regular fields. + (save-excursion + (setq addr-regexp + (if (re-search-forward "^Resent-\\(to\\|cc\\|bcc\\):" + header-end t) + "^Resent-\\(to\\|cc\\|bcc\\):" + "^\\(To:\\|Cc:\\|Bcc:\\)"))) + + (while (re-search-forward addr-regexp header-end t) + (replace-match "") + (setq this-line (match-beginning 0)) + (forward-line 1) + ;; get any continuation lines + (while (and (looking-at "^[ \t]+") (< (point) header-end)) + (forward-line 1)) + (setq this-line-end (point-marker)) + (setq simple-address-list + (concat simple-address-list " " + (mail-strip-quoted-names (buffer-substring this-line this-line-end)))) + ) + (erase-buffer) + (insert " " simple-address-list "\n") + (subst-char-in-region (point-min) (point-max) 10 ? t);; newline --> blank + (subst-char-in-region (point-min) (point-max) ?, ? t);; comma --> blank + (subst-char-in-region (point-min) (point-max) 9 ? t);; tab --> blank + + (goto-char (point-min)) + ;; tidyness in case hook is not robust when it looks at this + (while (re-search-forward "[ \t]+" header-end t) (replace-match " ")) + + (goto-char (point-min)) + (let (recipient-address-list) + (while (re-search-forward " \\([^ ]+\\) " (point-max) t) + (backward-char 1) + (setq recipient-address-list (cons (buffer-substring (match-beginning 1) (match-end 1)) + recipient-address-list)) + ) + (setq smtpmail-recipient-address-list recipient-address-list)) + + ) + ) + ) + ) + + +(defun smtpmail-do-bcc (header-end) + "Delete [Resent-]BCC: and their continuation lines from the header area. +There may be multiple BCC: lines, and each may have arbitrarily +many continuation lines." + (let ((case-fold-search t)) + (save-excursion + (goto-char (point-min)) + ;; iterate over all BCC: lines + (while (re-search-forward "^\\(RESENT-\\)?BCC:" header-end t) + (delete-region (match-beginning 0) + (progn (forward-line 1) (point))) + ;; get rid of any continuation lines + (while (and (looking-at "^[ \t].*\n") (< (point) header-end)) + (replace-match "")))))) + + +(provide 'smtpmail) + +;;; arch-tag: a76992df-6d71-43b7-9e72-4bacc6c05466 +;;; smtpmail.el ends here diff --git a/contrib/ssl.el b/contrib/ssl.el index 5aa9d2f..df198ba 100644 --- a/contrib/ssl.el +++ b/contrib/ssl.el @@ -1,9 +1,10 @@ -;;; ssl.el,v --- ssl functions for emacsen without them builtin +;;; ssl.el,v --- ssl functions for Emacsen without them builtin +;; Author: William M. Perry ;; Keywords: comm ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; Copyright (c) 1995, 1996 by William M. Perry -;;; Copyright (c) 1996 - 1999 Free Software Foundation, Inc. +;;; Copyright (c) 1996, 97, 98, 99, 2001 Free Software Foundation, Inc. ;;; ;;; This file is part of GNU Emacs. ;;; @@ -25,25 +26,14 @@ (eval-when-compile (require 'cl)) (require 'base64) - -(eval-and-compile - (condition-case () - (require 'custom) - (error nil)) - (if (and (featurep 'custom) (fboundp 'custom-declare-variable)) - nil ;; We've got what we needed - ;; We have the old custom-library, hack around it! - (defmacro defgroup (&rest args) - nil) - (defmacro defcustom (var value doc &rest args) - (` (defvar (, var) (, value) (, doc)))))) +(require 'url) ; for `url-configuration-directory' (defgroup ssl nil "Support for `Secure Sockets Layer' encryption." :group 'comm) (defcustom ssl-certificate-directory "~/.w3/certs/" - "*Directory to store CA certificates in" + "*Directory in which to store CA certificates." :group 'ssl :type 'directory) @@ -63,7 +53,7 @@ Run with one argument, the directory name." The certificate is piped to it. Maybe a way of passing a file should be implemented" :group 'ssl - :type 'list) + :type '(repeat string)) (defcustom ssl-certificate-directory-style 'ssleay "*Style of cert database to use, the only valid value right now is `ssleay'. @@ -102,6 +92,19 @@ to." :group 'ssl :type 'list) +(defcustom ssl-view-certificate-program-name ssl-program-name + "*The program to run to provide a human-readable view of a certificate." + :group 'ssl + :type 'string) + +(defcustom ssl-view-certificate-program-arguments + '("x509" "-text" "-inform" "DER") + "*Arguments that should be passed to the certificate viewing program. +The certificate is piped to it. +Maybe a way of passing a file should be implemented." + :group 'ssl + :type 'list) + (defun ssl-certificate-information (der) "Return an assoc list of information about a certificate in DER format." (let ((certificate (concat "-----BEGIN CERTIFICATE-----\n" @@ -112,18 +115,19 @@ to." (set-buffer (get-buffer-create " *openssl*")) (erase-buffer) (insert certificate) - (setq exit-code (condition-case () - (call-process-region (point-min) (point-max) - ssl-program-name - t (list (current-buffer) nil) t - "x509" - "-subject" ; Print the subject DN - "-issuer" ; Print the issuer DN - "-dates" ; Both before and after dates - "-serial" ; print out serial number - "-noout" ; Don't spit out the certificate - ) - (error -1))) + (setq exit-code + (condition-case () + (call-process-region (point-min) (point-max) + ssl-program-name + t (list (current-buffer) nil) t + "x509" + "-subject" ; Print the subject DN + "-issuer" ; Print the issuer DN + "-dates" ; Both before and after dates + "-serial" ; print out serial number + "-noout" ; Don't spit out the certificate + ) + (error -1))) (if (/= exit-code 0) nil (let ((vals nil)) @@ -133,17 +137,17 @@ to." vals))))) (defun ssl-accept-ca-certificate () - "Ask if the user is willing to accept a new CA certificate. The buffer-name -should be the intended name of the certificate, and the buffer should probably -be in DER encoding" + "Ask if the user is willing to accept a new CA certificate. +The buffer name should be the intended name of the certificate, and +the buffer should probably be in DER encoding" ;; TODO, check if it is really new or if we already know it (let* ((process-connection-type nil) (tmpbuf (generate-new-buffer "X509 CA Certificate Information")) (response (save-excursion - (and (eq 0 + (and (eq 0 (apply 'call-process-region - (point-min) (point-max) - ssl-view-certificate-program-name + (point-min) (point-max) + ssl-view-certificate-program-name nil tmpbuf t ssl-view-certificate-program-arguments)) (switch-to-buffer tmpbuf) @@ -171,27 +175,43 @@ be in DER encoding" nil nil nil (expand-file-name ssl-certificate-directory)))))))) +(defvar ssl-exec-wrapper nil) + +(defun ssl-get-command () + (if (memq system-type '(ms-dos ms-windows axp-vms vax-vms)) + ;; Nothing to do on DOS, Windows, or VMS! + (cons ssl-program-name ssl-program-arguments) + (if (not ssl-exec-wrapper) + (let ((script + (expand-file-name "exec_ssl_quietly" url-configuration-directory))) + (if (not (file-executable-p script)) + ;; Need to create our handy-dandy utility script to shut OpenSSL + ;; up completely. + (progn + (write-region "#!/bin/sh\n\nexec \"$@\" 2> /dev/null\n" nil + script nil 5) + (set-file-modes script 493))) ; (rwxr-xr-x) + (setq ssl-exec-wrapper script))) + (cons ssl-exec-wrapper (cons ssl-program-name ssl-program-arguments)))) + (defun open-ssl-stream (name buffer host service) "Open a SSL connection for a service to a host. Returns a subprocess-object to represent the connection. Input and output work as for subprocesses; `delete-process' closes it. Args are NAME BUFFER HOST SERVICE. NAME is name for process. It is modified if necessary to make it unique. -BUFFER is the buffer (or buffer-name) to associate with the process. - Process output goes at end of that buffer, unless you specify - an output stream or filter function to handle the output. - BUFFER may be also nil, meaning that this process is not associated - with any buffer +BUFFER is the buffer (or buffer name) to associate with the process. +Process output goes at end of that buffer, unless you specify +an output stream or filter function to handle the output. +BUFFER may be also nil, meaning that this process is not associated +with any buffer. Third arg is name of the host to connect to, or its IP address. Fourth arg SERVICE is name of the service desired, or an integer specifying a port number to connect to." (if (integerp service) (setq service (int-to-string service))) (let* ((process-connection-type nil) (port service) - (proc (eval - (` - (start-process name buffer ssl-program-name - (,@ ssl-program-arguments)))))) + (proc (eval `(start-process name buffer ,@(ssl-get-command))))) (process-kill-without-query proc) proc)) diff --git a/contrib/ucs-tables.el b/contrib/ucs-tables.el index 0255053..2b7e935 100644 --- a/contrib/ucs-tables.el +++ b/contrib/ucs-tables.el @@ -18,9 +18,9 @@ ;; 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. +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -710,28 +710,28 @@ Translates from the iso8859 charsets and `mule-unicode-0100-24ff'.") ;; These are commented out since the current 8859-8 standard ;; does not yet define these codepoints, although there are ;; drafts which do). -; (?\,H@(B . ?\x05B0) ;; HEBREW POINT SHEVA -; (?\,HA(B . ?\x05B1) ;; HEBREW POINT HATAF SEGOL -; (?\,HB(B . ?\x05B2) ;; HEBREW POINT HATAF PATAH -; (?\,HC(B . ?\x05B3) ;; HEBREW POINT HATAF QAMATS -; (?\,HD(B . ?\x05B4) ;; HEBREW POINT HIRIQ -; (?\,HE(B . ?\x05B5) ;; HEBREW POINT TSERE -; (?\,HF(B . ?\x05B6) ;; HEBREW POINT SEGOL -; (?\,HG(B . ?\x05B7) ;; HEBREW POINT PATAH -; (?\,HH(B . ?\x05B8) ;; HEBREW POINT QAMATS -; (?\,HI(B . ?\x05B9) ;; HEBREW POINT HOLAM -; (?\,HK(B . ?\x05BB) ;; HEBREW POINT QUBUTS -; (?\,HL(B . ?\x05BC) ;; HEBREW POINT DAGESH -; (?\,HM(B . ?\x05BD) ;; HEBREW POINT METEG -; (?\,HN(B . ?\x05BE) ;; HEBREW POINT MAQAF -; (?\,HO(B . ?\x05BF) ;; HEBREW POINT RAFE -; (?\,HP(B . ?\x05C0) ;; HEBREW PUNCTUATION PASEQ -; (?\,HQ(B . ?\x05C1) ;; HEBREW POINT SHIN DOT -; (?\,HR(B . ?\x05C2) ;; HEBREW POINT SIN DOT -; (?\,HS(B . ?\x05C3) ;; HEBREW PUNCTUATION SOF PASUQ - (?\,H[(B . ?\x202D) ;; LEFT-TO-RIGHT OVERRIDE - (?\,H\(B . ?\x202E) ;; RIGHT-TO-LEFT OVERRIDE - (?\,H](B . ?\x202C) ;; POP DIRECTIONAL FORMATTING +; (?\@ . ?\x05B0) ;; HEBREW POINT SHEVA +; (?\A . ?\x05B1) ;; HEBREW POINT HATAF SEGOL +; (?\B . ?\x05B2) ;; HEBREW POINT HATAF PATAH +; (?\C . ?\x05B3) ;; HEBREW POINT HATAF QAMATS +; (?\D . ?\x05B4) ;; HEBREW POINT HIRIQ +; (?\E . ?\x05B5) ;; HEBREW POINT TSERE +; (?\F . ?\x05B6) ;; HEBREW POINT SEGOL +; (?\G . ?\x05B7) ;; HEBREW POINT PATAH +; (?\H . ?\x05B8) ;; HEBREW POINT QAMATS +; (?\I . ?\x05B9) ;; HEBREW POINT HOLAM +; (?\K . ?\x05BB) ;; HEBREW POINT QUBUTS +; (?\L . ?\x05BC) ;; HEBREW POINT DAGESH +; (?\M . ?\x05BD) ;; HEBREW POINT METEG +; (?\N . ?\x05BE) ;; HEBREW POINT MAQAF +; (?\O . ?\x05BF) ;; HEBREW POINT RAFE +; (?\P . ?\x05C0) ;; HEBREW PUNCTUATION PASEQ +; (?\Q . ?\x05C1) ;; HEBREW POINT SHIN DOT +; (?\R . ?\x05C2) ;; HEBREW POINT SIN DOT +; (?\S . ?\x05C3) ;; HEBREW PUNCTUATION SOF PASUQ + (?\[ . ?\x202D) ;; LEFT-TO-RIGHT OVERRIDE + (?\\ . ?\x202E) ;; RIGHT-TO-LEFT OVERRIDE + (?\] . ?\x202C) ;; POP DIRECTIONAL FORMATTING (?\,H_(B . ?\x2017) ;; DOUBLE LOW LINE (?\,H`(B . ?\x05D0) ;; HEBREW LETTER ALEF (?\,Ha(B . ?\x05D1) ;; HEBREW LETTER BET @@ -760,8 +760,8 @@ Translates from the iso8859 charsets and `mule-unicode-0100-24ff'.") (?\,Hx(B . ?\x05E8) ;; HEBREW LETTER RESH (?\,Hy(B . ?\x05E9) ;; HEBREW LETTER SHIN (?\,Hz(B . ?\x05EA) ;; HEBREW LETTER TAV - (?\,H{(B . ?\x202A) ;; LEFT-TO-RIGHT EMBEDDING - (?\,H|(B . ?\x202B) ;; RIGHT-TO-LEFT EMBEDDING + (?\{ . ?\x202A) ;; LEFT-TO-RIGHT EMBEDDING + (?\| . ?\x202B) ;; RIGHT-TO-LEFT EMBEDDING (?\,H}(B . ?\x200E) ;; LEFT-TO-RIGHT MARK (?\,H~(B . ?\x200F) ;; RIGHT-TO-LEFT MARK )) @@ -1749,12 +1749,12 @@ Interactively, prompts for a hex string giving the code." (?$(7#`(B . ?$,1GO(B))) (ipa - '((?,0 (B . ?i) + '((?i . ?i) (?,0!(B . ?$,1#j(B) - (?,0"(B . ?e) + (?e . ?e) (?,0#(B . ?$,1#[(B) (?,0$(B . ?,Af(B) - (?,0%(B . ?a) + (?a . ?a) (?,0&(B . ?$,1#h(B) (?,0'(B . ?$,1#Y(B) (?,0((B . ?$,1#P(B) @@ -1762,50 +1762,50 @@ Interactively, prompts for a hex string giving the code." (?,0*(B . ?$,1#d(B) (?,0+(B . ?$,1$,(B) (?,0,(B . ?$,1#Q(B) - (?,0-(B . ?y) + (?y . ?y) (?,0.(B . ?$,1$/(B) (?,0/(B . ?,Ax(B) (?,00(B . ?$,1 s(B) (?,01(B . ?$,1#v(B) (?,02(B . ?$,1$)(B) (?,03(B . ?$,1#u(B) - (?,04(B . ?u) + (?u . ?u) (?,05(B . ?$,1$*(B) - (?,06(B . ?o) + (?o . ?o) (?,07(B . ?$,1#T(B) (?,08(B . ?$,1#R(B) (?,0:(B . ?$,1#Z(B) - (?,0@(B . ?p) - (?,0A(B . ?b) - (?,0B(B . ?t) - (?,0C(B . ?d) - (?,0D(B . ?k) - (?,0E(B . ?g) - (?,0F(B . ?f) - (?,0G(B . ?v) + (?p . ?p) + (?b . ?b) + (?t . ?t) + (?d . ?d) + (?k . ?k) + (?g . ?g) + (?f . ?f) + (?v . ?v) (?,0H(B . ?$,1'8(B) (?,0I(B . ?,Ap(B) - (?,0J(B . ?s) - (?,0K(B . ?z) + (?s . ?s) + (?z . ?z) (?,0L(B . ?$,1$#(B) (?,0M(B . ?$,1$2(B) (?,0N(B . ?,Ag(B) - (?,0O(B . ?x) + (?x . ?x) (?,0P(B . ?$,1$!(B) - (?,0Q(B . ?h) - (?,0R(B . ?m) - (?,0S(B . ?n) + (?h . ?h) + (?m . ?m) + (?n . ?n) (?,0T(B . ?$,1#r(B) (?,0U(B . ?$,1 k(B) - (?,0V(B . ?r) + (?r . ?r) (?,0W(B . ?$,1$ (B) (?,0X(B . ?$,1#y(B) - (?,0Y(B . ?j) - (?,0Z(B . ?l) + (?j . ?j) + (?l . ?l) (?,0[(B . ?$,1$.(B) (?,0\(B . ?$,1$?(B) (?,0](B . ?$,1#e(B) - (?,0^(B . ?w) + (?w . ?w) (?,0_(B . ?$,1$-(B) (?,0p(B . ?$,1$h(B) (?,0q(B . ?$,1$l(B) diff --git a/contrib/vcard.el b/contrib/vcard.el index 22f032c..8b0e3e1 100644 --- a/contrib/vcard.el +++ b/contrib/vcard.el @@ -20,7 +20,7 @@ ;; You should have received a copy of the GNU General Public License ;; along with this program; if not, you can either send email to this ;; program's maintainer or write to: The Free Software Foundation, -;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA. +;; Inc.; 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/contrib/xml.el b/contrib/xml.el index a495721..ca4bee8 100644 --- a/contrib/xml.el +++ b/contrib/xml.el @@ -20,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/etc/Makefile.in b/etc/Makefile.in index 517bfad..ff9967f 100644 --- a/etc/Makefile.in +++ b/etc/Makefile.in @@ -13,16 +13,19 @@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ SHELL = /bin/sh -install: +install: $(SHELL) $(top_srcdir)/mkinstalldirs $(etcdir) cd $(srcdir) \ && for p in gnus-tut.txt; do \ echo " $(INSTALL_DATA) $$p $(etcdir)/$$p"; \ $(INSTALL_DATA) $$p $(etcdir)/$$p; \ done - $(SHELL) $(top_srcdir)/mkinstalldirs $(etcdir)/images/gnus + $(SHELL) $(top_srcdir)/mkinstalldirs $(etcdir)/images/gnus $(etcdir)/images/mail cd $(srcdir) \ - && for p in images/gnus/*.xpm images/gnus/*.pbm images/gnus/*.xbm images/gnus/x-splash; do \ + && for p in images/gnus/*.xpm images/gnus/*.pbm images/gnus/*.xbm \ + images/mail/*.xpm images/mail/*.pbm \ + images/*.xpm images/*.pbm \ + images/gnus/x-splash; do \ echo " $(INSTALL_DATA) $$p $(etcdir)/$$p"; \ $(INSTALL_DATA) $$p $(etcdir)/$$p; \ done @@ -33,10 +36,13 @@ install: $(INSTALL_DATA) $$p $(etcdir)/$$p; \ done -uninstall: +uninstall: rm -f $(etcdir)/gnus-tut.txt cd $(srcdir) \ - && for p in images/gnus/*.xpm images/gnus/*.pbm images/gnus/*.xbm images/gnus/x-splash; do \ + && for p in images/gnus/*.xpm images/gnus/*.pbm images/gnus/*.xbm \ + images/mail/*.xpm images/mail/*.pbm \ + images/*.xpm images/*.pbm \ + images/gnus/x-splash; do \ rm -f "$(etcdir)/$$p"; \ done rmdir $(etcdir)/images/gnus 2> /dev/null || true @@ -51,8 +57,11 @@ Makefile: $(srcdir)/Makefile.in ../config.status cd .. \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -distclean: - rm -f *~ Makefile +clean: + rm -f *~ + +distclean: clean + rm -f Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/etc/gnus-tut.txt b/etc/gnus-tut.txt index 4e0a483..e058072 100644 --- a/etc/gnus-tut.txt +++ b/etc/gnus-tut.txt @@ -25,7 +25,8 @@ Ingebrigtsen. If you have a WWW browser, you can investigate to your heart's delight at and . -;; Copyright (C) 1995 Free Software Foundation, Inc. +;; Copyright (C) 1995, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news @@ -44,8 +45,8 @@ heart's delight at and ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. From lars Thu Feb 23 23:20:38 1995 From: larsi@ifi.uio.no (ding) diff --git a/etc/gnus/gnus-setup.ast b/etc/gnus/gnus-setup.ast index 790c6a0..2b8a842 100644 --- a/etc/gnus/gnus-setup.ast +++ b/etc/gnus/gnus-setup.ast @@ -1,8 +1,10 @@ @title Configuring Gnus for the first time @node What do you want to do with Gnus? + @variable outbound (:radio ((item :tag "Send mail via sendmail" "sendmail") (item :tag "Send mail via SMTP" "smtp"))) "sendmail" -@variable backends (:set ((item :tag "Read news via NNTP" "nntp") (item :tag"Sacrifice a goat" "goat") (item :tag "Read mail, store it locally" "nnml") (item :tag "Read mail and store it on an IMAP server" "nnimap"))) (list "nnml") + +@variable backends (:set ((item :tag "Read news via NNTP" "nntp") (item :tag "Read mail, store it locally" "nnml") (item :tag "Read mail and store it on an IMAP server" "nnimap"))) (list "nnml") @result primary-mail-selections (list backends outbound) @text @@ -38,6 +40,12 @@ TODO: this will be a real link. Run M-x assistant and use the news-server.ast file as input. @end text + +@c Local variables: +@c mode: texinfo +@c End: + @ignore @end ignore + diff --git a/etc/gnus/news-server.ast b/etc/gnus/news-server.ast index d607be5..294f923 100644 --- a/etc/gnus/news-server.ast +++ b/etc/gnus/news-server.ast @@ -56,3 +56,9 @@ Password: @variable{user-name} @end text +@c Local variables: +@c mode: texinfo +@c End: + +@c arch tag is missing + diff --git a/etc/images/README b/etc/images/README new file mode 100644 index 0000000..a435456 --- /dev/null +++ b/etc/images/README @@ -0,0 +1,94 @@ +The following icons are from GNOME 2.6: + + attach.xpm (stock_attach) + connect.xpm (stock_connect) + contact.xpm (stock_contact) + delete.xpm (stock_delete) + describe.xpm (stock_properties) + disconnect.xpm (stock_disconnect) + exit.xpm (stock_exit) + lock-broken.xpm (stock_lock_broken) + lock-ok.xpm (stock_lock_ok) + lock.xpm (stock_lock) + next-page.xpm (stock_next-page) + refresh.xpm (stock_refresh) + sort-ascending.xpm (stock_sort-ascending) + sort-column-ascending.xpm (stock_sort-column-ascending) + sort-criteria.xpm (stock_sort-criteria) + sort-descending.xpm (stock_sort-descending) + sort-row-ascending.xpm (stock_sort-row-ascending) + + gnus/toggle-subscription.xpm (stock_task-recurring) + + mail/compose.xpm (stock_mail-compose) + mail/copy.xpm (stock_mail-copy) + mail/forward.xpm (stock_mail-forward) + mail/inbox.xpm (stock_inbox) + mail/move.xpm (stock_mail-move) + mail/not-spam.xpm (stock_not-spam) + mail/outbox.xpm (stock_outbox) + mail/reply-all.xpm (stock_mail-reply-to-all) + mail/reply.xpm (stock_mail-reply) + mail/save-draft.xpm (stock_mail-handling) + mail/send.xpm (stock_mail-send) + mail/spam.xpm (stock_spam) + + +The following icons were contributed by Adam Sjøgren : + + mail/preview.xpm (combining stock_mail and stock_zoom) + mail/save.xpm (combining stock_mail, stock_save and stock_convert) + + +The folling icon are duplicated from Emacs 22. They are either not present in +Emacs 21 or look different there. + + cancel.xpm + close.xpm + copy.xpm + cut.xpm + diropen.xpm + help.xpm + home.xpm + index.xpm + jump-to.xpm + left-arrow.xpm + new.xpm + next-node.xpm + open.xpm + paste.xpm + preferences.xpm + prev-node.xpm + print.xpm + redo.xpm + right-arrow.xpm + save.xpm + saveas.xpm + search.xpm + separator.xpm + spell.xpm + +You might want to use the following code to get Gnome icons in Emacs 21: + + ;; Only for Emacs 21: + (when (and (not (featurep 'xemacs)) + (not (boundp 'image-load-path)) + tool-bar-mode) + (push "/path/to/etc/images/" image-load-path) + (setq tool-bar-map (make-sparse-keymap)) + (clear-image-cache) + (tool-bar-setup)) + +The GNOME's stock_*.png files were converted to XPM using the following GIMP +script: + +;; -*- scheme -*- +;; Put this file in ~/.gimp-*/scripts/ +;; gimp -i -b '(rs-save-as-xpm "foo.png" "foo.xpm" 127)' '(gimp-quit 0)' +(define (rs-save-as-xpm filename filename2 threshold) + (let* ((image (car (gimp-file-load RUN-NONINTERACTIVE filename filename))) + (drawable (car (gimp-image-get-active-layer image)))) + (file-xpm-save RUN-NONINTERACTIVE image drawable + filename2 filename2 threshold) + (gimp-image-delete image))) +;; end diff --git a/etc/images/attach.xpm b/etc/images/attach.xpm new file mode 100644 index 0000000..e3298c9 --- /dev/null +++ b/etc/images/attach.xpm @@ -0,0 +1,126 @@ +/* XPM */ +static char * stock_attach_xpm[] = { +"24 24 99 2", +" c None", +". c #000000", +"+ c #010101", +"@ c #515151", +"# c #9A9A9A", +"$ c #CFCFCF", +"% c #6F6F6F", +"& c #464646", +"* c #A5A5A5", +"= c #E2E2E2", +"- c #FFFFFF", +"; c #F6F6F6", +"> c #8A8A8A", +", c #393939", +"' c #1C1C1C", +") c #8B8B8B", +"! c #E6E6E6", +"~ c #EEEEEE", +"{ c #E1E1E1", +"] c #F8F8F8", +"^ c #F7F7F7", +"/ c #CCCCCC", +"( c #565656", +"_ c #3E3E3E", +": c #818181", +"< c #D4D4D4", +"[ c #E7E7E7", +"} c #D7D7D7", +"| c #FAFAFA", +"1 c #F9F9F9", +"2 c #C2C2C2", +"3 c #CBCBCB", +"4 c #F5F5F5", +"5 c #D9D9D9", +"6 c #030303", +"7 c #545454", +"8 c #DEDEDE", +"9 c #B3B3B3", +"0 c #797979", +"a c #F4F4F4", +"b c #9D9D9D", +"c c #282828", +"d c #FBFBFB", +"e c #A6A6A6", +"f c #C5C5C5", +"g c #F0F0F0", +"h c #CACACA", +"i c #C7C7C7", +"j c #F2F2F2", +"k c #CECECE", +"l c #C4C4C4", +"m c #D5D5D5", +"n c #DADADA", +"o c #F3F3F3", +"p c #858585", +"q c #BEBEBE", +"r c #D3D3D3", +"s c #DCDCDC", +"t c #9C9C9C", +"u c #484848", +"v c #A7A7A7", +"w c #D6D6D6", +"x c #C8C8C8", +"y c #C6C6C6", +"z c #4C4C4C", +"A c #EAEAEA", +"B c #E5E5E5", +"C c #D8D8D8", +"D c #ADADAD", +"E c #BCBCBC", +"F c #E0E0E0", +"G c #F1F1F1", +"H c #909090", +"I c #686868", +"J c #A2A2A2", +"K c #C0C0C0", +"L c #C1C1C1", +"M c #787878", +"N c #AEAEAE", +"O c #151515", +"P c #D0D0D0", +"Q c #979797", +"R c #727272", +"S c #4A4A4A", +"T c #ECECEC", +"U c #ACACAC", +"V c #BABABA", +"W c #DDDDDD", +"X c #DBDBDB", +"Y c #B1B1B1", +"Z c #232323", +"` c #696969", +" . c #B7B7B7", +".. c #828282", +"+. c #404040", +"@. c #969696", +"#. c #323232", +"$. c #E8E8E8", +"%. c #121212", +" ", +" . . . . . ", +" . . . . ", +" . + @ # $ % . ", +" . . & * = - - ; > , ", +" . ' ) ! ~ { - ] ^ ; / ( ", +" . _ : < ' [ } | 1 ] 2 3 4 5 : . ", +" 6 7 ! - - - . } 8 9 0 . = ; 4 a b c ", +" . ; - - | | d . e f g ] . = 2 h a i ( ", +" . j ] 1 k l f . m 1 ] ] . 9 n a o o 0 . ", +" p - ] q 1 1 . r s 2 2 . = 4 a o j t c ", +" u - ^ ^ ] ] . v w ^ ; . = a l x j y z ", +" . A - ; q 2 . B C ; 4 . D E A F G A H . ", +" I - 4 ; ; J . K L . M w o j G G m N O ", +" , - a 4 4 n # . . 0 w j j G w P Q R S ", +" . T - a U V W o k X T } w Y : ( Z . ", +" ` - o o o o j j } ...+.Z . . ", +" c - o j j } q @.#.Z . ", +" . ! $./ # +.Z . . ", +" , .., %.. ", +" . . ", +" ", +" ", +" "}; diff --git a/etc/images/cancel.xpm b/etc/images/cancel.xpm new file mode 100644 index 0000000..1a9c80a --- /dev/null +++ b/etc/images/cancel.xpm @@ -0,0 +1,35 @@ +/* XPM */ +static char *magick[] = { +/* columns rows colors chars-per-pixel */ +"24 24 5 1", +" c #01c601c601c6", +". c Gray40", +"X c #a527a527a527", +"o c #da22da22da22", +"O c None", +/* pixels */ +"OOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOO OOOOOOOOO", +"OOOOOO XXooXX. OOOOOOO", +"OOOOO XooooooooX. OOOOOO", +"OOOOO oooooooooo. OOOOOO", +"OOOO Xooo ooo XoX. OOOOO", +"OOOO Xoo o XXX OOOOO", +"OOOO oooo XoXX OOOOO", +"OOOO Xoooo ooXXX OOOOO", +"OOOO Xooo OXX. OOOOO", +"OOOO Xoo o XX. OOOOO", +"OOOO .Xoo ooX XX.. OOOOO", +"OOOOO XXOoXoXXX.. OOOOOO", +"OOOOO XXXXXXXXX.. OOOOOO", +"OOOOOO XXXX... OOOOOOO", +"OOOOOOOO OOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOO" +}; diff --git a/etc/images/close.xpm b/etc/images/close.xpm new file mode 100644 index 0000000..498843b --- /dev/null +++ b/etc/images/close.xpm @@ -0,0 +1,29 @@ +/* XPM */ +static char * close_xpm[] = { +"24 24 2 1", +" c None", +". c #000000", +" ", +" ", +" ", +" ", +" ", +" ", +" . . ", +" . ... ", +" .. .... ", +" .. ... ", +" ..... ", +" ... ", +" ..... ", +" ....... ", +" ... .... ", +" ... .... ", +" ... .. ", +" ", +" ", +" ", +" ", +" ", +" ", +" "}; diff --git a/etc/images/connect.xpm b/etc/images/connect.xpm new file mode 100644 index 0000000..f58e8b3 --- /dev/null +++ b/etc/images/connect.xpm @@ -0,0 +1,85 @@ +/* XPM */ +static char * stock_connect_xpm[] = { +"24 24 58 1", +" c None", +". c #000000", +"+ c #989389", +"@ c #807D74", +"# c #C6C2BA", +"$ c #34332D", +"% c #B7B3AA", +"& c #C4C2BD", +"* c #EAE8E3", +"= c #9C978D", +"- c #BCB9B2", +"; c #363433", +"> c #E2E1DD", +", c #F0EFEC", +"' c #AAA7A0", +") c #F0EEEB", +"! c #B2B0AB", +"~ c #F9F9F8", +"{ c #C5C3BD", +"] c #0F0F0D", +"^ c #F2F0ED", +"/ c #EBEAE6", +"( c #8A857B", +"_ c #ECEBE8", +": c #EEECEA", +"< c #9F9C93", +"[ c #F3F2F0", +"} c #E8E7E4", +"| c #E3E1DD", +"1 c #78756B", +"2 c #BEBBB5", +"3 c #B3B1AA", +"4 c #7D786E", +"5 c #E1DFDB", +"6 c #D1D0CC", +"7 c #938E84", +"8 c #C8C5BF", +"9 c #A7A298", +"0 c #010101", +"a c #8C8981", +"b c #A6A29B", +"c c #726D63", +"d c #CECAC3", +"e c #A7A49E", +"f c #7E7A70", +"g c #A09D94", +"h c #817D73", +"i c #6C685E", +"j c #3C3933", +"k c #8B877E", +"l c #706C62", +"m c #B1ADA4", +"n c #97938A", +"o c #625E54", +"p c #6A655B", +"q c #37342D", +"r c #646056", +"s c #8B877D", +" ", +" ", +" ", +" ", +" ", +" ", +" .. .. ", +" ..+@.#@.. ", +" $%&*@.*@=-; ", +" .>,'*@.)@!~{] ", +"......@>,'*@.)@!~{@.....", +"*******^/(_@.:@<[}|*****", +"@@@@@1123451.6@789@@@@@@", +".....01abcd1.e@fghi.....", +" ]abcd1.e@fgh] ", +" ]jklmi.n@opq. ", +" ]]+r.s@.. ", +" ]] ]. ", +" ", +" ", +" ", +" ", +" ", +" "}; diff --git a/etc/images/contact.xpm b/etc/images/contact.xpm new file mode 100644 index 0000000..b3cf61f --- /dev/null +++ b/etc/images/contact.xpm @@ -0,0 +1,129 @@ +/* XPM */ +static char * stock_contact_xpm[] = { +"24 24 102 2", +" c None", +". c #000000", +"+ c #E3E1DE", +"@ c #ECEBE7", +"# c #F0EEEB", +"$ c #D2CFC9", +"% c #81817F", +"& c #4C4C4A", +"* c #ECEAE6", +"= c #ECEAE5", +"- c #EBE9E5", +"; c #D2CEC8", +"> c #D9C7B8", +", c #D9C7B9", +"' c #D8C5B8", +") c #D1C0B3", +"! c #D6C5B7", +"~ c #EBEAE5", +"{ c #D3D0C9", +"] c #CDBCAC", +"^ c #AFA093", +"/ c #3A3531", +"( c #443F3A", +"_ c #AE9F93", +": c #CBBAAB", +"< c #4E4E4C", +"[ c #595957", +"} c #595857", +"| c #7D7C7A", +"1 c #D3D0CA", +"2 c #C6B5A4", +"3 c #3D3833", +"4 c #433D37", +"5 c #C2B0A2", +"6 c #D4D1CA", +"7 c #B0A08E", +"8 c #261F18", +"9 c #D37D1E", +"0 c #D68021", +"a c #B26616", +"b c #27241F", +"c c #9C8E7F", +"d c #EAE9E5", +"e c #A29281", +"f c #2E2012", +"g c #CC751A", +"h c #CC761A", +"i c #BF6C16", +"j c #24211C", +"k c #8E8170", +"l c #EAE8E3", +"m c #E9E8E3", +"n c #E9E7E3", +"o c #8E7F6C", +"p c #221E17", +"q c #C56D14", +"r c #7D450D", +"s c #AF5F11", +"t c #221E19", +"u c #7F7260", +"v c #E9E7E2", +"w c #E8E6E1", +"x c #E7E5E1", +"y c #E7E5E0", +"z c #D5D1CB", +"A c #3E372C", +"B c #1C1F1F", +"C c #301B06", +"D c #542D07", +"E c #291B0E", +"F c #151412", +"G c #473F33", +"H c #E8E6E2", +"I c #546371", +"J c #849CB4", +"K c #56687C", +"L c #343332", +"M c #495868", +"N c #566D85", +"O c #293643", +"P c #E6E4DF", +"Q c #E5E4DE", +"R c #EEEDE9", +"S c #7B95AF", +"T c #7B96B0", +"U c #68819B", +"V c #8999AA", +"W c #5A7088", +"X c #607A96", +"Y c #5B7691", +"Z c #E5E3DE", +"` c #4B4A48", +" . c #757471", +".. c #E6E3DE", +"+. c #3B3A39", +"@. c #747371", +"#. c #D3CFC8", +"$. c #E2E1DD", +"%. c #E7E4E0", +"&. c #D2CFC8", +"*. c #D1D0CA", +"=. c #C2C0B9", +" ", +" ", +" ", +" . . . . . . . . . . . . . . . . . . . . ", +" . + @ # # # # # # # # # # # # # # # # # $ . ", +" . # % . . . . . . . & * = - - - - - - - ; . ", +" . # . > , ' ) ! > , . * * ~ ~ ~ ~ - - ~ { . ", +" . # . ] ^ / . ( _ : . * < [ ~ } } | - ~ 1 . ", +" . # . 2 3 . . . 4 5 . * * ~ ~ - - - - - 6 . ", +" . # . 7 8 9 0 a b c . * [ < | [ - } | d 6 . ", +" . # . e f g h i j k . * * l l m n n n n 6 . ", +" . # . o p q r s t u . v v w w w x y y y z . ", +" . # . A B C D E F G . H H y y y y y y y 6 . ", +" . # . I J K L M N O . y y P P P P P P Q { . ", +" . R . S T U V W X Y . y y P P P P Z Z Z { . ", +" . d ` . . . . . . . ` y y ...+.+.Z @.Z #.. ", +" . $.y y y y y y y y y %.P Z Z Z Z Z Z Z &.. ", +" . *.6 z 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 =.. ", +" . . . . . . . . . . . . . . . . . . . . . ", +" ", +" ", +" ", +" ", +" "}; diff --git a/etc/images/copy.xpm b/etc/images/copy.xpm new file mode 100644 index 0000000..750aebb --- /dev/null +++ b/etc/images/copy.xpm @@ -0,0 +1,53 @@ +/* XPM */ +static char * copy_xpm[] = { +"24 24 26 1", +" c None", +". c #000000", +"+ c #B4B4B4", +"@ c #F8F8F8", +"# c #F6F6F6", +"$ c #C3C3C3", +"% c #E9E9E9", +"& c #989898", +"* c #828282", +"= c #8A8A8A", +"- c #E8E8E8", +"; c #636363", +"> c #5A5A5A", +", c #6B6B6B", +"' c #B3B3B3", +") c #FFFFFF", +"! c #D6D6D6", +"~ c #818181", +"{ c #A7A7A7", +"] c #8F8F8F", +"^ c #C6C6C6", +"/ c #808080", +"( c #E7E7E7", +"_ c #6D6D6D", +": c #767676", +"< c #F5F5F5", +" ", +" ", +" ", +"............. ", +".+@@@@@@@@@#$. ", +".@%%%%%%%%%%%. ", +".@&**=%+*%*+%. ", +".@%%%%%%%%---. ", +".@;>%,*+-............ ", +".@%%%%%%.'))))))))))!. ", +".@&**%*~.)))))))))))). ", +".@%%%%%-.){]]&)^])]^). ", +".@;>>%,/.)))))))))))). ", +".@%%%%%(.)_;):]^)^])). ", +".@&**%*~.)))))))))))). ", +".<%%%%%-.){]])]]^)&]). ", +".$%%%%%-.)))))))))))). ", +" ........)_;;):]^)^]). ", +" .)))))))))))). ", +" .){]])]]^)&]). ", +" .)))))))))))). ", +" .!))))))))))!. ", +" .............. ", +" "}; diff --git a/etc/images/cut.xpm b/etc/images/cut.xpm new file mode 100644 index 0000000..3f8e71d --- /dev/null +++ b/etc/images/cut.xpm @@ -0,0 +1,67 @@ +/* XPM */ +static char * cut_xpm[] = { +"24 24 40 1", +" c None", +". c #000000", +"+ c #C9C7C2", +"@ c #E6E4E0", +"# c #EFEEED", +"$ c #494946", +"% c #73726E", +"& c #F0EEED", +"* c #7F7D75", +"= c #F2F1EF", +"- c #D2CFC8", +"; c #E7E7E4", +"> c #BAB5AB", +", c #565653", +"' c #EDECE9", +") c #A4A097", +"! c #817F7E", +"~ c #4E4C48", +"{ c #F6F5F4", +"] c #474541", +"^ c #EFEEEC", +"/ c #8C8B8A", +"( c #F3F2F0", +"_ c #77746D", +": c #323232", +"< c #EBEBEA", +"[ c #605D58", +"} c #F5F4F3", +"| c #CECCC7", +"1 c #363634", +"2 c #6F6E6D", +"3 c #BEBDBB", +"4 c #EAE7E4", +"5 c #B8B5B1", +"6 c #474747", +"7 c #DAD8D4", +"8 c #9B9996", +"9 c #161615", +"0 c #6D6B6A", +"a c #3A3837", +" ", +" ", +" . . ", +" . . ", +" .+. .@. ", +" .#$ %@. ", +" .&*. .=-. ", +" .;>, %'). ", +" !#*. .=-~ ", +" .{>] ~^>. ", +" /(_.:<-[ ", +" .}|123>. ", +" .456>. ", +" .78.. ", +" .90a. ", +" ............. ", +" . ... ... ... ", +" .. .. .. .. ", +" . . . . ", +" .. .. .. .. ", +" .... .. . ", +" .... .... ", +" ", +" "}; diff --git a/etc/images/delete.xpm b/etc/images/delete.xpm new file mode 100644 index 0000000..e2d1d90 --- /dev/null +++ b/etc/images/delete.xpm @@ -0,0 +1,270 @@ +/* XPM */ +static char * stock_delete_xpm[] = { +"24 24 243 2", +" c None", +". c #000000", +"+ c #1C1C1C", +"@ c #767676", +"# c #E6E6E6", +"$ c #D3D3D3", +"% c #C3C3C3", +"& c #909090", +"* c #494949", +"= c #48473D", +"- c #BAB8A6", +"; c #E2E2DF", +"> c #F1F1F0", +", c #EAE9E6", +"' c #F2F2EE", +") c #EBEAE5", +"! c #C1C0B5", +"~ c #57564A", +"{ c #525146", +"] c #A8A68F", +"^ c #BDBBA1", +"/ c #C0BEA3", +"( c #A3A18A", +"_ c #6D6C5C", +": c #7C7C72", +"< c #4C4C49", +"[ c #45453F", +"} c #44433A", +"| c #6F6F67", +"1 c #C6C5B9", +"2 c #B6B59B", +"3 c #6D6C5D", +"4 c #B3B19B", +"5 c #A7A68E", +"6 c #908F7A", +"7 c #AAA993", +"8 c #CCCBB5", +"9 c #D0CEBA", +"0 c #D5D3C1", +"a c #AEADA3", +"b c #94938A", +"c c #454442", +"d c #232321", +"e c #353431", +"f c #292823", +"g c #1E1E1A", +"h c #535246", +"i c #ADAC93", +"j c #929189", +"k c #C2C1AF", +"l c #B1AF96", +"m c #ACAA92", +"n c #93927D", +"o c #080808", +"p c #D1D0C1", +"q c #D6D5C4", +"r c #DFDED1", +"s c #CECDC0", +"t c #ACACA6", +"u c #908F8A", +"v c #7E7D77", +"w c #5C5C55", +"x c #47463E", +"y c #656456", +"z c #777665", +"A c #807E6F", +"B c #BEBDA7", +"C c #B5B39A", +"D c #A19F88", +"E c #D9D8CC", +"F c #F6F5F2", +"G c #DBDAD1", +"H c #DAD9CE", +"I c #E5E4D9", +"J c #D0CFC3", +"K c #D3D3C9", +"L c #CAC9BC", +"M c #B7B6A6", +"N c #B8B6A1", +"O c #B0AF96", +"P c #B9B89D", +"Q c #B9B79D", +"R c #B8B69C", +"S c #C4C2A9", +"T c #AFAD97", +"U c #8B8976", +"V c #AAA998", +"W c #B6B6B2", +"X c #F9F9F7", +"Y c #FAFAF8", +"Z c #F4F4F0", +"` c #E2E1DA", +" . c #D9D9CE", +".. c #DBDACF", +"+. c #D3D1BE", +"@. c #C5C4AC", +"#. c #D6D5C3", +"$. c #CDCCBF", +"%. c #BBBAAD", +"&. c #7C7A69", +"*. c #717060", +"=. c #131313", +"-. c #999882", +";. c #AFAE9D", +">. c #C3C3BE", +",. c #DEDEDC", +"'. c #E9E9E8", +"). c #FBFBFA", +"!. c #FDFDFC", +"~. c #FDFDFD", +"{. c #FCFBFA", +"]. c #F2F2EF", +"^. c #EAE9E3", +"/. c #C0BFB1", +"(. c #959484", +"_. c #787766", +":. c #6E6D5D", +"<. c #5B5B4D", +"[. c #5D5C4F", +"}. c #A3A293", +"|. c #B8B7A6", +"1. c #D8D7D0", +"2. c #DBDBD4", +"3. c #D3D2CA", +"4. c #C8C8C3", +"5. c #C6C5BD", +"6. c #BDBCAD", +"7. c #BAB8A8", +"8. c #9F9E8B", +"9. c #8E8C78", +"0. c #8C8B77", +"a. c #7A7968", +"b. c #6C6B5D", +"c. c #4E4D45", +"d. c #424242", +"e. c #7B7B73", +"f. c #9F9F96", +"g. c #D2D1C7", +"h. c #DCDBD2", +"i. c #CCCBBE", +"j. c #D1D0C2", +"k. c #C4C3B6", +"l. c #9A9883", +"m. c #807F6D", +"n. c #7D7C6B", +"o. c #6A695E", +"p. c #40403E", +"q. c #37372D", +"r. c #0F0F0F", +"s. c #383734", +"t. c #787875", +"u. c #999893", +"v. c #8A897E", +"w. c #B3B2A4", +"x. c #AAAA9E", +"y. c #878673", +"z. c #8F8D79", +"A. c #626155", +"B. c #545451", +"C. c #31312E", +"D. c #2B2B23", +"E. c #71715D", +"F. c #57574B", +"G. c #42423A", +"H. c #262620", +"I. c #212121", +"J. c #1B1B1B", +"K. c #242424", +"L. c #161613", +"M. c #2A2A22", +"N. c #303027", +"O. c #3F3F34", +"P. c #7A7A65", +"Q. c #5B5B51", +"R. c #858576", +"S. c #76766B", +"T. c #98988E", +"U. c #75756B", +"V. c #515146", +"W. c #7F7F74", +"X. c #6A6A58", +"Y. c #404035", +"Z. c #626251", +"`. c #545445", +" + c #3E3E33", +".+ c #555546", +"++ c #34342B", +"@+ c #515143", +"#+ c #85856E", +"$+ c #5D5D54", +"%+ c #919182", +"&+ c #828278", +"*+ c #AAAAA3", +"=+ c #7A7A71", +"-+ c #4E4E45", +";+ c #8A8A80", +">+ c #7C7C6D", +",+ c #424237", +"'+ c #606052", +")+ c #5A5A4A", +"!+ c #3C3C32", +"~+ c #4E4E41", +"{+ c #35352C", +"]+ c #ACAC9C", +"^+ c #85857B", +"/+ c #BBBBB3", +"(+ c #A3A39A", +"_+ c #54544B", +":+ c #93938A", +"<+ c #919185", +"[+ c #686856", +"}+ c #414136", +"|+ c #434337", +"1+ c #A4A493", +"2+ c #C1C1B6", +"3+ c #B1B1A2", +"4+ c #6B6B5F", +"5+ c #9D9D8B", +"6+ c #848470", +"7+ c #71715E", +"8+ c #A5A594", +"9+ c #C2C2B7", +"0+ c #7B7B65", +"a+ c #5F5F4F", +"b+ c #666654", +"c+ c #49493C", +"d+ c #575748", +"e+ c #57574A", +"f+ c #7D7D6D", +"g+ c #767669", +"h+ c #B3B3A8", +"i+ c #A1A194", +"j+ c #6D6D61", +"k+ c #B3B3A5", +"l+ c #696957", +"m+ c #414135", +"n+ c #565647", +"o+ c #444438", +"p+ c #595951", +"q+ c #585849", +"r+ c #4E4E40", +"s+ c #747467", +"t+ c #616153", +" . . . . . . ", +" . + @ # $ % & * . . ", +" . . . = - ; > , ' ) ! ~ { . . . ", +" . ] ^ / ( _ : < [ } | 1 2 3 4 5 6 . ", +" . 7 8 9 0 a b c d e f g h i j k l m n . ", +" o p 8 q r s t u v w x y z A B C 2 C D . ", +" . E F G H I J K L M N O D P Q R S T U . ", +" . V W X Y Z ` ...0 +.S / @.#.$.%.&.*.. ", +" =.-.;.>.,.'.).!.~.{.X ].^.G /.(._.:.<.. ", +" . [.n }.|.1.2.3.4.5.6.7.8.9.0.9.a.b.c. ", +" . d.e.f.g.h.i.j.k.l l l l.m.n.o.p.. ", +" . q.r.s.t.u.v.w.x.( y.z.A.B.C.. D.. ", +" . E.F.G.H.I.J.. K.. . . . L.M.N.O.. ", +" . P.Q.R.S.T.U.V.W.X.Y.Z.`. +.+++@+. ", +" . #+$+%+&+*+=+-+;+>+,+'+)+!+~+{+`.. ", +" . #+Q.]+^+/+(+_+:+<+,+'+[+}+X.|+X.. ", +" . #+Q.1+^+2+3+4+3+5+`.6+7+|+X.|+X.. ", +" . #+Q.8+^+9+3+4+3+5+`.6+7+|+X.|+X.. ", +" . #+Q.5+^+2+3+4+3+5+`.6+7+|+X.|+X.. ", +" . 0+Q.1+^+2+3+4+3+5+`.6+7+|+X.|+a+. ", +" . b+Q.1+&+2+3+4+3+5+`.6+7+|+X.c+d+. ", +" . e+f+g+h+i+j+k+5+`.6+l+m+n+o+. . ", +" . . . p+q+r+s+t+~+c+c+. . . ", +" . . . . . . . . . . "}; diff --git a/etc/images/describe.xpm b/etc/images/describe.xpm new file mode 100644 index 0000000..38062d5 --- /dev/null +++ b/etc/images/describe.xpm @@ -0,0 +1,95 @@ +/* XPM */ +static char * stock_properties_xpm[] = { +"24 24 68 1", +" c None", +". c #000000", +"+ c #74716E", +"@ c #C9C4BD", +"# c #DFDAD2", +"$ c #F4EFE5", +"% c #F2ECE1", +"& c #FFFFFF", +"* c #4C4B48", +"= c #EEE5D4", +"- c #ECE2CF", +"; c #EADFC9", +"> c #F9F9F9", +", c #E2D2B1", +"' c #F4F4F4", +") c #EEEEEE", +"! c #959595", +"~ c #F5F5F5", +"{ c #F6F6F6", +"] c #D9D9D9", +"^ c #C7B99C", +"/ c #E9E9E9", +"( c #787878", +"_ c #E1E1E1", +": c #E2E2E2", +"< c #C8C8C8", +"[ c #877E69", +"} c #9A8F78", +"| c #DEDEDE", +"1 c #E3E3E3", +"2 c #929292", +"3 c #AFA389", +"4 c #ACACAC", +"5 c #A2A2A2", +"6 c #E4E4E4", +"7 c #BCBCBC", +"8 c #939393", +"9 c #EDEDED", +"0 c #EFEFEF", +"a c #F0F0F0", +"b c #E5E5E5", +"c c #E7E7E7", +"d c #E8E8E8", +"e c #EAEAEA", +"f c #EBEBEB", +"g c #BEBEBE", +"h c #F1F1F1", +"i c #DFDFDF", +"j c #F3F3F3", +"k c #E0E0E0", +"l c #ABABAB", +"m c #AEAEAE", +"n c #AFAFAF", +"o c #ADADAD", +"p c #B0B0B0", +"q c #B1B1B1", +"r c #F7F7F7", +"s c #B3B3B3", +"t c #F8F8F8", +"u c #B4B4B4", +"v c #B5B5B5", +"w c #B6B6B6", +"x c #FAFAFA", +"y c #FBFBFB", +"z c #DCDCDC", +"A c #DDDDDD", +"B c #E6E6E6", +"C c #969696", +" ", +" ", +" ", +" ......... ", +" .+@#$%.&&. ", +" *=---;.&>. ", +" .......;.,,,,.'). ", +" !~~{].;.^.,^^./(.. ", +" .~_:<.;.[.^.}..|].. ", +" .~:1.;.2.[.3.4...5. ", +" .{16..7/8.[.49)0a|. ", +" .{6bcd/ef8.g9)0ahi. ", +" .{bcd/ef9ef9)0ahjk. ", +" .{cllefmnomnppqj'_. ", +" .rd/ef9)09)0ahj'~:. ", +" .r/4o9)ppnppqss~{1. ", +" .tef9)0ah0ahj'~{rb. ", +" .>9npahssqssuvw>xc. ", +" .>)0ahj'~j'~{r>xyd. ", +" .nzA|ik_:k_:1bBcdC. ", +" ................. ", +" ", +" ", +" "}; diff --git a/etc/images/diropen.xpm b/etc/images/diropen.xpm new file mode 100644 index 0000000..6937b99 --- /dev/null +++ b/etc/images/diropen.xpm @@ -0,0 +1,44 @@ +/* XPM */ +static char * diropen_xpm[] = { +"19 24 17 1", +" c None", +". c #000100", +"+ c #C6C9A6", +"@ c #D0D3AF", +"# c #93997C", +"$ c #E6E7D0", +"% c #BEC19E", +"& c #B4B895", +"* c #A7AA88", +"= c #6B6D59", +"- c #4A4E40", +"; c #7C8166", +"> c #898E72", +", c #3C4032", +"' c #575845", +") c #34332C", +"! c #24231D", +" ............... ", +" .+@@@@@@@@@@@@@#. ", +".$@@@@@@@@@@@@@@@#.", +".++++%%%%%%%%%&&&*.", +".&&&&&&&&&&******#.", +".*%+++%%%%%%%%%&=#.", +".*+***********##-#.", +".*+****;===;####-#.", +".*+****=*****###-#.", +".*+****;*****###-#.", +".*+****########>-#.", +".*&######>>>>>>>,>.", +".*#-------------'>)", +".*&&&&&&&&&&&&&*#>)", +".*&************#'>)", +".*&***********##,>)", +".*&****====;###>,>)", +".#&****=**#**##>,;)", +".#&****>****###>,;)", +".#&****########>,;)", +".##''''''''''''',;)", +".#>==============;)", +".''''''''''''''''-!", +" ................. "}; diff --git a/etc/images/disconnect.xpm b/etc/images/disconnect.xpm new file mode 100644 index 0000000..e08b282 --- /dev/null +++ b/etc/images/disconnect.xpm @@ -0,0 +1,69 @@ +/* XPM */ +static char * stock_disconnect_xpm[] = { +"24 24 42 1", +" c None", +". c #000000", +"+ c #989389", +"@ c #807D74", +"# c #C6C2BA", +"$ c #43423C", +"% c #B7B3AA", +"& c #C4C2BD", +"* c #EAE8E3", +"= c #E2E1DD", +"- c #F0EFEC", +"; c #AAA7A0", +"> c #C5D2C8", +", c #E9EEEA", +"' c #F0EEEB", +") c #F2F0ED", +"! c #EBEAE6", +"~ c #8A857B", +"{ c #ECEBE8", +"] c #EEECEA", +"^ c #78756B", +"/ c #BEBBB5", +"( c #B3B1AA", +"_ c #7D786E", +": c #E1DFDB", +"< c #D1D0CC", +"[ c #010101", +"} c #8C8981", +"| c #A6A29B", +"1 c #726D63", +"2 c #CECAC3", +"3 c #A7A49E", +"4 c #0F0F0D", +"5 c #F0F3F1", +"6 c #272622", +"7 c #8B877E", +"8 c #706C62", +"9 c #B1ADA4", +"0 c #6C685E", +"a c #97938A", +"b c #646056", +"c c #8B877D", +" ", +" ", +" ", +" ", +" ", +" ", +" .. ..", +" ..+@. .#@", +" $%&*@.... .*@", +" .=-;*@.>>,. .'@", +".....@=-;*@.... .'@", +"******)!~{@. .]@", +"@@@@^^/(_:^. .<@", +"....[^}|12^.... .3@", +" 4}|12^.>>5. .3@", +" 67890.... .a@", +" 44+b. .c@", +" 44 4.", +" ", +" ", +" ", +" ", +" ", +" "}; diff --git a/etc/images/exit.xpm b/etc/images/exit.xpm new file mode 100644 index 0000000..7f9daf1 --- /dev/null +++ b/etc/images/exit.xpm @@ -0,0 +1,167 @@ +/* XPM */ +static char * stock_exit_xpm[] = { +"24 24 140 2", +" c None", +". c #000000", +"+ c #D6D6D4", +"@ c #BDBDBC", +"# c #A8A8A4", +"$ c #92928F", +"% c #727370", +"& c #61615E", +"* c #20201F", +"= c #F1F1EF", +"- c #E6E6E4", +"; c #DADAD7", +"> c #CFCFCD", +", c #C4C4C1", +"' c #A8A8A5", +") c #767674", +"! c #777774", +"~ c #1E1E1D", +"{ c #B9B9B7", +"] c #AEAEAC", +"^ c #8F8F8D", +"/ c #262626", +"( c #414140", +"_ c #E9836C", +": c #DEDEDC", +"< c #C5C5C2", +"[ c #636362", +"} c #040504", +"| c #040604", +"1 c #050705", +"2 c #E87B62", +"3 c #E67056", +"4 c #D5D5D3", +"5 c #DBDBD8", +"6 c #D0D0CE", +"7 c #080A07", +"8 c #0A0C09", +"9 c #0A0D09", +"0 c #0B0E0A", +"a c #F0B0A1", +"b c #EB8D77", +"c c #DF421E", +"d c #E97E66", +"e c #CBCBC8", +"f c #0C0F0B", +"g c #0F130D", +"h c #10140E", +"i c #11150F", +"j c #EFA392", +"k c #BFBFBD", +"l c #5D5D5C", +"m c #10150F", +"n c #141912", +"o c #161C14", +"p c #171D15", +"q c #B7B7B4", +"r c #0C0C0C", +"s c #192017", +"t c #1C2319", +"u c #1D241A", +"v c #CD8484", +"w c #990000", +"x c #701616", +"y c #A6A6A5", +"z c #181E16", +"A c #1E261B", +"B c #212A1E", +"C c #222B1F", +"D c #4F0000", +"E c #AEAEAB", +"F c #1D261B", +"G c #242E21", +"H c #273224", +"I c #283325", +"J c #580000", +"K c #B5B5B3", +"L c #293426", +"M c #2D3929", +"N c #2E3A2A", +"O c #7C4343", +"P c #6A0000", +"Q c #720000", +"R c #BDBDBB", +"S c #232C20", +"T c #2A3526", +"U c #303C2B", +"V c #33402E", +"W c #C5C5C3", +"X c #1E261C", +"Y c #303D2C", +"Z c #374532", +"` c #394834", +" . c #500000", +".. c #CDCDCB", +"+. c #1B2319", +"@. c #253022", +"#. c #303E2D", +"$. c #394934", +"%. c #3D4E38", +"&. c #9D9D9B", +"*. c #565655", +"=. c #2C3828", +"-. c #40503A", +";. c #43553E", +">. c #BABAB7", +",. c #777776", +"'. c #323830", +"). c #232C1F", +"!. c #313E2D", +"~. c #3B4A36", +"{. c #43553D", +"]. c #485B42", +"^. c #4A5E44", +"/. c #F0F0EE", +"(. c #E5E5E3", +"_. c #C6C6C3", +":. c #ACACAB", +"<. c #8B8B8A", +"[. c #32392F", +"}. c #2C3728", +"|. c #3F503A", +"1. c #465840", +"2. c #4B5E44", +"3. c #4E6347", +"4. c #506549", +"5. c #DADAD8", +"6. c #7A7D78", +"7. c #333C30", +"8. c #475A41", +"9. c #4F6348", +"0. c #53694C", +"a. c #566C4E", +"b. c #576D4F", +"c. c #91968F", +"d. c #3B4736", +"e. c #42543C", +"f. c #51674A", +"g. c #586F50", +"h. c #5B7353", +"i. c #5C7454", +" ", +" . . . . . . . . . . . . . . . . ", +" . + @ # $ % & & & * . . . . . . ", +" . = - ; > , ' ) ! ~ . . . . . . ", +" . . = - ; > , { ] ^ / . . . . . . ", +" . . . = - ; > , { { { ( . . . . . . ", +" . _ . : - ; > < { { { [ } | 1 1 1 . ", +". . . . . . 2 3 . 4 5 6 < { { { [ 7 8 9 0 0 . ", +". a 2 2 2 2 b c d . e 6 < { { { [ f g h i i . ", +". j c c c c c c c 3 . k < { l { [ m n o p p . ", +". j c c c c c c c c 3 . q { l r [ n s t u u . ", +". v w w w w w w w w w x . y r { [ z A B C C . ", +". v w w w w w w w w D . E { { { [ F G H I I . ", +". v w w w w w w w J . K < { { { [ C L M N N . ", +". O P P P P Q w J . R 6 < { { { [ S T U V V . ", +". . . . . . Q J . W 5 6 < { { { [ X H Y Z ` . ", +" . .. ..- 5 6 < { { { [ +.@.#.$.%.. ", +" . . . = - 5 6 < { ] &.*.B =.Z -.;.. ", +" . . = - 5 6 >.&.,.'.).!.~.{.].^.. ", +" . /.(._.:.<.[.}.Z |.1.2.3.4.4.. ", +" . 5.k 6.7.Z -.8.9.0.a.a.b.b.b.. ", +" . c.d.e.^.f.g.h.i.i.i.i.i.i.i.. ", +" . . . . . . . . . . . . . . . . ", +" "}; diff --git a/etc/images/gnus/mail_send.xpm b/etc/images/gnus/mail_send.xpm new file mode 100644 index 0000000..f1d2282 --- /dev/null +++ b/etc/images/gnus/mail_send.xpm @@ -0,0 +1,39 @@ +/* XPM */ +static char *magick[] = { +/* columns rows colors chars-per-pixel */ +"24 24 9 1", +" c Gray0", +". c #675e6580613e", +"X c #8c8c7c7c6969", +"o c #9b458d377822", +"O c #a941a6459f3e", +"+ c #c8c8b2b29898", +"@ c #dadac2c2a5a5", +"# c #eb4dea2fe4ad", +"$ c None", +/* pixels */ +"$$$$$$$$$$$$$$$$$$$$$$$$", +"$$$$$$$$$$$$$$$$$$$$$$$$", +"$$$$$$$$$$$$$ $$$$$$$", +"$$$$$$$$ .@#+ $$$$$$", +"$$$ .+#####@O $$$$$$", +"$$ .+##########.+O $$$$$", +"$$ @..########O.+# $$$$$", +"$$ O@O..@#####.+## $$$$$", +"$$$ ###+O.O##...##O $$$$", +"$$$ @####@+..O#O.+# $$$$", +"$$$ O####.#######.O $$$$", +"$$$$ ###+O########.O $$$", +"$$$$ ###.########@O $$$", +"$$$$ +#+O#####@O $$$$$", +"$$$$$ #.###@O $$$$$$", +"$$$$$ .O@O $$ .. $$$$$", +"$$$$$ .. $$$$ .oo. $$$$", +"$$$$$$ $$$$$ oo $$$", +"$$$$$$$$$$$$$$$ Oo $$$$$", +"$$$$$$$$$$$$$$ oOOX $$$$", +"$$$$$$$$$$$$$$ ++++ $$$$", +"$$$$$$$$$$$$$ O@@@@O $$$", +"$$$$$$$$$$$$$ $$$", +"$$$$$$$$$$$$$$$$$$$$$$$$" +}; diff --git a/etc/images/gnus/toggle-subscription.xpm b/etc/images/gnus/toggle-subscription.xpm new file mode 100644 index 0000000..c067468 --- /dev/null +++ b/etc/images/gnus/toggle-subscription.xpm @@ -0,0 +1,58 @@ +/* XPM */ +static char * stock_task_recurring_xpm[] = { +"24 24 31 1", +" c None", +". c #000000", +"+ c #FFFFFF", +"@ c #F4E2BC", +"# c #F4D597", +"$ c #434343", +"% c #F0CC84", +"& c #EBB13D", +"* c #4B4B4B", +"= c #535353", +"- c #C8C8C8", +"; c #7D7D7D", +"> c #7C7C7C", +", c #858585", +"' c #5C5C5C", +") c #949494", +"! c #F2F2F2", +"~ c #B6B6B6", +"{ c #BDBDBD", +"] c #818181", +"^ c #878787", +"/ c #B2B2B2", +"( c #FDFDFD", +"_ c #DBDBDB", +": c #CCCCCC", +"< c #ECECEC", +"[ c #7F7F99", +"} c #333366", +"| c #8F8FA9", +"1 c #59597F", +"2 c #EEEEEE", +" ", +" . . . . . . . ", +" .+.+.+.+.+.+.+. ", +" .@.#.#.#.#.#.#. ", +" .$%$&*&*&=&=&$&*. ", +" .-*;*>*>*>*>=,'). ", +" .!>~>{]{]{]{]{^/. ", +" .(_:::::::::::_/. ", +" .+<<<<<<<<<<<< c #F2F0EC", +", c #E1DFDC", +"' c #AFADAA", +") c #272726", +"! c #020202", +"~ c #3F3E3E", +"{ c #36302D", +"] c #181818", +"^ c #FBF8F5", +"/ c #FEFCF8", +"( c #FAF8F5", +"_ c #F5F4F1", +": c #F2F1ED", +"< c #F1EFEB", +"[ c #F1EEEB", +"} c #EAE9E6", +"| c #DAD8D4", +"1 c #100E0E", +"2 c #1F100E", +"3 c #AF3A1E", +"4 c #FBAB93", +"5 c #FAE9E3", +"6 c #F0EFEB", +"7 c #E9E8E5", +"8 c #EAE8E6", +"9 c #ECEAE8", +"0 c #EDEBE9", +"a c #EDEBE8", +"b c #EACFC6", +"c c #D5340A", +"d c #751904", +"e c #100806", +"f c #34160D", +"g c #AF3C20", +"h c #FCCCBD", +"i c #F7BEAD", +"j c #E67554", +"k c #DFDDDB", +"l c #DBD9D6", +"m c #D8D7D3", +"n c #DBDAD6", +"o c #E3E2DE", +"p c #ECEBE8", +"q c #E5572D", +"r c #E33A0B", +"s c #D4340A", +"t c #691504", +"u c #100504", +"v c #582C22", +"w c #0F0F0F", +"x c #FDD4C8", +"y c #F7BFAF", +"z c #E87554", +"A c #D5512B", +"B c #C68270", +"C c #BEBDBA", +"D c #A5A3A0", +"E c #9C9A95", +"F c #B9B7B2", +"G c #D7D6D2", +"H c #E7E5E2", +"I c #E79A85", +"J c #E53C0B", +"K c #E43C0B", +"L c #E23A0B", +"M c #C93009", +"N c #010000", +"O c #040100", +"P c #FAB19C", +"Q c #FACCBE", +"R c #EB8264", +"S c #D8532D", +"T c #C0340F", +"U c #932006", +"V c #141412", +"W c #857974", +"X c #DA370B", +"Y c #EC7C5B", +"Z c #E95B32", +"` c #DE380B", +" . c #9D2306", +".. c #626261", +"+. c #FEF1ED", +"@. c #F09479", +"#. c #DC532B", +"$. c #C0350F", +"%. c #942006", +"&. c #621404", +"*. c #E2522B", +"=. c #F2A690", +"-. c #E74E21", +";. c #E23B0B", +">. c #C99181", +",. c #454342", +"'. c #E5E4E2", +"). c #FCFBFA", +"!. c #E2D8D3", +"~. c #C34C2A", +"{. c #B02B07", +"]. c #9E2D12", +"^. c #EF8D71", +"/. c #F09B83", +"(. c #EADDD7", +"_. c #272724", +":. c #F0EEEC", +"<. c #F3F2EF", +"[. c #D7D6D3", +"}. c #BFBEBB", +"|. c #9E6153", +"1. c #3F0D02", +"2. c #F0B9A9", +"3. c #F6F5F4", +"4. c #E8E7E4", +"5. c #DAD8D5", +"6. c #585652", +"7. c #F6F4F0", +"8. c #DAD8D6", +"9. c #C2C1BE", +"0. c #989691", +"a. c #0A0A08", +"b. c #F6F4F2", +"c. c #F4F3F1", +"d. c #E4E3E0", +"e. c #D3D2CE", +"f. c #63625D", +"g. c #DCDAD8", +"h. c #C7C6C2", +"i. c #ABAAA5", +"j. c #0A0A0A", +"k. c #FAF8F6", +"l. c #EFEDEA", +"m. c #DDDCD8", +"n. c #C6C4C2", +"o. c #3E3E39", +"p. c #1B1B19", +"q. c #F0EEEA", +"r. c #E0DFDD", +"s. c #CCCBC9", +"t. c #C0BFBB", +"u. c #131311", +"v. c #676663", +"w. c #FCFAF8", +"x. c #D6D4D2", +"y. c #BCBAB7", +"z. c #3C3C3A", +"A. c #DEDCD9", +"B. c #7E4B3E", +"C. c #232323", +"D. c #CC9385", +"E. c #FAFAF7", +"F. c #E6E6E2", +"G. c #CDCCCA", +"H. c #B0B0AC", +"I. c #EDE3DF", +"J. c #E78468", +"K. c #DF5D3A", +"L. c #631909", +"M. c #282828", +"N. c #B46E5E", +"O. c #FCC3B2", +"P. c #F1A691", +"Q. c #DCD2CC", +"R. c #C8C6C3", +"S. c #7E7C78", +"T. c #E8AD9C", +"U. c #E96139", +"V. c #EB7452", +"W. c #EF8E72", +"X. c #EA8063", +"Y. c #9E2E13", +"Z. c #3F1811", +"`. c #121212", +" + c #6B433B", +".+ c #E0A191", +"++ c #FDD3C7", +"@+ c #F4AD98", +"#+ c #DE532B", +"$+ c #C83409", +"%+ c #B48274", +"&+ c #383534", +"*+ c #D6340A", +"=+ c #E43D0F", +"-+ c #E8582E", +";+ c #ED7957", +">+ c #F4B6A4", +",+ c #F4B09D", +"'+ c #F0E5E0", +")+ c #F4F3EF", +"!+ c #FDF8F6", +"~+ c #FBCEC1", +"{+ c #F28B6E", +"]+ c #E44E23", +"^+ c #D3370A", +"/+ c #BF2F09", +"(+ c #260800", +"_+ c #190F0B", +":+ c #D5350A", +"<+ c #E43D0C", +"[+ c #E74C1F", +"}+ c #EFBBAB", +"|+ c #F5F4F3", +"1+ c #F5F3F1", +"2+ c #EAB1A0", +"3+ c #DE4316", +"4+ c #C5310A", +"5+ c #591202", +"6+ c #0E0504", +"7+ c #C83009", +"8+ c #E0532B", +"9+ c #E7E6E3", +"0+ c #E7E6E2", +"a+ c #DDDCD9", +"b+ c #CFCECA", +"c+ c #C14724", +"d+ c #AE2907", +"e+ c #290800", +"f+ c #0F0705", +"g+ c #9B2205", +"h+ c #C1A89F", +"i+ c #D1D0CC", +"j+ c #CFCDCA", +"k+ c #C7C6C3", +"l+ c #BBBAB7", +"m+ c #B5B4B1", +"n+ c #A7A6A2", +"o+ c #66564F", +"p+ c #0B0908", +"q+ c #010100", +"r+ c #222221", +"s+ c #51504B", +"t+ c #5D5C57", +"u+ c #3B3B37", +" . . + @ # # $ % ", +" . . . . & # * = - ; > , ' ) ! ~ . . . . ", +". . { ] ^ / ( _ : > < [ } | . 1 . . ", +" . 2 3 4 5 6 - 7 8 9 0 0 a b c d e . ", +" . f g h i j k l m n o } p a q r s t u . . ", +" v w x y z A B C D E F G H I J K L M . N ", +" O P Q R S T U . . . . V W X Y Z K ` .. ", +" ..+.@.#.$.%.. . . &.*.=.-.;.>.! . ", +",.'.).!.~.{.. . . ].^./.(.n _.. ", +"@ :.<.[.}.|.. 1.2.3.4.5.6.. ", +"# 7.6 8.9.0.. a.b.c.d.e.f.. ", +"# > < g.h.i.. j.k.l.m.n.o.. ", +"p., q.r.s.t.u. v.w.9 x.y.. . ", +"z.' [ 7 A.[.B.. C.D.E.F.G.H.. . ", +" ) } 0 I.J.K.L.. M.N.O.P.Q.R.S.. . ", +" ! | T.U.V.W.X.Y.Z.a.`. +.+++@+#+$+%+. . ", +" &+. *+=+-+;+>+,+'+)+k.!+~+{+]+^+/+(+. . ", +" . _+d :+L <+[+}+|+l.1+|+2+3+^+4+5+. . . ", +" . 6+t 7+` 8+9+0+o a+[.b+c+d+e+. . . ", +" . f+. g+h+i+j+k+l+m+n+o+. . . . ", +" . . . p+. q+r+s+t+u+. . . . . . . ", +" . . . . . . . . . . . . ", +" ", +" "}; diff --git a/etc/images/home.xpm b/etc/images/home.xpm new file mode 100644 index 0000000..57e8f9c --- /dev/null +++ b/etc/images/home.xpm @@ -0,0 +1,128 @@ +/* XPM */ +static char * home_xpm[] = { +"24 24 101 2", +" c None", +". c #000000", +"+ c #212121", +"@ c #2C2C2C", +"# c #C1665A", +"$ c #924B37", +"% c #2A2A2A", +"& c #333333", +"* c #343434", +"= c #242424", +"- c #944D3A", +"; c #A05443", +"> c #181818", +", c #474747", +"' c #555555", +") c #8D8D8D", +"! c #383838", +"~ c #191919", +"{ c #974F3C", +"] c #222222", +"^ c #313131", +"/ c #A1A1A1", +"( c #676767", +"_ c #ACACAC", +": c #BCBCBC", +"< c #585858", +"[ c #141414", +"} c #1C1C1C", +"| c #464646", +"1 c #666666", +"2 c #BABABA", +"3 c #7E7E7E", +"4 c #D2D2D2", +"5 c #FFFFFF", +"6 c #4F4F4F", +"7 c #262626", +"8 c #232323", +"9 c #505050", +"0 c #B2B2B2", +"a c #909090", +"b c #9A9A9A", +"c c #838383", +"d c #171717", +"e c #202020", +"f c #717171", +"g c #A6A6A6", +"h c #616161", +"i c #1D1D1D", +"j c #1F1F1F", +"k c #C4C4C4", +"l c #CACACA", +"m c #AEAEAE", +"n c #D1D1D1", +"o c #7C7C7C", +"p c #BFBFBF", +"q c #6C6C6C", +"r c #EEEEEE", +"s c #949494", +"t c #C7C7C7", +"u c #EBEBEB", +"v c #7D7D7D", +"w c #6E6E6E", +"x c #A9A9A9", +"y c #E99E8F", +"z c #DD806D", +"A c #9B5343", +"B c #CECECE", +"C c #626262", +"D c #858585", +"E c #ECA292", +"F c #D0533A", +"G c #934F3E", +"H c #6D6D6D", +"I c #ECA291", +"J c #CF543C", +"K c #371D16", +"L c #5D5D5D", +"M c #868686", +"N c #787878", +"O c #ECA696", +"P c #C95C49", +"Q c #E17C66", +"R c #924E3D", +"S c #888888", +"T c #A0A0A0", +"U c #3D1208", +"V c #D15137", +"W c #919191", +"X c #879981", +"Y c #82947C", +"Z c #8A9B85", +"` c #6E8467", +" . c #5D7555", +".. c #4C6042", +"+. c #3F4F37", +"@. c #303D2A", +"#. c #7F8F7A", +"$. c #64785E", +"%. c #44563E", +"&. c #657460", +"*. c #40503A", +" ", +" . . ", +" . . . . . + @ . ", +" . # $ . . % & * = . ", +" . - ; . > , ' ) ! ~ . ", +" . { . ] ^ / ( _ : < [ . ", +" . . } | 1 2 3 4 : 5 6 7 . ", +" . 8 9 0 a 4 b 5 : 5 : c d . ", +" . e f g 4 b 5 : 5 : 5 : 5 h i . ", +" . j k k l 5 m 5 2 5 2 5 : 5 n o } . ", +" . 8 m p p p p p p p p . . . . . a q = . ", +" . . . . r 5 5 5 5 5 5 5 . s t u . v . . . . ", +" . 4 5 . . . . . 5 . : 5 5 . w . ", +" . x 5 . y z A . 5 . B 5 5 . C . ", +" . D 5 . E F G . 5 . . . . . H . ", +" . . 5 . I J K . k s L L M N . . ", +" . . r . O P G . 5 5 5 5 5 2 . ", +" . 2 . Q # R . : : : : : S . ", +" . T U V # A . 5 5 5 5 5 W . ", +" . . . . . . . . . . . . . . . . . . . . . ", +" } X Y Z X ` ...+.@.. Y #.$.%.&.*.. ", +" . . . . . . . . . . . . . . . . . ", +" . . . ", +" "}; diff --git a/etc/images/index.xpm b/etc/images/index.xpm new file mode 100644 index 0000000..7e1de12 --- /dev/null +++ b/etc/images/index.xpm @@ -0,0 +1,201 @@ +/* XPM */ +static char * index_xpm[] = { +"24 24 174 2", +" c None", +". c #000000", +"+ c #FDFDFD", +"@ c #F5F5F5", +"# c #F6F6F6", +"$ c #D0D0D0", +"% c #C1C1C1", +"& c #C3C3C3", +"* c #C6C6C6", +"= c #C8C8C8", +"- c #8D8D8D", +"; c #CACACA", +"> c #919191", +", c #EFEFEF", +"' c #878787", +") c #8A8A8A", +"! c #5C5C5C", +"~ c #F8F8F8", +"{ c #EAEAEA", +"] c #CCCCCC", +"^ c #CECECE", +"/ c #979797", +"( c #CDCDCD", +"_ c #A1A1A1", +": c #090600", +"< c #A3A3A3", +"[ c #C5C5C5", +"} c #C4C4C4", +"| c #D1D1D1", +"1 c #D2D2D1", +"2 c #D2D2D2", +"3 c #9A9A9A", +"4 c #E8E8E8", +"5 c #949494", +"6 c #939393", +"7 c #574F4F", +"8 c #FDFDFC", +"9 c #777777", +"0 c #7E7E7E", +"a c #9D9D9D", +"b c #6B6B6B", +"c c #F1F1F1", +"d c #ECECEC", +"e c #CFCFCF", +"f c #575050", +"g c #FDFAF8", +"h c #A5A5A5", +"i c #B9B9B9", +"j c #EEEEEE", +"k c #EDEDED", +"l c #D5D5D5", +"m c #BABABA", +"n c #6D6767", +"o c #F9F1EA", +"p c #9E9E9E", +"q c #B5B5B5", +"r c #D9D9D9", +"s c #D7D7D7", +"t c #BCBCBC", +"u c #625C5B", +"v c #F9EEE4", +"w c #4F4D4A", +"x c #646464", +"y c #747474", +"z c #D6D6D5", +"A c #DFDFDF", +"B c #A0A0A0", +"C c #615C5B", +"D c #F9F0E4", +"E c #746C67", +"F c #FEFDFC", +"G c #FFFEFD", +"H c #131210", +"I c #636363", +"J c #7C7C7C", +"K c #F3F2F2", +"L c #98948F", +"M c #F9EFE3", +"N c #A09489", +"O c #FEFDFD", +"P c #766D68", +"Q c #736961", +"R c #A3A3A2", +"S c #A6A6A6", +"T c #DBDBDB", +"U c #C7C7C7", +"V c #E8E5E2", +"W c #97938E", +"X c #F6E9D8", +"Y c #84817A", +"Z c #FBF3EA", +"` c #908C86", +" . c #F1EDE7", +".. c #7B7975", +"+. c #878786", +"@. c #070000", +"#. c #FAFAFA", +"$. c #DDDDDD", +"%. c #E2DFDC", +"&. c #A8A199", +"*. c #F0E0CE", +"=. c #C8BFB4", +"-. c #D5CCBF", +";. c #DFD7CD", +">. c #DAD3C9", +",. c #DDCFC4", +"'. c #928C84", +"). c #A8A8A8", +"!. c #959595", +"~. c #040000", +"{. c #D9D5D2", +"]. c #D9CABB", +"^. c #D7C8B8", +"/. c #DECFBF", +"(. c #D8C9B9", +"_. c #E3D3C2", +":. c #C9BBAC", +"<. c #D9CEC2", +"[. c #7F766D", +"}. c #909090", +"|. c #D3D3D3", +"1. c #060100", +"2. c #C0BDBA", +"3. c #8C8782", +"4. c #C2B5A7", +"5. c #BFB4A6", +"6. c #B8AB9D", +"7. c #BAAD9E", +"8. c #BEB0A2", +"9. c #948A7F", +"0. c #716860", +"a. c #E2E2E2", +"b. c #A9A9A8", +"c. c #332C2B", +"d. c #5D5954", +"e. c #79736C", +"f. c #958C80", +"g. c #8D8379", +"h. c #988D82", +"i. c #706760", +"j. c #787878", +"k. c #E4E4E4", +"l. c #C2C2C2", +"m. c #201A1A", +"n. c #57514F", +"o. c #625C59", +"p. c #625A53", +"q. c #6B625A", +"r. c #585251", +"s. c #696764", +"t. c #080000", +"u. c #989898", +"v. c #B0B0B0", +"w. c #AFAFAF", +"x. c #999999", +"y. c #9D9897", +"z. c #050000", +"A. c #0C0303", +"B. c #080100", +"C. c #030000", +"D. c #282523", +"E. c #5A5A5A", +"F. c #868686", +"G. c #ECE4E2", +"H. c #DED7D5", +"I. c #D8D1D0", +"J. c #E0DBD7", +"K. c #E9E6E3", +"L. c #FCFBFA", +"M. c #030500", +"N. c #0B0505", +"O. c #14100F", +"P. c #090806", +"Q. c #000100", +" ", +" . . . . . . . . . . . . . . . . . . . . ", +" . + @ @ @ @ @ @ @ # # # # # # # # # $ . ", +" . @ % % % & & & & * * * * * = = = = - . ", +" . # & & & * * * * = = = = = ; ; ; ; > . ", +" . , ' ' ' ) ) ) ) - - - - - > > > > ! . ", +" . ~ { { { { { { { { { { { { { { { { ; . ", +" . # ; ; ; ] ] ] ] ] ^ ^ ^ ^ $ $ $ $ / . ", +" . # ] ] ] ( ^ ^ ^ _ : < [ } | 1 | 2 3 . ", +" . 4 5 5 5 / / / 6 7 8 . 9 0 - a a a b . ", +" . ~ c d d d d d e f g . h i $ j j k * . ", +" . ~ 2 2 2 2 l l m n o . > p q r r r < . ", +" . ~ l l l l s s t u v w . x . y p z < . ", +" . A B B B B < 9 . C D E F . G H . I J . ", +" . ~ @ , , , j . K L M N O P F Q R . S . ", +" . ~ T T T T U . V W X Y Z ` ...+.@.< . ", +" . #.$.$.$.$.& . %.&.*.=.-.;.>.,.'.@.p . ", +" . { ).).).).!.~.{.].^./.(._.:.<.[.@.}.. ", +" . #.@ c c c |.1.2.3.4.5.6.7.8.9.0.@.] . ", +" . #.a.a.a.a.l b.c.d.e.f.g.9.h.i.. j.q . ", +" . #.a.a.a.a.k.l.j.m.n.o.p.q.r.s.t.u.q . ", +" . a.v.v.v.v.v.w.x.y.z.A.t.B.C.D.E.F.m . ", +" . . . . . . . . . ~.G.H.I.J.K.L.M.. . . ", +" ~.N.z.O.C.P.. Q. "}; diff --git a/etc/images/jump-to.xpm b/etc/images/jump-to.xpm new file mode 100644 index 0000000..8f98979 --- /dev/null +++ b/etc/images/jump-to.xpm @@ -0,0 +1,171 @@ +/* XPM */ +static char * jump_to_xpm[] = { +"24 24 144 2", +" c None", +". c #000000", +"+ c #9ABC82", +"@ c #C1E3AA", +"# c #A0C487", +"$ c #8F6508", +"% c #AD671D", +"& c #D6AF41", +"* c #E1B744", +"= c #B86F20", +"- c #7E5907", +"; c #D8E7CD", +"> c #D9E7CF", +", c #DDEAD2", +"' c #E4EFDA", +") c #EBF6DF", +"! c #C8EBB0", +"~ c #A2C688", +"{ c #986F26", +"] c #E2B946", +"^ c #EFCD64", +"/ c #F4D268", +"( c #F6D469", +"_ c #E7C24A", +": c #D5B044", +"< c #BC8C31", +"[ c #1A0700", +"} c #D7E6CD", +"| c #B2D29C", +"1 c #B6D69F", +"2 c #BDDEA5", +"3 c #C4E7AC", +"4 c #CAEEB1", +"5 c #A1C387", +"6 c #CBB86E", +"7 c #EDD97E", +"8 c #FEE882", +"9 c #FEE77E", +"0 c #FDDF60", +"a c #FBD14F", +"b c #E4BF49", +"c c #BB8C31", +"d c #CFE2C3", +"e c #B2D19C", +"f c #B5D59F", +"g c #BBDBA4", +"h c #C1E3A9", +"i c #C6E9AE", +"j c #C3E6AB", +"k c #A9CE8D", +"l c #DCBA5C", +"m c #FBE46B", +"n c #FFEB64", +"o c #FFE054", +"p c #FED952", +"q c #F8CF4E", +"r c #C4A13E", +"s c #8BA27B", +"t c #618249", +"u c #628349", +"v c #64864B", +"w c #66894D", +"x c #688B4E", +"y c #678B4D", +"z c #6B9251", +"A c #719755", +"B c #55833A", +"C c #ECC75E", +"D c #FFED59", +"E c #FFE757", +"F c #FFDF54", +"G c #FBD44F", +"H c #E1BD48", +"I c #B36C1F", +"J c #608148", +"K c #628449", +"L c #63854A", +"M c #65894C", +"N c #6C9151", +"O c #527E39", +"P c #B39237", +"Q c #F0C248", +"R c #FFF25B", +"S c #FFEB58", +"T c #FFE155", +"U c #FBD450", +"V c #E3BD49", +"W c #BC983B", +"X c #618349", +"Y c #628549", +"Z c #65884B", +"` c #4D7735", +" . c #907934", +".. c #DCB444", +"+. c #FCDB52", +"@. c #FFEF5A", +"#. c #FFE957", +"$. c #FEDF54", +"%. c #F9D24F", +"&. c #E0BA48", +"*. c #B08F37", +"=. c #52743B", +"-. c #456A2F", +";. c #608248", +">. c #628448", +",. c #476F31", +"'. c #7F6B32", +"). c #D0AF4B", +"!. c #F5CF4E", +"~. c #FFE255", +"{. c #FEDA52", +"]. c #EAC54B", +"^. c #D0AC42", +"/. c #9C5D1A", +"(. c #5A7B42", +"_. c #456C2F", +":. c #6F5C23", +"<. c #A78833", +"[. c #F0C54A", +"}. c #FFDA52", +"|. c #FFDE53", +"1. c #C39032", +"2. c #886423", +"3. c #BC9D3B", +"4. c #F0C84E", +"5. c #FFD551", +"6. c #FED751", +"7. c #FDD550", +"8. c #EDC74C", +"9. c #E5BF49", +"0. c #CCA941", +"a. c #AB7727", +"b. c #B1822D", +"c. c #DCB746", +"d. c #DFBA47", +"e. c #EDC64C", +"f. c #E9C34B", +"g. c #D6B144", +"h. c #C19D3D", +"i. c #AB7C2B", +"j. c #BC7222", +"k. c #BB983B", +"l. c #B09638", +"m. c #A2621B", +" ", +" ", +" . ", +" . . ", +" . + . . . . . . . ", +" . . . . . . @ # . . $ % & * = - . . ", +" . ; > , ' ) ! ! ~ . { ] ^ / ( _ : < [ . ", +" . } | 1 2 3 4 4 3 5 . 6 7 8 9 0 a b c . ", +" . d e f g h i i h j k . l m n o p q r - . ", +" . s t u v w x x y z A B . C D E F G H I . ", +" . s J t K L v v M N O . P Q R S T U V W . ", +" . s J J t X u Y Z ` . ...+.@.#.$.%.&.*.. ", +" . =.-.-.-.-.;.>.,.. '.).!.E E ~.{.].^./.. ", +" . . . . . . (._.. :.<.[.}.|.|.{.%.V 1.$ . ", +" . -.. . 2.3.4.5.6.7.8.9.0.a.. ", +" . . . . b.c.d.e.f.g.h.i.. . ", +" . . $ j.k.l.m.$ . . ", +" . . . . . . ", +" ", +" ", +" ", +" ", +" ", +" "}; diff --git a/etc/images/left-arrow.xpm b/etc/images/left-arrow.xpm new file mode 100644 index 0000000..586fe44 --- /dev/null +++ b/etc/images/left-arrow.xpm @@ -0,0 +1,70 @@ +/* XPM */ +static char * left_arrow_xpm[] = { +"24 24 43 1", +" c None", +". c #000000", +"+ c #B9D0B9", +"@ c #CDDECB", +"# c #B6C7B6", +"$ c #B1C9B0", +"% c #B3C4B3", +"& c #B4CBB2", +"* c #B5CEB5", +"= c #B7CCB5", +"- c #B9CEB7", +"; c #BAD1BA", +"> c #BBCFBA", +", c #BBD0B9", +"' c #B2C9B0", +") c #7EAB78", +"! c #AAC7A8", +"~ c #B3CAB1", +"{ c #B0C9B0", +"] c #B0C9AE", +"^ c #AEC7AC", +"/ c #AAC5A8", +"( c #A9C4A7", +"_ c #698267", +": c #2D2D2D", +"< c #CFDFCC", +"[ c #ADC8AB", +"} c #B0C7AE", +"| c #ADC6AB", +"1 c #678C63", +"2 c #9BAD9A", +"3 c #85AE81", +"4 c #87AF84", +"5 c #87B083", +"6 c #88AF84", +"7 c #88B085", +"8 c #86AF82", +"9 c #547150", +"0 c #3C5235", +"a c #5B7950", +"b c #4A6342", +"c c #3B5035", +"d c #415639", +" ", +" ", +" ", +" . ", +" .. ", +" .+. ", +" .@#. ", +" .@$%........ ", +" .@&*=-;->,'). ", +" .@!~{]^///^(_. ", +" :<[}||[!^^}^[1. ", +" .23444445645789. ", +" .0aaaaaaaaaaab. ", +" .0aaaaaaaaaab. ", +" .0aabccccccd. ", +" .0ab........ ", +" .0b. ", +" .b. ", +" .. ", +" . ", +" ", +" ", +" ", +" "}; diff --git a/etc/images/lock-broken.xpm b/etc/images/lock-broken.xpm new file mode 100644 index 0000000..15676bd --- /dev/null +++ b/etc/images/lock-broken.xpm @@ -0,0 +1,231 @@ +/* XPM */ +static char * stock_lock_broken_xpm[] = { +"24 24 204 2", +" c None", +". c #0E0E0E", +"+ c #262626", +"@ c #464646", +"# c #3C3C3C", +"$ c #3B3B3B", +"% c #212121", +"& c #252525", +"* c #ADADAD", +"= c #F0F0F0", +"- c #EAEAEA", +"; c #1A1A1A", +"> c #000000", +", c #FAFAFA", +"' c #F4F4F4", +") c #4D4D4D", +"! c #303030", +"~ c #D8D8D8", +"{ c #E5E5E5", +"] c #B0B0B0", +"^ c #414141", +"/ c #484848", +"( c #030303", +"_ c #DADADA", +": c #E4E4E4", +"< c #353535", +"[ c #070707", +"} c #A6A6A6", +"| c #E6E6E6", +"1 c #686868", +"2 c #020202", +"3 c #3E3E3E", +"4 c #EFEFEF", +"5 c #9B9B9B", +"6 c #343434", +"7 c #F8F8F8", +"8 c #999999", +"9 c #F1F1F1", +"0 c #C4C4C4", +"a c #232323", +"b c #535353", +"c c #AEAEAE", +"d c #F3F3F3", +"e c #D3D3D3", +"f c #242424", +"g c #4E4E4E", +"h c #EEEEEE", +"i c #B5B5B5", +"j c #0F0601", +"k c #200E03", +"l c #765E49", +"m c #7D6A56", +"n c #38291D", +"o c #180A03", +"p c #D6CBC1", +"q c #A09E9D", +"r c #1D1109", +"s c #2A1E13", +"t c #3D2E21", +"u c #3F3123", +"v c #47423D", +"w c #DBB98E", +"x c #D6B183", +"y c #D3AC7E", +"z c #CFA573", +"A c #CD9E67", +"B c #C39056", +"C c #46270A", +"D c #281F14", +"E c #675643", +"F c #A48367", +"G c #D8AB7C", +"H c #BF9E7C", +"I c #DCBB93", +"J c #DCB786", +"K c #D1A872", +"L c #231B12", +"M c #7B6C58", +"N c #C69B63", +"O c #C39860", +"P c #C09257", +"Q c #BD8A4A", +"R c #B9803D", +"S c #AA6E28", +"T c #412409", +"U c #100B07", +"V c #CDB598", +"W c #E8CCA9", +"X c #DAB587", +"Y c #D4AC7D", +"Z c #D1A775", +"` c #C99F6A", +" . c #AF8B5B", +".. c #2E2517", +"+. c #1E1910", +"@. c #0B0805", +"#. c #594B39", +"$. c #2A2015", +"%. c #C2975E", +"&. c #BE8D50", +"*. c #BB823F", +"=. c #AE722C", +"-. c #422409", +";. c #0E0B07", +">. c #AB957E", +",. c #E9CEAC", +"'. c #DBB68A", +"). c #D5AD7E", +"!. c #D0A975", +"~. c #C9A26F", +"{. c #B99667", +"]. c #AA895F", +"^. c #31291C", +"/. c #322A1C", +"(. c #54493B", +"_. c #C69C64", +":. c #C2965E", +"<. c #BE8E50", +"[. c #C29156", +"}. c #9E692A", +"|. c #1A150D", +"1. c #887762", +"2. c #EAD1AF", +"3. c #DDB98E", +"4. c #D4AC7E", +"5. c #D2A876", +"6. c #C39E6D", +"7. c #927751", +"8. c #15110C", +"9. c #988468", +"0. c #C2945A", +"a. c #BE8F51", +"b. c #BC8544", +"c. c #BE8A4F", +"d. c #9A6526", +"e. c #70604D", +"f. c #EFD6B5", +"g. c #DEBD93", +"h. c #D4AC7C", +"i. c #D0A672", +"j. c #C9A069", +"k. c #9D7E53", +"l. c #140F09", +"m. c #1F1710", +"n. c #EFD8B9", +"o. c #E3C39C", +"p. c #D7B080", +"q. c #D4AC79", +"r. c #CDA46F", +"s. c #3A2C1B", +"t. c #FFFFFF", +"u. c #1C160D", +"v. c #B29E85", +"w. c #E6C8A3", +"x. c #D7B081", +"y. c #D1A874", +"z. c #CBA16A", +"A. c #BA905A", +"B. c #251C10", +"C. c #DF421E", +"D. c #F7F7F7", +"E. c #DFDFDF", +"F. c #2F2619", +"G. c #92806A", +"H. c #E6C7A2", +"I. c #D6AF7E", +"J. c #CCA26C", +"K. c #53422A", +"L. c #211910", +"M. c #2A2014", +"N. c #E1E1E1", +"O. c #6A5C4A", +"P. c #EAD0AD", +"Q. c #DAB68B", +"R. c #D2A978", +"S. c #CEA56E", +"T. c #C89D66", +"U. c #856740", +"V. c #534026", +"W. c #F9F9F9", +"X. c #FBFBFB", +"Y. c #E2E2E2", +"Z. c #42362B", +"`. c #D1BA9B", +" + c #DCBA8E", +".+ c #D1A773", +"++ c #C4975C", +"@+ c #BE8C4C", +"#+ c #B4813F", +"$+ c #281B0B", +"%+ c #E3E3E3", +"&+ c #372416", +"*+ c #74654F", +"=+ c #B68E5C", +"-+ c #926231", +";+ c #452B11", +">+ c #341E09", +",+ c #221205", +"'+ c #150802", +")+ c #FDFDFD", +"!+ c #030000", +"~+ c #050000", +"{+ c #010000", +"]+ c #C3C3C3", +" ", +" ", +" . + @ # $ % ", +" & * = - ; > , ' ) > ", +" ! ~ { ] ^ / ( $ _ : < ", +" [ } | 1 2 3 4 5 > ", +" 6 7 8 > > 9 0 a ", +" b 9 c > > d e f ", +" g h i > j k l m n o ", +" ^ p q r s t u > v w x y z A B C ", +" D E F G H I J K L > M N O P Q R S T ", +" U V W X Y Z ` ...+. @.#.$.%.&.*.=.-. ", +" ;.>.,.'.).!.~.{.].^./. (._.:.<.[.}.-. ", +" |.1.2.3.4.5.6.7.8. > 9.0.a.b.c.d.T ", +" e.f.g.h.i.j.k.l.> > > > > > > > > > ", +" m.n.o.p.q.r._.s. > t.t.t.t.t.t.t.> ", +" u.v.w.x.y.z.A.B.> > t.C.C.D.C.C.E.> ", +" F.G.H.I.i.J.K.L.M. > t.C.C.C.C.C.N.> ", +" O.P.Q.R.S.T.U.V. > t.W.C.C.C.X.Y.> ", +" Z.`. +.+z.++@+#+$+> > t.C.C.C.C.C.%+> ", +" &+*+=+-+;+>+,+'+ > t.C.C.)+C.C.{ > ", +" !+~+{+> > - %+%+: { { ]+> ", +" > > > > > > > > > ", +" "}; diff --git a/etc/images/lock-ok.xpm b/etc/images/lock-ok.xpm new file mode 100644 index 0000000..630d9b4 --- /dev/null +++ b/etc/images/lock-ok.xpm @@ -0,0 +1,215 @@ +/* XPM */ +static char * stock_lock_ok_xpm[] = { +"24 24 188 2", +" c None", +". c #000000", +"+ c #212121", +"@ c #9E9E9E", +"# c #E6E6E6", +"$ c #E7E7E7", +"% c #C8C8C8", +"& c #A0A0A0", +"* c #131313", +"= c #5F5F5F", +"- c #EDEDED", +"; c #D6D6D6", +"> c #D5D5D5", +", c #DDDDDD", +"' c #D8D8D8", +") c #A1A1A1", +"! c #3C3C3C", +"~ c #353535", +"{ c #EFEFEF", +"] c #CFCFCF", +"^ c #4C4C4C", +"/ c #141414", +"( c #6A6A6A", +"_ c #D0D0D0", +": c #B2B2B2", +"< c #454545", +"[ c #E2E2E2", +"} c #292929", +"| c #0F0F0F", +"1 c #949494", +"2 c #E9E9E9", +"3 c #C3C3C3", +"4 c #1C1C1C", +"5 c #E1E1E1", +"6 c #272727", +"7 c #DEDEDE", +"8 c #B6B6B6", +"9 c #B7B6B6", +"0 c #150902", +"a c #2E2419", +"b c #251D15", +"c c #616160", +"d c #5E5A56", +"e c #29211A", +"f c #15100C", +"g c #2F251B", +"h c #1D1710", +"i c #4A392B", +"j c #656361", +"k c #565352", +"l c #392B1D", +"m c #322110", +"n c #0C0500", +"o c #EFDBBF", +"p c #EDD9C0", +"q c #E9D5BE", +"r c #E7D2B9", +"s c #E5D0B3", +"t c #DCC09D", +"u c #D9BE99", +"v c #DABE99", +"w c #D7BB95", +"x c #D5B68E", +"y c #D2AF85", +"z c #CFA77C", +"A c #9A5E1B", +"B c #F0DABF", +"C c #E4C6A0", +"D c #D6AF80", +"E c #D3AC7B", +"F c #D0A570", +"G c #C99F68", +"H c #C69B64", +"I c #C69C64", +"J c #C89D66", +"K c #C79C65", +"L c #C39860", +"M c #C09256", +"N c #BC8645", +"O c #B67C36", +"P c #985E1A", +"Q c #EED8BC", +"R c #E3C39C", +"S c #D3AA7B", +"T c #CFA670", +"U c #CA9F68", +"V c #C89E66", +"W c #C89F68", +"X c #C49961", +"Y c #C09358", +"Z c #BC8746", +"` c #B77D39", +" . c #EED8BB", +".. c #E2C29B", +"+. c #D6AE7F", +"@. c #CA9E6D", +"#. c #C69861", +"$. c #BF925A", +"%. c #BB8E56", +"&. c #BD8E56", +"*. c #5C7354", +"=. c #EFDABE", +"-. c #E4C49D", +";. c #D7B080", +">. c #DAB685", +",. c #D4B07C", +"'. c #D0A971", +"). c #CEA46B", +"!. c #CDA46D", +"~. c #FFFFFF", +"{. c #DBE0D9", +"]. c #52684B", +"^. c #4E6346", +"/. c #52674A", +"(. c #EFD8BB", +"_. c #E0C199", +":. c #D3AA7A", +"<. c #C89B67", +"[. c #C3965F", +"}. c #BC8E56", +"|. c #BA8B52", +"1. c #BA8C54", +"2. c #F6F6F6", +"3. c #F7F7F7", +"4. c #F8F8F8", +"5. c #E6E9E5", +"6. c #6B8064", +"7. c #4B5F45", +"8. c #44553D", +"9. c #E3C29C", +"0. c #D9B484", +"a. c #D4AE77", +"b. c #CFA770", +"c. c #CCA46B", +"d. c #CBA36B", +"e. c #B6BEB3", +"f. c #4E6047", +"g. c #788274", +"h. c #CBD2C9", +"i. c #6A8063", +"j. c #384834", +"k. c #EDD6B8", +"l. c #E1BD94", +"m. c #D1A874", +"n. c #BD9058", +"o. c #B7874E", +"p. c #B48349", +"q. c #B5844C", +"r. c #8F9C8A", +"s. c #53684B", +"t. c #475841", +"u. c #657C5E", +"v. c #4A5D44", +"w. c #626E5D", +"x. c #EED8BA", +"y. c #E0C099", +"z. c #D8B37F", +"A. c #D2AD76", +"B. c #CEA66F", +"C. c #CCA46D", +"D. c #FAFAFA", +"E. c #6A7E63", +"F. c #63715E", +"G. c #E3E3E3", +"H. c #EED5B7", +"I. c #DFC096", +"J. c #D2A776", +"K. c #CEA46E", +"L. c #C89D65", +"M. c #C49960", +"N. c #C1955C", +"O. c #C2955C", +"P. c #FBFBFB", +"Q. c #FCFCFC", +"R. c #80937A", +"S. c #6D796A", +"T. c #FEFEFE", +"U. c #E5E5E5", +"V. c #AC8C65", +"W. c #CFA772", +"X. c #C49256", +"Y. c #C08D51", +"Z. c #BA8849", +"`. c #B78342", +" + c #B48240", +".+ c #B68241", +"++ c #EAEAEA", +"@+ c #E4E4E4", +" ", +" ", +" . . . . . ", +" . + @ # $ % & * ", +" . = - # ; > , ' ) ! . ", +" ~ { ] ^ . . / ( _ : < ", +" . [ ' } . | ( % 1 . ", +" * 2 3 . 4 5 @ . ", +" 6 7 8 . . $ 9 . ", +" 0 a b c d e f g b h b i j k l m n ", +" . o p q r s t u u v u w x y z A . ", +" . B C D E F G H I J K L M N O P . ", +" . Q R D S T U I V W V X Y Z ` A . ", +" . ...+.@.#.$.%.&.. . . . . . . . . *. ", +" . =.-.;.>.,.'.).!.. ~.~.~.~.~.~.{.].^./.", +" . (._.:.<.[.}.|.1.. ~.2.3.3.4.5.6.7.8. ", +" . Q 9.+.0.a.b.c.d.. ~.e.f.g.h.i.7.j. ", +" . k.l.m.#.n.o.p.q.. ~.r.s.t.u.v.w.. ", +" . x.y.S z.A.B.c.C.. ~.D.E.s./.F.G.. ", +" . H.I.J.K.L.M.N.O.. ~.P.Q.R.S.T.U.. ", +" . V.W.X.Y.Z.`. +.+. ++G.G.@+U.U.3 . ", +" . . . . . . . . . . . . . . . . . ", +" ", +" "}; diff --git a/etc/images/lock.xpm b/etc/images/lock.xpm new file mode 100644 index 0000000..c9aa18d --- /dev/null +++ b/etc/images/lock.xpm @@ -0,0 +1,227 @@ +/* XPM */ +static char * stock_lock_xpm[] = { +"24 24 200 2", +" c None", +". c #000000", +"+ c #212121", +"@ c #9E9E9E", +"# c #E6E6E6", +"$ c #E7E7E7", +"% c #C8C8C8", +"& c #A0A0A0", +"* c #131313", +"= c #5F5F5F", +"- c #EDEDED", +"; c #D6D6D6", +"> c #D5D5D5", +", c #DDDDDD", +"' c #D8D8D8", +") c #A1A1A1", +"! c #3C3C3C", +"~ c #353535", +"{ c #EFEFEF", +"] c #CFCFCF", +"^ c #4C4C4C", +"/ c #141414", +"( c #6A6A6A", +"_ c #D0D0D0", +": c #B2B2B2", +"< c #454545", +"[ c #E2E2E2", +"} c #292929", +"| c #0F0F0F", +"1 c #949494", +"2 c #E9E9E9", +"3 c #C3C3C3", +"4 c #1C1C1C", +"5 c #E1E1E1", +"6 c #272727", +"7 c #DEDEDE", +"8 c #B6B6B6", +"9 c #B7B6B6", +"0 c #150902", +"a c #2E2419", +"b c #251D15", +"c c #616160", +"d c #5E5A56", +"e c #29211A", +"f c #15100C", +"g c #2F251B", +"h c #1D1710", +"i c #4A392B", +"j c #656361", +"k c #565352", +"l c #392B1D", +"m c #322110", +"n c #0C0500", +"o c #EFDBBF", +"p c #EDD9C0", +"q c #E9D5BE", +"r c #E7D2B9", +"s c #E5D0B3", +"t c #DCC09D", +"u c #D9BE99", +"v c #DABE99", +"w c #D7BB95", +"x c #D5B68E", +"y c #D2AF85", +"z c #CFA77C", +"A c #9A5E1B", +"B c #F0DABF", +"C c #E4C6A0", +"D c #D6AF80", +"E c #D3AC7B", +"F c #D0A570", +"G c #C99F68", +"H c #C69B64", +"I c #C69C64", +"J c #C89D66", +"K c #C79C65", +"L c #C39860", +"M c #C09256", +"N c #BC8645", +"O c #B67C36", +"P c #985E1A", +"Q c #EED8BC", +"R c #E3C39C", +"S c #D3AA7B", +"T c #CFA670", +"U c #CA9F68", +"V c #C89E66", +"W c #C89F68", +"X c #C49961", +"Y c #C09358", +"Z c #BC8746", +"` c #B77D39", +" . c #EED8BB", +".. c #E2C29B", +"+. c #D6AE7F", +"@. c #CA9E6D", +"#. c #C69861", +"$. c #BF925A", +"%. c #BB8E56", +"&. c #BD8E56", +"*. c #BD9058", +"=. c #BC8F58", +"-. c #B9884E", +";. c #B48145", +">. c #BA8442", +",. c #B47834", +"'. c #975C1A", +"). c #EFDABE", +"!. c #E4C49D", +"~. c #D7B080", +"{. c #DAB685", +"]. c #D4B07C", +"^. c #D0A971", +"/. c #CEA46B", +"(. c #CDA46D", +"_. c #CCA66D", +":. c #CCA46B", +"<. c #CA9F63", +"[. c #C79858", +"}. c #B9813F", +"|. c #B37834", +"1. c #975D1A", +"2. c #EFD8BB", +"3. c #E0C199", +"4. c #D3AA7A", +"5. c #C89B67", +"6. c #C3965F", +"7. c #BC8E56", +"8. c #BA8B52", +"9. c #BA8C54", +"0. c #BB8D55", +"a. c #BA8C55", +"b. c #B6864C", +"c. c #B47F43", +"d. c #BA833F", +"e. c #B37934", +"f. c #9B601E", +"g. c #E3C29C", +"h. c #D9B484", +"i. c #D4AE77", +"j. c #CFA770", +"k. c #CBA36B", +"l. c #CCA46C", +"m. c #CA9D61", +"n. c #C69856", +"o. c #BA813E", +"p. c #B27733", +"q. c #A36B2F", +"r. c #EDD6B8", +"s. c #E1BD94", +"t. c #D1A874", +"u. c #B7874E", +"v. c #B48349", +"w. c #B5844C", +"x. c #B5884D", +"y. c #B48146", +"z. c #B27A3C", +"A. c #B67D3A", +"B. c #B07530", +"C. c #A67137", +"D. c #EED8BA", +"E. c #E0C099", +"F. c #D8B37F", +"G. c #D2AD76", +"H. c #CEA66F", +"I. c #CCA46D", +"J. c #CCA56D", +"K. c #C99D61", +"L. c #C69858", +"M. c #B9803D", +"N. c #B67D38", +"O. c #AB783F", +"P. c #EED5B7", +"Q. c #DFC096", +"R. c #D2A776", +"S. c #CEA46E", +"T. c #C89D65", +"U. c #C49960", +"V. c #C1955C", +"W. c #C2955C", +"X. c #C2965C", +"Y. c #C09155", +"Z. c #BC8A4B", +"`. c #BE8A4C", +" + c #A9773C", +".+ c #AC8C65", +"++ c #CFA772", +"@+ c #C49256", +"#+ c #C08D51", +"$+ c #BA8849", +"%+ c #B78342", +"&+ c #B48240", +"*+ c #B68241", +"=+ c #B88544", +"-+ c #BB8949", +";+ c #BC8748", +">+ c #BA874A", +",+ c #B98548", +"'+ c #B27B3B", +")+ c #6D4215", +" ", +" ", +" . . . . . ", +" . + @ # $ % & * ", +" . = - # ; > , ' ) ! . ", +" ~ { ] ^ . . / ( _ : < ", +" . [ ' } . | ( % 1 . ", +" * 2 3 . 4 5 @ . ", +" 6 7 8 . . $ 9 . ", +" 0 a b c d e f g b h b i j k l m n ", +" . o p q r s t u u v u w x y z A . ", +" . B C D E F G H I J K L M N O P . ", +" . Q R D S T U I V W V X Y Z ` A . ", +" . ...+.@.#.$.%.&.*.=.-.;.>.,.'.. ", +" . ).!.~.{.].^./.(._.:.<.[.}.|.1.. ", +" . 2.3.4.5.6.7.8.9.0.a.b.c.d.e.f.. ", +" . Q g.+.h.i.j.:.k.l.k.m.n.o.p.q.. ", +" . r.s.t.#.*.u.v.w.x.b.y.z.A.B.C.. ", +" . D.E.S F.G.H.:.I.J.l.K.L.M.N.O.. ", +" . P.Q.R.S.T.U.V.W.X.X.Y.Z.>.`. +. ", +" . .+++@+#+$+%+&+*+=+-+;+>+,+'+)+. ", +" . . . . . . . . . . . . . . . ", +" ", +" "}; diff --git a/etc/images/mail/compose.xpm b/etc/images/mail/compose.xpm new file mode 100644 index 0000000..2329b3d --- /dev/null +++ b/etc/images/mail/compose.xpm @@ -0,0 +1,225 @@ +/* XPM */ +static char * stock_mail_compose_xpm[] = { +"24 24 198 2", +" c None", +". c #000000", +"+ c #D1AF61", +"@ c #F1E3AC", +"# c #FBA90F", +"$ c #FFFFFF", +"% c #B5B5B5", +"& c #A06B09", +"* c #816000", +"= c #E0E0E0", +"- c #C1C1C1", +"; c #F4F4F4", +"> c #FDFDFD", +", c #E6C370", +"' c #F1D387", +") c #D58F0C", +"! c #B2B2B2", +"~ c #C3C3C3", +"{ c #FBFBFB", +"] c #A8A8A8", +"^ c #F6F6F6", +"/ c #B3B3B3", +"( c #FAFAFA", +"_ c #ADADAD", +": c #767676", +"< c #5D5D5D", +"[ c #404040", +"} c #F8F8F8", +"| c #F1D07E", +"1 c #ACACAC", +"2 c #F8F8F6", +"3 c #E2E2E2", +"4 c #858585", +"5 c #4B4B49", +"6 c #161616", +"7 c #FBFBFA", +"8 c #7D7D7D", +"9 c #F2F2F2", +"0 c #F0F0F0", +"a c #EFEFEF", +"b c #D5D5D5", +"c c #F9F9F9", +"d c #F6F6F3", +"e c #F3F3F3", +"f c #878786", +"g c #E5E5E5", +"h c #DFDFDF", +"i c #EBEBEB", +"j c #AEAEAE", +"k c #7B5307", +"l c #EDEDED", +"m c #EBEBE9", +"n c #E9E9E7", +"o c #E0E0DE", +"p c #BFBFBF", +"q c #F0F0ED", +"r c #F1D284", +"s c #CA870B", +"t c #9E9E9C", +"u c #DCDCD9", +"v c #D9D9D9", +"w c #D9D9D6", +"x c #D6D6D4", +"y c #E5E5E4", +"z c #D9D9D7", +"A c #BABABA", +"B c #AAAAAA", +"C c #E7E7E5", +"D c #E4E4E2", +"E c #E2E2E0", +"F c #EEEEEC", +"G c #979796", +"H c #D4D4D1", +"I c #DEDEDC", +"J c #DEDEDB", +"K c #BDBDBC", +"L c #E7E7E7", +"M c #EFEFED", +"N c #A6A6A5", +"O c #BA7C0A", +"P c #7A5B00", +"Q c #DBDBD9", +"R c #D5D5D3", +"S c #BCBCBC", +"T c #E3E3E3", +"U c #F2E6B6", +"V c #7B7B7B", +"W c #704B05", +"X c #676764", +"Y c #CBCBC7", +"Z c #C9C9C7", +"` c #DBDBD7", +" . c #D7D7D5", +".. c #D7D7D3", +"+. c #B4B4B4", +"@. c #E4E4E4", +"#. c #DBD5C1", +"$. c #7E6F57", +"%. c #755800", +"&. c #D9D9D5", +"*. c #D5D5D1", +"=. c #D0D0CE", +"-. c #BABAB8", +";. c #DDDDDB", +">. c #D1D1CF", +",. c #0E0E0E", +"'. c #535353", +"). c #8D8D8B", +"!. c #C4C4C1", +"~. c #C4C4BF", +"{. c #C1C1BC", +"]. c #D3D3D0", +"^. c #D1D1D0", +"/. c #DCDCDB", +"(. c #E0E0DC", +"_. c #898987", +":. c #C9C9C6", +"<. c #CDCDCA", +"[. c #D0D0CD", +"}. c #CECECB", +"|. c #CFCFCC", +"1. c #D0D0CC", +"2. c #B6B6B6", +"3. c #D4D4D0", +"4. c #C3C3C0", +"5. c #5B5B5B", +"6. c #91918D", +"7. c #91918F", +"8. c #9F9F9D", +"9. c #AFAFAC", +"0. c #B9B9B6", +"a. c #BEBEBB", +"b. c #C5C5C2", +"c. c #C8C8C5", +"d. c #CACAC7", +"e. c #CBCBC8", +"f. c #CCCCC9", +"g. c #CCCCC8", +"h. c #D2D2D0", +"i. c #D2D2CF", +"j. c #BFBFBD", +"k. c #9F9F9C", +"l. c #888886", +"m. c #878785", +"n. c #8C8C8A", +"o. c #959593", +"p. c #9C9C9A", +"q. c #A8A8A5", +"r. c #B1B1AE", +"s. c #B5B5B3", +"t. c #BBBBB8", +"u. c #BFBFBC", +"v. c #C2C2BE", +"w. c #D1D1CE", +"x. c #AEAEAB", +"y. c #9D9D9A", +"z. c #979794", +"A. c #949491", +"B. c #9A9A97", +"C. c #A3A3A0", +"D. c #AAAAA7", +"E. c #B0B0AC", +"F. c #B8B8B5", +"G. c #B0B0AE", +"H. c #CFCFCD", +"I. c #BEBEBC", +"J. c #B4B4B0", +"K. c #ACACA8", +"L. c #A4A4A2", +"M. c #A0A09C", +"N. c #A4A4A0", +"O. c #A8A8A6", +"P. c #ABABA7", +"Q. c #B2B2AE", +"R. c #A4A4A4", +"S. c #CECECC", +"T. c #CECECA", +"U. c #C6C6C2", +"V. c #BCBCB9", +"W. c #B3B3AF", +"X. c #ABABA9", +"Y. c #A6A6A3", +"Z. c #A0A09D", +"`. c #ACACA9", +" + c #A1A1A1", +".+ c #B1B1AF", +"++ c #B4B4B3", +"@+ c #B4B4B1", +"#+ c #B3B3B1", +"$+ c #AEAEAA", +"%+ c #A7A7A4", +"&+ c #A2A2A0", +"*+ c #A5A5A1", +"=+ c #999997", +"-+ c #929290", +";+ c #949490", +">+ c #9D9D9B", +",+ c #858583", +" . . . ", +" . . . . . . . . . . . . + @ # . . . ", +" . $ $ $ $ $ $ $ $ $ % & @ # * . = - . ", +" . $ ; $ $ $ $ $ > > . , ' ) . ! ~ { ] . ", +" . $ ^ $ $ $ > > > / & @ # * . ( _ : < [ . ", +" . $ ^ $ { { { { } . , | ) . 1 2 3 4 5 6 . ", +" . $ ; > > { { 7 8 & @ # * . ; 9 0 a b _ . ", +" . $ 9 c ^ ^ d e . , | ) . f g 3 h i 3 - . ", +" . $ 0 } } } 2 j k @ # * . l i m n n o p . ", +" . $ a e 0 q l . , r s . t u v w x y z A . ", +" . $ l ; ; 9 B & @ # * . C y y D o E z A . ", +" . $ i F C g . , r s . G H E o I J I z K . ", +" . $ L M i N O # # P . E o I J u Q Q R S . ", +" . $ g T v . U V W . X Y Z u ` z .z ..+.. ", +" . $ E y @.. #.$.%.. u Q ` &...R *...=.-.. ", +" . $ I ;.>.,.'.. . ).!.~.{.*.*.].^.].=.-.. ", +" . $ /.(.;.. . _.:.<.[.}.[.[.[.[.|.[.1.2.. ", +" . $ Q 3.4.5.6.7.8.9.0.a.4.b.c.d.e.f.g.! . ", +" . $ h.i.|.j.k.l.m.n.o.p.q.r.s.t.a.u.v.! . ", +" . $ w.1.f.|.4.x.y.z.z.A.B.k.C.q.D.E.F.G.. ", +" . $ i.w.w.w.H.e.I.J.K.L.M.M.N.L.O.P.Q.R.. ", +" . $ ^.w.=.S.T.T.g.U.V.W.J.X.Y.Z.Y.D.`. +. ", +" . $ .+++@+@+@+#+#+Q.$+%+&+*+*+=+-+;+>+,+. ", +" . . . . . . . . . . . . . . . . . . . . "}; diff --git a/etc/images/mail/copy.xpm b/etc/images/mail/copy.xpm new file mode 100644 index 0000000..25ccc17 --- /dev/null +++ b/etc/images/mail/copy.xpm @@ -0,0 +1,104 @@ +/* XPM */ +static char * stock_mail_copy_xpm[] = { +"24 24 77 1", +" c None", +". c #010101", +"+ c #2F2F2F", +"@ c #E3E2E1", +"# c #FCFCFC", +"$ c #B3B2B1", +"% c #95938E", +"& c #F7F7F7", +"* c #F5F4F2", +"= c #F8F8F8", +"- c #F7F6F6", +"; c #EAE9E5", +"> c #7B7976", +", c #D2CFCA", +"' c #E1E0DD", +") c #908E8B", +"! c #EBEAEA", +"~ c #F1F0EE", +"{ c #E2E0DD", +"] c #7C7B78", +"^ c #C6C3C0", +"/ c #E5E3DE", +"( c #DCDAD7", +"_ c #8F8C88", +": c #EBEBEA", +"< c #EFEDEA", +"[ c #DFDDDA", +"} c #787774", +"| c #C1BEBA", +"1 c #E6E3E0", +"2 c #EFEEEC", +"3 c #CBCAC6", +"4 c #ECECEC", +"5 c #F3F2F0", +"6 c #DCDCDC", +"7 c #7D7C79", +"8 c #B4B2AE", +"9 c #E7E5E1", +"0 c #F0EFEB", +"a c #E4E2DD", +"b c #7B7874", +"c c #AFACA6", +"d c #ABA8A3", +"e c #F9F8F6", +"f c #EAE9E8", +"g c #B0ADA7", +"h c #F5F3F0", +"i c #B9B8B6", +"j c #CBC9C4", +"k c #DEDBD5", +"l c #9D9994", +"m c #DBD9D6", +"n c #747370", +"o c #A09C97", +"p c #DAD8D5", +"q c #E7E6E3", +"r c #E8E6E1", +"s c #E0DED9", +"t c #F7F6F4", +"u c #D3D1CF", +"v c #868480", +"w c #C2BFBD", +"x c #DAD9D5", +"y c #F6F5F1", +"z c #D8D6D1", +"A c #F7F5F2", +"B c #92908B", +"C c #CCCAC5", +"D c #F7F6F2", +"E c #F5F4F0", +"F c #EAE8E3", +"G c #D2D0CB", +"H c #D9D7D2", +"I c #DAD8D3", +"J c #D5D3CE", +"K c #D6D4CF", +"L c #040404", +" ", +" ", +" ", +" .+........... ", +" .@###########$. ", +" .#%&*=*-*-*;>,. ", +" .#')!~-*-*{]^/. ", +" .#~(_:~<~[}|1/. ", +" .#~23]4567890a. ", +" .#22~b.+........... ", +" .#~2c.@###########$. ", +" .#2de.#%&*=*-*-*;>,. ", +" .fgeh.#')!~-*-*{]^/. ", +" .ijkk.#~(_:~<~[}|1/. ", +" .....#~23]4567890a. ", +" .#22~l]mnopqrs. ", +" .#~2ctuvwxoy0z. ", +" .#2deetptAABrC. ", +" .fgehDEAEAhFBG. ", +" .ijkkkHIJKGGGB. ", +" ............L ", +" ", +" ", +" "}; diff --git a/etc/images/mail/forward.xpm b/etc/images/mail/forward.xpm new file mode 100644 index 0000000..07af5fd --- /dev/null +++ b/etc/images/mail/forward.xpm @@ -0,0 +1,92 @@ +/* XPM */ +static char * stock_mail_forward_xpm[] = { +"24 24 65 1", +" c None", +". c #000000", +"+ c #535353", +"@ c #FFFFFF", +"# c #FEFEFE", +"$ c #FDFDFD", +"% c #FCFCFC", +"& c #FBFBFB", +"* c #F9F9F9", +"= c #F8F8F8", +"- c #F7F7F7", +"; c #F6F6F6", +"> c #F5F5F5", +", c #F4F4F4", +"' c #E3E3E3", +") c #EEEEEE", +"! c #4F4F4F", +"~ c #F3F3F3", +"{ c #F2F2F2", +"] c #F1F1F1", +"^ c #F0F0F0", +"/ c #EFEFEF", +"( c #EDEDED", +"_ c #AEAEAE", +": c #E4E4E4", +"< c #434343", +"[ c #ACACAC", +"} c #C8C8C8", +"| c #A0A0A0", +"1 c #D4D4D4", +"2 c #ECECEC", +"3 c #959595", +"4 c #3E3E3E", +"5 c #4D4D4D", +"6 c #818181", +"7 c #C6C6C6", +"8 c #6A6A6A", +"9 c #636363", +"0 c #B9B9B9", +"a c #737373", +"b c #7C7C7C", +"c c #5B88B2", +"d c #9EB8D1", +"e c #5080AD", +"f c #B5C9DC", +"g c #AFC5DA", +"h c #B2C7DB", +"i c #B6CADD", +"j c #A4BDD5", +"k c #9CB7D1", +"l c #080D11", +"m c #BCBCBC", +"n c #9BB6D0", +"o c #A0BAD3", +"p c #9AB5CF", +"q c #97B3CE", +"r c #5F8BB4", +"s c #91B0CC", +"t c #95B2CE", +"u c #4C79A3", +"v c #49749C", +"w c #3F6588", +"x c #2A435B", +"y c #456F96", +"z c #375978", +" ", +" ", +" ", +" ................. ", +" .+@@@@#$%&*=-;>,'+. ", +" .)!@>,~{{]^^/)('!_. ", +" .@:<$~{{]^/))('![}. ", +" .@>:!&]^^/)(('<|1}. ", +" .@&>:<=^/)(2'!31:}. ", +" .@>>>:4>)(2'567::}. ", +" .@&>>:8<~2'!877>.}. ", +" .@>>:9@0!^!37a7>... ", +" .@&:9@>:1![7::b:.c. ", +" .@:a@>>>>:.......de. ", +" .@b@::::::.fghiiijkel ", +" .ammmmmmmm.nokknpokqr. ", +" ..........sdppnkkkotu.", +" .vwwwwwwwwx. ", +" .yzzzzzwwx. ", +" .......wx. ", +" .x. ", +" .. ", +" . ", +" "}; diff --git a/etc/images/mail/inbox.xpm b/etc/images/mail/inbox.xpm new file mode 100644 index 0000000..5774e3a --- /dev/null +++ b/etc/images/mail/inbox.xpm @@ -0,0 +1,103 @@ +/* XPM */ +static char * stock_inbox_xpm[] = { +"24 24 76 1", +" c None", +". c #000000", +"+ c #B5CADD", +"@ c #BFD1E1", +"# c #C3D4E3", +"$ c #C7D7E5", +"% c #B0C6DA", +"& c #6B94BB", +"* c #131E29", +"= c #739ABF", +"- c #7EA2C4", +"; c #9AB6D0", +"> c #E4EBF2", +", c #DDE6EF", +"' c #8CACCA", +") c #5C8AB4", +"! c #090F15", +"~ c #B1C7DB", +"{ c #D0DDEA", +"] c #D9E3ED", +"^ c #88A9C8", +"/ c #4D7CA7", +"( c #030405", +"_ c #41688D", +": c #32506C", +"< c #C4D5E4", +"[ c #A5BED5", +"} c #456F97", +"| c #3B5F81", +"1 c #C8D8E6", +"2 c #9CB8D2", +"3 c #395B7B", +"4 c #C6D6E4", +"5 c #BBCEDF", +"6 c #3D6183", +"7 c #B6CBDE", +"8 c #426A90", +"9 c #E2C6A9", +"0 c #E5CDB4", +"a c #D5AA7F", +"b c #9D6733", +"c c #CB9967", +"d c #ADC4D9", +"e c #B99877", +"f c #CFBAA4", +"g c #9A7149", +"h c #CDA378", +"i c #D2A87E", +"j c #608DB6", +"k c #AA7B4B", +"l c #C2A588", +"m c #996633", +"n c #BB9978", +"o c #C3976B", +"p c #D2A980", +"q c #D1A77D", +"r c #E0C4A8", +"s c #C9B097", +"t c #D7B38E", +"u c #DAC2A9", +"v c #BD9063", +"w c #CEA57C", +"x c #E5CFBB", +"y c #393633", +"z c #E0C8B1", +"A c #C9A480", +"B c #D1A87E", +"C c #D0A67B", +"D c #E1CAB4", +"E c #52504D", +"F c #D8C6B5", +"G c #CBA988", +"H c #CCAF93", +"I c #D2B496", +"J c #A67D51", +"K c #E2CFBD", +" ...... ", +" .+@#$%&*. ", +" .=-;$>,')! ", +" ...=~{]^/( ", +" .=+#$_:. ", +" .<[@}|. ", +" .12@}3. ", +" ....425}6.... ", +" .=2527}8}:. ", +" ..9.=227}}:. ", +" ..0abb.=2~}:.. ", +" ..0abbbbc.=d:.ef.. ", +".0abbbbghii.j.kkklf.. ", +".mnabgopqqqi.iokkkkef. ", +".mmmnrooqiqqqiiiokkkks. ", +".mmmmmnrooqiqqqiiiokkl. ", +" ..mmmmmnrooqiqqiiituf. ", +" ..mmmmmnrvwiqqtxxy. ", +" ..mmmmmzABCDxE.. ", +" ...mmmFGHIE.. ", +" ...mJK... ", +" ..... ", +" ", +" "}; diff --git a/etc/images/mail/move.xpm b/etc/images/mail/move.xpm new file mode 100644 index 0000000..ed478eb --- /dev/null +++ b/etc/images/mail/move.xpm @@ -0,0 +1,103 @@ +/* XPM */ +static char * stock_mail_move_xpm[] = { +"24 24 76 1", +" c None", +". c #010101", +"+ c #2F2F2F", +"@ c #E3E2E1", +"# c #FCFCFC", +"$ c #B3B2B1", +"% c #95938E", +"& c #F7F7F7", +"* c #F5F4F2", +"= c #F8F8F8", +"- c #F7F6F6", +"; c #EAE9E5", +"> c #7B7976", +", c #D2CFCA", +"' c #E1E0DD", +") c #908E8B", +"! c #EBEAEA", +"~ c #F1F0EE", +"{ c #E2E0DD", +"] c #7C7B78", +"^ c #C6C3C0", +"/ c #E5E3DE", +"( c #DCDAD7", +"_ c #8F8C88", +": c #EBEBEA", +"< c #EFEDEA", +"[ c #DFDDDA", +"} c #787774", +"| c #C1BEBA", +"1 c #E6E3E0", +"2 c #EFEEEC", +"3 c #CBCAC6", +"4 c #ECECEC", +"5 c #F3F2F0", +"6 c #DCDCDC", +"7 c #7D7C79", +"8 c #B4B2AE", +"9 c #E7E5E1", +"0 c #F0EFEB", +"a c #E4E2DD", +"b c #9D9994", +"c c #DBD9D6", +"d c #747370", +"e c #A09C97", +"f c #DAD8D5", +"g c #E7E6E3", +"h c #E8E6E1", +"i c #E0DED9", +"j c #AFACA6", +"k c #F7F6F4", +"l c #D3D1CF", +"m c #868480", +"n c #C2BFBD", +"o c #DAD9D5", +"p c #F6F5F1", +"q c #D8D6D1", +"r c #ABA8A3", +"s c #F9F8F6", +"t c #F7F5F2", +"u c #92908B", +"v c #CCCAC5", +"w c #EAE9E8", +"x c #B0ADA7", +"y c #F5F3F0", +"z c #F7F6F2", +"A c #F5F4F0", +"B c #EAE8E3", +"C c #D2D0CB", +"D c #B9B8B6", +"E c #CBC9C4", +"F c #DEDBD5", +"G c #D9D7D2", +"H c #DAD8D3", +"I c #D5D3CE", +"J c #D6D4CF", +"K c #040404", +" ", +" ", +" ", +" . . . . . . . ", +" . . ", +" ", +" . . ", +" ", +" . . ", +" .+........... ", +" . .@###########$. ", +" .#%&*=*-*-*;>,. ", +" . .#')!~-*-*{]^/. ", +" .#~(_:~<~[}|1/. ", +" . . .#~23]4567890a. ", +" .#22~b]cdefghi. ", +" .#~2jklmnoep0q. ", +" .#2rsskfkttuhv. ", +" .wxsyzAtAtyBuC. ", +" .DEFFFGHIJCCCu. ", +" ............K ", +" ", +" ", +" "}; diff --git a/etc/images/mail/not-spam.xpm b/etc/images/mail/not-spam.xpm new file mode 100644 index 0000000..f8db326 --- /dev/null +++ b/etc/images/mail/not-spam.xpm @@ -0,0 +1,149 @@ +/* XPM */ +static char * stock_not_spam_xpm[] = { +"24 24 122 2", +" c None", +". c #1D1E1E", +"+ c #333839", +"@ c #393F40", +"# c #171819", +"$ c #B2B8B9", +"% c #D5E3E7", +"& c #AABABD", +"* c #64696A", +"= c #0C0D0D", +"- c #929C9E", +"; c #E7F0F3", +"> c #EDF0F1", +", c #E5EDEF", +"' c #C5D9DD", +") c #2E3132", +"! c #3F4343", +"~ c #1F2121", +"{ c #DFEBEE", +"] c #B7C4C8", +"^ c #D2D9DA", +"/ c #E1EFF2", +"( c #B6CBCF", +"_ c #3C4547", +": c #1E2223", +"< c #191E1F", +"[ c #2D2E2F", +"} c #191A1A", +"| c #252829", +"1 c #7E8E92", +"2 c #B7C2C3", +"3 c #C3D9DD", +"4 c #9CACB0", +"5 c #C3CDCE", +"6 c #C7E1E7", +"7 c #668F97", +"8 c #90ACB2", +"9 c #CDDDE1", +"0 c #485559", +"a c #88A6AC", +"b c #1F2223", +"c c #3F4545", +"d c #242728", +"e c #313B3E", +"f c #A8C2C8", +"g c #B2BDC0", +"h c #CFE5E9", +"i c #C2D9DE", +"j c #81989C", +"k c #A2C0C5", +"l c #85A9B1", +"m c #E5ECEE", +"n c #E7F2F4", +"o c #9BAEB3", +"p c #C8E1E7", +"q c #3A3E3F", +"r c #0C0E0E", +"s c #000000", +"t c #333737", +"u c #B3C2C5", +"v c #DDEDF0", +"w c #D8E4E6", +"x c #DAECEF", +"y c #D5E9ED", +"z c #D2E7EC", +"A c #95ADB2", +"B c #DBE2E2", +"C c #EDEFF0", +"D c #A2B1B3", +"E c #8FA4A8", +"F c #D7E2E5", +"G c #798F94", +"H c #151819", +"I c #F3B5A7", +"J c #865E55", +"K c #AFB9BB", +"L c #F1F8F9", +"M c #F7FBFB", +"N c #D9EBEF", +"O c #ECF4F6", +"P c #F3F7F7", +"Q c #E9F2F4", +"R c #EEF2F3", +"S c #E9EDEE", +"T c #C5C8C9", +"U c #C2C6C8", +"V c #E0E7E7", +"W c #DDEAED", +"X c #7A9DA5", +"Y c #EB8169", +"Z c #B83618", +"` c #924E3C", +" . c #9FA5A6", +".. c #E3EEF0", +"+. c #ECF5F7", +"@. c #D6EAED", +"#. c #CBE4E9", +"$. c #747C7D", +"%. c #B43518", +"&. c #E76A4D", +"*. c #B53F24", +"=. c #CB705A", +"-. c #C4D8DB", +";. c #D2E6E9", +">. c #CAE3E8", +",. c #A9C8CF", +"'. c #EC927D", +"). c #E66F54", +"!. c #D26951", +"~. c #F1A897", +"{. c #E76547", +"]. c #C58B7D", +"^. c #A8ABAC", +"/. c #70A1AB", +"(. c #DF421E", +"_. c #C43A1A", +":. c #E17055", +"<. c #DD8D7A", +"[. c #FFFFFF", +"}. c #030505", +"|. c #A2432E", +"1. c #AC3316", +" ", +" ", +" . + @ ", +" # $ % & * . ", +" = - ; > , ' ) ! ", +" ~ { ] ^ / ( _ : < [ } ", +" | 1 2 3 4 5 6 7 8 9 0 a b ", +" c d e f g h i j k l m n o p q r ", +" s t u v w / x y z A B C D E F G H ", +" s s I J K L M N O P Q R S T U V W X < ", +"s I Y Z ` ...+.@.#.$.s s s s s s s s s s s s ", +"s %.&.Y *.=.-.;.>.,.s '.).).).).).).).).).).!.s ", +"s %.%.%.&.~.{.].^./.s ).(.(.(.(.(.(.(.(.(.(._.s ", +"s %.%.%.%.%.&.~.:.<.s ).(.[.[.(.(.(.(.[.[.(._.s ", +" s s %.%.%.%.%.&.~.s ).(.[.[.[.(.(.[.[.[.(._.s ", +" s s %.%.%.%.%.s ).(.(.[.[.[.[.[.[.(.(._.s ", +" s s %.%.%.s ).(.(.(.[.[.[.[.(.(.(._.s ", +" }.s s |.s ).(.(.(.[.[.[.[.(.(.(._.s ", +" s s s ).(.(.[.[.[.[.[.[.(.(._.s ", +" s ).(.[.[.[.(.(.[.[.[.(._.s ", +" s ).(.[.[.(.(.(.(.[.[.(._.s ", +" s ).(.(.(.(.(.(.(.(.(.(._.s ", +" s !._._._._._._._._._._.1.s ", +" s s s s s s s s s s s s "}; diff --git a/etc/images/mail/outbox.xpm b/etc/images/mail/outbox.xpm new file mode 100644 index 0000000..58b5212 --- /dev/null +++ b/etc/images/mail/outbox.xpm @@ -0,0 +1,96 @@ +/* XPM */ +static char * stock_outbox_xpm[] = { +"24 24 69 1", +" c None", +". c #000000", +"+ c #E66040", +"@ c #EE937E", +"# c #E55E3F", +"$ c #E1431F", +"% c #EC8770", +"& c #F0A08E", +"* c #F3B7A9", +"= c #EF9985", +"- c #E76749", +"; c #ED8C75", +"> c #F5BEB1", +", c #F3B4A5", +"' c #F4B8AA", +") c #F1A593", +"! c #E55B3B", +"~ c #E45534", +"{ c #F4BDB0", +"] c #F4BAAC", +"^ c #EF9C89", +"/ c #E34E2B", +"( c #C0391A", +"_ c #8A2912", +": c #3E3E3C", +"< c #D4D3D2", +"[ c #DB411D", +"} c #F1A999", +"| c #D23E1C", +"1 c #812611", +"2 c #C7C7C5", +"3 c #ACABA8", +"4 c #6A6966", +"5 c #E9775D", +"6 c #CECDCC", +"7 c #A93217", +"8 c #9B9A97", +"9 c #494846", +"0 c #9A9996", +"a c #BBBBB9", +"b c #747370", +"c c #A5A4A1", +"d c #AAA9A6", +"e c #686765", +"f c #7D7C79", +"g c #686764", +"h c #9C9B98", +"i c #999895", +"j c #ABAAA7", +"k c #A9A8A5", +"l c #AF3417", +"m c #E55D3D", +"n c #C5C5C3", +"o c #8D8C89", +"p c #626260", +"q c #B2B1AE", +"r c #A7A6A3", +"s c #B4B4B2", +"t c #C3C3C1", +"u c #92918E", +"v c #D1D0CF", +"w c #373735", +"x c #CACAC8", +"y c #A8A7A4", +"z c #CCCCCA", +"A c #52514E", +"B c #C8C8C6", +"C c #B5B5B3", +"D c #7E7D7A", +" . ", +" .. ", +" .+. ", +" ....@#. ", +" .$%&*=@-. ", +" .;>,')@@@!. ", +" .~{]*^@@@@@-.", +" ...@>/((((((_. ", +" .:<.[}|((((((1. ", +" ..234.5+(_...(1. ", +" ..63444.@(7...._. ", +" ..6344448.@(.90a.. ", +".634444bcd.#$.eff.a.. ", +".gh34bijkk.lm.iffff0a. ", +".ggghniikdo..pddiffffq. ", +".ggggghniikdkkkdddiffr. ", +" ..ggggghniikdkkdddsta. ", +" ..ggggghnurdkksvvw. ", +" ..gggggxrdyzvA.. ", +" ...gggB3qCA.. ", +" ...gDv... ", +" ..... ", +" ", +" "}; diff --git a/etc/images/mail/preview.xpm b/etc/images/mail/preview.xpm new file mode 100644 index 0000000..563a267 --- /dev/null +++ b/etc/images/mail/preview.xpm @@ -0,0 +1,178 @@ +/* XPM */ +static char * mail_preview_xpm[] = { +"24 24 151 2", +" c None", +". c #343434", +"+ c #2D2D2D", +"@ c #292929", +"# c #262626", +"$ c #2E2E2E", +"% c #303030", +"& c #737373", +"* c #A1A1A1", +"= c #B4B4B4", +"- c #B2B2B2", +"; c #9D9D9D", +"> c #676767", +", c #202020", +"' c #1C1C1C", +") c #272727", +"! c #616161", +"~ c #CACACA", +"{ c #CFCFCF", +"] c #D0D0D0", +"^ c #CECECE", +"/ c #C9C9C9", +"( c #C1C1C1", +"_ c #A7A7A7", +": c #4C4C4C", +"< c #131313", +"[ c #222222", +"} c #757575", +"| c #D3D3D3", +"1 c #DBDBDB", +"2 c #E7E7E7", +"3 c #EFEFEF", +"4 c #F3F3F3", +"5 c #F1F1F1", +"6 c #E5E5E5", +"7 c #D2D2D2", +"8 c #BCBCBC", +"9 c #5E5E5E", +"0 c #101010", +"a c #212121", +"b c #5B5B5B", +"c c #CCCCCC", +"d c #D7D7D7", +"e c #F5F5F5", +"f c #FAFAFA", +"g c #FBFBFB", +"h c #F8F8F8", +"i c #F0F0F0", +"j c #E1E1E1", +"k c #C2C2C2", +"l c #434343", +"m c #0F0F0F", +"n c #1F1F1F", +"o c #B9B9B9", +"p c #D4D4D4", +"q c #F7F7F7", +"r c #F9F9F9", +"s c #F6F6F6", +"t c #EAEAEA", +"u c #E2E2E2", +"v c #ABABAB", +"w c #0E0E0E", +"x c #000000", +"y c #111111", +"z c #686868", +"A c #9C9C9C", +"B c #808080", +"C c #8E8E8E", +"D c #919191", +"E c #929292", +"F c #949494", +"G c #939393", +"H c #8B8B8B", +"I c #838383", +"J c #A3A3A3", +"K c #555555", +"L c #080808", +"M c #535353", +"N c #333333", +"O c #AFAFAF", +"P c #E6E6E6", +"Q c #FDFDFD", +"R c #FEFEFE", +"S c #FCFCFC", +"T c #A8A8A8", +"U c #8D8D8D", +"V c #050505", +"W c #EEEEEE", +"X c #A6A6A6", +"Y c #C8C8C8", +"Z c #FFFFFF", +"` c #B6B6B6", +" . c #F4F4F4", +".. c #F2F2F2", +"+. c #A9A9A9", +"@. c #040404", +"#. c #2A2A2A", +"$. c #AAAAAA", +"%. c #ECECEC", +"&. c #A5A5A5", +"*. c #C7C7C7", +"=. c #D8D8D8", +"-. c #CDCDCD", +";. c #858585", +">. c #010101", +",. c #606060", +"'. c #646464", +"). c #C3C3C3", +"!. c #DADADA", +"~. c #494949", +"{. c #ADADAD", +"]. c #0A0A0A", +"^. c #BABABA", +"/. c #DCDCDC", +"(. c #989898", +"_. c #E9E9E9", +":. c #EBEBEB", +"<. c #A4A4A4", +"[. c #B7B7B7", +"}. c #D1D1D1", +"|. c #414141", +"1. c #3D3D3D", +"2. c #969696", +"3. c #A0A0A0", +"4. c #BEBEBE", +"5. c #D9D9D9", +"6. c #C5C5C5", +"7. c #515151", +"8. c #C0C0C0", +"9. c #959595", +"0. c #DDDDDD", +"a. c #484848", +"b. c #030303", +"c. c #454545", +"d. c #060606", +"e. c #B5B5B5", +"f. c #C6C6C6", +"g. c #C4C4C4", +"h. c #A2A2A2", +"i. c #828282", +"j. c #1E1E1E", +"k. c #191919", +"l. c #7C7C7C", +"m. c #E4E4E4", +"n. c #9E9E9E", +"o. c #525252", +"p. c #B0B0B0", +"q. c #6C6C6C", +"r. c #565656", +"s. c #797979", +"t. c #3A3A3A", +" ", +" ", +" . + @ # # # ", +" $ % & * = - ; > , ' ", +" ) ! = ~ { ] ^ / ( _ : < ", +" [ } ~ | 1 2 3 4 5 6 7 8 9 0 ", +" a b c d 6 e f g f h e i j k l m ", +" n o p 6 q r g g f r s i t u v w ", +" x y z A B C D E F F G G D C H I J K L ", +"x M N O P e r g Q R R Q S f h e i T U V ", +"x W y ~ t 5 q q g r S r f q e i X Y _ V ", +"x Z y ` t 3 4 e s q q q s ...+.~ ] J @. ", +"x Z #.$.v %.i .. .e e e 4 5 &.*.=.-.;.>. ", +"x Z ,.'.1 ; %.3 i 5 5 i i T ).=.!./ ~.x ", +"x Z {.].^./.(._.:.%.%.%.<.[.}.!.p &.>. ", +"x Z /.|.1.7 +.2.6 6 6 3.$.4.=.5.).% x ", +"x Z e 6.L 7.8.( 9.0.(.= Y J ).( a.b.x ", +"x Z g d c.d.. 3.( F e.8.~ f.U + b.].x x ", +"x Z e & ^.g.1.b.a.I h.&.i.l x j.[.k.x x x ", +"x Z l.p m.m.Y n.o.j.b.b.j.o.n.p.q.O j.n x x ", +"x & 8 8 8 8 8 8 &.&.&.&.&.&.&.8 8 r.x > N x x ", +" x x x x x x x x x x x x x x x x x x x s.t.x x ", +" x z n x ", +" x x "}; diff --git a/etc/images/mail/reply-all.xpm b/etc/images/mail/reply-all.xpm new file mode 100644 index 0000000..dfd560d --- /dev/null +++ b/etc/images/mail/reply-all.xpm @@ -0,0 +1,176 @@ +/* XPM */ +static char * stock_mail_reply_to_all_xpm[] = { +"24 24 149 2", +" c None", +". c #000000", +"+ c #ADA99C", +"@ c #E6E1D0", +"# c #F0EAD9", +"$ c #A9A598", +"% c #141416", +"& c #161618", +"* c #080809", +"= c #DBD6C7", +"- c #1B1B1C", +"; c #050505", +"> c #5A5A5A", +", c #676767", +"' c #020202", +") c #807D76", +"! c #D49A3E", +"~ c #D2973B", +"{ c #040402", +"] c #6D6B6B", +"^ c #7A7979", +"/ c #030100", +"( c #040100", +"_ c #282724", +": c #DD9831", +"< c #DA962F", +"[ c #1A0E01", +"} c #BC6D1B", +"| c #BE6E13", +"1 c #BE6D13", +"2 c #BD6C13", +"3 c #3E3C36", +"4 c #D69029", +"5 c #D18D27", +"6 c #737067", +"7 c #110900", +"8 c #CF791C", +"9 c #CE791C", +"0 c #CD761A", +"a c #C47013", +"b c #4A4136", +"c c #A0731E", +"d c #96691A", +"e c #000100", +"f c #291703", +"g c #BA6613", +"h c #8C4E0D", +"i c #844A0D", +"j c #BF6D13", +"k c #1F2A0D", +"l c #306220", +"m c #4F7242", +"n c #448D44", +"o c #2E802E", +"p c #3A6F3A", +"q c #FFFFFF", +"r c #535353", +"s c #171009", +"t c #AC600C", +"u c #713F0A", +"v c #693A0A", +"w c #AA5F0A", +"x c #192B10", +"y c #275926", +"z c #68A769", +"A c #358A36", +"B c #2D812D", +"C c #FBFBFB", +"D c #F7F7F7", +"E c #FAFAFA", +"F c #F5F5F5", +"G c #4F4F4F", +"H c #AEAEAE", +"I c #141517", +"J c #6F767C", +"K c #534C46", +"L c #241609", +"M c #23180E", +"N c #484644", +"O c #354A4D", +"P c #050B07", +"Q c #4F7E4F", +"R c #399239", +"S c #2D852D", +"T c #297F29", +"U c #ACACAC", +"V c #C8C8C8", +"W c #151618", +"X c #6C7C8B", +"Y c #728EA9", +"Z c #5D6B78", +"` c #C8CBCD", +" . c #C3C7CD", +".. c #8090A2", +"+. c #5A728B", +"@. c #4E6479", +"#. c #111714", +"$. c #328732", +"%. c #2B7F2C", +"&. c #2B772C", +"*. c #434343", +"=. c #A0A0A0", +"-. c #D4D4D4", +";. c #25282A", +">. c #8A9EB4", +",. c #6A86A1", +"'. c #596A7C", +"). c #DDE1E4", +"!. c #DCE2E7", +"~. c #899CAC", +"{. c #687E96", +"]. c #546D87", +"^. c #10161D", +"/. c #8C8C8C", +"(. c #959595", +"_. c #E4E4E4", +":. c #23282D", +"<. c #8096AB", +"[. c #5D7996", +"}. c #53687D", +"|. c #CDD3D9", +"1. c #CBD2DC", +"2. c #899BAB", +"3. c #CCD4DC", +"4. c #5C748C", +"5. c #111820", +"6. c #4D4D4D", +"7. c #818181", +"8. c #C6C6C6", +"9. c #1F252B", +"0. c #6B8197", +"a. c #536D89", +"b. c #4A5D6F", +"c. c #81919F", +"d. c #8293A4", +"e. c #5A7087", +"f. c #496481", +"g. c #445D79", +"h. c #0E151B", +"i. c #6A6A6A", +"j. c #0E141A", +"k. c #0D1319", +"l. c #0E141B", +"m. c #0E131A", +"n. c #0F141A", +"o. c #636363", +"p. c #737373", +"q. c #7C7C7C", +"r. c #BCBCBC", +" ", +" . . ", +" + @ # $ . ", +" % & * = # # # . ", +" - ; > , ' ) ! ~ # . ", +" { ] ^ / ( _ : < # . ", +" [ } | 1 2 3 4 5 # 6 ", +" 7 8 9 0 a b c d # # . e . . . . . . ", +" f g h i j k l m n o p . q q q q q r . ", +" s t u v w x y z A o B . C D E F G H . ", +" I J K L M N O P Q R S T . F F F G U V . ", +" W X Y Z ` ...+.@.#.$.%.&.. F F *.=.-.V . ", +" ;.>.,.'.).!.~.{.].^.. . . /.F G (.-._.V . ", +" :.<.[.}.|.1.2.3.4.5.F F F F 6.7.8._._.V . ", +" 9.0.a.b.c.d.e.f.g.h.F F F G i.=._.F _.V . ", +" j.k.l.l.l.j.m.n.o.G F G (.8.p.8.F _.V . ", +" . q C F o.8.F _.-.G U 8._.F q._._.V . ", +" . q F p.-.F F F F _._.F F F F q._.V . ", +" . q q.-._._._._._._._._._._._._.q.V . ", +" . p.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.o.. ", +" . . . . . . . . . . . . . . . . . . ", +" ", +" ", +" "}; diff --git a/etc/images/mail/reply.xpm b/etc/images/mail/reply.xpm new file mode 100644 index 0000000..4925041 --- /dev/null +++ b/etc/images/mail/reply.xpm @@ -0,0 +1,94 @@ +/* XPM */ +static char * stock_mail_reply_xpm[] = { +"24 24 67 1", +" c None", +". c #000000", +"+ c #535353", +"@ c #FFFFFF", +"# c #FEFEFE", +"$ c #FDFDFD", +"% c #FCFCFC", +"& c #FBFBFB", +"* c #F9F9F9", +"= c #F8F8F8", +"- c #F7F7F7", +"; c #F6F6F6", +"> c #F5F5F5", +", c #F4F4F4", +"' c #E3E3E3", +") c #EEEEEE", +"! c #4F4F4F", +"~ c #F3F3F3", +"{ c #F2F2F2", +"] c #F1F1F1", +"^ c #F0F0F0", +"/ c #EFEFEF", +"( c #EDEDED", +"_ c #AEAEAE", +": c #E4E4E4", +"< c #434343", +"[ c #ACACAC", +"} c #C8C8C8", +"| c #A0A0A0", +"1 c #D4D4D4", +"2 c #ECECEC", +"3 c #959595", +"4 c #3E3E3E", +"5 c #4D4D4D", +"6 c #818181", +"7 c #C6C6C6", +"8 c #3D1A13", +"9 c #6A6A6A", +"0 c #636363", +"a c #B9B9B9", +"b c #737373", +"c c #EAC0BA", +"d c #7C7C7C", +"e c #DF9E95", +"f c #E0A198", +"g c #E1A59D", +"h c #E2A79E", +"i c #E3ABA3", +"j c #E3AAA2", +"k c #CC6253", +"l c #DD978D", +"m c #DF9F97", +"n c #DE9A90", +"o c #DD968C", +"p c #DD948A", +"q c #B14334", +"r c #BCBCBC", +"s c #431913", +"t c #EAC2BC", +"u c #DF9C92", +"v c #DD998F", +"w c #B54535", +"x c #65261D", +"y c #983A2C", +"z c #7C2F24", +"A c #63251D", +"B c #6C291F", +" ", +" ", +" ", +" ................. ", +" .+@@@@#$%&*=-;>,'+. ", +" .)!@>,~{{]^^/)('!_. ", +" .@:<$~{{]^/))('![}. ", +" .@>:!&]^^/)(('<|1}. ", +" .@&>:<=^/)(2'!31:}. ", +" .@>>>:4>)(2'567::}. ", +" .@&8>:9<~2'!977>:}. ", +" .@..:0@a!^!37b7>:}. ", +" ..c.0@>:1![7::d::}. ", +" .ce.......:>>>:d:}. ", +" .cfghihjek.::::::d}. ", +" .clmenoonpq.rrrrrrr0. ", +"stnuvvlnnnnw.......... ", +" .xyyyyyyyyz. ", +" .xyyAAAAAB. ", +" .xy....... ", +" .x. ", +" .. ", +" . ", +" "}; diff --git a/etc/images/mail/save-draft.xpm b/etc/images/mail/save-draft.xpm new file mode 100644 index 0000000..9b37491 --- /dev/null +++ b/etc/images/mail/save-draft.xpm @@ -0,0 +1,99 @@ +/* XPM */ +static char * stock_mail_handling_xpm[] = { +"24 24 72 1", +" c None", +". c #000000", +"+ c #BCBCBC", +"@ c #FFFFFF", +"# c #535353", +"$ c #EEEEEE", +"% c #4F4F4F", +"& c #F5F5F5", +"* c #FBFBFB", +"= c #F7F7F7", +"- c #FAFAFA", +"; c #AEAEAE", +"> c #E4E4E4", +", c #434343", +"' c #ACACAC", +") c #C8C8C8", +"! c #A0A0A0", +"~ c #D4D4D4", +"{ c #959595", +"] c #3E3E3E", +"^ c #4D4D4D", +"/ c #818181", +"( c #C6C6C6", +"_ c #6A6A6A", +": c #636363", +"< c #B9B9B9", +"[ c #737373", +"} c #010101", +"| c #AAAAAA", +"1 c #0B0B0B", +"2 c #0C0C0C", +"3 c #060606", +"4 c #E4E3E1", +"5 c #050505", +"6 c #B3B3B1", +"7 c #484641", +"8 c #9F9D96", +"9 c #888781", +"0 c #7C7C7C", +"a c #B0AFAD", +"b c #A8A7A1", +"c c #908E86", +"d c #97958E", +"e c #807D74", +"f c #969696", +"g c #090909", +"h c #595854", +"i c #605E57", +"j c #898883", +"k c #76746B", +"l c #43423F", +"m c #282724", +"n c #363430", +"o c #6D6B63", +"p c #E2E2E1", +"q c #B6B5AF", +"r c #21201E", +"s c #0A0908", +"t c #181816", +"u c #E6E6E4", +"v c #65635C", +"w c #161614", +"x c #8C8B89", +"y c #DFDEDC", +"z c #B0AFA9", +"A c #D5D4D1", +"B c #93918B", +"C c #D6D5D2", +"D c #ABA9A3", +"E c #5D5C55", +"F c #494943", +"G c #42413C", +" ", +" ................. ", +" .+@@@@@@@@@@@@@@@#. ", +" .$%&*&*=*&*&*=-&%;. ", +" .@>,&&&&&&&&&&&%'). ", +" .@&>%&&&&&&&&&,!~). ", +" .@*&>,&&&&&&&%{~>). ", +" .@&&&>]&&&&&^/(>>). ", +" .@*&&&_,&&&%_!>&>). ", +" .@&&&:<<%&%{([(}}}. ", +" .@*&:(&>~%'|12:345... ", +" .@&[~&&&&>>2>62787.9.. ", +" .@0~>>>>>>>1ab888cde7. ", +" .[+++++++++fg88hijek. ", +" ...........78ilmn8o7..", +" .pq8hrstuevi.", +" ..78jnwxyv7..", +" .zequABv. ", +" .CD8eekkE7. ", +" ..h.7k7.F.. ", +" .. .G. .. ", +" ... ", +" ", +" "}; diff --git a/etc/images/mail/save.xpm b/etc/images/mail/save.xpm new file mode 100644 index 0000000..0001716 --- /dev/null +++ b/etc/images/mail/save.xpm @@ -0,0 +1,291 @@ +/* XPM */ +static char * mail_save_xpm[] = { +"24 24 264 2", +" c None", +". c #000000", +"+ c #141414", +"@ c #262626", +"# c #212121", +"$ c #1F1F1F", +"% c #1E1E1E", +"& c #1D1D1D", +"* c #202020", +"= c #232323", +"- c #292929", +"; c #171717", +"> c #121212", +", c #B8B8B8", +"' c #FFFFFF", +") c #A8A8A8", +"! c #0E0E0E", +"~ c #595959", +"{ c #444444", +"] c #4F4F4F", +"^ c #050505", +"/ c #222222", +"( c #3D3D3D", +"_ c #FEFEFE", +": c #FCFCFC", +"< c #FDFDFD", +"[ c #CACACA", +"} c #191919", +"| c #B3B1B0", +"1 c #EEECEB", +"2 c #F0DCAA", +"3 c #E5C470", +"4 c #DFB84F", +"5 c #8A681F", +"6 c #100E09", +"7 c #FBFBFB", +"8 c #515151", +"9 c #F0F0F0", +"0 c #D6D6D6", +"a c #EEECE9", +"b c #E6D498", +"c c #EED682", +"d c #EED680", +"e c #E3C15E", +"f c #D29815", +"g c #976E15", +"h c #7F5B0A", +"i c #1C190F", +"j c #D9D9D9", +"k c #424242", +"l c #F1F1F1", +"m c #F3F3F3", +"n c #EBE9E5", +"o c #CBB771", +"p c #735817", +"q c #C6A546", +"r c #E3C05D", +"s c #BC8710", +"t c #AD7C10", +"u c #6B6B6B", +"v c #A0A0A0", +"w c #535353", +"x c #505050", +"y c #AE9C5C", +"z c #292928", +"A c #CECDCA", +"B c #CAC9C7", +"C c #1A1917", +"D c #9C7E2B", +"E c #AB7C12", +"F c #242012", +"G c #555555", +"H c #DEDEDE", +"I c #E8E8E8", +"J c #3B3B3B", +"K c #D7D6D6", +"L c #656462", +"M c #DAD9D7", +"N c #E1E0DF", +"O c #1A1A19", +"P c #3D351F", +"Q c #A37819", +"R c #231F13", +"S c #282828", +"T c #898989", +"U c #EFEFEF", +"V c #FAFAFA", +"W c #E8E7E6", +"X c #8B8B8A", +"Y c #0B0B06", +"Z c #A97C1A", +"` c #1B1B1B", +" . c #C9C9C9", +".. c #DFDFDF", +"+. c #EBEBEB", +"@. c #ECECEC", +"#. c #E1E1E1", +"$. c #221E11", +"%. c #EAE8E3", +"&. c #C58F13", +"*. c #B68411", +"=. c #826321", +"-. c #302C19", +";. c #131313", +">. c #1A1A1A", +",. c #161616", +"'. c #151515", +"). c #181818", +"!. c #1B1B1A", +"~. c #141413", +"{. c #363220", +"]. c #916F25", +"^. c #322F1E", +"/. c #98B4C8", +"(. c #25313B", +"_. c #A9CCE0", +":. c #545A68", +"<. c #BC6A60", +"[. c #AD5A51", +"}. c #A4574D", +"|. c #2B2719", +"1. c #353120", +"2. c #5A4D51", +"3. c #6E8DA2", +"4. c #0C1820", +"5. c #BAE5FF", +"6. c #696E6F", +"7. c #F9F9F9", +"8. c #EBEBEA", +"9. c #937025", +"0. c #CDCAC1", +"a. c #73726E", +"b. c #7496AF", +"c. c #0A131A", +"d. c #BAE0FD", +"e. c #6A6E71", +"f. c #ECEDEC", +"g. c #DEDFDF", +"h. c #DBDDDD", +"i. c #D8DBDB", +"j. c #CDCFCF", +"k. c #312E1B", +"l. c #2F2C19", +"m. c #B2B3B0", +"n. c #C0C0BE", +"o. c #6F6D6B", +"p. c #7C9FBB", +"q. c #050F15", +"r. c #B7DDFC", +"s. c #54575A", +"t. c #F4F4F3", +"u. c #ECECEB", +"v. c #F3F3F2", +"w. c #7F7D7A", +"x. c #7EA0BB", +"y. c #020A10", +"z. c #B1D7F7", +"A. c #FDFCFB", +"B. c #EFEFEE", +"C. c #EDEDEC", +"D. c #EBECEB", +"E. c #EBECEC", +"F. c #F7F7F6", +"G. c #7D7977", +"H. c #7F9FB9", +"I. c #050B0E", +"J. c #B3DDF7", +"K. c #685050", +"L. c #847F7C", +"M. c #7E9DB7", +"N. c #0A0B0C", +"O. c #A9D3F0", +"P. c #7B99AB", +"Q. c #6B6E70", +"R. c #63696C", +"S. c #60666B", +"T. c #5E6569", +"U. c #555E67", +"V. c #5D6267", +"W. c #61676B", +"X. c #64696D", +"Y. c #62666A", +"Z. c #6B747E", +"`. c #7D9CB4", +" + c #000508", +".+ c #A8CBED", +"++ c #7498B7", +"@+ c #6F92B0", +"#+ c #3F5160", +"$+ c #4A5E70", +"%+ c #566E82", +"&+ c #4D6779", +"*+ c #52697C", +"=+ c #52697A", +"-+ c #54687A", +";+ c #455E70", +">+ c #7697B4", +",+ c #92A9BC", +"'+ c #000205", +")+ c #A8CEEB", +"!+ c #7196B3", +"~+ c #4D5152", +"{+ c #D7D2CB", +"]+ c #F1EEEA", +"^+ c #FAF8F5", +"/+ c #F9F8F5", +"(+ c #E8E4DF", +"_+ c #D8D4CD", +":+ c #9D968B", +"<+ c #425563", +"[+ c #446783", +"}+ c #A7C4DA", +"|+ c #000101", +"1+ c #A5CDEA", +"2+ c #7196B1", +"3+ c #57595C", +"4+ c #534F46", +"5+ c #2E281F", +"6+ c #CAC7C2", +"7+ c #C9C4BD", +"8+ c #C2BBB1", +"9+ c #E3E0DC", +"0+ c #314353", +"a+ c #40647C", +"b+ c #B6C9DA", +"c+ c #A3CDEB", +"d+ c #7695B1", +"e+ c #525455", +"f+ c #474239", +"g+ c #3B372D", +"h+ c #C0BCB5", +"i+ c #C7C2BA", +"j+ c #E2DFD9", +"k+ c #F8F6F3", +"l+ c #344652", +"m+ c #406479", +"n+ c #A6C3DA", +"o+ c #010000", +"p+ c #708798", +"q+ c #6A8DA7", +"r+ c #4F5052", +"s+ c #F7F2EC", +"t+ c #59534B", +"u+ c #57524A", +"v+ c #C1BCB4", +"w+ c #EBE9E4", +"x+ c #FFFFFD", +"y+ c #30414E", +"z+ c #415C6F", +"A+ c #A2C4DC", +"B+ c #020000", +"C+ c #030406", +"D+ c #141A1F", +"E+ c #151718", +"F+ c #35332F", +"G+ c #393634", +"H+ c #41403E", +"I+ c #3F3E3D", +"J+ c #454344", +"K+ c #434241", +"L+ c #312F2C", +"M+ c #02070A", +"N+ c #070E12", +"O+ c #465A69", +". + @ # $ % & & & % * = - ; . ", +"> , ' ' ' ' ' ' ' ' ' ' ' ) ! ", +"@ ' ~ ' ' ' ' ' ' ' ' ' { ] ^ . . . ", +"/ ' ' ( ' _ : < < ' [ } | 1 2 3 4 5 . 6 ", +"* ' ' 7 8 9 < 7 _ 0 @ a b c d d e f g h i ", +"$ ' ' ' j k l : m $ n o . . . p q r s t i ", +"* ' ' ' u v w ' x . y z A B C D d f E F ", +"/ ' ' G H 7 I J , K > L M N O P d f Q R ", +"S ' T U ' ' ' _ V ' < W X Y . . . d f Z . . . ", +"` ...U +.+.+.@.@.+.@.+.#.$.%.d d d f &.*.=.-.. ", +". ;.>.; ,.'.'.'.'.'.,.).!.~.{.%.d d f f ].^./.(.", +" . _.:.<.[.}.|.%.d f ].1.2.3.4.", +" . 5.6.' ' 7.8.-.%.9.^.0.a.b.c.", +" . d.e.f.g.h.i.j.k.l.m.n.o.p.q.", +" . r.s.' ' ' ' ' ' t.u.v.w.x.y.", +" . z.6.A.B.C.D.+.E.C.U F.G.H.I.", +" . J.K.' ' ' ' ' ' ' ' ' L.M.N.", +" . O.P.Q.R.S.T.U.V.W.X.Y.Z.`. +", +" . .+++@+#+$+%+&+*+=+-+;+>+,+'+", +" . )+!+~+{+]+^+/+(+_+:+<+[+}+|+", +" . 1+2+3+' 4+5+6+7+8+9+0+a+b+. ", +" . c+d+e+' f+g+h+i+j+k+l+m+n+o+", +" . p+q+r+s+t+u+v+w+x+]+y+z+A+B+", +" C+D+E+F+G+H+I+J+K+L+M+N+O+. "}; diff --git a/etc/images/mail/send.xpm b/etc/images/mail/send.xpm new file mode 100644 index 0000000..44ee493 --- /dev/null +++ b/etc/images/mail/send.xpm @@ -0,0 +1,85 @@ +/* XPM */ +static char * stock_mail_send_xpm[] = { +"24 24 58 1", +" c None", +". c #4F3F0A", +"+ c #000000", +"@ c #F4E6B5", +"# c #F4E5B3", +"$ c #EDD684", +"% c #755F10", +"& c #EDD580", +"* c #EED685", +"= c #AF8D18", +"- c #EFD98C", +"; c #EED88B", +"> c #EDD582", +", c #EED889", +"' c #EFDA92", +") c #F0DB93", +"! c #735D10", +"~ c #535353", +"{ c #FFFFFF", +"] c #F0DC97", +"^ c #F6F6F6", +"/ c #F5F5F5", +"( c #F4F4F4", +"_ c #E3E3E3", +": c #EEEEEE", +"< c #4F4F4F", +"[ c #EDD37C", +"} c #EDEDED", +"| c #AEAEAE", +"1 c #E4E4E4", +"2 c #434343", +"3 c #FDFDFD", +"4 c #F3F3F3", +"5 c #E4BF3D", +"6 c #CBA41C", +"7 c #D1A81C", +"8 c #907413", +"9 c #7C6411", +"0 c #ACACAC", +"a c #C8C8C8", +"b c #FBFBFB", +"c c #A0A0A0", +"d c #D4D4D4", +"e c #F8F8F8", +"f c #F0F0F0", +"g c #EFEFEF", +"h c #ECECEC", +"i c #959595", +"j c #3E3E3E", +"k c #4D4D4D", +"l c #818181", +"m c #C6C6C6", +"n c #6A6A6A", +"o c #636363", +"p c #B9B9B9", +"q c #737373", +"r c #7C7C7C", +"s c #BCBCBC", +" ", +" . ", +" +@+ ", +" +#$%+ ", +" +#&*=%+ ", +" +#-;>==%+ ", +" +#,',>===%+ ", +" ++++++)$&=!++++++ ", +" +~{{{{+]$$=!+^/(_~+ ", +" +:<{/(+,[$=!+:}_<|+ ", +" +{1234+56789+}_<0a+ ", +" +{/1 c #EDF0F1", +", c #E5EDEF", +"' c #C5D9DD", +") c #2E3132", +"! c #3F4343", +"~ c #1F2121", +"{ c #DFEBEE", +"] c #B7C4C8", +"^ c #D2D9DA", +"/ c #E1EFF2", +"( c #B6CBCF", +"_ c #3C4547", +": c #1E2223", +"< c #191E1F", +"[ c #2D2E2F", +"} c #191A1A", +"| c #252829", +"1 c #7E8E92", +"2 c #B7C2C3", +"3 c #C3D9DD", +"4 c #9CACB0", +"5 c #C3CDCE", +"6 c #C7E1E7", +"7 c #668F97", +"8 c #90ACB2", +"9 c #CDDDE1", +"0 c #485559", +"a c #88A6AC", +"b c #1F2223", +"c c #3F4545", +"d c #242728", +"e c #313B3E", +"f c #A8C2C8", +"g c #B2BDC0", +"h c #CFE5E9", +"i c #C2D9DE", +"j c #81989C", +"k c #A2C0C5", +"l c #85A9B1", +"m c #E5ECEE", +"n c #E7F2F4", +"o c #9BAEB3", +"p c #C8E1E7", +"q c #3A3E3F", +"r c #0C0E0E", +"s c #000000", +"t c #333737", +"u c #B3C2C5", +"v c #DDEDF0", +"w c #D8E4E6", +"x c #DAECEF", +"y c #D5E9ED", +"z c #D2E7EC", +"A c #95ADB2", +"B c #DBE2E2", +"C c #EDEFF0", +"D c #A2B1B3", +"E c #8FA4A8", +"F c #D7E2E5", +"G c #798F94", +"H c #151819", +"I c #F3B5A7", +"J c #865E55", +"K c #AFB9BB", +"L c #F1F8F9", +"M c #F7FBFB", +"N c #D9EBEF", +"O c #ECF4F6", +"P c #F3F7F7", +"Q c #E9F2F4", +"R c #EEF2F3", +"S c #E9EDEE", +"T c #C5C8C9", +"U c #C2C6C8", +"V c #E0E7E7", +"W c #DDEAED", +"X c #7A9DA5", +"Y c #EB8169", +"Z c #B83618", +"` c #924E3C", +" . c #9FA5A6", +".. c #E3EEF0", +"+. c #ECF5F7", +"@. c #D6EAED", +"#. c #CBE4E9", +"$. c #D9E7E9", +"%. c #E1EBED", +"&. c #B8CBD0", +"*. c #BDCBCF", +"=. c #ABB3B5", +"-. c #E3E5E5", +";. c #DCEBEF", +">. c #6A979F", +",. c #131819", +"'. c #B43518", +"). c #E76A4D", +"!. c #B53F24", +"~. c #CB705A", +"{. c #C4D8DB", +"]. c #D2E6E9", +"^. c #CAE3E8", +"/. c #A9C8CF", +"(. c #7FA4AA", +"_. c #82B4BE", +":. c #E2EFF0", +"<. c #D3E7EA", +"[. c #AFD5DE", +"}. c #C7E2E7", +"|. c #E7F1F2", +"1. c #97C3CB", +"2. c #637F86", +"3. c #191311", +"4. c #EF9985", +"5. c #F1A897", +"6. c #E76547", +"7. c #C58B7D", +"8. c #A8ABAC", +"9. c #70A1AB", +"0. c #88B5BE", +"a. c #95C7D1", +"b. c #ADD4DC", +"c. c #DCEAEF", +"d. c #B5D8E0", +"e. c #CAE4E9", +"f. c #95BEC6", +"g. c #6696A0", +"h. c #585857", +"i. c #51190C", +"j. c #D9401D", +"k. c #EC8A74", +"l. c #E17055", +"m. c #DD8D7A", +"n. c #D8E7EA", +"o. c #D8E9ED", +"p. c #D6EAEE", +"q. c #D9EBEE", +"r. c #E4F0F3", +"s. c #CFE3E8", +"t. c #5B94A0", +"u. c #5C7E85", +"v. c #3D221D", +"w. c #782310", +"x. c #EA7A60", +"y. c #E5A293", +"z. c #EBD9D5", +"A. c #C6D3D6", +"B. c #799FA8", +"C. c #558C98", +"D. c #45686E", +"E. c #27201F", +"F. c #5D3228", +"G. c #B86F5D", +"H. c #F1A593", +"I. c #E58D78", +"J. c #C0C0C1", +"K. c #32464B", +"L. c #4A6E75", +"M. c #282121", +"N. c #4A2E27", +"O. c #C6968B", +"P. c #DDA89B", +"Q. c #5F1C0D", +"R. c #F2AFA0", +"S. c #A36F63", +"T. c #341C17", +"U. c #301A15", +"V. c #674C45", +"W. c #E4AEA1", +"X. c #8D2A13", +"Y. c #030505", +"Z. c #A2432E", +"`. c #E4A799", +" + c #D97C67", +".+ c #B66A59", +"++ c #B26C5C", +"@+ c #882812", +"#+ c #DB411D", +"$+ c #F4BAAC", +" ", +" ", +" ", +" ", +" . + @ ", +" # $ % & * . ", +" = - ; > , ' ) ! ", +" ~ { ] ^ / ( _ : < [ } ", +" | 1 2 3 4 5 6 7 8 9 0 a b ", +" c d e f g h i j k l m n o p q r ", +" s t u v w / x y z A B C D E F G H ", +" s s I J K L M N O P Q R S T U V W X < ", +"s I Y Z ` ...+.@.#.$.%.h &.*.=.-.;.>.,.s ", +"s '.).Y !.~.{.].^./.(._.:.<.[.}.|.1.2.3.4.s ", +"s '.'.'.).5.6.7.8.9.0.a.b.c.d.e.f.g.h.i.j.k.s ", +"s '.'.'.'.'.).5.l.m.n.o.p.q.r.s.t.u.v.w.j.x.s ", +" s s '.'.'.'.'.).5.6.y.z.A.B.C.D.E.F.G.H.4.s ", +" s s '.'.'.'.'.).5.I.J.K.L.M.N.O.P.Q.s ", +" s s '.'.'.'.'.R.S.T.U.V.W.X.s s ", +" Y.s s Z.'.'.`. +.+++@+s s ", +" s s s '.#+$+s s s ", +" s s s s s ", +" ", +" "}; diff --git a/etc/images/new.xpm b/etc/images/new.xpm new file mode 100644 index 0000000..2d4690e --- /dev/null +++ b/etc/images/new.xpm @@ -0,0 +1,154 @@ +/* XPM */ +static char * new_xpm[] = { +"24 24 127 2", +" c None", +". c #000000", +"+ c #D3D3D3", +"@ c #F6F6F6", +"# c #FFFFFF", +"$ c #F9F9F9", +"% c #DADADA", +"& c #585858", +"* c #C7C7C7", +"= c #D1D1D1", +"- c #D6D6D6", +"; c #FEFEFE", +"> c #FDFDFD", +", c #C0C0C0", +"' c #E1E1E1", +") c #F0F0F0", +"! c #9B9B9B", +"~ c #FCFCFB", +"{ c #FBFBFB", +"] c #AFAFAE", +"^ c #E9E9E9", +"/ c #DFDFDF", +"( c #8F8F8F", +"_ c #FAFAF9", +": c #F9F9F8", +"< c #A4A4A3", +"[ c #F4F4F4", +"} c #CFCFCF", +"| c #A2A2A2", +"1 c #F8F8F7", +"2 c #F8F7F6", +"3 c #9E9E9E", +"4 c #F7F6F5", +"5 c #F6F6F4", +"6 c #F4F3F2", +"7 c #DEDDDC", +"8 c #D3D2D0", +"9 c #B7B7B5", +"0 c #9F9E9D", +"a c #706F6F", +"b c #65625A", +"c c #F5F4F3", +"d c #F2F2F0", +"e c #E4E4E2", +"f c #DAD9D7", +"g c #D8D8D6", +"h c #CDCCCA", +"i c #AFAEAC", +"j c #88847B", +"k c #F3F3F1", +"l c #EFEFED", +"m c #EEEDEB", +"n c #EDECEA", +"o c #E9E8E6", +"p c #D5D4D3", +"q c #C4C3C2", +"r c #8F8A81", +"s c #F6F5F4", +"t c #F5F5F3", +"u c #F1F1EF", +"v c #F1F0EE", +"w c #ECEBE9", +"x c #EAE9E7", +"y c #E5E4E2", +"z c #E4E3E0", +"A c #D2D1CE", +"B c #8D887E", +"C c #F3F2F1", +"D c #F0F0EE", +"E c #F0EFED", +"F c #EFEEEC", +"G c #E8E7E5", +"H c #E5E4E1", +"I c #E2E1DE", +"J c #E1DFDC", +"K c #979288", +"L c #A49E93", +"M c #E8E7E4", +"N c #E7E6E3", +"O c #E3E2DF", +"P c #E2E0DD", +"Q c #E1E0DC", +"R c #E0DFDB", +"S c #A19C90", +"T c #EDEDEB", +"U c #EBEAE8", +"V c #E9E8E5", +"W c #E6E4E1", +"X c #E3E2DE", +"Y c #DFDEDA", +"Z c #DEDDD9", +"` c #DDDCD8", +" . c #A19B90", +".. c #E7E5E2", +"+. c #E4E3DF", +"@. c #DCDBD7", +"#. c #E6E5E2", +"$. c #E5E4E0", +"%. c #E2E1DD", +"&. c #DBD9D5", +"*. c #D9D7D3", +"=. c #9F998D", +"-. c #E4E2DF", +";. c #DDDBD7", +">. c #DCDAD6", +",. c #D8D6D2", +"'. c #9E988D", +"). c #EDEDED", +"!. c #E1E0DD", +"~. c #E0DEDA", +"{. c #D8D6D1", +"]. c #D7D5D1", +"^. c #9D978B", +"/. c #E1DFDB", +"(. c #DEDCD8", +"_. c #D7D6D1", +":. c #D5D3CE", +"<. c #9B958A", +"[. c #999891", +"}. c #A39E92", +"|. c #A39D92", +"1. c #A39D91", +"2. c #A29C90", +"3. c #A19B8F", +"4. c #9D978C", +"5. c #9B968A", +"6. c #676359", +" ", +" . . . . . . . . . . . . . ", +" . + @ # # # # # # # # $ % & . ", +" . @ # # # # # # # # # # * = - . ", +" . # # # # # # # ; # ; > , ' ) ! . ", +" . # # # # # ; > ~ > ~ { ] ^ # / ( . ", +" . # # # ; > ~ { _ { _ : < ) # [ } | . ", +" . # ; > ~ { _ : 1 : 1 2 3 . . . . . . . ", +" . # ~ { _ : 1 2 4 2 4 5 6 7 8 9 0 a b . ", +" . # _ : 1 2 4 5 c 5 c 6 d e f g h i j . ", +" . # 1 2 4 5 c 6 k 6 k d l m n o p q r . ", +" . # s t 6 6 k d u d u v m w x y z A B . ", +" . # 6 C d D l v E v E F w G H z I J K . ", +" . # 6 C d D l v E v E F w G H z I J L . ", +" . # D l l F m n n n n w M N O P Q R S . ", +" . # T n w w w U V U V V H W X Y Z ` .. ", +" . # U o o G M M N M N ..+.X R Z ` @. .. ", +" . # N #.#.#.H W $.W $.+.%.R Z @.&.*.=.. ", +" . $ z O X -.+.%.X %.X Q Q Z ;.>.*.,.'.. ", +" . ).!.J Q R %.R Q R Q Y ~.;.>.*.{.].^.. ", +" . = /.~.Y Z R Z ~.Z ~.(.(.>.>.,._.:.<.. ", +" . [.}.L |.1.|.S 2.S 2.3. .=.=.4.4.5.6.. ", +" . . . . . . . . . . . . . . . . . . ", +" "}; diff --git a/etc/images/next-node.xpm b/etc/images/next-node.xpm new file mode 100644 index 0000000..385766e --- /dev/null +++ b/etc/images/next-node.xpm @@ -0,0 +1,45 @@ +/* XPM */ +static char * next_node2_xpm[] = { +"24 24 18 1", +" c None", +". c #000000", +"+ c #FFFFFF", +"@ c #DADAD6", +"# c #BCBCB8", +"$ c #506B46", +"% c #778E6F", +"& c #0F1308", +"* c #77A16E", +"= c #C2D7BE", +"- c #6B9060", +"; c #A9C7A6", +"> c #C1D6BD", +", c #BDD3B8", +"' c #B0CAAD", +") c #A4C3A2", +"! c #445B2C", +"~ c #8CA782", +" .................. ", +" .+++++++++++++++@#. ", +" .+++++++++++++++#+#. ", +" .+++$#++++++++++#%$&. ", +" .+++..#@++++++++@%$&. ", +" .+++.*.#@@+@++++++@#. ", +" .+@@.=-.#@@++@@@@@@#. ", +".......=;-.#@@@+@@@@@#. ", +".=>>>>>,;;-.#@@@@@@@@#. ", +".=;;;;';;;;-.##@@@@@@#. ", +".@>,,,>,,,,;-.#@@@@@@#. ", +".)----------!.%#@@@@@#. ", +".~---------!.%##@@@@##. ", +".*--------!.$%##@@@@@#. ", +".......--!.%####@@@@@#. ", +" .##%.-!.$%####@@@@##. ", +" .@##.!.%####@####@##. ", +" .+##..%%#####@@@@@@#. ", +" .+@#.#####@@@####@@#. ", +" .+@@#####@@@@####@##. ", +" .+##################. ", +" ..................... ", +" ", +" "}; diff --git a/etc/images/next-page.xpm b/etc/images/next-page.xpm new file mode 100644 index 0000000..75236fe --- /dev/null +++ b/etc/images/next-page.xpm @@ -0,0 +1,119 @@ +/* XPM */ +static char * stock_next_page_xpm[] = { +"24 24 92 2", +" c None", +". c #000000", +"+ c #5B7289", +"@ c #FFFFFF", +"# c #F2F2F2", +"$ c #E5E5E5", +"% c #D8D8D8", +"& c #CCCCCC", +"* c #B0B0B0", +"= c #8B8B8B", +"- c #6A6A6A", +"; c #494949", +"> c #888888", +", c #C9C9C9", +"' c #E3E3E3", +") c #EEEEEE", +"! c #E6E6E6", +"~ c #DEDEDE", +"{ c #D6D6D6", +"] c #ADADAD", +"^ c #556D85", +"/ c #47617B", +"( c #BFBFBF", +"_ c #B2B2B2", +": c #ACACAC", +"< c #A6A6A6", +"[ c #F6F6F6", +"} c #384F66", +"| c #3A5067", +"1 c #DADADA", +"2 c #3A5168", +"3 c #D3D3D3", +"4 c #3B5269", +"5 c #47617C", +"6 c #3D526A", +"7 c #48627D", +"8 c #B6B6B6", +"9 c #959595", +"0 c #7C7C7C", +"a c #616161", +"b c #464646", +"c c #262626", +"d c #C5C5C5", +"e c #3E546A", +"f c #49637D", +"g c #3F556B", +"h c #4B647E", +"i c #40566C", +"j c #4C647F", +"k c #41576D", +"l c #4C657F", +"m c #42586E", +"n c #4E6780", +"o c #44586F", +"p c #4F6881", +"q c #B5B5B5", +"r c #45596F", +"s c #506982", +"t c #77838F", +"u c #9C9FA1", +"v c #91969C", +"w c #91979C", +"x c #92979C", +"y c #92979D", +"z c #A2A3A4", +"A c #9D9FA2", +"B c #8F9296", +"C c #8F9396", +"D c #8F9397", +"E c #909397", +"F c #868788", +"G c #465B70", +"H c #526A83", +"I c #3E5975", +"J c #3F5A76", +"K c #415B77", +"L c #425C78", +"M c #435E79", +"N c #445F7A", +"O c #46607B", +"P c #68727D", +"Q c #7D8185", +"R c #616A73", +"S c #3B4F63", +"T c #3C5064", +"U c #3C5065", +"V c #3E5166", +"W c #3F5266", +"X c #405367", +"Y c #405468", +"Z c #344353", +"` c #2F4050", +" ", +" ", +" . . . . . . . . . . . . . . . . ", +" . + @ # $ % & * = - ; > , ' ) ! ~ { ] ^ . ", +" . / @ # $ % & ( _ : < @ @ [ ) ! ~ { _ } . ", +" . / @ # $ % & ( _ : < @ ' [ ) ! ~ { _ | . ", +" . / @ # $ % & ( _ : < @ . 1 ) ! ~ { * 2 . ", +" . / @ # $ % & ( _ : < @ . . 3 ! ~ { * 4 . ", +" . 5 @ # $ % & ( _ : < @ . . . & ~ { * 6 . ", +" . 7 @ # $ 8 9 0 a b c . . . . . d { * e . ", +" . f @ # $ % & ( _ : < @ . . . & ~ { * g . ", +" . h @ # $ % & ( _ : < @ . . 3 ! ~ { * i . ", +" . j @ # $ % & ( _ : < @ . 1 ) ! ~ { * k . ", +" . l @ # $ % & ( _ : < @ ' [ ) ! ~ { * m . ", +" . n @ # $ % & ( _ : < @ @ [ ) ! ~ { * o . ", +" . p @ # $ % & ( _ : < @ @ [ ) ! ~ { q r . ", +" . s t u v w x y y z < A B C C D D E F G . ", +" . H I J K L M N O P Q R S T U V W X Y Z . ", +" . . . . . . . . . ` . . . . . . . . . . ", +" . . . ", +" ", +" ", +" ", +" "}; diff --git a/etc/images/open.xpm b/etc/images/open.xpm new file mode 100644 index 0000000..6b95c7e --- /dev/null +++ b/etc/images/open.xpm @@ -0,0 +1,200 @@ +/* XPM */ +static char * open_xpm[] = { +"24 24 173 2", +" c None", +". c #000000", +"+ c #010100", +"@ c #B5B8A5", +"# c #E4E7D2", +"$ c #878A76", +"% c #33342B", +"& c #0B0B0B", +"* c #E2E5CF", +"= c #CFD4AF", +"- c #CED3AE", +"; c #B2B696", +"> c #2D2D25", +", c #23241D", +"' c #9D9F90", +") c #C6CAA6", +"! c #C4C9A5", +"~ c #C6CBA7", +"{ c #C7CCA8", +"] c #C9CEA9", +"^ c #555847", +"/ c #1A1B15", +"( c #20201A", +"_ c #D4D6C2", +": c #BEC2A0", +"< c #B3B896", +"[ c #B0B595", +"} c #B3B797", +"| c #B6BB99", +"1 c #BBC09E", +"2 c #BCC19F", +"3 c #81856C", +"4 c #3E3F32", +"5 c #010101", +"6 c #DADDC8", +"7 c #AFB494", +"8 c #AAAF8F", +"9 c #A3A789", +"0 c #A6AA8B", +"a c #A9AD8E", +"b c #A7AB8D", +"c c #A4A88A", +"d c #A1A588", +"e c #AAAD96", +"f c #B3B5A5", +"g c #B8BBAA", +"h c #BABCAB", +"i c #C1C3B2", +"j c #C7CAB7", +"k c #CACDBB", +"l c #BABDA8", +"m c #0C0C09", +"n c #DDDFCB", +"o c #969B7E", +"p c #9DA286", +"q c #95987C", +"r c #96997E", +"s c #9A9D81", +"t c #999D80", +"u c #9DA184", +"v c #A5AA8B", +"w c #A4A98A", +"x c #A3A889", +"y c #A2A588", +"z c #A2A587", +"A c #9FA386", +"B c #9B9E83", +"C c #898D74", +"D c #D8DBC9", +"E c #84866E", +"F c #7D8169", +"G c #151612", +"H c #D7DAC9", +"I c #797D67", +"J c #3D3F34", +"K c #E0E0D9", +"L c #EBEDDD", +"M c #E8EBD9", +"N c #E7EAD8", +"O c #E3E6D4", +"P c #DEE1D0", +"Q c #DADCCC", +"R c #DADCD1", +"S c #2B2C28", +"T c #D7DAC6", +"U c #6F735E", +"V c #0D0D0D", +"W c #F4F4EC", +"X c #CACFAB", +"Y c #C6CBA8", +"Z c #C2C6A4", +"` c #ABB091", +" . c #23251E", +".. c #494B3D", +"+. c #DCDCD4", +"@. c #EAECDD", +"#. c #CDD2AD", +"$. c #CCD1AC", +"%. c #CACFAA", +"&. c #BABF9D", +"*. c #B5B999", +"=. c #81836C", +"-. c #070806", +";. c #D5D8C4", +">. c #161616", +",. c #F2F2EA", +"'. c #C9CEAA", +"). c #C8CDA9", +"!. c #C4C9A6", +"~. c #C1C5A3", +"{. c #BCC09F", +"]. c #B6BB9A", +"^. c #B0B494", +"/. c #9DA185", +"(. c #535445", +"_. c #B6B8A7", +":. c #747470", +"<. c #ECECE2", +"[. c #C3C8A5", +"}. c #C2C7A4", +"|. c #C0C5A2", +"1. c #BFC4A1", +"2. c #BDC2A0", +"3. c #B9BD9C", +"4. c #B9BE9D", +"5. c #A9AD8F", +"6. c #A3A78A", +"7. c #80836D", +"8. c #020201", +"9. c #A6A998", +"0. c #B8BC9B", +"a. c #AFB394", +"b. c #ACB091", +"c. c #A8AC8E", +"d. c #A6AA8C", +"e. c #9FA286", +"f. c #9B9F83", +"g. c #9A9D82", +"h. c #8A8D75", +"i. c #4F5243", +"j. c #070705", +"k. c #9E9F91", +"l. c #E5E6DA", +"m. c #ADB192", +"n. c #A5A98C", +"o. c #9FA387", +"p. c #999D81", +"q. c #95987E", +"r. c #92957B", +"s. c #8C8F76", +"t. c #8A8D74", +"u. c #71735F", +"v. c #080908", +"w. c #E3E5D9", +"x. c #C0C3AF", +"y. c #94987C", +"z. c #8F9379", +"A. c #8B8F75", +"B. c #8A8E74", +"C. c #888C73", +"D. c #858970", +"E. c #868971", +"F. c #82866E", +"G. c #80836C", +"H. c #7D8069", +"I. c #797C66", +"J. c #727560", +"K. c #717460", +"L. c #71745F", +"M. c #6A6D59", +"N. c #434538", +"O. c #080907", +"P. c #050504", +" ", +" ", +" ", +" . . . . . . . ", +" + @ # # # # # $ % ", +" & * = = = - - ; > ", +", ' * ) ! ~ { ] ] ^ / ", +"( _ : < [ } | 1 2 3 4 5 . . . . . . . ", +", 6 7 8 9 0 8 a b c d e f g h i j k l . ", +"m n o p q r s t r u v w x y 9 z A B C . ", +". D E F G . . . . . . . . . . . . . . . 5 5 ", +". H I J K L M M M M M M M M M M M N O P Q R S ", +". T U V W = = = = = = = = = - - - X Y Z 1 ` . ", +". T ..+.@.#.- - #.- #.#.#.#.#.$.%.Y Z &.*.=.-. ", +". ;.>.,.X %.X %.'.%.'.{ ).).Y !.~.{.].^./.(.m ", +". _.:.<.[.}.}.Z |.Z 1.2.|.2.3.4.} [ 5.6.7.8. ", +". 9.+.0.0.*.} } [ [ a.a.a.b.c.d.e.f.g.h.i.j. ", +". k.l.m.5.d.n.6.6.d o.e.f.p.q.r.s.t.t.u.v. ", +". w.x.y.z.A.B.C.C.D.E.F.G.H.I.J.K.L.M.N.O. ", +" . . . . . . . . . . . . . . . . . . P. ", +" ", +" ", +" ", +" "}; diff --git a/etc/images/paste.xpm b/etc/images/paste.xpm new file mode 100644 index 0000000..cdd8636 --- /dev/null +++ b/etc/images/paste.xpm @@ -0,0 +1,116 @@ +/* XPM */ +static char * paste_xpm[] = { +"24 24 89 1", +" c None", +". c #000000", +"+ c #B9B9B9", +"@ c #FEFEFE", +"# c #F9F9F9", +"$ c #757575", +"% c #F5F5E8", +"& c #565651", +"* c #FFFFFF", +"= c #A0A0A0", +"- c #939393", +"; c #7C7C7C", +"> c #C5C5BB", +", c #CFC6A0", +"' c #D7CEAA", +") c #ADA689", +"! c #4B483C", +"~ c #6D6D6D", +"{ c #6C6C6C", +"] c #A9A9A9", +"^ c #3D3A30", +"/ c #979178", +"( c #C1B898", +"_ c #8A793D", +": c #C3BB9A", +"< c #AFA78A", +"[ c #444236", +"} c #FAFAFA", +"| c #EFEFEF", +"1 c #C7C7C7", +"2 c #D8D8D8", +"3 c #D2D2D2", +"4 c #7B7B7B", +"5 c #302E26", +"6 c #89846C", +"7 c #C4BC9A", +"8 c #847235", +"9 c #C5C5C5", +"0 c #A7A7A7", +"a c #ADADAD", +"b c #9A9A9A", +"c c #9B9B9B", +"d c #868686", +"e c #424242", +"f c #847033", +"g c #C9C09E", +"h c #464337", +"i c #35332A", +"j c #2D2B23", +"k c #C6BE9D", +"l c #826F33", +"m c #7F7964", +"n c #4C493C", +"o c #171612", +"p c #13120F", +"q c #3E3B31", +"r c #282210", +"s c #474438", +"t c #B3B3B3", +"u c #D6D6D6", +"v c #B7AE90", +"w c #B1AA8C", +"x c #37352B", +"y c #151410", +"z c #8F8F8F", +"A c #989898", +"B c #C6C6C6", +"C c #B9B293", +"D c #11100D", +"E c #434035", +"F c #636363", +"G c #767676", +"H c #AAA48B", +"I c #A5A086", +"J c #A19A7F", +"K c #312F26", +"L c #AFA88C", +"M c #050403", +"N c #12110E", +"O c #A9A489", +"P c #A39E85", +"Q c #EBE7D0", +"R c #D2C9A5", +"S c #A29053", +"T c #8E7C3D", +"U c #88793B", +"V c #806C2F", +"W c #78652B", +"X c #251F0C", +" .... ", +" ......+@#$...... ", +".%%%%%&*=-;&>%%%,. ", +".%''')!*~{]^/(''_. ", +".%::<[}|123456<78. ", +".%''!900abcde!)'f. ", +".%g:6hijjjjj56 c #CCCCCC", +", c #AFAFAF", +"' c #D3D1CB", +") c #C1C0BF", +"! c #F0EFED", +"~ c #797772", +"{ c #DCDCDC", +"] c #A5A19C", +"^ c #EAE9E5", +"/ c #F3F1F0", +"( c #EDEDED", +"_ c #A19D96", +": c #C1BDB4", +"< c #DBD8D3", +"[ c #D9D6D1", +"} c #89857E", +"| c #FCFCFC", +"1 c #EAE9E6", +"2 c #F5F4F3", +"3 c #C6C2BA", +"4 c #F0EFEE", +"5 c #F4F4F3", +"6 c #CBC7C0", +"7 c #ECECEB", +"8 c #676560", +"9 c #54524D", +"0 c #777676", +"a c #797978", +"b c #85827E", +"c c #79756F", +"d c #7590AE", +"e c #A4BAD0", +"f c #90A6BE", +"g c #9F9F9E", +"h c #BEBDBC", +"i c #B8B4AD", +"j c #87837C", +"k c #D3DFEA", +"l c #A2AEBC", +"m c #9DB6CE", +"n c #637B95", +"o c #E2E2E2", +"p c #EEEEED", +"q c #849CB6", +"r c #D7E2ED", +"s c #8D98A5", +"t c #9DB8D2", +"u c #607791", +"v c #EDEDEC", +"w c #99ADC3", +"x c #DFE7F0", +"y c #8193A9", +"z c #586D84", +"A c #5B7189", +"B c #F1F1F1", +"C c #EEEDEB", +"D c #A7A6A5", +"E c #726F6A", +"F c #A1B4C8", +"G c #EEF3F6", +"H c #60768F", +"I c #DEDDDC", +"J c #787776", +"K c #4E4E4D", +"L c #91A6BE", +"M c #F0F4F7", +"N c #97A5B6", +"O c #BFBEBD", +"P c #AAAAA9", +"Q c #ACACAB", +"R c #B0C6DB", +"S c #EDF2F6", +"T c #818A95", +"U c #6C85A1", +"V c #C0D1E2", +" .. ", +" .+@#. ", +" .$%+. .. ", +" .&$. .*=. ", +" .. -;$. .*>,. ", +" .' ..)!+~. .{,. ", +" .]%%^/+++. .(.. ", +" ._:%$<[+}. .|. ", +" .....123}..>. ", +" .456.,. ", +" .7.,.. ", +" .,.89. ", +" ....,.0abc. ", +" .def.. .ghij. ", +" .dklmn. .op6}. ", +" .qrsntu. .v/$}. ", +" .wxyztdA. .BCDE..", +" .FGyHtdA. .IJK,.", +" .LMNHtdA. .OPQ.", +" .RSTtdA.. ... ", +" .UtVLA.. ", +" .UUn.. ", +" ... ", +" "}; diff --git a/etc/images/prev-node.xpm b/etc/images/prev-node.xpm new file mode 100644 index 0000000..586bf9c --- /dev/null +++ b/etc/images/prev-node.xpm @@ -0,0 +1,44 @@ +/* XPM */ +static char * prev_node3_xpm[] = { +"24 24 17 1", +" c None", +". c #000000", +"+ c #0F1308", +"@ c #FFFFFF", +"# c #BCBCB8", +"$ c #DADAD6", +"% c #778E6F", +"& c #C2D7BE", +"* c #A6BFA0", +"= c #A9C7A6", +"- c #BDD3B8", +"; c #B0CAAD", +"> c #C1D6BD", +", c #8CA782", +"' c #5B7950", +") c #6B9060", +"! c #445B2C", +" .................. ", +" +@#@@@@@@@@@@@@@@$. ", +" +@@%$@@@@@@@@@@@@@$. ", +" .$#%%$@@@@@@@@@$.$$$. ", +" .%$##$@@@@@@@@#..$$$. ", +" .#@@@@@@@@@$$#.&.#$$. ", +" .$@@@@@@@@@@#.$*.##$. ", +" .@@@@@@@@$$#.$=*.......", +" .@@@@@@@$$#.$==-&&&&&*.", +" .@@@@@@@$#.@====;====%.", +" .@$@$$$$#.$>>>>>>>>>>,.", +" .@$@$$$$#.'))))))))))!.", +" .@$$$$$$##.')))))))))!.", +" .@$$$$$$##%.')))'!!!!!.", +" .@$$$$$##$#%.')!.......", +" .@$$$$$$$###%.'!.%%%. ", +" .@$$#####$$##%.!.%##. ", +" .@$$$$$$$#####%..###. ", +" .@$$#####$$$###%.###. ", +" .@$$$$$$$$$$$#######. ", +" .@##################. ", +" ..................... ", +" ", +" "}; diff --git a/etc/images/print.xpm b/etc/images/print.xpm new file mode 100644 index 0000000..95f2f40 --- /dev/null +++ b/etc/images/print.xpm @@ -0,0 +1,202 @@ +/* XPM */ +static char * print_xpm[] = { +"24 24 175 2", +" c None", +". c #000000", +"+ c #C7C7C7", +"@ c #FAFAFA", +"# c #FCFCFC", +"$ c #FBFBFB", +"% c #F8F8F8", +"& c #AFAFAF", +"* c #F9F9F9", +"= c #E5E5E5", +"- c #E3E3E3", +"; c #E2E2E2", +"> c #E0E0E0", +", c #DFDFDF", +"' c #DCDCDC", +") c #DBDBDB", +"! c #B6B6B6", +"~ c #6B6B6B", +"{ c #676767", +"] c #818181", +"^ c #E7E7E7", +"/ c #606060", +"( c #A0A0A0", +"_ c #DADADA", +": c #E1E1E1", +"< c #B7B7B7", +"[ c #FDFDFD", +"} c #EFEFEF", +"| c #EEEEEE", +"1 c #EDEDED", +"2 c #ECECEC", +"3 c #EBEBEB", +"4 c #E9E9E9", +"5 c #E8E8E8", +"6 c #BFBFBF", +"7 c #8A8A8A", +"8 c #6A6A6A", +"9 c #9E9E9E", +"0 c #F6F6F6", +"a c #909090", +"b c #A2A2A2", +"c c #AAAAAA", +"d c #F4F4F4", +"e c #CECECE", +"f c #ADADAD", +"g c #AEAEAE", +"h c #BEBEBE", +"i c #A6A6A6", +"j c #CDCDCD", +"k c #F5F5F5", +"l c #DEDEDE", +"m c #DDDDDD", +"n c #C9C9C9", +"o c #878787", +"p c #888888", +"q c #D0D0D0", +"r c #6E6E6E", +"s c #797979", +"t c #D1D1D1", +"u c #A1A1A1", +"v c #B3B3B3", +"w c #FFFFFF", +"x c #CACACA", +"y c #A7A7A7", +"z c #A5A5A5", +"A c #A4A4A4", +"B c #A3A3A3", +"C c #87847C", +"D c #EAE8E3", +"E c #8D8982", +"F c #53524C", +"G c #807D74", +"H c #AAA9A5", +"I c #BAB5AB", +"J c #F3F3F3", +"K c #C3C1BD", +"L c #8B8B89", +"M c #E6E5E1", +"N c #F9F9F8", +"O c #FAFAF9", +"P c #F9F9F7", +"Q c #F7F6F5", +"R c #F7F7F4", +"S c #F6F5F4", +"T c #F2F1EE", +"U c #F0EFEC", +"V c #E5E5E4", +"W c #9F9F9F", +"X c #DFDED9", +"Y c #A4A3A1", +"Z c #6C6B6A", +"` c #F5F4F3", +" . c #D5D5D5", +".. c #D3D3D3", +"+. c #D4D4D3", +"@. c #D4D4D4", +"#. c #A9A9A9", +"$. c #B5B5B5", +"%. c #CDCDCB", +"&. c #B5B5B4", +"*. c #DCDAD3", +"=. c #6B6B6A", +"-. c #999896", +";. c #918F87", +">. c #999895", +",. c #E6E4E1", +"'. c #F0EEEC", +"). c #FAF9F9", +"!. c #F9F8F7", +"~. c #F8F7F6", +"{. c #F8F8F7", +"]. c #F4F3F1", +"^. c #F2F1EF", +"/. c #565655", +"(. c #858482", +"_. c #9C9B99", +":. c #6B6A68", +"<. c #585858", +"[. c #5E5C57", +"}. c #524F4B", +"|. c #4A4845", +"1. c #4B4A46", +"2. c #4B4946", +"3. c #4A4844", +"4. c #494743", +"5. c #484642", +"6. c #474541", +"7. c #464440", +"8. c #514F4B", +"9. c #53514E", +"0. c #7B7A77", +"a. c #797771", +"b. c #949391", +"c. c #989694", +"d. c #868480", +"e. c #6E6C66", +"f. c #706D67", +"g. c #5C5955", +"h. c #67645F", +"i. c #5B5954", +"j. c #585651", +"k. c #5D5B56", +"l. c #595652", +"m. c #53504C", +"n. c #575450", +"o. c #595752", +"p. c #5C5956", +"q. c #5B5956", +"r. c #61615E", +"s. c #696861", +"t. c #77756F", +"u. c #7E7B77", +"v. c #979690", +"w. c #96938D", +"x. c #807E77", +"y. c #7D7A74", +"z. c #787770", +"A. c #716F6A", +"B. c #6E6C67", +"C. c #595753", +"D. c #63615C", +"E. c #686661", +"F. c #6F6E68", +"G. c #6D6C66", +"H. c #72716B", +"I. c #76746F", +"J. c #6A6963", +"K. c #8B8880", +"L. c #B2AFA8", +"M. c #B6B3AD", +"N. c #BFBDB6", +"O. c #BDBBB4", +"P. c #B0AEA6", +"Q. c #ABA8A2", +"R. c #9C9991", +" ", +" . . . . . . . . . . . . ", +" . + @ # # # # # # # $ % & . ", +" . * = - - - ; > , , ' ) ! . ", +" . # ~ { ] ^ / ( _ : > > < . ", +" . [ } | 1 1 | 2 2 3 4 5 6 . ", +" . [ 7 8 9 0 a b 4 c a d + . ", +" . [ # # # # $ $ # # $ $ e . ", +" . [ f g = h % h i j 3 # j . ", +" . k l l l m l l , l 5 : n . ", +" . . @ o ~ p q r s t p u q v . . ", +" . w . x y z A z z i B b u u 9 . C . ", +" . w D E F . . . . . . . . . . G C H I . ", +" . w w J w w w w w w w w w w w w w w w w D . ", +" . K L M N O N P Q R O O S T T U V D W X I . ", +" . Y Z ` h .! ..! +.< @.#...$.%.&.*.=.-.;.. ", +" . >.=.,.'.Q N @ ).N !.~.{.{.].].].^./.(.;.. ", +" . _.:.<.[.}.|.1.2.2.2.3.4.5.6.4.7.8.9.0.a.. ", +" . b.c.d.e.f.g.h.i.j.i.k.l.m.n.o.p.q.r.s.t.. ", +" . u.v.w.;.x.y.z.t.A.t.A.B.C.D.E.F.G.H.I.J.. ", +" . . . . . . . . . . . . . . . . . . . . ", +" . K.L.M.N.N.N.N.N.O.P.L.Q.P.R.R.R.G G . ", +" . . . . . . . . . . . . . . . . . . ", +" "}; diff --git a/etc/images/redo.xpm b/etc/images/redo.xpm new file mode 100644 index 0000000..273aec5 --- /dev/null +++ b/etc/images/redo.xpm @@ -0,0 +1,69 @@ +/* XPM */ +static char * stock_redo_xpm[] = { +"24 24 42 1", +" c None", +". c #000000", +"+ c #939A8D", +"@ c #BAD09D", +"# c #92998C", +"$ c #818F71", +"% c #ADBDA0", +"& c #C2D5AA", +"* c #D1DFBE", +"= c #BED2A3", +"- c #99A28F", +"; c #A8BCA6", +"> c #D5E1C6", +", c #CDDCBC", +"' c #D2E0BF", +") c #C5D7AE", +"! c #919889", +"~ c #8C9A7F", +"{ c #D4E0C5", +"] c #D3E0C1", +"^ c #BFD3A6", +"/ c #9BAA87", +"( c #B5C3A9", +"_ c #92AD62", +": c #7C9B40", +"< c #59702D", +"[ c #7F8E6B", +"} c #C8D9B2", +"| c #85A24D", +"1 c #53692A", +"2 c #A4B690", +"3 c #9BB572", +"4 c #6D8839", +"5 c #95A77E", +"6 c #8BA859", +"7 c #657255", +"8 c #98AF74", +"9 c #AFC394", +"0 c #6D7A5B", +"a c #9CAF84", +"b c #748261", +"c c #879772", +" ", +" ", +" ", +" . ", +" .. ", +" .+. ", +" ....@#. ", +" .$%&*=@-. ", +" .;>,')@@@!. ", +" .~{]*^@@@@@/. ", +" .(>_::::::<. ", +" .[}|::::::1. ", +" .23:<...:1. ", +" .@:4. .<. ", +" .@:.. .. ", +" .56. . ", +" .78. ", +" .9. ", +" .0a. ", +" .bc. ", +" ... ", +" ", +" ", +" "}; diff --git a/etc/images/refresh.xpm b/etc/images/refresh.xpm new file mode 100644 index 0000000..fbf4ce8 --- /dev/null +++ b/etc/images/refresh.xpm @@ -0,0 +1,113 @@ +/* XPM */ +static char * stock_refresh_xpm[] = { +"24 24 86 1", +" c None", +". c #000000", +"+ c #F3F6F8", +"@ c #C8D4DF", +"# c #F7F9FA", +"$ c #0D110C", +"% c #6286A5", +"& c #A0B6C9", +"* c #C9D5E0", +"= c #F2F5F7", +"- c #172116", +"; c #819EB6", +"> c #CAD6E1", +", c #CCD7E1", +"' c #CED9E3", +") c #F6F8F9", +"! c #7192AE", +"~ c #587B99", +"{ c #CDD8E2", +"] c #CFDAE4", +"^ c #D3DDE6", +"/ c #D5DEE6", +"( c #ADC0D0", +"_ c #90A9BF", +": c #537490", +"< c #23323E", +"[ c #85A1B8", +"} c #5E83A3", +"| c #6084A3", +"1 c #6689A7", +"2 c #678AA8", +"3 c #48657D", +"4 c #A8BCCD", +"5 c #7393AE", +"6 c #6B8DAA", +"7 c #5C81A1", +"8 c #5D82A2", +"9 c #6588A6", +"0 c #435F76", +"a c #B1C3D2", +"b c #50718D", +"c c #9FB5C8", +"d c #94ACC1", +"e c #425D73", +"f c #435E74", +"g c #B4C5D3", +"h c #6C8EAB", +"i c #C4D2DD", +"j c #5B80A0", +"k c #456178", +"l c #7595B0", +"m c #BFCEDA", +"n c #597D9C", +"o c #A3B8CA", +"p c #B0C2D1", +"q c #86A2B9", +"r c #6E8FAB", +"s c #E1E8EE", +"t c #B9C9D6", +"u c #6387A6", +"v c #4C6B85", +"w c #7F9DB6", +"x c #BCCCD9", +"y c #DDE5EC", +"z c #E4EAEF", +"A c #D8E1E9", +"B c #D1DBE4", +"C c #C7D3DE", +"D c #B7C8D6", +"E c #7091AD", +"F c #537592", +"G c #9DB3C6", +"H c #8CA7BD", +"I c #304353", +"J c #4E6E89", +"K c #829FB7", +"L c #92ABC0", +"M c #C5D3DE", +"N c #7C9AB3", +"O c #5A7E9D", +"P c #47647C", +"Q c #6185A4", +"R c #5B7F9E", +"S c #4F6F8A", +"T c #405A71", +"U c #283926", +" . ", +" .. ", +" .+. ", +" ....@#. ", +" $%&@@**=. .. ", +" -;@@**>,'). .!~. ", +" .%@**>,{]^/(. ._:. ", +" <&@[}}|%123. .4. ", +".5@678|%920. .ab. ", +".cd7e...1f. . .gh. ", +".ijb. .k. .. .al. ", +".mn. .. .'. .op5. ", +".qr. . .*s...at4u. ", +".vw. .xyzyABCDEF. ", +" .G. .p'B,@ixaH2I. ", +" .JK. .LM@,>>MmNOP. ", +" .F9. .9|%Q|}7RS.. ", +" .. .|R~~nJT.. ", +" .j~.... ", +" UO. ", +" .. ", +" . ", +" ", +" "}; diff --git a/etc/images/right-arrow.xpm b/etc/images/right-arrow.xpm new file mode 100644 index 0000000..da81568 --- /dev/null +++ b/etc/images/right-arrow.xpm @@ -0,0 +1,68 @@ +/* XPM */ +static char * right_arrow_xpm[] = { +"24 24 41 1", +" c None", +". c #000000", +"+ c #8CA782", +"@ c #B1CDAE", +"# c #77A16E", +"$ c #B4CEB1", +"% c #ACC8A9", +"& c #709867", +"* c #C1D6BD", +"= c #BDD3B8", +"- c #BFD4BB", +"; c #C2D7BE", +"> c #B0CAAD", +", c #B2CBB0", +"' c #AAC7A8", +") c #0F1308", +"! c #AEC5A8", +"~ c #AEC8AD", +"{ c #ABC7A8", +"] c #AAC6A7", +"^ c #A8C6A5", +"/ c #ADC8AD", +"( c #A8C7A8", +"_ c #A5C4A3", +": c #7F9F76", +"< c #A6BFA0", +"[ c #ABC7AA", +"} c #A7C5A4", +"| c #A9C7A6", +"1 c #AFC8AD", +"2 c #A4C3A2", +"3 c #6B9060", +"4 c #778E6F", +"5 c #698D60", +"6 c #6B9063", +"7 c #445B2C", +"8 c #6B8661", +"9 c #5B7950", +"0 c #6C8562", +"a c #65815C", +"b c #506B46", +" ", +" ", +" ", +" . ", +" .. ", +" .+. ", +" .@#. ", +" ........$%&. ", +" .*=-;;;;>,'&) ", +" .!~{{{]^'/(_:. ", +" .<[^}^|{%'{123. ", +" .45666666666657. ", +" .8999999999997. ", +" .099999999997. ", +" .abbbbbb9997. ", +" ........b97. ", +" .b7. ", +" .7. ", +" .. ", +" . ", +" ", +" ", +" ", +" "}; diff --git a/etc/images/save.xpm b/etc/images/save.xpm new file mode 100644 index 0000000..6507e37 --- /dev/null +++ b/etc/images/save.xpm @@ -0,0 +1,247 @@ +/* XPM */ +static char * save_xpm[] = { +"24 24 220 2", +" c None", +". c #000000", +"+ c #C3D7F4", +"@ c #A9CDE5", +"# c #75757A", +"$ c #EFC5BB", +"% c #F1C8BE", +"& c #F0C6BC", +"* c #EEBCB2", +"= c #EEBEB5", +"- c #EEC1B8", +"; c #EDBFB6", +"> c #E9B7AD", +", c #E9B8AF", +"' c #E9B9B1", +") c #E5BFBA", +"! c #737277", +"~ c #B3CDE3", +"{ c #A1BED6", +"] c #BBD6E8", +"^ c #8AAAC5", +"/ c #605F68", +"( c #E08D7E", +"_ c #E0826E", +": c #E0806E", +"< c #DC7A68", +"[ c #DC8171", +"} c #DA7868", +"| c #D48173", +"1 c #D47D6E", +"2 c #CE7265", +"3 c #CF7264", +"4 c #CE7567", +"5 c #C4675B", +"6 c #C36558", +"7 c #626169", +"8 c #87A3B7", +"9 c #567187", +"0 c #BAD5E9", +"a c #88A7C3", +"b c #686670", +"c c #C8817B", +"d c #CB7C74", +"e c #CB7A73", +"f c #CB7B73", +"g c #CC7C72", +"h c #CB7D73", +"i c #BF6B64", +"j c #CC7A70", +"k c #C16A62", +"l c #CC7C73", +"m c #C2655B", +"n c #C36459", +"o c #BA6C6A", +"p c #819EB6", +"q c #547086", +"r c #B6D3E7", +"s c #87ABC1", +"t c #737373", +"u c #FFFFFF", +"v c #83A0B8", +"w c #526C80", +"x c #B9D3E7", +"y c #85A4BF", +"z c #4F697C", +"A c #B9D3E6", +"B c #84A3BF", +"C c #CECECE", +"D c #CDCDCD", +"E c #BFBFBF", +"F c #88A4BB", +"G c #486276", +"H c #B7D2E7", +"I c #82A0BB", +"J c #636363", +"K c #465E70", +"L c #B5CAE5", +"M c #7FA2B9", +"N c #87A3BA", +"O c #455C6D", +"P c #AECCE5", +"Q c #7DA0B6", +"R c #C5C5C5", +"S c #546069", +"T c #B0D1E4", +"U c #83A1B6", +"V c #735B5B", +"W c #515C64", +"X c #AACEE3", +"Y c #7B9BB2", +"Z c #7A8E9A", +"` c #7A7A7A", +" . c #6B6F72", +".. c #6F6F6F", +"+. c #696969", +"@. c #6F777E", +"#. c #86A2B9", +"$. c #3A515D", +"%. c #A9C9E2", +"&. c #7494AF", +"*. c #829FB7", +"=. c #7F9DB6", +"-. c #7E9CB5", +";. c #7998B2", +">. c #85A1B8", +",. c #8CA7BD", +"'. c #8AA5BB", +"). c #364A59", +"!. c #ABC4E2", +"~. c #7294AD", +"{. c #6F90AC", +"]. c #7192AE", +"^. c #414A4E", +"/. c #424A51", +"(. c #525B63", +"_. c #626F79", +":. c #5F6C76", +"<. c #5C6971", +"[. c #5A666F", +"}. c #58636B", +"|. c #57636A", +"1. c #3B5360", +"2. c #39424B", +"3. c #7897B3", +"4. c #A4B9CB", +"5. c #364853", +"6. c #AAC9E2", +"7. c #7091AA", +"8. c #6F8FA7", +"9. c #4A5359", +"0. c #97938C", +"a. c #DFDDDA", +"b. c #E3E1DE", +"c. c #EBEAE8", +"d. c #EAE9E7", +"e. c #CFCEC9", +"f. c #C9C6C0", +"g. c #9B968E", +"h. c #566168", +"i. c #4B657A", +"j. c #54738C", +"k. c #AAC6DD", +"l. c #34464E", +"m. c #AAC9E1", +"n. c #6C8EA6", +"o. c #6C8CA4", +"p. c #40474D", +"q. c #DAD8D3", +"r. c #E7E6E2", +"s. c #67655E", +"t. c #524F47", +"u. c #D9D7D4", +"v. c #C7C5BF", +"w. c #C0BCB5", +"x. c #B8B3AB", +"y. c #434C54", +"z. c #4D697F", +"A. c #4F6F84", +"B. c #B3CADC", +"C. c #313E49", +"D. c #A8C8E1", +"E. c #6B8DA6", +"F. c #728FA4", +"G. c #E2E1DD", +"H. c #F0EFEC", +"I. c #CDCAC6", +"J. c #C2BFB9", +"K. c #CAC6C0", +"L. c #DCDAD7", +"M. c #4B555D", +"N. c #4E697F", +"O. c #BACCDC", +"P. c #A4C4DE", +"Q. c #698BA3", +"R. c #708AA1", +"S. c #383E43", +"T. c #E0DEDA", +"U. c #514E46", +"V. c #4F4C44", +"W. c #C7C4BE", +"X. c #CBC8C2", +"Y. c #E1E0DC", +"Z. c #E9E8E6", +"`. c #475158", +" + c #4E6879", +".+ c #4D6C80", +"++ c #A3C3DB", +"@+ c #383F43", +"#+ c #778999", +"$+ c #6E899E", +"%+ c #65859C", +"&+ c #33383C", +"*+ c #D7D4D0", +"=+ c #D6D4D0", +"-+ c #4E4A43", +";+ c #4D4942", +">+ c #D1CEC9", +",+ c #E6E5E2", +"'+ c #EDECEA", +")+ c #454F55", +"!+ c #486173", +"~+ c #4D6678", +"{+ c #A1C1DA", +"]+ c #373C40", +"^+ c #0C0D0F", +"/+ c #4E5E6A", +"(+ c #5B6E7C", +"_+ c #4F5B62", +":+ c #A4A099", +"<+ c #CCC9C3", +"[+ c #D7D5D1", +"}+ c #E4E2E0", +"|+ c #DDDBD7", +"1+ c #B8B5B0", +"2+ c #3E474D", +"3+ c #4A6176", +"4+ c #4A6070", +"5+ c #9BC3D8", +"6+ c #363C41", +"7+ c #28323E", +" ", +" ", +" . . . . . . . . . . . . . . . . . . . ", +" . + @ # $ % & * = - ; > , > , ' ) ! ~ { . ", +" . ] ^ / ( _ : < [ } | 1 2 3 4 5 6 7 8 9 . ", +" . 0 a b c d e f g h i j k l m n o b p q . ", +" . r s t u u u u u u u u u u u u u t v w . ", +" . x y t u u u u u u u u u u u u u t v z . ", +" . A B t C D D D D D D D D D D D E t F G . ", +" . H I J u u u u u u u u u u u u u t F K . ", +" . L M t u u u u u u u u u u u u u t N O . ", +" . P Q t C D D D D D D D D D D D R t N S . ", +" . T U V u u u u u u u u u u u u u t v W . ", +" . X Y Z ` t t t t t ...t t t t +.@.#.$.. ", +" . %.&.p v #.*.=.-.*.;.#.>.>.N *.,.v '.).. ", +" . !.~.{.].^./.(._.:.<.[.}.|.(.1.2.3.4.5.. ", +" . 6.7.8.9.0.a.b.c.c.d.a.e.f.g.h.i.j.k.l.. ", +" . m.n.o.p.q.r.s.t.t.u.v.w.x.e.y.z.A.B.C.. ", +" . D.E.F.p.G.H.s.t.t.I.J.w.K.L.M.N.A.O.C.. ", +" . P.Q.R.S.T.c.U.V.V.W.w.X.Y.Z.`. +.+++@+. ", +" . #+$+%+&+*+=+-+;+;+w.>+,+'+,+)+!+~+{+]+. ", +" ^+/+(+_+:+w.x.<+<+[+}+d.|+1+2+3+4+5+6+. ", +" . . . . . . . . . . . . . . . . 7+. ", +" "}; diff --git a/etc/images/saveas.xpm b/etc/images/saveas.xpm new file mode 100644 index 0000000..2830b06 --- /dev/null +++ b/etc/images/saveas.xpm @@ -0,0 +1,289 @@ +/* XPM */ +static char * saveas_xpm[] = { +"24 24 262 2", +" c None", +". c #000000", +"+ c #FBE73B", +"@ c #F2B64D", +"# c #FCEB3D", +"$ c #F7B544", +"% c #5D502C", +"& c #C3D7F4", +"* c #A9CDE5", +"= c #75757A", +"- c #EFC5BB", +"; c #F1C8BE", +"> c #F0C6BC", +", c #EEBCB2", +"' c #EEBEB5", +") c #EEC1B8", +"! c #EDBFB6", +"~ c #E8B6AC", +"{ c #FCE93B", +"] c #F7B545", +"^ c #6C5F34", +"/ c #434345", +"( c #92A7B9", +"_ c #96B1C7", +": c #BBD6E8", +"< c #8AAAC5", +"[ c #605F68", +"} c #E08D7E", +"| c #E0826E", +"1 c #E0806E", +"2 c #DC7A68", +"3 c #DC8171", +"4 c #DA7868", +"5 c #D38072", +"6 c #FAE43A", +"7 c #F4B244", +"8 c #615030", +"9 c #783E35", +"0 c #4D4C52", +"a c #7790A2", +"b c #526D82", +"c c #BAD5E9", +"d c #88A7C3", +"e c #686670", +"f c #C8817B", +"g c #CB7C74", +"h c #CB7A73", +"i c #CB7B73", +"j c #CC7C72", +"k c #CA7C72", +"l c #F9DF39", +"m c #F3AF42", +"n c #614F2F", +"o c #8F4941", +"p c #945554", +"q c #5B5A62", +"r c #7B97AE", +"s c #536F84", +"t c #B6D3E7", +"u c #87ABC1", +"v c #737373", +"w c #FFFFFF", +"x c #FEFEFE", +"y c #F9DC38", +"z c #EFB44D", +"A c #665A32", +"B c #BBBBBB", +"C c #CDCDCD", +"D c #E4E4E4", +"E c #6E6E6E", +"F c #819EB6", +"G c #526C80", +"H c #B9D3E7", +"I c #85A4BF", +"J c #F8D837", +"K c #F0A93F", +"L c #655930", +"M c #BABABA", +"N c #CCCCCC", +"O c #E5E5E5", +"P c #F7F7F7", +"Q c #727272", +"R c #83A0B8", +"S c #4F697C", +"T c #B9D3E6", +"U c #84A3BF", +"V c #CECECE", +"W c #F6D236", +"X c #EDA43E", +"Y c #5C5130", +"Z c #949494", +"` c #A3A3A3", +" . c #B7B7B7", +".. c #C6C6C6", +"+. c #BDBDBD", +"@. c #88A4BB", +"#. c #486276", +"$. c #B7D2E7", +"%. c #82A0BB", +"&. c #636363", +"*. c #FDFDFD", +"=. c #D7AE74", +"-. c #61562F", +";. c #465E70", +">. c #B5CAE5", +",. c #7FA2B9", +"'. c #4F4115", +"). c #87A3BA", +"!. c #455C6D", +"~. c #AECCE5", +"{. c #7DA0B6", +"]. c #CBCBCB", +"^. c #9B9B9B", +"/. c #9C9C9C", +"(. c #A7A7A7", +"_. c #B8B8B8", +":. c #C5C5C5", +"<. c #546069", +"[. c #B0D1E4", +"}. c #83A1B6", +"|. c #735B5B", +"1. c #F0F0F0", +"2. c #D9D9D9", +"3. c #D3D3D3", +"4. c #E1E1E1", +"5. c #EDEDED", +"6. c #F8F8F8", +"7. c #515C64", +"8. c #AACEE3", +"9. c #7B9BB2", +"0. c #7A8E9A", +"a. c #7A7A7A", +"b. c #707070", +"c. c #6C6C6C", +"d. c #6F6F6F", +"e. c #6A6E71", +"f. c #696969", +"g. c #6F777E", +"h. c #86A2B9", +"i. c #3A515D", +"j. c #A9C9E2", +"k. c #7494AF", +"l. c #7E9BB4", +"m. c #7D9AB3", +"n. c #7998B2", +"o. c #85A1B8", +"p. c #829FB7", +"q. c #8CA7BD", +"r. c #8AA5BB", +"s. c #364A59", +"t. c #ABC4E2", +"u. c #7294AD", +"v. c #6F90AC", +"w. c #7192AE", +"x. c #414A4E", +"y. c #424A51", +"z. c #525B63", +"A. c #626F79", +"B. c #5F6C76", +"C. c #5C6971", +"D. c #5A666F", +"E. c #58636B", +"F. c #57636A", +"G. c #3B5360", +"H. c #39424B", +"I. c #7897B3", +"J. c #A4B9CB", +"K. c #364853", +"L. c #AAC9E2", +"M. c #7091AA", +"N. c #6F8FA7", +"O. c #4A5359", +"P. c #97938C", +"Q. c #DFDDDA", +"R. c #E3E1DE", +"S. c #EBEAE8", +"T. c #EAE9E7", +"U. c #CFCEC9", +"V. c #C9C6C0", +"W. c #9B968E", +"X. c #566168", +"Y. c #4B657A", +"Z. c #54738C", +"`. c #AAC6DD", +" + c #34464E", +".+ c #AAC9E1", +"++ c #6C8EA6", +"@+ c #6C8CA4", +"#+ c #40474D", +"$+ c #DAD8D3", +"%+ c #E7E6E2", +"&+ c #67655E", +"*+ c #524F47", +"=+ c #D9D7D4", +"-+ c #C7C5BF", +";+ c #C0BCB5", +">+ c #B8B3AB", +",+ c #434C54", +"'+ c #4D697F", +")+ c #4F6F84", +"!+ c #B3CADC", +"~+ c #313E49", +"{+ c #A8C8E1", +"]+ c #6B8DA6", +"^+ c #728FA4", +"/+ c #E2E1DD", +"(+ c #F0EFEC", +"_+ c #CDCAC6", +":+ c #C2BFB9", +"<+ c #CAC6C0", +"[+ c #DCDAD7", +"}+ c #4B555D", +"|+ c #4E697F", +"1+ c #BACCDC", +"2+ c #A4C4DE", +"3+ c #698BA3", +"4+ c #708AA1", +"5+ c #383E43", +"6+ c #E0DEDA", +"7+ c #514E46", +"8+ c #4F4C44", +"9+ c #C7C4BE", +"0+ c #CBC8C2", +"a+ c #E1E0DC", +"b+ c #E9E8E6", +"c+ c #475158", +"d+ c #4E6879", +"e+ c #4D6C80", +"f+ c #A3C3DB", +"g+ c #383F43", +"h+ c #778999", +"i+ c #6E899E", +"j+ c #65859C", +"k+ c #33383C", +"l+ c #D7D4D0", +"m+ c #D6D4D0", +"n+ c #4E4A43", +"o+ c #4D4942", +"p+ c #D1CEC9", +"q+ c #E6E5E2", +"r+ c #EDECEA", +"s+ c #454F55", +"t+ c #486173", +"u+ c #4D6678", +"v+ c #A1C1DA", +"w+ c #373C40", +"x+ c #0C0D0F", +"y+ c #4E5E6A", +"z+ c #5B6E7C", +"A+ c #4F5B62", +"B+ c #A4A099", +"C+ c #CCC9C3", +"D+ c #D7D5D1", +"E+ c #E4E2E0", +"F+ c #DDDBD7", +"G+ c #B8B5B0", +"H+ c #3E474D", +"I+ c #4A6176", +"J+ c #4A6070", +"K+ c #9BC3D8", +"L+ c #363C41", +"M+ c #28323E", +" . . ", +" . + @ . ", +" . . . . . . . . . . . . . # $ % . . . ", +" . & * = - ; > , ' ) ! ~ . { ] ^ . / ( _ . ", +" . : < [ } | 1 2 3 4 5 . 6 7 8 . 9 0 a b . ", +" . c d e f g h i j k . l m n . o p q r s . ", +" . t u v w w w w x . y z A . B C D E F G . ", +" . H I v w w w x . J K L . M N O P Q R S . ", +" . T U v V C N . W X Y . Z ` ...+.v @.#.. ", +" . $.%.&.w w *.. =.-.. M N D P *.w v @.;.. ", +" . >.,.v w x . '.. . M N D P *.w w v ).!.. ", +" . ~.{.v V ].. . ^./.(._...].C C :.v ).<.. ", +" . [.}.|.w *.1.2.3.4.5.6.x w w w w v R 7.. ", +" . 8.9.0.a.Q b.c.c.d.e.E v v v v f.g.h.i.. ", +" . j.k.F R h.F l.m.F n.h.o.o.).p.q.R r.s.. ", +" . t.u.v.w.x.y.z.A.B.C.D.E.F.z.G.H.I.J.K.. ", +" . L.M.N.O.P.Q.R.S.S.T.Q.U.V.W.X.Y.Z.`. +. ", +" . .+++@+#+$+%+&+*+*+=+-+;+>+U.,+'+)+!+~+. ", +" . {+]+^+#+/+(+&+*+*+_+:+;+<+[+}+|+)+1+~+. ", +" . 2+3+4+5+6+S.7+8+8+9+;+0+a+b+c+d+e+f+g+. ", +" . h+i+j+k+l+m+n+o+o+;+p+q+r+q+s+t+u+v+w+. ", +" x+y+z+A+B+;+>+C+C+D+E+T.F+G+H+I+J+K+L+. ", +" . . . . . . . . . . . . . . . . M+. ", +" "}; diff --git a/etc/images/search.xpm b/etc/images/search.xpm new file mode 100644 index 0000000..ad63005 --- /dev/null +++ b/etc/images/search.xpm @@ -0,0 +1,234 @@ +/* XPM */ +static char * search_xpm[] = { +"24 24 207 2", +" c None", +". c #000000", +"+ c #D3D3D3", +"@ c #F6F6F6", +"# c #FFFFFF", +"$ c #F9F9F9", +"% c #DADADA", +"& c #585858", +"* c #C7C7C7", +"= c #D1D1D1", +"- c #D6D6D6", +"; c #FEFEFE", +"> c #FDFDFD", +", c #C0C0C0", +"' c #E1E1E1", +") c #F0F0F0", +"! c #9B9B9B", +"~ c #FCFCFB", +"{ c #FBFBFB", +"] c #AFAFAE", +"^ c #E9E9E9", +"/ c #DFDFDF", +"( c #8F8F8F", +"_ c #FAFAF9", +": c #F9F9F8", +"< c #A4A4A3", +"[ c #F4F4F4", +"} c #CFCFCF", +"| c #A2A2A2", +"1 c #B8B8B8", +"2 c #47473F", +"3 c #0A0A09", +"4 c #4B4B43", +"5 c #B4B4B3", +"6 c #F7F6F5", +"7 c #9E9E9E", +"8 c #A9A9A8", +"9 c #34342E", +"0 c #9D9D8D", +"a c #CFCFB9", +"b c #C4C4AF", +"c c #8D8D7F", +"d c #353530", +"e c #ACACAA", +"f c #F1F0EF", +"g c #DEDDDC", +"h c #D3D2D0", +"i c #B7B7B5", +"j c #9F9E9D", +"k c #706F6F", +"l c #65625A", +"m c #46463F", +"n c #9C9C8C", +"o c #E2E2D0", +"p c #EDEDE7", +"q c #C0C0AC", +"r c #B2B29F", +"s c #828274", +"t c #4C4C44", +"u c #E4E4E2", +"v c #E1E1DF", +"w c #DAD9D7", +"x c #D8D8D6", +"y c #CDCCCA", +"z c #AFAEAC", +"A c #88847B", +"B c #F8F8F7", +"C c #090908", +"D c #D5D5BF", +"E c #FBFBFA", +"F c #C3C3AE", +"G c #B5B5A2", +"H c #A6A695", +"I c #9C9C8F", +"J c #080807", +"K c #CFCFCD", +"L c #E3E2E0", +"M c #ECEBE9", +"N c #E9E8E6", +"O c #D5D4D3", +"P c #C4C3C2", +"Q c #8F8A81", +"R c #F6F5F4", +"S c #F3F3F1", +"T c #090909", +"U c #CACAB5", +"V c #DDDDD0", +"W c #B7B7A4", +"X c #AAAA98", +"Y c #9B9B8B", +"Z c #AEAEA3", +"` c #BBBAB9", +" . c #E8E7E5", +".. c #E5E4E2", +"+. c #E4E3E0", +"@. c #D2D1CE", +"#. c #8D887E", +"$. c #F4F3F2", +"%. c #F0EFEE", +"&. c #474740", +"*. c #929283", +"=. c #BABAA7", +"-. c #ADAD9B", +";. c #9F9F8E", +">. c #ACACA1", +",. c #CFCFCB", +"'. c #4C4C45", +"). c #B3B2B1", +"!. c #E2E1DE", +"~. c #E1DFDC", +"{. c #979288", +"]. c #949493", +"^. c #34342F", +"/. c #878779", +"(. c #A0A090", +"_. c #AEAEA2", +":. c #C3C3BE", +"<. c #010101", +"[. c #B1B0AF", +"}. c #D2D1CF", +"|. c #A49E93", +"1. c #F0F0EE", +"2. c #EDEDEB", +"3. c #DDDDDB", +"4. c #898988", +"5. c #414141", +"6. c #737271", +"7. c #A4A3A1", +"8. c #DFDEDB", +"9. c #E2E0DD", +"0. c #E1E0DC", +"a. c #E0DFDB", +"b. c #A19C90", +"c. c #E1E0DE", +"d. c #CBCAC9", +"e. c #B2B1B0", +"f. c #A3A2A1", +"g. c #9D9C9A", +"h. c #9E9D9C", +"i. c #9F9F9D", +"j. c #ABAAA7", +"k. c #DCDBD7", +"l. c #DEDDD9", +"m. c #DDDCD8", +"n. c #A19B90", +"o. c #EBEAE8", +"p. c #E6E5E3", +"q. c #C8C7C4", +"r. c #B6B6B3", +"s. c #B0AFAD", +"t. c #B3B2B0", +"u. c #747371", +"v. c #9D9C99", +"w. c #DAD9D5", +"x. c #E7E6E3", +"y. c #E6E5E2", +"z. c #E3E2DF", +"A. c #DBDAD7", +"B. c #D4D3D0", +"C. c #D0CFCB", +"D. c #D1CFCC", +"E. c #D1D0CC", +"F. c #C9C8C4", +"G. c #6B6B69", +"H. c #CECDC9", +"I. c #D6D4D0", +"J. c #9F998D", +"K. c #E3E2DE", +"L. c #E4E2DF", +"M. c #DFDEDA", +"N. c #D5D4D0", +"O. c #C0BFBC", +"P. c #7B7A78", +"Q. c #BCBAB6", +"R. c #CECCC8", +"S. c #9D978C", +"T. c #EDEDED", +"U. c #E1E0DD", +"V. c #E2E1DD", +"W. c #DBDAD6", +"X. c #BBB9B6", +"Y. c #A6A4A1", +"Z. c #9E9C99", +"`. c #ACABA7", +" + c #C7C5C2", +".+ c #9B9589", +"++ c #E1DFDB", +"@+ c #E0DEDA", +"#+ c #DEDCD8", +"$+ c #DAD8D4", +"%+ c #BDBCB8", +"&+ c #ACABA8", +"*+ c #B2B1AD", +"=+ c #C6C4C0", +"-+ c #999388", +";+ c #999891", +">+ c #A39E92", +",+ c #A39D92", +"'+ c #A39D91", +")+ c #A29C90", +"!+ c #A19B8F", +"~+ c #9D978B", +"{+ c #989286", +"]+ c #918C82", +"^+ c #938D83", +"/+ c #979286", +"(+ c #666258", +" ", +" . . . . . . . . . . . . . ", +" . + @ # # # # # # # # $ % & . ", +" . @ # # # # # # # # # # * = - . ", +" . # # # # # # # ; # ; > , ' ) ! . ", +" . # # # # # ; > ~ > ~ { ] ^ # / ( . ", +" . # # # ; > ~ { _ { _ : < ) # [ } | . ", +" . # ; > ~ 1 2 3 3 4 5 6 7 . . . . . . . ", +" . # ~ { 8 9 0 a b c d e f g h i j k l . ", +" . # _ : m n o p q r s t u v w x y z A . ", +" . # B 6 C D E F G H I J K L M N O P Q . ", +" . # R S T U V W X Y Z 3 ` w ...+.@.#.. ", +" . # $.%.&.*.=.-.;.>.,.'.).h !.+.!.~.{.. ", +" . # $.%.].^./.(._.:.<.<.[.}.!.+.!.~.|.. ", +" . # 1.2.3.4.4 3 3 5.6.<.<.7.8.9.0.a.b.. ", +" . # 2.M c.d.e.f.g.h.i.<.<.<.j.k.l.m.n.. ", +" . # o.N p.w q.r.z s.t.u.. <.<.v.w.k.n.. ", +" . # x.y.y.z.A.B.C.D.E.F.G.<.<.<.H.I.J.. ", +" . $ +.z.K.L.K.a.a.M.M.N.O.P.<.<.Q.R.S.. ", +" . T.U.~.0.a.V.a.0.a.0.W.E.X.Y.Z.`. +.+. ", +" . = ++@+M.l.a.l.@+l.@+#+$+R.%+&+*+=+-+. ", +" . ;+>+|.,+'+,+b.)+b.)+!+n.~+{+]+^+/+(+. ", +" . . . . . . . . . . . . . . . . . . ", +" "}; diff --git a/etc/images/separator.xpm b/etc/images/separator.xpm new file mode 100644 index 0000000..0c518fa --- /dev/null +++ b/etc/images/separator.xpm @@ -0,0 +1,30 @@ +/* XPM */ +static char * separator_xpm[] = { +"2 24 3 1", +" c None", +". c #DBD3CB", +"+ c #FCFBFA", +" ", +" ", +" ", +".+", +".+", +".+", +".+", +".+", +".+", +".+", +".+", +".+", +".+", +".+", +".+", +".+", +".+", +".+", +".+", +".+", +".+", +" ", +" ", +" "}; diff --git a/etc/images/sort-ascending.xpm b/etc/images/sort-ascending.xpm new file mode 100644 index 0000000..5a47e5c --- /dev/null +++ b/etc/images/sort-ascending.xpm @@ -0,0 +1,33 @@ +/* XPM */ +static char * stock_sort_ascending_xpm[] = { +"23 23 7 1", +" c None", +". c #314E6C", +"+ c #000000", +"@ c #D1DECF", +"# c #7DA377", +"$ c #E4ECE3", +"% c #B3C9AF", +" ", +" .... ", +" .. .. ", +" .. .. ", +" ...... ", +" .. .. ", +" .. .. ", +" ", +" + ", +" ", +" + ", +" ", +" + + ", +" +@+ + ", +" +@##+ ++ ++++++ ", +" +###+$+ +++ ", +" +##%#+ +++ ", +" +%##+ +++ ", +" +$###+ +++ ", +" +++++++ ++++++ ", +" ", +" ", +" "}; diff --git a/etc/images/sort-column-ascending.xpm b/etc/images/sort-column-ascending.xpm new file mode 100644 index 0000000..76d7f93 --- /dev/null +++ b/etc/images/sort-column-ascending.xpm @@ -0,0 +1,29 @@ +/* XPM */ +static char * stock_sort_column_ascending_xpm[] = { +"24 24 2 1", +" c None", +". c #000000", +" ", +" ", +" ... ", +" . .. ", +" .. ", +" .. ", +" .. ", +" .. ", +" .. ", +" ..... . ", +" ", +" . ", +" ", +" . ", +" .... ", +" .. .. ", +" .. .. ", +" .. .. ", +" ..... ", +" .. ", +" . ... ", +" ..... ", +" ", +" "}; diff --git a/etc/images/sort-criteria.xpm b/etc/images/sort-criteria.xpm new file mode 100644 index 0000000..d1c83b8 --- /dev/null +++ b/etc/images/sort-criteria.xpm @@ -0,0 +1,55 @@ +/* XPM */ +static char * stock_sort_criteria_xpm[] = { +"24 24 28 1", +" c None", +". c #000000", +"+ c #FFFFFF", +"@ c #D3D3D3", +"# c #F2ECE1", +"$ c #F4EFE5", +"% c #DFDAD2", +"& c #C9C4BD", +"* c #74716E", +"= c #FAFAFA", +"- c #EADFC9", +"; c #ECE2CF", +"> c #EEE5D4", +", c #4C4B48", +"' c #F5F5F5", +") c #C9C9C9", +"! c #E2D2B1", +"~ c #CFC4B1", +"{ c #BFBFBF", +"] c #C0C0C0", +"^ c #C7B99C", +"/ c #F0F0F0", +"( c #B7B7B7", +"_ c #9A8F78", +": c #877E69", +"< c #AFA389", +"[ c #A09889", +"} c #314E6C", +" ", +" ", +" ...... ", +" ... ", +" ... ", +" ... ", +" ......... ... ", +" .+@.#$%&*. ...... ", +" .=@.-;;;>, ", +" .').!!!!.~. ", +" .{].^^!.^.~. ", +" ./(.._.^.:.~. ", +" .....<.:...[. ", +" .:.. .. ", +" .. ", +" ", +" }}}} ", +" }} }} ", +" }} }} ", +" }}}}}} ", +" }} }} ", +" }} }} ", +" ", +" "}; diff --git a/etc/images/sort-descending.xpm b/etc/images/sort-descending.xpm new file mode 100644 index 0000000..90127ac --- /dev/null +++ b/etc/images/sort-descending.xpm @@ -0,0 +1,33 @@ +/* XPM */ +static char * stock_sort_descending_xpm[] = { +"24 23 7 1", +" c None", +". c #000000", +"+ c #D1DECF", +"@ c #7DA377", +"# c #314E6C", +"$ c #E4ECE3", +"% c #B3C9AF", +" ", +" ", +" ...... ", +" ... ", +" ... ", +" ... ", +" ... ", +" ...... ", +" . ", +" ", +" . ", +" ", +" . . ", +" .+. . ", +" .+@@. .. #### ", +" .@@@.$. ## ## ", +" .@@%@. ## ## ", +" .%@@. ###### ", +" .$@@@. ## ## ", +" ....... ## ## ", +" ", +" ", +" "}; diff --git a/etc/images/sort-row-ascending.xpm b/etc/images/sort-row-ascending.xpm new file mode 100644 index 0000000..5200b97 --- /dev/null +++ b/etc/images/sort-row-ascending.xpm @@ -0,0 +1,22 @@ +/* XPM */ +static char * stock_sort_row_ascending_xpm[] = { +"21 17 2 1", +" c None", +". c #000000", +" ", +" ", +" ", +" ", +" ... .... ", +" . .. .. .. ", +" .. .. .. ", +" .. .. .. ", +" .. ..... ", +" .. .. ", +" .. . .. ", +" ..... . . . ..... ", +" ", +" ", +" ", +" ", +" "}; diff --git a/etc/images/spell.xpm b/etc/images/spell.xpm new file mode 100644 index 0000000..b53f451 --- /dev/null +++ b/etc/images/spell.xpm @@ -0,0 +1,64 @@ +/* XPM */ +static char * spell_xpm[] = { +"24 24 37 1", +" c None", +". c #000000", +"+ c #8BBB8C", +"@ c #ABD0AC", +"# c #1A3B1A", +"$ c #8ABA88", +"% c #B4D5B4", +"& c #70A770", +"* c #132C13", +"= c #77A676", +"- c #2D2D2D", +"; c #CBDFCB", +"> c #6FAE6E", +", c #A8CBA6", +"' c #6D9D6C", +") c #D0E4D0", +"! c #6FAF6F", +"~ c #587055", +"{ c #B8D6B8", +"] c #5B9159", +"^ c #D4E4D4", +"/ c #67AF67", +"( c #5D905B", +"_ c #9FC59D", +": c #93BE92", +"< c #B5D1B5", +"[ c #67AF68", +"} c #63A261", +"| c #BBD6BA", +"1 c #82B881", +"2 c #75AF74", +"3 c #6B8868", +"4 c #9DC39D", +"5 c #7DB17B", +"6 c #6BA368", +"7 c #485C46", +"8 c #89BA88", +" ", +" ", +" ", +" ", +" ... .... ... ", +" .. . .. . .. . ", +" .. . .... .. ", +" ..... .. . .. ", +" .. . .. . .. . . ", +" .. . .... ... ... ", +" .+. ", +" .. .@# ", +" .$. .%&. ", +" *=. -;>. ", +" .,'. .)!~. ", +" .{].^/(. ", +" ._:<[}~. ", +" .|123. ", +" .4567. ", +" .83. ", +" .37. ", +" .. ", +" ", +" "}; diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a529100..7e30da9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,3039 @@ +2006-04-11 Reiner Steib + + * gnus.el: No Gnus v0.4 is released. + +2006-04-11 Lars Magne Ingebrigtsen + + * nnslashdot.el (nnslashdot-retrieve-headers-1): Fix up to new + layout. + + * rfc2047.el (rfc2047-decode-encoded-words): Don't message about + unknown charset. + + * message.el (message-header-synonyms): Add Original-To to the + default. + + * gnus-sum.el (gnus-get-newsgroup-headers-xover): group is an + optional parameter. + +2006-04-06 Reiner Steib + + * gnus-fun.el (gnus): Require it for gnus-directory. + +2006-04-06 Katsumi Yamaoka + + * gnus-fun.el (gnus-face-properties-alist): Add :version. + +2006-04-05 Daiki Ueno + + * pgg-gpg.el (pgg-gpg-process-filter): Fix. + +2006-04-05 Simon Josefsson + + * password.el (password-reset): New function. + +2006-04-05 Daiki Ueno + + * pgg-gpg.el (pgg-gpg-encrypt-region, pgg-gpg-sign-region): Wait + for BEGIN_SIGNING too, new in GnuPG 1.4.3. + +2006-04-04 Andreas Seltenreich + + * nnweb.el (nnweb-google-create-mapping): Update regexp. Some + whitespace was matched into the url, which broke browsing hits + > 100 when mm-url-use-external was nil. + +2006-04-04 Reiner Steib + + * gnus-sum.el (gnus-summary-from-or-to-or-newsgroups): Check + gnus-extra-headers for 'Newsgroups. + + * message.el (message-tool-bar-gnome): Check if `flyspell-mode' is + bound. + +2006-04-04 Daiki Ueno + + * pgg-gpg.el: Clean up process buffers every time gpg processes + complete. + +2006-04-03 Reiner Steib + + * gnus-fun.el (gnus-convert-image-to-face-command): Fix typo in + doc string. + +2006-04-03 Daiki Ueno + + * pgg-gpg.el (pgg-gpg-process-filter) + (pgg-gpg-wait-for-completion): Check if buffer is alive. + + * pgg-gpg.el (pgg-gpg-process-sentinel): Don't remove GNUPG: + lines, temporary fix. + +2006-03-31 Reiner Steib + + * gnus-group.el (gnus-group-update-tool-bar): Add :initialize and + :set. + +2006-03-29 Daiki Ueno + + * pgg-gpg.el (pgg-gpg-start-process): Don't bind + default-enable-multibyte-characters. This reverts the change from + revision 6.17 which is no longer necessary because the passphrase + is sent separately now. GnuPG messages are unreadable under + multibyte locales with default-enable-multibyte-characters set to + nil. + +2006-03-28 Reiner Steib + + * message.el (message-tool-bar-gnome): Move "spell". + +2006-03-27 Reiner Steib + + * gnus-sum.el (gnus-summary-from-or-to-or-newsgroups): Don't use + XEmacs-only `replace-in-string'. Use `gnus-group-real-name' + instead. + +2006-03-27 Karl Kleinpaste + + * gnus-sum.el (gnus-summary-from-or-to-or-newsgroups): Improve + newsgroups handling for NNTP overviews which don't include + Newsgroups. + +2006-03-26 Andreas Seltenreich + + * message.el (message-resend): Bind message-generate-hashcash to + to nil. + +2006-03-26 Andreas Seltenreich + + * hashcash.el (hashcash-already-paid-p): Bind case-fold-search + when searching for already-paid recipients. + +2006-03-27 Daiki Ueno + + * pgg-gpg.el: Invoke gpg asynchronous, to avoid querying for + passphrases when it is not needed. + (pgg-gpg-use-agent): Add, to hard code that pgg shouldn't wait for + passphrase stuff from gpg, should only be necessary when you use + gpg with a smartcard. + +2006-03-23 Katsumi Yamaoka + + * mml.el (mml-insert-mime): Ignore cached contents of + message/external-body part. + + * mm-decode.el (mm-get-part): Add optional 'no-cache' argument. + (mm-insert-part): Ditto. + +2006-03-23 Simon Josefsson + + * pgg-gpg.el (pgg-gpg-update-agent): Add again, with fixes from + Reiner. + (pgg-gpg-use-agent-p): Use it again. + +2006-03-23 Simon Josefsson + + * pgg-gpg.el (pgg-gpg-update-agent): Remove, doesn't work with + older emacsen. + (pgg-gpg-use-agent-p): Don't use it. + +2006-03-23 Reiner Steib + + * pgg-gpg.el (pgg-gpg-update-agent): Only use make-network-process + if we can. + +2006-03-22 Sascha Wilde + + * pgg-gpg.el (pgg-gpg-use-agent): Disable by default. + (pgg-gpg-update-agent): New function. + (pgg-gpg-use-agent-p): New function. + (pgg-gpg-process-region, pgg-gpg-encrypt-region) + (pgg-gpg-encrypt-symmetric-region, pgg-gpg-decrypt-region) + (pgg-gpg-sign-region): Use it. + +2006-03-22 Katsumi Yamaoka + + * gnus-sum.el (gnus-map-articles): Don't funcall symbol macro. + Reported by Ralf Wachinger . + +2006-03-21 Simon Josefsson + + * pgg-gpg.el: Ideas below based on patch from Sascha Wilde + . + (pgg-gpg-use-agent): New variable. + (pgg-gpg-process-region): Use it. + (pgg-gpg-encrypt-region): Likewise. + (pgg-gpg-encrypt-symmetric-region): Likewise. + (pgg-gpg-decrypt-region): Likewise. + (pgg-gpg-sign-region): Likewise. + (pgg-gpg-possibly-cache-passphrase): Don't cache a nil password. + +2006-03-21 Reiner Steib + + * gnus-agent.el (gnus-agent-queue-mail): Fix custom tag for `t'. + + * spam.el (spam-mark-new-messages-in-spam-group-as-spam): Add + comment on version. + +2006-03-20 Reiner Steib + + * smiley.el: Add missing test smiley. + +2006-03-17 Katsumi Yamaoka + + * mm-decode.el (mm-with-part): New macro. + (mm-get-part): Use it; work with message/external-body as well. + (mm-save-part): Treat name and filename equally. + + * mm-extern.el (mm-extern-cache-contents): New function. + (mm-inline-external-body): Use it; force the part to be displayed; + move undisplayer added to the cached handle to the parent. + + * gnus-art.el (gnus-mime-save-part-and-strip): Add name parameter. + (gnus-mime-view-part-as-type): Work with message/external-body. + + * gnus-util.el (gnus-tool-bar-update): Bind tool-bar-mode. + +2006-03-16 Reiner Steib + + * gmm-utils.el (gmm-image-load-path-for-library): Prefer user's + images in image-load-path. [Sync with image.el, revision 1.60, in + Emacs.] + +2006-03-15 Reiner Steib + + * gmm-utils.el (gmm-image-load-path-for-library): Pass value of + path rather than symbol. Always return list of directories. + Guarantee that image directory comes first. [Sync with image.el, + revision 1.59, in Emacs.] + + * message.el (message-make-tool-bar): Adjust to new API of + `gmm-image-load-path-for-library'. + + * gnus-sum.el (gnus-summary-make-tool-bar): Ditto. + + * gnus-group.el (gnus-group-make-tool-bar): Ditto. + +2006-03-15 Andreas Seltenreich + + * gnus-art.el (gnus-article-only-boring-p): Bind + inhibit-point-motion-hooks to avoid infinite loop when entering + intangible text. Reported by Ralf Wachinger + . + +2006-03-14 Reiner Steib + + * gmm-utils.el (gmm-image-load-path-for-library): Fix typo. Use + `defun' instead of `gmm-defun-compat'. + +2006-03-14 Simon Josefsson + + * message.el (message-unique-id): Don't use message-number-base36 + if (user-uid) is a float. Reported by Bjorn Solberg + . + +2006-03-13 Katsumi Yamaoka + + * mm-uu.el (mm-uu-dissect): Dissect all parts correctly. + + * gnus-art.el (gnus-mime-display-single): Make sure there is an + empty line between a part and a message part. + +2006-03-10 Reiner Steib + + * smiley.el: Add more test smileys. + (smiley-data-directory, smiley-regexp-alist) + (gnus-smiley-file-types): Fix doc strings. + (smiley-update-cache): Clear smiley-cached-regexp-alist before + adding new elements. + (smiley-mouse-map): Unused code. Make it a comment. + +2006-03-10 Katsumi Yamaoka + + * gnus-nocem.el (gnus-nocem-scan-groups): Add autoload cookie; + scan latest NoCeM messages instead of old ones. + (gnus-nocem-check-article): Fix regexps so as to match to PGP + delimiters that are recently used. + (gnus-nocem-load-cache): Add autoload cookie. + + * gnus.el (gnus-use-nocem): Enable it to be set to also a number. + + * gnus-start.el (gnus-setup-news): Scan NoCeM messages if a group + level which is larger than gnus-use-nocem is specified. + + * gnus-group.el (gnus-group-get-new-news): Ditto. + +2006-03-08 Reiner Steib + + * gnus-util.el (gnus-tool-bar-update): New function. + + * gnus-group.el (gnus-group-update-tool-bar): New variable. + (gnus-group-insert-group-line): Add gnus-tool-bar-update. + + * gnus-topic.el (gnus-topic-prepare-topic): Add gnus-tool-bar-update. + + * gnus-group.el (gnus-group-redraw-when-idle) + (gnus-group-redraw-check): Remove. + (gnus-group-make-tool-bar): Remove gnus-group-redraw-check. + +2006-03-08 Katsumi Yamaoka + + * nnmail.el (nnmail-split-it): Invert match-partial-words behavior + if optional last element is specified in splits (FIELD VALUE...). + +2006-03-07 Reiner Steib + + * message.el (message-make-tool-bar): Rename gmm-image-load-path + to gmm-image-load-path-for-library. Call with no-error argument. + (message-tool-bar-gnome): Rename "mail/attach" to "attach". + + * gnus-sum.el (gnus-summary-make-tool-bar): Ditto. + + * gnus-group.el (gnus-group-make-tool-bar): Ditto. + + * gmm-utils.el (gmm-image-load-path): Remove alias. + +2006-03-06 Reiner Steib + + * gmm-utils.el (gmm-image-load-path): Add alias. + + * nnml.el (nnml-generate-nov-databases-directory): Rename from + nnml-generate-nov-databases-1. + (nnml-generate-nov-databases): Use it. + (nnml-generate-nov-databases-directory): Document no-active + argument. + + * gmm-utils.el (gmm-image-load-path-for-library): Return single + directory if path is t. Add no-error. + + * gnus-group.el (gnus-group-make-tool-bar): Use add-hook. + Suggested by Stefan Monnier . + + * gnus-art.el (gnus-article-browse-delete-temp-files): Simplify + resetting gnus-article-browse-html-temp-list. + + * gmm-utils.el (gmm-image-load-path-for-library): Sync with + mh-compat.el revision 1.9 in Emacs. Rename `gmm-image-load-path'. + Add example to docstring. Rename local variables. Move error + checks to default case in cond and simplify. + +2006-03-06 Katsumi Yamaoka + + * mm-view.el (mm-w3m-cid-retrieve-1): Check carefully whether + handle is multipart when calling it recursively. + (mm-w3m-cid-retrieve): Display warning if retrieving fails. + +2006-03-03 Daniel Pittman + + * nnimap.el (nnimap-request-update-info-internal): Optimize. + Don't `gnus-uncompress-range' to avoid excessive memory usage. + +2006-03-03 Katsumi Yamaoka + + * gnus-group.el (gnus-group-tool-bar-gnome): Check if gnus-topic.el + is loaded. + + * gnus-sum.el (gnus-summary-tool-bar-gnome): Check if spam.el is + loaded. + +2006-03-03 Reiner Steib + + * mm-util.el (mm-with-unibyte-current-buffer): Change "Emacs 23" + to "Emacs 23 (unicode)" in doc string. + + * gnus-sum.el (gnus-summary-set-display-table): Change "Emacs 23" to + "Emacs 23 (unicode)" in comment. + +2006-03-03 Katsumi Yamaoka + + * mm-decode.el (mm-get-part): Don't use + mm-with-unibyte-current-buffer. + + * gnus-sum.el (gnus-summary-set-display-table): Don't nix out + characters 160 through 255 in Emacs 23. + +2006-03-02 Reiner Steib + + * gnus-art.el (gnus-article-browse-html-temp-list): Rename from + gnus-article-browse-html-temp. + (gnus-article-browse-delete-temp): Make it customizable. Add + `file'. Adjust doc string. + (gnus-article-browse-delete-temp-files): Add argument. Allow + query for each file. Adjust doc string. + (gnus-article-browse-html-parts): Add + `gnus-article-browse-delete-temp-files' to + `gnus-summary-prepare-exit-hook' and `gnus-exit-gnus-hook'. + +2006-03-02 Hynek Schlawack + + * gnus-art.el (gnus-article-browse-html-temp) + (gnus-article-browse-delete-temp): New variables. + (gnus-article-browse-delete-temp-files): New function. + (gnus-article-browse-html-parts): Use it. + +2006-03-02 Reiner Steib + + * gnus-group.el (gnus-group-redraw-check): Remove redundant tests. + + * gmm-utils.el (gmm-image-load-path): Mention ../etc search in doc + string. + + * gnus-sum.el (gnus-summary-tool-bar-gnome): Don't use + gnus-summary-insert-new-articles when unplugged. Remove + gnus-summary-search-article-forward. + + * gmm-utils.el (gmm-tool-bar-style): Test tool-bar-mode and + display-visual-class instead of display-color-cells. + +2006-03-02 Katsumi Yamaoka + + * dgnushack.el: Autoload customize-group for XEmacs. + + * mml.el (mml-generate-mime-1): Encode parts other than text/* or + message/* containing non-ASCII text properly. + +2006-03-01 Reiner Steib + + * message.el: Require gmm-utils, remove autoloads. + (message-tool-bar): Set default based on + gmm-tool-bar-style. + (message-tool-bar-gnome): Add gmm-customize-mode. + + * gnus-sum.el (gnus-summary-tool-bar): Set default based on + gmm-tool-bar-style. + (gnus-summary-tool-bar-gnome): Add gmm-customize-mode. + + * gnus-group.el (gnus-group-tool-bar): Set default based on + gmm-tool-bar-style. + (gnus-group-tool-bar-gnome): Add gmm-customize-mode. + + * gmm-utils.el (gmm-image-directory): Rename variable from + gmm-image-load-path. + (gmm-image-load-path): Use gmm-image-directory. + (gmm-customize-mode): New function. + (gmm-tool-bar-style): New variable. + + * gnus-group.el (gnus-group-redraw-when-idle): Rename from + gnus-group-redraw-line-number. + (gnus-group-redraw-check): Simplify. + (gnus-group-tool-bar-update): Remove redraw check. + (gnus-group-make-tool-bar): Add redraw check. + +2006-03-01 Michael Piotrowski (tiny change) + + * gnus-art.el (gnus-button): Add missing parentheses. + +2006-03-01 Katsumi Yamaoka + + * lpath.el: Fbind line-number-at-pos. + +2006-02-28 Katsumi Yamaoka + + * mm-util.el (mm-with-unibyte-current-buffer): Add note. + +2006-02-28 Reiner Steib + + * gnus-art.el (gnus-button): New face. + (gnus-article-button-face): Use it. + + * gnus-sum.el (gnus-summary-tool-bar-gnome): Add + gnus-summary-next-page. Re-order. + + * gnus-group.el (gnus-group-tool-bar-gnome): prev-node and + next-node are now included. + (gnus-group-redraw-line-number): New internal variable. + (gnus-group-redraw-check): Helper function for updating the tool + bar. + (gnus-group-tool-bar-update): Add gnus-group-redraw-check. + + * gmm-utils.el (gmm-tool-bar-item): Add TODO about modifiers. + + * spam.el (spam-spamassassin-score-regexp): New internal variable. + (spam-extra-header-to-number, spam-check-spamassassin-headers): + Use it to match format of Spamassassin 3.0 and later. Reported by + IRIE Tetsuya . + (spam-check-bogofilter) + (spam-bogofilter-register-with-bogofilter): Fix args of + `gnus-error' calls. + +2006-02-28 Reiner Steib + + * gnus-draft.el (gnus-draft-send): Bind message-signature to avoid + unnecessary interaction when sending queued mails. Reported by + TAKAHASHI Yoshio . + +2006-02-27 Reiner Steib + + * gnus-sum.el (gnus-sequence-of-unread-articles): Return nil if + first or last are nil. + +2006-02-24 Andreas Seltenreich + + * nnweb.el (nnweb-gmane-create-mapping): Don't choke on ^M. + +2006-02-24 Lars Magne Ingebrigtsen + + * gnus-int.el (gnus-open-server): Respect gnus-batch-mode. + +2006-02-24 Lars Magne Ingebrigtsen + + * dns.el (query-dns): Protect more against buggy tcp output. + +2006-02-24 Reiner Steib + + * nnweb.el (nnweb-type-definition, nnweb-gmane-search): Use new + nov.php. + +2006-02-24 Andreas Seltenreich + + * nnweb.el (nnweb-type-definition, nnweb-gmane-create-mapping) + (nnweb-gmane-wash-article, nnweb-gmane-search): Fix Gmane web + groups. Kudos to Olly Betts for providing NOV + output on the server side. + (nnweb-google-create-mapping): Update regexps and add some + progress indication. + +2006-02-23 Reiner Steib + + * gnus-group.el (gnus-group-tool-bar-gnome): Fix + gnus-agent-toggle-plugged. Re-order icons. + (gnus-group-tool-bar-gnome): Add + gnus-group-{prev,next}-unread-group. + (gnus-group-tool-bar-gnome): Re-order icons. + + * gnus-sum.el (gnus-summary-tool-bar-gnome): Move + gnus-summary-insert-new-articles. + + * message.el (message-tool-bar-gnome, message-tool-bar-retro): Fix + comments. + + * utf7.el (utf7-utf-16-coding-system): Fix comment. utf-16-be is + also available in Emacs 21.3. + + * message.el (message-fix-before-sending): Change "Emacs 22" to + "Emacs 23 (unicode)" in comment. + + * qp.el (quoted-printable-encode-region): Change "Emacs 22" to + "Emacs 23 (unicode)" in comment. + + * mm-util.el: Change "Emacs 22" to "Emacs 23 (unicode)" in + comment. + (mm-coding-system-p): Add comment about no-MULE XEmacs. + + * mm-view.el (mm-fill-flowed): Add :version. + +2006-02-23 Katsumi Yamaoka + + * gmm-utils.el (gmm-image-load-path): Don't modify image-load-path + and load-path. + +2006-02-22 Reiner Steib + + * message.el: Autoload gmm-image-load-path. + (message-tool-bar-retro): Prepend "gnus/" subdirectory to some + icon file names. Use old Emacs 21 "mail_send.xpm" icon for + consitency. + + * gmm-utils.el (gmm-image-load-path): Also search in + "../etc/images". Don't set gmm-image-load-path if we don't find + the image. + +2006-02-22 Katsumi Yamaoka + + * gmm-utils.el (gmm-image-load-path): Don't make + `gmm-image-load-path' include subdirectories which the second arg + `image' might specify. + + * gnus-group.el (gnus-group-tool-bar-retro): Prepend the "gnus/" + subdirectory to icon file names. + + * gnus-sum.el (gnus-summary-tool-bar-retro): Ditto. + +2006-02-21 Reiner Steib + + * gnus-group.el (gnus-group-make-tool-bar): Add IMAGE argument to + gmm-image-load-path calls. + + * gnus-sum.el (gnus-summary-make-tool-bar): Ditto. + + * message.el (message-make-tool-bar): Ditto. + + * mml.el (mml-preview): Added comment concerning tool bar icons. + + * gnus-group.el (gnus-group-tool-bar-gnome): Use new icon names. + (gnus-group-make-tool-bar): Use `gmm-image-load-path'. + + * gnus-sum.el (gnus-summary-tool-bar-gnome): Use new icon names. + (gnus-summary-make-tool-bar): Use `gmm-image-load-path'. + + * message.el (message-tool-bar-gnome): Use new icon names. + (message-make-tool-bar): Use `gmm-image-load-path'. + + * gmm-utils.el (gmm-defun-compat, gmm-image-search-load-path): New + functions from MH-E. + (gmm-image-load-path): New variable from MH-E. + (gmm-image-load-path): New function from MH-E. Added arguments + LIBRARY, IMAGE and PATH. Don't modify paths. Don't use + *-image-load-path-called-flag. + +2006-02-21 Milan Zamazal + + * mm-view.el (mm-view-pkcs7-verify): Implement using smime.el. + +2006-02-21 Wolfram Fenske + (tiny change) + + * nnimap.el (nnimap-request-move-article): Change folder back to + source group before deleting. + +2006-02-20 Reiner Steib + + * mm-util.el (mm-charset-override-alist): Fix type in doc string. + + * gnus-art.el (mm-url-insert-file-contents-external): Autoload + mm-url. + + * mm-uu.el (mm-uu-type-alist): Improve `LaTeX'. + +2006-02-20 Katsumi Yamaoka + + * rfc2047.el (rfc2047-charset-to-coding-system): Don't check the + coding system which mm-charset-to-coding-system returns for a + given charset is valid. + +2006-02-16 Juanma Barranquero + + * html2text.el (html2text-remove-tag-list): + * spam-stat.el (spam-stat-buffer-words): Fix typo in docstring. + +2006-02-14 Chong Yidong + + * gnus-cus.el: Revert 2005-10-17 change. + +2006-02-17 Katsumi Yamaoka + + * gnus-art.el (article-strip-banner): Call + article-really-strip-banner only when the regexp match is made. + +2006-02-16 Katsumi Yamaoka + + * gnus-art.el (article-strip-banner): Use + gnus-extract-address-components instead of + mail-header-parse-addresses to make it work with non-ASCII text; + remove mail-encode-encoded-word-string. + + * rfc2231.el (rfc2231-parse-string): Attempt to parse parameter + values which are surrounded with \"...\"; make it never cause a + Lisp error; give up parsing of parameters if it failed in + extracting type. + +2006-02-14 Arne J,Ax(Brgensen + + * smime.el (smime-cert-by-ldap-1): Fix bug where + `smime-ldap-search' returns results without userCertificates. + +2006-02-15 Katsumi Yamaoka + + * mm-util.el (mm-make-temp-file): Don't catch file-error in Emacs. + +2006-02-14 Reiner Steib + + * spam.el (spam-check-spamassassin-headers): Adapt format for + Spamassassin 3.0 or later. Reported by ARISAWA Akihiro + . + (spam-list-of-processors): Add spam-use-gmane. + +2006-02-14 Katsumi Yamaoka + + * mm-util.el (mm-make-temp-file): Import the Emacs 22 version of + make-temp-file; make it work with XEmacs as well. + + * gnus-art.el (gnus-article-browse-html-parts): Use the 3rd arg of + mm-make-temp-file. + + * mm-decode.el (mm-display-external): Use the 3rd arg of + mm-make-temp-file. + (mm-create-image-xemacs): Ditto. + +2006-02-14 Katsumi Yamaoka + + * gnus-draft.el (gnus-draft-send): Replace message-narrow-to-head + with message-narrow-to-headers. + (gnus-draft-setup): Narrow to header to run message-fetch-field. + (gnus-draft-check-draft-articles): New function. + (gnus-draft-edit-message, gnus-draft-send-message): Use it. + +2006-02-13 Reiner Steib + + * gnus-art.el (gnus-article-browse-html-parts): + `hs-show-html-list' should read `gnus-article-browse-html-parts'. + Don't use suffix argument for mm-make-temp-file for Emacs 21 + compatibility. Remove useless `format'. + +2006-02-13 Andreas Seltenreich + + * nnweb.el (nnweb-google-wash-article): Update regexps. + (nnweb-group-alist): Use defvoo instead of defvar. + +2006-02-13 Katsumi Yamaoka + + * nnoo.el (nnoo-declare): Don't generate duplicate entries when + re-loading nn* modules. + +2006-02-10 Reiner Steib + + * gnus-group.el (gnus-group-make-tool-bar): Remove duplicate check + for `tool-bar-mode' and don't check it's default-value. + + * gnus-sum.el (gnus-summary-make-tool-bar): Ditto. + + * message.el (message-make-tool-bar): Ditto. + + * gnus-art.el (gnus-article-browse-html-parts): Remove useless + `substring'. Shorten tmp-file name. + + * gnus.el: Remove bogus comment. + +2006-02-10 Hynek Schlawack + + * gnus-art.el (gnus-article-browse-html-parts): New function. + (gnus-article-browse-html-article): New function for viewing html + articles with a browser. + +2006-02-09 Daiki Ueno + + * pgg-gpg.el (pgg-gpg-encrypt-region): Don't convert line-endings + in elisp. + (pgg-gpg-encrypt-symmetric-region): Ditto. + (pgg-gpg-sign-region): Ditto. + + * pgg-def.el (pgg-text-mode): New variable. + + * mml2015.el (mml2015-pgg-sign): Enable pgg-text-mode. + (mml2015-pgg-encrypt): Ditto. + + * mml1991.el (mml1991-pgg-sign): Enable pgg-text-mode. + (mml1991-pgg-encrypt): Ditto. + +2006-02-08 Katsumi Yamaoka + + * nnfolder.el (nnfolder-insert-newsgroup-line): Use + message-make-date instead of current-time-string. + + * mm-view.el (mm-inline-message): Don't set gnus-newsgroup-charset + to gnus-decoded which mm-uu might set. + +2006-02-08 Katsumi Yamaoka + + * rfc2231.el (rfc2231-parse-string): Sort segmented parameters; + don't decode quoted parameters; remove misimported Emacs code. + Suggested by ARISAWA Akihiro . + (rfc2231-decode-encoded-string): Don't use split-string which + behaves differently according to Emacs version; use + mm-decode-coding-region to convert charset to coding-system. + Suggested by ARISAWA Akihiro . + (rfc2231-encode-string): Remove misimported Emacs code. + +2006-02-07 Katsumi Yamaoka + + * gnus-art.el (article-decode-charset): Don't use ignore-errors + when calling mail-header-parse-content-type. + (article-de-quoted-unreadable): Ditto. + (article-de-base64-unreadable): Ditto. + (article-wash-html): Ditto. + + * mm-decode.el (mm-dissect-buffer): Don't use ignore-errors when + calling mail-header-parse-content-type and + mail-header-parse-content-disposition. + (mm-find-raw-part-by-type): Don't use ignore-errors when calling + mail-header-parse-content-type. + + * mml.el (mml-insert-mime-headers): Use mml-insert-parameter to + insert charset and format parameters; encode description after + inserting it to buffer. + (mml-insert-parameter): Fold lines properly even if a parameter is + segmented into two or more lines; change the max column to 76. + + * rfc1843.el (rfc1843-decode-article-body): Don't use + ignore-errors when calling mail-header-parse-content-type. + + * rfc2231.el (rfc2231-parse-string): Return at least type if + possible; don't cause an error even if it fails in parsing of + parameters. Suggested by ARISAWA Akihiro . + (rfc2231-encode-string): Don't break lines at the beginning, leave + it to mml-insert-parameter. + + * webmail.el (webmail-yahoo-article): Don't use ignore-errors when + calling mail-header-parse-content-type. + +2006-02-06 Reiner Steib + + * spam-report.el (spam-report-gmane-use-article-number): Improve + doc string. + (spam-report-gmane-internal): Check if a suitable header was found + in the article. + +2006-02-04 Katsumi Yamaoka + + * rfc2231.el (rfc2231-parse-string): Revert 2006-02-03 change. + (rfc2231-encode-string): Make param*=value always begin with LWSP. + +2006-02-05 Romain Francoise + + Update copyright notices of all files in the gnus directory. + +2006-02-03 Andreas Seltenreich + + * nnweb.el (nnweb-request-group): Avoid growing overview files. + +2006-02-03 Katsumi Yamaoka + + * rfc2231.el (rfc2231-parse-string): Add missing semicolons to + segmented lines of parameter value to cope with Thunderbird 1.5 + bug (cf. https://bugzilla.mozilla.org/show_bug.cgi?id=323318). + Suggested by ARISAWA Akihiro . + (rfc2231-encode-string): Don't make lines exceeding 76 column. + +2006-02-01 Max Froumentin (tiny change) + + * mml.el (mml-generate-mime-1): Correct the order of inline signed + parts. + +2006-01-31 Andreas Seltenreich + + * nnweb.el (nnweb-group-alist): Use defvar instead of defvoo, + there's only one active file for all servers. + (nnweb-request-scan): Make sure nnweb-articles is initialized on + solid groups. Gnus might have used a FAST request to select the + group. + (nnweb-request-group, nnweb-google-parse-1): Don't keep nnweb-type + and nnweb-search redundantly in the active file. + (nnweb-request-list): Don't list bogus groups. There can only be + one. + (nnweb-request-create-group): Don't use ARGS. + (nnweb-possibly-change-server, nnweb-request-group): Remove some + initialisations. Let nnoo do the work. + +2006-01-31 Katsumi Yamaoka + + * mm-uu.el (mm-uu-emacs-sources-extract): Say the part has been + decoded. + (mm-uu-diff-extract): Ditto. + + * mm-view.el (mm-display-inline-fontify): Get decoded part rightly. + +2006-01-31 Kevin Ryde + + * mailcap.el (mailcap-viewer-passes-test): Don't put "(nil t)" into + mailcap-viewer-test-cache when there's no 'test clause, since that + will invert the meaning of a "nil" test previously determined by + mailcap-mailcap-entry-passes-test. + +2006-01-30 Katsumi Yamaoka + + * gnus-group.el: Bind tool-bar-mode instead of tool-bar-map when + compiling. + + * gnus-sum.el: Ditto. + + * message.el: Don't bind tool-bar-map when compiling. + +2006-01-30 Reiner Steib + + * nnweb.el (nnweb-google-parse-1): Clarify some comments. + +2006-01-30 Andreas Seltenreich + + * nnweb.el (nnweb-type-definition, nnweb-google-parse-1) + (nnweb-google-create-mapping, nnweb-google-search): Adapt to + current Google Groups. + +2006-01-26 Reiner Steib + + * gnus-sum.el (gnus-summary-make-tool-bar): Add checks for XEmacs + and tool-bar-mode. + + * gnus-group.el (gnus-group-make-tool-bar): Add checks for XEmacs + and tool-bar-mode. + + * message.el (message-tool-bar-update): Simplify. + (message-make-tool-bar): Add checks for XEmacs and tool-bar-mode. + + * gnus-sum.el (gnus-summary-tool-bar-update): Check for + gnus-summary-buffer. + (gnus-summary-tool-bar-gnome): Use "reply-author" icon for + gnus-summary-reply. + + * gmm-utils.el (gmm): Add :version. + +2006-01-26 Katsumi Yamaoka + + * Makefile.in (clean): New rule. + (distclean): Use it. + +2006-01-26 Steve Youngs + + * gmm-utils.el (gmm-tool-bar-item, gmm-tool-bar-zap-list): Don't + autoload. + +2006-01-26 Katsumi Yamaoka + + * gmm-utils.el (gmm-verbose): Add :group. + +2006-01-25 Reiner Steib + + * message.el: Change some comments WRT tool-bars. + + * gnus-sum.el (gnus-summary-tool-bar) + (gnus-summary-tool-bar-gnome, gnus-summary-tool-bar-retro) + (gnus-summary-tool-bar-zap-list): New variables. + (gnus-summary-make-tool-bar): Complete rewrite using + `gmm-tool-bar-from-list'. + + * gnus-group.el (gnus-group-tool-bar, gnus-group-tool-bar-gnome) + (gnus-group-tool-bar-retro, gnus-group-tool-bar-zap-list): New + variables. + (gnus-group-make-tool-bar): Complete rewrite using + `gmm-tool-bar-from-list'. + (gnus-group-tool-bar-update): New function. + + * message.el (message-mode-field-menu): Add "Show hidden Headers". + +2006-01-25 Katsumi Yamaoka + + * mm-uu.el (mm-uu-dissect-text-parts): Ignore it if a given part + is dissected into a single part of which the type is the same as + the given one; decode charset. + +2006-01-21 Kevin Ryde + + * mailcap.el (mailcap-parse-mailcap-extras): "test" key must go + into alists as symbol not string, since that's what + mailcap-viewer-passes-test and mailcap-mailcap-entry-passes-test + look for. + +2006-01-24 Reiner Steib + + * gmm-utils.el (gmm-tool-bar-item): Add "Separator". + (gmm-tool-bar-from-list): Suppress tooltip for `gmm-ignore'. + + * message.el (message-tool-bar-gnome): Use gmm-ignore. + +2006-01-24 Katsumi Yamaoka + + * gnus-xmas.el (gnus-mime-security-button-menu): New alias. + (gnus-xmas-mime-security-button-menu): New function. + + * gnus-art.el (gnus-mime-security-button-commands): New variable. + (gnus-mime-security-button-menu): New definition. + (gnus-mime-security-button-map): Use them. + (gnus-mime-security-button-menu): New function. + (gnus-insert-mime-security-button): Addition to help echo. + (gnus-mime-security-run-function, gnus-mime-security-save-part) + (gnus-mime-security-pipe-part): New functions. + + * mm-uu.el (mm-uu-buttonize-original-text-parts): Remove. + (mm-uu-dissect-text-parts): Revert a part of 2006-01-23 change. + + * mm-decode.el (mm-handle-set-disposition): Remove. + (mm-handle-set-description): Remove. + +2006-01-24 Katsumi Yamaoka + + * mm-view.el (mm-w3m-standalone-supports-m17n-p): New variable. + (mm-w3m-standalone-supports-m17n-p): New function. + (mm-inline-text-html-render-with-w3m-standalone): Use it to alter + w3m usage. + + * gnus-art.el (gnus-article-wash-html-with-w3m-standalone): Use + mm-w3m-standalone-supports-m17n-p to alter w3m usage. + +2006-01-23 Reiner Steib + + * message.el (message-tool-bar-zap-list): Use + gmm-tool-bar-zap-list as custom type. + (message-tool-bar-update): New function. + (message-tool-bar, message-tool-bar-gnome) + (message-tool-bar-retro): Add message-tool-bar-update. + (message-tool-bar-gnome): Add flyspell-buffer. + + * gnus-util.el (gnus-error): Describe `args'. + + * gmm-utils.el (gmm-error): Describe `args'. + (gmm-tool-bar-zap-list): New widget. + (gmm-tool-bar-from-list): Improve description of `zap-list'. + +2006-01-23 Katsumi Yamaoka + + * mm-uu.el (mm-uu-buttonize-original-text-parts): New variable. + (mm-uu-dissect-text-parts): Buttonize original text parts; reduce + the number of recursive calls. + + * mm-decode.el (mm-handle-set-disposition): New macro. + (mm-handle-set-description): New macro. + +2006-01-23 Katsumi Yamaoka + + * mm-uu.el (mm-uu-dissect-text-parts): Decode content transfer + encoding. + +2006-01-20 Reiner Steib + + * message.el (message-tool-bar-zap-list, message-tool-bar) + (message-tool-bar-gnome, message-tool-bar-retro): New variables. + (message-tool-bar-local-item-from-menu): Remove. + (message-tool-bar-map): Replace by `message-make-tool-bar'. + (message-make-tool-bar): New function. + (message-mode): Use `message-make-tool-bar'. + + * gmm-utils.el: New file. + (gmm-verbose, gmm-message, gmm-error): From gnus-utils.el. + (gmm-lazy): New widget copied from `nnmail.el'. + (gmm-tool-bar-from-list): New function for creating customizable + tool bars. + (gmm-tool-bar-from-list): Fix typos in doc string. Remove debug + output. + (gmm): Add :prefix to defgroup. + +2006-01-20 Per Abrahamsen + + * gmm-utils.el (gmm-widget-p): New function. + +2006-01-20 Reiner Steib + + * mml.el (mml-attach-file): Describe `description' in doc string. + (mml-menu): Add Emacs MIME manual and PGG manual. + +2006-01-20 Richard M. Stallman + + * mm-url.el (mm-url-load-url): Require url-parse and url-vars. + +2006-01-20 Kevin Greiner + + * nntp.el (nntp-end-of-line): Doc fix. + +2006-01-20 Chong Yidong + + * imap.el (imap-open): Handle case where buffer is a buffer + object. + +2005-01-20 Stefan Monnier + + * gnus-delay.el (gnus-delay): Don't autoload. + It's useless and could trigger a bug in cus-dep.el causing ldefs-boot + to be re-loaded when customizing the `gnus-delay' group. + +2005-01-20 Chong Yidong + + * message.el (message-insert-citation-line): Use newlines. + +2006-01-19 Ken Manheimer + + * pgg-pgp.el (pgg-pgp-encrypt-region, pgg-pgp-decrypt-region) + (pgg-pgp-sign-region): Add optional 'passphrase' argument to all + these routines, so the passphrase can be managed externally and + passed in to the system. + (pgg-pgp-decrypt-region, pgg-pgp-sign-region): Use new name for + pgg-add-passphrase-to-cache function. + + * pgg-pgp5.el (pgg-pgp5-encrypt-region, pgg-pgp5-decrypt-region) + (pgg-pgp5-sign-region): Add optional 'passphrase' argument to all + these routines, so the passphrase can be managed externally and + passed in to the system. + (pgg-pgp5-sign-region): Use new name of + pgg-add-passphrase-to-cache function. + +2006-01-19 Ken Manheimer + + * pgg-gpg.el (pgg-gpg-select-matching-key): Fix: look at the right + part of the decoded armor to find the key-identifier. + (pgg-gpg-lookup-key-owner): New function to return the + human-readable identifier of a key owner. + (pgg-gpg-key-id-from-key-owner): Make it easy to identify the key + itself. + (pgg-gpg-decrypt-region): Prompt with the key owner (rather than + the key value) if we have a key and can match it against a secret + key. Also, added a note pointing out fact that the prompt only + indicates the first matching key. + + * pgg.el (pgg-decrypt): Passing along 'passphrase' in call to + pgg-decrypt-region. + (pgg-add-passphrase-to-cache): Rename from + `pgg-add-passphrase-cache' to reduce confusion (all callers + changed). + (pgg-remove-passphrase-from-cache): Rename from + `pgg-remove-passphrase-cache' to reduce confusion (all callers + changed). + (pgg-read-passphrase, pgg-add-passphrase-cache) + (pgg-remove-passphrase-cache): Add informative docstrings. + (pgg-decrypt): Convey provided passphrase in subordinate call to + pgg-decrypt-region. + +2006-01-19 Ken Manheimer + + * pgg.el (pgg-encrypt-region, pgg-encrypt-symmetric-region) + (pgg-encrypt-symmetric, pgg-encrypt, pgg-decrypt-region) + (pgg-decrypt, pgg-sign-region, pgg-sign): Add optional + 'passphrase' argument, so the passphrase can be managed externally + and then passed in to the system. + + * pgg.el (pgg-read-passphrase, pgg-add-passphrase-cache) + (pgg-remove-passphrase-cache): Add optional 'notruncate' argument, + so the passphrase cache can be used reliably with identifiers + besides a pgp packet's key id. + + * pgg-gpg.el (pgg-gpg-encrypt-region) + (pgg-gpg-encrypt-symmetric-region, pgg-gpg-decrypt-region) + (pgg-gpg-sign-region): Add optional 'passphrase' argument to all + these routines, so the passphrase can be managed externally and + passed in to the system. + + * pgg-gpg.el (pgg-gpg-possibly-cache-passphrase): Add optional + 'notruncate' argument, so the passphrase cache can be used + reliably with identifiers besides a pgp packet's key id. + +2006-01-19 Sascha Wilde + + * pgg-gpg.el (pgg-gpg-encrypt-symmetric-region): New function for + symmetric encryption. + (pgg-gpg-symmetric-key-p): New function to check for an symmetric + encrypted session key. + (pgg-gpg-decrypt-region): When decrypting a symmetric encrypted + message ask for the passphrase in a proper way. + + * pgg.el (pgg-encrypt-symmetric, pgg-encrypt-symmetric-region): + New user commands for symmetric encryption. + +2006-01-19 Katsumi Yamaoka + + * mm-bodies.el (mm-decode-body): Don't decode decoded body. + + * mm-uu.el (mm-uu-dissect-text-parts): Dissect dissected parts. + +2006-01-19 Mark D. Baushke + + * pgg-gpg.el (pgg-gpg-encrypt-region): Add --textmode to gpg args. + +2006-01-17 Katsumi Yamaoka + + * mm-decode.el (mm-inlined-types): Add application/pgp. + (mm-automatic-display): Ditto. + + * mm-uu.el (mm-uu-dissect-text-parts): Recognize application/pgp + part as text. + +2006-01-16 Katsumi Yamaoka + + * nnrss.el: Update copyright. + (nnrss-opml-import): Query whether to subscribe to each entry. + + * gnus-art.el: + * gnus-sum.el: + * gnus-xmas.el: + * messagexmas.el: + * mm-uu.el: + * mm-view.el: Update copyright. + +2006-01-16 Reiner Steib + + * message.el (message-info): New function. + (message-mode-menu): Add it. + Update copyright. + + * ChangeLog: Fix and update copyright. + +2006-01-13 Romain Francoise + + * message.el (message-forward-subject-name-subject): Prefer the + address to 'nowhere' if the sender has no name. + Fix typo. Update copyright year. + +2006-01-13 Katsumi Yamaoka + + * gnus-art.el (article-wash-html): Use + gnus-summary-show-article-charset-alist if a numeric arg is given. + (gnus-article-wash-html-with-w3m-standalone): New function. + + * mm-view.el (mm-text-html-renderer-alist): Map w3m-standalone to + mm-inline-text-html-render-with-w3m-standalone. + (mm-text-html-washer-alist): Map w3m-standalone to + gnus-article-wash-html-with-w3m-standalone. + (mm-inline-text-html-render-with-w3m-standalone): New function. + +2006-01-12 Reiner Steib + + * mm-uu.el (mm-uu-type-alist): Fix previous message-marks commit. + Improve LaTeX. + +2006-01-10 Katsumi Yamaoka + + * nnrss.el (nnrss-wash-html-in-text-plain-parts): New variable. + (nnrss-request-article): Render text/plain parts as HTML. + + * gnus-art.el (gnus-article-wash-html-with-w3m): No need to narrow + the buffer. + +2006-01-08 Reiner Steib + + * gnus-cus.el (gnus-group-parameters): Sync posting-style with + custom definition of `gnus-posting-styles'. + + * gnus-start.el (gnus-gnus-to-quick-newsrc-format): Bind + print-circle. Suggested by Kalle Olavi Niemitalo . + +2006-01-05 Reiner Steib + + * gnus-group.el (gnus-useful-groups): Use Gmane for ding. + Use nntp for bug archive. + +2006-01-05 Katsumi Yamaoka + + * nnrss.el (nnrss-request-article): Fix the way to fill text/plain + parts. + (nnrss-normalize-date): New function converts ISO 8601 date into + RFC822 style. Suggested by Mark Plaksin . + (nnrss-check-group): Use it. + +2006-01-01 Katsumi Yamaoka + + * gnus-sum.el (gnus-summary-work-articles): Remove useless `min'. + + * nnrss.el (nnrss-fetch): Make it fail gracefully when it can't + fetch a feed. Suggested by Mark Plaksin . + (nnrss-insert-w3): Ditto. + +2005-12-22 Katsumi Yamaoka + + * gnus-uu.el (gnus-uu-digest-mail-forward): Reverse the order of + the articles to be forwarded including the case where neither a + number of articles nor a region is specified. + +2005-12-21 Katsumi Yamaoka + + * nnrss.el (nnrss-request-article): Fix last change; fill + text/plain parts. + +2005-12-20 Katsumi Yamaoka + + * nnrss.el (nnrss-request-article): Replace
s with newlines + in text/plain part. + (nnrss-check-group): Don't add excessive newline to dc:subject. + +2005-12-19 Mark Plaksin (tiny change) + + * nnrss.el (nnrss-check-group): Put the RSS dc:subject in the + article. + +2005-12-18 Reiner Steib + + * nnml.el: Don't require gnus-bcklg. Autoload it. + (nnml-use-compressed-files, nnml-save-mail): Support other + comression programs such as bzip2. + +2005-12-17 Lars Magne Ingebrigtsen + + * dns.el (query-dns): Make sure we check the buffer size before + removing tcp headers. + +2005-12-16 Katsumi Yamaoka + + * gnus-art.el (gnus-article-delete-text-of-type): Enable it to + remove MIME buttons associated with multipart/alternative parts. + (gnus-mime-display-alternative): Tag buttons using `article-type' + text property. + + * gnus-msg.el (gnus-copy-article-buffer): Remove MIME buttons + associated with multipart/alternative parts. + + * gnus-art.el (gnus-signature-separator): Fix custom type. + + * mm-decode.el (mm-inlined-types): Fix custom type. + (mm-keep-viewer-alive-types): Ditto. + (mm-automatic-display): Ditto. + (mm-attachment-override-types): Ditto. + (mm-inline-override-types): Ditto. + (mm-automatic-external-display): Ditto. + +2005-12-15 Reiner Steib + + * spam-report.el (spam-report-user-mail-address) + (spam-report-user-agent): New variables. + (spam-report-url-ping-plain): Use spam-report-user-agent. + +2005-12-14 Ralf Angeli + + * gnus-art.el (gnus-button-handle-custom): Do not just use + `customize-apropos' for any "M-x customize-*" button but the + function called for. Accept both the function name and its + argument in order to achieve this. + (gnus-button-alist): Remove support for "custom:" URL's. Pass + function name to `gnus-button-handle-custom' in case of "M-x + customize-*" buttons. + +2005-12-12 Katsumi Yamaoka + + * gnus-art.el (gnus-buttonized-mime-types): Mention addition of + multipart/alternative and add xref to mm-discouraged-alternatives + in doc string. + + * mm-decode.el (mm-discouraged-alternatives): Add xref to + gnus-buttonized-mime-types in doc string. + +2005-12-08 Reiner Steib + + * mm-decode.el (mm-discouraged-alternatives): Fix custom type. + Suggest image/.* in the doc string. + +2005-12-12 Reiner Steib + + * mm-uu.el (mm-uu-type-alist): Don't depend on message.el for + message-marks (Debian bug #342521). + +2005-12-12 Simon Josefsson + + * password.el (password-read-from-cache): Add. + (password-read): Use it. + +2005-12-12 Katsumi Yamaoka + + * rfc2047.el (rfc2047-charset-to-coding-system): Recognize + us-ascii as a MIME charset. + + * mm-bodies.el (mm-decode-content-transfer-encoding): Protect + against the case where the 2nd arg TYPE is nil. + +2005-12-09 Reiner Steib + + * pop3.el (pop3-stream-type): Fix custom version. + + * mm-uu.el (mm-uu-type-alist): Simplify uu regexp. + +2005-12-09 ARISAWA Akihiro (tiny change) + + * mm-decode.el (mm-display-external): Add missing cdr. + +2005-12-07 Katsumi Yamaoka + + * mm-decode.el (mm-display-external): Use nametemplate (defined in + RFC1524) if it is in mailcap or add a suffix according to + mailcap-mime-extensions when generating a temp filename; postpone + deleting a temp file for 2 seconds for some wrappers, shell + scripts, and so on, which might exit right after having started a + viewer command as a background job. + +2005-12-06 Reiner Steib + + * nntp.el (nntp-marks-directory): Fix custom group. + + * gnus-fun.el (gnus-face-from-file): Decrease quant in smaller + steps when < 10. + + * gnus-start.el (gnus-no-server-1): Mention + `gnus-level-default-subscribed' in doc string. + +2005-12-02 ARISAWA Akihiro (tiny change) + + * mm-view.el (mm-inline-text-html-render-with-w3m): Fix misplaced + parens. + +2005-12-01 Katsumi Yamaoka + + * gnus-xmas.el (gnus-use-toolbar): Revert. + (gnus-xmas-setup-toolbar): Use global default-toolbar if + gnus-use-toolbar is default. + + * messagexmas.el (message-use-toolbar): Revert. + (message-setup-toolbar): Use global default-toolbar if + message-use-toolbar is default. + +2005-11-30 Katsumi Yamaoka + + * gnus-xmas.el (gnus-use-toolbar): Determine the default value + according to default-toolbar-visible-p. + + * messagexmas.el (message-use-toolbar): Ditto. + +2005-11-26 Dave Love + + * tls.el (open-tls-stream): Rename arg SERVICE to PORT. + (tls-program, tls-success): Provide openssl alternative. + + * starttls.el: Doc fixes. + (starttls-open-stream-gnutls, starttls-open-stream): Rename arg + SERVICE to PORT. + + * pop3.el (pop3-open-server) : Clarify a loop. Deal with + port null or service name. + (starttls-negotiate): Autoload. + +2005-11-25 Katsumi Yamaoka + + * message.el (message-kill-to-signature): Fix interactive spec. + +2005-11-24 Katsumi Yamaoka + + * pop3.el (pop3-open-server): Recognize a string as a service name. + +2005-11-24 Pascal Rigaux (tiny change) + + * rfc2231.el (rfc2231-parse-string): Support non-ascii chars. + +2005-11-23 Dave Love + + Add pop3s, pop3/starttls. + + * pop3.el (pop3-authentication-scheme): Clarify doc. + (open-tls-stream, starttls-open-stream): Autoload. + (pop3-stream-type): New. + (pop3-open-server): Use it. + + * mail-source.el (mail-sources): Fix some :types. Add stream type + for POP. + (mail-source-keyword-map): Add :stream for POP. + (mail-source-fetch-pop): Use pop3-stream-type. + +2005-11-22 Katsumi Yamaoka + + * nnmail.el (nnmail-fancy-expiry-target): Use current-time instead + of current-time-string. + +2005-11-20 Stefan Schimanski (tiny change) + + * nnmail.el (nnmail-fancy-expiry-target): Protect against invalid + date header. + +2005-11-19 Kevin Greiner + + * gnus-sum.el (gnus-fetch-old-headers): Updated docs to warn that + it can seriously impact performance as it bypasses the agent's + local caches. + +2005-11-19 Kevin Greiner + + * gnus-agent.el (gnus-agent-possibly-synchronize-flags): A server + must be explicitly online rather than "not explicitly offline" for + its flags to be synchronized. + + * gnus-sum.el (gnus-summary-remove-process-mark): Always return t so + that gnus-uu-unmark-thread will function correctly. + + * gnus-group.el (gnus-total-fetched-for): Reduced cutoff so that + 1024K is instead displayed as 1M. + +2005-11-17 Lars Magne Ingebrigtsen + + * flow-fill.el (fill-flowed): Bind adaptive-fill-mode to nil. + +2005-11-16 Boris Samorodov (tiny patch) + + * imap.el (imap-kerberos4-open): Ignore SSL stuff. + +2005-11-13 Kevin Greiner + + * gnus-agent.el (gnus-agent-read-local): Trivial fix to format of + error message to display actual error condition. + (gnus-agent-save-local): Avoid saving symbols that are bound to + nil as they simply result in a warning message in + gnus-agent-read-local. + +2005-11-13 Katsumi Yamaoka + + * gnus-start.el (gnus-dribble-read-file): Use make-local-variable + rather than make-variable-buffer-local for file-precious-flag. + +2005-11-12 Kevin Greiner + + * gnus-agent.el (gnus-agent-braid-nov): Now tests new nov entries + for duplicates which are removed. The invalid sort check then + triggers a rescan after the sort as sorting may have moved + duplicate entries such that they can be cheaply detected. + +2005-11-13 Katsumi Yamaoka + + * gnus-start.el (gnus-dribble-read-file): Quote file-precious-flag. + +2005-11-12 Kevin Greiner + + * gnus-agent.el (gnus-agent-article-alist-save-format): Changed + internal variable to a custom variable. Changed default value + from compressed(2) to uncompressed(1). + (gnus-agent-read-agentview): Reversed revision 7.8 to restore + support for uncompressed agentview files. Taken together, reading + the agentview file should now be 6-7 times faster. + +2005-11-11 Jan Nieuwenhuizen + + * gnus-start.el (gnus-dribble-read-file): Set file-precious-flag, + as a buffer-local variable. This avoids creating truncated + dribble files as a result of a hang up, eg. + +2006-01-03 Rodrigo Ventura (tiny change) + + * gnus-xmas.el (gnus-xmas-group-startup-message): Typo + gnus-splash-face -> gnus-splash. Fixes starting from a TTY in + XEmacs. + +2005-12-09 Reiner Steib + + * gnus-start.el (gnus-start-draft-setup): Enforce + `gnus-draft-mode' for nndraft:drafts at startup. + + * gnus.el (gnus-splash): Change custom group. + (gnus-group-get-parameter, gnus-group-parameter-value): Describe + allow-list argument. + + * gnus-agent.el (gnus-agent-article-alist-save-format): Format doc + string. + +2005-12-06 Reiner Steib + + * gnus-art.el (gnus-default-article-saver): Add user-defined + `function' to custom type. + +2005-10-30 Chong Yidong + + * imap.el (imap-open): Handle case where buffer is a buffer + object. + +2005-11-29 Reiner Steib + + * gnus-cache.el (gnus-cache-rename-group): Wrap doc strings and + long lines. + (gnus-cache-delete-group): Wrap doc strings. + + * gnus-agent.el (gnus-agent-rename-group) + (gnus-agent-delete-group): Wrap doc strings. + + +2005-11-10 Katsumi Yamaoka + + * messagexmas.el (message-use-toolbar): Change the valid values + into default, top, bottom, left, and right. + (message-toolbar-thickness): New variable. + (message-xmas-setup-toolbar): Locate gnus-xmas-glyph-directory as + well. + (message-setup-toolbar): Make it work. + + * gnus-xmas.el (gnus-xmas-update-toolbars): New function. + (gnus-use-toolbar): Change the valid values into default, top, + bottom, left, and right. + (gnus-toolbar-thickness): New variable. + (gnus-xmas-setup-toolbar): New function. + (gnus-xmas-setup-group-toolbar): Use it. + (gnus-xmas-setup-summary-toolbar): Use it. + +2005-11-10 Lars Magne Ingebrigtsen + + * gnus-start.el (gnus-1): Add "native" to + gnus-predefined-server-alist. + + * gnus.el (gnus-method-to-server): Don't add "native" to the + lists here, because that leads to problems when + gnus-select-method is bound. + +2005-11-09 Simon Josefsson + + * gnus-sum.el (gnus-article-sort-by-date-reverse): Remove, + use (not sort-by-date) instead. + +2005-11-30 Stefan Monnier + + * gnus-delay.el (gnus-delay-group): Don't autoload. + It's useless and could trigger a bug in cus-dep.el causing ldefs-boot + to be re-loaded when customizing the `gnus-delay' group. + +2005-11-19 Chong Yidong + + * message.el: Revert last changes. + (message-insert-citation-line): Use newlines. + +2005-11-17 Chong Yidong + + * message.el (message-courtesy-message) + (message-mark-insert-begin, message-mark-insert-end) + (message-elide-ellipsis, message-cancel-message) + (message-add-header, message-change-subject) + (message-cross-post-followup-to-header) + (message-cross-post-insert-note, message-reduce-to-to-cc) + (message-widen-reply, message-delete-not-region) + (message-kill-to-signature, message-insert-signature) + (message-insert-importance-high, message-insert-importance-low) + (message-insert-or-toggle-importance) + (message-insert-disposition-notification-to) + (message-indent-citation, message-yank-original) + (message-cite-original-without-signature, message-cite-original) + (message-insert-citation-line, message-position-on-field) + (message-fix-before-sending, message-send-mail-partially) + (message-send-mail, message-send-mail-with-sendmail) + (message-send-mail-with-qmail, message-send-news) + (message-check-news-header-syntax, message-generate-headers) + (message-insert-courtesy-copy, message-fill-address) + (message-fill-header, message-shorten-references) + (message-setup-1, message-cancel-news) + (message-forward-make-body-plain, message-forward-make-body-mime) + (message-forward-make-body-mml, message-encode-message-body) + (message-forward-make-body-digest-plain) + (message-forward-make-body-digest-mime) + (message-use-alternative-email-as-from): Insert `hard-newline' + instead of ordinary newlines. + +2005-11-09 Katsumi Yamaoka + + * message.el (message-generate-headers): Downcase the argument + given to message-check-element. + +2005-11-08 Kevin Greiner + + * nntp.el (nntp-authinfo-rejected): New error condition. + (nntp-wait-for): Use new error condition to signal authentication + error. + (nntp-retrieve-data): Rethrow new error condition to break out of + recursive call to nntp-send-authinfo. + +2005-11-08 Romain Francoise + + * gnus-sum.el (gnus-summary-catchup-and-goto-prev-group): New function. + (gnus-summary-exit-map): Bind to `Z p'. + (gnus-summary-make-menu-bar): Add menu item. + +2005-11-02 Reiner Steib + + * gnus-art.el (gnus-article-treat-custom): Add `first'. + (gnus-treat-*): Add `first' in all doc strings. + + * gnus-group.el (gnus-group-compact-group): Fix typo. + +2005-11-01 Katsumi Yamaoka + + * gnus.el (gnus-parameters-case-fold-search): New variable. + (gnus-parameters-get-parameter): Use it. + + * gnus-score.el (gnus-home-score-file): Doc fix. + +2005-11-01 Xavier Maillard (tiny change) + + * gnus-score.el (gnus-update-score-entry-dates): Doc fix. + +2005-10-31 Katsumi Yamaoka + + * mm-util.el (mm-special-display-p): New function. + + * mml.el (mml-preview): Use it; doc fix. + +2005-10-29 Romain Francoise + + * message.el (message-fix-before-sending): Fix comment. + +2005-10-29 Jari Aalto + + * gnus-sum.el (gnus-article-sort-by-date-reverse): New function. + +2005-10-29 Jari Aalto + + * score-mode.el (gnus-score-edit-done-hook): Introduce variable. + Used in gnus-score.el. + +2005-10-28 Reiner Steib + + * mm-util.el (mm-codepage-setup): Remove bogus alias test. + +2005-10-27 Reiner Steib + + * flow-fill.el (fill-flowed-encode-tests): Restore trailing + whitespace removed in revision 7.8. Use concatenated string to + protect trailing whitespace. + +2005-10-27 Jouni K Seppanen (tiny change) + + * nnimap.el (nnimap-search-uids-not-since-is-evil): Add variable. + (nnimap-request-expire-articles): Use it to avoid sending 'UID + SEARCH UID ... NOT SINCE' queries, for inefficient servers like + Courier IMAP ("some version from 2004"). Mostly based on similar + code in the same function. + +2005-10-26 Didier Verna + + * gnus-group.el (gnus-group-compact-group): invalidate original + article buffer. + * gnus-srvr.el (gnus-server-compact-server): ditto. + * nnml.el (nnml-request-compact-group): handle self Xref: field in + NOV database and in article itself. + Invalidate article backlog. + +2005-10-26 Reiner Steib + + * mm-uu.el (mm-uu-hide-markers): Fix XEmacs case. + +2005-10-26 Simon Josefsson + + * flow-fill.el (fill-flowed): Flow-fill unquoted lines too, revert + part of 2004-07-25 change. + +2005-10-26 Katsumi Yamaoka + + * message.el (message-display-completion-list): New function. + (message-expand-group): Use it; make sure the Completions buffer + is modifiable. + +2005-10-23 Chong Yidong + + * gnus-sum.el (gnus-ignored-from-addresses): Handle case where + user-mail-name is an empty string. + +2005-10-25 Reiner Steib + + * gnus-score.el (gnus-default-adaptive-score-alist): Set defaults + depending on gnus-score-decay-constant. + + * encrypt.el (encrypt-insert-file-contents) + (encrypt-write-file-contents): Don't use `gnus-message'. + + * mm-uu.el (mm-uu-verbatim-marks-extract): Add four start and end + arguments. + (mm-uu-type-alist): Add message-marks and insert-marks. Pass + arguments to mm-uu-verbatim-marks-extract. + (mm-uu-hide-markers): New variable. + (mm-uu-extract): Use face similar to `gnus-cite-3'. + + * gnus-fun.el (gnus-convert-image-to-x-face-command) + (gnus-convert-image-to-face-command): Use "convert" by default to + allow other input image formats. + (gnus-x-face-from-file, gnus-face-from-file): Adjust doc strings + accordingly. + +2005-10-23 Simon Josefsson + + * imap.el (imap-gssapi-program): Align command line parameters + with latest GNU SASL. + (imap-gssapi-open): Ignore 'Trying ...' messages from GNU SASL. + +2005-10-21 Lars Magne Ingebrigtsen + + * nnslashdot.el (nnslashdot-retrieve-headers-1): Update to new + HTML. + (nnslashdot-request-article): Ditto. + + * lpath.el (featurep): Add nobreak-char-display. + +2005-10-20 Hiroshi Fujishima (tiny change) + + * mail-source.el (mail-source-fetch-pop): Require pop3. + (mail-source-check-pop): Ditto. + +2005-10-20 Katsumi Yamaoka + + * rfc2047.el (rfc2047-decode-encoded-words): Fix the handling of + errors. + +2005-10-19 Reiner Steib + + * gnus-art.el (gnus-treat-strip-trailing-blank-lines) + (gnus-treat-strip-leading-blank-lines): Improve doc string. + + * message.el (message-tool-bar-local-item-from-menu): Fix comment. + + * mm-bodies.el (mm-decode-string): Call + `mm-charset-to-coding-system' with allow-override argument. + +2005-10-19 Katsumi Yamaoka + + * rfc2047.el (rfc2047-allow-incomplete-encoded-text): New variable. + (rfc2047-charset-to-coding-system): New function. + (rfc2047-decode-encoded-words): New function. + (rfc2047-decode-region): Use them. + (rfc2047-decode-cte): Remove. + (rfc2047-parse-and-decode): Remove. + (rfc2047-decode): Remove. + +2005-10-15 Kenichi Handa + + * rfc2047.el (rfc2047-decode-cte): New function. + (rfc2047-decode-region): Change the way to decode successive + encoded-words: decode B- or Q-encoding in each encoded-word, + concatenate them, and decode it as charset. + +2005-10-14 Katsumi Yamaoka + + * lpath.el: Fbind codepage-setup for XEmacs. + +2005-10-17 Chong Yidong + + * gnus-cus.el (gnus-custom-map): New variable. Bind mouse-1 to + widget-move-and-invoke. + (gnus-custom-mode): Use gnus-custom-map. + +2005-10-15 Bill Wohler + + * message.el (message-tool-bar-map): Renamed image file from + mail_send to mail/send. + +2005-10-16 Masatake YAMATO + + * message.el (message-expand-group): Pass the common + prefix substring of completion to `display-completion-list'. + +2005-10-13 Reiner Steib + + * mml-sec.el (mml-secure-method): New internal variable. + (mml-secure-sign, mml-secure-encrypt, mml-secure-message-sign) + (mml-secure-message-sign-encrypt, mml-secure-message-encrypt): New + functions using mml-secure-method. + + * mml.el (mml-mode-map): Add key bindings for those functions. + (mml-menu): Simplify security menu entries. Suggested by Jesper + Harder . + (mml-attach-file, mml-attach-buffer, mml-attach-external): Goto + end of message if point is the headers of the message. + + * message.el (message-in-body-p): New function. + + * assistant.el: Autoload gnus-util and netrc. + + * mm-util.el (mm-charset-to-coding-system): Add allow-override. + Use `mm-charset-override-alist' only when decoding. + + * mm-bodies.el (mm-decode-body): Call + `mm-charset-to-coding-system' with allow-override argument. + + * gnus-art.el (gnus-mime-view-part-as-type-internal): Try to fetch + `filename' from Content-Disposition if Content-Type doesn't + provide `name'. + (gnus-mime-view-part-as-type): Set default instead of + initial-input. + +2005-10-09 Daniel Brockman + + * format-spec.el (format-spec): Propagate text properties of % spec. + +2005-10-12 Reiner Steib + + * gnus-art.el (gnus-treat-predicate): Add `first'. + +2005-10-11 Reiner Steib + + * mm-util.el (mm-charset-synonym-alist): Improve doc string. + (mm-charset-override-alist): New variable. + (mm-charset-to-coding-system): Use it. + (mm-codepage-setup): New helper function. + (mm-charset-eval-alist): New variable. + (mm-charset-to-coding-system): Use mm-charset-eval-alist. Warn + about unknown charsets. + + * dgnushack.el (with-syntax-table): Add some URLs WRT the XEmacs bug. + +2005-10-04 David Hansen + + * nnrss.el (nnrss-request-article): Add support for the comments tag. + (nnrss-check-group): Ditto. + +2005-10-04 Reiner Steib + + * mm-uu.el (mm-uu-verbatim-marks-extract, mm-uu-latex-extract): + Rename x-gnus-verbatim to x-verbatim. + (mm-uu-type-alist): Fix regexp for verbatim-marks. + + * mm-decode.el (mm-automatic-display): Rename x-gnus-verbatim to + x-verbatim. + + * mm-url.el (mm-url-predefined-programs): Add switches for curl. + + * gnus-util.el (gnus-remove-duplicates): Remove. + + * nnmail.el (nnmail-article-group): Use mm-delete-duplicates + instead of gnus-remove-duplicates. + + * message.el (message-remove-duplicates): Remove. + (message-idna-to-ascii-rhs-1): Use mm-delete-duplicates instead of + message-remove-duplicates. + + * mm-util.el (mm-delete-duplicates): Use `delete-dups' if + available, else use implementation from `delete-dups'. + + * message.el (message-insert-expires): New function. + (message-mode-map): Add key binding. + (message-mode-field-menu): Add menu entry. + (message-mode): Document it. + (message-make-expires-date): Use `message-make-date'. + +2005-10-04 Josh Huber + + * message.el (message-make-expires-date): New function. + +2005-10-04 Katsumi Yamaoka + + * Makefile.in (list-installed-shadows): New entry. + (install): Use it. + (remove-installed-shadows): New entry. + + * dgnushack.el (dgnushack-default-load-path): New variable. + (dgnushack-find-lisp-shadows): New function. + (dgnushack-remove-lisp-shadows): New function. + +2005-10-02 Katsumi Yamaoka + + * Makefile.in (install-el-elc): New entry. + (install): Use it so that .el files are necessarily installed. + +2005-09-30 Katsumi Yamaoka + + * time-date.el: Autoload parse-time-string, XEmacs needs it. + +2005-09-30 Stefan Monnier + + * mm-decode.el (mm-inline-media-tests): Check presence of the diff-mode + function rather than the diff-mode.el package. + (mm-display-external): Use with-current-buffer. + (mm-viewer-completion-map, mm-viewer-completion-map): + Move initialization inside declaration. + +2005-09-29 Simon Josefsson + + * spam.el: Load hashcash when compiling, to avoid warnings. Don't + autoload mail-check-payment. + (spam-check-hashcash): Define unconditionally, since hashcash.el + is part of Gnus now. Ignore errors from payment checking. + +2005-09-28 Reiner Steib + + * message.el (message-bold-region, message-unbold-region): Rename + from `bold-region' and `unbold-region'. + + * message.el: Remove useless autoloads. + +2005-09-28 Simon Josefsson + + * message.el (message-use-idna): Default to t. + (message-use-idna): Test whether encoding works too. Doc fix. + +2005-09-28 Katsumi Yamaoka + + * nntp.el (nntp-warn-about-losing-connection): Remove. + +2005-09-27 Reiner Steib + + * mm-uu.el (mm-uu-emacs-sources-regexp): Make variable + customizable. Change default value. + (mm-uu-diff-groups-regexp): Change default value. + (mm-uu-type-alist): Add doc string. + (mm-uu-configure): Add doc string. Make it interactive. + (mm-uu-tex-groups-regexp): New variable. + (mm-uu-latex-extract, mm-uu-latex-test): New functions. + (mm-uu-type-alist): Add LaTeX documents. + (mm-uu-verbatim-marks-extract): Use "text/x-gnus-verbatim" instead + of "text/verbatim". + (mm-uu-diff-groups-regexp): Fix missing quotes from previous commit. + + * mm-decode.el (mm-automatic-display): Use "text/x-gnus-verbatim" + instead of "text/verbatim". + + * message.el (message-mark-inserted-region) + (message-mark-insert-file): Use slrn style marks when called with + prefix argument. + +2005-09-27 Simon Josefsson + + * message.el (message-idna-to-ascii-rhs-1): Reformat. + +2005-09-27 Arne J,Ax(Brgensen + + * message.el (message-remove-duplicates): New function. + Implementation borrowed from `gnus-remove-duplicates'. + (message-idna-to-ascii-rhs): Also encode idna addresses in + Reply-To:, Mail-Reply-To: and Mail-Followup-To:. + (message-idna-to-ascii-rhs-1): When `message-use-idna' is 'ask + only ask about the same idna domain once per header and also tell + in what header to replace the idna domain. + + * gnus-art.el (article-decode-idna-rhs): Also decode idna + addresses in Reply-To:, Mail-Reply-To: and Mail-Followup-To:. + (article-decode-idna-rhs): Fix regexp so that all idna-address in + a header is decoded and not just the last one. + +2005-09-27 Katsumi Yamaoka + + * gnus-art.el (gnus-mime-display-single): Don't modify text if it + has been decoded. + + * mm-decode.el (mm-automatic-display): Add text/verbatim. + (mm-insert-part): Don't modify text if it has been decoded. + + * mm-uu.el (mm-uu-verbatim-marks-extract): Say text has been + decoded. + + * mm-view.el (mm-inline-text): Don't strip text props unless + decoding enriched or richtext parts. + +2005-09-25 Romain Francoise + + * gnus-agent.el (gnus-agent-expire-group, gnus-agent-expire): + * gnus-start.el (gnus-subscribe-interactively): + * gnus-uu.el (gnus-uu-grab-articles): + End `yes-or-no-p' and `y-or-n-p' prompts with question mark and + space. + +2005-09-24 Emilio C. Lopes + + * smime.el (smime-sign-buffer, smime-decrypt-buffer): + * mm-view.el (mm-view-pkcs7-decrypt): + * gnus-sum.el (gnus-summary-limit-to-extra) + (gnus-summary-respool-article, gnus-read-move-group-name): + * gnus-score.el (gnus-summary-increase-score): + * gnus-util.el (gnus-completing-read-with-default): + * gnus-art.el (gnus-read-save-file-name) + (gnus-summary-save-in-rmail, gnus-summary-save-in-mail) + (gnus-summary-save-in-file, gnus-summary-save-body-in-file): + * message.el (message-check-news-header-syntax): + Follow convention for reading with the minibuffer. + +2005-09-22 Reiner Steib + + * spam-report.el (spam-report-url-ping-plain): + Use gnus-extended-version as User-Agent. + + * gnus-agent.el (gnus-agent-synchronize-flags): Explain why the + default value is nil. + + * mm-uu.el (mm-uu-type-alist): Added slrn style verbatim-marks. + (mm-uu-verbatim-marks-extract): New function. + (mm-uu-extract): New face. + (mm-uu-copy-to-buffer): Use it. + + * spam-report.el (spam-report-gmane-ham): Renamed from + `spam-report-gmane-unspam'. + (spam-report-gmane-internal): Renamed from `spam-report-gmane'. + Simplify use of UNSPAM argument. Fetch "X-Report-Unspam" header. + + * spam.el (spam-report-gmane-spam, spam-report-gmane-ham): + Autoload. + (spam-report-gmane-unregister-routine): Renamed + `spam-report-gmane-unspam' to `spam-report-gmane-ham'. + +2005-09-21 Teodor Zlatanov + + * spam.el (spam-use-gmane, spam-report-gmane-register-routine) + (spam-report-gmane-unregister-routine): added support for gmane + unregistration + + * spam-report.el (spam-report-gmane-unspam) + (spam-report-gmane-spam): new wrappers around spam-report-gmane + (spam-report-gmane): changed to take a single article and do + unspam registration + +2005-09-19 Reiner Steib + + * mm-url.el (mm-url-decode-entities): Fix regexp. + +2005-09-20 Lars Magne Ingebrigtsen + + * gnus-agent.el (gnus-agent-synchronize-flags): Switch the + default to nil, to be able to use Gnus at all. If the default + switches to something else, then the function should be fixed not + be exceedingly slow. + +2005-09-20 Teodor Zlatanov + + * gnus-start.el (gnus-activate-group): if the server is nil, don't + fail hard + + * spam-report.el: better Keywords line + + * spam.el: added Maintainer and better Keywords line + +2005-09-19 Reiner Steib + + * gnus-art.el (gnus-article-replace-part) + (gnus-mime-replace-part): New functions. + (gnus-mime-action-alist, gnus-mime-button-commands) + (gnus-mime-save-part-and-strip): Added file argument. + (gnus-article-part-wrapper): Added interactive argument. + + * gnus-sum.el (gnus-summary-mime-map): Add + `gnus-article-replace-part'. + +2005-09-19 Didier Verna + + The nnml compaction feature: + * nnml.el (nnml-request-compact-group): New function. + * nnml.el (nnml-request-compact): New function. + * gnus-int.el (gnus-request-compact-group): New function. + * gnus-int.el (gnus-request-compact): New function. + * gnus-group.el (gnus-group-compact-group): New function. + * gnus-group.el (gnus-group-group-map): Bind it to 'G z'. + * gnus-group.el (gnus-group-make-menu-bar): Add an entry for it. + * gnus-srvr.el (gnus-server-compact-server): New function. + * gnus-srvr.el (gnus-server-mode-map): Bind it to 'z'. + * gnus-srvr.el (gnus-server-make-menu-bar): Add an entry for it. + +2005-09-18 Deepak Goel + + * sieve.el (sieve-help): Fix `message' call: first arg should be a + format spec. + +2005-09-16 Katsumi Yamaoka + + * gnus.el (gnus-group-startup-message): Bind image-load-path. + +2005-09-15 Romain Francoise + + * message.el (message-fill-paragraph): Clarify docstring. + +2005-09-14 Katsumi Yamaoka + + * gnus-art.el (gnus-mime-display-part): Protect against broken + MIME messages. + +2005-09-13 Katsumi Yamaoka + + * gnus-sum.el (gnus-summary-edit-article-done): Remove text props + before parsing header. + +2005-09-11 Jari Aalto + + * html2text.el: (html2text-replace-list): Add new entities. + +2005-09-11 Romain Francoise + + * message.el (message-alternative-emails): Improve docstring. + (message-setup-1): Call `message-use-alternative-email-as-from' + after `message-setup-hook' to give it precedence over posting + styles, etc. + (message-use-alternative-email-as-from): Add docstring. Remove + the original From header if present. + + * nnml.el (nnml-compressed-files-size-threshold): New variable. + (nnml-save-mail): Use it. + + * gnus-uu.el (gnus-uu-mark-series): Return number of marked + articles. Add new argument `silent'. + (gnus-uu-mark-all): Report the total number of marked articles. + +2005-09-10 Romain Francoise + + * gnus-uu.el (gnus-message-process-mark): Use gnus-message. + (gnus-uu-mark-series): Likewise. + +2005-09-10 Reiner Steib + + * spam-report.el (spam-report-gmane): Fix generation of spam + report URL. + +2005-09-10 Simon Josefsson + + * gnus-agent.el (gnus-agent-synchronize-flags): Make the default + t, based on discussion on the ding list with Robert Epprecht + . + +2005-09-07 Reiner Steib + + * spam-report.el (spam-report-gmane): Make it work without + X-Report-Spam header. Gmane now only provides Archived-At. + This is only used if `spam-report-gmane-use-article-number' is nil. + (spam-report-gmane-spam-header): Remove. Not used anymore. + + * gnus-sum.el (gnus-thread-sort-by-recipient): New function to + make `gnus-summary-sort-by-recipient' work with threading. + + * nnweb.el (nnweb-google-wash-article): Print a message if article + is not available. + +2005-09-07 TSUCHIYA Masatoshi + + * gnus-art.el (gnus-mime-display-single): Revert 2004-10-07 + change. Decode text/* parts content before displaying. + +2005-09-06 Reiner Steib + + * mml-smime.el: Remove defvar of gnus-extract-address-components. + +2005-09-06 Katsumi Yamaoka + + * mm-view.el (mm-display-inline-fontify): Disable support modes. + + * lpath.el: Don't bind mc-pgp-always-sign, url-current-object, + url-package-name, url-package-version, + w3m-cid-retrieve-function-alist, w3m-current-buffer, + w3m-display-inline-images, and w3m-minor-mode-map. + +2005-09-05 Reiner Steib + + * message.el (message-tab-body-function): Fixed mismatched custom + type. + + * gnus.el (gnus-group-change-level-function): Ditto. + + * gnus-msg.el (gnus-outgoing-message-group): Ditto. + + * gnus-art.el (gnus-signature-limit) + (gnus-article-mime-part-function): Ditto. + +2005-09-05 Katsumi Yamaoka + + * mml.el (mml-mode): Silence the byte compiler. + + * gnus-art.el (gnus-article-jump-to-part): Redisplay the article + using `(sit-for 0)' before moving the point to the specified part; + skip unbuttonized parts. + (gnus-article-part-wrapper): Don't use save-window-excursion; don't + return to the summary window if gnus-auto-select-part is non-nil. + +2005-09-04 Reiner Steib + + * mml.el (mml-dnd-protocol-alist, mml-dnd-attach-options): New + variables. + (mml-dnd-attach-file, mml-mode): Use them. + + * nnweb.el (nnweb-type-definition, nnweb-google-wash-article): + Make fetching article by MID work again for Google Groups. Added + FIXME concerning gnus-group-make-web-group. + + * mml-smime.el (mml-smime-sign-query, mml-smime-get-dns-cert): + Don't depend on Gnus by using mail-extract-address-components if + gnus-extract-address-components is not bound. + +2005-09-04 Lars Magne Ingebrigtsen + + * gnus-art.el (gnus-mime-display-security): Don't display the + signature, but only the signed part. + +2005-09-02 Katsumi Yamaoka + + * gnus-sum.el (gnus-thread-hide-subtree): Doc fix. + + * gnus-msg.el (gnus-inews-insert-gcc): Fix the mistake of using + list, not listp. + +2005-09-02 Hrvoje Niksic + + * mm-encode.el (mm-encode-content-transfer-encoding): Likewise + when encoding. + + * mm-bodies.el (mm-decode-content-transfer-encoding): + De-canonicalize CRLF for all text content types, not just + text/plain. + +2005-09-01 Katsumi Yamaoka + + * gnus-art.el (gnus-article-part-wrapper): Error if there's no + valid article; point arrow and cursor at the MIME button. + +2005-08-30 Katsumi Yamaoka + + * gnus-art.el (gnus-mime-save-part-and-strip): Clarify prompt. + Suggested by Dan Christensen . + + * mm-decode.el (mm-save-part): Enable change of prompt. + +2005-08-29 Jari Aalto + + * gnus-msg.el (gnus-inews-add-send-actions): Made + `message-post-method' lambda parameter ARG `&optional'. + +2005-08-29 Reiner Steib + + * gnus-sum.el (gnus-summary-mime-map): Added + gnus-article-save-part-and-strip, gnus-article-delete-part and + gnus-article-jump-to-part. + + * gnus-art.el (gnus-article-edit-article): Added quiet argument. + (gnus-article-edit-part): Use it. + (gnus-article-part-wrapper): Added no-handle argument. + (gnus-article-save-part-and-strip, gnus-article-delete-part): New + functions. + +2005-08-29 Romain Francoise + + * gnus-fun.el (gnus-convert-image-to-face-command): Fix typo in + docstring. + (gnus-face-from-file): Likewise. + +2005-08-29 Reiner Steib + + * gnus-art.el (gnus-mime-save-part-and-strip): Don't prompt. + (gnus-mime-delete-part): Don't prompt if `gnus-expert-user' is + non-nil. + (gnus-auto-select-part): New variable. + (gnus-article-jump-to-part): New function. + (gnus-article-edit-part, gnus-mime-save-part-and-strip) + (gnus-mime-delete-part): Allow selecting specified part after + deleting or stripping parts. + (gnus-article-jump-to-part): Don't use `read-number'. Use last + part if argument is bogus. + +2005-08-31 Juanma Barranquero + + * gnus-art.el (w3m-minor-mode-map): + * gnus-spec.el (gnus-newsrc-file-version): + * gnus-util.el (nnmail-active-file-coding-system) + (gnus-original-article-buffer, gnus-user-agent): + * gnus.el (gnus-ham-process-destinations) + (gnus-parameter-ham-marks-alist) + (gnus-parameter-spam-marks-alist, gnus-spam-autodetect) + (gnus-spam-autodetect-methods, gnus-spam-newsgroup-contents) + (gnus-spam-process-destinations, gnus-spam-process-newsgroups): + * mm-decode.el (gnus-current-window-configuration): + * mm-extern.el (gnus-article-mime-handles): + * mm-url.el (url-current-object, url-package-name) + (url-package-version): + * mm-view.el (gnus-article-mime-handles, gnus-newsgroup-charset) + (smime-keys, w3m-cid-retrieve-function-alist) + (w3m-current-buffer, w3m-display-inline-images) + (w3m-minor-mode-map): + * mml-smime.el (gnus-extract-address-components): + * mml.el (gnus-article-mime-handles, gnus-mouse-2) + (gnus-newsrc-hashtb, message-default-charset) + (message-deletable-headers, message-options) + (message-posting-charset, message-required-mail-headers) + (message-required-news-headers): + * mml1991.el (mc-pgp-always-sign): + * mml2015.el (mc-pgp-always-sign): + * nnheader.el (nnmail-extra-headers): + * rfc1843.el (gnus-decode-encoded-word-function) + (gnus-decode-header-function, gnus-newsgroup-name): + * spam-stat.el (gnus-original-article-buffer): Add defvars. + +2005-08-22 Karl Chen (tiny change) + + * gnus-art.el (gnus-treatment-function-alist): Move date-lapsed to + the end of the date treatments. + +2005-08-15 Simon Josefsson + + * pgg.el (url-insert-file-contents): Don't autoload it, Emacs has + it in url-handlers.el and XEmacs in url.el. Reported by Luca + Capello and Romain Francoise. + (pgg-fetch-key-function): Removed, not used? + (pgg-insert-url-with-w3): Require url, to get + url-insert-file-contents regardless of where it is defined. + +2005-08-13 Romain Francoise + + * message.el (message-cite-original-1): New function. + (message-cite-original): Use it. + (message-cite-original-without-signature): Ditto. + +2005-08-08 Romain Francoise + + * message.el (message-yank-empty-prefix): New variable. + (message-indent-citation): Use it. + (message-cite-original-without-signature): Respect X-No-Archive. + +2005-08-08 Simon Josefsson + + * pgg.el: Autoload url-insert-file-contents instead of loading + w3/url. + (pgg-insert-url-with-w3): Don't load url here. + +2005-08-07 Jesper Harder + + * message.el (message-kill-to-signature): Don't insert newline at + bol. + (message-newline-and-reformat): Bind fill-paragraph-function to nil. + +2005-08-06 Romain Francoise + + * message.el (message-user-fqdn): Fix typo in docstring. + +2005-08-05 Daiki Ueno + + * mml2015.el (mml2015-pgg-sign): Make sure micalg is correct. + + * pgg-parse.el (pgg-parse-hash-algorithm-alist): Add SHA-2. + +2005-08-05 Katsumi Yamaoka + + * mm-bodies.el (mm-encode-body): Use coding system rather than + charset to encode text. + + * mm-util.el (mm-find-mime-charset-region): Attempt to reduce the + number of charsets if utf-8 is available (XEmacs). + +2005-08-04 Reiner Steib + + * gnus-art.el (gnus-button-valid-localpart-regexp): New variable + taken from `gnus-button-mid-or-mail-regexp'. + (gnus-button-mid-or-mail-regexp, gnus-button-alist): Use it. + (gnus-button-alist): Improve regexp for domain part of the MIDs + for news:localpart@domain buttons. + (gnus-button-ctan-directory-regexp): Update. + +2005-08-02 Katsumi Yamaoka + + * sieve-manage.el (sieve-manage-interactive-login): Use + make-local-variable rather than make-variable-buffer-local. + (sieve-manage-open): Ditto. + (sieve-manage-authenticate): Ditto. + + * mml.el (mml-generate-mime-1): Make the content type default to + text/plain if the filename is not specified. + +2005-08-01 Katsumi Yamaoka + + * gnus-uu.el (gnus-uu-save-article): Use insert-buffer-substring + instead of insert-buffer. + + * message.el (message-yank-original): Ditto; set the mark at the + end of the yanked message. + +2005-07-29 Katsumi Yamaoka + + * gnus-art.el (gnus-article-next-page-1): Reduce the number of + lines to scroll rather than to stop it. + + * mml.el (mml-generate-default-type): Add doc string. + (mml-generate-mime-1): Use mm-default-file-encoding or make it + default to application/octet-stream when determining the content + type if it is not specified for the part or the mml contents; add + a comment about mml-generate-default-type. + +2005-07-29 Reiner Steib + + * mml.el (mml-generate-mime-1): Use mm-default-file-encoding or + make it default to application/octet-stream when determining the + content type if it is not specified for the external contents. + +2005-07-28 Katsumi Yamaoka + + * rfc2231.el (rfc2231-parse-string): Take care that not only a + segmented parameter but also other parameters might be there. + +2005-07-27 Katsumi Yamaoka + + * mm-decode.el (mm-display-external): Delete temp file, directory + and buffer immediately if the external process is exited. + +2005-07-26 Katsumi Yamaoka + + * gnus-art.el (gnus-article-next-page-1): Don't scroll if there're + fewer lines than that of scroll-margin. + (gnus-article-prev-page): Narrow the range to bind scroll-in-place. + +2005-07-25 Katsumi Yamaoka + + * gnus-art.el (gnus-article-next-page): Revert. + (gnus-article-beginning-of-window): New macro. + (gnus-article-next-page-1): Use it. + (gnus-article-prev-page): Ditto. + (gnus-article-edit-part): Use insert-buffer-substring instead of + insert-buffer. + (gnus-article-edit-exit): Ditto. + + * gnus-util.el (gnus-beginning-of-window): Remove. + (gnus-end-of-window): Remove. + + * lpath.el: Don't bind header-line-format and scroll-margin. + +2005-07-25 Simon Josefsson + + * pgg.el (pgg-insert-url-with-w3): Don't load w3, it is possible + to have the url package without w3. Reported by Daiki Ueno + and Luigi Panzeri . + +2005-07-20 Didier Verna + + * gnus-diary.el: Remove the description comment (nndiary is now + properly documented in the Gnus manual). + Fix the spelling of "Back End". + * nndiary.el: Ditto. + Fix the copyright notice. + +2005-07-18 Romain Francoise + + * gnus-sum.el (gnus-summary-to-prefix, + gnus-summary-newsgroup-prefix): New variables. + (gnus-summary-from-or-to-or-newsgroups): Use them. + +2005-07-17 Romain Francoise + + * mml2015.el (mml2015-clean-buffer): Prefix buffer name with a + space as it's generally not especially interesting to the user. + +2005-07-16 Romain Francoise + + * nnfolder.el (nnfolder-save-buffer): Bind `copyright-update' to + nil to avoid prompting and file modification if one of the + messages at the top of the nnfolder file contains a copyright + notice. + Update copyright notice. + + * gnus-uu.el (gnus-uu-save-article): Use `message-make-date' + instead of `current-time-string' as the latter creates a time + string that is not RFC 2822 compliant (it lacks the zone). + Update copyright notice. + +2005-07-21 Stefan Monnier + + * mml.el (mml-minibuffer-read-disposition): Don't use inline by default + for text/rtf. Display default in prompt. Pass default for M-n. + + * mm-uu.el (mm-uu-copy-to-buffer): Use with-current-buffer. + +2005-07-16 Lars Magne Ingebrigtsen + + * gnus-msg.el (gnus-button-mailto): Remove + save-selected-window-window hackery because it relies on + save-selected-window internals. + +2005-07-15 Katsumi Yamaoka + + * gnus-art.el (gnus-article-next-page): Use gnus-end-of-window. + (gnus-article-next-page-1): Use gnus-beginning-of-window. + (gnus-article-prev-page): Ditto. + + * gnus-util.el (gnus-beginning-of-window): New function. + (gnus-end-of-window): New function. + + * lpath.el: Bind header-line-format and scroll-margin for XEmacs. + +2005-07-14 Hiroshi Fujishima (tiny change) + + * gnus-score.el (gnus-score-edit-all-score): Set + gnus-score-edit-exit-function to gnus-score-edit-done and call + gnus-message. + +2005-07-14 Lars Magne Ingebrigtsen + + * gnus-msg.el (gnus-button-mailto): Remove + save-selected-window-window hackery because it relies on + save-selected-window internals. + +2005-07-13 Katsumi Yamaoka + + * gnus-salt.el (gnus-pick-mode): Remove the 5th arg of + add-minor-mode. + (gnus-binary-mode): Ditto. + + * gnus-topic.el (gnus-topic-mode): Ditto. + +2005-07-08 Ralf Angeli + + * gnus-art.el (gnus-article-next-page, gnus-article-next-page-1) + (gnus-article-prev-page): Take scroll-margin into consideration. + +2005-07-04 Lute Kamstra + + Update FSF's address in GPL notices. + +2005-07-04 Juanma Barranquero + + * gnus.el (gnus-exit): + * gnus-group.el (gnus-group-icons): + * nnmail.el (nnmail-prepare): Fix typos in docstrings. + + * gnus-nocem.el (gnus-nocem): + * message.el (message-various, message-buffers, message-sending) + (message-interface, message-forwarding, message-insertion) + (message-headers, message-news, message-mail): + * pgg-gpg.el (pgg-gpg): + * pgg-parse.el (pgg-parse): + * pgg-pgp.el (pgg-pgp): + * pgg-pgp5.el (pgg-pgp5): + * pop3.el (pop3): Finish `defgroup' description with period. + +2005-07-01 Katsumi Yamaoka + + * gnus-art.el (article-display-face): Improve the efficiency. + (article-display-x-face): Ditto; remove grey x-face stuff. + +2005-06-30 Katsumi Yamaoka + + * gnus-art.el (article-display-face): Correct the position in + which Faces are inserted. + +2005-06-29 Didier Verna + + * gnus-art.el (article-display-face): Display faces in correct + order. + +2005-06-29 Katsumi Yamaoka + + * gnus-nocem.el (gnus-nocem-verifyer): Default to pgg-verify. + (gnus-fill-real-hashtb): Use hash table instead of obarray. + (gnus-nocem-check-article): Fetch the Type header. + (gnus-nocem-message-wanted-p): Fix the way to examine types. + (gnus-nocem-verify-issuer): Use functionp instead of fboundp. + (gnus-nocem-enter-article): Use hash tables rather than obarrays; + make sure gnus-nocem-hashtb is initialized. + (gnus-nocem-alist-to-hashtb): Use hash table instead of obarray. + (gnus-nocem-unwanted-article-p): Ditto. + + * pgg.el (pgg-verify): Return the verification result. + +2005-06-27 Lars Magne Ingebrigtsen + + * gnus-art.el (gnus-mime-copy-part): Check whether coding-system + is ascii. + +2005-06-24 Juanma Barranquero + + * gnus-art.el (gnus-article-mode): Set `nobreak-char-display', not + `show-nonbreak-escape'. + +2005-06-23 Lute Kamstra + + * gnus-art.el (gnus-article-mode): Use kill-all-local-variables. + + * dig.el (dig-mode): + * smime.el (smime-mode): Use gnus-run-mode-hooks. + +2005-06-21 Juanma Barranquero + + * nnimap.el (nnimap-split-download-body): Fix spellings. + +2005-06-16 Juanma Barranquero + + * gnus-art.el (gnus-article-encrypt-body): + * gnus-cus.el (gnus-score-customize): + * mm-extern.el (mm-extern-local-file, mm-inline-external-body): + * pop3.el (pop3-user): Don't use `format' on `error' arguments. + +2005-06-16 Arne J,Ax(Brgensen + + * smime.el (smime-cert-by-ldap-1): Detect PEM format without + header by looking for magic "MII" at the beginnig. + +2005-06-16 Miles Bader + + * gnus-xmas.el (gnus-xmas-group-startup-message): + Use renamed gnus-splash face. + + * assistant.el (assistant-field): Remove "-face" suffix from face name. + (assistant-field-face): New backward-compatibility alias for renamed + face. + (assistant-render-text): Use renamed assistant-field face. + + * spam.el (spam): Remove "-face" suffix from face name. + (spam-face): New backward-compatibility alias for renamed face. + (spam-face, spam-initialize): Use renamed spam face. + + * message.el (message-header-to, message-header-cc) + (message-header-subject, message-header-newsgroups) + (message-header-other, message-header-name) + (message-header-xheader, message-separator, message-cited-text) + (message-mml): Remove "-face" suffix from face names. + (message-header-to-face, message-header-cc-face) + (message-header-subject-face, message-header-newsgroups-face) + (message-header-other-face, message-header-name-face) + (message-header-xheader-face, message-separator-face) + (message-cited-text-face, message-mml-face): + New backward-compatibility aliases for renamed faces. + (message-font-lock-keywords): Use renamed message faces. + + * sieve-mode.el (sieve-control-commands, sieve-action-commands) + (sieve-test-commands, sieve-tagged-arguments): + Remove "-face" suffix from face names. + (sieve-control-commands-face, sieve-action-commands-face) + (sieve-test-commands-face, sieve-tagged-arguments-face): + New backward-compatibility aliases for renamed faces. + (sieve-control-commands-face, sieve-action-commands-face) + (sieve-test-commands-face, sieve-tagged-arguments-face): + Use renamed sieve faces. + + * gnus.el (gnus-group-news-1, gnus-group-news-1-empty) + (gnus-group-news-2, gnus-group-news-2-empty, gnus-group-news-3) + (gnus-group-news-3-empty, gnus-group-news-4) + (gnus-group-news-4-empty, gnus-group-news-5) + (gnus-group-news-5-empty, gnus-group-news-6) + (gnus-group-news-6-empty, gnus-group-news-low) + (gnus-group-news-low-empty, gnus-group-mail-1) + (gnus-group-mail-1-empty, gnus-group-mail-2) + (gnus-group-mail-2-empty, gnus-group-mail-3) + (gnus-group-mail-3-empty, gnus-group-mail-low) + (gnus-group-mail-low-empty, gnus-summary-selected) + (gnus-summary-cancelled, gnus-summary-high-ticked) + (gnus-summary-low-ticked, gnus-summary-normal-ticked) + (gnus-summary-high-ancient, gnus-summary-low-ancient) + (gnus-summary-normal-ancient, gnus-summary-high-undownloaded) + (gnus-summary-low-undownloaded) + (gnus-summary-normal-undownloaded, gnus-summary-high-unread) + (gnus-summary-low-unread, gnus-summary-normal-unread) + (gnus-summary-high-read, gnus-summary-low-read) + (gnus-summary-normal-read, gnus-splash): + Remove "-face" suffix from face names. + (gnus-group-news-1-face, gnus-group-news-1-empty-face) + (gnus-group-news-2-face, gnus-group-news-2-empty-face) + (gnus-group-news-3-face, gnus-group-news-3-empty-face) + (gnus-group-news-4-face, gnus-group-news-4-empty-face) + (gnus-group-news-5-face, gnus-group-news-5-empty-face) + (gnus-group-news-6-face, gnus-group-news-6-empty-face) + (gnus-group-news-low-face, gnus-group-news-low-empty-face) + (gnus-group-mail-1-face, gnus-group-mail-1-empty-face) + (gnus-group-mail-2-face, gnus-group-mail-2-empty-face) + (gnus-group-mail-3-face, gnus-group-mail-3-empty-face) + (gnus-group-mail-low-face, gnus-group-mail-low-empty-face) + (gnus-summary-selected-face, gnus-summary-cancelled-face) + (gnus-summary-high-ticked-face, gnus-summary-low-ticked-face) + (gnus-summary-normal-ticked-face) + (gnus-summary-high-ancient-face, gnus-summary-low-ancient-face) + (gnus-summary-normal-ancient-face) + (gnus-summary-high-undownloaded-face) + (gnus-summary-low-undownloaded-face) + (gnus-summary-normal-undownloaded-face) + (gnus-summary-high-unread-face, gnus-summary-low-unread-face) + (gnus-summary-normal-unread-face, gnus-summary-high-read-face) + (gnus-summary-low-read-face, gnus-summary-normal-read-face) + (gnus-splash-face): + New backward-compatibility aliases for renamed faces. + (gnus-group-startup-message): Use renamed gnus faces. + + * gnus-srvr.el (gnus-server-agent, gnus-server-opened) + (gnus-server-closed, gnus-server-denied, gnus-server-offline) + (gnus-server-agent): Remove "-face" suffix from face names. + (gnus-server-agent-face, gnus-server-opened-face) + (gnus-server-closed-face, gnus-server-denied-face) + (gnus-server-offline-face): + New backward-compatibility aliases for renamed faces. + (gnus-server-agent-face, gnus-server-opened-face) + (gnus-server-closed-face, gnus-server-denied-face) + (gnus-server-offline-face): Use renamed gnus faces. + + * gnus-picon.el (gnus-picon-xbm, gnus-picon): + Remove "-face" suffix from face names. + (gnus-picon-xbm-face, gnus-picon-face): + New backward-compatibility aliases for renamed faces. + + * gnus-cite.el (gnus-cite-attribution, gnus-cite-1, gnus-cite-2) + (gnus-cite-3, gnus-cite-4, gnus-cite-5, gnus-cite-6) + (gnus-cite-7, gnus-cite-8, gnus-cite-9, gnus-cite-10) + (gnus-cite-11): Remove "-face" suffix from face names. + (gnus-cite-attribution-face, gnus-cite-face-1, gnus-cite-face-2) + (gnus-cite-face-3, gnus-cite-face-4, gnus-cite-face-5) + (gnus-cite-face-6, gnus-cite-face-7, gnus-cite-face-8) + (gnus-cite-face-9, gnus-cite-face-10, gnus-cite-face-11): + New backward-compatibility aliases for renamed faces. + (gnus-cite-attribution-face, gnus-cite-face-list) + (gnus-article-boring-faces): Use renamed gnus faces. + + * gnus-art.el (gnus-signature, gnus-header-from) + (gnus-header-subject, gnus-header-newsgroups, gnus-header-name) + (gnus-header-content): Remove "-face" suffix from face names. + (gnus-signature-face, gnus-header-from-face) + (gnus-header-subject-face, gnus-header-newsgroups-face) + (gnus-header-name-face, gnus-header-content-face): + New backward-compatibility aliases for renamed faces. + (gnus-signature-face, gnus-header-face-alist): Use renamed gnus faces. + + * gnus-sum.el (gnus-summary-selected-face) + (gnus-summary-highlight): Use renamed gnus faces. + * gnus-group.el (gnus-group-highlight): Likewise. + +2005-06-14 Juanma Barranquero + + * gnus-sieve.el (gnus-sieve-article-add-rule): + * legacy-gnus-agent.el (gnus-agent-unlist-expire-days): + * spam-stat.el (spam-stat-buffer-change-to-spam) + (spam-stat-buffer-change-to-non-spam): Follow error conventions. + + * message.el (message-is-yours-p): + * gnus-sum.el (gnus-auto-select-subject): Fix quoting in docstring. + +2005-06-14 Katsumi Yamaoka + + * mm-view.el (mm-inline-text): Withdraw the last change. + +2005-06-09 Katsumi Yamaoka + + * mm-view.el (mm-inline-text): Turn off adaptive-fill-mode while + executing enriched-decode. + +2005-06-07 Katsumi Yamaoka + + * mm-util.el (mm-find-buffer-file-coding-system): Don't examine + charset of tar files. + +2005-06-04 Luc Teirlinck + + * gnus-art.el (article-update-date-lapsed): Use `save-match-data'. + +2005-06-04 Lute Kamstra + + * nnfolder.el (nnfolder-read-folder): Make sure that undo + information is never recorded. + +2005-06-03 Stefan Monnier + + * gnus-art.el (gnus-emphasis-alist): Disable the strikethru thingy. + +2005-06-02 Katsumi Yamaoka + + * pop3.el (pop3-apop): Run md5 in the binary mode. + + * starttls.el (starttls-set-process-query-on-exit-flag): + Use eval-and-compile. + +2005-05-31 Simon Josefsson + + * smime.el (smime-replace-in-string): Define. + (smime-cert-by-ldap-1): Use it. + +2005-05-31 Katsumi Yamaoka + + * gnus-art.el (article-display-x-face): Replace + process-kill-without-query by gnus-set-process-query-on-exit-flag. + + * gnus-util.el (gnus-set-process-query-on-exit-flag): Alias to + set-process-query-on-exit-flag or process-kill-without-query. + + * html2text.el (html2text-fix-paragraphs): Use `while - re-search' + loop instead of replace-regexp. + + * imap.el (imap-ssl-open): Use set-process-query-on-exit-flag + instead of process-kill-without-query if it is available. + + * lpath.el: Fbind ldap-search-entries. + + * mm-util.el (mm-insert-file-contents): Bind find-file-hook + instead of find-file-hooks if it is available. + + * mml1991.el: Bind pgg-default-user-id when compiling. + + * mml2015.el: Bind pgg-default-user-id when compiling. + + * nndraft.el (nndraft-request-associate-buffer): + Use write-contents-functions instead of write-contents-hooks if it is + available. + + * nnheader.el (nnheader-find-file-noselect): Bind find-file-hook + instead of find-file-hooks if it is available. + + * nntp.el (nntp-open-connection): Replace + process-kill-without-query by gnus-set-process-query-on-exit-flag. + (nntp-open-ssl-stream): Ditto. + (nntp-open-tls-stream): Ditto. + + * starttls.el (starttls-set-process-query-on-exit-flag): Alias to + set-process-query-on-exit-flag or process-kill-without-query. + (starttls-open-stream-gnutls): Use it instead of + process-kill-without-query. + (starttls-open-stream): Ditto. + +2005-05-31 Ulf Stegemann (tiny change) + + * smime.el (smime-cert-by-ldap-1): Don't use + replace-regexp-in-string. + +2005-05-31 Arne J,Ax(Brgensen + + * smime-ldap.el (smime-ldap-search): Add compatibility for XEmacs. + + * smime.el (smime-cert-by-ldap-1): Handle certificates distributed + in PEM format. Adjust to the XEmacs compability. + +2005-05-30 Reiner Steib + + * encrypt.el (encrypt-xor-process-buffer): Replace `string-to-int' + by `string-to-number'. + * gnus-agent.el (gnus-agent-regenerate-group) + (gnus-agent-fetch-articles): Ditto. + * gnus-art.el (gnus-button-fetch-group): Ditto. + * gnus-cache.el (gnus-cache-generate-active) + (gnus-cache-articles-in-group): Ditto. + * gnus-group.el (gnus-group-set-current-level) + (gnus-group-insert-group-line): Ditto. + * gnus-score.el (gnus-score-set-expunge-below) + (gnus-score-set-mark-below, gnus-summary-score-effect) + (gnus-summary-score-entry): Ditto. + * gnus-soup.el (gnus-soup-send-packet, gnus-soup-parse-areas) + (gnus-soup-pack): Ditto. + * gnus-spec.el (gnus-xmas-format): Ditto. + * gnus-start.el (gnus-newsrc-to-gnus-format): Ditto. + * gnus-sum.el (gnus-create-xref-hashtb): Ditto. + * gnus-uu.el (gnus-uu-expand-numbers): Ditto. + * nnbabyl.el (nnbabyl-article-group-number): Ditto. + * nndb.el (nndb-get-remote-expire-response): Ditto. + * nndiary.el (nndiary-parse-schedule-value) + (nndiary-string-to-number, nndiary-request-replace-article) + (nndiary-request-article): Ditto. + * nndoc.el (nndoc-rnews-body-end, nndoc-mbox-body-end): Ditto. + * nndraft.el (nndraft-articles, nndraft-request-group): Ditto. + * nneething.el (nneething-make-head): Ditto. + * nnfolder.el (nnfolder-request-article) + (nnfolder-retrieve-headers): Ditto. + * nnheader.el (nnheader-file-to-number): Ditto. + * nnkiboze.el (nnkiboze-request-article): Ditto. + * nnmail.el (nnmail-process-unix-mail-format) + (nnmail-process-babyl-mail-format): Ditto. + * nnmbox.el (nnmbox-read-mbox, nnmbox-article-group-number): Ditto. + * nnmh.el (nnmh-update-gnus-unreads, nnmh-active-number) + (nnmh-request-create-group, nnmh-request-list-1) + (nnmh-request-group, nnmh-request-article): Ditto. + * nnml.el (nnml-request-replace-article, nnml-request-article): Ditto. + * nnrss.el (nnrss-find-rss-via-syndic8): Ditto. + * nnsoup.el (nnsoup-make-active): Ditto. + * nnspool.el (nnspool-find-id, nnspool-request-group): Ditto. + * nntp.el (nntp-find-group-and-number) + (nntp-retrieve-headers-with-xover): Ditto. + * pgg-gpg.el (pgg-gpg-snarf-keys-region): Ditto. + * pgg-parse.el (pgg-read-body, pgg-read-bytes) + (pgg-format-key-identifier): Ditto. + * pop3.el (pop3-last, pop3-stat): Ditto. + * qp.el (quoted-printable-decode-region): Ditto. + + * spam-report.el (spam-report-url-ping-mm-url): Use format instead + of concat. + +2005-05-30 Katsumi Yamaoka + + * gnus-agent.el (gnus-category-mode): Use gnus-run-mode-hooks. + + * gnus-art.el (gnus-article-mode): Use gnus-run-mode-hooks. + + * gnus-cus.el (gnus-custom-mode): Use gnus-run-mode-hooks. + + * gnus-eform.el (gnus-edit-form-mode): Use gnus-run-mode-hooks. + + * gnus-group.el (gnus-group-mode): Use gnus-run-mode-hooks. + + * gnus-kill.el (gnus-kill-file-mode): Use gnus-run-mode-hooks. + + * gnus-salt.el (gnus-tree-mode): Use gnus-run-mode-hooks. + (gnus-carpal-mode): Ditto. + + * gnus-srvr.el (gnus-server-mode): Use gnus-run-mode-hooks. + (gnus-browse-mode): Ditto. + + * gnus-sum.el (gnus-summary-mode): Use gnus-run-mode-hooks. + + * gnus-util.el (gnus-run-mode-hooks): Save current buffer. + +2005-05-29 Richard M. Stallman + + * gnus-cite.el (gnus-cite-add-face): Set overlay's evaporate property. + +2005-05-27 Katsumi Yamaoka + + * gnus-util.el (gnus-run-mode-hooks): New function. + + * score-mode.el (gnus-score-mode): Use gnus-run-mode-hooks. + + * dgnushack.el: Advise byte-optimize-form-code-walker to avoid the + ``...called for effect'' warnings for Emacs 21.4 as well as 21.3. + +2005-05-26 Luc Teirlinck + + * gnus-agent.el (gnus-agent-make-mode-line-string): + Use mode-line-highlight as mouse-face. + +2005-05-17 Katsumi Yamaoka + + * canlock.el (canlock): Change the parent group to news. + + * deuglify.el (gnus-outlook-deuglify): Add :group. + + * dig.el (dig): Add :group. + + * dns-mode.el (dns-mode): Add :group. + + * encrypt.el (encrypt): Add :group. + + * gnus-cite.el (gnus-cite-attribution-face): Add :group. + (gnus-cite-face-1, gnus-cite-face-2, gnus-cite-face-3): Ditto. + (gnus-cite-face-4, gnus-cite-face-5, gnus-cite-face-6): Ditto. + (gnus-cite-face-7, gnus-cite-face-8, gnus-cite-face-9): Ditto. + (gnus-cite-face-10, gnus-cite-face-11): Ditto. + + * gnus-diary.el (gnus-diary): Add :group. + + * gnus.el (gnus-group-news-1-face): Add :group. + (gnus-group-news-1-empty-face): Ditto. + (gnus-group-news-2-face, gnus-group-news-2-empty-face): Ditto. + (gnus-group-news-3-face, gnus-group-news-3-empty-face): Ditto. + (gnus-group-news-4-face, gnus-group-news-4-empty-face): Ditto. + (gnus-group-news-5-face, gnus-group-news-5-empty-face): Ditto. + (gnus-group-news-6-face, gnus-group-news-6-empty-face): Ditto. + (gnus-group-news-low-face, gnus-group-news-low-empty-face): Ditto. + (gnus-group-mail-1-face, gnus-group-mail-1-empty-face): Ditto. + (gnus-group-mail-2-face, gnus-group-mail-2-empty-face): Ditto. + (gnus-group-mail-3-face, gnus-group-mail-3-empty-face): Ditto. + (gnus-group-mail-low-face, gnus-group-mail-low-empty-face): Ditto. + (gnus-summary-selected-face, gnus-summary-cancelled-face): Ditto. + (gnus-summary-high-ticked-face): Ditto. + (gnus-summary-low-ticked-face): Ditto. + (gnus-summary-normal-ticked-face): Ditto. + (gnus-summary-high-ancient-face): Ditto. + (gnus-summary-low-ancient-face): Ditto. + (gnus-summary-normal-ancient-face): Ditto. + (gnus-summary-high-undownloaded-face): Ditto. + (gnus-summary-low-undownloaded-face): Ditto. + (gnus-summary-normal-undownloaded-face): Ditto. + (gnus-summary-high-unread-face): Ditto. + (gnus-summary-low-unread-face): Ditto. + (gnus-summary-normal-unread-face): Ditto. + (gnus-summary-high-read-face, gnus-summary-low-read-face): Ditto. + (gnus-summary-normal-read-face, gnus-splash-face): Ditto. + + * hashcash.el (hashcash): New custom group. + (hashcash-default-payment): Add :group. + (hashcash-payment-alist): Ditto. + (hashcash-default-accept-payment): Ditto. + (hashcash-accept-resources): Ditto. + (hashcash-path): Ditto. + (hashcash-extra-generate-parameters): Ditto. + (hashcash-double-spend-database): Ditto. + (hashcash-in-news): Ditto. + + * message.el (message-minibuffer-local-map): Add :group. + + * netrc.el (netrc): Add :group. + + * sieve-manage.el (sieve-manage-log): Add :group. + (sieve-manage-default-user): Diito. + (sieve-manage-server-eol, sieve-manage-client-eol): Ditto. + (sieve-manage-streams, sieve-manage-stream-alist): Ditto. + (sieve-manage-authenticators): Ditto. + (sieve-manage-authenticator-alist): Ditto. + (sieve-manage-default-port): Ditto. + + * sieve-mode.el (sieve-control-commands-face): Add :group. + (sieve-action-commands-face): Ditto. + (sieve-test-commands-face): Ditto. + (sieve-tagged-arguments-face): Ditto. + + * smime.el (smime): Add :group. + + * spam-report.el (spam-report): Add :group. + + * spam.el (spam, spam-face): Add :group. + +2005-05-16 Lars Magne Ingebrigtsen + + * nntp.el (nntp-next-result-arrived-p): Some news servers may + return \n.\n.\n at the end of articles. Protect against that. + (nntp-with-open-group): Allow debugging. + + * nnheader.el (mail-header-set-extra): Make into a function + because I just could't understand how to quote the list properly. + + * dns.el (query-dns-cached): New function. + +2005-05-26 Lute Kamstra + + * score-mode.el (gnus-score-mode): Use run-mode-hooks. + +2005-05-16 Katsumi Yamaoka + + * dgnushack.el: Autoload mail-extract-address-components for XEmacs. + + * gnus-art.el: Don't autoload mail-extract-address-components. + + * gnus.el: Remove duplicated autoload for message-y-or-n-p; use + eval-and-compile to evaluate it. + + * hashcash.el: Don't autoload executable-find. + + * nndb.el: Don't declare the nndb back end two or more times; don't + autoload news-reply-mode, news-setup, cancel-timer and telnet. + + * nntp.el: Autoload format-spec instead of format; use + eval-and-compile to evaluate autoload forms. + +2005-05-09 Georg C. F. Greve (tiny change) + + * pgg-gpg.el (pgg-gpg-possibly-cache-passphrase): Fix PIN caching. + +2005-05-01 Lars Magne Ingebrigtsen + + * gnus.el (gnus-version-number): Bump version. + 2005-05-01 Lars Magne Ingebrigtsen * gnus.el: No Gnus v0.3 is released. @@ -135,11 +3171,11 @@ * nnimap.el (nnimap-date-days-ago): Add defvars in order to silence the byte compiler inside the defun - * gnus-demon.el (parse-time-string): Added autoload. + * gnus-demon.el (parse-time-string): Add autoload. - * gnus-delay.el (parse-time-string): Added autoload. + * gnus-delay.el (parse-time-string): Add autoload. - * gnus-art.el (parse-time-string): Added autoload. + * gnus-art.el (parse-time-string): Add autoload. * nnultimate.el (parse-time): Require for `parse-time-string'. @@ -204,22 +3240,21 @@ * nnmaildir.el (nnmaildir-request-accept-article): Use `nnheader-cancel-timer' for compatibility with current XEmacs. -2005-03-13 Steve Youngs +2005-03-13 Andrey Slusar (tiny change) * gnus-async.el: Require timer-funcs at compile time when in XEmacs for `run-with-idle-timer'. -2005-03-13 Steve Youngs +2005-03-13 Andrey Slusar (tiny change) * gnus.el: Don't try and mark `gnus-agent-save-groups' as an autoloaded function. - From: Andrey Slusar . 2005-03-10 Stefan Monnier * nnimap.el (nnimap-retrieve-headers-from-server): Fix last change. -2005-03-10 Arne J,Ax(Brgensen (tiny change) +2005-03-10 Arne J,Ax(Brgensen (tiny change) * nnimap.el (nnimap-retrieve-headers-from-server): Fix off-by-one flaw. @@ -228,13 +3263,13 @@ * gnus-msg.el (gnus-confirm-mail-reply-to-news): Add gnus-expert-user to default. -2005-03-08 Juergen Kreileder (tiny change) +2005-03-08 Juergen Kreileder (tiny change) * nnimap.el (nnimap-open-server): Ditto. * imap.el (imap-authenticate): Fix typo. -2005-03-08 Bjorn Solberg (tiny change) +2005-03-08 Bjorn Solberg (tiny change) * nnimap.el (nnimap-retrieve-headers-from-server): Sort NOV buffer (since IMAP server might return FETCH response out of @@ -261,7 +3296,7 @@ gnus-agent-synchronize-group-flags to reset read status in both gnus and server. (gnus-agent-update-files-total-fetched-for): Fixed initial size. - + 2005-03-04 Reiner Steib * message.el: Don't autoload former message-utils variables. @@ -387,7 +3422,7 @@ * mml.el (mml-parse-1): Use them. -2005-02-21 Arne J,Ax(Brgensen +2005-02-21 Arne J,Ax(Brgensen * nnrss.el (nnrss-verbose): Removed. (nnrss-request-group): Use `nnheader-message' instead. @@ -451,7 +3486,7 @@ mml-smime-get-dns-ldap. (mml-smime-encrypt-query): Use new function. Default to ldap. -2005-02-14 Arne J,Ax(Brgensen +2005-02-14 Arne J,Ax(Brgensen * smime.el: Require smime-ldap. (smime-ldap-host-list): New variable. @@ -542,7 +3577,7 @@ (mm-display-inline-fontify): Rewrite for decoding and decompressing parts. -2004-10-15 TSUCHIYA Masatoshi +2005-02-07 TSUCHIYA Masatoshi * mm-view.el (mm-display-inline-fontify): Decode a part according to the charset parameter. @@ -557,12 +3592,12 @@ * nntp.el (nntp-marks-changed-p): Use time-less-p to compare the timestamps. -2005-01-29 Jari Aalto +2005-02-02 Jari Aalto * gnus-sum.el (gnus-list-of-unread-articles): Improve active groups error checking and notify user. -2004-09-04 Jari Aalto +2005-02-02 Jari Aalto * message.el (message-send-mail-function): Check existence of sendmail-program first before using default value @@ -610,20 +3645,20 @@ XEmacs. Remove `password-run-at-time' macro. (password-cache-add): Use `run-at-time' instead of - `password-run-at-time'. + `password-run-at-time'. * nnheaderxm.el: Require timer-funcs instead of run-at-time. Remove `nnheader-cancel-function-timers' alias, - `cancel-function-timers' exists in XEmacs in timer-funcs. + `cancel-function-timers' exists in XEmacs in timer-funcs. * mail-source.el: Require timer-funcs instead of itimer in XEmacs - for `run-with-idle-timer'. + for `run-with-idle-timer'. * gnus-demon.el: Require timer-funcs instead of itimer in XEmacs for `run-at-time'. * mm-url.el: Require timer-funcs at compile time when in XEmacs - for `with-timeout'. + for `with-timeout'. * dgnushack.el: Autoload the correct `setenv' for SXEmacs which is the same as for XEmacs 21.4. @@ -638,12 +3673,12 @@ * mml.el (mml-generate-mime-1): Convert string into unibyte when inserting " *mml*" buffer's contents into a unibyte temp buffer. -2005-01-24 Harald Meland (tiny change) +2005-01-24 Harald Meland (tiny change) * mail-source.el (mail-source-fetch-imap): Search for ^From case sensitively. -2005-01-21 Derek Atkins (tiny change) +2005-01-21 Derek Atkins (tiny change) * pgg-pgp.el (pgg-pgp-decrypt-region): Use passphrase cache. @@ -1069,7 +4104,7 @@ * dns.el (query-dns): Use sit-for to time instead of accept-process-output, since that doesn't seem to work on udp - sockets. + sockets. 2004-11-17 Katsumi Yamaoka @@ -1269,11 +4304,13 @@ * deuglify.el (gnus-outlook-deuglify): Add :version. - * html2text.el: Beautify code. Improve doc strings. Some checkdoc - cleanup. + * html2text.el: Beautify code. Improve doc strings. Some + checkdoc cleanup. (html2text-get-attr, html2text-fix-paragraph): Simplify code. - (html2text-format-tag-list): Add "strong" and "em". - From "Alfred M. Szmidt" (tiny change). + +2004-11-01 Alfred M. Szmidt (tiny change) + + * html2text.el (html2text-format-tag-list): Add "strong" and "em". 2004-10-29 Teodor Zlatanov @@ -1438,7 +4475,7 @@ 2004-10-17 Richard M. Stallman - * gnus-registry.el (gnus-registry-unload-hook): + * gnus-registry.el (gnus-registry-unload-hook): Set as a variable with add-hook. * nnspool.el (nnspool-spool-directory): Use news-directory instead @@ -1641,7 +4678,7 @@ * gnus-agent.el (gnus-agent-synchronize-group-flags): When necessary, pass full group name to gnus-request-set-marks. - + 2004-10-01 Simon Josefsson * mailcap.el (mailcap-mime-data): Add pdf. Remove non-free @@ -1651,12 +4688,12 @@ * spam-report.el (spam-report-gmane): Fix interactive. - * gnus-art.el (gnus-treat-body-boundary): Only do stuff under X. + * gnus-art.el (gnus-treat-body-boundary): Only do stuff under X. * gnus-agent.el (gnus-agent-synchronize-flags-server): Be silent when writing file. (gnus-agent-synchronize-flags): Don't default to being - interactive. + interactive. 2004-09-30 Simon Josefsson @@ -1674,7 +4711,7 @@ info read flags with the marks being sync'd to the backend. *gnus-util.el (gnus-pp): Added optional stream to match pp API. - + 2004-09-28 Teodor Zlatanov * spam.el (spam-verify-bogofilter): new function @@ -1729,7 +4766,7 @@ * gnus-dup.el (gnus-dup-open): Use mapc. (gnus-dup-enter-articles, gnus-dup-suppress-articles): Use dolist. - + (gnus-dup-enter-articles): Remove excess ID's from gnus-dup-hashtb. Reported by Stefan Wiens . @@ -1748,7 +4785,7 @@ * gnus-agent.el (gnus-agent-check-overview-buffer): Fixed range of deletion to remove entire duplicate line. Fixes merged article number bug. - + 2004-09-25 Kevin Greiner * gnus-agent.el (gnus-agent-possibly-synchronize-flags): Ignore @@ -1768,7 +4805,7 @@ gnus-agent-synchronize-group-flags, not backend's request-set-mark method, to ensure that synchronization updates marks in the backend and in the info (in memory) structure. - + 2004-09-24 Katsumi Yamaoka * gnus-uu.el (gnus-uu-digest-mail-forward): Obey the process/prefix @@ -2131,16 +5168,13 @@ * nnimap.el (nnimap-authinfo-file, nnimap-prune-cache): Add :group 'nnimap. -2004-08-30 Simon Josefsson +2004-08-30 Andreas Schwab * rfc2231.el (rfc2231-parse-string): Restore whitespace syntax for - ?* and ?\; (tiny patch). From Andreas Schwab . - -2004-08-30 Simon Josefsson + ?* and ?\;. * ietf-drums.el (ietf-drums-syntax-table): Set syntax of ?* ?\; - and ?\' to symbol instead of whitespace (tiny patch). From - Andreas Schwab . + and ?\' to symbol instead of whitespace. 2004-08-30 Katsumi Yamaoka @@ -2170,6 +5204,17 @@ * gnus-sum.el (gnus-summary-make-menu-bar): Avoid the "Unrecognized menu descriptor" error in XEmacs. +2004-08-26 Stefan Wiens (tiny change) + + * gnus-sum.el (gnus-read-header): Don't remove a header for the + parent article of a sparse article in the thread hashtb. + +2004-08-26 David Hedbor (tiny change) + + * nnmail.el (nnmail-split-lowercase-expanded): New user option. + (nnmail-expand-newtext): Lowercase expanded entries if + nnmail-split-lowercase-expanded is non-nil. + 2004-08-26 Katsumi Yamaoka * nndoc.el (nndoc-type-alist): Fix regexp in the rfc822-forward @@ -2348,7 +5393,7 @@ * flow-fill.el (fill-flowed): Remove space stuffing, and only do quotes that actually start with ">" at the beginning of the - lines. + lines. 2004-07-23 Katsumi Yamaoka @@ -2385,13 +5430,6 @@ * rfc2047.el (rfc2047-encode-region): Fix last change. 2004-07-12 Katsumi Yamaoka - From David Hedbor . - - * nnmail.el (nnmail-split-lowercase-expanded): New user option. - (nnmail-expand-newtext): Lowercase expanded entries if - nnmail-split-lowercase-expanded is non-nil. - -2004-07-12 Katsumi Yamaoka * rfc2047.el (rfc2047-encode-region): Treat backslash-quoted characters as non-special. @@ -2423,7 +5461,7 @@ 2004-07-03 Lars Magne Ingebrigtsen * nnheader.el (nnheader-uniquify-message-id): New experimental - variable. + variable. (nnheader-nov-read-message-id): Use it. * spam-report.el (spam-report-gmane): Add interactive. @@ -2433,10 +5471,9 @@ * mm-encode.el (mm-content-transfer-encoding-defaults): Use qp-or-base64 for the application/* types. -2004-07-02 Jesper Harder +2004-07-02 Joakim Verona (tiny change) - * nnrss.el (nnrss-read-group-data): Fix off-by-one error. From - Joakim Verona . + * nnrss.el (nnrss-read-group-data): Fix off-by-one error. 2004-06-30 Teodor Zlatanov @@ -2459,6 +5496,11 @@ * gnus-group.el (gnus-group-get-new-news-this-group): Don't update info that isn't there. +2004-06-29 Ilya N. Golubev . + + * mm-util.el (mm-mime-mule-charset-alist): Add the windows-1251 + entry. + 2004-06-29 Katsumi Yamaoka * mm-view.el (mm-inline-render-with-function): Use multibyte @@ -2466,11 +5508,9 @@ * mm-encode.el (mm-content-transfer-encoding-defaults): Doc fix. - * mm-util.el (mm-mime-mule-charset-alist): Add the windows-1251 - entry. From Ilya N. Golubev . - (mm-enrich-utf-8-by-mule-ucs): New function run when Mule-UCS is - loaded under XEmacs. - (): Don't make duplicated entries in mm-mime-mule-charset-alist. + * mm-util.el (mm-enrich-utf-8-by-mule-ucs): New function run when + Mule-UCS is loaded under XEmacs. + (mm-mime-mule-charset-alist): Avoid duplicated entries. 2004-06-28 Jesper Harder @@ -2658,7 +5698,7 @@ 2004-06-12 Lars Magne Ingebrigtsen - * message.el (message-ignored-supersedes-headers): Add Approved. + * message.el (message-ignored-supersedes-headers): Add Approved. 2004-06-11 Katsumi Yamaoka @@ -2670,7 +5710,7 @@ * rfc2047.el (rfc2047-encode-message-header): Disabled header folding -- not all headers can be folded, and this should be done - by the message composition mode. Probably. I think. + by the message composition mode. Probably. I think. 2004-06-10 Katsumi Yamaoka @@ -2724,12 +5764,12 @@ 2004-06-06 Lars Magne Ingebrigtsen * message.el (message-cite-articles-with-x-no-archive): New - variable. + variable. (message-cite-original): Use it. 2004-06-04 Lars Magne Ingebrigtsen - * message.el (message-cite-original): Respect X-No-Archive. + * message.el (message-cite-original): Respect X-No-Archive. 2004-06-04 Katsumi Yamaoka @@ -2777,13 +5817,15 @@ * spam.el (spam-group-spam-contents-p): handle empty groupname strings (spam-report-articles-resend) - (spam-report-resend-register-routine): allow spam-report-resend-to - to be a group parameter or a global value - (tiny change). From Daniel Pittman . (spam-register-routine): do registration iff any articles warrant it. (spam-summary-prepare-exit): changed log message for nil group - destinations + destinations + +2004-05-27 Daniel Pittman + + * spam.el (spam-report-resend-register-routine): allow + spam-report-resend-to to be a group parameter or a global value 2004-05-26 Simon Josefsson @@ -2810,11 +5852,14 @@ 2004-05-26 Teodor Zlatanov - * spam.el (spam-mark-junk-as-spam-routine) - (spam-mark-new-messages-in-spam-group-as-spam): allow user to - disable assigning the spam-mark to new messages - (spam-ham-copy-or-move-routine): todo decleared twice (tiny - change). From Adam Sj,Ax(Bgren . + * spam.el (spam-mark-new-messages-in-spam-group-as-spam): New + variable. + (spam-mark-junk-as-spam-routine): Use it. Allow to disable + assigning the spam-mark to new messages. + +2004-05-26 Adam Sj,Ax(Bgren (tiny change) + + (spam-ham-copy-or-move-routine): Don't declare `todo' twice. 2004-05-26 Katsumi Yamaoka @@ -2824,10 +5869,10 @@ (rfc2047-decode): Treat the ascii coding-system as raw-text by default. -2004-05-25 Teodor Zlatanov +2004-05-25 Anand Mitra (tiny change) * gnus-sum.el (gnus-summary-delete-article): invoke hook with - correct data (tiny change). From Anand Mitra . + correct data. 2004-05-24 Teodor Zlatanov @@ -2888,24 +5933,24 @@ * nnimap.el (nnimap-open-connection): Use netrc. * gnus-util.el (gnus-netrc-get): Remove aliases. - + * gnus-sum.el (gnus-auto-center-summary): Change default to 2. * assistant.el (wid-edit): Fix compilation. - * gnus-util.el (gnus-set-file-modes): Just ignore errors. + * gnus-util.el (gnus-set-file-modes): Just ignore errors. 2004-05-23 Paul Stodghill * gnus-util.el (gnus-set-file-modes): New function. (small - patch). + patch). 2004-05-23 Lars Magne Ingebrigtsen * gnus-topic.el (gnus-topic-jump-to-topic): Goto missing topic. * assistant.el (assistant-render-node): Fix up rendering and - read-only text. + read-only text. (assistant-render-node): Reset. (assistant-make-read-only): Not sticky. @@ -3017,7 +6062,7 @@ 2004-05-19 Lars Magne Ingebrigtsen * gnus-msg.el (gnus-inews-make-draft-meta-information): Fix quote - stuff. + stuff. * gnus-start.el (gnus-subscribe-hierarchical-interactive): Match on real group name. @@ -3028,7 +6073,7 @@ * pgg-pgp.el (pgg-pgp-verify-region): Clean up. -2004-05-19 Michael Schierl +2004-05-19 Michael Schierl (tiny change) * pgg-pgp.el (pgg-pgp-verify-region): Default when signature isn't a string. @@ -3038,17 +6083,17 @@ * gnus-draft.el (gnus-draft-send): Bind rfc2047-encode-encoded-words. - * rfc2047.el (rfc2047-encode-region): Encode =? strings. + * rfc2047.el (rfc2047-encode-region): Encode =? strings. (rfc2047-encodable-p): Say that =? needs encoding. (rfc2047-encode-encoded-words): New variable. * gnus-group.el (gnus-group-select-group): Doc fix. - * gnus-draft.el (gnus-draft-setup): Mark all replied as replied. + * gnus-draft.el (gnus-draft-setup): Mark all replied as replied. * gnus-group.el (gnus-group-mode): Set show-trailing-whitespace to nil. - + * gnus-cache.el (gnus-cache-possibly-enter-article): Use it. * nnheader.el (nnheader-get-lines-and-char): New function. @@ -3089,7 +6134,7 @@ * gnus-msg.el (gnus-inews-do-gcc): Don't use read-only-p to see whether backend can accept message. - * message.el (message-idna-to-ascii-rhs-1): Don't use equalp. + * message.el (message-idna-to-ascii-rhs-1): Don't use equalp. 2004-05-18 Kai Grossjohann @@ -3128,7 +6173,7 @@ * mail-source.el (mail-source-delete-crash-box): Refactor. (mail-source-fetch): Use it. (mail-source-fetch-file): Ditto. - (mail-source-fetch-directory): Run postscript in loop. + (mail-source-fetch-directory): Run postscript in loop. (mail-source-fetch-pop): Delete. (mail-source-fetch-maildir): Ditto. (mail-source-fetch-imap): Ditto. @@ -3141,7 +6186,7 @@ (message-delete-address): Use it. (message-fill-header-general): Refactor. (message-fill-field-address): Rename. - (message-narrow-to-field): Find the start of the header. + (message-narrow-to-field): Find the start of the header. (message-header-format-alist): Don't pre-fill. (message-fill-header): Removed. (message-insert-header): New function. @@ -3155,10 +6200,10 @@ * imap.el: Add compiler directives. - * gnus-score.el (gnus-score-edit-done): run-hook->run-hooks. + * gnus-score.el (gnus-score-edit-done): run-hook->run-hooks. * gnus-art.el (article-decode-idna-rhs): Don't use - message-idna-inside-rhs-p. + message-idna-inside-rhs-p. 2004-05-16 Lars Magne Ingebrigtsen @@ -3170,21 +6215,21 @@ 2004-05-16 Kim Minh Kaplan - * imap.el (imap-sasl-make-mechanisms): Use sasl. + * imap.el (imap-sasl-make-mechanisms): Use sasl. 2004-05-16 Lars Magne Ingebrigtsen * nneething.el (nneething-file-name): Don't create spurions - files. + files. - * gnus-msg.el (gnus-inews-do-gcc): Ignore read-only groups. + * gnus-msg.el (gnus-inews-do-gcc): Ignore read-only groups. (gnus-inews-do-gcc): Remove sleep. * gnus-art.el (gnus-mime-delete-part): Error message when no MIME part under point. - * gnus-agent.el (gnus-agent-synchronize-flags): Default to nil. - (gnus-agent-regenerate-group): Using nil messages aren't valid. + * gnus-agent.el (gnus-agent-synchronize-flags): Default to nil. + (gnus-agent-regenerate-group): Using nil messages aren't valid. 2004-05-15 Teodor Zlatanov @@ -3192,14 +6237,15 @@ 2004-05-14 Teodor Zlatanov - * gnus-dup.el (gnus-dup-unsuppress-article): don't assume the mail - header is not nil (tiny change). From Nelson Ferreira - . - * spam.el (spam-summary-prepare-exit): only produce "marking spam as expired without moving it" message when there are spam messages left +2004-05-14 Nelson Ferreira (tiny change) + + * gnus-dup.el (gnus-dup-unsuppress-article): don't assume the mail + header is not nil. + 2004-05-14 Kai Grossjohann * nntp.el (nntp-request-set-mark, nntp-request-update-info): Call @@ -3397,7 +6443,7 @@ From Dan Christensen , asjo@koldfront.dk (Adam Sj,Ax(Bgren), Wes Hardaker , and Michael Shields : - + * spam.el (spam-necessary-extra-headers): get the extra headers we may need for spam sorting and scoring (spam-user-format-function-S): a user format function suitable for @@ -3444,7 +6490,7 @@ hasn't worked for a while. 2004-04-15 Kevin Greiner - + * gnus-agent.el (gnus-agentize): gnus-agent-send-mail-real-function no longer set to current value of message-send-mail-function but rather a lambda that calls @@ -3452,7 +6498,7 @@ responsive to user changes to message-send-mail-function. 2004-04-15 Kevin Greiner - + * legacy-gnus-agent.el (gnus-agent-convert-to-compressed-agentview): Fixed typos with help from Florian Weimer @@ -3541,7 +6587,7 @@ (gnus-agent-need-update-total-fetched-for): New variable. (gnus-agent-update-files-total-fetched-for): New function. (gnus-agent-update-view-total-fetched-for): New function. - (gnus-agent-total-fetched-for): New function. + (gnus-agent-total-fetched-for): New function. * gnus-cache.el (gnus-cache-save-buffers): Use gnus-cache-update-overview-total-fetched-for to change disk space @@ -3564,7 +6610,7 @@ (gnus-cache-delete-group-total-fetched-for): New function. (gnus-cache-total-fetched-for): New function. - * gnus-group.el (): Require gnus-sum and autoload functions to + * gnus-group.el: Require gnus-sum and autoload functions to resolve warnings when gnus-group.el compiled alone. (gnus-group-line-format): Documented new %F (size of Fetched data) group line format; identifies disk space @@ -3589,14 +6635,15 @@ * gnus-util.el (gnus-rename-file): New function. +2004-04-07 Christian Neukirchen (tiny change) + + * mm-util.el (mm-image-load-path): Handle nil in load-path. + 2004-04-07 Jesper Harder * rfc2047.el (rfc2047-encoded-word-regexp): Remove unnecessary '+'. Reported by Stefan Wiens . - * mm-util.el (mm-image-load-path): Handle nil in load-path. - From Christian Neukirchen . - 2004-04-06 Jesper Harder * gnus-cache.el (gnus-cache-save-buffers): Check if buffer is @@ -3708,10 +6755,6 @@ * gnus-agent.el (gnus-agent-read-agentview): Add a missing arg to error. - * gnus-sum.el (gnus-read-header): Don't remove a header for the - parent article of a sparse article in the thread hashtb. From - Stefan Wiens . - 2004-03-12 Reiner Steib * imap.el (imap-store-password): New variable. @@ -3723,13 +6766,13 @@ * gnus-art.el (gnus-article-read-summary-keys): Restore new window-start and hscroll to summary window. -2004-03-12 Kevin Greiner +2004-03-12 Kevin Greiner * gnus-start.el (gnus-convert-old-newsrc): Only write the conversion message to newsrc-dribble when an actual conversion is performed. -2004-03-10 Malcolm Purvis (tiny change) +2004-03-10 Malcolm Purvis (tiny change) * spam-stat.el (spam-stat-coding-system): Use mm-coding-system-p. @@ -3741,7 +6784,7 @@ * gnus-art.el (gnus-mime-save-part-and-strip): Use it. (gnus-mime-delete-part): Use it. -2004-03-09 Kevin Greiner +2004-03-09 Kevin Greiner * gnus-agent.el (gnus-agent-read-local): Bind nnheader-file-coding-system to gnus-agent-file-coding-system to @@ -3757,7 +6800,7 @@ signaling an error; don't use mm-multiple-handles. (gnus-mime-delete-part): Ditto. -2004-03-08 Kevin Greiner +2004-03-08 Kevin Greiner * gnus-agent.el (gnus-agent-read-agentview): Removed support for old file versions. @@ -3779,7 +6822,7 @@ * legacy-gnus-agent.el (): New. Provides converters that are only loaded when gnus-convert-old-newsrc needs to call them. - + 2004-03-08 Katsumi Yamaoka * mail-source.el (mail-source-touch-pop): Doc fix. @@ -3796,8 +6839,8 @@ 2004-03-05 Per Abrahamsen - * gnus-sum.el (gnus-widget-reversible-match) - (gnus-widget-reversible-to-internal) + * gnus-sum.el (gnus-widget-reversible-match) + (gnus-widget-reversible-to-internal) (gnus-widget-reversible-to-external): New functions. (gnus-widget-reversible): New widget. (gnus-article-sort-functions, gnus-thread-sort-functions): Use it. @@ -3822,13 +6865,13 @@ * gnus.el (spam-autodetect-methods): add spam-use-gmane-xref as an autodetect method -2004-03-04 Kevin Greiner +2004-03-04 Kevin Greiner * gnus-int.el (gnus-request-accept-article): Inform the agent that articles are being added to a group. (gnus-request-replace-article): Inform the agent that articles need to be uncached as the cached contents are no longer valid. - + 2004-03-04 Katsumi Yamaoka * binhex.el: Don't autoload executable-find. @@ -3869,7 +6912,7 @@ * uudecode.el: Don't autoload executable-find. -2004-03-04 Kevin Greiner +2004-03-04 Kevin Greiner * gnus-agent.el (gnus-agent-file-header-cache): Removed. (gnus-agent-possibly-alter-active): Avoid null in numeric @@ -3901,7 +6944,7 @@ * gnus-cus.el (gnus-agent-customize-category): Mismatched paren. -2004-03-02 Kevin Greiner +2004-03-02 Kevin Greiner * gnus-cus.el (gnus-agent-customize-category): Removed ignore-errors macro reference that required cl to be loaded at @@ -3981,11 +7024,11 @@ * flow-fill.el: Typo. -2004-02-26 Andrew Cohen +2004-02-26 Andrew Cohen * spam-wash.el: New file. -2004-02-26 Mark A. Hershberger +2004-02-26 Mark A. Hershberger * nnrss.el (nnrss-opml-import, nnrss-opml-export): New functions. @@ -4234,7 +7277,7 @@ * nnlistserv.el (nnlistserv-kk-wash-article): do. - * nnml.el (nnml-request-set-mark, nnml-save-marks): do. + * nnml.el (nnml-request-set-mark, nnml-save-marks): do. * mm-bodies.el (mm-7bit-chars): Don't include \r. @@ -4248,11 +7291,10 @@ * rfc2047.el (rfc2047-pad-base64): Deal with more cases of invalid padding. -2004-01-27 Simon Josefsson +2004-01-27 Ralf Angeli - * mm-view.el (mm-fill-flowed): Add. - (mm-inline-text): Use it. Tiny patch from Ralf Angeli - . + * mm-view.el (mm-fill-flowed): New variable. + (mm-inline-text): Use it. 2004-01-27 Teodor Zlatanov @@ -4274,7 +7316,7 @@ 2004-01-27 Steve Youngs * gnus-spec.el (gnus-parse-simple-format): Fix setq value - omission. + omission. From Jerry James 2004-01-26 Katsumi Yamaoka @@ -4297,7 +7339,7 @@ * spam-stat.el (spam-stat-process-directory-age): New option. (spam-stat-process-directory): Use it. -2004-01-24 Hiroshi Fujishima (tiny change) +2004-01-24 Hiroshi Fujishima (tiny change) * spam-stat.el (spam-stat-reduce-size): Set spam-stat-dirty. (spam-stat-save): Accept prefix argument. @@ -4329,7 +7371,7 @@ * gnus-gl.el: Remove. -2004-01-23 Kevin Greiner +2004-01-23 Kevin Greiner * gnus-sum.el (gnus-adjust-marks): Now correctly handles a list of marks consisting of a single range {for example, (3 . 5)} rather @@ -4345,7 +7387,7 @@ * mm-util.el (mm-charset-synonym-alist): Add ks_c_5601-1987. Remove obsolete entries for big5 and gb2312. -2004-01-22 Kevin Greiner +2004-01-22 Kevin Greiner * gnus-sum.el (gnus-adjust-marks): Avoid splicing null INTO the uncompressed list. @@ -4358,7 +7400,7 @@ * gnus-util.el (gnus-fetch-field): Don't bind case-fold-search here -- it's done in message-fetch-field. -2004-01-21 Kevin Greiner +2004-01-21 Kevin Greiner * gnus-agent.el (gnus-agent-queue-mail, gnus-agent-prompt-send-queue): New variables. @@ -4429,7 +7471,7 @@ * gnus-sum.el (gnus-select-newgroup): Replaced inline code with gnus-agent-possibly-alter-active. (gnus-adjust-marked-articles): Faster handling of simple lists - + 2004-01-21 Jesper Harder * spam-stat.el (spam-stat-test-directory): New optional argument @@ -4438,7 +7480,7 @@ (spam-stat-buffer-words-with-scores): Don't narrow and change syntax table here. Reported by Andrew Cohen . -2004-01-20 Teodor Zlatanov +2004-01-20 Teodor Zlatanov * spam.el (gnus-summary-mode-map): make spam-generic-score the default scoring function @@ -4582,7 +7624,7 @@ * rfc2047.el (rfc2047-parse-and-decode, rfc2047-decode): Use a character for the encoding to avoid consing a string. - + * rfc2047.el (rfc2047-decode-string): Don't cons a string unnecessarily. @@ -4596,7 +7638,7 @@ * gnus.sum.el (gnus-remove-odd-characters): Don't cons two new strings. - * mm-util.el (mm-subst-char-in-string): Support inplace. + * mm-util.el (mm-subst-char-in-string): Support inplace. * gnus-sum.el (gnus-summary-remove-list-identifiers): Don't cons a new string in every iteration. Use shy groups. @@ -4643,21 +7685,21 @@ * gnus-topic.el (gnus-topic-find-groups, gnus-topic-clean-alist) (gnus-group-prepare-topics, gnus-topic-check-topology): do. - + * gnus-sum.el (gnus-update-read-articles, gnus-select-newsgroup) (gnus-mark-xrefs-as-read, gnus-compute-read-articles) (gnus-summary-walk-group-buffer, gnus-summary-move-article) (gnus-group-make-articles-read): do. - + 2004-01-09 Jesper Harder * gnus-art.el (article-decode-mime-words, article-babel) (gnus-article-highlight-signature, gnus-article-add-buttons) (gnus-signature-toggle): Use gnus-with-article-buffer. - + * gnus-art.el (gnus-article-highlight-headers) (gnus-article-add-buttons-to-head): Use gnus-with-article-headers. - + * gnus-art.el (gnus-mm-display-part, gnus-article-wash-status) (gnus-article-set-globals, gnus-request-article-this-buffer) (gnus-button-message-id, gnus-article-maybe-hide-headers) @@ -4915,10 +7957,10 @@ * nnheaderxm.el: Remove definition of run-at-time. -2004-01-05 Karl Pfl,Ad(Bsterer +2004-01-05 Karl Pfl,Ad(Bsterer (tiny change) * mml.el (mml-minibuffer-read-disposition): Show attachment type - in prompt (tiny change) + in prompt. 2004-01-06 Steve Youngs @@ -4931,7 +7973,7 @@ (gnus-xmas-define): Don't alias `gnus-set-text-properties' to `gnus-xmas-set-text-properties'. (gnus-xmas-redefine): Don't alias `gnus-completing-read' to - `gnus-xmas-completing-read'. + `gnus-xmas-completing-read'. (gnus-xmas-completing-read): Removed. (gnus-xmas-open-network-stream): Removed. @@ -5160,7 +8202,7 @@ * gnus-group.el (gnus-no-groups-message): Update. - * gnus-sum.el (gnus-summary-insert-new-articles): Remove . + * gnus-sum.el (gnus-summary-insert-new-articles): Remove . 2003-11-09 Simon Josefsson @@ -5214,7 +8256,7 @@ See ChangeLog.2 for earlier changes. - Copyright (C) 2000, 2001, 2002, 2004 Free Software Foundation, Inc. + Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. diff --git a/lisp/ChangeLog.2 b/lisp/ChangeLog.2 index 6bbec68..16aee6d 100644 --- a/lisp/ChangeLog.2 +++ b/lisp/ChangeLog.2 @@ -7390,7 +7390,7 @@ instead of mm-auto-save-coding-system for the draft or delayed group. -2002-10-28 Josh +2002-10-28 Josh Huber * mml.el (mml-mode-map): Fixed keybindings for mml-secure-* functions. @@ -7658,7 +7658,7 @@ * spam.el: more compilation fixes for BBDB - * spam-stat.el added code from Alex Schroeder + * spam-stat.el: added code from Alex Schroeder (spam-stat-reduce-size): Interactive. (spam-stat-reset): New function. (spam-stat-save): Interactive. @@ -12404,7 +12404,7 @@ 2001-12-05 Katsumi Yamaoka - * mm-view.wl (mm-inline-text): Decode a charset-encoded rich text. + * mm-view.el (mm-inline-text): Decode a charset-encoded rich text. 2001-12-04 08:00:00 ShengHuo ZHU diff --git a/lisp/Makefile.in b/lisp/Makefile.in index cd5408e..c931170 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@ -55,7 +55,7 @@ clever some l: gnus-load.el fi $(EMACS_COMP) -f dgnushack-compile -install: clever install-without-compiling +install: clever install-without-compiling list-installed-shadows install-without-compiling: $(SHELL) $(top_srcdir)/mkinstalldirs $(lispdir) @@ -86,6 +86,12 @@ install-el: $(INSTALL_DATA) $$p $(lispdir)/$$p; \ done +list-installed-shadows: + $(EMACS_COMP) -f dgnushack-find-lisp-shadows + +remove-installed-shadows: + $(EMACS_COMP) -f dgnushack-remove-lisp-shadows + tags: etags *.el @@ -101,8 +107,7 @@ gnus-load.el: $(EMACS_COMP) -f dgnushack-make-load clean: - rm -f *.orig *.rej *.elc *~ \ - auto-autoloads.el custom-load.el gnus-load.el dgnuskwds.el + rm -f *.elc *.orig *.rej *~ auto-autoloads.* custom-load.* gnus-load.el distclean: clean rm -f Makefile dgnuspath.el diff --git a/lisp/assistant.el b/lisp/assistant.el index ef10be6..f1e0e60 100644 --- a/lisp/assistant.el +++ b/lisp/assistant.el @@ -1,5 +1,5 @@ ;;; assistant.el --- guiding users through Emacs setup -;; Copyright (C) 2004 Free Software Foundation, Inc. +;; Copyright (C) 2004, 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: util @@ -18,8 +18,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -31,6 +31,11 @@ (require 'widget) (require 'wid-edit) +(autoload 'gnus-error "gnus-util") +(autoload 'netrc-get "netrc") +(autoload 'netrc-machine "netrc") +(autoload 'netrc-parse "netrc") + (defvar assistant-readers '(("variable" assistant-variable-reader) ("validate" assistant-sexp-reader) @@ -38,9 +43,11 @@ ("next" assistant-list-reader) ("text" assistant-text-reader))) -(defface assistant-field-face '((t (:bold t))) +(defface assistant-field '((t (:bold t))) "Face used for editable fields." :group 'gnus-article-emphasis) +;; backward-compatibility alias +(put 'assistant-field-face 'face-alias 'assistant-field) ;;; Internal variables @@ -268,7 +275,7 @@ (push (widget-create 'editable-field - :value-face 'assistant-field-face + :value-face 'assistant-field :assistant-variable variable (assistant-get-variable node variable)) assistant-widgets) @@ -278,7 +285,7 @@ (add-text-properties start (point) (list 'bold t - 'face 'assistant-field-face + 'face 'assistant-field 'not-read-only t)))))))) (defun assistant-render-node (node-name) diff --git a/lisp/base64.el b/lisp/base64.el index 26415a2..5b685e9 100644 --- a/lisp/base64.el +++ b/lisp/base64.el @@ -17,9 +17,9 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with this program; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/binhex.el b/lisp/binhex.el index c4f8509..185e269 100644 --- a/lisp/binhex.el +++ b/lisp/binhex.el @@ -1,6 +1,7 @@ ;;; binhex.el --- elisp native binhex decode -;; Copyright (c) 1998, 1999, 2000, 2001, 2002, 2004 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Shenghuo Zhu ;; Keywords: binhex news @@ -19,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/canlock.el b/lisp/canlock.el index 956800a..d915557 100644 --- a/lisp/canlock.el +++ b/lisp/canlock.el @@ -1,7 +1,7 @@ ;;; canlock.el --- functions for Cancel-Lock feature -;; Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004 -;; Free Software Foundation, Inc. +;; Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Katsumi Yamaoka ;; Keywords: news, cancel-lock, hmac, sha1, rfc2104 @@ -18,8 +18,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with this program; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -50,7 +50,7 @@ (defgroup canlock nil "The Cancel-Lock feature." - :group 'applications) + :group 'news) (defcustom canlock-password nil "Password to use when signing a Cancel-Lock or a Cancel-Key header." diff --git a/lisp/compface.el b/lisp/compface.el index 185f949..e829a3a 100644 --- a/lisp/compface.el +++ b/lisp/compface.el @@ -1,5 +1,6 @@ ;;; compface.el --- functions for converting X-Face headers -;; Copyright (C) 2002 Free Software Foundation, Inc. + +;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news @@ -18,8 +19,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/deuglify.el b/lisp/deuglify.el index 347fbfa..b9b7c7d 100644 --- a/lisp/deuglify.el +++ b/lisp/deuglify.el @@ -1,6 +1,6 @@ ;;; deuglify.el --- deuglify broken Outlook (Express) articles -;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Copyright (C) 2001, 2002 Raymond Scholz ;; Author: Raymond Scholz @@ -22,8 +22,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -231,7 +231,8 @@ (defgroup gnus-outlook-deuglify nil "Deuglify articles generated by broken user agents like MS Outlook (Express)." - :version "22.1") + :version "22.1" + :group 'gnus) ;;;###autoload (defcustom gnus-outlook-deuglify-unwrap-min 45 diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el index e26349f..b7339e0 100644 --- a/lisp/dgnushack.el +++ b/lisp/dgnushack.el @@ -1,6 +1,7 @@ ;;; dgnushack.el --- a hack to set the load path for byte-compiling ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005 +;; Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Katsumi Yamaoka @@ -21,8 +22,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -44,6 +45,8 @@ (copy-sequence coding-category-list)) '(coding-category-sjis)))))) +(defvar dgnushack-default-load-path (copy-sequence load-path)) + (defalias 'facep 'ignore) (require 'cl) @@ -100,7 +103,7 @@ (when (and (not (featurep 'xemacs)) (= emacs-major-version 21) - (= emacs-minor-version 3) + (>= emacs-minor-version 3) (condition-case code (let ((byte-compile-error-on-warn t)) (byte-optimize-form (quote (pop x)) t) @@ -229,6 +232,17 @@ adding the --with-addpath=FLIM_PATH option.\n" load-path))) (add-path "semi") +;; Work around for an incompatibility (XEmacs 21.4 vs. 21.5), see the +;; following threads: +;; +;; http://thread.gmane.org/gmane.emacs.gnus.general/56414 +;; Subject: attachment problems found but not fixed +;; +;; http://thread.gmane.org/gmane.emacs.gnus.general/56459 +;; Subject: Splitting mail -- XEmacs 21.4 vs 21.5 +;; +;; http://thread.gmane.org/gmane.emacs.xemacs.beta/20519 +;; Subject: XEmacs 21.5 and Gnus fancy splitting. (when (and (featurep 'xemacs) (let ((table (copy-syntax-table emacs-lisp-mode-syntax-table))) (modify-syntax-entry ?= " " table) @@ -292,6 +306,7 @@ adding the --with-addpath=FLIM_PATH option.\n" (autoload 'browse-url "browse-url" nil t) (autoload 'c-mode "cc-mode" nil t) (autoload 'customize-apropos "cus-edit" nil t) + (autoload 'customize-group "cus-edit" nil t) (autoload 'customize-save-variable "cus-edit" nil t) (autoload 'customize-set-variable "cus-edit" nil t) (autoload 'customize-variable "cus-edit" nil t) @@ -301,6 +316,7 @@ adding the --with-addpath=FLIM_PATH option.\n" (autoload 'executable-find "executable") (autoload 'font-lock-fontify-buffer "font-lock" nil t) (autoload 'info "info" nil t) + (autoload 'mail-extract-address-components "mail-extr") (autoload 'mail-fetch-field "mail-utils") (autoload 'make-annotation "annotations") (autoload 'make-display-table "disp-table") @@ -316,6 +332,8 @@ adding the --with-addpath=FLIM_PATH option.\n" (autoload 'setenv "process" nil t) (autoload 'setenv "env" nil t)) (autoload 'sgml-mode "psgml" nil t) + (autoload 'sha1 "sha1") + (autoload 'sha1-binary "sha1") (autoload 'smtpmail-send-it "smtpmail") (autoload 'sort-numeric-fields "sort" nil t) (autoload 'sort-subr "sort") @@ -350,8 +368,7 @@ adding the --with-addpath=FLIM_PATH option.\n" (autoload 'std11-unfold-region "nnheader")) (defconst dgnushack-unexporting-files - (append '("dgnushack.el" "dgnuspath.el" "dgnuskwds.el" "lpath.el" - "legacy-gnus-agent.el") + (append '("dgnushack.el" "dgnuspath.el" "lpath.el" "legacy-gnus-agent.el") (unless (or (condition-case code (require 'w3-parse) (error @@ -412,9 +429,7 @@ adding the --with-addpath=FLIM_PATH option.\n" (subrp (symbol-function 'base64-decode-string))) '("base64.el")) (when (and (fboundp 'md5) (subrp (symbol-function 'md5))) - '("md5.el")) - (when (featurep 'xemacs) - '("gnus-load.el"))) + '("md5.el"))) "Files which will not be installed.") (defconst dgnushack-exporting-files @@ -691,4 +706,81 @@ dgnushack-compile." (while (setq file (pop files)) (insert "etc/images/smilies/" file "\n")))))) +(defun dgnushack-find-lisp-shadows (&optional lispdir) + "Return a list of directories in which other Gnus installations exist. +This function looks for the other Gnus installations which will shadow +the new Gnus Lisp modules which have been installed in LISPDIR, using +the default `load-path'. The return value will make sense only when +LISPDIR is existent and is listed in the default `load-path'. Assume +LISPDIR will be prepended to `load-path' by a user if the default +`load-path' does not contain it." + (unless lispdir + (setq lispdir (getenv "lispdir"))) + (when (and lispdir (file-directory-p lispdir)) + (setq lispdir (file-truename (directory-file-name lispdir))) + (let ((indices '("gnus.elc" "gnus.el" "gnus.el.bz2" "gnus.el.gz" + "message.elc" "message.el" "message.el.bz2" + "message.el.gz")) + (path (delq nil (mapcar + (lambda (p) + (condition-case nil + (when (and p (file-directory-p p)) + (file-truename (directory-file-name p))) + (error nil))) + dgnushack-default-load-path))) + rest elcs) + (while path + (setq rest (cons (car path) rest) + path (delete (car rest) (cdr path)))) + (setq path (nreverse (cdr (member lispdir rest))) + rest nil) + (while path + (setq elcs indices) + (while elcs + (when (file-exists-p (expand-file-name (pop elcs) (car path))) + (setq rest (cons (car path) rest) + elcs nil))) + (setq path (cdr path))) + (prog1 + (setq path (nreverse rest)) + (when path + (let (print-level print-length) + (princ (concat "\n\ +WARNING: The other gnus installation" (if (cdr path) "s have" " has") "\ + been detected in:\n\n " (mapconcat 'identity path "\n ") "\n\n\ +You will need to modify the run-time `load-path', remove them manually, +or remove them using `make remove-installed-shadows'.\n\n")))))))) + +(defun dgnushack-remove-lisp-shadows (&optional lispdir) + "Remove the other Gnus installations which shadow the recent one." + (let ((path (with-temp-buffer + (let ((standard-output (current-buffer))) + (dgnushack-find-lisp-shadows lispdir)))) + elcs files shadows file) + (when path + (unless (setq elcs (directory-files srcdir nil "\\.elc\\'")) + (error "You should build .elc files first.")) + (setq files + (apply + 'append + (mapcar + (lambda (el) + (list (concat el "c") el (concat el ".bz2") (concat el ".gz"))) + (append + (list (file-name-nondirectory dgnushack-gnus-load-file) + (file-name-nondirectory dgnushack-cus-load-file)) + (mapcar (lambda (elc) (substring elc 0 -1)) elcs))))) + (while path + (setq shadows files) + (while shadows + (setq file (expand-file-name (pop shadows) (car path))) + (when (file-exists-p file) + (princ (concat " Removing " file "...")) + (condition-case nil + (progn + (delete-file file) + (princ "done\n")) + (error (princ "failed\n"))))) + (setq path (cdr path)))))) + ;;; dgnushack.el ends here diff --git a/lisp/dig.el b/lisp/dig.el index e71d6db..a7edc3b 100644 --- a/lisp/dig.el +++ b/lisp/dig.el @@ -1,5 +1,7 @@ ;;; dig.el --- Domain Name System dig interface -;; Copyright (c) 2000, 2001, 2003 Free Software Foundation, Inc. + +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Simon Josefsson ;; Keywords: DNS BIND dig @@ -18,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -40,7 +42,8 @@ (eval-when-compile (require 'cl)) (defgroup dig nil - "Dig configuration.") + "Dig configuration." + :group 'comm) (defcustom dig-program "dig" "Name of dig (domain information groper) binary." @@ -147,7 +150,8 @@ Buffer should contain output generated by `dig-invoke'." (set (make-local-variable 'font-lock-defaults) '(dig-font-lock-keywords t))) (when (featurep 'font-lock) - (font-lock-set-defaults))) + (font-lock-set-defaults)) + (gnus-run-mode-hooks 'dig-mode-hook)) (defun dig-exit () "Quit dig output buffer." diff --git a/lisp/dns-mode.el b/lisp/dns-mode.el index 0f1b71e..397b207 100644 --- a/lisp/dns-mode.el +++ b/lisp/dns-mode.el @@ -1,5 +1,5 @@ ;;; dns-mode.el --- a mode for viewing/editing Domain Name System master files -;; Copyright (c) 2000, 2001, 2003, 2004 Free Software Foundation, Inc. +;; Copyright (c) 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Simon Josefsson ;; Keywords: DNS master zone file SOA @@ -18,8 +18,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -48,7 +48,8 @@ ;;; Code: (defgroup dns-mode nil - "DNS master file mode configuration.") + "DNS master file mode configuration." + :group 'comm) (defconst dns-mode-classes '("IN" "CS" "CH" "HS") "List of strings with known DNS classes.") diff --git a/lisp/dns.el b/lisp/dns.el index 2d704fe..f9dd17f 100644 --- a/lisp/dns.el +++ b/lisp/dns.el @@ -1,5 +1,6 @@ ;;; dns.el --- Domain Name Service lookups -;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. + +;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: network @@ -18,8 +19,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -350,6 +351,18 @@ If TCP-P, the first two bytes of the package with be the length field." ;; connection to the DNS server. (open-network-stream "dns" (current-buffer) server "domain"))))) +(defvar dns-cache (make-vector 4096 0)) + +(defun query-dns-cached (name &optional type fullp reversep) + (let* ((key (format "%s:%s:%s:%s" name type fullp reversep)) + (sym (intern-soft key dns-cache))) + (if (and sym + (boundp sym)) + (symbol-value sym) + (let ((result (query-dns name type fullp reversep))) + (set (intern key dns-cache) result) + result)))) + (defun query-dns (name &optional type fullp reversep) "Query a DNS server for NAME of TYPE. If FULLP, return the entire record returned. @@ -393,10 +406,11 @@ If REVERSEP, look up an IP address." (decf times step)) (ignore-errors (delete-process process)) - (when tcp-p + (when (and tcp-p + (>= (buffer-size) 2)) (goto-char (point-min)) (delete-region (point) (+ (point) 2))) - (unless (zerop (buffer-size)) + (when (>= (buffer-size) 2) (let ((result (dns-read (buffer-string)))) (if fullp result diff --git a/lisp/earcon.el b/lisp/earcon.el index e9691e1..86fde23 100644 --- a/lisp/earcon.el +++ b/lisp/earcon.el @@ -1,6 +1,7 @@ ;;; earcon.el --- Sound effects for messages -;; Copyright (C) 1996, 2000, 2001, 2003 Free Software Foundation +;; Copyright (C) 1996, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Steven L. Baur @@ -18,8 +19,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: ;; This file provides access to sound effects in Gnus. diff --git a/lisp/encrypt.el b/lisp/encrypt.el index e5da278..9e1bd05 100644 --- a/lisp/encrypt.el +++ b/lisp/encrypt.el @@ -19,8 +19,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -41,7 +41,8 @@ (defgroup encrypt '((password-cache custom-variable) (password-cache-expiry custom-variable)) - "File encryption configuration.") + "File encryption configuration." + :group 'applications) (defcustom encrypt-file-alist nil "List of file names or regexes matched with encryptions. @@ -130,8 +131,8 @@ Format example: (if outdata (progn - (gnus-message 9 "%s was decrypted with %s (cipher %s)" - file (symbol-name method) cipher) + (message "%s was decrypted with %s (cipher %s)" + file (symbol-name method) cipher) (delete-region (point-min) (point-max)) (goto-char (point-min)) (insert outdata)) @@ -176,8 +177,8 @@ Format example: (if outdata (progn - (gnus-message 9 "%s was encrypted with %s (cipher %s)" - file (symbol-name method) cipher) + (message "%s was encrypted with %s (cipher %s)" + file (symbol-name method) cipher) (delete-region (point-min) (point-max)) (goto-char (point-min)) (insert outdata) @@ -217,7 +218,7 @@ Format example: (progn (setq new-list (reverse (split-string bs))) (dolist (x new-list) - (setq x (string-to-int x)) + (setq x (string-to-number x)) (insert (format "%c" (logxor x passphrase-sum)))))) (buffer-substring-no-properties (point-min) (point-max))))) diff --git a/lisp/flow-fill.el b/lisp/flow-fill.el index b8980e9..7e3e6e2 100644 --- a/lisp/flow-fill.el +++ b/lisp/flow-fill.el @@ -1,6 +1,7 @@ ;;; flow-fill.el --- interpret RFC2646 "flowed" text -;; Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Simon Josefsson ;; Keywords: mail @@ -19,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -109,7 +110,7 @@ RFC 2646 suggests 66 characters for readability." (while (re-search-forward " $" nil t) (when (save-excursion (beginning-of-line) - (looking-at "^\\(>+\\)\\( ?\\)")) + (looking-at "^\\(>*\\)\\( ?\\)")) (let ((quote (match-string 1)) sig) (if (string= quote "") @@ -139,7 +140,8 @@ RFC 2646 suggests 66 characters for readability." (condition-case nil (let ((fill-prefix (when quote (concat quote " "))) (fill-column (eval fill-flowed-display-column)) - filladapt-mode) + filladapt-mode + adaptive-fill-mode) (fill-region (point-at-bol) (min (1+ (point-at-eol)) (point-max)) @@ -154,38 +156,43 @@ RFC 2646 suggests 66 characters for readability." (defvar show-trailing-whitespace)) (defvar fill-flowed-encode-tests - '( + `( ;; The syntax of each list element is: ;; (INPUT . EXPECTED-OUTPUT) - ("> Thou villainous ill-breeding spongy dizzy-eyed -> reeky elf-skinned pigeon-egg! ->> Thou artless swag-bellied milk-livered ->> dismal-dreaming idle-headed scut! ->>> Thou errant folly-fallen spleeny reeling-ripe ->>> unmuzzled ratsbane! ->>>> Henceforth, the coding style is to be strictly ->>>> enforced, including the use of only upper case. ->>>>> I've noticed a lack of adherence to the coding ->>>>> styles, of late. ->>>>>> Any complaints? -" . "> Thou villainous ill-breeding spongy dizzy-eyed reeky elf-skinned -> pigeon-egg! ->> Thou artless swag-bellied milk-livered dismal-dreaming idle-headed ->> scut! ->>> Thou errant folly-fallen spleeny reeling-ripe unmuzzled ratsbane! ->>>> Henceforth, the coding style is to be strictly enforced, ->>>> including the use of only upper case. ->>>>> I've noticed a lack of adherence to the coding styles, of late. ->>>>>> Any complaints? -") -; (" -;> foo -;> -;> -;> bar -;" . " -;> foo bar -;") + (,(concat + "> Thou villainous ill-breeding spongy dizzy-eyed \n" + "> reeky elf-skinned pigeon-egg! \n" + ">> Thou artless swag-bellied milk-livered \n" + ">> dismal-dreaming idle-headed scut!\n" + ">>> Thou errant folly-fallen spleeny reeling-ripe \n" + ">>> unmuzzled ratsbane!\n" + ">>>> Henceforth, the coding style is to be strictly \n" + ">>>> enforced, including the use of only upper case.\n" + ">>>>> I've noticed a lack of adherence to the coding \n" + ">>>>> styles, of late.\n" + ">>>>>> Any complaints?") + . + ,(concat + "> Thou villainous ill-breeding spongy dizzy-eyed reeky elf-skinned\n" + "> pigeon-egg! \n" + ">> Thou artless swag-bellied milk-livered dismal-dreaming idle-headed\n" + ">> scut!\n" + ">>> Thou errant folly-fallen spleeny reeling-ripe unmuzzled ratsbane!\n" + ">>>> Henceforth, the coding style is to be strictly enforced,\n" + ">>>> including the use of only upper case.\n" + ">>>>> I've noticed a lack of adherence to the coding styles, of late.\n" + ">>>>>> Any complaints?\n" + )) + ;; (,(concat + ;; "\n" + ;; "> foo\n" + ;; "> \n" + ;; "> \n" + ;; "> bar\n") + ;; . + ;; ,(concat + ;; "\n" + ;; "> foo bar\n")) )) (defun fill-flowed-test () diff --git a/lisp/format-spec.el b/lisp/format-spec.el index 75e1fa8..682918f 100644 --- a/lisp/format-spec.el +++ b/lisp/format-spec.el @@ -1,5 +1,7 @@ ;;; format-spec.el --- functions for formatting arbitrary formatting strings -;; Copyright (C) 1999, 2000 Free Software Foundation, Inc. + +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: tools @@ -18,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -31,7 +33,8 @@ "Return a string based on FORMAT and SPECIFICATION. FORMAT is a string containing `format'-like specs like \"bash %u %k\", while SPECIFICATION is an alist mapping from format spec characters -to values." +to values. Any text properties on a %-spec itself are propagated to +the text that it generates." (with-temp-buffer (insert format) (goto-char (point-min)) @@ -45,10 +48,17 @@ to values." (let* ((num (match-string 1)) (spec (string-to-char (match-string 2))) (val (cdr (assq spec specification)))) - (delete-region (1- (match-beginning 0)) (match-end 0)) (unless val - (error "Invalid format character: `%%%c'" spec)) - (insert (format (concat "%" num "s") val)))) + (error "Invalid format character: `%%%c'" spec)) + ;; Pad result to desired length. + (let ((text (format (concat "%" num "s") val))) + ;; Insert first, to preserve text properties. + (insert-and-inherit text) + ;; Delete the specifier body. + (delete-region (+ (match-beginning 0) (length text)) + (+ (match-end 0) (length text))) + ;; Delete the percent sign. + (delete-region (1- (match-beginning 0)) (match-beginning 0))))) ;; Signal an error on bogus format strings. (t (error "Invalid format string")))) diff --git a/lisp/gmm-utils.el b/lisp/gmm-utils.el new file mode 100644 index 0000000..6e8ad69 --- /dev/null +++ b/lisp/gmm-utils.el @@ -0,0 +1,410 @@ +;;; gmm-utils.el --- Utility functions for Gnus, Message and MML + +;; Copyright (C) 2006 Free Software Foundation, Inc. + +;; Author: Reiner Steib +;; Keywords: news + +;; This file is 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., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. + +;;; Commentary: + +;; This library provides self-contained utility functions. The functions are +;; used in Gnus, Message and MML, but within this library there are no +;; dependencies on Gnus, Message, or MML or Gnus. + +;;; Code: + +(defgroup gmm nil + "Utility functions for Gnus, Message and MML" + :prefix "gmm-" + :version "23.0" ;; No Gnus + :group 'lisp) + +;; Helper functions from `gnus-utils.el': gmm-verbose, gmm-message, gmm-error + +(defcustom gmm-verbose 7 + "Integer that says how verbose gmm should be. +The higher the number, the more messages will flash to say what +it done. At zero, it will be totally mute; at five, it will +display most important messages; and at ten, it will keep on +jabbering all the time." + :type 'integer + :group 'gmm) + +;;;###autoload +(defun gmm-message (level &rest args) + "If LEVEL is lower than `gmm-verbose' print ARGS using `message'. + +Guideline for numbers: +1 - error messages, 3 - non-serious error messages, 5 - messages for things +that take a long time, 7 - not very important messages on stuff, 9 - messages +inside loops." + (if (<= level gmm-verbose) + (apply 'message args) + ;; We have to do this format thingy here even if the result isn't + ;; shown - the return value has to be the same as the return value + ;; from `message'. + (apply 'format args))) + +;;;###autoload +(defun gmm-error (level &rest args) + "Beep an error if LEVEL is equal to or less than `gmm-verbose'. +ARGS are passed to `message'." + (when (<= (floor level) gmm-verbose) + (apply 'message args) + (ding) + (let (duration) + (when (and (floatp level) + (not (zerop (setq duration (* 10 (- level (floor level))))))) + (sit-for duration)))) + nil) + +;;;###autoload +(defun gmm-widget-p (symbol) + "Non-nil iff SYMBOL is a widget." + (get symbol 'widget-type)) + +;; Copy of the `nnmail-lazy' code from `nnmail.el': +(define-widget 'gmm-lazy 'default + "Base widget for recursive datastructures. + +This is copy of the `lazy' widget in Emacs 22.1 provided for compatibility." + :format "%{%t%}: %v" + :convert-widget 'widget-value-convert-widget + :value-create (lambda (widget) + (let ((value (widget-get widget :value)) + (type (widget-get widget :type))) + (widget-put widget :children + (list (widget-create-child-value + widget (widget-convert type) value))))) + :value-delete 'widget-children-value-delete + :value-get (lambda (widget) + (widget-value (car (widget-get widget :children)))) + :value-inline (lambda (widget) + (widget-apply (car (widget-get widget :children)) + :value-inline)) + :default-get (lambda (widget) + (widget-default-get + (widget-convert (widget-get widget :type)))) + :match (lambda (widget value) + (widget-apply (widget-convert (widget-get widget :type)) + :match value)) + :validate (lambda (widget) + (widget-apply (car (widget-get widget :children)) :validate))) + +;; Note: The format of `gmm-tool-bar-item' may change if some future Emacs +;; version will provide customizable tool bar buttons using a different +;; interface. + +;; TODO: Extend API so that the "Command" entry can be a function or a plist. +;; In case of a list it should have the format... +;; +;; (:none command-without-modifier +;; :shift command-with-shift-pressed +;; :control command-with-ctrl-pressed +;; :control-shift command-with-control-and-shift-pressed +;; ;; mouse-2 and mouse-3 can't be used in Emacs yet. +;; :mouse-2 command-on-mouse-2-press +;; :mouse-3 command-on-mouse-3-press) ;; typically a menu of related commands +;; +;; Combinations of mouse-[23] plus shift and/or controll might be overkill. +;; +;; Then use (plist-get rs-command :none), (plist-get rs-command :shift) + +(define-widget 'gmm-tool-bar-item (if (gmm-widget-p 'lazy) 'lazy 'gmm-lazy) + "Tool bar list item." + :tag "Tool bar item" + :type '(choice + (list :tag "Command and Icon" + (function :tag "Command") + (string :tag "Icon file") + (choice + (const :tag "Default map" nil) + ;; Note: Usually we need non-nil attributes if map is t. + (const :tag "No menu" t) + (sexp :tag "Other map")) + (plist :inline t :tag "Properties")) + (list :tag "Separator" + (const :tag "No command" gmm-ignore) + (string :tag "Icon file") + (const :tag "No map") + (plist :inline t :tag "Properties")))) + +(define-widget 'gmm-tool-bar-zap-list (if (gmm-widget-p 'lazy) 'lazy 'gmm-lazy) + "Tool bar zap list." + :tag "Tool bar zap list" + :type '(choice (const :tag "Zap all" t) + (const :tag "Keep all" nil) + (list + ;; :value + ;; Work around (bug in customize?), see + ;; + ;; (new-file open-file dired kill-buffer write-file + ;; print-buffer customize help) + (set :inline t + (const new-file) + (const open-file) + (const dired) + (const kill-buffer) + (const save-buffer) + (const write-file) + (const undo) + (const cut) + (const copy) + (const paste) + (const search-forward) + (const print-buffer) + (const customize) + (const help)) + (repeat :inline t + :tag "Other" + (symbol :tag "Icon item"))))) + +;; (defun gmm-color-cells (&optional display) +;; "Return the number of color cells supported by DISPLAY. +;; Compatibility function." +;; ;; `display-color-cells' doesn't return more than 256 even if color depth is +;; ;; > 8 in Emacs 21. +;; ;; +;; ;; Feel free to add proper XEmacs support. +;; (let* ((cells (and (fboundp 'display-color-cells) +;; (display-color-cells display))) +;; (plane (and (fboundp 'x-display-planes) +;; (ash 1 (x-display-planes)))) +;; (none -1)) +;; (max (if (integerp cells) cells none) +;; (if (integerp plane) plane none)))) + +(defcustom gmm-tool-bar-style + (if (and (boundp 'tool-bar-mode) + tool-bar-mode + (and (fboundp 'display-visual-class) + (not (memq (display-visual-class) + (list 'static-gray 'gray-scale + 'static-color 'pseudo-color))))) + 'gnome + 'retro) + "Prefered tool bar style." + :type '(choice (const :tag "GNOME style" 'gnome) + (const :tag "Retro look" 'retro)) + :group 'gmm) + +(defvar tool-bar-map) + +;;;###autoload +(defun gmm-tool-bar-from-list (icon-list zap-list default-map) + "Make a tool bar from ICON-LIST. + +Within each entry of ICON-LIST, the first element is a menu +command, the second element is an icon file name and the third +element is a test function. You can use \\[describe-key] + to find out the name of a menu command. The fourth +and all following elements are passed a the PROPS argument to the +function `tool-bar-local-item'. + +If ZAP-LIST is a list, remove those item from the default +`tool-bar-map'. If it is t, start with a new sparse map. You +can use \\[describe-key] to find out the name of an icon +item. When \\[describe-key] shows \" +runs the command find-file\", then use `new-file' in ZAP-LIST. + +DEFAULT-MAP specifies the default key map for ICON-LIST." + (let (;; For Emacs 21, we must let-bind `tool-bar-map'. In Emacs 22, we + ;; could use some other local variable. + (tool-bar-map (if (eq zap-list t) + (make-sparse-keymap) + (copy-keymap tool-bar-map)))) + (when (listp zap-list) + ;; Zap some items which aren't relevant for this mode and take up space. + (dolist (key zap-list) + (define-key tool-bar-map (vector key) nil))) + (mapc (lambda (el) + (let ((command (car el)) + (icon (nth 1 el)) + (fmap (or (nth 2 el) default-map)) + (props (cdr (cdr (cdr el)))) ) + ;; command may stem from different from-maps: + (cond ((eq command 'gmm-ignore) + ;; The dummy `gmm-ignore', see `gmm-tool-bar-item' + ;; widget. Suppress tooltip by adding `:enable nil'. + (if (fboundp 'tool-bar-local-item) + (apply 'tool-bar-local-item icon nil nil + tool-bar-map :enable nil props) + ;; (tool-bar-local-item ICON DEF KEY MAP &rest PROPS) + ;; (tool-bar-add-item ICON DEF KEY &rest PROPS) + (apply 'tool-bar-add-item icon nil nil :enable nil props))) + ((equal fmap t) ;; Not a menu command + (if (fboundp 'tool-bar-local-item) + (apply 'tool-bar-local-item + icon command + (intern icon) ;; reuse icon or fmap here? + tool-bar-map props) + ;; Emacs 21 compatibility: + (apply 'tool-bar-add-item + icon command + (intern icon) + props))) + (t ;; A menu command + (if (fboundp 'tool-bar-local-item-from-menu) + (apply 'tool-bar-local-item-from-menu + ;; (apply 'tool-bar-local-item icon def key + ;; tool-bar-map props) + command icon tool-bar-map (symbol-value fmap) + props) + ;; Emacs 21 compatibility: + (apply 'tool-bar-add-item-from-menu + command icon (symbol-value fmap) + props)))) + t)) + (if (symbolp icon-list) + (eval icon-list) + icon-list)) + tool-bar-map)) + +;; WARNING: The following is subject to change. Don't rely on it yet. + +;; From MH-E without modifications: + +(defmacro gmm-defun-compat (name function arg-list &rest body) + "Create function NAME. +If FUNCTION exists, then NAME becomes an alias for FUNCTION. +Otherwise, create function NAME with ARG-LIST and BODY." + (let ((defined-p (fboundp function))) + (if defined-p + `(defalias ',name ',function) + `(defun ,name ,arg-list ,@body)))) + +(gmm-defun-compat gmm-image-search-load-path + image-search-load-path (file &optional path) + "Emacs 21 and XEmacs don't have `image-search-load-path'. +This function returns nil on those systems." + nil) + +;; From MH-E with modifications: + +;; Don't use `gmm-defun-compat' until API changes in +;; `image-load-path-for-library' in Emacs CVS are completed. + +(defun gmm-image-load-path-for-library (library image &optional path no-error) + "Return a suitable search path for images relative to LIBRARY. + +First it searches for IMAGE in `image-load-path' (excluding +\"`data-directory'/images\") and `load-path', followed by a path +suitable for LIBRARY, which includes \"../../etc/images\" and +\"../etc/images\" relative to the library file itself, and then +in \"`data-directory'/images\". + +Then this function returns a list of directories which contains +first the directory in which IMAGE was found, followed by the +value of `load-path'. If PATH is given, it is used instead of +`load-path'. + +If NO-ERROR is non-nil and a suitable path can't be found, don't +signal an error. Instead, return a list of directories as before, +except that nil appears in place of the image directory. + +Here is an example that uses a common idiom to provide +compatibility with versions of Emacs that lack the variable +`image-load-path': + + ;; Shush compiler. + (defvar image-load-path) + + (let* ((load-path (image-load-path-for-library \"mh-e\" \"mh-logo.xpm\")) + (image-load-path (cons (car load-path) + (when (boundp 'image-load-path) + image-load-path)))) + (mh-tool-bar-folder-buttons-init))" + (unless library (error "No library specified")) + (unless image (error "No image specified")) + (let (image-directory image-directory-load-path) + ;; Check for images in image-load-path or load-path. + (let ((img image) + (dir (or + ;; Images in image-load-path. + (gmm-image-search-load-path image) ;; "gmm-" prefix! + ;; Images in load-path. + (locate-library image))) + parent) + ;; Since the image might be in a nested directory (for + ;; example, mail/attach.pbm), adjust `image-directory' + ;; accordingly. + (when dir + (setq dir (file-name-directory dir)) + (while (setq parent (file-name-directory img)) + (setq img (directory-file-name parent) + dir (expand-file-name "../" dir)))) + (setq image-directory-load-path dir)) + + ;; If `image-directory-load-path' isn't Emacs' image directory, + ;; it's probably a user preference, so use it. Then use a + ;; relative setting if possible; otherwise, use + ;; `image-directory-load-path'. + (cond + ;; User-modified image-load-path? + ((and image-directory-load-path + (not (equal image-directory-load-path + (file-name-as-directory + (expand-file-name "images" data-directory))))) + (setq image-directory image-directory-load-path)) + ;; Try relative setting. + ((let (library-name d1ei d2ei) + ;; First, find library in the load-path. + (setq library-name (locate-library library)) + (if (not library-name) + (error "Cannot find library %s in load-path" library)) + ;; And then set image-directory relative to that. + (setq + ;; Go down 2 levels. + d2ei (file-name-as-directory + (expand-file-name + (concat (file-name-directory library-name) "../../etc/images"))) + ;; Go down 1 level. + d1ei (file-name-as-directory + (expand-file-name + (concat (file-name-directory library-name) "../etc/images")))) + (setq image-directory + ;; Set it to nil if image is not found. + (cond ((file-exists-p (expand-file-name image d2ei)) d2ei) + ((file-exists-p (expand-file-name image d1ei)) d1ei))))) + ;; Use Emacs' image directory. + (image-directory-load-path + (setq image-directory image-directory-load-path)) + (no-error + (message "Could not find image %s for library %s" image library)) + (t + (error "Could not find image %s for library %s" image library))) + + ;; Return an augmented `path' or `load-path'. + (nconc (list image-directory) + (delete image-directory (copy-sequence (or path load-path)))))) + +(defun gmm-customize-mode (&optional mode) + "Customize customization group for MODE. +If mode is nil, use `major-mode' of the curent buffer." + (interactive) + (customize-group + (or mode + (intern (let ((mode (symbol-name major-mode))) + (string-match "^\\(.+\\)-mode$" mode) + (match-string 1 mode)))))) + +(provide 'gmm-utils) + +;;; gmm-utils.el ends here diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el index b72813e..d3408aa 100644 --- a/lisp/gnus-agent.el +++ b/lisp/gnus-agent.el @@ -1,6 +1,7 @@ ;;; gnus-agent.el --- unplugged support for Gnus -;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Tatsuya Ichikawa @@ -18,8 +19,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -128,6 +129,8 @@ fetched will be limited to it. If not a positive integer, never consider it." (defcustom gnus-agent-synchronize-flags nil "Indicate if flags are synchronized when you plug in. If this is `ask' the hook will query the user." + ;; If the default switches to something else than nil, then the function + ;; should be fixed not be exceedingly slow. See 2005-09-20 ChangeLog entry. :version "21.1" :type '(choice (const :tag "Always" t) (const :tag "Never" nil) @@ -212,7 +215,7 @@ queue. Otherwise, queue if and only if unplugged." :group 'gnus-agent :type '(radio (const :format "Always" always) (const :format "Never" nil) - (const :format "When plugged" t))) + (const :format "When unplugged" t))) (defcustom gnus-agent-prompt-send-queue nil "If non-nil, `gnus-group-send-queue' will prompt if called when @@ -221,6 +224,18 @@ unplugged." :group 'gnus-agent :type 'boolean) +(defcustom gnus-agent-article-alist-save-format 1 + "Indicates whether to use compression(2), versus no +compression(1), when writing agentview files. The compressed +files do save space but load times are 6-7 times higher. A group +must be opened then closed for the agentview to be updated using +the new format." + ;; Wouldn't symbols instead numbers be nicer? --rsteib + :version "22.1" + :group 'gnus-agent + :type '(radio (const :format "Compressed" 2) + (const :format "Uncompressed" 1))) + ;;; Internal variables (defvar gnus-agent-history-buffers nil) @@ -586,7 +601,8 @@ manipulated as follows: (if (and (fboundp 'propertize) (fboundp 'make-mode-line-mouse-map)) (propertize string 'local-map - (make-mode-line-mouse-map mouse-button mouse-func)) + (make-mode-line-mouse-map mouse-button mouse-func) + 'mouse-face 'mode-line-highlight) string)) (defun gnus-agent-toggle-plugged (set-to) @@ -835,7 +851,7 @@ be a select method." (save-excursion (dolist (gnus-command-method (gnus-agent-covered-methods)) (when (and (file-exists-p (gnus-agent-lib-file "flags")) - (not (eq (gnus-server-status gnus-command-method) 'offline))) + (eq (gnus-server-status gnus-command-method) 'ok)) (gnus-agent-possibly-synchronize-flags-server gnus-command-method))))) (defun gnus-agent-synchronize-flags-server (method) @@ -880,9 +896,11 @@ be a select method." ;;;###autoload (defun gnus-agent-rename-group (old-group new-group) - "Rename fully-qualified OLD-GROUP as NEW-GROUP. Always updates the agent, even when -disabled, as the old agent files would corrupt gnus when the agent was -next enabled. Depends upon the caller to determine whether group renaming is supported." + "Rename fully-qualified OLD-GROUP as NEW-GROUP. +Always updates the agent, even when disabled, as the old agent +files would corrupt gnus when the agent was next enabled. +Depends upon the caller to determine whether group renaming is +supported." (let* ((old-command-method (gnus-find-method-for-group old-group)) (old-path (directory-file-name (let (gnus-command-method old-command-method) @@ -910,9 +928,11 @@ next enabled. Depends upon the caller to determine whether group renaming is sup ;;;###autoload (defun gnus-agent-delete-group (group) - "Delete fully-qualified GROUP. Always updates the agent, even when -disabled, as the old agent files would corrupt gnus when the agent was -next enabled. Depends upon the caller to determine whether group deletion is supported." + "Delete fully-qualified GROUP. +Always updates the agent, even when disabled, as the old agent +files would corrupt gnus when the agent was next enabled. +Depends upon the caller to determine whether group deletion is +supported." (let* ((command-method (gnus-find-method-for-group group)) (path (directory-file-name (let (gnus-command-method command-method) @@ -1573,7 +1593,7 @@ downloaded into the agent." (while (looking-at "\\([^: \n]+\\):\\([0-9]+\\) *") (push (cons (buffer-substring (match-beginning 1) (match-end 1)) - (string-to-int + (string-to-number (buffer-substring (match-beginning 2) (match-end 2)))) crosses) @@ -1867,7 +1887,7 @@ article numbers will be returned." (defsubst gnus-agent-read-article-number () "Reads the article number at point. Returns nil when a valid article number can not be read." - ;; It is unfortunite but the read function quietly overflows + ;; It is unfortunate but the read function quietly overflows ;; integer. As a result, I have to use string operations to test ;; for overflow BEFORE calling read. (when (looking-at "[0-9]+\t") @@ -1926,21 +1946,21 @@ doesn't exist, to valid the overview buffer." (gnus-agent-copy-nov-line (pop articles)) (ignore-errors - (while articles - (while (let ((art (read (current-buffer)))) - (cond ((< art (car articles)) - (forward-line 1) - t) - ((= art (car articles)) - (beginning-of-line) - (delete-region - (point) (progn (forward-line 1) (point))) - nil) - (t - (beginning-of-line) - nil)))) - - (gnus-agent-copy-nov-line (pop articles))))) + (while articles + (while (let ((art (read (current-buffer)))) + (cond ((< art (car articles)) + (forward-line 1) + t) + ((= art (car articles)) + (beginning-of-line) + (delete-region + (point) (progn (forward-line 1) (point))) + nil) + (t + (beginning-of-line) + nil)))) + + (gnus-agent-copy-nov-line (pop articles))))) (goto-char (point-max)) @@ -1956,23 +1976,39 @@ doesn't exist, to valid the overview buffer." (goto-char p)) (setq last (or last -134217728)) - (let (sort art) - (while (not (eobp)) - (setq art (gnus-agent-read-article-number)) - (cond ((not art) - ;; Bad art num - delete this line - (beginning-of-line) - (delete-region (point) (progn (forward-line 1) (point)))) - ((< art last) - ;; Art num out of order - enable sort - (setq sort t) - (forward-line 1)) - (t - ;; Good art num - (setq last art) - (forward-line 1)))) - (when sort - (sort-numeric-fields 1 (point-min) (point-max))))))) + (while (catch 'problems + (let (sort art) + (while (not (eobp)) + (setq art (gnus-agent-read-article-number)) + (cond ((not art) + ;; Bad art num - delete this line + (beginning-of-line) + (delete-region (point) (progn (forward-line 1) (point)))) + ((< art last) + ;; Art num out of order - enable sort + (setq sort t) + (forward-line 1)) + ((= art last) + ;; Bad repeat of art number - delete this line + (beginning-of-line) + (delete-region (point) (progn (forward-line 1) (point)))) + (t + ;; Good art num + (setq last art) + (forward-line 1)))) + (when sort + ;; something is seriously wrong as we simply shouldn't see out-of-order data. + ;; First, we'll fix the sort. + (sort-numeric-fields 1 (point-min) (point-max)) + + ;; but now we have to consider that we may have duplicate rows... + ;; so reset to beginning of file + (goto-char (point-min)) + (setq last -134217728) + + ;; and throw a code that restarts this scan + (throw 'problems t)) + nil)))))) ;; Keeps the compiler from warning about the free variable in ;; gnus-agent-read-agentview. @@ -1989,61 +2025,55 @@ doesn't exist, to valid the overview buffer." 'gnus-agent-file-loading-cache 'gnus-agent-read-agentview)))) -;; Save format may be either 1 or 2. Two is the new, compressed -;; format that is still being tested. Format 1 is uncompressed but -;; known to be reliable. -(defconst gnus-agent-article-alist-save-format 2) - (defun gnus-agent-read-agentview (file) "Load FILE and do a `read' there." (with-temp-buffer (condition-case nil - (progn - (nnheader-insert-file-contents file) - (goto-char (point-min)) - (let ((alist (read (current-buffer))) - (version (condition-case nil (read (current-buffer)) - (end-of-file 0))) - changed-version) - - (cond - ((< version 2) - (error "gnus-agent-read-agentview no longer supports version %d. Stop gnus, manually evaluate gnus-agent-convert-to-compressed-agentview, then restart gnus." version)) - ((= version 0) - (let ((inhibit-quit t) - entry) - (gnus-agent-open-history) - (set-buffer (gnus-agent-history-buffer)) - (goto-char (point-min)) - (while (not (eobp)) - (if (and (looking-at - "[^\t\n]+\t\\([0-9]+\\)\t\\([^ \n]+\\) \\([0-9]+\\)") - (string= (match-string 2) - gnus-agent-read-agentview) - (setq entry (assoc (string-to-number (match-string 3)) alist))) - (setcdr entry (string-to-number (match-string 1)))) - (forward-line 1)) - (gnus-agent-close-history) - (setq changed-version t))) - ((= version 1) - (setq changed-version (not (= 1 gnus-agent-article-alist-save-format)))) - ((= version 2) - (let (uncomp) - (mapcar - (lambda (comp-list) - (let ((state (car comp-list)) - (sequence (inline - (gnus-uncompress-range - (cdr comp-list))))) - (mapcar (lambda (article-id) - (setq uncomp (cons (cons article-id state) uncomp))) - sequence))) - alist) - (setq alist (sort uncomp 'car-less-than-car))))) - (when changed-version - (let ((gnus-agent-article-alist alist)) - (gnus-agent-save-alist gnus-agent-read-agentview))) - alist)) + (progn + (nnheader-insert-file-contents file) + (goto-char (point-min)) + (let ((alist (read (current-buffer))) + (version (condition-case nil (read (current-buffer)) + (end-of-file 0))) + changed-version) + + (cond + ((= version 0) + (let ((inhibit-quit t) + entry) + (gnus-agent-open-history) + (set-buffer (gnus-agent-history-buffer)) + (goto-char (point-min)) + (while (not (eobp)) + (if (and (looking-at + "[^\t\n]+\t\\([0-9]+\\)\t\\([^ \n]+\\) \\([0-9]+\\)") + (string= (match-string 2) + gnus-agent-read-agentview) + (setq entry (assoc (string-to-number (match-string 3)) alist))) + (setcdr entry (string-to-number (match-string 1)))) + (forward-line 1)) + (gnus-agent-close-history) + (setq changed-version t))) + ((= version 1) + (setq changed-version (not (= 1 gnus-agent-article-alist-save-format)))) + ((= version 2) + (let (uncomp) + (mapcar + (lambda (comp-list) + (let ((state (car comp-list)) + (sequence (inline + (gnus-uncompress-range + (cdr comp-list))))) + (mapcar (lambda (article-id) + (setq uncomp (cons (cons article-id state) uncomp))) + sequence))) + alist) + (setq alist (sort uncomp 'car-less-than-car))) + (setq changed-version (not (= 2 gnus-agent-article-alist-save-format))))) + (when changed-version + (let ((gnus-agent-article-alist alist)) + (gnus-agent-save-alist gnus-agent-read-agentview))) + alist)) (file-error nil)))) (defun gnus-agent-save-alist (group &optional articles state) @@ -2155,7 +2185,7 @@ modified) original contents, they are first saved to their own file." ;; NOTE: The '+ 0' ensure that min and max are both numerics. (set group (cons (+ 0 min) (+ 0 max)))) (error - (gnus-message 3 "Warning - invalid agent local: %s on line %d: " + (gnus-message 3 "Warning - invalid agent local: %s on line %d: %s" file line (error-message-string err)))) (forward-line 1) (setq line (1+ line)))) @@ -2186,13 +2216,14 @@ modified) original contents, they are first saved to their own file." ((member (symbol-name symbol) '("+dirty" "+method")) nil) (t - (prin1 symbol) (let ((range (symbol-value symbol))) - (princ " ") - (princ (car range)) - (princ " ") - (princ (cdr range)) - (princ "\n"))))) + (when range + (prin1 symbol) + (princ " ") + (princ (car range)) + (princ " ") + (princ (cdr range)) + (princ "\n")))))) my-obarray)))))))) (defun gnus-agent-get-local (group &optional gmane method) @@ -2602,7 +2633,7 @@ The following commands are available: (buffer-disable-undo) (setq truncate-lines t) (setq buffer-read-only t) - (gnus-run-hooks 'gnus-category-mode-hook)) + (gnus-run-mode-hooks 'gnus-category-mode-hook)) (defalias 'gnus-category-position-point 'gnus-goto-colon) @@ -2983,7 +3014,7 @@ FORCE is equivalent to setting the expiration predicates to true." (if (or (not (eq articles t)) (yes-or-no-p (concat "Are you sure that you want to " - "expire all articles in " group "."))) + "expire all articles in " group "? "))) (let ((gnus-command-method (gnus-find-method-for-group group)) (overview (gnus-get-buffer-create " *expire overview*")) orig) @@ -3391,7 +3422,7 @@ FORCE is equivalent to setting the expiration predicates to true." (gnus-agent-expire-group group articles force) (if (or (not (eq articles t)) (yes-or-no-p "Are you sure that you want to expire all \ -articles in every agentized group.")) +articles in every agentized group? ")) (let ((methods (gnus-agent-covered-methods)) ;; Bind gnus-agent-expire-current-dirs to enable tracking ;; of agent directories. @@ -3788,7 +3819,7 @@ If REREAD is not nil, downloaded articles are marked as unread." (dir (file-name-directory file)) point (downloaded (if (file-exists-p dir) - (sort (mapcar (lambda (name) (string-to-int name)) + (sort (mapcar (lambda (name) (string-to-number name)) (directory-files dir nil "^[0-9]+$" t)) '>) (progn (gnus-make-directory dir) nil))) diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index c4fee02..a734dda 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -1,6 +1,7 @@ ;;; gnus-art.el --- article mode commands for Semi-gnus -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; MORIOKA Tomohiko @@ -21,8 +22,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -31,7 +32,8 @@ (eval-when-compile (require 'cl) (require 'static) - (defvar tool-bar-map)) + (defvar tool-bar-map) + (defvar w3m-minor-mode-map)) (require 'path-util) (require 'gnus) @@ -65,6 +67,8 @@ (autoload 'gnus-button-reply "gnus-msg" nil t) (autoload 'parse-time-string "parse-time" nil nil) (autoload 'ansi-color-apply-on-region "ansi-color") +(autoload 'mm-url-insert-file-contents-external "mm-url") +(autoload 'mm-extern-cache-contents "mm-extern") (defgroup gnus-article nil "Article display." @@ -241,7 +245,9 @@ only of boring text. Boring text is controlled by This can also be a list of regexps. In that case, it will be checked from head to tail looking for a separator. Searches will be done from the end of the buffer." - :type '(repeat string) + :type '(choice :format "%{%t%}: %[Value Menu%]\n%v" + (regexp) + (repeat :tag "List of regexp" regexp)) :group 'gnus-article-signature) (defcustom gnus-signature-limit nil @@ -254,7 +260,8 @@ no signature in the buffer. If it is a string, it will be used as a regexp. If it matches, the text in question is not a signature. This can also be a list of the above values." - :type '(choice (integer :value 200) + :type '(choice (const nil) + (integer :value 200) (number :value 4.0) (function :value fun) (regexp :value ".*")) @@ -278,9 +285,6 @@ This can also be a list of the above values." "{ echo '/* Width=48, Height=48 */'; uncompface; } | icontopbm | ee -")) ((gnus-image-type-available-p 'pbm) 'gnus-display-x-face-in-from) - ((and window-system - (module-installed-p 'x-face-mule)) - 'x-face-mule-gnus-article-display-x-face) (t "{ echo '/* Width=48, Height=48 */'; uncompface; } | icontopbm | \ display -")) @@ -288,19 +292,14 @@ display -")) If it is a string, the command will be executed in a sub-shell asynchronously. The compressed face will be piped to this command." :type `(choice - ,@(let ((x-face-mule (if (featurep 'xemacs) - nil - (module-installed-p 'x-face-mule)))) - (delq nil - (list - 'string - (if (or (gnus-image-type-available-p 'xface) - (gnus-image-type-available-p 'pbm)) - '(function-item gnus-display-x-face-in-from)) - (if x-face-mule - '(function-item - x-face-mule-gnus-article-display-x-face)) - 'function)))) + :format "%{%t%}:\n%[Value Menu%] %v" + ,@(delq nil + (list + 'string + (if (or (gnus-image-type-available-p 'xface) + (gnus-image-type-available-p 'pbm)) + '(function-item gnus-display-x-face-in-from)) + 'function))) :version "21.1" :group 'gnus-picon :group 'gnus-article-washing) @@ -405,7 +404,13 @@ advertisements. For example: (or (nth 4 spec) 3) (intern (format "gnus-emphasis-%s" (nth 2 spec))))) types)) - '(("\\(\\s-\\|^\\)\\(_\\(\\(\\w\\|_[^_]\\)+\\)_\\)\\(\\s-\\|[?!.,;]\\)" + '(;; I've never seen anyone use this strikethru convention whereas I've + ;; several times seen it triggered by normal text. --Stef + ;; Miles suggests that this form is sometimes used but for italics, + ;; so maybe we should map it to `italic'. + ;; ("\\(\\s-\\|^\\)\\(-\\(\\(\\w\\|-[^-]\\)+\\)-\\)\\(\\s-\\|[?!.,;]\\)" + ;; 2 3 gnus-emphasis-strikethru) + ("\\(\\s-\\|^\\)\\(_\\(\\(\\w\\|_[^_]\\)+\\)_\\)\\(\\s-\\|[?!.,;]\\)" 2 3 gnus-emphasis-underline)))) "*Alist that says how to fontify certain phrases. Each item looks like this: @@ -517,9 +522,6 @@ be fed to `format-time-string'." :link '(custom-manual "(gnus)Article Date") :group 'gnus-article-washing) -(eval-and-compile - (autoload 'mail-extract-address-components "mail-extr")) - (defcustom gnus-save-all-headers t "*If non-nil, don't remove any headers before saving." :group 'gnus-article-saving @@ -567,7 +569,8 @@ Gnus provides the following functions: (function-item gnus-summary-save-in-file) (function-item gnus-summary-save-body-in-file) (function-item gnus-summary-save-in-vm) - (function-item gnus-summary-write-to-file))) + (function-item gnus-summary-write-to-file) + (function))) (defcustom gnus-rmail-save-name 'gnus-plain-save-name "A function generating a file name to save articles in Rmail format. @@ -687,7 +690,12 @@ Each element is a regular expression." (make-obsolete-variable 'gnus-article-hide-pgp-hook "This variable is obsolete in Gnus 5.10.") -(defcustom gnus-article-button-face 'bold +(defface gnus-button + '((t (:weight bold))) + "Face used for highlighting a button in the article buffer." + :group 'gnus-article-buttons) + +(defcustom gnus-article-button-face 'gnus-button "Face used for highlighting buttons in the article buffer. An article button is a piece of text that you can activate by pressing @@ -703,21 +711,23 @@ above them." :type 'face :group 'gnus-article-buttons) -(defcustom gnus-signature-face 'gnus-signature-face +(defcustom gnus-signature-face 'gnus-signature "Face used for highlighting a signature in the article buffer. -Obsolete; use the face `gnus-signature-face' for customizations instead." +Obsolete; use the face `gnus-signature' for customizations instead." :type 'face :group 'gnus-article-highlight :group 'gnus-article-signature) -(defface gnus-signature-face +(defface gnus-signature '((t (:italic t))) "Face used for highlighting a signature in the article buffer." :group 'gnus-article-highlight :group 'gnus-article-signature) +;; backward-compatibility alias +(put 'gnus-signature-face 'face-alias 'gnus-signature) -(defface gnus-header-from-face +(defface gnus-header-from '((((class color) (background dark)) (:foreground "spring green")) @@ -729,8 +739,10 @@ Obsolete; use the face `gnus-signature-face' for customizations instead." "Face used for displaying from headers." :group 'gnus-article-headers :group 'gnus-article-highlight) +;; backward-compatibility alias +(put 'gnus-header-from-face 'face-alias 'gnus-header-from) -(defface gnus-header-subject-face +(defface gnus-header-subject '((((class color) (background dark)) (:foreground "SeaGreen3")) @@ -742,8 +754,10 @@ Obsolete; use the face `gnus-signature-face' for customizations instead." "Face used for displaying subject headers." :group 'gnus-article-headers :group 'gnus-article-highlight) +;; backward-compatibility alias +(put 'gnus-header-subject-face 'face-alias 'gnus-header-subject) -(defface gnus-header-newsgroups-face +(defface gnus-header-newsgroups '((((class color) (background dark)) (:foreground "yellow" :italic t)) @@ -757,8 +771,10 @@ In the default setup this face is only used for crossposted articles." :group 'gnus-article-headers :group 'gnus-article-highlight) +;; backward-compatibility alias +(put 'gnus-header-newsgroups-face 'face-alias 'gnus-header-newsgroups) -(defface gnus-header-name-face +(defface gnus-header-name '((((class color) (background dark)) (:foreground "SeaGreen")) @@ -770,8 +786,10 @@ articles." "Face used for displaying header names." :group 'gnus-article-headers :group 'gnus-article-highlight) +;; backward-compatibility alias +(put 'gnus-header-name-face 'face-alias 'gnus-header-name) -(defface gnus-header-content-face +(defface gnus-header-content '((((class color) (background dark)) (:foreground "forest green" :italic t)) @@ -783,12 +801,14 @@ articles." "Face used for displaying header content." :group 'gnus-article-headers :group 'gnus-article-highlight) +;; backward-compatibility alias +(put 'gnus-header-content-face 'face-alias 'gnus-header-content) (defcustom gnus-header-face-alist - '(("From" nil gnus-header-from-face) - ("Subject" nil gnus-header-subject-face) - ("Newsgroups:.*," nil gnus-header-newsgroups-face) - ("" gnus-header-name-face gnus-header-content-face)) + '(("From" nil gnus-header-from) + ("Subject" nil gnus-header-subject) + ("Newsgroups:.*," nil gnus-header-newsgroups) + ("" gnus-header-name gnus-header-content)) "*Controls highlighting of article headers. An alist of the form (HEADER NAME CONTENT). @@ -864,7 +884,9 @@ This variable is only used when `gnus-inhibit-mime-unbuttonizing' is nil." "List of MIME types that should be given buttons when rendered inline. If set, this variable overrides `gnus-unbuttonized-mime-types'. To see e.g. security buttons you could set this to -`(\"multipart/signed\")'. +`(\"multipart/signed\")'. You could also add \"multipart/alternative\" to +this list to display radio buttons that allow you to choose one of two +media types those mails include. See also `mm-discouraged-alternatives'. This variable is only used when `gnus-inhibit-mime-unbuttonizing' is nil." :version "22.1" :group 'gnus-article-mime @@ -913,7 +935,8 @@ see http://www.cs.indiana.edu/picons/ftp/index.html" This is meant for people who want to do something automatic based on parts -- for instance, adding Vcard info to a database." :group 'gnus-article-mime - :type 'function) + :type '(choice (const nil) + function)) (defcustom gnus-mime-multipart-functions nil "An alist of MIME types to functions to display them." @@ -950,6 +973,7 @@ used." (defcustom gnus-mime-action-alist '(("save to file" . gnus-mime-save-part) ("save and strip" . gnus-mime-save-part-and-strip) + ("replace with file" . gnus-mime-replace-part) ("delete part" . gnus-mime-delete-part) ("display as text" . gnus-mime-inline-part) ("view the part" . gnus-mime-view-part) @@ -964,6 +988,19 @@ used." :type '(repeat (cons (string :tag "name") (function)))) +(defcustom gnus-auto-select-part 1 + "Advance to next MIME part when deleting or stripping parts. + +When 0, point will be placed on the same part as before. When +positive (negative), move point forward (backwards) this many +parts. When nil, redisplay article." + :version "23.0" ;; No Gnus + :group 'gnus-article-mime + :type '(choice (const nil :tag "Redisplay article.") + (const 1 :tag "Next part.") + (const 0 :tag "Current part.") + integer)) + ;;; ;;; The treatment variables ;;; @@ -975,6 +1012,7 @@ used." '(choice (const :tag "Off" nil) (const :tag "On" t) (const :tag "Header" head) + (const :tag "First" first) (const :tag "Last" last) (const :tag "Mime" mime) (integer :tag "Less") @@ -993,8 +1031,8 @@ used." (defcustom gnus-treat-highlight-signature '(or t (typep "text/x-vcard")) "Highlight the signature. -Valid values are nil, t, `head', `last', an integer or a predicate. -See Info node `(gnus)Customizing Articles'." +Valid values are nil, t, `head', `first', `last', an integer or a +predicate. See Info node `(gnus)Customizing Articles'." :group 'gnus-article-treat :link '(custom-manual "(gnus)Customizing Articles") :type gnus-article-treat-custom) @@ -1002,8 +1040,8 @@ See Info node `(gnus)Customizing Articles'." (defcustom gnus-treat-buttonize 100000 "Add buttons. -Valid values are nil, t, `head', `last', an integer or a predicate. -See Info node `(gnus)Customizing Articles'." +Valid values are nil, t, `head', `first', `last', an integer or a +predicate. See Info node `(gnus)Customizing Articles'." :group 'gnus-article-treat :link '(custom-manual "(gnus)Customizing Articles") :type gnus-article-treat-custom) @@ -1011,8 +1049,8 @@ See Info node `(gnus)Customizing Articles'." (defcustom gnus-treat-buttonize-head 'head "Add buttons to the head. -Valid values are nil, t, `head', `last', an integer or a predicate. -See Info node `(gnus)Customizing Articles' for details." +Valid values are nil, t, `head', `first', `last', an integer or a +predicate. See Info node `(gnus)Customizing Articles'." :group 'gnus-article-treat :link '(custom-manual "(gnus)Customizing Articles") :type gnus-article-treat-head-custom) @@ -1023,8 +1061,8 @@ See Info node `(gnus)Customizing Articles' for details." (featurep 'xemacs)) 50000) "Emphasize text. -Valid values are nil, t, `head', `last', an integer or a predicate. -See Info node `(gnus)Customizing Articles' for details." +Valid values are nil, t, `head', `first', `last', an integer or a +predicate. See Info node `(gnus)Customizing Articles'." :group 'gnus-article-treat :link '(custom-manual "(gnus)Customizing Articles") :type gnus-article-treat-custom) @@ -1032,8 +1070,8 @@ See Info node `(gnus)Customizing Articles' for details." (defcustom gnus-treat-strip-cr nil "Remove carriage returns. -Valid values are nil, t, `head', `last', an integer or a predicate. -See Info node `(gnus)Customizing Articles' for details." +Valid values are nil, t, `head', `first', `last', an integer or a +predicate. See Info node `(gnus)Customizing Articles'." :version "22.1" :group 'gnus-article-treat :link '(custom-manual "(gnus)Customizing Articles") @@ -1041,8 +1079,8 @@ See Info node `(gnus)Customizing Articles' for details." (defcustom gnus-treat-unsplit-urls nil "Remove newlines from within URLs. -Valid values are nil, t, `head', `last', an integer or a predicate. -See Info node `(gnus)Customizing Articles' for details." +Valid values are nil, t, `head', `first', `last', an integer or a +predicate. See Info node `(gnus)Customizing Articles'." :version "22.1" :group 'gnus-article-treat :link '(custom-manual "(gnus)Customizing Articles") @@ -1050,8 +1088,8 @@ See Info node `(gnus)Customizing Articles' for details." (defcustom gnus-treat-leading-whitespace nil "Remove leading whitespace in headers. -Valid values are nil, t, `head', `last', an integer or a predicate. -See Info node `(gnus)Customizing Articles' for details." +Valid values are nil, t, `head', `first', `last', an integer or a +predicate. See Info node `(gnus)Customizing Articles'." :version "22.1" :group 'gnus-article-treat :link '(custom-manual "(gnus)Customizing Articles") @@ -1059,56 +1097,56 @@ See Info node `(gnus)Customizing Articles' for details." (defcustom gnus-treat-hide-headers 'head "Hide headers. -Valid values are nil, t, `head', `last', an integer or a predicate. -See Info node `(gnus)Customizing Articles' for details." +Valid values are nil, t, `head', `first', `last', an integer or a +predicate. See Info node `(gnus)Customizing Articles'." :group 'gnus-article-treat :link '(custom-manual "(gnus)Customizing Articles") :type gnus-article-treat-head-custom) (defcustom gnus-treat-hide-boring-headers nil "Hide boring headers. -Valid values are nil, t, `head', `last', an integer or a predicate. -See Info node `(gnus)Customizing Articles' for details." +Valid values are nil, t, `head', `first', `last', an integer or a +predicate. See Info node `(gnus)Customizing Articles'." :group 'gnus-article-treat :link '(custom-manual "(gnus)Customizing Articles") :type gnus-article-treat-head-custom) (defcustom gnus-treat-hide-signature nil "Hide the signature. -Valid values are nil, t, `head', `last', an integer or a predicate. -See Info node `(gnus)Customizing Articles' for details." +Valid values are nil, t, `head', `first', `last', an integer or a +predicate. See Info node `(gnus)Customizing Articles'." :group 'gnus-article-treat :link '(custom-manual "(gnus)Customizing Articles") :type gnus-article-treat-custom) (defcustom gnus-treat-fill-article nil "Fill the article. -Valid values are nil, t, `head', `last', an integer or a predicate. -See Info node `(gnus)Customizing Articles' for details." +Valid values are nil, t, `head', `first', `last', an integer or a +predicate. See Info node `(gnus)Customizing Articles'." :group 'gnus-article-treat :link '(custom-manual "(gnus)Customizing Articles") :type gnus-article-treat-custom) (defcustom gnus-treat-hide-citation nil "Hide cited text. -Valid values are nil, t, `head', `last', an integer or a predicate. -See Info node `(gnus)Customizing Articles' for details." +Valid values are nil, t, `head', `first', `last', an integer or a +predicate. See Info node `(gnus)Customizing Articles'." :group 'gnus-article-treat :link '(custom-manual "(gnus)Customizing Articles") :type gnus-article-treat-custom) (defcustom gnus-treat-hide-citation-maybe nil "Hide cited text. -Valid values are nil, t, `head', `last', an integer or a predicate. -See Info node `(gnus)Customizing Articles' for details." +Valid values are nil, t, `head', `first', `last', an integer or a +predicate. See Info node `(gnus)Customizing Articles'." :group 'gnus-article-treat :link '(custom-manual "(gnus)Customizing Articles") :type gnus-article-treat-custom) (defcustom gnus-treat-strip-list-identifiers 'head "Strip list identifiers from `gnus-list-identifiers`. -Valid values are nil, t, `head', `last', an integer or a predicate. -See Info node `(gnus)Customizing Articles' for details." +Valid values are nil, t, `head', `first', `last', an integer or a +predicate. See Info node `(gnus)Customizing Articles'." :version "21.1" :group 'gnus-article-treat :link '(custom-manual "(gnus)Customizing Articles") @@ -1119,8 +1157,8 @@ See Info node `(gnus)Customizing Articles' for details." (defcustom gnus-treat-strip-pem nil "Strip PEM signatures. -Valid values are nil, t, `head', `last', an integer or a predicate. -See Info node `(gnus)Customizing Articles' for details." +Valid values are nil, t, `head', `first', `last', an integer or a +predicate. See Info node `(gnus)Customizing Articles'." :group 'gnus-article-treat :link '(custom-manual "(gnus)Customizing Articles") :type gnus-article-treat-custom) @@ -1128,16 +1166,16 @@ See Info node `(gnus)Customizing Articles' for details." (defcustom gnus-treat-strip-banner t "Strip banners from articles. The banner to be stripped is specified in the `banner' group parameter. -Valid values are nil, t, `head', `last', an integer or a predicate. -See Info node `(gnus)Customizing Articles' for details." +Valid values are nil, t, `head', `first', `last', an integer or a +predicate. See Info node `(gnus)Customizing Articles'." :group 'gnus-article-treat :link '(custom-manual "(gnus)Customizing Articles") :type gnus-article-treat-custom) (defcustom gnus-treat-highlight-headers 'head "Highlight the headers. -Valid values are nil, t, `head', `last', an integer or a predicate. -See Info node `(gnus)Customizing Articles' for details." +Valid values are nil, t, `head', `first', `last', an integer or a +predicate. See Info node `(gnus)Customizing Articles'." :group 'gnus-article-treat :link '(custom-manual "(gnus)Customizing Articles") :type gnus-article-treat-head-custom) @@ -1145,8 +1183,8 @@ See Info node `(gnus)Customizing Articles' for details." (defcustom gnus-treat-highlight-citation t "Highlight cited text. -Valid values are nil, t, `head', `last', an integer or a predicate. -See Info node `(gnus)Customizing Articles' for details." +Valid values are nil, t, `head', `first', `last', an integer or a +predicate. See Info node `(gnus)Customizing Articles'." :group 'gnus-article-treat :link '(custom-manual "(gnus)Customizing Articles") :type gnus-article-treat-custom) @@ -1154,24 +1192,24 @@ See Info node `(gnus)Customizing Articles' for details." (defcustom gnus-treat-date-ut nil "Display the Date in UT (GMT). -Valid values are nil, t, `head', `last', an integer or a predicate. -See Info node `(gnus)Customizing Articles' for details." +Valid values are nil, t, `head', `first', `last', an integer or a +predicate. See Info node `(gnus)Customizing Articles'." :group 'gnus-article-treat :link '(custom-manual "(gnus)Customizing Articles") :type gnus-article-treat-head-custom) (defcustom gnus-treat-date-local nil "Display the Date in the local timezone. -Valid values are nil, t, `head', `last', an integer or a predicate. -See Info node `(gnus)Customizing Articles' for details." +Valid values are nil, t, `head', `first', `last', an integer or a +predicate. See Info node `(gnus)Customizing Articles'." :group 'gnus-article-treat :link '(custom-manual "(gnus)Customizing Articles") :type gnus-article-treat-head-custom) (defcustom gnus-treat-date-english nil "Display the Date in a format that can be read aloud in English. -Valid values are nil, t, `head', `last', an integer or a predicate. -See Info node `(gnus)Customizing Articles' for details." +Valid values are nil, t, `head', `first', `last', an integer or a +predicate. See Info node `(gnus)Customizing Articles'." :version "22.1" :group 'gnus-article-treat :link '(custom-manual "(gnus)Customizing Articles") @@ -1179,24 +1217,24 @@ See Info node `(gnus)Customizing Articles' for details." (defcustom gnus-treat-date-lapsed nil "Display the Date header in a way that says how much time has elapsed. -Valid values are nil, t, `head', `last', an integer or a predicate. -See Info node `(gnus)Customizing Articles' for details." +Valid values are nil, t, `head', `first', `last', an integer or a +predicate. See Info node `(gnus)Customizing Articles'." :group 'gnus-article-treat :link '(custom-manual "(gnus)Customizing Articles") :type gnus-article-treat-head-custom) (defcustom gnus-treat-date-original nil "Display the date in the original timezone. -Valid values are nil, t, `head', `last', an integer or a predicate. -See Info node `(gnus)Customizing Articles' for details." +Valid values are nil, t, `head', `first', `last', an integer or a +predicate. See Info node `(gnus)Customizing Articles'." :group 'gnus-article-treat :link '(custom-manual "(gnus)Customizing Articles") :type gnus-article-treat-head-custom) (defcustom gnus-treat-date-iso8601 nil "Display the date in the ISO8601 format. -Valid values are nil, t, `head', `last', an integer or a predicate. -See Info node `(gnus)Customizing Articles' for details." +Valid values are nil, t, `head', `first', `last', an integer or a +predicate. See Info node `(gnus)Customizing Articles'." :version "21.1" :group 'gnus-article-treat :link '(custom-manual "(gnus)Customizing Articles") @@ -1205,16 +1243,16 @@ See Info node `(gnus)Customizing Articles' for details." (defcustom gnus-treat-date-user-defined nil "Display the date in a user-defined format. The format is defined by the `gnus-article-time-format' variable. -Valid values are nil, t, `head', `last', an integer or a predicate. -See Info node `(gnus)Customizing Articles' for details." +Valid values are nil, t, `head', `first', `last', an integer or a +predicate. See Info node `(gnus)Customizing Articles'." :group 'gnus-article-treat :link '(custom-manual "(gnus)Customizing Articles") :type gnus-article-treat-head-custom) (defcustom gnus-treat-strip-headers-in-body t "Strip the X-No-Archive header line from the beginning of the body. -Valid values are nil, t, `head', `last', an integer or a predicate. -See Info node `(gnus)Customizing Articles' for details." +Valid values are nil, t, `head', `first', `last', an integer or a +predicate. See Info node `(gnus)Customizing Articles'." :version "21.1" :group 'gnus-article-treat :link '(custom-manual "(gnus)Customizing Articles") @@ -1222,32 +1260,37 @@ See Info node `(gnus)Customizing Articles' for details." (defcustom gnus-treat-strip-trailing-blank-lines nil "Strip trailing blank lines. -Valid values are nil, t, `head', `last', an integer or a predicate. -See Info node `(gnus)Customizing Articles' for details." +Valid values are nil, t, `head', `first', `last', an integer or a +predicate. See Info node `(gnus)Customizing Articles'. + +When set to t, it also strips trailing blanks in all MIME parts. +Consider to use `last' instead." :group 'gnus-article-treat :link '(custom-manual "(gnus)Customizing Articles") :type gnus-article-treat-custom) (defcustom gnus-treat-strip-leading-blank-lines nil "Strip leading blank lines. -Valid values are nil, t, `head', `last', an integer or a predicate. -See Info node `(gnus)Customizing Articles' for details." +Valid values are nil, t, `head', `first', `last', an integer or a +predicate. See Info node `(gnus)Customizing Articles'. + +When set to t, it also strips trailing blanks in all MIME parts." :group 'gnus-article-treat :link '(custom-manual "(gnus)Customizing Articles") :type gnus-article-treat-custom) (defcustom gnus-treat-strip-multiple-blank-lines nil "Strip multiple blank lines. -Valid values are nil, t, `head', `last', an integer or a predicate. -See Info node `(gnus)Customizing Articles' for details." +Valid values are nil, t, `head', `first', `last', an integer or a +predicate. See Info node `(gnus)Customizing Articles'." :group 'gnus-article-treat :link '(custom-manual "(gnus)Customizing Articles") :type gnus-article-treat-custom) (defcustom gnus-treat-unfold-headers 'head "Unfold folded header lines. -Valid values are nil, t, `head', `last', an integer or a predicate. -See Info node `(gnus)Customizing Articles' for details." +Valid values are nil, t, `head', `first', `last', an integer or a +predicate. See Info node `(gnus)Customizing Articles'." :version "22.1" :group 'gnus-article-treat :link '(custom-manual "(gnus)Customizing Articles") @@ -1255,8 +1298,8 @@ See Info node `(gnus)Customizing Articles' for details." (defcustom gnus-treat-fold-headers nil "Fold headers. -Valid values are nil, t, `head', `last', an integer or a predicate. -See Info node `(gnus)Customizing Articles' for details." +Valid values are nil, t, `head', `first', `last', an integer or a +predicate. See Info node `(gnus)Customizing Articles'." :version "22.1" :group 'gnus-article-treat :link '(custom-manual "(gnus)Customizing Articles") @@ -1264,8 +1307,8 @@ See Info node `(gnus)Customizing Articles' for details." (defcustom gnus-treat-fold-newsgroups 'head "Fold the Newsgroups and Followup-To headers. -Valid values are nil, t, `head', `last', an integer or a predicate. -See Info node `(gnus)Customizing Articles' for details." +Valid values are nil, t, `head', `first', `last', an integer or a +predicate. See Info node `(gnus)Customizing Articles'." :version "22.1" :group 'gnus-article-treat :link '(custom-manual "(gnus)Customizing Articles") @@ -1273,8 +1316,8 @@ See Info node `(gnus)Customizing Articles' for details." (defcustom gnus-treat-overstrike t "Treat overstrike highlighting. -Valid values are nil, t, `head', `last', an integer or a predicate. -See Info node `(gnus)Customizing Articles' for details." +Valid values are nil, t, `head', `first', `last', an integer or a +predicate. See Info node `(gnus)Customizing Articles'." :group 'gnus-article-treat :link '(custom-manual "(gnus)Customizing Articles") :type gnus-article-treat-custom) @@ -1282,8 +1325,8 @@ See Info node `(gnus)Customizing Articles' for details." (defcustom gnus-treat-ansi-sequences (if (locate-library "ansi-color") t) "Treat ANSI SGR control sequences. -Valid values are nil, t, `head', `last', an integer or a predicate. -See Info node `(gnus)Customizing Articles' for details." +Valid values are nil, t, `head', `first', `last', an integer or a +predicate. See Info node `(gnus)Customizing Articles'." :group 'gnus-article-treat :link '(custom-manual "(gnus)Customizing Articles") :type gnus-article-treat-custom) @@ -1293,9 +1336,7 @@ See Info node `(gnus)Customizing Articles' for details." (defcustom gnus-treat-display-x-face (and (not noninteractive) - (or (eq gnus-article-x-face-command - 'x-face-mule-gnus-article-display-x-face) - (and (fboundp 'image-type-available-p) + (or (and (fboundp 'image-type-available-p) (image-type-available-p 'xbm) (string-match "^0x" (shell-command-to-string "uncompface")) (executable-find "icontopbm")) @@ -1303,9 +1344,9 @@ See Info node `(gnus)Customizing Articles' for details." (featurep 'xface))) 'head) "Display X-Face headers. -Valid values are nil, t, `head', `last', an integer or a predicate. -See Info node `(gnus)Customizing Articles' and Info node -`(gnus)X-Face' for details." +Valid values are nil, t, `head', `first', `last', an integer or a +predicate. See Info node `(gnus)Customizing Articles' and Info +node `(gnus)X-Face' for details." :group 'gnus-article-treat :version "21.1" :link '(custom-manual "(gnus)Customizing Articles") @@ -1364,9 +1405,9 @@ smiley functions are not overridden by `smiley').") (featurep 'png))) 'head) "Display Face headers. -Valid values are nil, t, `head', `last', an integer or a predicate. -See Info node `(gnus)Customizing Articles' and Info node -`(gnus)X-Face' for details." +Valid values are nil, t, `head', `first', `last', an integer or a +predicate. See Info node `(gnus)Customizing Articles' and Info +node `(gnus)X-Face' for details." :group 'gnus-article-treat :version "22.1" :link '(custom-manual "(gnus)Customizing Articles") @@ -1386,9 +1427,9 @@ See Info node `(gnus)Customizing Articles' and Info node t nil) "Display smileys. -Valid values are nil, t, `head', `last', an integer or a predicate. -See Info node `(gnus)Customizing Articles' and Info node -`(gnus)Smileys' for details." +Valid values are nil, t, `head', `first', `last', an integer or a +predicate. See Info node `(gnus)Customizing Articles' and Info +node `(gnus)Smileys' for details." :group 'gnus-article-treat :version "21.1" :link '(custom-manual "(gnus)Customizing Articles") @@ -1401,9 +1442,9 @@ See Info node `(gnus)Customizing Articles' and Info node (gnus-picons-installed-p)) 'head nil) "Display picons in the From header. -Valid values are nil, t, `head', `last', an integer or a predicate. -See Info node `(gnus)Customizing Articles' and Info node -`(gnus)Picons' for details." +Valid values are nil, t, `head', `first', `last', an integer or a +predicate. See Info node `(gnus)Customizing Articles' and Info +node `(gnus)Picons' for details." :version "22.1" :group 'gnus-article-treat :group 'gnus-picon @@ -1417,9 +1458,9 @@ See Info node `(gnus)Customizing Articles' and Info node (gnus-picons-installed-p)) 'head nil) "Display picons in To and Cc headers. -Valid values are nil, t, `head', `last', an integer or a predicate. -See Info node `(gnus)Customizing Articles' and Info node -`(gnus)Picons' for details." +Valid values are nil, t, `head', `first', `last', an integer or a +predicate. See Info node `(gnus)Customizing Articles' and Info +node `(gnus)Picons' for details." :version "22.1" :group 'gnus-article-treat :group 'gnus-picon @@ -1433,9 +1474,9 @@ See Info node `(gnus)Customizing Articles' and Info node (gnus-picons-installed-p)) 'head nil) "Display picons in the Newsgroups and Followup-To headers. -Valid values are nil, t, `head', `last', an integer or a predicate. -See Info node `(gnus)Customizing Articles' and Info node -`(gnus)Picons' for details." +Valid values are nil, t, `head', `first', `last', an integer or a +predicate. See Info node `(gnus)Customizing Articles' and Info +node `(gnus)Picons' for details." :version "22.1" :group 'gnus-article-treat :group 'gnus-picon @@ -1460,8 +1501,8 @@ See Info node `(gnus)Customizing Articles' for details." (defcustom gnus-treat-capitalize-sentences nil "Capitalize sentence-starting words. -Valid values are nil, t, `head', `last', an integer or a predicate. -See Info node `(gnus)Customizing Articles' for details." +Valid values are nil, t, `head', `first', `last', an integer or a +predicate. See Info node `(gnus)Customizing Articles'." :version "21.1" :group 'gnus-article-treat :link '(custom-manual "(gnus)Customizing Articles") @@ -1469,8 +1510,8 @@ See Info node `(gnus)Customizing Articles' for details." (defcustom gnus-treat-wash-html nil "Format as HTML. -Valid values are nil, t, `head', `last', an integer or a predicate. -See Info node `(gnus)Customizing Articles' for details." +Valid values are nil, t, `head', `first', `last', an integer or a +predicate. See Info node `(gnus)Customizing Articles'." :version "22.1" :group 'gnus-article-treat :link '(custom-manual "(gnus)Customizing Articles") @@ -1478,16 +1519,16 @@ See Info node `(gnus)Customizing Articles' for details." (defcustom gnus-treat-fill-long-lines nil "Fill long lines. -Valid values are nil, t, `head', `last', an integer or a predicate. -See Info node `(gnus)Customizing Articles' for details." +Valid values are nil, t, `head', `first', `last', an integer or a +predicate. See Info node `(gnus)Customizing Articles'." :group 'gnus-article-treat :link '(custom-manual "(gnus)Customizing Articles") :type gnus-article-treat-custom) (defcustom gnus-treat-play-sounds nil "Play sounds. -Valid values are nil, t, `head', `last', an integer or a predicate. -See Info node `(gnus)Customizing Articles' for details." +Valid values are nil, t, `head', `first', `last', an integer or a +predicate. See Info node `(gnus)Customizing Articles'." :version "21.1" :group 'gnus-article-treat :link '(custom-manual "(gnus)Customizing Articles") @@ -1505,8 +1546,8 @@ decode the body, '(or header t) for the whole article, etc." (defcustom gnus-treat-translate nil "Translate articles from one language to another. -Valid values are nil, t, `head', `last', an integer or a predicate. -See Info node `(gnus)Customizing Articles' for details." +Valid values are nil, t, `head', `first', `last', an integer or a +predicate. See Info node `(gnus)Customizing Articles'." :version "21.1" :group 'gnus-article-treat :link '(custom-manual "(gnus)Customizing Articles") @@ -1515,8 +1556,8 @@ See Info node `(gnus)Customizing Articles' for details." (defcustom gnus-treat-x-pgp-sig nil "Verify X-PGP-Sig. To automatically treat X-PGP-Sig, set it to head. -Valid values are nil, t, `head', `last', an integer or a predicate. -See Info node `(gnus)Customizing Articles' for details." +Valid values are nil, t, `head', `first', `last', an integer or a +predicate. See Info node `(gnus)Customizing Articles'." :version "22.1" :group 'gnus-article-treat :group 'mime-security @@ -1595,10 +1636,10 @@ This requires GNU Libidn, and by default only enabled if it is found." (gnus-treat-date-ut gnus-article-date-ut) (gnus-treat-date-local gnus-article-date-local) (gnus-treat-date-english gnus-article-date-english) - (gnus-treat-date-lapsed gnus-article-date-lapsed) (gnus-treat-date-original gnus-article-date-original) (gnus-treat-date-user-defined gnus-article-date-user) (gnus-treat-date-iso8601 gnus-article-date-iso8601) + (gnus-treat-date-lapsed gnus-article-date-lapsed) (gnus-treat-display-face gnus-article-display-face) (gnus-treat-hide-headers gnus-article-maybe-hide-headers) (gnus-treat-hide-boring-headers gnus-article-hide-boring-headers) @@ -1736,10 +1777,24 @@ Initialized from `text-mode-syntax-table.") "Delete text of TYPE in the current buffer." (save-excursion (let ((b (point-min))) - (while (setq b (text-property-any b (point-max) 'article-type type)) - (delete-region - b (or (text-property-not-all b (point-max) 'article-type type) - (point-max))))))) + (if (eq type 'multipart) + ;; Remove MIME buttons associated with multipart/alternative parts. + (progn + (goto-char b) + (while (if (get-text-property (point) 'gnus-part) + (setq b (point)) + (when (setq b (next-single-property-change (point) + 'gnus-part)) + (goto-char b) + t)) + (end-of-line) + (skip-chars-forward "\n") + (when (eq (get-text-property b 'article-type) 'multipart) + (delete-region b (point))))) + (while (setq b (text-property-any b (point-max) 'article-type type)) + (delete-region + b (or (text-property-not-all b (point-max) 'article-type type) + (point-max)))))))) (defun gnus-article-delete-invisible-text () "Delete all invisible text in the current buffer." @@ -2278,33 +2333,33 @@ unfolded." ;; read-only. (if (and wash-face-p (memq 'face gnus-article-wash-types)) (gnus-delete-images 'face) - (let (face faces) - (save-excursion + (let (face faces from) + (save-current-buffer (when (and wash-face-p - (progn - (goto-char (point-min)) - (not (re-search-forward "^Face:[\t ]*" nil t))) - (gnus-buffer-live-p gnus-original-article-buffer)) + (gnus-buffer-live-p gnus-original-article-buffer) + (not (re-search-forward "^Face:[\t ]*" nil t))) (set-buffer gnus-original-article-buffer)) (save-restriction (mail-narrow-to-head) (while (gnus-article-goto-header "Face") - (setq faces (nconc faces (list (mail-header-field-value))))))) - (dolist (face faces) - (let ((png (gnus-convert-face-to-png face)) - image) - (when png - (setq image - (apply 'gnus-create-image png 'png t - (cdr (assq 'png gnus-face-properties-alist)))) - (gnus-article-goto-header "from") - (when (bobp) - (insert "From: [no `from' set]\n") - (forward-char -17)) - (gnus-add-wash-type 'face) - (gnus-add-image 'face image) - (gnus-put-image image nil 'face)))))) - ))) + (push (mail-header-field-value) faces)))) + (when faces + (goto-char (point-min)) + (let ((from (gnus-article-goto-header "from")) + png image) + (unless from + (insert "From:") + (setq from (point)) + (insert "[no `from' set]\n")) + (while faces + (when (setq png (gnus-convert-face-to-png (pop faces))) + (setq image + (apply 'gnus-create-image png 'png t + (cdr (assq 'png gnus-face-properties-alist)))) + (goto-char from) + (gnus-add-wash-type 'face) + (gnus-add-image 'face image) + (gnus-put-image image nil 'face)))))))))) (defun article-display-x-face (&optional force) "Look for an X-Face header and display it if present." @@ -2321,13 +2376,10 @@ unfolded." (gnus-delete-images 'xface) ;; Display X-Faces. (let (x-faces from face) - (save-excursion + (save-current-buffer (when (and wash-face-p - (progn - (goto-char (point-min)) - (not (re-search-forward - "^X-Face\\(-[0-9]+\\)?:[\t ]*" nil t))) - (gnus-buffer-live-p gnus-original-article-buffer)) + (gnus-buffer-live-p gnus-original-article-buffer) + (not (re-search-forward "^X-Face:[\t ]*" nil t))) ;; If type `W f', use gnus-original-article-buffer, ;; otherwise use the current buffer because displaying ;; RFC822 parts calls this function too. @@ -2341,34 +2393,36 @@ unfolded." ;; single external face. (when (stringp gnus-article-x-face-command) (setq x-faces (list (car x-faces)))) - (while (and (setq face (pop x-faces)) - gnus-article-x-face-command - (or force - ;; Check whether this face is censored. - (not gnus-article-x-face-too-ugly) - (and gnus-article-x-face-too-ugly from - (not (string-match gnus-article-x-face-too-ugly - from))))) - ;; We display the face. - (cond ((stringp gnus-article-x-face-command) - ;; The command is a string, so we interpret the command - ;; as a, well, command, and fork it off. - (let ((process-connection-type nil)) - (process-kill-without-query - (start-process - "article-x-face" nil shell-file-name - shell-command-switch gnus-article-x-face-command)) - (with-temp-buffer - (insert face) - (process-send-region "article-x-face" - (point-min) (point-max))) - (process-send-eof "article-x-face"))) - ((functionp gnus-article-x-face-command) - ;; The command is a lisp function, so we call it. - (funcall gnus-article-x-face-command face)) - (t - (error "%s is not a function" - gnus-article-x-face-command))))))))) + (when (and x-faces + gnus-article-x-face-command + (or force + ;; Check whether this face is censored. + (not gnus-article-x-face-too-ugly) + (and from + (not (string-match gnus-article-x-face-too-ugly + from))))) + (while (setq face (pop x-faces)) + ;; We display the face. + (cond ((stringp gnus-article-x-face-command) + ;; The command is a string, so we interpret the command + ;; as a, well, command, and fork it off. + (let ((process-connection-type nil)) + (gnus-set-process-query-on-exit-flag + (start-process + "article-x-face" nil shell-file-name + shell-command-switch gnus-article-x-face-command) + nil) + (with-temp-buffer + (insert face) + (process-send-region "article-x-face" + (point-min) (point-max))) + (process-send-eof "article-x-face"))) + ((functionp gnus-article-x-face-command) + ;; The command is a lisp function, so we call it. + (funcall gnus-article-x-face-command face)) + (t + (error "%s is not a function" + gnus-article-x-face-command)))))))))) (defun article-decode-mime-words () "Decode all MIME-encoded words in the article." @@ -2399,8 +2453,7 @@ If PROMPT (the prefix), prompt for a coding system to use." (article-narrow-to-head) (setq ct (message-fetch-field "Content-Type" t) cte (message-fetch-field "Content-Transfer-Encoding" t) - ctl (and ct (ignore-errors - (mail-header-parse-content-type ct))) + ctl (and ct (mail-header-parse-content-type ct)) charset (cond (prompt (mm-read-coding-system "Charset to decode: ")) @@ -2478,20 +2531,22 @@ If PROMPT (the prefix), prompt for a coding system to use." (autoload 'idna-to-unicode "idna") (defun article-decode-idna-rhs () - "Decode IDNA strings in RHS in From:, To: and Cc: headers in current buffer." + "Decode IDNA strings in RHS in various headers in current buffer. +The following headers are decoded: From:, To:, Cc:, Reply-To:, +Mail-Reply-To: and Mail-Followup-To:." (when gnus-use-idna (save-restriction (let ((inhibit-point-motion-hooks t) (inhibit-read-only t)) (article-narrow-to-head) (goto-char (point-min)) - (while (re-search-forward "@.*\\(xn--[-A-Za-z0-9.]*\\)[ \t\n\r,>]" nil t) + (while (re-search-forward "@[^ \t\n\r,>]*\\(xn--[-A-Za-z0-9.]*\\)[ \t\n\r,>]" nil t) (let (ace unicode) (when (save-match-data (and (setq ace (match-string 1)) (save-excursion (and (re-search-backward "^[^ \t]" nil t) - (looking-at "From\\|To\\|Cc"))) + (looking-at "From\\|To\\|Cc\\|Reply-To\\|Mail-Reply-To\\|Mail-Followup-To"))) (setq unicode (idna-to-unicode ace)))) (unless (string= ace unicode) (replace-match unicode nil nil nil 1))))))))) @@ -2509,9 +2564,7 @@ If READ-CHARSET, ask for a coding system." (setq type (gnus-fetch-field "content-transfer-encoding")) (let* ((ct (gnus-fetch-field "content-type")) - (ctl (and ct - (ignore-errors - (mail-header-parse-content-type ct))))) + (ctl (and ct (mail-header-parse-content-type ct)))) (setq charset (and ctl (mail-content-type-get ctl 'charset))) (if (stringp charset) @@ -2539,9 +2592,7 @@ If READ-CHARSET, ask for a coding system." (setq type (gnus-fetch-field "content-transfer-encoding")) (let* ((ct (gnus-fetch-field "content-type")) - (ctl (and ct - (ignore-errors - (mail-header-parse-content-type ct))))) + (ctl (and ct (mail-header-parse-content-type ct)))) (setq charset (and ctl (mail-content-type-get ctl 'charset))) (if (stringp charset) @@ -2586,25 +2637,34 @@ If READ-CHARSET, ask for a coding system." (defun article-wash-html (&optional read-charset) "Format an HTML article. -If READ-CHARSET, ask for a coding system." +If READ-CHARSET, ask for a coding system. If it is a number, the +charset defined in `gnus-summary-show-article-charset-alist' is used." (interactive "P") (save-excursion (let ((inhibit-read-only t) charset) - (when (gnus-buffer-live-p gnus-original-article-buffer) - (with-current-buffer gnus-original-article-buffer - (let* ((ct (gnus-fetch-field "content-type")) - (ctl (and ct - (ignore-errors - (mail-header-parse-content-type ct))))) - (setq charset (and ctl - (mail-content-type-get ctl 'charset))) - (when (stringp charset) - (setq charset (intern (downcase charset))))))) - (when read-charset - (setq charset (mm-read-coding-system "Charset: " charset))) - (unless charset - (setq charset gnus-newsgroup-charset)) + (if read-charset + (if (or (and (numberp read-charset) + (setq charset + (cdr + (assq read-charset + gnus-summary-show-article-charset-alist)))) + (setq charset (mm-read-coding-system "Charset: "))) + (let ((gnus-summary-show-article-charset-alist + (list (cons 1 charset)))) + (with-current-buffer gnus-summary-buffer + (gnus-summary-show-article 1))) + (error "No charset is given")) + (when (gnus-buffer-live-p gnus-original-article-buffer) + (with-current-buffer gnus-original-article-buffer + (let* ((ct (gnus-fetch-field "content-type")) + (ctl (and ct (mail-header-parse-content-type ct)))) + (setq charset (and ctl + (mail-content-type-get ctl 'charset))) + (when (stringp charset) + (setq charset (intern (downcase charset))))))) + (unless charset + (setq charset gnus-newsgroup-charset))) (article-goto-body) (save-window-excursion (save-restriction @@ -2633,19 +2693,123 @@ If READ-CHARSET, ask for a coding system." (defun gnus-article-wash-html-with-w3m () "Wash the current buffer with emacs-w3m." (mm-setup-w3m) - (save-restriction - (narrow-to-region (point) (point-max)) - (let ((w3m-safe-url-regexp mm-w3m-safe-url-regexp) - w3m-force-redisplay) - (w3m-region (point-min) (point-max))) - (when (and mm-inline-text-html-with-w3m-keymap - (boundp 'w3m-minor-mode-map) - w3m-minor-mode-map) - (add-text-properties - (point-min) (point-max) - (list 'keymap w3m-minor-mode-map - ;; Put the mark meaning this part was rendered by emacs-w3m. - 'mm-inline-text-html-with-w3m t))))) + (let ((w3m-safe-url-regexp mm-w3m-safe-url-regexp) + w3m-force-redisplay) + (w3m-region (point-min) (point-max))) + (when (and mm-inline-text-html-with-w3m-keymap + (boundp 'w3m-minor-mode-map) + w3m-minor-mode-map) + (add-text-properties + (point-min) (point-max) + (list 'keymap w3m-minor-mode-map + ;; Put the mark meaning this part was rendered by emacs-w3m. + 'mm-inline-text-html-with-w3m t)))) + +(eval-when-compile (defvar charset)) ;; Bound by `article-wash-html'. + +(defun gnus-article-wash-html-with-w3m-standalone () + "Wash the current buffer with w3m." + (if (mm-w3m-standalone-supports-m17n-p) + (progn + (unless (mm-coding-system-p charset) ;; Bound by `article-wash-html'. + ;; The default. + (setq charset 'iso-8859-1)) + (let ((coding-system-for-write charset) + (coding-system-for-read charset)) + (call-process-region + (point-min) (point-max) + "w3m" t t nil "-dump" "-T" "text/html" + "-I" (symbol-name charset) "-O" (symbol-name charset)))) + (mm-inline-wash-with-stdin nil "w3m" "-dump" "-T" "text/html"))) + +(defvar gnus-article-browse-html-temp-list nil + "List of temporary files created by `gnus-article-browse-html-parts'. +Internal variable.") + +(defcustom gnus-article-browse-delete-temp 'ask + "What to do with temporary files from `gnus-article-browse-html-parts'. +If nil, don't delete temporary files. If it is t, delete them on +exit from the summary buffer. If it is the symbol `file', query +on each file, if it is `ask' ask once when exiting from the +summary buffer." + :group 'gnus-article + :type '(choice (const :tag "Don't delete" nil) + (const :tag "Don't ask" t) + (const :tag "Ask" ask) + (const :tag "Ask for each file" file))) + +;; Cf. mm-postponed-undisplay-list / mm-destroy-postponed-undisplay-list. + +(defun gnus-article-browse-delete-temp-files (&optional how) + "Delete temp-files created by `gnus-article-browse-html-parts'." + (when (and gnus-article-browse-html-temp-list + (or how + (setq how gnus-article-browse-delete-temp))) + (when (and (eq how 'ask) + (y-or-n-p (format + "Delete all %s temporary HTML file(s)? " + (length gnus-article-browse-html-temp-list))) + (setq how t))) + (dolist (file gnus-article-browse-html-temp-list) + (when (and (file-exists-p file) + (or (eq how t) + ;; `how' is neither `nil', `ask' nor `t' (i.e. `file'): + (gnus-y-or-n-p + (format "Delete temporary HTML file `%s'? " file)))) + (delete-file file))) + ;; Also remove file from the list when not deleted or if file doesn't + ;; exist anymore. + (setq gnus-article-browse-html-temp-list nil)) + gnus-article-browse-html-temp-list) + +(defun gnus-article-browse-html-parts (list) + "View all \"text/html\" parts from LIST. +Recurse into multiparts." + ;; Internal function used by `gnus-article-browse-html-article'. + (let ((showed)) + ;; Find and show the html-parts. + (dolist (handle list) + ;; If HTML, show it: + (when (listp handle) + (cond ((and (bufferp (car handle)) + (string-match "text/html" (car (mm-handle-type handle)))) + (let ((tmp-file (mm-make-temp-file + ;; Do we need to care for 8.3 filenames? + "mm-" nil ".html"))) + (mm-save-part-to-file handle tmp-file) + (add-to-list 'gnus-article-browse-html-temp-list tmp-file) + (add-hook 'gnus-summary-prepare-exit-hook + 'gnus-article-browse-delete-temp-files) + (add-hook 'gnus-exit-gnus-hook + (lambda () + (gnus-article-browse-delete-temp-files t))) + (browse-url tmp-file) + (setq showed t))) + ;; If multipart, recurse + ((and (stringp (car handle)) + (string-match "^multipart/" (car handle)) + (setq showed + (or showed + (gnus-article-browse-html-parts handle)))))))) + showed)) + +;; TODO: Key binding +(defun gnus-article-browse-html-article () + "View \"text/html\" parts of the current article with a WWW browser." + (interactive) + (save-window-excursion + ;; Open raw article and select the buffer + (gnus-summary-show-article t) + (gnus-summary-select-article-buffer) + (let ((parts (mm-dissect-buffer t t))) + ;; If singlepart, enforce a list. + (when (and (bufferp (car parts)) + (stringp (car (mm-handle-type parts)))) + (setq parts (list parts))) + ;; Process the list + (unless (gnus-article-browse-html-parts parts) + (gnus-error 3 "Mail doesn't contain a \"text/html\" part!")) + (gnus-summary-show-article)))) (defun article-hide-list-identifiers () "Remove list identifies from the Subject header. @@ -2708,20 +2872,17 @@ always hide." (article-really-strip-banner (gnus-parameter-banner gnus-newsgroup-name))) (when gnus-article-address-banner-alist - ;; It is necessary to encode from fields before checking, - ;; because `mail-header-parse-addresses' does not work - ;; (reliably) on decoded headers. And more, it is - ;; impossible to use `gnus-fetch-original-field' here, - ;; because `article-strip-banner' may be called in draft - ;; buffers to preview them. + ;; Note that the From header is decoded here, so it is + ;; required that the *-extract-address-components function + ;; supports non-ASCII text. (let ((from (save-restriction (widen) (article-narrow-to-head) (mail-fetch-field "from")))) (when (and from (setq from - (caar (mail-header-parse-addresses - (mail-encode-encoded-word-string from))))) + (cadr (funcall gnus-extract-address-components + from)))) (catch 'found (dolist (pair gnus-article-address-banner-alist) (when (string-match (car pair) from) @@ -3215,23 +3376,24 @@ function and want to see what the date was before converting." (defun article-update-date-lapsed () "Function to be run from a timer to update the lapsed time line." - (let (deactivate-mark) - (save-excursion - (ignore-errors - (walk-windows - (lambda (w) - (set-buffer (window-buffer w)) - (when (or (and (eq major-mode 'mime-view-mode) - (eq (mime-preview-original-major-mode) - 'gnus-original-article-mode)) - (eq major-mode 'gnus-article-mode)) - (let ((mark (point-marker))) - (goto-char (point-min)) - (when (re-search-forward "^X-Sent:" nil t) - (article-date-lapsed t)) - (goto-char (marker-position mark)) - (move-marker mark nil)))) - nil 'visible))))) + (save-match-data + (let (deactivate-mark) + (save-excursion + (ignore-errors + (walk-windows + (lambda (w) + (set-buffer (window-buffer w)) + (when (or (and (eq major-mode 'mime-view-mode) + (eq (mime-preview-original-major-mode) + 'gnus-original-article-mode)) + (eq major-mode 'gnus-article-mode)) + (let ((mark (point-marker))) + (goto-char (point-min)) + (when (re-search-forward "^X-Sent:" nil t) + (article-date-lapsed t)) + (goto-char (marker-position mark)) + (move-marker mark nil)))) + nil 'visible)))))) (defun gnus-start-date-timer (&optional n) "Start a timer to update the X-Sent header in the article buffers. @@ -3432,7 +3594,7 @@ This format is defined by the `gnus-article-time-format' variable." ((null split-name) (read-file-name (concat prompt " (default " - (file-name-nondirectory default-name) ") ") + (file-name-nondirectory default-name) "): ") (file-name-directory default-name) default-name)) ;; A single group name is returned. @@ -3442,7 +3604,7 @@ This format is defined by the `gnus-article-time-format' variable." (symbol-value variable))) (read-file-name (concat prompt " (default " - (file-name-nondirectory default-name) ") ") + (file-name-nondirectory default-name) "): ") (file-name-directory default-name) default-name)) ;; A single split name was found @@ -3455,7 +3617,7 @@ This format is defined by the `gnus-article-time-format' variable." ((file-exists-p name) name) (t gnus-article-save-directory)))) (read-file-name - (concat prompt " (default " name ") ") + (concat prompt " (default " name "): ") dir name))) ;; A list of splits was found. (t @@ -3466,7 +3628,7 @@ This format is defined by the `gnus-article-time-format' variable." (setq result (expand-file-name (read-file-name - (concat prompt " (`M-p' for defaults) ") + (concat prompt " (`M-p' for defaults): ") gnus-article-save-directory (car split-name)) gnus-article-save-directory))) @@ -3500,7 +3662,7 @@ This format is defined by the `gnus-article-time-format' variable." Optional argument FILENAME specifies file name. Directory to save to is default to `gnus-article-save-directory'." (setq filename (gnus-read-save-file-name - "Save %s in rmail file:" filename + "Save %s in rmail file" filename gnus-rmail-save-name gnus-newsgroup-name gnus-current-headers 'gnus-newsgroup-last-rmail)) (gnus-eval-in-buffer-window gnus-save-article-buffer @@ -3515,7 +3677,7 @@ Directory to save to is default to `gnus-article-save-directory'." Optional argument FILENAME specifies file name. Directory to save to is default to `gnus-article-save-directory'." (setq filename (gnus-read-save-file-name - "Save %s in Unix mail file:" filename + "Save %s in Unix mail file" filename gnus-mail-save-name gnus-newsgroup-name gnus-current-headers 'gnus-newsgroup-last-mail)) (gnus-eval-in-buffer-window gnus-save-article-buffer @@ -3534,7 +3696,7 @@ Directory to save to is default to `gnus-article-save-directory'." Optional argument FILENAME specifies file name. Directory to save to is default to `gnus-article-save-directory'." (setq filename (gnus-read-save-file-name - "Save %s in file:" filename + "Save %s in file" filename gnus-file-save-name gnus-newsgroup-name gnus-current-headers 'gnus-newsgroup-last-file)) (gnus-eval-in-buffer-window gnus-save-article-buffer @@ -3558,7 +3720,7 @@ The directory to save in defaults to `gnus-article-save-directory'." Optional argument FILENAME specifies file name. The directory to save in defaults to `gnus-article-save-directory'." (setq filename (gnus-read-save-file-name - "Save %s body in file:" filename + "Save %s body in file" filename gnus-file-save-name gnus-newsgroup-name gnus-current-headers 'gnus-newsgroup-last-file)) (gnus-eval-in-buffer-window gnus-save-article-buffer @@ -3932,6 +4094,7 @@ commands: \\[gnus-article-describe-briefly]\t Describe the current mode briefly \\[gnus-info-find-node]\t Go to the Gnus info node" (interactive) + (kill-all-local-variables) (gnus-simplify-mode-line) (setq mode-name "Article") (setq major-mode 'gnus-article-mode) @@ -3956,13 +4119,13 @@ commands: (make-local-variable 'gnus-article-charset) (make-local-variable 'gnus-article-ignored-charsets) ;; Prevent recent Emacsen from displaying non-break space as "\ ". - (set (make-local-variable 'show-nonbreak-escape) nil) + (set (make-local-variable 'nobreak-char-display) nil) (gnus-set-default-directory) (buffer-disable-undo) (setq buffer-read-only t show-trailing-whitespace nil) (set-syntax-table gnus-article-mode-syntax-table) - (gnus-run-hooks 'gnus-article-mode-hook)) + (gnus-run-mode-hooks 'gnus-article-mode-hook)) (defun gnus-article-setup-buffer () "Initialize the article buffer." @@ -4372,10 +4535,11 @@ General format specifiers can also be used. See Info node (gnus-mime-view-part-as-charset "C" "View As charset...") (gnus-mime-save-part "o" "Save...") (gnus-mime-save-part-and-strip "\C-o" "Save and Strip") + (gnus-mime-replace-part "r" "Replace part") (gnus-mime-delete-part "d" "Delete part") (gnus-mime-copy-part "c" "View As Text, In Other Buffer") (gnus-mime-inline-part "i" "View As Text, In This Buffer") - (gnus-mime-view-part-internally "E" "View Internally") + (gnus-mime-view-part-internally "E" "View Internally") ;; Why `E'? (gnus-mime-view-part-externally "e" "View Externally") (gnus-mime-print-part "p" "Print") (gnus-mime-pipe-part "|" "Pipe To Command...") @@ -4435,8 +4599,37 @@ General format specifiers can also be used. See Info node (delete-region (point) (point-max)) (mm-display-parts handles)))))) +(defun gnus-article-jump-to-part (n) + "Jump to MIME part N." + (interactive "P") + (pop-to-buffer gnus-article-buffer) + ;; FIXME: why is it necessary? + (sit-for 0) + (let ((parts (length gnus-article-mime-handle-alist))) + (or n (setq n + (string-to-number + (read-string ;; Emacs 21 doesn't have `read-number'. + (format "Jump to part (2..%s): " parts))))) + (unless (and (integerp n) (<= n parts) (>= n 1)) + (setq n + (progn + (gnus-message 7 "Invalid part `%s', using %s instead." + n parts) + parts))) + (gnus-message 9 "Jumping to part %s." n) + (cond ((>= gnus-auto-select-part 1) + (while (and (<= n parts) + (not (gnus-article-goto-part n))) + (setq n (1+ n)))) + ((< gnus-auto-select-part 0) + (while (and (>= n 1) + (not (gnus-article-goto-part n))) + (setq n (1- n)))) + (t + (gnus-article-goto-part n))))) + (eval-when-compile - (defsubst gnus-article-edit-part (handles) + (defsubst gnus-article-edit-part (handles &optional current-id) "Edit an article in order to delete a mime part. This function is exclusively used by `gnus-mime-save-part-and-strip' and `gnus-mime-delete-part', and not provided at run-time normally." @@ -4451,7 +4644,7 @@ and `gnus-mime-delete-part', and not provided at run-time normally." ',gnus-newsgroup-ignored-charsets)) (mbl mml-buffer-list)) (setq mml-buffer-list nil) - (insert-buffer gnus-original-article-buffer) + (insert-buffer-substring gnus-original-article-buffer) (mime-to-mml ',handles) (setq gnus-article-mime-handles nil) (let ((mbl1 mml-buffer-list)) @@ -4475,13 +4668,29 @@ and `gnus-mime-delete-part', and not provided at run-time normally." (gnus-summary-edit-article-done ,(or (mail-header-references gnus-current-headers) "") ,(gnus-group-read-only-p) - ,gnus-summary-buffer no-highlight))) + ,gnus-summary-buffer no-highlight)) + t) (gnus-article-edit-done) (gnus-summary-expand-window) - (gnus-summary-show-article))) - -(defun gnus-mime-save-part-and-strip () - "Save the MIME part under point then replace it with an external body." + (gnus-summary-show-article) + (when (and current-id (integerp gnus-auto-select-part)) + (gnus-article-jump-to-part + (+ current-id gnus-auto-select-part))))) + +(defun gnus-mime-replace-part (file) + "Replace MIME part under point with an external body." + ;; Useful if file has already been saved to disk + (interactive + (list + (mm-with-multibyte + (read-file-name "Replace MIME part with file: " + (or mm-default-directory default-directory) + nil nil)))) + (gnus-mime-save-part-and-strip file)) + +(defun gnus-mime-save-part-and-strip (&optional file) + "Save the MIME part under point then replace it with an external body. +If FILE is given, use it for the external part." (interactive) (gnus-article-check-buffer) (when (gnus-group-read-only-p) @@ -4489,29 +4698,36 @@ and `gnus-mime-delete-part', and not provided at run-time normally." (when (mm-complicated-handles gnus-article-mime-handles) (error "\ The current article has a complicated MIME structure, giving up...")) - (when (gnus-yes-or-no-p "\ -Deleting parts may malfunction or destroy the article; continue? ") - (let* ((data (get-text-property (point) 'gnus-data)) - file param - (handles gnus-article-mime-handles)) - (setq file (and data (mm-save-part data))) - (when file - (with-current-buffer (mm-handle-buffer data) - (erase-buffer) - (insert "Content-Type: " (mm-handle-media-type data)) - (mml-insert-parameter-string (cdr (mm-handle-type data)) - '(charset)) - (insert "\n") - (insert "Content-ID: " (message-make-message-id) "\n") - (insert "Content-Transfer-Encoding: binary\n") - (insert "\n")) - (setcdr data - (cdr (mm-make-handle nil - `("message/external-body" - (access-type . "LOCAL-FILE") - (name . ,file))))) - (set-buffer gnus-summary-buffer) - (gnus-article-edit-part handles))))) + (let* ((data (get-text-property (point) 'gnus-data)) + (id (get-text-property (point) 'gnus-part)) + param + (handles gnus-article-mime-handles)) + (unless file + (setq file + (and data (mm-save-part data "Delete MIME part and save to: ")))) + (when file + (with-current-buffer (mm-handle-buffer data) + (erase-buffer) + (insert "Content-Type: " (mm-handle-media-type data)) + (mml-insert-parameter-string (cdr (mm-handle-type data)) + '(charset)) + ;; Add a filename for the sake of saving the part again. + (mml-insert-parameter + (mail-header-encode-parameter "name" (file-name-nondirectory file))) + (insert "\n") + (insert "Content-ID: " (message-make-message-id) "\n") + (insert "Content-Transfer-Encoding: binary\n") + (insert "\n")) + (setcdr data + (cdr (mm-make-handle nil + `("message/external-body" + (access-type . "LOCAL-FILE") + (name . ,file))))) + ;; (set-buffer gnus-summary-buffer) + (gnus-article-edit-part handles id)))) + +;; A function like `gnus-summary-save-parts' (`X m', ` ') but with stripping would be nice. (defun gnus-mime-delete-part () "Delete the MIME part under point. @@ -4523,9 +4739,11 @@ Replace it with some information about the removed part." (when (mm-complicated-handles gnus-article-mime-handles) (error "\ The current article has a complicated MIME structure, giving up...")) - (when (gnus-yes-or-no-p "\ -Deleting parts may malfunction or destroy the article; continue? ") + (when (or gnus-expert-user + (gnus-yes-or-no-p "\ +Deleting parts may malfunction or destroy the article; continue? ")) (let* ((data (get-text-property (point) 'gnus-data)) + (id (get-text-property (point) 'gnus-part)) (handles gnus-article-mime-handles) (none "(none)") (description @@ -4556,8 +4774,8 @@ Deleting parts may malfunction or destroy the article; continue? ") nil `("text/plain") nil nil (list "attachment") (format "Deleted attachment (%s bytes)" bsize)))))) - (set-buffer gnus-summary-buffer) - (gnus-article-edit-part handles)))) + ;; (set-buffer gnus-summary-buffer) + (gnus-article-edit-part handles id)))) (defun gnus-mime-save-part () "Save the MIME part under point." @@ -4588,9 +4806,12 @@ Deleting parts may malfunction or destroy the article; continue? ") (defun gnus-mime-view-part-as-type-internal () (gnus-article-check-buffer) - (let* ((name (mail-content-type-get - (mm-handle-type (get-text-property (point) 'gnus-data)) - 'name)) + (let* ((handle (get-text-property (point) 'gnus-data)) + (name (or + ;; Content-Type: foo/bar; name=... + (mail-content-type-get (mm-handle-type handle) 'name) + ;; Content-Disposition: attachment; filename=... + (cdr (assq 'filename (cdr (mm-handle-disposition handle)))))) (def-type (and name (mm-default-file-encoding name)))) (and def-type (cons def-type 0)))) @@ -4598,14 +4819,21 @@ Deleting parts may malfunction or destroy the article; continue? ") "Choose a MIME media type, and view the part as such." (interactive) (unless mime-type - (setq mime-type (completing-read - "View as MIME type: " - (mapcar #'list (mailcap-mime-types)) - nil nil - (gnus-mime-view-part-as-type-internal)))) + (setq mime-type + (let ((default (gnus-mime-view-part-as-type-internal))) + (completing-read + (format "View as MIME type (default %s): " + (car default)) + (mapcar #'list (mailcap-mime-types)) + nil nil nil nil + (car default))))) (gnus-article-check-buffer) (let ((handle (get-text-property (point) 'gnus-data))) (when handle + (when (equal (mm-handle-media-type handle) "message/external-body") + (unless (mm-handle-cache handle) + (mm-extern-cache-contents handle)) + (setq handle (mm-handle-cache handle))) (setq handle (mm-make-handle (mm-handle-buffer handle) (cons mime-type (cdr (mm-handle-type handle))) @@ -4754,7 +4982,7 @@ Compressed files like .gz and .bz2 are decompressed." (and charset (setq coding-system (mm-charset-to-coding-system charset)) - (not (eq charset 'ascii)))) + (not (eq coding-system 'ascii)))) (mm-decode-coding-string contents coding-system) (mm-string-to-multibyte contents))) (goto-char b))))) @@ -4821,13 +5049,68 @@ If no internal viewer is available, use an external viewer." (if action-pair (funcall (cdr action-pair))))) -(defun gnus-article-part-wrapper (n function) - (with-current-buffer gnus-article-buffer - (when (> n (length gnus-article-mime-handle-alist)) - (error "No such part")) - (gnus-article-goto-part n) - (let ((handle (cdr (assq n gnus-article-mime-handle-alist)))) - (funcall function handle)))) +(defun gnus-article-part-wrapper (n function &optional no-handle interactive) + "Call FUNCTION on MIME part N. +Unless NO-HANDLE, call FUNCTION with N-th MIME handle as it's only argument. +If INTERACTIVE, call FUNCTION interactivly." + (let (window frame) + ;; Check whether the article is displayed. + (unless (and (gnus-buffer-live-p gnus-article-buffer) + (setq window (get-buffer-window gnus-article-buffer t)) + (frame-visible-p (setq frame (window-frame window)))) + (error "No article is displayed")) + (with-current-buffer gnus-article-buffer + ;; Check whether the article displays the right contents. + (unless (with-current-buffer gnus-summary-buffer + (eq gnus-current-article (gnus-summary-article-number))) + (error "You should select the right article first")) + ;; Check whether the specified part exists. + (when (> n (length gnus-article-mime-handle-alist)) + (error "No such part"))) + (unless + (progn + ;; To select the window is needed so that the cursor + ;; might be visible on the MIME button. + (select-window (prog1 + window + (setq window (selected-window)) + ;; Article may be displayed in the other frame. + (gnus-select-frame-set-input-focus + (prog1 + frame + (setq frame (selected-frame)))))) + (when (gnus-article-goto-part n) + ;; We point the cursor and the arrow at the MIME button + ;; when the `function' prompt the user for something. + (let ((cursor-in-non-selected-windows t) + (overlay-arrow-string "=>") + (overlay-arrow-position (point-marker))) + (unwind-protect + (cond + ((and no-handle interactive) + (call-interactively function)) + (no-handle + (funcall function)) + (interactive + (call-interactively + function + (cdr (assq n gnus-article-mime-handle-alist)))) + (t + (funcall function + (cdr (assq n gnus-article-mime-handle-alist))))) + (set-marker overlay-arrow-position nil) + (unless gnus-auto-select-part + (gnus-select-frame-set-input-focus frame) + (select-window window)))) + t)) + (if gnus-inhibit-mime-unbuttonizing + ;; This is the default though the program shouldn't reach here. + (error "No such part") + ;; The part which doesn't have the MIME button is selected. + ;; So, we display all the buttons and redo it. + (let ((gnus-inhibit-mime-unbuttonizing t)) + (gnus-summary-show-article) + (gnus-article-part-wrapper n function no-handle)))))) (defun gnus-article-pipe-part (n) "Pipe MIME part N, which is the numerical prefix." @@ -4865,6 +5148,24 @@ N is the numerical prefix." (interactive "p") (gnus-article-part-wrapper n 'gnus-mime-inline-part)) +(defun gnus-article-save-part-and-strip (n) + "Save MIME part N and replace it with an external body. +N is the numerical prefix." + (interactive "p") + (gnus-article-part-wrapper n 'gnus-mime-save-part-and-strip t)) + +(defun gnus-article-replace-part (n) + "Replace MIME part N with an external body. +N is the numerical prefix." + (interactive "p") + (gnus-article-part-wrapper n 'gnus-mime-replace-part t t)) + +(defun gnus-article-delete-part (n) + "Delete MIME part N and add some information about the removed part. +N is the numerical prefix." + (interactive "p") + (gnus-article-part-wrapper n 'gnus-mime-delete-part t)) + (defun gnus-article-mime-match-handle-first (condition) (if condition (let (n) @@ -5106,6 +5407,8 @@ If displaying \"text/html\" is discouraged \(see (defun gnus-mime-display-part (handle) (cond + ;; Maybe a broken MIME message. + ((null handle)) ;; Single part. ((not (stringp (car handle))) (gnus-mime-display-single handle)) @@ -5179,6 +5482,13 @@ If displaying \"text/html\" is discouraged \(see (let ((id (1+ (length gnus-article-mime-handle-alist))) beg) (push (cons id handle) gnus-article-mime-handle-alist) + (when (and display + (equal (mm-handle-media-supertype handle) "message")) + (insert-char + ?\n + (cond ((not (bolp)) 2) + ((or (bobp) (eq (char-before (1- (point))) ?\n)) 0) + (t 1)))) (when (or (not display) (not (gnus-unbuttonized-mime-type-p type))) (gnus-insert-mime-button @@ -5205,7 +5515,17 @@ If displaying \"text/html\" is discouraged \(see (forward-line -1) (setq beg (point))) (gnus-article-insert-newline) - (mm-display-inline handle) + (mm-insert-inline + handle + (let ((charset (mail-content-type-get (mm-handle-type handle) + 'charset))) + (cond ((not charset) + (mm-string-as-multibyte (mm-get-part handle))) + ((eq charset 'gnus-decoded) + (with-current-buffer (mm-handle-buffer handle) + (buffer-string))) + (t + (mm-decode-string (mm-get-part handle) charset))))) (goto-char (point-max)))) ;; Do highlighting. (save-excursion @@ -5275,7 +5595,7 @@ If displaying \"text/html\" is discouraged \(see ,gnus-mouse-face-prop ,gnus-article-mouse-face face ,gnus-article-button-face gnus-part ,id - gnus-data ,handle)) + article-type multipart)) (widget-convert-button 'link from (point) :action 'gnus-widget-press-button :button-keymap gnus-widget-button-keymap) @@ -5532,14 +5852,36 @@ Argument LINES specifies lines to be scrolled up." (gnus-article-next-page-1 lines) nil)) +(defmacro gnus-article-beginning-of-window () + "Move point to the beginning of the window. +In Emacs, the point is placed at the line number which `scroll-margin' +specifies." + (if (featurep 'xemacs) + '(move-to-window-line 0) + '(move-to-window-line + (min (max 0 scroll-margin) + (max 1 (- (window-height) + (if mode-line-format 1 0) + (if header-line-format 1 0))))))) + (defun gnus-article-next-page-1 (lines) - (let ((scroll-in-place nil)) - (condition-case () - (scroll-up lines) - (end-of-buffer - ;; Long lines may cause an end-of-buffer error. - (goto-char (point-max))))) - (move-to-window-line 0)) + (when (and (not (featurep 'xemacs)) + (numberp lines) + (> lines 0) + (numberp (symbol-value 'scroll-margin)) + (> (symbol-value 'scroll-margin) 0)) + ;; Protect against the bug that Emacs 21.x hangs up when scrolling up for + ;; too many number of lines if `scroll-margin' is set as two or greater. + (setq lines (min lines + (max 0 (- (count-lines (window-start) (point-max)) + (symbol-value 'scroll-margin)))))) + (condition-case () + (let ((scroll-in-place nil)) + (scroll-up lines)) + (end-of-buffer + ;; Long lines may cause an end-of-buffer error. + (goto-char (point-max)))) + (gnus-article-beginning-of-window)) (defun gnus-article-prev-page (&optional lines) "Show previous page of current article. @@ -5553,13 +5895,13 @@ Argument LINES specifies lines to be scrolled down." (gnus-narrow-to-page -1) ;Go to previous page. (goto-char (point-max)) (recenter -1)) - (let ((scroll-in-place nil)) - (prog1 - (condition-case () - (scroll-down lines) - (beginning-of-buffer - (goto-char (point-min)))) - (move-to-window-line 0))))) + (prog1 + (condition-case () + (let ((scroll-in-place nil)) + (scroll-down lines)) + (beginning-of-buffer + (goto-char (point-min)))) + (gnus-article-beginning-of-window)))) (defun gnus-article-only-boring-p () "Decide whether there is only boring text remaining in the article. @@ -5569,14 +5911,15 @@ not have a face in `gnus-article-boring-faces'." (boundp 'gnus-article-boring-faces) (symbol-value 'gnus-article-boring-faces)) (save-excursion - (catch 'only-boring - (while (re-search-forward "\\b\\w\\w" nil t) - (forward-char -1) - (when (not (gnus-intersection - (gnus-faces-at (point)) - (symbol-value 'gnus-article-boring-faces))) - (throw 'only-boring nil))) - (throw 'only-boring t))))) + (let ((inhibit-point-motion-hooks t)) + (catch 'only-boring + (while (re-search-forward "\\b\\w\\w" nil t) + (forward-char -1) + (when (not (gnus-intersection + (gnus-faces-at (point)) + (symbol-value 'gnus-article-boring-faces))) + (throw 'only-boring nil))) + (throw 'only-boring t)))))) (defun gnus-article-refer-article () "Read article specified by message-id around point." @@ -6111,7 +6454,7 @@ groups." ,(or (mail-header-references gnus-current-headers) "") ,(gnus-group-read-only-p) ,gnus-summary-buffer no-highlight)))) -(defun gnus-article-edit-article (start-func exit-func) +(defun gnus-article-edit-article (start-func exit-func &optional quiet) "Start editing the contents of the current article buffer." (let ((winconf (current-window-configuration))) (set-buffer gnus-article-buffer) @@ -6126,7 +6469,8 @@ groups." (setq gnus-prev-winconf winconf) (when gnus-article-edit-article-setup-function (funcall gnus-article-edit-article-setup-function)) - (gnus-message 6 "C-c C-c to end edits; C-c C-k to exit"))) + (unless quiet + (gnus-message 6 "C-c C-c to end edits; C-c C-k to exit")))) (defun gnus-article-edit-done (&optional arg) "Update the article edits and exit." @@ -6331,6 +6675,14 @@ after replacing with the original article." :group 'gnus-article-buttons :type 'regexp) +;; Regexp suggested by Felix Wiemann in <87oeuomcz9.fsf@news2.ososo.de> +(defcustom gnus-button-valid-localpart-regexp + "[a-z0-9$%(*-=?[_][^<>\")!;:,{}\n\t ]*" + "Regular expression that matches a localpart of mail addresses or MIDs." + :version "22.1" + :group 'gnus-article-buttons + :type 'regexp) + (defcustom gnus-button-man-handler 'manual-entry "Function to use for displaying man pages. The function must take at least one argument with a string naming the @@ -6370,12 +6722,11 @@ The function must take one argument, the string naming the URL." (regexp :tag "Other"))) (defcustom gnus-button-ctan-directory-regexp - (concat - "\\(?:" - "biblio\\|digests\\|dviware\\|fonts\\|graphics\\|help\\|" - "indexing\\|info\\|language\\|macros\\|support\\|systems\\|" - "tds\\|tools\\|usergrps\\|web\\|nonfree\\|obsolete" - "\\)") + (regexp-opt + (list "archive-tools" "biblio" "bibliography" "digests" "documentation" + "dviware" "fonts" "graphics" "help" "indexing" "info" "language" + "languages" "macros" "nonfree" "obsolete" "support" "systems" + "tds" "tools" "usergrps" "web") t) "Regular expression for ctan directories. It should match all directories in the top level of `gnus-ctan-url'." :version "22.1" @@ -6383,8 +6734,7 @@ It should match all directories in the top level of `gnus-ctan-url'." :type 'regexp) (defcustom gnus-button-mid-or-mail-regexp - (concat "\\b\\(\")!;:,{}\n\t ]*@" - ;; Felix Wiemann in <87oeuomcz9.fsf@news2.ososo.de> + (concat "\\b\\(?\\)\\b") "Regular expression that matches a message ID or a mail address." @@ -6565,9 +6915,11 @@ address, `ask' if unsure and `invalid' if the string is invalid." (gnus-url-mailto url-mailto)) (t (gnus-message 3 "Invalid string."))))) -(defun gnus-button-handle-custom (url) - "Follow a Custom URL." - (customize-apropos (gnus-url-unhex-string url))) +(defun gnus-button-handle-custom (fun arg) + "Call function FUN on argument ARG. +Both FUN and ARG are supposed to be strings. ARG will be passed +as a symbol to FUN." + (funcall (intern fun) (intern arg))) (defvar gnus-button-handle-describe-prefix "^\\(C-h\\|?\\)") @@ -6699,8 +7051,9 @@ positives are possible." (defcustom gnus-button-alist '(("<\\(url:[>\n\t ]*?\\)?\\(nntp\\|news\\):[>\n\t ]*\\([^>\n\t ]*@[^>\n\t ]*\\)>" 0 (>= gnus-button-message-level 0) gnus-button-handle-news 3) - ("\\b\\(nntp\\|news\\):\\([^>\n\t ]*@[^>)!;:,\n\t ]*\\)" 0 t - gnus-button-handle-news 2) + ((concat "\\b\\(nntp\\|news\\):\\(" + gnus-button-valid-localpart-regexp "@[a-z0-9.-]+[a-z]\\)") + 0 t gnus-button-handle-news 2) ("\\(\\b<\\(url:[>\n\t ]*\\)?\\(nntp\\|news\\):[>\n\t ]*\\(//\\)?\\([^>\n\t ]*\\)>\\)" 1 (>= gnus-button-message-level 0) gnus-button-fetch-group 5) ("\\b\\(nntp\\|news\\):\\(//\\)?\\([^'\">\n\t ]+\\)" @@ -6746,10 +7099,8 @@ positives are possible." ;; Info links like `C-h i d m CC Mode RET' 0 (>= gnus-button-emacs-level 1) gnus-button-handle-info-keystrokes 2) ;; This is custom - ("\\bcustom:\\(//\\)?\\([^'\">\n\t ]+\\)" - 0 (>= gnus-button-emacs-level 5) gnus-button-handle-custom 2) - ("M-x[ \t\n]customize-[^ ]+[ \t\n]RET[ \t\n]\\([^ ]+\\)[ \t\n]RET" 0 - (>= gnus-button-emacs-level 1) gnus-button-handle-custom 1) + ("M-x[ \t\n]\\(customize-[^ ]+\\)[ \t\n]RET[ \t\n]\\([^ ]+\\)[ \t\n]RET" 0 + (>= gnus-button-emacs-level 1) gnus-button-handle-custom 1 2) ;; Emacs help commands ("M-x[ \t\n]+apropos[ \t\n]+RET[ \t\n]+\\([^ \t\n]+\\)[ \t\n]+RET" ;; regexp doesn't match arguments containing ` '. @@ -6992,7 +7343,7 @@ do the highlighting. See the documentation for those functions." (defun gnus-article-highlight-signature () "Highlight the signature in an article. It does this by highlighting everything after -`gnus-signature-separator' using `gnus-signature-face'." +`gnus-signature-separator' using the face `gnus-signature'." (interactive) (when gnus-signature-face (gnus-with-article-buffer @@ -7294,7 +7645,7 @@ specified by `gnus-button-alist'." (match-string 3 address) "nntp"))) nil nil nil - (and (match-end 6) (list (string-to-int (match-string 6 address)))))))) + (and (match-end 6) (list (string-to-number (match-string 6 address)))))))) (defun gnus-url-parse-query-string (query &optional downcase) (let (retval pairs cur key val) @@ -7559,6 +7910,8 @@ For example: t) ((eq val 'head) nil) + ((eq val 'first) + (eq part-number 1)) ((eq val 'last) (eq part-number total-parts)) ((numberp val) @@ -7577,7 +7930,7 @@ For example: current-prefix-arg)) (let ((func (cdr (assoc protocol gnus-article-encrypt-protocol-alist)))) (unless func - (error (format "Can't find the encrypt protocol %s" protocol))) + (error "Can't find the encrypt protocol %s" protocol)) (if (member gnus-newsgroup-name '("nndraft:delayed" "nndraft:drafts" "nndraft:queue")) @@ -7659,12 +8012,51 @@ For example: (?d gnus-tmp-details ?s) (?D gnus-tmp-pressed-details ?s))) +(defvar gnus-mime-security-button-commands + '((gnus-article-press-button "\r" "Show Detail") + (undefined "v") + (undefined "t") + (undefined "C") + (gnus-mime-security-save-part "o" "Save...") + (undefined "\C-o") + (undefined "r") + (undefined "d") + (undefined "c") + (undefined "i") + (undefined "E") + (undefined "e") + (undefined "p") + (gnus-mime-security-pipe-part "|" "Pipe To Command...") + (undefined "."))) + (defvar gnus-mime-security-button-map (let ((map (make-sparse-keymap))) (define-key map gnus-mouse-2 'gnus-article-push-button) - (define-key map "\r" 'gnus-article-press-button) + (define-key map gnus-down-mouse-3 'gnus-mime-security-button-menu) + (dolist (c gnus-mime-security-button-commands) + (define-key map (cadr c) (car c))) map)) +(easy-menu-define + gnus-mime-security-button-menu gnus-mime-security-button-map + "Security button menu." + `("Security Part" + ,@(delq nil + (mapcar (lambda (c) + (unless (eq (car c) 'undefined) + (vector (caddr c) (car c) :enable t))) + gnus-mime-security-button-commands)))) + +(defun gnus-mime-security-button-menu (event prefix) + "Construct a context-sensitive menu of security commands." + (interactive "e\nP") + (save-window-excursion + (let ((pos (event-start event))) + (select-window (posn-window pos)) + (goto-char (posn-point pos)) + (gnus-article-check-buffer) + (popup-menu gnus-mime-security-button-menu nil prefix)))) + (defvar gnus-mime-security-details-buffer nil) (defvar gnus-mime-security-button-pressed nil) @@ -7789,15 +8181,16 @@ For example: (when (boundp 'help-echo-owns-message) (setq help-echo-owns-message t)) (format - "%S: show detail" - (aref gnus-mouse-2 0)))))) + "%S: show detail; %S: more options" + (aref gnus-mouse-2 0) + (aref gnus-down-mouse-3 0)))))) (defun gnus-mime-display-security (handle) (save-restriction (narrow-to-region (point) (point)) (unless (gnus-unbuttonized-mime-type-p (car handle)) (gnus-insert-mime-security-button handle)) - (gnus-mime-display-mixed (cdr handle)) + (gnus-mime-display-part (cadr handle)) (unless (bolp) (insert "\n")) (unless (gnus-unbuttonized-mime-type-p (car handle)) @@ -7853,6 +8246,34 @@ For example: ;;; @ end ;;; +(defun gnus-mime-security-run-function (function) + "Run FUNCTION with the security part under point." + (gnus-article-check-buffer) + (let ((data (get-text-property (point) 'gnus-data)) + buffer handle) + (when (and (stringp (car-safe data)) + (setq buffer (mm-handle-multipart-original-buffer data)) + (setq handle (cadr data))) + (if (bufferp (mm-handle-buffer handle)) + (progn + (setq handle (cons buffer (copy-sequence (cdr handle)))) + (mm-handle-set-undisplayer handle nil)) + (setq handle (mm-make-handle + buffer + (mm-handle-multipart-ctl-parameter handle 'protocol) + nil nil nil nil nil nil))) + (funcall function handle)))) + +(defun gnus-mime-security-save-part () + "Save the security part under point." + (interactive) + (gnus-mime-security-run-function 'mm-save-part)) + +(defun gnus-mime-security-pipe-part () + "Pipe the security part under point to a process." + (interactive) + (gnus-mime-security-run-function 'mm-pipe-part)) + (gnus-ems-redefine) (provide 'gnus-art) diff --git a/lisp/gnus-async.el b/lisp/gnus-async.el index 66f4c33..f5f1d89 100644 --- a/lisp/gnus-async.el +++ b/lisp/gnus-async.el @@ -1,6 +1,7 @@ ;;; gnus-async.el --- asynchronous support for Gnus -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2003 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news @@ -19,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/gnus-audio.el b/lisp/gnus-audio.el index 62a6b86..2525cb0 100644 --- a/lisp/gnus-audio.el +++ b/lisp/gnus-audio.el @@ -1,5 +1,7 @@ ;;; gnus-audio.el --- Sound effects for Gnus -;; Copyright (C) 1996, 2000, 2003 Free Software Foundation + +;; Copyright (C) 1996, 2000, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Steven L. Baur ;; Keywords: news, mail, multimedia @@ -18,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/gnus-bbdb.el b/lisp/gnus-bbdb.el index 35dd546..7ce5579 100644 --- a/lisp/gnus-bbdb.el +++ b/lisp/gnus-bbdb.el @@ -23,8 +23,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Code: diff --git a/lisp/gnus-bcklg.el b/lisp/gnus-bcklg.el index c2b0cc3..18ffeab 100644 --- a/lisp/gnus-bcklg.el +++ b/lisp/gnus-bcklg.el @@ -1,6 +1,7 @@ ;;; gnus-bcklg.el --- backlog functions for Gnus -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news @@ -19,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/gnus-cache.el b/lisp/gnus-cache.el index 2516924..496edfe 100644 --- a/lisp/gnus-cache.el +++ b/lisp/gnus-cache.el @@ -1,6 +1,7 @@ ;;; gnus-cache.el --- cache interface for Gnus + ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Tatsuya Ichikawa @@ -21,8 +22,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -362,7 +363,7 @@ Returns the list of articles removed." (let ((alist (gnus-agent-load-alist gnus-newsgroup-name))) (unless (cdr (assoc article alist)) (setq gnus-newsgroup-undownloaded - (gnus-add-to-sorted-list + (gnus-add-to-sorted-list gnus-newsgroup-undownloaded article))))) (push article out)) (gnus-summary-update-download-mark article) @@ -494,7 +495,7 @@ Returns the list of articles removed." articles) (when (file-exists-p dir) (setq articles - (sort (mapcar (lambda (name) (string-to-int name)) + (sort (mapcar (lambda (name) (string-to-number name)) (directory-files dir nil "^[0-9]+$" t)) '<)) ;; Update the cache active file, just to synch more. @@ -684,7 +685,7 @@ If LOW, update the lower bound instead." ;; Separate articles from all other files and directories. (while files (if (string-match "^[0-9]+$" (file-name-nondirectory (car files))) - (push (string-to-int (file-name-nondirectory (pop files))) nums) + (push (string-to-number (file-name-nondirectory (pop files))) nums) (push (pop files) alphs))) ;; If we have nums, then this is probably a valid group. (when (setq nums (sort nums '<)) @@ -734,9 +735,11 @@ If GROUP is non-nil, also cater to `gnus-cacheable-groups' and ;;;###autoload (defun gnus-cache-rename-group (old-group new-group) - "Rename OLD-GROUP as NEW-GROUP. Always updates the cache, even when -disabled, as the old cache files would corrupt gnus when the cache was -next enabled. Depends upon the caller to determine whether group renaming is supported." + "Rename OLD-GROUP as NEW-GROUP. +Always updates the cache, even when disabled, as the old cache +files would corrupt Gnus when the cache was next enabled. It +depends on the caller to determine whether group renaming is +supported." (let ((old-dir (gnus-cache-file-name old-group "")) (new-dir (gnus-cache-file-name new-group ""))) (gnus-rename-file old-dir new-dir t)) @@ -746,9 +749,12 @@ next enabled. Depends upon the caller to determine whether group renaming is sup (let ((no-save gnus-cache-active-hashtb)) (unless gnus-cache-active-hashtb (gnus-cache-read-active)) - (let* ((old-group-hash-value (gnus-gethash old-group gnus-cache-active-hashtb)) - (new-group-hash-value (gnus-gethash new-group gnus-cache-active-hashtb)) - (delta (or old-group-hash-value new-group-hash-value))) + (let* ((old-group-hash-value + (gnus-gethash old-group gnus-cache-active-hashtb)) + (new-group-hash-value + (gnus-gethash new-group gnus-cache-active-hashtb)) + (delta + (or old-group-hash-value new-group-hash-value))) (gnus-sethash new-group old-group-hash-value gnus-cache-active-hashtb) (gnus-sethash old-group nil gnus-cache-active-hashtb) @@ -758,9 +764,11 @@ next enabled. Depends upon the caller to determine whether group renaming is sup ;;;###autoload (defun gnus-cache-delete-group (group) - "Delete GROUP. Always updates the cache, even when -disabled, as the old cache files would corrupt gnus when the cache was -next enabled. Depends upon the caller to determine whether group deletion is supported." + "Delete GROUP from the cache. +Always updates the cache, even when disabled, as the old cache +files would corrupt gnus when the cache was next enabled. +Depends upon the caller to determine whether group deletion is +supported." (let ((dir (gnus-cache-file-name group ""))) (gnus-delete-directory dir)) diff --git a/lisp/gnus-cite.el b/lisp/gnus-cite.el index daa6862..9fd9065 100644 --- a/lisp/gnus-cite.el +++ b/lisp/gnus-cite.el @@ -1,7 +1,7 @@ ;;; gnus-cite.el --- parse citations in articles for Gnus -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Per Abhiddenware @@ -19,8 +19,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -137,131 +137,165 @@ the envelope From line." :group 'gnus-cite :type 'boolean) -(defface gnus-cite-attribution-face '((t - (:italic t))) - "Face used for attribution lines.") +(defface gnus-cite-attribution '((t (:italic t))) + "Face used for attribution lines." + :group 'gnus-cite) +;; backward-compatibility alias +(put 'gnus-cite-attribution-face 'face-alias 'gnus-cite-attribution) -(defcustom gnus-cite-attribution-face 'gnus-cite-attribution-face +(defcustom gnus-cite-attribution-face 'gnus-cite-attribution "Face used for attribution lines. It is merged with the face for the cited text belonging to the attribution." :version "22.1" :group 'gnus-cite :type 'face) -(defface gnus-cite-face-1 '((((class color) - (background dark)) - (:foreground "light blue")) - (((class color) - (background light)) - (:foreground "MidnightBlue")) - (t - (:italic t))) - "Citation face.") - -(defface gnus-cite-face-2 '((((class color) - (background dark)) - (:foreground "light cyan")) - (((class color) - (background light)) - (:foreground "firebrick")) - (t - (:italic t))) - "Citation face.") - -(defface gnus-cite-face-3 '((((class color) - (background dark)) - (:foreground "light yellow")) - (((class color) - (background light)) - (:foreground "dark green")) - (t - (:italic t))) - "Citation face.") - -(defface gnus-cite-face-4 '((((class color) - (background dark)) - (:foreground "light pink")) - (((class color) - (background light)) - (:foreground "OrangeRed")) - (t - (:italic t))) - "Citation face.") - -(defface gnus-cite-face-5 '((((class color) - (background dark)) - (:foreground "pale green")) - (((class color) - (background light)) - (:foreground "dark khaki")) - (t - (:italic t))) - "Citation face.") - -(defface gnus-cite-face-6 '((((class color) - (background dark)) - (:foreground "beige")) - (((class color) - (background light)) - (:foreground "dark violet")) - (t - (:italic t))) - "Citation face.") - -(defface gnus-cite-face-7 '((((class color) - (background dark)) - (:foreground "orange")) - (((class color) - (background light)) - (:foreground "SteelBlue4")) - (t - (:italic t))) - "Citation face.") - -(defface gnus-cite-face-8 '((((class color) - (background dark)) - (:foreground "magenta")) - (((class color) - (background light)) - (:foreground "magenta")) - (t - (:italic t))) - "Citation face.") - -(defface gnus-cite-face-9 '((((class color) - (background dark)) - (:foreground "violet")) - (((class color) - (background light)) - (:foreground "violet")) - (t - (:italic t))) - "Citation face.") - -(defface gnus-cite-face-10 '((((class color) - (background dark)) - (:foreground "medium purple")) - (((class color) - (background light)) - (:foreground "medium purple")) - (t - (:italic t))) - "Citation face.") - -(defface gnus-cite-face-11 '((((class color) - (background dark)) - (:foreground "turquoise")) - (((class color) - (background light)) - (:foreground "turquoise")) - (t - (:italic t))) - "Citation face.") +(defface gnus-cite-1 '((((class color) + (background dark)) + (:foreground "light blue")) + (((class color) + (background light)) + (:foreground "MidnightBlue")) + (t + (:italic t))) + "Citation face." + :group 'gnus-cite) +;; backward-compatibility alias +(put 'gnus-cite-face-1 'face-alias 'gnus-cite-1) + +(defface gnus-cite-2 '((((class color) + (background dark)) + (:foreground "light cyan")) + (((class color) + (background light)) + (:foreground "firebrick")) + (t + (:italic t))) + "Citation face." + :group 'gnus-cite) +;; backward-compatibility alias +(put 'gnus-cite-face-2 'face-alias 'gnus-cite-2) + +(defface gnus-cite-3 '((((class color) + (background dark)) + (:foreground "light yellow")) + (((class color) + (background light)) + (:foreground "dark green")) + (t + (:italic t))) + "Citation face." + :group 'gnus-cite) +;; backward-compatibility alias +(put 'gnus-cite-face-3 'face-alias 'gnus-cite-3) + +(defface gnus-cite-4 '((((class color) + (background dark)) + (:foreground "light pink")) + (((class color) + (background light)) + (:foreground "OrangeRed")) + (t + (:italic t))) + "Citation face." + :group 'gnus-cite) +;; backward-compatibility alias +(put 'gnus-cite-face-4 'face-alias 'gnus-cite-4) + +(defface gnus-cite-5 '((((class color) + (background dark)) + (:foreground "pale green")) + (((class color) + (background light)) + (:foreground "dark khaki")) + (t + (:italic t))) + "Citation face." + :group 'gnus-cite) +;; backward-compatibility alias +(put 'gnus-cite-face-5 'face-alias 'gnus-cite-5) + +(defface gnus-cite-6 '((((class color) + (background dark)) + (:foreground "beige")) + (((class color) + (background light)) + (:foreground "dark violet")) + (t + (:italic t))) + "Citation face." + :group 'gnus-cite) +;; backward-compatibility alias +(put 'gnus-cite-face-6 'face-alias 'gnus-cite-6) + +(defface gnus-cite-7 '((((class color) + (background dark)) + (:foreground "orange")) + (((class color) + (background light)) + (:foreground "SteelBlue4")) + (t + (:italic t))) + "Citation face." + :group 'gnus-cite) +;; backward-compatibility alias +(put 'gnus-cite-face-7 'face-alias 'gnus-cite-7) + +(defface gnus-cite-8 '((((class color) + (background dark)) + (:foreground "magenta")) + (((class color) + (background light)) + (:foreground "magenta")) + (t + (:italic t))) + "Citation face." + :group 'gnus-cite) +;; backward-compatibility alias +(put 'gnus-cite-face-8 'face-alias 'gnus-cite-8) + +(defface gnus-cite-9 '((((class color) + (background dark)) + (:foreground "violet")) + (((class color) + (background light)) + (:foreground "violet")) + (t + (:italic t))) + "Citation face." + :group 'gnus-cite) +;; backward-compatibility alias +(put 'gnus-cite-face-9 'face-alias 'gnus-cite-9) + +(defface gnus-cite-10 '((((class color) + (background dark)) + (:foreground "medium purple")) + (((class color) + (background light)) + (:foreground "medium purple")) + (t + (:italic t))) + "Citation face." + :group 'gnus-cite) +;; backward-compatibility alias +(put 'gnus-cite-face-10 'face-alias 'gnus-cite-10) + +(defface gnus-cite-11 '((((class color) + (background dark)) + (:foreground "turquoise")) + (((class color) + (background light)) + (:foreground "turquoise")) + (t + (:italic t))) + "Citation face." + :group 'gnus-cite) +;; backward-compatibility alias +(put 'gnus-cite-face-11 'face-alias 'gnus-cite-11) (defcustom gnus-cite-face-list - '(gnus-cite-face-1 gnus-cite-face-2 gnus-cite-face-3 gnus-cite-face-4 - gnus-cite-face-5 gnus-cite-face-6 gnus-cite-face-7 gnus-cite-face-8 - gnus-cite-face-9 gnus-cite-face-10 gnus-cite-face-11) + '(gnus-cite-1 gnus-cite-2 gnus-cite-3 gnus-cite-4 gnus-cite-5 gnus-cite-6 + gnus-cite-7 gnus-cite-8 gnus-cite-9 gnus-cite-10 gnus-cite-11) "*List of faces used for highlighting citations. When there are citations from multiple articles in the same message, @@ -287,8 +321,7 @@ This should make it easier to see who wrote what." ;; This has to go here because its default value depends on ;; gnus-cite-face-list. -(defcustom gnus-article-boring-faces (cons 'gnus-signature-face - gnus-cite-face-list) +(defcustom gnus-article-boring-faces (cons 'gnus-signature gnus-cite-face-list) "List of faces that are not worth reading. If an article has more pages below the one you are looking at, but nothing on those pages is a word of at least three letters that is not @@ -340,7 +373,7 @@ in a boring face, then the pages will be skipped." Each citation in the article will be highlighted with a different face. The faces are taken from `gnus-cite-face-list'. Attribution lines are highlighted with the same face as the -corresponding citation merged with `gnus-cite-attribution-face'. +corresponding citation merged with the face `gnus-cite-attribution'. Text is considered cited if at least `gnus-cite-minimum-match-count' lines matches `message-cite-prefix-regexp' with the same prefix. @@ -1004,6 +1037,7 @@ See also the documentation for `gnus-article-highlight-citation'." (when (< from to) (push (setq overlay (gnus-make-overlay from to)) gnus-cite-overlay-list) + (gnus-overlay-put overlay 'evaporate t) (gnus-overlay-put overlay 'face face)))))) (defun gnus-cite-toggle (prefix) diff --git a/lisp/gnus-cus.el b/lisp/gnus-cus.el index 45988bc..d814f32 100644 --- a/lisp/gnus-cus.el +++ b/lisp/gnus-cus.el @@ -1,7 +1,7 @@ ;;; gnus-cus.el --- customization commands for Gnus -;; -;; Copyright (C) 1996, 1999, 2000, 2001, 2002, 2003, 2004 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1996, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Per Abrahamsen ;; Keywords: news @@ -20,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -67,7 +67,7 @@ if that value is non-nil." (set (make-local-variable 'widget-push-button-suffix) "") (set (make-local-variable 'widget-link-prefix) "") (set (make-local-variable 'widget-link-suffix) "")) - (gnus-run-hooks 'gnus-custom-mode-hook)) + (gnus-run-mode-hooks 'gnus-custom-mode-hook)) ;;; Group Customization: @@ -227,9 +227,12 @@ See `gnus-emphasis-alist'.") (const signature-file) (const organization) (const address) + (const x-face-file) (const name) (const body) - (const import)) + (const import) + (symbol) + (string :tag "Header")) (string :format "%v")))) "post style. See `gnus-posting-styles'.")) @@ -773,8 +776,8 @@ When called interactively, FILE defaults to the current score file. This can be changed using the `\\[gnus-score-change-score-file]' command." (interactive (list gnus-current-score-file)) (unless file - (error (format "No score file for %s" - (gnus-group-decoded-name gnus-newsgroup-name)))) + (error "No score file for %s" + (gnus-group-decoded-name gnus-newsgroup-name))) (let ((scores (gnus-score-load file)) (types (mapcar (lambda (entry) `(group :format "%v%h\n" @@ -1015,9 +1018,9 @@ articles in the thread. ;; gnus-agent-cat-prepare-category-field as I don't want the ;; group list to appear when customizing a topic. (widget-insert "\n") - - (let ((symb - (set + + (let ((symb + (set (make-local-variable 'gnus-agent-cat-groups) (widget-create `(choice diff --git a/lisp/gnus-delay.el b/lisp/gnus-delay.el index dcb2856..796fe53 100644 --- a/lisp/gnus-delay.el +++ b/lisp/gnus-delay.el @@ -1,6 +1,7 @@ ;;; gnus-delay.el --- Delayed posting of articles -;; Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Kai Großjohann ;; Keywords: mail, news, extensions @@ -19,8 +20,8 @@ ;; 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. +;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -39,7 +40,6 @@ (require 'gnus-draft) (autoload 'parse-time-string "parse-time" nil nil) -;;;###autoload (defgroup gnus-delay nil "Arrange for sending postings later." :version "22.1" diff --git a/lisp/gnus-demon.el b/lisp/gnus-demon.el index 18a23e0..5a0ea40 100644 --- a/lisp/gnus-demon.el +++ b/lisp/gnus-demon.el @@ -1,7 +1,7 @@ ;;; gnus-demon.el --- daemonic Gnus behaviour -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2003 -;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news @@ -20,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/gnus-diary.el b/lisp/gnus-diary.el index e75467c..6855183 100644 --- a/lisp/gnus-diary.el +++ b/lisp/gnus-diary.el @@ -1,6 +1,6 @@ -;;; gnus-diary.el --- Wrapper around the NNDiary Gnus backend +;;; gnus-diary.el --- Wrapper around the NNDiary Gnus back end -;; Copyright (c) 2001, 2002, 2003 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Copyright (C) 1999, 2000, 2001 Didier Verna. ;; Author: Didier Verna @@ -22,7 +22,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with this program; if not, write to the Free Software -;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +;; MA 02110-1301, USA. ;;; Commentary: @@ -32,63 +33,8 @@ ;; Description: ;; =========== -;; Gnus-Diary is a wrapper around the NNDiary Gnus backend. It is here to -;; make your nndiary-user life easier in different ways. So, you don't have -;; to use it if you don't want to. But, really, you should. - -;; Gnus-Diary offers the following features on top of the NNDiary backend: - -;; - A nice summary line format: -;; Displaying diary messages in standard summary line format (usually -;; something like ": ") is pretty useless. Most of the -;; time, you're the one who wrote the message, and you mostly want to see -;; the event's date. Gnus-Diary offers you a nice summary line format -;; which will do this. By default, a summary line will appear like this: -;; -;; : -;; -;; for example, here's how Joe's birthday is displayed in my -;; "nndiary:birhdays" summary buffer (the message is expirable, but will -;; never be deleted, as it specifies a regular event): -;; -;; E Sat, Sep 22 01, 12:00: Joe's birthday (in 6 months, 1 week) - -;; - More article sorting functions: -;; Gnus-Diary adds a new sorting function called -;; `gnus-summary-sort-by-schedule'. This function lets you organize your -;; diary summary buffers from the closest event to the farthest one. - -;; - Automatic generation of diary group parameters: -;; When you create a new diary group, or visit one, Gnus-Diary checks your -;; group parameters, and if needed, sets the summary line format to the -;; diary-specific value, adds the diary-specific sorting functions, and -;; also adds the different `X-Diary-*' headers to the group's -;; posting-style. It is then easier to send a diary message, because if -;; you use `C-u a' or `C-u m' on a diary group to prepare a message, these -;; headers will be inserted automatically (but not filled with proper -;; values yet). - -;; - An interactive mail-to-diary convertion function: -;; The function `gnus-diary-check-message' ensures that the current message -;; contains all the required diary headers, and prompts you for values / -;; correction if needed. This function is hooked in the nndiary backend so -;; that moving an article to an nndiary group will trigger it -;; automatically. It is also bound to `C-c D c' in message-mode and -;; article-edit-mode in order to ease the process of converting a usual -;; mail to a diary one. This function takes a prefix argument which will -;; force prompting of all diary headers, regardless of their -;; presence/validity. That way, you can very easily reschedule a diary -;; message for instance. - - -;; Usage: -;; ===== - -;; 0/ Don't use any `gnus-user-format-function-[d|D]'. Gnus-Diary provides -;; both of these (sorry if you used them before). -;; 1/ Add '(require 'gnus-diary) to your gnusrc file. -;; 2/ Customize your gnus-diary options to suit your needs. - +;; gnus-diary is a utility toolkit used on top of the nndiary back end. It is +;; now fully documented in the Gnus manual. ;; Bugs / Todo: @@ -102,8 +48,9 @@ (require 'gnus-art) (defgroup gnus-diary nil - "Utilities on top of the nndiary backend for Gnus." - :version "22.1") + "Utilities on top of the nndiary back end for Gnus." + :version "22.1" + :group 'gnus) (defcustom gnus-diary-summary-line-format "%U%R%z %uD: %(%s%) (%ud)\n" "*Summary line format for nndiary groups." @@ -134,7 +81,7 @@ There are currently two built-in format functions: :group 'gnus-diary) (defconst gnus-diary-version nndiary-version - "Current Diary backend version.") + "Current Diary back end version.") ;; Compatibility functions ================================================== @@ -339,7 +286,7 @@ Optional prefix (or REVERSE argument) means sort in reverse order." )) ;; Called when a group is subscribed. This is needed because groups created -;; because of mail splitting are *not* created with the backend function. +;; because of mail splitting are *not* created with the back end function. ;; Thus, `nndiary-request-create-group-hooks' is inoperative. (defun gnus-diary-maybe-update-group-parameters (group) (when (eq (car (gnus-find-method-for-group group)) 'nndiary) @@ -457,7 +404,7 @@ If ARG (or prefix) is non-nil, force prompting for all fields." ;; The end ================================================================== (defun gnus-diary-version () - "Current Diary backend version." + "Current Diary back end version." (interactive) (message "NNDiary version %s" nndiary-version)) diff --git a/lisp/gnus-dired.el b/lisp/gnus-dired.el index 3937874..01c3c28 100644 --- a/lisp/gnus-dired.el +++ b/lisp/gnus-dired.el @@ -1,7 +1,7 @@ ;;; gnus-dired.el --- utility functions where gnus and dired meet -;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004 -;; Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Authors: Benjamin Rutt , ;; Shenghuo Zhu @@ -21,8 +21,8 @@ ;; 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. +;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/gnus-draft.el b/lisp/gnus-draft.el index 40b76a8..9aa3783 100644 --- a/lisp/gnus-draft.el +++ b/lisp/gnus-draft.el @@ -1,6 +1,7 @@ ;;; gnus-draft.el --- draft message support for Semi-gnus -;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; MORIOKA Tomohiko @@ -21,8 +22,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -98,6 +99,7 @@ (interactive) (let ((article (gnus-summary-article-number)) (group gnus-newsgroup-name)) + (gnus-draft-check-draft-articles (list article)) (gnus-summary-mark-as-read article gnus-canceled-mark) (gnus-draft-setup article group t) (set-buffer-modified-p t) @@ -122,6 +124,7 @@ (let* ((articles (gnus-summary-work-articles n)) (total (length articles)) article) + (gnus-draft-check-draft-articles articles) (while (setq article (pop articles)) (gnus-summary-remove-process-mark article) (unless (memq article gnus-newsgroup-unsendable) @@ -144,6 +147,8 @@ message-send-hook)) (message-setup-hook (and (not is-queue) message-setup-hook)) + (message-signature (and (not is-queue) + message-signature)) (gnus-agent-queue-mail (and (not is-queue) gnus-agent-queue-mail)) (rfc2047-encode-encoded-words nil) @@ -152,7 +157,7 @@ ;; We read the meta-information that says how and where ;; this message is to be sent. (save-restriction - (message-narrow-to-head) + (message-narrow-to-headers) (when (re-search-forward (concat "^" (regexp-quote gnus-agent-target-move-group-header) ":") nil t) @@ -263,9 +268,12 @@ (goto-char (point-min)) (search-forward "\n\n") (forward-char -1) + (save-restriction + (narrow-to-region (point-min) (point)) + (setq ga + (message-fetch-field gnus-draft-meta-information-header))) (insert mail-header-separator) (forward-line 1) - (setq ga (message-fetch-field gnus-draft-meta-information-header)) (message-set-auto-save-file-name)))) (gnus-backlog-remove-article group narticle) (when (and ga @@ -290,6 +298,32 @@ "Say whether ARTICLE is sendable." (not (memq article gnus-newsgroup-unsendable))) +(defun gnus-draft-check-draft-articles (articles) + "Check whether the draft articles ARTICLES are under edit." + (when (equal gnus-newsgroup-name "nndraft:drafts") + (let ((buffers (buffer-list)) + file buffs buff) + (save-current-buffer + (while (and articles + (not buff)) + (setq file (nndraft-article-filename (pop articles)) + buffs buffers) + (while buffs + (set-buffer (setq buff (pop buffs))) + (if (and buffer-file-name + (string-equal (file-truename buffer-file-name) + (file-truename file)) + (buffer-modified-p)) + (setq buffs nil) + (setq buff nil))))) + (when buff + (let* ((window (get-buffer-window buff t)) + (frame (and window (window-frame window)))) + (if frame + (gnus-select-frame-set-input-focus frame) + (pop-to-buffer buff t))) + (error "The draft %s is under edit" file))))) + (provide 'gnus-draft) ;;; gnus-draft.el ends here diff --git a/lisp/gnus-dup.el b/lisp/gnus-dup.el index b332e73..5446117 100644 --- a/lisp/gnus-dup.el +++ b/lisp/gnus-dup.el @@ -1,6 +1,7 @@ ;;; gnus-dup.el --- suppression of duplicate articles in Gnus -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2004 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news @@ -19,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/gnus-eform.el b/lisp/gnus-eform.el index f209011..f788a30 100644 --- a/lisp/gnus-eform.el +++ b/lisp/gnus-eform.el @@ -1,6 +1,7 @@ ;;; gnus-eform.el --- a mode for editing forms for Gnus -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2004 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news @@ -19,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -83,7 +84,7 @@ It is a slightly enhanced emacs-lisp-mode. (use-local-map gnus-edit-form-mode-map) (make-local-variable 'gnus-edit-form-done-function) (make-local-variable 'gnus-prev-winconf) - (gnus-run-hooks 'gnus-edit-form-mode-hook)) + (gnus-run-mode-hooks 'gnus-edit-form-mode-hook)) (defun gnus-edit-form (form documentation exit-func) "Edit FORM in a new buffer. diff --git a/lisp/gnus-ems.el b/lisp/gnus-ems.el index 41dddd3..e820583 100644 --- a/lisp/gnus-ems.el +++ b/lisp/gnus-ems.el @@ -1,6 +1,7 @@ ;;; gnus-ems.el --- functions for making Semi-gnus work under different Emacsen -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Tatsuya Ichikawa @@ -20,8 +21,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/gnus-fun.el b/lisp/gnus-fun.el index e7f88d0..6734543 100644 --- a/lisp/gnus-fun.el +++ b/lisp/gnus-fun.el @@ -1,5 +1,6 @@ ;;; gnus-fun.el --- various frivolous extension functions to Gnus -;; Copyright (C) 2002, 2003 Free Software Foundation, Inc. + +;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news @@ -18,8 +19,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -31,6 +32,7 @@ (require 'gnus-ems) (require 'gnus-util) +(require 'gnus) (defcustom gnus-x-face-directory (expand-file-name "x-faces" gnus-directory) "*Directory where X-Face PBM files are stored." @@ -44,21 +46,37 @@ :group 'gnus-fun :type 'string) -(defcustom gnus-convert-image-to-x-face-command "giftopnm %s | ppmnorm | pnmscale -width 48 -height 48 | ppmtopgm | pgmtopbm | pbmtoxbm | compface" +(defcustom gnus-convert-image-to-x-face-command + "convert -scale 48x48! %s xbm:- | xbm2xface.pl" "Command for converting an image to an X-Face. +The command must take a image filename (use \"%s\") as input. +The output must be the Face header data on stdout in PNG format. + By default it takes a GIF filename and output the X-Face header data on stdout." :version "22.1" :group 'gnus-fun - :type 'string) - -(defcustom gnus-convert-image-to-face-command "djpeg %s | ppmnorm | pnmscale -width 48 -height 48 | ppmquant %d | pnmtopng" - "Command for converting an image to an Face. -By default it takes a JPEG filename and output the Face header data -on stdout." + :type '(choice (const :tag "giftopnm, netpbm (GIF input only)" + "giftopnm %s | ppmnorm | pnmscale -width 48 -height 48 | ppmtopgm | pgmtopbm | pbmtoxbm | compface") + (const :tag "convert" + "convert -scale 48x48! %s xbm:- | xbm2xface.pl") + (string))) + +(defcustom gnus-convert-image-to-face-command + "convert -scale 48x48! %s -colors %d png:-" + "Command for converting an image to a Face. + +The command must take an image filename (first format argument +\"%s\") and the number of colors (second format argument: \"%d\") +as input. The output must be the Face header data on stdout in +PNG format." :version "22.1" :group 'gnus-fun - :type 'string) + :type '(choice (const :tag "djpeg, netpbm (JPG input only)" + "djpeg %s | ppmnorm | pnmscale -width 48 -height 48 | ppmquant %d | pnmtopng") + (const :tag "convert" + "convert -scale 48x48! %s -colors %d png:-") + (string))) (defcustom gnus-face-properties-alist (if (featurep 'xemacs) '((xface . (:face gnus-x-face))) @@ -81,6 +99,7 @@ See the manual for the valid properties for various image types. Currently, `pbm' is used for X-Face images and `png' is used for Face images in Emacs. Only the `:face' property is effective on the `xface' image type in XEmacs if it is built with the libcompface library." + :version "23.0" ;; No Gnus :group 'gnus-fun :type '(repeat (cons :format "%v" (symbol :tag "Image type") plist))) @@ -124,8 +143,11 @@ Output to the current buffer, replace text, and don't mingle error." ;;;###autoload (defun gnus-x-face-from-file (file) - "Insert an X-Face header based on an image file." - (interactive "fImage file name (by default GIF): ") + "Insert an X-Face header based on an image file. + +Depending on `gnus-convert-image-to-x-face-command' it may accept +different input formats." + (interactive "fImage file name: ") (when (file-exists-p file) (gnus-shell-command-to-string (format gnus-convert-image-to-x-face-command @@ -133,8 +155,11 @@ Output to the current buffer, replace text, and don't mingle error." ;;;###autoload (defun gnus-face-from-file (file) - "Return an Face header based on an image file." - (interactive "fImage file name (by default JPEG): ") + "Return a Face header based on an image file. + +Depending on `gnus-convert-image-to-face-command' it may accept +different input formats." + (interactive "fImage file name: ") (when (file-exists-p file) (let ((done nil) (attempt "") @@ -149,7 +174,7 @@ Output to the current buffer, replace text, and don't mingle error." quant)))) (if (> (length attempt) 726) (progn - (setq quant (- quant 2)) + (setq quant (- quant (if (< quant 10) 1 2))) (gnus-message 9 "Length %d; trying quant %d" (length attempt) quant)) (setq done t))) diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el index d9719ce..1ab2a5a 100644 --- a/lisp/gnus-group.el +++ b/lisp/gnus-group.el @@ -1,6 +1,7 @@ ;;; gnus-group.el --- group mode commands for Gnus -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news @@ -19,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -28,7 +29,7 @@ (eval-when-compile (require 'cl) - (defvar tool-bar-map)) + (defvar tool-bar-mode)) (require 'gnus) (require 'gnus-start) @@ -38,10 +39,11 @@ (require 'gnus-range) (require 'gnus-win) (require 'gnus-undo) +(require 'gmm-utils) (require 'time-date) (require 'gnus-ems) -(eval-when-compile +(eval-when-compile (require 'mm-url) (let ((features (cons 'gnus-group features))) (require 'gnus-sum)) @@ -288,14 +290,15 @@ variable." :type 'hook) (defcustom gnus-useful-groups - '(("(ding) mailing list mirrored at sunsite.auc.dk" - "emacs.ding" - (nntp "sunsite.auc.dk" - (nntp-address "sunsite.auc.dk"))) - ("gnus-bug archive" - "gnus-bug" - (nndir "/ftp@ftp.ifi.uio.no:/pub/emacs/gnus/gnus-bug/")) - ("Gnus help group" + '(("(ding) mailing list mirrored at gmane.org" + "gmane.emacs.gnus.general" + (nntp "Gmane" + (nntp-address "news.gmane.org"))) + ("Gnus bug archive" + "gnus.gnus-bug" + (nntp "news.gnus.org" + (nntp-address "news.gnus.org"))) + ("Local Gnus help group" "gnus-help" (nndoc "gnus-help" (nndoc-article-type mbox) @@ -314,50 +317,50 @@ variable." (defcustom gnus-group-highlight '(;; Mail. ((and mailp (= unread 0) (eq level 1)) . - gnus-group-mail-1-empty-face) + gnus-group-mail-1-empty) ((and mailp (eq level 1)) . - gnus-group-mail-1-face) + gnus-group-mail-1) ((and mailp (= unread 0) (eq level 2)) . - gnus-group-mail-2-empty-face) + gnus-group-mail-2-empty) ((and mailp (eq level 2)) . - gnus-group-mail-2-face) + gnus-group-mail-2) ((and mailp (= unread 0) (eq level 3)) . - gnus-group-mail-3-empty-face) + gnus-group-mail-3-empty) ((and mailp (eq level 3)) . - gnus-group-mail-3-face) + gnus-group-mail-3) ((and mailp (= unread 0)) . - gnus-group-mail-low-empty-face) + gnus-group-mail-low-empty) ((and mailp) . - gnus-group-mail-low-face) + gnus-group-mail-low) ;; News. ((and (= unread 0) (eq level 1)) . - gnus-group-news-1-empty-face) + gnus-group-news-1-empty) ((and (eq level 1)) . - gnus-group-news-1-face) + gnus-group-news-1) ((and (= unread 0) (eq level 2)) . - gnus-group-news-2-empty-face) + gnus-group-news-2-empty) ((and (eq level 2)) . - gnus-group-news-2-face) + gnus-group-news-2) ((and (= unread 0) (eq level 3)) . - gnus-group-news-3-empty-face) + gnus-group-news-3-empty) ((and (eq level 3)) . - gnus-group-news-3-face) + gnus-group-news-3) ((and (= unread 0) (eq level 4)) . - gnus-group-news-4-empty-face) + gnus-group-news-4-empty) ((and (eq level 4)) . - gnus-group-news-4-face) + gnus-group-news-4) ((and (= unread 0) (eq level 5)) . - gnus-group-news-5-empty-face) + gnus-group-news-5-empty) ((and (eq level 5)) . - gnus-group-news-5-face) + gnus-group-news-5) ((and (= unread 0) (eq level 6)) . - gnus-group-news-6-empty-face) + gnus-group-news-6-empty) ((and (eq level 6)) . - gnus-group-news-6-face) + gnus-group-news-6) ((and (= unread 0)) . - gnus-group-news-low-empty-face) + gnus-group-news-low-empty) (t . - gnus-group-news-low-face)) + gnus-group-news-low)) "*Controls the highlighting of group buffer lines. Below is a list of `Form'/`Face' pairs. When deciding how a a @@ -387,7 +390,7 @@ ticked: The number of ticked articles." :type 'character) (defgroup gnus-group-icons nil - "Add Icons to your group buffer. " + "Add Icons to your group buffer." :group 'gnus-group-visual) (defcustom gnus-group-icon-list @@ -666,6 +669,7 @@ simple manner.") "r" gnus-group-rename-group "R" gnus-group-make-rss-group "c" gnus-group-customize + "z" gnus-group-compact-group "x" gnus-group-nnimap-expunge "\177" gnus-group-delete-group [delete] gnus-group-delete-group) @@ -844,6 +848,8 @@ simple manner.") (gnus-group-group-name)] ["Select quick" gnus-group-quick-select-group (gnus-group-group-name)] ["Customize" gnus-group-customize (gnus-group-group-name)] + ["Compact" gnus-group-compact-group + :active (gnus-group-group-name)] ("Edit" ["Parameters" gnus-group-edit-group-parameters :included (not (gnus-topic-mode-p)) @@ -1000,36 +1006,146 @@ simple manner.") (gnus-run-hooks 'gnus-group-menu-hook))) -(defvar gnus-group-toolbar-map nil) - -;; Emacs 21 tool bar. Should be no-op otherwise. -(defun gnus-group-make-tool-bar () - (if (and - (condition-case nil (require 'tool-bar) (error nil)) - (fboundp 'tool-bar-add-item-from-menu) - (default-value 'tool-bar-mode) - (not gnus-group-toolbar-map)) - (setq gnus-group-toolbar-map - (let ((tool-bar-map (make-sparse-keymap)) - (load-path (mm-image-load-path))) - (tool-bar-add-item-from-menu - 'gnus-group-get-new-news "get-news" gnus-group-mode-map) - (tool-bar-add-item-from-menu - 'gnus-group-get-new-news-this-group "gnntg" gnus-group-mode-map) - (tool-bar-add-item-from-menu - 'gnus-group-catchup-current "catchup" gnus-group-mode-map) - (tool-bar-add-item-from-menu - 'gnus-group-describe-group "describe-group" gnus-group-mode-map) - (tool-bar-add-item "subscribe" 'gnus-group-subscribe 'subscribe - :help "Subscribe to the current group") - (tool-bar-add-item "unsubscribe" 'gnus-group-unsubscribe - 'unsubscribe - :help "Unsubscribe from the current group") - (tool-bar-add-item-from-menu - 'gnus-group-exit "exit-gnus" gnus-group-mode-map) - tool-bar-map))) - (if gnus-group-toolbar-map - (set (make-local-variable 'tool-bar-map) gnus-group-toolbar-map))) + +(defvar gnus-group-tool-bar-map nil) + +(defun gnus-group-tool-bar-update (&optional symbol value) + "Update group buffer toolbar. +Setter function for custom variables." + (when symbol + (set-default symbol value)) + ;; (setq-default gnus-group-tool-bar-map nil) + ;; (use-local-map gnus-group-mode-map) + (when (gnus-alive-p) + (with-current-buffer gnus-group-buffer + (gnus-group-make-tool-bar t)))) + +(defcustom gnus-group-tool-bar (if (eq gmm-tool-bar-style 'gnome) + 'gnus-group-tool-bar-gnome + 'gnus-group-tool-bar-retro) + "Specifies the Gnus group tool bar. + +It can be either a list or a symbol refering to a list. See +`gmm-tool-bar-from-list' for the format of the list. The +default key map is `gnus-group-mode-map'. + +Pre-defined symbols include `gnus-group-tool-bar-gnome' and +`gnus-group-tool-bar-retro'." + :type '(choice (const :tag "GNOME style" gnus-group-tool-bar-gnome) + (const :tag "Retro look" gnus-group-tool-bar-retro) + (repeat :tag "User defined list" gmm-tool-bar-item) + (symbol)) + :version "23.0" ;; No Gnus + :initialize 'custom-initialize-default + :set 'gnus-group-tool-bar-update + :group 'gnus-group) + +(defcustom gnus-group-tool-bar-gnome + '((gnus-group-post-news "mail/compose") + ;; Some useful agent icons? I don't use the agent so agent users should + ;; suggest useful commands: + (gnus-agent-toggle-plugged "connect" t + :visible (and gnus-agent (not gnus-plugged))) + (gnus-agent-toggle-plugged "disconnect" t + :visible (and gnus-agent gnus-plugged)) + ;; FIXME: gnus-agent-toggle-plugged (in gnus-agent-group-make-menu-bar) + ;; should have a better help text. + (gnus-group-send-queue "mail/outbox" t + :visible (and gnus-agent gnus-plugged) + :help "Send articles from the queue group") + (gnus-group-get-new-news "mail/inbox" nil + :visible (or (not gnus-agent) + gnus-plugged)) + ;; FIXME: gnus-*-read-group should have a better help text. + (gnus-topic-read-group "open" nil + :visible (and (boundp 'gnus-topic-mode) + gnus-topic-mode)) + (gnus-group-read-group "open" nil + :visible (not (and (boundp 'gnus-topic-mode) + gnus-topic-mode))) + ;; (gnus-group-find-new-groups "???" nil) + (gnus-group-save-newsrc "save") + (gnus-group-describe-group "describe") + (gnus-group-unsubscribe-current-group "gnus/toggle-subscription") + (gnus-group-prev-unread-group "left-arrow") + (gnus-group-next-unread-group "right-arrow") + (gnus-group-exit "exit") + (gmm-customize-mode "preferences" t :help "Edit mode preferences") + (gnus-info-find-node "help")) + "List of functions for the group tool bar (GNOME style). + +See `gmm-tool-bar-from-list' for the format of the list." + :type '(repeat gmm-tool-bar-item) + :version "23.0" ;; No Gnus + :initialize 'custom-initialize-default + :set 'gnus-group-tool-bar-update + :group 'gnus-group) + +(defcustom gnus-group-tool-bar-retro + '((gnus-group-get-new-news "gnus/get-news") + (gnus-group-get-new-news-this-group "gnus/gnntg") + (gnus-group-catchup-current "gnus/catchup") + (gnus-group-describe-group "gnus/describe-group") + (gnus-group-subscribe "gnus/subscribe" t + :help "Subscribe to the current group") + (gnus-group-unsubscribe "gnus/unsubscribe" t + :help "Unsubscribe from the current group") + (gnus-group-exit "gnus/exit-gnus" gnus-group-mode-map)) + "List of functions for the group tool bar (retro look). + +See `gmm-tool-bar-from-list' for the format of the list." + :type '(repeat gmm-tool-bar-item) + :version "23.0" ;; No Gnus + :initialize 'custom-initialize-default + :set 'gnus-group-tool-bar-update + :group 'gnus-group) + +;; FIXME: Moving through the Group buffer (in topic mode) e.g. with C-n +;; doesn't update the state (enabled/disabled) of the icon +;; `gnus-group-describe-group'. After `C-l' the state is correct. +;; See the following report on emacs-devel +;; : +;; From: Reiner Steib +;; Subject: tool bar icons not updated according to :active condition +;; Newsgroups: gmane.emacs.devel +;; Date: Mon, 23 Jan 2006 19:59:13 +0100 +;; Message-ID: + +(defcustom gnus-group-tool-bar-zap-list t + "List of icon items from the global tool bar. +These items are not displayed in the Gnus group mode tool bar. + +See `gmm-tool-bar-from-list' for the format of the list." + :type 'gmm-tool-bar-zap-list + :version "23.0" ;; No Gnus + :initialize 'custom-initialize-default + :set 'gnus-group-tool-bar-update + :group 'gnus-group) + +(defvar image-load-path) + +(defun gnus-group-make-tool-bar (&optional force) + "Make a group mode tool bar from `gnus-group-tool-bar'. +When FORCE, rebuild the tool bar." + (when (and (not (featurep 'xemacs)) + (boundp 'tool-bar-mode) + tool-bar-mode + ;; The Gnus 5.10.6 code checked (default-value 'tool-bar-mode). + ;; Why? --rsteib + (or (not gnus-group-tool-bar-map) force)) + (let* ((load-path + (gmm-image-load-path-for-library "gnus" + "gnus/toggle-subscription.xpm" + nil t)) + (image-load-path (cons (car load-path) + (when (boundp 'image-load-path) + image-load-path))) + (map (gmm-tool-bar-from-list gnus-group-tool-bar + gnus-group-tool-bar-zap-list + 'gnus-group-mode-map))) + (if map + (set (make-local-variable 'tool-bar-map) map)))) + gnus-group-tool-bar-map) (defun gnus-group-mode () "Major mode for reading news. @@ -1070,7 +1186,7 @@ The following commands are available: (gnus-undo-mode 1)) (when gnus-slave (gnus-slave-mode)) - (gnus-run-hooks 'gnus-group-mode-hook)) + (gnus-run-mode-hooks 'gnus-group-mode-hook)) (defun gnus-update-group-mark-positions () (save-excursion @@ -1430,6 +1546,25 @@ if it is a string, only list groups matching REGEXP." (gnus-range-difference (list active) (gnus-info-read info)) seen)))))) +(defcustom gnus-group-update-tool-bar + (and (not (featurep 'xemacs)) + (boundp 'tool-bar-mode) + tool-bar-mode + ;; Using `redraw-frame' (see `gnus-tool-bar-update') in Emacs 21 might + ;; be confusing, so maybe we shouldn't call it by default. + (fboundp 'force-window-update)) + "Force updating the group buffer tool bar." + :group 'gnus-group + :version "22.1" + :initialize 'custom-initialize-default + :set (lambda (symbol value) + (set-default symbol value) + (when (gnus-alive-p) + (with-current-buffer gnus-group-buffer + ;; FIXME: Is there a better way to redraw the group buffer? + (gnus-group-get-new-news 0)))) + :type 'boolean) + (defun gnus-group-insert-group-line (gnus-tmp-group gnus-tmp-level gnus-tmp-marked number gnus-tmp-method) @@ -1494,8 +1629,10 @@ if it is a string, only list groups matching REGEXP." (if (member gnus-tmp-group gnus-group-marked) gnus-process-mark ? )) (buffer-read-only nil) + beg end header gnus-tmp-header) ; passed as parameter to user-funcs. (beginning-of-line) + (setq beg (point)) (gnus-add-text-properties (point) (prog1 (1+ (point)) @@ -1505,11 +1642,17 @@ if it is a string, only list groups matching REGEXP." (eval gnus-group-line-format-spec))) `(gnus-group ,(gnus-intern-safe gnus-tmp-group gnus-active-hashtb) gnus-unread ,(if (numberp number) - (string-to-int gnus-tmp-number-of-unread) + (string-to-number gnus-tmp-number-of-unread) t) gnus-marked ,gnus-tmp-marked-mark gnus-indentation ,gnus-group-indentation gnus-level ,gnus-tmp-level)) + (setq end (point)) + (when gnus-group-update-tool-bar + (gnus-put-text-property beg end 'point-entered + 'gnus-tool-bar-update) + (gnus-put-text-property beg end 'point-left + 'gnus-tool-bar-update)) (forward-line -1) (when (inline (gnus-visual-p 'group-highlight 'highlight)) (gnus-run-hooks 'gnus-group-update-hook)) @@ -1738,7 +1881,7 @@ If FIRST-TOO, the current line is also eligible as a target." (size (+ size-in-cache size-in-agent)) (suffix '("B" "K" "M" "G")) (scale 1024.0) - (cutoff (* 10 scale))) + (cutoff scale)) (while (> size cutoff) (setq size (/ size scale) suffix (cdr suffix))) @@ -2283,6 +2426,25 @@ If EXCLUDE-GROUP, do not go to that group." (gnus-group-position-point) (and best-point (gnus-group-group-name)))) +;; Is there something like an after-point-motion-hook? +;; (inhibit-point-motion-hooks?). Is there a tool-bar-update function? + +;; (defun gnus-group-menu-bar-update () +;; (let* ((buf (list (with-current-buffer gnus-group-buffer +;; (current-buffer)))) +;; (name (buffer-name (car buf)))) +;; (setcdr buf +;; (if (> (length name) 27) +;; (concat (substring name 0 12) +;; "..." +;; (substring name -12)) +;; name)) +;; (menu-bar-update-buffers-1 buf))) + +;; (defun gnus-group-position-point () +;; (gnus-goto-colon) +;; (gnus-group-menu-bar-update)) + (defun gnus-group-first-unread-group () "Go to the first group with unread articles." (interactive) @@ -3331,7 +3493,7 @@ Uses the process/prefix convention." (progn (unless (gnus-group-process-prefix current-prefix-arg) (error "No group on the current line")) - (string-to-int + (string-to-number (let ((s (read-string (format "Level (default %s): " (or (gnus-group-group-level) @@ -3677,7 +3839,10 @@ re-scanning. If ARG is non-nil and not a number, this will force ;; We might read in new NoCeM messages here. (when (and gnus-use-nocem - (null arg)) + (or (and (numberp gnus-use-nocem) + (numberp arg) + (>= arg gnus-use-nocem)) + (not arg))) (gnus-nocem-scan-groups)) ;; If ARG is not a number, then we read the active file. (when (and arg (not (numberp arg))) @@ -4384,6 +4549,40 @@ This command may read the active file." (gnus-add-marked-articles group 'expire (list article)))))) + +;;; +;;; Group compaction. -- dvl +;;; + +(defun gnus-group-compact-group (group) + "Compact the current group. +Compaction means removing gaps between article numbers. Hence, this +operation is only meaningful for back ends using one file per article +\(e.g. nnml). + +Note: currently only implemented in nnml." + (interactive (list (gnus-group-group-name))) + (unless group + (error "No group to compact")) + (unless (gnus-check-backend-function 'request-compact-group group) + (error "This back end does not support group compaction")) + (let ((group-decoded (gnus-group-decoded-name group))) + (gnus-message 6 "\ +Compacting group %s... (this may take a long time)" + group-decoded) + (prog1 + (if (not (gnus-request-compact-group group)) + (gnus-error 3 "Couldn't compact group %s" group-decoded) + (gnus-message 6 "Compacting group %s...done" group-decoded) + t) + ;; Invalidate the "original article" buffer which might be out of date. + ;; #### NOTE: Yes, this might be a bit rude, but since compaction + ;; #### will not happen very often, I think this is acceptable. + (let ((original (get-buffer gnus-original-article-buffer))) + (and original (gnus-kill-buffer original))) + ;; Update the group line to reflect new information (art number etc). + (gnus-group-update-group-line)))) + (provide 'gnus-group) ;;; gnus-group.el ends here diff --git a/lisp/gnus-i18n.el b/lisp/gnus-i18n.el index c71b1e2..484dd36 100644 --- a/lisp/gnus-i18n.el +++ b/lisp/gnus-i18n.el @@ -20,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Code: diff --git a/lisp/gnus-int.el b/lisp/gnus-int.el index f6cc6c8..32b371d 100644 --- a/lisp/gnus-int.el +++ b/lisp/gnus-int.el @@ -1,6 +1,7 @@ ;;; gnus-int.el --- backend interface functions for Gnus -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; MORIOKA Tomohiko @@ -20,8 +21,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -250,10 +251,12 @@ If it is down, start it up (again)." ;; recurse to open the agent's backend. (setq open-offline (eq gnus-server-unopen-status 'offline)) gnus-server-unopen-status) - ((gnus-y-or-n-p - (format "Unable to open %s:%s, go offline? " - (car gnus-command-method) - (cadr gnus-command-method))) + ((and + (not gnus-batch-mode) + (gnus-y-or-n-p + (format "Unable to open %s:%s, go offline? " + (car gnus-command-method) + (cadr gnus-command-method)))) (setq open-offline t) 'offline) (t @@ -333,6 +336,23 @@ name. The method this group uses will be queried." (funcall (gnus-get-function gnus-command-method 'request-regenerate) (nth 1 gnus-command-method))) +(defun gnus-request-compact-group (group) + (let* ((method (gnus-find-method-for-group group)) + (gnus-command-method method) + (result + (funcall (gnus-get-function gnus-command-method + 'request-compact-group) + (gnus-group-real-name group) + (nth 1 gnus-command-method) t))) + result)) + +(defun gnus-request-compact (gnus-command-method) + "Request groups compaction from GNUS-COMMAND-METHOD." + (when (stringp gnus-command-method) + (setq gnus-command-method (gnus-server-to-method gnus-command-method))) + (funcall (gnus-get-function gnus-command-method 'request-compact) + (nth 1 gnus-command-method))) + (defun gnus-request-group (group &optional dont-check gnus-command-method) "Request GROUP. If DONT-CHECK, no information is required." (let ((gnus-command-method diff --git a/lisp/gnus-kill.el b/lisp/gnus-kill.el index d634dfe..f3c7c49 100644 --- a/lisp/gnus-kill.el +++ b/lisp/gnus-kill.el @@ -1,6 +1,7 @@ ;;; gnus-kill.el --- kill commands for Gnus -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2003 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Masanobu UMEDA ;; Lars Magne Ingebrigtsen @@ -20,8 +21,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -161,7 +162,7 @@ gnus-kill-file-mode-hook with no arguments, if that value is non-nil." (setq major-mode 'gnus-kill-file-mode) (setq mode-name "Kill") (lisp-mode-variables nil) - (gnus-run-hooks 'emacs-lisp-mode-hook 'gnus-kill-file-mode-hook)) + (gnus-run-mode-hooks 'emacs-lisp-mode-hook 'gnus-kill-file-mode-hook)) (defun gnus-kill-file-edit-file (newsgroup) "Begin editing a kill file for NEWSGROUP. diff --git a/lisp/gnus-logic.el b/lisp/gnus-logic.el index 06c46fb..966ab7c 100644 --- a/lisp/gnus-logic.el +++ b/lisp/gnus-logic.el @@ -1,6 +1,7 @@ ;;; gnus-logic.el --- advanced scoring code for Gnus -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news @@ -19,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/gnus-mailcap.el b/lisp/gnus-mailcap.el index 51abb73..b2b0a37 100644 --- a/lisp/gnus-mailcap.el +++ b/lisp/gnus-mailcap.el @@ -1,6 +1,7 @@ ;;; mailcap.el --- MIME media types configuration -;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: William M. Perry ;; Lars Magne Ingebrigtsen @@ -20,8 +21,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -531,7 +532,12 @@ MAILCAPS if set; otherwise (on Unix) use the path from RFC 1524, plus (skip-chars-forward ";")) (setq done t)))) (setq value (buffer-substring val-pos (point)))) - (setq results (cons (cons name value) results)) + ;; `test' as symbol, others like "copiousoutput" and "needsx11" as + ;; strings + (setq results (cons (cons (if (string-equal name "test") + 'test + name) + value) results)) (skip-chars-forward " \";\n\t")) results))) @@ -638,30 +644,31 @@ to supply to the test." (viewer (cdr (assoc 'viewer viewer-info))) (default-directory (expand-file-name "~/")) status parsed-test cache result) - (if (setq cache (assoc test mailcap-viewer-test-cache)) - (cadr cache) - (setq - result - (cond - ((not test-info) t) ; No test clause - ((not test) nil) ; Already failed test - ((eq test t) t) ; Already passed test - ((functionp test) ; Lisp function as test - (funcall test type-info)) - ((and (symbolp test) ; Lisp variable as test - (boundp test)) - (symbol-value test)) - ((and (listp test) ; List to be eval'd - (symbolp (car test))) - (eval test)) - (t - (setq test (mailcap-unescape-mime-test test type-info) - test (list shell-file-name nil nil nil - shell-command-switch test) - status (apply 'call-process test)) - (eq 0 status)))) - (push (list otest result) mailcap-viewer-test-cache) - result))) + (cond ((setq cache (assoc test mailcap-viewer-test-cache)) + (cadr cache)) + ((not test-info) t) ; No test clause + (t + (setq + result + (cond + ((not test) nil) ; Already failed test + ((eq test t) t) ; Already passed test + ((functionp test) ; Lisp function as test + (funcall test type-info)) + ((and (symbolp test) ; Lisp variable as test + (boundp test)) + (symbol-value test)) + ((and (listp test) ; List to be eval'd + (symbolp (car test))) + (eval test)) + (t + (setq test (mailcap-unescape-mime-test test type-info) + test (list shell-file-name nil nil nil + shell-command-switch test) + status (apply 'call-process test)) + (eq 0 status)))) + (push (list otest result) mailcap-viewer-test-cache) + result)))) (defun mailcap-add-mailcap-entry (major minor info) (let ((old-major (assoc major mailcap-mime-data))) diff --git a/lisp/gnus-mh.el b/lisp/gnus-mh.el index 35ee140..b5d9c2c 100644 --- a/lisp/gnus-mh.el +++ b/lisp/gnus-mh.el @@ -1,6 +1,7 @@ ;;; gnus-mh.el --- mh-e interface for Gnus -;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003, +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Masanobu UMEDA ;; Lars Magne Ingebrigtsen @@ -20,8 +21,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/gnus-ml.el b/lisp/gnus-ml.el index 71957b2..f9898f9 100644 --- a/lisp/gnus-ml.el +++ b/lisp/gnus-ml.el @@ -1,6 +1,7 @@ ;;; gnus-ml.el --- Mailing list minor mode for Gnus -;; Copyright (C) 2000, 2001 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Julien Gilles ;; Keywords: news, mail @@ -19,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/gnus-mlspl.el b/lisp/gnus-mlspl.el index a6232d3..34a6bdc 100644 --- a/lisp/gnus-mlspl.el +++ b/lisp/gnus-mlspl.el @@ -1,7 +1,7 @@ ;;; gnus-mlspl.el --- a group params-based mail splitting mechanism -;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004 -;; Free Software Foundation, Inc. +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Alexandre Oliva ;; Keywords: news, mail @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with this program; see the file COPYING. If not, write to -;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/gnus-move.el b/lisp/gnus-move.el index a949eb9..1b6ca79 100644 --- a/lisp/gnus-move.el +++ b/lisp/gnus-move.el @@ -1,6 +1,7 @@ ;;; gnus-move.el --- commands for moving Gnus from one server to another -;; Copyright (C) 1996, 1997, 1998, 1999, 2000 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news @@ -19,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el index 88069e1..5a7fa0e 100644 --- a/lisp/gnus-msg.el +++ b/lisp/gnus-msg.el @@ -1,6 +1,7 @@ ;;; gnus-msg.el --- mail and post interface for Semi-gnus -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -;; 2005 Free Software Foundation, Inc. + +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Masanobu UMEDA ;; Lars Magne Ingebrigtsen @@ -24,8 +25,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -71,8 +72,10 @@ message in, you can set this variable to a function that checks the current newsgroup name and then returns a suitable group name (or list of names)." :group 'gnus-message - :type '(choice (string :tag "Group") - (function))) + :type '(choice (const nil) + (function) + (string :tag "Group") + (repeat :tag "List of groups" (string :tag "Group")))) (defcustom gnus-mailing-list-groups nil "*If non-nil a regexp matching groups that are really mailing lists. @@ -501,27 +504,19 @@ Gcc: header for archiving purposes." ;; COMPOSEFUNC should return t if succeed. Undocumented ??? t) -(defvar save-selected-window-window) - ;;;###autoload (defun gnus-button-mailto (address) "Mail to ADDRESS." (set-buffer (gnus-copy-article-buffer)) (gnus-setup-message 'message - (message-reply address)) - (and (boundp 'save-selected-window-window) - (not (window-live-p save-selected-window-window)) - (setq save-selected-window-window (selected-window)))) + (message-reply address))) ;;;###autoload (defun gnus-button-reply (&optional to-address wide) "Like `message-reply'." (interactive) (gnus-setup-message 'message - (message-reply to-address wide)) - (and (boundp 'save-selected-window-window) - (not (window-live-p save-selected-window-window)) - (setq save-selected-window-window (selected-window)))) + (message-reply to-address wide))) ;;;###autoload (define-mail-user-agent 'gnus-user-agent @@ -552,7 +547,7 @@ Gcc: header for archiving purposes." (gnus-make-local-hook 'message-header-hook) (add-hook 'message-header-hook 'gnus-agent-possibly-save-gcc nil t)) (setq message-post-method - `(lambda (arg) + `(lambda (&optional arg) (gnus-post-method arg ,gnus-newsgroup-name))) (setq message-user-agent (gnus-message-make-user-agent)) (unless message-use-multi-frames @@ -927,10 +922,10 @@ header line with the old Message-ID." (when (featurep 'smiley-mule) (smiley-encode-buffer))) (gnus-article-delete-text-of-type 'annotation) + (gnus-article-delete-text-of-type 'multipart) (gnus-remove-text-with-property 'gnus-prev) (gnus-remove-text-with-property 'gnus-next) (gnus-remove-text-with-property 'gnus-decoration) - (gnus-remove-text-with-property 'x-face-mule-bitmap-image) (insert (prog1 (static-if (featurep 'xemacs) @@ -1858,7 +1853,7 @@ this is a reply." (gcc (cond ((functionp group) (funcall group)) - ((or (stringp group) (list group)) + ((or (stringp group) (listp group)) group)))) (when gcc (insert "Gcc: " diff --git a/lisp/gnus-namazu.el b/lisp/gnus-namazu.el index 081ba22..46cc071 100644 --- a/lisp/gnus-namazu.el +++ b/lisp/gnus-namazu.el @@ -17,9 +17,9 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with this program; if not, you can either send email to this -;; program's maintainer or write to: The Free Software Foundation, -;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA. +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -237,7 +237,8 @@ This means that the group \"nnimap+server:INBOX.group\" is placed in \"~/Maildir/.group\"." :group 'gnus-namazu :type '(repeat - (cons (regexp :tag "Regexp of group name") + (cons (choice (regexp :tag "Regexp of group name") + (const :tag "Groups served by `gnus-select-method'" t)) (string :tag "Base path of groups"))) :set (lambda (symbol value) (prog1 (set-default symbol value) @@ -336,7 +337,9 @@ This means that the group \"nnimap+server:INBOX.group\" is placed in "-a" ; show all matches "-l") ; use list format gnus-namazu-additional-arguments - (list query) + (list (if gnus-namazu-command-prefix + (concat "'" query "'") + query)) gnus-namazu-index-directories))) (apply 'call-process (car commands) nil t nil (cdr commands)))) @@ -367,10 +370,14 @@ This means that the group \"nnimap+server:INBOX.group\" is placed in (gnus-namazu/server-directory method)))) (push (cons dir group) alist))) (dolist (pair gnus-namazu-remote-groups) - (when (string-match (car pair) group) - (setq dir (nnmail-group-pathname - (substring group (match-end 0)) - "/")) + (when (setq dir + (or (and (eq t (car pair)) + (gnus-method-equal method gnus-select-method) + group) + (and (stringp (car pair)) + (string-match (car pair) group) + (substring group (match-end 0))))) + (setq dir (nnmail-group-pathname dir "/")) (push (cons (concat (cdr pair) ;; nnmail-group-pathname() on some ;; systems returns pathnames which diff --git a/lisp/gnus-nocem.el b/lisp/gnus-nocem.el index bbaf550..de134a2 100644 --- a/lisp/gnus-nocem.el +++ b/lisp/gnus-nocem.el @@ -1,8 +1,7 @@ ;;; gnus-nocem.el --- NoCeM pseudo-cancellation treatment -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2004 -;; Free Software Foundation, Inc. - +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news @@ -21,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -37,7 +36,7 @@ (require 'gnus-range) (defgroup gnus-nocem nil - "NoCeM pseudo-cancellation treatment" + "NoCeM pseudo-cancellation treatment." :group 'gnus-score) (defcustom gnus-nocem-groups @@ -74,12 +73,16 @@ issuer registry." :group 'gnus-nocem :type 'integer) -(defcustom gnus-nocem-verifyer 'mc-verify +(defcustom gnus-nocem-verifyer (lambda () + (pgg-verify-region (point-min) (point-max))) "*Function called to verify that the NoCeM message is valid. -One likely value is `mc-verify'. If the function in this variable -isn't bound, the message will be used unconditionally." +One likely value is the function using `pgg-verify-region'. +If the function in this variable isn't bound, the message will be used +unconditionally." :group 'gnus-nocem - :type '(radio (function-item mc-verify) + :type '(radio (function (lambda () + (pgg-verify-region (point-min) (point-max)))) + (function-item mc-verify) (function :tag "other"))) (defcustom gnus-nocem-liberal-fetch nil @@ -129,13 +132,15 @@ valid issuer, which is much faster if you are selective about the issuers." (defun gnus-fill-real-hashtb () "Fill up a hash table with the real-name mappings from the user's active file." - (setq gnus-nocem-real-group-hashtb (gnus-make-hashtable - (length gnus-newsrc-alist))) + (if (hash-table-p gnus-nocem-real-group-hashtb) + (clrhash gnus-nocem-real-group-hashtb) + (setq gnus-nocem-real-group-hashtb (make-hash-table :test 'equal))) (mapcar (lambda (group) (setq group (gnus-group-real-name (car group))) - (gnus-sethash group t gnus-nocem-real-group-hashtb)) + (puthash group t gnus-nocem-real-group-hashtb)) gnus-newsrc-alist)) +;;;###autoload (defun gnus-nocem-scan-groups () "Scan all NoCeM groups for new NoCeM messages." (interactive) @@ -206,10 +211,10 @@ valid issuer, which is much faster if you are selective about the issuers." (not (member (mail-header-message-id header) gnus-nocem-seen-message-ids)))) (push header check-headers))) - (let* ((i 0) - (check-headers - (last check-headers gnus-nocem-check-article-limit)) - (len (length check-headers))) + (setq check-headers (last (nreverse check-headers) + gnus-nocem-check-article-limit)) + (let ((i 0) + (len (length check-headers))) (dolist (h check-headers) (gnus-message 7 "Checking article %d in %s for NoCeM (%d of %d)..." @@ -235,9 +240,13 @@ valid issuer, which is much faster if you are selective about the issuers." (days-to-time gnus-nocem-expiry-wait))) (gnus-request-article-this-buffer (mail-header-number header) group) (goto-char (point-min)) - (when (re-search-forward "-----BEGIN PGP MESSAGE-----" nil t) + (when (re-search-forward + "-----BEGIN PGP\\(?: SIGNED\\)? MESSAGE-----" + nil t) (delete-region (point-min) (match-beginning 0))) - (when (re-search-forward "-----END PGP MESSAGE-----\n?" nil t) + (when (re-search-forward + "-----END PGP \\(?:MESSAGE\\|SIGNATURE\\)-----\n?" + nil t) (delete-region (match-end 0) (point-max))) (goto-char (point-min)) ;; The article has to have proper NoCeM headers. @@ -246,7 +255,7 @@ valid issuer, which is much faster if you are selective about the issuers." ;; We get the name of the issuer. (narrow-to-region b e) (setq issuer (mail-fetch-field "issuer") - type (mail-fetch-field "issuer")) + type (mail-fetch-field "type")) (widen) (if (not (gnus-nocem-message-wanted-p issuer type)) (message "invalid NoCeM issuer: %s" issuer) @@ -267,18 +276,20 @@ valid issuer, which is much faster if you are selective about the issuers." (while (setq condition (pop conditions)) (cond ((stringp condition) - (setq wanted (string-match condition type))) + (when (string-match condition type) + (setq wanted t))) ((and (consp condition) (eq (car condition) 'not) (stringp (cadr condition))) - (setq wanted (not (string-match (cadr condition) type)))) + (when (string-match (cadr condition) type) + (setq wanted nil))) (t (error "Invalid NoCeM condition: %S" condition)))) wanted)))) (defun gnus-nocem-verify-issuer (person) "Verify using PGP that the canceler is who she says she is." - (if (fboundp gnus-nocem-verifyer) + (if (functionp gnus-nocem-verifyer) (ignore-errors (funcall gnus-nocem-verifyer)) ;; If we don't have Mailcrypt, then we use the message anyway. @@ -297,31 +308,26 @@ valid issuer, which is much faster if you are selective about the issuers." (while (search-forward "\t" nil t) (cond ((not (ignore-errors - (setq group (let ((obarray gnus-nocem-real-group-hashtb)) - (read buf))))) + (setq group (gnus-group-real-name (symbol-name (read buf)))) + (gethash group gnus-nocem-real-group-hashtb))) ;; An error. ) - ((not (symbolp group)) - ;; Ignore invalid entries. - ) - ((not (boundp group)) - ;; Make sure all entries in the hashtb are bound. - (set group nil)) (t - (when (gnus-gethash (gnus-group-real-name (symbol-name group)) - gnus-nocem-real-group-hashtb) - ;; Valid group. - (beginning-of-line) - (while (eq (char-after) ?\t) - (forward-line -1)) - (setq id (buffer-substring (point) (1- (search-forward "\t")))) - (unless (gnus-gethash id gnus-nocem-hashtb) - ;; only store if not already present - (gnus-sethash id t gnus-nocem-hashtb) - (push id ncm)) - (forward-line 1) - (while (eq (char-after) ?\t) - (forward-line 1)))))) + ;; Valid group. + (beginning-of-line) + (while (eq (char-after) ?\t) + (forward-line -1)) + (setq id (buffer-substring (point) (1- (search-forward "\t")))) + (unless (if (hash-table-p gnus-nocem-hashtb) + (gethash id gnus-nocem-hashtb) + (setq gnus-nocem-hashtb (make-hash-table :test 'equal)) + nil) + ;; only store if not already present + (puthash id t gnus-nocem-hashtb) + (push id ncm)) + (forward-line 1) + (while (eq (char-after) ?\t) + (forward-line 1))))) (when ncm (setq gnus-nocem-touched-alist t) (push (cons (let ((time (current-time))) (setcdr (cdr time) nil) time) @@ -329,6 +335,7 @@ valid issuer, which is much faster if you are selective about the issuers." gnus-nocem-alist)) t))) +;;;###autoload (defun gnus-nocem-load-cache () "Load the NoCeM cache." (interactive) @@ -359,7 +366,9 @@ valid issuer, which is much faster if you are selective about the issuers." (prev pprev) (expiry (days-to-time gnus-nocem-expiry-wait)) entry) - (setq gnus-nocem-hashtb (gnus-make-hashtable (* (length alist) 51))) + (if (hash-table-p gnus-nocem-hashtb) + (clrhash gnus-nocem-hashtb) + (setq gnus-nocem-hashtb (make-hash-table :test 'equal))) (while (setq entry (car alist)) (if (not (time-less-p (time-since (car entry)) expiry)) ;; This entry has expired, so we remove it. @@ -368,7 +377,7 @@ valid issuer, which is much faster if you are selective about the issuers." ;; This is ok, so we enter it into the hashtable. (setq entry (cdr entry)) (while entry - (gnus-sethash (car entry) t gnus-nocem-hashtb) + (puthash (car entry) t gnus-nocem-hashtb) (setq entry (cdr entry)))) (setq alist (cdr alist))))) @@ -386,7 +395,7 @@ valid issuer, which is much faster if you are selective about the issuers." (defun gnus-nocem-unwanted-article-p (id) "Say whether article ID in the current group is wanted." (and gnus-nocem-hashtb - (gnus-gethash id gnus-nocem-hashtb))) + (gethash id gnus-nocem-hashtb))) (provide 'gnus-nocem) diff --git a/lisp/gnus-offline.el b/lisp/gnus-offline.el index 0e1655a..6cd037c 100644 --- a/lisp/gnus-offline.el +++ b/lisp/gnus-offline.el @@ -27,10 +27,10 @@ ;;; 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. +;; 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., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; ;;;; Commentary: ;;; Note. @@ -798,10 +798,10 @@ Please check your .emacs or .gnus.el to work nnspool fine.") "*Set interval time for gnus-daemon." (interactive) (setq gnus-offline-interval-time - (string-to-int (read-from-minibuffer - (format (gnus-offline-gettext 'interval-time-1) - gnus-offline-interval-time) - nil))) + (string-to-number (read-from-minibuffer + (format (gnus-offline-gettext 'interval-time-1) + gnus-offline-interval-time) + nil))) (if (< gnus-offline-interval-time 2) (progn (message "%s" (gnus-offline-gettext 'interval-time-2)) diff --git a/lisp/gnus-ofsetup.el b/lisp/gnus-ofsetup.el index 5bfc6df..f3dd268 100644 --- a/lisp/gnus-ofsetup.el +++ b/lisp/gnus-ofsetup.el @@ -19,8 +19,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;; ;;; Commentary: @@ -468,7 +468,7 @@ mail source specifier $B$H$+>e5-$N$h$&$J%-!<%o!<%I$K$D$$$F$b$C$H$h$/(B ;; Create a list of mail source specifiers. (setq num-of-address (read-from-minibuffer (gnus-ofsetup-gettext 'setup-11))) - (setq i (setq n (string-to-int num-of-address))) + (setq i (setq n (string-to-number num-of-address))) ;; (while (> i 0) (let* ((j (- n (1- i))) diff --git a/lisp/gnus-picon.el b/lisp/gnus-picon.el index 408b76f..83b58e7 100644 --- a/lisp/gnus-picon.el +++ b/lisp/gnus-picon.el @@ -1,7 +1,7 @@ ;;; gnus-picon.el --- displaying pretty icons in Gnus -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -;; Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news xpm annotation glyph faces @@ -20,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -83,13 +83,17 @@ added right to the textual representation." (const right)) :group 'gnus-picon) -(defface gnus-picon-xbm-face '((t (:foreground "black" :background "white"))) +(defface gnus-picon-xbm '((t (:foreground "black" :background "white"))) "Face to show xbm picon in." :group 'gnus-picon) +;; backward-compatibility alias +(put 'gnus-picon-xbm-face 'face-alias 'gnus-picon-xbm) -(defface gnus-picon-face '((t (:foreground "black" :background "white"))) +(defface gnus-picon '((t (:foreground "black" :background "white"))) "Face to show picon in." :group 'gnus-picon) +;; backward-compatibility alias +(put 'gnus-picon-face 'face-alias 'gnus-picon) ;;; Internal variables: diff --git a/lisp/gnus-range.el b/lisp/gnus-range.el index eea1737..8d79cbe 100644 --- a/lisp/gnus-range.el +++ b/lisp/gnus-range.el @@ -1,7 +1,7 @@ ;;; gnus-range.el --- range and sequence functions for Gnus -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2004 -;; Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news @@ -20,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/gnus-registry.el b/lisp/gnus-registry.el index d4d165a..0578959 100644 --- a/lisp/gnus-registry.el +++ b/lisp/gnus-registry.el @@ -1,6 +1,7 @@ ;;; gnus-registry.el --- article registry for Gnus -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Ted Zlatanov ;; Keywords: news @@ -19,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/gnus-salt.el b/lisp/gnus-salt.el index 96ccbc3..15c7d0e 100644 --- a/lisp/gnus-salt.el +++ b/lisp/gnus-salt.el @@ -1,7 +1,7 @@ ;;; gnus-salt.el --- alternate summary mode interfaces for Gnus -;; Copyright (C) 1996, 1997, 1998, 1999, 2001 -;; Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news @@ -20,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -128,8 +128,7 @@ It accepts the same format specs that `gnus-summary-line-format' does." ;; Set up the menu. (when (gnus-visual-p 'pick-menu 'menu) (gnus-pick-make-menu-bar)) - (add-minor-mode 'gnus-pick-mode " Pick" gnus-pick-mode-map - nil 'gnus-pick-mode) + (add-minor-mode 'gnus-pick-mode " Pick" gnus-pick-mode-map) (gnus-run-hooks 'gnus-pick-mode-hook)))) (defun gnus-pick-setup-message () @@ -362,8 +361,7 @@ This must be bound to a button-down mouse event." ;; Set up the menu. (when (gnus-visual-p 'binary-menu 'menu) (gnus-binary-make-menu-bar)) - (add-minor-mode 'gnus-binary-mode " Binary" - gnus-binary-mode-map nil 'gnus-binary-mode) + (add-minor-mode 'gnus-binary-mode " Binary" gnus-binary-mode-map) (gnus-run-hooks 'gnus-binary-mode-hook)))) (defun gnus-binary-display-article (article &optional all-header) @@ -496,7 +494,7 @@ Two predefined functions are available: (gnus-set-work-buffer) (gnus-tree-node-insert (make-mail-header "") nil) (setq gnus-tree-node-length (1- (point)))) - (gnus-run-hooks 'gnus-tree-mode-hook)) + (gnus-run-mode-hooks 'gnus-tree-mode-hook)) (defun gnus-tree-read-summary-keys (&optional arg) "Read a summary buffer key sequence and execute it." @@ -1009,7 +1007,7 @@ The following commands are available: (buffer-disable-undo) (setq buffer-read-only t) (make-local-variable 'gnus-carpal-attached-buffer) - (gnus-run-hooks 'gnus-carpal-mode-hook)) + (gnus-run-mode-hooks 'gnus-carpal-mode-hook)) (defun gnus-carpal-setup-buffer (type) (let ((buffer (symbol-value (intern (format "gnus-carpal-%s-buffer" type))))) diff --git a/lisp/gnus-score.el b/lisp/gnus-score.el index 0a125cd..f170787 100644 --- a/lisp/gnus-score.el +++ b/lisp/gnus-score.el @@ -1,6 +1,7 @@ ;;; gnus-score.el --- scoring code for Gnus -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Per Abrahamsen ;; Lars Magne Ingebrigtsen @@ -20,8 +21,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -139,7 +140,7 @@ If this variable is nil, no score file entries will be expired." number)) (defcustom gnus-update-score-entry-dates t - "*In non-nil, update matching score entry dates. + "*If non-nil, update matching score entry dates. If this variable is nil, then score entries that provide matches will be expired along with non-matching score entries." :group 'gnus-score-expire @@ -178,7 +179,7 @@ It is called with one parameter -- the score to be decayed." It can be: * A string - This file file will be used as the home score file. + This file will be used as the home score file. * A function The result of this function will be used as the home score file. @@ -189,7 +190,7 @@ It can be: The elements in this list can be: * `(regexp file-name ...)' - If the `regexp' matches the group name, the first `file-name' will + If the `regexp' matches the group name, the first `file-name' will be used as the home score file. (Multiple filenames are allowed so that one may use gnus-score-file-single-match-alist to set this variable.) @@ -224,13 +225,22 @@ This variable allows the same syntax as `gnus-home-score-file'." (function :value fun))) (defcustom gnus-default-adaptive-score-alist - '((gnus-kill-file-mark) + `((gnus-kill-file-mark) (gnus-unread-mark) - (gnus-read-mark (from 3) (subject 30)) - (gnus-catchup-mark (subject -10)) - (gnus-killed-mark (from -1) (subject -20)) - (gnus-del-mark (from -2) (subject -15))) - "*Alist of marks and scores." + (gnus-read-mark + (from , (+ 2 gnus-score-decay-constant)) + (subject , (+ 27 gnus-score-decay-constant))) + (gnus-catchup-mark + (subject , (+ -7 (* -1 gnus-score-decay-constant)))) + (gnus-killed-mark + (from , (- -1 gnus-score-decay-constant)) + (subject , (+ -17 (* -1 gnus-score-decay-constant)))) + (gnus-del-mark + (from , (- -1 gnus-score-decay-constant)) + (subject , (+ -12 (* -1 gnus-score-decay-constant))))) + "Alist of marks and scores. +If you use score decays, you might want to set values higher than +`gnus-score-decay-constant'." :group 'gnus-score-adapt :type '(repeat (cons (symbol :tag "Mark") (repeat (list (choice :tag "Header" @@ -696,7 +706,7 @@ file for the command instead of the current score file." (intern ; need symbol (gnus-completing-read-with-default (symbol-name (car gnus-extra-headers)) ; default response - "Score extra header:" ; prompt + "Score extra header" ; prompt (mapcar (lambda (x) ; completion list (cons (symbol-name x) x)) gnus-extra-headers) @@ -871,7 +881,7 @@ If optional argument `EXTRA' is non-nil, it's a non-standard overview header." ;; If this is an integer comparison, we transform from string to int. (if (eq (nth 2 (assoc header gnus-header-index)) 'gnus-score-integer) (if (stringp match) - (setq match (string-to-int match))) + (setq match (string-to-number match))) (set-text-properties 0 (length match) nil match)) (unless (eq date 'now) @@ -936,7 +946,7 @@ EXTRA is the possible non-standard header." t) (read-string "Match: ") (if (y-or-n-p "Use regexp match? ") 'r 's) - (string-to-int (read-string "Score: ")))) + (string-to-number (read-string "Score: ")))) (save-excursion (unless (and (stringp match) (> (length match) 0)) (error "No match")) @@ -990,7 +1000,7 @@ EXTRA is the possible non-standard header." "Automatically mark articles with score below SCORE as read." (interactive (list (or (and current-prefix-arg (prefix-numeric-value current-prefix-arg)) - (string-to-int (read-string "Mark below: "))))) + (string-to-number (read-string "Mark below: "))))) (setq score (or score gnus-summary-default-score 0)) (gnus-score-set 'mark (list score)) (gnus-score-set 'touched '(t)) @@ -1024,7 +1034,7 @@ EXTRA is the possible non-standard header." "Automatically expunge articles with score below SCORE." (interactive (list (or (and current-prefix-arg (prefix-numeric-value current-prefix-arg)) - (string-to-int (read-string "Set expunge below: "))))) + (string-to-number (read-string "Set expunge below: "))))) (setq score (or score gnus-summary-default-score 0)) (gnus-score-set 'expunge (list score)) (gnus-score-set 'touched '(t))) @@ -1138,7 +1148,11 @@ EXTRA is the possible non-standard header." "Edit the all.SCORE file." (interactive) (find-file (gnus-score-file-name "all")) - (gnus-score-mode)) + (gnus-score-mode) + (setq gnus-score-edit-exit-function 'gnus-score-edit-done) + (gnus-message + 4 (substitute-command-keys + "\\\\[gnus-score-edit-exit] to save edits"))) (defun gnus-score-edit-file (file) "Edit a score file." diff --git a/lisp/gnus-setup.el b/lisp/gnus-setup.el index 25dfda0..ae4836c 100644 --- a/lisp/gnus-setup.el +++ b/lisp/gnus-setup.el @@ -1,7 +1,7 @@ ;;; gnus-setup.el --- Initialization & Setup for Gnus 5 -;; Copyright (C) 1995, 1996, 2000, 2001, 2004 -;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Steven L. Baur ;; Keywords: news @@ -20,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: ;; My head is starting to spin with all the different mail/news packages. diff --git a/lisp/gnus-sieve.el b/lisp/gnus-sieve.el index 824e66c..3b0154d 100644 --- a/lisp/gnus-sieve.el +++ b/lisp/gnus-sieve.el @@ -1,5 +1,6 @@ ;;; gnus-sieve.el --- Utilities to manage sieve scripts for Gnus -;; Copyright (C) 2001, 2003 Free Software Foundation, Inc. + +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: NAGY Andras , ;; Simon Josefsson @@ -18,8 +19,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -129,7 +130,7 @@ Return nil if no rule could be guessed." (let ((rule (gnus-sieve-guess-rule-for-article)) (info (gnus-get-info gnus-newsgroup-name))) (if (null rule) - (error "Could not guess rule for article.") + (error "Could not guess rule for article") (gnus-info-set-params info (cons rule (gnus-info-params info))) (message "Added rule in group %s for article: %s" gnus-newsgroup-name rule))))) diff --git a/lisp/gnus-soup.el b/lisp/gnus-soup.el index 32a2bdd..fabacc5 100644 --- a/lisp/gnus-soup.el +++ b/lisp/gnus-soup.el @@ -1,7 +1,7 @@ ;;; gnus-soup.el --- SOUP packet writing support for Gnus -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002 -;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Per Abrahamsen ;; Lars Magne Ingebrigtsen @@ -21,8 +21,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -350,9 +350,9 @@ If NOT-ALL, don't pack ticked articles." (packer (if (< (string-match "%s" packer) (string-match "%d" packer)) (format packer files - (string-to-int (gnus-soup-unique-prefix dir))) + (string-to-number (gnus-soup-unique-prefix dir))) (format packer - (string-to-int (gnus-soup-unique-prefix dir)) + (string-to-number (gnus-soup-unique-prefix dir)) files))) (dir (expand-file-name dir))) (gnus-make-directory dir) @@ -386,7 +386,7 @@ though the two last may be nil if they are missing." (and (eq (preceding-char) ?\t) (gnus-soup-field)) (and (eq (preceding-char) ?\t) - (string-to-int (gnus-soup-field)))) + (string-to-number (gnus-soup-field)))) areas) (when (eq (preceding-char) ?\t) (beginning-of-line 2))) @@ -536,7 +536,7 @@ Return whether the unpacking was successful." (error "Bad header")) (forward-line 1) (setq beg (point) - end (+ (point) (string-to-int + end (+ (point) (string-to-number (buffer-substring (match-beginning 1) (match-end 1))))) (switch-to-buffer tmp-buf) diff --git a/lisp/gnus-spec.el b/lisp/gnus-spec.el index d75625b..8fa8c62 100644 --- a/lisp/gnus-spec.el +++ b/lisp/gnus-spec.el @@ -1,6 +1,7 @@ ;;; gnus-spec.el --- format spec functions for Gnus -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Katsumi Yamaoka @@ -20,14 +21,15 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: ;;; Code: (eval-when-compile (require 'cl)) +(defvar gnus-newsrc-file-version) (require 'alist) (require 'gnus) @@ -553,7 +555,7 @@ are supported for %s." (t (if (null args) (error 'wrong-number-of-arguments #'my-format n fstring)) - (let* ((minlen (string-to-int (or (match-string 2) ""))) + (let* ((minlen (string-to-number (or (match-string 2) ""))) (arg (car args)) (str (if (stringp arg) arg (format "%s" arg))) (lpad (null (match-string 1))) diff --git a/lisp/gnus-srvr.el b/lisp/gnus-srvr.el index d7cbcfc..3d029cf 100644 --- a/lisp/gnus-srvr.el +++ b/lisp/gnus-srvr.el @@ -1,6 +1,7 @@ ;;; gnus-srvr.el --- virtual server support for Gnus -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news @@ -19,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -115,6 +116,7 @@ If nil, a faster, but more primitive, buffer is used instead." ["Copy" gnus-server-copy-server t] ["Edit" gnus-server-edit-server t] ["Regenerate" gnus-server-regenerate-server t] + ["Compact" gnus-server-compact-server t] ["Exit" gnus-server-exit t])) (easy-menu-define @@ -164,70 +166,82 @@ If nil, a faster, but more primitive, buffer is used instead." "g" gnus-server-regenerate-server + "z" gnus-server-compact-server + "\C-c\C-i" gnus-info-find-node "\C-c\C-b" gnus-bug)) -(defface gnus-server-agent-face +(defface gnus-server-agent '((((class color) (background light)) (:foreground "PaleTurquoise" :bold t)) (((class color) (background dark)) (:foreground "PaleTurquoise" :bold t)) (t (:bold t))) "Face used for displaying AGENTIZED servers" :group 'gnus-server-visual) +;; backward-compatibility alias +(put 'gnus-server-agent-face 'face-alias 'gnus-server-agent) -(defface gnus-server-opened-face +(defface gnus-server-opened '((((class color) (background light)) (:foreground "Green3" :bold t)) (((class color) (background dark)) (:foreground "Green1" :bold t)) (t (:bold t))) "Face used for displaying OPENED servers" :group 'gnus-server-visual) +;; backward-compatibility alias +(put 'gnus-server-opened-face 'face-alias 'gnus-server-opened) -(defface gnus-server-closed-face +(defface gnus-server-closed '((((class color) (background light)) (:foreground "Steel Blue" :italic t)) (((class color) (background dark)) (:foreground "Light Steel Blue" :italic t)) (t (:italic t))) "Face used for displaying CLOSED servers" :group 'gnus-server-visual) +;; backward-compatibility alias +(put 'gnus-server-closed-face 'face-alias 'gnus-server-closed) -(defface gnus-server-denied-face +(defface gnus-server-denied '((((class color) (background light)) (:foreground "Red" :bold t)) (((class color) (background dark)) (:foreground "Pink" :bold t)) (t (:inverse-video t :bold t))) "Face used for displaying DENIED servers" :group 'gnus-server-visual) +;; backward-compatibility alias +(put 'gnus-server-denied-face 'face-alias 'gnus-server-denied) -(defface gnus-server-offline-face +(defface gnus-server-offline '((((class color) (background light)) (:foreground "Orange" :bold t)) (((class color) (background dark)) (:foreground "Yellow" :bold t)) (t (:inverse-video t :bold t))) "Face used for displaying OFFLINE servers" :group 'gnus-server-visual) +;; backward-compatibility alias +(put 'gnus-server-offline-face 'face-alias 'gnus-server-offline) -(defcustom gnus-server-agent-face 'gnus-server-agent-face +(defcustom gnus-server-agent-face 'gnus-server-agent "Face name to use on AGENTIZED servers." :version "22.1" :group 'gnus-server-visual :type 'face) -(defcustom gnus-server-opened-face 'gnus-server-opened-face +(defcustom gnus-server-opened-face 'gnus-server-opened "Face name to use on OPENED servers." :version "22.1" :group 'gnus-server-visual :type 'face) -(defcustom gnus-server-closed-face 'gnus-server-closed-face +(defcustom gnus-server-closed-face 'gnus-server-closed "Face name to use on CLOSED servers." :version "22.1" :group 'gnus-server-visual :type 'face) -(defcustom gnus-server-denied-face 'gnus-server-denied-face +(defcustom gnus-server-denied-face 'gnus-server-denied "Face name to use on DENIED servers." :version "22.1" :group 'gnus-server-visual :type 'face) -(defcustom gnus-server-offline-face 'gnus-server-offline-face +(defcustom gnus-server-offline-face 'gnus-server-offline "Face name to use on OFFLINE servers." :version "22.1" :group 'gnus-server-visual @@ -269,7 +283,7 @@ The following commands are available: (put 'gnus-server-mode 'font-lock-defaults '(gnus-server-font-lock-keywords t)) (set (make-local-variable 'font-lock-defaults) '(gnus-server-font-lock-keywords t))) - (gnus-run-hooks 'gnus-server-mode-hook)) + (gnus-run-mode-hooks 'gnus-server-mode-hook)) (defun gnus-server-insert-server-line (gnus-tmp-name method) (let* ((gnus-tmp-how (car method)) @@ -861,7 +875,7 @@ buffer. (setq truncate-lines t) (gnus-set-default-directory) (setq buffer-read-only t) - (gnus-run-hooks 'gnus-browse-mode-hook)) + (gnus-run-mode-hooks 'gnus-browse-mode-hook)) (defun gnus-browse-read-group (&optional no-article number) "Enter the group at the current line. @@ -1001,6 +1015,40 @@ If NUMBER, fetch this number of articles." (gnus-message 5 "Requesting regeneration of %s...done" server) (gnus-message 5 "Couldn't regenerate %s" server)))) + +;;; +;;; Server compaction. -- dvl +;;; + +;; #### FIXME: this function currently fails to update the Group buffer's +;; #### appearance. +(defun gnus-server-compact-server () + "Issue a command to the server to compact all its groups. + +Note: currently only implemented in nnml." + (interactive) + (let ((server (gnus-server-server-name))) + (unless server + (error "No server on the current line")) + (condition-case () + (gnus-get-function (gnus-server-to-method server) + 'request-compact) + (error + (error "This back end doesn't support compaction"))) + (gnus-message 5 "\ +Requesting compaction of %s... (this may take a long time)" + server) + (unless (gnus-open-server server) + (error "Couldn't open server")) + (if (not (gnus-request-compact server)) + (gnus-message 5 "Couldn't compact %s" server) + (gnus-message 5 "Requesting compaction of %s...done" server) + ;; Invalidate the original article buffer which might be out of date. + ;; #### NOTE: Yes, this might be a bit rude, but since compaction + ;; #### will not happen very often, I think this is acceptable. + (let ((original (get-buffer gnus-original-article-buffer))) + (and original (gnus-kill-buffer original)))))) + (provide 'gnus-srvr) ;;; gnus-srvr.el ends here diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el index 3f8a3fd..62f7d83 100644 --- a/lisp/gnus-start.el +++ b/lisp/gnus-start.el @@ -1,6 +1,7 @@ ;;; gnus-start.el --- startup functions for Gnus -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news @@ -19,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -618,7 +619,7 @@ Can be used to turn version control on or off." "Subscribe the new GROUP interactively. It is inserted in hierarchical newsgroup order if subscribed. If not, it is killed." - (if (gnus-y-or-n-p (format "Subscribe new newsgroup: %s " group)) + (if (gnus-y-or-n-p (format "Subscribe new newsgroup %s? " group)) (gnus-subscribe-hierarchically group) (push group gnus-killed-list))) @@ -740,11 +741,12 @@ the first newsgroup." (defun gnus-no-server-1 (&optional arg slave) "Read network news. -If ARG is a positive number, Gnus will use that as the -startup level. If ARG is nil, Gnus will be started at level 2. -If ARG is non-nil and not a positive number, Gnus will -prompt the user for the name of an NNTP server to use. -As opposed to `gnus', this command will not connect to the local server." +If ARG is a positive number, Gnus will use that as the startup +level. If ARG is nil, Gnus will be started at level 2 +\(`gnus-level-default-subscribed' minus one). If ARG is non-nil +and not a positive number, Gnus will prompt the user for the name +of an NNTP server to use. As opposed to \\[gnus], this command +will not connect to the local server." (interactive "P") (let ((val (or arg (1- gnus-level-default-subscribed)))) (gnus val t slave) @@ -772,6 +774,13 @@ prompt the user for the name of an NNTP server to use." (nnheader-init-server-buffer) (setq gnus-slave slave) (gnus-read-init-file) + + ;; Add "native" to gnus-predefined-server-alist just to have a + ;; name for the native select method. + (when gnus-select-method + (push (cons "native" gnus-select-method) + gnus-predefined-server-alist)) + (if gnus-agent (gnus-agentize)) @@ -826,7 +835,10 @@ prompt the user for the name of an NNTP server to use." (gnus-request-create-group "drafts" '(nndraft "")) (unless (gnus-group-entry "nndraft:drafts") (let ((gnus-level-default-subscribed 1)) - (gnus-subscribe-group "nndraft:drafts" nil '(nndraft ""))) + (gnus-subscribe-group "nndraft:drafts" nil '(nndraft "")))) + (unless (equal (gnus-group-get-parameter "nndraft:drafts" 'gnus-dummy t) + '((gnus-draft-mode))) + (gnus-message 3 "Setting up drafts group") (gnus-group-set-parameter "nndraft:drafts" 'gnus-dummy '((gnus-draft-mode))))) @@ -878,6 +890,7 @@ prompt the user for the name of an NNTP server to use." (set-buffer (setq gnus-dribble-buffer (gnus-get-buffer-create (file-name-nondirectory dribble-file)))) + (set (make-local-variable 'file-precious-flag) t) (erase-buffer) (setq buffer-file-name dribble-file) (auto-save-mode t) @@ -1061,9 +1074,12 @@ If LEVEL is non-nil, the news will be set up at level LEVEL." (gnus-check-bogus-newsgroups)) ;; We might read in new NoCeM messages here. - (when (and gnus-use-nocem - (not level) - (not dont-connect)) + (when (and (not dont-connect) + gnus-use-nocem + (or (and (numberp gnus-use-nocem) + (numberp level) + (>= level gnus-use-nocem)) + (not level))) (gnus-nocem-scan-groups)) ;; Read any slave files. @@ -1549,8 +1565,8 @@ If SCAN, request a scan of that group as well." ;; command may have responded with the `(0 . 0)'. We ;; ignore this if we already have an active entry ;; for the group. - (if (and (zerop (car active)) - (zerop (cdr active)) + (if (and (zerop (or (car active) 0)) + (zerop (or (cdr active) 0)) (gnus-active group)) (gnus-active group) @@ -2627,7 +2643,7 @@ If FORCE is non-nil, the .newsrc file is read." (cond ((looking-at "[0-9]+") ;; We narrow and read a number instead of buffer-substring/ - ;; string-to-int because it's faster. narrow/widen is + ;; string-to-number because it's faster. narrow/widen is ;; faster than save-restriction/narrow, and save-restriction ;; produces a garbage object. (setq num1 (progn @@ -2932,6 +2948,7 @@ If FORCE is non-nil, the .newsrc file is read." (print-escape-nonascii t) (print-length nil) (print-level nil) + (print-circle nil) (print-escape-newlines t) (gnus-killed-list (if (and gnus-save-killed-list diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index ad0d5bf..a53be1a 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -1,6 +1,7 @@ ;;; gnus-sum.el --- summary mode commands for gnus -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; MORIOKA Tomohiko @@ -21,8 +22,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -30,7 +31,7 @@ (eval-when-compile (require 'cl) - (defvar tool-bar-map)) + (defvar tool-bar-mode)) (require 'gnus) (require 'gnus-group) @@ -39,6 +40,7 @@ (require 'gnus-int) (require 'gnus-undo) (require 'gnus-util) +(require 'gmm-utils) (require 'nnoo) (eval-when-compile @@ -71,17 +73,21 @@ it will be killed sometime later." (defcustom gnus-fetch-old-headers nil "*Non-nil means that Gnus will try to build threads by grabbing old headers. -If an unread article in the group refers to an older, already read (or -just marked as read) article, the old article will not normally be -displayed in the Summary buffer. If this variable is t, Gnus -will attempt to grab the headers to the old articles, and thereby -build complete threads. If it has the value `some', only enough -headers to connect otherwise loose threads will be displayed. This -variable can also be a number. In that case, no more than that number -of old headers will be fetched. If it has the value `invisible', all +If an unread article in the group refers to an older, already +read (or just marked as read) article, the old article will not +normally be displayed in the Summary buffer. If this variable is +t, Gnus will attempt to grab the headers to the old articles, and +thereby build complete threads. If it has the value `some', all +old headers will be fetched but only enough headers to connect +otherwise loose threads will be displayed. This variable can +also be a number. In that case, no more than that number of old +headers will be fetched. If it has the value `invisible', all old headers will be fetched, but none will be displayed. -The server has to support NOV for any of this to work." +The server has to support NOV for any of this to work. + +This feature can seriously impact performance it ignores all +locally cached header entries." :group 'gnus-thread :type '(choice (const :tag "off" nil) (const :tag "on" t) @@ -265,8 +271,7 @@ simplification is selected." "*If non-nil, hide all threads initially. This can be a predicate specifier which says which threads to hide. If threads are hidden, you have to run the command -`gnus-summary-show-thread' by hand or use `gnus-select-article-hook' -to expose hidden threads." +`gnus-summary-show-thread' by hand or or select an article." :group 'gnus-thread :type '(radio (sexp :format "Non-nil\n" :match (lambda (widget value) @@ -329,7 +334,7 @@ This variable can either be the symbols `first' (place point on the first subject), `unread' (place point on the subject line of the first unread article), `best' (place point on the subject line of the higest-scored article), `unseen' (place point on the subject line of -the first unseen article), 'unseen-or-unread' (place point on the subject +the first unseen article), `unseen-or-unread' (place point on the subject line of the first unseen article or, if all article have been seen, on the subject line of the first unread article), or a function to be called to place point on some subject line." @@ -804,20 +809,21 @@ Each list item can also be a list `(not F)' where F is a function; this specifies reversed sort order. Ready-made functions include `gnus-thread-sort-by-number', -`gnus-thread-sort-by-author', `gnus-thread-sort-by-subject', -`gnus-thread-sort-by-date', `gnus-thread-sort-by-score', -`gnus-thread-sort-by-most-recent-number', -`gnus-thread-sort-by-most-recent-date', -`gnus-thread-sort-by-random', and -`gnus-thread-sort-by-total-score' (see `gnus-thread-score-function'). +`gnus-thread-sort-by-author', `gnus-thread-sort-by-recipient' +`gnus-thread-sort-by-subject', `gnus-thread-sort-by-date', +`gnus-thread-sort-by-score', `gnus-thread-sort-by-most-recent-number', +`gnus-thread-sort-by-most-recent-date', `gnus-thread-sort-by-random', +and `gnus-thread-sort-by-total-score' (see +`gnus-thread-score-function'). When threading is turned off, the variable `gnus-article-sort-functions' controls how articles are sorted." :group 'gnus-summary-sort - :type '(repeat + :type '(repeat (gnus-widget-reversible (choice (function-item gnus-thread-sort-by-number) (function-item gnus-thread-sort-by-author) + (function-item gnus-thread-sort-by-recipient) (function-item gnus-thread-sort-by-subject) (function-item gnus-thread-sort-by-date) (function-item gnus-thread-sort-by-score) @@ -996,7 +1002,7 @@ automatically when it is selected." :group 'gnus-summary :type 'boolean) -(defcustom gnus-summary-selected-face 'gnus-summary-selected-face +(defcustom gnus-summary-selected-face 'gnus-summary-selected "Face used for highlighting the current article in the summary buffer." :group 'gnus-summary-visual :type 'face) @@ -1005,42 +1011,42 @@ automatically when it is selected." (defcustom gnus-summary-highlight '(((eq mark gnus-canceled-mark) - . gnus-summary-cancelled-face) + . gnus-summary-cancelled) ((and uncached (> score default-high)) - . gnus-summary-high-undownloaded-face) + . gnus-summary-high-undownloaded) ((and uncached (< score default-low)) - . gnus-summary-low-undownloaded-face) + . gnus-summary-low-undownloaded) (uncached - . gnus-summary-normal-undownloaded-face) + . gnus-summary-normal-undownloaded) ((and (> score default-high) (or (eq mark gnus-dormant-mark) (eq mark gnus-ticked-mark))) - . gnus-summary-high-ticked-face) + . gnus-summary-high-ticked) ((and (< score default-low) (or (eq mark gnus-dormant-mark) (eq mark gnus-ticked-mark))) - . gnus-summary-low-ticked-face) + . gnus-summary-low-ticked) ((or (eq mark gnus-dormant-mark) (eq mark gnus-ticked-mark)) - . gnus-summary-normal-ticked-face) + . gnus-summary-normal-ticked) ((and (> score default-high) (eq mark gnus-ancient-mark)) - . gnus-summary-high-ancient-face) + . gnus-summary-high-ancient) ((and (< score default-low) (eq mark gnus-ancient-mark)) - . gnus-summary-low-ancient-face) + . gnus-summary-low-ancient) ((eq mark gnus-ancient-mark) - . gnus-summary-normal-ancient-face) + . gnus-summary-normal-ancient) ((and (> score default-high) (eq mark gnus-unread-mark)) - . gnus-summary-high-unread-face) + . gnus-summary-high-unread) ((and (< score default-low) (eq mark gnus-unread-mark)) - . gnus-summary-low-unread-face) + . gnus-summary-low-unread) ((eq mark gnus-unread-mark) - . gnus-summary-normal-unread-face) + . gnus-summary-normal-unread) ((> score default-high) - . gnus-summary-high-read-face) + . gnus-summary-high-read) ((< score default-low) - . gnus-summary-low-read-face) + . gnus-summary-low-read) (t - . gnus-summary-normal-read-face)) + . gnus-summary-normal-read)) "*Controls the highlighting of summary buffer lines. A list of (FORM . FACE) pairs. When deciding how a a particular @@ -1080,12 +1086,28 @@ which it may alter in any way." :type '(repeat symbol)) (defcustom gnus-ignored-from-addresses - (and user-mail-address (regexp-quote user-mail-address)) + (and user-mail-address + (not (string= user-mail-address "")) + (regexp-quote user-mail-address)) "*Regexp of From headers that may be suppressed in favor of To headers." :version "21.1" :group 'gnus-summary :type 'regexp) +(defcustom gnus-summary-to-prefix "-> " + "*String prefixed to the To field in the summary line when +using `gnus-ignored-from-addresses'." + :version "22.1" + :group 'gnus-summary + :type 'string) + +(defcustom gnus-summary-newsgroup-prefix "=> " + "*String prefixed to the Newsgroup field in the summary +line when using `gnus-ignored-from-addresses'." + :version "22.1" + :group 'gnus-summary + :type 'string) + (defcustom gnus-newsgroup-ignored-charsets '(unknown-8bit x-unknown) "List of charsets that should be ignored. When these charsets are used in the \"charset\" parameter, the @@ -1908,6 +1930,7 @@ increase the score of each group you read." "Q" gnus-summary-exit "Z" gnus-summary-exit "n" gnus-summary-catchup-and-goto-next-group + "p" gnus-summary-catchup-and-goto-prev-group "R" gnus-summary-reselect-current-group "G" gnus-summary-rescan-group "N" gnus-summary-next-group @@ -1957,7 +1980,6 @@ increase the score of each group you read." "t" gnus-summary-toggle-header "g" gnus-treat-smiley "v" gnus-summary-verbose-headers - "m" gnus-summary-toggle-mime "a" gnus-article-strip-headers-in-body ;; mnemonic: wash archive "p" gnus-article-verify-x-pgp-sig "d" gnus-article-treat-dumbquotes @@ -2066,6 +2088,10 @@ increase the score of each group you read." "m" gnus-summary-repair-multipart "v" gnus-article-view-part "o" gnus-article-save-part + "O" gnus-article-save-part-and-strip + "r" gnus-article-replace-part + "d" gnus-article-delete-part + "j" gnus-article-jump-to-part "c" gnus-article-copy-part "C" gnus-article-view-part-as-charset "e" gnus-article-view-part-externally @@ -2576,6 +2602,7 @@ gnus-summary-show-article-from-menu-as-charset-%s" cs)))) '(:help "Mark unread articles in this group as read, then exit"))] ["Catchup all and exit" gnus-summary-catchup-all-and-exit t] ["Catchup and goto next" gnus-summary-catchup-and-goto-next-group t] + ["Catchup and goto prev" gnus-summary-catchup-and-goto-prev-group t] ["Exit group" gnus-summary-exit ,@(if (featurep 'xemacs) '(t) '(:help "Exit current group, return to group selection mode"))] @@ -2590,49 +2617,161 @@ gnus-summary-show-article-from-menu-as-charset-%s" cs)))) (defvar gnus-summary-tool-bar-map nil) -;; Emacs 21 tool bar. Should be no-op otherwise. -(defun gnus-summary-make-tool-bar () - (if (and (fboundp 'tool-bar-add-item-from-menu) - (default-value 'tool-bar-mode) - (not gnus-summary-tool-bar-map)) - (setq gnus-summary-tool-bar-map - (let ((tool-bar-map (make-sparse-keymap)) - (load-path (mm-image-load-path))) - (tool-bar-add-item-from-menu - 'gnus-summary-prev-unread "prev-ur" gnus-summary-mode-map) - (tool-bar-add-item-from-menu - 'gnus-summary-next-unread "next-ur" gnus-summary-mode-map) - (tool-bar-add-item-from-menu - 'gnus-summary-post-news "post" gnus-summary-mode-map) - (tool-bar-add-item-from-menu - 'gnus-summary-followup-with-original "fuwo" gnus-summary-mode-map) - (tool-bar-add-item-from-menu - 'gnus-summary-followup "followup" gnus-summary-mode-map) - (tool-bar-add-item-from-menu - 'gnus-summary-reply-with-original "reply-wo" gnus-summary-mode-map) - (tool-bar-add-item-from-menu - 'gnus-summary-reply "reply" gnus-summary-mode-map) - (tool-bar-add-item-from-menu - 'gnus-summary-caesar-message "rot13" gnus-summary-mode-map) - (tool-bar-add-item-from-menu - 'gnus-uu-decode-uu "uu-decode" gnus-summary-mode-map) - (tool-bar-add-item-from-menu - 'gnus-summary-save-article-file "save-aif" gnus-summary-mode-map) - (tool-bar-add-item-from-menu - 'gnus-summary-save-article "save-art" gnus-summary-mode-map) - (tool-bar-add-item-from-menu - 'gnus-uu-post-news "uu-post" gnus-summary-mode-map) - (tool-bar-add-item-from-menu - 'gnus-uu-post-news "uu-post" gnus-summary-mode-map) - (tool-bar-add-item-from-menu - 'gnus-summary-catchup "catchup" gnus-summary-mode-map) - (tool-bar-add-item-from-menu - 'gnus-summary-catchup-and-exit "cu-exit" gnus-summary-mode-map) - (tool-bar-add-item-from-menu - 'gnus-summary-exit "exit-summ" gnus-summary-mode-map) - tool-bar-map))) - (if gnus-summary-tool-bar-map - (set (make-local-variable 'tool-bar-map) gnus-summary-tool-bar-map))) +;; Note: The :set function in the `gnus-summary-tool-bar*' variables will only +;; affect _new_ message buffers. We might add a function that walks thru all +;; summary-mode buffers and force the update. +(defun gnus-summary-tool-bar-update (&optional symbol value) + "Update summary mode toolbar. +Setter function for custom variables." + (setq-default gnus-summary-tool-bar-map nil) + (when symbol + ;; When used as ":set" function: + (set-default symbol value)) + (when (gnus-buffer-live-p gnus-summary-buffer) + (with-current-buffer gnus-summary-buffer + (gnus-summary-make-tool-bar)))) + +(defcustom gnus-summary-tool-bar (if (eq gmm-tool-bar-style 'gnome) + 'gnus-summary-tool-bar-gnome + 'gnus-summary-tool-bar-retro) + "Specifies the Gnus summary tool bar. + +It can be either a list or a symbol refering to a list. See +`gmm-tool-bar-from-list' for the format of the list. The +default key map is `gnus-summary-mode-map'. + +Pre-defined symbols include `gnus-summary-tool-bar-gnome' and +`gnus-summary-tool-bar-retro'." + :type '(choice (const :tag "GNOME style" gnus-summary-tool-bar-gnome) + (const :tag "Retro look" gnus-summary-tool-bar-retro) + (repeat :tag "User defined list" gmm-tool-bar-item) + (symbol)) + :version "23.0" ;; No Gnus + :initialize 'custom-initialize-default + :set 'gnus-summary-tool-bar-update + :group 'gnus-summary) + +(defcustom gnus-summary-tool-bar-gnome + '((gnus-summary-post-news "mail/compose" nil) + (gnus-summary-insert-new-articles "mail/inbox" nil + :visible (or (not gnus-agent) + gnus-plugged)) + (gnus-summary-reply-with-original "mail/reply") + (gnus-summary-reply "mail/reply" nil :visible nil) + (gnus-summary-followup-with-original "mail/reply-all") + (gnus-summary-followup "mail/reply-all" nil :visible nil) + (gnus-summary-mail-forward "mail/forward") + (gnus-summary-save-article "mail/save") + (gnus-summary-search-article-forward "search" nil :visible nil) + (gnus-summary-print-article "print") + (gnus-summary-tick-article-forward "flag-followup" nil :visible nil) + ;; Some new commands that may need more suitable icons: + (gnus-summary-save-newsrc "save" nil :visible nil) + ;; (gnus-summary-show-article "stock_message-display" nil :visible nil) + (gnus-summary-prev-article "left-arrow") + (gnus-summary-next-article "right-arrow") + (gnus-summary-next-page "next-page") + ;; (gnus-summary-enter-digest-group "right_arrow" nil :visible nil) + ;; + ;; Maybe some sort-by-... could be added: + ;; (gnus-summary-sort-by-author "sort-a-z" nil :visible nil) + ;; (gnus-summary-sort-by-date "sort-1-9" nil :visible nil) + (gnus-summary-mark-as-expirable + "delete" nil + :visible (gnus-check-backend-function 'request-expire-articles + gnus-newsgroup-name)) + (gnus-summary-mark-as-spam + "mail/spam" t + :visible (and (fboundp 'spam-group-ham-contents-p) + (spam-group-ham-contents-p gnus-newsgroup-name)) + :help "Mark as spam") + (gnus-summary-mark-as-read-forward + "mail/not-spam" nil + :visible (and (fboundp 'spam-group-spam-contents-p) + (spam-group-spam-contents-p gnus-newsgroup-name))) + ;; + (gnus-summary-exit "exit") + (gmm-customize-mode "preferences" t :help "Edit mode preferences") + (gnus-info-find-node "help")) + "List of functions for the summary tool bar (GNOME style). + +See `gmm-tool-bar-from-list' for the format of the list." + :type '(repeat gmm-tool-bar-item) + :version "23.0" ;; No Gnus + :initialize 'custom-initialize-default + :set 'gnus-summary-tool-bar-update + :group 'gnus-summary) + +(defcustom gnus-summary-tool-bar-retro + '((gnus-summary-prev-unread-article "gnus/prev-ur") + (gnus-summary-next-unread-article "gnus/next-ur") + (gnus-summary-post-news "gnus/post") + (gnus-summary-followup-with-original "gnus/fuwo") + (gnus-summary-followup "gnus/followup") + (gnus-summary-reply-with-original "gnus/reply-wo") + (gnus-summary-reply "gnus/reply") + (gnus-summary-caesar-message "gnus/rot13") + (gnus-uu-decode-uu "gnus/uu-decode") + (gnus-summary-save-article-file "gnus/save-aif") + (gnus-summary-save-article "gnus/save-art") + (gnus-uu-post-news "gnus/uu-post") + (gnus-summary-catchup "gnus/catchup") + (gnus-summary-catchup-and-exit "gnus/cu-exit") + (gnus-summary-exit "gnus/exit-summ") + ;; Some new command that may need more suitable icons: + (gnus-summary-print-article "gnus/print" nil :visible nil) + (gnus-summary-mark-as-expirable "gnus/close" nil :visible nil) + (gnus-summary-save-newsrc "gnus/save" nil :visible nil) + ;; (gnus-summary-enter-digest-group "gnus/right_arrow" nil :visible nil) + (gnus-summary-search-article-forward "gnus/search" nil :visible nil) + ;; (gnus-summary-insert-new-articles "gnus/paste" nil :visible nil) + ;; (gnus-summary-toggle-threads "gnus/open" nil :visible nil) + ;; + (gnus-info-find-node "gnus/help" nil :visible nil)) + "List of functions for the summary tool bar (retro look). + +See `gmm-tool-bar-from-list' for the format of the list." + :type '(repeat gmm-tool-bar-item) + :version "23.0" ;; No Gnus + :initialize 'custom-initialize-default + :set 'gnus-summary-tool-bar-update + :group 'gnus-summary) + +(defcustom gnus-summary-tool-bar-zap-list t + "List of icon items from the global tool bar. +These items are not displayed in the Gnus summary mode tool bar. + +See `gmm-tool-bar-from-list' for the format of the list." + :type 'gmm-tool-bar-zap-list + :version "23.0" ;; No Gnus + :initialize 'custom-initialize-default + :set 'gnus-summary-tool-bar-update + :group 'gnus-summary) + +(defvar image-load-path) + +(defun gnus-summary-make-tool-bar (&optional force) + "Make a summary mode tool bar from `gnus-summary-tool-bar'. +When FORCE, rebuild the tool bar." + (when (and (not (featurep 'xemacs)) + (boundp 'tool-bar-mode) + tool-bar-mode + (or (not gnus-summary-tool-bar-map) force)) + (let* ((load-path + (gmm-image-load-path-for-library "gnus" + "mail/save.xpm" + nil t)) + (image-load-path (cons (car load-path) + (when (boundp 'image-load-path) + image-load-path))) + (map (gmm-tool-bar-from-list gnus-summary-tool-bar + gnus-summary-tool-bar-zap-list + 'gnus-summary-mode-map))) + (when map + ;; Need to set `gnus-summary-tool-bar-map' because `gnus-article-mode' + ;; uses it's value. + (setq gnus-summary-tool-bar-map map)))) + (set (make-local-variable 'tool-bar-map) gnus-summary-tool-bar-map)) (defun gnus-score-set-default (var value) "A version of set that updates the GNU Emacs menu-bar." @@ -2743,12 +2882,13 @@ The following commands are available: \\{gnus-summary-mode-map}" (interactive) (kill-all-local-variables) + (let ((gnus-summary-local-variables gnus-newsgroup-variables)) + (gnus-summary-make-local-variables)) + (gnus-summary-make-local-variables) + (setq gnus-newsgroup-name group) (when (gnus-visual-p 'summary-menu 'menu) (gnus-summary-make-menu-bar) (gnus-summary-make-tool-bar)) - (gnus-summary-make-local-variables) - (let ((gnus-summary-local-variables gnus-newsgroup-variables)) - (gnus-summary-make-local-variables)) (gnus-make-thread-indent-array) (gnus-simplify-mode-line) (setq major-mode 'gnus-summary-mode) @@ -2763,7 +2903,6 @@ The following commands are available: (setq selective-display-ellipses t) ;Display `...' (gnus-summary-set-display-table) (gnus-set-default-directory) - (setq gnus-newsgroup-name group) (unless (gnus-news-group-p group) (setq gnus-newsgroup-incorporated (nnmail-new-mail-numbers (gnus-group-real-name group)))) @@ -2774,7 +2913,7 @@ The following commands are available: (make-local-variable 'gnus-summary-mark-positions) (gnus-make-local-hook 'pre-command-hook) (add-hook 'pre-command-hook 'gnus-set-global-variables nil t) - (gnus-run-hooks 'gnus-summary-mode-hook) + (gnus-run-mode-hooks 'gnus-summary-mode-hook) (turn-on-gnus-mailing-list-mode) (gnus-update-format-specifications nil 'summary 'summary-mode 'summary-dummy) (gnus-update-summary-mark-positions)) @@ -3146,8 +3285,11 @@ display only a single character." (aset table ?\r nil) ;; We keep TAB as well. (aset table ?\t nil) - ;; We nix out any glyphs over 126 that are not set already. - (let ((i 256)) + ;; We nix out any glyphs 127 through 255, or 127 through 159 in + ;; Emacs 23 (unicode), that are not set already. + (let ((i (if (ignore-errors (= (make-char 'latin-iso8859-1 160) 160)) + 160 + 256))) (while (>= (setq i (1- i)) 127) ;; Only modify if the entry is nil. (unless (aref table i) @@ -3359,12 +3501,19 @@ buffer that was in action when the last article was fetched." newsgroups) (cond ((setq to (cdr (assq 'To extra-headers))) - (concat "-> " + (concat gnus-summary-to-prefix (inline (gnus-summary-extract-address-component (funcall gnus-decode-encoded-word-function to))))) - ((setq newsgroups (cdr (assq 'Newsgroups extra-headers))) - (concat "=> " newsgroups))))) + ((setq newsgroups + (or + (cdr (assq 'Newsgroups extra-headers)) + (and + (memq 'Newsgroups gnus-extra-headers) + (eq (car (gnus-find-method-for-group + gnus-newsgroup-name)) 'nntp) + (gnus-group-real-name gnus-newsgroup-name)))) + (concat gnus-summary-newsgroup-prefix newsgroups))))) (inline (gnus-summary-extract-address-component gnus-tmp-from))))) (defun gnus-summary-insert-line (gnus-tmp-header @@ -4585,6 +4734,11 @@ using some other form will lead to serious barfage." (or (cdr (assq 'To (mail-header-extra h2))) "")))) (or (car extract) (cadr extract))))) +(defun gnus-thread-sort-by-recipient (h1 h2) + "Sort threads by root recipient." + (gnus-article-sort-by-recipient + (gnus-thread-header h1) (gnus-thread-header h2))) + (defsubst gnus-article-sort-by-subject (h1 h2) "Sort articles by root subject." (string-lessp @@ -4705,33 +4859,39 @@ If nil, use subject instead." :version "22.1" :type '(radio (const :format "%v " nil) string) :group 'gnus-thread) + (defcustom gnus-sum-thread-tree-false-root "> " "With %B spec, used for a false root of a thread. If nil, use subject instead." :version "22.1" :type '(radio (const :format "%v " nil) string) :group 'gnus-thread) + (defcustom gnus-sum-thread-tree-single-indent "" "With %B spec, used for a thread with just one message. If nil, use subject instead." :version "22.1" :type '(radio (const :format "%v " nil) string) :group 'gnus-thread) + (defcustom gnus-sum-thread-tree-vertical "| " "With %B spec, used for drawing a vertical line." :version "22.1" :type 'string :group 'gnus-thread) + (defcustom gnus-sum-thread-tree-indent " " "With %B spec, used for indenting." :version "22.1" :type 'string :group 'gnus-thread) + (defcustom gnus-sum-thread-tree-leaf-with-other "+-> " "With %B spec, used for a leaf with brothers." :version "22.1" :type 'string :group 'gnus-thread) + (defcustom gnus-sum-thread-tree-single-leaf "\\-> " "With %B spec, used for a leaf without brothers." :version "22.1" @@ -5719,7 +5879,7 @@ The resulting hash table is returned, or nil if no Xrefs were found." (match-end 1))) (substring xrefs (match-beginning 1) (match-end 1)))) (setq number - (string-to-int (substring xrefs (match-beginning 2) + (string-to-number (substring xrefs (match-beginning 2) (match-end 2)))) (if (setq entry (gnus-gethash group xref-hashtb)) (setcdr entry (cons number (cdr entry))) @@ -6016,7 +6176,8 @@ Return a list of headers that match SEQUENCE (see (allp (cond ((eq gnus-read-all-available-headers t) t) - ((stringp gnus-read-all-available-headers) + ((and (stringp gnus-read-all-available-headers) + group) (string-match gnus-read-all-available-headers group)) (t nil))) @@ -6508,10 +6669,12 @@ displayed, no centering will be performed." (setq nlast (if (atom (cadr read)) (cadr read) (caadr read))) (setq read (cdr read))))) ;; And add the last unread articles. - (cond ((< first last) - (push (cons first last) unread)) - ((= first last) - (push first unread))) + (cond ((not (and first last)) + nil) + ((< first last) + (push (cons first last) unread)) + ((= first last) + (push first unread))) ;; Return the sequence of unread articles. (delq 0 (nreverse unread)))) @@ -7787,8 +7950,8 @@ articles that are younger than AGE days." (gnus-completing-read-with-default (symbol-name (car gnus-extra-headers)) (if current-prefix-arg - "Exclude extra header:" - "Limit extra header:") + "Exclude extra header" + "Limit extra header") (mapcar (lambda (x) (cons (symbol-name x) x)) gnus-extra-headers) @@ -8594,7 +8757,6 @@ If BACKWARD, search backward instead." (start (or (search-backward "\n\n" nil t) (point-min)))) (goto-char (or (text-property-any start end 'x-face-image t);; x-face-e21 - (text-property-any start end 'x-face-mule-bitmap-image t) (, opoint))))))) (defmacro gnus-summary-search-article-highlight-matched-text @@ -8620,11 +8782,7 @@ If BACKWARD, search backward instead." gnus-treat-display-x-face gnus-treat-buttonize-head gnus-treat-decode-article-as-default-mime-charset)) - (static-if (featurep 'xemacs) - items - (cons '(x-face-mule-delete-x-face-field - (quote never)) - items)))) + items)) (gnus-treat-display-x-face (when (, x-face) gnus-treat-display-x-face))) (gnus-article-prepare-mime-display))) @@ -8672,8 +8830,7 @@ Optional argument BACKWARD means do search for backward. gnus-article-buffer t))))) (gnus-summary-select-article nil t) (setq treated nil))) - (let ((gnus-inhibit-treatment t) - (x-face-mule-delete-x-face-field 'never)) + (let ((gnus-inhibit-treatment t)) (setq treated (eq 'old (gnus-summary-select-article))) (when (and treated (not @@ -9472,7 +9629,7 @@ latter case, they will be copied into the relevant groups." gnus-newsgroup-name))))) (method (gnus-completing-read-with-default - methname "What backend do you want to use when respooling?" + methname "Backend to use when respooling" methods nil t nil 'gnus-mail-method-history)) ms) (cond @@ -9766,7 +9923,8 @@ groups." (save-excursion (save-restriction (message-narrow-to-head) - (let ((head (buffer-string)) + (let ((head (buffer-substring-no-properties + (point-min) (point-max))) header) (with-temp-buffer (insert (format "211 %d Article retrieved.\n" @@ -10060,7 +10218,8 @@ the actual number of articles marked is returned." (when (gnus-summary-goto-subject article) (gnus-summary-show-thread) (gnus-summary-goto-subject article) - (gnus-summary-update-secondary-mark article)))) + (gnus-summary-update-secondary-mark article))) + t) (defun gnus-summary-set-saved-mark (article) "Set the process mark on ARTICLE and update the summary line." @@ -10632,6 +10791,15 @@ read." (gnus-summary-catchup all)) (gnus-summary-next-group)) +(defun gnus-summary-catchup-and-goto-prev-group (&optional all) + "Mark all articles in this group as read and select the previous group. +If given a prefix, mark all articles, unread as well as ticked, as +read." + (interactive "P") + (save-excursion + (gnus-summary-catchup all)) + (gnus-summary-next-group nil nil t)) + ;;; ;;; with article ;;; @@ -10818,7 +10986,9 @@ Returns nil if no thread was there to be shown." (defun gnus-map-articles (predicate articles) "Map PREDICATE over ARTICLES and return non-nil if any predicate is non-nil." (apply 'gnus-or (mapcar predicate - (mapcar 'gnus-summary-article-header articles)))) + (mapcar (lambda (number) + (gnus-summary-article-header number)) + articles)))) (defun gnus-summary-hide-all-threads (&optional predicate) "Hide all thread subtrees. @@ -11257,7 +11427,7 @@ save those articles instead." (let* ((split-name (gnus-get-split-value gnus-move-split-methods)) (minibuffer-confirm-incomplete nil) ; XEmacs (prom - (format "%s %s to:" + (format "%s %s to" prompt (if (> (length articles) 1) (format "these %d articles" (length articles)) diff --git a/lisp/gnus-topic.el b/lisp/gnus-topic.el index d1fe02e..438a2c0 100644 --- a/lisp/gnus-topic.el +++ b/lisp/gnus-topic.el @@ -1,6 +1,7 @@ ;;; gnus-topic.el --- a folding minor mode for Gnus group buffers -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Ilja Weis ;; Lars Magne Ingebrigtsen @@ -20,8 +21,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -435,7 +436,7 @@ If LOWEST is non-nil, list all newsgroups of level LOWEST or higher." (copy-sequence gnus-group-listed-groups)))) (gnus-update-format-specifications nil 'topic) - + (when (or (not gnus-topic-alist) (not gnus-topology-checked-p)) (gnus-topic-check-topology)) @@ -583,6 +584,11 @@ articles in the topic and its subtopics." (not (eq (nth 2 type) 'hidden)) level all-entries unread)) (gnus-topic-update-unreads (car type) unread) + (when gnus-group-update-tool-bar + (gnus-put-text-property beg end 'point-entered + 'gnus-tool-bar-update) + (gnus-put-text-property beg end 'point-left + 'gnus-tool-bar-update)) (goto-char end) unread)) @@ -1134,10 +1140,7 @@ articles in the topic and its subtopics." (when (gnus-visual-p 'topic-menu 'menu) (gnus-topic-make-menu-bar)) (gnus-set-format 'topic t) - (add-minor-mode 'gnus-topic-mode " Topic" - gnus-topic-mode-map nil (lambda (&rest junk) - (interactive) - (gnus-topic-mode nil t))) + (add-minor-mode 'gnus-topic-mode " Topic" gnus-topic-mode-map) (add-hook 'gnus-group-catchup-group-hook 'gnus-topic-update-topic) (set (make-local-variable 'gnus-group-prepare-function) 'gnus-group-prepare-topics) diff --git a/lisp/gnus-undo.el b/lisp/gnus-undo.el index 337d6cb..c84c26b 100644 --- a/lisp/gnus-undo.el +++ b/lisp/gnus-undo.el @@ -1,7 +1,7 @@ ;;; gnus-undo.el --- minor mode for undoing in Gnus -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2003 -;; Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news @@ -20,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el index 4805782..9825c09 100644 --- a/lisp/gnus-util.el +++ b/lisp/gnus-util.el @@ -1,6 +1,7 @@ ;;; gnus-util.el --- utility functions for Semi-gnus -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Tatsuya Ichikawa @@ -20,8 +21,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -39,9 +40,12 @@ (require 'cl) ;; Fixme: this should be a gnus variable, not nnmail-. (defvar nnmail-pathname-coding-system) + (defvar nnmail-active-file-coding-system) ;; Inappropriate references to other parts of Gnus. (defvar gnus-emphasize-whitespace-regexp) + (defvar gnus-original-article-buffer) + (defvar gnus-user-agent) ) (require 'time-date) @@ -312,8 +316,8 @@ is slower." (defun gnus-completing-read-with-default (default prompt &rest args) ;; Like `completing-read', except that DEFAULT is the default argument. (let* ((prompt (if default - (concat prompt " (default " default ") ") - (concat prompt " "))) + (concat prompt " (default " default "): ") + (concat prompt ": "))) (answer (apply 'completing-read prompt args))) (if (or (null answer) (zerop (length answer))) default @@ -474,7 +478,8 @@ inside loops." (apply 'format args))) (defun gnus-error (level &rest args) - "Beep an error if LEVEL is equal to or less than `gnus-verbose'." + "Beep an error if LEVEL is equal to or less than `gnus-verbose'. +ARGS are passed to `message'." (when (<= (floor level) gnus-verbose) (apply 'message args) (ding) @@ -1033,6 +1038,13 @@ ARG is passed to the first function." (save-current-buffer (apply 'run-hooks funcs))) +(defun gnus-run-mode-hooks (&rest funcs) + "Run `run-mode-hooks' if it is available, otherwise `run-hooks'. +This function saves the current buffer." + (if (fboundp 'run-mode-hooks) + (save-current-buffer (apply 'run-mode-hooks funcs)) + (save-current-buffer (apply 'run-hooks funcs)))) + ;;; Various (defvar gnus-group-buffer) ; Compiler directive @@ -1044,14 +1056,6 @@ ARG is passed to the first function." (set-buffer gnus-group-buffer) (eq major-mode 'gnus-group-mode)))) -(defun gnus-remove-duplicates (list) - (let (new) - (while list - (or (member (car list) new) - (setq new (cons (car list) new))) - (setq list (cdr list))) - (nreverse new))) - (defun gnus-remove-if (predicate list) "Return a copy of LIST with all items satisfying PREDICATE removed." (let (out) @@ -1453,6 +1457,26 @@ Return nil otherwise." display)) display))))) +(eval-when-compile + (defvar tool-bar-mode)) + +(defun gnus-tool-bar-update (&rest ignore) + "Update the tool bar." + (when (and (boundp 'tool-bar-mode) + tool-bar-mode) + (let* ((args nil) + (func (cond ((featurep 'xemacs) + 'ignore) + ((fboundp 'tool-bar-update) + 'tool-bar-update) + ((fboundp 'force-window-update) + 'force-window-update) + ((fboundp 'redraw-frame) + (setq args (list (selected-frame))) + 'redraw-frame) + (t 'ignore)))) + (apply func args)))) + ;; Fixme: This has only one use (in gnus-agent), which isn't worthwhile. (defmacro gnus-mapcar (function seq1 &rest seqs2_n) "Apply FUNCTION to each element of the sequences, and make a list of the results. @@ -1589,6 +1613,12 @@ empty directories from OLD-PATH." (ignore-errors (set-file-modes filename mode))) +(if (fboundp 'set-process-query-on-exit-flag) + (defalias 'gnus-set-process-query-on-exit-flag + 'set-process-query-on-exit-flag) + (defalias 'gnus-set-process-query-on-exit-flag + 'process-kill-without-query)) + (provide 'gnus-util) ;;; gnus-util.el ends here diff --git a/lisp/gnus-uu.el b/lisp/gnus-uu.el index 9da4de0..7c6de16 100644 --- a/lisp/gnus-uu.el +++ b/lisp/gnus-uu.el @@ -1,6 +1,7 @@ ;;; gnus-uu.el --- extract (uu)encoded files in Gnus -;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 2000, -;; 2001, 2002, 2003, 2004 Free Software Foundation, Inc. + +;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, +;; 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Created: 2 Oct 1993 @@ -20,8 +21,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -486,9 +487,10 @@ didn't work, and overwrite existing files. Otherwise, ask each time." ;; The case where neither a number of articles nor a region is ;; specified. (gnus-summary-top-thread) - (setq gnus-article-reply (gnus-uu-get-list-of-articles nil))) - ;; Specify articles to be forwarded. - (setq gnus-newsgroup-processable (copy-sequence gnus-article-reply)) + (setq gnus-article-reply (nreverse (gnus-uu-find-articles-matching)))) + ;; Specify articles to be forwarded. Note that they should be + ;; reversed; see `gnus-uu-get-list-of-articles'. + (setq gnus-newsgroup-processable (reverse gnus-article-reply)) (gnus-setup-message 'forward (setq gnus-uu-digest-from-subject nil) (setq gnus-uu-digest-buffer @@ -537,19 +539,19 @@ didn't work, and overwrite existing files. Otherwise, ask each time." (defun gnus-message-process-mark (unmarkp new-marked) (let ((old (- (length gnus-newsgroup-processable) (length new-marked)))) - (message "%d mark%s %s%s" - (length new-marked) - (if (= (length new-marked) 1) "" "s") - (if unmarkp "removed" "added") - (cond - ((and (zerop old) - (not unmarkp)) - "") - (unmarkp - (format ", %d remain marked" - (length gnus-newsgroup-processable))) - (t - (format ", %d already marked" old)))))) + (gnus-message 6 "%d mark%s %s%s" + (length new-marked) + (if (= (length new-marked) 1) "" "s") + (if unmarkp "removed" "added") + (cond + ((and (zerop old) + (not unmarkp)) + "") + (unmarkp + (format ", %d remain marked" + (length gnus-newsgroup-processable))) + (t + (format ", %d already marked" old)))))) (defun gnus-new-processable (unmarkp articles) (if unmarkp @@ -577,16 +579,18 @@ When called interactively, prompt for REGEXP." (interactive "sUnmark (regexp): ") (gnus-uu-mark-by-regexp regexp t)) -(defun gnus-uu-mark-series () +(defun gnus-uu-mark-series (&optional silent) "Mark the current series with the process mark." (interactive) (let* ((articles (gnus-uu-find-articles-matching)) - (l (length articles))) + (l (length articles))) (while articles (gnus-summary-set-process-mark (car articles)) (setq articles (cdr articles))) - (message "Marked %d articles" l)) - (gnus-summary-position-point)) + (unless silent + (gnus-message 6 "Marked %d articles" l)) + (gnus-summary-position-point) + l)) (defun gnus-uu-mark-region (beg end &optional unmark) "Set the process mark on all articles between point and mark." @@ -694,14 +698,16 @@ When called interactively, prompt for REGEXP." (setq gnus-newsgroup-processable nil) (save-excursion (let ((data gnus-newsgroup-data) + (count 0) number) (while data (when (and (not (memq (setq number (gnus-data-number (car data))) gnus-newsgroup-processable)) (vectorp (gnus-data-header (car data)))) (gnus-summary-goto-subject number) - (gnus-uu-mark-series)) - (setq data (cdr data))))) + (setq count (+ count (gnus-uu-mark-series t)))) + (setq data (cdr data))) + (gnus-message 6 "Marked %d articles" count))) (gnus-summary-position-point)) ;; All PostScript functions written by Erik Selberg . @@ -844,7 +850,7 @@ When called interactively, prompt for REGEXP." (erase-buffer) (insert (format "Date: %s\nFrom: %s\nSubject: %s Digest\n\n" - (current-time-string) name name)) + (message-make-date) name name)) (insert "Topics:\n"))) (when (not (eq in-state 'end)) (setq state (list 'middle)))) @@ -901,16 +907,16 @@ When called interactively, prompt for REGEXP." (if gnus-uu-digest-buffer (with-current-buffer gnus-uu-digest-buffer (erase-buffer) - (insert-buffer "*gnus-uu-pre*") + (insert-buffer-substring "*gnus-uu-pre*") (goto-char (point-max)) - (insert-buffer "*gnus-uu-body*")) + (insert-buffer-substring "*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*")) + (insert-buffer-substring "*gnus-uu-pre*")) (gnus-write-buffer-as-coding-system nnheader-text-coding-system gnus-uu-saved-article-name))) (save-excursion @@ -923,7 +929,7 @@ When called interactively, prompt for REGEXP." (if gnus-uu-digest-buffer (with-current-buffer gnus-uu-digest-buffer (goto-char (point-max)) - (insert-buffer "*gnus-uu-body*")) + (insert-buffer-substring "*gnus-uu-body*")) (let ((file-name-coding-system nnmail-pathname-coding-system)) (write-region-as-coding-system nnheader-text-coding-system @@ -1170,7 +1176,7 @@ When called interactively, prompt for REGEXP." (ignore-errors (replace-match (format "%06d" - (string-to-int (buffer-substring + (string-to-number (buffer-substring (match-beginning 0) (match-end 0))))))) (setq string (buffer-substring 1 (point-max))) (setcar (car string-list) string) @@ -1278,7 +1284,7 @@ When called interactively, prompt for REGEXP." (not gnus-uu-be-dangerous) (or (eq gnus-uu-be-dangerous t) (gnus-y-or-n-p - (format "Delete unsuccessfully decoded file %s" + (format "Delete unsuccessfully decoded file %s? " result-file)))) (delete-file result-file))) (when (memq 'begin process-state) @@ -1338,7 +1344,7 @@ When called interactively, prompt for REGEXP." (gnus-message 2 "No begin part at the beginning") (sleep-for 2)) (setq state 'middle)))) - + ;; When there are no result-files, then something must be wrong. (if result-files (message "") diff --git a/lisp/gnus-vers.el b/lisp/gnus-vers.el index fe63f5c..17ce528 100644 --- a/lisp/gnus-vers.el +++ b/lisp/gnus-vers.el @@ -1,6 +1,6 @@ ;;; gnus-vers.el --- Declare gnus version -;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Keiichi Suzuki @@ -20,9 +20,9 @@ ;; General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with this program; see the file COPYING. If not, write to -;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -40,10 +40,10 @@ ;; Product information of this gnus. (product-provide 'gnus-vers (product-define "T-gnus" nil - (list 6 17 3 + (list 6 17 4 (string-to-number gnus-revision-number)))) -(defconst gnus-original-version-number "0.3" +(defconst gnus-original-version-number "0.4" "Version number for this version of Gnus.") (provide 'running-pterodactyl-gnus-0_73-or-later) diff --git a/lisp/gnus-vm.el b/lisp/gnus-vm.el index 2737151..5e48f32 100644 --- a/lisp/gnus-vm.el +++ b/lisp/gnus-vm.el @@ -1,7 +1,7 @@ ;;; gnus-vm.el --- vm interface for Gnus -;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -;; Free Software Foundation, Inc. +;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Per Persson ;; Katsumi Yamaoka @@ -21,8 +21,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/gnus-win.el b/lisp/gnus-win.el index 95fffe7..046cbb3 100644 --- a/lisp/gnus-win.el +++ b/lisp/gnus-win.el @@ -1,6 +1,7 @@ ;;; gnus-win.el --- window configuration functions for Gnus -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news @@ -19,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/gnus-xmas.el b/lisp/gnus-xmas.el index f1e000e..858d044 100644 --- a/lisp/gnus-xmas.el +++ b/lisp/gnus-xmas.el @@ -1,7 +1,7 @@ ;;; gnus-xmas.el --- Gnus functions for XEmacs -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Katsumi Yamaoka @@ -21,8 +21,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -428,6 +428,8 @@ call it with the value of the `gnus-data' text property." (defalias 'gnus-mark-active-p 'region-exists-p) (defalias 'gnus-annotation-in-region-p 'gnus-xmas-annotation-in-region-p) (defalias 'gnus-mime-button-menu 'gnus-xmas-mime-button-menu) + (defalias 'gnus-mime-security-button-menu + 'gnus-xmas-mime-security-button-menu) (defalias 'gnus-image-type-available-p 'gnus-xmas-image-type-available-p) (defalias 'gnus-put-image 'gnus-xmas-put-image) (defalias 'gnus-create-image 'gnus-xmas-create-image) @@ -543,7 +545,7 @@ the resulting string may be narrower than END-COLUMN. " based on " gnus-original-product-name " v" gnus-original-version-number "\n") (end-of-line 0) - (put-text-property (point-min) (point) 'face 'gnus-splash-face) + (put-text-property (point-min) (point) 'face 'gnus-splash) (insert-char ?\ (prog1 (max 0 (/ (- (window-width) (point)) 2)) (goto-char (point-min)))) @@ -593,7 +595,7 @@ the resulting string may be narrower than END-COLUMN. (rest (- wheight pheight))) (insert (make-string (max 0 (* 2 (/ rest 3))) ?\n))) ;; Paint it. - (put-text-property (point-min) (point-max) 'face 'gnus-splash-face))) + (put-text-property (point-min) (point-max) 'face 'gnus-splash))) (goto-char (point-min)) (setq modeline-buffer-identification (list (concat gnus-version ": *Group*"))) @@ -602,17 +604,53 @@ the resulting string may be narrower than END-COLUMN. ;;; The toolbar. -(defcustom gnus-use-toolbar (if (featurep 'toolbar) - 'default-toolbar - nil) - "*If nil, do not use a toolbar. -If it is non-nil, it must be a toolbar. The five valid values are -`default-toolbar', `top-toolbar', `bottom-toolbar', -`right-toolbar', and `left-toolbar'." - :type '(choice (const default-toolbar) - (const top-toolbar) (const bottom-toolbar) - (const left-toolbar) (const right-toolbar) +(defun gnus-xmas-update-toolbars () + "Update the toolbars' appearance." + (when (and (not noninteractive) + (featurep 'gnus-xmas)) + (save-excursion + (dolist (buffer (buffer-list)) + (set-buffer buffer) + (cond ((eq major-mode 'gnus-group-mode) + (gnus-xmas-setup-group-toolbar)) + ((eq major-mode 'gnus-summary-mode) + (gnus-xmas-setup-summary-toolbar))))))) + +(defcustom gnus-use-toolbar (if (featurep 'toolbar) 'default) + "*Position to display the toolbar. Nil means do not use a toolbar. +If it is non-nil, it should be one of the symbols `default', `top', +`bottom', `right', and `left'. `default' means to use the default +toolbar, the rest mean to display the toolbar on the place which those +names show." + :type '(choice (const default) + (const top) (const bottom) (const left) (const right) (const :tag "no toolbar" nil)) + :set (lambda (symbol value) + (set-default + symbol + (if (or (not value) + (memq value (list 'default 'top 'bottom 'right 'left))) + value + 'default)) + (gnus-xmas-update-toolbars)) + :group 'gnus-xmas) + +(defcustom gnus-toolbar-thickness + (if (featurep 'toolbar) + (cons (specifier-instance default-toolbar-height) + (specifier-instance default-toolbar-width))) + "*Cons of the height and the width specifying the thickness of a toolbar. +The height is used for the toolbar displayed on the top or the bottom, +the width is used for the toolbar displayed on the right or the left." + :type '(cons :tag "height & width" + (integer :tag "height") (integer :tag "width")) + :set (lambda (symbol value) + (set-default + symbol + (if (and (consp value) (natnump (car value)) (natnump (cdr value))) + value + '(37 . 40))) + (gnus-xmas-update-toolbars)) :group 'gnus-xmas) (defvar gnus-group-toolbar @@ -694,19 +732,57 @@ If it is non-nil, it must be a toolbar. The five valid values are [gnus-summary-exit gnus-summary-exit t "Exit this summary"]) "The summary buffer mail toolbar.") +(defun gnus-xmas-setup-toolbar (toolbar) + (when (featurep 'toolbar) + (if (and gnus-use-toolbar + (message-xmas-setup-toolbar toolbar nil "gnus")) + (let ((bar (or (intern-soft (format "%s-toolbar" gnus-use-toolbar)) + 'default-toolbar)) + (height (car gnus-toolbar-thickness)) + (width (cdr gnus-toolbar-thickness)) + (cur (current-buffer)) + bars) + (set-specifier (symbol-value bar) toolbar cur) + (set-specifier default-toolbar-height height cur) + (set-specifier default-toolbar-width width cur) + (set-specifier top-toolbar-height height cur) + (set-specifier bottom-toolbar-height height cur) + (set-specifier right-toolbar-width width cur) + (set-specifier left-toolbar-width width cur) + (if (eq bar 'default-toolbar) + (progn + (remove-specifier default-toolbar-visible-p cur) + (remove-specifier top-toolbar cur) + (remove-specifier top-toolbar-visible-p cur) + (remove-specifier bottom-toolbar cur) + (remove-specifier bottom-toolbar-visible-p cur) + (remove-specifier right-toolbar cur) + (remove-specifier right-toolbar-visible-p cur) + (remove-specifier left-toolbar cur) + (remove-specifier left-toolbar-visible-p cur)) + (set-specifier (symbol-value (intern (format "%s-visible-p" bar))) + t cur) + (setq bars (delq bar (list 'default-toolbar + 'bottom-toolbar 'top-toolbar + 'right-toolbar 'left-toolbar))) + (while bars + (set-specifier (symbol-value (intern (format "%s-visible-p" + (pop bars)))) + nil cur)))) + (let ((cur (current-buffer))) + (set-specifier default-toolbar-visible-p nil cur) + (set-specifier top-toolbar-visible-p nil cur) + (set-specifier bottom-toolbar-visible-p nil cur) + (set-specifier right-toolbar-visible-p nil cur) + (set-specifier left-toolbar-visible-p nil cur))))) + (defun gnus-xmas-setup-group-toolbar () - (and gnus-use-toolbar - (message-xmas-setup-toolbar gnus-group-toolbar nil "gnus") - (set-specifier (symbol-value gnus-use-toolbar) - (cons (current-buffer) gnus-group-toolbar)))) + (gnus-xmas-setup-toolbar gnus-group-toolbar)) (defun gnus-xmas-setup-summary-toolbar () - (let ((bar (if (gnus-news-group-p gnus-newsgroup-name) - gnus-summary-toolbar gnus-summary-mail-toolbar))) - (and gnus-use-toolbar - (message-xmas-setup-toolbar bar nil "gnus") - (set-specifier (symbol-value gnus-use-toolbar) - (cons (current-buffer) bar))))) + (gnus-xmas-setup-toolbar (if (gnus-news-group-p gnus-newsgroup-name) + gnus-summary-toolbar + gnus-summary-mail-toolbar))) (defun gnus-xmas-mail-strip-quoted-names (address) "Protect mail-strip-quoted-names from nil input. @@ -787,6 +863,21 @@ XEmacs compatibility workaround." (goto-char (event-point event)) (funcall (event-function response) (event-object response)))) +(defun gnus-xmas-mime-security-button-menu (event prefix) + "Construct a context-sensitive menu of security commands." + (interactive "e\nP") + (let ((response + (get-popup-menu-response + `("Security Part" + ,@(delq nil + (mapcar (lambda (c) + (unless (eq (car c) 'undefined) + `[,(caddr c) ,(car c) t])) + gnus-mime-security-button-commands)))))) + (set-buffer (event-buffer event)) + (goto-char (event-point event)) + (funcall (event-function response) (event-object response)))) + (defun gnus-group-add-icon () "Add an icon to the current line according to `gnus-group-icon-list'." (let* ((p (point)) diff --git a/lisp/gnus.el b/lisp/gnus.el index d8b38fc..77a370e 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -1,7 +1,7 @@ ;;; gnus.el --- a newsreader for GNU Emacs -;; Copyright (C) 1987, 1988, 1989, 1990, 1993, 1994, 1995, 1996, 1997, -;; 1998, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1987, 1988, 1989, 1990, 1993, 1994, 1995, 1996, 1997, 1998, +;; 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Masanobu UMEDA ;; Lars Magne Ingebrigtsen @@ -23,8 +23,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -37,10 +37,20 @@ (require 'wid-edit) (require 'nnheader) -(autoload 'message-y-or-n-p "message" nil nil 'macro) (require 'gnus-vers) +;; These are defined afterwards with gnus-define-group-parameter +(defvar gnus-ham-process-destinations) +(defvar gnus-parameter-ham-marks-alist) +(defvar gnus-parameter-spam-marks-alist) +(defvar gnus-spam-autodetect) +(defvar gnus-spam-autodetect-methods) +(defvar gnus-spam-newsgroup-contents) +(defvar gnus-spam-process-destinations) +(defvar gnus-spam-process-newsgroups) + + (defgroup gnus nil "The coffee-brewing, all singing, all dancing, kitchen sink newsreader." :group 'news @@ -279,7 +289,7 @@ is restarted, and sometimes reloaded." :group 'gnus) (defgroup gnus-exit nil - "Exiting gnus." + "Exiting Gnus." :link '(custom-manual "(gnus)Exiting Gnus") :group 'gnus) @@ -353,7 +363,7 @@ be set in `.emacs' instead." ;; We define these group faces here to avoid the display ;; update forced when creating new faces. -(defface gnus-group-news-1-face +(defface gnus-group-news-1 '((((class color) (background dark)) (:foreground "PaleTurquoise" :bold t)) @@ -362,9 +372,12 @@ be set in `.emacs' instead." (:foreground "ForestGreen" :bold t)) (t ())) - "Level 1 newsgroup face.") + "Level 1 newsgroup face." + :group 'gnus-group) +;; backward-compatibility alias +(put 'gnus-group-news-1-face 'face-alias 'gnus-group-news-1) -(defface gnus-group-news-1-empty-face +(defface gnus-group-news-1-empty '((((class color) (background dark)) (:foreground "PaleTurquoise")) @@ -373,9 +386,12 @@ be set in `.emacs' instead." (:foreground "ForestGreen")) (t ())) - "Level 1 empty newsgroup face.") + "Level 1 empty newsgroup face." + :group 'gnus-group) +;; backward-compatibility alias +(put 'gnus-group-news-1-empty-face 'face-alias 'gnus-group-news-1-empty) -(defface gnus-group-news-2-face +(defface gnus-group-news-2 '((((class color) (background dark)) (:foreground "turquoise" :bold t)) @@ -384,9 +400,12 @@ be set in `.emacs' instead." (:foreground "CadetBlue4" :bold t)) (t ())) - "Level 2 newsgroup face.") + "Level 2 newsgroup face." + :group 'gnus-group) +;; backward-compatibility alias +(put 'gnus-group-news-2-face 'face-alias 'gnus-group-news-2) -(defface gnus-group-news-2-empty-face +(defface gnus-group-news-2-empty '((((class color) (background dark)) (:foreground "turquoise")) @@ -395,9 +414,12 @@ be set in `.emacs' instead." (:foreground "CadetBlue4")) (t ())) - "Level 2 empty newsgroup face.") + "Level 2 empty newsgroup face." + :group 'gnus-group) +;; backward-compatibility alias +(put 'gnus-group-news-2-empty-face 'face-alias 'gnus-group-news-2-empty) -(defface gnus-group-news-3-face +(defface gnus-group-news-3 '((((class color) (background dark)) (:bold t)) @@ -406,9 +428,12 @@ be set in `.emacs' instead." (:bold t)) (t ())) - "Level 3 newsgroup face.") + "Level 3 newsgroup face." + :group 'gnus-group) +;; backward-compatibility alias +(put 'gnus-group-news-3-face 'face-alias 'gnus-group-news-3) -(defface gnus-group-news-3-empty-face +(defface gnus-group-news-3-empty '((((class color) (background dark)) ()) @@ -417,9 +442,12 @@ be set in `.emacs' instead." ()) (t ())) - "Level 3 empty newsgroup face.") + "Level 3 empty newsgroup face." + :group 'gnus-group) +;; backward-compatibility alias +(put 'gnus-group-news-3-empty-face 'face-alias 'gnus-group-news-3-empty) -(defface gnus-group-news-4-face +(defface gnus-group-news-4 '((((class color) (background dark)) (:bold t)) @@ -428,9 +456,12 @@ be set in `.emacs' instead." (:bold t)) (t ())) - "Level 4 newsgroup face.") + "Level 4 newsgroup face." + :group 'gnus-group) +;; backward-compatibility alias +(put 'gnus-group-news-4-face 'face-alias 'gnus-group-news-4) -(defface gnus-group-news-4-empty-face +(defface gnus-group-news-4-empty '((((class color) (background dark)) ()) @@ -439,9 +470,12 @@ be set in `.emacs' instead." ()) (t ())) - "Level 4 empty newsgroup face.") + "Level 4 empty newsgroup face." + :group 'gnus-group) +;; backward-compatibility alias +(put 'gnus-group-news-4-empty-face 'face-alias 'gnus-group-news-4-empty) -(defface gnus-group-news-5-face +(defface gnus-group-news-5 '((((class color) (background dark)) (:bold t)) @@ -450,9 +484,12 @@ be set in `.emacs' instead." (:bold t)) (t ())) - "Level 5 newsgroup face.") + "Level 5 newsgroup face." + :group 'gnus-group) +;; backward-compatibility alias +(put 'gnus-group-news-5-face 'face-alias 'gnus-group-news-5) -(defface gnus-group-news-5-empty-face +(defface gnus-group-news-5-empty '((((class color) (background dark)) ()) @@ -461,9 +498,12 @@ be set in `.emacs' instead." ()) (t ())) - "Level 5 empty newsgroup face.") + "Level 5 empty newsgroup face." + :group 'gnus-group) +;; backward-compatibility alias +(put 'gnus-group-news-5-empty-face 'face-alias 'gnus-group-news-5-empty) -(defface gnus-group-news-6-face +(defface gnus-group-news-6 '((((class color) (background dark)) (:bold t)) @@ -472,9 +512,12 @@ be set in `.emacs' instead." (:bold t)) (t ())) - "Level 6 newsgroup face.") + "Level 6 newsgroup face." + :group 'gnus-group) +;; backward-compatibility alias +(put 'gnus-group-news-6-face 'face-alias 'gnus-group-news-6) -(defface gnus-group-news-6-empty-face +(defface gnus-group-news-6-empty '((((class color) (background dark)) ()) @@ -483,9 +526,12 @@ be set in `.emacs' instead." ()) (t ())) - "Level 6 empty newsgroup face.") + "Level 6 empty newsgroup face." + :group 'gnus-group) +;; backward-compatibility alias +(put 'gnus-group-news-6-empty-face 'face-alias 'gnus-group-news-6-empty) -(defface gnus-group-news-low-face +(defface gnus-group-news-low '((((class color) (background dark)) (:foreground "DarkTurquoise" :bold t)) @@ -494,9 +540,12 @@ be set in `.emacs' instead." (:foreground "DarkGreen" :bold t)) (t ())) - "Low level newsgroup face.") + "Low level newsgroup face." + :group 'gnus-group) +;; backward-compatibility alias +(put 'gnus-group-news-low-face 'face-alias 'gnus-group-news-low) -(defface gnus-group-news-low-empty-face +(defface gnus-group-news-low-empty '((((class color) (background dark)) (:foreground "DarkTurquoise")) @@ -505,9 +554,12 @@ be set in `.emacs' instead." (:foreground "DarkGreen")) (t ())) - "Low level empty newsgroup face.") + "Low level empty newsgroup face." + :group 'gnus-group) +;; backward-compatibility alias +(put 'gnus-group-news-low-empty-face 'face-alias 'gnus-group-news-low-empty) -(defface gnus-group-mail-1-face +(defface gnus-group-mail-1 '((((class color) (background dark)) (:foreground "aquamarine1" :bold t)) @@ -516,9 +568,12 @@ be set in `.emacs' instead." (:foreground "DeepPink3" :bold t)) (t (:bold t))) - "Level 1 mailgroup face.") + "Level 1 mailgroup face." + :group 'gnus-group) +;; backward-compatibility alias +(put 'gnus-group-mail-1-face 'face-alias 'gnus-group-mail-1) -(defface gnus-group-mail-1-empty-face +(defface gnus-group-mail-1-empty '((((class color) (background dark)) (:foreground "aquamarine1")) @@ -527,9 +582,12 @@ be set in `.emacs' instead." (:foreground "DeepPink3")) (t (:italic t :bold t))) - "Level 1 empty mailgroup face.") + "Level 1 empty mailgroup face." + :group 'gnus-group) +;; backward-compatibility alias +(put 'gnus-group-mail-1-empty-face 'face-alias 'gnus-group-mail-1-empty) -(defface gnus-group-mail-2-face +(defface gnus-group-mail-2 '((((class color) (background dark)) (:foreground "aquamarine2" :bold t)) @@ -538,9 +596,12 @@ be set in `.emacs' instead." (:foreground "HotPink3" :bold t)) (t (:bold t))) - "Level 2 mailgroup face.") + "Level 2 mailgroup face." + :group 'gnus-group) +;; backward-compatibility alias +(put 'gnus-group-mail-2-face 'face-alias 'gnus-group-mail-2) -(defface gnus-group-mail-2-empty-face +(defface gnus-group-mail-2-empty '((((class color) (background dark)) (:foreground "aquamarine2")) @@ -549,9 +610,12 @@ be set in `.emacs' instead." (:foreground "HotPink3")) (t (:bold t))) - "Level 2 empty mailgroup face.") + "Level 2 empty mailgroup face." + :group 'gnus-group) +;; backward-compatibility alias +(put 'gnus-group-mail-2-empty-face 'face-alias 'gnus-group-mail-2-empty) -(defface gnus-group-mail-3-face +(defface gnus-group-mail-3 '((((class color) (background dark)) (:foreground "aquamarine3" :bold t)) @@ -560,9 +624,12 @@ be set in `.emacs' instead." (:foreground "magenta4" :bold t)) (t (:bold t))) - "Level 3 mailgroup face.") + "Level 3 mailgroup face." + :group 'gnus-group) +;; backward-compatibility alias +(put 'gnus-group-mail-3-face 'face-alias 'gnus-group-mail-3) -(defface gnus-group-mail-3-empty-face +(defface gnus-group-mail-3-empty '((((class color) (background dark)) (:foreground "aquamarine3")) @@ -571,9 +638,12 @@ be set in `.emacs' instead." (:foreground "magenta4")) (t ())) - "Level 3 empty mailgroup face.") + "Level 3 empty mailgroup face." + :group 'gnus-group) +;; backward-compatibility alias +(put 'gnus-group-mail-3-empty-face 'face-alias 'gnus-group-mail-3-empty) -(defface gnus-group-mail-low-face +(defface gnus-group-mail-low '((((class color) (background dark)) (:foreground "aquamarine4" :bold t)) @@ -582,9 +652,12 @@ be set in `.emacs' instead." (:foreground "DeepPink4" :bold t)) (t (:bold t))) - "Low level mailgroup face.") + "Low level mailgroup face." + :group 'gnus-group) +;; backward-compatibility alias +(put 'gnus-group-mail-low-face 'face-alias 'gnus-group-mail-low) -(defface gnus-group-mail-low-empty-face +(defface gnus-group-mail-low-empty '((((class color) (background dark)) (:foreground "aquamarine4")) @@ -593,20 +666,28 @@ be set in `.emacs' instead." (:foreground "DeepPink4")) (t (:bold t))) - "Low level empty mailgroup face.") + "Low level empty mailgroup face." + :group 'gnus-group) +;; backward-compatibility alias +(put 'gnus-group-mail-low-empty-face 'face-alias 'gnus-group-mail-low-empty) ;; Summary mode faces. -(defface gnus-summary-selected-face '((t - (:underline t))) - "Face used for selected articles.") +(defface gnus-summary-selected '((t (:underline t))) + "Face used for selected articles." + :group 'gnus-summary) +;; backward-compatibility alias +(put 'gnus-summary-selected-face 'face-alias 'gnus-summary-selected) -(defface gnus-summary-cancelled-face +(defface gnus-summary-cancelled '((((class color)) (:foreground "yellow" :background "black"))) - "Face used for cancelled articles.") + "Face used for cancelled articles." + :group 'gnus-summary) +;; backward-compatibility alias +(put 'gnus-summary-cancelled-face 'face-alias 'gnus-summary-cancelled) -(defface gnus-summary-high-ticked-face +(defface gnus-summary-high-ticked '((((class color) (background dark)) (:foreground "pink" :bold t)) @@ -615,9 +696,12 @@ be set in `.emacs' instead." (:foreground "firebrick" :bold t)) (t (:bold t))) - "Face used for high interest ticked articles.") + "Face used for high interest ticked articles." + :group 'gnus-summary) +;; backward-compatibility alias +(put 'gnus-summary-high-ticked-face 'face-alias 'gnus-summary-high-ticked) -(defface gnus-summary-low-ticked-face +(defface gnus-summary-low-ticked '((((class color) (background dark)) (:foreground "pink" :italic t)) @@ -626,9 +710,12 @@ be set in `.emacs' instead." (:foreground "firebrick" :italic t)) (t (:italic t))) - "Face used for low interest ticked articles.") + "Face used for low interest ticked articles." + :group 'gnus-summary) +;; backward-compatibility alias +(put 'gnus-summary-low-ticked-face 'face-alias 'gnus-summary-low-ticked) -(defface gnus-summary-normal-ticked-face +(defface gnus-summary-normal-ticked '((((class color) (background dark)) (:foreground "pink")) @@ -637,9 +724,12 @@ be set in `.emacs' instead." (:foreground "firebrick")) (t ())) - "Face used for normal interest ticked articles.") + "Face used for normal interest ticked articles." + :group 'gnus-summary) +;; backward-compatibility alias +(put 'gnus-summary-normal-ticked-face 'face-alias 'gnus-summary-normal-ticked) -(defface gnus-summary-high-ancient-face +(defface gnus-summary-high-ancient '((((class color) (background dark)) (:foreground "SkyBlue" :bold t)) @@ -648,9 +738,12 @@ be set in `.emacs' instead." (:foreground "RoyalBlue" :bold t)) (t (:bold t))) - "Face used for high interest ancient articles.") + "Face used for high interest ancient articles." + :group 'gnus-summary) +;; backward-compatibility alias +(put 'gnus-summary-high-ancient-face 'face-alias 'gnus-summary-high-ancient) -(defface gnus-summary-low-ancient-face +(defface gnus-summary-low-ancient '((((class color) (background dark)) (:foreground "SkyBlue" :italic t)) @@ -659,9 +752,12 @@ be set in `.emacs' instead." (:foreground "RoyalBlue" :italic t)) (t (:italic t))) - "Face used for low interest ancient articles.") + "Face used for low interest ancient articles." + :group 'gnus-summary) +;; backward-compatibility alias +(put 'gnus-summary-low-ancient-face 'face-alias 'gnus-summary-low-ancient) -(defface gnus-summary-normal-ancient-face +(defface gnus-summary-normal-ancient '((((class color) (background dark)) (:foreground "SkyBlue")) @@ -670,56 +766,80 @@ be set in `.emacs' instead." (:foreground "RoyalBlue")) (t ())) - "Face used for normal interest ancient articles.") + "Face used for normal interest ancient articles." + :group 'gnus-summary) +;; backward-compatibility alias +(put 'gnus-summary-normal-ancient-face 'face-alias 'gnus-summary-normal-ancient) -(defface gnus-summary-high-undownloaded-face +(defface gnus-summary-high-undownloaded '((((class color) (background light)) (:bold t :foreground "cyan4")) (((class color) (background dark)) (:bold t :foreground "LightGray")) (t (:inverse-video t :bold t))) - "Face used for high interest uncached articles.") + "Face used for high interest uncached articles." + :group 'gnus-summary) +;; backward-compatibility alias +(put 'gnus-summary-high-undownloaded-face 'face-alias 'gnus-summary-high-undownloaded) -(defface gnus-summary-low-undownloaded-face +(defface gnus-summary-low-undownloaded '((((class color) (background light)) (:italic t :foreground "cyan4" :bold nil)) (((class color) (background dark)) (:italic t :foreground "LightGray" :bold nil)) (t (:inverse-video t :italic t))) - "Face used for low interest uncached articles.") + "Face used for low interest uncached articles." + :group 'gnus-summary) +;; backward-compatibility alias +(put 'gnus-summary-low-undownloaded-face 'face-alias 'gnus-summary-low-undownloaded) -(defface gnus-summary-normal-undownloaded-face +(defface gnus-summary-normal-undownloaded '((((class color) (background light)) (:foreground "cyan4" :bold nil)) (((class color) (background dark)) (:foreground "LightGray" :bold nil)) (t (:inverse-video t))) - "Face used for normal interest uncached articles.") + "Face used for normal interest uncached articles." + :group 'gnus-summary) +;; backward-compatibility alias +(put 'gnus-summary-normal-undownloaded-face 'face-alias 'gnus-summary-normal-undownloaded) -(defface gnus-summary-high-unread-face +(defface gnus-summary-high-unread '((t (:bold t))) - "Face used for high interest unread articles.") + "Face used for high interest unread articles." + :group 'gnus-summary) +;; backward-compatibility alias +(put 'gnus-summary-high-unread-face 'face-alias 'gnus-summary-high-unread) -(defface gnus-summary-low-unread-face +(defface gnus-summary-low-unread '((t (:italic t))) - "Face used for low interest unread articles.") + "Face used for low interest unread articles." + :group 'gnus-summary) +;; backward-compatibility alias +(put 'gnus-summary-low-unread-face 'face-alias 'gnus-summary-low-unread) -(defface gnus-summary-normal-unread-face +(defface gnus-summary-normal-unread '((t ())) - "Face used for normal interest unread articles.") + "Face used for normal interest unread articles." + :group 'gnus-summary) +;; backward-compatibility alias +(put 'gnus-summary-normal-unread-face 'face-alias 'gnus-summary-normal-unread) -(defface gnus-summary-incorporated-face +(defface gnus-summary-incorporated '((t ())) - "Face used for incorporated articles.") + "Face used for incorporated articles." + :group 'gnus-summary) +;; backward-compatibility alias +(put 'gnus-summary-incorporated-face 'face-alias 'gnus-summary-incorporated) -(defface gnus-summary-high-read-face +(defface gnus-summary-high-read '((((class color) (background dark)) (:foreground "PaleGreen" @@ -730,9 +850,12 @@ be set in `.emacs' instead." :bold t)) (t (:bold t))) - "Face used for high interest read articles.") + "Face used for high interest read articles." + :group 'gnus-summary) +;; backward-compatibility alias +(put 'gnus-summary-high-read-face 'face-alias 'gnus-summary-high-read) -(defface gnus-summary-low-read-face +(defface gnus-summary-low-read '((((class color) (background dark)) (:foreground "PaleGreen" @@ -743,9 +866,12 @@ be set in `.emacs' instead." :italic t)) (t (:italic t))) - "Face used for low interest read articles.") + "Face used for low interest read articles." + :group 'gnus-summary) +;; backward-compatibility alias +(put 'gnus-summary-low-read-face 'face-alias 'gnus-summary-low-read) -(defface gnus-summary-normal-read-face +(defface gnus-summary-normal-read '((((class color) (background dark)) (:foreground "PaleGreen")) @@ -754,7 +880,10 @@ be set in `.emacs' instead." (:foreground "DarkGreen")) (t ())) - "Face used for normal interest read articles.") + "Face used for normal interest read articles." + :group 'gnus-summary) +;; backward-compatibility alias +(put 'gnus-summary-normal-read-face 'face-alias 'gnus-summary-normal-read) ;;; @@ -798,7 +927,7 @@ be set in `.emacs' instead." (eval-and-compile (autoload 'gnus-play-jingle "gnus-audio")) -(defface gnus-splash-face +(defface gnus-splash '((((class color) (background dark)) (:foreground "#888888")) @@ -807,7 +936,10 @@ be set in `.emacs' instead." (:foreground "#888888")) (t ())) - "Face for the splash screen.") + "Face for the splash screen." + :group 'gnus-start) +;; backward-compatibility alias +(put 'gnus-splash-face 'face-alias 'gnus-splash) (defun gnus-splash () (save-excursion @@ -876,8 +1008,13 @@ be set in `.emacs' instead." ((and (fboundp 'find-image) (display-graphic-p) (let* ((bg (face-background 'default)) - (fg (face-foreground 'gnus-splash-face)) + (fg (face-foreground 'gnus-splash)) (data-directory (nnheader-find-etc-directory "images/gnus")) + (image-load-path (cond (data-directory + (list data-directory)) + ((boundp 'image-load-path) + (symbol-value 'image-load-path)) + (t load-path))) (image (find-image `((:type xpm :file "gnus.xpm" :color-symbols @@ -957,7 +1094,7 @@ be set in `.emacs' instead." (rest (- wheight pheight))) (insert (make-string (max 0 (* 2 (/ rest 3))) ?\n))) ;; Fontify some. - (put-text-property (point-min) (point-max) 'face 'gnus-splash-face) + (put-text-property (point-min) (point-max) 'face 'gnus-splash) (setq gnus-simple-splash t))) (goto-char (point-min)) (setq mode-line-buffer-identification (concat " " gnus-version)) @@ -993,17 +1130,18 @@ For example: :type '(repeat (cons regexp (repeat sexp)))) -(defvar gnus-group-parameters-more nil) - -(defvar gnus-colon-keywords - (eval-when-compile - (when (boundp 'dgnushack-colon-keywords) - (symbol-value 'dgnushack-colon-keywords))) - "List of the colon keywords should be bound at run-time. This variable -defaults to a proper value only if this file is byte-compiled by make.") +(defcustom gnus-parameters-case-fold-search 'default + "If it is t, ignore case of group names specified in `gnus-parameters'. +If it is nil, don't ignore case. If it is `default', which is for the +backward compatibility, use the value of `case-fold-search'." + :version "22.1" + :group 'gnus-group-various + :type '(choice :format "%{%t%}:\n %[Value Menu%] %v" + (const :tag "Use `case-fold-search'" default) + (const nil) + (const t))) -(dolist (keyword gnus-colon-keywords) - (set keyword keyword)) +(defvar gnus-group-parameters-more nil) (defmacro gnus-define-group-parameter (param &rest rest) "Define a group parameter PARAM. @@ -1463,9 +1601,23 @@ articles. This is not a good idea." :value t))) (defcustom gnus-use-nocem nil - "*If non-nil, Gnus will read NoCeM cancel messages." + "*If non-nil, Gnus will read NoCeM cancel messages. +You can also set this variable to a positive number as a group level. +In that case, Gnus scans NoCeM messages when checking new news if this +value is not exceeding a group level that you specify as the prefix +argument to some commands, e.g. `gnus', `gnus-group-get-new-news', etc. +Otherwise, Gnus does not scan NoCeM messages if you specify a group +level to those commands." :group 'gnus-meta - :type 'boolean) + :type '(choice + (const :tag "off" nil) + (const :tag "on" t) + (list :convert-widget + (lambda (widget) + (list 'integer :tag "group level" + :value (if (boundp 'gnus-level-default-subscribed) + gnus-level-default-subscribed + 3)))))) (defcustom gnus-suppress-duplicates nil "*If non-nil, Gnus will mark duplicate copies of the same article as read." @@ -2307,7 +2459,8 @@ following hook: "Function run when a group level is changed. It is called with three parameters -- GROUP, LEVEL and OLDLEVEL." :group 'gnus-group-levels - :type 'function) + :type '(choice (const nil) + function)) ;;; Face thingies. @@ -2911,14 +3064,6 @@ gnus-registry.el will populate this if it's loaded.") gnus-group-split-update) ("gnus-delay" gnus-delay-initialize)))) -(eval-and-compile - (unless (featurep 'xemacs) - (autoload 'x-face-mule-gnus-article-display-x-face "x-face-mule"))) - -(unless (and (fboundp 'base64-encode-string) - (subrp (symbol-function 'base64-encode-string))) - (require 'base64)) - ;; To search articles with Namazu. (autoload 'gnus-namazu-search "gnus-namazu" nil t) (autoload 'gnus-namazu-create-index "gnus-namazu" nil t) @@ -3442,11 +3587,8 @@ that that variable is buffer-local to the summary buffers." (push name-method gnus-server-method-cache)) (throw 'server-name (car name-method)))) server-alist)) - (let ((alists (list gnus-server-alist - gnus-predefined-server-alist))) - (if gnus-select-method - (push (list (cons "native" gnus-select-method)) alists)) - alists)) + (list gnus-server-alist + gnus-predefined-server-alist)) (let* ((name (if (member (cadr method) '(nil "")) (format "%s" (car method)) @@ -3721,7 +3863,10 @@ You should probably use `gnus-find-method-for-group' instead." (defun gnus-parameters-get-parameter (group) "Return the group parameters for GROUP from `gnus-parameters'." - (let (params-list) + (let ((case-fold-search (if (eq gnus-parameters-case-fold-search 'default) + case-fold-search + gnus-parameters-case-fold-search)) + params-list) (dolist (elem gnus-parameters) (when (string-match (car elem) group) (setq params-list @@ -3805,6 +3950,7 @@ If you call this function inside a loop, consider using the faster (defun gnus-group-get-parameter (group &optional symbol allow-list) "Return the group parameters for GROUP. If SYMBOL, return the value of that symbol in the group parameters. +If ALLOW-LIST, also allow list as a result. Most functions should use `gnus-group-find-parameter', which also examines the topic parameters." (let ((params (gnus-info-params (gnus-get-info group)))) @@ -3814,7 +3960,8 @@ also examines the topic parameters." (defun gnus-group-parameter-value (params symbol &optional allow-list present-p) - "Return the value of SYMBOL in group PARAMS." + "Return the value of SYMBOL in group PARAMS. +If ALLOW-LIST, also allow list as a result." ;; We only wish to return group parameters (dotted lists) and ;; not local variables, which may have the same names. ;; But first we handle single elements... @@ -4080,7 +4227,7 @@ If NEWSGROUP is nil, return the global kill file name instead." (setq valids (cdr valids))) outs)) -(eval-when-compile +(eval-and-compile (autoload 'message-y-or-n-p "message" nil nil 'macro)) (defun gnus-read-group (prompt &optional default) diff --git a/lisp/hashcash.el b/lisp/hashcash.el index 8172590..9920dcd 100644 --- a/lisp/hashcash.el +++ b/lisp/hashcash.el @@ -20,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -49,14 +49,16 @@ ;;; Code: -(eval-and-compile - (autoload 'executable-find "executable")) +(defgroup hashcash nil + "Hashcash configuration." + :group 'mail) (defcustom hashcash-default-payment 20 "*The default number of bits to pay to unknown users. If this is zero, no payment header will be generated. See `hashcash-payment-alist'." - :type 'integer) + :type 'integer + :group 'hashcash) (defcustom hashcash-payment-alist '() "*An association list mapping email addresses to payment amounts. @@ -70,32 +72,39 @@ present, is the string to be hashed; if not present ADDR will be used." (list :tag "Replace hash input" (string :name "Address") (string :name "Hash input") - (integer :name "Amount"))))) + (integer :name "Amount")))) + :group 'hashcash) (defcustom hashcash-default-accept-payment 20 "*The default minimum number of bits to accept on incoming payments." - :type 'integer) + :type 'integer + :group 'hashcash) (defcustom hashcash-accept-resources `((,user-mail-address nil)) "*An association list mapping hashcash resources to payment amounts. Resources named here are to be accepted in incoming payments. If the corresponding AMOUNT is NIL, the value of `hashcash-default-accept-payment' -is used instead.") +is used instead." + :group 'hashcash) (defcustom hashcash-path (executable-find "hashcash") - "*The path to the hashcash binary.") + "*The path to the hashcash binary." + :group 'hashcash) (defcustom hashcash-extra-generate-parameters nil "*A list of parameter strings passed to `hashcash-path' when minting. For example, you may want to set this to '(\"-Z2\") to reduce header length." - :type '(repeat string)) + :type '(repeat string) + :group 'hashcash) (defcustom hashcash-double-spend-database "hashcash.db" - "*The path to the double-spending database.") + "*The path to the double-spending database." + :group 'hashcash) (defcustom hashcash-in-news nil "*Specifies whether or not hashcash payments should be made to newsgroups." - :type 'boolean) + :type 'boolean + :group 'hashcash) (defvar hashcash-process-alist nil "Alist of asynchronous hashcash processes and buffers.") @@ -201,7 +210,8 @@ Return immediately. Call CALLBACK with process and result when ready." (save-excursion (save-restriction (message-narrow-to-headers-or-head) - (let ((token (message-fetch-field "x-hashcash"))) + (let ((token (message-fetch-field "x-hashcash")) + (case-fold-search t)) (and (stringp token) (string-match (regexp-quote recipient) token)))))) diff --git a/lisp/html2text.el b/lisp/html2text.el index 91d8426..c6822e4 100644 --- a/lisp/html2text.el +++ b/lisp/html2text.el @@ -1,5 +1,6 @@ ;;; html2text.el --- a simple html to plain text converter -;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. + +;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Joakim Hove @@ -17,8 +18,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -42,8 +43,42 @@ (defvar html2text-format-single-element-list '(("hr" . html2text-clean-hr))) (defvar html2text-replace-list - '((" " . " ") (">" . ">") ("<" . "<") (""" . "\"") - ("&" . "&") ("'" . "'")) + '(("´" . "`") + ("&" . "&") + ("'" . "'") + ("¦" . "|") + ("¢" . "c") + ("ˆ" . "^") + ("©" . "(C)") + ("¤" . "(#)") + ("°" . "degree") + ("÷" . "/") + ("€" . "e") + ("½" . "1/2") + (">" . ">") + ("¿" . "?") + ("«" . "<<") + ("&ldquo" . "\"") + ("‹" . "(") + ("‘" . "`") + ("<" . "<") + ("—" . "--") + (" " . " ") + ("–" . "-") + ("‰" . "%%") + ("±" . "+-") + ("£" . "£") + (""" . "\"") + ("»" . ">>") + ("&rdquo" . "\"") + ("®" . "(R)") + ("›" . ")") + ("’" . "'") + ("§" . "§") + ("¹" . "^1") + ("²" . "^2") + ("³" . "^3") + ("˜" . "~")) "The map of entity to text. This is an alist were each element is a dotted pair consisting of an @@ -58,7 +93,7 @@ completely verbatim - without any use of REGEXP.") This is a list of tags which should be removed, without any formatting. Note that tags in the list are presented *without* -any \"<\" or \">\". All occurences of a tag appearing in this +any \"<\" or \">\". All occurrences of a tag appearing in this list are removed, irrespective of whether it is a closing or opening tag, or if the tag has additional attributes. The deletion is done by the function `html2text-remove-tags'. @@ -373,7 +408,8 @@ formatting, and then moved afterward.") fashion, quite close to pure guess-work. It does work in some cases though." (interactive) (goto-char (point-min)) - (replace-regexp "^
$" "") + (while (re-search-forward "^
$" nil t) + (delete-region (match-beginning 0) (match-end 0))) ;; Removing lonely
on a single line, if they are left intact we ;; dont have any paragraphs at all. (goto-char (point-min)) diff --git a/lisp/ietf-drums.el b/lisp/ietf-drums.el index aca0f6a..51eea31 100644 --- a/lisp/ietf-drums.el +++ b/lisp/ietf-drums.el @@ -1,6 +1,7 @@ ;;; ietf-drums.el --- Functions for parsing RFC822bis headers -;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; This file is part of GNU Emacs. @@ -17,8 +18,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/imap.el b/lisp/imap.el index 2d7d917..d4d4023 100644 --- a/lisp/imap.el +++ b/lisp/imap.el @@ -1,6 +1,7 @@ ;;; imap.el --- imap library -;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Simon Josefsson ;; Keywords: mail @@ -19,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -175,8 +176,7 @@ the list is tried until a successful connection is made." :type '(repeat string)) (defcustom imap-gssapi-program (list - (concat "gsasl --client --connect %s:%p " - "--imap --application-data " + (concat "gsasl %s %p " "--mechanism GSSAPI " "--authentication-id %l") "imtest -m gssapi -u %l -p %p %s") @@ -587,6 +587,13 @@ sure of changing the value of `foo'." (while (and (memq (process-status process) '(open run)) (set-buffer buffer) ;; XXX "blue moon" nntp.el bug (goto-char (point-min)) + ;; Athena IMTEST can output SSL verify errors + (or (while (looking-at "^verify error:num=") + (forward-line)) + t) + (or (while (looking-at "^TLS connection established") + (forward-line)) + t) ;; cyrus 1.6.x (13? < x <= 22) queries capabilities (or (while (looking-at "^C:") (forward-line)) @@ -595,6 +602,10 @@ sure of changing the value of `foo'." (or (not (looking-at "S: ")) (forward-char 3) t) + ;; GNU SASL may print 'Trying ...' first. + (or (not (looking-at "Trying ")) + (forward-line) + t) (not (and (imap-parse-greeting) ;; success in imtest 1.6: (re-search-forward @@ -635,6 +646,10 @@ sure of changing the value of `foo'." (erase-buffer) (let ((port (or port imap-default-ssl-port)) (process-connection-type imap-process-connection-type) + (set-process-query-on-exit-flag + (if (fboundp 'set-process-query-on-exit-flag) + 'set-process-query-on-exit-flag + 'process-kill-without-query)) process) (when (prog1 (setq process (as-binary-process @@ -645,7 +660,7 @@ sure of changing the value of `foo'." (format-spec-make ?s server ?p (number-to-string port)))))) - (process-kill-without-query process)) + (funcall set-process-query-on-exit-flag process nil)) (with-current-buffer buffer (goto-char (point-min)) (while (and (memq (process-status process) '(open run)) @@ -1085,8 +1100,11 @@ necessary. If nil, the buffer name is generated." stream)) ;; We're done, kill the first connection (imap-close buffer) - (kill-buffer buffer) - (rename-buffer buffer) + (let ((name (if (stringp buffer) + buffer + (buffer-name buffer)))) + (kill-buffer buffer) + (rename-buffer name)) (message "imap: Reconnecting with stream `%s'...done" stream) (setq imap-stream stream) diff --git a/lisp/legacy-gnus-agent.el b/lisp/legacy-gnus-agent.el index ee1b0d9..ae71df6 100644 --- a/lisp/legacy-gnus-agent.el +++ b/lisp/legacy-gnus-agent.el @@ -25,7 +25,7 @@ converted to the compressed format." ((file-directory-p member) (push member search-in)) ((equal (file-name-nondirectory member) ".agentview") - (setq converted-something + (setq converted-something (or (gnus-agent-convert-agentview member) converted-something)))))) @@ -175,7 +175,7 @@ converted to the compressed format." (t t)))))) (kill-buffer buffer)) - (error "Change gnus-agent-expire-days to an integer for gnus to start.")))) + (error "Change gnus-agent-expire-days to an integer for gnus to start")))) ;; The gnus-agent-unlist-expire-days has its own conversion prompt. ;; Therefore, hide the default prompt. @@ -198,8 +198,8 @@ possible that the hook was persistently saved." (when (cond ((eq (type-of func) 'compiled-function) ;; Search def. of compiled function for gnus-agent-do-once string - (let* (definition - print-level + (let* (definition + print-level print-length (standard-output (lambda (char) diff --git a/lisp/lpath.el b/lisp/lpath.el index d4ff257..a3589f2 100644 --- a/lisp/lpath.el +++ b/lisp/lpath.el @@ -13,33 +13,29 @@ Info-menu create-image display-graphic-p display-time-event-handler find-coding-system find-image image-size image-type-available-p insert-image - make-mode-line-mouse-map make-temp-file propertize put-image - replace-regexp-in-string rmail-msg-is-pruned - rmail-msg-restore-non-pruned-header sort-coding-systems - tool-bar-add-item tool-bar-add-item-from-menu - tool-bar-local-item-from-menu url-generic-parse-url - url-http-file-exists-p url-insert-file-contents - vcard-pretty-print w32-focus-frame w3m-detect-meta-charset - w3m-region x-focus-frame)) + line-number-at-pos make-mode-line-mouse-map make-temp-file + propertize put-image replace-regexp-in-string + rmail-msg-is-pruned rmail-msg-restore-non-pruned-header + sort-coding-systems tool-bar-add-item + tool-bar-add-item-from-menu tool-bar-local-item-from-menu + url-generic-parse-url url-http-file-exists-p + url-insert-file-contents vcard-pretty-print w32-focus-frame + w3m-detect-meta-charset w3m-region x-focus-frame)) (maybe-bind '(eudc-protocol - filladapt-mode mc-pgp-always-sign - rmail-insert-mime-forwarded-message-function url-current-object - url-package-name url-package-version + filladapt-mode rmail-insert-mime-forwarded-message-function w3-meta-charset-content-type-regexp - w3-meta-content-type-charset-regexp - w3m-cid-retrieve-function-alist w3m-current-buffer - w3m-display-inline-images w3m-minor-mode-map)) + w3-meta-content-type-charset-regexp)) (if (featurep 'xemacs) (progn - (maybe-fbind '(delete-overlay - detect-coding-string eudc-expand-inline event-click-count - event-end event-start find-coding-systems-for-charsets + (maybe-fbind '(codepage-setup + delete-overlay detect-coding-string eudc-expand-inline + event-click-count event-end event-start + find-coding-systems-for-charsets find-coding-systems-region find-coding-systems-string - mail-abbrevs-setup mouse-minibuffer-check - mouse-movement-p mouse-scroll-subr overlay-lists - posn-point posn-window read-event set-buffer-multibyte - track-mouse window-edges)) + mail-abbrevs-setup mouse-minibuffer-check mouse-movement-p + mouse-scroll-subr overlay-lists posn-point posn-window + read-event set-buffer-multibyte track-mouse window-edges)) (maybe-bind '(adaptive-fill-first-line-regexp buffer-display-table buffer-file-coding-system current-language-environment @@ -51,16 +47,17 @@ (maybe-fbind '(bbdb-complete-name delete-annotation delete-extent device-connection dfw-device events-to-keys font-lock-set-defaults frame-device - get-char-table glyph-height glyph-width mail-aliases-setup - make-annotation make-event make-glyph make-network-process - map-extents message-xmas-redefine put-char-table - set-extent-property temp-directory + get-char-table glyph-height glyph-width ldap-search-entries + mail-aliases-setup make-annotation make-event make-glyph + make-network-process map-extents message-xmas-redefine + put-char-table set-extent-property temp-directory valid-image-instantiator-format-p w3-coding-system-for-mime-charset w3-do-setup w3-prepare-buffer w3-region window-pixel-height window-pixel-width)) (maybe-bind '(help-echo-owns-message mail-mode-hook mm-w3m-mode-map - show-nonbreak-escape))) + show-nonbreak-escape + nobreak-char-display))) (when (and (featurep 'xemacs) (not (featurep 'mule))) diff --git a/lisp/mail-parse.el b/lisp/mail-parse.el index 951a967..05f8c6b 100644 --- a/lisp/mail-parse.el +++ b/lisp/mail-parse.el @@ -1,6 +1,7 @@ ;;; mail-parse.el --- Interface functions for parsing mail -;; Copyright (C) 1998, 1999, 2000 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; This file is part of GNU Emacs. @@ -17,8 +18,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/mail-prsvr.el b/lisp/mail-prsvr.el index 2566abc..ecb44fb 100644 --- a/lisp/mail-prsvr.el +++ b/lisp/mail-prsvr.el @@ -1,5 +1,7 @@ ;;; mail-prsvr.el --- Interface variables for parsing mail -;; Copyright (C) 1999, 2000 Free Software Foundation, Inc. + +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; This file is part of GNU Emacs. @@ -16,8 +18,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/mail-source.el b/lisp/mail-source.el index 6753c0d..61c6fa5 100644 --- a/lisp/mail-source.el +++ b/lisp/mail-source.el @@ -1,6 +1,7 @@ ;;; mail-source.el --- functions for fetching mail -;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news, mail @@ -19,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -106,7 +107,7 @@ See Info node `(gnus)Mail Source Specifiers'." (const :format "" :value :port) (choice :tag "Port" :value "pop3" - (number :format "%v") + (integer :format "%v") (string :format "%v"))) (group :inline t (const :format "" :value :user) @@ -122,13 +123,15 @@ See Info node `(gnus)Mail Source Specifiers'." (choice :tag "Prescript" :value nil (string :format "%v") - (function :format "%v"))) + (function :format "%v") + (const :tag "None" nil))) (group :inline t (const :format "" :value :postscript) (choice :tag "Postscript" :value nil (string :format "%v") - (function :format "%v"))) + (function :format "%v") + (const :tag "None" nil))) (group :inline t (const :format "" :value :function) (function :tag "Function")) @@ -141,7 +144,14 @@ See Info node `(gnus)Mail Source Specifiers'." (const apop))) (group :inline t (const :format "" :value :plugged) - (boolean :tag "Plugged")))) + (boolean :tag "Plugged")) + (group :inline t + (const :format "" :value :stream) + (choice :tag "Stream" + :value nil + (const :tag "Clear" nil) + (const starttls) + (const :tag "SSL/TLS" ssl))))) (cons :tag "Maildir (qmail, postfix...)" (const :format "" maildir) (checklist :tag "Options" :greedy t @@ -161,7 +171,7 @@ See Info node `(gnus)Mail Source Specifiers'." (const :format "" :value :port) (choice :tag "Port" :value 143 - number string)) + integer string)) (group :inline t (const :format "" :value :user) (string :tag "User")) @@ -347,6 +357,7 @@ Common keywords should be listed here.") (:password) (:connection) (:authentication password) + (:stream nil) (:leave)) (maildir (:path (or (getenv "MAILDIR") "~/Maildir/")) @@ -714,6 +725,7 @@ If CONFIRM is non-nil, ask for confirmation before removing a file." (defun mail-source-fetch-pop (source callback) "Fetcher for single-file sources." (mail-source-bind (pop source) + ;; fixme: deal with stream type in format specs (mail-source-run-script prescript (format-spec-make ?p password ?t mail-source-crash-box @@ -816,7 +828,8 @@ If CONFIRM is non-nil, ask for confirmation before removing a file." (pop3-mailhost server) (pop3-port port) (pop3-authentication-scheme - (if (eq authentication 'apop) 'apop 'pass))) + (if (eq authentication 'apop) 'apop 'pass)) + (pop3-stream-type stream)) (if (or debug-on-quit debug-on-error) (save-excursion (pop3-get-message-count)) (condition-case err diff --git a/lisp/mailheader.el b/lisp/mailheader.el index 796ae75..0d2aff9 100644 --- a/lisp/mailheader.el +++ b/lisp/mailheader.el @@ -18,9 +18,9 @@ ;; 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. +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/message.el b/lisp/message.el index be0326a..cbd0861 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -1,6 +1,7 @@ ;;; message.el --- composing mail and news messages -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; MORIOKA Tomohiko @@ -25,8 +26,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -45,6 +46,7 @@ (require 'canlock) (require 'mailheader) (require 'nnheader) +(require 'gmm-utils) ;; This is apparently necessary even though things are autoloaded. ;; Because we dynamically bind mail-abbrev-mode-regexp, we'd better ;; require mailabbrev here. @@ -72,46 +74,46 @@ (put 'user-full-name 'custom-type 'string) (defgroup message-various nil - "Various Message Variables" + "Various Message Variables." :link '(custom-manual "(message)Various Message Variables") :group 'message) (defgroup message-buffers nil - "Message Buffers" + "Message Buffers." :link '(custom-manual "(message)Message Buffers") :group 'message) (defgroup message-sending nil - "Message Sending" + "Message Sending." :link '(custom-manual "(message)Sending Variables") :group 'message) (defgroup message-interface nil - "Message Interface" + "Message Interface." :link '(custom-manual "(message)Interface") :group 'message) (defgroup message-forwarding nil - "Message Forwarding" + "Message Forwarding." :link '(custom-manual "(message)Forwarding") :group 'message-interface) (defgroup message-insertion nil - "Message Insertion" + "Message Insertion." :link '(custom-manual "(message)Insertion") :group 'message) (defgroup message-headers nil - "Message Headers" + "Message Headers." :link '(custom-manual "(message)Message Headers") :group 'message) (defgroup message-news nil - "Composing News Messages" + "Composing News Messages." :group 'message) (defgroup message-mail nil - "Composing Mail Messages" + "Composing Mail Messages." :group 'message) (defgroup message-faces nil @@ -1021,7 +1023,8 @@ The function `message-supersede' runs this hook." (set-keymap-parent map minibuffer-local-map) map) "Keymap for `message-read-from-minibuffer'." - :version "22.1") + :version "22.1" + :group 'message-various) ;;;###autoload (defcustom message-citation-line-function 'message-insert-citation-line @@ -1039,33 +1042,23 @@ configuration. See the variable `gnus-cite-attribution-suffix'." (defcustom message-yank-prefix "> " "*Prefix inserted on the lines of yanked messages. Fix `message-cite-prefix-regexp' if it is set to an abnormal value. -See also `message-yank-cited-prefix'." +See also `message-yank-cited-prefix' and `message-yank-empty-prefix'." :type 'string :link '(custom-manual "(message)Insertion Variables") :group 'message-insertion) -(defcustom message-yank-add-new-references t - "Non-nil means new IDs will be added to \"References\" field when an -article is yanked by the command `message-yank-original' interactively. -If it is a symbol `message-id-only', only an ID from \"Message-ID\" field -is used, otherwise IDs extracted from \"References\", \"In-Reply-To\" and -\"Message-ID\" fields are used." - :type '(radio (const :tag "Do not add anything" nil) - (const :tag "From Message-Id, References and In-Reply-To fields" t) - (const :tag "From only Message-Id field." message-id-only)) - :group 'message-insertion) - -(defcustom message-list-references-add-position nil - "Integer value means position for adding to \"References\" field when -an article is yanked by the command `message-yank-original' interactively." - :type '(radio (const :tag "Add to last" nil) - (integer :tag "Position from last ID")) - :group 'message-insertion) - (defcustom message-yank-cited-prefix ">" - "*Prefix inserted on cited or empty lines of yanked messages. + "*Prefix inserted on cited lines of yanked messages. Fix `message-cite-prefix-regexp' if it is set to an abnormal value. -See also `message-yank-prefix'." +See also `message-yank-prefix' and `message-yank-empty-prefix'." + :version "22.1" + :type 'string + :link '(custom-manual "(message)Insertion Variables") + :group 'message-insertion) + +(defcustom message-yank-empty-prefix ">" + "*Prefix inserted on empty lines of yanked messages. +See also `message-yank-prefix' and `message-yank-cited-prefix'." :version "22.1" :type 'string :link '(custom-manual "(message)Insertion Variables") @@ -1083,7 +1076,7 @@ Used by `message-yank-original' via `message-yank-cite'." "*Function for citing an original message. Predefined functions include `message-cite-original' and `message-cite-original-without-signature'. -Note that `message-cite-original' uses `mail-citation-hook' if that is non-nil." +Note that these functions use `mail-citation-hook' if that is non-nil." :type '(radio (function-item message-cite-original) (function-item message-cite-original-without-signature) (function-item mu-cite-original) @@ -1093,6 +1086,16 @@ Note that `message-cite-original' uses `mail-citation-hook' if that is non-nil." :group 'message-insertion) ;;;###autoload +(defcustom message-indent-citation-function 'message-indent-citation + "*Function for modifying a citation just inserted in the mail buffer. +This can also be a list of functions. Each function can find the +citation between (point) and (mark t). And each function should leave +point and mark around the citation text as modified." + :type 'function + :link '(custom-manual "(message)Insertion Variables") + :group 'message-insertion) + +;;;###autoload (defcustom message-suspend-font-lock-when-citing nil "Non-nil means suspend font-lock'ing while citing an original message. Some lazy demand-driven fontification tools (or Emacs itself) have a @@ -1103,14 +1106,23 @@ even if it is an add-hoc expedient." :type 'boolean :group 'message-insertion) -;;;###autoload -(defcustom message-indent-citation-function 'message-indent-citation - "*Function for modifying a citation just inserted in the mail buffer. -This can also be a list of functions. Each function can find the -citation between (point) and (mark t). And each function should leave -point and mark around the citation text as modified." - :type 'function - :link '(custom-manual "(message)Insertion Variables") +(defcustom message-yank-add-new-references t + "Non-nil means new IDs will be added to \"References\" field when an +article is yanked by the command `message-yank-original' interactively. +If it is a symbol `message-id-only', only an ID from \"Message-ID\" field +is used, otherwise IDs extracted from \"References\", \"In-Reply-To\" and +\"Message-ID\" fields are used." + :type '(radio + (const :tag "Do not add anything" nil) + (const :tag "From Message-Id, References and In-Reply-To fields" t) + (const :tag "From only Message-Id field." message-id-only)) + :group 'message-insertion) + +(defcustom message-list-references-add-position nil + "Integer value means position for adding to \"References\" field when +an article is yanked by the command `message-yank-original' interactively." + :type '(radio (const :tag "Add to last" nil) + (integer :tag "Position from last ID")) :group 'message-insertion) ;;;###autoload @@ -1349,7 +1361,7 @@ starting with `not' and followed by regexps." table) "Syntax table used while in Message mode.") -(defface message-header-to-face +(defface message-header-to '((((class color) (background dark)) (:foreground "green2" :bold t)) @@ -1360,8 +1372,10 @@ starting with `not' and followed by regexps." (:bold t :italic t))) "Face used for displaying From headers." :group 'message-faces) +;; backward-compatibility alias +(put 'message-header-to-face 'face-alias 'message-header-to) -(defface message-header-cc-face +(defface message-header-cc '((((class color) (background dark)) (:foreground "green4" :bold t)) @@ -1372,8 +1386,10 @@ starting with `not' and followed by regexps." (:bold t))) "Face used for displaying Cc headers." :group 'message-faces) +;; backward-compatibility alias +(put 'message-header-cc-face 'face-alias 'message-header-cc) -(defface message-header-subject-face +(defface message-header-subject '((((class color) (background dark)) (:foreground "green3")) @@ -1384,8 +1400,10 @@ starting with `not' and followed by regexps." (:bold t))) "Face used for displaying subject headers." :group 'message-faces) +;; backward-compatibility alias +(put 'message-header-subject-face 'face-alias 'message-header-subject) -(defface message-header-newsgroups-face +(defface message-header-newsgroups '((((class color) (background dark)) (:foreground "yellow" :bold t :italic t)) @@ -1396,8 +1414,10 @@ starting with `not' and followed by regexps." (:bold t :italic t))) "Face used for displaying newsgroups headers." :group 'message-faces) +;; backward-compatibility alias +(put 'message-header-newsgroups-face 'face-alias 'message-header-newsgroups) -(defface message-header-other-face +(defface message-header-other '((((class color) (background dark)) (:foreground "#b00000")) @@ -1408,8 +1428,10 @@ starting with `not' and followed by regexps." (:bold t :italic t))) "Face used for displaying newsgroups headers." :group 'message-faces) +;; backward-compatibility alias +(put 'message-header-other-face 'face-alias 'message-header-other) -(defface message-header-name-face +(defface message-header-name '((((class color) (background dark)) (:foreground "DarkGreen")) @@ -1420,8 +1442,10 @@ starting with `not' and followed by regexps." (:bold t))) "Face used for displaying header names." :group 'message-faces) +;; backward-compatibility alias +(put 'message-header-name-face 'face-alias 'message-header-name) -(defface message-header-xheader-face +(defface message-header-xheader '((((class color) (background dark)) (:foreground "blue")) @@ -1432,8 +1456,10 @@ starting with `not' and followed by regexps." (:bold t))) "Face used for displaying X-Header headers." :group 'message-faces) +;; backward-compatibility alias +(put 'message-header-xheader-face 'face-alias 'message-header-xheader) -(defface message-separator-face +(defface message-separator '((((class color) (background dark)) (:foreground "blue3")) @@ -1444,8 +1470,10 @@ starting with `not' and followed by regexps." (:bold t))) "Face used for displaying the separator." :group 'message-faces) +;; backward-compatibility alias +(put 'message-separator-face 'face-alias 'message-separator) -(defface message-cited-text-face +(defface message-cited-text '((((class color) (background dark)) (:foreground "red")) @@ -1456,8 +1484,10 @@ starting with `not' and followed by regexps." (:bold t))) "Face used for displaying cited text names." :group 'message-faces) +;; backward-compatibility alias +(put 'message-cited-text-face 'face-alias 'message-cited-text) -(defface message-mml-face +(defface message-mml '((((class color) (background dark)) (:foreground "ForestGreen")) @@ -1468,6 +1498,8 @@ starting with `not' and followed by regexps." (:bold t))) "Face used for displaying MML." :group 'message-faces) +;; backward-compatibility alias +(put 'message-mml-face 'face-alias 'message-mml) (defun message-font-lock-make-header-matcher (regexp) (let ((form @@ -1491,44 +1523,44 @@ starting with `not' and followed by regexps." (let ((content "[ \t]*\\(.+\\(\n[ \t].*\\)*\\)\n?")) `((,(message-font-lock-make-header-matcher (concat "^\\([Tt]o:\\)" content)) - (1 'message-header-name-face) - (2 'message-header-to-face nil t)) + (1 'message-header-name) + (2 'message-header-to nil t)) (,(message-font-lock-make-header-matcher (concat "^\\([GBF]?[Cc][Cc]:\\|[Rr]eply-[Tt]o:\\|" "[Mm]ail-[Cc]opies-[Tt]o:\\|" "[Mm]ail-[Rr]eply-[Tt]o:\\|" "[Mm]ail-[Ff]ollowup-[Tt]o:\\)" content)) - (1 'message-header-name-face) - (2 'message-header-cc-face nil t)) + (1 'message-header-name) + (2 'message-header-cc nil t)) (,(message-font-lock-make-header-matcher (concat "^\\([Ss]ubject:\\)" content)) - (1 'message-header-name-face) - (2 'message-header-subject-face nil t)) + (1 'message-header-name) + (2 'message-header-subject nil t)) (,(message-font-lock-make-header-matcher (concat "^\\([Nn]ewsgroups:\\|Followup-[Tt]o:\\)" content)) - (1 'message-header-name-face) - (2 'message-header-newsgroups-face nil t)) + (1 'message-header-name) + (2 'message-header-newsgroups nil t)) (,(message-font-lock-make-header-matcher (concat "^\\([A-Z][^: \n\t]+:\\)" content)) - (1 'message-header-name-face) - (2 'message-header-other-face nil t)) + (1 'message-header-name) + (2 'message-header-other nil t)) (,(message-font-lock-make-header-matcher (concat "^\\(X-[A-Za-z0-9-]+:\\|In-Reply-To:\\)" content)) - (1 'message-header-name-face) - (2 'message-header-name-face)) + (1 'message-header-name) + (2 'message-header-name)) ,@(if (and mail-header-separator (not (equal mail-header-separator ""))) `((,(concat "^\\(" (regexp-quote mail-header-separator) "\\)$") - 1 'message-separator-face)) + 1 'message-separator)) nil) ((lambda (limit) (re-search-forward (concat "^\\(" message-cite-prefix-regexp "\\).*") limit t)) - (0 'message-cited-text-face)) + (0 'message-cited-text)) (,mime-edit-tag-regexp - (0 'message-mml-face)))) + (0 'message-mml)))) "Additional expressions to highlight in Message mode.") ;; XEmacs does it like this. For Emacs, we have to set the @@ -1536,10 +1568,10 @@ starting with `not' and followed by regexps." (put 'message-mode 'font-lock-defaults '(message-font-lock-keywords t)) (defvar message-face-alist - '((bold . bold-region) + '((bold . message-bold-region) (underline . underline-region) (default . (lambda (b e) - (unbold-region b e) + (message-unbold-region b e) (ununderline-region b e)))) "Alist of mail and news faces for facemenu. The cdr of each entry is a function for applying the face to a region.") @@ -1603,8 +1635,13 @@ should be sent in several parts. If it is nil, the size is unlimited." (integer 1000000))) (defcustom message-alternative-emails nil - "A regexp to match the alternative email addresses. -The first matched address (not primary one) is used in the From field." + "*Regexp matching alternative email addresses. +The first address in the To, Cc or From headers of the original +article matching this variable is used as the From field of +outgoing messages. + +This variable has precedence over posting styles and anything that runs +off `message-setup-hook'." :group 'message-headers :link '(custom-manual "(message)Message Headers") :type '(choice (const :tag "Always use primary" nil) @@ -1658,7 +1695,7 @@ no, only reply back to the author." :type 'boolean) (defcustom message-user-fqdn nil - "*Domain part of Messsage-Ids." + "*Domain part of Message-Ids." :version "22.1" :group 'message-headers :link '(custom-manual "(message)News Headers") @@ -1669,8 +1706,13 @@ no, only reply back to the author." (file-error)) (mm-coding-system-p 'utf-8) (executable-find idna-program) - 'ask) - "Whether to encode non-ASCII in domain names into ASCII according to IDNA." + (string= (idna-to-ascii "räksmörgås") + "xn--rksmrgs-5wao1o") + t) + "Whether to encode non-ASCII in domain names into ASCII according to IDNA. +GNU Libidn, and in particular the elisp package \"idna.el\" and +the external program \"idn\", must be installed for this +functionality to work." :version "22.1" :group 'message-headers :link '(custom-manual "(message)IDNA") @@ -2056,7 +2098,6 @@ Leading \"Re: \" is not stripped by this function. Use the function ;;; Suggested by Jonas Steverud @ www.dtek.chalmers.se/~d4jonas/ -;;;###autoload (defun message-change-subject (new-subject) "Ask for NEW-SUBJECT header, append (was: )." ;; @@ -2088,32 +2129,31 @@ Leading \"Re: \" is not stripped by this function. Use the function " (was: " old-subject ")\n"))))))))) -;;;###autoload -(defun message-mark-inserted-region (beg end) +(defun message-mark-inserted-region (beg end &optional verbatim) "Mark some region in the current article with enclosing tags. -See `message-mark-insert-begin' and `message-mark-insert-end'." - (interactive "r") +See `message-mark-insert-begin' and `message-mark-insert-end'. +If VERBATIM, use slrn style verbatim marks (\"#v+\" and \"#v-\")." + (interactive "r\nP") (save-excursion ;; add to the end of the region first, otherwise end would be invalid (goto-char end) - (insert message-mark-insert-end) + (insert (if verbatim "#v-\n" message-mark-insert-end)) (goto-char beg) - (insert message-mark-insert-begin))) + (insert (if verbatim "#v+\n" message-mark-insert-begin)))) -;;;###autoload -(defun message-mark-insert-file (file) +(defun message-mark-insert-file (file &optional verbatim) "Insert FILE at point, marking it with enclosing tags. -See `message-mark-insert-begin' and `message-mark-insert-end'." - (interactive "fFile to insert: ") +See `message-mark-insert-begin' and `message-mark-insert-end'. +If VERBATIM, use slrn style verbatim marks (\"#v+\" and \"#v-\")." + (interactive "fFile to insert: \nP") ;; reverse insertion to get correct result. (let ((p (point))) - (insert message-mark-insert-end) + (insert (if verbatim "#v-\n" message-mark-insert-end)) (goto-char p) (insert-file-contents file) (goto-char p) - (insert message-mark-insert-begin))) + (insert (if verbatim "#v+\n" message-mark-insert-begin)))) -;;;###autoload (defun message-add-archive-header () "Insert \"X-No-Archive: Yes\" in the header and a note in the body. The note can be customized using `message-archive-note'. When called with a @@ -2133,7 +2173,6 @@ body, set `message-archive-note' to nil." (message-add-header message-archive-header) (message-sort-headers))) -;;;###autoload (defun message-cross-post-followup-to-header (target-group) "Mangles FollowUp-To and Newsgroups header to point to TARGET-GROUP. With prefix-argument just set Follow-Up, don't cross-post." @@ -2177,7 +2216,6 @@ With prefix-argument just set Follow-Up, don't cross-post." (insert (concat "\nFollowup-To: " target-group))) (setq message-cross-post-old-target target-group)) -;;;###autoload (defun message-cross-post-insert-note (target-group cross-post in-old old-groups) "Insert a in message body note about a set Followup or Crosspost. @@ -2210,7 +2248,6 @@ been made to before the user asked for a Crosspost." (insert (concat message-followup-to-note target-group "\n")) (insert (concat message-cross-post-note target-group "\n"))))) -;;;###autoload (defun message-cross-post-followup-to (target-group) "Crossposts message and set Followup-To to TARGET-GROUP. With prefix-argument just set Follow-Up, don't cross-post." @@ -2252,7 +2289,6 @@ With prefix-argument just set Follow-Up, don't cross-post." ;;; Reduce To: to Cc: or Bcc: header -;;;###autoload (defun message-reduce-to-to-cc () "Replace contents of To: header with contents of Cc: or Bcc: header." (interactive) @@ -2444,6 +2480,17 @@ Point is left at the beginning of the narrowed-to region." (message-skip-to-next-address) (kill-region start (point)))) + +(defun message-info (&optional arg) + "Display the Message manual. + +Prefixed with one \\[universal-argument], display the Emacs MIME manual. +Prefixed with two \\[universal-argument]'s, display the PGG manual." + (interactive "p") + (cond ((eq arg 16) (Info-goto-node "(pgg)Top")) + ((eq arg 4) (Info-goto-node "(emacs-mime)Top")) + (t (Info-goto-node "(message)Top")))) + ;;; @@ -2498,6 +2545,7 @@ Point is left at the beginning of the narrowed-to region." (define-key message-mode-map "\C-c\C-fw" 'message-insert-wide-reply) (define-key message-mode-map "\C-c\C-n" 'message-insert-newsgroups) (define-key message-mode-map "\C-c\C-l" 'message-to-list-only) + (define-key message-mode-map "\C-c\C-f\C-e" 'message-insert-expires) (define-key message-mode-map "\C-c\C-u" 'message-insert-or-toggle-importance) (define-key message-mode-map "\C-c\M-n" @@ -2576,7 +2624,11 @@ Point is left at the beginning of the narrowed-to region." '(:help "Ask, then arrange to send message at that time"))] ["Kill Message" message-kill-buffer ,@(if (featurep 'xemacs) '(t) - '(:help "Delete this message without sending"))])) + '(:help "Delete this message without sending"))] + "----" + ["Message manual" message-info + ,@(if (featurep 'xemacs) '(t) + '(:help "Display the Message manual"))])) (easy-menu-define message-mode-field-menu message-mode-map "" @@ -2609,7 +2661,8 @@ Point is left at the beginning of the narrowed-to region." ;; ["Followup-To (with note in body)" message-cross-post-followup-to t] ["Crosspost / Followup-To..." message-cross-post-followup-to t] ["Distribution" message-goto-distribution t] - ["X-No-Archive:" message-add-archive-header t ] + ["Expires" message-insert-expires t ] + ["X-No-Archive" message-add-archive-header t ] "----" ;; (typical) mailing-lists stuff ["Fetch To" message-insert-to @@ -2631,6 +2684,8 @@ Point is left at the beginning of the narrowed-to region." "----" ["Sort Headers" message-sort-headers t] ["Encode non-ASCII domain names" message-idna-to-ascii-rhs t] + ;; We hide `message-hidden-headers' by narrowing the buffer. + ["Show Hidden Headers" widen t] ["Goto Body" message-goto-body t] ["Goto Signature" message-goto-signature t])) @@ -2717,6 +2772,7 @@ C-c C-f move to a header field (and create it if there isn't): C-c C-f C-f move to Followup-To C-c C-f C-m move to Mail-Followup-To C-c C-f c move to Mail-Copies-To + C-c C-f C-e move to Expires C-c C-f C-i cycle through Importance values C-c C-f s change subject and append \"(was: )\" C-c C-f x crossposting with FollowUp-To header and note in body @@ -2776,7 +2832,7 @@ M-RET `message-newline-and-reformat' (break the line and reformat)." (set (make-local-variable 'font-lock-defaults) '(message-font-lock-keywords t)) (if (boundp 'tool-bar-map) - (set (make-local-variable 'tool-bar-map) (message-tool-bar-map)))) + (set (make-local-variable 'tool-bar-map) (message-make-tool-bar)))) (easy-menu-add message-mode-menu message-mode-map) (easy-menu-add message-mode-field-menu message-mode-map) (gnus-make-local-hook 'after-change-functions) @@ -2951,6 +3007,11 @@ the address is inserted by default." (message-goto-body) (forward-line -1)) +(defun message-in-body-p () + "Return t if point is in the message body." + (let ((body (save-excursion (message-goto-body) (point)))) + (>= (point) body))) + (defun message-goto-signature () "Move point to the beginning of the message signature. If there is no signature in the article, go to the end and @@ -3016,7 +3077,8 @@ prefix FORCE is given." (message-carefully-insert-headers headers))) (defcustom message-header-synonyms - '((To Cc Bcc)) + '((To Cc Bcc) + (Original-To)) "List of lists of header synonyms. E.g., if this list contains a member list with elements `Cc' and `To', then `message-carefully-insert-headers' will not insert a `To' header @@ -3112,7 +3174,7 @@ or in the synonym headers, defined by `message-header-synonyms'." "Kill all text up to the signature. If a numberic argument or prefix arg is given, leave that number of lines before the signature intact." - (interactive "p") + (interactive "P") (save-excursion (save-restriction (let ((point (point))) @@ -3124,13 +3186,14 @@ of lines before the signature intact." (end-of-line -1))) (unless (= point (point)) (kill-region point (point)) - (insert "\n")))))) + (unless (bolp) + (insert "\n"))))))) (defun message-newline-and-reformat (&optional arg not-break) "Insert four newlines, and then reformat if inside quoted text. Prefix arg means justify as well." (interactive (list (if current-prefix-arg 'full))) - (let (quoted point beg end leading-space bolp) + (let (quoted point beg end leading-space bolp fill-paragraph-function) (setq point (point)) (beginning-of-line) (setq beg (point)) @@ -3215,7 +3278,9 @@ Prefix arg means justify as well." (if point (goto-char point))))) (defun message-fill-paragraph (&optional arg) - "Like `fill-paragraph'." + "Message specific function to fill a paragraph. +This function is used as the value of `fill-paragraph-function' in +Message buffers and is not meant to be called directly." (interactive (list (if current-prefix-arg 'full))) (if (if (boundp 'filladapt-mode) filladapt-mode) nil @@ -3479,9 +3544,12 @@ However, if `message-yank-prefix' is non-nil, insert that prefix on each line." (save-excursion (goto-char start) (while (< (point) (mark t)) - (if (or (looking-at ">") (looking-at "^$")) - (insert message-yank-cited-prefix) - (insert message-yank-prefix)) + (cond ((looking-at ">") + (insert message-yank-cited-prefix)) + ((looking-at "^$") + (insert message-yank-empty-prefix)) + (t + (insert message-yank-prefix))) (forward-line 1)))) (goto-char start))) @@ -3531,8 +3599,10 @@ be added to the \"References\" field." (prog1 t (delete-windows-on buffer t) - ; The mark will be set at the end of the article. - (insert-buffer buffer)))) + ; Set the mark at the end of the yanked message. + (push-mark (save-excursion + (insert-buffer-substring buffer) + (point)))))) ;; Add new IDs to the References field. (when (and message-yank-add-new-references (interactive-p)) @@ -3613,49 +3683,14 @@ be added to the \"References\" field." (push (buffer-name buffer) buffers)))) (nreverse buffers))) -(defun message-cite-original-without-signature () - "Cite function in the standard Message manner." - (let ((start (point)) - (end (mark t)) - (functions - (when message-indent-citation-function - (if (listp message-indent-citation-function) - message-indent-citation-function - (list message-indent-citation-function)))) - (message-reply-headers (or message-reply-headers - (make-mail-header)))) - (mail-header-set-from message-reply-headers - (save-restriction - (narrow-to-region - (point) - (if (search-forward "\n\n" nil t) - (1- (point)) - (point-max))) - (or (message-fetch-field "from") - "unknown sender"))) - ;; Allow undoing. - (undo-boundary) - (goto-char end) - (when (re-search-backward message-signature-separator start t) - ;; Also peel off any blank lines before the signature. - (forward-line -1) - (while (looking-at "^[ \t]*$") - (forward-line -1)) - (forward-line 1) - (delete-region (point) end) - (unless (search-backward "\n\n" start t) - ;; Insert a blank line if it is peeled off. - (insert "\n"))) - (goto-char start) - (mapc 'funcall functions) - (when message-citation-line-function - (unless (bolp) - (insert "\n")) - (funcall message-citation-line-function)))) +(eval-when-compile (defvar mail-citation-hook)) ; Compiler directive -(eval-when-compile (defvar mail-citation-hook)) ;Compiler directive -(defun message-cite-original () - "Cite function in the standard Message manner." +(defun message-cite-original-1 (strip-signature) + "Cite an original message. +If STRIP-SIGNATURE is non-nil, strips off the signature from the +original message. + +This function uses `mail-citation-hook' if that is non-nil." (if (and (boundp 'mail-citation-hook) mail-citation-hook) (run-hooks 'mail-citation-hook) @@ -3679,6 +3714,20 @@ be added to the \"References\" field." (setq x-no-archive (message-fetch-field "x-no-archive"))) (goto-char start) (mapc 'funcall functions) + (when strip-signature + ;; Allow undoing. + (undo-boundary) + (goto-char end) + (when (re-search-backward message-signature-separator start t) + ;; Also peel off any blank lines before the signature. + (forward-line -1) + (while (looking-at "^[ \t]*$") + (forward-line -1)) + (forward-line 1) + (delete-region (point) end) + (unless (search-backward "\n\n" start t) + ;; Insert a blank line if it is peeled off. + (insert "\n")))) (when message-citation-line-function (unless (bolp) (insert "\n")) @@ -3691,10 +3740,21 @@ be added to the \"References\" field." (insert "> [Quoted text removed due to X-No-Archive]\n") (forward-line -1))))) +(defun message-cite-original () + "Cite function in the standard Message manner." + (message-cite-original-1 nil)) + +(defun message-cite-original-without-signature () + "Cite function in the standard Message manner. +This function strips off the signature from the original message." + (message-cite-original-1 t)) + (defun message-insert-citation-line () "Insert a simple citation line." (when message-reply-headers - (insert (mail-header-from message-reply-headers) " writes:\n\n"))) + (insert (mail-header-from message-reply-headers) " writes:") + (newline) + (newline))) (defun message-position-on-field (header &rest afters) (let ((case-fold-search t)) @@ -4101,8 +4161,8 @@ not have PROP." ;; (when (let ((char (char-after))) ;; (or (< (mm-char-int char) 128) ;; (and (mm-multibyte-p) -;; ;; Fixme: Wrong for Emacs 22 and for things -;; ;; like undecable utf-8. Should at least +;; ;; FIXME: Wrong for Emacs 23 (unicode) and for +;; ;; things like undecable utf-8. Should at least ;; ;; use find-coding-systems-region. ;; (memq (char-charset char) ;; '(eight-bit-control eight-bit-graphic @@ -4779,7 +4839,7 @@ Otherwise, generate and save a value for `canlock-password' first." (zerop (length (setq to (completing-read - "Followups to (default: no Followup-To header) " + "Followups to (default no Followup-To header): " (mapcar #'list (cons "poster" (message-tokenize-header @@ -5237,6 +5297,22 @@ If NOW, use that time instead." (concat "Re: " (message-strip-subject-re subject))) (t subject))) +(defun message-insert-expires (days) + "Insert the Expires header. Expiry in DAYS days." + (interactive "NExpire article in how many days? ") + (save-excursion + (message-position-on-field "Expires" "X-Draft-From") + (insert (message-make-expires-date days)))) + +(defun message-make-expires-date (days) + "Make date string for the Expires header. Expiry in DAYS days. + +In posting styles use `(\"Expires\" (make-expires-date 30))'." + (let* ((cur (decode-time (current-time))) + (nday (+ days (nth 3 cur)))) + (setf (nth 3 cur) nday) + (message-make-date (apply 'encode-time cur)))) + (defun message-make-message-id () "Make a unique Message-ID." (concat "<" (message-unique-id) @@ -5273,7 +5349,9 @@ If NOW, use that time instead." (* 25 25))) (let ((tm (current-time))) (concat - (if (memq system-type '(ms-dos emx vax-vms)) + (if (or (memq system-type '(ms-dos emx vax-vms)) + ;; message-number-base36 doesn't handle bigints. + (floatp (user-uid))) (let ((user (downcase (user-login-name)))) (while (string-match "[^a-z0-9_]" user) (aset user (match-beginning 0) ?_)) @@ -5593,13 +5671,17 @@ subscribed address (and not the additional To and Cc header contents)." (let ((field (message-fetch-field header)) rhs ace address) (when field - (dolist (address (mail-header-parse-addresses field)) - (setq address (car address) - rhs (downcase (or (cadr (split-string address "@")) "")) - ace (downcase (idna-to-ascii rhs))) + (dolist (rhs + (mm-delete-duplicates + (mapcar (lambda (rhs) (or (cadr (split-string rhs "@")) "")) + (mapcar 'downcase + (mapcar + 'car (mail-header-parse-addresses field)))))) + (setq ace (downcase (idna-to-ascii rhs))) (when (and (not (equal rhs ace)) (or (not (eq message-use-idna 'ask)) - (y-or-n-p (format "Replace %s with %s? " rhs ace)))) + (y-or-n-p (format "Replace %s with %s in %s:? " + rhs ace header)))) (goto-char (point-min)) (while (re-search-forward (concat "^" header ":") nil t) (message-narrow-to-field) @@ -5619,6 +5701,8 @@ See `message-idna-encode'." (message-idna-to-ascii-rhs-1 "From") (message-idna-to-ascii-rhs-1 "To") (message-idna-to-ascii-rhs-1 "Reply-To") + (message-idna-to-ascii-rhs-1 "Mail-Reply-To") + (message-idna-to-ascii-rhs-1 "Mail-Followup-To") (message-idna-to-ascii-rhs-1 "Cc"))))) (defun message-generate-headers (headers) @@ -5710,7 +5794,8 @@ Headers already prepared in the buffer are not modified." ;; The element is a symbol. We insert the value ;; of this symbol, if any. (symbol-value header)) - ((not (message-check-element header)) + ((not (message-check-element + (intern (downcase (symbol-name header))))) ;; We couldn't generate a value for this header, ;; so we just ask the user. (read-from-minibuffer @@ -6201,11 +6286,6 @@ are not included." (when message-default-mail-headers (insert message-default-mail-headers) (or (bolp) (insert ?\n))) - (save-restriction - (message-narrow-to-headers) - (if (and replybuffer - message-alternative-emails) - (message-use-alternative-email-as-from))) (when message-generate-headers-first (message-generate-headers (message-headers-to-generate @@ -6224,6 +6304,12 @@ are not included." ;; Generate hashcash headers for recipients already known (mail-add-payment-async)) (run-hooks 'message-setup-hook) + ;; Do this last to give it precedence over posting styles, etc. + (when (message-mail-p) + (save-restriction + (message-narrow-to-headers) + (if message-alternative-emails + (message-use-alternative-email-as-from)))) (message-position-point) (undo-boundary)) @@ -6708,9 +6794,9 @@ that further discussion should take place only in " (defun message-is-yours-p () "Non-nil means current article is yours. -If you have added 'cancel-messages to 'message-shoot-gnksa-feet', all articles +If you have added 'cancel-messages to `message-shoot-gnksa-feet', all articles are yours except those that have Cancel-Lock header not belonging to you. -Instead of shooting GNKSA feet, you should modify 'message-alternative-emails' +Instead of shooting GNKSA feet, you should modify `message-alternative-emails' regexp to match all of yours addresses." ;; Canlock-logic as suggested by Per Abrahamsen ;; @@ -6898,7 +6984,9 @@ news, Source is the list of newsgroups is was posted to." (gnus-group-decoded-name group) (or (and (setq from (message-fetch-field "from")) (car (std11-extract-address-components - (nnheader-decode-from from)))) + (nnheader-decode-from from))) + (cadr (std11-extract-address-components + (nnheader-decode-from from)))) "(nowhere)"))) "] " subject)) @@ -7128,6 +7216,7 @@ Optional NEWS will use news to forward instead of mail." (set-buffer (get-buffer-create " *message resend*")) (erase-buffer)) (let ((message-this-is-mail t) + message-generate-hashcash message-setup-hook) (message-setup `((To . ,address)))) ;; Insert our usual headers. @@ -7165,7 +7254,8 @@ Optional NEWS will use news to forward instead of mail." ;; Send it. (let ((message-encoding-buffer (current-buffer)) (message-edit-buffer (current-buffer)) - message-required-mail-headers) + message-required-mail-headers + message-generate-hashcash) (message-send-mail)) (kill-buffer (current-buffer))) (message "Resending message to %s...done" address))) @@ -7291,7 +7381,7 @@ you." ;; This code should be moved to underline.el (from which it is stolen). ;;;###autoload -(defun bold-region (start end) +(defun message-bold-region (start end) "Bold all nonblank characters in the region. Works by overstriking characters. Called from program, takes two arguments START and END @@ -7307,7 +7397,7 @@ which specify the range to operate on." (forward-char 1))))) ;;;###autoload -(defun unbold-region (start end) +(defun message-unbold-region (start end) "Remove all boldness (overstruck characters) in the region. Called from program, takes two arguments START and END which specify the range to operate on." @@ -7337,55 +7427,123 @@ which specify the range to operate on." ;; Support for toolbar (eval-when-compile - (defvar tool-bar-map) (defvar tool-bar-mode)) -(defun message-tool-bar-local-item-from-menu (command icon in-map &optional from-map &rest props) - ;; We need to make tool bar entries in local keymaps with - ;; `tool-bar-local-item-from-menu' in Emacs > 21.3 - (if (fboundp 'tool-bar-local-item-from-menu) - ;; This is for Emacs 21.3 - (tool-bar-local-item-from-menu command icon in-map from-map props) - (tool-bar-add-item-from-menu command icon from-map props))) - -(defun message-tool-bar-map () - (or message-tool-bar-map - (setq message-tool-bar-map - (and - (condition-case nil (require 'tool-bar) (error nil)) - (fboundp 'tool-bar-add-item-from-menu) +;; Note: The :set function in the `message-tool-bar*' variables will only +;; affect _new_ message buffers. We might add a function that walks thru all +;; message-mode buffers and force the update. +(defun message-tool-bar-update (&optional symbol value) + "Update message mode toolbar. +Setter function for custom variables." + (setq-default message-tool-bar-map nil) + (when symbol + ;; When used as ":set" function: + (set-default symbol value))) + +(defcustom message-tool-bar (if (eq gmm-tool-bar-style 'gnome) + 'message-tool-bar-gnome + 'message-tool-bar-retro) + "Specifies the message mode tool bar. + +It can be either a list or a symbol refering to a list. See +`gmm-tool-bar-from-list' for the format of the list. The +default key map is `message-mode-map'. + +Pre-defined symbols include `message-tool-bar-gnome' and +`message-tool-bar-retro'." + :type '(repeat gmm-tool-bar-list-item) + :type '(choice (const :tag "GNOME style" message-tool-bar-gnome) + (const :tag "Retro look" message-tool-bar-retro) + (repeat :tag "User defined list" gmm-tool-bar-item) + (symbol)) + :version "23.0" ;; No Gnus + :initialize 'custom-initialize-default + :set 'message-tool-bar-update + :group 'message) + +(defcustom message-tool-bar-gnome + '((ispell-message "spell" nil + :visible (or (not (boundp 'flyspell-mode)) + (not flyspell-mode))) + (flyspell-buffer "spell" t + :visible (and (boundp 'flyspell-mode) + flyspell-mode) + :help "Flyspell whole buffer") + (gmm-ignore "separator") + (message-send-and-exit "mail/send") + (message-dont-send "mail/save-draft") + (message-kill-buffer "close") ;; stock_cancel + (mime-edit-insert-file "attach" mime-edit-mode-map) + (mime-edit-preview-message "mail/preview" mime-edit-mode-map) + ;;(mml-secure-message-sign-encrypt "lock" mml-mode-map :visible nil) + (message-insert-importance-high "important" nil :visible nil) + (message-insert-importance-low "unimportant" nil :visible nil) + (message-insert-disposition-notification-to "receipt" nil :visible nil) + (gmm-customize-mode "preferences" t :help "Edit mode preferences") + (message-info "help" t :help "Message manual")) + "List of items for the message tool bar (GNOME style). + +See `gmm-tool-bar-from-list' for details on the format of the list." + :type '(repeat gmm-tool-bar-item) + :version "23.0" ;; No Gnus + :initialize 'custom-initialize-default + :set 'message-tool-bar-update + :group 'message) + +(defcustom message-tool-bar-retro + '(;; Old Emacs 21 icon for consistency. + (message-send-and-exit "gnus/mail_send") + (message-kill-buffer "close") + (message-dont-send "cancel") + (mime-edit-insert-file "attach" mime-edit-mode-map) + (ispell-message "spell") + (mime-edit-preview-message "preview" mime-edit-mode-map) + (message-insert-importance-high "gnus/important") + (message-insert-importance-low "gnus/unimportant") + (message-insert-disposition-notification-to "gnus/receipt")) + "List of items for the message tool bar (retro style). + +See `gmm-tool-bar-from-list' for details on the format of the list." + :type '(repeat gmm-tool-bar-item) + :version "23.0" ;; No Gnus + :initialize 'custom-initialize-default + :set 'message-tool-bar-update + :group 'message) + +(defcustom message-tool-bar-zap-list + '(new-file open-file dired kill-buffer write-file + print-buffer customize help) + "List of icon items from the global tool bar. +These items are not displayed on the message mode tool bar. + +See `gmm-tool-bar-from-list' for the format of the list." + :type 'gmm-tool-bar-zap-list + :version "23.0" ;; No Gnus + :initialize 'custom-initialize-default + :set 'message-tool-bar-update + :group 'message) + +(defvar image-load-path) + +(defun message-make-tool-bar (&optional force) + "Make a message mode tool bar from `message-tool-bar-list'. +When FORCE, rebuild the tool bar." + (when (and (not (featurep 'xemacs)) + (boundp 'tool-bar-mode) tool-bar-mode - (let ((tool-bar-map (copy-keymap tool-bar-map)) - (load-path (mm-image-load-path))) - ;; Zap some items which aren't so relevant and take - ;; up space. - (dolist (key '(print-buffer kill-buffer save-buffer - write-file dired open-file)) - (define-key tool-bar-map (vector key) nil)) - (message-tool-bar-local-item-from-menu - 'message-send-and-exit "mail_send" tool-bar-map message-mode-map) - (message-tool-bar-local-item-from-menu - 'message-kill-buffer "close" tool-bar-map message-mode-map) - (message-tool-bar-local-item-from-menu - 'message-dont-send "cancel" tool-bar-map message-mode-map) -;; (message-tool-bar-local-item-from-menu -;; 'mime-edit-insert-file "attach" -;; tool-bar-map mime-edit-mode-map) - (message-tool-bar-local-item-from-menu - 'ispell-message "spell" tool-bar-map message-mode-map) -;; (message-tool-bar-local-item-from-menu -;; 'mime-edit-preview-message "preview" -;; tool-bar-map mime-edit-mode-map) - (message-tool-bar-local-item-from-menu - 'message-insert-importance-high "important" - tool-bar-map message-mode-map) - (message-tool-bar-local-item-from-menu - 'message-insert-importance-low "unimportant" - tool-bar-map message-mode-map) - (message-tool-bar-local-item-from-menu - 'message-insert-disposition-notification-to "receipt" - tool-bar-map message-mode-map) - tool-bar-map))))) + (or (not message-tool-bar-map) force)) + (setq message-tool-bar-map + (let* ((load-path + (gmm-image-load-path-for-library "message" + "mail/save-draft.xpm" + nil t)) + (image-load-path (cons (car load-path) + (when (boundp 'image-load-path) + image-load-path)))) + (gmm-tool-bar-from-list message-tool-bar + message-tool-bar-zap-list + 'message-mode-map)))) + message-tool-bar-map) ;;; Group name completion. @@ -7439,7 +7597,8 @@ If nil, the function bound in `text-mode-map' or `global-map' is executed." :version "22.1" :group 'message :link '(custom-manual "(message)Various Commands") - :type 'function) + :type '(choice (const nil) + function)) (defun message-tab () "Complete names according to `message-completion-alist'. @@ -7456,6 +7615,17 @@ those headers." (lookup-key global-map "\t") 'indent-relative)))) +(eval-and-compile + (condition-case nil + (with-temp-buffer + (let ((standard-output (current-buffer))) + (eval '(display-completion-list nil ""))) + (defalias 'message-display-completion-list 'display-completion-list)) + (error ;; Don't use `wrong-number-of-arguments' here because of XEmacs. + (defun message-display-completion-list (completions &optional ignore) + "Display the list of completions, COMPLETIONS, using `standard-output'." + (display-completion-list completions))))) + (defun message-expand-group () "Expand the group name under point." (let* ((b (save-excursion @@ -7494,7 +7664,9 @@ those headers." (let ((buffer-read-only nil)) (erase-buffer) (let ((standard-output (current-buffer))) - (display-completion-list (sort completions 'string<))) + (message-display-completion-list (sort completions 'string<) + string)) + (setq buffer-read-only nil) (goto-char (point-min)) (delete-region (point) (progn (forward-line 3) (point)))))))))) @@ -7671,6 +7843,9 @@ regexp VARSTR." (read-string prompt initial-contents)))) (defun message-use-alternative-email-as-from () + "Set From field of the outgoing message to the first matching +address in `message-alternative-emails', looking at To, Cc and +From headers in the original article." (require 'mail-utils) (let* ((fields '("To" "Cc" "From")) (emails @@ -7685,6 +7860,7 @@ regexp VARSTR." emails nil)) (pop emails)) (unless (or (not email) (equal email user-mail-address)) + (message-remove-header "From") (goto-char (point-max)) (insert "From: " (let ((user-mail-address email)) (message-make-from)) "\n")))) diff --git a/lisp/messagexmas.el b/lisp/messagexmas.el index 856f6e1..97d27aa 100644 --- a/lisp/messagexmas.el +++ b/lisp/messagexmas.el @@ -1,7 +1,7 @@ ;;; messagexmas.el --- XEmacs extensions to message -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2003, 2004 -;; Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: mail, news @@ -20,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -38,13 +38,20 @@ If this variable is nil, Message will try to locate the directory automatically.") -(defvar message-use-toolbar (if (featurep 'toolbar) - 'default-toolbar - nil) - "*If nil, do not use a toolbar. -If it is non-nil, it must be a toolbar. The five valid values are -`default-toolbar', `top-toolbar', `bottom-toolbar', -`right-toolbar', and `left-toolbar'.") +(defvar message-use-toolbar (if (featurep 'toolbar) 'default) + "*Position to display the toolbar. Nil means do not use a toolbar. +If it is non-nil, it should be one of the symbols `default', `top', +`bottom', `right', and `left'. `default' means to use the default +toolbar, the rest mean to display the toolbar on the place which those +names show.") + +(defvar message-toolbar-thickness + (if (featurep 'toolbar) + (cons (specifier-instance default-toolbar-height) + (specifier-instance default-toolbar-width))) + "*Cons of the height and the width specifying the thickness of a toolbar. +The height is used for the toolbar displayed on the top or the bottom, +the width is used for the toolbar displayed on the right or the left.") (defvar message-toolbar '([message-spell ispell-message t "Spell"] @@ -60,7 +67,8 @@ If it is non-nil, it must be a toolbar. The five valid values are (nnheader-find-etc-directory package)))) (defun message-xmas-setup-toolbar (bar &optional force package) - (let ((dir (message-xmas-find-glyph-directory package)) + (let ((dir (or (message-xmas-find-glyph-directory package) + (message-xmas-find-glyph-directory "gnus"))) (xpm (if (featurep 'xpm) "xpm" "xbm")) icon up down disabled name) (unless package @@ -84,10 +92,48 @@ If it is non-nil, it must be a toolbar. The five valid values are dir)) (defun message-setup-toolbar () - (and message-use-toolbar - (message-xmas-setup-toolbar message-toolbar) - (set-specifier (symbol-value message-use-toolbar) - (cons (current-buffer) message-toolbar)))) + (when (featurep 'toolbar) + (if (and message-use-toolbar + (message-xmas-setup-toolbar message-toolbar)) + (let ((bar (or (intern-soft (format "%s-toolbar" message-use-toolbar)) + 'default-toolbar)) + (height (car message-toolbar-thickness)) + (width (cdr message-toolbar-thickness)) + (cur (current-buffer)) + bars) + (set-specifier (symbol-value bar) message-toolbar cur) + (set-specifier default-toolbar-height height cur) + (set-specifier default-toolbar-width width cur) + (set-specifier top-toolbar-height height cur) + (set-specifier bottom-toolbar-height height cur) + (set-specifier right-toolbar-width width cur) + (set-specifier left-toolbar-width width cur) + (if (eq bar 'default-toolbar) + (progn + (remove-specifier default-toolbar-visible-p cur) + (remove-specifier top-toolbar cur) + (remove-specifier top-toolbar-visible-p cur) + (remove-specifier bottom-toolbar cur) + (remove-specifier bottom-toolbar-visible-p cur) + (remove-specifier right-toolbar cur) + (remove-specifier right-toolbar-visible-p cur) + (remove-specifier left-toolbar cur) + (remove-specifier left-toolbar-visible-p cur)) + (set-specifier (symbol-value (intern (format "%s-visible-p" bar))) + t cur) + (setq bars (delq bar (list 'default-toolbar + 'bottom-toolbar 'top-toolbar + 'right-toolbar 'left-toolbar))) + (while bars + (set-specifier (symbol-value (intern (format "%s-visible-p" + (pop bars)))) + nil cur)))) + (let ((cur (current-buffer))) + (set-specifier default-toolbar-visible-p nil cur) + (set-specifier top-toolbar-visible-p nil cur) + (set-specifier bottom-toolbar-visible-p nil cur) + (set-specifier right-toolbar-visible-p nil cur) + (set-specifier left-toolbar-visible-p nil cur))))) (defun message-xmas-exchange-point-and-mark () "Exchange point and mark, but allow for XEmacs' optional argument." diff --git a/lisp/messcompat.el b/lisp/messcompat.el index ff7520f..3cd74a0 100644 --- a/lisp/messcompat.el +++ b/lisp/messcompat.el @@ -1,7 +1,7 @@ ;;; messcompat.el --- making message mode compatible with mail mode -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003 -;; Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: mail, news @@ -20,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/mm-bodies.el b/lisp/mm-bodies.el index 2320793..aee329b 100644 --- a/lisp/mm-bodies.el +++ b/lisp/mm-bodies.el @@ -1,7 +1,7 @@ ;;; mm-bodies.el --- Functions for decoding MIME things -;; Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004 -;; Free Software Foundation, Inc. +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; MORIOKA Tomohiko @@ -19,8 +19,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -93,7 +93,8 @@ If no encoding was done, nil is returned." (save-excursion (if charset (progn - (mm-encode-coding-region (point-min) (point-max) charset) + (mm-encode-coding-region (point-min) (point-max) + (mm-charset-to-coding-system charset)) charset) (goto-char (point-min)) (let ((charsets (mm-find-mime-charset-region (point-min) (point-max) @@ -224,8 +225,9 @@ If TYPE is `text/plain' CRLF->LF translation may occur." (message "Error while decoding: %s" error) nil)) (when (and + type (memq encoding '(base64 x-uuencode x-uue x-binhex x-yenc)) - (equal type "text/plain")) + (string-match "\\`text/" type)) (goto-char (point-min)) (while (search-forward "\r\n" nil t) (replace-match "\n" t t))))) @@ -245,8 +247,12 @@ decoding. If it is nil, default to `mail-parse-charset'." (save-excursion (when encoding (mm-decode-content-transfer-encoding encoding type)) - (when (featurep 'mule) ; Fixme: Wrong test for unibyte session. - (let ((coding-system (mm-charset-to-coding-system charset))) + (when (and (featurep 'mule) ;; Fixme: Wrong test for unibyte session. + (not (eq charset 'gnus-decoded))) + (let ((coding-system (mm-charset-to-coding-system + ;; Allow overwrite using + ;; `mm-charset-override-alist'. + charset nil t))) (if (and (not coding-system) (listp mail-parse-ignored-charsets) (memq 'gnus-unknown mail-parse-ignored-charsets)) @@ -258,8 +264,7 @@ decoding. If it is nil, default to `mail-parse-charset'." ;;in XEmacs (mm-multibyte-p) (or (not (eq coding-system 'ascii)) - (setq coding-system mail-parse-charset)) - (not (eq coding-system 'gnus-decoded))) + (setq coding-system mail-parse-charset))) (mm-decode-coding-region (point-min) (point-max) coding-system)) (setq buffer-file-coding-system @@ -278,7 +283,11 @@ decoding. If it is nil, default to `mail-parse-charset'." (setq charset mail-parse-charset)) (or (when (featurep 'mule) - (let ((coding-system (mm-charset-to-coding-system charset))) + (let ((coding-system (mm-charset-to-coding-system + charset + ;; Allow overwrite using + ;; `mm-charset-override-alist'. + nil t))) (if (and (not coding-system) (listp mail-parse-ignored-charsets) (memq 'gnus-unknown mail-parse-ignored-charsets)) diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el index b22d573..7af9bef 100644 --- a/lisp/mm-decode.el +++ b/lisp/mm-decode.el @@ -1,6 +1,7 @@ ;;; mm-decode.el --- Functions for decoding MIME things -;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; MORIOKA Tomohiko @@ -18,8 +19,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -34,8 +35,11 @@ (eval-and-compile (autoload 'mm-inline-partial "mm-partial") (autoload 'mm-inline-external-body "mm-extern") + (autoload 'mm-extern-cache-contents "mm-extern") (autoload 'mm-insert-inline "mm-view")) +(defvar gnus-current-window-configuration) + (add-hook 'gnus-exit-gnus-hook 'mm-destroy-postponed-undisplay-list) (defgroup mime-display () @@ -218,7 +222,12 @@ before the external MIME handler is invoked." ("text/richtext" mm-inline-text identity) ("text/x-patch" mm-display-patch-inline (lambda (handle) - (locate-library "diff-mode"))) + ;; If the diff-mode.el package is installed, the function is + ;; autoloaded. Checking (locate-library "diff-mode") would be trying + ;; to cater to broken installations. OTOH checking the function + ;; makes it possible to install another package which provides an + ;; alternative implementation of diff-mode. --Stef + (fboundp 'diff-mode))) ("application/emacs-lisp" mm-display-elisp-inline identity) ("application/x-emacs-lisp" mm-display-elisp-inline identity) ("text/dns" mm-display-dns-inline identity) @@ -271,11 +280,13 @@ before the external MIME handler is invoked." "application/x-emacs-lisp" "application/pgp-signature" "application/x-pkcs7-signature" "application/pkcs7-signature" "application/x-pkcs7-mime" - "application/pkcs7-mime") + "application/pkcs7-mime" + ;; Mutt still uses this even though it has already been withdrawn. + "application/pgp") "List of media types that are to be displayed inline. See also `mm-inline-media-tests', which says how to display a media type inline." - :type '(repeat string) + :type '(repeat regexp) :group 'mime-display) (defcustom mm-keep-viewer-alive-types @@ -284,19 +295,21 @@ type inline." "List of media types for which the external viewer will not be killed when selecting a different article." :version "22.1" - :type '(repeat string) + :type '(repeat regexp) :group 'mime-display) (defcustom mm-automatic-display - '("text/plain" "text/enriched" "text/richtext" "text/html" + '("text/plain" "text/enriched" "text/richtext" "text/html" "text/x-verbatim" "text/x-vcard" "image/.*" "message/delivery-status" "multipart/.*" "message/rfc822" "text/x-patch" "text/dns" "application/pgp-signature" "application/emacs-lisp" "application/x-emacs-lisp" "application/x-pkcs7-signature" "application/pkcs7-signature" "application/x-pkcs7-mime" - "application/pkcs7-mime") + "application/pkcs7-mime" + ;; Mutt still uses this even though it has already been withdrawn. + "application/pgp") "A list of MIME types to be displayed automatically." - :type '(repeat string) + :type '(repeat regexp) :group 'mime-display) (defcustom mm-attachment-override-types '("text/x-vcard" @@ -305,17 +318,17 @@ when selecting a different article." "application/pkcs7-signature" "application/x-pkcs7-signature") "Types to have \"attachment\" ignored if they can be displayed inline." - :type '(repeat string) + :type '(repeat regexp) :group 'mime-display) (defcustom mm-inline-override-types nil "Types to be treated as attachments even if they can be displayed inline." - :type '(repeat string) + :type '(repeat regexp) :group 'mime-display) (defcustom mm-automatic-external-display nil "List of MIME type regexps that will be displayed externally automatically." - :type '(repeat string) + :type '(repeat regexp) :group 'mime-display) (defcustom mm-discouraged-alternatives nil @@ -327,8 +340,13 @@ for instance, text/html parts are very unwanted, and text/richtext are somewhat unwanted, then the value of this variable should be set to: - (\"text/html\" \"text/richtext\")" - :type '(repeat string) + (\"text/html\" \"text/richtext\") + +Adding \"image/.*\" might also be useful. Spammers use it as the +prefered part of multipart/alternative messages. See also +`gnus-buttonized-mime-types', to which adding \"multipart/alternative\" +enables you to choose manually one of two types those mails include." + :type '(repeat regexp) ;; See `mm-preferred-alternative-precedence'. :group 'mime-display) (defcustom mm-tmp-directory @@ -448,21 +466,19 @@ If not set, `default-directory' will be used." (defvar mm-viewer-completion-map (let ((map (make-sparse-keymap 'mm-viewer-completion-map))) (set-keymap-parent map minibuffer-local-completion-map) + ;; Should we bind other key to minibuffer-complete-word? + (define-key map " " 'self-insert-command) map) "Keymap for input viewer with completion.") -;; Should we bind other key to minibuffer-complete-word? -(define-key mm-viewer-completion-map " " 'self-insert-command) - (defvar mm-viewer-completion-map (let ((map (make-sparse-keymap 'mm-viewer-completion-map))) (set-keymap-parent map minibuffer-local-completion-map) + ;; Should we bind other key to minibuffer-complete-word? + (define-key map " " 'self-insert-command) map) "Keymap for input viewer with completion.") -;; Should we bind other key to minibuffer-complete-word? -(define-key mm-viewer-completion-map " " 'self-insert-command) - ;;; The functions. (defun mm-alist-to-plist (alist) @@ -519,13 +535,13 @@ Postpone undisplaying of viewers for types in loose-mime (mail-fetch-field "mime-version")) (setq ct (mail-fetch-field "content-type") - ctl (ignore-errors (mail-header-parse-content-type ct)) + ctl (and ct (mail-header-parse-content-type ct)) cte (mail-fetch-field "content-transfer-encoding") cd (mail-fetch-field "content-disposition") description (mail-fetch-field "content-description") id (mail-fetch-field "content-id")) (unless from - (setq from (mail-fetch-field "from"))) + (setq from (mail-fetch-field "from"))) ;; FIXME: In some circumstances, this code is running within ;; an unibyte macro. mail-extract-address-components ;; creates unibyte buffers. This `if', though not a perfect @@ -538,7 +554,7 @@ Postpone undisplaying of viewers for types in (list mm-dissect-default-type) (and cte (intern (downcase (mail-header-strip cte)))) no-strict-mime - (and cd (ignore-errors (mail-header-parse-content-disposition cd))) + (and cd (mail-header-parse-content-disposition cd)) description) (setq type (split-string (car ctl) "/")) (setq subtype (cadr type) @@ -557,7 +573,7 @@ Postpone undisplaying of viewers for types in ;; what really needs to be done here is a way to link a ;; MIME handle back to it's parent MIME handle (in a multilevel ;; MIME article). That would probably require changing - ;; the mm-handle API so we simply store the multipart buffert + ;; the mm-handle API so we simply store the multipart buffer ;; name as a text property of the "multipart/whatever" string. (add-text-properties 0 (length (car ctl)) (list 'buffer (mm-copy-to-buffer) @@ -571,8 +587,7 @@ Postpone undisplaying of viewers for types in ctl (and cte (intern (downcase (mail-header-strip cte)))) no-strict-mime - (and cd (ignore-errors - (mail-header-parse-content-disposition cd))) + (and cd (mail-header-parse-content-disposition cd)) description id) ctl)))) (when id @@ -749,7 +764,18 @@ external if displayed external." (gnus-map-function mm-file-name-rewrite-functions (file-name-nondirectory filename)) dir)) - (setq file (mm-make-temp-file (expand-file-name "mm." dir)))) + ;; Use nametemplate (defined in RFC1524) if it is specified + ;; in mailcap. + (let ((suffix (cdr (assoc "nametemplate" mime-info)))) + (if (and suffix + (string-match "\\`%s\\(\\..+\\)\\'" suffix)) + (setq suffix (match-string 1 suffix)) + ;; Otherwise, use a suffix according to + ;; `mailcap-mime-extensions'. + (setq suffix (car (rassoc (mm-handle-media-type handle) + mailcap-mime-extensions)))) + (setq file (mm-make-temp-file (expand-file-name "mm." dir) + nil suffix)))) (let ((coding-system-for-write mm-binary-coding-system)) (write-region (point-min) (point-max) file nil 'nomesg)) (message "Viewing with %s" method) @@ -798,8 +824,7 @@ external if displayed external." (mm-mailcap-command method file (mm-handle-type handle))) (if (buffer-live-p buffer) - (save-excursion - (set-buffer buffer) + (with-current-buffer buffer (buffer-string)))) (progn (ignore-errors (delete-file file)) @@ -808,14 +833,52 @@ external if displayed external." (ignore-errors (kill-buffer buffer)))))) 'inline) (t + ;; Deleting the temp file should be postponed for some wrappers, + ;; shell scripts, and so on, which might exit right after having + ;; started a viewer command as a background job. (let ((command (mm-mailcap-command method file (mm-handle-type handle)))) (unwind-protect - (start-process "*display*" - (setq buffer - (generate-new-buffer " *mm*")) - shell-file-name - shell-command-switch command) + (progn + (start-process "*display*" + (setq buffer + (generate-new-buffer " *mm*")) + shell-file-name + shell-command-switch command) + (set-process-sentinel + (get-buffer-process buffer) + (lexical-let ;; Don't use `let'. + ;; Function used to remove temp file and directory. + ((fn `(lambda nil + ;; Don't use `ignore-errors'. + (condition-case nil + (delete-file ,file) + (error)) + (condition-case nil + (delete-directory + ,(file-name-directory file)) + (error)))) + ;; Form uses to kill the process buffer and + ;; remove the undisplayer. + (fm `(progn + (kill-buffer ,buffer) + ,(macroexpand + (list 'mm-handle-set-undisplayer + (list 'quote handle) + nil)))) + ;; Message to be issued when the process exits. + (done (format "Displaying %s...done" command)) + ;; In particular, the timer object (which is + ;; a vector in Emacs but is a list in XEmacs) + ;; requires that it is lexically scoped. + (timer (run-at-time 2.0 nil 'ignore))) + (lambda (process state) + (when (eq 'exit (process-status process)) + (if (memq timer timer-list) + (timer-set-function timer fn) + (funcall fn)) + (ignore-errors (eval fm)) + (message "%s" done)))))) (mm-handle-set-external-undisplayer handle (cons file buffer))) (message "Displaying %s..." command)) @@ -1014,23 +1077,54 @@ external if displayed external." ;;; Functions for outputting parts ;;; -(defun mm-get-part (handle) - "Return the contents of HANDLE as a string." - (mm-with-unibyte-buffer - (insert (with-current-buffer (mm-handle-buffer handle) - (mm-with-unibyte-current-buffer - (buffer-string)))) - (mm-decode-content-transfer-encoding - (mm-handle-encoding handle) - (mm-handle-media-type handle)) - (buffer-string))) - -(defun mm-insert-part (handle) - "Insert the contents of HANDLE in the current buffer." +(defmacro mm-with-part (handle &rest forms) + "Run FORMS in the temp buffer containing the contents of HANDLE." + `(let* ((handle ,handle) + ;; The multibyteness of the temp buffer should be turned on + ;; if inserting a multibyte string. Contrarily, the buffer's + ;; multibyteness should be off if inserting a unibyte string, + ;; especially if a string contains 8bit data. + (default-enable-multibyte-characters + (with-current-buffer (mm-handle-buffer handle) + (mm-multibyte-p)))) + (with-temp-buffer + (insert-buffer-substring (mm-handle-buffer handle)) + (mm-disable-multibyte) + (mm-decode-content-transfer-encoding + (mm-handle-encoding handle) + (mm-handle-media-type handle)) + ,@forms))) +(put 'mm-with-part 'lisp-indent-function 1) +(put 'mm-with-part 'edebug-form-spec '(body)) + +(defun mm-get-part (handle &optional no-cache) + "Return the contents of HANDLE as a string. +If NO-CACHE is non-nil, cached contents of a message/external-body part +are ignored." + (if (and (not no-cache) + (equal (mm-handle-media-type handle) "message/external-body")) + (progn + (unless (mm-handle-cache handle) + (mm-extern-cache-contents handle)) + (with-current-buffer (mm-handle-buffer (mm-handle-cache handle)) + (buffer-string))) + (mm-with-part handle + (buffer-string)))) + +(defun mm-insert-part (handle &optional no-cache) + "Insert the contents of HANDLE in the current buffer. +If NO-CACHE is non-nil, cached contents of a message/external-body part +are ignored." (save-excursion - (insert (if (mm-multibyte-p) - (mm-string-as-multibyte (mm-get-part handle)) - (mm-get-part handle))))) + (insert + (cond ((eq (mail-content-type-get (mm-handle-type handle) 'charset) + 'gnus-decoded) + (with-current-buffer (mm-handle-buffer handle) + (buffer-string))) + ((mm-multibyte-p) + (mm-string-as-multibyte (mm-get-part handle no-cache))) + (t + (mm-get-part handle no-cache)))))) (defun mm-file-name-delete-whitespace (file-name) "Remove all whitespace characters from FILE-NAME." @@ -1070,20 +1164,22 @@ string if you do not like underscores." (setq filename (gnus-replace-in-string filename "[<>|]" "")) (gnus-replace-in-string filename "^[.-]+" "")) -(defun mm-save-part (handle) - "Write HANDLE to a file." - (let* ((name (mail-content-type-get (mm-handle-type handle) 'name)) - (filename (mail-content-type-get - (mm-handle-disposition handle) 'filename)) - file) +(defun mm-save-part (handle &optional prompt) + "Write HANDLE to a file. +PROMPT overrides the default one used to ask user for a file name." + (let ((filename (or (mail-content-type-get + (mm-handle-disposition handle) 'filename) + (mail-content-type-get + (mm-handle-type handle) 'name))) + file) (when filename (setq filename (gnus-map-function mm-file-name-rewrite-functions (file-name-nondirectory filename)))) (setq file (mm-with-multibyte - (read-file-name "Save MIME part to: " - (or mm-default-directory default-directory) - nil nil (or filename name "")))) + (read-file-name (or prompt "Save MIME part to: ") + (or mm-default-directory default-directory) + nil nil (or filename "")))) (setq mm-default-directory (file-name-directory file)) (and (or (not (file-exists-p file)) (yes-or-no-p (format "File %s already exists; overwrite? " @@ -1237,8 +1333,8 @@ be determined." ;; out to a file, and then create a file ;; specifier. (let ((file (mm-make-temp-file - (expand-file-name "emm.xbm" - mm-tmp-directory)))) + (expand-file-name "emm" mm-tmp-directory) + nil ".xbm"))) (unwind-protect (progn (write-region (point-min) (point-max) file) @@ -1325,9 +1421,8 @@ If RECURSIVE, search recursively." (save-excursion (save-restriction (narrow-to-region start (1- (point))) - (when (let ((ctl (ignore-errors - (mail-header-parse-content-type - (mail-fetch-field "content-type"))))) + (when (let* ((ct (mail-fetch-field "content-type")) + (ctl (and ct (mail-header-parse-content-type ct)))) (if notp (not (equal (car ctl) type)) (equal (car ctl) type))) @@ -1338,9 +1433,8 @@ If RECURSIVE, search recursively." (save-excursion (save-restriction (narrow-to-region start end) - (when (let ((ctl (ignore-errors - (mail-header-parse-content-type - (mail-fetch-field "content-type"))))) + (when (let* ((ct (mail-fetch-field "content-type")) + (ctl (and ct (mail-header-parse-content-type ct)))) (if notp (not (equal (car ctl) type)) (equal (car ctl) type))) diff --git a/lisp/mm-encode.el b/lisp/mm-encode.el index 79ab2c6..738be98 100644 --- a/lisp/mm-encode.el +++ b/lisp/mm-encode.el @@ -1,6 +1,7 @@ ;;; mm-encode.el --- Functions for encoding MIME things -;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; MORIOKA Tomohiko @@ -18,8 +19,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -117,7 +118,7 @@ ENCODING can be: nil (do nothing); one of `quoted-printable', `base64'; ;; Likewise base64 below. (quoted-printable-encode-region (point-min) (point-max) t)) ((eq encoding 'base64) - (when (equal type "text/plain") + (when (string-match "\\`text/" type) (goto-char (point-min)) (while (search-forward "\n" nil t) (replace-match "\r\n" t t))) diff --git a/lisp/mm-extern.el b/lisp/mm-extern.el index b063ee8..0cd68d6 100644 --- a/lisp/mm-extern.el +++ b/lisp/mm-extern.el @@ -1,5 +1,7 @@ ;;; mm-extern.el --- showing message/external-body -;; Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc. + +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Shenghuo Zhu ;; Keywords: message external-body @@ -18,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -31,6 +33,8 @@ (require 'mm-decode) (require 'mm-url) +(defvar gnus-article-mime-handles) + (defvar mm-extern-function-alist '((local-file . mm-extern-local-file) (url . mm-extern-url) @@ -52,7 +56,7 @@ (mm-disable-multibyte) (if (file-exists-p name) (mm-insert-file-contents name nil nil nil nil t) - (error (format "File %s is gone" name))))) + (error "File %s is gone" name)))) (defun mm-extern-url (handle) (erase-buffer) @@ -108,11 +112,8 @@ (insert "[" info "]\n\n"))) ;;;###autoload -(defun mm-inline-external-body (handle &optional no-display) - "Show the external-body part of HANDLE. -This function replaces the buffer of HANDLE with a buffer contains -the entire message. -If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing." +(defun mm-extern-cache-contents (handle) + "Put the external-body part of HANDLE into its cache." (let* ((access-type (cdr (assq 'access-type (cdr (mm-handle-type handle))))) (func (cdr (assq (intern @@ -120,48 +121,61 @@ If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing." (or access-type (error "Couldn't find access type")))) mm-extern-function-alist))) - gnus-displaying-mime buf - handles) - (unless (mm-handle-cache handle) - (unless func - (error (format "Access type (%s) is not supported" access-type))) - (with-temp-buffer - (mm-insert-part handle) - (goto-char (point-max)) - (insert "\n\n") - (setq handles (mm-dissect-buffer t))) - (unless (bufferp (car handles)) - (mm-destroy-parts handles) - (error "Multipart external body is not supported")) - (save-excursion ;; single part - (set-buffer (setq buf (mm-handle-buffer handles))) - (let (good) - (unwind-protect - (progn - (funcall func handle) - (setq good t)) - (unless good - (mm-destroy-parts handles)))) - (mm-handle-set-cache handle handles)) - (setq gnus-article-mime-handles - (mm-merge-handles gnus-article-mime-handles handles))) - (unless no-display - (save-excursion - (save-restriction - (narrow-to-region (point) (point)) - (gnus-display-mime (mm-handle-cache handle)) - (mm-handle-set-undisplayer - handle - `(lambda () - (let (buffer-read-only) - (condition-case nil - ;; This is only valid on XEmacs. - (mapcar (lambda (prop) - (remove-specifier - (face-property 'default prop) (current-buffer))) - '(background background-pixmap foreground)) - (error nil)) - (delete-region ,(point-min-marker) ,(point-max-marker)))))))))) + buf handles) + (unless func + (error "Access type (%s) is not supported" access-type)) + (mm-with-part handle + (goto-char (point-max)) + (insert "\n\n") + ;; It should be just a single MIME handle. + (setq handles (mm-dissect-buffer t))) + (unless (bufferp (car handles)) + (mm-destroy-parts handles) + (error "Multipart external body is not supported")) + (save-excursion + (set-buffer (setq buf (mm-handle-buffer handles))) + (let (good) + (unwind-protect + (progn + (funcall func handle) + (setq good t)) + (unless good + (mm-destroy-parts handles)))) + (mm-handle-set-cache handle handles)) + (setq gnus-article-mime-handles + (mm-merge-handles gnus-article-mime-handles handles)))) + +;;;###autoload +(defun mm-inline-external-body (handle &optional no-display) + "Show the external-body part of HANDLE. +This function replaces the buffer of HANDLE with a buffer contains +the entire message. +If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing." + (unless (mm-handle-cache handle) + (mm-extern-cache-contents handle)) + (unless no-display + (save-excursion + (save-restriction + (narrow-to-region (point) (point)) + (let* ((type (regexp-quote + (mm-handle-media-type (mm-handle-cache handle)))) + ;; Force the part to be displayed (but if there is no + ;; method to display, a user will be prompted to save). + ;; See `gnus-mime-display-single'. + (mm-inline-override-types nil) + (mm-attachment-override-types + (cons type mm-attachment-override-types)) + (mm-automatic-display (cons type mm-automatic-display)) + (mm-automatic-external-display + (cons type mm-automatic-external-display)) + ;; Suppress adding of button to the cached part. + (gnus-inhibit-mime-unbuttonizing nil)) + (gnus-display-mime (mm-handle-cache handle))) + ;; Move undisplayer added to the cached handle to the parent. + (mm-handle-set-undisplayer + handle + (mm-handle-undisplayer (mm-handle-cache handle))) + (mm-handle-set-undisplayer (mm-handle-cache handle) nil))))) (provide 'mm-extern) diff --git a/lisp/mm-partial.el b/lisp/mm-partial.el index ab84d4b..06af180 100644 --- a/lisp/mm-partial.el +++ b/lisp/mm-partial.el @@ -1,5 +1,7 @@ ;;; mm-partial.el --- showing message/partial -;; Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc. + +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Shenghuo Zhu ;; Keywords: message partial @@ -18,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/mm-url.el b/lisp/mm-url.el index 529def5..0934abd 100644 --- a/lisp/mm-url.el +++ b/lisp/mm-url.el @@ -1,5 +1,7 @@ ;;; mm-url.el --- a wrapper of url functions/commands for Gnus -;; Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc. + +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Shenghuo Zhu @@ -17,8 +19,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -42,6 +44,10 @@ (require 'timer-funcs) (require 'timer))) +(defvar url-current-object) +(defvar url-package-name) +(defvar url-package-version) + (defgroup mm-url nil "A wrapper of url package and external url command for Gnus." :group 'gnus) @@ -59,7 +65,7 @@ '((wget "wget" "--user-agent=mm-url" "-q" "-O" "-") (w3m "w3m" "-dump_source") (lynx "lynx" "-source") - (curl "curl" "--silent"))) + (curl "curl" "--silent" "--user-agent mm-url" "--location"))) (defcustom mm-url-program (cond @@ -271,7 +277,10 @@ This is taken from RFC 2396.") (defun mm-url-load-url () "Load `url-insert-file-contents'." (unless (condition-case () - (require 'url-handlers) + (progn + (require 'url-handlers) + (require 'url-parse) + (require 'url-vars)) (error nil)) ;; w3-4.0pre0.46 or earlier version. (require 'w3-vars) @@ -360,7 +369,7 @@ If FOLLOW-REFRESH is non-nil, redirect refresh url in META." (defun mm-url-decode-entities () "Decode all HTML entities." (goto-char (point-min)) - (while (re-search-forward "&\\(#[0-9]+\\|[a-z]+\\);" nil t) + (while (re-search-forward "&\\(#[0-9]+\\|[a-z]+[0-9]*\\);" nil t) (let ((elem (if (eq (aref (match-string 1) 0) ?\#) (let ((c (string-to-number (substring diff --git a/lisp/mm-util.el b/lisp/mm-util.el index cee0393..3eb4d41 100644 --- a/lisp/mm-util.el +++ b/lisp/mm-util.el @@ -1,6 +1,7 @@ ;;; mm-util.el --- Utility functions for Mule and low level things -;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; MORIOKA Tomohiko @@ -18,8 +19,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -102,18 +103,23 @@ (lambda (ch) (mm-string-as-multibyte (char-to-string ch))) string ""))) (multibyte-string-p . ignore) - ;; It is not a MIME function, but some MIME functions use it. - (make-temp-file . (lambda (prefix &optional dir-flag) - (let ((file (expand-file-name - (make-temp-name prefix) - (if (fboundp 'temp-directory) - (temp-directory) - temporary-file-directory)))) - (if dir-flag - (make-directory file)) - file))) (insert-byte . insert-char) - (multibyte-char-to-unibyte . identity)))) + (multibyte-char-to-unibyte . identity) + (special-display-p + . (lambda (buffer-name) + "Returns non-nil if a buffer named BUFFER-NAME gets a special frame." + (and special-display-function + (or (and (member buffer-name special-display-buffer-names) t) + (cdr (assoc buffer-name special-display-buffer-names)) + (catch 'return + (dolist (elem special-display-regexps) + (and (stringp elem) + (string-match elem buffer-name) + (throw 'return t)) + (and (consp elem) + (stringp (car elem)) + (string-match (car elem) buffer-name) + (throw 'return (cdr elem)))))))))))) (eval-and-compile (defalias 'mm-char-or-char-int-p @@ -161,9 +167,32 @@ system object in XEmacs." (if (fboundp 'coding-system-p) (when (coding-system-p cs) cs) - ;; Is this branch ever actually useful? + ;; no-MULE XEmacs: (car (memq cs (mm-get-coding-system-list)))))) +(defun mm-codepage-setup (number &optional alias) + "Create a coding system cpNUMBER. +The coding system is created using `codepage-setup'. If ALIAS is +non-nil, an alias is created and added to +`mm-charset-synonym-alist'. If ALIAS is a string, it's used as +the alias. Else windows-NUMBER is used." + (interactive + (let ((completion-ignore-case t) + (candidates (cp-supported-codepages))) + (list (completing-read "Setup DOS Codepage: (default 437) " candidates + nil t nil nil "437")))) + (when alias + (setq alias (if (stringp alias) + (intern alias) + (intern (format "windows-%s" number))))) + (let* ((cp (intern (format "cp%s" number)))) + (unless (mm-coding-system-p cp) + (codepage-setup number)) + (when (and alias + ;; Don't add alias if setup of cp failed. + (mm-coding-system-p cp)) + (add-to-list 'mm-charset-synonym-alist (cons alias cp))))) + (defvar mm-charset-synonym-alist `( ;; Not in XEmacs, but it's not a proper MIME charset anyhow. @@ -197,7 +226,51 @@ system object in XEmacs." '((ks_c_5601-1987 . cp949)) '((ks_c_5601-1987 . euc-kr)))) ) - "A mapping from invalid charset names to the real charset names.") + "A mapping from unknown or invalid charset names to the real charset names.") + +(defcustom mm-charset-override-alist + `((iso-8859-1 . windows-1252)) + "A mapping from undesired charset names to their replacement. + +You may add pairs like (iso-8859-1 . windows-1252) here, +i.e. treat iso-8859-1 as windows-1252. windows-1252 is a +superset of iso-8859-1." + :type '(list (set :inline t + (const (iso-8859-1 . windows-1252)) + (const (undecided . windows-1252))) + (repeat :inline t + :tag "Other options" + (cons (symbol :tag "From charset") + (symbol :tag "To charset")))) + :version "23.0" ;; No Gnus + :group 'mime) + +(defcustom mm-charset-eval-alist + (if (featurep 'xemacs) + nil ;; I don't know what would be useful for XEmacs. + '(;; Emacs 21 offers 1250 1251 1253 1257. Emacs 22 provides autoloads for + ;; 1250-1258 (i.e. `mm-codepage-setup' does nothing). + (windows-1250 . (mm-codepage-setup 1250 t)) + (windows-1251 . (mm-codepage-setup 1251 t)) + (windows-1253 . (mm-codepage-setup 1253 t)) + (windows-1257 . (mm-codepage-setup 1257 t)))) + "An alist of (CHARSET . FORM) pairs. +If an article is encoded in an unknown CHARSET, FORM is +evaluated. This allows to load additional libraries providing +charsets on demand. If supported by your Emacs version, you +could use `autoload-coding-system' here." + :version "23.0" ;; No Gnus + :type '(list (set :inline t + (const (windows-1250 . (mm-codepage-setup 1250 t))) + (const (windows-1251 . (mm-codepage-setup 1251 t))) + (const (windows-1253 . (mm-codepage-setup 1253 t))) + (const (windows-1257 . (mm-codepage-setup 1257 t))) + (const (cp850 . (mm-codepage-setup 850 nil)))) + (repeat :inline t + :tag "Other options" + (cons (symbol :tag "charset") + (symbol :tag "form")))) + :group 'mime) (defvar mm-binary-coding-system (cond @@ -327,7 +400,7 @@ with Mule charsets. It is completely useless for Emacs." cs mime mule alist) (while css (setq cs (pop css) - mime (or (coding-system-get cs :mime-charset) ; Emacs 22 + mime (or (coding-system-get cs :mime-charset) ; Emacs 23 (unicode) (coding-system-get cs 'mime-charset))) (when (and mime (not (eq t (setq mule @@ -422,11 +495,17 @@ mail with multiple parts is preferred to sending a Unicode one.") (pop alist)) out))) -(defun mm-charset-to-coding-system (charset &optional lbt) +(defun mm-charset-to-coding-system (charset &optional lbt + allow-override) "Return coding-system corresponding to CHARSET. CHARSET is a symbol naming a MIME charset. If optional argument LBT (`unix', `dos' or `mac') is specified, it is -used as the line break code type of the coding system." +used as the line break code type of the coding system. + +If ALLOW-OVERRIDE is given, use `mm-charset-override-alist' to +map undesired charset names to their replacement. This should +only be used for decoding, not for encoding." + ;; OVERRIDE is used (only) in `mm-decode-body'. (when (stringp charset) (setq charset (intern (downcase charset)))) (when lbt @@ -438,6 +517,11 @@ used as the line break code type of the coding system." ((or (null (mm-get-coding-system-list)) (not (fboundp 'coding-system-get))) charset) + ;; Check override list quite early. Should only used for decoding, not for + ;; encoding! + ((and allow-override + (let ((cs (cdr (assq charset mm-charset-override-alist)))) + (and cs (mm-coding-system-p cs) cs)))) ;; ascii ((eq charset 'us-ascii) 'ascii) @@ -450,9 +534,27 @@ used as the line break code type of the coding system." ;;; (eq charset (coding-system-get charset 'mime-charset)) ) charset) + ;; Eval expressions from `mm-charset-eval-alist' + ((let* ((el (assq charset mm-charset-eval-alist)) + (cs (car el)) + (form (cdr el))) + (and cs + form + (prog2 + ;; Avoid errors... + (condition-case nil (eval form) (error nil)) + ;; (message "Failed to eval `%s'" form)) + (mm-coding-system-p cs) + (message "Added charset `%s' via `mm-charset-eval-alist'" cs)) + cs))) ;; Translate invalid charsets. ((let ((cs (cdr (assq charset mm-charset-synonym-alist)))) - (and cs (mm-coding-system-p cs) cs))) + (and cs + (mm-coding-system-p cs) + ;; (message + ;; "Using synonym `%s' from `mm-charset-synonym-alist' for `%s'" + ;; cs charset) + cs))) ;; Last resort: search the coding system list for entries which ;; have the right mime-charset in case the canonical name isn't ;; defined (though it should be). @@ -464,6 +566,11 @@ used as the line break code type of the coding system." (eq charset (or (coding-system-get c :mime-charset) (coding-system-get c 'mime-charset)))) (setq cs c))) + (unless cs + ;; Warn the user about unknown charset: + (if (fboundp 'gnus-message) + (gnus-message 7 "Unknown charset: %s" charset) + (message "Unknown charset: %s" charset))) cs)))) (eval-and-compile @@ -551,14 +658,21 @@ If the charset is `composition', return the actual one." ;; This is for XEmacs. (mm-mule-charset-to-mime-charset charset))) -(defun mm-delete-duplicates (list) - "Simple substitute for CL `delete-duplicates', testing with `equal'." - (let (result head) - (while list - (setq head (car list)) - (setq list (delete head list)) - (setq result (cons head result))) - (nreverse result))) +(if (fboundp 'delete-dups) + (defalias 'mm-delete-duplicates 'delete-dups) + (defun mm-delete-duplicates (list) + "Destructively remove `equal' duplicates from LIST. +Store the result in LIST and return it. LIST must be a proper list. +Of several `equal' occurrences of an element in LIST, the first +one is kept. + +This is a compatibility function for Emacsen without `delete-dups'." + ;; Code from `subr.el' in Emacs 22: + (let ((tail list)) + (while tail + (setcdr tail (delete (car tail) (cdr tail))) + (setq tail (cdr tail)))) + list)) ;; Fixme: This is used in places when it should be testing the ;; default multibyteness. See mm-default-multibyte-p. @@ -750,6 +864,17 @@ charset, and a longer list means no appropriate charset." (if (and (memq 'iso-2022-jp-2 charsets) (memq 'iso-2022-jp-2 hack-charsets)) (setq charsets (delq 'iso-2022-jp charsets))) + ;; Attempt to reduce the number of charsets if utf-8 is available. + (if (and (featurep 'xemacs) + (> (length charsets) 1) + (mm-coding-system-p 'utf-8)) + (let ((mm-coding-system-priorities + (cons 'utf-8 mm-coding-system-priorities))) + (setq charsets + (mm-delete-duplicates + (mapcar 'mm-mime-charset + (delq 'ascii + (mm-find-charset-region b e))))))) charsets)) (defmacro mm-with-unibyte-buffer (&rest forms) @@ -771,11 +896,18 @@ Use multibyte mode for this." (defmacro mm-with-unibyte-current-buffer (&rest forms) "Evaluate FORMS with current buffer temporarily made unibyte. Also bind `default-enable-multibyte-characters' to nil. -Equivalent to `progn' in XEmacs" +Equivalent to `progn' in XEmacs + +NOTE: Use this macro with caution in multibyte buffers (it is not +worth using this macro in unibyte buffers of course). Use of +`(set-buffer-multibyte t)', which is run finally, is generally +harmful since it is likely to modify existing data in the buffer. +For instance, it converts \"\\300\\255\" into \"\\255\" in +Emacs 23 (unicode)." (let ((multibyte (make-symbol "multibyte")) (buffer (make-symbol "buffer"))) `(if mm-emacs-mule - (let ((,multibyte enable-multibyte-characters) + (let ((,multibyte enable-multibyte-characters) (,buffer (current-buffer))) (unwind-protect (let (default-enable-multibyte-characters) @@ -858,22 +990,28 @@ to advanced Emacs features, such as file-name-handlers, format decoding, `find-file-hooks', etc. If INHIBIT is non-nil, inhibit `mm-inhibit-file-name-handlers'. This function ensures that none of these modifications will take place." - (let ((format-alist nil) - (auto-mode-alist (if inhibit nil (mm-auto-mode-alist))) - (default-major-mode 'fundamental-mode) - (enable-local-variables nil) - (after-insert-file-functions nil) - (enable-local-eval nil) - (find-file-hooks nil) - (inhibit-file-name-operation (if inhibit - 'insert-file-contents - inhibit-file-name-operation)) - (inhibit-file-name-handlers - (if inhibit - (append mm-inhibit-file-name-handlers - inhibit-file-name-handlers) - inhibit-file-name-handlers))) - (insert-file-contents filename visit beg end replace))) + (let* ((format-alist nil) + (auto-mode-alist (if inhibit nil (mm-auto-mode-alist))) + (default-major-mode 'fundamental-mode) + (enable-local-variables nil) + (after-insert-file-functions nil) + (enable-local-eval nil) + (inhibit-file-name-operation (if inhibit + 'insert-file-contents + inhibit-file-name-operation)) + (inhibit-file-name-handlers + (if inhibit + (append mm-inhibit-file-name-handlers + inhibit-file-name-handlers) + inhibit-file-name-handlers)) + (ffh (if (boundp 'find-file-hook) + 'find-file-hook + 'find-file-hooks)) + (val (symbol-value ffh))) + (set ffh nil) + (unwind-protect + (insert-file-contents filename visit beg end replace) + (set ffh val)))) (defun mm-append-to-file (start end filename &optional codesys inhibit) "Append the contents of the region to the end of file FILENAME. @@ -915,6 +1053,74 @@ If INHIBIT is non-nil, inhibit `mm-inhibit-file-name-handlers'." inhibit-file-name-handlers))) (write-region start end filename append visit lockname))) +;; It is not a MIME function, but some MIME functions use it. +(if (and (fboundp 'make-temp-file) + (ignore-errors + (let ((def (symbol-function 'make-temp-file))) + (and (byte-code-function-p def) + (setq def (if (fboundp 'compiled-function-arglist) + ;; XEmacs + (eval (list 'compiled-function-arglist def)) + (aref def 0))) + (>= (length def) 4) + (eq (nth 3 def) 'suffix))))) + (defalias 'mm-make-temp-file 'make-temp-file) + ;; Stolen (and modified for XEmacs) from Emacs 22. + (defun mm-make-temp-file (prefix &optional dir-flag suffix) + "Create a temporary file. +The returned file name (created by appending some random characters at the end +of PREFIX, and expanding against `temporary-file-directory' if necessary), +is guaranteed to point to a newly created empty file. +You can then use `write-region' to write new data into the file. + +If DIR-FLAG is non-nil, create a new empty directory instead of a file. + +If SUFFIX is non-nil, add that at the end of the file name." + (let ((umask (default-file-modes)) + file) + (unwind-protect + (progn + ;; Create temp files with strict access rights. It's easy to + ;; loosen them later, whereas it's impossible to close the + ;; time-window of loose permissions otherwise. + (set-default-file-modes 448) + (while (condition-case err + (progn + (setq file + (make-temp-name + (expand-file-name + prefix + (if (fboundp 'temp-directory) + ;; XEmacs + (temp-directory) + temporary-file-directory)))) + (if suffix + (setq file (concat file suffix))) + (if dir-flag + (make-directory file) + (if (featurep 'xemacs) + ;; NOTE: This is unsafe if XEmacs users + ;; don't use a secure temp directory. + (if (file-exists-p file) + (signal 'file-already-exists + (list "File exists" file)) + (write-region "" nil file nil 'silent)) + (write-region "" nil file nil 'silent + nil 'excl))) + nil) + (file-already-exists t) + ;; The XEmacs version of `make-directory' issues + ;; `file-error'. + (file-error (or (and (featurep 'xemacs) + (file-exists-p file)) + (signal (car err) (cdr err))))) + ;; the file was somehow created by someone else between + ;; `make-temp-name' and `write-region', let's try again. + nil) + file) + ;; Reset the umask. + (set-default-file-modes umask))))) + (defun mm-image-load-path (&optional package) (let (dir result) (dolist (path load-path (nreverse result)) @@ -1059,7 +1265,12 @@ gzip, bzip2, etc. are allowed." (unless filename (setq filename buffer-file-name)) (save-excursion - (let ((decomp (mm-decompress-buffer filename nil t))) + (let ((decomp (unless ;; No worth to examine charset of tar files. + (and filename + (string-match + "\\.\\(?:tar\\.[^.]+\\|tbz\\|tgz\\)\\'" + filename)) + (mm-decompress-buffer filename nil t)))) (when decomp (set-buffer (let (default-enable-multibyte-characters) (generate-new-buffer " *temp*"))) diff --git a/lisp/mm-uu.el b/lisp/mm-uu.el index 0bbccf0..3299cf3 100644 --- a/lisp/mm-uu.el +++ b/lisp/mm-uu.el @@ -1,6 +1,7 @@ ;;; mm-uu.el --- Return uu stuff as mm handles -;; Copyright (c) 1998, 1999, 2000, 2001, 2002, 2003, 2004 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Shenghuo Zhu ;; Keywords: postscript uudecode binhex shar forward gnatsweb pgp @@ -19,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -76,28 +77,38 @@ decoder, such as hexbin." "The default disposition of uu parts. This can be either \"inline\" or \"attachment\".") -(defvar mm-uu-emacs-sources-regexp "gnu\\.emacs\\.sources" - "The regexp of Emacs sources groups.") +(defcustom mm-uu-emacs-sources-regexp "\\.emacs\\.sources" + "The regexp of Emacs sources groups." + :version "22.1" + :type 'regexp + :group 'gnus-article-mime) -(defcustom mm-uu-diff-groups-regexp "gnus\\.commits" - "*Regexp matching diff groups." +(defcustom mm-uu-diff-groups-regexp + "\\(gmane\\|gnu\\)\\..*\\(diff\\|commit\\|cvs\\|bug\\|devel\\)" + "Regexp matching diff groups." :version "22.1" :type 'regexp :group 'gnus-article-mime) +(defcustom mm-uu-tex-groups-regexp "\\.tex\\>" + "*Regexp matching TeX groups." + :version "23.0" + :type 'regexp + :group 'gnus-article-mime) + (defvar mm-uu-type-alist '((postscript "^%!PS-" "^%%EOF$" mm-uu-postscript-extract nil) - (uu + (uu ;; Maybe we should have a more strict test here. "^begin[ \t]+0?[0-7][0-7][0-7][ \t]+" "^end[ \t]*$" mm-uu-uu-extract mm-uu-uu-filename) (binhex - "^:...............................................................$" + "^:.\\{63,63\\}$" ":$" mm-uu-binhex-extract nil @@ -112,8 +123,8 @@ This can be either \"inline\" or \"attachment\".") "^exit 0$" mm-uu-shar-extract) (forward -;;; Thanks to Edward J. Sabol and -;;; Peter von der Ah\'e + ;; Thanks to Edward J. Sabol and + ;; Peter von der Ah\'e "^-+ \\(Start of \\)?Forwarded message" "^-+ End \\(of \\)?forwarded message" mm-uu-forward-extract @@ -152,7 +163,40 @@ This can be either \"inline\" or \"attachment\".") nil mm-uu-diff-extract nil - mm-uu-diff-test))) + mm-uu-diff-test) + (message-marks + ;; Text enclosed with tags similar to `message-mark-insert-begin' and + ;; `message-mark-insert-end'. Don't use those variables to avoid + ;; dependency on `message.el'. + "^-+[8<>]*-\\{9,\\}[a-z ]+-\\{9,\\}[a-z ]+-\\{9,\\}[8<>]*-+$" + "^-+[8<>]*-\\{9,\\}[a-z ]+-\\{9,\\}[a-z ]+-\\{9,\\}[8<>]*-+$" + (lambda () (mm-uu-verbatim-marks-extract 0 -1 1 -1)) + nil) + ;; Omitting [a-z8<] leads to false positives (bogus signature separators + ;; and mailing list banners). + (insert-marks + "^ *\\(-\\|_\\)\\{30,\\}.*[a-z8<].*\\(-\\|_\\)\\{30,\\} *$" + "^ *\\(-\\|_\\)\\{30,\\}.*[a-z8<].*\\(-\\|_\\)\\{30,\\} *$" + (lambda () (mm-uu-verbatim-marks-extract 0 0 1 -1)) + nil) + (verbatim-marks + ;; slrn-style verbatim marks, see + ;; http://www.slrn.org/manual/slrn-manual-6.html#ss6.81 + "^#v\\+" + "^#v\\-$" + (lambda () (mm-uu-verbatim-marks-extract 0 0 1 -1)) + nil) + (LaTeX + "^\\([\\\\%][^\n]+\n\\)*\\\\documentclass.*[[{%]" + "^\\\\end{document}" + mm-uu-latex-extract + nil + mm-uu-latex-test)) + "A list of specifications for non-MIME attachments. +Each element consist of the following entries: label, +start-regexp, end-regexp, extract-function, test-function. + +After modifying this list you must run \\[mm-uu-configure].") (defcustom mm-uu-configure-list '((shar . disabled)) "A list of mm-uu configuration. @@ -188,24 +232,66 @@ To disable dissecting shar codes, for instance, add (defsubst mm-uu-function-2 (entry) (nth 5 entry)) -(defun mm-uu-copy-to-buffer (&optional from to) +;; In Emacs 22, we could use `min-colors' in the face definition. But Emacs +;; 21 and XEmacs don't support it. +(defcustom mm-uu-hide-markers + (< 16 (or (and (fboundp 'defined-colors) + (length (defined-colors))) + (and (fboundp 'device-color-cells) + (device-color-cells)) + 0)) + "If non-nil, hide verbatim markers. +The value should be nil on displays where the face +`mm-uu-extract' isn't distinguishable to the face `default'." + :type '(choice (const :tag "Hide" t) + (const :tag "Don't hide" nil)) + :version "23.0" ;; No Gnus + :group 'gnus-article-mime) + +(defface mm-uu-extract '(;; Colors from `gnus-cite-3' plus background: + (((class color) + (background dark)) + (:foreground "light yellow" + :background "dark green")) + (((class color) + (background light)) + (:foreground "dark green" + :background "light yellow")) + (t + ())) + "Face for extracted buffers." + ;; See `mm-uu-verbatim-marks-extract'. + :version "23.0" ;; No Gnus + :group 'gnus-article-mime) + +(defun mm-uu-copy-to-buffer (&optional from to properties) "Copy the contents of the current buffer to a fresh buffer. -Return that buffer." - (save-excursion - (let ((obuf (current-buffer)) - (coding-system - ;; Might not exist in non-MULE XEmacs - (when (boundp 'buffer-file-coding-system) - buffer-file-coding-system))) - (set-buffer (generate-new-buffer " *mm-uu*")) +Return that buffer. + +If PROPERTIES is non-nil, PROPERTIES are applied to the buffer, +see `set-text-properties'. If PROPERTIES equals t, this means to +apply the face `mm-uu-extract'." + (let ((obuf (current-buffer)) + (coding-system + ;; Might not exist in non-MULE XEmacs + (when (boundp 'buffer-file-coding-system) + buffer-file-coding-system))) + (with-current-buffer (generate-new-buffer " *mm-uu*") (setq buffer-file-coding-system coding-system) (insert-buffer-substring obuf from to) + (cond ((eq properties t) + (set-text-properties (point-min) (point-max) + '(face mm-uu-extract))) + (properties + (set-text-properties (point-min) (point-max) properties))) (current-buffer)))) (defun mm-uu-configure-p (key val) (member (cons key val) mm-uu-configure-list)) (defun mm-uu-configure (&optional symbol value) + "Configure detection of non-MIME attachments." + (interactive) (if symbol (set-default symbol value)) (setq mm-uu-beginning-regexp nil) (mapcar (lambda (entry) @@ -253,9 +339,38 @@ Return that buffer." (mm-make-handle (mm-uu-copy-to-buffer start-point end-point) '("application/postscript"))) +(defun mm-uu-verbatim-marks-extract (start-offset end-offset + &optional + start-hide + end-hide) + (let ((start (or (and mm-uu-hide-markers + start-hide) + start-offset + 1)) + (end (or (and mm-uu-hide-markers + end-hide) + end-offset + -1))) + (mm-make-handle + (mm-uu-copy-to-buffer + (progn (goto-char start-point) + (forward-line start) + (point)) + (progn (goto-char end-point) + (forward-line end) + (point)) + t) + '("text/x-verbatim" (charset . gnus-decoded))))) + +(defun mm-uu-latex-extract () + (mm-make-handle + (mm-uu-copy-to-buffer start-point end-point t) + ;; application/x-tex? + '("text/x-verbatim" (charset . gnus-decoded)))) + (defun mm-uu-emacs-sources-extract () (mm-make-handle (mm-uu-copy-to-buffer start-point end-point) - '("application/emacs-lisp") + '("application/emacs-lisp" (charset . gnus-decoded)) nil nil (list mm-dissect-disposition (cons 'filename file-name)))) @@ -271,13 +386,18 @@ Return that buffer." (defun mm-uu-diff-extract () (mm-make-handle (mm-uu-copy-to-buffer start-point end-point) - '("text/x-patch"))) + '("text/x-patch" (charset . gnus-decoded)))) (defun mm-uu-diff-test () (and gnus-newsgroup-name mm-uu-diff-groups-regexp (string-match mm-uu-diff-groups-regexp gnus-newsgroup-name))) +(defun mm-uu-latex-test () + (and gnus-newsgroup-name + mm-uu-tex-groups-regexp + (string-match mm-uu-tex-groups-regexp gnus-newsgroup-name))) + (defun mm-uu-forward-extract () (mm-make-handle (mm-uu-copy-to-buffer (progn (goto-char start-point) (forward-line) (point)) @@ -453,7 +573,8 @@ value of `mm-uu-text-plain-type'." (t (goto-char (point-max)))) (setq text-start (point)) (while (re-search-forward mm-uu-beginning-regexp nil t) - (setq start-point (match-beginning 0)) + (setq start-point (match-beginning 0) + entry nil) (let ((alist mm-uu-type-alist) (beginning-regexp (match-string 0))) (while (not entry) @@ -498,24 +619,67 @@ value of `mm-uu-text-plain-type'." (setq result (cons "multipart/mixed" (nreverse result)))) result))) -(defun mm-uu-dissect-text-parts (handle) - "Dissect text parts and put uu handles into HANDLE." - (let ((buffer (mm-handle-buffer handle)) - type children) +;;;###autoload +(defun mm-uu-dissect-text-parts (handle &optional decoded) + "Dissect text parts and put uu handles into HANDLE. +Assume text has been decoded if DECODED is non-nil." + (let ((buffer (mm-handle-buffer handle))) (cond ((stringp buffer) - (mapc 'mm-uu-dissect-text-parts (cdr handle))) + (dolist (elem (cdr handle)) + (mm-uu-dissect-text-parts elem decoded))) ((bufferp buffer) - (when (and (setq type (mm-handle-media-type handle)) - (stringp type) - (string-match "\\`text/" type) - (with-current-buffer buffer - (setq children - (mm-uu-dissect t (mm-handle-type handle))))) - (kill-buffer buffer) - (setcar handle (car children)) - (setcdr handle (cdr children)))) + (let ((type (mm-handle-media-type handle)) + (case-fold-search t) ;; string-match + children charset encoding) + (when (and + (stringp type) + ;; Mutt still uses application/pgp even though + ;; it has already been withdrawn. + (string-match "\\`text/\\|\\`application/pgp\\'" type) + (setq + children + (with-current-buffer buffer + (cond + ((or decoded + (eq (setq charset (mail-content-type-get + (mm-handle-type handle) + 'charset)) + 'gnus-decoded)) + (setq decoded t) + (mm-uu-dissect + t (cons type '((charset . gnus-decoded))))) + (charset + (setq decoded t) + (mm-with-multibyte-buffer + (insert (mm-decode-string (mm-get-part handle) + charset)) + (mm-uu-dissect + t (cons type '((charset . gnus-decoded)))))) + ((setq encoding (mm-handle-encoding handle)) + (setq decoded nil) + ;; Inherit the multibyteness of the `buffer'. + (with-temp-buffer + (insert-buffer-substring buffer) + (mm-decode-content-transfer-encoding + encoding type) + (mm-uu-dissect t (list type)))) + (t + (setq decoded nil) + (mm-uu-dissect t (list type))))))) + ;; Ignore it if a given part is dissected into a single + ;; part of which the type is the same as the given one. + (if (and (<= (length children) 2) + (string-equal (mm-handle-media-type (cadr children)) + type)) + (kill-buffer (mm-handle-buffer (cadr children))) + (kill-buffer buffer) + (setcdr handle (cdr children)) + (setcar handle (car children)) ;; "multipart/mixed" + (dolist (elem (cdr children)) + (mm-uu-dissect-text-parts elem decoded)))))) (t - (mapc 'mm-uu-dissect-text-parts handle))))) + (dolist (elem handle) + (mm-uu-dissect-text-parts elem decoded)))))) (provide 'mm-uu) diff --git a/lisp/mm-view.el b/lisp/mm-view.el index f3e2f79..70868c4 100644 --- a/lisp/mm-view.el +++ b/lisp/mm-view.el @@ -1,6 +1,7 @@ ;;; mm-view.el --- functions for viewing MIME objects -;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; This file is part of GNU Emacs. @@ -17,8 +18,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -37,11 +38,18 @@ (autoload 'fill-flowed "flow-fill") (autoload 'html2text "html2text")) +(defvar gnus-article-mime-handles) +(defvar gnus-newsgroup-charset) +(defvar smime-keys) +(defvar w3m-cid-retrieve-function-alist) +(defvar w3m-current-buffer) +(defvar w3m-display-inline-images) +(defvar w3m-minor-mode-map) + (defvar mm-text-html-renderer-alist '((w3 . mm-inline-text-html-render-with-w3) (w3m . mm-inline-text-html-render-with-w3m) - (w3m-standalone mm-inline-render-with-stdin nil - "w3m" "-dump" "-T" "text/html") + (w3m-standalone . mm-inline-text-html-render-with-w3m-standalone) (links mm-inline-render-with-file mm-links-remove-leading-blank "links" "-dump" file) @@ -53,8 +61,7 @@ (defvar mm-text-html-washer-alist '((w3 . gnus-article-wash-html-with-w3) (w3m . gnus-article-wash-html-with-w3m) - (w3m-standalone mm-inline-wash-with-stdin nil - "w3m" "-dump" "-T" "text/html") + (w3m-standalone . gnus-article-wash-html-with-w3m-standalone) (links mm-inline-wash-with-file mm-links-remove-leading-blank "links" "-dump" file) @@ -66,6 +73,7 @@ (defcustom mm-fill-flowed t "If non-nil a format=flowed article will be displayed flowed." :type 'boolean + :version "22.1" :group 'mime-display) ;;; Internal variables. @@ -203,21 +211,25 @@ (defun mm-w3m-cid-retrieve-1 (url handle) (dolist (elem handle) - (when (listp elem) - (if (equal url (mm-handle-id elem)) - (progn - (mm-insert-part elem) - (throw 'found-handle (mm-handle-media-type elem)))) - (if (equal "multipart" (mm-handle-media-supertype elem)) - (mm-w3m-cid-retrieve-1 url elem))))) + (when (consp elem) + (when (equal url (mm-handle-id elem)) + (mm-insert-part elem) + (throw 'found-handle (mm-handle-media-type elem))) + (when (and (stringp (car elem)) + (equal "multipart" (mm-handle-media-supertype elem))) + (mm-w3m-cid-retrieve-1 url elem))))) (defun mm-w3m-cid-retrieve (url &rest args) "Insert a content pointed by URL if it has the cid: scheme." (when (string-match "\\`cid:" url) - (catch 'found-handle - (mm-w3m-cid-retrieve-1 (concat "<" (substring url (match-end 0)) ">") - (with-current-buffer w3m-current-buffer - gnus-article-mime-handles))))) + (or (catch 'found-handle + (mm-w3m-cid-retrieve-1 + (setq url (concat "<" (substring url (match-end 0)) ">")) + (with-current-buffer w3m-current-buffer + gnus-article-mime-handles))) + (prog1 + nil + (message "Failed to find \"Content-ID: %s\"" url))))) (defun mm-inline-text-html-render-with-w3m (handle) "Render a text/html part using emacs-w3m." @@ -244,19 +256,71 @@ (point-min) (point-max) (list 'keymap w3m-minor-mode-map ;; Put the mark meaning this part was rendered by emacs-w3m. - 'mm-inline-text-html-with-w3m t)))) - (mm-handle-set-undisplayer - handle - `(lambda () - (let (buffer-read-only) - (if (functionp 'remove-specifier) - (mapcar (lambda (prop) - (remove-specifier - (face-property 'default prop) - (current-buffer))) - '(background background-pixmap foreground))) - (delete-region ,(point-min-marker) - ,(point-max-marker)))))))) + 'mm-inline-text-html-with-w3m t))) + (mm-handle-set-undisplayer + handle + `(lambda () + (let (buffer-read-only) + (if (functionp 'remove-specifier) + (mapcar (lambda (prop) + (remove-specifier + (face-property 'default prop) + (current-buffer))) + '(background background-pixmap foreground))) + (delete-region ,(point-min-marker) + ,(point-max-marker))))))))) + +(defvar mm-w3m-standalone-supports-m17n-p (if (featurep 'mule) 'undecided) + "*T means the w3m command supports the m17n feature.") + +(defun mm-w3m-standalone-supports-m17n-p () + "Say whether the w3m command supports the m17n feature." + (cond ((eq mm-w3m-standalone-supports-m17n-p t) t) + ((eq mm-w3m-standalone-supports-m17n-p nil) nil) + ((not (featurep 'mule)) (setq mm-w3m-standalone-supports-m17n-p nil)) + ((condition-case nil + (let ((coding-system-for-write 'iso-2022-jp) + (coding-system-for-read 'iso-2022-jp) + (str (mm-decode-coding-string "\ +\e$B#D#o#e#s!!#w#3#m!!#s#u#p#p#o#r#t#s!!#m#1#7#n!)\e(B" 'iso-2022-jp))) + (mm-with-multibyte-buffer + (insert str) + (call-process-region + (point-min) (point-max) "w3m" t t nil "-dump" + "-T" "text/html" "-I" "iso-2022-jp" "-O" "iso-2022-jp") + (goto-char (point-min)) + (search-forward str nil t))) + (error nil)) + (setq mm-w3m-standalone-supports-m17n-p t)) + (t + ;;(message "You had better upgrade your w3m command") + (setq mm-w3m-standalone-supports-m17n-p nil)))) + +(defun mm-inline-text-html-render-with-w3m-standalone (handle) + "Render a text/html part using w3m." + (if (mm-w3m-standalone-supports-m17n-p) + (let ((source (mm-get-part handle)) + (charset (mail-content-type-get (mm-handle-type handle) 'charset)) + cs) + (unless (and charset + (setq cs (mm-charset-to-coding-system charset)) + (not (eq cs 'ascii))) + ;; The default. + (setq charset "iso-8859-1" + cs 'iso-8859-1)) + (mm-insert-inline + handle + (mm-with-unibyte-buffer + (insert source) + (mm-enable-multibyte) + (let ((coding-system-for-write 'binary) + (coding-system-for-read cs)) + (call-process-region + (point-min) (point-max) + "w3m" t t nil "-dump" "-T" "text/html" + "-I" charset "-O" charset)) + (buffer-string)))) + (mm-inline-render-with-stdin handle nil "w3m" "-dump" "-T" "text/html"))) (defun mm-links-remove-leading-blank () ;; Delete the annoying three spaces preceding each line of links @@ -362,9 +426,9 @@ (goto-char (point-max)))) (save-restriction (narrow-to-region b (point)) - (set-text-properties (point-min) (point-max) nil) (when (or (equal type "enriched") (equal type "richtext")) + (set-text-properties (point-min) (point-max) nil) (ignore-errors (enriched-decode (point-min) (point-max)))) (mm-handle-set-undisplayer @@ -433,7 +497,8 @@ ;; disable prepare hook gnus-article-prepare-hook (gnus-newsgroup-charset - (or charset gnus-newsgroup-charset))) + (unless (eq charset 'gnus-decoded) ;; mm-uu might set it. + (or charset gnus-newsgroup-charset)))) (let ((gnus-original-article-buffer (mm-handle-buffer handle))) (run-hooks 'gnus-article-decode-hook)) (gnus-article-prepare-display) @@ -481,7 +546,8 @@ (buffer-disable-undo) (mm-enable-multibyte) (insert (cond ((eq charset 'gnus-decoded) - (mm-insert-part handle)) + (with-current-buffer (mm-handle-buffer handle) + (buffer-string))) (coding-system (mm-decode-coding-string text coding-system)) (charset @@ -489,14 +555,16 @@ (t text))) (require 'font-lock) - ;; Inhibit font-lock this time (*-mode-hook might run - ;; `turn-on-font-lock') so that jit-lock may not turn off - ;; font-lock immediately after this. - (let ((font-lock-mode t)) - (funcall mode)) - (let ((font-lock-verbose nil)) - ;; I find font-lock a bit too verbose. - (font-lock-fontify-buffer)) + (let ((font-lock-maximum-size nil) + ;; Disable support modes, e.g., jit-lock, lazy-lock, etc. + (font-lock-mode-hook nil) + (font-lock-support-mode nil) + ;; I find font-lock a bit too verbose. + (font-lock-verbose nil)) + (funcall mode) + ;; The mode function might have already turned on font-lock. + (unless (symbol-value 'font-lock-mode) + (font-lock-fontify-buffer))) ;; By default, XEmacs font-lock uses non-duplicable text ;; properties. This code forces all the text properties ;; to be copied along with the text. @@ -560,19 +628,24 @@ (otherwise (error "Unknown or unimplemented PKCS#7 type")))) (defun mm-view-pkcs7-verify (handle) - ;; A bogus implementation of PKCS#7. FIXME:: - (mm-insert-part handle) - (goto-char (point-min)) - (if (search-forward "Content-Type: " nil t) - (delete-region (point-min) (match-beginning 0))) - (goto-char (point-max)) - (if (re-search-backward "--\r?\n?" nil t) - (delete-region (match-end 0) (point-max))) + (let ((verified nil)) + (with-temp-buffer + (insert "MIME-Version: 1.0\n") + (mm-insert-headers "application/pkcs7-mime" "base64" "smime.p7m") + (insert-buffer-substring (mm-handle-buffer handle)) + (setq verified (smime-verify-region (point-min) (point-max)))) + (goto-char (point-min)) + (mm-insert-part handle) + (if (search-forward "Content-Type: " nil t) + (delete-region (point-min) (match-beginning 0))) + (goto-char (point-max)) + (if (re-search-backward "--\r?\n?" nil t) + (delete-region (match-end 0) (point-max))) + (unless verified + (insert-buffer-substring smime-details-buffer))) (goto-char (point-min)) (while (search-forward "\r\n" nil t) (replace-match "\n")) - (message "Verify signed PKCS#7 message is unimplemented.") - (sit-for 1) t) (defun mm-view-pkcs7-decrypt (handle) @@ -586,9 +659,9 @@ (cadar smime-keys) (smime-get-key-by-email (completing-read - (concat "Decipher using which key? " - (if smime-keys (concat "(default " (caar smime-keys) ") ") - "")) + (concat "Decipher using key" + (if smime-keys (concat "(default " (caar smime-keys) "): ") + ": ")) smime-keys nil nil nil nil (car-safe (car-safe smime-keys)))))) (goto-char (point-min)) (while (search-forward "\r\n" nil t) diff --git a/lisp/mmgnus.el b/lisp/mmgnus.el index d5ad15f..e38bd28 100644 --- a/lisp/mmgnus.el +++ b/lisp/mmgnus.el @@ -19,8 +19,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Code: diff --git a/lisp/mml-sec.el b/lisp/mml-sec.el index bbb08ba..9edf6bd 100644 --- a/lisp/mml-sec.el +++ b/lisp/mml-sec.el @@ -1,5 +1,7 @@ ;;; mml-sec.el --- A package with security functions for MML documents -;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Simon Josefsson @@ -17,8 +19,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -186,6 +188,29 @@ You can also customize or set `mml-signencrypt-style-alist' instead." (cons method tags)))) (t (error "The message is corrupted. No mail header separator")))))) +(defvar mml-secure-method + (if (equal mml-default-encrypt-method mml-default-sign-method) + mml-default-sign-method + "pgpmime") + "Current security method. Internal variable.") + +(defun mml-secure-sign (&optional method) + "Add MML tags to sign this MML part. +Use METHOD if given. Else use `mml-secure-method' or +`mml-default-sign-method'." + (interactive) + (mml-secure-part + (or method mml-secure-method mml-default-sign-method) + 'sign)) + +(defun mml-secure-encrypt (&optional method) + "Add MML tags to encrypt this MML part. +Use METHOD if given. Else use `mml-secure-method' or +`mml-default-sign-method'." + (interactive) + (mml-secure-part + (or method mml-secure-method mml-default-sign-method))) + (defun mml-secure-sign-pgp () "Add MML tags to PGP sign this MML part." (interactive) @@ -254,6 +279,34 @@ You can also customize or set `mml-signencrypt-style-alist' instead." (when (re-search-backward "^<#secure.*>\n" nil t) (delete-region (match-beginning 0) (match-end 0))))) + +(defun mml-secure-message-sign (&optional method) + "Add MML tags to sign this MML part. +Use METHOD if given. Else use `mml-secure-method' or +`mml-default-sign-method'." + (interactive) + (mml-secure-part + (or method mml-secure-method mml-default-sign-method) + 'sign)) + +(defun mml-secure-message-sign-encrypt (&optional method) + "Add MML tag to sign and encrypt the entire message. +Use METHOD if given. Else use `mml-secure-method' or +`mml-default-sign-method'." + (interactive) + (mml-secure-message + (or method mml-secure-method mml-default-sign-method) + 'signencrypt)) + +(defun mml-secure-message-encrypt (&optional method) + "Add MML tag to encrypt the entire message. +Use METHOD if given. Else use `mml-secure-method' or +`mml-default-sign-method'." + (interactive) + (mml-secure-message + (or method mml-secure-method mml-default-sign-method) + 'encrypt)) + (defun mml-secure-message-sign-smime () "Add MML tag to encrypt/sign the entire message." (interactive) diff --git a/lisp/mml-smime.el b/lisp/mml-smime.el index 760951d..8ab978e 100644 --- a/lisp/mml-smime.el +++ b/lisp/mml-smime.el @@ -1,5 +1,7 @@ ;;; mml-smime.el --- S/MIME support for MML -;; Copyright (c) 2000, 2001, 2003, 2005 Free Software Foundation, Inc. + +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Simon Josefsson ;; Keywords: Gnus, MIME, S/MIME, MML @@ -18,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -55,7 +57,7 @@ (if (not (and (not (file-exists-p tmp)) (get-buffer tmp))) (push tmp certfiles) - (setq file (mm-make-temp-file (expand-file-name "mml." + (setq file (mm-make-temp-file (expand-file-name "mml." mm-tmp-directory))) (with-current-buffer tmp (write-region (point-min) (point-max) file)) @@ -80,7 +82,10 @@ (list 'keyfile (if (= (length smime-keys) 1) (cadar smime-keys) - (or (let ((from (cadr (funcall gnus-extract-address-components + (or (let ((from (cadr (funcall (if (boundp + 'gnus-extract-address-components) + gnus-extract-address-components + 'mail-extract-address-components) (or (save-excursion (save-restriction (message-narrow-to-headers) @@ -106,7 +111,10 @@ (while (not result) (setq who (read-from-minibuffer (format "%sLookup certificate for: " (or bad "")) - (cadr (funcall gnus-extract-address-components + (cadr (funcall (if (boundp + 'gnus-extract-address-components) + gnus-extract-address-components + 'mail-extract-address-components) (or (save-excursion (save-restriction (message-narrow-to-headers) @@ -138,7 +146,6 @@ result)) (defun mml-smime-encrypt-query () - ;; todo: add ldap support (xemacs ldap api?) ;; todo: try dns/ldap automatically first, before prompting user (let (certs done) (while (not done) diff --git a/lisp/mml.el b/lisp/mml.el index b4e0ca3..359e33b 100644 --- a/lisp/mml.el +++ b/lisp/mml.el @@ -1,6 +1,7 @@ ;;; mml.el --- A package for parsing and validating MML documents -;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; This file is part of GNU Emacs. @@ -17,8 +18,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -37,12 +38,23 @@ (autoload 'gnus-make-local-hook "gnus-util") (autoload 'message-fetch-field "message") (autoload 'message-mark-active-p "message") + (autoload 'message-info "message") (autoload 'fill-flowed-encode "flow-fill") (autoload 'message-posting-charset "message")) (eval-when-compile (autoload 'dnd-get-local-file-name "dnd")) +(defvar gnus-article-mime-handles) +(defvar gnus-mouse-2) +(defvar gnus-newsrc-hashtb) +(defvar message-default-charset) +(defvar message-deletable-headers) +(defvar message-options) +(defvar message-posting-charset) +(defvar message-required-mail-headers) +(defvar message-required-news-headers) + (defcustom mml-content-type-parameters '(name access-type expiration size permission format) "*A list of acceptable parameters in MML tag. @@ -126,7 +138,13 @@ 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-default-type "text/plain") +(defvar mml-generate-default-type "text/plain" + "Content type by which the Content-Type header can be omitted. +The Content-Type header will not be put in the MIME part if the type +equals the value and there's no parameter (e.g. charset, format, etc.) +and `mml-insert-mime-headers-always' is nil. The value will be bound +to \"message/rfc822\" when encoding an article to be forwarded as a MIME +part. This is for the internal use, you should never modify the value.") (defvar mml-buffer-list nil) @@ -404,11 +422,16 @@ If MML is non-nil, return the buffer up till the correspondent mml tag." (mml-tweak-part cont) (cond ((or (eq (car cont) 'part) (eq (car cont) 'mml)) - (let ((raw (cdr (assq 'raw cont))) - type charset coding filename encoding flowed coded) - (setq type (or (cdr (assq 'type cont)) "text/plain") - charset (cdr (assq 'charset cont)) - coding (mm-charset-to-coding-system charset)) + (let* ((raw (cdr (assq 'raw cont))) + (filename (cdr (assq 'filename cont))) + (type (or (cdr (assq 'type cont)) + (if filename + (or (mm-default-file-encoding filename) + "application/octet-stream") + "text/plain"))) + (charset (cdr (assq 'charset cont))) + (coding (mm-charset-to-coding-system charset)) + encoding flowed coded) (cond ((eq coding 'ascii) (setq charset nil coding nil)) @@ -421,7 +444,7 @@ If MML is non-nil, return the buffer up till the correspondent mml tag." (cond ((cdr (assq 'buffer cont)) (insert-buffer-substring (cdr (assq 'buffer cont)))) - ((and (setq filename (cdr (assq 'filename cont))) + ((and filename (not (equal (cdr (assq 'nofile cont)) "yes"))) (let ((coding-system-for-read coding)) (mm-insert-file-contents filename))) @@ -441,6 +464,10 @@ If MML is non-nil, return the buffer up till the correspondent mml tag." (cond ((eq (car cont) 'mml) (let ((mml-boundary (mml-compute-boundary cont)) + ;; It is necessary for the case where this + ;; function is called recursively since + ;; `m-g-d-t' will be bound to "message/rfc822" + ;; when encoding an article to be forwarded. (mml-generate-default-type "text/plain")) (mml-to-mime)) (let ((mm-7bit-chars (concat mm-7bit-chars "\x1b"))) @@ -482,7 +509,7 @@ If MML is non-nil, return the buffer up till the correspondent mml tag." (insert (with-current-buffer (cdr (assq 'buffer cont)) (mm-with-unibyte-current-buffer (buffer-string))))) - ((and (setq filename (cdr (assq 'filename cont))) + ((and filename (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)) @@ -491,7 +518,15 @@ If MML is non-nil, return the buffer up till the correspondent mml tag." (mm-find-buffer-file-coding-system filename))))) (t - (insert (cdr (assq 'contents cont))))) + (let ((contents (cdr (assq 'contents cont)))) + (if (if (featurep 'xemacs) + (string-match "[^\000-\377]" contents) + (mm-multibyte-string-p contents)) + (progn + (mm-enable-multibyte) + (insert contents) + (setq charset (mm-encode-body charset))) + (insert contents))))) (setq encoding (mm-encode-buffer type) coded (mm-string-as-multibyte (buffer-string)))) (mml-insert-mime-headers cont type charset encoding nil) @@ -527,15 +562,21 @@ If MML is non-nil, return the buffer up till the correspondent mml tag." "access-type=url")) (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")) + cont '(expiration size permission))) + (insert "\n\n") + (insert "Content-Type: " + (or (cdr (assq 'type cont)) + (if name + (or (mm-default-file-encoding name) + "application/octet-stream") + "text/plain")) + "\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") @@ -556,7 +597,8 @@ If MML is non-nil, return the buffer up till the correspondent mml tag." ;; Skip `multipart' and attributes. (when (and (consp part) (consp (cdr part))) (insert "\n--" mml-boundary "\n") - (mml-generate-mime-1 part)))) + (mml-generate-mime-1 part) + (goto-char (point-max))))) (insert "\n--" mml-boundary "--\n"))))) (t (error "Invalid element: %S" cont))) @@ -641,10 +683,10 @@ If MML is non-nil, return the buffer up till the correspondent mml tag." "Can't encode a part with several charsets")) (insert "Content-Type: " type) (when charset - (insert "; " (mail-header-encode-parameter - "charset" (symbol-name charset)))) + (mml-insert-parameter + (mail-header-encode-parameter "charset" (symbol-name charset)))) (when flowed - (insert "; format=flowed")) + (mml-insert-parameter "format=flowed")) (when parameters (mml-insert-parameter-string cont mml-content-type-parameters)) @@ -664,8 +706,11 @@ If MML is non-nil, return the buffer up till the correspondent mml tag." (unless (eq encoding '7bit) (insert (format "Content-Transfer-Encoding: %s\n" encoding))) (when (setq description (cdr (assq 'description cont))) - (insert "Content-Description: " - (mail-encode-encoded-word-string description) "\n")))) + (insert "Content-Description: ") + (setq description (prog1 + (point) + (insert description "\n"))) + (mail-encode-encoded-word-region description (point))))) (defun mml-parameter-string (cont types) (let ((string "") @@ -759,7 +804,7 @@ If HANDLES is non-nil, use it instead reparsing the buffer." (unless (setq textp (equal (mm-handle-media-supertype handle) "text")) (save-excursion (set-buffer (setq buffer (mml-generate-new-buffer " *mml*"))) - (mm-insert-part handle) + (mm-insert-part handle 'no-cache) (if (setq mmlp (equal (mm-handle-media-type handle) "message/rfc822")) (mime-to-mml))))) @@ -818,14 +863,20 @@ If HANDLES is non-nil, use it instead reparsing the buffer." (defun mml-insert-parameter (&rest parameters) "Insert PARAMETERS in a nice way." - (dolist (param parameters) - (insert ";") - (let ((point (point))) + (let (start end) + (dolist (param parameters) + (insert ";") + (setq start (point)) (insert " " param) - (when (> (current-column) 71) - (goto-char point) - (insert "\n") - (end-of-line))))) + (setq end (point)) + (goto-char start) + (end-of-line) + (if (> (current-column) 76) + (progn + (goto-char start) + (insert "\n") + (goto-char (1+ end))) + (goto-char end))))) ;;; ;;; Mode for inserting and editing MML forms @@ -838,6 +889,11 @@ If HANDLES is non-nil, use it instead reparsing the buffer." (encryptpart (make-sparse-keymap)) (map (make-sparse-keymap)) (main (make-sparse-keymap))) + (define-key map "\C-s" 'mml-secure-message-sign) + (define-key map "\C-c" 'mml-secure-message-encrypt) + (define-key map "\C-e" 'mml-secure-message-sign-encrypt) + (define-key map "\C-p\C-s" 'mml-secure-sign) + (define-key map "\C-p\C-c" 'mml-secure-encrypt) (define-key sign "p" 'mml-secure-message-sign-pgpmime) (define-key sign "o" 'mml-secure-message-sign-pgp) (define-key sign "s" 'mml-secure-message-sign-smime) @@ -875,31 +931,63 @@ If HANDLES is non-nil, use it instead reparsing the buffer." ["Attach File..." mml-attach-file ,@(if (featurep 'xemacs) '(t) '(:help "Attach a file at point"))] - ["Attach Buffer..." mml-attach-buffer t] - ["Attach External..." mml-attach-external t] - ["Insert Part..." mml-insert-part t] - ["Insert Multipart..." mml-insert-multipart t] - ["PGP/MIME Sign" mml-secure-message-sign-pgpmime t] - ["PGP/MIME Encrypt" mml-secure-message-encrypt-pgpmime t] - ["PGP Sign" mml-secure-message-sign-pgp t] - ["PGP Encrypt" mml-secure-message-encrypt-pgp t] - ["S/MIME Sign" mml-secure-message-sign-smime t] - ["S/MIME Encrypt" mml-secure-message-encrypt-smime t] - ("Secure MIME part" - ["PGP/MIME Sign Part" mml-secure-sign-pgpmime t] - ["PGP/MIME Encrypt Part" mml-secure-encrypt-pgpmime t] - ["PGP Sign Part" mml-secure-sign-pgp t] - ["PGP Encrypt Part" mml-secure-encrypt-pgp t] - ["S/MIME Sign Part" mml-secure-sign-smime t] - ["S/MIME Encrypt Part" mml-secure-encrypt-smime t]) - ["Encrypt/Sign off" mml-unsecure-message t] + ["Attach Buffer..." mml-attach-buffer + ,@(if (featurep 'xemacs) '(t) + '(:help "Attach a buffer to the outgoing MIME message"))] + ["Attach External..." mml-attach-external + ,@(if (featurep 'xemacs) '(t) + '(:help "Attach reference to file"))] + ;; + ("Change Security Method" + ["PGP/MIME" + (lambda () (interactive) (setq mml-secure-method "pgpmime")) + ,@(if (featurep 'xemacs) nil + '(:help "Set Security Method to PGP/MIME")) + :style radio + :selected (equal mml-secure-method "pgpmime") ] + ["S/MIME" + (lambda () (interactive) (setq mml-secure-method "smime")) + ,@(if (featurep 'xemacs) nil + '(:help "Set Security Method to S/MIME")) + :style radio + :selected (equal mml-secure-method "smime") ] + ["Inline PGP" + (lambda () (interactive) (setq mml-secure-method "pgp")) + ,@(if (featurep 'xemacs) nil + '(:help "Set Security Method to inline PGP")) + :style radio + :selected (equal mml-secure-method "pgp") ] ) + ;; + ["Sign Message" mml-secure-message-sign t] + ["Encrypt Message" mml-secure-message-encrypt t] + ["Sign and Encrypt Message" mml-secure-message-sign-encrypt t] + ["Encrypt/Sign off" mml-unsecure-message + ,@(if (featurep 'xemacs) '(t) + '(:help "Don't Encrypt/Sign Message"))] + ;; Maybe we could remove these, because people who write MML most probably + ;; don't use the menu: + ["Insert Part..." mml-insert-part + :active (message-in-body-p)] + ["Insert Multipart..." mml-insert-multipart + :active (message-in-body-p)] + ;; + ;; Do we have separate encrypt and encrypt/sign commands for parts? + ["Sign Part" mml-secure-sign t] + ["Encrypt Part" mml-secure-encrypt t] ;;["Narrow" mml-narrow-to-part t] - ["Quote MML" mml-quote-region + ["Quote MML in region" mml-quote-region :active (message-mark-active-p) ,@(if (featurep 'xemacs) nil '(:help "Quote MML tags in region"))] ["Validate MML" mml-validate t] - ["Preview" mml-preview t])) + ["Preview" mml-preview t] + "----" + ["Emacs MIME manual" (lambda () (interactive) (message-info 4)) + ,@(if (featurep 'xemacs) '(t) + '(:help "Display the Emacs MIME manual"))] + ["PGG manual" (lambda () (interactive) (message-info 16)) + ,@(if (featurep 'xemacs) '(t) + '(:help "Display the PGG manual"))])) (defvar mml-mode nil "Minor mode for editing MML.") @@ -918,9 +1006,8 @@ See Info node `(emacs-mime)Composing'. (easy-menu-add mml-menu mml-mode-map) (when (boundp 'dnd-protocol-alist) (set (make-local-variable 'dnd-protocol-alist) - '(("^file:///" . mml-dnd-attach-file) - ("^file://" . dnd-open-file) - ("^file:" . mml-dnd-attach-file)))) + (append mml-dnd-protocol-alist + (symbol-value 'dnd-protocol-alist)))) (run-hooks 'mml-mode-hook))) ;;; @@ -963,13 +1050,15 @@ See Info node `(emacs-mime)Composing'. description)) (defun mml-minibuffer-read-disposition (type &optional default) - (let* ((default (or default - (if (string-match "^text/.*" type) - "inline" - "attachment"))) - (disposition (completing-read "Disposition: " - '(("attachment") ("inline") ("")) - nil t))) + (unless default (setq default + (if (and (string-match "\\`text/" type) + (not (string-match "\\`text/rtf\\'" type))) + "inline" + "attachment"))) + (let ((disposition (completing-read + (format "Disposition (default %s): " default) + '(("attachment") ("inline") ("")) + nil t nil nil default))) (if (not (equal disposition "")) disposition default))) @@ -1016,33 +1105,83 @@ See Info node `(emacs-mime)Composing'. ;;; Attachment functions. +(defcustom mml-dnd-protocol-alist + '(("^file:///" . mml-dnd-attach-file) + ("^file://" . dnd-open-file) + ("^file:" . mml-dnd-attach-file)) + "The functions to call when a drop in `mml-mode' is made. +See `dnd-protocol-alist' for more information. When nil, behave +as in other buffers." + :type '(choice (repeat (cons (regexp) (function))) + (const :tag "Behave as in other buffers" nil)) + :version "23.0" ;; No Gnus + :group 'message) + +(defcustom mml-dnd-attach-options nil + "Which options should be queried when attaching a file via drag and drop. + +If it is a list, valid members are `type', `description' and +`disposition'. `disposition' implies `type'. If it is nil, +don't ask for options. If it is t, ask the user whether or not +to specify options." + :type '(choice + (const :tag "Non" nil) + (const :tag "Query" t) + (list :value (type description disposition) + (set :inline t + (const type) + (const description) + (const disposition)))) + :version "23.0" ;; No Gnus + :group 'message) + (defun mml-attach-file (file &optional type description disposition) "Attach a file to the outgoing MIME message. The file is not inserted or encoded until you send the message with `\\[message-send-and-exit]' or `\\[message-send]'. -FILE is the name of the file to attach. TYPE is its content-type, a -string of the form \"type/subtype\". DESCRIPTION is a one-line -description of the attachment." +FILE is the name of the file to attach. TYPE is its +content-type, a string of the form \"type/subtype\". DESCRIPTION +is a one-line description of the attachment. The DISPOSITION +specifies how the attachment is intended to be displayed. It can +be either \"inline\" (displayed automatically within the message +body) or \"attachment\" (separate from the body)." (interactive (let* ((file (mml-minibuffer-read-file "Attach file: ")) (type (mml-minibuffer-read-type file)) (description (mml-minibuffer-read-description)) (disposition (mml-minibuffer-read-disposition type))) (list file type description disposition))) - (mml-insert-empty-tag 'part - 'type type - 'filename file - 'disposition (or disposition "attachment") - 'description description)) + (save-excursion + (unless (message-in-body-p) (goto-char (point-max))) + (mml-insert-empty-tag 'part + 'type type + 'filename file + 'disposition (or disposition "attachment") + 'description description))) (defun mml-dnd-attach-file (uri action) - "Attach a drag and drop file." + "Attach a drag and drop file. + +Ask for type, description or disposition according to +`mml-dnd-attach-options'." (let ((file (dnd-get-local-file-name uri t))) (when (and file (file-regular-p file)) - (let* ((type (mml-minibuffer-read-type file)) - (description (mml-minibuffer-read-description)) - (disposition (mml-minibuffer-read-disposition type))) + (let ((mml-dnd-attach-options mml-dnd-attach-options) + type description disposition) + (setq mml-dnd-attach-options + (when (and (eq mml-dnd-attach-options t) + (not + (y-or-n-p + "Use default type, disposition and description? "))) + '(type description disposition))) + (when (or (memq 'type mml-dnd-attach-options) + (memq 'disposition mml-dnd-attach-options)) + (setq type (mml-minibuffer-read-type file))) + (when (memq 'description mml-dnd-attach-options) + (setq description (mml-minibuffer-read-description))) + (when (memq 'disposition mml-dnd-attach-options) + (setq disposition (mml-minibuffer-read-disposition type))) (mml-attach-file file type description disposition))))) (defun mml-attach-buffer (buffer &optional type description) @@ -1053,8 +1192,11 @@ See `mml-attach-file' for details of operation." (type (mml-minibuffer-read-type buffer "text/plain")) (description (mml-minibuffer-read-description))) (list buffer type description))) - (mml-insert-empty-tag 'part 'type type 'buffer buffer - 'disposition "attachment" 'description description)) + (save-excursion + (unless (message-in-body-p) (goto-char (point-max))) + (mml-insert-empty-tag 'part 'type type 'buffer buffer + 'disposition "attachment" + 'description description))) (defun mml-attach-external (file &optional type description) "Attach an external file into the buffer. @@ -1065,8 +1207,10 @@ TYPE is the MIME type to use." (type (mml-minibuffer-read-type file)) (description (mml-minibuffer-read-description))) (list file type description))) - (mml-insert-empty-tag 'external 'type type 'name file - 'disposition "attachment" 'description description)) + (save-excursion + (unless (message-in-body-p) (goto-char (point-max))) + (mml-insert-empty-tag 'external 'type type 'name file + 'disposition "attachment" 'description description))) (defun mml-insert-multipart (&optional type) (interactive (list (completing-read "Multipart type (default mixed): " @@ -1098,7 +1242,12 @@ Should be adopted if code in `message-send-mail' is changed." (defun mml-preview (&optional raw) "Display current buffer with Gnus, in a new buffer. -If RAW, don't highlight the article." +If RAW, display a raw encoded MIME message. + +The window layout for the preview buffer is controled by the variables +`special-display-buffer-names', `special-display-regexps', or +`gnus-buffer-configuration' (the first match made will be used), +or the `pop-to-buffer' function." (interactive "P") (setq mml-preview-buffer (generate-new-buffer (concat (if raw "*Raw MIME preview of " @@ -1166,8 +1315,11 @@ If RAW, don't highlight the article." (lambda (event) (interactive "@e") (widget-button-press (widget-event-point event) event))) + ;; FIXME: Buffer is in article mode, but most tool bar commands won't + ;; work. Maybe only keep the following icons: search, print, quit (goto-char (point-min)))) - (if (and (boundp 'gnus-buffer-configuration) + (if (and (not (mm-special-display-p (buffer-name mml-preview-buffer))) + (boundp 'gnus-buffer-configuration) (assq 'mml-preview gnus-buffer-configuration)) (let ((gnus-message-buffer (current-buffer))) (gnus-configure-windows 'mml-preview)) diff --git a/lisp/mml1991.el b/lisp/mml1991.el index dbd980b..7007713 100644 --- a/lisp/mml1991.el +++ b/lisp/mml1991.el @@ -1,5 +1,7 @@ ;;; mml1991.el --- Old PGP message format (RFC 1991) support for MML -;; Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. + +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Sascha Ldecke , ;; Simon Josefsson (Mailcrypt interface, Gnus glue) @@ -19,8 +21,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -30,6 +32,8 @@ (require 'cl) (require 'mm-util)) +(defvar mc-pgp-always-sign) + (autoload 'quoted-printable-decode-region "qp") (autoload 'quoted-printable-encode-region "qp") @@ -180,7 +184,7 @@ (delete-region (point-min) (point))) (mm-with-unibyte-current-buffer (with-temp-buffer - (flet ((gpg-encrypt-func + (flet ((gpg-encrypt-func (sign plaintext ciphertext result recipients &optional passphrase sign-with-key armor textmode) (if sign @@ -219,11 +223,14 @@ ;; pgg wrapper -(defvar pgg-output-buffer) -(defvar pgg-errors-buffer) +(eval-when-compile + (defvar pgg-default-user-id) + (defvar pgg-errors-buffer) + (defvar pgg-output-buffer)) (defun mml1991-pgg-sign (cont) - (let (headers cte) + (let ((pgg-text-mode t) + headers cte) ;; Don't sign headers. (goto-char (point-min)) (while (not (looking-at "^$")) @@ -255,7 +262,8 @@ t)) (defun mml1991-pgg-encrypt (cont &optional sign) - (let (cte) + (let ((pgg-text-mode t) + cte) ;; Strip MIME Content[^ ]: headers since it will be ASCII ARMOURED (goto-char (point-min)) (while (looking-at "^Content[^ ]+:") @@ -266,7 +274,7 @@ (delete-region (point-min) (point))) (mm-decode-content-transfer-encoding cte) (unless (pgg-encrypt-region - (point-min) (point-max) + (point-min) (point-max) (split-string (or (message-options-get 'message-recipients) diff --git a/lisp/mml2015.el b/lisp/mml2015.el index fcb70d1..696b0dc 100644 --- a/lisp/mml2015.el +++ b/lisp/mml2015.el @@ -1,5 +1,7 @@ ;;; mml2015.el --- MIME Security with Pretty Good Privacy (PGP) -;; Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. + +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Shenghuo Zhu ;; Keywords: PGP MIME MML @@ -18,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -33,6 +35,8 @@ (require 'mm-util) (require 'mml) +(defvar mc-pgp-always-sign) + (defvar mml2015-use (or (progn (ignore-errors @@ -636,6 +640,7 @@ Valid packages include `pgg', `gpg' and `mailcrypt'.") ;;; pgg wrapper (eval-when-compile + (defvar pgg-default-user-id) (defvar pgg-errors-buffer) (defvar pgg-output-buffer)) @@ -643,7 +648,8 @@ Valid packages include `pgg', `gpg' and `mailcrypt'.") (autoload 'pgg-decrypt-region "pgg") (autoload 'pgg-verify-region "pgg") (autoload 'pgg-sign-region "pgg") - (autoload 'pgg-encrypt-region "pgg")) + (autoload 'pgg-encrypt-region "pgg") + (autoload 'pgg-parse-armor "pgg-parse")) (defun mml2015-pgg-decrypt (handle ctl) (catch 'error @@ -811,15 +817,24 @@ Valid packages include `pgg', `gpg' and `mailcrypt'.") (let ((pgg-errors-buffer mml2015-result-buffer) (boundary (mml-compute-boundary cont)) (pgg-default-user-id (or (message-options-get 'mml-sender) - pgg-default-user-id))) + pgg-default-user-id)) + (pgg-text-mode t) + entry) (unless (pgg-sign-region (point-min) (point-max)) (pop-to-buffer mml2015-result-buffer) (error "Sign error")) (goto-char (point-min)) (insert (format "Content-Type: multipart/signed; boundary=\"%s\";\n" boundary)) - ;;; FIXME: what is the micalg? - (insert "\tmicalg=pgp-sha1; protocol=\"application/pgp-signature\"\n") + (if (setq entry (assq 2 (pgg-parse-armor + (with-current-buffer pgg-output-buffer + (buffer-string))))) + (setq entry (assq 'hash-algorithm (cdr entry)))) + (insert (format "\tmicalg=%s; " + (if (cdr entry) + (downcase (format "pgp-%s" (cdr entry))) + "pgp-sha1"))) + (insert "protocol=\"application/pgp-signature\"\n") (insert (format "\n--%s\n" boundary)) (goto-char (point-max)) (insert (format "\n--%s\n" boundary)) @@ -831,6 +846,7 @@ Valid packages include `pgg', `gpg' and `mailcrypt'.") (defun mml2015-pgg-encrypt (cont &optional sign) (let ((pgg-errors-buffer mml2015-result-buffer) + (pgg-text-mode t) (boundary (mml-compute-boundary cont))) (unless (pgg-encrypt-region (point-min) (point-max) (split-string @@ -865,7 +881,7 @@ Valid packages include `pgg', `gpg' and `mailcrypt'.") (erase-buffer) t) (setq mml2015-result-buffer - (gnus-get-buffer-create "*MML2015 Result*")) + (gnus-get-buffer-create " *MML2015 Result*")) nil)) (defsubst mml2015-clear-decrypt-function () diff --git a/lisp/netrc.el b/lisp/netrc.el index 0d59125..ad90458 100644 --- a/lisp/netrc.el +++ b/lisp/netrc.el @@ -1,6 +1,6 @@ ;;; netrc.el --- .netrc parsing functionality -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 -;; Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Modularizer: Ted Zlatanov @@ -20,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -40,7 +40,8 @@ (autoload 'encrypt-insert-file-contents "encrypt")) (defgroup netrc nil - "Netrc configuration.") + "Netrc configuration." + :group 'comm) (defvar netrc-services-file "/etc/services" "The name of the services file.") diff --git a/lisp/nnagent.el b/lisp/nnagent.el index 11c7fb2..7a61279 100644 --- a/lisp/nnagent.el +++ b/lisp/nnagent.el @@ -1,7 +1,7 @@ ;;; nnagent.el --- offline backend for Gnus -;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 -;; Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news, mail @@ -20,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/nnbabyl.el b/lisp/nnbabyl.el index da4cb9b..a27d321 100644 --- a/lisp/nnbabyl.el +++ b/lisp/nnbabyl.el @@ -1,7 +1,7 @@ ;;; nnbabyl.el --- rmail mbox access for Gnus -;; Copyright (C) 1995, 1996, 1997, 1998, 1099, 2000, 2001 -;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1099, 2000, 2001, 2002, 2003, +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Masanobu UMEDA @@ -21,8 +21,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -491,7 +491,7 @@ (when (re-search-forward "^X-Gnus-Newsgroup: +\\([^:]+\\):\\([0-9]+\\) " nil t) (cons (buffer-substring (match-beginning 1) (match-end 1)) - (string-to-int + (string-to-number (buffer-substring (match-beginning 2) (match-end 2))))))) (defun nnbabyl-insert-lines () diff --git a/lisp/nndb.el b/lisp/nndb.el index dd477a3..98574dd 100644 --- a/lisp/nndb.el +++ b/lisp/nndb.el @@ -1,6 +1,7 @@ ;;; nndb.el --- nndb access for Gnus -;; Copyright (C) 1997, 1998, 2000, 2003, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 2000, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Masanobu UMEDA ;; Kai Grossjohann @@ -22,8 +23,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -50,7 +51,9 @@ ;;- ;; Register nndb with known select methods. -(gnus-declare-backend "nndb" 'mail 'respool 'address 'prompt-address) +(require 'gnus-start) +(unless (assoc "nndb" gnus-valid-select-methods) + (gnus-declare-backend "nndb" 'mail 'respool 'address 'prompt-address)) ;;; Code: @@ -59,14 +62,6 @@ (require 'nntp) (eval-when-compile (require 'cl)) -(eval-and-compile - (autoload 'news-setup "rnewspost") - (autoload 'news-reply-mode "rnewspost") - (autoload 'cancel-timer "timer") - (autoload 'telnet "telnet" nil t) - (autoload 'telnet-send-input "telnet" nil t) - (autoload 'gnus-declare-backend "gnus-start")) - ;; Declare nndb as derived from nntp (nnoo-declare nndb nntp) @@ -201,7 +196,7 @@ article was posted to nndb") ;; otherwise, pull all of the following numbers into the list (re-search-forward "follows\r?\n?" nil t) (while (re-search-forward "^[0-9]+$" nil t) - (push (string-to-int (match-string 0)) list))) + (push (string-to-number (match-string 0)) list))) list)) (defun nndb-request-expire-articles-remote diff --git a/lisp/nndiary.el b/lisp/nndiary.el index bf433ad..a1a0d73 100644 --- a/lisp/nndiary.el +++ b/lisp/nndiary.el @@ -1,7 +1,7 @@ -;;; nndiary.el --- A diary backend for Gnus +;;; nndiary.el --- A diary back end for Gnus -;; Copyright (C) 1999, 2000, 2001, 2003 -;; Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Didier Verna ;; Maintainer: Didier Verna @@ -22,7 +22,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with this program; if not, write to the Free Software -;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +;; MA 02110-1301, USA. ;;; Commentary: @@ -32,127 +33,8 @@ ;; Description: ;; =========== -;; This package implements NNDiary, a diary backend for Gnus. NNDiary is a -;; mail backend, pretty similar to nnml in its functionnning (it has all the -;; features of nnml, actually), but in which messages are treated as event -;; reminders. - -;; Here is a typical scenario: -;; - You've got a date with Andy Mc Dowell or Bruce Willis (select according -;; to your sexual preference) in one month. You don't want to forget it. -;; - Send a (special) diary message to yourself (see below). -;; - Forget all about it and keep on getting and reading new mail, as usual. -;; - From time to time, as you type `g' in the group buffer and as the date -;; is getting closer, the message will pop up again, just like if it were -;; new and unread. -;; - Read your "new" messages, this one included, and start dreaming of the -;; night you're gonna have. -;; - Once the date is over (you actually fell asleep just after dinner), the -;; message will be automatically deleted if it is marked as expirable. - -;; Some more notes on the diary backend: -;; - NNDiary is a *real* mail backend. You *really* send real diary -;; messsages. This means for instance that you can give appointements to -;; anybody (provided they use Gnus and NNDiary) by sending the diary message -;; to them as well. -;; - However, since NNDiary also has a 'request-post method, you can also -;; `C-u a' instead of `C-u m' on a diary group and the message won't actually -;; be sent; just stored in the group. -;; - The events you want to remember need not be punctual. You can set up -;; reminders for regular dates (like once each week, each monday at 13:30 -;; and so on). Diary messages of this kind will never be deleted (unless -;; you do it explicitely). But that, you guessed. - - -;; Usage: -;; ===== - -;; 1/ NNDiary has two modes of operation: traditional (the default) and -;; autonomous. -;; a/ In traditional mode, NNDiary does not get new mail by itself. You -;; have to move mails from your primary mail backend to nndiary -;; groups. -;; b/ In autonomous mode, NNDiary retrieves its own mail and handles it -;; independantly of your primary mail backend. To use NNDiary in -;; autonomous mode, you have several things to do: -;; i/ Put (setq nndiary-get-new-mail t) in your gnusrc file. -;; ii/ Diary messages contain several `X-Diary-*' special headers. -;; You *must* arrange that these messages be split in a private -;; folder *before* Gnus treat them. You need this because Gnus -;; is not able yet to manage multiple backends for mail -;; retrieval. Getting them from a separate source will -;; compensate this misfeature to some extent, as we will see. -;; As an example, here's my procmailrc entry to store diary files -;; in ~/.nndiary (the default nndiary mail source file): -;; -;; :0 HD : -;; * ^X-Diary -;; .nndiary -;; iii/ Customize the variables `nndiary-mail-sources' and -;; `nndiary-split-methods'. These are replacements for the usual -;; mail sources and split methods which, and will be used in -;; autonomous mode. `nndiary-mail-sources' defaults to -;; '(file :path "~/.nndiary"). -;; 2/ Install nndiary somewhere Emacs / Gnus can find it. Normally, you -;; *don't* have to '(require 'nndiary) anywhere. Gnus will do so when -;; appropriate as long as nndiary is somewhere in the load path. -;; 3/ Now, customize the rest of nndiary. In particular, you should -;; customize `nndiary-reminders', the list of times when you want to be -;; reminded of your appointements (e.g. 3 weeks before, then 2 days -;; before, then 1 hour before and that's it). -;; 4/ You *must* use the group timestamp feature of Gnus. This adds a -;; timestamp to each groups' parameters (please refer to the Gnus -;; documentation ("Group Timestamp" info node) to see how it's done. -;; 5/ Once you have done this, you may add a permanent nndiary virtual server -;; (something like '(nndiary "")) to your `gnus-secondary-select-methods'. -;; Yes, this server will be able to retrieve mails and split them when you -;; type `g' in the group buffer, just as if it were your only mail backend. -;; This is the benefit of using a private folder. -;; 6/ Hopefully, almost everything (see the TODO section below) will work as -;; expected when you restart Gnus: in the group buffer, `g' and `M-g' will -;; also get your new diary mails, `F' will find your new diary groups etc. - - -;; How to send diary messages: -;; ========================== - -;; There are 7 special headers in diary messages. These headers are of the -;; form `X-Diary-', the being one of `Minute', `Hour', -;; `Dom', `Month', `Year', `Time-Zone' and `Dow'. `Dom' means "Day of Month", -;; and `dow' means "Day of Week". These headers actually behave like crontab -;; specifications and define the event date(s). - -;; For all headers but the `Time-Zone' one, a header value is either a -;; star (meaning all possible values), or a list of fields (separated by a -;; comma). A field is either an integer, or a range. A range is two integers -;; separated by a dash. Possible integer values are 0-59 for `Minute', 0-23 -;; for `Hour', 1-31 for `Dom', `1-12' for Month, above 1971 for `Year' and 0-6 -;; for `Dow' (0 = sunday). As a special case, a star in either `Dom' or `Dow' -;; doesn't mean "all possible values", but "use only the other field". Note -;; that if both are star'ed, the use of either one gives the same result :-), - -;; The `Time-Zone' header is special in that it can have only one value (you -;; bet ;-). -;; A star doesn't mean "all possible values" (because it has no sense), but -;; "the current local time zone". - -;; As an example, here's how you would say "Each Monday and each 1st of month, -;; at 12:00, 20:00, 21:00, 22:00, 23:00 and 24:00, from 1999 to 2010" (I let -;; you find what to do then): -;; -;; X-Diary-Minute: 0 -;; X-Diary-Hour: 12, 20-24 -;; X-Diary-Dom: 1 -;; X-Diary-Month: * -;; X-Diary-Year: 1999-2010 -;; X-Diary-Dow: 1 -;; X-Diary-Time-Zone: * -;; -;; -;; Sending a diary message is not different from sending any other kind of -;; mail, except that such messages are identified by the presence of these -;; special headers. - +;; nndiary is a mail back end designed to handle mails as diary event +;; reminders. It is now fully documented in the Gnus manual. ;; Bugs / Todo: @@ -160,43 +42,43 @@ ;; * Respooling doesn't work because contrary to the request-scan function, ;; Gnus won't allow me to override the split methods when calling the -;; respooling backend functions. +;; respooling back end functions. ;; * There's a bug in the time zone mechanism with variable TZ locations. ;; * We could allow a keyword like `ask' in X-Diary-* headers, that would mean ;; "ask for value upon reception of the message". ;; * We could add an optional header X-Diary-Reminders to specify a special ;; reminders value for this message. Suggested by Jody Klymak. ;; * We should check messages validity in other circumstances than just -;; moving an article from sonwhere else (request-accept). For instance, when -;; editing / saving and so on. +;; moving an article from somewhere else (request-accept). For instance, +;; when editing / saving and so on. ;; Remarks: ;; ======= -;; * nnoo. -;; NNDiary is very similar to nnml. This makes the idea of using nnoo (to -;; derive nndiary from nnml) natural. However, my experience with nnoo is -;; that for reasonably complex backends like this one, noo is a burden -;; rather than an help. It's tricky to use, not everything can be -;; inherited, what can be inherited and when is not very clear, and you've -;; got to be very careful because a little mistake can fuck up your your -;; other backends, especially because their variables will be use instead of -;; your real ones. Finally, I found it easier to just clone the needed -;; parts of nnml, and tracking nnml updates is not a big deal. +;; * nnoo. NNDiary is very similar to nnml. This makes the idea of using nnoo +;; (to derive nndiary from nnml) natural. However, my experience with nnoo +;; is that for reasonably complex back ends like this one, noo is a burden +;; rather than an help. It's tricky to use, not everything can be inherited, +;; what can be inherited and when is not very clear, and you've got to be +;; very careful because a little mistake can fuck up your other back ends, +;; especially because their variables will be use instead of your real ones. +;; Finally, I found it easier to just clone the needed parts of nnml, and +;; tracking nnml updates is not a big deal. ;; IMHO, nnoo is actually badly designed. A much simpler, and yet more ;; powerful one would be to make *real* functions and variables for a new -;; backend based on another. Lisp is a reflexive language so that's a very +;; back end based on another. Lisp is a reflexive language so that's a very ;; easy thing to do: inspect the function's form, replace occurences of ;; (even in strings) with , and you're done. ;; * nndiary-get-new-mail, nndiary-mail-source and nndiary-split-methods: ;; NNDiary has some experimental parts, in the sense Gnus normally uses only -;; one mail backends for mail retreival and splitting. This backend is also -;; an attempt to make it behave differently. For Gnus developpers: as you -;; can see if you snarf into the code, that was not a very difficult thing -;; to do. Something should be done about the respooling breakage though. +;; one mail back ends for mail retreival and splitting. This back end is +;; also an attempt to make it behave differently. For Gnus developpers: as +;; you can see if you snarf into the code, that was not a very difficult +;; thing to do. Something should be done about the respooling breakage +;; though. ;;; Code: @@ -219,10 +101,10 @@ (apply #'error args)))) -;; Backend behavior customization =========================================== +;; Back End behavior customization =========================================== (defgroup nndiary nil - "The Gnus Diary backend." + "The Gnus Diary back end." :version "22.1" :group 'gnus-diary) @@ -325,27 +207,27 @@ The hooks will be called with the article in the current buffer." :type 'boolean) -;; Backend declaration ====================================================== +;; Back End declaration ====================================================== ;; Well, most of this is nnml clonage. (nnoo-declare nndiary) (defvoo nndiary-directory (nnheader-concat gnus-directory "diary/") - "Spool directory for the nndiary backend.") + "Spool directory for the nndiary back end.") (defvoo nndiary-active-file (expand-file-name "active" nndiary-directory) - "Active file for the nndiary backend.") + "Active file for the nndiary back end.") (defvoo nndiary-newsgroups-file (expand-file-name "newsgroups" nndiary-directory) - "Newsgroups description file for the nndiary backend.") + "Newsgroups description file for the nndiary back end.") (defvoo nndiary-get-new-mail nil "Whether nndiary gets new mail and split it. -Contrary to traditional mail backends, this variable can be set to t -even if your primary mail backend also retreives mail. In such a case, +Contrary to traditional mail back ends, this variable can be set to t +even if your primary mail back end also retreives mail. In such a case, NDiary uses its own mail-sources and split-methods.") (defvoo nndiary-nov-is-evil nil @@ -366,10 +248,10 @@ all. This may very well take some time.") (defconst nndiary-version "0.2-b14" - "Current Diary backend version.") + "Current Diary back end version.") (defun nndiary-version () - "Current Diary backend version." + "Current Diary back end version." (interactive) (message "NNDiary version %s" nndiary-version)) @@ -601,7 +483,7 @@ all. This may very well take some time.") (nnheader-report 'nndiary "Article %s retrieved" id) ;; We return the article number. (cons (if group-num (car group-num) group) - (string-to-int (file-name-nondirectory path))))))) + (string-to-number (file-name-nondirectory path))))))) (deffoo nndiary-request-group (group &optional server dont-check) (let ((file-name-coding-system nnmail-pathname-coding-system)) @@ -630,7 +512,7 @@ all. This may very well take some time.") (deffoo nndiary-request-scan (&optional group server) ;; Use our own mail sources and split methods while Gnus doesn't let us have - ;; multiple backends for retrieving mail. + ;; multiple back ends for retrieving mail. (let ((mail-sources nndiary-mail-sources) (nnmail-split-methods nndiary-split-methods)) (setq nndiary-article-file-alist nil) @@ -820,7 +702,7 @@ all. This may very well take some time.") ;; we should insert it. (This situation should never ;; occur, but one likes to make sure...) (while (and (looking-at "[0-9]+\t") - (< (string-to-int + (< (string-to-number (buffer-substring (match-beginning 0) (match-end 0))) article) @@ -1279,14 +1161,14 @@ all. This may very well take some time.") (nnheader-article-to-file-alist nndiary-current-directory)))) -(defun nndiary-string-to-int (str min &optional max) - ;; Like `string-to-int' but barf if STR is not exactly an integer, and not +(defun nndiary-string-to-number (str min &optional max) + ;; Like `string-to-number' but barf if STR is not exactly an integer, and not ;; within the specified bounds. ;; Signals are caught by `nndiary-schedule'. (if (not (string-match "^[ \t]*[0-9]+[ \t]*$" str)) (nndiary-error "not an integer value") ;; else - (let ((val (string-to-int str))) + (let ((val (string-to-number str))) (and (or (< val min) (and max (> val max))) (nndiary-error "value out of range")) @@ -1313,12 +1195,12 @@ all. This may very well take some time.") (let ((res (split-string val "-"))) (cond ((= (length res) 1) - (nndiary-string-to-int (car res) min-or-values max)) + (nndiary-string-to-number (car res) min-or-values max)) ((= (length res) 2) ;; don't know if crontab accepts this, but ensure ;; that BEG is <= END - (let ((beg (nndiary-string-to-int (car res) min-or-values max)) - (end (nndiary-string-to-int (cadr res) min-or-values max))) + (let ((beg (nndiary-string-to-number (car res) min-or-values max)) + (end (nndiary-string-to-number (cadr res) min-or-values max))) (cond ((< beg end) (cons beg end)) ((= beg end) diff --git a/lisp/nndir.el b/lisp/nndir.el index f1a6635..f7849c0 100644 --- a/lisp/nndir.el +++ b/lisp/nndir.el @@ -1,7 +1,7 @@ ;;; nndir.el --- single directory newsgroup access for Gnus -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 -;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news @@ -20,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/nndoc.el b/lisp/nndoc.el index 3763654..f393ece 100644 --- a/lisp/nndoc.el +++ b/lisp/nndoc.el @@ -1,6 +1,7 @@ ;;; nndoc.el --- single file access for Gnus -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Masanobu UMEDA @@ -20,8 +21,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -421,7 +422,7 @@ from the document.") (search-forward "\n\n" beg t) (re-search-backward "^Content-Length:[ \t]*\\([0-9]+\\) *$" end t) - (setq len (string-to-int (match-string 1))) + (setq len (string-to-number (match-string 1))) (search-forward "\n\n" beg t) (unless (= (setq len (+ (point) len)) (point-max)) (and (< len (point-max)) @@ -444,7 +445,7 @@ from the document.") (defun nndoc-rnews-body-end () (and (re-search-backward nndoc-article-begin nil t) (forward-line 1) - (goto-char (+ (point) (string-to-int (match-string 1)))))) + (goto-char (+ (point) (string-to-number (match-string 1)))))) (defun nndoc-babyl-type-p () (when (re-search-forward "\^_\^L *\n" nil t) diff --git a/lisp/nndraft.el b/lisp/nndraft.el index 4e3eb9c..1b93ac8 100644 --- a/lisp/nndraft.el +++ b/lisp/nndraft.el @@ -1,7 +1,7 @@ ;;; nndraft.el --- draft article access for Gnus -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2003 -;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news @@ -20,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -174,8 +174,11 @@ (setq buffer-file-name (expand-file-name file) buffer-auto-save-file-name (make-auto-save-file-name)) (clear-visited-file-modtime) - (make-local-variable 'write-contents-hooks) - (push 'nndraft-generate-headers write-contents-hooks) + (let ((hook (if (boundp 'write-contents-functions) + 'write-contents-functions + 'write-contents-hooks))) + (gnus-make-local-hook hook) + (add-hook hook 'nndraft-generate-headers nil t)) article)) (deffoo nndraft-request-group (group &optional server dont-check) @@ -185,7 +188,7 @@ (file-name-coding-system nnmail-pathname-coding-system) dir file) (nnheader-re-read-dir pathname) - (setq dir (mapcar (lambda (name) (string-to-int (substring name 1))) + (setq dir (mapcar (lambda (name) (string-to-number (substring name 1))) (ignore-errors (directory-files pathname nil "^#[0-9]+#$" t)))) (dolist (n dir) @@ -293,7 +296,7 @@ "Return the list of messages in the group." (gnus-make-directory nndraft-current-directory) (sort - (mapcar 'string-to-int + (mapcar 'string-to-number (directory-files nndraft-current-directory nil "\\`[0-9]+\\'" t)) '<)) diff --git a/lisp/nneething.el b/lisp/nneething.el index 8987abb..8694e9b 100644 --- a/lisp/nneething.el +++ b/lisp/nneething.el @@ -1,7 +1,7 @@ ;;; nneething.el --- arbitrary file access for Gnus -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 -;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Masanobu UMEDA @@ -21,8 +21,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -428,7 +428,7 @@ This variable is used as the alternative of `mailcap-mime-extensions'.") (when (re-search-forward "<[a-zA-Z0-9_]@[-a-zA-Z0-9_]>" 1000 t) (concat "From: " (match-string 0) "\n")))) (nneething-from-line (nth 2 atts) file)) - (if (> (string-to-int (int-to-string (nth 7 atts))) 0) + (if (> (string-to-number (int-to-string (nth 7 atts))) 0) (concat "Chars: " (int-to-string (nth 7 atts)) "\n") "") (if buffer diff --git a/lisp/nnfolder.el b/lisp/nnfolder.el index ddddba6..dff3337 100644 --- a/lisp/nnfolder.el +++ b/lisp/nnfolder.el @@ -1,6 +1,7 @@ ;;; nnfolder.el --- mail folder access for Gnus -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Simon Josefsson (adding MARKS) ;; ShengHuo Zhu (adding NOV) @@ -23,8 +24,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -201,7 +202,7 @@ the group. Then the marks file will be regenerated properly by Gnus.") ((search-backward (concat "\n" nnfolder-article-marker) nil t) (goto-char (match-end 0)) - (setq num (string-to-int + (setq num (string-to-number (buffer-substring (point) (point-at-eol)))) (goto-char start) @@ -211,7 +212,7 @@ the group. Then the marks file will be regenerated properly by Gnus.") (search-forward (concat "\n" nnfolder-article-marker) nil t) (progn - (setq num (string-to-int + (setq num (string-to-number (buffer-substring (point) (point-at-eol)))) (> num article)) @@ -286,7 +287,7 @@ the group. Then the marks file will be regenerated properly by Gnus.") (cons nnfolder-current-group (if (search-forward (concat "\n" nnfolder-article-marker) nil t) - (string-to-int (buffer-substring + (string-to-number (buffer-substring (point) (point-at-eol))) -1)))))))) @@ -826,7 +827,7 @@ deleted. Point is left where the deleted region was." (insert "\n")) (forward-char -1) (insert (format (concat nnfolder-article-marker "%d %s\n") - (cdr group-art) (current-time-string))))) + (cdr group-art) (message-make-date))))) (defun nnfolder-active-number (group) ;; Find the next article number in GROUP. @@ -876,6 +877,7 @@ deleted. Point is left where the deleted region was." nnfolder-file-coding-system)) (nnheader-find-file-noselect file t))))) (set-buffer-multibyte t) ;; Use multibyte buffer for future copying. + (buffer-disable-undo) (if (equal (cadr (assoc group nnfolder-scantime-alist)) (nth 5 (file-attributes file))) ;; This looks up-to-date, so we don't do any scanning. @@ -902,7 +904,6 @@ deleted. Point is left where the deleted region was." maxid start end newscantime novbuf articles newnum buffer-read-only) - (buffer-disable-undo) (setq maxid (cdr active)) (unless (or gnus-nov-is-evil nnfolder-nov-is-evil @@ -1071,7 +1072,8 @@ This command does not work if you use short group names." (gnus-make-directory (file-name-directory (buffer-file-name))) (let ((coding-system-for-write (or nnfolder-file-coding-system-for-write - nnfolder-file-coding-system))) + nnfolder-file-coding-system)) + (copyright-update nil)) (save-buffer))) (unless (or gnus-nov-is-evil nnfolder-nov-is-evil) (nnfolder-save-nov))) diff --git a/lisp/nngateway.el b/lisp/nngateway.el index 6059dcf..c66115f 100644 --- a/lisp/nngateway.el +++ b/lisp/nngateway.el @@ -1,7 +1,7 @@ ;;; nngateway.el --- posting news via mail gateways -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 -;; Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news, mail @@ -20,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/nnheader.el b/lisp/nnheader.el index f64f284..879f17b 100644 --- a/lisp/nnheader.el +++ b/lisp/nnheader.el @@ -1,8 +1,8 @@ ;;; nnheader.el --- header access macros for Semi-gnus and its backends -;; Copyright (C) 1987, 1988, 1989, 1990, 1993, 1994, 1995, 1996, -;; 1997, 1998, 2000, 2001, 2002, 2003, 2004 -;; Free Software Foundation, Inc. +;; Copyright (C) 1987, 1988, 1989, 1990, 1993, 1994, +;; 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003, +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Masanobu UMEDA ;; Lars Magne Ingebrigtsen @@ -24,8 +24,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -34,6 +34,8 @@ (eval-when-compile (require 'cl)) (eval-when-compile (require 'static)) +(defvar nnmail-extra-headers) + ;; Requiring `gnus-util' at compile time creates a circular ;; dependency between nnheader.el and gnus-util.el. ;;(eval-when-compile (require 'gnus-util)) @@ -154,11 +156,12 @@ This variable is a substitute for `mm-text-coding-system-for-write'.") (defun nnheader-image-load-path (&optional package) (let (dir result) (dolist (path load-path (nreverse result)) - (if (file-directory-p - (setq dir (concat (file-name-directory - (directory-file-name path)) - "etc/" (or package "gnus/")))) - (push dir result)) + (when (and path + (file-directory-p + (setq dir (concat (file-name-directory + (directory-file-name path)) + "etc/images/" (or package "gnus/"))))) + (push dir result)) (push path result)))) (defalias 'mm-image-load-path 'nnheader-image-load-path) @@ -176,6 +179,22 @@ This variable is a substitute for `mm-text-coding-system-for-write'.") (defalias 'mm-decode-coding-region 'decode-coding-region) (defalias 'mm-set-buffer-file-coding-system 'set-buffer-file-coding-system) + ;; Should keep track of `mm-subst-char-in-string' in mm-util.el. + (if (fboundp 'subst-char-in-string) + (defalias 'mm-subst-char-in-string 'subst-char-in-string) + (defun mm-subst-char-in-string (from to string &optional inplace) + "Replace characters in STRING from FROM to TO. + Unless optional argument INPLACE is non-nil, return a new string." + (let ((string (if inplace string (copy-sequence 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))) + ;; Should keep track of `mm-detect-coding-region' in mm-util.el. (defun nnheader-detect-coding-region (start end) "Like 'detect-coding-region' except returning the best one." @@ -292,19 +311,7 @@ nil, ." (t (lambda nil enable-multibyte-characters)))) - ;; Should keep track of the same alias in mm-util.el. - (defalias 'mm-make-temp-file - (if (fboundp 'make-temp-file) - 'make-temp-file - (lambda (prefix &optional dir-flag) - (let ((file (expand-file-name - (make-temp-name prefix) - (if (fboundp 'temp-directory) - (temp-directory) - temporary-file-directory)))) - (if dir-flag - (make-directory file)) - file)))) + (defalias 'mm-make-temp-file 'make-temp-file) ;; Should keep track of `mm-coding-system-p' in mm-util.el. (defun nnheader-coding-system-p (sym) @@ -334,7 +341,24 @@ nil, ." (cond ((fboundp 'char-or-char-int-p) 'char-or-char-int-p) ((fboundp 'char-valid-p) 'char-valid-p) - (t 'identity)))) + (t 'identity))) + + ;; Should keep track of the same function in mm-util.el. + (if (fboundp 'delete-dups) + (defalias 'mm-delete-duplicates 'delete-dups) + (defun mm-delete-duplicates (list) + "Destructively remove `equal' duplicates from LIST. +Store the result in LIST and return it. LIST must be a proper list. +Of several `equal' occurrences of an element in LIST, the first +one is kept. + +This is a compatibility function for Emacsen without `delete-dups'." + ;; Code from `subr.el' in Emacs 22: + (let ((tail list)) + (while tail + (setcdr tail (delete (car tail) (cdr tail))) + (setq tail (cdr tail)))) + list))) ;; mail-parse stuff. (unless (featurep 'mail-parse) @@ -592,7 +616,10 @@ given, the return value will not contain the last newline." (mime-find-field-decoder 'From 'nov)) (defalias 'mail-header-extra 'mime-gnus-entity-extra-internal) -(defalias 'mail-header-set-extra 'mime-gnus-entity-set-extra-internal) + +(defun mail-header-set-extra (header extra) + "Set the extra headers in HEADER to EXTRA." + (mime-gnus-entity-set-extra-internal header extra)) (defun nnheader-decode-field-body (field-body field-name &optional mode max-column) @@ -1312,9 +1339,9 @@ list of headers that match SEQUENCE (see `nntp-retrieve-headers')." (defsubst nnheader-file-to-number (file) "Take a FILE name and return the article number." (if (string= nnheader-numerical-short-files "^[0-9]+$") - (string-to-int file) + (string-to-number file) (string-match nnheader-numerical-short-files file) - (string-to-int (match-string 0 file)))) + (string-to-number (match-string 0 file)))) (defvar nnheader-directory-files-is-safe (or (eq system-type 'windows-nt) @@ -1429,20 +1456,8 @@ without formatting." (apply 'insert format args)) t)) -(static-if (fboundp 'subst-char-in-string) - (defsubst nnheader-replace-chars-in-string (string from to) - (subst-char-in-string from to string)) - (defun nnheader-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))) +(defsubst nnheader-replace-chars-in-string (string from to) + (mm-subst-char-in-string from to string)) (defun nnheader-replace-duplicate-chars-in-string (string from to) "Replace characters in STRING from FROM to TO." @@ -1567,15 +1582,21 @@ A buffer may be modified in several ways after reading into the buffer due to advanced Emacs features, such as file-name-handlers, format decoding, find-file-hooks, etc. This function ensures that none of these modifications will take place." - (let ((format-alist nil) - (auto-mode-alist (nnheader-auto-mode-alist)) - (default-major-mode 'fundamental-mode) - (enable-local-variables nil) - (after-insert-file-functions nil) - (enable-local-eval nil) - (find-file-hooks nil)) - (insert-file-contents-as-coding-system - nnheader-file-coding-system filename visit beg end replace))) + (let* ((format-alist nil) + (auto-mode-alist (nnheader-auto-mode-alist)) + (default-major-mode 'fundamental-mode) + (enable-local-variables nil) + (after-insert-file-functions nil) + (enable-local-eval nil) + (ffh (if (boundp 'find-file-hook) + 'find-file-hook + 'find-file-hooks)) + (val (symbol-value ffh))) + (set ffh nil) + (unwind-protect + (insert-file-contents-as-coding-system + nnheader-file-coding-system filename visit beg end replace) + (set ffh val)))) (defun nnheader-insert-nov-file (file first) (let ((size (nth 7 (file-attributes file))) @@ -1600,15 +1621,21 @@ find-file-hooks, etc. (defun nnheader-find-file-noselect (&rest args) "Open a file with some variables bound. See `find-file-noselect' for the arguments." - (let ((format-alist nil) - (auto-mode-alist (nnheader-auto-mode-alist)) - (default-major-mode 'fundamental-mode) - (enable-local-variables nil) - (after-insert-file-functions nil) - (enable-local-eval nil) - (find-file-hooks nil)) - (apply 'find-file-noselect-as-coding-system - nnheader-file-coding-system args))) + (let* ((format-alist nil) + (auto-mode-alist (nnheader-auto-mode-alist)) + (default-major-mode 'fundamental-mode) + (enable-local-variables nil) + (after-insert-file-functions nil) + (enable-local-eval nil) + (ffh (if (boundp 'find-file-hook) + 'find-file-hook + 'find-file-hooks)) + (val (symbol-value ffh))) + (set ffh nil) + (unwind-protect + (apply 'find-file-noselect-as-coding-system + nnheader-file-coding-system args) + (set ffh val)))) (defun nnheader-auto-mode-alist () "Return an `auto-mode-alist' with only the .gz (etc) thingies." diff --git a/lisp/nnheaderxm.el b/lisp/nnheaderxm.el index 246a19f..0564ae6 100644 --- a/lisp/nnheaderxm.el +++ b/lisp/nnheaderxm.el @@ -21,8 +21,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/nnimap.el b/lisp/nnimap.el index ab10457..35225fb 100644 --- a/lisp/nnimap.el +++ b/lisp/nnimap.el @@ -1,6 +1,7 @@ ;;; nnimap.el --- imap backend for Gnus -;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Simon Josefsson ;; Jim Radford @@ -20,8 +21,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -206,7 +207,7 @@ RFC2060 section 6.4.4." "Whether to download entire articles during splitting. This is generally not required, and will slow things down considerably. You may need it if you want to use an advanced splitting function that -analyses the body before splitting the article. +analyzes the body before splitting the article. If this variable is nil, bodies will not be downloaded; if this variable is the symbol `default' the default behaviour is used (which currently is nil, unless you use a statistical @@ -317,6 +318,11 @@ every message in the group, thus making it quite slow. Unlike other backends, you do not need to take special care if you flip this variable.") +(defvoo nnimap-search-uids-not-since-is-evil nil + "If non-nil, avoid \"UID SEARCH UID ... NOT SINCE\" queries when expiring. +Instead, use \"UID SEARCH SINCE\" to prune the list of expirable +articles within Gnus. This seems to be faster on Courier in some cases.") + (defvoo nnimap-expunge-on-close 'always ; 'ask, 'never "Whether to expunge a group when it is closed. When a IMAP group with articles marked for deletion is closed, this @@ -1177,18 +1183,12 @@ function is generally only called when Gnus is shutting down." (let (seen unseen) ;; read info could contain articles marked unread by other ;; imap clients! we correct this - (setq seen (gnus-uncompress-range (gnus-info-read info)) - unseen (imap-search "UNSEEN UNDELETED") - seen (gnus-set-difference seen unseen) - ;; seen might lack articles marked as read by other - ;; imap clients! we correct this - seen (append seen (imap-search "SEEN")) - ;; remove dupes - seen (sort seen '<) - seen (gnus-compress-sequence seen t) - ;; we can't return '(1) since this isn't a "list of ranges", - ;; and we can't return '((1)) since g-list-of-unread-articles - ;; is buggy so we return '((1 . 1)). + (setq unseen (gnus-compress-sequence + (imap-search "UNSEEN UNDELETED")) + seen (gnus-range-difference (gnus-info-read info) unseen) + seen (gnus-range-add seen + (gnus-compress-sequence + (imap-search "SEEN"))) seen (if (and (integerp (car seen)) (null (cdr seen))) (list (cons (car seen) (car seen))) @@ -1493,6 +1493,21 @@ function is generally only called when Gnus is shutting down." (gnus-compress-sequence oldarts)) "\\Deleted") (setq articles (gnus-set-difference articles oldarts)))))) + ((and nnimap-search-uids-not-since-is-evil (numberp days)) + (let* ((all-new-articles + (gnus-compress-sequence + (imap-search (format "SINCE %s" + (nnimap-date-days-ago days))))) + (oldartseq + (gnus-range-difference artseq all-new-articles)) + (oldarts (gnus-uncompress-range oldartseq))) + (when oldarts + (nnimap-expiry-target oldarts group server) + (when (imap-message-flags-add + (imap-range-to-message-set oldartseq) + "\\Deleted") + (setq articles (gnus-set-difference + articles oldarts)))))) ((numberp days) (let ((oldarts (imap-search (format nnimap-expunge-search-string @@ -1510,7 +1525,7 @@ function is generally only called when Gnus is shutting down." ;; return articles not deleted articles) -(deffoo nnimap-request-move-article (article group server accept-form +(deffoo nnimap-request-move-article (article group server accept-form &optional last move-is-internal) (when (nnimap-possibly-change-server server) (save-excursion @@ -1533,6 +1548,7 @@ function is generally only called when Gnus is shutting down." (setq result (eval accept-form)) (kill-buffer buf) result) + (nnimap-possibly-change-group group server) (imap-message-flags-add (imap-range-to-message-set (list article)) "\\Deleted" 'silent nnimap-server-buffer)) diff --git a/lisp/nnir.el b/lisp/nnir.el index 846db89..4ba37f0 100644 --- a/lisp/nnir.el +++ b/lisp/nnir.el @@ -18,8 +18,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -339,7 +339,8 @@ Add an entry here when adding a new search engine.") ;;; User Customizable Variables: (defgroup nnir nil - "Search nnmh and nnml groups in Gnus with Glimpse, freeWAIS-sf, or EWS.") + "Search nnmh and nnml groups in Gnus with Glimpse, freeWAIS-sf, or EWS." + :group 'gnus) ;; Mail backend. @@ -906,8 +907,8 @@ pairs (also vectors, actually)." dirnam nnir-wais-remove-prefix)) (setq group (substitute ?. ?/ (replace-match "" t t dirnam))) (push (vector group - (string-to-int artno) - (string-to-int score)) + (string-to-number artno) + (string-to-number score)) artlist)) (message "Massaging waissearch output...done") (apply 'vector @@ -951,7 +952,7 @@ pairs (also vectors, actually)." (setq group (substitute ?. ?/ (match-string 1 article))) (setq article-num (match-string 2 article)) (setq artlist (vconcat artlist (vector (vector group - (string-to-int article-num) + (string-to-number article-num) 1000))))) (message "Gathering query output...done") artlist))) @@ -1107,8 +1108,8 @@ Windows NT 4.0." (setq group (substitute ?. ?\\ group)) (push (vector group - (string-to-int artno) - (string-to-int score)) + (string-to-number artno) + (string-to-number score)) artlist))))) (message "Massaging swish++ output...done") @@ -1194,8 +1195,8 @@ Tested with swish-e-2.0.1 on Windows NT 4.0." (setq group (substitute ?. ?\\ group)) (push (vector group - (string-to-int artno) - (string-to-int score)) + (string-to-number artno) + (string-to-number score)) artlist)))) (message "Massaging swish-e output...done") @@ -1275,8 +1276,8 @@ Tested with Namazu 2.0.6 on a GNU/Linux system." ;; stuff results into artlist vector (push (vector (substitute ?. ?/ group) - (string-to-int article) - (string-to-int score)) artlist))) + (string-to-number article) + (string-to-number score)) artlist))) ;; sort artlist by score (apply 'vector diff --git a/lisp/nnkiboze.el b/lisp/nnkiboze.el index 6ab99dd..132512b 100644 --- a/lisp/nnkiboze.el +++ b/lisp/nnkiboze.el @@ -1,7 +1,7 @@ ;;; nnkiboze.el --- select virtual news access for Gnus -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003 -;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news @@ -20,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -106,7 +106,7 @@ (error "nnkiboze: No xref")) (unless (string-match " \\([^ ]+\\):\\([0-9]+\\)" xref) (error "nnkiboze: Malformed xref")) - (setq num (string-to-int (match-string 2 xref)) + (setq num (string-to-number (match-string 2 xref)) group (match-string 1 xref)) (or (with-current-buffer buffer (or (and gnus-use-cache (gnus-cache-request-article num group)) diff --git a/lisp/nnlistserv.el b/lisp/nnlistserv.el index 1d0d415..f08aa82 100644 --- a/lisp/nnlistserv.el +++ b/lisp/nnlistserv.el @@ -1,6 +1,7 @@ ;;; nnlistserv.el --- retrieving articles via web mailing list archives -;; Copyright (C) 1997, 1998, 1999, 2000, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news, mail @@ -19,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/nnmail.el b/lisp/nnmail.el index 60ce895..a41d292 100644 --- a/lisp/nnmail.el +++ b/lisp/nnmail.el @@ -1,6 +1,7 @@ ;;; nnmail.el --- mail support functions for the Gnus mail backends -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news, mail @@ -19,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -47,7 +48,7 @@ :group 'nnmail) (defgroup nnmail-prepare nil - "Preparing (or mangling) new mail after retrival." + "Preparing (or mangling) new mail after retrieval." :group 'nnmail) (defgroup nnmail-duplicate nil @@ -767,7 +768,7 @@ If SOURCE is a directory spec, try to return the group name component." (if (not (save-excursion (and (re-search-backward "^Content-Length:[ \t]*\\([0-9]+\\)" start t) - (setq content-length (string-to-int + (setq content-length (string-to-number (buffer-substring (match-beginning 1) (match-end 1)))) @@ -904,7 +905,7 @@ If SOURCE is a directory spec, try to return the group name component." (if (not (re-search-forward "^Content-Length:[ \t]*\\([0-9]+\\)" nil t)) (setq content-length nil) - (setq content-length (string-to-int (match-string 1))) + (setq content-length (string-to-number (match-string 1))) ;; We destroy the header, since none of the backends ever ;; use it, and we do not want to confuse other mailers by ;; having a (possibly) faulty header. @@ -1139,7 +1140,7 @@ FUNC will be called with the group name to determine the article number." 5 "Error in `nnmail-split-methods'; using `bogus' mail group") (sit-for 1) '("bogus"))))) - (setq split (gnus-remove-duplicates split)) + (setq split (mm-delete-duplicates split)) ;; The article may be "cross-posted" to `junk'. What ;; to do? Just remove the `junk' spec. Don't really ;; see anything else to do... @@ -1418,11 +1419,12 @@ See the documentation for the variable `nnmail-split-fancy' for details." ;; Not in cache, compute a regexp for the field/value pair. (t - (let* ((field (nth 0 split)) - (value (nth 1 split)) - partial-front - partial-rear - regexp) + (let ((field (nth 0 split)) + (value (nth 1 split)) + (split-rest (cddr split)) + partial-front + partial-rear + regexp) (if (symbolp value) (setq value (cdr (assq value nnmail-split-abbrev-alist)))) (if (and (>= (length value) 2) @@ -1434,7 +1436,13 @@ See the documentation for the variable `nnmail-split-fancy' for details." (string= ".*" (substring value -2))) (setq value (substring value 0 -2) partial-rear "")) - (when nnmail-split-fancy-match-partial-words + ;; Invert the match-partial-words behavior if the optional + ;; last element is specified. + (while (eq (car split-rest) '-) + (setq split-rest (cddr split-rest))) + (when (if (cadr split-rest) + (not nnmail-split-fancy-match-partial-words) + nnmail-split-fancy-match-partial-words) (setq partial-front "" partial-rear "")) (setq regexp (concat "^\\(\\(" @@ -1865,9 +1873,15 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details." (case-fold-search nil) (from (or (message-fetch-field "from") "")) (to (or (message-fetch-field "to") "")) - (date (date-to-time - (or (message-fetch-field "date") (current-time-string)))) + (date (message-fetch-field "date")) (target 'delete)) + (setq date (if date + (condition-case err + (date-to-time date) + (error + (message "%s" (error-message-string err)) + (current-time))) + (current-time))) (dolist (regexp-target-pair (reverse nnmail-fancy-expiry-targets) target) (setq header (car regexp-target-pair)) (cond diff --git a/lisp/nnmaildir.el b/lisp/nnmaildir.el index ab9a915..6cf9c7d 100644 --- a/lisp/nnmaildir.el +++ b/lisp/nnmaildir.el @@ -17,8 +17,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/nnmbox.el b/lisp/nnmbox.el index de520b3..d70b81b 100644 --- a/lisp/nnmbox.el +++ b/lisp/nnmbox.el @@ -1,7 +1,7 @@ ;;; nnmbox.el --- mail mbox access for Gnus -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Masanobu UMEDA @@ -16,8 +16,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -476,7 +476,7 @@ (when (re-search-forward "^X-Gnus-Newsgroup: +\\([^:]+\\):\\([0-9]+\\) " nil t) (cons (buffer-substring (match-beginning 1) (match-end 1)) - (string-to-int + (string-to-number (buffer-substring (match-beginning 2) (match-end 2))))))) (defun nnmbox-in-header-p (pos) @@ -681,7 +681,7 @@ (let (alist) (while (re-search-forward " \\([^:]+\\):\\([0-9]+\\)" end-header t) (push (cons (match-string 1) - (string-to-int (match-string 2))) alist)) + (string-to-number (match-string 2))) alist)) (nnmbox-insert-newsgroup-line alist)) ;; this is really a new article (nnmbox-save-mail diff --git a/lisp/nnmh.el b/lisp/nnmh.el index 81d547b..ee014f0 100644 --- a/lisp/nnmh.el +++ b/lisp/nnmh.el @@ -1,7 +1,7 @@ ;;; nnmh.el --- mhspool access for Gnus -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2003 -;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Masanobu UMEDA @@ -22,8 +22,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -152,7 +152,7 @@ as unread by Gnus.") (file-exists-p file) (not (file-directory-p file)) (save-excursion (nnmail-find-file file)) - (string-to-int (file-name-nondirectory file))))) + (string-to-number (file-name-nondirectory file))))) (deffoo nnmh-request-group (group &optional server dont-check) (nnheader-init-server-buffer) @@ -178,7 +178,7 @@ as unread by Gnus.") (nnheader-re-read-dir pathname) (setq dir (sort - (mapcar 'string-to-int + (mapcar 'string-to-number (directory-files pathname nil "^[0-9]+$" t)) '<)) (cond @@ -224,7 +224,7 @@ as unread by Gnus.") (nnmh-request-list-1 rdir)))) ;; For each directory, generate an active file line. (unless (string= (expand-file-name nnmh-toplev) dir) - (let ((files (mapcar 'string-to-int + (let ((files (mapcar 'string-to-number (directory-files dir nil "^[0-9]+$" t)))) (when files (save-excursion @@ -358,7 +358,7 @@ as unread by Gnus.") nnmh-group-alist) (nnmh-possibly-create-directory group) (nnmh-possibly-change-directory group server) - (let ((articles (mapcar 'string-to-int + (let ((articles (mapcar 'string-to-number (directory-files nnmh-current-directory nil "^[0-9]+$")))) (when articles @@ -484,7 +484,7 @@ as unread by Gnus.") (gnus-make-directory dir)) ;; Find the highest number in the group. (let ((files (sort - (mapcar 'string-to-int + (mapcar 'string-to-number (directory-files dir nil "^[0-9]+$")) '>))) (when files @@ -507,7 +507,7 @@ as unread by Gnus.") ;; articles in this folder. The articles that are "new" will be ;; marked as unread by Gnus. (let* ((dir nnmh-current-directory) - (files (sort (mapcar 'string-to-int + (files (sort (mapcar 'string-to-number (directory-files nnmh-current-directory nil "^[0-9]+$" t)) '<)) diff --git a/lisp/nnml.el b/lisp/nnml.el index 02c3d35..dbb9372 100644 --- a/lisp/nnml.el +++ b/lisp/nnml.el @@ -1,9 +1,11 @@ ;;; nnml.el --- mail spool access for Gnus -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2003 -;; Free Software Foundation, Inc. -;; Author: Simon Josefsson (adding MARKS) -;; Lars Magne Ingebrigtsen +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005, 2006 Free Software Foundation, Inc. + +;; Authors: Didier Verna (adding compaction) +;; Simon Josefsson (adding MARKS) +;; Lars Magne Ingebrigtsen ;; Masanobu UMEDA ;; Keywords: news, mail @@ -21,8 +23,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -40,7 +42,8 @@ (require 'nnoo) (eval-and-compile - (autoload 'gnus-article-unpropagatable-p "gnus-sum")) + (autoload 'gnus-article-unpropagatable-p "gnus-sum") + (autoload 'gnus-backlog-remove-article "gnus-bcklg")) (nnoo-declare nnml) @@ -83,7 +86,18 @@ marks file will be regenerated properly by Gnus.") "If non-nil, inhibit expiry.") (defvoo nnml-use-compressed-files nil - "If non-nil, allow using compressed message files.") + "If non-nil, allow using compressed message files. + +If it is a string, use it as the file extension which specifies +the comression program. You can set it to \".bz2\" if your Emacs +supports auto-compression using the bzip2 program. A value of t +is equivalent to \".gz\".") + +(defvoo nnml-compressed-files-size-threshold 1000 + "Default size threshold for compressed message files. +Message files with bodies larger than that many characters will +be automatically compressed if `nnml-use-compressed-files' is +non-nil.") @@ -213,7 +227,7 @@ marks file will be regenerated properly by Gnus.") (nnheader-report 'nnml "Article %s retrieved" id) ;; We return the article number. (cons (if group-num (car group-num) group) - (string-to-int (file-name-nondirectory path))))))) + (string-to-number (file-name-nondirectory path))))))) (deffoo nnml-request-group (group &optional server dont-check) (let ((file-name-coding-system nnmail-pathname-coding-system)) @@ -370,7 +384,7 @@ marks file will be regenerated properly by Gnus.") (nnmail-check-syntax) (let (result) (when nnmail-cache-accepted-message-ids - (nnmail-cache-insert (nnmail-fetch-field "message-id") + (nnmail-cache-insert (nnmail-fetch-field "message-id") group (nnmail-fetch-field "subject") (nnmail-fetch-field "from"))) @@ -427,7 +441,7 @@ marks file will be regenerated properly by Gnus.") ;; we should insert it. (This situation should never ;; occur, but one likes to make sure...) (while (and (looking-at "[0-9]+\t") - (< (string-to-int + (< (string-to-number (buffer-substring (match-beginning 0) (match-end 0))) article) @@ -622,8 +636,10 @@ marks file will be regenerated properly by Gnus.") (setq chars (nnmail-insert-lines)) (setq extension (and nnml-use-compressed-files - (> chars 1000) - ".gz")) + (> chars nnml-compressed-files-size-threshold) + (if (stringp nnml-use-compressed-files) + nnml-use-compressed-files + ".gz"))) (nnmail-insert-xref group-art) (run-hooks 'nnmail-prepare-save-mail-hook) (run-hooks 'nnml-prepare-save-mail-hook) @@ -755,12 +771,14 @@ marks file will be regenerated properly by Gnus.") (nnml-open-server server)) (setq nnml-directory (expand-file-name nnml-directory)) ;; Recurse down the directories. - (nnml-generate-nov-databases-1 nnml-directory nil t) + (nnml-generate-nov-databases-directory nnml-directory nil t) ;; Save the active file. (nnmail-save-active nnml-group-alist nnml-active-file)) -(defun nnml-generate-nov-databases-1 (dir &optional seen no-active) - "Regenerate the NOV database in DIR." +(defun nnml-generate-nov-databases-directory (dir &optional seen no-active) + "Regenerate the NOV database in DIR. + +Unless no-active is non-nil, update the active file too." (interactive "DRegenerate NOV in: ") (setq dir (file-name-as-directory dir)) ;; Only scan this sub-tree if we haven't been here yet. @@ -770,7 +788,7 @@ marks file will be regenerated properly by Gnus.") (dolist (dir (directory-files dir t nil t)) (when (and (not (string-match "^\\." (file-name-nondirectory dir))) (file-directory-p dir)) - (nnml-generate-nov-databases-1 dir seen))) + (nnml-generate-nov-databases-directory dir seen))) ;; Do this directory. (let ((files (sort (nnheader-article-to-file-alist dir) 'car-less-than-car))) @@ -1009,6 +1027,193 @@ Use the nov database for the current group if available." (nnml-save-marks group server) (nnheader-message 7 "Bootstrapping marks for %s...done" group))))) + +;;; +;;; Group and server compaction. -- dvl +;;; + +;; #### FIXME: this function handles self Xref: entry correctly, but I don't +;; #### know how to handle external cross-references. I actually don't know if +;; #### this is handled correctly elsewhere. For instance, what happens if you +;; #### move all articles to a new group (that's what people do for manual +;; #### compaction) ? + +;; #### NOTE: the function below handles the article backlog. This is +;; #### conceptually the wrong place to do it because the backend is at a +;; #### lower level. However, this is the only place where we have the needed +;; #### information to do the job. Ideally, this function should not handle +;; #### the backlog by itself, but return a list of moved groups / articles to +;; #### the caller. This will become important to avoid code duplication when +;; #### other backends get a compaction feature. Also, note that invalidating +;; #### the "original article buffer" is already done at an upper level. + +;; Shouldn't `nnml-request-compact-group' be interactive? --rsteib + +(defun nnml-request-compact-group (group &optional server save) + (nnml-possibly-change-directory group server) + (unless nnml-article-file-alist + (setq nnml-article-file-alist + (sort (nnml-current-group-article-to-file-alist) + 'car-less-than-car))) + (if (not nnml-article-file-alist) + ;; The group is empty: do nothing but return t + t + ;; The group is not empty: + (let* ((group-full-name + (gnus-group-prefixed-name + group + (gnus-server-to-method (format "nnml:%s" server)))) + (info (gnus-get-info group-full-name)) + (new-number 1) + compacted) + (let ((articles nnml-article-file-alist) + article) + (while (setq article (pop articles)) + (let ((old-number (car article))) + (when (> old-number new-number) + ;; There is a gap here: + (let ((old-number-string (int-to-string old-number)) + (new-number-string (int-to-string new-number))) + (setq compacted t) + ;; #### NOTE: `nnml-article-to-file' calls + ;; #### `nnml-update-file-alist' (which in turn calls + ;; #### `nnml-current-group-article-to-file-alist', which + ;; #### might use the NOV database). This might turn out to be + ;; #### inefficient. In that case, we will do the work + ;; #### manually. + ;; 1/ Move the article to a new file: + (let* ((oldfile (nnml-article-to-file old-number)) + (newfile + (gnus-replace-in-string + oldfile (concat "\\(" + old-number-string + "\\)\\(\\(\\.gz\\)?\\)$") + (concat new-number-string "\\2")))) + (with-current-buffer nntp-server-buffer + (nnmail-find-file oldfile) + ;; Update the Xref header in the article itself: + (when (and (re-search-forward "^Xref: [^ ]+ " nil t) + (re-search-forward + (concat "\\<" + (regexp-quote + (concat group ":" old-number-string)) + "\\>") + (point-at-eol) t)) + (replace-match + (concat group ":" new-number-string))) + ;; Save to the new file: + (nnmail-write-region (point-min) (point-max) newfile)) + (funcall nnmail-delete-file-function oldfile)) + ;; 2/ Update all marks for this article: + ;; #### NOTE: it is possible that the new article number + ;; #### already belongs to a range, whereas the corresponding + ;; #### article doesn't exist (for example, if you delete an + ;; #### article). For that reason, it is important to update + ;; #### the ranges (meaning remove inexistant articles) before + ;; #### doing anything on them. + ;; 2 a/ read articles: + (let ((read (gnus-info-read info))) + (setq read (gnus-remove-from-range read (list new-number))) + (when (gnus-member-of-range old-number read) + (setq read (gnus-remove-from-range read (list old-number))) + (setq read (gnus-add-to-range read (list new-number)))) + (gnus-info-set-read info read)) + ;; 2 b/ marked articles: + (let ((oldmarks (gnus-info-marks info)) + mark newmarks) + (while (setq mark (pop oldmarks)) + (setcdr mark (gnus-remove-from-range (cdr mark) + (list new-number))) + (when (gnus-member-of-range old-number (cdr mark)) + (setcdr mark (gnus-remove-from-range (cdr mark) + (list old-number))) + (setcdr mark (gnus-add-to-range (cdr mark) + (list new-number)))) + (push mark newmarks)) + (gnus-info-set-marks info newmarks)) + ;; 3/ Update the NOV entry for this article: + (unless nnml-nov-is-evil + (save-excursion + (set-buffer (nnml-open-nov group)) + (when (nnheader-find-nov-line old-number) + ;; Replace the article number: + (looking-at old-number-string) + (replace-match new-number-string nil t) + ;; Update the Xref header: + (when (re-search-forward + (concat "\\(Xref:[^\t\n]* \\)\\<" + (regexp-quote + (concat group ":" old-number-string)) + "\\>") + (point-at-eol) t) + (replace-match + (concat "\\1" group ":" new-number-string)))))) + ;; 4/ Possibly remove the article from the backlog: + (when gnus-keep-backlog + ;; #### NOTE: instead of removing the article, we could + ;; #### modify the backlog to reflect the numbering change, + ;; #### but I don't think it's worth it. + (gnus-backlog-remove-article group-full-name old-number) + (gnus-backlog-remove-article group-full-name new-number)))) + (setq new-number (1+ new-number))))) + (if (not compacted) + ;; No compaction had to be done: + t + ;; Some articles have actually been renamed: + ;; 1/ Rebuild active information: + (let ((entry (assoc group nnml-group-alist)) + (active (cons 1 (1- new-number)))) + (setq nnml-group-alist (delq entry nnml-group-alist)) + (push (list group active) nnml-group-alist) + ;; Update the active hashtable to let the *Group* buffer display + ;; up-to-date lines. I don't think that either gnus-newsrc-hashtb or + ;; gnus-newwrc-alist are out of date, since all we did is to modify + ;; the info of the group internally. + (gnus-set-active group-full-name active)) + ;; 1 bis/ + ;; #### NOTE: normally, we should save the overview (NOV) file + ;; #### here, just like we save the marks file. However, there is no + ;; #### such function as nnml-save-nov for a single group. Only for + ;; #### all groups. Gnus inconsistency is getting worse every day... + ;; 2/ Rebuild marks file: + (unless nnml-marks-is-evil + ;; #### NOTE: this constant use of global variables everywhere is + ;; #### truly disgusting. Gnus really needs a *major* cleanup. + (setq nnml-marks (gnus-info-marks info)) + (push (cons 'read (gnus-info-read info)) nnml-marks) + (dolist (el gnus-article-unpropagated-mark-lists) + (setq nnml-marks (gnus-remassoc el nnml-marks))) + (nnml-save-marks group server)) + ;; 3/ Save everything if this was not part of a bigger operation: + (if (not save) + ;; Nothing to save (yet): + t + ;; Something to save: + ;; a/ Save the NOV databases: + ;; #### NOTE: this should be done directory per directory in 1bis + ;; #### above. See comment there. + (nnml-save-nov) + ;; b/ Save the active file: + (nnmail-save-active nnml-group-alist nnml-active-file) + t))))) + +(defun nnml-request-compact (&optional server) + "Request compaction of all SERVER nnml groups." + (interactive (list (or (nnoo-current-server 'nnml) ""))) + (nnmail-activate 'nnml) + (unless (nnml-server-opened server) + (nnml-open-server server)) + (setq nnml-directory (expand-file-name nnml-directory)) + (let* ((groups (gnus-groups-from-server + (gnus-server-to-method (format "nnml:%s" server)))) + (first (pop groups)) + group) + (when first + (while (setq group (pop groups)) + (nnml-request-compact-group (gnus-group-real-name group) server)) + (nnml-request-compact-group (gnus-group-real-name first) server t)))) + + (provide 'nnml) ;;; nnml.el ends here diff --git a/lisp/nnnil.el b/lisp/nnnil.el index 9e26160..0578b20 100644 --- a/lisp/nnnil.el +++ b/lisp/nnnil.el @@ -15,8 +15,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/nnoo.el b/lisp/nnoo.el index 384599b..86de41c 100644 --- a/lisp/nnoo.el +++ b/lisp/nnoo.el @@ -1,7 +1,7 @@ ;;; nnoo.el --- OO Gnus Backends -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 -;; Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news @@ -20,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -61,12 +61,16 @@ (defmacro nnoo-declare (backend &rest parents) `(eval-and-compile - (push (list ',backend - (mapcar (lambda (p) (list p)) ',parents) - nil nil) - nnoo-definition-alist) - (push (list ',backend "*internal-non-initialized-backend*") - nnoo-state-alist))) + (if (assq ',backend nnoo-definition-alist) + (setcar (cdr (assq ',backend nnoo-definition-alist)) + (mapcar 'list ',parents)) + (push (list ',backend + (mapcar 'list ',parents) + nil nil) + nnoo-definition-alist)) + (unless (assq ',backend nnoo-state-alist) + (push (list ',backend "*internal-non-initialized-backend*") + nnoo-state-alist)))) (put 'nnoo-declare 'lisp-indent-function 1) (defun nnoo-parents (backend) @@ -254,7 +258,7 @@ (setcdr bstate (delq defs (cdr bstate))) (pop defs) (while defs - (set (car (pop defs)) nil))))) + (set (car (pop defs)) nil))))) t) (defun nnoo-close (backend) diff --git a/lisp/nnrss.el b/lisp/nnrss.el index a585468..197eade 100644 --- a/lisp/nnrss.el +++ b/lisp/nnrss.el @@ -1,5 +1,7 @@ ;;; nnrss.el --- interfacing with RSS -;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Shenghuo Zhu ;; Keywords: RSS @@ -18,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -92,9 +94,15 @@ ARTICLE is the article number of the current headline.") (defvar nnrss-compatible-encoding-alist '((iso-8859-1 . windows-1252)) "Alist of encodings and those supersets. The cdr of each element is used to decode data if it is available when -the car is what the data specify as the encoding. Or, the car is used +the car is what the data specify as the encoding. Or, the car is used for decoding when the cdr that the data specify is not available.") +(defvar nnrss-wash-html-in-text-plain-parts nil + "*Non-nil means render text in text/plain parts as HTML. +The function specified by the `mm-text-html-renderer' variable will be +used to render text. If it is nil, text will simply be folded. This +variable is not used in T-gnus.") + (nnoo-define-basics nnrss) ;;; Interface functions @@ -228,9 +236,10 @@ The return value will be `html' or `text'." " "))) (link (nth 2 e)) (enclosure (nth 7 e)) + (comments (nth 8 e)) (mail-header-separator "") mime-edit-insert-user-agent-field) - (when (or text link enclosure) + (when (or text link enclosure comments) (if (eq 'html (nnrss-body-presentation-method)) (progn (mime-edit-insert-text "html") @@ -243,10 +252,30 @@ The return value will be `html' or `text'." (insert "

" (cadr enclosure) " " (nth 2 enclosure) " " (nth 3 enclosure) "

\n")) + (when comments + (insert "

comments

\n")) (insert "\n")) (mime-edit-insert-text "plain") (when text - (insert text "\n") + (goto-char (prog1 + (point) + (insert text))) + ;; See `nnrss-check-group', which inserts "

". + (when (search-forward "

" nil t) + (if (eobp) + (replace-match "\n") + (replace-match "\n\n"))) + (unless (eobp) + (let ((fill-column default-fill-column) + (window (get-buffer-window nntp-server-buffer))) + (when window + (setq fill-column + (max 1 (/ (* (window-width window) 7) 8)))) + (fill-region (point) (point-max)) + (goto-char (point-max)) + ;; XEmacs version of `fill-region' inserts newline. + (unless (bolp) + (insert "\n")))) (when (or link enclosure) (insert "\n"))) (when link @@ -254,7 +283,9 @@ The return value will be `html' or `text'." (when enclosure (insert (car enclosure) " " (nth 2 enclosure) " " - (nth 3 enclosure) "\n"))) + (nth 3 enclosure) "\n")) + (when comments + (insert comments "\n"))) (mime-edit-translate-body))) (when nnrss-content-function (funcall nnrss-content-function e group article)))) @@ -362,7 +393,11 @@ otherwise return nil." ;; mm-url will load mm-util. d-e-m-c should be bound to ;; t then, because of `mm-emacs-mule'. (default-enable-multibyte-characters t)) - (mm-url-insert url))) + (condition-case err + (mm-url-insert url) + (error (if (or debug-on-quit debug-on-error) + (signal (car err) (cdr err)) + (message "nnrss: Failed to fetch %s" url)))))) (nnheader-remove-cr-followed-by-lf) ;; Decode text according to the encoding attribute. (when (setq cs (nnrss-get-encoding)) @@ -413,6 +448,74 @@ nnrss: %s: Not valid XML %s and w3-parse doesn't work %s" (unless (assoc (car elem) nnrss-group-alist) (insert (prin1-to-string (car elem)) " 0 1 y\n"))))) +(eval-and-compile (autoload 'timezone-parse-date "timezone")) + +(defun nnrss-normalize-date (date) + "Return a date string of DATE in the RFC822 style. +This function handles the ISO 8601 date format described in +, and also the RFC822 style +which RSS 2.0 allows." + (let (case-fold-search vector year month day time zone cts) + (cond ((null date)) + ;; RFC822 + ((string-match " [0-9]+ " date) + (setq vector (timezone-parse-date date) + year (string-to-number (aref vector 0))) + (when (>= year 1969) + (setq month (string-to-number (aref vector 1)) + day (string-to-number (aref vector 2))) + (unless (>= (length (setq time (aref vector 3))) 3) + (setq time "00:00:00")) + (when (and (setq zone (aref vector 4)) + (not (string-match "\\`[A-Z+-]" zone))) + (setq zone nil)))) + ;; ISO 8601 + ((string-match + (eval-when-compile + (concat + ;; 1. year + "\\(199[0-9]\\|20[0-9][0-9]\\)" + "\\(?:-" + ;; 2. month + "\\([01][0-9]\\)" + "\\(?:-" + ;; 3. day + "\\([0-3][0-9]\\)" + "\\)?\\)?\\(?:T" + ;; 4. hh:mm + "\\([012][0-9]:[0-5][0-9]\\)" + "\\(?:" + ;; 5. :ss + "\\(:[0-5][0-9]\\)" + "\\(?:\\.[0-9]+\\)?\\)?\\)?" + ;; 6+7,8,9. zone + "\\(?:\\(?:\\([+-][012][0-9]\\):\\([0-5][0-9]\\)\\)" + "\\|\\([+-][012][0-9][0-5][0-9]\\)" + "\\|\\(Z\\)\\)?")) + date) + (setq year (string-to-number (match-string 1 date)) + month (string-to-number (or (match-string 2 date) "1")) + day (string-to-number (or (match-string 3 date) "1")) + time (if (match-beginning 5) + (substring date (match-beginning 4) (match-end 5)) + (concat (or (match-string 4 date) "00:00") ":00")) + zone (cond ((match-beginning 6) + (concat (match-string 6 date) + (match-string 7 date))) + ((match-beginning 9) ;; Z + "+0000") + (t ;; nil if zone is not provided. + (match-string 8 date)))))) + (if month + (progn + (setq cts (current-time-string (encode-time 0 0 0 day month year))) + (format "%s, %02d %s %04d %s%s" + (substring cts 0 3) day (substring cts 4 7) year time + (if zone + (concat " " zone) + ""))) + (message-make-date)))) + ;;; data functions (defun nnrss-read-server-data (server) @@ -498,7 +601,11 @@ nnrss: %s: Not valid XML %s and w3-parse doesn't work %s" (defun nnrss-insert-w3 (url) (mm-with-unibyte-current-buffer - (mm-url-insert url))) + (condition-case err + (mm-url-insert url) + (error (if (or debug-on-quit debug-on-error) + (signal (car err) (cdr err)) + (message "nnrss: Failed to fetch %s" url)))))) (defun nnrss-decode-entities-string (string) (if string @@ -527,8 +634,8 @@ nnrss: %s: Not valid XML %s and w3-parse doesn't work %s" ;;; Snarf functions (defun nnrss-check-group (group server) - (let (file xml subject url extra changed author date - enclosure rss-ns rdf-ns content-ns dc-ns) + (let (file xml subject url extra changed author date feed-subject + enclosure comments rss-ns rdf-ns content-ns dc-ns) (if (and nnrss-use-local (file-exists-p (setq file (expand-file-name (nnrss-translate-file-chars @@ -570,12 +677,15 @@ nnrss: %s: Not valid XML %s and w3-parse doesn't work %s" (setq extra (or extra (nnrss-node-text content-ns 'encoded item) (nnrss-node-text rss-ns 'description item))) + (if (setq feed-subject (nnrss-node-text dc-ns 'subject item)) + (setq extra (concat feed-subject "

" extra))) (setq author (or (nnrss-node-text rss-ns 'author item) (nnrss-node-text dc-ns 'creator item) (nnrss-node-text dc-ns 'contributor item))) - (setq date (or (nnrss-node-text dc-ns 'date item) - (nnrss-node-text rss-ns 'pubDate item) - (message-make-date))) + (setq date (nnrss-normalize-date + (or (nnrss-node-text dc-ns 'date item) + (nnrss-node-text rss-ns 'pubDate item)))) + (setq comments (nnrss-node-text rss-ns 'comments item)) (when (setq enclosure (cadr (assq (intern (concat rss-ns "enclosure")) item))) (let ((url (cdr (assq 'url enclosure))) (len (cdr (assq 'length enclosure))) @@ -606,7 +716,8 @@ nnrss: %s: Not valid XML %s and w3-parse doesn't work %s" (and author (nnrss-mime-encode-string author)) date (and extra (nnrss-decode-entities-string extra)) - enclosure) + enclosure + comments) nnrss-group-data) (puthash (or url extra) t nnrss-group-hashtb) (setq changed t)) @@ -623,14 +734,29 @@ nnrss: %s: Not valid XML %s and w3-parse doesn't work %s" "OPML subscriptions import. Read the file and attempt to subscribe to each Feed in the file." (interactive "fImport file: ") - (mapcar - (lambda (node) (gnus-group-make-rss-group - (cdr (assq 'xmlUrl (cadr node))))) + (mapc + (lambda (node) + (let ((xmlurl (cdr (assq 'xmlUrl (cadr node))))) + (when (and xmlurl + (not (string-match "\\`[\t ]*\\'" xmlurl)) + (prog1 + (y-or-n-p (format "Subscribe to %s " xmlurl)) + (message ""))) + (condition-case err + (progn + (gnus-group-make-rss-group xmlurl) + (forward-line 1)) + (error + (message + "Failed to subscribe to %s (%s); type any key to continue: " + xmlurl + (error-message-string err)) + (let ((echo-keystrokes 0)) + (read-char))))))) (nnrss-find-el 'outline - (progn - (find-file opml-file) - (xml-parse-region (point-min) - (point-max)))))) + (mm-with-multibyte-buffer + (insert-file-contents opml-file) + (xml-parse-region (point-min) (point-max)))))) (defun nnrss-opml-export () "OPML subscription export. @@ -900,7 +1026,7 @@ whether they are `offsite' or `onsite'." (selection (mapcar (lambda (listinfo) (cons (cdr (assoc "sitename" listinfo)) - (string-to-int + (string-to-number (cdr (assoc "feedid" listinfo))))) feedinfo))) (cdr (assoc diff --git a/lisp/nnslashdot.el b/lisp/nnslashdot.el index 5a14581..f52172d 100644 --- a/lisp/nnslashdot.el +++ b/lisp/nnslashdot.el @@ -1,6 +1,7 @@ ;;; nnslashdot.el --- interfacing with Slashdot -;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news @@ -19,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -86,7 +87,7 @@ (nnslashdot-possibly-change-server group server) (condition-case why (unless gnus-nov-is-evil - (nnslashdot-retrieve-headers-1 articles group)) + (nnslashdot-retrieve-headers-1 articles group)) (search-failed (nnslashdot-lose why)))) (deffoo nnslashdot-retrieve-headers-1 (articles group) @@ -141,41 +142,30 @@ (setq article (if (and article (< start article)) article start)) (goto-char point) (while (re-search-forward - "<\\(b\\|H4\\)>\\([^<]+\\).*score:\\([^)]+\\))" + "\\([^<]+\\).*\n.*\n.*score:\\([^)]+\\))" nil t) (setq cid (match-string 1) - subject (match-string 3) - score (match-string 5)) + subject (match-string 2) + score (match-string 3)) (unless (assq article (nth 4 entry)) (setcar (nthcdr 4 entry) (cons (cons article cid) (nth 4 entry))) (setq changed t)) (when (string-match "^Re: *" subject) (setq subject (concat "Re: " (substring subject (match-end 0))))) - (setq subject (mm-url-decode-entities-string subject)) - (search-forward "
") - (cond - ((looking-at - "by[ \t\n]+]+>\\([^<]+\\)[ \t\n]*(\\(<[^>]+>\\)*\\([^<>)]+\\))") - (goto-char (- (match-end 0) 5)) - (setq from (concat - (mm-url-decode-entities-string (match-string 1)) - " <" (match-string 3) ">"))) - ((looking-at "by[ \t\n]+]+>\\([^<(]+\\) (\\([0-9]+\\))") - (goto-char (- (match-end 0) 5)) - (setq from (concat - (mm-url-decode-entities-string (match-string 1)) - " <" (match-string 2) ">"))) - ((looking-at "by \\([^<>]*\\)[\t\n\r ]+on ") - (goto-char (- (match-end 0) 5)) - (setq from (mm-url-decode-entities-string (match-string 1)))) - (t - (setq from ""))) + (setq subject (mm-url-decode-entities-string subject) + from "") + (when (re-search-forward "by[ \t\n]+<[^>]+>\\([^<(]+\\)" nil t) + (setq from + (concat + (mm-url-decode-entities-string (match-string 1)) + " "))) (search-forward "on ") (setq date (nnslashdot-date-to-date - (buffer-substring (point) (progn (skip-chars-forward "^()<>\n\r") (point))))) - (setq lines (/ (abs (- (search-forward ""))) + (buffer-substring + (point) (progn (skip-chars-forward "^()<>\n\r") (point))))) + (setq lines (/ (abs (- (search-forward ""))) 70)) (if (not (re-search-forward ".*cid=\\([0-9]+\\)\">Parent" nil t)) @@ -255,21 +245,20 @@ (if (= article 1) (progn (search-forward "Posted by") - (search-forward "
") + (search-forward "
") (setq contents (buffer-substring (point) (progn - (re-search-forward - "\\|\\|< [ \t\r\n]*" cid)) (setq contents (buffer-substring - (re-search-forward "]*>") - (search-forward ""))))))) + (search-forward "
") + (search-forward "
"))))))) (search-failed (nnslashdot-lose why))) (when contents diff --git a/lisp/nnsoup.el b/lisp/nnsoup.el index c41f22d..4046992 100644 --- a/lisp/nnsoup.el +++ b/lisp/nnsoup.el @@ -1,7 +1,7 @@ ;;; nnsoup.el --- SOUP access for Gnus -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Masanobu UMEDA @@ -21,8 +21,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -750,9 +750,9 @@ backend for the messages.") (let ((files (sort (directory-files nnsoup-directory t "IDX$") (lambda (f1 f2) (< (progn (string-match "/\\([0-9]+\\)\\." f1) - (string-to-int (match-string 1 f1))) + (string-to-number (match-string 1 f1))) (progn (string-match "/\\([0-9]+\\)\\." f2) - (string-to-int (match-string 1 f2))))))) + (string-to-number (match-string 1 f2))))))) active group lines ident elem min) (set-buffer (get-buffer-create " *nnsoup work*")) (dolist (file files) diff --git a/lisp/nnspool.el b/lisp/nnspool.el index 996ab64..268cc9e 100644 --- a/lisp/nnspool.el +++ b/lisp/nnspool.el @@ -1,8 +1,7 @@ ;;; nnspool.el --- spool access for GNU Emacs ;; Copyright (C) 1988, 1989, 1990, 1993, 1994, 1995, 1996, 1997, 1998, -;; 2000, 2002, 2003 -;; Free Software Foundation, Inc. +;; 2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Masanobu UMEDA ;; Lars Magne Ingebrigtsen @@ -22,8 +21,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -247,7 +246,7 @@ there.") ;; Yes, completely empty spool directories *are* possible. ;; Fix by Sudish Joseph (when (setq dir (directory-files pathname nil "^[0-9]+$" t)) - (setq dir (sort (mapcar 'string-to-int dir) '<))) + (setq dir (sort (mapcar 'string-to-number dir) '<))) (if dir (nnheader-insert "211 %d %d %d %s\n" (length dir) (car dir) @@ -432,7 +431,7 @@ there.") (call-process "grep" nil t nil (regexp-quote id) nnspool-history-file)) (goto-char (point-min)) (when (looking-at "<[^>]+>[ \t]+[-0-9~]+[ \t]+\\([^ /\t\n]+\\)/\\([0-9]+\\)[ \t\n]") - (cons (match-string 1) (string-to-int (match-string 2)))))) + (cons (match-string 1) (string-to-number (match-string 2)))))) (defun nnspool-find-file (file) "Insert FILE in server buffer safely." diff --git a/lisp/nntp.el b/lisp/nntp.el index 38b8c4d..0141fc5 100644 --- a/lisp/nntp.el +++ b/lisp/nntp.el @@ -1,7 +1,8 @@ ;;; nntp.el --- nntp access for Gnus -;; Copyright (C) 1987, 1988, 1989, 1990, 1992, 1993, 1994, 1995, 1996, -;; 1997, 1998, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1987, 1988, 1989, 1990, 1992, 1993, +;; 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002, +;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Katsumi Yamaoka @@ -21,7 +22,8 @@ ;; 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, 675 Mass Ave, Cambridge, MA 02139, USA. +;; Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, +;; MA 02110-1301, USA. ;;; Commentary: @@ -137,8 +139,8 @@ This command is used by the methods `nntp-open-telnet-stream', (defvoo nntp-end-of-line "\r\n" "*String to use on the end of lines when talking to the NNTP server. -This is \"\\r\\n\" by default, but should be \"\\n\" when using and -indirect telnet connection method (nntp-open-via-*-and-telnet).") +This is \"\\r\\n\" by default, but should be \"\\n\" when using an indirect +connection method (nntp-open-via-*).") (defvoo nntp-via-rlogin-command "rsh" "*Rlogin command used to connect to an intermediate host. @@ -220,9 +222,6 @@ then use this hook to rsh to the remote machine and start a proxy NNTP server there that you can connect to. See also `nntp-open-connection-function'") -(defvoo nntp-warn-about-losing-connection t - "*If non-nil, beep when a server closes connection.") - ;; Marks (defvoo nntp-marks-is-evil nil "*If non-nil, Gnus will never generate and use marks file for nntp groups. @@ -235,7 +234,7 @@ See `nnml-marks-is-evil' for more information.") (defcustom nntp-marks-directory (nnheader-concat gnus-directory "marks/") "*The directory where marks for nntp groups will be stored." - :group 'gnus + :group 'nntp :type 'directory) (defcustom nntp-authinfo-file "~/.authinfo" @@ -307,13 +306,20 @@ noticing asynchronous data.") (defvar nntp-async-timer nil) (defvar nntp-async-process-list nil) -(defvar nntp-ssl-program +(defvar nntp-ssl-program "openssl s_client -quiet -ssl3 -connect %s:%p" "A string containing commands for SSL connections. Within a string, %s is replaced with the server address and %p with port number on server. The program should accept IMAP commands on stdin and return responses to stdout.") +(defvar nntp-authinfo-rejected nil +"A custom error condition used to report 'Authentication Rejected' errors. +Condition handlers that match just this condition ensure that the nntp +backend doesn't catch this error.") +(put 'nntp-authinfo-rejected 'error-conditions '(error nntp-authinfo-rejected)) +(put 'nntp-authinfo-rejected 'error-message "Authorization Rejected") + ;;; Internal functions. @@ -364,16 +370,21 @@ be restored and the command retried." (defsubst nntp-wait-for (process wait-for buffer &optional decode discard) "Wait for WAIT-FOR to arrive from PROCESS." + (save-excursion (set-buffer (process-buffer process)) (goto-char (point-min)) + (while (and (or (not (memq (char-after (point)) '(?2 ?3 ?4 ?5))) - (looking-at "480")) + (looking-at "48[02]")) (memq (process-status process) '(open run))) - (when (looking-at "480") - (nntp-handle-authinfo process)) - (when (looking-at "^.*\n") - (delete-region (point) (progn (forward-line 1) (point)))) + (cond ((looking-at "480") + (nntp-handle-authinfo process)) + ((looking-at "482") + (nnheader-report 'nntp (get 'nntp-authinfo-rejected 'error-message)) + (signal 'nntp-authinfo-rejected nil)) + ((looking-at "^.*\n") + (delete-region (point) (progn (forward-line 1) (point))))) (nntp-accept-process-output process) (goto-char (point-min))) (prog1 @@ -469,6 +480,8 @@ be restored and the command retried." (wait-for (nntp-wait-for process wait-for buffer decode)) (t t))) + (nntp-authinfo-rejected + (signal 'nntp-authinfo-rejected (cdr err))) (error (nnheader-report 'nntp "Couldn't open connection to %s: %s" address err)) @@ -594,7 +607,12 @@ be restored and the command retried." ;; a line with only a "." on it. ((eq (char-after) ?2) (if (re-search-forward "\n\\.\r?\n" nil t) - t + (progn + ;; Some broken news servers add another dot at the end. + ;; Protect against inflooping there. + (while (looking-at "^\\.\r?\n") + (forward-line 1)) + t) nil)) ;; A result that starts with a 3xx or 4xx code is terminated ;; by a newline. @@ -656,7 +674,8 @@ command whose response triggered the error." (condition-case nil (progn ,@forms) (quit - (nntp-close-server) + (unless debug-on-quit + (nntp-close-server)) (signal 'quit nil)))) (when timer (nnheader-cancel-timer timer))) @@ -943,7 +962,7 @@ command whose response triggered the error." (if (numberp article) (int-to-string article) article)))) (deffoo nntp-request-group (group &optional server dont-check) - (nntp-with-open-group + (nntp-with-open-group nil server (when (nntp-send-command "^[245].*\n" "GROUP" group) (let ((entry (nntp-find-connection-entry nntp-server-buffer))) @@ -1258,7 +1277,7 @@ password contained in '~/.nntp-authinfo'." (nntp-kill-buffer pbuffer)) (when (and (buffer-name pbuffer) process) - (process-kill-without-query process) + (gnus-set-process-query-on-exit-flag process nil) (if (and (nntp-wait-for process "^2.*\n" buffer nil t) (memq (process-status process) '(open run))) (prog1 @@ -1279,9 +1298,10 @@ password contained in '~/.nntp-authinfo'." (open-network-stream-as-binary "nntpd" buffer nntp-address nntp-port-number)) -(autoload 'format-spec "format") -(autoload 'format-spec-make "format") -(autoload 'open-tls-stream "tls") +(eval-and-compile + (autoload 'format-spec "format-spec") + (autoload 'format-spec-make "format-spec") + (autoload 'open-tls-stream "tls")) (defun nntp-open-ssl-stream (buffer) (let* ((process-connection-type nil) @@ -1293,7 +1313,7 @@ password contained in '~/.nntp-authinfo'." (format-spec-make ?s nntp-address ?p nntp-port-number)))))) - (process-kill-without-query proc) + (gnus-set-process-query-on-exit-flag proc nil) (save-excursion (set-buffer buffer) (let ((nntp-connection-alist (list proc buffer nil))) @@ -1304,7 +1324,7 @@ password contained in '~/.nntp-authinfo'." (defun nntp-open-tls-stream (buffer) (let ((proc (open-tls-stream "nntpd" buffer nntp-address nntp-port-number))) - (process-kill-without-query proc) + (gnus-set-process-query-on-exit-flag proc nil) (save-excursion (set-buffer buffer) (let ((nntp-connection-alist (list proc buffer nil))) @@ -1444,7 +1464,7 @@ password contained in '~/.nntp-authinfo'." ;; that the server has closed the connection. This MUST be ;; handled here as the buffer restored by the save-excursion may ;; be the process's former output buffer (i.e. now killed) - (or (and process + (or (and process (memq (process-status process) '(open run))) (nntp-report "Server closed connection")))) @@ -1625,8 +1645,8 @@ password contained in '~/.nntp-authinfo'." (when (<= count 1) (goto-char (point-min)) (when (re-search-forward "^[0-9][0-9][0-9] .*\n\\([0-9]+\\)" nil t) - (let ((low-limit (string-to-int - (buffer-substring (match-beginning 1) + (let ((low-limit (string-to-number + (buffer-substring (match-beginning 1) (match-end 1))))) (while (and articles (<= (car articles) low-limit)) (setq articles (cdr articles)))))) @@ -1695,7 +1715,7 @@ password contained in '~/.nntp-authinfo'." (goto-char (point-min)) ;; We first find the number by looking at the status line. (let ((number (and (looking-at "2[0-9][0-9] +\\([0-9]+\\) ") - (string-to-int + (string-to-number (buffer-substring (match-beginning 1) (match-end 1))))) newsgroups xref) @@ -1733,7 +1753,7 @@ password contained in '~/.nntp-authinfo'." "\\([^ :]+\\):\\([0-9]+\\)") xref)) (setq group (match-string 1 xref) - number (string-to-int (match-string 2 xref)))) + number (string-to-number (match-string 2 xref)))) ((and (setq newsgroups (mail-fetch-field "newsgroups")) (not (string-match "," newsgroups))) @@ -2055,7 +2075,8 @@ Please refer to the following variables to customize the connection: (make-directory (directory-file-name dir) t) (nnheader-message 5 "Creating nntp marks directory %s" dir)))) -(autoload 'time-less-p "time-date") +(eval-and-compile + (autoload 'time-less-p "time-date")) (defun nntp-marks-changed-p (group server) (let ((file (expand-file-name @@ -2070,7 +2091,7 @@ Please refer to the following variables to customize the connection: (defun nntp-save-marks (group server) (let ((file-name-coding-system nnmail-pathname-coding-system) (file (expand-file-name - nntp-marks-file-name + nntp-marks-file-name (nnmail-group-pathname group (nntp-marks-directory server))))) (condition-case err diff --git a/lisp/nnultimate.el b/lisp/nnultimate.el index b6a6ac0..f682cdc 100644 --- a/lisp/nnultimate.el +++ b/lisp/nnultimate.el @@ -1,6 +1,7 @@ ;;; nnultimate.el --- interfacing with the Ultimate Bulletin Board system -;; Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news @@ -19,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/nnvirtual.el b/lisp/nnvirtual.el index 8fabe99..955b07e 100644 --- a/lisp/nnvirtual.el +++ b/lisp/nnvirtual.el @@ -1,6 +1,7 @@ ;;; nnvirtual.el --- virtual newsgroups access for Gnus -;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: David Moore ;; Lars Magne Ingebrigtsen @@ -21,8 +22,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/nnwarchive.el b/lisp/nnwarchive.el index 57f31e9..dd1440e 100644 --- a/lisp/nnwarchive.el +++ b/lisp/nnwarchive.el @@ -1,5 +1,7 @@ ;;; nnwarchive.el --- interfacing with web archives -;; Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc. + +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Shenghuo Zhu ;; Keywords: news egroups mail-archive @@ -18,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/nnweb.el b/lisp/nnweb.el index 473e5cd..ea12f53 100644 --- a/lisp/nnweb.el +++ b/lisp/nnweb.el @@ -1,6 +1,7 @@ ;;; nnweb.el --- retrieving articles via web search engines -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news @@ -19,8 +20,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -53,17 +54,19 @@ Valid types include `google', `dejanews', and `gmane'.") (defvar nnweb-type-definition '((google - (article . ignore) - (id . "http://groups.google.de/groups?selm=%s&output=gplain") + (id . "http://www.google.com/groups?as_umsgid=%s&hl=en&dmode=source") + (result . "http://groups.google.com/group/%s/msg/%s?dmode=source") + (article . nnweb-google-wash-article) (reference . identity) (map . nnweb-google-create-mapping) (search . nnweb-google-search) - (address . "http://groups.google.de/groups") - (base . "http://groups.google.de") + (address . "http://groups.google.com/groups") + (base . "http://groups.google.com") (identifier . nnweb-google-identity)) (dejanews ;; alias of google - (article . ignore) - (id . "http://groups.google.com/groups?selm=%s&output=gplain") + (id . "http://www.google.com/groups?as_umsgid=%s&hl=en&dmode=source") + (result . "http://groups.google.com/group/%s/msg/%s?dmode=source") + (article . nnweb-google-wash-article) (reference . identity) (map . nnweb-google-create-mapping) (search . nnweb-google-search) @@ -76,7 +79,7 @@ Valid types include `google', `dejanews', and `gmane'.") (reference . identity) (map . nnweb-gmane-create-mapping) (search . nnweb-gmane-search) - (address . "http://gmane.org/") + (address . "http://search.gmane.org/nov.php") (identifier . nnweb-gmane-identity))) "Type-definition alist.") @@ -116,25 +119,20 @@ Valid types include `google', `dejanews', and `gmane'.") (deffoo nnweb-request-scan (&optional group server) (nnweb-possibly-change-server group server) (if nnweb-ephemeral-p - (setq nnweb-hashtb (gnus-make-hashtable 4095))) + (setq nnweb-hashtb (gnus-make-hashtable 4095)) + (unless nnweb-articles + (nnweb-read-overview group))) (funcall (nnweb-definition 'map)) (unless nnweb-ephemeral-p (nnweb-write-active) (nnweb-write-overview group))) (deffoo nnweb-request-group (group &optional server dont-check) - (nnweb-possibly-change-server nil server) - (when (and group - (not (equal group nnweb-group)) - (not nnweb-ephemeral-p)) - (setq nnweb-group group - nnweb-articles nil) - (let ((info (assoc group nnweb-group-alist))) - (when info - (setq nnweb-type (nth 2 info)) - (setq nnweb-search (nth 3 info)) - (unless dont-check - (nnweb-read-overview group))))) + (nnweb-possibly-change-server group server) + (unless (or nnweb-ephemeral-p + dont-check + nnweb-articles) + (nnweb-read-overview group)) (cond ((not nnweb-articles) (nnheader-report 'nnweb "No matching articles")) @@ -198,7 +196,7 @@ Valid types include `google', `dejanews', and `gmane'.") (nnweb-possibly-change-server nil server) (save-excursion (set-buffer nntp-server-buffer) - (nnmail-generate-active nnweb-group-alist) + (nnmail-generate-active (list (assoc server nnweb-group-alist))) t)) (deffoo nnweb-request-update-info (group info &optional server) @@ -210,7 +208,7 @@ Valid types include `google', `dejanews', and `gmane'.") (deffoo nnweb-request-create-group (group &optional server args) (nnweb-possibly-change-server nil server) (nnweb-request-delete-group group) - (push `(,group ,(cons 1 0) ,@args) nnweb-group-alist) + (push `(,group ,(cons 1 0)) nnweb-group-alist) (nnweb-write-active) t) @@ -280,18 +278,16 @@ Valid types include `google', `dejanews', and `gmane'.") def)) (defun nnweb-possibly-change-server (&optional group server) - (nnweb-init server) (when server (unless (nnweb-server-opened server) - (nnweb-open-server server))) + (nnweb-open-server server)) + (nnweb-init server)) (unless nnweb-group-alist (nnweb-read-active)) (unless nnweb-hashtb (setq nnweb-hashtb (gnus-make-hashtable 4095))) (when group - (when (and (not nnweb-ephemeral-p) - (equal group nnweb-group)) - (nnweb-request-group group nil t)))) + (setq nnweb-group group))) (defun nnweb-init (server) "Initialize buffers and such." @@ -305,53 +301,56 @@ Valid types include `google', `dejanews', and `gmane'.") (current-buffer)))))) ;;; -;;; Deja bought by google.com +;;; groups.google.com ;;; (defun nnweb-google-wash-article () - (let ((case-fold-search t) url) - (goto-char (point-min)) - (re-search-forward "^
" nil t)
-    (narrow-to-region (point-min) (point))
-    (search-backward "\n *")
+	(end-re "\n *"))
     (goto-char (point-min))
-    (while (search-forward "
" nil t)
-      (replace-match "\n"))
-    (mm-url-remove-markup)
-    (goto-char (point-min))
-    (while (re-search-forward "^[ \t]*\n" nil t)
-      (replace-match ""))
-    (goto-char (point-max))
-    (insert "\n")
-    (widen)
-    (narrow-to-region (point) (point-max))
-    (search-forward "" nil t)
-    (delete-region (point) (point-max))
-    (mm-url-remove-markup)
-    (widen)))
+    (if (save-excursion
+	  (or (re-search-forward "The requested message.*could not be found."
+				 nil t)
+	      (not (and (re-search-forward start-re nil t)
+			(re-search-forward end-re nil t)))))
+	;; FIXME: Don't know how to indicate "not found".
+	;; Should this function throw an error?  --rsteib
+	(progn
+	  (gnus-message 3 "Requested article not found")
+	  (erase-buffer))
+      (delete-region (point-min)
+		     (re-search-forward start-re))
+      (goto-char (point-min))
+      (delete-region (progn
+		       (re-search-forward end-re)
+		       (match-beginning 0))
+		     (point-max))
+      (mm-url-decode-entities))))
 
 (defun nnweb-google-parse-1 (&optional Message-ID)
+  "Parse search result in current buffer."
   (let ((i 0)
 	(case-fold-search t)
 	(active (cadr (assoc nnweb-group nnweb-group-alist)))
 	Subject Score Date Newsgroups From
 	map url mid)
     (unless active
-      (push (list nnweb-group (setq active (cons 1 0))
-		  nnweb-type nnweb-search)
+      (push (list nnweb-group (setq active (cons 1 0)))
 	    nnweb-group-alist))
     ;; Go through all the article hits on this page.
     (goto-char (point-min))
-    (while (re-search-forward
-	    "a href=/groups\\(\\?[^ \">]*selm=\\([^ &\">]+\\)\\)" nil t)
-      (setq mid (match-string 2)
+    (while
+	(re-search-forward
+	 "a +href=\"/group/\\([^>\"]+\\)/browse_thread/[^>]+#\\([0-9a-f]+\\)"
+	 nil t)
+      (setq Newsgroups (match-string-no-properties 1)
+	    ;; Note: Starting with Google Groups 2, `mid' is a Google-internal
+	    ;; ID, not a proper Message-ID.
+	    mid (match-string-no-properties 2)
 	    url (format
-		 (nnweb-definition 'id) mid))
+		 (nnweb-definition 'result) Newsgroups mid))
       (narrow-to-region (search-forward ">" nil t)
 			(search-forward "" nil t))
       (mm-url-remove-markup)
@@ -359,25 +358,22 @@ Valid types include `google', `dejanews', and `gmane'.")
       (setq Subject (buffer-string))
       (goto-char (point-max))
       (widen)
-      (forward-line 2)
-      (when (looking-at "
]+>")
-	(goto-char (match-end 0)))
-      (if (not (looking-at "]+>"))
-	  (skip-chars-forward " \t")
-	(narrow-to-region (point)
-			  (search-forward "" nil t))
-	(mm-url-remove-markup)
-	(mm-url-decode-entities)
-	(setq Newsgroups (buffer-string))
-	(goto-char (point-max))
-	(widen)
-	(skip-chars-forward "- \t"))
+      (narrow-to-region (point)
+			(search-forward "]+\\).*Next" nil t))
+			"\" \n\t]+\\)[^<]*]+next"
+			nil t))
 		  (>= i nnweb-max-hits))
 	      (setq more nil)
 	    ;; Yup, there are more articles
 	    (setq more (concat (nnweb-definition 'base) (match-string 1)))
 	    (when more
 	      (erase-buffer)
+	      (nnheader-message 7 "Searching google...(%d)" i)
 	      (mm-url-insert more))))
 	;; Return the articles in the right order.
+	(nnheader-message 7 "Searching google...done")
 	(setq nnweb-articles
 	      (sort nnweb-articles 'car-less-than-car))))))
 
@@ -442,7 +442,8 @@ Valid types include `google', `dejanews', and `gmane'.")
        ("hl" . "en")
        ("lr" . "")
        ("safe" . "off")
-       ("sites" . "groups")))))
+       ("sites" . "groups")
+       ("filter" . "0")))))
   t)
 
 (defun nnweb-google-identity (url)
@@ -458,46 +459,61 @@ Valid types include `google', `dejanews', and `gmane'.")
   "Perform the search and create a number-to-url alist."
   (save-excursion
     (set-buffer nnweb-buffer)
-    (erase-buffer)
-    (when (funcall (nnweb-definition 'search) nnweb-search)
-      (let ((more t)
-	    (case-fold-search t)
-	    (active (or (cadr (assoc nnweb-group nnweb-group-alist))
-			(cons 1 0)))
-	    subject group url
-	    map)
-	  ;; Remove stuff from the beginning of results
-	(goto-char (point-min))
-	(search-forward "Search Results
    " nil t)
-	(delete-region (point-min) (point))
+    (let ((case-fold-search t)
+	  (active (or (cadr (assoc nnweb-group nnweb-group-alist))
+		      (cons 1 0)))
+	  map)
+      (erase-buffer)
+      (nnheader-message 7 "Searching Gmane..." )
+      (when (funcall (nnweb-definition 'search) nnweb-search)
 	(goto-char (point-min))
-	;; Iterate over the actual hits
-	(while (re-search-forward ".*href=\"\\([^\"]+\\)\">\\(.*\\)" nil t)
-	    (setq url (concat "http://gmane.org/" (match-string 1)))
-	    (setq subject (match-string 2))
-	  (unless (nnweb-get-hashtb url)
-	    (push
-	     (list
-	      (incf (cdr active))
-	      (make-full-mail-header
-	       (cdr active) (concat  "(" group ") " subject) nil nil
-	       nil nil 0 0 url))
-	     map)
-	    (nnweb-set-hashtb (cadar map) (car map))))
-	;; Return the articles in the right order.
-	(setq nnweb-articles
-	      (sort (nconc nnweb-articles map) 'car-less-than-car))))))
+	;; Skip the status line
+	(forward-line 1)
+	;; Thanks to Olly Betts we now have NOV lines in our buffer!
+	(while (not (eobp))
+	  (unless (or (eolp) (looking-at "\x0d"))
+	    (let ((header (nnheader-parse-nov)))
+	      (let ((xref (mail-header-xref header))
+		    (from (mail-header-from header))
+		    (subject (mail-header-subject header))
+		    (rfc2047-encoding-type 'mime))
+		(when (string-match " \\([^:]+\\):\\([0-9]+\\)" xref)
+		  (mail-header-set-xref
+		   header
+		   (format "http://article.gmane.org/%s/%s/raw"
+			   (match-string 1 xref)
+			   (match-string 2 xref))))
+
+		;; Add host part to gmane-encrypted addresses
+		(when (string-match "@$" from)
+		  (mail-header-set-from header
+					(concat from "public.gmane.org")))
+
+		(mail-header-set-subject header
+					 (rfc2047-encode-string subject))
+
+		(unless (nnweb-get-hashtb (mail-header-xref header))
+		  (push
+		   (list
+		    (incf (cdr active))
+		    header)
+		   map)
+		  (nnweb-set-hashtb (cadar map) (car map))))))
+	  (forward-line 1)))
+      (nnheader-message 7 "Searching Gmane...done")
+      (setq nnweb-articles
+	    (sort (nconc nnweb-articles map) 'car-less-than-car)))))
 
 (defun nnweb-gmane-wash-article ()
   (let ((case-fold-search t))
     (goto-char (point-min))
-    (search-forward "" nil t)
-    (delete-region (point-min) (point))
-    (goto-char (point-min))
-    (while (looking-at "^
  • \\([^ ]+\\).*
    • ")
-      (replace-match "\\1\\2" t)
-      (forward-line 1))
-    (mm-url-remove-markup)))
+    (when (search-forward "" nil t)
+      (delete-region (point-min) (point))
+      (goto-char (point-min))
+      (while (looking-at "^
  • \\([^ ]+\\).*
    • ")
+	(replace-match "\\1\\2" t)
+	(forward-line 1))
+      (mm-url-remove-markup))))
 
 (defun nnweb-gmane-search (search)
   (mm-url-insert
@@ -505,11 +521,13 @@ Valid types include `google', `dejanews', and `gmane'.")
     (nnweb-definition 'address)
     "?"
     (mm-url-encode-www-form-urlencoded
-     `(("query" . ,search)))))
+     `(("query" . ,search)
+       ("HITSPERPAGE" . ,(number-to-string nnweb-max-hits))))))
   (setq buffer-file-name nil)
+  (set-buffer-multibyte t)
+  (mm-decode-coding-region (point-min) (point-max) 'utf-8)
   t)
 
-
 (defun nnweb-gmane-identity (url)
   "Return a unique identifier based on URL."
   (if (string-match "group=\\(.+\\)" url)
diff --git a/lisp/nnwfm.el b/lisp/nnwfm.el
index 7731e59..1b17d21 100644
--- a/lisp/nnwfm.el
+++ b/lisp/nnwfm.el
@@ -1,5 +1,7 @@
 ;;; nnwfm.el --- interfacing with a web forum
-;; Copyright (C) 2000 Free Software Foundation, Inc.
+
+;; Copyright (C) 2000, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen 
 ;; Keywords: news
@@ -18,8 +20,8 @@
 
 ;; 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.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
diff --git a/lisp/parse-time.el b/lisp/parse-time.el
index 34dd3fd..2e73cd5 100644
--- a/lisp/parse-time.el
+++ b/lisp/parse-time.el
@@ -1,6 +1,7 @@
 ;;; parse-time.el --- Parsing time strings
 
-;; Copyright (C) 1996, 2000, 2002 by Free Software Foundation, Inc.
+;; Copyright (C) 1996, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;;   Free Software Foundation, Inc.
 
 ;; Author: Erik Naggum 
 ;; Keywords: util
@@ -19,8 +20,8 @@
 
 ;; 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.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
diff --git a/lisp/password.el b/lisp/password.el
index 00defc2..28e6d1e 100644
--- a/lisp/password.el
+++ b/lisp/password.el
@@ -1,6 +1,6 @@
 ;;; password.el --- Read passwords from user, possibly using a password cache.
 
-;; Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson 
 ;; Created: 2003-12-21
@@ -20,8 +20,8 @@
 
 ;; 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.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -79,21 +79,29 @@ Whether passwords are cached at all is controlled by `password-cache'."
 
 (defvar password-data (make-vector 7 0))
 
+(defun password-read-from-cache (key)
+  "Obtain passphrase for KEY from time-limited passphrase cache.
+Custom variables `password-cache' and `password-cache-expiry'
+regulate cache behavior."
+  (and password-cache
+       key
+       (symbol-value (intern-soft key password-data))))
+
 (defun password-read (prompt &optional key)
   "Read password, for use with KEY, from user, or from cache if wanted.
 KEY indicate the purpose of the password, so the cache can
 separate passwords.  The cache is not used if KEY is nil.  It is
 typically a string.
 The variable `password-cache' control whether the cache is used."
-  (or (and password-cache
-	   key
-	   (symbol-value (intern-soft key password-data)))
+  (or (password-read-from-cache key)
       (read-passwd prompt)))
 
 (defun password-read-and-add (prompt &optional key)
   "Read password, for use with KEY, from user, or from cache if wanted.
 Then store the password in the cache.  Uses `password-read' and
-`password-cache-add'."
+`password-cache-add'.
+Custom variables `password-cache' and `password-cache-expiry'
+regulate cache behavior."
   (let ((password (password-read prompt key)))
     (when (and password key)
       (password-cache-add key password))
@@ -122,6 +130,11 @@ seconds."
   (set (intern key password-data) password)
   nil)
 
+(defun password-reset ()
+  "Clear the password cache."
+  (interactive)
+  (fillarray password-data 0))
+
 (provide 'password)
 
 ;;; password.el ends here
diff --git a/lisp/pop3.el b/lisp/pop3.el
index f9c73a0..60ede15 100644
--- a/lisp/pop3.el
+++ b/lisp/pop3.el
@@ -1,7 +1,7 @@
 ;;; pop3.el --- Post Office Protocol (RFC 1460) interface
 
-;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-;;        Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Richard L. Pieri 
 ;;      Daiki Ueno  
@@ -23,8 +23,8 @@
 
 ;; 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.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -37,10 +37,15 @@
 
 ;;; Gnus:
 
-;; You can use this program for Gnus, without needing any modification.
-;; There are two ways to do that; one is to replace Gnus' pop3.el with
-;; it when installing Gnus; the other is to replace Gnus' pop3.el which
-;; has been installed with this module and byte-compile it.
+;; Put something like the following line in your ~/.gnus.el file if
+;; you'd like to use this module together with Gnus, not T-gnus.
+;;
+;;(eval-after-load "mail-source" '(require 'pop3))
+;;
+;; There are two ways to install this module; one is to replace
+;; pop3.el of the Gnus version with this module when installing Gnus;
+;; the other is to replace pop3.el of the Gnus version which has been
+;; installed with this module and byte-compile it.
 
 ;; Note: you should not modify the value for the `pop' section of the
 ;; `mail-source-keyword-map' variable.
@@ -79,7 +84,7 @@
 (require 'mail-utils)
 
 (defgroup pop3 nil
-  "Post Office Protocol"
+  "Post Office Protocol."
   :group 'mail
   :group 'mail-source)
 
@@ -123,11 +128,11 @@
 
 (defcustom pop3-authentication-scheme 'pass
   "*POP3 authentication scheme.
-Defaults to 'pass, for the standard USER/PASS authentication.  Other valid
-values are 'apop."
-  :version "22.1" ;; Oort Gnus
-  :type '(choice (const :tag "USER/PASS" pass)
+Defaults to `pass', for the standard USER/PASS authentication.  The other
+valid value is 'apop'."
+  :type '(choice (const :tag "Normal user/password" pass)
 		 (const :tag "APOP" apop))
+  :version "22.1" ;; Oort Gnus
   :group 'pop3)
 
 (defcustom pop3-leave-mail-on-server nil
@@ -301,6 +306,19 @@ Shorter values mean quicker response, but are more CPU intensive.")
     (pop3-quit process)
     message-count))
 
+(defcustom pop3-stream-type nil
+  "*Transport security type for POP3 connexions.
+This may be either nil (plain connexion), `ssl' (use an
+SSL/TSL-secured stream) or `starttls' (use the starttls mechanism
+to turn on TLS security after opening the stream).  However, if
+this is nil, `ssl' is assumed for connexions to port
+995 (pop3s)."
+  :version "23.0" ;; No Gnus
+  :group 'pop3
+  :type '(choice (const :tag "Plain" nil)
+		 (const :tag "SSL/TLS" ssl)
+		 (const starttls)))
+
 (defun pop3-open-server (mailhost port)
   "Open TCP connection to MAILHOST on PORT.
 Returns the process associated with the connection.
@@ -314,10 +332,21 @@ Argument PORT specifies connecting port."
       (setq
        process
        (cond
-	((eq pop3-connection-type 'ssl)
+	((or (eq pop3-connection-type 'ssl)
+	     (eq pop3-stream-type 'ssl)
+	     (and (not pop3-stream-type) (member port '(995 "pop3s"))))
+	 ;; gnutls-cli, openssl don't accept service names
+	 (if (or (equal port "pop3s")
+		 (null port))
+	     (setq port 995))
 	 (pop3-open-ssl-stream "POP" (current-buffer) mailhost port))
-	((eq pop3-connection-type 'tls)
-	 (pop3-open-tls-stream "POP" (current-buffer) mailhost port))
+	((or (memq pop3-connection-type '(tls starttls))
+	     (memq pop3-stream-type '(tls starttls)))
+	 ;; gnutls-cli, openssl don't accept service names
+	 (if (equal port "pop3")
+	     (setq port 110))
+	 (pop3-open-tls-stream "POP" (current-buffer)
+			       mailhost (or port 110)))
 	(t
 	 (let ((coding-system-for-read 'binary)
 	       (coding-system-for-write 'binary))
@@ -341,6 +370,7 @@ Argument PORT specifies connecting port."
 	    "-connect" ,(format "%s:%d" host service)))
 	 (process (open-ssl-stream name buffer host service)))
     (when process
+      ;; There's a load of info printed that needs deleting.
       (with-current-buffer buffer
 	(goto-char (point-min))
 	(while (and (memq (process-status process) '(open run))
@@ -476,6 +506,8 @@ If NOW, use that time instead."
 	    ;; Date: 08 Jul 1996 23:22:24 -0400
 	    ;; should be
 	    ;; Tue Jul 9 09:04:21 1996
+
+	    ;; Fixme: This should use timezone on the date field contents.
 	    (setq date
 		  (cond ((not date)
 			 "Tue Jan 1 00:00:0 1900")
@@ -603,7 +635,7 @@ If NOW, use that time instead."
   (pop3-send-command process (format "USER %s" user))
   (let ((response (pop3-read-response process t)))
     (if (not (and response (string-match "+OK" response)))
-	(error (format "USER %s not valid" user)))))
+	(error "USER %s not valid" user))))
 
 (defun pop3-pass (process)
   "Send authentication information to the server."
@@ -640,8 +672,8 @@ If NOW, use that time instead."
   "Return the number of messages in the maildrop and the maildrop's size."
   (pop3-send-command process "STAT")
   (let ((response (pop3-read-response process t)))
-    (list (string-to-int (nth 1 (split-string response " ")))
-	  (string-to-int (nth 2 (split-string response " "))))))
+    (list (string-to-number (nth 1 (split-string response " ")))
+	  (string-to-number (nth 2 (split-string response " "))))))
 
 (defun pop3-retr (process msg crashbuf)
   "Retrieve message-id MSG to buffer CRASHBUF."
@@ -667,7 +699,7 @@ If NOW, use that time instead."
   "Return highest accessed message-id number for the session."
   (pop3-send-command process "LAST")
   (let ((response (pop3-read-response process t)))
-    (string-to-int (nth 1 (split-string response " ")))))
+    (string-to-number (nth 1 (split-string response " ")))))
 
 (defun pop3-rset (process)
   "Remove all delete marks from current maildrop."
@@ -712,7 +744,7 @@ where
 	  (apply 'narrow-to-region (pop3-get-extended-response process))
 	  (goto-char (point-min))
 	  (while (looking-at "\\([^ \n\t]*\\) \\([^ \n\t]*\\)")
-	    (setq msgno (string-to-int (match-string 1))
+	    (setq msgno (string-to-number (match-string 1))
 		  uidl (match-string 2))
 	    (push (cons msgno uidl) pairs)
 	    (beginning-of-line 2))
@@ -741,8 +773,8 @@ where
 	  (apply 'narrow-to-region (pop3-get-extended-response process))
 	  (goto-char (point-min))
 	  (while (looking-at "\\([^ \n\t]*\\) \\([^ \n\t]*\\)")
-	    (setq msgno (string-to-int (match-string 1))
-		  len (string-to-int (match-string 2)))
+	    (setq msgno (string-to-number (match-string 1))
+		  len (string-to-number (match-string 2)))
 	    (push (cons msgno len) pairs)
 	    (beginning-of-line 2))
 	  (cons (length pairs) (nreverse pairs)))))))
@@ -822,6 +854,13 @@ to `mail-sources' while fetching mails with Gnus."
 ;;  +OK [negotiation is ready]
 ;;  -ERR [security layer is already active]
 
+;; STLS      (RFC 2595)
+;; Arguments: none
+;; Restrictions: Only permitted in AUTHORIZATION state.
+;; Possible responses:
+;;  +OK
+;;  -ERR
+
 ;;; TRANSACTION STATE
 
 ;; STAT
diff --git a/lisp/qp.el b/lisp/qp.el
index e458dc2..37bef26 100644
--- a/lisp/qp.el
+++ b/lisp/qp.el
@@ -1,7 +1,7 @@
 ;;; qp.el --- Quoted-Printable functions
 
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005
-;;        Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen 
 ;; Keywords: mail, extensions
@@ -20,8 +20,8 @@
 
 ;; 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.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -69,7 +69,7 @@ them into characters should be done separately."
 	  (cond ((eq (char-after (1+ (point))) ?\n)
 		 (delete-char 2))
 		((looking-at "=[0-9A-F][0-9A-F]")
-		 (let ((byte (string-to-int (buffer-substring (1+ (point))
+		 (let ((byte (string-to-number (buffer-substring (1+ (point))
 							      (+ 3 (point)))
 					    16)))
 		   (mm-insert-byte byte 1)
@@ -118,7 +118,7 @@ encode lines starting with \"From\"."
 		  (not (eobp)))
 	(insert
 	 (prog1
-	     ;; To unibyte in case of Emacs 22 eight-bit.
+	     ;; To unibyte in case of Emacs 23 (unicode) eight-bit.
 	     (format "=%02X" (mm-multibyte-char-to-unibyte (char-after)))
 	   (delete-char 1))))
       ;; Encode white space at the end of lines.
diff --git a/lisp/read-passwd.el b/lisp/read-passwd.el
index 4542604..694214e 100644
--- a/lisp/read-passwd.el
+++ b/lisp/read-passwd.el
@@ -21,8 +21,8 @@
 
 ;; 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.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 ;;
 ;;
 (require 'mail-source)
diff --git a/lisp/rfc1843.el b/lisp/rfc1843.el
index 16260cb..39f3c58 100644
--- a/lisp/rfc1843.el
+++ b/lisp/rfc1843.el
@@ -1,5 +1,7 @@
 ;;; rfc1843.el --- HZ (rfc1843) decoding
-;; Copyright (c) 1998, 1999, 2000, 2003 Free Software Foundation, Inc.
+
+;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004,
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Shenghuo Zhu 
 ;; Keywords: news HZ HZ+ mail i18n
@@ -18,8 +20,8 @@
 
 ;; 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.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -35,6 +37,10 @@
 (eval-when-compile (require 'cl))
 (require 'mm-util)
 
+(defvar gnus-decode-encoded-word-function)
+(defvar gnus-decode-header-function)
+(defvar gnus-newsgroup-name)
+
 (defvar rfc1843-word-regexp
   "~\\({\\([\041-\167][\041-\176]\\| \\)+\\)\\(~}\\|$\\)")
 
@@ -143,8 +149,7 @@ ftp://ftp.math.psu.edu/pub/simpson/chinese/hzp/hzp.doc"
 	  (let* ((inhibit-point-motion-hooks t)
 		 (case-fold-search t)
 		 (ct (message-fetch-field "Content-Type" t))
-		 (ctl (and ct (ignore-errors
-				(mail-header-parse-content-type ct)))))
+		 (ctl (and ct (mail-header-parse-content-type ct))))
 	    (if (and ctl (not (string-match "/" (car ctl))))
 		(setq ctl nil))
 	    (goto-char (point-max))
diff --git a/lisp/rfc2045.el b/lisp/rfc2045.el
index ba3116b..246e159 100644
--- a/lisp/rfc2045.el
+++ b/lisp/rfc2045.el
@@ -1,6 +1,7 @@
 ;;; rfc2045.el --- Functions for decoding rfc2045 headers
 
-;; Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004,
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen 
 ;; This file is part of GNU Emacs.
@@ -17,8 +18,8 @@
 
 ;; 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.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;; RFC 2045 is: "Multipurpose Internet Mail Extensions (MIME) Part
 ;; One:  Format of Internet Message Bodies".
diff --git a/lisp/rfc2047.el b/lisp/rfc2047.el
index d45987f..b0d2bdc 100644
--- a/lisp/rfc2047.el
+++ b/lisp/rfc2047.el
@@ -1,7 +1,7 @@
 ;;; rfc2047.el --- functions for encoding and decoding rfc2047 messages
 
-;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, 2005
-;;        Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004,
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen 
 ;;	MORIOKA Tomohiko 
@@ -19,8 +19,8 @@
 
 ;; 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.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -783,6 +783,82 @@ it, put the following line in your ~/.gnus.el file:
 (defvar rfc2047-quote-decoded-words-containing-tspecials nil
   "If non-nil, quote decoded words containing special characters.")
 
+(defvar rfc2047-allow-incomplete-encoded-text t
+  "*Non-nil means allow incomplete encoded-text in successive encoded-words.
+Dividing of encoded-text in the place other than character boundaries
+violates RFC2047 section 5, while we have a capability to decode it.
+If it is non-nil, the decoder will decode B- or Q-encoding in each
+encoded-word, concatenate them, and decode it by charset.  Otherwise,
+the decoder will fully decode each encoded-word before concatenating
+them.")
+
+(defun rfc2047-charset-to-coding-system (charset)
+  "Return coding-system corresponding to MIME CHARSET.
+If your Emacs implementation can't decode CHARSET, return nil."
+  (when (stringp charset)
+    (setq charset (intern (downcase charset))))
+  (when (or (not charset)
+	    (eq 'gnus-all mail-parse-ignored-charsets)
+	    (memq 'gnus-all mail-parse-ignored-charsets)
+	    (memq charset mail-parse-ignored-charsets))
+    (setq charset mail-parse-charset))
+  (let ((cs (mm-charset-to-coding-system charset)))
+    (cond ((eq cs 'ascii)
+	   (setq cs (or (mm-charset-to-coding-system mail-parse-charset)
+			'raw-text)))
+	  ((mm-coding-system-p cs))
+	  ((and charset
+		(listp mail-parse-ignored-charsets)
+		(memq 'gnus-unknown mail-parse-ignored-charsets))
+	   (setq cs (mm-charset-to-coding-system mail-parse-charset))))
+    (if (eq cs 'ascii)
+	'raw-text
+      cs)))
+
+(defun rfc2047-decode-encoded-words (words)
+  "Decode successive encoded-words in WORDS and return a decoded string.
+Each element of WORDS looks like (CHARSET ENCODING ENCODED-TEXT
+ENCODED-WORD)."
+  (let (word charset cs encoding text rest)
+    (while words
+      (setq word (pop words))
+      (if (and (setq cs (rfc2047-charset-to-coding-system
+			 (setq charset (car word))))
+	       (condition-case code
+		   (cond ((char-equal ?B (nth 1 word))
+			  (setq text (base64-decode-string
+				      (rfc2047-pad-base64 (nth 2 word)))))
+			 ((char-equal ?Q (nth 1 word))
+			  (setq text (quoted-printable-decode-string
+				      (mm-subst-char-in-string
+				       ?_ ?  (nth 2 word) t)))))
+		 (error
+		  (message "%s" (error-message-string code))
+		  nil)))
+	  (if (and rfc2047-allow-incomplete-encoded-text
+		   (eq cs (caar rest)))
+	      ;; Concatenate text of which the charset is the same.
+	      (setcdr (car rest) (concat (cdar rest) text))
+	    (push (cons cs text) rest))
+	;; Don't decode encoded-word.
+	(push (cons nil (nth 3 word)) rest)))
+    (while rest
+      (setq words (concat
+		   (or (and (setq cs (caar rest))
+			    (condition-case code
+				(mm-decode-coding-string (cdar rest) cs)
+			      (error
+			       (message "%s" (error-message-string code))
+			       nil)))
+		       (concat (when (cdr rest) " ")
+			       (cdar rest)
+			       (when (and words
+					  (not (eq (string-to-char words) ? )))
+				 " ")))
+		   words)
+	    rest (cdr rest)))
+    words))
+
 ;; Fixme: This should decode in place, not cons intermediate strings.
 ;; Also check whether it needs to worry about delimiting fields like
 ;; encoding.
@@ -797,32 +873,32 @@ it, put the following line in your ~/.gnus.el file:
   "Decode MIME-encoded words in region between START and END."
   (interactive "r")
   (let ((case-fold-search t)
-	b e)
+	(eword-regexp (eval-when-compile
+			;; Ignore whitespace between encoded-words.
+			(concat "[\n\t ]*\\(" rfc2047-encoded-word-regexp
+				"\\)")))
+	b e match words)
     (save-excursion
       (save-restriction
 	(narrow-to-region start end)
-	(goto-char (point-min))
-	;; Remove whitespace between encoded words.
-	(while (re-search-forward
-		(eval-when-compile
-		  (concat "\\(" rfc2047-encoded-word-regexp "\\)"
-			  "\\(\n?[ \t]\\)+"
-			  "\\(" rfc2047-encoded-word-regexp "\\)"))
-		nil t)
-	  (delete-region (goto-char (match-end 1)) (match-beginning 6)))
-	;; Decode the encoded words.
-	(setq b (goto-char (point-min)))
-	(while (re-search-forward rfc2047-encoded-word-regexp nil t)
-	  (setq e (match-beginning 0))
-	  (insert (rfc2047-parse-and-decode
-		   (prog1
-		       (match-string 0)
-		     (delete-region e (match-end 0)))))
-	  (while (looking-at rfc2047-encoded-word-regexp)
-	    (insert (rfc2047-parse-and-decode
-		     (prog1
-			 (match-string 0)
-		       (delete-region (point) (match-end 0))))))
+	(goto-char (setq b start))
+	;; Look for the encoded-words.
+	(while (setq match (re-search-forward eword-regexp nil t))
+	  (setq e (match-beginning 1)
+		end (match-end 0)
+		words nil)
+	  (while match
+	    (push (list (match-string 2) ;; charset
+			(char-after (match-beginning 3)) ;; encoding
+			(match-string 4) ;; encoded-text
+			(match-string 1)) ;; encoded-word
+		  words)
+	    ;; Look for the subsequent encoded-words.
+	    (when (setq match (looking-at eword-regexp))
+	      (goto-char (setq end (match-end 0)))))
+	  ;; Replace the encoded-words with the decoded one.
+	  (delete-region e end)
+	  (insert (rfc2047-decode-encoded-words (nreverse words)))
 	  (save-restriction
 	    (narrow-to-region e (point))
 	    (goto-char e)
@@ -928,21 +1004,6 @@ it, put the following line in your ~/.gnus.el file:
 	    (mm-decode-coding-string string mail-parse-charset))
 	(mm-string-as-multibyte string)))))
 
-(defun rfc2047-parse-and-decode (word)
-  "Decode WORD and return it if it is an encoded word.
-Return WORD if it is not not an encoded word or if the charset isn't
-decodable."
-  (if (not (string-match rfc2047-encoded-word-regexp word))
-      word
-    (or
-     (condition-case nil
-	 (rfc2047-decode
-	  (match-string 1 word)
-	  (string-to-char (match-string 2 word))
-	  (match-string 3 word))
-       (error word))
-     word)))				; un-decodable
-
 (defun rfc2047-pad-base64 (string)
   "Pad STRING to quartets."
   ;; Be more liberal to accept buggy base64 strings. If
@@ -958,36 +1019,6 @@ decodable."
       (2 (concat string "=="))
       (3 (concat string "=")))))
 
-(defun rfc2047-decode (charset encoding string)
-  "Decode STRING from the given MIME CHARSET in the given ENCODING.
-Valid ENCODINGs are the characters \"B\" and \"Q\".
-If your Emacs implementation can't decode CHARSET, return nil."
-  (if (stringp charset)
-      (setq charset (intern (downcase charset))))
-  (if (or (not charset)
-	  (eq 'gnus-all mail-parse-ignored-charsets)
-	  (memq 'gnus-all mail-parse-ignored-charsets)
-	  (memq charset mail-parse-ignored-charsets))
-      (setq charset mail-parse-charset))
-  (let ((cs (mm-charset-to-coding-system charset)))
-    (if (and (not cs) charset
-	     (listp mail-parse-ignored-charsets)
-	     (memq 'gnus-unknown mail-parse-ignored-charsets))
-	(setq cs (mm-charset-to-coding-system mail-parse-charset)))
-    (when cs
-      (when (eq cs 'ascii)
-	(setq cs (or mail-parse-charset 'raw-text)))
-      (mm-decode-coding-string
-       (cond
-	((char-equal ?B encoding)
-	 (base64-decode-string
-	  (rfc2047-pad-base64 string)))
-	((char-equal ?Q encoding)
-	 (quoted-printable-decode-string
-	  (mm-subst-char-in-string ?_ ? string t)))
-	(t (error "Invalid encoding: %c" encoding)))
-       cs))))
-
 (provide 'rfc2047)
 
 ;;; rfc2047.el ends here
diff --git a/lisp/rfc2104.el b/lisp/rfc2104.el
index 5496a4f..2bafee8 100644
--- a/lisp/rfc2104.el
+++ b/lisp/rfc2104.el
@@ -1,5 +1,7 @@
 ;;; rfc2104.el --- RFC2104 Hashed Message Authentication Codes
-;; Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+
+;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004,
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson 
 ;; Keywords: mail
@@ -18,8 +20,8 @@
 
 ;; 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.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
diff --git a/lisp/rfc2231.el b/lisp/rfc2231.el
index 444ca0b..fe4460b 100644
--- a/lisp/rfc2231.el
+++ b/lisp/rfc2231.el
@@ -1,7 +1,7 @@
 ;;; rfc2231.el --- Functions for decoding rfc2231 headers
 
-;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004
-;;        Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen 
 ;; This file is part of GNU Emacs.
@@ -18,8 +18,8 @@
 
 ;; 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.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -41,20 +41,51 @@
 N.B.  This is in violation with RFC2047, but it seem to be in common use."
   (rfc2231-parse-string (rfc2047-decode-string string)))
 
-(defun rfc2231-parse-string (string)
+(defun rfc2231-parse-string (string &optional signal-error)
   "Parse STRING and return a list.
 The list will be on the form
- `(name (attribute . value) (attribute . value)...)"
+ `(name (attribute . value) (attribute . value)...)'.
+
+If the optional SIGNAL-ERROR is non-nil, signal an error when this
+function fails in parsing of parameters.  Otherwise, this function
+must never cause a Lisp error."
   (with-temp-buffer
     (let ((ttoken (ietf-drums-token-to-list ietf-drums-text-token))
 	  (stoken (ietf-drums-token-to-list ietf-drums-tspecials))
 	  (ntoken (ietf-drums-token-to-list "0-9"))
-	  (prev-value "")
-	  display-name mailbox c display-string parameters
-	  attribute value type subtype number encoded
-	  prev-attribute)
-      (ietf-drums-init (mail-header-remove-whitespace
-			(mail-header-remove-comments string)))
+	  c type attribute encoded number prev-attribute vals
+	  prev-encoded parameters value)
+      (ietf-drums-init
+       (condition-case nil
+	   (mail-header-remove-whitespace
+	    (mail-header-remove-comments string))
+	 ;; The most likely cause of an error is unbalanced parentheses
+	 ;; or double-quotes.  If all parentheses and double-quotes are
+	 ;; quoted meaninglessly with backslashes, removing them might
+	 ;; make it parseable.  Let's try...
+	 (error
+	  (let (mod)
+	    (when (and (string-match "\\\\\"" string)
+		       (not (string-match "\\`\"\\|[^\\]\"" string)))
+	      (setq string (mm-replace-in-string string "\\\\\"" "\"")
+		    mod t))
+	    (when (and (string-match "\\\\(" string)
+		       (string-match "\\\\)" string)
+		       (not (string-match "\\`(\\|[^\\][()]" string)))
+	      (setq string (mm-replace-in-string string "\\\\\\([()]\\)" "\\1")
+		    mod t))
+	    (or (and mod
+		     (ignore-errors
+		       (mail-header-remove-whitespace
+			(mail-header-remove-comments string))))
+		;; Finally, attempt to extract only type.
+		(if (string-match
+		     (concat "\\`[\t\n ]*\\([^" ietf-drums-tspecials "\t\n ]+"
+			     "\\(?:/[^" ietf-drums-tspecials
+			     "\t\n ]+\\)?\\)\\(?:[\t\n ;]\\|\\'\\)")
+		     string)
+		    (match-string 1 string)
+		  ""))))))
       (let ((table (copy-syntax-table ietf-drums-syntax-table)))
 	(modify-syntax-entry ?\' "w" table)
 	(modify-syntax-entry ?* " " table)
@@ -66,115 +97,160 @@ The list will be on the form
 	(set-syntax-table table))
       (setq c (char-after))
       (when (and (memq c ttoken)
-		 (not (memq c stoken)))
-	(setq type (downcase (buffer-substring
-			      (point) (progn (forward-sexp 1) (point)))))
+		 (not (memq c stoken))
+		 (setq type (ignore-errors
+			      (downcase
+			       (buffer-substring (point) (progn
+							   (forward-sexp 1)
+							   (point)))))))
 	;; Do the params
-	(while (not (eobp))
-	  (setq c (char-after))
-	  (unless (eq c ?\;)
-	    (error "Invalid header: %s" string))
-	  (forward-char 1)
-	  ;; If c in nil, then this is an invalid header, but
-	  ;; since elm generates invalid headers on this form,
-	  ;; we allow it.
-	  (when (setq c (char-after))
-	    (if (and (memq c ttoken)
-		     (not (memq c stoken)))
-		(setq attribute
-		      (intern
-		       (downcase
-			(buffer-substring
-			 (point) (progn (forward-sexp 1) (point))))))
-	      (error "Invalid header: %s" string))
-	    (setq c (char-after))
-	    (when (eq c ?*)
-	      (forward-char 1)
-	      (setq c (char-after))
-	      (if (not (memq c ntoken))
-		  (setq encoded t
-			number nil)
-		(setq number
-		      (string-to-number
-		       (buffer-substring
-			(point) (progn (forward-sexp 1) (point)))))
+	(condition-case err
+	    (progn
+	      (while (not (eobp))
 		(setq c (char-after))
-		(when (eq c ?*)
-		  (setq encoded t)
+		(unless (eq c ?\;)
+		  (error "Invalid header: %s" string))
+		(forward-char 1)
+		;; If c in nil, then this is an invalid header, but
+		;; since elm generates invalid headers on this form,
+		;; we allow it.
+		(when (setq c (char-after))
+		  (if (and (memq c ttoken)
+			   (not (memq c stoken)))
+		      (setq attribute
+			    (intern
+			     (downcase
+			      (buffer-substring
+			       (point) (progn (forward-sexp 1) (point))))))
+		    (error "Invalid header: %s" string))
+		  (setq c (char-after))
+		  (if (eq c ?*)
+		      (progn
+			(forward-char 1)
+			(setq c (char-after))
+			(if (not (memq c ntoken))
+			    (setq encoded t
+				  number nil)
+			  (setq number
+				(string-to-number
+				 (buffer-substring
+				  (point) (progn (forward-sexp 1) (point)))))
+			  (setq c (char-after))
+			  (when (eq c ?*)
+			    (setq encoded t)
+			    (forward-char 1)
+			    (setq c (char-after)))))
+		    (setq number nil
+			  encoded nil))
+		  ;; See if we have any previous continuations.
+		  (when (and prev-attribute
+			     (not (eq prev-attribute attribute)))
+		    (setq vals
+			  (mapconcat 'cdr (sort vals 'car-less-than-car) ""))
+		    (push (cons prev-attribute
+				(if prev-encoded
+				    (rfc2231-decode-encoded-string vals)
+				  vals))
+			  parameters)
+		    (setq prev-attribute nil
+			  vals nil
+			  prev-encoded nil))
+		  (unless (eq c ?=)
+		    (error "Invalid header: %s" string))
 		  (forward-char 1)
-		  (setq c (char-after)))))
-	    ;; See if we have any previous continuations.
-	    (when (and prev-attribute
-		       (not (eq prev-attribute attribute)))
-	      (push (cons prev-attribute prev-value) parameters)
-	      (setq prev-attribute nil
-		    prev-value ""))
-	    (unless (eq c ?=)
-	      (error "Invalid header: %s" string))
-	    (forward-char 1)
-	    (setq c (char-after))
-	    (cond
-	     ((eq c ?\")
-	      (setq value
-		    (buffer-substring (1+ (point))
-				      (progn (forward-sexp 1) (1- (point))))))
-	     ((and (or (memq c ttoken)
-		       (> c ?\177)) ;; EXTENSION: Support non-ascii chars.
-		   (not (memq c stoken)))
-	      (setq value (buffer-substring
-			   (point) (progn (forward-sexp) (point)))))
-	     (t
-	      (error "Invalid header: %s" string)))
-	    (if number
-		(setq prev-attribute attribute
-		      prev-value (concat prev-value value))
-	      (push (cons attribute
-			  (if encoded
-			      (rfc2231-decode-encoded-string value)
-			    value))
-		    parameters))))
-
-	;; Take care of any final continuations.
-	(when prev-attribute
-	  (push (cons prev-attribute
-		      (if encoded
-			  (rfc2231-decode-encoded-string prev-value)
-			prev-value))
-		parameters))
-
-	(when type
-	  `(,type ,@(nreverse parameters)))))))
+		  (setq c (char-after))
+		  (cond
+		   ((eq c ?\")
+		    (setq value (buffer-substring (1+ (point))
+						  (progn
+						    (forward-sexp 1)
+						    (1- (point)))))
+		    (when encoded
+		      (setq value (mapconcat (lambda (c) (format "%%%02x" c))
+					     value ""))))
+		   ((and (or (memq c ttoken)
+			     ;; EXTENSION: Support non-ascii chars.
+			     (> c ?\177))
+			 (not (memq c stoken)))
+		    (setq value
+			  (buffer-substring
+			   (point)
+			   (progn
+			     (forward-sexp)
+			     ;; We might not have reached at the end of
+			     ;; the value because of non-ascii chars,
+			     ;; so we should jump over them if any.
+			     (while (and (not (eobp))
+					 (> (char-after) ?\177))
+			       (forward-char 1)
+			       (forward-sexp))
+			     (point)))))
+		   (t
+		    (error "Invalid header: %s" string)))
+		  (if number
+		      (progn
+			(push (cons number value) vals)
+			(setq prev-attribute attribute
+			      prev-encoded encoded))
+		    (push (cons attribute
+				(if encoded
+				    (rfc2231-decode-encoded-string value)
+				  value))
+			  parameters))))
+
+	      ;; Take care of any final continuations.
+	      (when prev-attribute
+		(setq vals (mapconcat 'cdr (sort vals 'car-less-than-car) ""))
+		(push (cons prev-attribute
+			    (if prev-encoded
+				(rfc2231-decode-encoded-string vals)
+			      vals))
+		      parameters)))
+	  (error
+	   (setq parameters nil)
+	   (if signal-error
+	       (signal (car err) (cdr err))
+	     ;;(message "%s" (error-message-string err))
+	     )))
+
+	(cons type (nreverse parameters))))))
 
 (defun rfc2231-decode-encoded-string (string)
   "Decode an RFC2231-encoded string.
-These look like \"us-ascii'en-us'This%20is%20%2A%2A%2Afun%2A%2A%2A\"."
-  (with-temp-buffer
-    (let ((elems (split-string string "'")))
-      ;; The encoded string may contain zero to two single-quote
-      ;; marks.  This should give us the encoded word stripped
-      ;; of any preceding values.
-      (insert (car (last elems)))
+These look like:
+ \"us-ascii'en-us'This%20is%20%2A%2A%2Afun%2A%2A%2A\",
+ \"us-ascii''This%20is%20%2A%2A%2Afun%2A%2A%2A\",
+ \"'en-us'This%20is%20%2A%2A%2Afun%2A%2A%2A\",
+ \"''This%20is%20%2A%2A%2Afun%2A%2A%2A\", or
+ \"This is ***fun***\"."
+  (string-match "\\`\\(?:\\([^']+\\)?'\\([^']+\\)?'\\)?\\(.+\\)" string)
+  (let ((coding-system (mm-charset-to-coding-system (match-string 1 string)))
+	;;(language (match-string 2 string))
+	(value (match-string 3 string)))
+    (mm-with-multibyte-buffer
+      (insert value)
       (goto-char (point-min))
       (while (search-forward "%" nil t)
 	(insert
 	 (prog1
 	     (string-to-number (buffer-substring (point) (+ (point) 2)) 16)
 	   (delete-region (1- (point)) (+ (point) 2)))))
-      ;; Encode using the charset, if any.
-      (when (and (mm-multibyte-p)
-		 (> (length elems) 1)
-		 (not (equal (intern (downcase (car elems))) 'us-ascii)))
-	(mm-decode-coding-region (point-min) (point-max)
-				 (intern (downcase (car elems)))))
+      ;; Decode using the charset, if any.
+      (unless (memq coding-system '(nil ascii))
+	(mm-decode-coding-region (point-min) (point-max) coding-system))
       (buffer-string))))
 
 (defun rfc2231-encode-string (param value)
-  "Return and PARAM=VALUE string encoded according to RFC2231."
+  "Return and PARAM=VALUE string encoded according to RFC2231.
+Use `mml-insert-parameter' or `mml-insert-parameter-string' to insert
+the result of this function."
   (let ((control (ietf-drums-token-to-list ietf-drums-no-ws-ctl-token))
 	(tspecial (ietf-drums-token-to-list ietf-drums-tspecials))
 	(special (ietf-drums-token-to-list "*'%\n\t"))
 	(ascii (ietf-drums-token-to-list ietf-drums-text-token))
 	(num -1)
+	;; Don't make lines exceeding 76 column.
+	(limit (- 74 (length param)))
 	spacep encodep charsetp charset broken)
     (with-temp-buffer
       (insert value)
@@ -193,28 +269,34 @@ These look like \"us-ascii'en-us'This%20is%20%2A%2A%2Afun%2A%2A%2A\"."
       (when charsetp
 	(setq charset (mm-encode-body)))
       (cond
-       ((or encodep charsetp)
+       ((or encodep charsetp
+	    (progn
+	      (end-of-line)
+	      (> (current-column) (if spacep (- limit 2) limit))))
+	(setq limit (- limit 6))
 	(goto-char (point-min))
+	(insert (symbol-name (or charset 'us-ascii)) "''")
 	(while (not (eobp))
-	  (when (> (current-column) 60)
-	    (insert ";\n")
-	    (setq broken t))
 	  (if (or (not (memq (following-char) ascii))
 		  (memq (following-char) control)
 		  (memq (following-char) tspecial)
 		  (memq (following-char) special)
 		  (eq (following-char) ? ))
 	      (progn
+		(when (>= (current-column) (1- limit))
+		  (insert ";\n")
+		  (setq broken t))
 		(insert "%" (format "%02x" (following-char)))
 		(delete-char 1))
+	    (when (> (current-column) limit)
+	      (insert ";\n")
+	      (setq broken t))
 	    (forward-char 1)))
 	(goto-char (point-min))
-	(insert (symbol-name (or charset 'us-ascii)) "''")
-	(goto-char (point-min))
 	(if (not broken)
 	    (insert param "*=")
 	  (while (not (eobp))
-	    (insert (if (>= num 0) " " "\n ")
+	    (insert (if (>= num 0) " " "")
 		    param "*" (format "%d" (incf num)) "*=")
 	    (forward-line 1))))
        (spacep
diff --git a/lisp/score-mode.el b/lisp/score-mode.el
index 2a54dcc..0414009 100644
--- a/lisp/score-mode.el
+++ b/lisp/score-mode.el
@@ -1,6 +1,7 @@
 ;;; score-mode.el --- mode for editing Gnus score files
 
-;; Copyright (C) 1996, 2001, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 2001, 2002, 2003, 2004,
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen 
 ;; Keywords: news, mail
@@ -19,8 +20,8 @@
 
 ;; 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.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -28,7 +29,10 @@
 
 (eval-when-compile (require 'cl))
 (eval-when-compile (require 'static))
-(require 'gnus-util)			; for gnus-pp
+(require 'gnus-util)			; for gnus-pp, gnus-run-mode-hooks
+
+(defvar gnus-score-edit-done-hook nil
+  "*Hook run at the end of closing the score buffer.")
 
 (defvar gnus-score-mode-hook nil
   "*Hook run in score mode buffers.")
@@ -70,7 +74,7 @@ This mode is an extended emacs-lisp mode.
   (setq mode-name "Score")
   (lisp-mode-variables nil)
   (make-local-variable 'gnus-score-edit-exit-function)
-  (run-hooks 'emacs-lisp-mode-hook 'gnus-score-mode-hook))
+  (gnus-run-mode-hooks 'emacs-lisp-mode-hook 'gnus-score-mode-hook))
 
 (defun gnus-score-make-menu-bar ()
   (unless (boundp 'gnus-score-menu)
diff --git a/lisp/sieve-manage.el b/lisp/sieve-manage.el
index 63588b8..300c54a 100644
--- a/lisp/sieve-manage.el
+++ b/lisp/sieve-manage.el
@@ -1,5 +1,7 @@
 ;;; sieve-manage.el --- Implementation of the managesive protocol in elisp
-;; Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
+
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson 
 
@@ -17,8 +19,8 @@
 
 ;; 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.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -91,22 +93,27 @@
 
 (defcustom sieve-manage-log "*sieve-manage-log*"
   "Name of buffer for managesieve session trace."
-  :type 'string)
+  :type 'string
+  :group 'sieve-manage)
 
 (defcustom sieve-manage-default-user (user-login-name)
   "Default username to use."
-  :type 'string)
+  :type 'string
+  :group 'sieve-manage)
 
 (defcustom sieve-manage-server-eol "\r\n"
   "The EOL string sent from the server."
-  :type 'string)
+  :type 'string
+  :group 'sieve-manage)
 
 (defcustom sieve-manage-client-eol "\r\n"
   "The EOL string we send to the server."
-  :type 'string)
+  :type 'string
+  :group 'sieve-manage)
 
 (defcustom sieve-manage-streams '(network starttls shell)
-  "Priority of streams to consider when opening connection to server.")
+  "Priority of streams to consider when opening connection to server."
+  :group 'sieve-manage)
 
 (defcustom sieve-manage-stream-alist
   '((network   sieve-manage-network-p          sieve-manage-network-open)
@@ -118,7 +125,8 @@
 
 NAME names the stream, CHECK is a function returning non-nil if the
 server support the stream and OPEN is a function for opening the
-stream.")
+stream."
+  :group 'sieve-manage)
 
 (defcustom sieve-manage-authenticators '(digest-md5
 					 cram-md5
@@ -126,7 +134,8 @@ stream.")
 					 ntlm
 					 plain
 					 login)
-  "Priority of authenticators to consider when authenticating to server.")
+  "Priority of authenticators to consider when authenticating to server."
+  :group 'sieve-manage)
 
 (defcustom sieve-manage-authenticator-alist
   '((cram-md5   sieve-manage-cram-md5-p       sieve-manage-cram-md5-auth)
@@ -141,11 +150,13 @@ stream.")
 
 NAME names the authenticator.  CHECK is a function returning non-nil if
 the server support the authenticator and AUTHENTICATE is a function
-for doing the actual authentication.")
+for doing the actual authentication."
+  :group 'sieve-manage)
 
 (defcustom sieve-manage-default-port 2000
   "Default port number for managesieve protocol."
-  :type 'integer)
+  :type 'integer
+  :group 'sieve-manage)
 
 ;; Internal variables:
 
@@ -189,8 +200,8 @@ LOGINFUNC is passed a username and a password, it should return t if
 it where sucessful authenticating itself to the server, nil otherwise.
 Returns t if login was successful, nil otherwise."
   (with-current-buffer buffer
-    (make-variable-buffer-local 'sieve-manage-username)
-    (make-variable-buffer-local 'sieve-manage-password)
+    (make-local-variable 'sieve-manage-username)
+    (make-local-variable 'sieve-manage-password)
     (let (user passwd ret reason passwd-key)
       (condition-case ()
 	  (while (or (not user) (not passwd))
@@ -433,7 +444,7 @@ Optional variable BUFFER is buffer (buffer, or string naming buffer)
 to work in."
   (setq buffer (or buffer (format " *sieve* %s:%d" server (or port 2000))))
   (with-current-buffer (get-buffer-create buffer)
-    (mapc 'make-variable-buffer-local sieve-manage-local-variables)
+    (mapc 'make-local-variable sieve-manage-local-variables)
     (sieve-manage-disable-multibyte)
     (buffer-disable-undo)
     (setq sieve-manage-server (or server sieve-manage-server))
@@ -521,8 +532,8 @@ password is remembered in the buffer."
   (with-current-buffer (or buffer (current-buffer))
     (if (not (eq sieve-manage-state 'nonauth))
 	(eq sieve-manage-state 'auth)
-      (make-variable-buffer-local 'sieve-manage-username)
-      (make-variable-buffer-local 'sieve-manage-password)
+      (make-local-variable 'sieve-manage-username)
+      (make-local-variable 'sieve-manage-password)
       (if user (setq sieve-manage-username user))
       (if passwd (setq sieve-manage-password passwd))
       (if (funcall (nth 2 (assq sieve-manage-auth
diff --git a/lisp/sieve-mode.el b/lisp/sieve-mode.el
index f105ced..7d03b1c 100644
--- a/lisp/sieve-mode.el
+++ b/lisp/sieve-mode.el
@@ -1,5 +1,7 @@
 ;;; sieve-mode.el --- Sieve code editing commands for Emacs
-;; Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
+
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson 
 
@@ -17,8 +19,8 @@
 
 ;; 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.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -64,32 +66,38 @@
 
 ;; Font-lock
 
-(defvar sieve-control-commands-face 'sieve-control-commands-face
+(defvar sieve-control-commands-face 'sieve-control-commands
   "Face name used for Sieve Control Commands.")
 
-(defface sieve-control-commands-face
+(defface sieve-control-commands
   '((((type tty) (class color)) (:foreground "blue" :weight light))
     (((class grayscale) (background light)) (:foreground "LightGray" :bold t))
     (((class grayscale) (background dark)) (:foreground "DimGray" :bold t))
     (((class color) (background light)) (:foreground "Orchid"))
     (((class color) (background dark)) (:foreground "LightSteelBlue"))
     (t (:bold t)))
-  "Face used for Sieve Control Commands.")
+  "Face used for Sieve Control Commands."
+  :group 'sieve)
+;; backward-compatibility alias
+(put 'sieve-control-commands-face 'face-alias 'sieve-control-commands)
 
-(defvar sieve-action-commands-face 'sieve-action-commands-face
+(defvar sieve-action-commands-face 'sieve-action-commands
   "Face name used for Sieve Action Commands.")
 
-(defface sieve-action-commands-face
+(defface sieve-action-commands
   '((((type tty) (class color)) (:foreground "blue" :weight bold))
     (((class color) (background light)) (:foreground "Blue"))
     (((class color) (background dark)) (:foreground "LightSkyBlue"))
     (t (:inverse-video t :bold t)))
-  "Face used for Sieve Action Commands.")
+  "Face used for Sieve Action Commands."
+  :group 'sieve)
+;; backward-compatibility alias
+(put 'sieve-action-commands-face 'face-alias 'sieve-action-commands)
 
-(defvar sieve-test-commands-face 'sieve-test-commands-face
+(defvar sieve-test-commands-face 'sieve-test-commands
   "Face name used for Sieve Test Commands.")
 
-(defface sieve-test-commands-face
+(defface sieve-test-commands
   '((((type tty) (class color)) (:foreground "magenta"))
     (((class grayscale) (background light))
      (:foreground "LightGray" :bold t :underline t))
@@ -98,19 +106,25 @@
     (((class color) (background light)) (:foreground "CadetBlue"))
     (((class color) (background dark)) (:foreground "Aquamarine"))
     (t (:bold t :underline t)))
-  "Face used for Sieve Test Commands.")
+  "Face used for Sieve Test Commands."
+  :group 'sieve)
+;; backward-compatibility alias
+(put 'sieve-test-commands-face 'face-alias 'sieve-test-commands)
 
-(defvar sieve-tagged-arguments-face 'sieve-tagged-arguments-face
+(defvar sieve-tagged-arguments-face 'sieve-tagged-arguments
   "Face name used for Sieve Tagged Arguments.")
 
-(defface sieve-tagged-arguments-face
+(defface sieve-tagged-arguments
   '((((type tty) (class color)) (:foreground "cyan" :weight bold))
     (((class grayscale) (background light)) (:foreground "LightGray" :bold t))
     (((class grayscale) (background dark)) (:foreground "DimGray" :bold t))
     (((class color) (background light)) (:foreground "Purple"))
     (((class color) (background dark)) (:foreground "Cyan"))
     (t (:bold t)))
-  "Face used for Sieve Tagged Arguments.")
+  "Face used for Sieve Tagged Arguments."
+  :group 'sieve)
+;; backward-compatibility alias
+(put 'sieve-tagged-arguments-face 'face-alias 'sieve-tagged-arguments)
 
 
 (defconst sieve-font-lock-keywords
diff --git a/lisp/sieve.el b/lisp/sieve.el
index 827ff5c..071a2eb 100644
--- a/lisp/sieve.el
+++ b/lisp/sieve.el
@@ -1,5 +1,6 @@
 ;;; sieve.el --- Utilities to manage sieve scripts
-;; Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
+
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson 
 
@@ -17,8 +18,8 @@
 
 ;; 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.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -244,7 +245,7 @@ Used to bracket operations which move point in the sieve-buffer."
   (if (eq last-command 'sieve-help)
       ;; would need minor-mode for log-edit-mode
       (describe-function 'sieve-mode)
-    (message (substitute-command-keys
+    (message "%s" (substitute-command-keys
 	      "`\\[sieve-edit-script]':edit `\\[sieve-activate]':activate `\\[sieve-deactivate]':deactivate `\\[sieve-remove]':remove"))))
 
 (defun sieve-bury-buffer (buf &optional mainbuf)
diff --git a/lisp/smiley.el b/lisp/smiley.el
index fa94333..fe93aea 100644
--- a/lisp/smiley.el
+++ b/lisp/smiley.el
@@ -1,6 +1,7 @@
 ;;; smiley.el --- displaying smiley faces
 
-;; Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Dave Love 
 ;; Keywords: news mail multimedia
@@ -19,8 +20,8 @@
 
 ;; 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.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -30,8 +31,22 @@
 ;; I'm not sure we need that degree of rococoness and defaults like a
 ;; yellow background.  Also, using PBM means we can display the images
 ;; more generally.  -- fx
-
-;;; Test smileys:  :-) :-\ :-( :-/
+;; `smiley.el' was replaced by `smiley-ems.el' on 2002-01-26 (after fx'
+;; comment).
+
+;; Test smileys:
+;; smile             ^:-) ^:)
+;; blink             ;-)  ;)
+;; forced            :-]
+;; braindamaged      8-)
+;; indifferent       :-|
+;; wry               :-/  :-\
+;; sad               :-(
+;; frown             :-{
+;; evil              >:-)
+;; cry               ;-(
+;; dead              X-)
+;; grin              :-D
 
 ;;; Code:
 
@@ -44,8 +59,9 @@
   :group 'gnus-visual)
 
 ;; Maybe this should go.
-(defcustom smiley-data-directory (nnheader-find-etc-directory "images/smilies")
-  "*Location of the smiley faces files."
+(defcustom smiley-data-directory
+  (nnheader-find-etc-directory "images/smilies")
+  "Location of the smiley faces files."
   :type 'directory
   :group 'smiley)
 
@@ -117,8 +133,8 @@
       ("\\(:-(\\)\\W" 1 "sad")
       ("\\(:-{\\)\\W" 1 "frown")))
   "*A list of regexps to map smilies to images.
-The elements are (REGEXP MATCH FILE), where MATCH is the submatch in
-regexp to replace with IMAGE.  IMAGE is the name of a PBM file in
+The elements are (REGEXP MATCH IMAGE), where MATCH is the submatch in
+regexp to replace with IMAGE.  IMAGE is the name of an image file in
 `smiley-data-directory'."
   :type '(repeat (list regexp
 		       (integer :tag "Regexp match number")
@@ -136,7 +152,7 @@ regexp to replace with IMAGE.  IMAGE is the name of a PBM file in
     (when (gnus-image-type-available-p 'xbm)
       (push "xbm" types))
     types)
-  "*List of suffixes on picon file names to try."
+  "*List of suffixes on smiley file names to try."
   :version "22.1"
   :type '(repeat string)
   :group 'smiley)
@@ -144,6 +160,7 @@ regexp to replace with IMAGE.  IMAGE is the name of a PBM file in
 (defvar smiley-cached-regexp-alist nil)
 
 (defun smiley-update-cache ()
+  (setq smiley-cached-regexp-alist nil)
   (dolist (elt (if (symbolp smiley-regexp-alist)
 		   (symbol-value smiley-regexp-alist)
 		 smiley-regexp-alist))
@@ -162,12 +179,13 @@ regexp to replace with IMAGE.  IMAGE is the name of a PBM file in
 	    (push (list (car elt) (cadr elt) image)
 		  smiley-cached-regexp-alist)))))))
 
-(defvar smiley-mouse-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map [down-mouse-2] 'ignore) ; override widget
-    (define-key map [mouse-2]
-      'smiley-mouse-toggle-buffer)
-    map))
+;; Not implemented:
+;; (defvar smiley-mouse-map
+;;   (let ((map (make-sparse-keymap)))
+;;     (define-key map [down-mouse-2] 'ignore) ; override widget
+;;     (define-key map [mouse-2]
+;;       'smiley-mouse-toggle-buffer)
+;;     map))
 
 ;;;###autoload
 (defun smiley-region (start end)
diff --git a/lisp/spam-report.el b/lisp/spam-report.el
index dcd9557..18af034 100644
--- a/lisp/spam-report.el
+++ b/lisp/spam-report.el
@@ -1,8 +1,9 @@
 ;;; spam-report.el --- Reporting spam
-;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
 
-;; Author: Teodor Zlatanov 
-;; Keywords: network
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+
+;; Author: Ted Zlatanov 
+;; Keywords: network, spam, mail, gmane, report
 
 ;; This file is part of GNU Emacs.
 
@@ -18,8 +19,8 @@
 
 ;; 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.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -35,7 +36,9 @@
   (autoload 'mm-url-insert "mm-url"))
 
 (defgroup spam-report nil
-  "Spam reporting configuration.")
+  "Spam reporting configuration."
+  :group 'mail
+  :group 'news)
 
 (defcustom spam-report-gmane-regex nil
   "Regexp matching Gmane newsgroups, e.g. \"^nntp\\+.*:gmane\\.\"
@@ -46,14 +49,12 @@ instead."
 		(regexp :value "^nntp\+.*:gmane\."))
   :group 'spam-report)
 
-(defcustom spam-report-gmane-spam-header
-  "^X-Report-Spam: http://\\([^/]+\\)\\(.*\\)$"
-  "String matching Gmane spam-reporting header.  Two match groups are needed."
-  :type 'regexp
-  :group 'spam-report)
-
 (defcustom spam-report-gmane-use-article-number t
-  "Whether the article number (faster!) or the header should be used."
+  "Whether the article number (faster!) or the header should be used.
+
+You must set this to nil if you don't read Gmane groups directly
+from news.gmane.org, e.g. when using local newsserver such as
+leafnode."
   :type 'boolean
   :group 'spam-report)
 
@@ -118,38 +119,96 @@ Reports is as ham when HAM is set."
   "Report an article as ham by resending via email."
   (spam-report-resend articles t))
 
-(defun spam-report-gmane (&rest articles)
-  "Report an article as spam through Gmane."
+(defun spam-report-gmane-ham (&rest articles)
+  "Report ARTICLES as ham (unregister) through Gmane."
   (interactive (gnus-summary-work-articles current-prefix-arg))
   (dolist (article articles)
-    (when (and gnus-newsgroup-name
-	       (or (null spam-report-gmane-regex)
-		   (string-match spam-report-gmane-regex gnus-newsgroup-name)))
-      (gnus-message 6 "Reporting spam article %d to spam.gmane.org..." article)
+    (spam-report-gmane-internal t article)))
+
+(defun spam-report-gmane-spam (&rest articles)
+  "Report ARTICLES as spam through Gmane."
+  (interactive (gnus-summary-work-articles current-prefix-arg))
+  (dolist (article articles)
+    (spam-report-gmane-internal nil article)))
+
+;; `spam-report-gmane' was an interactive entry point, so we should provide an
+;; alias.
+(defalias 'spam-report-gmane 'spam-report-gmane-spam)
+
+(defun spam-report-gmane-internal (unspam article)
+  "Report ARTICLE as spam or not-spam through Gmane, depending on UNSPAM."
+  (when (and gnus-newsgroup-name
+	     (or (null spam-report-gmane-regex)
+		 (string-match spam-report-gmane-regex gnus-newsgroup-name)))
+    (let ((rpt-host (if unspam "unspam.gmane.org" "spam.gmane.org")))
+      (gnus-message 6 "Reporting article %d to %s..." article rpt-host)
       (if spam-report-gmane-use-article-number
-	  (spam-report-url-ping 
-	   "spam.gmane.org"
+	  (spam-report-url-ping
+	   rpt-host
 	   (format "/%s:%d"
 		   (gnus-group-real-name gnus-newsgroup-name)
 		   article))
 	(with-current-buffer nntp-server-buffer
 	  (gnus-request-head article gnus-newsgroup-name)
-	  (goto-char (point-min))
-	  (if (re-search-forward spam-report-gmane-spam-header nil t)
-	      (let* ((host (match-string 1))
-		     (report (match-string 2))
-		     (url (format "http://%s%s" host report)))
-		(gnus-message 7 "Reporting spam through URL %s..." url)
-		(spam-report-url-ping host report))
-	    (gnus-message 3 "Could not find X-Report-Spam in article %d..."
-			  article)))))))
-
+	  (let ((case-fold-search t)
+		field host report url)
+	    ;; First check for X-Report-Spam because it's more specific to
+	    ;; spam reporting than Archived-At.  OTOH, all new articles on
+	    ;; Gmane don't have X-Report-Spam anymore (unless Lars changes his
+	    ;; mind :-)).
+	    ;;
+	    ;; There might be more than one Archived-At header so we need to
+	    ;; find (and transform) the one related to Gmane.
+	    (setq field (or (gnus-fetch-field "X-Report-Spam")
+			    (gnus-fetch-field "X-Report-Unspam")
+			    (gnus-fetch-field "Archived-At")))
+	    (when (stringp field)
+	      (setq host
+		    (progn
+		      (string-match
+		       (concat "http://\\([a-z]+\\.gmane\\.org\\)"
+			       "\\(/[^:/]+[:/][0-9]+\\)")
+		       field)
+		      (match-string 1 field)))
+	      (setq report (match-string 2 field))
+	      (when (string-equal "permalink.gmane.org" host)
+		(setq host rpt-host)
+		(setq report (gnus-replace-in-string
+			      report "/\\([0-9]+\\)$" ":\\1")))
+	      (setq url (format "http://%s%s" host report)))
+	    (if (not (and host report url))
+		(gnus-message
+		 3 "Could not find a spam report header in article %d..."
+		 article)
+	      (gnus-message 7 "Reporting article through URL %s..." url)
+	      (spam-report-url-ping host report))))))))
 
 (defun spam-report-url-ping (host report)
   "Ping a host through HTTP, addressing a specific GET resource using
 the function specified by `spam-report-url-ping-function'."
+  ;; Example:
+  ;; host: "spam.gmane.org"
+  ;; report: "/gmane.some.group:123456"
   (funcall spam-report-url-ping-function host report))
 
+(defcustom spam-report-user-mail-address
+  (and (stringp user-mail-address)
+       (gnus-replace-in-string user-mail-address "@" ""))
+  "Mail address of this user used for spam reports to Gmane.
+This is initialized based on `user-mail-address'."
+  :type '(choice string
+		 (const :tag "Don't expose address" nil))
+  :version "23.0" ;; No Gnus
+  :group 'spam-report)
+
+(defvar spam-report-user-agent
+  (if spam-report-user-mail-address
+      (format "%s (%s) %s" "spam-report.el"
+	      spam-report-user-mail-address
+	      (gnus-extended-version))
+    (format "%s %s" "spam-report.el"
+	    (gnus-extended-version))))
+
 (defun spam-report-url-ping-plain (host report)
   "Ping a host through HTTP, addressing a specific GET resource."
   (let ((tcp-connection))
@@ -164,8 +223,8 @@ the function specified by `spam-report-url-ping-function'."
       (set-marker (process-mark tcp-connection) (point-min))
       (process-send-string
        tcp-connection
-       (format "GET %s HTTP/1.1\nUser-Agent: %s (spam-report.el)\nHost: %s\n\n"
-	       report (gnus-emacs-version) host)))))
+       (format "GET %s HTTP/1.1\nUser-Agent: %s\nHost: %s\n\n"
+	       report spam-report-user-agent host)))))
 
 ;;;###autoload
 (defun spam-report-process-queue (&optional file keep)
@@ -216,14 +275,14 @@ symbol `ask', query before flushing the queue file."
 the external program specified in `mm-url-program' to connect to
 server."
   (with-temp-buffer
-    (let ((url (concat "http://" host report)))
+    (let ((url (format "http://%s%s" host report)))
       (mm-url-insert url t))))
 
 ;;;###autoload
 (defun spam-report-url-to-file (host report)
   "Collect spam report requests in `spam-report-requests-file'.
 Customize `spam-report-url-ping-function' to use this function."
-  (let ((url (concat "http://" host report))
+  (let ((url (format "http://%s%s" host report))
 	(file spam-report-requests-file))
     (gnus-make-directory (file-name-directory file))
     (gnus-message 9 "Writing URL `%s' to file `%s'" url file)
diff --git a/lisp/spam-stat.el b/lisp/spam-stat.el
index b9265fc..8c02522 100644
--- a/lisp/spam-stat.el
+++ b/lisp/spam-stat.el
@@ -1,6 +1,6 @@
 ;;; spam-stat.el --- detecting spam based on statistics
 
-;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder 
 ;; Keywords: network
@@ -20,8 +20,8 @@
 
 ;; 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.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -124,6 +124,8 @@
 ;;; Code:
 (require 'mail-parse)
 
+(defvar gnus-original-article-buffer)
+
 (defgroup spam-stat nil
   "Statistical spam detection for Emacs.
 Use the functions to build a dictionary of words and their statistical
diff --git a/lisp/spam-wash.el b/lisp/spam-wash.el
index be91cdf..7b91620 100644
--- a/lisp/spam-wash.el
+++ b/lisp/spam-wash.el
@@ -19,8 +19,8 @@
 
 ;; 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.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
diff --git a/lisp/spam.el b/lisp/spam.el
index 9fc0b9e..1c5ac62 100644
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -1,8 +1,10 @@
 ;;; spam.el --- Identifying spam
-;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen 
-;; Keywords: network
+;; Maintainer: Ted Zlatanov 
+;; Keywords: network, spam, mail, bogofilter, BBDB, dspam, dig, whitelist, blacklist, gmane, hashcash, spamassassin, bsfilter, ifile, stat, crm114, spamoracle
 
 ;; This file is part of GNU Emacs.
 
@@ -18,8 +20,8 @@
 
 ;; 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.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -40,6 +42,7 @@
 
 (eval-when-compile (require 'cl))
 (eval-when-compile (require 'spam-report))
+(eval-when-compile (require 'hashcash))
 
 (require 'path-util)
 (require 'gnus-sum)
@@ -58,6 +61,8 @@
 ;; autoload spam-report
 (eval-and-compile
   (autoload 'spam-report-gmane "spam-report")
+  (autoload 'spam-report-gmane-spam "spam-report")
+  (autoload 'spam-report-gmane-ham "spam-report")
   (autoload 'spam-report-resend "spam-report"))
 
 ;; autoload gnus-registry
@@ -80,7 +85,9 @@ Populated by spam-install-backend-super.")
 
 (defgroup spam nil
   "Spam configuration."
-  :version "22.1")
+  :version "22.1"
+  :group 'mail
+  :group 'news)
 
 (defcustom spam-summary-exit-behavior 'default
   "Exit behavior at the time of summary exit.
@@ -102,6 +109,7 @@ a group through group/topic parameters overrides this mechanism."
 (defcustom spam-mark-new-messages-in-spam-group-as-spam t
   "Whether new messages in a spam group should get the spam-mark."
   :type 'boolean
+  ;; :version "22.1" ;; Gnus 5.10.8 / No Gnus 0.3
   :group 'spam)
 
 (defcustom spam-log-to-registry nil
@@ -350,7 +358,7 @@ Only meaningful if you enable `spam-use-blackholes'."
   :type '(radio (const nil) regexp)
   :group 'spam)
 
-(defface spam-face
+(defface spam
   '((((class color) (type tty) (background dark))
      (:foreground "gray80" :background "gray50"))
     (((class color) (type tty) (background light))
@@ -360,9 +368,12 @@ Only meaningful if you enable `spam-use-blackholes'."
     (((class color) (background light))
      (:foreground "ivory4"))
     (t :inverse-video t))
-  "Face for spam-marked articles.")
+  "Face for spam-marked articles."
+  :group 'spam)
+;; backward-compatibility alias
+(put 'spam-face 'face-alias 'spam)
 
-(defcustom spam-face 'spam-face
+(defcustom spam-face 'spam
   "Face for spam-marked articles."
   :type 'face
   :group 'spam)
@@ -1049,11 +1060,10 @@ backends)."
 			      nil)
 
 (spam-install-nocheck-backend 'spam-use-gmane
-			      nil
+			      'spam-report-gmane-unregister-routine
 			      'spam-report-gmane-register-routine
-			      ;; does Gmane support unregistration?
-			      nil
-			      nil)
+			      'spam-report-gmane-register-routine
+			      'spam-report-gmane-unregister-routine)
 
 (spam-install-nocheck-backend 'spam-use-resend
 			      'spam-report-resend-register-ham-routine
@@ -1164,6 +1174,15 @@ backends)."
 	(return))))
     result))
 
+(defvar spam-spamassassin-score-regexp
+  ".*\\b\\(?:score\\|hits\\)=\\(-?[0-9.]+\\)"
+  "Regexp matching SpamAssassin score header.
+The first group must match the number.")
+;; "score" for Spamassassin 3.0 or later:
+;; X-Spam-Status: Yes, score=13.1 required=5.0 tests=DNS_FROM_RFC_ABUSE,
+;; 	[...],UNDISC_RECIPS autolearn=disabled version=3.0.3
+
+
 (defun spam-extra-header-to-number (header headers)
   "Transform an extra HEADER to a number, using list of HEADERS.
 Note this has to be fast."
@@ -1172,7 +1191,8 @@ Note this has to be fast."
        ((eq header 'X-Spam-Status)
 	(string-to-number (gnus-replace-in-string
 			   (gnus-extra-header header headers)
-			   ".*hits=" "")))
+			   spam-spamassassin-score-regexp
+			   "\\1")))
        ;; for CRM checking, it's probably faster to just do the string match
        ((and spam-use-crm114 (string-match "( pR: \\([0-9.-]+\\)" header))
 	(match-string 1 header))
@@ -1238,6 +1258,7 @@ Will not return a nil score."
     (gnus-group-spam-exit-processor-stat         spam spam-use-stat)
     (gnus-group-spam-exit-processor-spamoracle   spam spam-use-spamoracle)
     (gnus-group-spam-exit-processor-spamassassin spam spam-use-spamassassin)
+    (gnus-group-spam-exit-processor-report-gmane spam spam-use-gmane) ;; Buggy?
     (gnus-group-ham-exit-processor-ifile         ham spam-use-ifile)
     (gnus-group-ham-exit-processor-bogofilter    ham spam-use-bogofilter)
     (gnus-group-ham-exit-processor-bsfilter      ham spam-use-bsfilter)
@@ -2015,18 +2036,10 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
 
 ;;{{{ Hashcash.
 
-(eval-when-compile
-  (autoload 'mail-check-payment "hashcash"))
-
-(condition-case nil
-    (progn
-      (require 'hashcash)
+(defun spam-check-hashcash ()
+  "Check the headers for hashcash payments."
+  (ignore-errors (mail-check-payment)))	 ;mail-check-payment returns a boolean
 
-      (defun spam-check-hashcash ()
-	"Check the headers for hashcash payments."
-	(mail-check-payment)))	 ;mail-check-payment returns a boolean
-
-  (file-error))
 ;;}}}
 
 ;;{{{ BBDB
@@ -2429,7 +2442,11 @@ REMOVE not nil, remove the ADDRESSES."
 ;;{{{ Spam-report glue (gmane and resend reporting)
 (defun spam-report-gmane-register-routine (articles)
   (when articles
-    (apply 'spam-report-gmane articles)))
+    (apply 'spam-report-gmane-spam articles)))
+
+(defun spam-report-gmane-unregister-routine (articles)
+  (when articles
+    (apply 'spam-report-gmane-ham articles)))
 
 (defun spam-report-resend-register-ham-routine (articles)
   (spam-report-resend-register-routine articles t))
@@ -2498,7 +2515,7 @@ REMOVE not nil, remove the ADDRESSES."
 		     (if db `("-d" ,db "-v") `("-v"))))
 	    (setq return (spam-check-bogofilter-headers score))))
 	return)
-    (gnus-error "`spam.el' doesnt support obsolete bogofilter versions")))
+    (gnus-error 5 "`spam.el' doesn't support obsolete bogofilter versions")))
 
 (defun spam-bogofilter-register-with-bogofilter (articles
 						 spam
@@ -2524,7 +2541,7 @@ REMOVE not nil, remove the ADDRESSES."
 		     spam-bogofilter-path
 		     nil nil nil switch
 		     (if db `("-d" ,db "-v") `("-v")))))))
-    (gnus-error "`spam.el' doesnt support obsolete bogofilter versions")))
+    (gnus-error 5 "`spam.el' doesn't support obsolete bogofilter versions")))
 
 (defun spam-bogofilter-register-spam-routine (articles &optional unregister)
   (spam-bogofilter-register-with-bogofilter articles t unregister))
@@ -2609,7 +2626,7 @@ REMOVE not nil, remove the ADDRESSES."
   (if score				; scoring mode
       (let ((header (message-fetch-field spam-spamassassin-spam-status-header)))
 	(when header
-	  (if (string-match "hits=\\(-?[0-9.]+\\)" header)
+	  (if (string-match spam-spamassassin-score-regexp header)
 	      (match-string 1 header)
 	    "0")))
     ;; spam detection mode
@@ -2878,8 +2895,8 @@ installed through spam-necessary-extra-headers."
     (add-to-list 'gnus-extra-headers header))
 
   (setq spam-install-hooks t)
-  ;; TODO: How do we redo this every time spam-face is customized?
-  (push '((eq mark gnus-spam-mark) . spam-face)
+  ;; TODO: How do we redo this every time the `spam' face is customized?
+  (push '((eq mark gnus-spam-mark) . spam)
 	gnus-summary-highlight)
   ;; Add hooks for loading and saving the spam stats
   (add-hook 'gnus-save-newsrc-hook 'spam-maybe-spam-stat-save)
diff --git a/lisp/starttls.el b/lisp/starttls.el
index 939bee7..5c4e9ce 100644
--- a/lisp/starttls.el
+++ b/lisp/starttls.el
@@ -1,6 +1,7 @@
 ;;; starttls.el --- STARTTLS functions
 
-;; Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno 
 ;; Author: Simon Josefsson 
@@ -21,8 +22,8 @@
 
 ;; 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.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -31,7 +32,7 @@
 ;; [RFC 2595] "Using TLS with IMAP, POP3 and ACAP"
 ;;	by Chris Newman  (1999/06)
 
-;; This file now contain a combination of the two previous
+;; This file now contains a combination of the two previous
 ;; implementations both called "starttls.el".  The first one is Daiki
 ;; Ueno's starttls.el which uses his own "starttls" command line tool,
 ;; and the second one is Simon Josefsson's starttls.el which uses
@@ -43,7 +44,7 @@
 ;; both tools installed.  It is recommended to use GNUTLS, though, as
 ;; it performs more verification of the certificates.
 
-;; The GNUTLS support require GNUTLS 0.9.90 (released 2003-10-08) or
+;; The GNUTLS support requires GNUTLS 0.9.90 (released 2003-10-08) or
 ;; later, from , or "starttls"
 ;; from .
 
@@ -57,7 +58,7 @@
 ;;   (message "STARTTLS output:\n%s" (starttls-negotiate tmp))
 ;;   (process-send-string tmp "EHLO foo\n"))
 
-;; An example run yield the following output:
+;; An example run yields the following output:
 ;;
 ;; 220 yxa.extundo.com ESMTP Sendmail 8.12.11/8.12.11/Debian-3; Wed, 26 May 2004 19:12:29 +0200; (No UCE/UBE) logging access from: c494102a.s-bi.bostream.se(OK)-c494102a.s-bi.bostream.se [217.215.27.65]
 ;; 220 2.0.0 Ready to start TLS
@@ -145,15 +146,14 @@ i.e. when `starttls-use-gnutls' is nil."
 
 (defcustom starttls-extra-args nil
   "Extra arguments to `starttls-program'.
-This program is used when the `starttls' command is used,
-i.e. when `starttls-use-gnutls' is nil."
+These apply when the `starttls' command is used, i.e. when
+`starttls-use-gnutls' is nil."
   :type '(repeat string)
   :group 'starttls)
 
 (defcustom starttls-extra-arguments nil
   "Extra arguments to `starttls-program'.
-This program is used when GNUTLS is used, i.e. when
-`starttls-use-gnutls' is non-nil.
+These apply when GNUTLS is used, i.e. when `starttls-use-gnutls' is non-nil.
 
 For example, non-TLS compliant servers may require
 '(\"--protocols\" \"ssl3\").  Invoke \"gnutls-cli --help\" to
@@ -171,7 +171,7 @@ find out which parameters are available."
 (defcustom starttls-connect "- Simple Client Mode:\n\n"
   "*Regular expression indicating successful connection.
 The default is what GNUTLS's \"gnutls-cli\" outputs."
-  ;; GNUTLS cli.c:main() print this string when it is starting to run
+  ;; GNUTLS cli.c:main() prints this string when it is starting to run
   ;; in the application read/write phase.  If the logic, or the string
   ;; itself, is modified, this must be updated.
   :version "22.1"
@@ -181,7 +181,7 @@ The default is what GNUTLS's \"gnutls-cli\" outputs."
 (defcustom starttls-failure "\\*\\*\\* Handshake has failed"
   "*Regular expression indicating failed TLS handshake.
 The default is what GNUTLS's \"gnutls-cli\" outputs."
-  ;; GNUTLS cli.c:do_handshake() print this string on failure.  If the
+  ;; GNUTLS cli.c:do_handshake() prints this string on failure.  If the
   ;; logic, or the string itself, is modified, this must be updated.
   :version "22.1"
   :type 'regexp
@@ -199,10 +199,10 @@ The default is what GNUTLS's \"gnutls-cli\" outputs."
   :group 'starttls)
 
 (defun starttls-negotiate-gnutls (process)
-  "Negotiate TLS on process opened by `open-starttls-stream'.
-This should typically only be done once.  It typically return a
+  "Negotiate TLS on PROCESS opened by `open-starttls-stream'.
+This should typically only be done once.  It typically returns a
 multi-line informational message with information about the
-handshake, or NIL on failure."
+handshake, or nil on failure."
   (let (buffer info old-max done-ok done-bad)
     (if (null (setq buffer (process-buffer process)))
 	;; XXX How to remove/extract the TLS negotiation junk?
@@ -235,18 +235,25 @@ handshake, or NIL on failure."
       (starttls-negotiate-gnutls process)
     (signal-process (process-id process) 'SIGALRM)))
 
-(defun starttls-open-stream-gnutls (name buffer host service)
+(eval-and-compile
+  (if (fboundp 'set-process-query-on-exit-flag)
+      (defalias 'starttls-set-process-query-on-exit-flag
+	'set-process-query-on-exit-flag)
+    (defalias 'starttls-set-process-query-on-exit-flag
+      'process-kill-without-query)))
+
+(defun starttls-open-stream-gnutls (name buffer host port)
   (message "Opening STARTTLS connection to `%s'..." host)
   (let* (done
 	 (old-max (with-current-buffer buffer (point-max)))
 	 (process-connection-type starttls-process-connection-type)
 	 (process (apply #'start-process name buffer
 			 starttls-gnutls-program "-s" host
-			 "-p" (if (integerp service)
-				  (int-to-string service)
-				service)
+			 "-p" (if (integerp port)
+				  (int-to-string port)
+				port)
 			 starttls-extra-arguments)))
-    (process-kill-without-query process)
+    (starttls-set-process-query-on-exit-flag process nil)
     (while (and (processp process)
 		(eq (process-status process) 'run)
 		(save-excursion
@@ -265,11 +272,11 @@ handshake, or NIL on failure."
 	     host (if done "done" "failed"))
     process))
 
-(defun starttls-open-stream (name buffer host service)
-  "Open a TLS connection for a service to a host.
-Returns a subprocess-object to represent the connection.
+(defun starttls-open-stream (name buffer host port)
+  "Open a TLS connection for a port to a host.
+Returns a subprocess object to represent the connection.
 Input and output work as for subprocesses; `delete-process' closes it.
-Args are NAME BUFFER HOST SERVICE.
+Args are NAME BUFFER HOST PORT.
 NAME is name for process.  It is modified if necessary to make it unique.
 BUFFER is the buffer (or `buffer-name') to associate with the process.
  Process output goes at end of that buffer, unless you specify
@@ -277,16 +284,17 @@ BUFFER is the buffer (or `buffer-name') to associate with the process.
  BUFFER may be also nil, meaning that this process is not associated
  with any buffer
 Third arg is name of the host to connect to, or its IP address.
-Fourth arg SERVICE is name of the service desired, or an integer
-specifying a port number to connect to."
+Fourth arg PORT is an integer specifying a port to connect to.
+If `starttls-use-gnutls' is nil, this may also be a service name, but
+GNUTLS requires a port number."
   (if starttls-use-gnutls
-      (starttls-open-stream-gnutls name buffer host service)
+      (starttls-open-stream-gnutls name buffer host port)
     (let* ((process-connection-type starttls-process-connection-type)
 	   (process (apply #'start-process
 			   name buffer starttls-program
-			   host (format "%s" service)
+			   host (format "%s" port)
 			   starttls-extra-args)))
-      (process-kill-without-query process)
+      (starttls-set-process-query-on-exit-flag process nil)
       process)))
 
 (defun starttls-open-ssl-stream (name buffer host service)
diff --git a/lisp/time-date.el b/lisp/time-date.el
index b1977da..32cd5bd 100644
--- a/lisp/time-date.el
+++ b/lisp/time-date.el
@@ -1,6 +1,7 @@
 ;;; time-date.el --- Date and time handling functions
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005
-;;        Free Software Foundation, Inc.
+
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;;   Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen 
 ;;	Masanobu Umeda 
@@ -20,8 +21,8 @@
 
 ;; 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.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -93,6 +94,7 @@ and type 3 is the list (HIGH LOW MICRO)."
    ((eq type 1) (list high low))
    ((eq type 2) (list high low micro))))
 
+(autoload 'parse-time-string "parse-time")
 (autoload 'timezone-make-date-arpa-standard "timezone")
 
 ;;;###autoload
diff --git a/lisp/tls.el b/lisp/tls.el
index ea07f1e..f61e3d5 100644
--- a/lisp/tls.el
+++ b/lisp/tls.el
@@ -1,6 +1,7 @@
 ;;; tls.el --- TLS/SSL support via wrapper around GnuTLS
 
-;; Copyright (C) 1996-1999, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2002, 2003, 2004,
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson 
 ;; Keywords: comm, tls, gnutls, ssl
@@ -19,8 +20,8 @@
 
 ;; 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.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -57,7 +58,8 @@
   :group 'comm)
 
 (defcustom tls-program '("gnutls-cli -p %p %h"
-			 "gnutls-cli -p %p %h --protocols ssl3")
+			 "gnutls-cli -p %p %h --protocols ssl3"
+			 "openssl s_client -connect %h:%p -no_ssl2")
   "List of strings containing commands to start TLS stream to a host.
 Each entry in the list is tried until a connection is successful.
 %s is replaced with server hostname, %p with port to connect to.
@@ -65,6 +67,7 @@ The program should read input on stdin and write output to
 stdout.  Also see `tls-success' for what the program should output
 after successful negotiation."
   :type '(repeat string)
+  :version "22.1"
   :group 'tls)
 
 (defcustom tls-process-connection-type nil
@@ -73,9 +76,10 @@ after successful negotiation."
   :type 'boolean
   :group 'tls)
 
-(defcustom tls-success "- Handshake was completed"
+(defcustom tls-success "- Handshake was completed\\|SSL handshake has read "
   "*Regular expression indicating completed TLS handshakes.
-The default is what GNUTLS's \"gnutls-cli\" outputs."
+The default is what GNUTLS's \"gnutls-cli\" or OpenSSL's
+\"openssl s_client\" outputs."
   :version "22.1"
   :type 'regexp
   :group 'tls)
@@ -110,11 +114,11 @@ Used by `tls-certificate-information'."
 	    (push (cons (match-string 1) (match-string 2)) vals))
 	  (nreverse vals))))))
 
-(defun open-tls-stream (name buffer host service)
-  "Open a TLS connection for a service to a host.
+(defun open-tls-stream (name buffer host port)
+  "Open a TLS connection for a port to a host.
 Returns a subprocess-object to represent the connection.
 Input and output work as for subprocesses; `delete-process' closes it.
-Args are NAME BUFFER HOST SERVICE.
+Args are NAME BUFFER HOST PORT.
 NAME is name for process.  It is modified if necessary to make it unique.
 BUFFER is the buffer (or buffer-name) to associate with the process.
  Process output goes at end of that buffer, unless you specify
@@ -122,8 +126,7 @@ BUFFER is the buffer (or buffer-name) to associate with the process.
  BUFFER may be also nil, meaning that this process is not associated
  with any buffer
 Third arg is name of the host to connect to, or its IP address.
-Fourth arg SERVICE is name of the service desired, or an integer
-specifying a port number to connect to."
+Fourth arg PORT is an integer specifying a port to connect to."
   (let ((cmds tls-program) cmd done)
     (message "Opening TLS connection to `%s'..." host)
     (while (and (not done) (setq cmd (pop cmds)))
@@ -136,9 +139,9 @@ specifying a port number to connect to."
 			 cmd
 			 (format-spec-make
 			  ?h host
-			  ?p (if (integerp service)
-				 (int-to-string service)
-			       service))))))
+			  ?p (if (integerp port)
+				 (int-to-string port)
+			       port))))))
 	     response)
 	(while (and process
 		    (memq (process-status process) '(open run))
diff --git a/lisp/utf7.el b/lisp/utf7.el
index c540076..d218c49 100644
--- a/lisp/utf7.el
+++ b/lisp/utf7.el
@@ -1,5 +1,7 @@
 ;;; utf7.el --- UTF-7 encoding/decoding for Emacs   -*-coding: iso-8859-1;-*-
-;; Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc.
+
+;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Jon K Hellan 
 ;; Maintainer: bugs@gnus.org
@@ -19,8 +21,8 @@
 
 ;; 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.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -78,7 +80,7 @@
 (defconst utf7-utf-16-coding-system
   (cond ((mm-coding-system-p 'utf-16-be-no-signature) ; Mule-UCS
 	 'utf-16-be-no-signature)
-	((and (mm-coding-system-p 'utf-16-be) ; Emacs 22.1
+	((and (mm-coding-system-p 'utf-16-be) ; Emacs 21.3, Emacs 22
 	      ;; Avoid versions with BOM.
 	      (= 2 (length (encode-coding-string "a" 'utf-16-be))))
 	 'utf-16-be)
diff --git a/lisp/uudecode.el b/lisp/uudecode.el
index 7157adf..875d32d 100644
--- a/lisp/uudecode.el
+++ b/lisp/uudecode.el
@@ -1,7 +1,7 @@
 ;;; uudecode.el -- elisp native uudecode
 
-;; Copyright (c) 1998, 1999, 2000, 2001, 2003, 2004
-;;        Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Shenghuo Zhu 
 ;; Keywords: uudecode news
@@ -20,8 +20,8 @@
 
 ;; 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.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
diff --git a/lisp/webmail.el b/lisp/webmail.el
index 6064224..9f22152 100644
--- a/lisp/webmail.el
+++ b/lisp/webmail.el
@@ -1,5 +1,7 @@
 ;;; webmail.el --- interface of web mail
-;; Copyright (C) 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
+
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Shenghuo Zhu 
 ;; Keywords: hotmail netaddress my-deja netscape
@@ -18,8 +20,8 @@
 
 ;; 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.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -635,7 +637,7 @@
 	  (goto-char (point-min))
 	  (delete-blank-lines)
 	  (setq ct (mail-fetch-field "content-type")
-		ctl (ignore-errors (mail-header-parse-content-type ct))
+		ctl (and ct (mail-header-parse-content-type ct))
 		;;cte (mail-fetch-field "content-transfer-encoding")
 		cd (mail-fetch-field "content-disposition")
 		description (mail-fetch-field "content-description")
diff --git a/lisp/yenc.el b/lisp/yenc.el
index 3fea50f..7903d78 100644
--- a/lisp/yenc.el
+++ b/lisp/yenc.el
@@ -1,5 +1,6 @@
 ;;; yenc.el --- elisp native yenc decoder
-;; Copyright (c) 2002 Free Software Foundation, Inc.
+
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Jesper Harder 
 ;; Keywords: yenc news
@@ -18,8 +19,8 @@
 
 ;; 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.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
diff --git a/make.bat b/make.bat
index 8d865c8..5cde189 100755
--- a/make.bat
+++ b/make.bat
@@ -3,6 +3,16 @@
 rem Written by Frank Schmitt (ich@frank-schmitt.net)
 rem based on the work by David Charlap (shamino@writeme.com)
 rem .
+rem .
+rem From http://my.gnus.org/node/343:
+rem   A comment on installing Gnus on Windows 98 SE that might help others: When
+rem   I ran the "make.bat" file in the 5.10.6 tarball I got a bunch of "Out of
+rem   environment space" messages. The solution was to (1) make a shortcut to
+rem   the make.bat file, and (2) right-click on the shortcut, setting "Cmd line"
+rem   in the "Program" tab in "properties" to include the parameters make.bat
+rem   requires, and "initial environment" in the "memories" tab, to the maximum
+rem   (in my case, anyway, 2560).
+rem .
 rem Clear PWD so emacs doesn't get confused
 set GNUS_PWD_SAVE=%PWD%
 set PWD=
@@ -21,8 +31,8 @@ goto noemacs
 set EMACS=emacs.bat
 echo.
 echo ***************************************************************************
-echo * Using emacs.bat (If you've got en Emacs >= 20.3 please remove Emacs.bat,
-echo * it isn't needed anymore.
+echo * Using emacs.bat  (If you've got Emacs 20.3 or higher please remove
+echo * Emacs.bat, it isn't needed anymore.)
 echo ***************************************************************************
 echo.
 goto emacs
@@ -187,9 +197,14 @@ if not exist %GNUS_ETC_DIR%\gnus\nul mkdir %GNUS_ETC_DIR%\gnus
 xcopy /R /Q /Y .\gnus\* %GNUS_ETC_DIR%\gnus\
 if ErrorLevel 1 set ERROR=%ERROR%,copy-etc-gnus-*
 if not exist %GNUS_ETC_DIR%\images\nul mkdir %GNUS_ETC_DIR%\images
+xcopy /R /Q /Y .\images\*.??? %GNUS_ETC_DIR%\images
+if ErrorLevel 1 set ERROR=%ERROR%,copy-etc-images-*
 if not exist %GNUS_ETC_DIR%\images\gnus\nul mkdir %GNUS_ETC_DIR%\images\gnus
 xcopy /R /Q /Y .\images\gnus\* %GNUS_ETC_DIR%\images\gnus\
 if ErrorLevel 1 set ERROR=%ERROR%,copy-etc-images-gnus-*
+if not exist %GNUS_ETC_DIR%\images\mail\nul mkdir %GNUS_ETC_DIR%\images\mail
+xcopy /R /Q /Y .\images\mail\* %GNUS_ETC_DIR%\images\mail\
+if ErrorLevel 1 set ERROR=%ERROR%,copy-etc-images-mail-*
 if not exist %GNUS_ETC_DIR%\images\smilies\nul mkdir %GNUS_ETC_DIR%\images\smilies
 xcopy /R /Q /Y .\images\smilies\* %GNUS_ETC_DIR%\images\smilies\
 if ErrorLevel 1 set ERROR=%ERROR%,copy-etc-images-smilies-*
diff --git a/texi/ChangeLog b/texi/ChangeLog
index fbd0a0f..c780c4b 100644
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,549 @@
+2006-04-11  Reiner Steib  
+
+	* gnus.texi, gnus-faq.texi, message.texi: No Gnus v0.4 is released.
+
+2006-04-10  Reiner Steib  
+
+	* gnus.texi (Misc Group Stuff, Summary Buffer, Article Keymap)
+	(Server Commands): Key `v' is reserved for users.
+
+2006-04-07  Reiner Steib  
+
+	* gnus.texi (Summary Buffer Lines): Add `*'.
+
+2006-04-07  Jochen K,A|(Bpper  
+
+	* gnus.texi (Group Parameters): Mention
+	gnus-permanently-visible-groups.
+
+2006-04-06  Katsumi Yamaoka  
+
+	* gnus.texi (Face): Restore xref to gnus-face-properties-alist;
+	fix typo.
+
+2006-04-05  Reiner Steib  
+
+	* gnus.texi (X-Face): Clarify.
+	(Face): Need Emacs with PNG support.
+
+2006-04-04  Reiner Steib  
+
+	* gnus.texi, message.texi: Bump version.
+
+2006-04-04  Simon Josefsson  
+
+	* gnus.texi (Security): Improve.
+
+2006-03-31  Reiner Steib  
+
+	* gnus-news.texi: Restore customizable tool bar item.  Markup
+	fixes.  Minor rewording.  Add "New packages and libraries",
+	"summary and article", "Appearance" and "Miscellaneous".  Remove
+	"Major new features" and "Other changes".  Add some @xref-s.
+
+2006-03-31  Romain Francoise  
+
+	* gnus.texi (Virtual Groups): `nnvirtual-always-rescan' defaults
+	to t, not nil (and has for the past eight years).
+
+2006-03-30  Romain Francoise  
+
+	* gnus-news.texi: Reorder entries in sections.  Fix typos.
+	Add local variables section.
+
+	* gnus-news.el (gnus-news-header-disclaimer): Delete top section.
+	(gnus-news-fill-column): Increment to 80.
+	(gnus-news-translate-file): Support nested list items.
+
+2006-03-30  Reiner Steib  
+
+	* gnus-news.texi: Add gnus-group-update-tool-bar.
+
+2006-03-29  Reiner Steib  
+
+	* gnus.texi (Top): Add comment about version line.
+
+	* message.texi (Top): Ditto.  Change to take named versions into
+	account.
+
+	* gnus-news.texi: Add customizable tool bar.
+
+2006-03-28  Reiner Steib  
+
+	* gnus.texi (Posting Styles): Add x-face-file to example.
+	(X-Face): Refer to posting styles.
+
+	* gnus-faq.texi ([5.8]): Add x-face-file.
+	([8.4]): Add links to gmane.emacs.gnus.user and
+	gmane.emacs.gnus.general.
+
+2006-03-27  Reiner Steib  
+
+	* sasl.texi: Use @copyright{} instead of (C).  Update copyright.
+
+2006-03-27  Karl Berry  
+
+	* gnus.texi, message.texi, emacs-mime.texi, sieve.texi, pgg.texi:
+	Do not indent copyright year list.
+
+2006-03-27  Reiner Steib  
+
+	* gnus-faq.texi: Use .invalid.
+	([5.4]): Fix gnus-posting-styles example.
+
+2006-03-20  Romain Francoise  
+
+	* gnus.texi (Mail Folders, Mail Spool): Grammar fixes.
+
+2006-03-10  Katsumi Yamaoka  
+
+	* gnus.texi (NoCeM): Mention gnus-use-nocem can also be a number.
+
+2006-03-10  Reiner Steib  
+
+	* gnus.texi (Fancy Mail Splitting): Improve sentences so as to be
+	easy to understand.
+
+2006-03-09  Katsumi Yamaoka  
+
+	* gnus.texi: Markup fix.
+	(Fancy Mail Splitting): Specify new feature.
+
+2006-03-08  Katsumi Yamaoka  
+
+	* gnus.texi (Fancy Mail Splitting): Improve descriptions about
+	partial-words matching.
+
+2006-03-07  Reiner Steib  
+
+	* emacs-mime.texi (Display Customization): Reword image/.* stuff.
+
+	* gnus.texi (Oort Gnus): Add note about `gnus-load'.
+	(MIME Commands): Fix mm-discouraged-alternatives.
+
+2006-03-06  Reiner Steib  
+
+	* gnus-news.el, gnus-news.texi: Update copyright.
+
+2006-03-03  Reiner Steib  
+
+	* xemacs.mak: Remove outdated file.  Use make.bat instead.
+
+	* gnus.texi (Oort Gnus): Add `mm-fill-flowed'.
+
+2006-02-09  Reiner Steib  
+
+	* gnus.texi (Mail Spool): nnml-use-compressed-files can be a
+	string.
+	(Gnus Versions): Add history beyond start of Oort.
+
+	* gnus-news.texi: Add nnml-use-compressed-files.
+
+2006-01-31  Romain Francoise  
+
+	* message.texi: Update copyright year.
+
+2006-01-26  Katsumi Yamaoka  
+
+	* ps/Makefile.in (distclean): Remove Makefile.
+
+	* Makefile.in (almost-clean): Rename from clean.
+	(clean): Rename from veryclean.
+	(distclean): Use clean.
+	(pspackage): Use almost-clean.
+
+2006-01-16  Katsumi Yamaoka  
+
+	* gnus.texi: Update copyright.
+
+2006-01-13  Katsumi Yamaoka  
+
+	* gnus.texi (Article Washing): Additions.
+
+2006-01-08  Alex Schroeder  
+
+	* pgg.texi (Caching passphrase): Rewording.
+
+2006-01-10  Katsumi Yamaoka  
+
+	* gnus.texi (RSS): Document nnrss-wash-html-in-text-plain-parts.
+
+2006-01-06  Katsumi Yamaoka  
+
+	* gnus.texi (Group Parameters): Fix description.
+	(RSS): Addition.
+
+2005-12-22  Katsumi Yamaoka  
+
+	* gnus.texi (Summary Post Commands): Fix function bound to `S O p'.
+
+2005-12-19  Katsumi Yamaoka  
+
+	* emacs-mime.texi (Display Customization): Add setting example to
+	mm-discouraged-alternatives.
+
+2005-12-15  Reiner Steib  
+
+	* gnus.texi (Gmane Spam Reporting): Fix
+	spam-report-gmane-use-article-number.  Add
+	spam-report-user-mail-address.
+
+2005-12-13  Reiner Steib  
+
+	* gnus-news.el (gnus-news-translate-file): Fix previous commit.
+
+	* gnus-coding.texi (Gnus Coding Style): Add `uudecode.el'.
+	(Gnus Maintainance Guide): Add ref to "Gnus Development".  Add
+	conventions about custom versions.
+
+2005-12-12  Katsumi Yamaoka  
+
+	* gnus.texi (MIME Commands): Mention addition of
+	multipart/alternative to gnus-buttonized-mime-types and add xref
+	to mm-discouraged-alternatives.
+
+	* emacs-mime.texi (Display Customization): Mention addition of
+	"image/.*" and add xref to gnus-buttonized-mime-types in the
+	mm-discouraged-alternatives section.
+
+2005-12-06  Katsumi Yamaoka  
+
+	* gnus-news.el: Markup and description fixes and additions.
+
+2005-12-05  Katsumi Yamaoka  
+
+	* pgg.texi (User Commands): Fix description of pgg-verify-region.
+	(Selecting an implementation): Fix descriptions.
+
+2005-12-02  Reiner Steib  
+
+	* gnus-news.el: Update Copyright.
+	(gnus-news-translate-file): Avoid "*Note" at beginning of line.
+
+2005-12-01  Katsumi Yamaoka  
+
+	* emacs-mime.texi (Non-MIME): x-gnus-verbatim -> x-verbatim.
+
+2005-11-30  Katsumi Yamaoka  
+
+	* message.texi (Various Message Variables): Addition.
+
+2005-11-29  Katsumi Yamaoka  
+
+	* message.texi: Fix default values.
+
+2005-11-25  Katsumi Yamaoka  
+
+	* message.texi (Header Commands): Clarify descriptions of
+	message-cross-post-followup-to, message-reduce-to-to-cc, and
+	message-insert-wide-reply.
+	(Various Commands): Fix kindex for message-kill-to-signature;
+	clarify description of message-tab.
+
+2005-11-22  Katsumi Yamaoka  
+
+	* message.texi (Mailing Lists): Fix description about MFT.
+
+	* gnus.texi (Emacs Lisp): Use ~/.gnus.el instead of ~/.emacs.
+
+2005-11-17  Katsumi Yamaoka  
+
+	* gnus.texi (Slow Terminal Connection): Replace old description
+	with new one.
+
+2005-11-16  Katsumi Yamaoka  
+
+	* gnus.texi (Oort Gnus): Use ~/.gnus.el instead of ~/.emacs;
+	replace X-Draft-Headers with X-Draft-From.
+
+2005-11-14  Katsumi Yamaoka  
+
+	* gnus.texi (Various Various): Fix the default value of
+	nnheader-max-head-length.
+	(Gnus Versions): Fix typo.
+
+2005-11-10  Reiner Steib  
+
+	* gnus-coding.texi (Gnus Coding Style): Add MIME subsection.
+	(Gnus Maintainance Guide): Improvements.
+
+	* gnus.texi (Sorting the Summary Buffer): Replace 2005-10-29
+	change by a reference to `Group Parameters'.  Use `(not ...)' in
+	example instead of `lambda' expression.
+	(Group Parameters): Add simplified sorting example based on
+	example for `Sorting the Summary Buffer' from Jari Aalto
+	.
+	(Example Methods): Add example for an indirect connection.
+
+2005-11-10  Katsumi Yamaoka  
+
+	* gnus.texi (XVarious): Fix description of gnus-use-toolbar; add
+	new variable gnus-toolbar-thickness.
+
+2005-11-09  Katsumi Yamaoka  
+
+	* gnus.texi (Agent and flags): Add it to the detailmenu.
+
+2005-11-08  Kevin Greiner  
+
+	* gnus.texi (nntp-open-via-telnet-and-telnet): Fixed grammar.
+	(Agent Parameters): Updated parameter names to match code.
+	(Group Agent Commands): Corrected 'gnus-agent-fetch-series' as
+	'gnus-agent-summary-fetch-series'.
+	(Agent and flags): New section providing a generalized discussion
+	of flag handling.
+	(Agent and IMAP): Removed flag discussion.
+	(Agent Variables): Added 'gnus-agent-synchronize-flags'
+
+2005-11-08  Romain Francoise  
+
+	* gnus.texi (Exiting the Summary Buffer): Add new function
+	`gnus-summary-catchup-and-goto-prev-group', bound to `Z p'.
+
+2005-11-08  Katsumi Yamaoka  
+
+	* gnus.texi (XVarious): Revert description of gnus-use-toolbar.
+
+2005-11-07  Katsumi Yamaoka  
+
+	* gnus.texi (X-Face): Fix description.
+	(XVarious): Remove gnus-xmas-logo-color-alist and
+	gnus-xmas-logo-color-style; fix description of gnus-use-toolbar.
+
+2005-11-04 Ken Manheimer  
+
+	* pgg.texi (User Commands): Document additional passphrase
+	argument for pgg-encrypt-*, pgg-decrypt-*, and pgg-sign-* functions.
+	(Backend methods): Likewise for corresponding pgg-scheme-* functions.
+
+2005-11-02  Reiner Steib  
+
+	* gnus.texi (Conformity): Fix typo.
+	(Customizing Articles): Document `first'.
+
+2005-11-01  Katsumi Yamaoka  
+
+	* gnus.texi (Group Parameters): Mention new variable
+	gnus-parameters-case-fold-search.
+	(Home Score File): Addition.
+
+2005-10-29  Sascha Wilde  
+
+	* pgg.texi (How to use): Update the example to add autoload of
+	pgg-encrypt-symmetric-region.
+	(User Commands): Document pgg-encrypt-symmetric-region.
+	(Backend methods): Document pgg-scheme-encrypt-symmetric-region.
+
+2005-10-29  Jari Aalto  
+
+	* gnus.texi (Sorting the Summary Buffer):
+	Add `gnus-thread-sort-by-date-reverse'.  Add example
+	host to different sorting in NNTP and RSS groups.
+
+2005-10-28  Reiner Steib  
+
+	* gnus-coding.texi: Split into nodes.
+	(Gnus Coding Style): Add flow-fill.el.
+
+2005-10-25  Reiner Steib  
+
+	* gnus-coding.texi (Dependencies): Add some text.
+	(Dependencies): Update encrypt.el.
+
+2005-10-17  Katsumi Yamaoka  
+
+	* gnus.texi (Document Groups): Remove duplicate item.
+
+2005-10-14  Katsumi Yamaoka  
+
+	* gnus.texi (Document Server Internals): Addition.
+
+2005-10-13  Katsumi Yamaoka  
+
+	* gnus.texi (A note on namespaces): Fix RFC reference.
+
+2005-10-12  Katsumi Yamaoka  
+
+	* gnus.texi (RSS): Fix key description.
+
+2005-10-11  Katsumi Yamaoka  
+
+	* gnus.texi: Emacs/w3 -> Emacs/W3.
+	(Browsing the Web): Fix description.
+	(Web Searches): Ditto.
+	(Customizing W3): Ditto.
+
+2005-10-07  Katsumi Yamaoka  
+
+	* gnus.texi (Maildir): Clarify expire-age and expire-group.
+
+2005-10-04  Katsumi Yamaoka  
+
+	* gnus-news.texi: Mention that the Lisp files are now installed in
+	.../site-lisp/gnus/ by default.
+
+2005-10-03  Simon Josefsson  
+
+	* gnus-news.texi: Fix typo.
+
+2005-09-28  Reiner Steib  
+
+	* gnus-coding.texi: Added  some comments.
+
+	* message.texi (Insertion): Describe prefix for
+	message-mark-inserted-region and message-mark-insert-file.
+
+2005-09-28  Simon Josefsson  
+
+	* message.texi (IDNA): Fix.
+
+2005-09-28  Katsumi Yamaoka  
+
+	* gnus.texi (NNTP): Remove nntp-buggy-select, nntp-read-timeout,
+	nntp-server-hook, and nntp-warn-about-losing-connection; fix
+	description of nntp-open-connection-function.
+	(Common Variables): Fix descriptions.
+
+2005-09-27  Reiner Steib  
+
+	* emacs-mime.texi (Non-MIME): Add Slrn-style verbatim marks and
+	LaTeX documents.  Describe "text/x-gnus-verbatim".
+
+2005-09-26  Katsumi Yamaoka  
+
+	* gnus.texi (Server Buffer Format): Document the %a format spec.
+
+2005-09-22  Katsumi Yamaoka  
+
+	* gnus.texi (Mail): Fix gnus-confirm-mail-reply-to-news entry.
+
+2005-09-21  Teodor Zlatanov  
+
+	* gnus.texi (Blacklists and Whitelists)
+	(Blacklists and Whitelists, BBDB Whitelists)
+	(Gmane Spam Reporting, Bogofilter, spam-stat spam filtering)
+	(spam-stat spam filtering, SpamOracle)
+	(Extending the Spam ELisp package): Removed extra quote symbol for
+	clarity.
+
+2005-09-20  Reiner Steib  
+
+	* gnus.texi (MIME Commands): Add gnus-article-save-part-and-strip,
+	gnus-article-delete-part and gnus-article-replace-part.
+	(Using MIME): Add gnus-mime-replace-part.
+
+	* gnus-news.texi: Add gnus-mime-replace-part and
+	gnus-article-replace-part.  Use @xref.
+
+2005-09-20  Simon Josefsson  
+
+	* gnus-coding.texi: New file, from Reiner Steib
+	.
+
+2005-09-17  Romain Francoise  
+
+	Update all files to specify GFDL version 1.2.
+
+	* doclicense.texi (GNU Free Documentation License): Update to
+	version 1.2.
+
+2005-09-15  Katsumi Yamaoka  
+
+	* gnus.texi (Finding the Parent): Fix description of how Gnus
+	finds article.
+
+2005-09-14  Jari Aalto  
+
+	* gnus.texi (Advanced Scoring Examples): New exmples to teach how
+	to drop off non-answered articles.
+
+2005-09-11  Romain Francoise  
+
+	* message.texi (Message Headers): Explain what
+	`message-alternative-emails' does in more detail.
+
+	* gnus.texi (Mail Spool): Mention that `nnml-use-compressed-files'
+	requires `auto-compression-mode' to be enabled.  Add new nnml
+	variable `nnml-compressed-files-size-threshold'.
+
+2005-09-07  Reiner Steib  
+
+	* gnus.texi (Sorting the Summary Buffer): Added
+	gnus-thread-sort-by-recipient.
+
+2005-09-05  Katsumi Yamaoka  
+
+	* gnus-news.texi: Fix reference.
+
+2005-09-04  Reiner Steib  
+
+	* gnus.texi (Mail Source Customization): Fix descriptions of
+	mail-source-incoming-file-prefix.
+
+	* message.texi (MIME): Describe mml-dnd-protocol-alist and
+	mml-dnd-attach-options.
+
+	* gnus-news.texi: Added reference.
+
+2005-09-02  Katsumi Yamaoka  
+
+	* gnus.texi (Choosing Variables): Fix descriptions.
+
+2005-08-19  Katsumi Yamaoka  
+
+	* emacs-mime.texi (time-date): Fix description of safe-date-to-time.
+
+2005-08-18  Katsumi Yamaoka  
+
+	* emacs-mime.texi (Handles): Remove duplicate item.
+	(Encoding Customization): Fix the default value for
+	mm-coding-system-priorities.
+	(Charset Translation): Emacs doesn't use mm-mime-mule-charset-alist.
+	(Basic Functions): Fix reference.
+
+2005-08-10  Romain Francoise  
+
+	* gnus-news.texi: Mention new variable `message-yank-empty-prefix'.
+
+2005-08-09  Katsumi Yamaoka  
+
+	* gnus.texi (Charsets): Fj hierarchy uses iso-2022-jp.
+
+2005-08-08  Romain Francoise  
+
+	* message.texi (Insertion Variables): Mention new variable
+	`message-yank-empty-prefix'.  Change `message-yank-cited-prefix'
+	documentation accordingly.
+
+2005-07-27  Reiner Steib  
+
+	* gnus.texi (Startup Files): Fix name of gnus-site-init-file.
+	Mention that gnus-init-file is not read when Emacs is invoked with
+	--no-init-file or -q.
+
+2005-07-20  Didier Verna  
+
+	* gnus.texi (Email Based Diary): New. Proper documentation for the
+	nndiary back end and the gnus-diary library.
+
+2005-07-18  Romain Francoise  
+
+	* gnus.texi (To From Newsgroups): Mention new variables
+	`gnus-summary-to-prefix' and `gnus-summary-newsgroup-prefix'.
+
+	* gnus-news.texi: Ditto.
+
+2005-06-29  Katsumi Yamaoka  
+
+	* gnus.texi (NoCeM): gnus-nocem-verifyer defaults to pgg-verify.
+
+2005-06-23  Juanma Barranquero  
+
+	* gnus.texi (MIME Commands, Fancy Mail Splitting, Agent Visuals)
+	(Agent Variables):
+	* message.texi (Message Headers):
+	Texinfo usage fix.
+
 2005-03-30  Reiner Steib  
 
 	* Makefile.in (gnus-booklet.dvi, gnus-booklet.pdf): Simplify.
@@ -101,7 +647,7 @@
 
 	* gnus-news.texi: Ditto.
 
-2005-01-16  Xavier Maillard  (tiny change)
+2005-01-16  Xavier Maillard    (tiny change)
 
 	* gnus-faq.texi ([4.1]): Typo.
 
@@ -165,7 +711,7 @@
 
 2004-12-08  Reiner Steib  
 
-	* gnusref.tex: Mention `gnus-summary-limit-to-recipient' and 
+	* gnusref.tex: Mention `gnus-summary-limit-to-recipient' and
 	`gnus-summary-sort-by-recipient'.
 
 2004-12-08  Reiner Steib  
@@ -187,7 +733,7 @@
 
 2004-12-06  Reiner Steib  
 
-	* gnus-news.texi: Mention `gnus-summary-limit-to-recipient' and 
+	* gnus-news.texi: Mention `gnus-summary-limit-to-recipient' and
 	`gnus-summary-sort-by-recipient'.
 
 	* gnus.texi (Filtering Spam Using The Spam ELisp Package): Index
@@ -363,7 +909,7 @@
 2004-08-31  Reiner Steib  
 
 	* emacs-mime.texi, gnus-faq.texi, gnus.texi, message.texi,
-	pgg.texi, sieve.texi: Use @copying and @insertcopying.
+	* pgg.texi, sieve.texi: Use @copying and @insertcopying.
 
 2004-08-22  Reiner Steib  
 
@@ -372,8 +918,8 @@
 
 2004-08-17  Teodor Zlatanov  
 
-	* gnus.texi (IMAP): add comments about imaps synonym to imap in
-	netrc syntax
+	* gnus.texi (IMAP): Add comments about imaps synonym to imap in
+	netrc syntax.
 
 2004-08-15  Simon Josefsson  
 
@@ -434,7 +980,7 @@
 2004-05-28  Reiner Steib  
 
 	* gnus-faq.texi: Untabify.
-	([6.3]): nnir.el is in contrib directory.  
+	([6.3]): nnir.el is in contrib directory.
 
 	* message.texi (News Headers): Clarify how a unique ID is created.
 
@@ -443,7 +989,7 @@
 2004-05-19  Andre Srinivasan  
 
 	* gnus.texi (Group Parameters): Added more on hooks.  (Small
-	change.) 
+	change.)
 
 2004-05-19  Reiner Steib  
 
@@ -470,7 +1016,7 @@
 
 	* gnus.texi (Charsets): Point to relevant section in emacs-mime.
 
-2004-04-14  Kevin Greiner 
+2004-04-14  Kevin Greiner  
 
 	* gnus.texi (Agent Visuals): Referenced new F(etched) group line
 	format.
@@ -504,9 +1050,8 @@
 
 2004-03-29  Teodor Zlatanov  
 
-	* gnus.texi (Spam ELisp Package Sequence of Events): some clarifications
-	(Spam ELisp Package Global Variables)
-	(Spam ELisp Package Global Variables): more clarifications
+	* gnus.texi (Spam ELisp Package Sequence of Events): Some clarifications.
+	(Spam ELisp Package Global Variables): More clarifications.
 
 2004-03-18  Helmut Waitzmann    (tiny change)
 
@@ -580,7 +1125,7 @@
 
 	* emacs-mime.texi: Enclose the iflatex section with iftex.
 
-2004-03-02  Kevin Greiner 
+2004-03-02  Kevin Greiner  
 
 	* emacs-mime.texi: Wrapped documentencoding inside of iflatex as
 	documentencoding is not supported by infohack.
@@ -591,7 +1136,7 @@
 	characters that can not be encoded using iso-8859-1.
 	(Gnus Unplugged): Reference gnus-agent variable.
 	(Agent Variables): Added gnus-agent.
-	
+
 
 2004-02-17  Katsumi Yamaoka  
 
@@ -622,7 +1167,7 @@
 2004-01-23  Teodor Zlatanov  
 
 	* gnus.texi (Spam ELisp Package Filtering of Incoming Mail):
-	mention spam-split does not modify incoming mail
+	Mention spam-split does not modify incoming mail.
 
 2004-01-23  Jesper Harder  
 
@@ -630,9 +1175,9 @@
 
 2004-01-22  Teodor Zlatanov  
 
-	* gnus.texi (Spam ELisp Package Sequence of Events): fix typo
+	* gnus.texi (Spam ELisp Package Sequence of Events): Fix typo.
 
-2004-01-21  Kevin Greiner 
+2004-01-21  Kevin Greiner  
 
 	* gnus.texi (Outgoing Messages, Agent Variables): Add
 	gnus-agent-queue-mail and gnus-agent-prompt-send-queue.
@@ -661,7 +1206,7 @@
 
 	* gnus.texi (The problem of spam): Fix, reported by Cheng Gao
 	 and suggested by Richard Hoskins
-	 (tiny change).
+	  (tiny change).
 
 2004-01-07  Jesper Harder  
 
@@ -766,7 +1311,7 @@
 	(Blacklists and Whitelists, BBDB Whitelists)
 	(Gmane Spam Reporting, Bogofilter, spam-stat spam filtering)
 	(SpamOracle): mention that spam/ham processor variables are being
-	obsoleted 
+	obsoleted
 	(Extending the Spam ELisp package): add some new documentation
 	for adding a new backend to spam.el
 
@@ -790,7 +1335,7 @@
 2003-12-31  Steve Youngs  
 
 	* gnus.texi (XEmacs): Update list of Gnus XEmacs package
-	requirements. 
+	requirements.
 
 2003-12-30  Reiner Steib  
 
@@ -817,7 +1362,7 @@
 
 	* gnus.texi (Group Parameters): Clarify.
 
-2003-12-11  Kevin Greiner 
+2003-12-11  Kevin Greiner  
 
 	* gnus.texi (Agent Parameters): Added references in Topic and
 	Group Parameters.  Added gnus-agent-cat-disable-undownloaded-faces
@@ -1064,11 +1609,13 @@
 	* gnus.texi (Filtering Spam Using The Spam ELisp Package):
 	mentioned the spam-install-hooks mess
 
+2003-07-11  Matthias Andree   (tiny change)
+
+	* gnus.texi (Splitting in IMAP): Typos.
+
 2003-07-11  Simon Josefsson  
 
-	* gnus.texi (Splitting in IMAP): Typos, tiny patch from Matthias
-	Andree .
-	(Splitting in IMAP): Mention Sieve.
+	* gnus.texi (Splitting in IMAP): Mention Sieve.
 
 2003-07-10  Simon Josefsson  
 
@@ -1084,7 +1631,7 @@
 2003-06-24  Lars Magne Ingebrigtsen  
 
 	* gnus.texi (Summary Mail Commands): Make note of
-	Mail-Followup-To. 
+	Mail-Followup-To.
 
 2003-06-23  Jesper Harder  
 
@@ -1194,12 +1741,11 @@
 
 	* message.texi (Insertion Variables): do.
 
-2003-05-13  Simon Josefsson  
+2003-05-13  Niklas Morberg   (tiny change)
 
-	* gnus.texi (IMAP, Agent and IMAP, Oort Gnus): s/a/an/.  Tiny
-	patch from Niklas Morberg .
+	* gnus.texi (IMAP, Agent and IMAP, Oort Gnus): s/a/an/.
 
-2003-05-12  Kevin Greiner 
+2003-05-12  Kevin Greiner  
 
 	* gnus.texi (Agent Visuals): Add.
 
@@ -1454,7 +2000,7 @@
 
 	* message.texi (IDNA): New.
 
-2003-03-18  Kevin Greiner 
+2003-03-18  Kevin Greiner  
 
 	* gnus.texi (Gnus Unplugged): Refer to new agent Group/Topic
 	parameters.
@@ -1492,10 +2038,9 @@
 
 	* gnus.texi (Required Back End Functions): Add.
 
-2003-03-17  Simon Josefsson  
+2003-03-17  Frank Haun	  (tiny change)
 
-	* pgg.texi: Fix setfilename.  Tiny patch by Frank Haun
-	.
+	* pgg.texi: Fix setfilename.
 
 2003-03-09  Paul Jarc  
 
@@ -1531,7 +2076,7 @@
 	(Document Server Internals, Score Variables, Adaptive Scoring)
 	(X-Face, Hashcash): do.
 
-2003-02-28  Vasily Korytov 
+2003-02-28  Vasily Korytov  
 
 	* gnus.texi: New values, 'to-list and 'cc-list, for
 	gnus-boring-article-headers.
@@ -2413,7 +2958,7 @@
 	* gnus.texi (Mail Spool): Add cindex for marks.
 	(Mail Folders): Add cindex for marks.
 
-2002-03-24  Raymond Scholz 
+2002-03-24  Raymond Scholz  
 
 	* gnus.texi (Summary Buffer Lines): Fix doc.
 
@@ -2421,7 +2966,7 @@
 
 	* Makefile.in (booklet.dvi, booklet.pdf): Support booklet.
 
-2002-03-24  Felix Natter 
+2002-03-24  Felix Natter  
 
 	* booklet.tex, bk-at.tex, bk-lt.tex, gnuslog-booklet.eps: New file.
 	* gnusref.tex, refcard.tex: Support booklet.
@@ -2451,7 +2996,7 @@
 	* message.texi (Security): Add mml-unsecure-message.
 	(Mailing Lists): Index message-goto-mail-followup-to.
 
-2002-03-23  Jesper Harder 
+2002-03-23  Jesper Harder  
 
 	* gnusref.tex, refcard.tex: Addition.
 
@@ -2530,7 +3075,7 @@
 
 	* gnus.texi (Mail Source Specifiers): Use @uref.
 
-2002-02-13  Jesper Harder 
+2002-02-13  Jesper Harder  
 
 	* message.texi, gnus.texi, emacs-mime.texi: Use small caps
 	consistently.  MIME, NOV, NNTP, HTML, IMAP are written with @sc
@@ -3600,11 +4145,11 @@
 	* gnus.texi (Sorting Groups): Note `C-k' and `C-y' for manually
 	moving groups around.
 
-2001-04-07  Ryan Yeske 
+2001-04-07  Ryan Yeske  
 
 	* gnus.texi (Splitting in IMAP): Fix.
 
-2001-04-07  Jesper Harder 
+2001-04-07  Jesper Harder  
 
 	* gnus.texi (More Threading): Fix.
 
@@ -3727,7 +4272,7 @@
 
 	* gnus.texi (Top): Add Using GPG.
 
-2001-02-02  David Masterson 
+2001-02-02  David Masterson  
 
 	* gnus.texi (The Server is Down): Add link to Group Levels.
 
@@ -3746,7 +4291,7 @@
 	* message.texi (message-ignored-news-headers): Add "X-Draft-From:".
 	(message-ignored-mail-headers): Ditto.
 
-2001-01-21  Raymond Scholz 
+2001-01-21  Raymond Scholz  
 
 	* message.texi: Rename X-Mailer and X-Newsreader to User-Agent.
 
@@ -3762,7 +4307,7 @@
 
 	* emacs-mime.texi: Set dircategory to Emacs.
 
-2001-01-16  Jesper Harder 
+2001-01-16  Jesper Harder  
 
 	* gnus.texi (Group Line Specification): Add.
 
@@ -3931,7 +4476,7 @@
 	group names as target, where `gnus-split-methods' uses file
 	names.  Suggested by Nevin Kapur.
 
-2000-11-07  Martin Buchholz 
+2000-11-07  Martin Buchholz  
 
 	* gnus.texi: Doc fix.
 
@@ -3944,7 +4489,7 @@
 
 	* gnus.texi (Finding the News): @env is not supported in texinfo 3.12.
 
-2000-10-31  Jorge Godoy 
+2000-10-31  Jorge Godoy  
 
 	* gnus.texi: gnus-gpg document.
 
@@ -4083,7 +4628,7 @@
 	Explain interaction between these.  Add Lisp example for setting
 	`nnmail-expiry-target'.
 
-2000-08-04  Andreas Oeldenberger 
+2000-08-04  Andreas Oeldenberger  
 
 	* message.texi (Forwarding): Fix.
 
@@ -4240,7 +4785,7 @@
 
 	* gnus.texi (MIME Commands): Fix.
 
-2000-01-03  Karl Kleinpaste 
+2000-01-03  Karl Kleinpaste  
 
 	* gnus.texi (Splitting in IMAP): Add '.' after @xref.
 
diff --git a/texi/Makefile.in b/texi/Makefile.in
index b59c320..7ee865f 100644
--- a/texi/Makefile.in
+++ b/texi/Makefile.in
@@ -132,9 +132,9 @@ gnus-booklet.pdf: $(REFCARD).tex  $(LOGO).pdf
 	  TEXINPUTS=$(srcdir):$$TEXINPUTS:: \
           $(PDFLATEX) '\def\booklettrue{}\def\letterpapertrue{}\input{$(REFCARD)}' ;\
 	fi
-	mv $(REFCARD).pdf $@ 
+	mv $(REFCARD).pdf $@
 
-gnus-faq-full-update:  gnus-faq-clean gnus-faq-texi
+gnus-faq-full-update: gnus-faq-clean gnus-faq-texi
 
 gnus-faq.xml:
 	cvs -z3 -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/gnus \
@@ -153,7 +153,7 @@ gnus-faq-texi: gnus-faq.xml xml2texi.sh xml2texi.scm
 gnus-faq-clean:
 	rm -f gnus-faq.xml gnus-faq.*.tmp gnus-faq.texi
 
-clean:
+almost-clean:
 	rm -f *.[cgk]idx *.aux *.cp *.cps *.dvi *.dvi-x *.fn *.ky	\
 	*.kys *.latexi *.log *.orig *.pdf *.pdf-x *.pg *.rej		\
 	*.tmplatexi *.toc *.tp *.vr gnus.*.bak gnus.[cgk]ind gnus.idx	\
@@ -244,11 +244,11 @@ latexboth: gnus-manual-a4.ps.gz gnus-manual-standard.ps.gz
 out:
 	scp gnus-manual-*.ps.gz gnus-manual-*.pdf www@quimby:html/gnus/documents
 
-veryclean: clean
+clean: almost-clean
 	rm -f gnus.dvi gnus.ps texi2latex.elc
 	rm -f gnus-manual-a4.* gnus-manual-standard.*
 
-distclean: veryclean
+distclean: clean
 	rm -f *.orig *.rej *.elc *~ gnus-[0-9] gnus-[0-9][0-9] Makefile
 	rm -f message-[0-9]
 	rm -f $(INFO_DEPS)
@@ -322,7 +322,7 @@ tmps:
 		a="h"; echo -n "\\gnussmiley{$$i}"; fi done > smiley.tex; \
 		if [ -n "$$a" ]; then echo "{$$i}" >> smiley.tex; fi
 pspackage:
-	cd ps; make clean
+	cd ps; make almost-clean
 	tar czvf pspackage.tar.gz gnus-faq.texi gnus.texi herds misc pagestyle.sty picons pixidx.sty postamble.tex ps screen smilies splitindex texi2latex.el xface Makefile README etc
 
 Makefile: $(srcdir)/Makefile.in ../config.status
diff --git a/texi/doclicense.texi b/texi/doclicense.texi
index d580caf..465bbbd 100644
--- a/texi/doclicense.texi
+++ b/texi/doclicense.texi
@@ -2,11 +2,11 @@
 @node GNU Free Documentation License, Intro, Copying, Top
 
 @appendix GNU Free Documentation License
-@center Version 1.1, March 2000
+@center Version 1.2, November 2002
 
 @display
-Copyright (C) 2000  Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+Copyright (C) 2000,2001,2002  Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
@@ -17,12 +17,12 @@ of this license document, but changing it is not allowed.
 PREAMBLE
 
 The purpose of this License is to make a manual, textbook, or other
-written document ``free'' in the sense of freedom: to assure everyone
-the effective freedom to copy and redistribute it, with or without
-modifying it, either commercially or noncommercially.  Secondarily,
-this License preserves for the author and publisher a way to get
-credit for their work, while not being considered responsible for
-modifications made by others.
+functional and useful document ``free'' in the sense of freedom: to
+assure everyone the effective freedom to copy and redistribute it,
+with or without modifying it, either commercially or noncommercially.
+Secondarily, this License preserves for the author and publisher a way
+to get credit for their work, while not being considered responsible
+for modifications made by others.
 
 This License is a kind of ``copyleft'', which means that derivative
 works of the document must themselves be free in the same sense.  It
@@ -41,11 +41,15 @@ principally for works whose purpose is instruction or reference.
 @item
 APPLICABILITY AND DEFINITIONS
 
-This License applies to any manual or other work that contains a
-notice placed by the copyright holder saying it can be distributed
-under the terms of this License.  The ``Document'', below, refers to any
-such manual or work.  Any member of the public is a licensee, and is
-addressed as ``you''.
+This License applies to any manual or other work, in any medium, that
+contains a notice placed by the copyright holder saying it can be
+distributed under the terms of this License.  Such a notice grants a
+world-wide, royalty-free license, unlimited in duration, to use that
+work under the conditions stated herein.  The ``Document'', below,
+refers to any such manual or work.  Any member of the public is a
+licensee, and is addressed as ``you''.  You accept the license if you
+copy, modify or distribute the work in a way requiring permission
+under copyright law.
 
 A ``Modified Version'' of the Document means any work containing the
 Document or a portion of it, either copied verbatim, or with
@@ -55,7 +59,7 @@ A ``Secondary Section'' is a named appendix or a front-matter section of
 the Document that deals exclusively with the relationship of the
 publishers or authors of the Document to the Document's overall subject
 (or to related matters) and contains nothing that could fall directly
-within that overall subject.  (For example, if the Document is in part a
+within that overall subject.  (Thus, if the Document is in part a
 textbook of mathematics, a Secondary Section may not explain any
 mathematics.)  The relationship could be a matter of historical
 connection with the subject or with related matters, or of legal,
@@ -64,33 +68,41 @@ them.
 
 The ``Invariant Sections'' are certain Secondary Sections whose titles
 are designated, as being those of Invariant Sections, in the notice
-that says that the Document is released under this License.
+that says that the Document is released under this License.  If a
+section does not fit the above definition of Secondary then it is not
+allowed to be designated as Invariant.  The Document may contain zero
+Invariant Sections.  If the Document does not identify any Invariant
+Sections then there are none.
 
 The ``Cover Texts'' are certain short passages of text that are listed,
 as Front-Cover Texts or Back-Cover Texts, in the notice that says that
-the Document is released under this License.
+the Document is released under this License.  A Front-Cover Text may
+be at most 5 words, and a Back-Cover Text may be at most 25 words.
 
 A ``Transparent'' copy of the Document means a machine-readable copy,
 represented in a format whose specification is available to the
-general public, whose contents can be viewed and edited directly and
+general public, that is suitable for revising the document
 straightforwardly with generic text editors or (for images composed of
 pixels) generic paint programs or (for drawings) some widely available
 drawing editor, and that is suitable for input to text formatters or
 for automatic translation to a variety of formats suitable for input
 to text formatters.  A copy made in an otherwise Transparent file
-format whose markup has been designed to thwart or discourage
-subsequent modification by readers is not Transparent.  A copy that is
-not ``Transparent'' is called ``Opaque''.
+format whose markup, or absence of markup, has been arranged to thwart
+or discourage subsequent modification by readers is not Transparent.
+An image format is not Transparent if used for any substantial amount
+of text.  A copy that is not ``Transparent'' is called ``Opaque.''
+
 
 Examples of suitable formats for Transparent copies include plain
 ASCII without markup, Texinfo input format, LaTeX input format, SGML
 or XML using a publicly available DTD, and standard-conforming simple
-HTML designed for human modification.  Opaque formats include
-PostScript, PDF, proprietary formats that can be read and edited only
-by proprietary word processors, SGML or XML for which the DTD and/or
+HTML, PostScript or PDF designed for human modification.  Examples of
+transparent image formats include PNG, XCF and JPG.  Opaque formats
+include proprietary formats that can be read and edited only by
+proprietary word processors, SGML or XML for which the DTD and/or
 processing tools are not generally available, and the
-machine-generated HTML produced by some word processors for output
-purposes only.
+machine-generated HTML, PostScript or PDF produced by some word
+processors for output purposes only.
 
 The ``Title Page'' means, for a printed book, the title page itself,
 plus such following pages as are needed to hold, legibly, the material
@@ -98,6 +110,21 @@ this License requires to appear in the title page.  For works in
 formats which do not have any title page as such, ``Title Page'' means
 the text near the most prominent appearance of the work's title,
 preceding the beginning of the body of the text.
+
+A section ``Entitled XYZ'' means a named subunit of the Document whose
+title either is precisely XYZ or contains XYZ in parentheses following
+text that translates XYZ in another language.  (Here XYZ stands for a
+specific section name mentioned below, such as ``Acknowledgements'',
+``Dedications'', ``Endorsements'', or ``History''.)  To ``Preserve the Title''
+of such a section when you modify the Document means that it remains a
+section ``Entitled XYZ'' according to this definition.
+
+The Document may include Warranty Disclaimers next to the notice which
+states that this License applies to the Document.  These Warranty
+Disclaimers are considered to be included by reference in this
+License, but only as regards disclaiming warranties: any other
+implication that these Warranty Disclaimers may have is void and has
+no effect on the meaning of this License.
 @sp 1
 @item
 VERBATIM COPYING
@@ -118,9 +145,10 @@ you may publicly display copies.
 @item
 COPYING IN QUANTITY
 
-If you publish printed copies of the Document numbering more than 100,
-and the Document's license notice requires Cover Texts, you must enclose
-the copies in covers that carry, clearly and legibly, all these Cover
+If you publish printed copies (or copies in media that commonly have
+printed covers) of the Document, numbering more than 100, and the
+Document's license notice requires Cover Texts, you must enclose the
+copies in covers that carry, clearly and legibly, all these Cover
 Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
 the back cover.  Both covers must also clearly and legibly identify
 you as the publisher of these copies.  The front cover must present
@@ -138,16 +166,15 @@ pages.
 If you publish or distribute Opaque copies of the Document numbering
 more than 100, you must either include a machine-readable Transparent
 copy along with each Opaque copy, or state in or with each Opaque copy
-a publicly-accessible computer-network location containing a complete
-Transparent copy of the Document, free of added material, which the
-general network-using public has access to download anonymously at no
-charge using public-standard network protocols.  If you use the latter
-option, you must take reasonably prudent steps, when you begin
-distribution of Opaque copies in quantity, to ensure that this
-Transparent copy will remain thus accessible at the stated location
-until at least one year after the last time you distribute an Opaque
-copy (directly or through your agents or retailers) of that edition to
-the public.
+a computer-network location from which the general network-using
+public has access to download using public-standard network protocols
+a complete Transparent copy of the Document, free of added material.
+If you use the latter option, you must take reasonably prudent steps,
+when you begin distribution of Opaque copies in quantity, to ensure
+that this Transparent copy will remain thus accessible at the stated
+location until at least one year after the last time you distribute an
+Opaque copy (directly or through your agents or retailers) of that
+edition to the public.
 
 It is requested, but not required, that you contact the authors of the
 Document well before redistributing any large number of copies, to give
@@ -171,7 +198,8 @@ A. Use in the Title Page (and on the covers, if any) a title distinct
 B. List on the Title Page, as authors, one or more persons or entities
    responsible for authorship of the modifications in the Modified
    Version, together with at least five of the principal authors of the
-   Document (all of its principal authors, if it has less than five).@*
+   Document (all of its principal authors, if it has fewer than five),
+   unless they release you from this requirement.@*
 C. State on the Title page the name of the publisher of the
    Modified Version, as the publisher.@*
 D. Preserve all the copyright notices of the Document.@*
@@ -183,10 +211,10 @@ F. Include, immediately after the copyright notices, a license notice
 G. Preserve in that license notice the full lists of Invariant Sections
    and required Cover Texts given in the Document's license notice.@*
 H. Include an unaltered copy of this License.@*
-I. Preserve the section entitled ``History'', and its title, and add to
-   it an item stating at least the title, year, new authors, and
+I. Preserve the section Entitled ``History'', Preserve its Title, and add
+   to it an item stating at least the title, year, new authors, and
    publisher of the Modified Version as given on the Title Page.  If
-   there is no section entitled ``History'' in the Document, create one
+   there is no section Entitled ``History'' in the Document, create one
    stating the title, year, authors, and publisher of the Document as
    given on its Title Page, then add an item describing the Modified
    Version as stated in the previous sentence.@*
@@ -197,17 +225,18 @@ J. Preserve the network location, if any, given in the Document for
    You may omit a network location for a work that was published at
    least four years before the Document itself, or if the original
    publisher of the version it refers to gives permission.@*
-K. In any section entitled ``Acknowledgements'' or ``Dedications'',
-   preserve the section's title, and preserve in the section all the
-   substance and tone of each of the contributor acknowledgements
+K. For any section Entitled ``Acknowledgements'' or ``Dedications'',
+   Preserve the Title of the section, and preserve in the section all
+   the substance and tone of each of the contributor acknowledgements
    and/or dedications given therein.@*
 L. Preserve all the Invariant Sections of the Document,
    unaltered in their text and in their titles.  Section numbers
    or the equivalent are not considered part of the section titles.@*
-M. Delete any section entitled ``Endorsements''.  Such a section
+M. Delete any section Entitled ``Endorsements.''  Such a section
    may not be included in the Modified Version.@*
-N. Do not retitle any existing section as ``Endorsements''
+N. Do not retitle any existing section to be Entitled ``Endorsements''
    or to conflict in title with any Invariant Section.@*
+O. Preserve any Warranty Disclaimers.@*
 @sp 1
 If the Modified Version includes new front-matter sections or
 appendices that qualify as Secondary Sections and contain no material
@@ -216,7 +245,7 @@ of these sections as invariant.  To do this, add their titles to the
 list of Invariant Sections in the Modified Version's license notice.
 These titles must be distinct from any other section titles.
 
-You may add a section entitled ``Endorsements'', provided it contains
+You may add a section Entitled ``Endorsements'', provided it contains
 nothing but endorsements of your Modified Version by various
 parties--for example, statements of peer review or that the text has
 been approved by an organization as the authoritative definition of a
@@ -244,7 +273,7 @@ License, under the terms defined in section 4 above for modified
 versions, provided that you include in the combination all of the
 Invariant Sections of all of the original documents, unmodified, and
 list them all as Invariant Sections of your combined work in its
-license notice.
+license notice, and that you preserve all their Warranty Disclaimers.
 
 The combined work need only contain one copy of this License, and
 multiple identical Invariant Sections may be replaced with a single
@@ -255,11 +284,11 @@ author or publisher of that section if known, or else a unique number.
 Make the same adjustment to the section titles in the list of
 Invariant Sections in the license notice of the combined work.
 
-In the combination, you must combine any sections entitled ``History''
-in the various original documents, forming one section entitled
-``History''; likewise combine any sections entitled ``Acknowledgements'',
-and any sections entitled ``Dedications''.  You must delete all sections
-entitled ``Endorsements.''
+In the combination, you must combine any sections Entitled ``History''
+in the various original documents, forming one section Entitled
+``History''; likewise combine any sections Entitled ``Acknowledgements'',
+and any sections Entitled ``Dedications.''  You must delete all sections
+Entitled ``Endorsements.''
 @sp 1
 @item
 COLLECTIONS OF DOCUMENTS
@@ -280,18 +309,20 @@ AGGREGATION WITH INDEPENDENT WORKS
 
 A compilation of the Document or its derivatives with other separate
 and independent documents or works, in or on a volume of a storage or
-distribution medium, does not as a whole count as a Modified Version
-of the Document, provided no compilation copyright is claimed for the
-compilation.  Such a compilation is called an ``aggregate'', and this
-License does not apply to the other self-contained works thus compiled
-with the Document, on account of their being thus compiled, if they
-are not themselves derivative works of the Document.
+distribution medium, is called an ``aggregate'' if the copyright
+resulting from the compilation is not used to limit the legal rights
+of the compilation's users beyond what the individual works permit.
+When the Document is included in an aggregate, this License does not
+apply to the other works in the aggregate which are not themselves
+derivative works of the Document.
 
 If the Cover Text requirement of section 3 is applicable to these
-copies of the Document, then if the Document is less than one quarter
-of the entire aggregate, the Document's Cover Texts may be placed on
-covers that surround only the Document within the aggregate.
-Otherwise they must appear on covers around the whole aggregate.
+copies of the Document, then if the Document is less than one half of
+the entire aggregate, the Document's Cover Texts may be placed on
+covers that bracket the Document within the aggregate, or the
+electronic equivalent of covers if the Document is in electronic form.
+Otherwise they must appear on printed covers that bracket the whole
+aggregate.
 @sp 1
 @item
 TRANSLATION
@@ -302,10 +333,17 @@ Replacing Invariant Sections with translations requires special
 permission from their copyright holders, but you may include
 translations of some or all Invariant Sections in addition to the
 original versions of these Invariant Sections.  You may include a
-translation of this License provided that you also include the
-original English version of this License.  In case of a disagreement
-between the translation and the original English version of this
-License, the original English version will prevail.
+translation of this License, and all the license notices in the
+Document, and any Warranty Disclaimers, provided that you also include
+the original English version of this License and the original versions
+of those notices and disclaimers.  In case of a disagreement between
+the translation and the original version of this License or a notice
+or disclaimer, the original version will prevail.
+
+If a section in the Document is Entitled ``Acknowledgements'',
+``Dedications'', or ``History'', the requirement (section 4) to Preserve
+its Title (section 1) will typically require changing the actual
+title.
 @sp 1
 @item
 TERMINATION
@@ -346,21 +384,30 @@ license notices just after the title page:
 
 @smallexample
 @group
+Copyright (C)  @var{year}  @var{your name}.
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.2
+or any later version published by the Free Software Foundation;
+with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+A copy of the license is included in the section entitled ``GNU
+Free Documentation License''.
+@end group
+@end smallexample
 
-  Copyright (C)  @var{year}  @var{your name}.
-  Permission is granted to copy, distribute and/or modify this document
-  under the terms of the GNU Free Documentation License, Version 1.1
-  or any later version published by the Free Software Foundation;
-  with the Invariant Sections being @var{list their titles}, with the
-  Front-Cover Texts being @var{list}, and with the Back-Cover Texts being @var{list}.
-  A copy of the license is included in the section entitled ``GNU
-  Free Documentation License''.
+If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
+replace the ``with...Texts.'' line with this:
+
+@smallexample
+@group
+with the Invariant Sections being @var{list their titles}, with the
+Front-Cover Texts being @var{list}, and with the Back-Cover Texts being
+@var{list}.
 @end group
 @end smallexample
-If you have no Invariant Sections, write ``with no Invariant Sections''
-instead of saying which ones are invariant.  If you have no
-Front-Cover Texts, write ``no Front-Cover Texts'' instead of
-``Front-Cover Texts being @var{list}''; likewise for Back-Cover Texts.
+
+If you have Invariant Sections without Cover Texts, or some other
+combination of the three, merge those two alternatives to suit the
+situation.
 
 If your document contains nontrivial examples of program code, we
 recommend releasing these examples in parallel under your choice of
diff --git a/texi/emacs-mime.texi b/texi/emacs-mime.texi
index 2ac1300..21275fc 100644
--- a/texi/emacs-mime.texi
+++ b/texi/emacs-mime.texi
@@ -9,12 +9,12 @@
 @copying
 This file documents the Emacs MIME interface functionality.
 
-Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003
-          Free Software Foundation, Inc.
+Copyright @copyright{} 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+2006 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
+under the terms of the GNU Free Documentation License, Version 1.2 or
 any later version published by the Free Software Foundation; with no
 Invariant Sections, with the Front-Cover texts being ``A GNU
 Manual'', and with the Back-Cover Texts as in (a) below.  A copy of the
@@ -56,7 +56,7 @@ license to the document, as described in section 6 of the license.
 This manual documents the libraries used to compose and display
 @acronym{MIME} messages.
 
-This manual is directed at users who want to modify the behaviour of
+This manual is directed at users who want to modify the behavior of
 the @acronym{MIME} encoding/decoding process or want a more detailed
 picture of how the Emacs @acronym{MIME} library works, and people who want
 to write functions and commands that manipulate @acronym{MIME} elements.
@@ -176,8 +176,27 @@ Patches.  This is intended for groups where diffs of committed files
 are automatically sent to.  It only works in groups matching
 @code{mm-uu-diff-groups-regexp}.
 
+@item verbatim-marks
+@cindex verbatim-marks
+Slrn-style verbatim marks.
+
+@item LaTeX
+@cindex LaTeX
+LaTeX documents.  It only works in groups matching
+@code{mm-uu-tex-groups-regexp}.
+
 @end table
 
+@cindex text/x-verbatim
+@c Is @vindex suitable for a face?
+@vindex mm-uu-extract
+Some inlined non-@acronym{MIME} attachments are displayed using the face
+@code{mm-uu-extract}.  By default, no @acronym{MIME} button for these
+parts is displayed.  You can force displaying a button using @kbd{K b}
+(@code{gnus-summary-display-buttonized}) or add @code{text/x-verbatim}
+to @code{gnus-buttonized-mime-types}, @xref{MIME Commands, ,MIME
+Commands, gnus, Gnus Manual}.
+
 @node Handles
 @section Handles
 
@@ -213,10 +232,6 @@ Set the undisplayer object.
 @findex mm-handle-disposition
 Return the parsed @code{Content-Disposition} of the part.
 
-@item mm-handle-disposition
-@findex mm-handle-disposition
-Return the description of the part.
-
 @item mm-get-content-id
 Returns the handle(s) referred to by @code{Content-ID}.
 
@@ -326,6 +341,31 @@ you could say something like:
       (remove "text/html" mm-automatic-display))
 @end lisp
 
+Adding @code{"image/.*"} might also be useful.  Spammers use images as
+the prefered part of @samp{multipart/alternative} messages, so you might
+not notice there are other parts.  See also
+@code{gnus-buttonized-mime-types}, @ref{MIME Commands, ,MIME Commands,
+gnus, Gnus Manual}.  After adding @code{"multipart/alternative"} to
+@code{gnus-buttonized-mime-types} you can choose manually which
+alternative you'd like to view.  For example, you can set those
+variables like:
+
+@lisp
+(setq gnus-buttonized-mime-types
+      '("multipart/alternative" "multipart/signed")
+      mm-discouraged-alternatives
+      '("text/html" "image/.*"))
+@end lisp
+
+In this case, Gnus will display radio buttons for such a kind of spam
+message as follows:
+
+@example
+1.  (*) multipart/alternative  ( ) image/gif
+
+2.  (*) text/plain          ( ) text/html
+@end example
+
 @item mm-inline-large-images
 @vindex mm-inline-large-images
 When displaying inline images that are larger than the window, Emacs
@@ -795,7 +835,7 @@ This plain text part is an attachment.
 Mapping from @acronym{MIME} charset to encoding to use.  This variable is
 usually used except, e.g., when other requirements force a specific
 encoding (digitally signed messages require 7bit encodings).  The
-default is 
+default is
 
 @lisp
 ((iso-2022-jp . 7bit)
@@ -813,7 +853,9 @@ by using the @code{encoding} @acronym{MML} tag (@pxref{MML Definition}).
 @item mm-coding-system-priorities
 @vindex mm-coding-system-priorities
 Prioritize coding systems to use for outgoing messages.  The default
-is @code{nil}, which means to use the defaults in Emacs.  It is a list of
+is @code{nil}, which means to use the defaults in Emacs, but is
+@code{(iso-8859-1 iso-2022-jp iso-2022-jp-2 shift_jis utf-8)} when
+running Emacs in the Japanese language environment.  It is a list of
 coding system symbols (aliases of coding systems are also allowed, use
 @kbd{M-x describe-coding-system} to make sure you are specifying correct
 coding system names).  For example, if you have configured Emacs
@@ -880,8 +922,9 @@ used, of course.
 @vindex mm-mime-mule-charset-alist
 Things are slightly more complicated when running Emacs with @sc{mule}
 support.  In this case, a list of the @sc{mule} charsets used in the
-part is obtained, and the @sc{mule} charsets are translated to @acronym{MIME}
-charsets by consulting the variable @code{mm-mime-mule-charset-alist}.
+part is obtained, and the @sc{mule} charsets are translated to
+@acronym{MIME} charsets by consulting the table provided by Emacs itself
+or the variable @code{mm-mime-mule-charset-alist} for XEmacs.
 If this results in a single @acronym{MIME} charset, this is used to encode
 the part.  But if the resulting list of @acronym{MIME} charsets contains more
 than one element, two things can happen: If it is possible to encode the
@@ -1172,7 +1215,7 @@ in the subsequent sections.
 This chapter describes the basic, ground-level functions for parsing and
 handling.  Covered here is parsing @code{From} lines, removing comments
 from header lines, decoding encoded words, parsing date headers and so
-on.  High-level functionality is dealt with in the next chapter
+on.  High-level functionality is dealt with in the first chapter
 (@pxref{Decoding and Viewing}).
 
 @menu
@@ -1508,7 +1551,7 @@ Take a time and return the number of days that represents.
 
 @item safe-date-to-time
 Take a date and return a time.  If the date is not syntactically valid,
-return a ``zero'' date.
+return a ``zero'' time.
 
 @item time-less-p
 Take two times and say whether the first time is less (i. e., earlier)
diff --git a/texi/gnus-coding.texi b/texi/gnus-coding.texi
new file mode 100644
index 0000000..0d70edd
--- /dev/null
+++ b/texi/gnus-coding.texi
@@ -0,0 +1,357 @@
+\input texinfo
+
+@setfilename gnus-coding
+@settitle Gnus Coding Style and Maintainance Guide
+@syncodeindex fn cp
+@syncodeindex vr cp
+@syncodeindex pg cp
+
+@copying
+Copyright (c) 2004, 2005  Free Software Foundation, Inc.
+
+@quotation
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.1 or
+any later version published by the Free Software Foundation; with no
+Invariant Sections, with the Front-Cover texts being ``A GNU
+Manual'', and with the Back-Cover Texts as in (a) below.  A copy of the
+license is included in the section entitled ``GNU Free Documentation
+License'' in the Emacs manual.
+
+(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
+this GNU Manual, like GNU software.  Copies published by the Free
+Software Foundation raise funds for GNU development.''
+
+This document is part of a collection distributed under the GNU Free
+Documentation License.  If you want to distribute this document
+separately from the collection, you can do so by adding a copy of the
+license to the document, as described in section 6 of the license.
+@end quotation
+@end copying
+
+
+@titlepage
+@title Gnus Coding Style and Maintainance Guide
+
+@author by Reiner Steib  
+
+@insertcopying
+@end titlepage
+
+@c Obviously this is only a very rudimentary draft.  We put it in CVS
+@c anyway hoping that it might annoy someone enough to fix it.  ;-)
+@c Fixing only a paragraph also is appreciated.
+
+@node Top
+@top Gnus Coding Style and Maintainance Guide
+This manual describes @dots{}
+@menu
+* Gnus Coding Style:: Gnus Coding Style
+* Gnus Maintainance Guide:: Gnus Maintainance Guide
+@end menu
+
+@c @ref{Gnus Reference Guide, ,Gnus Reference Guide, gnus, The Gnus Newsreader}
+
+@node Gnus Coding Style
+@chapter Gnus Coding Style
+@section Dependencies
+
+The Gnus distribution contains a lot of libraries that have been written
+for Gnus and used intensively for Gnus.  But many of those libraries are
+useful on their own.  E.g. other Emacs Lisp packages might use the
+@acronym{MIME} library @xref{Top, ,Top, emacs-mime, The Emacs MIME
+Manual}.
+
+@subsection General purpose libraries
+
+@table @file
+
+@item netrc.el
+@file{.netrc} parsing functionality.
+@c As of 2005-10-21...
+There are no Gnus dependencies in this file.
+
+@item format-spec.el
+Functions for formatting arbitrary formatting strings.
+@c As of 2005-10-21...
+There are no Gnus dependencies in this file.
+
+@end table
+
+@subsection Encryption and security
+
+@table @file
+@item encrypt.el
+File encryption routines
+@c As of 2005-10-25...
+There are no Gnus dependencies in this file.
+
+@item password.el
+Read passwords from user, possibly using a password cache.
+@c As of 2005-10-21...
+There are no Gnus dependencies in this file.
+
+@item tls.el
+TLS/SSL support via wrapper around GnuTLS
+@c As of 2005-10-21...
+There are no Gnus dependencies in this file.
+
+@item pgg*.el
+Glue for the various PGP implementations.
+@c As of 2005-10-21...
+There are no Gnus dependencies in these files.
+
+@end table
+
+@subsection Networking
+
+@table @file
+@item dig.el
+Domain Name System dig interface.
+@c As of 2005-10-21...
+There are no serious Gnus dependencies in this file.  Uses
+@code{gnus-run-mode-hooks} (a wrapper function).
+
+@item dns*.el
+Domain Name Service lookups.
+@c As of 2005-10-21...
+There are no Gnus dependencies in these files.
+@end table
+
+@subsection Mail and News related RFCs
+
+@table @file
+@item pop3.el
+Post Office Protocol (RFC 1460) interface.
+@c As of 2005-10-21...
+There are no Gnus dependencies in this file.
+
+@item imap.el
+@acronym{IMAP} library.
+@c As of 2005-10-21...
+There are no Gnus dependencies in this file.
+
+@item ietf-drums.el
+Functions for parsing RFC822bis headers.
+@c As of 2005-10-21...
+There are no Gnus dependencies in this file.
+
+@item rfc1843.el
+HZ (rfc1843) decoding.  HZ is a data format for exchanging files of
+arbitrarily mixed Chinese and @acronym{ASCII} characters.
+@c As of 2005-10-21...
+@code{rfc1843-gnus-setup} seem to be useful only for Gnus.  Maybe this
+function should be relocated to remove dependencies on Gnus.  Other
+minor dependencies: @code{gnus-newsgroup-name} could be eliminated by
+using an optional argument to @code{rfc1843-decode-article-body}.
+
+@item rfc2045.el
+Functions for decoding rfc2045 headers
+
+@item rfc2047.el
+Functions for encoding and decoding rfc2047 messages
+
+@item rfc2104.el
+RFC2104 Hashed Message Authentication Codes
+
+@item rfc2231.el
+Functions for decoding rfc2231 headers
+
+@item flow-fill.el
+Interpret RFC2646 "flowed" text.
+@c As of 2005-10-27...
+There are no Gnus dependencies in this file.
+
+@item uudecode.el
+Elisp native uudecode.
+@c As of 2005-12-06...
+There are no Gnus dependencies in this file.
+@c ... but the custom group is gnus-extract.
+@end table
+
+@subsection message
+
+All message composition from Gnus (both mail and news) takes place in
+Message mode buffers.  Message mode is intended to be a replacement for
+Emacs mail mode.  There should be no Gnus dependencies in
+@file{message.el}.
+
+@subsection Emacs @acronym{MIME}
+
+The files @file{mml*.el} and @file{mm-*.el} provide @acronym{MIME}
+functionality for Emacs.
+
+@acronym{MML} (@acronym{MIME} Meta Language) is supposed to be
+independent from Gnus.  Alas it is not anymore.
+
+
+@subsection Gnus backends
+
+The files @file{nn*.el} provide functionality for accessing NNTP
+(@file{nntp.el}), IMAP (@file{nnimap.el}) and several other Mail back
+ends (probably @file{nnml.el}, @file{nnfolder.el} and
+@file{nnmaildir.el} are the most widely used mail back ends).
+
+
+
+@c mm-uu requires nnheader which requires gnus-util.  message.el also
+@c requires nnheader.
+
+@c message / gnus
+@c 
+@c nn*
+@c 
+@c mm*
+@c
+@c rfc*
+@c 
+@c pgg*
+@c tla netrc pop3 dig dns ...
+@c format-spec.el
+
+
+@section Compatibility
+
+No Gnus should work on:
+@itemize @bullet
+@item
+Emacs 21.1 and up.
+@item
+XEmacs 21.4 and up.
+@end itemize
+
+Gnus 5.10 should work on:
+@itemize @bullet
+@item
+Emacs 20.7 and up.
+@item
+XEmacs 21.1 and up.
+@end itemize
+
+@node Gnus Maintainance Guide
+@chapter Gnus Maintainance Guide
+
+@section Stable and development versions
+
+The development of Gnus normally is done on the CVS trunk, i.e. there
+are no separate branches to develop and test new features.  Most of the
+time, the trunk is developed quite actively with more or less daily
+changes.  Only after a new major release, e.g. 5.10.1, there's usually a
+feature period of several months.  After the release of Gnus 5.10.6 the
+development of new features started again on the trunk while the 5.10
+series is continued on the stable branch (v5-10) from which more stable
+releases will be done when needed (5.10.7, @dots{}).
+@ref{Gnus Development, ,Gnus Development, gnus, The Gnus Newsreader}
+
+Stable releases of Gnus finally become part of Emacs.  E.g. Gnus 5.8
+became a part of Emacs 21 (relabeled to Gnus 5.9).  The 5.10 series will
+become part of Emacs 22 (as Gnus 5.11).
+
+@section Syncing
+
+@c Some MIDs related to this follow.  Use http://thread.gmane.org/MID
+@c (and click on the subject) to get the thread on Gmane.
+
+@c Some quotes from Miles Bader follow...
+
+@c 
+@c 
+
+In the past, the inclusion of Gnus into Emacs was quite cumbersome.  For
+each change made to Gnus in Emacs repository, it had to be checked that
+it was applied to the new Gnus version, too.  Else, bug fixes done in
+Emacs repository might have been lost.
+
+With the inclusion of Gnus 5.10, Miles Bader has set up an Emacs-Gnus
+gateway to ensure the bug fixes from Emacs CVS are propagated to Gnus
+CVS semi-automatically.  These bug fixes are installed on the stable
+branch and on the trunk.  Basically the idea is that the gateway will
+cause all common files in Emacs and Gnus v5-10 to be identical except
+when there's a very good reason (e.g., the Gnus version string in Emacs
+says @samp{5.11}, but the v5-10 version string remains @samp{5.10.x}).
+Furthermore, all changes in these files in either Emacs or the v5-10
+branch will be installed into the Gnus CVS trunk, again except where
+there's a good reason.
+@c (typically so far the only exception has been that the changes
+@c already exist in the trunk in modified form).
+Because of this, when the next major version of Gnus will be included in
+Emacs, it should be very easy -- just plonk in the files from the Gnus
+trunk without worrying about lost changes from the Emacs tree.
+
+The effect of this is that as hacker, you should generally only have to
+make changes in one place:
+
+@itemize
+@item
+If it's a file which is thought of as being outside of Gnus (e.g., the
+new @file{encrypt.el}), you should probably make the change in the Emacs
+tree, and it will show up in the Gnus tree a few days later.
+
+If you don't have Emacs CVS access (or it's inconvenient), you can
+change such a file in the v5-10 branch, and it should propagate to Emacs
+CVS -- however, it will get some extra scrutiny (by Miles) to see if the
+changes are possibly controversial and need discussion on the mailing
+list.  Many changes are obvious bug-fixes however, so often there won't
+be any problem.
+
+@item
+If it's to a Gnus file, and it's important enough that it should be part
+of Emacs and the v5-10 branch, then you can make the change on the v5-10
+branch, and it will go into Emacs CVS and the Gnus CVS trunk (a few days
+later).  The most prominent examples for such changes are bug-fixed
+including improvements on the documentation.
+
+If you know that there will be conflicts (perhaps because the affected
+source code is different in v5-10 and the Gnus CVS trunk), then you can
+install your change in both places, and when I try to sync them, there
+will be a conflict -- however, since in most such cases there would be a
+conflict @emph{anyway}, it's often easier for me to resolve it simply if
+I see two @samp{identical} changes, and can just choose the proper one,
+rather than having to actually fix the code.
+
+@item
+For general Gnus development changes, of course you just make the
+change on the Gnus CVS trunk and it goes into Emacs a few years
+later... :-)
+@end itemize
+
+Of course in any case, if you just can't wait for me to sync your
+change, you can commit it in more than one place and probably there will
+be no problem; usually the changes are textually identical anyway, so
+can be easily resolved automatically (sometimes I notice silly things in
+such multiple commits, like whitespace differences, and unify those ;-).
+
+
+@c I do Emacs->Gnus less often (than Gnus->Emacs) because it tends to
+@c require more manual work.
+
+@c By default I sync about once a week.  I also try to follow any Gnus
+@c threads on the mailing lists and make sure any changes being discussed
+@c are kept more up-to-date (so say 1-2 days delay for "topical" changes).
+
+@c 
+
+@c BTW, just to add even more verbose explanation about the syncing thing:
+
+@section Miscellanea
+
+@heading @file{GNUS-NEWS}
+
+Starting from No Gnus, the @file{GNUS-NEWS} is created from
+@file{texi/gnus-news.texi}.  Don't edit @file{GNUS-NEWS}.  Edit
+@file{texi/gnus-news.texi}, type @command{make GNUS-NEWS} in the
+@file{texi} directory and commit @file{GNUS-NEWS} and
+@file{texi/gnus-news.texi}.
+
+@heading Conventions for version information in defcustoms
+
+For new customizable variables introduced in Oort Gnus (including the
+v5-10 branch) use @code{:version "22.1" ;; Oort Gnus} including the
+comment.
+@c
+If the variable is new in No Gnus use @code{:version "23.0" ;; No Gnus}.
+
+@c Local Variables:
+@c mode: texinfo
+@c coding: iso-8859-1
+@c End:
diff --git a/texi/gnus-faq.texi b/texi/gnus-faq.texi
index 7bab196..6900d87 100644
--- a/texi/gnus-faq.texi
+++ b/texi/gnus-faq.texi
@@ -52,7 +52,7 @@ a subscriber, your submissions will automatically pass.  You can
 also subscribe to the list by sending a blank email to
 @email{faq-discuss-subscribe@@my.gnus.org, faq-discuss-subscribe@@my.gnus.org}
 and @uref{http://mail1.kens.com/cgi-bin/ezmlm-browse?command=monthbythread%26list=faq-discuss, browse
-the archive}.
+the archive (BROKEN)}.
 
 @node FAQ - Changes
 @subheading Changes
@@ -233,10 +233,10 @@ Which version of Emacs do I need?
 
 @subsubheading Answer
 
-Gnus 5.10 requires an Emacs version that is greater
-than or equal to Emacs 20.7 or XEmacs 21.1. The
-development versions of Gnus (aka No Gnus) require Emacs
-21 or XEmacs 21.4.
+Gnus 5.10 requires an Emacs version that is greater than or equal
+to Emacs 20.7 or XEmacs 21.1.
+The development versions of Gnus (aka No Gnus) requires Emacs 21
+or XEmacs 21.4.
 
 @node [1.7]
 @subsubheading Question 1.7
@@ -1197,26 +1197,26 @@ from using them):
 @example
 (setq nnmail-split-methods
   '(("duplicates" "^Gnus-Warning:.*duplicate")
-    ("XEmacs-NT" "^\\(To:\\|CC:\\).*localpart@@xemacs.bla.*")
-    ("Gnus-Tut" "^\\(To:\\|CC:\\).*localpart@@socha.bla.*")
-    ("tcsh" "^\\(To:\\|CC:\\).*localpart@@mx.gw.bla.*")
-    ("BAfH" "^\\(To:\\|CC:\\).*localpart@@.*uni-muenchen.bla.*")
+    ("XEmacs-NT" "^\\(To:\\|CC:\\).*localpart@@xemacs.invalid.*")
+    ("Gnus-Tut" "^\\(To:\\|CC:\\).*localpart@@socha.invalid.*")
+    ("tcsh" "^\\(To:\\|CC:\\).*localpart@@mx.gw.invalid.*")
+    ("BAfH" "^\\(To:\\|CC:\\).*localpart@@.*uni-muenchen.invalid.*")
     ("Hamster-src" "^\\(CC:\\|To:\\).*hamster-sourcen@@yahoogroups.\\(de\\|com\\).*")
-    ("Tagesschau" "^From: tagesschau $")
-    ("Replies" "^\\(CC:\\|To:\\).*localpart@@Frank-Schmitt.bla.*")
-    ("EK" "^From:.*\\(localpart@@privateprovider.bla\\|localpart@@workplace.bla\\).*")
+    ("Tagesschau" "^From: tagesschau $")
+    ("Replies" "^\\(CC:\\|To:\\).*localpart@@Frank-Schmitt.invalid.*")
+    ("EK" "^From:.*\\(localpart@@privateprovider.invalid\\|localpart@@workplace.invalid\\).*")
     ("Spam" "^Content-Type:.*\\(ks_c_5601-1987\\|EUC-KR\\|big5\\|iso-2022-jp\\).*")
     ("Spam" "^Subject:.*\\(This really work\\|XINGA\\|ADV:\\|XXX\\|adult\\|sex\\).*")
     ("Spam" "^Subject:.*\\(\=\?ks_c_5601-1987\?\\|\=\?euc-kr\?\\|\=\?big5\?\\).*")
     ("Spam" "^X-Mailer:\\(.*BulkMailer.*\\|.*MIME::Lite.*\\|\\)")
     ("Spam" "^X-Mailer:\\(.*CyberCreek Avalanche\\|.*http\:\/\/GetResponse\.com\\)")
     ("Spam" "^From:.*\\(verizon\.net\\|prontomail\.com\\|money\\|ConsumerDirect\\).*")
-    ("Spam" "^Delivered-To: GMX delivery to spamtrap@@gmx.bla$")
+    ("Spam" "^Delivered-To: GMX delivery to spamtrap@@gmx.invalid$")
     ("Spam" "^Received: from link2buy.com")
-    ("Spam" "^CC: .*azzrael@@t-online.bla")
+    ("Spam" "^CC: .*azzrael@@t-online.invalid")
     ("Spam" "^X-Mailer-Version: 1.50 BETA")
-    ("Uni" "^\\(CC:\\|To:\\).*localpart@@uni-koblenz.bla.*")
-    ("Inbox" "^\\(CC:\\|To:\\).*\\(my\ name\\|address@@one.bla\\|adress@@two.bla\\)")
+    ("Uni" "^\\(CC:\\|To:\\).*localpart@@uni-koblenz.invalid.*")
+    ("Inbox" "^\\(CC:\\|To:\\).*\\(my\ name\\|address@@one.invalid\\|adress@@two.invalid\\)")
     ("Spam" "")))
 @end example
 @noindent
@@ -1314,7 +1314,7 @@ This example should make the syntax clear:
 (setq gnus-posting-styles
   '((".*"
      (name "Frank Schmitt")
-     (address "me@@there.bla")
+     (address "me@@there.invalid")
      (organization "Hamme net, kren mer och nimmi")
      (signature-file "~/.signature")
      ("X-SampleHeader" "foobar")
@@ -1366,21 +1366,21 @@ at the bottom.
 
 @example
 (setq gnus-posting-styles
-  '((".*"  ;;default
-     (name "Frank Schmitt")
-     (organization "Hamme net, kren mer och nimmi")
-     (signature-file "~/.signature")    )
-    ((message-news-p)  ;;Usenet news?
-     (address "mySpamTrap@@Frank-Schmitt.bla")
-     ("Reply-To" "hereRealRepliesOnlyPlease@@Frank-Schmitt.bla")    )
-    ((message-mail-p)  ;;mail?
-     (address "usedForMails@@Frank-Schmitt.bla")    )
-    ("^gmane" ;;this is mail, too in fact
-     (address "usedForMails@@Frank-Schmitt.net")
-     ("Reply-To" nil)    )
-    ("^gmane.mail.spam.spamassassin.general$"
-     (eval (setq mail-envelope-from "Azzrael@@rz-online.de"))
-     (address "Azzrael@@rz-online.de")) ))
+      '((".*" ;;default
+         (name "Frank Schmitt")
+         (organization "Hamme net, kren mer och nimmi")
+         (signature-file "~/.signature"))
+        ((message-news-p) ;;Usenet news?
+         (address "mySpamTrap@@Frank-Schmitt.invalid")
+         (reply-to "hereRealRepliesOnlyPlease@@Frank-Schmitt.invalid"))
+        ((message-mail-p) ;;mail?
+         (address "usedForMails@@Frank-Schmitt.invalid"))
+        ("^gmane" ;;this is mail, too in fact
+         (address "usedForMails@@Frank-Schmitt.invalid")
+         (reply-to nil))
+        ("^gmane\\.mail\\.spam\\.spamassassin\\.general$"
+         (eval (set (make-local-variable 'message-sendmail-envelope-from)
+                    "Azzrael@@rz-online.de")))))
 @end example
 @noindent
 
@@ -1464,7 +1464,7 @@ You can store your mail addresses in a ~/.mailrc file using a simple
 alias syntax:
 
 @example
-alias al	"Al "
+alias al	"Al "
 @end example
 @noindent
 
@@ -1495,8 +1495,8 @@ place them in ~/.emacs:
 (setq bbdb-north-american-phone-numbers-p nil)
 ;;Tell bbdb about your email address:
 (setq bbdb-user-mail-names
-      (regexp-opt '("Your.Email@@here.bla"
-                    "Your.other@@mail.there.bla")))
+      (regexp-opt '("Your.Email@@here.invalid"
+                    "Your.other@@mail.there.invalid")))
 ;;cycling while completing email addresses
 (setq bbdb-complete-name-allow-cycling t)
 ;;No popup-buffers
@@ -1551,12 +1551,19 @@ Now you only have to tell Gnus to include the X-face in your postings by saying
 (setq message-default-headers
         (with-temp-buffer
           (insert "X-Face: ")
-          (insert-file-contents "~/.xemacs/xface")
+          (insert-file-contents "~/.xface")
           (buffer-string)))
 @end example
 @noindent
 
-in ~/.gnus.el.
+in ~/.gnus.el.  If you use Gnus 5.10, you can simply add an entry
+
+@example
+(x-face-file "~/.xface")
+@end example
+@noindent
+
+to gnus-posting-styles.
 
 @node [5.9]
 @subsubheading Question 5.9
@@ -2121,11 +2128,15 @@ Which mailing lists and newsgroups are there?
 
 @subsubheading Answer
 
-There's the newsgroup gnu.emacs.gnus (pull it from
-e.g. news.gnus.org) which deals with general questions and the
-ding mailing list (ding@@gnus.org) dealing with development of
+There's the newsgroup gnu.emacs.gnus
+(also available as
+@uref{http://dir.gmane.org/gmane.emacs.gnus.user, 
+gmane.emacs.gnus.user})
+which deals with general Gnus questions.
+The ding mailing list (ding@@gnus.org) deals with development of
 Gnus. You can read the ding list via NNTP, too under the name
-gmane.emacs.gnus.general from news.gmane.org.
+@uref{http://dir.gmane.org/gmane.emacs.gnus.general, 
+gmane.emacs.gnus.general} from news.gmane.org.
 
 If you want to stay in the big8,
 news.software.newssreaders is also read by some Gnus
diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 2a5e1ed..0f2b748 100644
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -7,13 +7,12 @@
 @syncodeindex pg cp
 
 @copying
-Copyright \copyright{} 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright @copyright{} 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
+under the terms of the GNU Free Documentation License, Version 1.2 or
 any later version published by the Free Software Foundation; with no
 Invariant Sections, with the Front-Cover texts being ``A GNU
 Manual'', and with the Back-Cover Texts as in (a) below.  A copy of the
@@ -21,10 +20,10 @@ license is included in the section entitled ``GNU Free Documentation
 License'' in the Emacs manual.
 
 $B$3$NJ8=q$r!"%U%j!<%=%U%H%&%'%":bCDH/9T$N(B GNU $B%U%j!r7o$N2<$GJ#@=!"G[I[!"$"$k$$$OJQ99$9(B
-$B$k$3$H$r5v2D$7$^$9!#JQ99IT2DItJ,$O;XDj$7$^$;$s!#!V(BA GNU Manual$B!W$OI=I=;f(B
+$BBh(B 1.2 $BHG$^$?$O$=$l0J9_$NHG$,Dj$a$k>r7o$N2<$GJ#@=!"G[I[!"$"$k$$$OJQ99$9(B
+$B$k$3$H$r5v2D$7$^$9!#JQ99IT2DItJ,$O;XDj$7$^$;$s!#!H(BA GNU Manual$B!I$OI=I=;f(B
 $B%F%-%9%H!"0J2<$N(B (a) $B$ON"I=;f%F%-%9%H$G$9!#$3$NMxMQ5vBz7@Ls=q$NJ#O$K4^$^$l$F$$$^(B
+$B!H(BEmacs manual$B!I$N!V(BGNU $B%U%j!O$K4^$^$l$F$$$^(B
 $B$9!#(B
 
 (a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
@@ -43,7 +42,7 @@ license to the document, as described in section 6 of the license.
 
 $B$3$NJ8=q$O!V(BGNU $B%U%j!O$K5-=R$5$l$F$$$k$h$&$K!"J8=q$K7@Ls=q$NJ#l$G$9!#(BGnus $B$O$9$Y$F$r%K%e!<%9%0(B
-$B%k!<%W$N$h$&$KI=<($7$^$9!#(BGnus $B$G%a!<%k$rFI$_!"%G%#%l%/%H%j!<$r%V%i%&%:(B
+gnus $B$O%a%C%;!<%8$rFI$`$3$H$K4X$9$kl$G$9!#(Bgnus $B$O$9$Y$F$r%K%e!<%9%0(B
+$B%k!<%W$N$h$&$KI=<($7$^$9!#(Bgnus $B$G%a!<%k$rFI$_!"%G%#%l%/%H%j!<$r%V%i%&%:(B
 $B$7!"(B@code{ftp} $B$r$9$k$3$H$,$G$-$^$9!#$"$"!"$=$l$K!"%K%e!<%9$rFI$`$3$H$5(B
 $B$($G$-$^$9(B!
 
 Emacs $B$,J8>O$rJT=8$9$k?M$KNO$rM?$($k$h$&$K!"(Bgnus $B$O%K%e!<%9$rFI$`?M$KNO(B
-$B$rM?$($h$&$H$7$F$$$^$9!#(BGnus $B$OMxMQ$`F0:n$r$9$k$h$&$K(B gnus $B$r3HD%$9$k$3$H$r>)Ne$7$F$$$^$9!#(B
 $B%W%m%0%i%`$,?M$rA`:n$9$k$Y$-$G$O$"$j$^$;$s!#?M$,%W%m%0%i%`$r;H$&(B ($B$b$7$/(B
 $B$OMtMQ$9$k(B) $B$3$H$K$h$C$F!"$d$j$?$$$3$H$r$G$-$k$h$&$K$J$C$F$$$k$Y$-$J$N$G(B
@@ -414,13 +409,13 @@ Emacs $B$,J8>O$rJT=8$9$k?M$KNO$rM?$($k$h$&$K!"(Bgnus $B$O%K%e!<%9$rFI$`?M$KNO
 @end iftex
 
 @menu
-* Starting Up::              $B%K%e!<%9$r8+$D$1$k$N$K$O6lO+$,H<$&$+$bCN$l$J$$(B
+* Starting Up::              $B%K%e!<%9$r8+$D$1$k$N$K$O6lO+$,H<$&$+$b$7$l$J$$(B
 * Group Buffer::             $B%0%k!<%W$rA*Br$7!"9XFI$7!":o=|$9$k(B
 * Summary Buffer::           $B5-;v$rFI$_!"J]B8$7!"Ej9F$9$k(B
 * Article Buffer::           $B5-;v$rI=<($7!"07$&(B
 * Composing Messages::       $B%a!<%k$H%K%e!<%9$rAw$k$?$a$N>pJs(B
-* Select Methods::           Gnus $B$OA4$F$N%a%C%;!<%8$r$$$m$$$m$JA*BrJ}K!$GFI$`(B
-* Scoring::                  $B5-;v$KCM$r$D$1$k(B
+* Select Methods::           gnus $B$O$9$Y$F$N%a%C%;!<%8$r$$$m$$$m$JA*BrJ}K!$GFI$`(B
+* Scoring::                  $B5-;v$KCM$rIU$1$k(B
 * Various::                  $B0lHLE*$J@_Dj(B
 * The End::                  $B$5$i$P!"$=$7$F$5$h$&$J$i(B
 * Appendices::               $BMQ8l!"(BEmacs $BF~Lg!"(B@acronym{FAQ}$B!"Nr;K!"FbIt9=B$(B
@@ -429,7 +424,7 @@ Emacs $B$,J8>O$rJT=8$9$k?M$KNO$rM?$($k$h$&$K!"(Bgnus $B$O%K%e!<%9$rFI$`?M$KNO
 
 Other related manuals
 
-* Message:(message).         $B%a%C%;!<%8$N:n@.(B
+* Message:(message-ja).      $B%a%C%;!<%8$N:n@.(B
 * Emacs-MIME:(emacs-mime).   Composing messages; @acronym{MIME}-specific parts.
 * Sieve:(sieve).             Managing Sieve scripts in Emacs.
 * PGG:(pgg).                 @acronym{PGP/MIME} with Gnus.
@@ -438,16 +433,16 @@ Other related manuals
 @detailmenu
  --- The Detailed Node Listing ---
 
-Starting Gnus
+Starting gnus
 
 * Finding the News::            $B%K%e!<%9$re$N(B gnus $B$r:nF0$5$;$k$3$H$,$G$-$k(B
 * Fetching a Group::            $B%0%k!<%W$rFI$`$?$a$@$1$K(B gnus $B$r5/F0$9$k(B
-* New Groups::                  Gnus $B$,?7$7$$%0%k!<%W$KBP$7$F2?$r$9$k$+(B
-* Changing Servers::            $B$"$k%5!<%P$+$iJL$N%5!<%P$X0\$j$?$$$+$b$7$l$J$$(B
-* Startup Files::               $B$d$C$+$$$J%9%?!<%H%"%C%W%U%!%$%k(B -- @file{.newsrc}
+* New Groups::                  gnus $B$,?7$7$$%0%k!<%W$KBP$7$F2?$r$9$k$+(B
+* Changing Servers::            $B$"$k%5!<%P!<$+$iJL$N%5!<%P!<$X0\$kI,MW$,$"$k$+$b$7$l$J$$(B
+* Startup Files::               $B$d$C$+$$$J%9%?!<%H%"%C%W%U%!%$%k(B---@file{.newsrc}
 * Auto Save::                   $B%/%i%C%7%e$+$i$N2sI|(B
 * The Active File::             $BCY$$2s@~$+$i$N%U%!%$%k$NpJs$HJQ99$NJ}K!(B
-* Group Maneuvering::           $B%0%k!<%W%P%C%U%!$r0\F0$9$k%3%^%s%I(B
+* Group Maneuvering::           $B%0%k!<%W%P%C%U%!!<$r0\F0$9$k%3%^%s%I(B
 * Selecting a Group::           $BC5n(B
 * Group Data::                  $B%0%k!<%W$N>pJs$rJQ99$9$k(B
 * Group Levels::                $B%l%Y%k(B? $B$=$l$C$F2?(B?
 * Group Score::                 $B$"$J$?$N9%$-$J%0%k!<%W$r8+$D$1=P$9J}K!(B
-* Marking Groups::              $B%0%k!<%W$K0u$r$D$1$F$*$$$F!"8e$G=hM}$G$-$^$9(B
+* Marking Groups::              $B%0%k!<%W$K0u$rIU$1$F$*$$$F!"8e$G=hM}$G$-$k(B
 * Foreign Groups::              $B%0%k!<%W$N:n@.$H=$@5(B
-* Group Parameters::            $B%0%k!<%WKh$K0c$C$?%Q%i%a!<%?$r;}$?$;$i$l$^$9(B
-* Listing Groups::              Gnus $B$O%0%k!<%W$r$$$m$$$m$JJ,$1J}$GI=<($G$-$^$9(B
+* Group Parameters::            $B%0%k!<%WKh$K0c$C$?%Q%i%a!<%?!<$r;}$?$;$i$l$k(B
+* Listing Groups::              gnus $B$O%0%k!<%W$r$$$m$$$m$JJ,$1J}$GI=<($G$-$k(B
 * Sorting Groups::              $B%0%k!<%W$N=gHV$NG[CVBX$((B
 * Group Maintenance::           $B$-$l$$$J(B @file{.newsrc} $B$NJ]$AJ}(B
-* Browse Foreign Server::       $B%5!<%P$r354Q$G$-$k!#2?$,FI$a$k$N$+8+$F$_$h$&(B
-* Exiting Gnus::                $B%K%e!<%9FI$`$N$r$d$a$F!";E;v$r$7$h$&(B
+* Browse Foreign Server::       $B%5!<%P!<$r354Q$G$-$k!#2?$,FI$a$k$N$+8+$F$_$h$&(B
+* Exiting Gnus::                $B%K%e!<%9$rFI$`$N$r$d$a$F!";E;v$r$7$h$&(B
 * Group Topics::                $B%0%k!<%W$r@Z$j:.$<$F!"%H%T%C%/$4$H$KJ,3d$9$k(B
 * Misc Group Stuff::            $BB>$K$G$-$k$3$H(B
 
 Group Buffer Format
 
-* Group Line Specification::    $B%0%k!<%W%P%C%U%!$N8+$(J}$r7h$a$k(B
-* Group Mode line Specification::  $B%0%k!<%W%P%C%U%!$N%b!<%I9T(B
-* Group Highlighting::          $B%0%k!<%W%P%C%U%!$K$-$l$$$K?'$r$D$1$k(B
+* Group Line Specification::    $B%0%k!<%W%P%C%U%!!<$N8+$(J}$r7h$a$k(B
+* Group Mode Line Specification::  $B%0%k!<%W%P%C%U%!!<$N%b!<%I9T(B
+* Group Highlighting::          $B%0%k!<%W%P%C%U%!!<$K$-$l$$$K?'$rIU$1$k(B
 
 Group Topics
 
@@ -490,45 +485,45 @@ Group Topics
 * Topic Variables::             Lisp $B$G%H%T%C%/$r%+%9%?%^%$%:$9$kJ}K!(B
 * Topic Sorting::               $B%H%T%C%/KhJL!9$KJB$YBX$($k(B
 * Topic Topology::              $BA4@$3&$NCO?^(B
-* Topic Parameters::            $B$"$k%H%T%C%/$NA4$F$N%0%k!<%W$KE,MQ$5$l$k%Q%i%a!<%?(B
+* Topic Parameters::            $B$"$k%H%T%C%/$N$9$Y$F$N%0%k!<%W$KE,MQ$5$l$k%Q%i%a!<%?!<(B
 
 Misc Group Stuff
 
-* Scanning New Messages::       Gnus $B$K?7$7$$%a%C%;!<%8$,E~Ce$7$?$+$I$&$+$rJ9$/(B
+* Scanning New Messages::       gnus $B$K?7$7$$%a%C%;!<%8$,E~Ce$7$?$+$I$&$+$rJ9$/(B
 * Group Information::           $B%0%k!<%W$H(B gnus $B$K4X$9$k>pJs$H%X%k%W(B
-* Group Timestamp::             Gnus $B$K:G8e$K$$$D%0%k!<%W$rFI$s$@$+$r5-O?$5$;$k(B
-* File Commands::               Gnus $B$N%U%!%$%k$NFI$_=q$-(B
+* Group Timestamp::             gnus $B$K:G8e$K$$$D%0%k!<%W$rFI$s$@$+$r5-O?$5$;$k(B
+* File Commands::               gnus $B$N%U%!%$%k$NFI$_=q$-(B
 * Sieve Commands::              Sieve $B%9%/%j%W%H$N4IM}(B
 
 Summary Buffer
 
-* Summary Buffer Format::       $B35N,%P%C%U%!$N304Q$r7hDj$9$k(B
-* Summary Maneuvering::         $B35N,%P%C%U%!$rF0$-2s$k(B
+* Summary Buffer Format::       $B35N,%P%C%U%!!<$N304Q$r7hDj$9$k(B
+* Summary Maneuvering::         $B35N,%P%C%U%!!<$rF0$-2s$k(B
 * Choosing Articles::           $B5-;v$rFI$`(B
 * Paging the Article::          $BFI$s$G$$$k5-;v$r%9%/%m!<%k$9$k(B
 * Reply Followup and Post::     $B5-;v$rEj9F$9$k(B
 * Delayed Articles::            $B5-;v$r8e$GAw$k(B
-* Marking Articles::            $B5-;v$K4{FI$d4|8B@Z$l:o=|2DG=Ey$N0u$rIU$1$k(B
-* Limiting::                    $B35N,%P%C%U%!$K@)8B$r2C$($k$3$H$,$G$-$k(B
+* Marking Articles::            $B5-;v$K4{FI$d4|8B@Z$l>C5n2DG=Ey$N0u$rIU$1$k(B
+* Limiting::                    $B35N,%P%C%U%!!<$K@)8B$r2C$($k$3$H$,$G$-$k(B
 * Threading::                   $B%9%l%C%I$,$I$N$h$&$K:n$i$l$k$+(B
 * Sorting the Summary Buffer::  $B%9%l%C%I$H5-;v$,$I$N$h$&$KJB$S$+$($i$l$k$+(B
-* Asynchronous Fetching::       Gnus $B$O5-;v$r@h$KC5n$7$J$/$5$;$k(B
-* Article Backlog::             $B4{$KFI$s$@5-;v$r;D$7$F$*$/(B
+* Article Backlog::             $B$9$G$KFI$s$@5-;v$r;D$7$F$*$/(B
 * Saving Articles::             $B5-;v$NJ]B8$r%+%9%?%^%$%:$9$kJ}K!(B
-* Decoding Articles::           Gnus $B$O0lO"$N(B (uu)encode $B$5$l$?5-;v$r07$($k(B
-* Article Treatment::           $B5-;v%P%C%U%!$O$*K>$_$I$*$j$KL\Cc6lCc$K$G$-$k(B
+* Decoding Articles::           gnus $B$O0lO"$N(B (uu)encode $B$5$l$?5-;v$r07$($k(B
+* Article Treatment::           $B5-;v%P%C%U%!!<$O$*K>$_$I$*$j$KL\Cc6lCc$K$G$-$k(B
 @c * MIME Commands::               Doing MIMEy things with the articles.
 @c * Charsets::                    Character set issues.
-* Article Commands::            $B5-;v%P%C%U%!$G$$$m$$$m$J$3$H$r$9$k(B
-* Summary Sorting::             $B$$$m$$$m$JJ}K!$G35N,%P%C%U%!$rJB$YBX$($k(B
+* Article Commands::            $B5-;v%P%C%U%!!<$G$$$m$$$m$J$3$H$r$9$k(B
+* Summary Sorting::             $B$$$m$$$m$JJ}K!$G35N,%P%C%U%!!<$rJB$YBX$($k(B
 * Finding the Parent::          $B;R5-;v$,C5$;$J$$$C$F(B? $B?F5-;v$r$N$I$N>l=j$K$b9g$o$J$+$C$?$b$N(B
-* Exiting the Summary Buffer::  $B%0%k!<%W%P%C%U%!$KLa$k!"$^$?$O8=:_$N%0%k!<%W$r:F$SA*Br$9$k(B
+* Various Summary Stuff::       $BB>$N$I$N>O$K$bG<$^$i$J$+$C$?$b$N(B
+* Exiting the Summary Buffer::  $B%0%k!<%W%P%C%U%!!<$KLa$k!"$^$?$O8=:_$N%0%k!<%W$r:F$SA*Br$9$k(B
 * Crosspost Handling::          $B%/%m%9%]%9%H$5$l$?5-;v$,$I$N$h$&$K07$o$l$k$+(B
 * Duplicate Suppression::       $B%/%m%9%]%9%H$N07$$$K<:GT$7$?$H$-$NBeBXA0$rI=<($7$J$$J}K!(B
 * Summary Buffer Mode Line::    $B%b!<%I9T$N8+$(J}$r7h$a$i$l$k(B
-* Summary Highlighting::        $B35N,%P%C%U%!$r$-$l$$$GAGE($K$9$k(B
+* Summary Highlighting::        $B35N,%P%C%U%!!<$r$-$l$$$GAGE($K$9$k(B
 
 Choosing Articles
 
@@ -564,12 +559,12 @@ Marking Articles
 
 Threading
 
-* Customizing Threading::       $BJQ992DG=$J%9%l%C%I$K1F6A$9$kJQ?t(B
-* Thread Commands::             $B35N,%P%C%U%!$G$N%9%l%C%I$K4p$E$$$?L?Na(B
+* Customizing Threading::       $B%9%l%C%I$K1F6A$r5Z$\$9JQ992DG=$JJQ?t(B
+* Thread Commands::             $B35N,%P%C%U%!!<$G$N%9%l%C%I$K4p$E$$$?L?Na(B
 
 Customizing Threading
 
-* Loose Threads::               Gnus $B$,L5B+G{%9%l%C%I$r=8$a$FBg$-$J%9%l%C%I$K$9$kJ}K!(B
+* Loose Threads::               gnus $B$,L5B+G{%9%l%C%I$r=8$a$FBg$-$J%9%l%C%I$K$9$kJ}K!(B
 * Filling In Threads::          $B%9%l%C%I$rKd$a$k(B
 * More Threading::              $B%9%l%C%I$r$$$8$/$k$5$i$KB?$/$NJQ?t(B
 * Low-Level Threading::         $B$3$l$G=*$o$C$?$H;W$C$?$G$7$g$&(B@dots{} $B$G$b$"$J$?$O4V0c$C$F$$$?(B!
@@ -580,18 +575,18 @@ Decoding Articles
 * Shell Archives::              shar $B5-;v$r2rE`$9$k(B
 * PostScript Files::            $B%]%9%H%9%/%j%W%H$rJ,3d$9$k(B
 * Other Files::                 $BIaDL$NJ]B8$H(B binhex.
-* Decoding Variables::          $B9,$;$JI|9f2=$N$?$a$NJQ?t(B
-* Viewing Files::               $BI|9f2=$N7k2L$r8+$?$$(B?
+* Decoding Variables::          $B9,$;$J%G%3!<%I$N$?$a$NJQ?t(B
+* Viewing Files::               $B%G%3!<%I$5$l$?7k2L$r8+$?$$(B?
 
 Decoding Variables
 
 * Rule Variables::              $B%U%!%$%k$,$I$N$h$&$KI=<($5$l$k$+$r7h$a$kJQ?t(B
-* Other Decode Variables::      $BB>$NI|9f2=$NJQ?t(B
+* Other Decode Variables::      $BB>$N%G%3!<%I$N$?$a$NJQ?t(B
 * Uuencoding and Posting::      uuencode $B$9$k$N$r%+%9%?%^%$%:$9$kJQ?t(B
 
 Article Treatment
 
-* Article Highlighting::        $B5-;v$r2LJ*%5%i%@$N$h$&$K8+$($k$h$&$K$7$?$$(B
+* Article Highlighting::        $B5-;v$r%U%k!<%D%5%i%@$N$h$&$K$7$?$$(B
 * Article Fontisizing::         $B6/D4$5$l$?J8$rAGE($K$9$k(B
 * Article Hiding::              $BFCDj$N>pJs$O>C$75n$j$?$$$H$b;W$&(B
 * Article Washing::             $B?M@8$r$b$C$H$h$/$9$k$?$/$5$s$N5$$NMx$$$?4X?t(B
@@ -606,55 +601,56 @@ Article Treatment
 Alternative Approaches
 
 * Pick and Read::               $B$^$:!"5-;v$K0u$rIU$1$F!"$=$l$+$iFI$`(B
-* Binary Groups::               $B$9$Y$F$N5-;v$r<+F0(B-$BI|9f2=$9$k(B
+* Binary Groups::               $B$9$Y$F$N5-;v$r<+F0%G%3!<%I$9$k(B
 
 Various Summary Stuff
 
 * Summary Group Information::   $B>pJs;X8~$NL?Na(B
 * Searching for Articles::      $BJ#?t5-;vL?Na(B
 * Summary Generation Commands::
-* Really Various Summary Commands::  $B$"$N$d$C$+$$$JB>$KE,9g$7$J$$L?Na(B
+* Really Various Summary Commands::  $B$"$N$d$C$+$$$J;W$$DL$j$K$J$i$J$$L?Na(B
 
 Article Buffer
 
 * Hiding Headers::              $B$I$N%X%C%@!<$rI=<($9$k$+$r7h$a$k(B
-* Using MIME::                  @acronym{MIME} $B5-;v$H$7$F8+$;$k(B
+* Using MIME::                  $BFI$`A0$K5-;v$r(B @acronym{MIME} $B$KDL$9(B
 * Customizing Articles::        $B5-;v$N8+1I$($r;EN)$F$k(B
-* Article Keymap::              $B5-;v%P%C%U%!$G;H$($k%-!(B
 
 Composing Messages
 
-* Mail::                        $B%a!<%k$HJVEz(B
-* Posting Server::              $B$I$N%5!<%P!<$rDL$7$F%K%e!<%9$rEj9F$^$?$O%a!<%k$rAw?.$9$k$Y$-$+(B?
+* Mail::                        $B%a!<%k$NAw?.$HJVEz(B
+* Posting Server::              $B$I$N%5!<%P!<$GEj9F$^$?$O%a!<%k$rAw?.$9$k$Y$-$+(B?
 * POP before SMTP::             $B%a!<%k$rFI$^$J$$$H%a!<%k$rAw?.$G$-$J$$(B
-* Mail and Post::               $BF1;~$K%a!<%k$r=P$7JVEz$9$k(B
+* Mail and Post::               $B%K%e!<%9$H%a!<%k$rF1;~$KAw?.$9$k(B
 * Archived Messages::           $BAw$C$?%a%C%;!<%8$r(B gnus $B$,Cy$a$F$*$/$H$3$m(B
-* Posting Styles::              $B$"$J$?$,C/$G$"$k$+$r;XDj$9$k$h$j4JC1$JJ}K!(B
+* Posting Styles::              $B$"$J$?$,C/$G$"$k$+$rL@$i$+$K$9$k$h$j4JC1$JJ}K!(B
 * Drafts::                      $B%a%C%;!<%8$N1d4|$H5qH]$5$l$?%a%C%;!<%8(B
-* Rejected Articles::           $B%5!<%P!<$,$"$J$?$N5-;v$r9%$-$G$J$$$H$-$K2?$,5/$3$k(B?
+* Rejected Articles::           $B%5!<%P!<$,$"$J$?$N5-;v$r7y$$$@$H2?$,5/$3$k(B?
 @c * Signing and encrypting::      How to compose secure messages.
 
 Select Methods
 
-* Server Buffer::               $B;ve$N%5!<%P!<$r:n$C$FJT=8$9$k(B
+* Server Buffer::               $B2>A[%5!<%P!<$r:n$C$FJT=8$9$k(B
 * Getting News::                USENET $B%K%e!<%9$r(B gnus $B$GFI$`(B
 * Getting Mail::                $B8D?ME*$J%a!<%k$r(B gnus $B$GFI$`(B
-* Browsing the Web::            $B2a>j$J%&%'%V$N;q8;$+$i%a%C%;!<%8$r$rA*BrJ}K!$H$7$F;H$&;v$,$G$-$k(B
-* Unavailable Servers::         $B@\B3$7$h$&$H;n$_$?%5!<%P!<$N$$$/$D$+$,Mn$A$F$$$k$+$b$7$l$J$$(B
+* Servers and Methods::         $B%5!<%P!$rA*BrJ}K!$H$7$F;H$&$3$H$,$G$-$k(B
+* Unavailable Servers::         $B@\B3$7$h$&$H$7$?%5!<%P!<$N$$$/$D$+$OMn$A$F$$$k$+$b$7$l$J$$(B
 
 Getting News
 
@@ -670,25 +666,25 @@ Getting News
 
 Getting Mail
 
-* Mail in a Newsreader::        $B%K%e!<%9%j!<%@$G%a!<%k(B ($BBg;v$JA0CV$-(B)
+* Mail in a Newsreader::        $B%K%e!<%9%j!<%@!<$G%a!<%k(B ($BBg;v$JA0CV$-(B)
 * Getting Started Reading Mail::  $B4JC1$JNAM}K\$N$h$&$JNc(B
-* Splitting Mail::              $B$I$N$h$&$K%a!<%k%0%k!<%W$r:n@.$9$k$+(B
-* Mail Sources::                Gnus $B$K$I$3$+$i%a!<%k$r$N%U%!%$%k$rFI$`$?$a$K%a!<%k%P%C%/%(%s%I$r;H$&(B
-* Choosing a Mail Back End::    Gnus $B$O?'!9$J%a!<%kMM<0$rFI$`;v$,$G$-$k(B
+* Expiring Mail::               $BMW$i$J$$%a!<%k$rC5n(B
-* Editing IMAP ACLs::           $B%a!<%k%\%C%/%9$X$NB>$NMxMQA06u4V$r;H$&(B($B;H$o$J$$(B)$BJ}K!(B
+* Editing IMAP ACLs::           $BB>$NMxMQA06u4V$r;H$&(B ($B;H$o$J$$(B) $BJ}K!(B
 * Debugging IMAP::              $B$b$N$4$H$,F/$+$J$$$H$-$K$9$k$Y$-$3$H(B
 
 Other Sources
@@ -725,7 +721,7 @@ Other Sources
 * Directory Groups::            $B%G%#%l%/%H%j!<$r%K%e!<%9%0%k!<%W$N$h$&$KFI$`(B
 * Anything Groups::             Dired?  $BC/$,(B dired $B$J$s$F;H$&$N(B?
 * Document Groups::             $B8DJL$N%U%!%$%k72$O%0%k!<%W$NAG(B
-* SOUP::                        @sc{soup} $B%Q%1%C%H$r(B ``$B%*%U%i%$%s(B'' $B$GFI$`(B
+* SOUP::                        @sc{soup} $B%Q%1%C%H$r!V%*%U%i%$%s!W$GFI$`(B
 * Mail-To-News Gateways::       $B%a!<%k$+$i%K%e!<%9$X$N%2!<%H%&%'%$$rDL$7$F5-;v$rEj9F$9$k(B
 
 Document Groups
@@ -734,29 +730,49 @@ Document Groups
 
 SOUP
 
-* SOUP Commands::               @sc{soup} $B%Q%1%C%H$r:n@.!"Aw=P$9$kL?Na(B
-* SOUP Groups::                 @sc{soup} $B%Q%1%C%H$rFI$`%P%C%/%(%s%I(B
-* SOUP Replies::                @code{nnsoup} $B$K%a!<%k$H%K%e!<%9$r0z$-7Q$,$;$kJ}K!(B
+* SOUP Commands::               @sc{soup} $B%Q%1%C%H$r:n$C$FAw$j=P$9L?Na(B
+* SOUP Groups::                 @sc{soup} $B%Q%1%C%H$rFI$`$?$a$N%P%C%/%(%s%I(B
+* SOUP Replies::                $B%a!<%k$H%K%e!<%9$r(B @code{nnsoup} $B$K0z$-7Q$,$;$kJ}K!(B
 
 Combined Groups
 
-* Virtual Groups::              $B$?$/$5$s$N%0%k!<%W$N5-;v$r7k9g$9$k(B
+* Virtual Groups::              $B$?$/$5$s$N%0%k!<%W$N5-;v$r9gJ;$9$k(B
 * Kibozed Groups::              $B%K%e!<%9%9%W!<%k$NCf$+$i$N5-;v$r8!:w$9$k(B
 
-Gnus Unplugged
+Email Based Diary
+
+* The NNDiary Back End::        $B4pK\E*$J@_Dj$H;H$$J}(B
+* The Gnus Diary Library::      NNDiary $B$N>e0L3,AX$K$"$kC$9J}K!(B
+* Agent Expiry::                $B8E$$5-;v$rDI$$J'$&J}K!(B
 * Agent Regeneration::          $BDL?.@ZCG$dB>$N;v8N$+$i2sI|$9$kJ}K!(B
+* Agent and flags::             $B%(!<%8%'%s%H$O$I$&%U%i%0$r0];}$9$k$N$+(B
 * Agent and IMAP::              $B%(!<%8%'%s%H$r(B @acronym{IMAP} $B$G;H$&J}K!(B
-* Outgoing Messages::           $BEj9F!"%a!<%k$r=P$9$H$-$K$J$K$,5/$3$k$N$+(B?
+* Outgoing Messages::           $B%K%e!<%9$d%a!<%k$r=P$9$H$-$K$J$K$,5/$3$k$N$+(B?
 * Agent Variables::             $B%+%9%?%^%$%:$O3Z$7(B
 * Example Setup::               $B%*%U%i%$%s?M4V$N$?$a$N(B @file{~/.gnus.el} $B$NNc(B
-* Batching Agents::             @code{cron} $B%8%g%V$K$h$k%K%e!<%9C5n%U%!%$%k$r%9%3%"%U%!%$%k$KJQ49$9$k(B
-* Advanced Scoring::            $B%9%3%"$NK!B'$r:n$k$?$a$KO@M}I=8=$r;H$&(B
-* Score Decays::                $B%9%3%"$r8O$l$F$$$+$;$k$N$OLr$KN)$D;v$b$"$k(B
+* Scoring Tips::                $B8z2LE*$K%9%3%"$rIU$1$kJ}K!(B
+* Reverse Scoring::             $B:P$r$H$C$?LdBj;y$OLdBj$G$O$J$$(B
+* Global Score Files::          $BCO$rJ$$$!"<*$r@Z$jNv$/%9%3%"%U%!%$%k(B
+* Kill Files::                  $B$=$l$i$O$^$@$3$3$K$"$k$,!"L5;k$9$k$3$H$,$G$-$k(B
+* Converting Kill Files::       $B>C5n%U%!%$%k$r%9%3%"%U%!%$%k$KK]Lu$9$k(B
+* Advanced Scoring::            $B%9%3%"$N5,B'$r:n$k$?$a$KO@M}I=8=$r;H$&(B
+* Score Decays::                $B%9%3%"$r8:?j$5$;$k$N$OLr$KN)$D$3$H$b$"$k(B
 
 Advanced Scoring
 
 * Advanced Scoring Syntax::     $BDj5A(B
 * Advanced Scoring Examples::   $B$I$N$h$&$K8+$($k$+(B
-* Advanced Scoring Tips::       $B$=$l$r:GBg8BMxMQ$9$k(B
+* Advanced Scoring Tips::       $B$=$l$r:GBg8B$KMxMQ$9$k(B
 
 Various
 
-* Process/Prefix::              $BB?$/$N07$$L?Na$G;H$o$l$k=,47(B
-* Interactive::                 Gnus $B$KB?$/$Ne$2$k$+(B
+* Formatting Variables::        $B%P%C%U%!!<$N8+1I$($r;XDj$9$k$3$H$,$G$-$k(B
+* Window Layout::               gnus $B$N3F%P%C%U%!!<$N%&%#%s%I%&$r@_Dj$9$k(B
+* Faces and Fonts::             $B%U%'!<%9$,$I$N$h$&$K8+$($k$+$rJQ99$9$k(B
+* Compilation::                 gnus $B$rB.$/$9$k$K$O(B
 * Mode Lines::                  $B%b!<%I9T$K>pJs$rI=<($9$k(B
-* Highlighting and Menus::      $B%P%C%U%!$rAGE($G?4CO$h$/8+$;$k(B
-* Buttons::                     $B4JC1$J==Jb$G%"%-%l%9g'$rF@$k(B
-* Daemons::                     Gnus $B$O$"$J$?$NN"$GJ*;v$rd1j$K$J$k(B!
+* Daemons::                     gnus $B$O$"$J$?$NN"$G;E;v$r$9$k$3$H$,$G$-$k(B
 * NoCeM::                       Spam $B$dB>$NB@$j$d$9$$?);v$rHr$1$kJ}K!(B
-* Undo::                        $B$$$/$D$+$NF0:n$O85$KLa$9;v$,$G$-$k(B
+* Undo::                        $B$$$/$D$+$NF0:n$O85$KLa$9$3$H$,$G$-$k(B
 * Predicate Specifiers::        $B=R8l$r@_Dj$9$k(B
 * Moderation::                  $B$"$J$?$,%b%G%l!<%?!<$@$C$?$i$I$&$9$k$+(B
-* Image Enhancements::          $B:G?7$N(B Emacs/XEmacs $B$O3($rI=<($G$-$k(B
-* Fuzzy Matching::              $BBg$-$JLJLS$C$F2?(B?
-* Thwarting Email Spam::        $BM>7W$J>&6HE*EE;R%a!<%k$rHr$1$kJ}K!(B
+* Image Enhancements::          $B:G?7$N(B Emacs/XEmacs $B$O2hA|$rI=<($G$-$k(B
+* Fuzzy Matching::              $BBg$-$J$R$:$s$@2;(B (big fuzz) $B$C$F2?(B?
+* Thwarting Email Spam::        $BMj$s$G$b$$$J$$9-9p%a!<%k$rHr$1$kJ}K!(B
 * Other modes::                 $BB>$N%b!<%I$H$NAj8_:nMQ(B
 * Various Various::             $BK\Ev$K$$$m$$$m$J$b$N(B
 
@@ -824,8 +840,8 @@ Formatting Variables
 
 * Formatting Basics::           $B=qK!;EMMJQ?t$O4pK\E*$K=qK!;XDjJ8;zNs$G$"$k(B
 * Mode Line Formatting::        $B%b!<%I9T$N=qK!;EMMJQ?t$K4X$9$k$$$/$D$+$N5,B'(B
-* Advanced Formatting::         $B?'!9$JJ}K!$G=PNO$r=$@5$9$k(B
-* User-Defined Specs::          Gnus $B$K$"$J$?<+?H$N4X?t$r8F$P$;$k(B
+* Advanced Formatting::         $B?'!9$JJ}K!$G=PNO$rJQ2=$5$;$k(B
+* User-Defined Specs::          gnus $B$K$"$J$?<+?H$N4X?t$r8F$P$;$k(B
 * Formatting Fonts::            $B;EMM$rB?:L$GAGE($K8+$;$k(B
 * Positioning Point::           $BA`:n$N8e$G%]%$%s%H$r0\F0$9$k(B
 * Tabulation::                  $B=PNO$N@0Ns(B
@@ -835,9 +851,9 @@ Image Enhancements
 
 * X-Face::                      $B%U%!%s%-!<$J$A$C$A$c$JGr9u$N3($rI=<($9$k(B
 * Face::                        $B$h$j%U%!%s%-!<$G$A$C$A$c$J%+%i!<$N3($rI=<($9$k(B
-* Smileys::                     $BI=<($5$l$k$Y$/@8$^$l$?9,$;$=$&$J4i$rI=<($9$kJ}K!(B
+* Smileys::                     $B9,$;$J4i$r$^$5$K$=$N$h$&$KI=<($9$k(B
 * Picons::                      $B$"$J$?$,FI$s$G$$$k$b$N$N3($rI=<($9$kJ}K!(B
-* XVarious::                    $B$=$NB>$N(B XEmacs $B$G(B Gnus $B$JJQ?t(B
+* XVarious::                    XEmacs $B$N$?$a$N(B gnus $B$NJQ?t(B
 
 Thwarting Email Spam
 
@@ -878,67 +894,67 @@ Appendices
 * XEmacs::                      XEmacs $B$G%$%s%9%H!<%k$9$k$?$a$NMW7o(B
 * History::                     $B$I$&$d$C$F(B gnus $B$,:#F|$N$h$&$K$J$C$?$+(B
 * On Writing Manuals::          $B$J$<$3$l$,=i?4eR2p(B
+* Frequently Asked Questions::  gnus $B$N(B FAQ
 
 History
 
 * Gnus Versions::               $B$I$s$J%P!<%8%g%s$N(B Gnus $B$,%j%j!<%9$5$l$F$$$k$+(B
-* Other Gnus Versions::         $B%j%j!<%9$5$l$F$$$kB>$N%P!<%8%g%s$N(B Gnus
-* Why?::                        Gnus $B$NL\E*$O2?(B?
-* Compatibility::               Gnus $B$O(B @sc{gnus} $B$H$I$l$/$i$$8_49@-$,$"$k$N(B?
-* Conformity::                  Gnus $B$OA4$F$NI8=`$rK~$?$=$&$H$9$k(B
-* Emacsen::                     Gnus $B$O$$$/$D$+$N8=BeE*$J(B Emacs $B4D6-$G$N%P!<%8%g%s$N(B gnus
+* Why?::                        gnus $B$NL\E*$O2?(B?
+* Compatibility::               gnus $B$O(B @sc{gnus} $B$H$I$l$/$i$$8_49@-$,$"$k$N(B?
+* Conformity::                  gnus $B$O$9$Y$F$NI8=`$rK~$?$=$&$H$9$k(B
+* Emacsen::                     gnus $B$O>/?t$N8=BeE*$J(B Emacs $B$Ge$N$b$N(B---Gnus 5.4/5.5
 * Quassia Gnus::                2 $B$+$1$k(B 2 $B$O(B 4$B!"$b$7$/$O(B Gnus 5.6/5.7
-* Pterodactyl Gnus::            $B8^HVL\!"(BP $B$G;O$^$k!"$b$7$/$O(B Gnus 5.8/5.9 $B$H$7$FCN$i$l$F$$$k$b$N(B
+* Pterodactyl Gnus::            $B?@Hk$N?t$b(B P $B$G;O$^$k$1$l$I!#(BGnus 5.8/5.9 $B$NJLL>(B
 * Oort Gnus::                   $B5pBg$J!#1s$/MZ$+$J!#(BGnus 5.10/5.11$B!#(B
-* No Gnus::                     Lars $B$5$s!"D>$7$F(B!
+* No Gnus::                     $BD6$d$P$$(B
 
 Customization
 
-* Slow/Expensive Connection::   $B%m!<%+%k$N(B Emacs $B$rN)$A>e$2$F!"B>$N$H$3$m$+$i%K%e!<%9$rF@$k;v$,$G$-$k(B
-* Slow Terminal Connection::    $B1s3V(B Emacs $B$rpJs7A<0(B
-* Extended Interactive::        $B5-9f@\F,<-$J$I(B
-* Emacs/XEmacs Code::           Gnus $B$OA4$F$N6aBe(B Emacsen $B$GF0:n$9$k(B
-* Various File Formats::        Gnus $B$N;HMQ$9$k%U%!%$%k$N7A<0(B
+* Group Info::                  $B%0%k!<%W>pJs$N7A<0(B
+* Extended Interactive::        $B%7%s%\%k@\F,0z?t$J$I(B
+* Emacs/XEmacs Code::           gnus $B$O$9$Y$F$N:G?7$N(B Emacsen $B$GF0:n$9$k(B
+* Various File Formats::        gnus $B$,;HMQ$9$k%U%!%$%k$N7A<0(B
 
 Back End Interface
 
-* Required Back End Functions::  $BpJs(B
-* Newsgroups File Format::      $B%0%k!<%W$N5-=R(B
+* Active File Format::          $B;HMQ2DG=$J5-;v$H%0%k!<%W$N>pJs(B
+* Newsgroups File Format::      $B%0%k!<%W$N@bL@(B
 
 Emacs for Heathens
 
@@ -959,8 +975,8 @@ Emacs for Heathens
 
 @findex gnus-other-frame
 @kindex M-x gnus-other-frame
-$BJL$N%U%l!<%`(B (frame) $B$G(B gnus $B$r5/F0$7$?$$$H$-$O!"L?(B
-$BNa(B @kbd{M-x gnus-other-frame} $B$r;H$&$3$H$,$G$-$^$9!#(B
+$BJL$N%U%l!<%`(B (frame) $B$G(B gnus $B$r5/F0$7$?$$$H$-$O!"(B
+@kbd{M-x gnus-other-frame} $BL?Na$r;H$&$3$H$,$G$-$^$9!#(B
 
 $B3+;O;~$K2?$+$,$&$^$/$$$+$J$$$H$-$O(B @file{~/.gnus.el} $B%U%!%$%k$NCf$GJQ?t(B
 $B$r$$$/$D$+$$$8$/$j$^$o$5$J$1$l$P$J$i$J$$$G$7$g$&!#$3$N%U%!%$%k(B
@@ -968,17 +984,17 @@ Emacs for Heathens
 $B$^$l$^$9!#(B
 
 $B$3$N@bL@=q$G$h$/$o$+$i$J$$MQ8l$,$G$F$-$?$H$-$O!"MQ8l$N(B
-$B9`(B (@pxref{Terminology}) $B$r;2>H$7$F$/$@$5$$!#(B
+$B>O(B (@ref{Terminology}) $B$r;2>H$7$F2<$5$$!#(B
 
 @menu
 * Finding the News::      $B%K%e!<%9$re$N(B gnus $B$r:nF0$5$;$k$3$H$,$G$-$k(B
 * Fetching a Group::      $B%0%k!<%W$rFI$`$?$a$@$1$K(B gnus $B$r5/F0$9$k(B
-* New Groups::            Gnus $B$,?7$7$$%0%k!<%W$KBP$7$F2?$r$9$k$+(B
-* Changing Servers::      $B$"$k%5!<%P$+$iJL$N%5!<%P$X0\$j$?$$$+$b$7$l$J$$(B
-* Startup Files::         $B$d$C$+$$$J%9%?!<%H%"%C%W%U%!%$%k(B -- @file{.newsrc}
+* New Groups::            gnus $B$,?7$7$$%0%k!<%W$KBP$7$F2?$r$9$k$+(B
+* Changing Servers::      $B$"$k%5!<%P!<$+$iJL$N%5!<%P!<$X0\$kI,MW$,$"$k$+$b$7$l$J$$(B
+* Startup Files::         $B$d$C$+$$$J%9%?!<%H%"%C%W%U%!%$%k(B---@file{.newsrc}
 * Auto Save::             $B%/%i%C%7%e$+$i$N2sI|(B
 * The Active File::       $BCY$$2s@~$+$i$N%U%!%$%k$Nl=j(B} $B$rI=$9%j%9%H$G$"$kI,MW$,$"$j$^$9!#$3$NJ}K!$O$"$J$?$N4pK\J}(B
-$BK!(B (native method) $B$K$J$j$^$9!#$3$NJ}K!$Gl=j!W$rI=$9%j(B
+$B%9%H$G$"$kI,MW$,$"$j$^$9!#$3$NJ}K!$O$"$J$?$N4pK\J}K!(B (native method) $B$K(B
+$B$J$j$^$9!#$3$NJ}K!$Gl9g$O!"(B
+$B%m!<%+%k!&%9%W!<%k$N%G%#%l%/%H%j!<$rFI$_9~$_$?$$>l9g$O!"(B
 
 @lisp
 (setq gnus-select-method '(nnspool ""))
@@ -1033,14 +1049,14 @@ gnus $B$O(B @code{gnus-nntpserver-file} ($B@_Dj$5$l$F$$$J$$>l9g(B
 
 @vindex gnus-nntp-server
 @code{gnus-nntp-server} $B$,@_Dj$5$l$F$$$k$H!"$3$NJQ?t(B
-$B$O(B @code{gnus-select-method} $B$r>e=q$-$7$^$9!#$G$9$+$i!"(B
-@code{gnus-nntp-server} $B$O(B @code{nil} $B$K@_Dj$9$k$Y$-$G!"=i4|@_Dj$G$b$=$N(B
-$B$h$&$K$J$C$F$$$^$9!#(B
+$B$O(B @code{gnus-select-method} $B$h$j$bM%@h$5$l$^$9!#$G$9$+(B
+$B$i(B @code{gnus-nntp-server} $B$O(B @code{nil} $B$K@_Dj$9$k$Y$-$G!"$=$l$,%G%#%U%)(B
+$B%k%H$G$9!#(B
 
 @vindex gnus-secondary-servers
 @vindex gnus-nntp-server
-Gnus $B$K(B @acronym{NNTP} $B%5!<%P!<$NL>A0$NF~NO$rBPOCE*$K;XDj$9$k$3$H$b$G$-(B
-$B$^$9!#(B@code{gnus} $B$K?tCM$G$J$$@\F,0z?t$rEO$9$H(B ($BNc(B: @kbd{C-u M-x gnus})$B!"(B
+gnus $B$K(B @acronym{NNTP} $B%5!<%P!<$NL>A0$rBPOCE*$K;XDj$9$k$3$H$b$G$-$^$9!#(B
+@code{gnus} $B$K?tCM$G$J$$@\F,0z?t$rEO$9$H(B ($BNc(B: @kbd{C-u M-x gnus})$B!"(B
 gnus $B$O(B @code{gnus-secondary-servers} $B%j%9%H(B ($B$b$7B8:_$9$k$J$i$P(B) $B$+$i%5!<(B
 $B%P!<$rA*$V$3$H$,$G$-$k$h$&$K$7$^$9!#$?$@C1$K@\B3$7$?$$$H;W$C$?%5!<%P!<$N(B
 $BL>A0$rBG$D$3$H$b$G$-$^$9!#(B($B$3$l$O(B @code{gnus-nntp-server} $B$r@_Dj$7!"$3$l(B
@@ -1049,10 +1065,10 @@ gnus $B$O(B @code{gnus-secondary-servers} $B%j%9%H(B ($B$b$7B8:_$9$k$J$i$P
 
 @findex gnus-group-browse-foreign-server
 @kindex B ($B%0%k!<%W(B)
-$B$7$+$7!"IaCJF|>oE*$K$O0l$D$N(B @acronym{NNTP} $B%5!<%P$r;H$$!"0c$C$?%5!<%P!<(B
-$B$K$O6=L#$N$"$k%0%k!<%W$,>/$7$7$+$J$$>l9g!"%0%k!<%W%P%C%U%!$G(B @kbd{B} $BL?(B
-$BNa$r;H$&$3$H$NJ}$,NI$$$G$7$g$&!#$=$l$O!"A*Br2DG=$J%0%k!<%W$rI=<($7!"$=$N(B
-$BCf$+$i$I$l$G$b9%$-$J$b$N$r9XFI$9$k$3$H$,$G$-$^$9!#$3$l(B
+$B$7$+$7!"IaCJF|>oE*$K$O0l$D$N(B @acronym{NNTP} $B%5!<%P!<$r;H$$!"0c$C$?%5!<%P!<(B
+$B$K$O6=L#$N$"$k%0%k!<%W$,>/$7$7$+$J$$>l9g!"%0%k!<%W%P%C%U%!!<(B
+$B$G(B @kbd{B} $BL?Na$r;H$&$3$H$NJ}$,NI$$$G$7$g$&!#$=$l$O!"A*Br2DG=$J%0%k!<%W(B
+$B$rI=<($7!"$=$NCf$+$i$I$l$G$b9%$-$J$b$N$r9XFI$9$k$3$H$,$G$-$^$9!#$3$l(B
 $B$O(B @file{.newsrc} $B$NJ];}$r$:$C$H$d$j$d$9$/$7$^$9!#(B
 @xref{Foreign Groups, $B30It%0%k!<%W(B}.
 
@@ -1060,13 +1076,13 @@ gnus $B$O(B @code{gnus-secondary-servers} $B%j%9%H(B ($B$b$7B8:_$9$k$J$i$P
 @c @head
 $B30It%0%k!<%W$KBP$9$k>/$70c$C$?$d$jJ}$O!"JQ(B
 $B?t(B @code{gnus-secondary-select-methods} $B$r@_Dj$9$kJ}K!$G$9!#$3$NJQ?t$KI=(B
-$B$5$l$F$$$kA*BrJ}K!$O!"B?$/$NE@$G(B @code{gnus-select-method} $B%5!<%P!<$NBr(B
-$BJ}K!$HF1$8$h$&$K07$o$l$^$9!#5/F0Cf$K%"%/%F%#%V%U%!%$%k$rC5$7$K$$$-(B ($B$b$7(B
-$BMW5a$5$l$F$$$l$P(B)$B!"$3$l$i$N%5!<%P!<>e$K$G$-$??7$7$$%K%e!<%9%0%k!<%W$O85!9(B
-$B$N%0%k!<%W$HF1$8$h$&$K9XFI(B ($B$b$7$/$OHs9XFI(B) $B$5$l$^$9!#(B
+$B$5$l$F$$$kA*BrJ}K!$O!"B?$/$NE@$G(B @code{gnus-select-method} $B%5!<%P!<$NA*(B
+$BBrJ}K!$HF1$8$h$&$K07$o$l$^$9!#5/F0Cf$K%"%/%F%#%V%U%!%$%k$rC5$7$K$$$-(B ($B$b(B
+$B$7MW5a$5$l$F$$$l$P(B)$B!"$3$l$i$N%5!<%P!<>e$K$G$-$??7$7$$%K%e!<%9%0%k!<%W$O(B
+$B85!9$N%0%k!<%W$HF1$8$h$&$K9XFI$5$l$^$9(B ($B$b$7$/$O!"$5$l$^$;$s(B)$B!#(B
 
-$B$?$H$($P!"%a!<%k$rFI$`$?$a$K(B @code{nnmbox} $B%P%C%/%(%s%I(B (back end) $B$r;H(B
-$B$$$?$$$H$-$O!"IaDL!"$3$NJQ?t$r!"(B
+$BNc$($P%a!<%k$rFI$`$?$a$K(B @code{nnmbox} $B%P%C%/%(%s%I(B (back end) $B$r;H$$$?(B
+$B$$$H$-$O!"IaDL$3$NJQ?t$r!"(B
 
 @lisp
 (setq gnus-secondary-select-methods '((nnmbox "")))
@@ -1076,7 +1092,7 @@ gnus $B$O(B @code{gnus-secondary-servers} $B%j%9%H(B ($B$b$7B8:_$9$k$J$i$P
 $B$H@_Dj$7$^$9!#(B
 
 $BCm(B: @acronym{NNTP} $B%P%C%/%(%s%I$O0u%U%!%$%k(B (@pxref{NNTP marks}) $B$K0u$r(B
-$BJ]B8$7$^$9!#$3$N5!G=$O(B Gnus $B$,%$%s%9%H!<%k$5$l$F$$$kJ#?t$N%[%9%H4V$G0u$r(B
+$BJ]B8$7$^$9!#$3$N5!G=$O(B gnus $B$,%$%s%9%H!<%k$5$l$F$$$kJ#?t$N%[%9%H4V$G0u$r(B
 $B6&M-$9$k$3$H$rMF0W$K$7$^$9$,!"?7Ce5-;v$N\:Y$K$D$$$F$O(B @ref{NNTP marks} $B$r;2>H$7$F2<$5$$!#(B
 
@@ -1084,17 +1100,17 @@ gnus $B$O(B @code{gnus-secondary-servers} $B%j%9%H(B ($B$b$7B8:_$9$k$J$i$P
 @section $B0lHV=i$a(B
 @cindex first time usage
 
-$B5/F0MQ%U%!%$%k$,B8:_$7$J$$$H$-$O(B (@pxref{Startup Files})$B!"(Bgnus $B$O%G%#%U%)(B
-$B%k%H$G$I$N%0%k!<%W$,9XFI$5$l$F$$$k$Y$-$+$r7hDj$7$h$&$H$7$^$9!#(B
+$B5/F0MQ%U%!%$%k$,B8:_$7$J$$$H$-$O(B (@pxref{Startup Files})$B!"(Bgnus $B$O$I$N%0(B
+$B%k!<%W$,%G%#%U%)%k%H$G9XFI$5$l$F$$$k$Y$-$+$r7hDj$7$h$&$H$7$^$9!#(B
 
 @vindex gnus-default-subscribed-newsgroups
 $BJQ?t(B @code{gnus-default-subscribed-newsgroups} $B$,@_Dj$5$l$F$$$k$H!"(B
 gnus $B$O$=$N%j%9%H$NCf$N%0%k!<%W$r9XFI$7!";D$j$r:o=|$7$^$9!#%7%9%F%`4IM}(B
 $B$^$l$^$9!#(B
 
-$B$=$&$G$J$$$H$-$O!"(Bgnus $B$O>/$7$NG$0U$N%0%k!<%W$r9XFI$7$^$9(B ($BNc(B:
-@samp{*.newusers})$B!#(B(@dfn{$BG$0U(B}$B$O$3$3$G$O!"(B@dfn{Lars $B$5$s$,FI$`$Y$-$G$"(B
-$B$k$H9M$($k$b$N(B}$B$H$$$&$h$&$KDj5A$5$l$F$$$^$9(B)
+$B$=$&$G$J$$$H$-$O!"(Bgnus $B$O>/?t$NE,Ev$J%0%k!<%W$r9XFI$7$^$9(B ($BNc(B:
+@samp{*.newusers})$B!#(B($B!VE,Ev$J!W$O$3$3$G$O!V$"$J$?$,FI$`$Y$-$G$"$k(B
+$B$H(B Lars $B$5$s$,9M$($k$b$N!W$H$$$&$h$&$KDj5A$5$l$F$$$^$9(B)
 
 $B$^$?!"$?$$$F$$$N6&DL$NLdBj$N2r7h$N$K$$$/$D$+%a!<%k$N%0(B
-$B%k!<%W$,$"$l$P!"$=$l$K$b$+$+$o$i$:(B gnus $B$r5/F0$7$?$$$H;W$&$+$b$7$l$^$;$s!#(B
+$B%G%#%U%)%k%H$N%5!<%P!<$,Mn$A$F$$$k$H$-$O!"EvA3(B gnus $B$N5/F0$K$$$/$D$+$NLd(B
+$BBj$,H/@8$7$^$9!#$7$+$7!"%K%e!<%9%0%k!<%W$NB>$K$$$/$D$+%a!<%k$N%0%k!<%W$,(B
+$B$"$k$N$J$i$P!"$=$l$K$b$+$+$o$i$:(B gnus $B$r5/F0$9$kI,MW$,$"$k$+$b$7$l$^$;$s!#(B
 
-Gnus $B$O!"?.Mj$G$-$k%W%m%0%i%`$N0l$D$H$7$F!"%5!<%P!<$H@\B3$G$-$J$$$H$-$O(B
-$B4pK\A*BrJ}K!$J$7$GB3$1$k$+$I$&$+$r?R$M$^$9!#$3$l$Ol9g(B) $B$d%5!<%P!<$,2?$i$+$NM}M3$G0l(B
-$B;~E*$KD4;R$,$*$+$7$/$J$C$F$$$k$H$-$K5/$3$j$^$9!#$b$7$=$N$^$^B39T$9$k$3$H(B
-$B$K$7$F!"30It%0%k!<%W$,0l$D$bL5$$>l9g!"l9g(B) $B$d%5!<%P!<$,2?$i$+$NM}M3$G0l;~(B
+$BE*$KD4;R$,$*$+$7$/$J$C$F$$$k$H$-$K5/$3$j$^$9!#$b$7$=$N$^$^B39T$9$k$3$H$K(B
+$B$7$F!"30It%0%k!<%W$,0l$D$bL5$$>l9g!"uBV$K$7$^$9(B ($B4pK\%0%k!<%W$G$J$$%0%k!<%W$O$=$NFs$D$N%l%Y%k(B
-$B$K$7$F$*$/$N$,K>$^$7$$$G$7$g$&(B)$B!#(B@ref{Group Levels} $B$b;2>H$7$F2<$5$$!#(B
+$B%k$@$1$rFI$_$?$$$H$-$O!"(Bgnus $B$r5/F0$9$k$N$K(B @code{gnus-no-server} $BL?Na$r(B
+$B;H$&$3$H$,$G$-$^$9!#5^$$$G$$$k$H$-$K$b$T$C$?$j$G$7$g$&!#$3$NL?Na$OK\Mh$N(B
+$B%5!<%P!<$K$O@\B3$7$^$;$s(B---$B$=$NBe$o$j$K!"%l%Y%k(B 1 $B$H(B 2 $B$K$"$k$9$Y$F$N%0(B
+$B%k!<%W$r3hF0>uBV$K$7$^$9(B ($B4pK\%0%k!<%W$G$J$$%0%k!<%W$O$=$NFs$D$N%l%Y%k$K(B
+$B$7$F$*$/$N$,K>$^$7$$$G$7$g$&(B)$B!#(B@ref{Group Levels} $B$b;2>H$7$F2<$5$$(B ($BLu(B
+$BCm(B: @code{gnus-no-server} $B$O(B @code{gnus-group-use-permanent-levels} $BJQ?t(B
+$B$NCM$r(B 2 $B$K@_Dj$9$k$3$H$KCm0U$7$F2<$5$$(B)$B!#(B
 
 @node Slave Gnusae
 @section gnus $B$r%9%l!<%V$K$9$k(B
 @cindex slave
 
-$B$"$J$?$OFs$D0J>e$N(B Emacs $B$H!"Fs$D0J>e$N(B gnus $B$rF1;~$KF0$+$7$?$$$H;W$&$+(B
-$B$b$7$l$^$;$s!#0c$C$?(B @file{.newsrc} $B%U%!%$%k$r;H$C$F$$$k$J$i(B ($BNc$($P!"(B
-$BFs$D$N0c$C$?%5!<%P!<$+$iFI$_9~$`$?$a$K!"Fs$D$N0c$C$?(B gnus $B$rF0:n$5$;$F$$(B
-$B$k>l9g(B)$B!"$^$C$?$/LdBj$O$"$j$^$;$s!#$=$l$r9T$($PNI$$$@$1$G$9!#(B
+$B$"$J$?$K$OFs$D0J>e$N(B gnus $B$r$=$l$>$lJL$N(B Emacs $B>e$GF1;~$KF0$+$9I,MW$,@8(B
+$B$8$k$+$b$7$l$^$;$s!#0c$C$?(B @file{.newsrc} $B%U%!%$%k$r;H$C$F$$$k$J$i(B ($BNc$((B
+$B$P!"Fs$D$N0c$C$?%5!<%P!<$+$iFI$_9~$`$?$a$K!"Fs$D$N0c$C$?(B gnus $B$rF0:n$5$;(B
+$B$F$$$k>l9g(B)$B!"$^$C$?$/LdBj$O$"$j$^$;$s!#$=$l$r9T$J$($PNI$$$@$1$G$9!#(B
 
 $BLdBj$O!"F1$8(B @file{.newsrc} $B%U%!%$%k$r;H$&Fs$D$N(B gnus $B$rF0$+$=$&$H$7$?$H(B
 $B$-$K5/$3$j$^$9!#(B
 
-$B$3$NLdBj$KBP=h$9$k$?$a$K!"(Bgnus $B%?%o!<$N%7%s%/%?%s%/$K$$$k2f!9$O?7$7$$35(B
-$BG0$K$?$I$j$D$-$^$7$?!#(B@dfn{$B%^%9%?!<(B} $B$H(B @dfn{$B%9%l!<%V(B} $B$G$9!#(B($B2f!9$O$3$N(B
-$B35G0$KFC5v$r?=@A$7$^$7$?!#$=$7$F!"$=$N8@MU$NCx:n8"$rF@$^$7$?!#$*8_$$$K4X(B
-$BO"$7$F$3$l$i$N8@MU$r;H$$$?$$$J$i!"0l2s;H$&Kh$K!";d$K(B $1 $B$rAw$i$J$1$l$P$J(B
-$B$j$^$;$s!#$b$C$A$m$s!"(B@dfn{$B%3%s%T%e!<%?!<%"%W%j%1!<%7%g%s$N%^%9%?!$l(B @kbd{M-x gnus-slave} $B$G5/F0(B
-$B$7$^$9!#%9%l!<%V$OIaDL$N(B @file{.newsrc} $B$OJ]B8$7$^$;$s$,!"Be$o$j(B
-$B$K(B @dfn{$B%9%l!<%V%U%!%$%k(B} $B$K%9%l!<%V$N5/F0Cf$K$I$N$h$&$J%0%k!<%W$,FI$^$l(B
-$B$?$+$H$$$&>pJs$@$1$rJ]B8$7$^$9!#%^%9%?!<(B gnus $B$,5/F0$9$k$H$-!"$=$l$O$=$l(B
-$B$i$N%9%l!<%V%U%!%$%k$rFI$_9~$_(B ($B$=$7$F>C$7(B)$B!"$=$l$i$+$i$9$Y$F$N>pJs$rpJs(B
+$B$@$1$rJ]B8$7$^$9!#%^%9%?!<(B gnus $B$,5/F0$9$k$H$-!"$=$l$O$=$l$i$N%9%l!<%V%U%!(B
+$B%$%k$rFI$_9~$_(B ($B$=$7$F>C$7(B)$B!"$=$l$i$+$i$9$Y$F$N>pJs$rpJs$OIaDL$N(B ($B$9$J$o$A!"%^%9%?!<(B
 $B$N(B) @file{.newsrc} $B%U%!%$%k$h$j$bM%@h$5$l$^$9!#(B
 
 $B%9%l!<%V$r5/F0$9$k$H$-$K$b$7%^%9%?!<$N(B @file{.newsrc*} $B%U%!%$%k72$,%;!<(B
 $B%V$5$l$F$$$J$+$C$?$i!"<+F0J]B8$5$l$?%U%!%$%k$rFI$`$+$I$&$+$r?R$M$i$l$k$+(B
-$B$b$7$l$^$;$s!#(B``yes'' $B$HEz$($k$H!"%^%9%?!<$K%;!<%V$5$l$F$$$J$$JQ99$O%9%l!<(B
-$B%V$KH?1G$5$l$^$;$s!#(B``no'' $B$HEz$($k$H!"%^%9%?!<$GFI$^$l$?$$$/$D$+$N5-;v(B
-$B$,!"%9%l!<%V$G$OL$FI$G$"$k$H8+$J$5$l$k$+$b$7$l$^$;$s!#(B
+$B$b$7$l$^$;$s!#!H(Byes$B!I$HEz$($k$H!"%^%9%?!<$K%;!<%V$5$l$F$$$J$$JQ99$O%9%l!<(B
+$B%V$KH?1G$5$l$^$;$s!#!H(Bno$B!I$HEz$($k$H!"%^%9%?!<$GFI$^$l$?$$$/$D$+$N5-;v$,!"(B
+$B%9%l!<%V$G$OL$FI$G$"$k$H8+$J$5$l$k$+$b$7$l$^$;$s!#(B
 
 @node New Groups
 @section $B?7$7$$%0%k!<%W(B
@@ -1172,27 +1190,27 @@ Gnus $B$O!"?.Mj$G$-$k%W%m%0%i%`$N0l$D$H$7$F!"%5!<%P!<$H@\B3$G$-$J$$$H$-$O(B
 @cindex subscription
 
 @vindex gnus-check-new-newsgroups
-$B?7$7$$%K%e!<%9%0%k!<%W$rA4$/8+$J$$$GK~B-$G$"$k$J$i$P!"(B
+$B?7$7$$%K%e!<%9%0%k!<%W$r$^$C$?$/8+$J$/$F$bK~B-$J$i$P!"(B
 @code{gnus-check-new-newsgroups} $B$r(B @code{nil} $B$K@_Dj$9$k$3$H$,$G$-$^$9!#(B
 $B$3$l$r@_Dj$7$?>l9g!"5/F0$K$+$+$k;~4V$,C;$/$J$j$^$9!#$3$NJQ?t(B
-$B$,(B @code{nil} $B$K@_Dj$5$l$F$$$F$b!"%0%k!<%W%P%C%U%!$G(B @kbd{U} $B$r2!$;$P$$(B
-$B$D$G$b?7$7$$%0%k!<%W$r9XFI$9$k$3$H$,$G$-$^$9(B (@pxref{Group Maintenance})$B!#(B
-$B=i4|@_Dj$G$O$3$NJQ?t$O(B @code{ask-server} $B$G$9!#$3$NJQ?t(B
-$B$,(B @code{always} $B$K@_Dj$5$l$F$$$k$H!"L?Na(B @kbd{g} $B$rJ}!"$=$7$FA4BN$K$o$?$C$F;~4V$r@aLs$G$-$^$9!#%G%#(B
-$B%9%/>CHqNL$b>/$J$/$J$j$^$9!#$=$l$J$i!"$I$&$7$F$3$l$,=i4|@_Dj$G$O$J$$$N$G(B
-$B$7$g$&(B? $B;DG0$J$,$i!"$9$Y$F$N%5!<%P!<$,$3$NL?Na$rM}2r$9$k$o$1$G$O$J$$$N$G(B
-$B$9!#(B
+$B%9%/>CHqNL$b>/$J$/$J$j$^$9!#$=$l$J$i!"$I$&$7$F$3$l$,%G%#%U%)%k%H$G$O$J$$(B
+$B$N$G$7$g$&(B? $B;DG0$J$,$i!"$9$Y$F$N%5!<%P!<$,$3$NL?Na$rM}2r$9$k$o$1$G$O$J$$(B
+$B$N$G$9!#(B
 
 $B;d$O:#$"$J$?$,2?$r9M$($F$$$k$+$rEv$F$i$l$^$9!#$I$&$9$l$P%5!<%P!<(B
 $B$,(B @code{ask-server} $B$rM}2r$9$k$+$,$o$+$k$N$G$7$g$&(B? $B$(!"0c$&$N$G$9(B
 $B$+(B? $B$"$!!"NI$+$C$?!#$H$$$&$N$O!"3N$NJ}K!$H$7$F$O!"%5!<%P!<(B
+$B$l$k$+$I$&$+$rD4$Y$F2<$5$$!"$H$$$&$3$H$@$1$G$9!#$b$7$$$/$D$+$N%0%k!<%W$,(B
+$B8=$l$?$J$i!"$=$l$GF0:n$7$F$$$^$9!#0l$D$b8=$l$J$1$l$P!"$=$l$OF0:n$7$F$$$^(B
+$B$;$s!#;d$O!"(Bgnus $B$K%5!<%P!<$,(B @code{ask-server} $B$rM}2r$9$k$+$I$&$+$r?dNL(B
+$B$5$;$k4X?t$r=q$/$3$H$b$G$-$^$9$,!"$=$l$OC1$K?dNL$7$F$$$k$K$9$.$^$;$s!#$G(B
+$B$9$+$i!"$=$N4X?t$r=q$/$3$H$O$J$$$G$7$g$&!#B>$NJ}K!$H$7$F$O!"%5!<%P!<(B
 $B$K(B @code{telnet} $B$r$7$F!"(B@code{HELP} $B$HBG$A!"%5!<%P!<$,M}2r$9$k%3%^%s%I(B
 $B$NCf$K(B @samp{NEWGROUPS} $B$,$"$k$+$I$&$+$rD4$Y$k$3$H$b$G$-$^$9!#$b$7$"$l$P!"(B
 $B$*$=$i$/F0:n$9$k$G$7$g$&(B ($B$7$+$7!"E,@Z$K5!G=$rDs6!$9$k$3$H$J(B
 $B$/(B @samp{NEWGROUPS} $B$r%j%9%H$K4^$a$k%5!<%P!<$b$"$j$^$9(B)$B!#(B
 
-$B$3$NJQ?t$O!"A*BrJ}K!$N%j%9%H$G$"$k$3$H$b$G$-$^$9!#$=$N$H$-$O!"(Bgnus $B$OL?(B
-$BNa(B @code{ask-server} $B$r$=$l$>$l$NA*BrJ}K!$KBP$7$F$l$NA*BrJ}K!$KBP$7$F%s%S(B (zombie) $B$K$7$^$9!#$3$l$,=i4|@_Dj$K$J$C$F(B
-$B$$$^$9!#8e$G%>%s%S$r(B (@kbd{A z} $B$K$h$C$F(B) $B354Q$7$?$j!"(B(@kbd{S z} $B$K$h$C(B
-$B$F(B) $BE,@Z$KA4$F$r:o=|$7$?$j!"(B(@kbd{u} $B$K$h$C$F(B) $B9XFI$7$?$j$G$-$^$9!#(B
+$B$9$Y$F$N?7$7$$%0%k!<%W$r%>%s%S(B (zombie) $B$K$7$^$9!#$3$l$,%G%#%U%)%k%H$K$J$C(B
+$B$F$$$^$9!#8e$G%>%s%S$r(B (@kbd{A z} $B$K$h$C$F(B) $B354Q$7$?$j!"(B(@kbd{S z} $B$K$h$C(B
+$B$F(B) $BE,@Z$K$9$Y$F$r:o=|$7$?$j!"(B(@kbd{u} $B$K$h$C$F(B) $B9XFI$7$?$j$G$-$^$9!#(B
 
 @item gnus-subscribe-randomly
 @vindex gnus-subscribe-randomly
 $BG$0U$N=gHV$G$9$Y$F$N?7$7$$%0%k!<%W$r9XFI$7$^$9!#e!Y$K2C$($i$l$^$9!#(B
+$B%0%k!<%W$O%0%k!<%W%P%C%U%!!<$N!X0lHV>e!Y$K2C$($i$l$^$9!#(B
 
 @item gnus-subscribe-alphabetically
 @vindex gnus-subscribe-alphabetically
@@ -1263,9 +1281,9 @@ Gnus $B$O!"IaDL$O%0%k!<%W$,?7$7$$$+$I$&$+$r!"9XFI$7$F$$$k%0%k!<%W$H:o=|$5(B
 
 @item gnus-subscribe-interactively
 @vindex gnus-subscribe-interactively
-$B?7$7$$%0%k!<%W$rBPOCE*$K9XFI$7$^$9!#$3$l$O(B gnus $B$,(B @strong{$BA4$F(B} $B$N%0%k!<(B
-$B%W$KBP$7$F?R$M$k$3$H$r0UL#$7$F$$$^$9!#9XFI$9$k%0%k!<%W$O3,AXE*$K9XFI$5$l(B
-$B$^$9!#(B
+$B?7$7$$%0%k!<%W$rBPOCE*$K9XFI$7$^$9!#$3$l$O(B gnus $B$,(B @strong{$B$9$Y$F(B} $B$N%0(B
+$B%k!<%W$KBP$7$F?R$M$k$3$H$r0UL#$7$F$$$^$9!#9XFI$9$k%0%k!<%W$O3,AXE*$K9XFI(B
+$B$5$l$^$9!#(B
 
 @item gnus-subscribe-killed
 @vindex gnus-subscribe-killed
@@ -1273,73 +1291,74 @@ Gnus $B$O!"IaDL$O%0%k!<%W$,?7$7$$$+$I$&$+$r!"9XFI$7$F$$$k%0%k!<%W$H:o=|$5(B
 
 @item gnus-subscribe-topics
 @vindex gnus-subscribe-topics
-$B%0%k!<%W$r9gCW$9$k(B @code{subscribe} $B%H%T%C%/%Q%i%a!<%?$N$"$k%0%k!<%W$KF~(B
-$B$l$^$9(B (@pxref{Topc Parameters})$B!#Nc$($P!"0J2<$N$h$&(B
-$B$J(B @code{subscribe} $B%Q%i%a!<%?(B
+$B%0%k!<%W$r!"$=$l$K9gCW$9$k(B @code{subscribe} $B%H%T%C%/%Q%i%a!<%?!<$r;}$C$F(B
+$B$$$k%0%k!<%W$KF~$l$^$9(B (@pxref{Topic Parameters})$B!#Nc$($P!"0J2<$N$h$&(B
+$B$J(B @code{subscribe} $B%Q%i%a!<%?!<(B
 
 @example
 "nnslashdot"
 @end example
 
-$B$O$=$N@55,I=8=$K9gCW$9$kA4$F$N%0%k!<%W$O$=$N%H%T%C%/$N2<$G9XFI$5$l$k$H$$(B
-$B$&$3$H$G$9!#(B
+$B$O!"$=$N@55,I=8=$K9gCW$9$k$9$Y$F$N%0%k!<%W$O$=$N%H%T%C%/$N2<$G9XFI$5$l$k(B
+$B$H$$$&$3$H$G$9!#(B
 
 $B%0%k!<%W$K9gCW$9$k%H%T%C%/$,L5$$>l9g!"%0%k!<%W$O:G>e0L$N%H%T%C%/$G9XFI$5(B
 $B$l$^$9!#(B
 @end table
 
 @vindex gnus-subscribe-hierarchical-interactive
-$B>e$NJQ?t$HNI$/4X78$7$?JQ?t$O!"(B
+$B>e$NJQ?t$HL)@\$K4X78$9$kJQ?t$O!"(B
 @code{gnus-subscribe-hierarchical-interactive} $B$G$9!#$3$NJQ?t(B
 $B$,(B @code{nil} $B$G$J$$$H!"(Bgnus $B$O3,AXE*$JJ}K!$G?7$7$$%0%k!<%W$r9XFI$9$k$+(B
 $B$I$&$+$r?R$M$^$9!#(Bgnus $B$O$=$l$>$l$N3,AX$G!"$=$l$r2<$K9_$j$k$+$I$&$+$r?R(B
 $B$M$^$9!#(B
 
-$B$h$/$"$k4V0c$$$O!"?tCJMnA0$NJQ(B
-$B?t(B (@code{gnus-subscribe-newsgroup-method}) $B$r(B @code{gnus-subscribe-herarchical-interactive} $B$K(B
-$B@_Dj$9$k$3$H$G$9!#$3$l$O8m$j$G$9!#$3$l$OF0:n$7$^$;$s!#$3$l$O$*$a$G$?$$?M(B
-$B$N$9$k$3$H$G$9!#$G$9$+$i!"@dBP$K$7$J$$$G$/$@$5$$!#(B
+$B$h$/$"$k4V0c$$$O!"?tCJMnA0$N(B (@code{gnus-subscribe-newsgroup-method}) $BJQ(B
+$B?t$r(B @code{gnus-subscribe-herarchical-interactive} $B$K@_Dj$9$k$3$H$G$9!#(B
+$B$3$l$O8m$j$G$9!#$3$l$OF0:n$7$^$;$s!#$3$l$O$*$a$G$?$$?M$N$9$k$3$H$G$9!#$G(B
+$B$9$+$i!"@dBP$K$7$J$$$G2<$5$$!#(B
 
 @node Filtering New Groups
 @subsection $B?7$7$$%0%k!<%W$rA*JL$9$k(B
 
 $B$I$N?7$7$$%0%k!<%W$,9XFI(B ($B$b$7$/$O!"L5;k(B) $B$5$l$k$Y$-$+$r4IM}$9$k2wE,$GA0$r;}$D%0%k!<%W$OA4$FL5;k$5$l!"(B@samp{sci} $B$G;O$^$kL>A0$r;}$D%0%k!<(B
-$B%W$OA4$F9XFI$9$k!"$H$$$&$3$H$rI=$7$F$$$k$+$i$G$9!#(BGnus $B$O$3$l$i$N%0%k!<(B
-$B%W$r9XFI$9$k$N$K!"IaDL$N9XFIJ}K!$rMQ$$$^$;$s!#Be$o$j$K!"(B
-@code{gnus-subscribe-options-newsgroup-method} $B$,MQ$$$i$l$^$9!#$3$NJQ?t(B
-$B$O=i4|@_Dj$G$O(B @code{gnus-subscribe-alphabetically} $B$G$9!#(B
+$B$3$N9T$O!"L@$i$+$K$^$8$a$GM}CNE*$G2J3XE*$J?M4V(B ($B$"$k$$$OH`=w$O$I$3$K$G$b(B
+$B$$$kC1$K$D$^$i$J$$?M$+$b$7$l$J$$$1$l$I(B) $B$,=q$$$?$b$N$G$9!#$J$<$J$i!"$3$l(B
+$B$O(B @samp{alt} $B$H(B @samp{rec} $B$G;O$^$kL>A0$r;}$D%0%k!<%W$O$9$Y$FL5;k$5$l!"(B
+@samp{sci} $B$G;O$^$kL>A0$r;}$D%0%k!<%W$O$9$Y$F9XFI$9$k!"$H$$$&$3$H$rI=$7(B
+$B$F$$$k$+$i$G$9!#(Bgnus $B$O$3$l$i$N%0%k!<%W$r9XFI$9$k$N$KIaDL$N9XFIJ}K!$r;H(B
+$B$$$^$;$s!#Be$o$j$K(B @code{gnus-subscribe-options-newsgroup-method} $B$,;H$o(B
+$B$l$^$9!#$3$NJQ?t$O%G%#%U%)%k%H$G(B @code{gnus-subscribe-alphabetically} $B$K(B
+$B$J$j$^$9!#(B
 
 @vindex gnus-options-not-subscribe
 @vindex gnus-options-subscribe
-$B%U%!%$%k(B @file{.newsrc} $B$r$$$8$j$?$/$J$$>l9g$O!"(B
+@file{.newsrc} $B%U%!%$%k$r$$$8$j$?$/$J$$>l9g$O!"(B
 @code{gnus-options-subscribe} $B$H(B @code{gnus-options-not-subscribe} $B$NFs(B
-$B$D$NJQ?t$@$1$r@_Dj$9$k$3$H$b$G$-$^$9!#$3$NFs$D$NJQ?t$O%U%!%$(B
-$B%k(B @file{.newsrc} $B$N(B @samp{optinos -n} $B9T$HA4$/F1$8$3$H$r$7$^$9!#$I$A$i(B
-$B$NJQ?t$b@55,I=8=$G!"?7$7$$%0%k!<%W$OA0r7o$K9XFI$5$l!"8e(B
-$Br7o$K9XFI$5$l!"8eJ,$J$b$N$G$9!#$7$+$7!";d$O$3$NFs$D$,$"$C$?J}$,NI$$$H;W$$$^$7$?!#$b$&0l(B
-$BJ}$NJQ?t$O%f!<%6$,$$$8$/$k$N$K;H$o$l$k$N$KBP$7$F!"$3$NJQ?t$O$$$/$D$+$N4p(B
-$BK\E*$J5,B'$r@_Dj$9$k$?$a$N$b$N$G$9!#=i4|@_Dj$G$O$3$NJQ?t$O%a!<%k%P%C%/%((B
-$B%s%I(B (@code{nnml}, @code{nnbabyl}, @code{nnfolder}, @code{nnmbox},
-@code{nnmh} $B$*$h$S(B @code{nnmaildir}) $B$+$i$G$-$kA4$F$N?7$7$$%0%k!<%W$r9X(B
-$BFI$9$k$h$&$K$J$C$F$$$^$9!#$=$l$,7y$G$"$l$P!"$3$NJQ?t$r(B @code{nil} $B$K@_Dj(B
-$B$7$F$/$@$5$$!#(B
+$B$O(B @code{gnus-options-subscribe} $B$H$^$C$?$/F1$8$h$&$KF0:n$9$k$N$G!"K\Ev(B
+$B$OM>J,$J$b$N$G$9!#$7$+$7!";d$O$3$NFs$D$,$"$C$?J}$,NI$$$H;W$$$^$7$?!#$b$&(B
+$B0lJ}$NJQ?t$OMxMQJ}$N%5!<%P!<$K@\B3$G$-$k$J$i!"(Bgnus $B$O$"$J$?$,FI$s$@5-;vA4$F$KBP$7(B
-$B$F%X%C%@!<(B (headers) $B$rMW5a$7$F!"(B@code{Message-ID} $B$rHf3S$7!"FI$s$@5-;v(B
-$B$H5-;v$N0u$r?7$7$/5-O?$7$^$9!#%3%^%s%I(B @kbd{M-x gnus-change-server} $B$O$3(B
-$B$l$r$9$Y$F$N4pK\%0%k!<%W$KBP$7$F9T$$$^$9!#$=$N%3%^%s%I$O0\F0@h$NJ}K!$NF~(B
-$BNO$rB%$7$^$9!#(B
+$B$b$7N>J}$N%5!<%P!<$K@\B3$G$-$k$J$i!"(Bgnus $B$O$"$J$?$,FI$s$@5-;v$9$Y$F$KBP(B
+$B$7$F%X%C%@!<(B (headers) $B$rMW5a$7$F!"(B@code{Message-ID} $B$rHf3S$7!"FI$s$@5-(B
+$B;v$H5-;v$N0u$r?7$7$/5-O?$7$^$9!#(B@kbd{M-x gnus-change-server} $B%3%^%s%I$O(B
+$B$3$l$r$9$Y$F$N4pK\%0%k!<%W$KBP$7$F9T$J$$$^$9!#$=$N%3%^%s%I$O0\F0@h$NJ}(B
+$BK!(B (the method) $B$rF~NO$9$k$3$H$rMW5a$7$^$9!#(B
 
 @kindex M-x gnus-group-move-group-to-server
 @findex gnus-group-move-group-to-server
-$B8D!9$N%0%k!<%W$rL?Na(B @kbd{M-x gnus-group-move-group-to-server} $B$G0\(B
+$B8D!9$N%0%k!<%W$r(B @kbd{M-x gnus-group-move-group-to-server} $BL?Na$G0\(B
 $BF0$9$k$3$H$b$G$-$^$9!#$3$l$O$"$k%5!<%P!<$+$iJL$N%5!<%P!<$X0l$D(B
 $B$N(B ($B30It(B) $B%0%k!<%W$r0\F0$7$?$$$H$-$KLr$KN)$A$^$9!#(B
 
 @kindex M-x gnus-group-clear-data-on-native-groups
 @findex gnus-group-clear-data-on-native-groups
 $B8E$$%5!<%P!<$H?7$7$$%5!<%P!<$NN>J}$K@\B3$9$k$3$H$,$G$-$J$$$H$-!"0u$HFI$s(B
-$B$@HO0O$O$9$Y$F0UL#$,L5$/$J$j$^$9!#$=$N$h$&$J$H$-$O!"%3%^%s%I(B @kbd{M-x
-gnus-group-clear-data-on-native-groups} $B$r;H$C$F!"4pK\%0%k!<%W$K4X$9$k%G!<(B
-$B%?$r$9$Y$F>C5n$9$k$3$H$,$G$-$^$9!#$3$N%3%^%s%I$OCm0U$7$F;H$C$F$/$@$5$$!#(B
+$B$@HO0O$O$9$Y$F0UL#$,L5$/$J$j$^$9!#$=$N$h$&$J$H$-(B
+$B$O(B @kbd{M-x gnus-group-clear-data-on-native-groups} $B%3%^%s%I$r;H$C$F!"4p(B
+$BK\%0%k!<%W$K4X$9$k%G!<%?$r$9$Y$F>C5n$9$k$3$H$,$G$-$^$9!#$3$N%3%^%s%I$OCm(B
+$B0U$7$F;H$C$F2<$5$$!#(B
 
 @kindex M-x gnus-group-clear-data
 @findex gnus-group-clear-data
-$B8=:_$N%0%k!<%W$NA4$F$N%G!<%?$r%/%j%"$7$^$9!=!=%^!<%/$H4{FI5-;v$N%j%9%H$r(B
-$B>C$75n$j$^$9(B (@code{gnus-group-clear-data})$B!#(B
+@code{gnus-group-clear-data} $B%3%^%s%I$O8=:_$N%0%k!<%W$N$9$Y$F$N%G!<%?$r(B
+$B%/%j%"$7$^$9(B---$B0u$H4{FI5-;v$N%j%9%H$r>C$75n$j$^$9!#(B
 
-$B%5!<%P!<$rJQ99$7$?8e$G!"%-%c%C%7%e3,AX$r0\F0$5$;$J$1$l$P(B@strong{$B$J$j$^$;(B
-$B$s(B}$B!#$H$$$&$N$O!"%-%c%C%7%e5-;v$O4V0c$C$?5-;vHV9f$K$J$C$F$*$j!"$=$l(B
-$B$O(B gnus $B$,$I$N5-;v$rFI$s$@$H$_$J$9$+$K1F6A$7$^$9!#(B
+$B%5!<%P!<$rJQ99$7$?8e$G!"%-%c%C%7%e3,AX$r0\F0$5$;$J$1$l(B
+$B$P(B @strong{$B$J$j$^$;$s(B}$B!#$H$$$&$N$O!"%-%c%C%7%e5-;v$O4V0c$C$?5-;vHV9f$K$J$C(B
+$B$F$*$j!"$=$l$O(B gnus $B$,$I$N5-;v$rFI$s$@$H$_$J$9$+$K1F6A$7$^$9!#(B
 @code{gnus-group-clear-data-on-native-groups} $B$O$=$l$r<+F0$G9T$J$C$F$7$^(B
-$B$&$+$I$&$+$r?R$M$^$9!#(B@code{gnus-group-clear-data} $B$G(B
-$B$O(B @kbd{M-x gnus-cache-move-cache} $B$,;H$($^$9(B ($B$G$b5$$rIU$1$F!"$=$l$O$9(B
-$B$Y$F$N%0%k!<%W$N%-%c%C%7%e$r0\F0$7$F$7$^$$$^$9$+$i(B)$B!#(B
+$B$&$+$I$&$+$r?R$M$^$9!#(B@code{gnus-group-clear-data} $B$G$O(B @kbd{M-x
+gnus-cache-move-cache} $B$,;H$($^$9(B ($B$G$b5$$rIU$1$F!"$=$l$O$9$Y$F$N%0%k!<(B
+$B%W$N%-%c%C%7%e$r0\F0$7$F$7$^$$$^$9$+$i(B)$B!#(B
 
 @node Startup Files
 @section $B5/F0%U%!%$%k(B
@@ -1414,29 +1434,28 @@ gnus-group-clear-data-on-native-groups} $B$r;H$C$F!"4pK\%0%k!<%W$K4X$9$k%G!<(B
 $B$N5/F0%U%!%$%k$r;H$$$^$9!#$3$N%U%!%$%k$O!"9VFI$7$F$$$k%0%k!<%W$H!"$=$l$i(B
 $B$N%0%k!<%W$K$*$$$F$I$N5-;v$,FI$^$l$?$+$N!"$9$Y$F$N>pJs$r;}$C$F$$$^$9!#(B
 
-@sc{gnus} $B$G$OJ*;v$,>/!9J#;($K$J$C$F$$$^$9!#%U%!%$%k(B @file{.newsrc} $B$r:G(B
-$B?7$N$b$N$K$9$k$@$1$G$O$J$/!"%U%!%$%k(B @file{.newsrc} $B$K$O9g$o$J$$>pJs$rJ](B
-$BB8$7$F$*$/$?$a$K(B @file{.newsrc.el} $B$H8F$P$l$k%U%!%$%k$r;H$$$^$9!#(B($BpJs$rJ#@=$7$FJ];}$7$F$$$^(B
-$B$9!#(B) @sc{gnus}$B$O$3$l$i$NCf$G0lHV:G8e$KJ]B8$5$l$?$b$N$r;H$$$^$9!#$3$l$r(B
-$B$9$k$3$H$K$h$j!"(B@sc{gnus} $B$HB>$N%K%e!<%9%j!<%@!<$r@Z$jBX$($F;H$&$3$H$,$G(B
-$B$-$^$9!#(B
+@sc{gnus} $B$G$O$b$N$4$H$,>/!9J#;($K$J$C$F$$$^$9!#(B@file{.newsrc} $B%U%!%$%k(B
+$B$r:G?7$N$b$N$K$9$k$@$1$G$O$J$/!"(B@file{.newsrc} $B%U%!%$%k$K$O9g$o$J$$>pJs(B
+$B$rJ]B8$7$F$*$/$?$a$K(B @file{.newsrc.el} $B$H8F$P$l$k%U%!%$%k$r;H$$$^$9!#(B($BpJs$rJ#@=$7$FJ];}$7$F$$$^$9!#(B)
+@sc{gnus} $B$O$3$l$i$NCf$G0lHV:G8e$KJ]B8$5$l$?$b$N$r;H$$$^$9!#$3$l$r$9$k$3(B
+$B$H$K$h$j!"(B@sc{gnus} $B$HB>$N%K%e!<%9%j!<%@!<$r@Z$jBX$($F;H$&$3$H$,$G$-$^$9!#(B
 
-$B$3$l$O$A$g$C$H$P$+$JJ}K!$J$N$G!"(Bgnus $B$O$b$C$HNI$$J}K!$rJT$_=P$7$^$7$?!#(B
+$B$3$l$O$A$g$C$H4V$,H4$1$F$$$k$N$G!"(Bgnus $B$O$b$C$HNI$$J}K!$rJT$_=P$7$^$7$?!#(B
 @file{.newsrc} $B$H(B @file{.newsrc.el} $B%U%!%$%k$K2C$($F!"(B
-gnus $B$O(B @file{.newsrc.eld} $B$H8F$P$l$k%U%!%$%k$b;}$C$F$$$^$9!#(BGnus $B$O$3$l(B
-$B$i$NCf$G0lHV?7$7$$%U%!%$%k$rFI$_$^$9$,!"%U%!%$%k(B @file{.newsrc.el} $B$K=q(B
-$B$-9~$`$3$H$O$"$j$^$;$s!#%U%!%$%k(B @file{.newsrc.eld} $B$O@dBP$K>C$9$Y$-$G$O(B
-$B$"$j$^$;$s!#(B---$B$=$l$O%U%!%$%k(B @file{.newsrc} $B$K$O$J$$$?$/$5$s$N>pJs$rJ](B
-$B;}$7$F$$$^$9!#(B
+gnus $B$O(B @file{.newsrc.eld} $B$H8F$P$l$k%U%!%$%k$b;}$C$F$$$^$9!#(Bgnus $B$O$3$l(B
+$B$i$NCf$G0lHV?7$7$$%U%!%$%k$rFI$_$^$9$,!"(B@file{.newsrc.el} $B%U%!%$%k$K=q$-(B
+$B9~$`$3$H$O$"$j$^$;$s!#(B@file{.newsrc.eld} $B%U%!%$%k$O@dBP$K>C$9$Y$-$G$O$"(B
+$B$j$^$;$s!#(B---$B$=$l$O(B @file{.newsrc} $B%U%!%$%k$K$O$J$$$?$/$5$s$N>pJs$rJ];}(B
+$B$7$F$$$^$9!#(B
 
 @vindex gnus-save-newsrc-file
 @vindex gnus-read-newsrc-file
-@code{gnus-save-newsrc-file} $B$r(B @code{nil} $B$K$9$k$3$H$K$h$C$F%U%!%$(B
-$B%k(B @file{.newsrc} $B$K=q$-9~$`$N$r;_$a$k$3$H$,$G$-$^$9!#$=$&$9$l$P!"$=$N%U%!(B
-$B%$%k$r:o=|$9$k$3$H$,$G$-!"%G%#%9%/MFNL$r@aLs$9$k$3$H$,$G$-!"(Bgnus $B$N=*N;(B
-$B$,B.$/$J$j$^$9!#$7$+$7!"$=$&$9$k$HB>$N%K%e!<%9%j!<%@!<$r;H$($J$/$J$j$^$9!#(B
-$B$G$b!"$A$g$C$H!"C/$+$=$&$7$?$$?M$,$$$k$G$7$g$&$+!#F1$8$h$&(B
+@code{gnus-save-newsrc-file} $B$r(B @code{nil} $B$K$9$k$3$H$K$h$C(B
+$B$F(B @file{.newsrc} $B%U%!%$%k$K=q$-9~$`$N$r;_$a$k$3$H$,$G$-$^$9!#$=$&$9$l$P!"(B
+$B$=$N%U%!%$%k$r:o=|$9$k$3$H$,$G$-!"%G%#%9%/MFNL$r@aLs$9$k$3$H$,$G$-!"(B
+gnus $B$N=*N;$,B.$/$J$j$^$9!#$7$+$7!"$=$&$9$k$HB>$N%K%e!<%9%j!<%@!<$r;H$((B
+$B$J$/$J$j$^$9!#$G$b!"$A$g$C$H!"C/$+$=$&$7$?$$?M$,$$$k$G$7$g$&$+!#F1$8$h$&(B
 $B$K(B @code{gnus-read-newsrc-file} $B$r(B @code{nil} $B$K$9$k$3$H$K$h$C$F!"(B
 gnus $B$O(B @file{.newsrc} $B%U%!%$%k$H$9$Y$F$N(B @file{.newsrc-SERVER} $B%U%!%$%k(B
 $B$rL5;k$9$k$h$&$K$J$j$^$9!#$=$N$3$H$O!"$"$J$?$,;~!90c$&%K%e!<%9%j!<%@!<$r(B
@@ -1444,25 +1463,24 @@ gnus $B$O(B @file{.newsrc} $B%U%!%$%k$H$9$Y$F$N(B @file{.newsrc-SERVER} $B%
 $B$GFI$_$?$$>l9g$K!"JXMx$J$3$H$,$"$j$^$9!#(B
 
 @vindex gnus-save-killed-list
-@code{gnus-save-killed-list} ($B=i4|@_Dj$G$O(B @code{t}) $B$,(B @code{nil} $B$G$"(B
-$B$k$H!"(Bgnus $B$O:o=|$5$l$?%0%k!<%W$r5/F0%U%!%$%k$KJ]B8$7$^$;$s!#$3$l$O!"(B($B5/(B
-$BF0;~$H=*N;;~$N(B) $B;~4V$H!"(B($B%G%#%9%/$N(B) $BMFNL$r@aLs$7$^$9!#$3$&$9$k$H!"(B
-gnus $B$,$I$N%0%k!<%W$,?7$7$$$+$N5-O?$r;}$C$F$$$J$$$3$H$K$J$j$^$9$N$G!"?7(B
-$B$7$$%0%k!<%W$N<+F09XFIJ}K!$O0UL#$,L5$/$J$j$^$9!#$3$NJQ?t$r(B @code{nil} $B$K(B
-$B$7$?$H$-$O!"(B@code{gnus-check-new-newsgroups} $B$r>o(B
-$B$K(B @code{nil} $B$+(B @code{ask-server} $B$K$7$F$*$/$Y$-$G$7$g(B
-$B$&(B (@pxref{New Groups})$B!#$3$NJQ?t$O@55,I=8=$G$"$k$3$H$b$G$-$^$9!#$=$N$h(B
-$B$&$J>l9g$O!"%U%!%$%k$rJ]B8$9$kD>A0$K$=$N@55,I=8=$K9gCW$7$J$$$9$Y$F$N%0%k!<(B
-$B%W$r>C5n$7$^$9!#$3$l$O!"$9$Y$F$N%5!<%P!<$,(B @code{ask-server} $B$rM}2r$9$k(B
-$B$o$1$G$O$J$$!"$H$$$C$?$h$&$J!"FCDj$N$"$$$^$$$J>u67$N$H$-$KLr$KN)$D$G$7$g(B
-$B$&!#(B
+@code{gnus-save-killed-list} ($B%G%#%U%)%k%H$O(B @code{t}) $B$,(B @code{nil} $B$G(B
+$B$"$k$H!"(Bgnus $B$O:o=|$5$l$?%0%k!<%W$r5/F0%U%!%$%k$KJ]B8$7$^$;$s!#$3$l(B
+$B$O(B ($B5/F0;~$H=*N;;~$N(B) $B;~4V$H!"(B($B%G%#%9%/$N(B) $BMFNL$r@aLs$7$^$9!#$3$&$9$k(B
+$B$H(B gnus $B$,$I$N%0%k!<%W$,?7$7$$$+$N5-O?$r;}$C$F$$$J$$$3$H$K$J$k$N$G!"?7$7(B
+$B$$%0%k!<%W$N<+F09XFIJ}K!$O0UL#$,L5$/$J$j$^$9!#$3$NJQ?t$r(B @code{nil} $B$K$7(B
+$B$?$H$-$O!"(B@code{gnus-check-new-newsgroups} $B$r>o(B
+$B$K(B @code{nil} $B$+(B @code{ask-server} $B$K$7$F$*$/$Y$-$G$7$g$&(B (@pxref{New
+Groups})$B!#$3$NJQ?t$O@55,I=8=$G$"$k$3$H$b$G$-$^$9!#$=$N$h$&$J>l9g$O!"%U%!(B
+$B%$%k$rJ]B8$9$kD>A0$K$=$N@55,I=8=$K9gCW$7$J$$$9$Y$F$N%0%k!<%W$r>C5n$7$^$9!#(B
+$B$3$l$O!"$9$Y$F$N%5!<%P!<$,(B @code{ask-server} $B$rM}2r$9$k$o$1$G$O$J$$!"$H(B
+$B$$$C$?$h$&$J!"$$$/$i$+$"$$$^$$$J>u67$N$H$-$KLr$KN)$D$G$7$g$&!#(B
 
 @vindex gnus-startup-file
 @vindex gnus-backup-startup-file
 @vindex version-control
 $BJQ?t(B @code{gnus-startup-file} $B$O5/F0%U%!%$%k$,$I$3$K$"$k$+$r;XDj$7$^$9!#(B
-$B=i4|CM$O(B @file{~/.newsrc} $B$G!"$=$l$,$I$N$h$&$J$b$N$G$"$l!"KvHx(B
-$B$K(B @samp{.eld} $B$r$D$1$?$b$N$,(B gnus (El Dingo) $B$N5/F0%U%!%$%k$K$J$j$^$9!#(B
+$B%G%#%U%)%k%HCM$O(B @file{~/.newsrc} $B$G!"$=$l$,$I$N$h$&$J$b$N$G$"$l!"KvHx(B
+$B$K(B @samp{.eld} $B$rIU$1$?$b$N$,(B gnus (El Dingo) $B$N5/F0%U%!%$%k$K$J$j$^$9!#(B
 $B$3$N%U%!%$%k$N%P!<%8%g%s@)8f$r$7$?$$$H$-(B
 $B$O(B @code{gnus-backup-startup-file} $B$r%;%C%H$7$F2<$5$$!#$=$l(B
 $B$O(B @code{version-control} $BJQ?t$HF1$8CM$rA0$N%U%!%$%k$K!"@\Hx8l(B @file{.elc} $B$H(B @file{.el} $B$,(B
+gnus $B$O$3$l$i$HF1$8L>A0$N%U%!%$%k$K!"@\Hx8l(B @file{.elc} $B$H(B @file{.el} $B$,(B
 $BIU$$$F$$$k$b$N$bD4$Y$^$9!#8@$$49$($l$P!"(B
 @code{gnus-init-file} $B$r(B @file{~/.gnus} $B$K@_Dj$9$k$H!"(B
 gnus $B$O(B @file{~/.gnus.elc}, @file{~/.gnus.el} $B$rC5$7!":G8e(B
-$B$K(B @file{~/.gnus} $B$r(B ($B$3$N=gHV$K(B) $BC5$7$^$9!#(B
+$B$K(B @file{~/.gnus} $B$r(B ($B$3$N=gHV$K(B) $BC5$7$^$9!#(B@option{-q} $B$^$?(B
+$B$O(B @option{--no-init-file} $B%*%W%7%g%s(B (@pxref{Initial Options, ,Initial
+Options, emacs, The Emacs Editor}) $B$,;XDj$5$l$F(B Emacs $B$,5/F0$5$l$?>l9g!"(B
+gnus $B$O(B @code{gnus-init-file} $B$rFI$_9~$_$^$;$s!#(B
 
 @node Auto Save
 @section $B<+F0J]B8(B
@@ -1505,10 +1528,10 @@ gnus $B$O(B @file{~/.gnus.elc}, @file{~/.gnus.el} $B$rC5$7!":G8e(B
 @cindex auto-save
 
 $B2?$+(B gnus $B$N%G!<%?$rJQ99$9$k$3$H(B ($B5-;v$rFI$`!"0u$rIU$1$k!"%0%k!<%W$r:o=|(B
-$B$^$?$O9XFI$9$k(B) $B$r$7$?$H$-!"JQ99$OFCJL$J(B@dfn{$B%I%j%V%k%P%C%U%!(B (dribble
-buffer)} $B$K=q$-9~$^$l$^$9!#$3$N%P%C%U%!$O(BEmacs $B$,IaDL$9$k$h$&$K<+F0J]B8(B
-$B$5$l$^$9!#%U%!%$%k(B @file{.newsrc} $B$rJ]B8$9$kA0$K(B Emacs$B$,Mn$A$?$H$-$O!"$9(B
-$B$Y$F$NJQ99$r$3$N%U%!%$%k$+$i2sI|$9$k$3$H$,$G$-$k$G$7$g$&!#(B
+$B$^$?$O9XFI$9$k(B) $B$r$7$?$H$-!"JQ99$OFCJL$J!V%I%j%V%k%P%C%U%!!A0$r;}$D%0%k!<%W$rGS=|$9$k$?$a$K;H$o$l$F$-$^$7$?$,!"6=L#$NL5$$%0(B
 $B%k!<%W$N3,AX$rL5;k$9$k$?$a$K;H$&$3$H$b$G$-$^$9!#$7$+$7!"$3$l$O$*4+$a$G$-(B
-$B$^$;$s!#K\Ev$N$3$H$r8@$&$H!"A4$/;?@.$G$-$^$;$s!#Be$o$j$K!"$=$N$h$&$JMQES(B
-$B$KMQ$$$i$l$kJQ?t$N35N,$rCN$k$?$a$K!"(B@ref{New Groups} $B$r;2>H$7$F$/$@$5$$!#(B
-
+$B$^$;$s!#K\Ev$N$3$H$r8@$&$H!"$^$C$?$/;?@.$G$-$^$;$s!#Be$o$j$K!"$=$N$h$&$J(B
+$BMQES$KMQ$$$i$l$kJQ?t$N35N,$rCN$k$?$a$K!"(B@ref{New Groups} $B$r;2>H$7$F2<$5(B
+$B$$!#(B
 @c This variable is
 @c @code{nil} by default, and will slow down active file handling somewhat
 @c if you set it to anything else.
@@ -1555,42 +1578,42 @@ Gnus $B$O5/F0$7$?$H$-$d!"pJs$@$1$rF@(B
 $B$F$d$C$F$$$3$&$H$7$^$9!#(B
 
 $B5$$rIU$1$F$[$7$$$N$O!"$"$J$?$,;3$[$I$N$?$/$5$s$N%0%k!<%W$r9XFI$7$F$$$k$H(B
-$B$-$K$3$NJQ?t$r(B @code{nil} $B@_Dj$9$k$H!"(Bgnus $B$OB.$/$J$k$I$3$m$+!"CY$/$J$C(B
+$B$-$K$3$NJQ?t$r(B @code{nil} $B$K@_Dj$9$k$H!"(Bgnus $B$OB.$/$J$k$I$3$m$+CY$/$J$C(B
 $B$F$7$^$&$H$$$&$3$H$G$9!#8=>u$G$O!"%K%e!<%9$r(B 2400bps $B0J>e$N%b%G%`$rDL$7(B
 $B$FFI$s$G$$$k$N$G$J$$8B$j!"(Bgnus $B$NB.EY$O$+$J$jCY$/$J$k$G$7$g$&!#(B
 
-$B$3$NJQ?t$O(B @code{some} $B$H$$$&CM$bu$N>pJs$r9XFI$5$l$F$$$k%0%k!<%W$N$b$N$@$1$rF@$h$&$H$7$^$9!#$$$/$D$+$N%5!<(B
-$B%P!<(B ($BL?Na(B @code{LIST ACTIVE group} $B$r;H$&$3$H$N$G$-$k!":G?71T$N(B INN $B%5!<(B
+$B$3$NJQ?t$O(B @code{some} $B$H$$$&CM$bpJs$r$@$1$rF@$h$&$H$7$^$9!#$$$/$D$+$N%5!<(B
+$B%P!<(B (@code{LIST ACTIVE group} $BL?Na$r;H$&$3$H$N$G$-$k!":G?71T$N(B INN $B%5!<(B
 $B%P!<(B) $B$G$O!"Hs>o$KAa$/$J$k$G$7$g$&$,!"B>$N%5!<%P!<$G$OB.$/$O$"$j$^$;$s!#(B
 $B$I$N$h$&$K$;$h!"CY$$2s@~$G$O(B @code{some} $B$O(B @code{nil} $B$h$j$bB.$/!"$=$l(B
-$B$O$b$A$m$s(B@code{t} $B$h$j$bB.$/$J$j$^$9!#(B
+$B$O$b$A$m$s(B @code{t} $B$h$j$bB.$/$J$j$^$9!#(B
 
-$B$$$/$D$+$N%K%e!<%9%5!<%P!<(B ($BNc$($P8E$$(B Leafnode $B$d8E$$(B INN) $B$K$OL?(B
-$BNa(B @code{LIST ACTIVE group} $B$,$"$j$^$;$s!#$=$&$$$&%5!<%P!<$K(B
+$B$$$/$D$+$N%K%e!<%9%5!<%P!<(B ($BNc$($P8E$$(B Leafnode $B$d8E$$(B INN) $B$K(B
+$B$O(B @code{LIST ACTIVE group} $BL?Na$,$"$j$^$;$s!#$=$&$$$&%5!<%P!<$K(B
 $B$O(B @code{nil} $B$r$3$NJQ?t$NCM$K@_Dj$9$k$N$,!"$*$=$i$/$b$C$H$bM-8z$G$7$g$&!#(B
 
 $B$b$7$3$NJQ?t$,(B @code{nil} $B$G$"$k$H!"(Bgnus $B$O40A4$K$,$s$8$,$i$a$NJ}K!$G%0(B
 $B%k!<%W$N>pJs$rF@$h$&$H$7$^$9!#$=$7$F!"$3$l$O$"$^$jB.$/$"$j$^$;$s!#$b$7$=(B
 $B$l$,(B @code{some} $B$G(B @acronym{NNTP} $B%5!<%P!<$r;H$C$F$$$k$H$-$O!"(Bgnus $B$O$G(B
 $B$-$k$@$1B.$/L?Na$r=P$7!"0l7b$G$9$Y$F$NJVEz$rFI$_9~$_$^$9!#$3$NJ}$,IaDL$O(B
-$B$h$jNI$$7k2L$r$b$?$i$7$^$9$,!"%5!<%P!<$,L?Na(B @code{LIST ACTIVE group} $B$r(B
+$B$h$jNI$$7k2L$r$b$?$i$7$^$9$,!"%5!<%P!<$,(B @code{LIST ACTIVE group} $BL?Na$r(B
 $BM}2r$7$J$$$J$i!"%5!<%P!<$K$H$C$F$O$"$^$jNI$$$H$O8@$($^$;$s!#(B
 
-Gnus $B$N5/F0$K$"$^$j$K;~4V$,$+$+$k$H;W$C$?$J$i!"$3$NJQ?t$K$3$l$i$N;0$D$N(B
-$B0c$C$?CM$r;n$7$F$_$F!"$I$l$,0lHVNI$$$+$rC5$7$F$/$@$5$$!#(B
+gnus $B$N5/F0$K$"$^$j$K;~4V$,$+$+$k$H;W$C$?$J$i!"$3$NJQ?t$K$3$l$i$N;0$D$N(B
+$B0c$C$?CM$r;n$7$F$_$F!"$I$l$,0lHVNI$$$+$rC5$7$F2<$5$$!#(B
 
 @code{some} $B$+(B @code{nil} $B$r;H$&$N$G$"$l$P!"$I$A$i$K$7$mB.EY$r>e$2$k$?$a(B
 $B$K$9$Y$F$N6=L#$NL5$$%0%k!<%W$rI,$::o=|$9$k$Y$-$G$7$g$&!#(B
 
 $B$3$NJQ?t$OFse;J$K5$IU$+$l$K$/$/$J$k$G(B
-$B$7$g$&!#$3$NJQ?t$O(B @file{~/.gnus.el} $B$,%m!<%I$5$l$kA0$K;H$o$l$^$9$N$G!"(B
-@file{.emacs} $B$K@_Dj$9$k$Y$-$G$"$kE@$rCm0U$7$F$/$@$5$$!#(B
+$B$7$g$&!#$3$NJQ?t$O(B @file{~/.gnus.el} $B$,%m!<%I$5$l$kA0$K;H$o$l$k$N$G!"(B
+@file{.emacs} $B$K@_Dj$9$k$Y$-$G$"$kE@$rCm0U$7$F2<$5$$!#(B
 
 @item gnus-no-groups-message
 @vindex gnus-no-groups-message
@@ -1647,14 +1669,13 @@ Gnus $B$N5/F0$K@.8y$7$?8e$K!"0lHV:G8e$Ke$NJQ?t$,(B @code{nil} $B$G$J$$$H$-$K1iAU$5$l$kC;$$6J$G$9!#=i4|CM(B
+$B>e$NJQ?t$,(B @code{nil} $B$G$J$$$H$-$K1iAU$5$l$kC;$$6J$G$9!#%G%#%U%)%k%H(B
 $B$O(B @samp{Tuxdemoon.Jingle4.au} $B$G$9!#(B
 @end table
 
 @node Group Buffer
-@chapter $B%0%k!<%W%P%C%U%!(B
+@chapter $B%0%k!<%W%P%C%U%!!<(B
 @cindex group buffer
-
 @c Alex Schroeder suggests to rearrange this as follows:
 @c
 @c  ok, just save it for reference.  I'll go to bed in a minute.
@@ -1674,9 +1695,9 @@ Gnus $B$N5/F0$K@.8y$7$?8e$K!"0lHV:G8e$KC$5$l$k$3$H$O$"$j$^$;$s!#(B
+$B%0%k!<%W%P%C%U%!!<(B (@dfn{group buffer}) $B$OM-8z$J%0%k!<%W$rA4It(B ($B$"$k$$$O(B
+$B0lIt$r(B) $B0lMwI=<($7$^$9!#$3$l$O(B gnus $B$r5/F0$7$?$H$-$K:G=i$KI=<($5$l$k%P%C(B
+$B%U%!!<$G!"(Bgnus $B$,@8$-$F$$$k8B$j7h$7$F>C$5$l$k$3$H$O$"$j$^$;$s!#(B
 
 @iftex
 @iflatex
@@ -1691,42 +1712,41 @@ Gnus $B$N5/F0$K@.8y$7$?8e$K!"0lHV:G8e$KpJs$HJQ99$NJ}K!(B
-* Group Maneuvering::           $B%0%k!<%W%P%C%U%!$r0\F0$9$k%3%^%s%I(B
+* Group Maneuvering::           $B%0%k!<%W%P%C%U%!!<$r0\F0$9$k%3%^%s%I(B
 * Selecting a Group::           $BC5n(B
 * Group Data::                  $B%0%k!<%W$N>pJs$rJQ99$9$k(B
 * Group Levels::                $B%l%Y%k(B? $B$=$l$C$F2?(B?
 * Group Score::                 $B$"$J$?$N9%$-$J%0%k!<%W$r8+$D$1=P$9J}K!(B
-* Marking Groups::              $B%0%k!<%W$K0u$r$D$1$F$*$$$F!"8e$G=hM}$G$-$^$9(B
+* Marking Groups::              $B%0%k!<%W$K0u$rIU$1$F$*$$$F!"8e$G=hM}$G$-$k(B
 * Foreign Groups::              $B%0%k!<%W$N:n@.$H=$@5(B
-* Group Parameters::            $B%0%k!<%WKh$K0c$C$?%Q%i%a!<%?$r;}$?$;$i$l$^$9(B
-* Listing Groups::              Gnus $B$O%0%k!<%W$r$$$m$$$m$JJ,$1J}$GI=<($G$-$^$9(B
+* Group Parameters::            $B%0%k!<%WKh$K0c$C$?%Q%i%a!<%?!<$r;}$?$;$i$l$k(B
+* Listing Groups::              gnus $B$O%0%k!<%W$r$$$m$$$m$JJ,$1J}$GI=<($G$-$k(B
 * Sorting Groups::              $B%0%k!<%W$N=gHV$NG[CVBX$((B
 * Group Maintenance::           $B$-$l$$$J(B @file{.newsrc} $B$NJ]$AJ}(B
-* Browse Foreign Server::       $B%5!<%P$r354Q$G$-$k!#2?$,FI$a$k$N$+8+$F$_$h$&(B
+* Browse Foreign Server::       $B%5!<%P!<$r354Q$G$-$k!#2?$,FI$a$k$N$+8+$F$_$h$&(B
 * Exiting Gnus::                $B%K%e!<%9FI$`$N$r$d$a$F!";E;v$r$7$h$&(B
 * Group Topics::                $B%0%k!<%W$r@Z$j:.$<$F!"%H%T%C%/$4$H$KJ,3d$9$k(B
 * Misc Group Stuff::            $BB>$K$G$-$k$3$H(B
 @end menu
 
 @node Group Buffer Format
-@section $B%0%k!<%W%P%C%U%!$N7A<0(B
+@section $B%0%k!<%W%P%C%U%!!<$N7A<0(B
 
 @menu
-* Group Line Specification::    $B%0%k!<%W%P%C%U%!$N8+$(J}$r7h$a$k(B
-* Group Mode line Specification::  $B%0%k!<%W%P%C%U%!$N%b!<%I9T(B
-* Group Highlighting::          $B%0%k!<%W%P%C%U%!$K$-$l$$$K?'$r$D$1$k(B
+* Group Line Specification::    $B%0%k!<%W%P%C%U%!!<$N8+$(J}$r7h$a$k(B
+* Group Mode Line Specification::  $B%0%k!<%W%P%C%U%!!<$N%b!<%I9T(B
+* Group Highlighting::          $B%0%k!<%W%P%C%U%!!<$K$-$l$$$K?'$rIU$1$k(B
 @end menu
 
 @node Group Line Specification
 @subsection $B%0%k!<%W9T$N;EMM(B
 @cindex group buffer format
 
-$B%0%k!<%W%P%C%U%!$N=i4|@_Dj7A<0$O$-$l$$$G$D$^$s$J$$$1$I!"$3$l$O7/$N9%$-$J(B
-$B$h$&$K!"%5%$%3!<$K%@%5$/$9$k$3$H$b$G$-$^$9!#(B
+$B%0%k!<%W%P%C%U%!!<$N%G%#%U%)%k%H$N7A<0$O$-$l$$$G$D$^$s$J$$$1$I!"$3$l$O7/(B
+$B$N9%$-$J$h$&$K!"%5%$%3!<$K%@%5$/$9$k$3$H$b$G$-$^$9!#(B
 
 $B$3$l$,%0%k!<%W9T$NNc$G$9!#(B
 
@@ -1738,7 +1758,7 @@ Gnus $B$N5/F0$K@.8y$7$?8e$K!"0lHV:G8e$Ke5-$N9T$r@8@.$7$^$9!#(B
+$B>e5-$N9T$r@8@.$9$k$N$O(B @samp{%M%S%5y:%B%(%g%)\n} $B$H$$$&CM$G$9!#(B
 
-$B%3%m%s$O!"$3$N9T$NCf$KI,$:L5$/$F$O$$$1$^$;$s!#%+!<%=%k$O!"2?$+$NA`:n$r$7(B
-$B$?8e$O>o$K%3%m%s$N$H$3$m$K0\F0$9$k$+$i$G$9!#(B@xref{Positioning Point}. $BB>(B
-$B$K$O2?$bI,MW$G$O$"$j$^$;$s!=!=%0%k!<%WL>$5$($b$G$9!#I=<($5$l$F$$$kJ8;z$O(B
-$BA4$F$?$@$N2hLL$N>~$j$G$"$j!"(Bgnus $B$,$=$l$rD4$Y$k$3$H$O$"$j$^$;$s!#(BGnus $B$O(B
-$BI,MW$H$9$kA4$F$NpJs$r!"%F%-%9%HB0@-$r;H$C$F21$($F$$$^$9!#(B
+$B%3%m%s$O!"$3$N9T$NCf$KI,$:L5$/$F$O$$$1$^$;$s!#%+!<%=%k$O2?$+$NA`:n$r$7$?(B
+$B8e$O>o$K%3%m%s$N$H$3$m$K0\F0$9$k$+$i$G$9!#(B@xref{Positioning Point}. $BB>$K(B
+$B$O2?$bI,MW$G$O$"$j$^$;$s(B---$B%0%k!<%WL>$5$($b$G$9!#I=<($5$l$F$$$kJ8;z$O$9(B
+$B$Y$F$?$@$N2hLL$N>~$j$G$"$j!"(Bgnus $B$,$=$l$rD4$Y$k$3$H$O$"$j$^$;$s!#(Bgnus $B$O(B
+$BI,MW$H$9$k$9$Y$F$NpJs$r!"%F%-%9%HB0@-$r;H$C$F21$($F$$$^$9!#(B
 
 ($B$b$77/$,!"$9$4$/%X%s$J!"AG@2$i$7$$!"I=7W;;Iw$N%l%$%"%&%H$r:n$C$?$H$7$?(B
 $B$i!"$_$s$J!"7/$O2q7W$N;E;v$,K;$7$/$C$F!"%K%e!<%9$rFI$s$G;~4V$rL5BL;H$$$7(B
@@ -1763,7 +1783,7 @@ Gnus $B$N5/F0$K@.8y$7$?8e$K!"0lHV:G8e$K(B Gnus $B%a!<%j%s%0%j%9%H$K(B
 $BO"Mm$7$F2<$5$$!#(B
@@ -1812,13 +1832,13 @@ gnus $B$,$3$N?dDj$r;H$&$N$O!"(B@acronym{NNTP} $B%W%m%H%3%k$OG=N($NNI(B
 $B%0%k!<%WL>!#(B
 
 @item C
-$B%0%k!<%W%Q%i%a!<%?$K%3%a%s%H$NMWAG$,L5$$>l9g$N%3%a%s(B
-$B%H(B (@pxref{Group Parameters}) $B$^$?$O%0%k!<%WL>!#(B
+$B%0%k!<%W$N$?$a$N%3%a%s%H(B (@pxref{Group Parameters})$B!"$^$?$O%0%k!<%W%Q%i(B
+$B%a!<%?!<$K%3%a%s%H$NMWAG$,L5$$>l9g$O%0%k!<%WL>!#(B
 
 @item D
 $B%K%e!<%9%0%k!<%W$N@bL@!#$3$l$i$,8=$l$kA0$K!"%0%k!<%W$N@bL@$rFI$`I,MW$,$"(B
 $B$j$^$9!#$=$l$K$O(B @code{gnus-read-active-file} $B$r@_Dj$9$k$+!"%0%k!<%W%P%C(B
-$B%U%!$G(B @kbd{M-d} $B%3%^%s%I$r;H$C$F2<$5$$!#(B
+$B%U%!!<$G(B @kbd{M-d} $B%3%^%s%I$r;H$C$F2<$5$$!#(B
 
 @item o
 $B;J2ql9g(B @samp{m}$B!#(B
@@ -1833,7 +1853,7 @@ gnus $B$,$3$N?dDj$r;H$&$N$O!"(B@acronym{NNTP} $B%W%m%H%3%k$OG=N($NNI(B
 $B$=$N%0%k!<%W$N35N,%P%C%U%!!<$,3+$$$F$$$k$+$I$&$+!#(B
 
 @item n
-$B$I$3$+$i$NA*Br$+!#(B
+$B$I$3$+$i$NA*Br$+!#(B($BLuCm(B: $B%P%C%/%(%s%I$N%7%s%\%kL>(B)
 
 @item z
 $B30ItA*BrJ}K!$,;H$o$l$F$$$k>l9g!"(B@samp{<%s:%n>} $B$HF1$8J8;zNs!#(B
@@ -1844,8 +1864,8 @@ gnus $B$,$3$N?dDj$r;H$&$N$O!"(B@acronym{NNTP} $B%W%m%H%3%k$OG=N($NNI(B
 @item c
 @vindex gnus-group-uncollapsed-levels
 $BC;$$(B ($B>JN,$7$?(B) $B%0%k!<%WL>!#(B@code{gnus-group-uncollapsed-levels} $BJQ?t$O!"(B
-$B$I$N%l%Y%k$^$G%0%k!<%WL>$rA4It;D$9$+$r<($7$^$9!#=i4|CM$O(B 1 $B$G$9!=!=$3(B
-$B$N0UL#$O!"(B@samp{gnu.emacs.gnus} $B$N$h$&$J%0%k!<%WL>(B
+$B$I$N%l%Y%k$^$G%0%k!<%WL>$rA4It;D$9$+$r<($7$^$9!#%G%#%U%)%k%H$O(B 1 $B$G(B
+$B$9(B---$B$3$N0UL#$O!"(B@samp{gnu.emacs.gnus} $B$N$h$&$J%0%k!<%WL>(B
 $B$r(B @samp{g.e.gnus} $B$KC;=L$9$k$H$$$&$3$H$G$9!#(B
 
 @item m
@@ -1855,41 +1875,41 @@ gnus $B$,$3$N?dDj$r;H$&$N$O!"(B@acronym{NNTP} $B%W%m%H%3%k$OG=N($NNI(B
 $B$O(B @samp{%} (@code{gnus-new-mail-mark})$B!#(B
 
 @item p
-@samp{#} (@code{gnus-process-mark}) $B$G!"$=$N%0%k!<%W$K%W%m%;%9%^!<%/$,IU(B
-$B$$$F$$$k$3$H$r<($7$^$9!#(B
+@samp{#} (@code{gnus-process-mark}) $B$G!"$=$N%0%k!<%W$K%W%m%;%90u$,IU$$$F(B
+$B$$$k$3$H$r<($7$^$9!#(B
 
 @item d
 $B:G8e$K$$$D$3$N%0%k!<%W$rFI$s$@$+$r<($9J8;zNs(B (@pxref{Group Timestamp})$B!#(B
 
 @item F
 $B%-%c%C%7%e$H%(!<%8%'%s%H$NN>J}$K$h$C$F.$K$9$k$?$a$K!"<+F0E*$K%P%$%H(B(B)$B!"%-%m%P%$%H(B(K)$B!"%a(B
-$B%,%P%$%H(B(M)$B!"$^$?$O%.%,%P%$%H(B(G) $B$K%9%1!<%k$5$l$^$9!#8GDjI}%+%i%`MQ$K(B
+$BNL!#CM$O%+%i%`I}$r:G>.$K$9$k$?$a$K!"<+F0E*$K%P%$%H(B (B)$B!"%-%m%P%$%H(B (K)$B!"(B
+$B%a%,%P%$%H(B (M)$B!"$^$?$O%.%,%P%$%H(B (G) $B$K=L<\$5$l$^$9!#8GDjI}%+%i%`MQ$K(B
 $B$O(B %7F $B$N7A<0$GB-$j$^$9!#(B
 
 @item u
 $BMxMQ$N3F;XDjJ8;z$N>pJs$HF1MM$K!"(B
-$B%P%C%U%!$KA^F~$5$l$kJ8;zNs$rJV$5$J$1$l$P$J$j$^$;$s!#(B
+gnus $B$O(B @code{gnus-user-format-function-}@samp{X} $B4X?t$r8F$S=P$7$^$9!#$3(B
+$B$3$G(B @samp{X} $B$O(B @samp{%u} $B$KB3$$$F$$$kJ8;z$G$9!#$3$N4X?t$O0z?t$K0l$D$N(B
+$B%@%_!<%Q%i%a!<%?!<$rEO$5$l$^$9!#$3$N4X?t$O!"B>$N3F;XDjJ8;z$N>pJs$HF1MM$K!"(B
+$B%P%C%U%!!<$KA^F~$5$l$kJ8;zNs$rJV$5$J$1$l$P$J$j$^$;$s!#(B
 @end table
 
 @cindex *
-$BA4$F$N!V!A$N?t!W$N;XDj$G!"$b$7$=$N>pJs$,MxMQ$G$-$J$$>l9g$K$O%"%9%?%j%9(B
-$B%/(B (@samp{*}) $B$,Kd$a$i$l$^$9!=!=Nc$($P!"5/F0$5$l$F$$$J$$30It%0%k!<%W$d!"(B
+$B$9$Y$F$N!V!A$N?t!W$N;XDj$O!"$b$7$=$N>pJs$,MxMQ$G$-$J$$>l9g$K$O%"%9%?%j%9(B
+$B%/(B (@samp{*}) $B$GKd$a$i$l$^$9(B---$BNc$($P!"5/F0$5$l$F$$$J$$30It%0%k!<%W$d!"(B
 $BIT@5$J4pK\%0%k!<%W$N>l9g$G$9!#(B
 
-@node Group Mode line Specification
+@node Group Mode Line Specification
 @subsection $B%0%k!<%W%b!<%I9T$N;EMM(B
 @cindex group mode line
 
 @vindex gnus-group-mode-line-format
 $B%b!<%I9T(B
 $B$O(B @code{gnus-group-mode-line-format} (@pxref{Mode Line Formatting}) $B$r(B
-$B@_Dj$9$k$3$H$GJQ99$G$-$^$9!#$3$$$D$O;XDjJ8;z$r$"$s$^$j$?$/$5$sCN$C$F$^$;(B
-$B$s!#(B
+$B@_Dj$9$k$3$H$GJQ99$G$-$^$9!#$3$$$D$O;XDjJ8;z$r$"$s$^$j$?$/$5$sCN$C$F$$$^(B
+$B$;$s!#(B
 
 @table @samp
 @item S
@@ -1904,12 +1924,12 @@ Gnus $B$O(B @code{gnus-user-format-function-}@samp{X} $B4X?t$r8F$S=P$7$^$9!#$
 @cindex group highlighting
 
 @vindex gnus-group-highlight
-$B%0%k!<%W%P%C%U%!$N%O%$%i%$%H$O(B @code{gnus-group-highlight} $BJQ?t$K$h$C$F(B
-$B@)8f$5$l$F$$$^$9!#$3$l$O(B @code{(@var{form} . @var{face})} $B$N$h$&$J$b$N$r(B
-$BMWAG$K;}$DO"A[%j%9%H$G$9!#(B@var{form} $B$,2?$+(B @code{nil} $B0J30$KI>2A$5$l$k(B
-$B$b$N$J$i!"$=$N9T$KBP$7$F(B @var{face} $B$,;HMQ$5$l$^$9!#(B
+$B%0%k!<%W%P%C%U%!!<$N%O%$%i%$%H$O(B @code{gnus-group-highlight} $BJQ?t$K$h$C(B
+$B$F@)8f$5$l$^$9!#$3$l$O(B @code{(@var{form} . @var{face})} $B$N$h$&$J$b$N$rMW(B
+$BAG$K;}$DO"A[%j%9%H$G$9!#(B@var{form} $B$,I>2A$5$l$?7k2L$,!"(B@code{nil} $B0J30$N(B
+$B2?$+$K$J$k$H!"$=$N9T$KBP$7$F(B @var{face} $B$,;HMQ$5$l$^$9!#(B
 
-$B0J2<$,$3$NJQ?t$NCM$NNc$G$9!#$3$l$OGX7J$,0E$$@_Dj$G$O$-$l$$$K8+$($k$+$bCN(B
+$B0J2<$,$3$NJQ?t$NCM$NNc$G$9!#$3$l$OGX7J$,0E$$@_Dj$G$O$-$l$$$K8+$($k$+$b$7(B
 $B$l$^$;$s!#(B
 
 @lisp
@@ -1934,7 +1954,7 @@ Gnus $B$O(B @code{gnus-user-format-function-}@samp{X} $B4X?t$r8F$S=P$7$^$9!#$
         (t . my-group-face-5)))
 @end lisp
 
-@ref{Faces and Fonts} $B$b;2>H$7$F$/$@$5$$!#(B
+@ref{Faces and Fonts} $B$b;2>H$7$F2<$5$$!#(B
 
 $B$3$N(B form $B$,I>2A$5$l$k$H$-$KF0E*$KB+G{$5$l$F$$$kJQ?t$K$O0J2<$N$b$N$,$"$j(B
 $B$^$9!#(B
@@ -1955,8 +1975,8 @@ Gnus $B$O(B @code{gnus-user-format-function-}@samp{X} $B4X?t$r8F$S=P$7$^$9!#$
 @item ticked
 $B$=$N%0%k!<%WCf$N0u$NIU$$$?5-;v$N?t!#(B
 @item total
-$B$=$N%0%k!<%WCf$NA45-;v?t!#$b$C$H@53N$K8@$&$H!"(B@var{max-number} $B%^%$%J%9(B
-@var{min_number} $B%W%i%9(B 1.
+$B$=$N%0%k!<%WCf$NA45-;v?t!#$b$C$H@53N$K8@$&$H!"(B@var{max-number} $B%^%$%J(B
+$B%9(B @var{min_number} $B%W%i%9(B 1$B!#(B
 @item topic
 $B%H%T%C%/%^%$%J!<%b!<%I$r;HMQ$7$F$$$k;~!"$3$NJQ?t$OA^F~$5$l$F$$$k8=:_$N%H(B
 $B%T%C%/$KB+G{$5$l$^$9!#(B
@@ -1970,14 +1990,15 @@ Gnus $B$O(B @code{gnus-user-format-function-}@samp{X} $B4X?t$r8F$S=P$7$^$9!#$
 @findex gnus-group-highlight-line
 @code{gnus-group-update-hook} $B$O%0%k!<%W9T$,JQ99$5$l$?$H$-$K8F$S=P$5$l$^(B
 $B$9!#$3$l$O(B @code{gnus-visual} $B$,(B @code{nil} $B$N$H$-$O8F$S=P$5$l$^$;$s!#$3(B
-$B$N%U%C%/$O=i4|@_Dj$G$O(B @code{gnus-group-highlight-line} $B$r8F$S=P$7$^$9!#(B
+$B$N%U%C%/$O%G%#%U%)%k%H$G$O(B @code{gnus-group-highlight-line} $B$r8F$S=P$7$^(B
+$B$9!#(B
 
 @node Group Maneuvering
 @section $B%0%k!<%WA`:n(B
 @cindex group movement
 
-$BA4$F$N0\F0%3%^%s%I$O?t;z@\F,0z?t$rM}2r$9$k$N$G!"4|BT$9$kDL$j$NF0:n$r$7$^(B
-$B$9!#$?$V$s$M!#(B
+$B$9$Y$F$N0\F0%3%^%s%I$O?tCM@\F,0z?t$rM}2r$9$k$N$G!"4|BT$9$kDL$j$NF0:n$r$7(B
+$B$^$9!#$?$V$s$M!#(B
 
 @table @kbd
 @item n
@@ -2006,14 +2027,14 @@ Gnus $B$O(B @code{gnus-user-format-function-}@samp{X} $B4X?t$r8F$S=P$7$^$9!#$
 
 @item M-n
 @kindex M-n ($B%0%k!<%W(B)
-@findex gnus-group-prev-unread-group-same-level
+@findex gnus-group-next-unread-group-same-level
 $B0l$DA0$NF1$8%l%Y%k(B ($B$b$7$/$O$=$l$h$j>.$5$$%l%Y%k(B) $B$NL$FI%0%k!<%W$K0\F0$7(B
 $B$^$9(B (@code{gnus-group-prev-unread-group-same-level})$B!#(B
 
 @item M-p
 @kindex M-p ($B%0%k!<%W(B)
-@findex gnus-group-next-unread-group-same-level
-$B.$5$$%l%Y%k(B)$B$NL$FI%0%k!<%W$K0\F0$7$^(B
+@findex gnus-group-prev-unread-group-same-level
+$B.$5$$%l%Y%k(B) $B$NL$FI%0%k!<%W$K0\F0$7$^(B
 $B$9(B (@code{gnus-group-next-unread-group-same-level})$B!#(B
 @end table
 
@@ -2041,9 +2062,9 @@ Gnus $B$O(B @code{gnus-user-format-function-}@samp{X} $B4X?t$r8F$S=P$7$^$9!#$
 @end table
 
 @vindex gnus-group-goto-unread
-@code{gnus-group-goto-unread} $B$r(B @code{nil} $B$K$9$k$H!"A4$F$N0\F0%3%^%s%I(B
-$B$O!"e5-$N%3%^%s%I$HF1$8F0:n$r$7$^$9$,!"!V%4%?%4%?!W$O:GDc8B$K$7$h$&$H(B
-$B$7$^$9(B (@code{gnus-group-quick-select-group})$B!#%9%3%"!&(Bkill $B$N=hM}$O9T$o(B
-$B$l$:!"%O%$%i%$%H$b5-;v>C5n$b$7$^$;$s!#$3$l$O!"$"$J$?$,K\Ev$K5^$$$G$$$F!"(B
+$B$7$^$9(B (@code{gnus-group-quick-select-group})$B!#%9%3%"!&(Bkill $B$N=hM}$O9T$J(B
+$B$o$l$:!"%O%$%i%$%H$b5-;v>C5n$b$7$^$;$s!#$3$l$O!"$"$J$?$,K\Ev$K5^$$$G$$$F!"(B
 $B$I$C$+$N$d$?$i$G$C$+$$%0%k!<%W$KF~$i$J$1$l$P$$$1$J$$$H$-$KLr$KN)$D$+$b$7(B
-$B$l$^$;$s!#$^$?!"@\F,<-$K(B 0 $B$rM?$($l$P(B ($B$9$J$o$A(B @kbd{0 M-RET})$B!"(Bgnus $B$O(B
-$B35N,%P%C%U%!$r:n$m$&$H$5$($7$^$;$s!#$3$l$O35N,%P%C%U%!$r:n$kA0$K%9%l%C%I(B
-$BI=<($r@Z$jBX$($?$$$H$-Lr$KN)$A$^$9(B (@pxref{Summary Generation Commands})$B!#(B
+$B$l$^$;$s!#$^$?!"@\F,0z?t$K(B 0 $B$rM?$($l$P(B ($B$9$J$o$A(B @kbd{0 M-RET})$B!"(B
+gnus $B$O35N,%P%C%U%!!<$r:n$m$&$H$5$($7$^$;$s!#$3$l$O35N,%P%C%U%!!<$r:n$k(B
+$BA0$K%9%l%C%II=<($r@Z$jBX$($?$$$H$-Lr$KN)$A$^$9(B (@pxref{Summary
+Generation Commands})$B!#(B
 
 @item M-SPACE
 @kindex M-SPACE ($B%0%k!<%W(B)
 @findex gnus-group-visible-select-group
 $B$3$l$O(B @kbd{RET} $B%3%^%s%I$HF1$8F0:n$r$9$k$5$i$K$b$&0l$D$N%3%^%s%I$G$9$,!"(B
-$B$3$N%3%^%s%I$O5-;v>C5n$HJ]N15-;v$r1#$9=hM}$r9T$$$^$;(B
+$B$3$N%3%^%s%I$O5-;v>C5n$HJ]N15-;v$r1#$9=hM}$r9T$J$$$^$;(B
 $B$s(B (@code{gnus-group-visible-select-group})$B!#(B
 
 @item C-M-RET
@@ -2100,17 +2122,17 @@ Gnus $B$O(B @code{gnus-user-format-function-}@samp{X} $B4X?t$r8F$S=P$7$^$9!#$
 @findex gnus-group-select-group-ephemerally
 $B:G8e$K$3$N%3%^%s%I$O!"8=:_$N%0%k!<%W$r0lEY8B$j!"$=$NFbMF$K0l@Z$N=hM}$r$9(B
 $B$k$3$H$N$J$$$h$&$KA*Br$7$^(B
-$B$9(B (@code{gnus-group-select-group-ephemerally})$B!#%9%l%C%II=<($5$($b9T$o(B
-$B$l$^$;$s!#$3$NJ}K!$GA*Br$7$?8e$K$3$N%0%k!<%W$KBP$7$F9T$C$?$3$H$OA4$F!"$=(B
-$B$N8e$K1F6A$rM?$($k$3$H$O$"$j$^$;$s!#(B
+$B$9(B (@code{gnus-group-select-group-ephemerally})$B!#%9%l%C%II=<($5$($b9T$J(B
+$B$o$l$^$;$s!#$3$NJ}K!$GA*Br$7$?8e$K$3$N%0%k!<%W$KBP$7$F9T$J$C$?$3$H$O$9$Y(B
+$B$F!"$=$N8e$K1F6A$rM?$($k$3$H$O$"$j$^$;$s!#(B
 @end table
 
 @vindex gnus-large-newsgroup
 @code{gnus-large-newsgroup} $BJQ?t$O!"2?$rBg$-$J%0%k!<%W$H9M$($k$Y$-$+(B
 $B$r(B gnus $B$KM?$($^$9!#(B@code{nil} $B$@$C$?$i!"$I$N%0%k!<%W$bBg$-$$$H9M$($^$;(B
-$B$s!#%G%#%U%)%k%HCM$O(B 200 $B$G$9!#%0%k!<%W$K(B ($BL$FI$H0uIU$-$N(B) $B5-;v$,$3$N?t(B
-$B0J>e$"$l$P!"(Bgnus $B$O$=$N%0%k!<%W$KF~$kA0$KMxMQe$"$l$P!"(Bgnus $B$O$=$N%0%k!<%W$KF~$kA0$KMxMQ%s%S%0%k!<%W$r(B kill $B$7$^$9(B (@code{gnus-group-kill-all-zombies})$B!#(B
+$B$9$Y$F$N%>%s%S%0%k!<%W$r(B kill $B$7$^(B
+$B$9(B (@code{gnus-group-kill-all-zombies})$B!#(B
 
 @item S C-k
 @kindex S C-k ($B%0%k!<%W(B)
 @findex gnus-group-kill-level
-$B$"$k%l%Y%k$N%0%k!<%W$rA4$F(B kill $B$7$^$9(B (@code{gnus-group-kill-level})$B!#(B
+$B$"$k%l%Y%k$N%0%k!<%W$r$9$Y$F(B kill $B$7$^$9(B (@code{gnus-group-kill-level})$B!#(B
 kill $B$7$?8e!"$3$l$i$N%0%k!<%W$r(B yank $B$GLa$9$3$H$O$G$-$J$$$N$G!"$3$N%3%^(B
-$B%s%I$O$$$/$i$+Cm0U$7$F;H$C$F$/$@$5$$!#$3$N%3%^%s%I$,K\Ev$KJXMx$K$J$k$N$O!"(B
-@file{.newsrc} $B$KH$7$F$/$/$@$5$$!#(B
+@ref{Group Levels} $B$b;2>H$7$F2<$5$$!#(B
 
 @node Group Data
 @section $B%0%k!<%W%G!<%?(B
@@ -2231,9 +2254,9 @@ kill $B$7$?8e!"$3$l$i$N%0%k!<%W$r(B yank $B$GLa$9$3$H$O$G$-$J$$$N$G!"$3$N%3%^
 @findex gnus-group-catchup-current
 @vindex gnus-group-catchup-group-hook
 @c @icon{gnus-group-catchup-current}
-$B$=$N%0%k!<%WFb$NA4$F$NL50u$N5-;v$r4{FI$K$9(B
-$B$k(B (@code{gnus-group-catchup-current})$B!#%0%k!<%W%P%C%U%!$+$i4{FI$K$7$?>l(B
-$B9g$O(B @code{gnus-group-catchup-group-hook} $B$,8F$S=P$5$l$^$9!#(B
+$B$=$N%0%k!<%WFb$N$9$Y$F$NL50u$N5-;v$r4{FI$K$7$^(B
+$B$9(B (@code{gnus-group-catchup-current})$B!#%0%k!<%W%P%C%U%!!<$+$i4{FI$K$7$?(B
+$B>l9g$O(B @code{gnus-group-catchup-group-hook} $B$,8F$S=P$5$l$^$9!#(B
 
 @item C
 @kindex C ($B%0%k!<%W(B)
@@ -2244,15 +2267,15 @@ kill $B$7$?8e!"$3$l$i$N%0%k!<%W$r(B yank $B$GLa$9$3$H$O$G$-$J$$$N$G!"$3$N%3%^
 @item M-c
 @kindex M-c ($B%0%k!<%W(B)
 @findex gnus-group-clear-data
-$B8=:_$N%0%k!<%W$NA4$F$N%G!<%?$r%/%j%"$7$^$9!=!=%^!<%/$H4{FI5-;v$N%j%9%H$r(B
-$B>C$75n$j$^$9(B (@code{gnus-group-clear-data})$B!#(B
+$B8=:_$N%0%k!<%W$N$9$Y$F$N%G!<%?$r%/%j%"$7$^$9(B---$B0u$H4{FI5-;v$N%j%9%H$r>C(B
+$B$75n$j$^$9(B (@code{gnus-group-clear-data})$B!#(B
 
 @item M-x gnus-group-clear-data-on-native-groups
 @kindex M-x gnus-group-clear-data-on-native-groups
 @findex gnus-group-clear-data-on-native-groups
-$B$b$7(B @acronym{NNTP} $B%5!<%P$rJL$N$b$N$K@Z$jBX$($?$H$9$k$H!"A4$F$N%^!<%/$H(B
-$B4{FI>pJs$O$b$&Lr$K$ON)$A$^$;$s!#$3$N%3%^%s%I$r;H$C$F4pK\%0%k!<%W$NA4$F$N(B
-$B%G!<%?$r%/%j%"$9$k$3$H$,$G$-$^$9!#Cm0U$7$F;H$C$F$M!#(B
+$B$b$7(B @acronym{NNTP} $B%5!<%P!<$rJL$N$b$N$K@Z$jBX$($?$H$9$k$H!"$9$Y$F$N0u$H(B
+$B4{FI>pJs$O$b$&Lr$K$ON)$A$^$;$s!#$3$N%3%^%s%I$r;H$C$F4pK\%0%k!<%W$N$9$Y$F(B
+$B$N%G!<%?$r%/%j%"$9$k$3$H$,$G$-$^$9!#Cm0U$7$F;H$C$F$M!#(B
 @end table
 
 @node Group Levels
@@ -2260,12 +2283,12 @@ kill $B$7$?8e!"$3$l$i$N%0%k!<%W$r(B yank $B$GLa$9$3$H$O$G$-$J$$$N$G!"$3$N%3%^
 @cindex group level
 @cindex level
 
-$BA4$F$N%0%k!<%W$O(B @dfn{$B9XFIEY(B} (@dfn{subscribedness}) $B$N%l%Y%k$r;}$A$^$9!#(B
+$B$9$Y$F$N%0%k!<%W$O!V9XFIEY!W(B(@dfn{subscribedness}) $B$N%l%Y%k$r;}$A$^$9!#(B
 $BNc$($P!"$"$k%0%k!<%W$,%l%Y%k(B 2 $B$@$H$9$l$P!"$=$l$O%l%Y%k(B 5 $B$N%0%k!<%W$h$j(B
-$B$b!V$h$j9XFI$7$F$$$k!W$H$$$&$3$H$G$9!#(BGnus $B$KBP$7$F!"$"$k%l%Y%k$+$=$l$h(B
+$B$b!V$h$j9XFI$7$F$$$k!W$H$$$&$3$H$G$9!#(Bgnus $B$KBP$7$F!"$"$k%l%Y%k$+$=$l$h(B
 $B$j>.$5$$%l%Y%k$N%0%k!<%W$N$_0lMwI=<($9$k$h$&$KMj$`$3$H$b$G$-$k(B
 $B$7(B (@pxref{Listing Groups})$B!"$"$k%l%Y%k$+$=$l$h$j>.$5$$%l%Y%k$N%0%k!<%W(B
-$B$N?7Ce5-;v$N$_$r3NG'$9$k$3$H$b$G$-$^$9(B(@pxref{Scanning New Messages})$B!#(B
+$B$N?7Ce5-;v$N$_$r3NG'$9$k$3$H$b$G$-$^$9(B (@pxref{Scanning New Messages})$B!#(B
 
 $BK:$l$J$$$G(B: $B%0%k!<%W$N%l%Y%k$,Bg$-$$$[$I!"=EMWEY$ODc$/$J$k$H$$$&$3$H!#(B
 
@@ -2273,32 +2296,32 @@ kill $B$7$?8e!"$3$l$i$N%0%k!<%W$r(B yank $B$GLa$9$3$H$O$G$-$J$$$N$G!"$3$N%3%^
 @item S l
 @kindex S l ($B%0%k!<%W(B)
 @findex gnus-group-set-current-level
-$B8=:_$N%0%k!<%W$N%l%Y%k$r@_Dj$9$k!#?t;z%W%l%U%#%C%/%9$,M?$($i$l$k$H!"$=$3(B
-$B$+$i(B @var{n} $B8D$N%0%k!<%W$N%l%Y%k$,@_Dj$5$l$^$9!#%l%Y%k$rF~NO$9$k$?$a$N(B
-$B%W%m%s%W%H$,=P$^$9!#(B
+$B8=:_$N%0%k!<%W$N%l%Y%k$r@_Dj$7$^$9!#?tCM$N@\F,0z?t$,M?$($i$l$k$H!"$=$3$+(B
+$B$i(B @var{n} $B8D$N%0%k!<%W$N%l%Y%k$,@_Dj$5$l$^$9!#%l%Y%k$rF~NO$9$k$?$a$N%W(B
+$B%m%s%W%H$,=P$^$9!#(B
 @end table
 
 @vindex gnus-level-killed
 @vindex gnus-level-zombie
 @vindex gnus-level-unsubscribed
 @vindex gnus-level-subscribed
-Gnus $B$O%l%Y%k(B 1 $B$+$i(B @code{gnus-level-subscribed} ($B$3$NCM$r4^$`(B) ($B=i4|CM(B
-$B$O(B 5) $B$^$G$N%0%k!<%W$r9XFI!"(B@code{gnus-level-subscribed} ($B$3$NCM$r4^$^$J(B
-$B$$(B) $B$+$i(B@code{gnus-level-unsubscribed} ($B$3$NCM$r4^$`(B) ($B=i4|CM$O(B 7) $B$^$G(B
-$B$N%0%k!<%W$rHs9XFI!"(B@code{gnus-level-zombie} $B$r%>%s%S(B ($BJb$/;S(B) ($B=i4|CM(B
-$B$O(B 8)$B!"(B@code{gnus-level-killed} $B$r(B kill $B$5$l$F$$$k(B ($B40A4$K;`$s$G(B
-$B$k(B) ($B=i4|CM$O(B 9) $B$HH=CG$7$^$9!#(BGnus $B$O9XFI$HHs9XFI$N%0%k!<%W$OA4$/F1MM$K(B
-$B07$$$^$9$,!"%>%s%S$H(B kill $B%0%k!<%W$O!"$I$N5-;v$rFI$s$@$+!"B8:_$9$k$+$J$I(B
-$B$N>pJs$r0l@Z;}$A$^$;$s!#$3$N;`$s$G$k%0%k!<%W$H@8$-$F$k%0%k!<%W$N6hJL$O!"(B
-$BJL$K$=$l$,$-$l$$$@$+$i$H$+8-$$$+$i$H$$$&$o$1$G$O$J$/!"=c?h$K8zN(E*$JM}M3(B
-$B$N$?$a$G$9!#(B
+gnus $B$O%l%Y%k(B 1 $B$+$i(B @code{gnus-level-subscribed} ($B$3$NCM$r4^$`(B) ($B%G%#%U%)(B
+$B%k%H$O(B 5) $B$^$G$N%0%k!<%W$r9XFI!"(B@code{gnus-level-subscribed} ($B$3$NCM$r4^(B
+$B$^$J$$(B) $B$+$i(B @code{gnus-level-unsubscribed} ($B$3$NCM$r4^$`(B) ($B%G%#%U%)%k%H(B
+$B$O(B 7) $B$^$G$N%0%k!<%W$rHs9XFI!"(B@code{gnus-level-zombie} $B$r%>%s%S(B ($BJb$/;S(B)
+($B%G%#%U%)%k%H$O(B 8)$B!"(B@code{gnus-level-killed} $B$r(B kill $B$5$l$F$$$k(B ($B40A4$K(B
+$B;`$s$G$$$k(B) ($B%G%#%U%)%k%H$O(B 9) $B$HH=CG$7$^$9!#(Bgnus $B$O9XFI$HHs9XFI$N%0%k!<(B
+$B%W$O$^$C$?$/F1MM$K07$$$^$9$,!"%>%s%S$H(B kill $B%0%k!<%W$O!"$I$N5-;v$rFI$s$@(B
+$B$+!"B8:_$9$k$+$J$I$N>pJs$r0l@Z;}$A$^$;$s!#$3$N;`$s$G$$$k%0%k!<%W$H@8$-$F(B
+$B$$$k%0%k!<%W$N6hJL$O!"JL$K$=$l$,$-$l$$$@$+$i$H$+8-$$$+$i$H$$$&$o$1$G$O$J(B
+$B$/!"=c?h$K8zN(E*$JM}M3$N$?$a$G$9!#(B
 
 $B%a!<%kMQ$N%0%k!<%W$O(B ($B$b$7$"$l$P(B) $BHs>o$K>.$5$$%l%Y%k(B ($BNc$($P(B 1 $B$+(B 2) $B$K(B
 $B$7$F$*$/$3$H$r$*4+$a$7$^$9!#(B
 
-$B/Cm0U$r$7$F$^$o$kI,MW$,$"$j$^$9!#(B
-$B0lC6$=$l$r@_Dj$7$?$i!"FsEY$H$=$l$K?($i$J$$$G$/$@$5$$!#$5$i$K8@$($P!"<+J,(B
-$B$G2?$r$d$C$F$$$k$+$r@53N$KM}2r$7$F$$$J$$8B$j!"0l@Z?($i$J$$$G$/$@$5$$!#(B
+$B$$$C$?$s$=$l$r@_Dj$7$?$i!"FsEY$H$=$l$K?($i$J$$$G2<$5$$!#$5$i$K8@$($P!"<+(B
+$BJ,$G2?$r$d$C$F$$$k$+$r@53N$KM}2r$7$F$$$J$$8B$j!"0l@Z?($i$J$$$G2<$5$$!#(B
 
 @vindex gnus-level-default-unsubscribed
 @vindex gnus-level-default-subscribed
-$B?H6a$K4X78$9$kFs$D$NJQ?t$O(B @code{gnus-level-default-subscribed} ($B=i4|CM(B
-$B$O(B 3) $B$H(B @code{gnus-level-default-unsubscribed} ($B=i4|CM$O(B 6) $B$G$9!#$3$l(B
-$B$i$O?7$7$$%0%k!<%W$,(B ($BHs(B) $B9XFI$5$l$?$H$-$N%l%Y%k$G$9!#$b$A$m$s!"$3$l(B
-$B$iFs$D$NJQ?t$NCM$O!"0UL#$N$"$k@5$7$$HO0O$G$J$/$F$O$J$j$^$;$s!#(B
+$B?H6a$K4X78$9$kFs$D$NJQ?t$O(B @code{gnus-level-default-subscribed} ($B%G%#%U%)(B
+$B%k%H$O(B 3) $B$H(B @code{gnus-level-default-unsubscribed} ($B%G%#%U%)%k%H(B
+$B$O(B 6) $B$G$9!#$3$l$i$O?7$7$$%0%k!<%W$,(B ($BHs(B) $B9XFI$5$l$?$H$-$N%l%Y%k$G$9!#$b(B
+$B$A$m$s!"$3$l$iFs$D$NJQ?t$NCM$O!"0UL#$N$"$k@5$7$$HO0O$G$J$/$F$O$J$j$^$;$s!#(B
 
 @vindex gnus-keep-same-level
 @code{gnus-keep-same-level} $B$,(B @code{nil} $B0J30$G$"$l$P!"0\F0%3%^%s%I$N$$(B
@@ -2339,23 +2362,23 @@ Gnus $B$O%l%Y%k(B 1 $B$+$i(B @code{gnus-level-subscribed} ($B$3$NCM$r4^$`(
 $B$$(B) $B%0%k!<%W$K0\F0$7$^$9!#(B
 
 @vindex gnus-group-default-list-level
-$B=i4|@_Dj$G$O(B @code{gnus-group-default-list-level} $B$HF1$8$+$=$l$h$j>.$5$$(B
-$B%l%Y%k$N%0%k!<%W$,!"%0%k!<%W%P%C%U%!$K0lMwI=<($5$l$^$9!#(B
+$B%G%#%U%)%k%H$G$O(B @code{gnus-group-default-list-level} $B$HF1$8$+$=$l$h$j>.(B
+$B$5$$%l%Y%k$N%0%k!<%W$,!"%0%k!<%W%P%C%U%!!<$K0lMwI=<($5$l$^$9!#(B
 
 @vindex gnus-group-list-inactive-groups
 @code{gnus-group-list-inactive-groups} $B$,(B @code{nil} $B0J30$G$"$l$P!"L$FI(B
-$B$N%0%k!<%W$K0l=o$K%"%/%F%#%V$G$J$$%0%k!<%W$bI=<($7$^$9!#$3$NJQ?t$O=i4|@_(B
-$BDj$G$O(B @code{t} $B$G$9!#$b$7$3$l$,(B @code{nil} $B$G$"$l$P!"%"%/%F%#%V$G$J$$%0(B
-$B%k!<%W$OI=<($5$l$^$;$s!#(B
+$B$N%0%k!<%W$K%"%/%F%#%V$G$J$$%0%k!<%W$b0l=o$KI=<($7$^$9!#$3$NJQ?t$O%G%#%U%)(B
+$B%k%H$G$O(B @code{t} $B$G$9!#$b$7$3$l$,(B @code{nil} $B$G$"$l$P!"%"%/%F%#%V$G$J$$(B
+$B%0%k!<%W$OI=<($5$l$^$;$s!#(B
 
 @vindex gnus-group-use-permanent-levels
-@code{gnus-group-use-permanent-levels} $B$,(B @code{nil} $B0J30$G$"$l$P!"0lC6(B
-$B%l%Y%k$r(B @kbd{g} $B$d(B @kbd{l} $B$N%W%l%U%#%C%/%9$KM?$($k$H!"$=$N8e$NA4$F$N%3(B
-$B%^%s%I$K$*$$$F$=$N%l%Y%k$,!V:nMQ$9$k!W%l%Y%k$K$J$j$^$9!#(B
+@code{gnus-group-use-permanent-levels} $B$,(B @code{nil} $B0J30$G$"$l$P!"$$$C(B
+$B$?$s(B @kbd{g} $B$d(B @kbd{l} $B%3%^%s%I$N@\F,0z?t$K%l%Y%k$rM?$($k$H!"$=$N8e$N$9(B
+$B$Y$F$N%3%^%s%I$K$*$$$F$=$N%l%Y%k$,!V:nMQ$9$k!W%l%Y%k$K$J$j$^$9!#(B
 
 @vindex gnus-activate-level
-Gnus $B$ODL>o!"(B@code{gnus-activate-level} $B$+$=$l$h$j>.$5$$%l%Y%k$N%0%k!<%W(B
-$B$N$_$r5/F0$7$^$9(B ($B$D$^$j%5!<%P$KLd$$9g$o$;$r$9$k(B)$B!#9XFI$7$F$$$J$$%0%k!<(B
+gnus $B$ODL>o!"(B@code{gnus-activate-level} $B$+$=$l$h$j>.$5$$%l%Y%k$N%0%k!<%W(B
+$B$N$_$r5/F0$7$^$9(B ($B$D$^$j%5!<%P!<$KLd$$9g$o$;$r$9$k(B)$B!#9XFI$7$F$$$J$$%0%k!<(B
 $B%W$r5/F0$7$?$/$J$1$l$P!"$3$NJQ?t$rNc$($P(B 5 $B$K@_Dj$9$k$H$h$$$+$b$7$l$^$;(B
 $B$s!#%G%#%U%)%k%H$O(B 6 $B$G$9!#(B
 
@@ -2367,39 +2390,40 @@ Gnus $B$ODL>o!"(B@code{gnus-activate-level} $B$+$=$l$h$j>.$5$$%l%Y%k$N%0%k!<%
 
 $BIaDL$O=EMW$J%0%k!<%W$O9b%l%Y%k$K$7$F$*$/$G$7$g$&$1$l$I$b!"$3$NJ}K!$G$O>/!9(B
 $B@)8B$,$-$D$$$G$9$h$M!#$R$g$C$H$7$?$i!"%0%k!<%W$r$I$l$/$i$$IQHK$KFI$`$+$K(B
-$B$h$C$F%0%k!<%W%P%C%U%!$r%=!<%H$7$?$$$J$"!"$J$s$F;W$o$J$$(B? $BM}$K$+$J$C$F$k(B
-$B$G$7$g(B?
-
-@dfn{$B%0%k!<%W%9%3%"(B} (@dfn{group score}) $B$O$=$N$?$a$N$b$N$G$9!#(BGnus $B$K0J(B
-$B2<$G@bL@$5$l$F$$$k5!9=$G!"$=$l$>$l$N%0%k!<%W$KBP$7$F%9%3%"$r;XDj$5$;$k$3(B
-$B$H$,$G$-$^$9!#$=$7$F%0%k!<%W%P%C%U%!$r$3$N%9%3%"$r4p$K%=!<%H$9$k$3$H$,$G(B
-$B$-$^$9!#$"$k$$$O!"%9%3%"=g$G%=!<%H$7$F$=$N8e%l%Y%k$G%=!<%H$9$k$3$H$b$G$-(B
-$B$^$9!#(B($B%l%Y%k$H%9%3%"$r$R$H$^$H$a$K$7$F!"%0%k!<%W(B
-$B$N(B @dfn{$B%i%s%/(B} (@dfn{rank}) $B$H8F$S$^$9!#%l%Y%k$,(B 4 $B$G%9%3%"$,(B 1 $B$N%0%k!<(B
-$B%W$O!"%l%Y%k$,(B 5 $B$G%9%3%"$,(B 300 $B$N%0%k!<%W$h$j$b9b$$%i%s%/$H$J$j$^$9!#(B
-($B%l%Y%k$NJ}$,=EMWEY$,9b$/!"%9%3%"$NJ}$O=EMWEY$,Dc$/$J$j$^$9!#(B))
+$B$h$C$F%0%k!<%W%P%C%U%!!<$rJB$YBX$($?$$$J$"!"$J$s$F;W$$$^$;$s$+(B? $BM}$K$+$J$C(B
+$B$F$k$G$7$g(B?
+
+$B!V%0%k!<%W%9%3%"!W(B(@dfn{group score}) $B$O$=$N$?$a$N$b$N$G$9!#(Bgnus $B$K0J2<(B
+$B$G@bL@$5$l$F$$$k5!9=$G!"$=$l$>$l$N%0%k!<%W$KBP$7$F%9%3%"$r;XDj$9$k$3$H$,(B
+$B$G$-$^$9!#$=$7$F%0%k!<%W%P%C%U%!!<$r$3$N%9%3%"$r4p$KJB$YBX$($k$3$H$,$G$-(B
+$B$^$9!#$"$k$$$O!"%9%3%"=g$GJB$YBX$($F$=$N8e%l%Y%k$GJB$YBX$($k$3$H$b$G$-$^(B
+$B$9!#(B($B%l%Y%k$H%9%3%"$r$R$H$^$H$a$K$7$F!"%0%k!<%W$N!V%i%s%/!W(B
+(@dfn{rank}) $B$H8F$S$^$9!#%l%Y%k$,(B 4 $B$G%9%3%"$,(B 1 $B$N%0%k!<%W$O!"%l%Y%k(B
+$B$,(B 5 $B$G%9%3%"$,(B 300 $B$N%0%k!<%W$h$j$b9b$$%i%s%/$H$J$j$^$9!#(B($B%l%Y%k$NJ}$,(B
+$B=EMWEY$,9b$/!"%9%3%"$NJ}$O=EMWEY$,Dc$/$J$j$^$9!#(B))
 
 @findex gnus-summary-bubble-group
 $BIQHK$KFI$`%0%k!<%W$K!"$a$C$?$KFI$^$J$$%0%k!<%W$h$j$b9b$$%9%3%"$rM?$($?$$(B
 $B$H$-$O!"(B@code{gnus-summary-exit-hook} $B%U%C%/(B
 $B$K(B @code{gnus-summary-bubble-group} $B4X?t$rDI2C$9$k$3$H$,$G$-$^$9!#$3$l$G(B
-$B%P%V%k%=!<%H$Nl9g$G!"$=$l$i$,%0(B
-$B%k!<%W%P%C%U%!$KO"B3$7$F$"$k>l9g$K$O!"DL>oDL$jL?Na$KBP$7$F?t;z@\F,<-$rM?(B
-$B$($k$@$1$G$9!#$=$&$9$l$P$[$H$s$I$N%0%k!<%WL?Na$O!"$3$l$i$N%0%k!<%W$KBP$7(B
-$B$F$"$J$?$NL?Na$K=>$$$^$9!#(B
+$B%k!<%W%P%C%U%!!<$KO"B3$7$F$"$k>l9g$K$O!"DL>oDL$jL?Na$KBP$7$F?tCM@\F,0z?t(B
+$B$rM?$($k$@$1$G$9!#$=$&$9$l$P$[$H$s$I$N%0%k!<%WL?Na$O!"$3$l$i$N%0%k!<%W$K(B
+$BBP$7$F$"$J$?$NL?Na$K=>$$$^$9!#(B
 
 $B$7$+$7$=$l$i$N%0%k!<%W$,=gHV$KJB$s$G$$$J$$>l9g$K$*$$$F$b!"$$$/$D$+$N%0%k!<(B
 $B%W$KBP$7$FL?Na$ro!"(B@code{gnus-activate-level} $B$+$=$l$h$j>.$5$$%l%Y%k$N%0%k!<%
 @itemx M m
 @kindex M m ($B%0%k!<%W(B)
 @findex gnus-group-mark-group
-$B8=:_$N%0%k!<%W$K0u$r$D$1$k(B (@code{gnus-group-mark-group})$B!#(B
+$B8=:_$N%0%k!<%W$K0u$rIU$1$k(B (@code{gnus-group-mark-group})$B!#(B
 
 @item M-#
 @kindex M-# ($B%0%k!<%W(B)
@@ -2419,48 +2443,48 @@ Gnus $B$ODL>o!"(B@code{gnus-activate-level} $B$+$=$l$h$j>.$5$$%l%Y%k$N%0%k!<%
 @item M U
 @kindex M U ($B%0%k!<%W(B)
 @findex gnus-group-unmark-all-groups
-$BA4$F$N%0%k!<%W$+$i0u$r:o=|$9$k(B (@code{gnus-group-unmark-all-groups})$B!#(B
+$B$9$Y$F$N%0%k!<%W$+$i0u$r:o=|$9$k(B (@code{gnus-group-unmark-all-groups})$B!#(B
 
 @item M w
 @kindex M w ($B%0%k!<%W(B)
 @findex gnus-group-mark-region
-$B%]%$%s%H$H%^!<%/$N4V$NA4$F$N%0%k!<%W$K0u$r$D$1(B
+$B%]%$%s%H$H%^!<%/$N4V$N$9$Y$F$N%0%k!<%W$K0u$rIU$1(B
 $B$k(B (@code{gnus-group-mark-region})$B!#(B
 
 @item M b
 @kindex M b ($B%0%k!<%W(B)
 @findex gnus-group-mark-buffer
-$B%P%C%U%!Fb$NA4$F$N%0%k!<%W$K0u$r$D$1$k(B (@code{gnus-group-mark-buffer})$B!#(B
+$B%P%C%U%!!H$7$F$/$@$5$$!#(B
+@ref{Process/Prefix} $B$b;2>H$7$F2<$5$$!#(B
 
 @findex gnus-group-universal-argument
-$B%W%m%;%90u$,IU$1$i$l$F$$$kA4$F$N%0%k!<%W$KBP$7$F2?$+$NL?Na$rR2p$7$^$9!#$3$l(B
-$B$i$NL?Na$OA4$F!"?75,$K:n@.$7$?%0%k!<%W$r%]%$%s%H0LCV$KA^F~$7$^(B
-$B$9!=!=(B@code{gnus-subscribe-newsgroup-method} $B$O;2>H$5$l$^$;$s!#(B
+$B0J2<$G$O!"0lHLE*$J30It%0%k!<%W$N:n@.!"JQ99$r9T$J$&%0%k!<%W%b!<%I$NL?Na$r(B
+$B$$$/$D$+!"$*$h$SFCJL$JL\E*$N%0%k!<%W$r4JC1$K:n@.$9$kL?Na$r>R2p$7$^$9!#$3(B
+$B$l$i$NL?Na$O$9$Y$F!"?75,$K:n@.$7$?%0%k!<%W$r%]%$%s%H0LCV$KA^F~$7$^(B
+$B$9(B---@code{gnus-subscribe-newsgroup-method} $B$O;2>H$5$l$^$;$s!#(B
 
 @table @kbd
 @item G m
 @kindex G m ($B%0%k!<%W(B)
 @findex gnus-group-make-group
 @cindex making groups
-$B?7$7$$%0%k!<%W$r:n@.$7$^$9(B (@code{gnus-group-make-group})$B!#(BGnus $B$O%W%m%s(B
+$B?7$7$$%0%k!<%W$r:n@.$7$^$9(B (@code{gnus-group-make-group})$B!#(Bgnus $B$O%W%m%s(B
 $B%W%H$rI=<($7$F!"L>A0$HJ}K!$H!">l9g$K$h$C$F$O(B @dfn{address} $B$NF~NO$r5a$a(B
 $B$F$-$^$9!#$h$j4JC1$K(B @acronym{NNTP} $B%0%k!<%W$r9XFI$9$kJ}K!$K$D$$$F$O!"(B
 @ref{Browse Foreign Server} $B$r;2>H$7$F2<$5$$!#(B
@@ -2469,7 +2493,7 @@ Gnus $B$ODL>o!"(B@code{gnus-activate-level} $B$+$=$l$h$j>.$5$$%l%Y%k$N%0%k!<%
 @kindex G M ($B%0%k!<%W(B)
 @findex gnus-group-read-ephemeral-group
 $B0l;~%K%e!<%9%0%k!<%W$r:n@.$7$^(B
-$B$9(B (@code{gnus-group-read-ephemeral-group})$B!#(B Gnus $B$O%W%m%s%W%H$rI=<($7(B
+$B$9(B (@code{gnus-group-read-ephemeral-group})$B!#(B gnus $B$O%W%m%s%W%H$rI=<($7(B
 $B$F!"L>A0!"J}K!$*$h$S(B @dfn{address} $B$NF~NO$r5a$a$^$9!#(B
 
 @item G n
@@ -2484,56 +2508,57 @@ Gnus $B$ODL>o!"(B@code{gnus-activate-level} $B$+$=$l$h$j>.$5$$%l%Y%k$N%0%k!<%
 $B%5!<%P!<$N%"%I%l%9$r<($9%7%s%\%kL>$H5-;v%0%k!<%WL>$NF~NO$r5a$a$F$-$^$9!#(B
 $B$3$l$r;H$&$K$O(B @uref{http://emacs-w3m.namazu.org/, emacs-w3m} $B$,I,MW$G$9!#(B
 @code{nnshimbun} $B$K4X$9$k>\:Y(B
-$B$O(B (@pxref{Nnshimbun, , Nnshimbun, emacs-w3m-ja, Emacs-w3m-ja}) $B$r;2>H$7(B
-$B$F2<$5$$!#(B
+$B$O(B @xref{Nnshimbun, ,Nnshimbun, emacs-w3m-ja, Emacs-w3m-ja}, $B$r;2>H$7$F(B
+$B2<$5$$!#(B
 
 @item G r
 @kindex G r ($B%0%k!<%W(B)
 @findex gnus-group-rename-group
 @cindex renaming groups
 $B8=:_$N%0%k!<%W$NL>A0$r!"2?$+JL$N$b$N$KJQ99$7$^(B
-$B$9(B (@code{gnus-group-rename-group})$B!#$3$l$O$"$ko(B
-$B$KCY$$$3$H$bM-$jF@$^$9!#(B
+$B$9(B (@code{gnus-group-rename-group})$B!#$3$l$O$"$ko$K(B
+$BCY$$$3$H$bM-$jF@$^$9!#(B
 
 @item G c
 @kindex G c ($B%0%k!<%W(B)
 @cindex customizing
 @findex gnus-group-customize
-$B%0%k!<%W%Q%i%a!<%?$r%+%9%?%^%$%:$9$k(B (@code{gnus-group-customize})$B!#(B
+$B%0%k!<%W%Q%i%a!<%?!<$r%+%9%?%^%$%:$9$k(B (@code{gnus-group-customize})$B!#(B
 
 @item G e
 @kindex G e ($B%0%k!<%W(B)
 @findex gnus-group-edit-group-method
 @cindex renaming groups
-$B8=:_$N%0%k!<%W$NA*BrJ}K!$r=$@5$9$k$?$a$N%P%C%U%!$K0\F0$7$^(B
+$B8=:_$N%0%k!<%W$NA*BrJ}K!$r=$@5$9$k$?$a$N%P%C%U%!!<$K0\F0$7$^(B
 $B$9(B (@code{gnus-group-edit-group-method})$B!#(B
 
 @item G p
 @kindex G p ($B%0%k!<%W(B)
 @findex gnus-group-edit-group-parameters
-$B%0%k!<%W%Q%i%a!<%?$r=$@5$9$k$?$a$N%P%C%U%!$K0\F0$7$^(B
+$B%0%k!<%W%Q%i%a!<%?!<$r=$@5$9$k$?$a$N%P%C%U%!!<$K0\F0$7$^(B
 $B$9(B (@code{gnus-group-edit-group-parameters})$B!#(B
 
 @item G E
 @kindex G E ($B%0%k!<%W(B)
 @findex gnus-group-edit-group
-$B%0%k!<%W>pJs$r=$@5$9$k$?$a$N%P%C%U%!$K0\F0$7$^(B
+$B%0%k!<%W>pJs$r=$@5$9$k$?$a$N%P%C%U%!!<$K0\F0$7$^(B
 $B$9(B (@code{gnus-group-edit-group})$B!#(B
 
 @item G d
 @kindex G d ($B%0%k!<%W(B)
 @findex gnus-group-make-directory-group
 @cindex nndir
-$B%G%#%l%/%H%j%0%k!<%W$r:n@.$7$^$9(B (@pxref{Directory Groups})$B!#%G%#%l%/%H(B
-$B%jL>$r%W%m%s%W%H$GF~NO$7$^$9(B (@code{gnus-group-make-directory-group})$B!#(B
+$B%G%#%l%/%H%j!<%0%k!<%W$r:n@.$7$^$9(B (@pxref{Directory Groups})$B!#%G%#%l%/(B
+$B%H%j!$r%W%m%s%W%H$GF~NO$7$^(B
+$B$9(B (@code{gnus-group-make-directory-group})$B!#(B
 
 @item G h
 @kindex G h ($B%0%k!<%W(B)
 @cindex help group
 @findex gnus-group-make-help-group
 
-Gnus $B%X%k%W%0%k!<%W$r:n@.$7$^$9(B (@code{gnus-group-make-help-group})$B!#(B
+gnus $B%X%k%W%0%k!<%W$r:n@.$7$^$9(B (@code{gnus-group-make-help-group})$B!#(B
 
 @item G a
 @kindex G a ($B%0%k!<%W(B)
@@ -2542,12 +2567,12 @@ Gnus $B%X%k%W%0%k!<%W$r:n@.$7$^$9(B (@code{gnus-group-make-help-group})$B!#(
 @findex gnus-group-make-archive-group
 @vindex gnus-group-archive-directory
 @vindex gnus-group-recent-archive-directory
-Gnus $B%"!<%+%$%V%0%k!<%W$r:n@.$7$^(B
-$B$9(B (@code{gnus-group-make-archive-group})$B!#=i4|@_Dj$G$O:G$b:G6a$N5-;v$r(B
-$B;X$7$F$$$k%0%k!<%W$,:n@.$5$l$^$9(B
-$B$,(B (@code{gnus-group-recent-archive-directory})$B!"@\F,0z?t$rM?$($k$HA4$F(B
-$B$N5-;v$r4^$`%0%k!<%W$,(B @code{gnus-group-archive-directory} $B$r4p$K:n@.$5(B
-$B$l$^$9!#(B
+gnus $B%"!<%+%$%V%0%k!<%W$r:n@.$7$^(B
+$B$9(B (@code{gnus-group-make-archive-group})$B!#%G%#%U%)%k%H$G$O:G$b:G6a$N5-(B
+$B;v$r;X$7$F$$$k%0%k!<%W$,:n@.$5$l$^$9(B
+$B$,(B (@code{gnus-group-recent-archive-directory})$B!"@\F,0z?t$rM?$($k$H$9$Y(B
+$B$F$N5-;v$r4^$`%0%k!<%W$,(B @code{gnus-group-archive-directory} $B$r4p$K:n@.(B
+$B$5$l$^$9!#(B
 
 @item G k
 @kindex G k ($B%0%k!<%W(B)
@@ -2561,8 +2586,8 @@ kiboze $B%0%k!<%W$r:n@.$7$^$9!#%W%m%s%W%H$GL>A0$H!"(Bkiboze $B%0%k!<%W$K!V4^$
 @kindex G D ($B%0%k!<%W(B)
 @findex gnus-group-enter-directory
 @cindex nneething
-$BG$0U$N%G%#%l%/%H%j$r(B @code{nneething} $B%P%C%/%(%s%I%K%e!<%9%0%k!<%W$G$"$k(B
-$B$+$N$h$&$KFI$_9~$_$^$9(B (@code{gnus-group-enter-directory})$B!#(B
+$BG$0U$N%G%#%l%/%H%j!<$r(B @code{nneething} $B%P%C%/%(%s%I%K%e!<%9%0%k!<%W$G$"(B
+$B$k$+$N$h$&$KFI$_9~$_$^$9(B (@code{gnus-group-enter-directory})$B!#(B
 @xref{Anything Groups}.
 
 @item G f
@@ -2570,22 +2595,21 @@ kiboze $B%0%k!<%W$r:n@.$7$^$9!#%W%m%s%W%H$GL>A0$H!"(Bkiboze $B%0%k!<%W$K!V4^$
 @findex gnus-group-make-doc-group
 @cindex ClariNet Briefs
 @cindex nndoc
-$B%U%!%$%k$J$I$r$b$H$K%0%k!<%W$r:n@.$7$^(B
-$B$9(B (@code{gnus-group-make-doc-group})$B!#$3$N%3%^%s%I$K@\F,<-$rM?$($?>l9g!"(B
-$B%U%!%$%kL>$H%U%!%$%k%?%$%W$r%W%m%s%W%H$GF~NO$7$^$9!#8=:_%5%]!<%H$5$l$F$$(B
-$B$k%U%!%$%k%?%$%W$O(B @code{mbox}, @code{babyl}, @code{digest}, @code{news},
-@code{rnews}, @code{mmdf}, @code{forward}, @code{rfc934},
+$B2?$i$+$N%U%!%$%k$r$b$H$K%0%k!<%W$r:n@.$7$^(B
+$B$9(B (@code{gnus-group-make-doc-group})$B!#$3$N%3%^%s%I$K@\F,0z?t$rM?$($?>l(B
+$B9g!"%U%!%$%kL>$H%U%!%$%k%?%$%W$r%W%m%s%W%H$GF~NO$7$^$9!#8=:_%5%]!<%H$5$l(B
+$B$F$$$k%U%!%$%k%?%$%W$O(B @code{mbox}, @code{babyl}, @code{digest},
+@code{news}, @code{rnews}, @code{mmdf}, @code{forward}, @code{rfc934},
 @code{rfc822-forward}, @code{mime-parts}, @code{standard-digest},
 @code{slack-digest}, @code{clari-briefs}, @code{nsmail}, @code{outlook},
-@code{oe-dbx} $B$*$h$S(B @code{mailman} $B$G$9!#@\F,<-$J$7$G$3$N%3%^%s%I$rA0$H!"(Bkiboze $B%0%k!<%W$K!V4^$
 @cindex nnweb
 @cindex gmane
 $B%&%'%V8!:w7k2L$r$b$H$K0l;~E*$J%0%k!<%W$r:n@.$7$^(B
-$B$9(B (@code{gnus-group-make-web-group})$B!#$3$N%3%^%s%I$K@\F,<-$rM?$($k$H!"(B
+$B$9(B (@code{gnus-group-make-web-group})$B!#$3$N%3%^%s%I$K@\F,0z?t$rM?$($k$H!"(B
 $B0l;~E*$G$O$J$/8GDj$7$?%0%k!<%W$r:n@.$7$^$9!#%W%m%s%W%H$G8!:w%(%s%8%s$NA0$H!"(Bkiboze $B%0%k!<%W$K!V4^$
 @kindex G DEL ($B%0%k!<%W(B)
 @findex gnus-group-delete-group
 $B$3$N4X?t$O8=:_$N%0%k!<%W$r:o=|$7$^$9(B (@code{gnus-group-delete-group})$B!#(B
-$B@\F,<-$,M?$($i$l$k$H!"$3$N4X?t$O$=$N%0%k!<%WFb$NA45-;v$rK\Ev$K:o=|$7!"%0(B
-$B%k!<%W<+?H$r$3$N@$$+$i6/@)E*$KKu;&$7$F$7$^$$$^$9!#@\F,<-$O!"$"$J$?$,2?$r(B
-$B$d$m$&$H$7$F$$$k$+!"K\Ev$K<+?.$,$"$k$H$-$K$N$_;H$C$F$/$@$5$$!#$^$"!"$3$N(B
-$B%3%^%s%I$O(B (@code{nntp} $B%0%k!<%W$N$h$&$J(B) $BFI$_=P$7@lMQ%0%k!<%W$K$O;H$($^(B
-$B$;$s$1$I!#(B
+$B@\F,0z?t$,M?$($i$l$k$H!"$3$N4X?t$O$=$N%0%k!<%WFb$NA45-;v$rK\Ev$K:o=|$7!"(B
+$B%0%k!<%W<+?H$r$3$N@$$+$i6/@)E*$KKu;&$7$F$7$^$$$^$9!#@\F,0z?t$O!"$"$J$?$,(B
+$B2?$r$d$m$&$H$7$F$$$k$+!"K\Ev$K<+?.$,$"$k$H$-$K$N$_;H$C$F2<$5$$!#$^$"!"$3(B
+$B$N%3%^%s%I$O(B (@code{nntp} $B%0%k!<%W$N$h$&$J(B) $BFI$_=P$7@lMQ%0%k!<%W$K$O;H$((B
+$B$^$;$s$1$l$I!#(B
 
 @item G V
 @kindex G V ($B%0%k!<%W(B)
@@ -2641,32 +2665,34 @@ kiboze $B%0%k!<%W$r:n@.$7$^$9!#%W%m%s%W%H$GL>A0$H!"(Bkiboze $B%0%k!<%W$K!V4^$
 
 @vindex gnus-activate-foreign-newsgroups
 $B$b$7(B @code{gnus-activate-foreign-newsgroups} $B$,@5$N?t$G$"$l$P!"(Bgnus $B$O5/(B
-$BF0;~$K!"$3$N?t$+$=$l$h$j$b>.$5$$%l%Y%k$N30It%0%k!<%W$rA4$F%A%'%C%/$7$^$9!#(B
-$B$3$l$OFC$K0c$C$?(B @acronym{NNTP} $B%5!<%P$+$i$?$/$5$s$N%0%k!<%W$r9XFI$7$F$$(B
-$B$k>l9g$J$I!"$7$P$i$/;~4V$,$+$+$k$+$b$7$l$^$;$s!#(B@ref{Group Levels} $B$b;2(B
-$B>H$7$F2<$5$$!#(B@code{gnus-activate-level} $B$b30It%K%e!<%9%0%k!<%W$N3h@-2=(B
-$B$K1F6A$r5Z$\$7$^$9!#(B
+$BF0;~$K!"$3$N?t$+$=$l$h$j$b>.$5$$%l%Y%k$N30It%0%k!<%W$r$9$Y$F%A%'%C%/$7$^(B
+$B$9!#$3$l$OFC$K0c$C$?(B @acronym{NNTP} $B%5!<%P!<$+$i$?$/$5$s$N%0%k!<%W$r9XFI(B
+$B$7$F$$$k>l9g$K$O!"$7$P$i$/;~4V$,$+$+$k$+$b$7$l$^$;$s!#(B
+@ref{Group Levels} $B$b;2>H$7$F2<$5$$!#(B@code{gnus-activate-level} $B$b30It(B
+$B%K%e!<%9%0%k!<%W$N3h@-2=$K1F6A$r5Z$\$7$^$9!#(B
 
 @node Group Parameters
-@section $B%0%k!<%W%Q%i%a!<%?(B
+@section $B%0%k!<%W%Q%i%a!<%?!<(B
 @cindex group parameters
 
-$B%0%k!<%W%Q%i%a!<%?$O!"$"$kFCDj$N%0%k!<%W$K8GM-$J>pJs$r3JG<$7$^$9!#0J2<$O(B
-$B%0%k!<%W%Q%i%a!<%?%j%9%H$NNc$G$9(B:
+$B%0%k!<%W%Q%i%a!<%?!<$O!"$"$kFCDj$N%0%k!<%W$K8GM-$J>pJs$rJ];}$7$^$9!#0J2<(B
+$B$O%0%k!<%W%Q%i%a!<%?!<%j%9%H$NNc$G$9(B:
 
 @example
 ((to-address . "ding@@gnus.org")
  (auto-expire . t))
 @end example
 
-$B$=$l$>$l$NMWAG$O!XE@BP!Y(B(dotted pair)$B!=!=$D$^$jE@(B (dot) $B$NA0$K80!"E@$N8e(B
-$B$m$KCM$,$"$k$b$N!"$G9=@.$5$l$^$9!#A4$F$N%Q%i%a!<%?$O$3$N7A<0$ro$N%j%9%H$K$J$j$^$9!#(B
+$B$=$l$>$l$NMWAG$O!XE@BP!Y(B(dotted pair)---$B$D$^$jE@(B (dot) $B$NA0$K80!"E@$N8e(B
+$B$m$KCM$,$"$k$b$N!"$G9=@.$5$l$^$9!#$9$Y$F$N%Q%i%a!<%?!<$O$3$N7A<0$ro$N%j%9(B
+$B%H(B ($BLuCm(B: $B8e=R$N(B @code{(@var{variable} @var{form})} $B$N9`$r;2>H(B) $B$K$J$j$^(B
+$B$9!#(B
 
-$B$$$/$D$+$N%Q%i%a!<%?$OBP1~$9$k%+%9%?%^%$%:2DG=$JJQ?t$r;}$C$F$$$^$9!#$=$l(B
-$B$i$O@55,I=8=$HCM$NO"A[%j%9%H$G$9!#(B
+$B$$$/$D$+$N%Q%i%a!<%?!<$OBP1~$9$k%+%9%?%^%$%:2DG=$JJQ?t$r;}$C$F$$$^$9!#$=(B
+$B$l$i$O@55,I=8=$HCM$NO"A[%j%9%H$G$9!#(B
 
-$B0J2<$OMxMQ2DG=$J%0%k!<%W%Q%i%a!<%?$G$9(B:
+$B0J2<$OMxMQ2DG=$J%0%k!<%W%Q%i%a!<%?!<$G$9(B:
 
 @table @code
 @item to-address
@@ -2678,14 +2704,14 @@ kiboze $B%0%k!<%W$r:n@.$7$^$9!#%W%m%s%W%H$GL>A0$H!"(Bkiboze $B%0%k!<%W$K!V4^$
 @end example
 
 $B$3$l$OZ$5$l$k$N$G!";22CZ$5$l$k$N$G!";22Ce$K$"$C$?$H$7$^$7$g$&!#$3$l$OK\Ev$N%K%e!<%9%0%k!<%W$G$9$,!"%5!<%P$O%a!<(B
+$B$K4X$o$i$:M-8z$K$J$j$^$9!#Nc$($P(B @samp{fa.4ad-l} $B$H$$$&%0%k!<%W$,%5!<%P!<(B
+$B>e$K$"$C$?$H$7$^$7$g$&!#$3$l$OK\Ev$N%K%e!<%9%0%k!<%W$G$9$,!"%5!<%P!<$O%a!<(B
 $B%k%K%e!<%9%2!<%H%&%'%$$rDL$7$F5-;v$r@\Ej9F$9$k$3$H$OIT2DG=$G!"Be$o$j$K$=$N%a!<%j%s%0%j%9%H$K%a!<%k$rAw(B
 $B?.$7$J$1$l$P$J$j$^$;$s!#(B
@@ -2700,21 +2726,21 @@ kiboze $B%0%k!<%W$r:n@.$7$^$9!#%W%m%s%W%H$GL>A0$H!"(Bkiboze $B%0%k!<%W$K!V4^$
 (to-list . "some@@where.com")
 @end example
 
-$B$3$l$O%U%)%m!<%"%C%W$r$7$?$H$-$O40A4$KL5;k$5$l$^$9!=!=Nc30$O$=$l$,%K%e!<(B
+$B$3$l$O%U%)%m!<%"%C%W$r$7$?$H$-$O40A4$KL5;k$5$l$^$9(B---$BNc30$O$=$l$,%K%e!<(B
 $B%9%0%k!<%W$rI=$o$7$F$$$k$H$-$O!"(B@kbd{f} $B$r2!$7$?$H$-$K%a!<%k%0%k!<%W$N%k!<(B
 $B%k$,E,MQ$5$l$k$H$$$&$3$H$G$9!#(B
 
 $B$b$7(B @kbd{a} $B%3%^%s%I$r%a!<%k%0%k!<%W$GH$7$F2<$5$$!#(B
 
@@ -2723,26 +2749,30 @@ kiboze $B%0%k!<%W$r:n@.$7$^$9!#%W%m%s%W%H$GL>A0$H!"(Bkiboze $B%0%k!<%W$K!V4^$
 @cindex subscribed
 @cindex Mail-Followup-To
 @findex gnus-find-subscribed-addresses
-$B$b$7$3$N%Q%i%a!<%?$,(B @code{t} $B$K@_Dj$5$l$F$$$k$H!"(Bgnus $B$O$"$J$?$,$3$N%0(B
-$B%k!<%W$r(B to-address $B$H(B to-list $B%Q%i%a!<%?$N%"%I%l%9$G9XFI$7$F$$$k%a!<%j(B
-$B%s%0%j%9%H$G$"$k$H2rpJs$r(B gnus $B$KM?$($k$3$H$O!"$"$J$?$,$=(B
-$B$l$i$N%a!<%j%s%0%j%9%H$KEj9F$9$k$H$-$K@5$7$$(B Mail-Followup-To $B%X%C%@!<$r(B
-$B@8@.$9$k$?$a$N(B ($B$[$s$N(B) $BBh0lJb$G$9!#FsJbL\$O(B @file{.gnus.el} $B$K0J2<$rF~(B
-$B$l$k$3$H$G$9!#(B
+$B$b$7$3$N%Q%i%a!<%?!<$,(B @code{t} $B$K@_Dj$5$l$F$$$k$H!"(Bgnus $B$O$"$J$?$,$3$N(B
+$B%0%k!<%W$r(B to-address $B$H(B to-list $B%Q%i%a!<%?!<$N%"%I%l%9$G9XFI$7$F$$$k%a!<(B
+$B%j%s%0%j%9%H$G$"$k$H2rpJs$r(B gnus $B$KM?$($k$3$H$O!"$"$J$?$,(B
+$B$=$l$i$N%a!<%j%s%0%j%9%H$KEj9F$9$k$H$-$K@5$7$$(B Mail-Followup-To $B%X%C%@!<(B
+$B$r@8@.$9$k$?$a$N(B ($B$[$s$N(B) $BBh0lJb$G$9!#FsJbL\$O(B @file{.gnus.el} $B$K0J2<$r(B
+$BF~$l$k$3$H$G$9!#(B
 
 @lisp
 (setq message-subscribed-address-functions
       '(gnus-find-subscribed-addresses))
 @end lisp
 
-$BMxMQ$G$-$k(B MFT $BBP1~5!G=$r40A4$K07$&$K$O!"$3$3(B (@pxref{Mailing Lists, ,
-Mailing Lists, message-ja, The Message Manual}) $B$r8+$F2<$5$$!#(B
+$BMxMQ$G$-$k(B MFT $BBP1~5!G=$r40A4$K07$&$K$O!"$3$3(B (@pxref{Mailing Lists,
+,$B%a!<%j%s%0%j%9%H(B, message-ja, The Message Manual}) $B$r8+$F2<$5$$!#(B
 
 @item visible
 @cindex visible
-$B%0%k!<%W%Q%i%a!<%?$N%j%9%HCf$K(B @code{(visible . t)} $B$H$$$&MWAG$,$"$l$P!"(B
-$B$=$N%0%k!<%W$O%0%k!<%W%P%C%U%!$K$*$$$F!"L$FI5-;v$,$"$k$+$I$&$+$K4X$o$i$:!"(B
-$B>o$KI=<($5$l$^$9!#(B
+$B%0%k!<%W%Q%i%a!<%?!<$N%j%9%HCf$K(B @code{(visible . t)} $B$H$$$&MWAG$,$"$l$P!"(B
+$B$=$N%0%k!<%W$O%0%k!<%W%P%C%U%!!<$K$*$$$F!"L$FI5-;v$,$"$k$+$I$&$+$K4X$o$i(B
+$B$:!">o$KI=<($5$l$^$9!#(B
+
+$B$3$N%Q%i%a!<%?!<$r(B @code{gnus-parameters} $B$r2p$7$F@_Dj$9$k$3$H$O$G$-$^$;(B
+$B$s$,!"Be$o$j$K(B @code{gnus-permanently-visible-groups} $B$r;H$($PNI$$$G$7$g(B
+$B$&!#(B
 
 @item broken-reply-to
 @cindex broken-reply-to
@@ -2750,83 +2780,84 @@ Mailing Lists, message-ja, The Message Manual}) $B$r8+$F2<$5$$!#(B
 $B$O(B @code{Reply-To} $B$OL5;k$5$l!"(B
 @code{reply-to} $B$,(B @code{gnus-boring-article-headers} $B$NItJ,$G$"$l$P!"%X%C(B
 $B%@!<$,1#$5$l$k$H$$$&0UL#$G$9!#$3$l$O$"$k(B listserv $B$K$h$k%a!<%j%s%0%j%9%H(B
-$B$r9XFI$7$F$$$F!"$=$l$,(B @code{Reply-To} $BMs$r(B listserv $B<+?H$KJV$9$h$&$K$D(B
+$B$r9XFI$7$F$$$F!"$=$l$,(B @code{Reply-To} $BMs$r(B listserv $B<+?H$KJV$9$h$&$KIU(B
 $B$1$i$l$F$$$k>l9g$KM-8z$G$7$g$&!#$3$l$O$*$+$7$J?6$kIq$$$G$9!#$@$+$i$3$l$,(B
 $BMW$k$s$G$9(B!
 
 @item to-group
 @cindex to-group
 @code{(to-group . "some.group.name")} $B$H$$$&MWAG$O!"$=$N%0%k!<%W$X$NEj9F(B
-$B$OA4$F(B @code{some.group.name} $B$KAw$i$l$k!"$H$$$&0UL#$G$9!#(B
+$B$O$9$Y$F(B @code{some.group.name} $B$KAw$i$l$k!"$H$$$&0UL#$G$9!#(B
 
 @item newsgroup
 @cindex newsgroup
-$B%0%k!<%W%Q%i%a!<%?%j%9%H$K(B @code{(newsgroup . t)} $B$,$"$l$P!"(Bgnus $B$OA4$F(B
-$B$N1~Ez$r%K%e!<%95-;v$KBP$9$k1~Ez$G$"$k$+$N$h$&$K07$$$^$9!#$3$l$OC5n$5$l$k$h$&$K0u$rIU$1$i$l$^$9!#B>$NJ}K!$O!"(B
+$B%0%k!<%W%Q%i%a!<%?!<$K(B @code{(auto-expire . t)} $B$N$h$&$JMWAG$,$"$l$P!"$9(B
+$B$Y$F$N4{FI5-;v$O4|8B@Z$l>C5n$5$l$k$h$&$K0u$rIU$1$i$l$^$9!#B>$NJ}K!$O!"(B
 @xref{Expiring Mail}.
 
 @code{gnus-auto-expirable-newsgroups} $B$b;2>H$7$F2<$5$$!#(B
 
 @item total-expire
 @cindex total-expire
-$B%0%k!<%W%Q%i%a!<%?$K(B @code{(total-expire . t)} $B$N$h$&$JMWAG$,$"$l$P!"4{(B
-$BFI5-;v$O!";~8B>C5n$N0u$,$D$$$F$$$J$/$H$bA4$F;~8B>C5n=hM}$r;\$5$l$^$9!#Cm(B
-$B0U$7$F;HMQ$7$F$/$@$5$$!#L$FI5-;v!"0uIU$-5-;v!"J]N15-;v$O;~8B>C5n$5$l$^$;(B
-$B$s!#(B
+$B%0%k!<%W%Q%i%a!<%?!<$K(B @code{(total-expire . t)} $B$N$h$&$JMWAG$,$"$l$P!"(B
+$B4{FI5-;v$O!"4|8B@Z$l>C5n$N0u$,IU$$$F$$$J$/$F$b$9$Y$F4|8B@Z$l>C5n=hM}$r;\(B
+$B$5$l$^$9!#Cm0U$7$F;HMQ$7$F2<$5$$!#L$FI5-;v!"0uIU$-5-;v!"J]N15-;v$O4|8B@Z(B
+$B$l>C5n$5$l$^$;$s!#(B
 
 @code{gnus-total-expirable-newsgroups} $B$b;2>H$7$F2<$5$$!#(B
 
 @item expiry-wait
 @cindex expiry-wait
 @vindex nnmail-expiry-wait-function
-$B%0%k!<%W%Q%i%a!<%?$K(B @code{(expiry-wait . 10)} $B$N$h$&$JMWAG$,$"$l$P!"$3(B
-$B$NCM$O5-;v$r;~8B>C5n$9$k$H$-(B
+$B%0%k!<%W%Q%i%a!<%?!<$K(B @code{(expiry-wait . 10)} $B$N$h$&$JMWAG$,$"$l$P!"(B
+$B$3$NCM$O5-;v$r4|8B@Z$l>C5n$9$k$H$-(B
 $B$K(B @code{nnmail-expiry-wait} $B$H(B @code{nnmail-expiry-wait-function} $B$N@_(B
-$BDj(B (@pxref{Expiring Mail}) $B$h$j$bM%@h$5$l$^$9!#$3$NCM$O;~8B>C5n$NF|(B
+$BDj(B (@pxref{Expiring Mail}) $B$h$j$bM%@h$5$l$^$9!#$3$NCM$O4|8B@Z$l>C5n$NF|(B
 $B?t(B ($B@0?t$G$"$kI,MW$O$J$$(B) $B$+$b$7$/$O(B @code{never} $B$+(B @code{immediate} $B$N(B
 $B%7%s%\%k$r;XDj$G$-$^$9!#(B
 
 @item expiry-target
 @cindex expiry-target
-$B;~8B>C5n$5$l$k%a%C%;!<%8$N2L$F$k>l=j!#$3$N%Q%l%a!<%?(B
-$B$O(B @code{nnmail-expiry-target} $B$r>e=q$-$7$^$9!#(B
+$B4|8B@Z$l>C5n$5$l$k%a%C%;!<%8$N2L$F$k>l=j!#$3$N%Q%i%a!<%?!<(B
+$B$O(B @code{nnmail-expiry-target} $B$h$j$bM%@h$5$l$^$9!#(B
 
 @item score-file
 @cindex score file group parameter
 @code{(score-file . "file")} $B$N$h$&$JMWAG$O!"(B@file{file} $B$r8=:_$N%0%k!<(B
-$B%W$KE,MQ$5$l$k%9%3%"%U%!%$%k$K$7$^$9!#E,MQ$5$l$k%9%3%"EPO?$OA4$F$3$N%U%!(B
-$B%$%k$KF~$j$^$9!#(B
+$B%W$KE,MQ$5$l$k%9%3%"%U%!%$%k$K$7$^$9!#$9$Y$F$NE,MQ$5$l$k%9%3%"!&%(%s%H%j!<(B
+$B$O$3$N%U%!%$%k$KF~$j$^$9!#(B
 
 @item adapt-file
 @cindex adapt file group parameter
 @code{(adapt-file . "file")} $B$N$h$&$JMWAG$O!"(B@file{file} $B$r8=:_$N%0%k!<(B
-$B%W$NE,1~%U%!%$%k$K$7$^$9!#A4$F$NE,1~%9%3%"EPO?$O$3$N%U%!%$%k$KF~$j$^$9!#(B
+$B%W$NE,1~%U%!%$%k$K$7$^$9!#$9$Y$F$NE,1~%9%3%"!&%(%s%H%j!<$O$3$N%U%!%$%k$K(B
+$BF~$j$^$9!#(B
 
 @item admin-address
 @cindex admin-address
 $B%a!<%j%s%0%j%9%H$+$iC&2q$9$k$H$-$O!"C&2qDLCN%a!<%k$r$=$N%a!<%j%s%0%j%9%H(B
 $B<+?H$KAw?.$7$F$O$$$1$^$;$s!#Be$o$j$K4IM}MQ%"%I%l%9$K%a%C%;!<%8$rAw?.$7$^(B
-$B$9!#$3$N%Q%i%a!<%?$K$O$I$3$+JXMx$J4IM}MQ%"%I%l%9$r=q$$$F$*$/$3$H$,$G$-$^(B
-$B$9!#(B
+$B$9!#$3$N%Q%i%a!<%?!<$K$O$I$3$+ET9g$NNI$$$J4IM}MQ%"%I%l%9$r=q$$$F$*$/$3$H(B
+$B$,$G$-$^$9!#(B
 
 @item display
 @cindex display
@@ -2835,14 +2866,14 @@ Mailing Lists, message-ja, The Message Manual}) $B$r8+$F2<$5$$!#(B
 
 @table @code
 @item all
-$BL$FI!"4{FI5-;v$NN>J}$rA4$FI=<($7$^$9!#(B
+$BL$FI!"4{FI5-;v$NN>J}$r$9$Y$FI=<($7$^$9!#(B
 
 @item an integer
 $B$=$N%0%k!<%W$N:G8e$N(B @var{integer} $B8D$N5-;v$rI=<($7$^$9!#$3$l(B
 $B$O(B @kbd{C-u @var{integer}} $B$G$=$N%0%k!<%W$KF~$k$N$HF1$8$G$9!#(B
 
 @item default
-$B=i4|@_Dj$G$NI=<(5-;v$rI=<($7$^$9!#$3$l$ODL>o$OL$FI5-;v$H0uIU$-5-;v$G$9!#(B
+$B%G%#%U%)%k%H$N5-;v$rI=<($7$^$9!#$3$l$ODL>o$OL$FI5-;v$H2D;k5-;v$G$9!#(B
 
 @item $BG[Ns(B
 $B=R8l$rK~B-$9$k$h$&$K5-;v$rI=<($7$^$9!#(B
@@ -2867,9 +2898,9 @@ Mailing Lists, message-ja, The Message Manual}) $B$r8+$F2<$5$$!#(B
 @code{unseen} $B$*$h$S(B @code{recent} $B$r4^$_$^$9!#(B
 @end table
 
-@code{display} $B%Q%i%a!<%?$O!"35N,%P%C%U%!$r;XDj$7$?0lIt$NAH$@$1$K@)8B$9(B
-$B$k$h$&$KF/$-$^$9!#@)8B$r%9%?%C%/$+$iA0$H=pL>$K$7$?$$$J$i!"(B
 @code{gnus-posting-styles} $B$r$$$8$i$:$K!"$3$N$h$&$J$b$N$r%0%k!<%W%Q%i%a!<(B
-$B%?$KF~$l$k$3$H$,$G$-$^$9(B:
+$B%?!<$KF~$l$k$3$H$,$G$-$^$9(B:
 
 @example
 (posting-style
@@ -2921,22 +2952,21 @@ See also @code{gnus-group-ignored-charsets-alist}.
 @item banner
 @cindex banner
 @code{(banner . @var{regex})} $B$N$h$&$J9`L\$O!"5-;v$N$9$Y$F$N>l=j$G@55,I=(B
-$B8=(B @var{regex} $B$K%^%C%A$9$k$b$N$r:o=|$7$^$9!#(B@var{regex} $B$NBe$o$j$K%7%s(B
-$B%\%k(B @code{signature} ($B:G8e$N=pL>$r:o(B
-$B=|(B) $B$dO"A[%j%9%H(B @code{gnus-article-banner-alist} $B$N3FMWAG$r;H$&$3$H$b$G(B
-$B$-$^$9!#(B
+$B8=(B @var{regex} $B$K9gCW$9$k$b$N$r:o=|$7$^$9!#(B@var{regex} $B$NBe$o$j$K%7%s%\(B
+$B%k(B @code{signature} ($B:G8e$N=pL>$r:o=|(B) $B$dO"A[%j%9(B
+$B%H(B @code{gnus-article-banner-alist} $B$N3FMWAG$r;H$&$3$H$b$G$-$^$9!#(B
 
 @item sieve
 @cindex sieve
-$B$3$N%Q%i%a!<%?$O!"F~$C$F$-$?%a!<%k$,$3$N%0%k!<%W$KCV$/$KCM$9$k$+$I$&$+$r(B
-$BD4$Y$k(B Sieve ($B$U$k$$(B) $B%F%9%H$r;}$A$^$9!#$3$N%0%k!<%W%Q%i%a!<%?$r85(B
+$B$3$N%Q%i%a!<%?!<$O!"F~$C$F$-$?%a!<%k$,$3$N%0%k!<%W$KCV$/$KCM$9$k$+$I$&$+(B
+$B$rD4$Y$k(B Sieve ($B$U$k$$(B) $B%F%9%H$r;}$A$^$9!#$3$N%0%k!<%W%Q%i%a!<%?!<$r85(B
 $B$K(B @samp{fileinto "group.name";} $B$H$$$&%F%9%H>r7o$rK\BN$K;}$D!"(B
 Sieve $B$N(B @samp{IF} $B@)8f9=B$BN$,:n$i$l$^$9!#(B
 
 $BNc$($P!"$b$7(B @samp{INBOX.list.sieve} $B%0%k!<%W$,(B @code{(sieve address
-"sender" "sieve-admin@@extundo.com")} $B$H$$$&%0%k!<%W%Q%i%a!<%?$r;}$C$F$$(B
-$B$?$J$i$P!"%0%k!<%W%Q%i%a!<%?$r(B Sieve $B%9%/%j%W%H$KJQ49$9$k(B (@pxref{Sieve
-Commands}) $B$H$-$K!"0J2<$N(B Sieve $B%3!<%I$,:n$i$l$^$9(B:
+"sender" "sieve-admin@@extundo.com")} $B$H$$$&%0%k!<%W%Q%i%a!<%?!<$r;}$C$F(B
+$B$$$?$J$i$P!"%0%k!<%W%Q%i%a!<%?!<$r(B Sieve $B%9%/%j%W%H$KJQ49$9(B
+$B$k(B (@pxref{Sieve Commands}) $B$H$-$K!"0J2<$N(B Sieve $B%3!<%I$,:n$i$l$^$9(B:
 
 @example
 if address "sender" "sieve-admin@@extundo.com" @{
@@ -2946,8 +2976,8 @@ if address "sender" "sieve-admin@@extundo.com" @{
 
 $BJ#?t$NEE;R%a!<%k%"%I%l%9$N$?$a$N%F%9%H$r@8@.$9$k$K$O!"(B@code{(sieve
 address "sender" ("name@@one.org" else@@two.org"))} $B$N$h$&$J%0%k!<%W%Q%i(B
-$B%a!<%?$r;H$C$F2<$5$$!#(BSieve $B%9%/%j%W%H(B (@pxref{Sieve Commands}) $B$r@8@.$9(B
-$B$k$H!"0J2<$N$h$&$J(B Sieve $B%3!<%I$,:n$i$l$^$9(B:
+$B%a!<%?!<$r;H$C$F2<$5$$!#(BSieve $B%9%/%j%W%H(B (@pxref{Sieve Commands}) $B$r@8@.(B
+$B$9$k$H!"0J2<$N$h$&$J(B Sieve $B%3!<%I$,:n$i$l$^$9(B:
 
 @example
 if address "sender" ["name@@one.org", "else@@two.org"] @{
@@ -2955,7 +2985,7 @@ if address "sender" ["name@@one.org", "else@@two.org"] @{
 @}
 @end example
 
-Sieve $B%Q%i%a!<%?$K4XO"$9$k=EMW$J%3%^%s%I$HJQ?t$K$D$$$F$O!"(B@pxref{Sieve
+Sieve $B%Q%i%a!<%?!<$K4XO"$9$k=EMW$J%3%^%s%I$HJQ?t$K$D$$$F$O!"(B@ref{Sieve
 Commands} $B$r;2>H$7$F2<$5$$!#(B
 
 Sieve $B8@8l$O(B RFC 3028 $B$G=R$Y$i$l$F$$$^(B
@@ -2963,53 +2993,54 @@ Sieve $B8@8l$O(B RFC 3028 $B$G=R$Y$i$l$F$$$^(B
 
 @item (agent parameters)
 $B%(!<%8%'%s%H$r;H$&$h$&$K$7$F$"$k$H!"8D!9$N%0%k!<%W$G%(!<%8%'%s%H$N?6$kIq(B
-$B$$$r@)8f$9$k$I$N%Q%i%a!<%?$b@_Dj$9$k$3$H$,$G$-$^$9!#%(!<%8%'%s%H%Q%i%a!<(B
-$B%?$K$D$$$F$O(B @ref{Category Syntax} $B$r;2>H$7$F2<$5$$!#$?$$$F$$$N%f!<%6$O!"(B
-$B@_Dj$KMW$9$k6lO+$r:G>.8B$K$9$k$?$a$K!"%(!<%8%'%s%H%+%F%4%j!<$+%0%k!<%W%H(B
-$B%T%C%/$N$I$A$i$+$G%(!<%8%'%s%H%Q%i%a!<%?$r@_Dj$9$k$3$H$rA*$V$G$7$g$&!#(B
+$B$$$r@)8f$9$k$I$N%Q%i%a!<%?!<$b@_Dj$9$k$3$H$,$G$-$^$9!#%(!<%8%'%s%H%Q%i%a!<(B
+$B%?!<$K$D$$$F$O(B @ref{Category Syntax} $B$r;2>H$7$F2<$5$$!#$?$$$F$$$NMxMQ.8B$K$9$k$?$a$K!"%(!<%8%'%s%H%+%F%4%j!<$+%0%k!<(B
+$B%W%H%T%C%/$N$I$A$i$+$G%(!<%8%'%s%H%Q%i%a!<%?!<$r@_Dj$9$k$3$H$rA*$V$G$7$g(B
+$B$&!#(B
 
 @item (@var{variable} @var{form})
 $B%0%k!<%W$KF~$k$H$-$K!"$=$N%0%k!<%W%m!<%+%k$NJQ?t$r@_Dj$9$k%0%k!<%W%Q%i%a!<(B
-$B%?$r;HMQ$9$k$3$H$,$G$-$^$9!#(B@samp{news.answers} $B$K$*$$$F%9%l%C%II=<($r9T(B
-$B$$$?$/$J$$$H$-$O!"$=$N%0%k!<%W$K%0%k!<%W%Q%i%a!<%?(B
+$B%?!<$r;HMQ$9$k$3$H$,$G$-$^$9!#(B@samp{news.answers} $B$K$*$$$F%9%l%C%II=<($r(B
+$B9T$J$$$?$/$J$$$H$-$O!"$=$N%0%k!<%W$K%0%k!<%W%Q%i%a!<%?!<(B
 $B$K(B @code{(gnus-show-threads nil)} $B$H=q$1$^$9!#(B
-@code{gnus-show-threads} $B$O!"$=$N35N,%P%C%U%!$NCf$N%m!<%+%kJQ?t$K$J$j!"(B
-form $B$N(B @code{nil} $B$O$=$3$GI>2A$5$l$^$9!#(B
+@code{gnus-show-threads} $B$O!"$=$N35N,%P%C%U%!!<$NCf$N%m!<%+%kJQ?t$K$J$j!"(B
+form $B$N(B @code{nil} $B$O$=$3$G(B @code{eval} ($BI>2A(B) $B$5$l$^$9!#(B
 
-$B$3$N5!G=$O!"JQ?t$r35N,%P%C%U%!$G%m!<%+%k$K@_Dj$9$k$3$H$KCm0U$7$F2<$5$$!#(B
-$B$G$b!"$$$/$D$+$NJQ?t$O5-;v%P%C%U%!$+(B ($BJV?.!"%U%)%m!2A$5$l$^$9!#Be$o$j$K!"LdBj$NJQ?t(B
-$B$r(B @code{gnus-newsgroup-variables} $B$K2C$($k$3$H$,=u$1$K$J$k$+$b$7$l$^$;(B
-$B$s!#$7$?$,$C$F!"%0%k!<%W%Q%i%a!<%?$r2p$7$F(B @code{message-from-style} $B$r(B
-$B@_Dj$7$?$$$J$i$P!"(B@file{~/.gnus}$B%U%!%$%k$N$I$3$+B>$N$H$3$m$K!"2A$5$l$^$9!#Be$o$j$K!"LdBj$N(B
+$BJQ?t$r(B @code{gnus-newsgroup-variables} $B$K2C$($k$3$H$,=u$1$K$J$k$+$b$7$l(B
+$B$^$;$s!#$7$?$,$C$F!"%0%k!<%W%Q%i%a!<%?!<$r2p$7(B
+$B$F(B @code{message-from-style} $B$r@_Dj$7$?$$$J$i$P!"(B@file{~/.gnus} $B%U%!%$%k(B
+$B$N$I$3$+B>$N$H$3$m$K!"Ms$+$i%a!<%j%s%0%j%9%H$NI8<1%?%0$r$O$.(B
+$B$3$N5!G=$NMQES$N0l$D$O!"5-;v$NI=BjMs$+$i%a!<%j%s%0%j%9%H$NI8<1%?%0$r$O$.(B
 $B$K(B @samp{DOC-BOOK-APPS:} $B$H$$$&%?%0$r;}$C$F$$$k$J(B
-$B$i$P!"$=$N%0%k!<%W$N%0%k!<%W%Q%i%a!<%?$K(B @code{(gnus-list-identifiers
-"DOCBOOK-APPS:")} $B$rF~$l$k$3$H$K$h$C$F!"$=$N%0%k!<%W$N35N,%P%C%U%!$KI=<((B
-$B$5$l$k5-;v$NBjL>$+$i%?%0$r$O$.2A7k(B
-$B2L$,@_Dj$5$l$^$9!#(B
+$B%?!<$K(B @code{(dummy-variable (ding))} $B$_$?$$$J$b$N$r=q$$$F$*$/$3$H$b$G$-(B
+$B$^$9!#(B@code{dummy-variable} $B$H$$$&JQ?t$K(B ($BL50UL#$J(B) @code{(ding)} $B$NI>2A(B
+$B7k2L$,@_Dj$5$l$^$9!#(B
 
 $B$"$k$$$O!"(B@var{variable} $B$O$=$N%0%k!<%W$KBP$7$F%m!<%+%k$K$J$k$N$G!"$3$N(B
 $BMM<0$O0l;~E*$K%U%C%/$rJQ99$9$k$?$a$K;H$&$3$H$,$G$-$^$9!#Nc$($P!"0J2<$N$b(B
-$B$N$,%0%k!<%W%Q%i%a!<%?$KDI2C$5$l$k$H!"(B
+$B$N$,%0%k!<%W%Q%i%a!<%?!<$KDI2C$5$l$k$H!"(B
 
 @lisp
 (gnus-summary-prepared-hook
@@ -3020,15 +3051,16 @@ nntp+news.gnus.org:gmane.text.docbook.apps
 $B$$$h$&$K$J$j$^$9!#(B
 @end table
 
-$B%0%k!<%W%Q%i%a!<%?$N=$@5$K$O(B @kbd{G p} $B$+(B @kbd{G c} $BL?Na$r;H$C$F$/$@$5(B
+$B%0%k!<%W%Q%i%a!<%?!<$N=$@5$K$O(B @kbd{G p} $B$+(B @kbd{G c} $BL?Na$r;H$C$F2<$5(B
 $B$$(B (@kbd{G p} $B$O(B Lisp $B%Y!<%9$N!"(B@kbd{G c} $B$O(B Custom $B$U$&$N%$%s%?!<%U%'!<(B
-$B%9$rDs6!$7$^$9(B)$B!#%H%T%C%/%Q%i%a!<%?$K$D$$$FFI$s$G$_$k$3$H$bLLGr$$$G$7$g(B
+$B%9$rDs6!$7$^$9(B)$B!#%H%T%C%/%Q%i%a!<%?!<$K$D$$$FFI$s$G$_$k$3$H$bLLGr$$$G$7$g(B
 $B$&(B (@pxref{Topic Parameters})$B!#(B
 
 @vindex gnus-parameters
-$B%0%k!<%W%Q%i%a!<%?$O(B @code{gnus-parameters} $BJQ?t$r2p:_$7$F@_Dj$9$k$3$H$b(B
-$B$G$-$^$9!#$G$b$$$/$D$+$N%Q%i%a!<%?!"Nc$($P(B @code{visible} $B$O8zNO$rH/4x$7(B
-$B$^$;$s!#Nc$G$9!#(B
+$B%0%k!<%W%Q%i%a!<%?!<$O(B @code{gnus-parameters} $BJQ?t$r2p:_$7$F@_Dj$9$k$3$H(B
+$B$b$G$-$^$9!#$G$b$$$/$D$+$N%Q%i%a!<%?!l9g!"BeBX$H$7(B
+$B$F(B @code{gnus-permanently-visible-groups} $B$r;H$&$3$H$,$G$-$^$9(B)$B!#Nc$G$9(B:
 
 @lisp
 (setq gnus-parameters
@@ -3054,6 +3086,44 @@ nntp+news.gnus.org:gmane.text.docbook.apps
 $BJ8;zNs$NCM$O!"(B@code{to-group} $B$NNc$,<($9$h$&$K!"@55,I=8=$K$h$kCV$-49$($r(B
 $B$H(B @code{gnus-parameters} $B$G;XDj$5$l$?$3$l$i$N@55,I=8=$N0l$D$r(B
+$BHf3S$9$k$H$-$KBgJ8;z$H>.J8;z$r6hJL$9$k$+$I$&$+$O!"%G%#%U%)%k%H$G$O$=$NHf(B
+$B3S$r9T$J$&;~E@$G$N(B @code{case-fold-search} $B$NCM$K0MB8$7$^$9!#0lHLE*(B
+$B$K(B @code{case-fold-search} $B$NCM$O(B @code{t} $B$G!"$=$l$ONc$((B
+$B$P(B @code{("INBOX\\.FOO" (total-expire . t))} $B$H$$$&MWAG(B
+$B$,!"(B@samp{INBOX.FOO} $B%0%k!<%W$H(B @samp{INBOX.foo} $B%0%k!<%W$NN>J}$KE,MQ$5(B
+$B$l$k$3$H$r0UL#$7$^$9!#$3$l$i$N@55,I=8=$,>o$KBgJ8;z$H>.J8;z$r6hJL$9$k$h$&(B
+$B$K$7$?$$>l9g$O!"(B@code{gnus-parameters-case-fold-search} $BJQ?t$NCM(B
+$B$r(B @code{nil} $B$K@_Dj$7$F2<$5$$!#$"$k$$$O!"$=$l$i$,>o$KBgJ8;z$H>.J8;z$r6h(B
+$BJL$7$J$$$h$&$K$7$?$$$J$i!"$=$l$r(B @code{t} $B$K@_Dj$7$F2<$5$$!#(B
+
+@code{gnus-parameters} $B$r2p$9$k$3$H$K$h$C$F!"%0%k!<%W$K$h$C$F0[$J$kJB$Y(B
+$BBX$($rDj5A$9$k$3$H$,$G$-$^$9!#$3$l$O!"(B@acronym{NNTP} $B%0%k!<%W$G$O:G?7$N(B
+$B%K%e!<%9$,@hF,$K$J$k$h$&$KF|IU$G!"(B@acronym{RSS} $B%0%k!<%W$G$OI=Bj$G!"$=$l(B
+$B$>$lJB$YBX$($r9T$J$&Nc$G$9!#$3$NNc$N:G=i$N%0%k!<%W$O!"(Bnews.gmane.org $B$+(B
+$B$i.$5$$%l%Y%k$N%0(B
-$B%k!<%W$N$_$rI=<($7$^$9!#=i4|@_Dj$G$O!"$3$l$O%l%Y%k(B 5 ($B$D$^(B
-$B$j(B @code{gnus-group-default-list-level}) $B$+$=$l$h$j>.$5$$%l%Y%k(B ($B$9$J$o(B
-$B$A9XFI$7$F$$$k%0%k!<%W$N$_(B) $B$rI=<($7$^$9!#(B
+$BL$FI5-;v$r;}$D$9$Y$F$N%0%k!<%W$rI=<($7$^(B
+$B$9(B (@code{gnus-group-list-groups})$B!#?tCM@\F,0z?t$r;H$&$H!"$3$N%3%^%s%I$O(B
+$B0z?t$N?t$+$=$l$h$j$b>.$5$$%l%Y%k$N%0%k!<%W$N$_$rI=<($7$^$9!#%G%#%U%)%k%H(B
+$B$G$O!"$3$l$O%l%Y%k(B 5 ($B$D$^$j(B @code{gnus-group-default-list-level}) $B$+$=(B
+$B$l$h$j>.$5$$%l%Y%k(B ($B$9$J$o$A9XFI$7$F$$$k%0%k!<%W$N$_(B) $B$rI=<($7$^$9!#(B
 
 @item L
 @itemx A u
 @kindex A u ($B%0%k!<%W(B)
 @kindex L ($B%0%k!<%W(B)
 @findex gnus-group-list-all-groups
-$BL$FI5-;v$N$"$k$J$7$K4X$o$i$:!"A4$F$N%0%k!<%W$rI=<($7$^(B
-$B$9(B (@code{gnus-group-list-all-groups})$B!#?t;z@\F,0z?t$r;HMQ$9$k$H!"$3$N%3(B
-$B%^%s%I$O0z?t$N?t$+$=$l$h$j$b>.$5$$%l%Y%k$N%0%k!<%W$N$_$rI=<($7$^$9!#=i4|(B
-$B@_Dj$G$O(B 7 $B$+$=$l$h$j$b>.$5$$%l%Y%k$N%0%k!<%W(B ($B$9$J$o$A9XFI!"Hs9XFI$N%0(B
-$B%k!<%W$N$_(B) $B$,I=<($5$l$^$9!#(B
+$BL$FI5-;v$N$"$k$J$7$K4X$o$i$:!"$9$Y$F$N%0%k!<%W$rI=<($7$^(B
+$B$9(B (@code{gnus-group-list-all-groups})$B!#?tCM@\F,0z?t$r;HMQ$9$k$H!"$3$N%3(B
+$B%^%s%I$O0z?t$N?t$+$=$l$h$j$b>.$5$$%l%Y%k$N%0%k!<%W$N$_$rI=<($7$^$9!#%G%#(B
+$B%U%)%k%H$G$O(B 7 $B$+$=$l$h$j$b>.$5$$%l%Y%k$N%0%k!<%W(B ($B$9$J$o$A9XFI!"Hs9XFI(B
+$B$N%0%k!<%W$N$_(B) $B$,I=<($5$l$^$9!#(B
 
 @item A l
 @kindex A l ($B%0%k!<%W(B)
 @findex gnus-group-list-level
-$B$"$kFCDj$N%l%Y%k$NL$FI5-;v$N$"$k%0%k!<%W$rI=<($7$^(B
-$B$9(B (@code{gnus-group-list-level})$B!#@\F,<-$rM?$($k$H!"L$FI5-;v$N$J$$%0%k!<(B
-$B%W$b4^$a$FI=<($7$^$9!#(B
+$BL$FI5-;v$,$"$k%0%k!<%W$N$&$A!";XDj$7$?%l%Y%k$N$b$N$@$1$rI=<($7$^(B
+$B$9(B (@code{gnus-group-list-level})$B!#@\F,0z?t$rM?$($k$H!"L$FI5-;v$NL5$$%0(B
+$B%k!<%W$b4^$a$FI=<($7$^$9!#(B
 
 @item A k
 @kindex A k ($B%0%k!<%W(B)
 @findex gnus-group-list-killed
-kill $B$5$l$?%0%k!<%W$rA4$FI=<($7$^$9(B (@code{gnus-group-list-killed})$B!#@\(B
-$BF,0z?t$rM?$($k$H!"8=:_9XFI!"Hs9XFI$H$J$C$F$$$J$$A4$F$NMxMQ2DG=$J%0%k!<%W(B
-$B$rI=<($7$^$9!#$3$l$O%5!<%P$+$i%"%/%F%#%V%U%!%$%k$rFI$`$3$H$K$J$k$G$7$g$&!#(B
+kill $B$5$l$?%0%k!<%W$r$9$Y$FI=<($7$^$9(B (@code{gnus-group-list-killed})$B!#(B
+$B@\F,0z?t$rM?$($k$H!"9XFI$^$?$OHs9XFI$N$I$A$i$K$b$J$C$F$$$J$$$9$Y$F$NMxMQ(B
+$B2DG=$J%0%k!<%W$rI=<($7$^$9!#$3$l$O%5!<%P!<$+$i%"%/%F%#%V%U%!%$%k$rFI$`$3(B
+$B$H$K$J$k$G$7$g$&!#(B
 
 @item A z
 @kindex A z ($B%0%k!<%W(B)
 @findex gnus-group-list-zombies
-$BA4$F$N%>%s%S%0%k!<%W$rI=<($7$^$9(B (@code{gnus-group-list-zombies})$B!#(B
+$B$9$Y$F$N%>%s%S%0%k!<%W$rI=<($7$^$9(B (@code{gnus-group-list-zombies})$B!#(B
 
 @item A m
 @kindex A m ($B%0%k!<%W(B)
 @findex gnus-group-list-matching
-$B@55,I=8=$K9gCW$9$kL>A0$r;}$D%0%k!<%W$G!"L$FI5-;v$N$"$k9XFI%0%k!<%W$rA4$F(B
-$BI=<($7$^$9(B (@code{gnus-group-list-matching})$B!#(B
+$B@55,I=8=$K9gCW$9$kL>A0$r;}$D%0%k!<%W$G!"L$FI5-;v$N$"$k9XFI%0%k!<%W$r$9$Y(B
+$B$FI=<($7$^$9(B (@code{gnus-group-list-matching})$B!#(B
 
 @item A M
 @kindex A M ($B%0%k!<%W(B)
 @findex gnus-group-list-all-matching
-$B@55,I=8=$K9gCW$9$k%0%k!<%W$rI=<($9(B
-$B$k(B (@code{gnus-group-list-all-matching})$B!#(B
+$B@55,I=8=$K9gCW$9$k%0%k!<%W$rI=<($7$^(B
+$B$9(B (@code{gnus-group-list-all-matching})$B!#(B
 
 @item A A
 @kindex A A ($B%0%k!<%W(B)
 @findex gnus-group-list-active
-$B:#@\B3$7$F$$$k%5!<%P$N%"%/%F%#%V%U%!%$%k$K$"$k%0%k!<%W$r!"K\Ev$KA4ItI=<((B
-$B$7$^$9(B (@code{gnus-group-list-active})$B!#$3$l$O$7$P$i$/;~4V$,$+$+$k$3$H$b(B
-$BM-$jF@$^$9!#$?$V$s(B @kbd{A M} $B$r/3d$j0z$$$F/(B
+$B3d$j0z$$$FA0$r;}$D%0%k!<%W$rA4$FI=<($9(B
-$B$k(B (@code{gnus-group-apropos})$B!#(B
+$B@55,I=8=$K9gCW$9$kL>A0$r;}$D%0%k!<%W$r$9$Y$FI=<($7$^(B
+$B$9(B (@code{gnus-group-apropos})$B!#(B
 
 @item A d
 @kindex A d ($B%0%k!<%W(B)
 @findex gnus-group-description-apropos
-$B@55,I=8=$K9gCW$9$kL>A0$+@bL@J8$r;}$D%0%k!<%W$rA4$FI=<($9(B
-$B$k(B (@code{gnus-group-description-apropos})$B!#(B
+$B@55,I=8=$K9gCW$9$kL>A0$+@bL@J8$r;}$D%0%k!<%W$r$9$Y$FI=<($7$^(B
+$B$9(B (@code{gnus-group-description-apropos})$B!#(B
 
 @item A c
 @kindex A c ($B%0%k!<%W(B)
 @findex gnus-group-list-cached
-$B%-%c%C%7%e5-;v$r;}$D%0%k!<%W$rA4$FI=<($9(B
-$B$k(B (@code{gnus-group-list-cached})$B!#(B
+$B%-%c%C%7%e5-;v$r;}$D%0%k!<%W$r$9$Y$FI=<($7$^(B
+$B$9(B (@code{gnus-group-list-cached})$B!#(B
 
 @item A ?
 @kindex A ? ($B%0%k!<%W(B)
 @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
+$BJ]N15-;v$r;}$D%0%k!<%W$r$9$Y$FI=<($7$^(B
+$B$9(B (@code{gnus-group-list-dormant})$B!#(B
 
 @item A /
 @kindex A / ($B%0%k!<%W(B)
 @findex gnus-group-list-limit
-$B8=:_$NA*Br$5$l$?HO0O$K8BDj$7$?%0%k!<%W$rI=<($9(B
-$B$k(B (@code{gnus-group-list-limit})$B!#(B
+$B8=:_$NA*Br$5$l$?HO0O$K8BDj$7$?%0%k!<%W$rI=<($7$^(B
+$B$9(B (@code{gnus-group-list-limit})$B!#(B
 
 @item A f
 @kindex A f ($B%0%k!<%W(B)
 @findex gnus-group-list-flush
-$B8=:_$NA*Br$5$l$?%0%k!<%W$r=q$-=P$9(B (@code{gnus-group-list-flush})$B!#(B
+$B8=:_$NA*Br$5$l$?%0%k!<%W$r=q$-=P$7$^$9(B (@code{gnus-group-list-flush})$B!#(B
 
 @item A p
 @kindex A p ($B%0%k!<%W(B)
 @findex gnus-group-list-plus
-$B8=:_$NA*Br$5$l$?%0%k!<%W$r2C$($?%0%k!<%W$rI=<($9(B
-$B$k(B (@code{gnus-group-list-plus})$B!#(B
+$B8=:_$NA*Br$5$l$?%0%k!<%W$r2C$($?%0%k!<%W$rI=<($7$^(B
+$B$9(B (@code{gnus-group-list-plus})$B!#(B
 @end table
 
 @vindex gnus-permanently-visible-groups
 @cindex visible group parameter
 @code{gnus-permanently-visible-groups} $B@55,I=8=$K9gCW$9$k%0%k!<%W$O!"L$(B
 $BFI5-;v$,$"$k$+$J$$$+$K4X$o$i$:>o$KI=<($5$l$^$9!#$"$k$$$O%0%k!<%W%Q%i%a!<(B
-$B%?$K$*$$$F(B @code{visible} $BMWAG$rDI2C$9$k$3$H$G$bF1MM$N8z2L$rF@$k$3$H$,$G(B
-$B$-$^$9!#(B
+$B%?!<$K$*$$$F(B @code{visible} $BMWAG$rDI2C$9$k$3$H$G$bF1MM$N8z2L$rF@$k$3$H$,(B
+$B$G$-$^$9!#(B
 
 @vindex gnus-list-groups-with-ticked-articles
-$B0uIU$-$N5-;v$N$_$r;}$D%0%k!<%W$ODL>o%0%k!<%W%P%C%U%!$KI=<($5$l$^$9!#$b(B
+$B0uIU$-$N5-;v$N$_$r;}$D%0%k!<%W$ODL>o%0%k!<%W%P%C%U%!!<$KI=<($5$l$^$9!#$b(B
 $B$7(B @code{gnus-list-groups-with-ticked-articles} $B$,(B @code{nil} $B$G$"$l$P!"(B
-$B$=$N%0%k!<%W$O40A4$K6u$N%0%k!<%W$G$"$k$+$N$h$&$K07$o$l$^$9!#=i4|CM(B
+$B$=$N%0%k!<%W$O40A4$K6u$N%0%k!<%W$G$"$k$+$N$h$&$K07$o$l$^$9!#%G%#%U%)%k%H(B
 $B$O(B @code{t} $B$G$9!#(B
 
 @node Sorting Groups
-@section $B%0%k!<%W$N%=!<%H(B
+@section $B%0%k!<%W$NJB$YBX$((B
 @cindex sorting groups
 
 @kindex C-c C-s ($B%0%k!<%W(B)
 @findex gnus-group-sort-groups
 @vindex gnus-group-sort-function
-@kbd{C-c C-s} (@code{gnus-group-sort-groups}) $BL?Na$O!"%0%k!<%W%P%C%U%!(B
+@kbd{C-c C-s} (@code{gnus-group-sort-groups}) $BL?Na$O!"%0%k!<%W%P%C%U%!!<(B
 $B$r(B @code{gnus-group-sort-function} $BJQ?t$GM?$($i$l$k4X?t$K=>$C$FJB$YBX$((B
 $B$^$9!#MxMQ2DG=$JJB$YBX$(4X?t(B (sorting function) $B$K$O0J2<$N$b$N$,$"$j$^(B
 $B$9(B:
@@ -3193,7 +3266,7 @@ kill $B$5$l$?%0%k!<%W$rA4$FI=<($7$^$9(B (@code{gnus-group-list-killed})$B!#@\
 @table @code
 @item gnus-group-sort-by-alphabet
 @findex gnus-group-sort-by-alphabet
-$B%0%k!<%WL>$G%"%k%U%!%Y%C%H=g$KJB$YBX$($^$9!#$3$l$,=i4|@_Dj$G$9!#(B
+$B%0%k!<%WL>$G%"%k%U%!%Y%C%H=g$KJB$YBX$($^$9!#$3$l$,%G%#%U%)%k%H$G$9!#(B
 
 @item gnus-group-sort-by-real-name
 @findex gnus-group-sort-by-real-name
@@ -3211,7 +3284,7 @@ kill $B$5$l$?%0%k!<%W$rA4$FI=<($7$^$9(B (@code{gnus-group-list-killed})$B!#@\
 @item gnus-group-sort-by-rank
 @findex gnus-group-sort-by-rank
 $B%0%k!<%W$N%9%3%"$GJB$YBX$(!"$N%"%k%U%!%Y%C%H=g$GJB$YBX$($^(B
+$B%0%k!<%W%P%C%U%!!<$r%0%k!<%WL>$N%"%k%U%!%Y%C%H=g$GJB$YBX$($^(B
 $B$9(B (@code{gnus-group-sort-groups-by-alphabet})$B!#(B
 
 @item G S u
 @kindex G S u ($B%0%k!<%W(B)
 @findex gnus-group-sort-groups-by-unread
-$B%0%k!<%W%P%C%U%!$rL$FI5-;v$N?t$GJB$YBX$($^(B
+$B%0%k!<%W%P%C%U%!!<$rL$FI5-;v$N?t$GJB$YBX$($^(B
 $B$9(B (@code{gnus-group-sort-groups-by-unread})$B!#(B
 
 @item G S l
 @kindex G S l ($B%0%k!<%W(B)
 @findex gnus-group-sort-groups-by-level
-$B%0%k!<%W%P%C%U%!$r%0%k!<%W%l%Y%k$GJB$YBX$($^(B
+$B%0%k!<%W%P%C%U%!!<$r%0%k!<%W%l%Y%k$GJB$YBX$($^(B
 $B$9(B (@code{gnus-group-sort-groups-by-level})$B!#(B
 
 @item G S v
 @kindex G S v ($B%0%k!<%W(B)
 @findex gnus-group-sort-groups-by-score
-$B%0%k!<%W%P%C%U%!$r%0%k!<%W$N%9%3%"$GJB$YBX$($^(B
+$B%0%k!<%W%P%C%U%!!<$r%0%k!<%W$N%9%3%"$GJB$YBX$($^(B
 $B$9(B (@code{gnus-group-sort-groups-by-score})$B!#(B@xref{Group Score}.
 
 @item G S r
 @kindex G S r ($B%0%k!<%W(B)
 @findex gnus-group-sort-groups-by-rank
-$B%0%k!<%W%P%C%U%!$r%0%k!<%W$N%i%s%/$GJB$YBX$($^(B
+$B%0%k!<%W%P%C%U%!!<$r%0%k!<%W$N%i%s%/$GJB$YBX$($^(B
 $B$9(B (@code{gnus-group-sort-groups-by-rank})$B!#(B@xref{Group Score}.
 
 @item G S m
 @kindex G S m ($B%0%k!<%W(B)
 @findex gnus-group-sort-groups-by-method
-$B%0%k!<%W%P%C%U%!$r%P%C%/%(%s%I$NL>A0$G%"%k%U%!%Y%C%H=g$KJB$YBX$($^(B
+$B%0%k!<%W%P%C%U%!!<$r%P%C%/%(%s%I$NL>A0$G%"%k%U%!%Y%C%H=g$KJB$YBX$($^(B
 $B$9(B (@code{gnus-group-sort-groups-by-method})$B!#(B
 
 @item G S n
 @kindex G S n ($B%0%k!<%W(B)
 @findex gnus-group-sort-groups-by-real-name
-$B%0%k!<%W%P%C%U%!$rK\Ev$N(B ($BA0$K2?$bIU$$$F$$$J$$(B) $B%0%k!<%WL>$G%"%k%U%!%Y%C(B
+$B%0%k!<%W%P%C%U%!!<$rK\Ev$N(B ($BA0$K2?$bIU$$$F$$$J$$(B) $B%0%k!<%WL>$G%"%k%U%!%Y%C(B
 $B%H=g$KJB$YBX$($^$9(B (@code{gnus-group-sort-groups-by-real-name})$B!#(B
 @end table
 
-$B0J2<$NA4$F$NL?Na$O%W%m%;%9(B/$B@\F,<-$N=,47$K=>$$$^(B
+$B0J2<$N$9$Y$F$NL?Na$O%W%m%;%9(B/$B@\F,0z?t$N=,47$K=>$$$^(B
 $B$9(B (@pxref{Process/Prefix})$B!#(B
 
-$B%7%s%\%k@\F,<-(B (@pxref{Symbolic Prefixes}) $B$,M?$($i$l$?$H$-$O!"$3$l$iA4(B
-$B$F$NL?Na$O5U=g$GJB$S49$($^$9!#(B
+$B%7%s%\%k@\F,0z?t(B (@pxref{Symbolic Prefixes}) $B$,M?$($i$l$?$H$-$O!"$3$l$i(B
+$B$9$Y$F$NL?Na$O5U=g$GJB$S49$($^$9!#(B
 
 $B$^$?!"%0%k!<%W$N0lIt$rJB$YBX$($k$3$H$b$G$-$^$9!#(B
 
@@ -3353,28 +3426,28 @@ kill $B$5$l$?%0%k!<%W$rA4$FI=<($7$^$9(B (@code{gnus-group-list-killed})$B!#@\
 @findex gnus-group-find-new-groups
 $B?7$7$$%0%k!<%W$r8+$D$1$F!"$=$l$i$r=hM}$7$^(B
 $B$9(B (@code{gnus-group-find-new-groups})$B!#0l2s$N(B @kbd{C-u} $B$N8e$G2!$5$l$k(B
-$B$H!"%5!<%P!<$K?7$7$$%0%k!<%W$r?R$M$k$?$a$KJ}K!(B @code{ask-server} $B$r;H$$(B
-$B$^$9!#Fs2s$N(B @kbd{C-u} $B$N8e$G2!$5$l$k$H!"%5!<%P!<$K?7$7$$%0%k!<%W$r?R$M(B
-$B$k$?$a$K:G$b40A4$G$"$k$H;W$o$l$kJ}K!$rMQ$$!"?7$7$$%0%k!<%W$r%>%s%S$H$7$F(B
-$B9XFI$7$^$9!#(B
+$B$H!"%5!<%P!<$K?7$7$$%0%k!<%W$r?R$M$k$?$a$K(B @code{ask-server} $B$NJ}K!$r;H(B
+$B$$$^$9!#Fs2s$N(B @kbd{C-u} $B$N8e$G2!$5$l$k$H!"%5!<%P!<$K?7$7$$%0%k!<%W$r?R(B
+$B$M$k$?$a$K:G$b40A4$G$"$k$H;W$o$l$kJ}K!$rMQ$$!"?7$7$$%0%k!<%W$r%>%s%S$H$7(B
+$B$F9XFI$7$^$9!#(B
 
 @item C-c C-x
 @kindex C-c C-x ($B%0%k!<%W(B)
 @findex gnus-group-expire-articles
-$B8=:_$N%0%k!<%W$N%(%/%9%Q%$%"5-;v$KBP$7$F(B ($B$b$7$"$l$P(B) $BA4$F%(%/%9%Q%$%"=h(B
-$BM}$r9T$$$^$9(B (@code{gnus-group-expire-articles})$B!#$3$l$O!"$=$N%0%k!<%W$K(B
-$B$7$P$i$/B8:_$7$F$$$?4|8B@Z$l:o=|2DG=$J$9$Y$F$N5-;v$r>C5n$9$k$H$$$&$3$H$G(B
-$B$9!#(B(@pxref{Expiring Mail})$B!#(B
+$B8=:_$N%0%k!<%W$N4|8B@Z$l>C5n2DG=$J5-;v$KBP$7$F(B ($B$b$7$"$l$P(B) $B$9$Y$F4|8B@Z(B
+$B$l>C5n$N=hM}$r9T$J$$$^$9(B (@code{gnus-group-expire-articles})$B!#$3$l$O!"$=(B
+$B$N%0%k!<%W$K$7$P$i$/B8:_$7$F$$$?4|8B@Z$l>C5n2DG=$J$9$Y$F$N5-;v$r>C5n$9$k(B
+$B$H$$$&$3$H$G$9!#(B(@pxref{Expiring Mail})$B!#(B
 
 @item C-c C-M-x
 @kindex C-c C-M-x ($B%0%k!<%W(B)
 @findex gnus-group-expire-all-groups
-$BA4$F$N%0%k!<%W$NA4$F$N4|8B@Z$l:o=|2DG=$J5-;v$KBP$7$F!"%(%/%9%Q%$%"=hM}$r(B
-$B9T$$$^$9!#(B(@code{gnus-group-expire-all-groups})$B!#(B
+$B$9$Y$F$N%0%k!<%W$N$9$Y$F$N4|8B@Z$l>C5n2DG=$J5-;v$KBP$7$F!"4|8B@Z$l>C5n$N(B
+$B=hM}$r9T$J$$$^$9!#(B(@code{gnus-group-expire-all-groups})$B!#(B
 @end table
 
 @node Browse Foreign Server
-@section $B30It%5!<%P$N1\Mw(B
+@section $B30It%5!<%P!<$N1\Mw(B
 @cindex foreign servers
 @cindex browsing servers
 
@@ -3382,14 +3455,14 @@ kill $B$5$l$?%0%k!<%W$rA4$FI=<($7$^$9(B (@code{gnus-group-list-killed})$B!#@\
 @item B
 @kindex B ($B%0%k!<%W(B)
 @findex gnus-group-browse-foreign-server
-$BA*BrJ}K!$H%5!<%PL>$rJ9$+$l$^$9!#(BGnus $B$O$3$N%5!<%P$K@\B3$7!"$=$3$K$"$k(B
-$B%0%k!<%W$r1\Mw$7$h$&$H$7$^$9(B (@code{gnus-group-browse-foreign-server})$B!#(B
+$BA*BrJ}K!$H%5!<%P!$rJ9$+$l$^$9!#(Bgnus $B$O$3$N%5!<%P!<$K@\B3$7!"$=$3$K$"(B
+$B$k%0%k!<%W$r1\Mw$7$h$&$H$7$^$9(B (@code{gnus-group-browse-foreign-server})$B!#(B
 @end table
 
 @findex gnus-browse-mode
-$BMxMQ2DG=$J%0%k!<%W$N%j%9%H$r;}$C$??7$7$$%P%C%U%!$,8=$l$^$9!#$3$N%P%C%U%!(B
-$B$O(B @code{gnus-browse-mode} $B$r;HMQ$7$^$9!#$3$N%P%C%U%!$ODL>o$N%0%k!<%W%P%C(B
-$B%U%!$K$A$g$C$H(B ($B$H$$$&$+!"$H$C$F$b(B) $B;w$F$$$^$9!#(B
+$BMxMQ2DG=$J%0%k!<%W$N%j%9%H$r;}$C$??7$7$$%P%C%U%!!<$,8=$l$^$9!#$3$N%P%C%U%!!<(B
+$B$O(B @code{gnus-browse-mode} $B$r;HMQ$7$^$9!#$3$N%P%C%U%!!<$ODL>o$N%0%k!<%W(B
+$B%P%C%U%!!<$K$A$g$C$H(B ($B$H$$$&$+!"$H$C$F$b(B) $B;w$F$$$^$9!#(B
 
 $B0J2<$,1\Mw%b!<%I(B (browse mode) $B$G;HMQ$G$-$k%-!l9g$O9XFI$9$k$3$H$K$J$k$N$@$1$l(B
+$B8=:_$N%0%k!<%W$rHs9XFI$K$7$^$9!#$H8@$&$h$j$O(B ($BLuCm(B: $B$3$N%3%^%s%I$O%H%0%k(B
+$B$J$N$G(B)$B!"$3$N>l9g$O9XFI$9$k$3$H$K$J$k$N$G$7$g$&$1$l(B
 $B$I(B (@code{gnus-browse-unsubscribe-current-group})$B!#(B
 
 @item l
@@ -3437,43 +3511,43 @@ kill $B$5$l$?%0%k!<%W$rA4$FI=<($7$^$9(B (@code{gnus-group-list-killed})$B!#@\
 @kindex ? ($B1\Mw(B)
 @findex gnus-browse-describe-briefly
 $B1\Mw%b!<%I(B (browse mode) $B$r4JC1$K@bL@$7$^$9(B ($B$^$"!"Bg$7$F@bL@$9$k$3$H$b(B
-$B$J$$$s$@$1$I$5(B) (@code{gnus-browse-describe-briefly})$B!#(B
+$B$J$$$s$G$9$1$l$I$M(B) (@code{gnus-browse-describe-briefly})$B!#(B
 @end table
 
 @node Exiting gnus
-@section Gnus $B$N=*N;(B
+@section gnus $B$N=*N;(B
 @cindex exiting gnus
 
-$B$=$&!"(Bgnus $B$O:G8e(B ($B%5%$%3!<(B) $B$G$9(B ($BLuCm(B: $B$/!"6l$7$$!#(B
-$B86J8$O(B ``Yes, gnus is ex(c)iting.'')$B!#(B
+$B$=$&!"(Bgnus $B$O:G8e(B ($B%5%$%3!<(B) $B$G$9(B ($BLuCm(B: $B$/!"6l$7$$!#86J8$O!H(BYes, gnus
+is ex(c)iting.$B!I(B)$B!#(B
 
 @table @kbd
 @item z
 @kindex z ($B%0%k!<%W(B)
 @findex gnus-group-suspend
-Gnus $B$rCfCG$7$^$9(B (@code{gnus-group-suspend})$B!#$3$l$O(B gnus $B$rC$9$@$1$G$9!#KM$O$3$l$N(B
-$B$&$l$7$5$,$h$/$o$+$s$J$$$s$@$1$I!"C/$+J,$+$k?M$$$k(B?
+gnus $B$rCfCG$7$^$9(B (@code{gnus-group-suspend})$B!#$3$l$O(B gnus $B$rC$9$@$1$G$9!#KM$O(B
+$B$3$l$N$&$l$7$5$,$h$/$o$+$s$J$$$s$@$1$I!"C/$+J,$+$k?M$$$^$9(B?
 
 @item q
 @kindex q ($B%0%k!<%W(B)
 @findex gnus-group-exit
 @c @icon{gnus-group-exit}
-Gnus $B$r=*N;$7$^$9(B(@code{gnus-group-exit})$B!#(B
+gnus $B$r=*N;$7$^$9(B (@code{gnus-group-exit})$B!#(B
 
 @item Q
 @kindex Q ($B%0%k!<%W(B)
 @findex gnus-group-quit
-@file{.newsrc} $B%U%!%$%k$r%;!<%V$;$:$K(B gnus $B$r=*N;$7$^(B
-$B$9(B (@code{gnus-group-quit})$B!#%I%j%V%k%U%!%$%k$O%;!<%V$5$l$^$9$1(B
+@file{.newsrc} $B%U%!%$%k$rJ]B8$;$:$K(B gnus $B$r=*N;$7$^(B
+$B$9(B (@code{gnus-group-quit})$B!#%I%j%V%k%U%!%$%k$OJ]B8$5$l$^$9$1$l(B
 $B$I(B (@pxref{Auto Save})$B!#(B
 @end table
 
 @vindex gnus-exit-gnus-hook
 @vindex gnus-suspend-gnus-hook
 @vindex gnus-after-exiting-gnus-hook
-Gnus $B$rCfCG$9$k$H$-$O(B @code{gnus-suspend-gnus-hook} $B$,8F$S=P$5$l$^$9!#(B
-Gnus$B$r=*N;$9$k$H$-$O(B @code{gnus-exit-gnus-hook} $B$,8F$S=P$5$l!"$5$i(B
+gnus $B$rCfCG$9$k$H$-$O(B @code{gnus-suspend-gnus-hook} $B$,8F$S=P$5$l$^$9!#(B
+gnus $B$r=*N;$9$k$H$-$O(B @code{gnus-exit-gnus-hook} $B$,8F$S=P$5$l!"$5$i(B
 $B$K(B gnus $B$r=*N;$9$k$H$-$N:G8e$H$7(B
 $B$F(B @code{gnus-after-exiting-gnus-hook} $B$,8F$S=P$5$l$^$9!#(B
 
@@ -3494,7 +3568,7 @@ Note:
 $B$N%0%k!<%W$r$"$C$A$X!"$G!";D$j$r(B ($B$((B? $B%0%k!<%W$,Fs$D$/$i$$$7$+$J$$(B
 $B$N(B?) $B$N%;%/%7%g%s$KF~$l$^$7$g$&!#$"$k$$(B
 $B$O(B Emacs $B%;%C%/%9$N%0%k!<%W$r(B Emacs $B%0%k!<%W!"%;%C%/%9%0%k!<%W$N$I$A$i$+(B
-$B$NI{%H%T%C%/$H$9$k$3$H$5$($b$G$-$^$9!=!=$"$k$$$ON>J}$K(B! $B$9$s$4$$$G$7$g$&(B!
+$B$NI{%H%T%C%/$H$9$k$3$H$5$($b$G$-$^$9(B---$B$"$k$$$ON>J}$K(B! $B$9$s$4$$$G$7$g$&(B!
 
 @iftex
 @iflatex
@@ -3503,11 +3577,10 @@ Note:
 }
 @end iflatex
 @end iftex
-
 $B$3$l$,Nc$G$9(B:
 
 @example
-Gnus
+gnus
   Emacs -- $B$3$$$D$O$9$2!<$<(B!
      3: comp.emacs
      2: alt.religion.emacs
@@ -3521,18 +3594,18 @@ Gnus
 
 @findex gnus-topic-mode
 @kindex t ($B%0%k!<%W(B)
-$B$3$N(B@emph{$BAG@2$i$7$$(B}$B5!G=$r;H$&$K$O!"(B@code{gnus-topic} $B%^%$%J!<%b!<%I(B
-$B$r(B ($B2?$H(B!) $BC1$K%9%$%C%A%*%s$9$k$@$1!=!=%0%k!<%W%P%C%U%!$G!"(B@kbd{t} $B$r2!(B
-$B$7$F$/$@$5$$(B ($B$3$l$O%H%0%k%3%^%s%I$G$9(B)$B!#(B
+$B$3$N(B @emph{$BAG@2$i$7$$(B} $B5!G=$r;H$&$K$O!"(B@code{gnus-topic} $B%^%$%J!<%b!<%I(B
+$B$r(B ($B2?$H(B!) $BC1$K%9%$%C%A%*%s$9$k$@$1(B---$B%0%k!<%W%P%C%U%!!<$G!"(B@kbd{t} $B$r2!(B
+$B$7$F2<$5$$(B ($B$3$l$O%H%0%k%3%^%s%I$G$9(B)$B!#(B
 
 $B$5$"$d$C$F$_$h$&!#$H$K$+$/;n$7$F$_$F!#7/$,La$C$F$/$k$^$G!"KM$O$3$3$GBT$C(B
 $B$F$k$+$i$5!#%i%i!"%?%i%i%s(B@dots{}$B!"$$$$6J$@$M!"$3$l(B@dots{}$B%i!"%i!"(B
 $B%i(B@dots{}$B$((B? $BLa$C$F$-$?(B? $B$h$7!"$8$c(B
 $B$`$G$7$g$&!#Bh;0$K9T$J$&A`:n$O!"$=$l$i$N0l@Z9g@Z$rI=<($7$?$j1#$9$3$H$G$7$g(B
 $B$&!#B>$N%0%k!<%W$N35MW$r8+$d$9$/$9$k$?$a$K!"$"$J$?$OI{%H%T%C%/$d%0%k!<%W(B
-$B$K$h$C$F$O!"%H%T%C%/$,1#$l$k$h$&$K$7$?$$$H;W$&$+$b$7$l$^$;$s$M!#(B
+$B$K$h$C$F$O!"%H%T%C%/$,1#$l$k$h$&$K$9$kI,MW$,$"$k$+$b$7$l$^$;$s$M!#(B
 
 $B$3$3$K$O!"$"$J$?$N9%$`$d$jJ}$G%H%T%C%/$r@_Dj$9$k$?$a$KI,MW$K$J$j$=$&$J!"(B
 $B4pK\E*$J%-!<$N%j%9%H$,$"$j$^$9!#(B
@@ -3576,14 +3649,14 @@ Gnus
 @kindex T TAB ($B%H%T%C%/(B)
 @kindex TAB ($B%H%T%C%/(B)
 @findex gnus-topic-indent
-$B8=:_$N%H%T%C%/$N(B ``$B;z2<$2(B'' $B$r9T$$!"$=$NA0$N%H%T%C%/$NI{%H%T%C%/$K$7$^(B
+$B8=:_$N%H%T%C%/$N!V;z2<$2!W$r9T$J$$!"$=$NA0$N%H%T%C%/$NI{%H%T%C%/$K$7$^(B
 $B$9(B (@code{gnus-topic-indent})$B!#@\F,0z?t$rM?$($k$H!"H?BP$K$=$N%H%T%C%/$N(B
 $B;z2<$2$r2sI|(B (un-indent) $B$7$^$9!#(B
 
 @item M-TAB
 @kindex M-TAB ($B%H%T%C%/(B)
 @findex gnus-topic-unindent
-$B8=:_$N%H%T%C%/$N(B ``$B;z2<$22sI|(B'' (un-indent) $B$r9T$$!"$=$l$,8=:_$N?F$N?F$N(B
+$B8=:_$N%H%T%C%/$N!V;z2<$22sI|!W(B(un-indent) $B$r9T$J$$!"$=$l$,8=:_$N?F$N?F$N(B
 $BI{%H%T%C%/$K$J$k$h$&$K$7$^$9(B (@code{gnus-topic-unindent})$B!#(B
 @end table
 
@@ -3597,18 +3670,18 @@ Gnus
 @kindex C-k ($B%H%T%C%/(B)
 @findex gnus-topic-kill-group
 $B%0%k!<%W$"$k$$$O%H%T%C%/$r(B kill $B$7$^$9(B (@code{gnus-topic-kill-group})$B!#(B
-$B%H%T%C%/Fb$K$"$C$?%0%k!<%W$bA4$F!"%H%T%C%/$H0l=o$K:o=|$5$l$^$9!#(B
+$B%H%T%C%/Fb$K$"$C$?%0%k!<%W$b$9$Y$F!"%H%T%C%/$H0l=o$K:o=|$5$l$^$9!#(B
 
 @item C-y
 @kindex C-y ($B%H%T%C%/(B)
 @findex gnus-topic-yank-group
 $BD>A0$N(B kill $B$5$l$?%0%k!<%W$"$k$$$O%H%T%C%/$r(B yank $B$7$^(B
-$B$9(B (@code{gnus-topic-yank-group})$B!#A4$F$N%H%T%C%/$O!"A4$F$N%0%k!<%W$NA0(B
-$B$K(B yank $B$5$l$k$3$H$K5$$r$D$1$F$/$@$5$$!#(B
+$B$9(B (@code{gnus-topic-yank-group})$B!#$9$Y$F$N%H%T%C%/$O!"$9$Y$F$N%0%k!<%W(B
+$B$NA0$K(B yank $B$5$l$k$3$H$K5$$rIU$1$F2<$5$$!#(B
 
 $B$G$9$+$i!"$"$k%H%T%C%/$r%H%T%C%/$N%j%9%H$N@hF,$K0\F0$9$k$K$O!"C1$K$=$3(B
 $B$G(B @kbd{C-k} $B$rC!$-$^$9!#$3$l$O%+%C%H!u%Z!<%9%H$N%+%C%H$KAjEv$7$^$9!#$=(B
-$B$&$7$?$i%+!<%=%k$r%P%C%U%!$N@hF,(B (``Gnus'' $B%H%T%C%/$N??2<(B) $B$K0\F0$7$F!"(B
+$B$&$7$?$i%+!<%=%k$r%P%C%U%!!<$N@hF,(B ($B!H(Bgnus$B!I%H%T%C%/$N??2<(B) $B$K0\F0$7$F!"(B
 @kbd{C-y} $B$rC!$$$F2<$5$$!#$3$l$O%+%C%H!u%Z!<%9%H$N%Z!<%9%H$KAjEv$7$^$9!#(B
 $B$J$"$s$@!"4JC1$8$c$s!#(B
 
@@ -3627,11 +3700,11 @@ Gnus
 @itemx SPACE
 $B%0%k!<%W$rA*Br$9$k$+!"$"$k$$$O%H%T%C%/$r@^$j$?$?$_$^(B
 $B$9(B (@code{gnus-topic-select-group})$B!#%0%k!<%W$N>e$G$3$N%3%^%s%I$roDL$j$=$N%0%k!<%W$KF~$j$^$9!#%H%T%C%/9T$N>e$G9T$&$H!"$=$N%H%T%C(B
-$B%/$O(B ($B4{$KI=<($5$l$F$$$k$H$-$O(B) $B@^$j$?$?$^$l$k$+!"(B($B4{$K@^$j$?$?$^$l$F$$(B
-$B$k$H$-$O(B) $BE83+$5$l$^$9!#$D$^$j%H%T%C%/$KBP$7$F$O$3$l$O%H%0%k%3%^%s%I$G$9!#(B
-$B$5$i$K!"?t;z%W%l%U%#%C%/%9$rM?$($k$H!"$=$N%l%Y%k(B ($B$H$=$l$h$j$b>.$5$$%l%Y(B
-$B%k(B) $B$N%0%k!<%W$,I=<($5$l$^$9!#(B
+$B$k$H!"DL>oDL$j$=$N%0%k!<%W$KF~$j$^$9!#%H%T%C%/9T$N>e$G9T$J$&$H!"$=$N%H%T%C(B
+$B%/$O(B ($B$9$G$KI=<($5$l$F$$$k$H$-$O(B) $B@^$j$?$?$^$l$k$+!"(B($B$9$G$K@^$j$?$?$^$l(B
+$B$F$$$k$H$-$O(B) $BE83+$5$l$^$9!#$D$^$j%H%T%C%/$KBP$7$F$O$3$l$O%H%0%k%3%^%s%I(B
+$B$G$9!#$5$i$K!"?tCM$N@\F,0z?t$rM?$($k$H!"$=$N%l%Y%k(B ($B$H$=$l$h$j$b>.$5$$%l(B
+$B%Y%k(B) $B$N%0%k!<%W$,I=<($5$l$^$9!#(B
 @end table
 
 $B$5$F$*$N%3%^%s%I$N%j%9%H$G$9!#=g=x$K$OFC$K0UL#$O$"$j$^$;$s!#(B
@@ -3659,38 +3732,38 @@ Gnus
 @item T h
 @kindex T h ($B%H%T%C%/(B)
 @findex gnus-topic-hide-topic
-$B8=:_$N%H%T%C%/$r1#$7$^$9!#$b$7%W%l%U%#%C%/%9$,M?$($i$l$?$J$i!"$=$N%H%T%C(B
-$B%/$r1J5W$K1#$7$^$9!#(B
+$B8=:_$N%H%T%C%/$r1#$7$^$9!#@\F,0z?t$,M?$($i$k$H!"$=$N%H%T%C%/$r1J5W$K1#$7(B
+$B$^$9!#(B
 
 @item T s
 @kindex T s ($B%H%T%C%/(B)
 @findex gnus-topic-show-topic
-$B8=:_$N%H%T%C%/$rI=<($7$^$9!#$b$7%W%l%U%#%C%/%9$,M?$($i$l$?$J$i!"$=$N%H%T%C(B
-$B%/$r1J5W$KI=<($7$^$9!#(B
+$B8=:_$N%H%T%C%/$rI=<($7$^$9!#@\F,0z?t$,M?$($i$l$k$H!"$=$N%H%T%C%/$r1J5W$K(B
+$BI=<($7$^$9!#(B
 
 @item T D
 @kindex T D ($B%H%T%C%/(B)
 @findex gnus-topic-remove-group
 $B%0%k!<%W$r8=:_$N%H%T%C%/$+$i:o=|$7$^$9(B (@code{gnus-topic-remove-group})$B!#(B
 $B$3$NL?Na$Ol9g$O!"(Bgnus $B$O$"$J$?$,l9g$O!"(Bgnus $B$O$"$J$?$,$$$^$9(B (@pxref{Process/Prefix})$B!#(B
 
 @item T M
 @kindex T M ($B%H%T%C%/(B)
 @findex gnus-topic-move-matching
-$B@55,I=8=$K%^%C%A$9$kA4$F$N%0%k!<%W$r!"$"$k%H%T%C%/$K0\F0$5$;$^(B
+$B@55,I=8=$K9gCW$9$k$9$Y$F$N%0%k!<%W$r!"$"$k%H%T%C%/$K0\F0$5$;$^(B
 $B$9(B (@code{gnus-topic-move-matching})$B!#(B
 
 @item T C
 @kindex T C ($B%H%T%C%/(B)
 @findex gnus-topic-copy-matching
-$B@55,I=8=$K%^%C%A$9$kA4$F$N%0%k!<%W$r!"$"$k%H%T%C%/$K%3%T!<$7$^(B
+$B@55,I=8=$K9gCW$9$k$9$Y$F$N%0%k!<%W$r!"$"$k%H%T%C%/$K%3%T!<$7$^(B
 $B$9(B (@code{gnus-topic-copy-matching})$B!#(B
 
 @item T H
@@ -3702,22 +3775,23 @@ Gnus
 @item T #
 @kindex T # ($B%H%T%C%/(B)
 @findex gnus-topic-mark-topic
-$B8=:_$N%H%T%C%/$K$"$k%0%k!<%WA4$F$K%W%m%;%9%^!<%/$r$D$1$^(B
-$B$9(B (@code{gnus-topic-mark-topic})$B!#@\F,<-$,M?$($i$l$J$$>l9g!"$3$N%3%^%s(B
-$B%I$OI{%H%T%C%/$KBP$7$F:F5"E*$KF/$-$^$9!#(B
+$B8=:_$N%H%T%C%/$K$"$k%0%k!<%W$9$Y$F$K%W%m%;%90u$rIU$1$^(B
+$B$9(B (@code{gnus-topic-mark-topic})$B!#@\F,0z?t$,M?$($i$l$J$$>l9g!"$3$N%3%^(B
+$B%s%I$OI{%H%T%C%/$KBP$7$F:F5"E*$KF/$-$^$9!#(B
 
 @item T M-#
 @kindex T M-# ($B%H%T%C%/(B)
 @findex gnus-topic-unmark-topic
-$B8=:_$N%H%T%C%/$K$"$kA4$F$N%0%k!<%W$+$i%W%m%;%9%^!<%/$r>C$7$^(B
-$B$9(B (@code{gnus-topic-unmark-topic})$B!#@\F,<-$,M?$($i$l$J$$>l9g!"$3$N%3%^(B
-$B%s%I$OI{%H%T%C%/$KBP$7$F:F5"E*$KF/$-$^$9!#(B
+$B8=:_$N%H%T%C%/$K$"$k$9$Y$F$N%0%k!<%W$+$i%W%m%;%90u$r>C$7$^(B
+$B$9(B (@code{gnus-topic-unmark-topic})$B!#@\F,0z?t$,M?$($i$l$J$$>l9g!"$3$N%3(B
+$B%^%s%I$OI{%H%T%C%/$KBP$7$F:F5"E*$KF/$-$^$9!#(B
 
 @item C-c C-x
 @kindex C-c C-x ($B%H%T%C%/(B)
 @findex gnus-topic-expire-articles
-($B$b$7$"$l$P(B) $B8=:_$N%0%k!<%W$+%H%T%C%/$+$NA4$F$N;~8B>C5n2DG=5-;v$r;~8B>C(B
-$B5n$7$^$9(B (@code{gnus-topic-expire-articles})$B!#(B(@pxref{Expiring Mail})$B!#(B
+($B$b$7$"$l$P(B) $B8=:_$N%0%k!<%W$+%H%T%C%/$+$N$9$Y$F$N4|8B@Z$l>C5n2DG=5-;v$r(B
+$B4|8B@Z$l>C5n$7$^$9(B (@code{gnus-topic-expire-articles})$B!#(B(@pxref{Expiring
+Mail})$B!#(B
 
 @item T r
 @kindex T r ($B%H%T%C%/(B)
@@ -3732,7 +3806,7 @@ Gnus
 @item A T
 @kindex A T ($B%H%T%C%/(B)
 @findex gnus-topic-list-active
-Gnus $B$,CN$C$F$$$k%H%T%C%/2=$5$l$?%0%k!<%W$rA4$FI=<($7$^(B
+gnus $B$,CN$C$F$$$k%H%T%C%/2=$5$l$?%0%k!<%W$r$9$Y$FI=<($7$^(B
 $B$9(B (@code{gnus-topic-list-active})$B!#(B
 
 @item T M-n
@@ -3751,7 +3825,7 @@ Gnus $B$,CN$C$F$$$k%H%T%C%/2=$5$l$?%0%k!<%W$rA4$FI=<($7$^(B
 @cindex group parameters
 @cindex topic parameters
 @cindex parameters
-$B%H%T%C%/%Q%i%a!<%?$r=$@5$7$^$9(B (@code{gnus-topic-edit-parameters})$B!#(B
+$B%H%T%C%/%Q%i%a!<%?!<$r=$@5$7$^$9(B (@code{gnus-topic-edit-parameters})$B!#(B
 @xref{Topic Parameters}.
 @end table
 
@@ -3759,8 +3833,8 @@ Gnus $B$,CN$C$F$$$k%H%T%C%/2=$5$l$?%0%k!<%W$rA4$FI=<($7$^(B
 @subsection $B%H%T%C%/JQ?t(B
 @cindex topic variables
 
-$BA0$N9`$G$O!"$I$N%H%T%C%/$rI=<($9$k$+$r(B gnus $B$K8@$&J}K!$r@bL@$7$^$7$?!#(B
-$B$3$N9`$G$O!"$=$l$>$l$N%H%T%C%/$N2?$rI=<($9$k$+$r(Bgnus $B$K8@$&J}K!$r@bL@$7(B
+$BA0$N>O$G$O!"$I$N%H%T%C%/$rI=<($9$k$+$r(B gnus $B$K8@$&J}K!$r@bL@$7$^$7$?!#(B
+$B$3$N>O$G$O!"$=$l$>$l$N%H%T%C%/$N2?$rI=<($9$k$+$r(B gnus $B$K8@$&J}K!$r@bL@$7(B
 $B$^$9!#(B
 
 @vindex gnus-topic-line-format
@@ -3781,21 +3855,21 @@ Gnus $B$,CN$C$F$$$k%H%T%C%/2=$5$l$?%0%k!<%W$rA4$FI=<($7$^(B
 @item a
 $B%H%T%C%/Cf$NL$FI5-;v$N?t!#(B
 @item A
-$B%H%T%C%/$HA4$F$NI{%H%T%C%/$NL$FI5-;v$N?t!#(B
+$B%H%T%C%/$H$9$Y$F$NI{%H%T%C%/$NL$FI5-;v$N?t!#(B
 @end table
 
 @vindex gnus-topic-indent-level
 $B3FI{%H%T%C%/(B ($B$HI{%H%T%C%/Fb$N%0%k!<%W(B) $B$O!"%H%T%C%/%l%Y%k?t(B
-$B$N(B @code{gnus-topic-indent-level} $BG\$N6uGrJ,$N;z2<$2$,9T$o$l$^$9!#=i4|CM(B
-$B$O(B 2 $B$G$9!#(B
+$B$N(B @code{gnus-topic-indent-level} $BG\$N6uGrJ,$N;z2<$2$,9T$J$o$l$^$9!#%G%#(B
+$B%U%)%k%H$O(B 2 $B$G$9!#(B
 
 @vindex gnus-topic-mode-hook
-@code{gnus-topic-mode-hook} $B$O%H%T%C%/%^%$%J!<%b!<%I%P%C%U%!$G8F$S=P$5$l(B
-$B$^$9!#(B
+@code{gnus-topic-mode-hook} $B$O%H%T%C%/%^%$%J!<%b!<%I%P%C%U%!!<$G8F$S=P$5(B
+$B$l$^$9!#(B
 
 @vindex gnus-topic-display-empty-topics
 @code{gnus-topic-display-empty-topics} $B$O%H%T%C%/$NCf$KL$FI5-;v$,L5$$>l(B
-$B9g$G$b$=$N%H%T%C%/$rI=<($9$k$h$&$K$7$^$9!#=i4|CM$O(B @code{t} $B$G$9!#(B
+$B9g$G$b$=$N%H%T%C%/$rI=<($9$k$h$&$K$7$^$9!#%G%#%U%)%k%H$O(B @code{t} $B$G$9!#(B
 
 @node Topic Sorting
 @subsection $B%H%T%C%/$NJB$YBX$((B
@@ -3853,19 +3927,19 @@ Gnus $B$,CN$C$F$$$k%H%T%C%/2=$5$l$?%0%k!<%W$rA4$FI=<($7$^(B
 $B$K=>$C$FJB$YBX$($^$9(B (@code{gnus-topic-sort-groups})$B!#(B
 @end table
 
-$B@\F,0z?t$,M?$($i$l$?$i!"$3$l$i$9$Y$F$N%3%^%s%I$O5U=g$NJB$YBX$($r9T$J$$$^(B
-$B$9!#%0%k!<%W$N%=!<%H$K$D$$$F$N$5$i$J$k>pJs$O(B @ref{Sorting Groups} $B$r;2>H(B
-$B$7$F2<$5$$!#(B
+$B@\F,0z?t$,M?$($i$l$k$H!"$3$l$i$9$Y$F$N%3%^%s%I$O5U=g$NJB$YBX$($r9T$J$$$^(B
+$B$9!#%0%k!<%W$NJB$YBX$($K$D$$$F$N$5$i$J$k>pJs$O(B @ref{Sorting Groups} $B$r;2(B
+$B>H$7$F2<$5$$!#(B
 
 @node Topic Topology
 @subsection $B%H%T%C%/$N0LAj9=B$(B
 @cindex topic topology
 @cindex topology
 
-$B$=$l$G$O!"%0%k!<%W%P%C%U%!$NNc$r8+$F$$$-$^$7$g$&!#(B
+$B$=$l$G$O!"%0%k!<%W%P%C%U%!!<$NNc$r8+$F$$$-$^$7$g$&!#(B
 
 @example
-Gnus
+gnus
   Emacs -- $B$3$$$D$O$9$2!<$<(B!
      3: comp.emacs
      2: alt.religion.emacs
@@ -3877,65 +3951,66 @@ Gnus
     13: comp.sources.unix
 @end example
 
-$B$D$^$j!"$3$3$G$O0l$D$N%H%C%W%l%Y%k$N%H%T%C%/(B (@samp{Gnus}) $B$,$"$j!"$=$N(B
+$B$D$^$j!"$3$3$G$O0l$D$N%H%C%W%l%Y%k$N%H%T%C%/(B (@samp{gnus}) $B$,$"$j!"$=$N(B
 $B2<$KFs$D$N%H%T%C%/$,$"$j!"$=$N$&$A$N0lJ}$NI{%H%T%C%/Cf$K0l$DI{%H%T%C%/$,(B
 $B$"$j$^$9(B ($B%H%C%W%l%Y%k%H%T%C%/$O>o$K0l$D$7$+$"$j$^$;$s(B)$B!#$3$N9=B$$O!"0J(B
 $B2<$N$h$&$KI=8=$G$-$^$9(B:
 
 @lisp
-(("Gnus" visible)
+(("gnus" visible)
  (("Emacs -- $B$3$$$D$O$9$2!<$<(B!" visible)
   (("$B$($C$A$J(B Emacs" visible)))
  (("$B$=$NB>(B" visible)))
 @end lisp
 
 @vindex gnus-topic-topology
-$B$3$l$Oe5-$NI=<($r9T$&$?$a$N!"JQ?t(B @code{gnus-topic-topology} $B$NCM(B
-$B$=$N$b$N$J$N$G$9!#$3$NJQ?t$O(B @file{.newsrc.eld} $B%U%!%$%k$KJ]B8$5$l!"e5-$NI=<($r9T$J$&$?$a$N!"JQ?t(B @code{gnus-topic-topology} $B$N(B
+$BCM$=$N$b$N$J$N$G$9!#$3$NJQ?t$O(B @file{.newsrc.eld} $B%U%!%$%k$KJ]B8$5$l!"$N%9%?!<%H%"%C(B
-$B%W%U%!%$%k$N@_Dj$K$OA4$/1F6A$rM?$($^$;$s!#(B
+$B%W%U%!%$%k$N@_Dj$K$O$^$C$?$/1F6A$rM?$($^$;$s!#(B
 
 $B$3$N9=B$$O!"$I$N%H%T%C%/$,$I$N%H%T%C%/$NI{%H%T%C%/$G$"$k$+$H!"$I$N%H%T%C(B
 $B%/$,I=<($5$l$F$$$k$+$r<($7$F$$$^$9!#8=:_$OFs$D$N@_Dj(B
-$BCM!=!=(B@code{visible} $B$H(B @code{invisible} $B$,5v$5$l$F$$$^$9!#(B
+$BCM(B---@code{visible} $B$H(B @code{invisible} $B$r;H$&$3$H$,$G$-$^$9!#(B
 
 @node Topic Parameters
-@subsection $B%H%T%C%/%Q%i%a!<%?(B
+@subsection $B%H%T%C%/%Q%i%a!<%?!<(B
 @cindex topic parameters
 
-$B%H%T%C%/Fb$NA4$F$N%0%k!<%W$O%0%k!<%W%Q%i%a!<%?$r!"$=$N?F(B ($B$H@hAD(B) $B$N%H%T%C(B
-$B%/%Q%i%a!<%?$+$i7Q>5$7$^$9!#%0%k!<%W%Q%i%a!<%?$H$7$F@5$7$$$b$N$OA4$F!"%H(B
-$B%T%C%/%Q%i%a!<%?$H$7$F$b@5$7$$$b$N$G$9(B(@pxref{Group Parameters})$B!#%(!<%8%'(B
-$B%s%H$r;H$&$h$&$K$7$F$"$k$H!"$9$Y$F$N%(!<%8%'%s%H%Q%i%a!<%?(B (@ref{Category
-Syntax} $B$N(B Agent Parameters $B$r;2>H(B ($BLuCm(B: $BI,MW$J$i(B Index $B$r;H$C$F(B)) $B$OM-(B
-$B8z$J%H%T%C%/%Q%i%a!<%?$G$b$"$j$^$9!#(B
+$B%H%T%C%/Fb$N$9$Y$F$N%0%k!<%W$O%0%k!<%W%Q%i%a!<%?!<$r!"$=$N?F(B ($B$H@hAD(B) $B$N(B
+$B%H%T%C%/%Q%i%a!<%?!<$+$i7Q>5$7$^$9!#%0%k!<%W%Q%i%a!<%?!<$H$7$F@5$7$$$b$N(B
+$B$O$9$Y$F!"%H%T%C%/%Q%i%a!<%?!<$H$7$F$b@5$7$$$b$N$G(B
+$B$9(B (@pxref{Group Parameters})$B!#%(!<%8%'%s%H$r;H$&$h$&$K$7$F$"$k$H!"$9$Y(B
+$B$F$N%(!<%8%'%s%H%Q%i%a!<(B
+$B%?!<(B (@ref{Category Syntax} $B$N(B Agent Parameters $B$r;2>H(B ($BLuCm(B: $BI,MW$J(B
+$B$i(B Index $B$r;H$C$F(B)) $B$OM-8z$J%H%T%C%/%Q%i%a!<%?!<$G$b$"$j$^$9!#(B
 
-$B$5$i$K!"0J2<$N%Q%i%a!<%?$O%H%T%C%/%Q%i%a!<%?$H$7$F$N$_M-8z$G$9(B:
+$B$5$i$K!"0J2<$N%Q%i%a!<%?!<$O%H%T%C%/%Q%i%a!<%?!<$H$7$F$N$_M-8z$G$9(B:
 
 @table @code
 @item subscribe
 $B%H%T%C%/$G?7$7$$%0%k!<%W$r9XFI$7$F$$$k>l(B
-$B9g(B (@pxref{Subscription Methods})$B!"(B@code{subscribe} $B%H%T%C%/%Q%i%a!<%?$O(B
-$B$I$N%0%k!<%W$,$I$N%H%T%C%/$K9T$/$+$r;XDj$7$^$9!#CM$O$=$N%H%T%C%/$K9T$/%0(B
-$B%k!<%W$K9gCW$9$k@55,I=8=$G$"$kI,MW$,$"$j$^$9!#(B
+$B9g(B (@pxref{Subscription Methods})$B!"(B@code{subscribe} $B%H%T%C%/%Q%i%a!<%?!<(B
+$B$O$I$N%0%k!<%W$,$I$N%H%T%C%/$K9T$/$+$r;XDj$7$^$9!#CM$O$=$N%H%T%C%/$K9T$/(B
+$B%0%k!<%W$K9gCW$9$k@55,I=8=$G$"$kI,MW$,$"$j$^$9!#(B
 
 @item subscribe-level
 $B%H%T%C%/$G?7$7$$%0%k!<%W$r9XFI$7$F$$$k>l(B
-$B9g(B (@code{subscribe} $B%Q%i%a!<%?$r;2>H(B)$B!"$=$N%0%k!<%W$N9XFIEY$N%l%Y%k(B
+$B9g(B (@code{subscribe} $B%Q%i%a!<%?!<$r;2>H(B)$B!"$=$N%0%k!<%W$N9XFIEY$N%l%Y%k(B
 $B$O(B @code{gnus-level-default-subscribed} $B$NBe$o$j(B
-$B$K(B @code{subscribe-level} $B%H%T%C%/%Q%i%a!<%?$NCM$K$J$j$^$9!#(B
+$B$K(B @code{subscribe-level} $B%H%T%C%/%Q%i%a!<%?!<$NCM$K$J$j$^$9!#(B
 @end table
 
-$B%0%k!<%W%Q%i%a!<%?$O(B ($B$b$A$m$s(B) $B%H%T%C%/%Q%i%a!<%?$h$j$bM%@h$5$l!"I{%H%T%C(B
-$B%/$N%H%T%C%/%Q%i%a!<%?$O?F%H%T%C%/$N%H%T%C%/%Q%i%a!<%?$h$j$bM%@h$5$l$^$9!#(B
-$BJ,$+$k$h$M!#$4$/IaDL$N7Q>5%k!<%k$G$9(B ($B%k!<%k(B (@dfn{Rules}) $B$O$3$3$G$OL>(B
-$B;l$G$"$C$F!"F0;l$N!V@~$r0z$/!W$G$O$"$j$^$;$s!#$3$N%k!<%k$K$OH?BP$7$?$/$J(B
-$B$k$+$bCN$l$J$$$1$I!"$=$l$O$4<+M3$K(B)$B!#(B
+$B%0%k!<%W%Q%i%a!<%?!<$O(B ($B$b$A$m$s(B) $B%H%T%C%/%Q%i%a!<%?!<$h$j$bM%@h$5$l!"I{(B
+$B%H%T%C%/$N%H%T%C%/%Q%i%a!<%?!<$O?F%H%T%C%/$N%H%T%C%/%Q%i%a!<%?!<$h$j$bM%(B
+$B@h$5$l$^$9!#J,$+$k$h$M!#$4$/IaDL$N7Q>5%k!<%k$G(B
+$B$9(B ($B%k!<%k(B (@dfn{Rules}) $B$O$3$3$G$OL>;l$G$"$C$F!"F0;l$N!V@~$r0z$/!W$G$O(B
+$B$"$j$^$;$s!#$3$N%k!<%k$K$OH?BP$7$?$/$J$k$+$b$7$l$J$$$1$I!"$=$l$O$4<+M3$K(B)$B!#(B
 
 @example
 @group
-Gnus
+gnus
   Emacs
      3: comp.emacs
      2: alt.religion.emacs
@@ -3951,13 +4026,13 @@ Gnus
 @end example
 
 @samp{Emacs} $B%H%T%C%/$O%H%T%C%/%Q%i%a!<(B
-$B%?(B @code{(score-file . "emacs.SCORE")} $B$r;}$C$F$$$^$9!#(B
+$B%?!<(B @code{(score-file . "emacs.SCORE")} $B$r;}$C$F$$$^$9!#(B
 @samp{$BB)H4$-(B} $B%H%T%C%/$O%H%T%C%/%Q%i%a!<(B
-$B%?(B @code{(score-file . "relief.SCORE")} $B$r;}$A!"(B
+$B%?!<(B @code{(score-file . "relief.SCORE")} $B$r;}$A!"(B
 @samp{$B$=$NB>(B} $B%H%T%C%/$O%H%T%C%/%Q%i%a!<(B
-$B%?(B @code{(score-file . "emacs.SCORE")} $B$r;}$C$F$$$^$9!#(B
+$B%?!<(B @code{(score-file . "emacs.SCORE")} $B$r;}$C$F$$$^$9!#(B
 $B$5$i$K!"(B@samp{alt.religion.emacs} $B$O%0%k!<%W%Q%i%a!<(B
-$B%?(B @code{(score-file . "religion.SCORE")} $B$r;}$C$F$$$^$9!#(B
+$B%?!<(B @code{(score-file . "religion.SCORE")} $B$r;}$C$F$$$^$9!#(B
 
 $B$5$F!"$3$3$G(B @samp{$BB)H4$-(B} $B%H%T%C%/$N(B @samp{alt.sex.emacs} $B%0%k!<%W$KF~$C(B
 $B$?$H$-!"(B@file{relief.SCORE} $B$,4pK\%9%3%"%U%!%$%k$H$J$j$^$9!#$b(B
@@ -3967,12 +4042,12 @@ Gnus
 $B%9%3%"%U%!%$%k$K$J$k$G$7$g$&!#(B
 
 $B$3$l$C$F$H$C$F$b4JC1$G<+L@$N$3$H$N$h$&$K8+$($k$G$7$g(B? $B$^$"!"$=$NDL$j$G$9!#(B
-$B$G$9$,LdBj$,$"$k>l9g$b$"$j$^$9!#FC$K(B@code{total-expiry} $B%Q%i%a!<%?$K4X$7(B
-$B$F$G$9!#Nc$($P$"$k%a!<%k%0%k!<%W$rFs$D$N%H%T%C%/$NCf$K!"0lJ}(B
+$B$G$9$,LdBj$,$"$k>l9g$b$"$j$^$9!#FC$K(B @code{total-expiry} $B%Q%i%a!<%?!<$K(B
+$B4X$7$F$G$9!#Nc$($P$"$k%a!<%k%0%k!<%W$rFs$D$N%H%T%C%/$NCf$K!"0lJ}(B
 $B$O(B @code{total-expiry} $B$"$j$G!"$b$&0lJ}$O$=$l$J$7$G;}$C$F$$$k$H$7$^$7$g(B
 $B$&!#$3$3$G(B @kbd{M-x gnus-expire-all-expirable-groups} $B$rC(B
+$B5n$7$?$$$N$+$rCN$kJ}K!$,$J$$$?$a!":G0-$N;vBV$,H/@8$9$k$+$b$7$l$^$;$s!#l9g$K$O==J,Cm0U$7$J$1$l$P$J$j$^$;$s!#(B
 
@@ -3980,78 +4055,94 @@ Gnus
 @section $B$=$NB>$N%0%k!<%W4XO"(B
 
 @menu
-* Scanning New Messages::       Gnus $B$K?7$7$$%a%C%;!<%8$,E~Ce$7$?$+$I$&$+$rJ9$/(B
+* Scanning New Messages::       gnus $B$K?7$7$$%a%C%;!<%8$,E~Ce$7$?$+$I$&$+$rJ9$/(B
 * Group Information::           $B%0%k!<%W$H(B gnus $B$K4X$9$k>pJs$H%X%k%W(B
-* Group Timestamp::             Gnus $B$K:G8e$K$$$D%0%k!<%W$rFI$s$@$+$r5-O?$5$;$k(B
-* File Commands::               Gnus $B$N%U%!%$%k$NFI$_=q$-(B
+* Group Timestamp::             gnus $B$K:G8e$K$$$D%0%k!<%W$rFI$s$@$+$r5-O?$5$;$k(B
+* File Commands::               gnus $B$N%U%!%$%k$NFI$_=q$-(B
 * Sieve Commands::              Sieve $B%9%/%j%W%H$N4IM}(B
 @end menu
 
 @table @kbd
+@item v
+@kindex v ($B%0%k!<%W(B)
+@cindex keys, reserved for users (Group)
+@kbd{v} $B%-!<$O%f!<%6!A0$+$iO"A[$5$l$k$3$H$H$ON"J"$K!"@\F,<-$G%a!<%k%0%k!<%W(B
-$B$,;XDj$5$l$?>l9g$O!"%K%e!<%9$NBe$o$j$K%a!<%k$NMM<0$,MQ0U$5$l$^$9!#(B
+$B$9(B (@code{gnus-group-post-news})$B!#@\F,0z?t$,M?$($i$l$k$H!"8=:_0LCV$N%0%k!<(B
+$B%W$KEj9F$7$^$9!#$b$7@\F,0z?t$,(B 1 $B$@$C$?$i!"$I$N%0%k!<%W$KEj9F$9$k$+$r?R(B
+$B$M$^$9!#$3$N4X?t$NL>A0$+$iO"A[$5$l$k$3$H$H$ON"J"$K!"@\F,0z?t$G%a!<%k%0%k!<(B
+$B%W$,;XDj$5$l$?>l9g$O!"%K%e!<%9$NBe$o$j$K%a!<%k$NMM<0$,MQ0U$5$l$^$9!#(B
 @xref{Composing Messages}.
 
 @item m
 @kindex m ($B%0%k!<%W(B)
 @findex gnus-group-mail
-$B%a!<%k$r$I$3$+$KAw$j$^$9(B (@code{gnus-group-mail})$B!#$b$7@\F,<-$,M?$($i$l(B
-$B$?$i8=:_0LCV$N%0%k!<%W$NEj9FMM<0(B (posting style) $B$r;H$$$^$9!#$b$7@\F,<-(B
-$B$,(B 1 $B$@$C$?$i!"$I$N%0%k!<%W$NEj9FMM<0$r;H$&$+$r?R$M$^$9!#(B
+$B%a!<%k$r$I$3$+$KAw$j$^$9(B (@code{gnus-group-mail})$B!#@\F,0z?t$,M?$($i$l$k(B
+$B$H!"8=:_0LCV$N%0%k!<%W$NEj9FMM<0(B (posting style) $B$r;H$$$^$9!#$b$7@\F,0z(B
+$B?t$,(B 1 $B$@$C$?$i!"$I$N%0%k!<%W$NEj9FMM<0$r;H$&$+$r?R$M$^$9!#(B
 @xref{Composing Messages}.
 
 @item i
 @kindex i ($B%0%k!<%W(B)
 @findex gnus-group-news
-$B%K%e!<%9$N:n@.$r3+;O$7$^$9(B (@code{gnus-group-news})$B!#$b$7@\F,<-$,M?$($i(B
-$B$l$?$i8=:_0LCV$N%0%k!<%W$KEj9F$7$^$9!#$b$7@\F,<-$,(B 1 $B$@$C$?$i!"$I$N%0%k!<(B
-$B%W$KEj9F$9$k$+$r?R$M$^$9!#(B@xref{Composing Messages}.
+$B%K%e!<%9$N:n@.$r3+;O$7$^$9(B (@code{gnus-group-news})$B!#@\F,0z?t$,M?$($i$l(B
+$B$k$H!"8=:_0LCV$N%0%k!<%W$KEj9F$7$^$9!#$b$7@\F,0z?t$,(B 1 $B$@$C$?$i!"$I$N%0(B
+$B%k!<%W$KEj9F$9$k$+$r?R$M$^$9!#(B@xref{Composing Messages}.
 
 $B$3$N4X?t$O!"$?$H$(%a!<%k%0%k!<%W$G;H$o$l$?$H$7$F$b!"(B
-$B@\%;!<%V$5$l$^$9!#BP1~$9$k%P%C%/%(%s%I$,Ej9F$N$?$a$N%a%=%C(B
-$B%I(B (request-post method) $B$r;}$C$F$$$J$1$l$P$J$j$^$;$s$,!#(B
+$B%a!<%k%0%k!<%W$K!VEj9F!W$9$k$N$KJXMx$G$9(B; $B$=$l$i$OEv$N%0%k!<%W$KC1$KD>@\(B
+$BJ]B8$5$l$^$9!#BP1~$9$k%P%C%/%(%s%I$,Ej9F$N$?$a$N%a%=%C%I(B (request-post
+method) $B$r;}$C$F$$$J$1$l$P$J$j$^$;$s$,!#(B
 @end table
 
-$B0J2<$O%0%k!<%W%P%C%U%!$N$?$a$NJQ?t$G$9(B:
+$B0J2<$O%0%k!<%W%P%C%U%!!<$N$?$a$NJQ?t$G$9(B:
 
 @table @code
 @item gnus-group-mode-hook
 @vindex gnus-group-mode-hook
-$B%0%k!<%W%P%C%U%!$,:n@.$5$l$?;~$K8F$S=P$5$l$^$9!#(B
+$B%0%k!<%W%P%C%U%!!<$,:n@.$5$l$?;~$K8F$S=P$5$l$^$9!#(B
 
 @item gnus-group-prepare-hook
 @vindex gnus-group-prepare-hook
-$B%0%k!<%W%P%C%U%!$,@8@.$5$l$?$"$H$K8F$S=P$5$l$^$9!#$3$l$O%P%C%U%!$r2?$+JQ(B
-$B$J!"<+A3$8$c$J$$J}K!$G=$@5$7$?$$$H$-$K;H$o$l$k$+$b$7$l$^$;$s!#(B
+$B%0%k!<%W%P%C%U%!!<$,@8@.$5$l$?$"$H$K8F$S=P$5$l$^$9!#$3$l$O%P%C%U%!!<$r2?(B
+$B$+JQ$J!"<+A3$G$O$J$$J}K!$G=$@5$7$?$$$H$-$K;H$o$l$k$+$b$7$l$^$;$s!#(B
 
 @item gnus-group-prepared-hook
 @vindex gnus-group-prepare-hook
-$B%0%k!<%W%P%C%U%!$,@8@.$5$l$?8e$N0lHV:G8e$K8F$S=P$5$l$^$9!#Nc$($P%]%$%s%H(B
-$B$r$I$3$+$K0\F0$5$;$?$$$H$-$J$I$K;H$($^$9!#(B
+$B%0%k!<%W%P%C%U%!!<$,@8@.$5$l$?8e$N0lHV:G8e$K8F$S=P$5$l$^$9!#Nc$($P%]%$%s(B
+$B%H$r$I$3$+$K0\F0$5$;$?$$$H$-$J$I$K;H$($^$9!#(B
 
 @item gnus-permanently-visible-groups
 @vindex gnus-permanently-visible-groups
-$B$3$N@55,I=8=$K%^%C%A$9$k%0%k!<%W$O!"$=$l$,6u$G$"$k$+$I$&$+$K4X$o$i$:!">o(B
-$B$K%0%k!<%W%P%C%U%!$KI=<($5$l$^$9!#(B
+$B$3$N@55,I=8=$K9gCW$9$k%0%k!<%W$O!"$=$l$,6u$G$"$k$+$I$&$+$K4X$o$i$:!">o$K(B
+$B%0%k!<%W%P%C%U%!!<$KI=<($5$l$^$9!#(B
 
 @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
+$B%0%k!<%WL>MQ$NA*BrJ}K!$HJ8;z%;%C%H$NO"A[%j%9%H$G$9!#$3$l$O1Q;z$G$O$J$$%0(B
+$B%k!<%WL>$rI=<($9$k$?$a$K;H$$$^$9!#(B
 
 $BNc(B:
 @lisp
@@ -4062,10 +4153,10 @@ Gnus
 @item gnus-group-name-charset-group-alist
 @cindex UTF-8 group names
 @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!#%G%#%U%)%k%HCM$O!"(BUTF-8 $B$,%5(B
-$B%]!<%H$5$l$F$$$k>l9g$O(B @code{((".*" utf-8))}$B!"$=$l0J30$N>l9g(B
-$B$O(B @code{nil} $B$G$9!#(B
+$B%0%k!<%WL>MQ$N%0%k!<%WL>$N@55,I=8=$HJ8;z%;%C%H$NO"A[%j%9%H$G$9!#$3$l$O1Q(B
+$B;z$G$O$J$$%0%k!<%WL>$rI=<($9$k$?$a$K;H$$$^$9!#(BUTF-8 $B$,%5%]!<%H$5$l$F$$$k(B
+$B>l9g$O(B @code{((".*" utf-8))} $B$,%G%#%U%)%k%HCM$G!"$=$l0J30$N>l9g$N%G%#%U%)(B
+$B%k%H$O(B @code{nil} $B$G$9!#(B
 
 $BNc(B:
 @lisp
@@ -4084,11 +4175,10 @@ Gnus
 @kindex g ($B%0%k!<%W(B)
 @findex gnus-group-get-new-news
 @c @icon{gnus-group-get-new-news}
-$B%5!<%P$N?7Ce5-;v$r%A%'%C%/$7$^$9!#?t;z%W%l%U%#%C%/%9$r;HMQ$9$k$H!"$3$NL?(B
-$BNa$O0z?t(B @var{arg} $B$+$=$l$h$j>.$5$$%l%Y%k$N%0%k!<%W$N$_$r%A%'%C%/$7$^(B
-$B$9(B (@code{gnus-group-get-new-news})$B!#?t;z0J30$N%W%l%U%#%C%/%9$rM?$($k$H!"(B
-$B$3$NL?Na$O$=$N%P%C%/%(%s%I$+$i%"%/%F%#%V%U%!%$%k$r6/@)E*$KA4ItFI$_D>$7$^(B
-$B$9!#(B
+$B%5!<%P!<$N?7Ce5-;v$r%A%'%C%/$7$^$9!#?tCM$N@\F,0z?t$r;HMQ$9$k$H!"$3$NL?Na(B
+$B$O0z?t(B @var{arg} $B$+$=$l$h$j>.$5$$%l%Y%k$N%0%k!<%W$N$_$r%A%'%C%/$7$^(B
+$B$9(B (@code{gnus-group-get-new-news})$B!#?tCM0J30$N@\F,0z?t$rM?$($k$H!"$3$N(B
+$BL?Na$O$=$N%P%C%/%(%s%I$+$i%"%/%F%#%V%U%!%$%k$r6/@)E*$KA4ItFI$_D>$7$^$9!#(B
 
 @item M-g
 @kindex M-g ($B%0%k!<%W(B)
@@ -4098,21 +4188,22 @@ Gnus
 $B8=:_$N%0%k!<%W$K?7Ce5-;v$,$"$k$+$I$&$+$r%A%'%C%/$7$^(B
 $B$9(B (@code{gnus-group-get-new-news-this-group})$B!#(B
 @code{gnus-goto-next-group-when-activating} $B$O$3$NL?Na$,r7o$KA4$F$N%0%k!<%W$r5/F0$7$^$9(B (@code{gnus-activate-all-groups})$B!#(B
+$BL5>r7o$K$9$Y$F$N%0%k!<%W$r5/F0$7$^$9(B (@code{gnus-activate-all-groups})$B!#(B
 
 @item R
 @kindex R ($B%0%k!<%W(B)
 @cindex restarting
 @findex gnus-group-restart
-Gnus $B$r%j%9%?!<%H$7$^$9(B (@code{gnus-group-restart})$B!#$3$l(B
-$B$O(B @file{.newsrc} $B%U%!%$%k$r%;!<%V$7!"A4$F$N%5!<%P$N@\B3$rJD$8!"A4$F(B
-$B$N(B gnus $B%i%s%?%$%`JQ?t$r%/%j%"$7$?8e!"(Bgnus $B$r$b$&0lEY:G=i$+$i3+;O$7$^$9!#(B
+gnus $B$r:F5/F0$7$^$9(B (@code{gnus-group-restart})$B!#$3$l(B
+$B$O(B @file{.newsrc} $B%U%!%$%k$r%;!<%V$7!"$9$Y$F$N%5!<%P!<$N@\B3$rJD$8!"$9$Y(B
+$B$F$N(B gnus $B%i%s%?%$%`JQ?t$r%/%j%"$7$?8e!"(Bgnus $B$r$b$&0lEY:G=i$+$i3+;O$7$^(B
+$B$9!#(B
 @end table
 
 @vindex gnus-get-new-news-hook
@@ -4133,26 +4224,26 @@ Gnus $B$r%j%9%?!<%H$7$^$9(B (@code{gnus-group-restart})$B!#$3$l(B
 @kindex H f ($B%0%k!<%W(B)
 @findex gnus-group-fetch-faq
 @vindex gnus-group-faq-directory
-@cindex @acronym{FAQ}
+@cindex FAQ
 @cindex ange-ftp
 $B8=:_$N%0%k!<%W$N(B @acronym{FAQ} $B$ro%j%b!<%H%^%7%s>e$N%G%#%l%/%H%j$G$9!#$3$NJQ?t$O%G%#%l%/(B
-$B%H%j$N%j%9%H$G$"$C$F$b9=$$$^$;$s!#$3$N>l9g!"$3$N%3%^%s%I$K%W%l%U%#%C%/%9(B
+gnus $B$O(B @acronym{FAQ} $B$r(B @code{gnus-group-faq-directory} $B$+$io%j%b!<%H%^%7%s>e$N%G%#%l%/%H%j!<$G$9!#$3$NJQ?t$O%G%#(B
+$B%l%/%H%j!<$N%j%9%H$G$"$C$F$b9=$$$^$;$s!#$3$N>l9g!"$3$N%3%^%s%I$K@\F,0z?t(B
 $B$rM?$($k$3$H$G$$$/$D$+$N%5%$%H$NCf$+$iA*$V$3$H$,$G$-$^$9!#%U%!%$%k$Nl9g!"(B
-gnus $B$O(B @code{gnus-group-faq-directory} $B$NCM$rA4$F!"0l$D0l$D%*!<%W%s$7$F(B
-$B$_$h$&$H$7$^$9!#(B
+gnus $B$O(B @code{gnus-group-faq-directory} $B$NCM$r$9$Y$F!"0l$D0l$D%*!<%W%s$7(B
+$B$F$_$h$&$H$7$^$9!#(B
 
 @item H c
 @kindex H c ($B%0%k!<%W(B)
 @findex gnus-group-fetch-charter
 @vindex gnus-group-charter-alist
 @cindex charter
-$B8=:_$N%0%k!<%W$N7{>O$r(B web $B%V%i%&%6$G3+$3$&$H$7$^(B
+$B8=:_$N%0%k!<%W$N7{>O$r(B web $B%V%i%&%6!<$G3+$3$&$H$7$^(B
 $B$9(B (@code{gnus-group-fetch-charter})$B!#@\F,0z?t$,M?$($i$l$k$H%0%k!<%WL>$r(B
 $B?R$M$^$9!#(B
 
@@ -4177,7 +4268,7 @@ gnus $B$O(B @code{browse-url} $B$r;H$C$F%3%s%H%m!<%k%a%C%;!<%8$r3+$-$^$9!#$=$
 $B%3%s%H%m!<%k%a%C%;!<%8$O05=L$5$l$F$$$k$3$H$KCm0U$7$F2<$5$$!#$3$N%3%^%s%I(B
 $B$r;H$&$K$O(B @code{auto-compression-mode} $B$r(B on $B$K$7$F$*$/I,MW$,$"$j$^(B
 $B$9(B (@pxref{Compressed Files, ,Compressed Files, emacs, The Emacs
-Manual})$B!#(B
+Editor})$B!#(B
 
 @item H d
 @itemx C-c C-d
@@ -4187,15 +4278,15 @@ Manual})$B!#(B
 @cindex describing groups
 @cindex group description
 @findex gnus-group-describe-group
-$B8=:_$N%0%k!<%W$N@bL@$rI=<($9$k(B (@code{gnus-group-describe-group})$B!#%W%l(B
-$B%U%#%C%/%9$rM?$($k$H!"@bL@J8$r%5!<%P$+$i6/@)E*$K:FFI$_9~$_$7$^$9!#(B
+$B8=:_$N%0%k!<%W$N@bL@$rI=<($7$^$9(B (@code{gnus-group-describe-group})$B!#@\(B
+$BF,0z?t$rM?$($k$H!"@bL@J8$r%5!<%P!<$+$i6/@)E*$K:FFI$_9~$_$7$^$9!#(B
 
 @item M-d
 @kindex M-d ($B%0%k!<%W(B)
 @findex gnus-group-describe-all-groups
-$BA4$F$N%0%k!<%W$N@bL@$rI=<($7$^(B
-$B$9(B (@code{gnus-group-describe-all-groups})$B!#%W%l%U%#%C%/%9$rM?$($k$H!"@b(B
-$BL@J8%U%!%$%k$r%5!<%P$+$i6/@)E*$K:FFI$_9~$_$7$^$9!#(B
+$B$9$Y$F$N%0%k!<%W$N@bL@$rI=<($7$^(B
+$B$9(B (@code{gnus-group-describe-all-groups})$B!#@\F,0z?t$rM?$($k$H!"@bL@J8%U%!(B
+$B%$%k$r%5!<%P!<$+$i6/@)E*$K:FFI$_9~$_$7$^$9!#(B
 
 @item H v
 @itemx V
@@ -4216,7 +4307,7 @@ Manual})$B!#(B
 @cindex info
 @cindex manual
 @findex gnus-info-find-node
-Gnus $B$N(B info $B%N!<%I$K0\F0$7$^$9(B (@code{gnus-info-find-node})$B!#(B
+gnus $B$N(B info $B%N!<%I$K0\F0$7$^$9(B (@code{gnus-info-find-node})$B!#(B
 @end table
 
 @node Group Timestamp
@@ -4224,18 +4315,18 @@ Gnus $B$N(B info $B%N!<%I$K0\F0$7$^$9(B (@code{gnus-info-find-node})$B!#(B
 @cindex timestamps
 @cindex group timestamps
 
-Gnus $B$K!"$"$J$?$,:G8e$K$$$D%0%k!<%W$rFI$s$@$+$r5-O?$5$;$k$HJXMx$+$b$7$l(B
+gnus $B$K!"$"$J$?$,:G8e$K$$$D%0%k!<%W$rFI$s$@$+$r5-O?$5$;$k$HJXMx$+$b$7$l(B
 $B$^$;$s!#$3$N3hF0$r;O$a$5$;$k$K$O!"(B
 @code{gnus-group-set-timestamp} $B$r(B @code{gnus-select-group-hook} $B$KDI2C(B
-$B$7$F$/$@$5$$!#(B
+$B$7$F2<$5$$!#(B
 
 @lisp
 (add-hook 'gnus-select-group-hook 'gnus-group-set-timestamp)
 @end lisp
 
-$B$3$l$r9T$C$?8e!"$"$J$?$,%0%k!<%W$KF~$k$?$S$K$=$l$,5-O?$5$l$^$9!#(B
+$B$3$l$r9T$J$C$?8e!"$"$J$?$,%0%k!<%W$KF~$k$?$S$K$=$l$,5-O?$5$l$^$9!#(B
 
-$B$3$N>pJs$O$5$^$6$^$JJ}K!$GI=<($G$-$^$9!=!=$b$C$H$b4JC1$J$N$O!"%0%k!<%W9T(B
+$B$3$N>pJs$O$5$^$6$^$JJ}K!$GI=<($G$-$^$9(B---$B$b$C$H$b4JC1$J$N$O!"%0%k!<%W9T(B
 $B%U%)!<%^%C%H$G(B @samp{%d} $B;XDj$r;H$&J}K!$G$9(B:
 
 @lisp
@@ -4259,8 +4350,8 @@ Gnus $B$K!"$"$J$?$,:G8e$K$$$D%0%k!<%W$rFI$s$@$+$r5-O?$5$;$k$HJXMx$+$b$7$l(B
       "%M\%S\%p\%P\%5y: %(%-40,40g%) %6,6~(cut 2)d\n")
 @end lisp
 
-$B$b$C$H6E$C$?F|IU$N7A<0$r$*K>$_$J$i!"%f!<%6!$_$J$i!"MxMQl9g!"5-;v$O:G=i$N5,B'$K%^%C(B
-$B%A$9$k%0%k!<%W$@$1$KCV$+$l$^$9!#Nc$($P%0%k!<%W%Q%i%a!<%?(B @samp{(sieve
+$B$+$r@)8f$7$^$9!#$b$7Hs(B-@code{nil} ($B%G%#%U%)%k%H(B) $B$@$C$?$i5-;v$O5,B'$K9g(B
+$BCW$9$k$9$Y$F$N%0%k!<%W$KCV$+$l$^$9!#$=$&$G$J$$>l9g!"5-;v$O:G=i$N5,B'$K9g(B
+$BCW$9$k%0%k!<%W$@$1$KCV$+$l$^$9!#Nc$($P%0%k!<%W%Q%i%a!<%?!<(B @samp{(sieve
 address "sender" "owner-ding@@hpc.uh.edu")} $B$O!"(B
 @code{gnus-sieve-crosspost} $B$,(B @code{nil} $B$@$C$?$i0J2<$N(B Sieve $B%3!<%I$N(B
 $BCGJR$r:n$j$^$9!#(B(@code{gnus-sieve-crosspost} $B$,Hs(B-@code{nil} $B$@$C$?>l9g(B
@@ -4343,7 +4434,7 @@ if address "sender" "owner-ding@@hpc.uh.edu" @{
 @findex gnus-sieve-generate
 @vindex gnus-sieve-file
 @cindex generating sieve script
-@code{sieve} $B%0%k!<%W%Q%i%a!<%?$+$i(B Sieve $B%9%/%j%W%H$r:F:n@.$7$F!"(B
+@code{sieve} $B%0%k!<%W%Q%i%a!<%?!<$+$i(B Sieve $B%9%/%j%W%H$r:F:n@.$7$F!"(B
 @code{gnus-sieve-file} $B$K=q$-9~$_$^$9!#0JA0$NFbMF$OJ]B8$5$l$^$;$s!#(B
 
 @item D u
@@ -4351,51 +4442,62 @@ if address "sender" "owner-ding@@hpc.uh.edu" @{
 @findex gnus-sieve-update
 @vindex gnus-sieve-file
 @cindex updating sieve script
-@code{sieve} $B%0%k!<%W%Q%i%a!<%?$r85$K(B @code{gnus-sieve-file} $B$N(B gnus $B$,(B
-$B4IM}$7$F$$$kItJ,$r:F:n@.$7$F%U%!%$%k$K%;!<%V$7!"(B@code{sieveshell} $B%W%m%0(B
-$B%i%`$r;H$C$F%5!<%P!<$K%"%C%W%m!<%I$7$^$9!#(B
+@code{sieve} $B%0%k!<%W%Q%i%a!<%?!<$r85(B
+$B$K(B @code{gnus-sieve-file} $B$N(B gnus $B$,4IM}$7$F$$$kItJ,$r:F:n@.$7$F%U%!%$%k(B
+$B$K%;!<%V$7!"(B@code{sieveshell} $B%W%m%0%i%`$r;H$C$F%5!<%P!<$K%"%C%W%m!<%I$7(B
+$B$^$9!#(B
 @end table
 
 @node Summary Buffer
-@chapter $B35N,%P%C%U%!(B
+@chapter $B35N,%P%C%U%!!<(B
 @cindex summary buffer
 
-$B35N,%P%C%U%!(B (summary buffer) $B$G$O$=$l$>$l$N5-;v$,0l9T$GI=<($5$l$^$9!#$=(B
-$B$NCf$rF0$-2s$j!"5-;v$rFI$_!"Ej9F$7!"JVEz$r$9$k$3$H$,$G$-$^$9!#(B
+$B35N,%P%C%U%!!<(B (summary buffer) $B$G$O$=$l$>$l$N5-;v$,0l9T$GI=<($5$l$^$9!#(B
+$B$=$NCf$rF0$-2s$j!"5-;v$rFI$_!"Ej9F$7!"JVEz$r$9$k$3$H$,$G$-$^$9!#(B
+
+$B35N,%P%C%U%!!<$K0\$k0lHVIaDL$NJ}K!$O!"%0%k!<%W%P%C%U%!!<$G%0%k!<%W$rA*Br(B
+$B$9$k$3$H$G$9(B (@pxref{Selecting a Group})$B!#(B
 
-$B35N,%P%C%U%!$K0\$k0lHVIaDL$NJ}K!$O!"%0%k!<%W%P%C%U%!$G%0%k!<%W$rA*Br$9$k(B
-$B$3$H$G$9(B (@pxref{Selecting a Group})$B!#(B
+$B9%$-$J$@$1$?$/$5$s$N35N,%P%C%U%!!<$r3+$$$F$*$/$3$H$,$G$-$^$9!#(B
 
-$B35N,%P%C%U%!$OK>$`$@$1$?$/$5$s3+$$$?>uBV$K$7$F$*$/$3$H$,$G$-$^$9!#(B
+@kindex v ($B35N,(B)
+@cindex keys, reserved for users (Summary)
+@kbd{v} $B%-!<$O%f!<%6!C5n2DG=Ey$N0u$rIU$1$k(B
+* Limiting::                    $B35N,%P%C%U%!!<$K@)8B$r2C$($k$3$H$,$G$-$k(B
 * Threading::                   $B%9%l%C%I$,$I$N$h$&$K:n$i$l$k$+(B
 * Sorting the Summary Buffer::  $B%9%l%C%I$H5-;v$,$I$N$h$&$KJB$S$+$($i$l$k$+(B
-* Asynchronous Fetching::       Gnus $B$O5-;v$r@h$KC5n$7$J$/$5$;$k(B
-* Article Backlog::             $B4{$KFI$s$@5-;v$r;D$7$F$*$/(B
+* Article Backlog::             $B$9$G$KFI$s$@5-;v$r;D$7$F$*$/(B
 * Saving Articles::             $B5-;v$NJ]B8$r%+%9%?%^%$%:$9$kJ}K!(B
-* Decoding Articles::           Gnus $B$O0lO"$N(B (uu)encode $B$5$l$?5-;v$r07$($k(B
-* Article Treatment::           $B5-;v%P%C%U%!$O$*K>$_$I$*$j$KL\Cc6lCc$K$G$-$k(B
+* Decoding Articles::           gnus $B$O0lO"$N(B (uu)encode $B$5$l$?5-;v$r07$($k(B
+* Article Treatment::           $B5-;v%P%C%U%!!<$O$*K>$_$I$*$j$KL\Cc6lCc$K$G$-$k(B
 @c * MIME Commands::               Doing MIMEy things with the articles.
 @c * Charsets::                    Character set issues.
-* Article Commands::            $B5-;v%P%C%U%!$G$$$m$$$m$J$3$H$r$9$k(B
-* Summary Sorting::             $B$$$m$$$m$JJ}K!$G35N,%P%C%U%!$rJB$YBX$($k(B
+* Article Commands::            $B5-;v%P%C%U%!!<$G$$$m$$$m$J$3$H$r$9$k(B
+* Summary Sorting::             $B$$$m$$$m$JJ}K!$G35N,%P%C%U%!!<$rJB$YBX$($k(B
 * Finding the Parent::          $B;R5-;v$,C5$;$J$$$C$F(B? $B?F5-;v$r$N$I$N>l=j$K$b9g$o$J$+$C$?$b$N(B
-* Exiting the Summary Buffer::  $B%0%k!<%W%P%C%U%!$KLa$k!"$^$?$O8=:_$N%0%k!<%W$r:F$SA*Br$9$k(B
+* Various Summary Stuff::       $BB>$N$I$N>O$K$bG<$^$i$J$+$C$?$b$N(B
+* Exiting the Summary Buffer::  $B%0%k!<%W%P%C%U%!!<$KLa$k!"$^$?$O8=:_$N%0%k!<%W$r:F$SA*Br$9$k(B
 * Crosspost Handling::          $B%/%m%9%]%9%H$5$l$?5-;v$,$I$N$h$&$K07$o$l$k$+(B
 * Duplicate Suppression::       $B%/%m%9%]%9%H$N07$$$K<:GT$7$?$H$-$NBeBXA0$rI=<($7$J$$J}K!(B
 * Summary Buffer Mode Line::    $B%b!<%I9T$N8+$(J}$r7h$a$i$l$k(B
-* Summary Highlighting::        $B35N,%P%C%U%!$r$-$l$$$GAGE($K$9$k(B
+* Summary Highlighting::        $B35N,%P%C%U%!!<$r$-$l$$$GAGE($K$9$k(B
 @end menu
 
 @findex std11-extract-address-components
 @findex mail-extract-address-components
 @findex gnus-extract-address-components
 @vindex gnus-extract-address-components
-Gnus $B$OJQ?t(B @code{gnus-extract-address-components} $B$NCM$r(B @code{From} $B%X%C(B
-$B%@!<$NL>A0$H%"%I%l%9$NItJ,$ro$KB.$/F0:n$7$^$9!#(B
-@code{mail-extract-address-components} $B$ONI$/F0:n$7$^$9$,!"$d$dCY$/$J$j(B
-$B$^$9!#$=$7$F!"(B@code{std11-extract-address-components} $B$O$H$F$bNI$/F0:n$7(B
-$B$^$9$,!"CY$/$J$j$^$9!#%G%#%U%)%k%H$N4X?t$O(B 5% $B$N3d9g$G4V0c$C$FEz$($^$9!#(B
-$B$b$7$3$l$K2fK}$J$i$J$$$N$G$"$l$P!"B>$N4X?t$rBe$o$j$K;H$&$3$H$,$G$-$^$9(B:
+gnus $B$OJQ?t(B @code{gnus-extract-address-components} $B$NCM$r(B @code{From} $B%X%C(B
+$B%@!<$NL>A0$H%"%I%l%9$NItJ,$rCj=P$9$k$?$a$N4X?t$H$7$F;H$$$^$9!#$9$G$KDj5A(B
+$B$5$l$F$$$k4X?t$,Fs$DB8:_$7$^$9(B: $B%G%#%U%)%k%H(B
+$B$O(B @code{gnus-extract-address-components} $B$G!"$H$F$b4JC1$K3d$j@Z$C$?2r7h(B
+$BK!$G$9$,Hs>o$KB.$/F0:n$7$^$9!#(B@code{mail-extract-address-components} $B$O(B
+$BNI$/F0:n$7$^$9$,CY$$$G$9!#%G%#%U%)%k%H$N4X?t$O(B 5% $B$N3d9g$G4V0c$C$?Ez$rJV(B
+$B$7$^$9!#$b$7$3$l$K2fK}$J$i$J$$$N$G$"$l$P!"Be$o$j$KB>$N4X?t$r;H$C$F2<$5$$(B:
 
 @lisp
 (setq gnus-extract-address-components
@@ -4443,25 +4542,25 @@ Gnus $B$OJQ?t(B @code{gnus-extract-address-components} $B$NCM$r(B @code{From
 
 @vindex gnus-summary-same-subject
 @code{gnus-summary-same-subject} $B$O:#FI$s$G$$$k5-;v$,!"$=$NA0$N5-;v$HF1(B
-$B$8I=Bj(B (subject) $B$G$"$k$3$H$r<($9J8;zNs$G$9!#$3$NJ8;zNs$O;EMM$,$3$l$rMW(B
-$B5a$9$k$H$-$K;H$o$l$^$9!#=i4|@_Dj$G$O(B @code{""} $B$G$9!#(B
+$B$8I=Bj(B (subject) $B$G$"$k$3$H$r<($9J8;zNs$G$9!#$3$NJ8;zNs$O!"$=$l$rMW5a$9(B
+$B$k=qK!;EMM$G;H$o$l$^$9!#%G%#%U%)%k%H$G$O(B @code{""} $B$G$9!#(B
 
 @node Summary Buffer Lines
-@subsection $B35N,%P%C%U%!$N9T(B
+@subsection $B35N,%P%C%U%!!<$N9T(B
 
 @vindex gnus-summary-line-format
 $BJQ?t(B @code{gnus-summary-line-format} $B$NCM$rJQ$($k$3$H$K$h$C$F!"35N,%P%C(B
-$B%U%!$G$N9T$NMM<0(B (format) $B$rJQ99$9$k$3$H$,$G$-$^$9!#$$$/$D$+$N3H(B
-$BD%(B (@pxref{Formatting Variables}) $B$r=|$$$F!"IaDL$N(B @code{format} $BJ8;zNs(B
+$B%U%!!<$N9T$NMM<0(B (format) $B$rJQ99$9$k$3$H$,$G$-$^$9!#$$$/$D$+$N3H(B
+$BD%(B (@pxref{Formatting Variables}) $B$H$H$b$K!"IaDL$N(B @code{format} $BJ8;zNs(B
 $B$HF1$8$h$&$KF0:n$7$^$9!#(B
 
 $B9T$K$O>o$K%3%m%s$+%]%$%s%H0LCV$N%^!<%+!<$,B8:_$7$F$$$J$1$l$P$J$j$^$;$s!#(B
 $BA`:n$7$?8e$K!"%+!<%=%k$O$$$D$b%3%m%s$+%]%$%s%H0LCV$N%^!<%+!<$N>l=j$K0\F0(B
-$B$7$^$9!#(B($B$b$A$m$s!"$3$NF0:n$rJQ$($k$3$H$,$G$-$J$$$H$7$?$i(B Gnus $B$K$O$"$k(B
+$B$7$^$9!#(B($B$b$A$m$s!"$3$NF0:n$rJQ$($k$3$H$,$G$-$J$$$H$7$?$i(B gnus $B$K$O$"$k(B
 $B$^$8$-$3$H$G$9!#4X?t(B @code{gnus-goto-colon} $B$r!"$"$J$?$,9%$-$J%+!<%=%k$N(B
 $BF0$-$K$J$k$h$&$K!"?7$?$K=q$1$PNI$$$N$G$9!#(B) @xref{Positioning Point}.
 
-$B=i4|CM$NJ8;zNs$O(B @samp{%U%R%z%I%(%[%4L: %-23,23f%]%) %s\n} $B$G$9!#(B
+$B%G%#%U%)%k%H$NJ8;zNs$O(B @samp{%U%R%z%I%(%[%4L: %-23,23f%]%) %s\n} $B$G$9!#(B
 
 $B0J2<$NMM<0;X<(J8;z$H3HD%MM<0;X<($r;H$&$3$H$,$G$-$^$9(B:
 
@@ -4472,15 +4571,15 @@ Gnus $B$OJQ?t(B @code{gnus-extract-address-components} $B$NCM$r(B @code{From
 $BI=Bj$NJ8;zNs!#(B@code{gnus-list-identifiers} $B$N@_Dj$K$h$C$F%a!<%j%s%0%j%9(B
 $B%H$NI8<1$,:o=|$5$l$^$9!#(B@xref{Article Hiding}.
 @item s
-$B%9%l%C%I(B (thread) $B$N4p5-;v$G$"$k$H$-$+D>A0$N5-;v$,0c$&I=Bj$N$H$-$O$=$NBj(B
-$BL>$G!"$=$l0J30$O(B @code{gnus-summary-same-subject}$B!#(B
-(@code{gnus-summary-same-subject} $B$N=i4|CM$O(B @code{""}$B!#(B)
+$B%9%l%C%I(B (thread) $B$N855-;v$G$"$k$H$-$+D>A0$N5-;v$,0c$&I=Bj$N$H$-$O$=$NI=(B
+$BBj$G!"$=$l0J30$O(B @code{gnus-summary-same-subject}$B!#(B
+(@code{gnus-summary-same-subject} $B$O%G%#%U%)%k%H$G(B @code{""}$B!#(B)
 @item F
 $B40A4$J(B @code{From} $BMs!#(B
 @item n
 $BL>A0(B (@code{From} $BMs$h$j(B)$B!#(B
 @item f
-$BL>A0!"(B@code{To} $B%X%C%@!<$+(B @code{Newsgroups} $B%X%C%@!<$G(B
+$BL>A0!"(B@code{To} $BMs$NFbMF!"$^$?$O(B @code{Newsgroups} $BMs$NFbMF$N$I$l$+$G(B
 $B$9(B (@pxref{To From Newsgroups})$B!#(B
 @item a
 $BL>A0(B (@code{From} $BMs$h$j(B)$B!#$3$l$H(B @code{n} $B$H$N0c$$$O!"$3$l$OJQ(B
@@ -4515,21 +4614,22 @@ Gnus $B$OJQ?t(B @code{gnus-extract-address-components} $B$NCM$r(B @code{From
 $B0J2<$N%*%W%7%g%s$G8+1I$($r%+%9%?%^%$%:$9$k$3$H$,$G$-$^$9!#%G%#%U%)%k%H(B
 $B$N(B @acronym{ASCII} $BJ8;z$r@~IA2hMQ$N?^0F$GCV$-49$($k$3$H$K$h$C$F!"%9%l%C(B
 $B%II=<($r$r;H(B
+$B%9%l%C%I$N:,(B (root) $B$K;H$o$l$^$9!#(B@code{nil} $B$@$C$?$i!"Be$o$j$KI=Bj$r;H(B
 $B$$$^$9!#%G%#%U%)%k%H$O(B @samp{> } $B$G$9!#(B
 
 @item gnus-sum-thread-tree-false-root
 @vindex gnus-sum-thread-tree-false-root
 $B%9%l%C%I$N$K$;$N:,$K;H$o$l$^$9(B (@pxref{Loose Threads})$B!#(B@code{nil} $B$@$C(B
-$B$?$i!"Be$o$j$KBjL>$r;H$$$^$9!#%G%#%U%)%k%H$O(B @samp{> } $B$G$9!#(B
+$B$?$i!"Be$o$j$KI=Bj$r;H$$$^$9!#%G%#%U%)%k%H$O(B @samp{> } $B$G$9!#(B
 
 @item gnus-sum-thread-tree-single-indent
 @vindex gnus-sum-thread-tree-single-indent
-$BC10l$N%a%C%;!<%8$N%9%l%C%I$K;H$o$l$^$9!#(B@code{nil} $B$@$C$?$i!"Be$o$j$KBj(B
-$BL>$r;H$$$^$9!#%G%#%U%)%k%H$O(B @samp{} $B$G$9!#(B
+$BC10l$N%a%C%;!<%8$N%9%l%C%I$K;H$o$l$^$9!#(B@code{nil} $B$@$C$?$i!"Be$o$j$KI=(B
+$BBj$r;H$$$^$9!#%G%#%U%)%k%H$O(B @samp{} $B$G$9!#(B
 
 @item gnus-sum-thread-tree-vertical
 @vindex gnus-sum-thread-tree-vertical
@@ -4549,8 +4649,8 @@ Gnus $B$OJQ?t(B @code{gnus-extract-address-components} $B$NCM$r(B @code{From
 @end table
 
 @item T
-$B5-;v$,K\5-;v$G$"$l$P2?$bI=<($;$:!"$=$&$G$J$$>l9g$O$?$/$5$s$N6uGr$G$9(B ($B8e(B
-$B$N$b$N$r$9$Y$F2hLL$N30$KDI$$=P$7$F$7$^$$$^$9(B)$B!#(B
+$B5-;v$,855-;v$G$"$l$P2?$bI=<($;$:!"$=$&$G$J$$>l9g$O$?$/$5$s$N6uGr$G$9(B ($B$=(B
+$B$l$h$j8e$N$b$N$r$9$Y$F2hLL$N30$KDI$$=P$7$F$7$^$$$^$9(B)$B!#(B
 @item [
 $B3+$-3g8L!#IaDL$O(B @samp{[} $B$G$9$,!"M\;R5-;v$K$O(B @samp{<} $B$K$9$k$3$H$,$G$-(B
 $B$^$9(B (@pxref{Customizing Threading})$B!#(B
@@ -4560,21 +4660,21 @@ Gnus $B$OJQ?t(B @code{gnus-extract-address-components} $B$NCM$r(B @code{From
 @item >
 $B$=$l$>$l$N%9%l%C%I$N%l%Y%k$KBP$7$F0l$D$N6uGr!#(B
 @item <
-$BFs==0z$/%9%l%C%I%l%Y%k$N6uGr!#(B
+(20 - $B%9%l%C%I%l%Y%k(B) $B8D$N6uGr!#(B
 @item U
 $BL$FI!#(B@xref{Read Articles}.
 
 @item R
-$B$3$NJ6$i$o$7$$L>A0;XDj;R$O(B @dfn{secondary mark} $B$K$h$C$FDj5A$5$l$^$9!#$3(B
-$B$N%^!<%/$O5-;v$,4{$KJVEz:Q$_$N$b$N$+!"%-%c%C%7%e$5$l$?$b$N$+!"$"$k$$$OJ](B
-$BB8$5$l$?$b$N$+$rI=$7$^$9!#(B@xref{Other Marks}.
+$B$3$NJ6$i$o$7$$L>A0;XDj;R$O!VBhFs$N0u!W(B(the secondary mark) $B$G$9!#$3$N0u(B
+$B$O5-;v$,$9$G$KJVEz:Q$_$N$b$N$+!"%-%c%C%7%e$5$l$?$b$N$+!"$"$k$$$OJ]B8$5$l(B
+$B$?$b$N$+$rI=$7$^$9!#(B@xref{Other Marks}.
 
 @item i
-$B?t;z$H$7$F$N%9%3%"(B (@pxref{Scoring})$B!#(B
+$B?tCM$H$7$F$N%9%3%"(B (@pxref{Scoring})$B!#(B
 @item z
 @vindex gnus-summary-zcore-fuzz
-$B$3$l$O!"(Bzcore $B$G=i4|@_Dj$N%l%Y%k$h$j$b>e$G$"$l$P(B @samp{+} $B$G!"=i4|@_Dj$N(B
-$B%l%Y%k$h$j$b2<$G$"$l$P(B @samp{-} $B$G$9!#(B
+$B$3$l$O!"(Bzcore $B$G%G%#%U%)%k%H$N%l%Y%k$h$j$b>e$G$"$l$P(B @samp{+} $B$G!"%G%#%U%)(B
+$B%k%H$N%l%Y%k$h$j$b2<$G$"$l$P(B @samp{-} $B$G$9!#(B
 @code{gnus-summary-default-score} $B$H$N:9(B
 $B$,(B @code{gnus-summary-zcore-fuzz} $B$h$j$b>.$5$$$H!"$3$N;EMM$O;H$o$l$^$;$s!#(B
 @item V
@@ -4582,18 +4682,18 @@ Gnus $B$OJQ?t(B @code{gnus-extract-address-components} $B$NCM$r(B @code{From
 @item x
 @code{Xref}.
 @item D
-@code{$BF|IU(B} (@code{Date})$B!#(B
+@code{Date}.
 @item d
-@code{DD-MM}$BMM<0$K$h$k(B@code{$BF|IU(B}$B!#(B
+@code{DD-MM} $BMM<0$K$h$k(B @code{Date}$B!#(B
 @item o
-@var{YYYYMMDD}@code{T}@var{HHMMSS}$BMM<0$K$h$k(B@code{$BF|IU(B}$B!#(B
+@var{YYYYMMDD}@code{T}@var{HHMMSS} $BMM<0$K$h$k(B @code{Date}$B!#(B
 @item M
 @code{Message-ID}.
 @item r
 @code{References}.
 @item t
-$B8=:_$NI{%9%l%C%I$N5-;v$N?t!#$3$N;EMM$r;H$&$H35N,%P%C%U%!$N@8@.$,4vJ,CY$/(B
-$B$J$j$^$9!#(B
+$B8=:_$NI{%9%l%C%I$N5-;v$N?t!#$3$N;EMM$r;H$&$H35N,%P%C%U%!!<$N@8@.$,4vJ,CY(B
+$B$/$J$j$^$9!#(B
 @item e
 $B5-;v$K;R5-;v$,$"$k$H!"(B@samp{=} (@code{gnus-not-empty-thread-mark}) $B$,I=(B
 $B<($5$l$^$9!#(B
@@ -4601,16 +4701,17 @@ Gnus $B$OJQ?t(B @code{gnus-extract-address-components} $B$NCM$r(B @code{From
 $B9T?t!#(B
 @item O
 $B%@%&%s%m!<%I$N0u!#(B
+@item *
+$B%+!<%=%k$r(B ($B:G=i$N%3%m%s$N8e$m$NBe$o$j$K(B) $BCV$/>l=j!#(B
 @item &user-date;
 $B7P2a;~4V$NMM<0!#$$$m$$$m$JMM<0$,(B @code{gnus-user-date-format-alist} $B$GDj(B
 $B5A$5$l$F$$$^$9!#(B
 @item u
-$BMxMQ$N35N,;XDj$HF1MM$K35N,$KA^F~(B
-$B$5$l$^$9!#(B
+$BMxMQ$N35N,;XDj$HF1MM$K35N,$KA^F~$5$l$^$9!#(B
 @end table
 
 @samp{%(} $B$H(B @samp{%)} $B$N4V$K$"$k%F%-%9%H$O!"$=$3$K%^%&%9$,$"$k$H$-(B
@@ -4621,23 +4722,23 @@ Gnus $B$OJQ?t(B @code{gnus-extract-address-components} $B$NCM$r(B @code{From
 $BIU$1$kI,MW$,$"$j$^$9!#8zN($N$?$a$K!"(Bgnus $B$O$3$l$i$NJ8;z$,$I$N7e$K8=$l$k(B
 $B$+$r7W;;$7!"!X%O!<%I!&%3!<%I!Y$7$^$9!#$3$l$O!"2DJQD9$N;EMM$N8e$G$O!"$3$l(B
 $B$i$O0UL#$r;}$?$J$$$H$$$&$3$H$G$9!#$^$!!"$5$9$,$KBaJa$O$5$l$J$$$G$7$g$&$,!"(B
-$B35N,%P%C%U%!$OJQ$K$J$j$^$9!#$=$l$G$b==J,Ha$7$$$G$7$g$&$1$I!#(B
+$B35N,%P%C%U%!!<$OJQ$K$J$j$^$9!#$=$l$G$b==J,Ha$7$$$G$7$g$&$1$I!#(B
 
 $B8-$$A*Br$O$3$l$i$N;XDj$r$G$-$k$@$1:8$K;}$C$F$/$k$3$H$G$9!#(B($B$G$b!"$=$&$$(B
 $B$&$3$H$O$9$Y$F$KEv$F$O$^$k$N$G$O$J$$$G$7$g$&$+!#4WOC5YBj!#(B)
 
-$B$3$N@)8B$O>-Mh$NHG$G$OL5$/$J$k$+$bCN$l$^$;$s!#(B
+$B$3$N@)8B$O>-Mh$NHG$G$OL5$/$J$k$+$b$7$l$^$;$s!#(B
 
 @node To From Newsgroups
 @subsection To From Newsgroups
 @cindex To
 @cindex Newsgroups
 
-$B$$$/$D$+$N%0%k!<%W$G$O(B ($BFC$K%"!<%+%$%V%0%k!<%W(B), @code{From} $B%X%C%@!<$O(B
-$B$"$^$j6=L#$r0z$-$^$;$s!#$=$3$NA4$F$N5-;v$O$"$J$?$K$h$C$F=q$+$l$?$b$N$G$9(B
-$B$+$i!#Be$o$j$K!"(B@code{To} $B$d(B @code{Newsgroups} $B%X%C%@!<$N>pJs$rI=<($9$k(B
-$B$?$a$K$O!";0$D$N$3$H$r7h$a$kI,MW$,$"$j$^$9(B: $B$I$N>pJs$r=8$a$k$+(B, $B$I$3$KI=(B
-$B<($9$k$+(B, $B$$$DI=<($9$k$+!#(B
+$B$$$/$D$+$N%0%k!<%W(B ($BFC$K%"!<%+%$%V%0%k!<%W(B) $B$G$O(B @code{From} $B%X%C%@!<$O(B
+$B$"$^$j6=L#$r0z$-$^$;$s!#$=$3$N$9$Y$F$N5-;v$O$"$J$?$K$h$C$F=q$+$l$?$b$N$G(B
+$B$9$+$i!#Be$o$j$K!"(B@code{To} $B$d(B @code{Newsgroups} $B%X%C%@!<$N>pJs$rI=<($9(B
+$B$k$?$a$K$O!";0$D$N$3$H$r7h$a$kI,MW$,$"$j$^$9(B: $B$I$N>pJs$r=8$a$k$+(B, $B$I$3$K(B
+$BI=<($9$k$+(B, $B$$$DI=<($9$k$+!#(B
 
 @enumerate
 @item
@@ -4650,14 +4751,14 @@ Gnus $B$OJQ?t(B @code{gnus-extract-address-components} $B$NCM$r(B @code{From
       '(To Newsgroups X-Newsreader))
 @end lisp
 
-$B$3$l$O!"(Bgnus $B$,$3$l$i$N;0$D$N%X%C%@!<$r } $B$,!"(B@code{Newsgroups} $B$K$O(B @samp{=> } $B$,;H$o$l$^$9$,!"(B
+@code{gnus-summary-to-prefix} $B$H(B @code{gnus-summary-newsgroup-prefix} $B$K(B
+$B$h$C$F!"$=$l$i$NJ8;zNs$r%+%9%?%^%$%:$9$k$3$H$,$G$-$^$9!#(B
 @end enumerate
 
 @vindex nnmail-extra-headers
-$B4XO"$7$?JQ?t$O(B @code{nnmail-extra-headers} $B$G!"(B
-overview (@acronym{NOV}) $B%U%!%$%k$K$$$DDI2C$N%X%C%@!<$r4^$a$k$+$r@)8f$7(B
-$B$^$9!#8E$$(B overview $B%U%!%$%k$,$"$k>l9g$O!"$3$NJQ?t$rJQ99$7$?8e$K%5!<%P!<(B
-$B%P%C%U%!$K(B @kbd{^} $B$GF~$C$FE,@Z$J%a!<%k%5!<%P!<(B ($BNc$((B
+$B4XO"$9$kJQ?t$O(B @code{nnmail-extra-headers} $B$G!"(B
+overview (@acronym{NOV}) $B%U%!%$%k$r:n$k:]$K$$$DDI2C$N%X%C%@!<$r4^$a$k$+(B
+$B$r@)8f$7$^$9!#8E$$(B overview $B%U%!%$%k$,$"$k>l9g$O!"$3$NJQ?t$rJQ99$7$?8e$K(B
+$B%5!<%P!<%P%C%U%!!<$K(B @kbd{^} $B$GF~$C$FE,@Z$J%a!<%k%5!<%P!<(B ($BNc$((B
 $B$P(B nnml) $B$G(B @kbd{g} $B$r2!$7!":F@8@.$9$kI,MW$,$"$j$^$9!#(B
 
 @vindex gnus-summary-line-format
-gnus $B$K!"(B@code{gnus-summary-line-format} $BJQ?t$N(B @code{%n} $B;EMM(B
-$B$r(B @code{%f} $B;EMM$KJQ99$9$k$3$H$G!"%G!<%?$rI=<($9$k$h$&$K;X<($9$kI,MW$,(B
-$B$"$j$^$9!#(B
+$B$5$i$K(B @code{gnus-summary-line-format} $BJQ?t$N(B @code{%n} $B;EMM(B
+$B$r(B @code{%f} $B;EMM$KJQ99$9$k$3$H$K$h$C$F%G!<%?$rI=<($9$k$h$&$K!"(Bgnus $B$K;X(B
+$B<($9$kI,MW$,$"$j$^$9!#(B
 
 $BMWLs$9$k$H!"IaDL$O0J2<$N$h$&$J$b$N$r(B @file{~/.gnus.el} $B$KCV$/$3$H$K$J$j(B
 $B$^$9(B:
@@ -4701,28 +4808,27 @@ gnus $B$K!"(B@code{gnus-summary-line-format} $BJQ?t$N(B @code{%n} $B;EMM(B
 $B$$!#(B)
 
 $B%K%e!<%94IM}?M!"$^$?$O%K%e!<%94IM}?M$r@bF@$7$F%5%]!<%H$NDI2C$r$7$F$b$i$*(B
-$B$&$H;W$C$F$$$k%f!<%6!<$N$_$J$5$s$X$N$4Cm0U(B:
+$B$&$H;W$C$F$$$kMxMQe5-$N$3$H$O!":n@.$5$l$k(B @acronym{NOV} $B%U%!%$%k$rA`:n$G$-$k%a!<%k%0%k!<(B
-$B%W$G$O$?$$$F$$$N>l9gLrN)$A$^$9!#$7$+$7!"4IM}?M$r@bF@$7$F(B ($BFC$K(B INN $B$NIa(B
-$BDL$Ne5-$N$3$H$O(B
+$B$?$$$F$$$N>l9gLrN)$A$^$9!#$7$+$7!"4IM}?M$r@bF@$7$F(B ($BFC$K(B INN $B$NIaDL$N$l$NMWAG$G$9(B:
+$B0J2<$O$"$J$?$,M7$V$3$H$N$G$-$kMWAG$?$A$G$9(B:
 
 @table @samp
 @item G
@@ -4734,15 +4840,15 @@ Formatting})$B!#(B@code{gnus-summary-mode-line-format} $B$r2?$G$b9%$-$J$b$N$K
 @item z
 $B8=:_$N5-;v%9%3%"!#(B
 @item V
-Gnus $B%P!<%8%g%s!#(B
+gnus $B%P!<%8%g%s!#(B
 @item U
 $B$=$N%0%k!<%W$G$NL$FI5-;v$N?t!#(B
 @item e
-$B35N,%P%C%U%!$KI=<($5$l$F$$$J$$L$FI5-;v$N?t!#(B
+$B35N,%P%C%U%!!<$KI=<($5$l$F$$$J$$L$FI5-;v$N?t!#(B
 @item Z
 $BL$FI$HL$A*Br$N5-;v$N?t$H$H$b$KI=$5$l$kJ8;zNs$G!"L$FI$+$DL$A*Br$N5-;v$,$"(B
-$B$k>l9g$O(B @samp{<%U(+%e) more>} $B$G!"L$FI5-;v$N$_$N>l9g(B
-$B$O(B @samp{<%U more>} $B$G$9!#(B
+$B$k>l9g$N(B @samp{<%U(+%e) more>}$B!"$*$h$SL$FI5-;v$N$_$N>l9g(B
+$B$N(B @samp{<%U more>} $B$N$I$A$i$+$G$9!#(B
 @item g
 $BC;=L%0%k!<%WL>!#Nc$($P!"(B@samp{rec.arts.anime} $B$O(B @samp{r.a.anime} $B$KC;=L(B
 $B$5$l$^$9!#(B
@@ -4757,7 +4863,7 @@ Gnus $B%P!<%8%g%s!#(B
 @item t
 $B2D;k0uIU$-5-;v$N?t(B (@pxref{Unread Articles})$B!#(B
 @item r
-$B$=$N0lO"$NF0:n$N4V$K4{FI$H$7$F0u$,$D$$$?5-;v$N?t!#(B
+$B$=$N35N,%P%C%U%!!<$G5-;v$rFI$s$@7k2L!"4{FI$N0u$,IU$$$?5-;v$N?t!#(B
 @item E
 $B%9%3%"%U%!%$%k$K$h$C$FKu>C$5$l$?5-;v$N?t!#(B
 @end table
@@ -4769,42 +4875,41 @@ Gnus $B%P!<%8%g%s!#(B
 @item gnus-visual-mark-article-hook
 @vindex gnus-visual-mark-article-hook
 $B$3$N%U%C%/$O5-;v$rA*Br$7$?8e$Kl9g$Ol9g$O score default) . bold))
 @end lisp
 
-$B$4A[A|$N$H$*$j!"$b$7(B @var{form} $B$,(B @code{nil} $B$G$J$$CM$rJV$9$H!"(B
-@var{face} $B$,$=$N9T$KE,MQ$5$l$^$9!#(B
+$B$4A[A|$N$H$*$j!"(B@var{form} $B$,(B @code{nil} $B$G$J$$CM$rJV$9$H!"(B@var{face} $B$,(B
+$B$=$N9T$KE,MQ$5$l$^$9!#(B
 @end table
 
 @node Summary Maneuvering
 @section $B35N,4V$N0\F0(B
 @cindex summary movement
 
-$B$9$Y$F$ND>@\0\F0L?Na$O?tCM@\F,0z?t$r@\0\F0L?Na$O?tCM@\F,0z?t$rl9g!"(B
+@kbd{C-n} $B%-!<$H(B @kbd{C-p} $B%-!<$r;H$&$3$H$K$h$C$F!")$a$^$9!#$3$NJQ?t(B
-$B$,(B @code{t} $B$Gl9g$H$7$F!"$3$NJQ?t(B
-$B$,(B @code{quietly} $B$G$"$k$H!"(Bgnus $B$O3NG'$r$;$:$K!"H$7$F$/$@$5$$!#(B
+$B0\F0L?Na$N0l$D(B (@kbd{n} $B$N$h$&$J(B) $B$rH/$7$?$H$-$K8=:_$N5-;v$N8e$KL$FI5-;v(B
+$B$,L5$$$H!"(Bgnus $B$Ol9g$H(B
+$B$7$F!"$3$NJQ?t$,(B @code{quietly} $B$@$C$?$i!"(Bgnus $B$O3NG'$r$;$:$Kl9g$O!"%0%k!<%W(B
+$B$N0lHV:G8e$N5-;v$rFI$s$G$$$?$H$-$K8B$C$FF1$8$3$H$,5/$3$j$^$9!#:G8e$K!"$b(B
+$B$7$3$NJQ?t$,(B @code{slightly-quietly} $B$@$C$?$i!"(B@kbd{Z n} $BL?Na$O3NG'$r$;(B
+$B$:$KH$7$F2<$5$$!#(B
 
 @item gnus-auto-select-same
 @vindex gnus-auto-select-same
 @code{nil} $B$G$J$$$H!"$9$Y$F$N0\F0L?Na$O8=:_$N5-;v$HF1$8I=Bj$N5-;v$K0\F0(B
-$B$7$h$&$H$7$^$9!#(B(@dfn{$BF1$8(B} $B$O$3$3$G$O(B @dfn{$BBgBNF1$8(B} $B$H$$$&0UL#$+$bCN$l(B
-$B$^$;$s!#>\:Y$O(B @code{gnus-summary-gather-subject-limit} $B$r8+$F$/$@$5(B
-$B$$(B (@pxref{Customizing Threading} $B$b;2>H$7$F$/$@$5$$(B)$B!#(B) $BF1$8I=Bj$N5-;v(B
-$B$,L5$$$H$-$O:G=i$NL$FI5-;v$K0\F0$7$^$9!#(B
+$B$7$h$&$H$7$^$9!#(B($B!VF1$8!W$O$3$3$G$O!VBgBNF1$8!W$H$$$&0UL#$+$b$7$l$^$;$s!#(B
+$B>\:Y$O(B @code{gnus-summary-gather-subject-limit} $B$r8+$F2<$5(B
+$B$$(B (@pxref{Customizing Threading})$B!#(B) $BF1$8I=Bj$N5-;v$,L5$$$H$-$O!":G=i$N(B
+$BL$FI5-;v$K0\F0$7$^$9!#(B
 
-$B$3$NJQ?t$O!"%9%l%C%II=<($r9T$C$F$$$k$H$-$O$"$^$jLr$KN)$?$J$$$G$7$g$&!#(B
+$B$3$NJQ?t$O!"%9%l%C%II=<($r9T$J$C$F$$$k$H$-$O$"$^$jLr$KN)$?$J$$$G$7$g$&!#(B
 
 @item gnus-summary-check-current
 @vindex gnus-summary-check-current
-@code{nil} $B$G$J$$$H!"$9$Y$F$N!XL$FI!Y0\F0L?Na$O!"l9g!"$9$Y$F$N!XL$FI!Y0\F0L?Na$O!"8=:_$N5-;v$,(B
+$BL$FI$@$C$?$io$K??Cf$KJ]$A$^$9!#(B
-$B$3$l$r$9$k$H!"$H$F$b$3$.$l$$$K$J$j$^$9$,!"CY$$%M%C%H%o!<%/@\B3$G$"$C$?$j!"(B
-$BC1$K$3$N(B Emacsism $B$G$J$$9T0Y$r9%$-$K$J$l$J$$$N$G$"$l$P!"IaDL$N(B Emacs $B$N(B
-$B%9%/%m!<%k$K$9$k$?$a$K!"$3$NJQ?t$r(B @code{nil} $B$K$9$k$3$H$,$G$-$^$9!#$3$l(B
-$B$O35N,%P%C%U%!$N?eJ?J}8~$N??Cf$X$N:F0\F0$b6X;_$7$^$9$N$G!"Hs>o$KD9$$%9%l%C(B
+@code{nil} $B$G$J$$$H!"(Bgnus $B$O35N,%P%C%U%!!<$G$N%]%$%s%H$r>o$K??Cf$KJ]$A$^(B
+$B$9!#$3$l$r$9$k$H!"$H$F$b$3$.$l$$$K$J$j$^$9$,!"CY$$%M%C%H%o!<%/$K@\B3$7$F(B
+$B$$$?$j!"$3$N(B Emacs $B$i$7$/$J$$N.57$,9%$-$K$J$l$J$$$N$G$"$l$P!"$3$NJQ?t(B
+$B$r(B @code{nil} $B$K$9$k$3$H$K$h$C$F!"IaDL$N(B Emacs $B$N%9%/%m!<%k$K$9$k$3$H$,(B
+$B$G$-$^$9!#$3$l$O35N,%P%C%U%!!<$N?eJ?J}8~$G%]%$%s%H$,??$sCf$K$J$k$h$&$K$9(B
+$B$kA`:n(B (horizontal re-centering) $B$b6X;_$7$F$7$^$&$N$G!"Hs>o$KD9$$%9%l%C(B
 $B%I$rFI$`$H$-$OITJX$+$b$7$l$^$;$s!#(B
+
+$B$3$NJQ?t$O?tCM$G$b9=$$$^$;$s!#$=$N>l9g$O!"%&%#%s%I%&$N@hF,$+$i$=$N?t$N9T(B
+$B$@$12<$,$C$?0LCV$K>o$K%]%$%s%H$,$"$k$h$&$K@)8f$5$l$^$9!#(B
 @end table
 
 @node Choosing Articles
@@ -4885,10 +4995,10 @@ Gnus $B$,H$7$F2<$5$$!#(B
@@ -4897,12 +5007,13 @@ Summary Buffer} $B$r;2>H$7$F2<$5$$!#(B
 @item SPACE
 @kindex SPACE ($B35N,(B)
 @findex gnus-summary-next-page
-$B8=:_$N5-;v$+!"$=$l$,4{$KFI$^$l$F$$$k>l9g$Ol9g$OH$7$F2<$5$$!#(B
 @kindex , ($B35N,(B)
 @findex gnus-summary-best-unread-article
 $B:G9b%9%3%"$NL$FI5-;v$K0\F0$7$^(B
-$B$9(B (@code{gnus-summary-best-unread-article})$B!#$b$7@\F,0z?t$,M?$($i$l$?$J(B
-$B$i$P!"%G%#%U%)%k%H$N%9%3%"$h$jBg$-$$%9%3%"$r;}$D:G=i$NL$FI5-;v$K0\F0$7$^(B
-$B$9!#(B
+$B$9(B (@code{gnus-summary-best-unread-article})$B!#@\F,0z?t$,M?$($i$l$k$H!"%G%#(B
+$B%U%)%k%H$N%9%3%"$h$jBg$-$$%9%3%"$r;}$D:G=i$NL$FI5-;v$K0\F0$7$^$9!#(B
 
 @item G l
 @itemx l
 @kindex l ($B35N,(B)
 @kindex G l ($B35N,(B)
 @findex gnus-summary-goto-last-article
-$BD>A0$N5-;v$K0\F0$7$^$9(B (@code{gnus-summary-goto-last-article})$B!#(B
+$BD>A0$KFI$s$@5-;v$K0\F0$7$^$9(B (@code{gnus-summary-goto-last-article})$B!#(B
 
 @item G o
 @kindex G o ($B35N,(B)
 @findex gnus-summary-pop-article
-$B35N,$NMzNr(B (history) $B$+$i:G8e$N5-;v$r0l$De$NL?Na$H0c$&$N$O!"(B
-@kbd{l} $B$,:G=*Fs$D$N5-;v$N4V$r0\F0$9$k$N$KBP$7$F!"$3$l$O9%$-$J$@$1A0$N5-(B
-$B;v$rMzNr$+$iA*$S=P$9$3$H$,$G$-$kE@$G$9!#2?$i$+$N$3$l$K4X78$7$?$3$H(B
-$B$O(B ($B$b$7$3$l$i$NL?Na$r$?$/$5$s;H$&$N$G$"$l$P(B)$B!"(B
-@ref{Article Backlog} $B$r;2>H$7$F$/$@$5$$!#(B
+@cindex history
+@cindex article history
+$B35N,$NMzNr(B (history) $B$+$i:G8e$N5-;v$r0l$De$NL?Na$H0c$&$N$O!"(B
+@kbd{l} $B$,:G8e$NFs$D$N5-;v$N4V$r0\F0$9$k$@$1$J$N$KBP$7$F!"$3$l$O9%$-$J$@(B
+$B$1A0$N5-;v$rMzNr$+$iA*$S=P$9$3$H$,$G$-$kE@$G$9!#$3$l$KB?>/4X78$9$k$3$H$K(B
+$B$D$$$F!"(B@ref{Article Backlog} $B$r;2>H$7$F2<$5$$(B ($B$3$l$i$NL?Na$r$?$/$5$s;H(B
+$B$&$N$G$"$l$P(B)$B!#(B
 
 @item G j
 @item j
 @kindex j ($B35N,(B)
 @kindex G j ($B35N,(B)
 @findex gnus-summary-goto-article
-$B5-;vHV9f$+(B @code{Message-ID} $B$r?R$M!"$=$l$+$i$=$N5-;v$K9T$/!#(B
-(@code{gnus-summary-goto-article})$B!#(B
+$B5-;vHV9f$+(B @code{Message-ID} $B$r?R$M!"$=$l$+$i$=$N5-;v$K9T$-$^(B
+$B$9(B (@code{gnus-summary-goto-article})$B!#(B
 @end table
 
 @node Choosing Variables
 @subsection $BA*$V$?$a$NJQ?t(B
 
-$B5-;v$r0\F0$7!"A*Br$9$k$N$K4XO"$7$?$$$/$D$+$NJQ?t(B:
+$B5-;v$N0\F0$HA*Br$K4XO"$9$k$$$/$D$+$NJQ?t(B:
 
 @table @code
 @item gnus-auto-extended-newsgroup
 @vindex gnus-auto-extend-newsgroup
-$B$3$NJQ?t$,(B @code{nil} $B$G$J$$$H!"$9$Y$F$N0\F0L?Na$O!"$b$7$=$N5-;v$,35N,%P%C(B
-$B%U%!$KI=<($5$l$F$$$J$$>l9g$G$b!"A0(B ($B$b$7$/$Ol9g$G$b!"A0(B ($B$b$7$/$Oo$K8F$P$l$^$9!#=i4|@_Dj$G$O!"A*Br$5$l(B
-$B$?5-;v$N2<$K1#$l$F$$$k%9%l%C%I$r8+$;$k$h$&$K$J$C$F$$$^$9!#$"$J$?$,FI$s$@(B
-$B$=$l$>$l$N5-;v$r%(!<%8%'%s%H$K%;!<%V$5$;$?$$>l9g$O!"$3$N%U%C%/(B
-$B$K(B @code{gnus-agent-fetch-selected-article} $B$rDI2C$9$k$3$H$G!"$=$l$r9T$J(B
-$B$&$G$7$g$&!#(B
+$B$3$N%U%C%/$O5-;v$,A*Br$5$l$?$H$-$K>o$K8F$P$l$^$9!#%G%#%U%)%k%H(B
+$B$O(B @code{nil} $B$G$9!#9VFI$9$k$=$l$>$l$N5-;v$r%(!<%8%'%s%H$KJ]B8$5$;$?$$>l(B
+$B9g$O!"$3$N%U%C%/$K(B @code{gnus-agent-fetch-selected-article} $B$rDI2C$9$l$P(B
+$BNI$$$G$7$g$&!#(B
 
 @item gnus-mark-article-hook
 @vindex gnus-mark-article-hook
 @findex gnus-summary-mark-unread-as-read
 @findex gnus-summary-mark-read-and-unread-as-read
 @findex gnus-unread-mark
-$B$3$N%U%C%/$O5-;v$,A*Br$5$l$?$H$-$K>o$K8F$P$l$^$9!#$=$l$O5-;v$K4{FI$N0u$r(B
-$BIU$1$k$?$a$K$"$j$^$9!#=i4|CM(B
+$B$3$N%U%C%/$O5-;v$,A*Br$5$l$?$H$-$K>o$K8F$P$l$^$9!#$3$l$O5-;v$K4{FI$N0u$r(B
+$BIU$1$k$?$a$K;H$o$l$k$3$H$r0U?^$7$F$$$^$9!#%G%#%U%)%k%HCM(B
 $B$O(B @code{gnus-summary-mark-read-and-unread-as-read} $B$G!"$[$H$s$I$9$Y$F$N(B
 $BFI$s$@5-;v$N0u$r(B @code{gnus-read-mark} $B$KJQ99$7$^$9!#$3$N4X?t$K1F6A$5$l(B
-$B$J$$5-;v$O!"2D;k!"J]N1!"4|8B@Z$l:o=|2DG=5-;v$@$1$G$9!#$b$7!"L$FI$K4{FI$N(B
-$B0u$rIU$1$?$$$@$1$G$"$l$P!"Be$o$j(B
-$B$K(B @code{gnus-summary-mark-unread-as-read} $B$r;H$&$3$H$,$G$-$^$9!#$=$l$O!"(B
-@code{gnus-low-score-mark} $B$d(B @code{gnus-del-mark} ($B$J$I$J$I(B) $B$N0u$r$=$N(B
-$B$^$^;D$7$^$9!#(B
+$B$J$$5-;v$O!"2D;k!"J]N1!"4|8B@Z$l>C5n2DG=5-;v$@$1$G$9!#L$FI5-;v$K4{FI$N0u(B
+$B$rIU$1$?$$$@$1$G$"$l$P!"Be$o$j(B
+$B$K(B @code{gnus-summary-mark-unread-as-read} $B$r;H$&$3$H$,$G$-$^$9!#(B
+@code{gnus-low-score-mark} $B$d(B @code{gnus-del-mark} ($B$J$I(B) $B$N0u$O$=$N$^$^(B
+$B;D$7$^$9!#(B
 @end table
 
 @node Paging the Article
@@ -5031,17 +5141,16 @@ Summary Buffer} $B$r;2>H$7$F2<$5$$!#(B
 @item SPACE
 @kindex SPACE ($B35N,(B)
 @findex gnus-summary-next-page
-@kbd{SPACE} $B$O5-;v$r0l%Z!<%8@h$K%9%/%m!<%k$7$^$9!#5-;v$N:G8e$K$$$k>l9g$O(B
-$Bl9g$O$7$+L5$$>l9g!"$=$l$O%9%-%C%W$5$l!"Be$o$j$KH$7$F2<$5$$!#(B
 @findex gnus-summary-show-article
 @vindex gnus-summary-show-article-charset-alist
 $B8=:_$N5-;v$r(B ($B:F(B) $BH$7$F2<$5$$!#(B
 @kindex A s ($B35N,(B)
 @kindex s ($B35N,(B)
 @findex gnus-summary-isearch-article
-$B5-;v%P%C%U%!$G%$%s%/%j%a%s%?%k%5!<%A(B (isearch) $B$r9T$$$^(B
+$B5-;v%P%C%U%!!<$G%$%s%/%j%a%s%?%k%5!<%A(B (isearch) $B$r9T$J$$$^(B
 $B$9(B (@code{gnus-summary-isearch-article})$B!#(B
 
 @item h
 @kindex h ($B35N,(B)
 @findex gnus-summary-select-article-buffer
-$B5-;v%P%C%U%!$rA*Br$7$^$9(B (@code{gnus-summary-select-article-buffer})$B!#(B
+$B5-;v%P%C%U%!!<$rA*Br$7$^$9(B (@code{gnus-summary-select-article-buffer})$B!#(B
 @end table
 
 @node Reply Followup and Post
@@ -5141,7 +5251,7 @@ Summary Buffer} $B$r;2>H$7$F2<$5$$!#(B
 @kindex S R ($B35N,(B)
 @findex gnus-summary-reply-with-original
 @c @icon{gnus-summary-reply-with-original}
-$B8=:_$N5-;v$r=q$$$??M$K!"K\5-;v$r4^$s$@JVEz$N%a!<%k$r=P$7$^(B
+$B8=:_$N5-;v$r=q$$$??M$K!"855-;v$r4^$s$@JVEz$N%a!<%k$r=P$7$^(B
 $B$9(B (@code{gnus-summary-reply-with-original})$B!#$3$NL?Na$O%W%m%;%9(B/$B@\F,0z(B
 $B?t$N=,47$r;H$$$^$9!#(B
 
@@ -5149,7 +5259,7 @@ Summary Buffer} $B$r;2>H$7$F2<$5$$!#(B
 @kindex S w ($B35N,(B)
 @findex gnus-summary-wide-reply
 $B8=:_$N5-;v$r=q$$$??M$KBP$7$F!"9-$$JVEz(B (wide reply) $B$r$7$^(B
-$B$9(B (@code{gnus-summary-wide-reply})$B!#(B@dfn{$B9-$$JVEz(B} $B$H$O%X%C%@!<(B
+$B$9(B (@code{gnus-summary-wide-reply})$B!#!V9-$$JVEz!W$H$O%X%C%@!<(B
 $B$N(B @code{To}, @code{From}, ($B$b$7$/$O(B @code{Reply-to}) $B$H(B @code{Cc}) $B$N$9(B
 $B$Y$F$N?M$KJVEz$r$9$k$3$H$G$9!#(B@code{Mail-Followup-To} $B$,$"$l$P!"Be$o$j$K(B
 $B$=$l$,;H$o$l$^$9!#(B
@@ -5157,7 +5267,7 @@ Summary Buffer} $B$r;2>H$7$F2<$5$$!#(B
 @item S W
 @kindex S W ($B35N,(B)
 @findex gnus-summary-wide-reply-with-original
-$B8=:_$N5-;v$KK\5-;v$r4^$s$@9-$$JVEz$N%a!<%k$rAw$j$^(B
+$B8=:_$N5-;v$K855-;v$r4^$s$@9-$$JVEz$N%a!<%k$rAw$j$^(B
 $B$9(B (@code{gnus-summary-wide-reply-with-original})$B!#$3$NL?Na$O%W%m%;%9(B/$B@\(B
 $BF,0z?t$N=,47$r;H$$$^$9!#(B
 
@@ -5165,15 +5275,15 @@ Summary Buffer} $B$r;2>H$7$F2<$5$$!#(B
 @kindex S v ($B35N,(B)
 @findex gnus-summary-very-wide-reply
 $B8=:_$N5-;v$r=q$$$??M$KBP$7$F!"Hs>o$K9-$$JVEz(B (very wide reply) $B$r$7$^(B
-$B$9(B (@code{gnus-summary-very-wide-reply})$B!#(B@dfn{$BHs>o$K9-$$JVEz(B} $B$H$O!"%W(B
-$B%m%;%9(B/$B@\F,0z?t$G;XDj$5$l$?$9$Y$F$N5-;v$N%X%C%@!<$N(B @code{To},
-@code{From}, ($B$b$7$/$O(B @code{Reply-to}) $B$H(B @code{Cc}) $B$N$9$Y$F$N?M$KJVEz(B
-$B$r$9$k$3$H$G$9!#$3$NL?Na$O%W%m%;%9(B/$B@\F,0z?t$N=,47$r;H$$$^$9!#(B
+$B$9(B (@code{gnus-summary-very-wide-reply})$B!#!VHs>o$K9-$$JVEz!W$H$O!"%W%m%;(B
+$B%9(B/$B@\F,0z?t$G;XDj$5$l$?$9$Y$F$N5-;v$N%X%C%@!<$N(B @code{To}, @code{From},
+($B$b$7$/$O(B @code{Reply-to}) $B$H(B @code{Cc}) $B$N$9$Y$F$N?M$KJVEz$r$9$k$3$H$G(B
+$B$9!#$3$NL?Na$O%W%m%;%9(B/$B@\F,0z?t$N=,47$r;H$$$^$9!#(B
 
 @item S V
 @kindex S V ($B35N,(B)
 @findex gnus-summary-very-wide-reply-with-original
-$B8=:_$N5-;v$KK\5-;v$r4^$s$@Hs>o$K9-$$JVEz$N%a!<%k$rAw$j$^(B
+$B8=:_$N5-;v$K855-;v$r4^$s$@Hs>o$K9-$$JVEz$N%a!<%k$rAw$j$^(B
 $B$9(B (@code{gnus-summary-very-wide-reply-with-original})$B!#$3$NL?Na$O%W%m%;(B
 $B%9(B/$B@\F,0z?t$N=,47$r;H$$$^$9!#(B
 
@@ -5183,13 +5293,14 @@ Summary Buffer} $B$r;2>H$7$F2<$5$$!#(B
 $B8=:_$N5-;v$r=q$$$??M$KBP$7$FJVEz$r$7$^$9$,(B @code{Reply-To} $B%U%#!<%k%I$O(B
 $BL5;k$7$^$9(B (@code{gnus-summary-reply-broken-reply-to})$B!#%a!<%j%s%0%j%9%H(B
 $B$,$=$N%j%9%H$r;X$9(B @code{Reply-To} $B$r2a$C$F@_Dj$9$k$?$a$K$3$l$,I,MW$J$N(B
-$B$G$"$l$P!"$"$J$?$O$?$V$sBe$o$j$K(B @code{broken-reply-to} $B%0%k!<%W%Q%i%a!<(B
-$B%?$r@_Dj$9$kI,MW$,$"$j!"$=$l$OF0:n$9$k$G$7$g$&!#(B
+$B$G$"$l$P!"$*$=$i$/$"$J$?$OBe$o$j$K(B @code{broken-reply-to} $B%0%k!<%W%Q%i%a!<(B
+$B%?!<$r@_Dj$9$kI,MW$,$"$j$^$9!#$=$&$9$l$P!"$b$N$4$H$O@5$7$/F/$/$h$&$K$J$k(B
+$B$G$7$g$&!#(B@xref{Group Parameters}.
 
 @item S B R
 @kindex S B R ($B35N,(B)
 @findex gnus-summary-reply-broken-reply-to-with-original
-$B8=:_$N5-;v$r=q$$$??M$KBP$7$FK\5-;v$r4^$s$@JVEz$r$7$^$9(B
+$B8=:_$N5-;v$r=q$$$??M$KBP$7$F855-;v$r4^$s$@JVEz$r$7$^$9(B
 $B$,(B @code{Reply-To} $B%U%#!<%k%I$OL5;k$7$^(B
 $B$9(B (@code{gnus-summary-reply-broken-reply-to-with-original})$B!#(B
 
@@ -5209,9 +5320,9 @@ Summary Buffer} $B$r;2>H$7$F2<$5$$!#(B
 @findex gnus-summary-mail-other-window
 @c @icon{gnus-summary-mail-originate}
 $B%a!<%k$r:n@.$7$^$9(B (@code{gnus-summary-mail-other-window})$B!#%G%#%U%)%k%H(B
-$B$G$O8=:_$N%0%k!<%W$NEj9FMM<0(B (posting style) $B$r;H$$$^$9!#$b$7@\F,<-$,M?(B
-$B$($i$l$?$i$=$l$O;H$$$^$;$s!#$b$7@\F,<-$,(B 1 $B$@$C$?$i!"$I$N%0%k!<%W$NEj9F(B
-$BMM<0$r;H$&$+$r?R$M$^$9!#(B
+$B$G$O8=:_$N%0%k!<%W$NEj9FMM<0(B (posting style) $B$r;H$$$^$9!#@\F,0z?t$,M?$((B
+$B$i$l$k$H!"$=$l$O;H$$$^$;$s!#$b$7@\F,0z?t$,(B 1 $B$@$C$?$i!"$I$N%0%k!<%W$NEj(B
+$B9FMM<0$r;H$&$+$r?R$M$^$9!#(B
 
 @item S i
 @itemx i
@@ -5219,15 +5330,15 @@ Summary Buffer} $B$r;2>H$7$F2<$5$$!#(B
 @kindex S i ($B35N,(B)
 @findex gnus-summary-news-other-window
 $B%K%e!<%9$r:n@.$7$^$9(B (@code{gnus-summary-news-other-window})$B!#%G%#%U%)%k(B
-$B%H$G$O8=:_$N%0%k!<%W$KEj9F$7$^$9!#$b$7@\F,<-$,M?$($i$l$?$i8=:_$N%0%k!<%W(B
-$BL>$O;H$o$l$^$;$s!#$b$7@\F,<-$,(B 1 $B$@$C$?$i!"$I$N%0%k!<%W$KEj9F$9$k$+$r?R(B
-$B$M$^$9!#(B
+$B%H$G$O8=:_$N%0%k!<%W$KEj9F$7$^$9!#@\F,0z?t$,M?$($i$l$k$H!"8=:_$N%0%k!<%W(B
+$BL>$O;H$o$l$^$;$s!#$b$7@\F,0z?t$,(B 1 $B$@$C$?$i!"$I$N%0%k!<%W$KEj9F$9$k$+$r(B
+$B?R$M$^$9!#(B
 
 $B$3$N4X?t$O!"$?$H$(%a!<%k%0%k!<%W$G;H$o$l$?$H$7$F$b!"(B
-$B@\%;!<%V$5$l$^$9!#BP1~$9$k%P%C%/%(%s%I$,Ej9F$N$?$a$N%a%=%C(B
-$B%I(B (request-post method) $B$r;}$C$F$$$J$1$l$P$J$j$^$;$s$,!#(B
+$B%a!<%k%0%k!<%W$K!VEj9F!W$9$k$N$KJXMx$G$9(B; $B$=$l$i$OEv$N%0%k!<%W$KC1$KD>@\(B
+$B%;!<%V$5$l$^$9!#BP1~$9$k%P%C%/%(%s%I$,Ej9F$N$?$a$N%a%=%C%I(B (request-post
+method) $B$r;}$C$F$$$J$1$l$P$J$j$^$;$s$,!#(B
 
 @item S D b
 @kindex S D b ($B35N,(B)
@@ -5235,29 +5346,30 @@ Summary Buffer} $B$r;2>H$7$F2<$5$$!#(B
 @cindex bouncing mail
 $B%a!<%k$rAw$C$?$N$K!"2?$i$+$NM}M3(B ($B%"%I%l%9$N4V0c$$!"E>Aw$NITD4(B) $B$GLa$C$F(B
 $B$-$?$H$-$K!"$3$NL?Na$r;H$C$FLa$C$F$-$?%a!<%k$r$b$&0l2sAw$k$3$H$,$G$-$^(B
-$B$9(B (@code{gnus-summary-resend-bonced-mail})$B!#$b$&0lEY%a!<%k$rAw$kA0$K%X%C(B
-$B%@!<$rJT=8$G$-$k$h$&$K!"%a!<%k%P%C%U%!$K$=$N%a!<%k$,8=$l$k$G$7$g$&!#$3$N(B
-$BL?Na$K@\F,0z?t$rM?$($F!"La$C$F$-$?%a!<%k$,C/$+$X$NJVEz$G$"$C$?>l9g!"(B
-gnus $B$O$=$N%a!<%k$r$N%a!<%k$X$NJV(B
+$BEz$G$"$C$?>l9g$K!"(Bgnus $B$O$=$N%a!<%k$re$NL?Na$H:.F1$7$J$$$h$&$K!"(B@code{gnus-summary-resend-message} $B$O8=:_$N(B
-$B%a%C%;!<%8$rAw$k@h$N%"%I%l%9$NF~NO$rB%$7!"$=$l$+$i$=$N>l=j$K%a!<%k$rAw$j(B
-$B$^$9!#%a%C%;!<%8$N%X%C%@!<$OJQ99$5$l$^$;$s!=!=$7$+$7!"(B
-@code{Resent-To}, @code{Resent-From} $BEy$N%X%C%@!<$,IU$12C$($i$l$^$9!#$3(B
-$B$l$O!"(B($B$*$=$i$/(B) $B$"$J$?<+?H$r(B @code{To} $BMs$K=q$$$?K\?M$K$b%a!<%k$rAw$C$F(B
-$B$7$^$&$H$$$&$3$H$G$9!#$3$l$O:.Mp$r>7$/$G$7$g$&!#$G$9$+$i!"$b$A$m$s!"K\Ev(B
-$B$K(B $Be$NL?Na$H:.F1$7$J$$$G2<$5$$!#(B@code{gnus-summary-resend-message} $B$O8=:_(B
+$B$N%a%C%;!<%8$rAw$k08@h$N%"%I%l%9$NF~NO$rB%$7$F!"$=$N>l=j$K%a!<%k$rAw$j$^(B
+$B$9!#%a%C%;!<%8$N%X%C%@!<$OJQ99$5$l$^$;$s(B---$B$7$+$7(B @code{Resent-To},
+@code{Resent-From} $B$J$I$N!"$?$/$5$s$N%X%C%@!<$,IU$12C$($^$9!#$3$l$O!"(B($B$*(B
+$B$=$i$/(B) $B$"$J$?<+?H$r(B @code{To} $BMs$K=q$$$?K\?M$K$b%a!<%k$rAw$C$F$7$^$&$H(B
+$B$$$&$3$H$G$9!#$3$l$O:.Mp$r>7$/$G$7$g$&!#$G$9$+$iEvA3!"$"$J$?$,K\Ev$KAw$7$?$$$H$-$KMQ$$$i$l$^$9!#(B($B$b$7$"$J$?(B
-$B$,(B @code{root} $B$G$"$j!"(B@code{postmaster} $B$G$b$"$j!"(B
-@code{root} $B$K(B @code{postmaster} $B$X$N%a!<%k$rl9g$O!"$=$l(B
-$B$r(B @code{postmaster} $B$K$b:FAw$9$kI,MW$,$"$k$7$g$&!#Ca=x$,$J$1$l$P$J$j$^(B
-$B$;$s(B! (Ordnung muss sein!))
+$B$,(B @code{root} $B$G$"$j!"(B@code{postmaster} $B$G$b$"$j!"(B@code{root} $B08$F(B
+$B$K(B @code{postmaster} $B$X$N%a!<%k$rl9g$O!"$=$l(B
+$B$r(B @code{postmaster} $B$K$b:FAw$9$kI,MW$,$"$k$+$b$7$l$^$;$s!#Ca=x$,$J$1$l(B
+$B$P$J$j$^$;$s(B! (Ordnung muss sein!))
 
 $B$3$NL?Na$O%W%m%;%9(B/$B@\F,0z?t$N=,47$K=>$$$^$9(B (@pxref{Process/Prefix})$B!#(B
 
@@ -5279,15 +5391,15 @@ gnus $B$O$=$N%a!<%k$rj%/%m%9%]%9%H$X$N6l>p$N%a!<%k$rAw$j$^(B
+$B8=:_$N5-;v$N=q$-j$J%/%m%9%]%9%H$X$N6l>p$N%a!<%k$rAw$j$^(B
 $B$9(B (@code{gnus-summary-mail-crosspost-complaint})$B!#(B
 
 @findex gnus-crosspost-complaint
-$B$3$NL?Na$O!"8=:_(B Usenet $B$K2#9T$7$F$$$k!"%/%m%9%]%9%H$N@$3&E*N.9T$KBP$7$F(B
-$BH?7b$r9T$&$$!"$=$l$>$l(B
-$B$N%a!<%k$rAw$kA0$KAw?.$9$k$+$I$&$+$N3NG'$r$7$^$9!#(B
+$B$3$NL?Na$O!"8=:_(B Usenet $B$K2#9T$7$F$$$k%/%m%9%]%9%H$N@$3&E*N.9T$KBP$7$FH?(B
+$B7b$r9T$J$&$$!"$=$l$>$l$N(B
+$B%a!<%k$rAw$kA0$KAw?.$9$k$+$I$&$+$N3NG'$r$7$^$9!#(B
 @end table
 
 $B$^$?(B @xref{Header Commands, ,$B%X%C%@!pJs$,$"$j$^$9!#(B
 @findex gnus-summary-post-news
 @c @icon{gnus-summary-post-news}
 $BEj9F$9$k$?$a$N5-;v$r:n@.$7$^$9(B (@code{gnus-summary-post-news})$B!#%G%#%U%)(B
-$B%k%H$G$O8=:_$N%0%k!<%W$KEj9F$7$^$9!#$b$7@\F,<-$,M?$($i$l$?$i8=:_$N%0%k!<(B
-$B%WL>$O;H$o$l$^$;$s!#$b$7@\F,<-$,(B 1 $B$@$C$?$i!"Be$o$j$KJL$N$I$N%0%k!<%W$K(B
-$BEj9F$9$k$+$r?R$M$^$9!#(B
+$B%k%H$G$O8=:_$N%0%k!<%W$KEj9F$7$^$9!#@\F,0z?t$,M?$($i$l$k$H!"8=:_$N%0%k!<(B
+$B%WL>$O;H$o$l$^$;$s!#$b$7@\F,0z?t$,(B 1 $B$@$C$?$i!"Be$o$j$KJL$N$I$N%0%k!<%W(B
+$B$KEj9F$9$k$+$r?R$M$^$9!#(B
 
 @item S f
 @itemx f
@@ -5326,7 +5438,7 @@ Manual}, $B$K$5$i$J$k>pJs$,$"$j$^$9!#(B
 @kindex F ($B35N,(B)
 @c @icon{gnus-summary-followup-with-original}
 @findex gnus-summary-followup-with-original
-$BK\5-;v$rpJs$,$"$j$^$9!#(B
 @item S N
 @kindex S N ($B35N,(B)
 @findex gnus-summary-followup-to-mail-with-original
-$B%a!<%k$N%a%C%;!<%8$rpJs$,$"$j$^$9!#(B
 @kindex S u ($B35N,(B)
 @findex gnus-uu-post-news
 @c @icon{gnus-uu-post-news}
-$B%U%!%$%k$r(B Uuencode $B$7!"J,3d$7$F!"AH$K$7$FEj9F$7$^(B
+$B%U%!%$%k$r(B uuencode $B$7$FJ,3d$7!"$=$l$i$rO"B3$7$FEj9F$7$^(B
 $B$9(B (@code{gnus-uu-post-news})$B!#(B(@pxref{Uuencoding and Posting})$B!#(B
 @end table
 
 $B$^$?(B @xref{Header Commands, ,$B%X%C%@!pJs$,$"$j$^$9!#(B
 
-@c FIXME this is not implemented
 @node Summary Message Commands
 @subsection $B35N,%a%C%;!<%8L?Na(B
 
@@ -5381,9 +5492,9 @@ Manual}, $B$K$5$i$J$k>pJs$,$"$j$^$9!#(B
 @item S y
 @kindex S y ($B35N,(B)
 @findex gnus-summary-yank-message
-$B8=:_$N5-;v$r4{$KB8:_$9$k(B Message $B:n@.%P%C%U%!$KE=$jIU$1$^(B
+$B8=:_$N5-;v$r!"$9$G$KB8:_$9$k%a%C%;!<%8:n@.%P%C%U%!!<$KE=$jIU$1$^(B
 $B$9(B (@code{gnus-summaryyank-message})$B!#$3$NL?Na$OE=$jIU$1$?$$%a%C%;!<%8%P%C(B
-$B%U%!$NF~NO$rB%$7!"%W%m%;%9(B/$B@\F,<-$N=,47$rM}2r$7$^(B
+$B%U%!!<$NF~NO$rB%$7!"%W%m%;%9(B/$B@\F,0z?t$N=,47$rM}2r$7$^(B
 $B$9(B (@pxref{Process/Prefix})$B!#(B
 @end table
 
@@ -5401,48 +5512,48 @@ Manual}, $B$K$5$i$J$k>pJs$,$"$j$^$9!#(B
 @findex gnus-summary-cancel-article
 @kindex C ($B35N,(B)
 @c @icon{gnus-summary-cancel-article}
-$BC$7$?$$5-;v$r8+$D$1$F$/$@$5$$(B ($BC$9$3$H$,$G$-$k$N$O<+J,$N5-;v$@(B
-$B$1$G$9!#JQ$J$3$H$O;n$5$J$$$G$/$@$5$$(B)$B!#$=$l$+$i!"(B
-@kbd{C} $B$+(B @kbd{S c} $B$r2!$7$F$/$@$5(B
-$B$$(B (@code{gnus-summary-cancel-article})$B!#$"$J$?$N5-;v$,C$5$l$^(B
-$B$9!=!=@$3&Cf$N5!3#$,$"$J$?$N5-;v$rC$7$^$9!#$3$NL?Na$O%W%m%;%9(B/$B@\F,(B
-$B0z?t$N=,47$rMQ$$$^$9(B (@pxref{Process/Prefix})$B!#(B
-
-$B$7$+$7!"Cm0U$7$F$[$7$$$N$O$9$Y$F$N%5%$%H(B (site) $B$,C$7$r07$C$F$$$k$o(B
-$B$1$G$O$J$$$3$H$G$9!#$G$9$+$i!"$?$$$F$$$N%5%$%H$,LdBj$N5-;v$rC$7$F$b!"(B
-$B$"$A$3$A$G$"$J$?$N5-;v$O@8$-;D$k$+$b$7$l$^$;$s!#(B
-
-Gnus $B$O!"C$9$H$-$K!X8=:_!Y$NA*BrJ}K!$r;H$$$^$9!#I8=`$NEj9FJ}K!$r;H(B
-$B$$$?$$$N$G$"$l$P!"J8;z@\F,0z?t(B @samp{a} $B$r;H$C$F$/$@$5(B
+$BC$7$?$$5-;v$r8+$D$1$F2<$5$$(B ($BC$9$3$H$,$G$-$k$N$O<+J,$N5-;v$@$1(B
+$B$G$9!#JQ$J$3$H$O;n$5$J$$$G2<$5$$(B)$B!#$=$7$F(B @kbd{C} $B$+(B @kbd{S c} $B$r2!$7$F(B
+$B2<$5$$(B (@code{gnus-summary-cancel-article})$B!#$"$J$?$N5-;v$,C$5$l$^(B
+$B$9(B---$B@$3&Cf$N5!3#$,$"$J$?$N5-;v$rC$7$^$9!#$3$NL?Na$O%W%m%;%9(B/$B@\F,0z(B
+$B?t$N=,47$rMQ$$$^$9(B (@pxref{Process/Prefix})$B!#(B
+
+$B$7$+$7Cm0U$7$FM_$7$$$N$O!"$9$Y$F$N%5%$%H$,C$7$r07$C$F$$$k$o$1$G$O$J(B
+$B$$$3$H$G$9!#$G$9$+$i!"$?$$$F$$$N%5%$%H$,LdBj$N5-;v$rC$7$F$b!"$"$A$3(B
+$B$A$G$"$J$?$N5-;v$O@8$-;D$k$+$b$7$l$^$;$s!#(B
+
+gnus $B$OC$9$H$-$K!X8=:_!Y$NA*BrJ}K!$r;H$$$^$9!#I8=`$NEj9FJ}K!$r;H$$(B
+$B$?$$$N$G$"$l$P!"J8;z@\F,0z?t(B @samp{a} $B$r;H$C$F2<$5(B
 $B$$(B (@pxref{Symbolic Prefixes})$B!#(B
 
-Gnus $B$O(B @code{Cancel-Lock} $B%X%C%@!<(B (@pxref{Canceling News, Canceling
-News, , message, Message Manual}) $B$r;H$C$F!"$"$J$?$@$1$,$"$J$?$N%a%C%;!<(B
-$B%8$r%-%c%s%;%k$G$-$k$3$H$rJ]>Z$7$^$9!#(B
+gnus $B$O(B @code{Cancel-Lock} $B%X%C%@!<(B (@pxref{Canceling News,
+,$B%K%e!<%9$rC$9(B, message-ja, The Message Manual}) $B$r;H$C$F!"$"$J$?$@(B
+$B$1$,$"$J$?$N%a%C%;!<%8$r%-%c%s%;%k$G$-$k$h$&$K$7$^$9!#(B
 
-$B$b$72?$+4V0c$$$r$7$?$N$K5$IU$$$F!"D{@5$r$7$?$$$N$G$"$l$P!"(B
-@dfn{$BBeBX(B} (@dfn{superseding}) $B5-;v$rEj9F$7$FK\5-;v$rCV$-49$($k$3$H$,$G(B
-$B$-$^$9!#(B
+$B$b$72?$+4V0c$$$r$7$?$N$K5$IU$$$F!"D{@5$r$7$?$$$N$G$"$l$P!"!VBeBX!W(B
+(@dfn{superseding}) $B5-;v$rEj9F$7$F855-;v$rCV$-49$($k$3$H$,$G$-$^$9!#(B
 
 @findex gnus-summary-supersede-article
 @kindex S ($B35N,(B)
-$BK\5-;v$N$H$3$m$X0\F0$7$F!"(B@kbd{S s} $B$r2!$7$F$/$@$5(B
-$B$$(B (@code{gnus-summary-supersede-article})$B!#IaDL$NJ}K!$G$=$l$rAw$kA0$K!"(B
-$B5-;v$r9%$-$J$h$&$KJT=8$9$k$3$H$,$G$-$^$9!#BeBX$K4X$7$F$b!"C$7$HF1$8(B
-$B$3$H$,Ev$F$O$^$j$^$9!#$3$A$i$NJ}$,$b$C$H$h$/Ev$F$O$^$k$+$b$7$l$^$;(B
-$B$s(B: $B$$$/$D$+$N%5%$%H$OBeBX$rl9g!"5-;v$,:G=i$K$"(B
-$B$J$?$N%5%$%H$K8=$l$kA0$KC$7(B/$BBeBX$r$9$k$?$a$N9*L/$JC$7$HF1$8$3$H$,Ev$F$O$^$j$^$9!#$3$A$i$NJ}$,$b$C$H$h(B
+$B$/Ev$F$O$^$k$+$b$7$l$^$;$s(B: $B$$$/$D$+$N%5%$%H$OBeBX$rl9g!"5-;v$,:G=i$K(B
+$B$"$J$?$N%5%$%H$K8=$l$kA0$KC$7(B/$BBeBX$r$9$k$?$a$N9*L/$JC$5$l$k$+(B
+$BCV$-49$($i$l$k$G$7$g$&!#(B
+
+$B$A$g$C$H3P$($F$*$$$F2<$5$$(B: 'supersede' ($BBeBX(B) $B$H$$$&8l$NCf$K(B 'c' $B$OL5$$(B
+$B$H$$$&$3$H$r!#(B
 
 @node Delayed Articles
 @section $BCY1d5-;v(B
@@ -5471,8 +5582,8 @@ News, , message, Message Manual}) $B$r;H$C$F!"$"$J$?$@$1$,$"$J$?$N%a%C%;!<(B
 @code{d} ($BF|(B), @code{w} ($B=5(B), @code{M} ($B7n(B) $B$*$h$S(B @code{Y} ($BG/(B) $B$G$9!#(B
 
 @item
-$BF|IU!#(B@code{YYYY-MM-DD} $B$N$h$&$J7A<0$G;XDj$7$^$9!#!#%a%C%;!<%8$NAw?.$O$=(B
-$B$NF|$NFCDj$N;~9o(B ($B%G%#%U%)%k%H$O(B 8 $B;~(B) $B$^$GCY$i$;$i$l$^$9!#(B
+$BF|IU!#(B@code{YYYY-MM-DD} $B$N$h$&$J7A<0$G;XDj$7$^$9!#%a%C%;!<%8$NAw?.$O$=$N(B
+$BF|$NFCDj$N;~9o(B ($B%G%#%U%)%k%H$O(B 8 $B;~(B) $B$^$GCY$i$;$i$l$^$9!#(B
 @code{gnus-delay-default-hour} $B$b;2>H$7$F2<$5$$!#(B
 
 @item
@@ -5545,9 +5656,9 @@ News, , message, Message Manual}) $B$r;H$C$F!"$"$J$?$@$1$,$"$J$?$N%a%C%;!<(B
 
 $B5-;v$KIU$1$i$l$k0u$O$$$/$D$+$"$j$^$9!#(B
 
-$B5-;v$N(B @dfn{$B9XFIEY(B} ($B$*$)!"$9$s$4$$?78l6g$@(B!) $B$r7hDj$9$k0u$,$"$j$^$9!#1Q(B
-$B;z$N0u$O0lHLE*$K$O(B @dfn{$B4{FI(B}$B$r0UL#$7!"1Q;z$G$J$$J8;z$O0lHLE*(B
-$B$K(B @dfn{$BL$FI(B}$B$r0UL#$7$^$9!#(B
+$B5-;v$N!V9XFIEY!W(B($B$&$R$g!<$C!"2?$F$9$i$P$d$7$$B$8l$@(B!) $B$r7hDj$9$k0u$,$"$j(B
+$B$^$9!#1Q;z$G$J$$J8;z$,0lHL$K!VL$FI!W$r0UL#$9$k$N$KBP$7$F!"1Q;z$N0u$O0lHL(B
+$B$K!V4{FI!W$r0UL#$7$^$9!#(B
 
 $B2C$($F!"9XFIEY$K1F6A$7$J$$0u$b$"$j$^$9!#(B
 
@@ -5567,35 +5678,35 @@ News, , message, Message Manual}) $B$r;H$C$F!"$"$J$?$@$1$,$"$J$?$N%a%C%;!<(B
 @node Unread Articles
 @subsection $BL$FI5-;v(B
 
-$B0J2<$N0u$O$$$m$$$m$JJ}K!$G5-;v$KL$FI$N(B ($B$h$&$J(B) $B0u$rIU$1$^$9!#(B
+$B0J2<$N0u$O2?$i$+$NJ}K!$G5-;v$KL$FI$N(B ($B$h$&$J(B) $B0u$rIU$1$^$9!#(B
 
 @table @samp
 @item !
 @vindex gnus-ticked-mark
-$B2D;k5-;v(B (Ticked) $B$H$7$F0u$r$D$1$^$9(B (@code{gnus-ticked-mark})$B!#(B
+$B2D;k5-;v(B (ticked) $B$H$7$F0u$rIU$1$^$9(B (@code{gnus-ticked-mark})$B!#(B
 
-@dfn{$B2D;k5-;v(B}$B$H$O!">o$K2D;k>uBV$G$"$k5-;v$N$3$H$G$9!#$*$b$7$m$$$H;W$&5-(B
-$B;v$,$"$C$?>l9g$d!"C1$KFI$`$N$r@h$K1d$P$7$?$$$H$-$d!"8e$GJVEz$r$7$?$$$H$-(B
-$B$K!"IaDL$O2D;k0u$rIU$1$^$9!#$7$+$7!"5-;v$O4|8B@Z$l>C5n$5$l$k$3$H$b$"$j$^(B
-$B$9(B ($B%K%e!<%9%5!<%P!<$N%=%U%H%&%'%"$,%K%e!<%9%5!<%P!<>e$N5-;v$r>C5n!"(B
+$B!V2D;k5-;v!W$H$O>o$K2D;k>uBV$G$"$k5-;v$N$3$H$G$9!#$*$b$7$m$$$H;W$&5-;v$,(B
+$B$"$C$?>l9g$d!"FI$`$N$r@h$K1d$P$7$?$$$H$-$d!"8e$GJVEz$r$7$?$$$H$-$K!"IaDL(B
+$B$O2D;k0u$rIU$1$^$9!#$7$+$7!"5-;v$O4|8B@Z$l>C5n$5$l$k$3$H$b$"$j$^$9(B ($B%K%e!<(B
+$B%9%5!<%P!<>e$N5-;v$r>C5n$9$k$N$O%K%e!<%9%5!<%P!<$N%=%U%H%&%'%"$G!"(B
 gnus $B<+BN$O2D;k5-;v$r4|8B@Z$l>C5n$7$^$;$s(B) $B$N$G!"1J1s$K5-;v$rJ]B8$7$F$*(B
-$B$-$?$$>l9g$O!"$=$N5-;v$r1JB3$K$9$kI,MW$,$"$j$^(B
-$B$9(B (@pxref{Persistent Articles})$B!#(B
+$B$-$?$$>l9g$O!"$=$N5-;v$r1JB3$K$9$kI,MW$,$"$j$^$9(B (@pxref{Persistent
+Articles})$B!#(B
 
 @item ?
 @vindex gnus-dormant-mark
 $BJ]N1$H$7$F0u$rIU$1$^$9(B (@code{gnus-dormant-mark})$B!#(B
 
-@dfn{$BJ]N15-;v(B}$B$O%U%)%m!<%"%C%W$,$"$C$?$H$-$K$@$135N,%P%C%U%!$K8=$l$^$9!#(B
-$B%U%)%m!<%"%C%W$,L5$$$H$-$bI=<($5$;$?$$$H$-$O!"L?Na(B @kbd{/ D} $B$r;H$&$3$H(B
-$B$,$G$-$^$9!#$=$l0J30$O(B ($B8+$($k$+$I$&$+$OJL$K$7$F(B)$B!"2D;k5-;v(B (Ticked) $B$H(B
-$B;w$?$h$&$J$b$N$G$9!#(B
+$B!VJ]N15-;v!W$O%U%)%m!<%"%C%W$,$"$C$?$H$-$K$@$135N,%P%C%U%!!<$K8=$l$^$9!#(B
+$B%U%)%m!<%"%C%W$,L5$$$H$-$bI=<($5$;$?$$$H$-$O!"(B@kbd{/ D} $BL?Na$r;H$C$F2<$5(B
+$B$$(B (@pxref{Limiting})$B!#$=$l0J30$O(B ($B8+$($k$+$I$&$+$OJL$K$7$F(B)$B!"2D;k5-(B
+$B;v(B (ticked) $B$H;w$?$h$&$J$b$N$G$9!#(B
 
 @item SPACE
 @vindex gnus-unread-mark
 $BL$FI$H$7$F0u$rIU$1$^$9(B (@code{gnus-unread-mark})$B!#(B
 
-@dfn{$BL$FI5-;v(B}$B$O:#$^$GA4$/FI$^$l$F$$$J$$5-;v$N$3$H$G$9!#(B
+$B!VL$FI5-;v!W$O:#$^$G$^$C$?$/FI$^$l$F$$$J$$5-;v$N$3$H$G$9!#(B
 @end table
 
 @node Read Articles
@@ -5607,8 +5718,8 @@ gnus $B<+BN$O2D;k5-;v$r4|8B@Z$l>C5n$7$^$;$s(B) $B$N$G!"1J1s$K5-;v$rJ]B8$7$F$*
 @table @samp
 @item r
 @vindex gnus-del-mark
-$BMxMQC5n$7$^$;$s(B) $B$N$G!"1J1s$K5-;v$rJ]B8$7$F$*
 
 @item O
 @vindex gnus-ancient-mark
-$BA02s$N%;%C%7%g%s$G4{FI$N0u$rIU$1$F!":#$O(B@dfn{$B8E$/(B}$B$J$C$F$7$^$C$?5-;v!#(B
+$BA02s$N%;%C%7%g%s$G4{FI$N0u$rIU$1$F!":#$O!V8E$/!W$J$C$F$7$^$C$?5-;v!#(B
 
 @item K
 @vindex gnus-killed-mark
-$B:o=|$N0u(B (@code{gnus-killed-mark})$B!#(B
+$B:o=|$5$l$?0u(B (@code{gnus-killed-mark})$B!#(B
 
 @item X
 @vindex gnus-kill-file-mark
-$B:o=|%U%!%$%k$K$h$C$F:o=|$N0u$,$D$$$?5-(B
+$B:o=|%U%!%$%k$K$h$C$F:o=|$N0u$,IU$$$?5-(B
 $B;v(B (@code{gnus-kill-file-mark})$B!#(B
 
 @item Y
 @vindex gnus-low-score-mark
-$BDc$9$.$k%9%3%"$N$?$a$K4{FI$N0u$,$D$$$?5-(B
+$BDc$9$.$k%9%3%"$N$?$a$K4{FI$N0u$,IU$$$?5-(B
 $B;v(B (@code{gnus-low-score-mark})$B!#(B
 
 @item C
 @vindex gnus-catchup-mark
-$B%-%c%C%A%"%C%W$K$h$C$F4{FI$N0u$,$D$$$?5-(B
+$B%-%c%C%A%"%C%W$K$h$C$F4{FI$N0u$,IU$$$?5-(B
 $B;v(B (@code{gnus-catchup-mark})$B!#(B
 
 @item G
@@ -5652,11 +5763,11 @@ gnus $B<+BN$O2D;k5-;v$r4|8B@Z$l>C5n$7$^$;$s(B) $B$N$G!"1J1s$K5-;v$rJ]B8$7$F$*
 
 @item M
 @vindex gnus-duplicate-mark
-$B=EJ#M^@)$K$h$j4{FI$N0u$N$D$$$?5-;v(B (@code{gnus-duplicate-mark})$B!#(B
+$B=EJ#M^@)$K$h$j4{FI$N0u$NIU$$$?5-;v(B (@code{gnus-duplicate-mark})$B!#(B
 @xref{Duplicate Suppression}.
 @end table
 
-$B$3$l$i$N$9$Y$F$N0u$O!"K\Ev$O$?$@5-;v$,4{FI$H$7$F0u$,$D$$$F$$$k$3$H$r0UL#(B
+$B$3$l$i$N$9$Y$F$N0u$O!"K\Ev$K$?$@5-;v$,4{FI$H$7$F0u$,IU$$$F$$$k$3$H$r0UL#(B
 $B$9$k$@$1$G$9!#E,1~%9%3%"%j%s%0$r$7$?$H$-$K$O0c$C$?$h$&$K2rC5n$7$^$;$s(B) $B$N$G!"1J1s$K5-;v$rJ]B8$7$F$*
 @table @samp
 @item E
 @vindex gnus-expirable-mark
-$B4|8B@Z$l:o=|2DG=$H$7$F0u$N$D$$$?5-;v(B (@code{gnus-expirable-mark})$B!#(B
+$B4|8B@Z$l>C5n2DG=$H$7$F0u$NIU$$$?5-;v(B (@code{gnus-expirable-mark})$B!#(B
 
-$B5-;v$r(B @dfn{$B4|8B@Z$l:o=|2DG=(B} $B$H$7$F0u$rIU$1$k(B ($B$b$7$/$O!"<+F0E*$K$=$N$h(B
-$B$&$K0u$rIU$1$k(B) $B$3$H$O!"IaDL$N%0%k!<%W$G$O$"$^$j0UL#$,$"$j$^$;$s!=!=MxMQ(B
-$BC5n2DG=!W$H$7$F0u$rIU$1$k(B ($B$b$7$/$O!"<+F0E*$K$=$N$h$&$K(B
+$B0u$rIU$1$k(B) $B$3$H$O!"IaDL$N%0%k!<%W$G$O$"$^$j0UL#$,$"$j$^$;$s(B---$BMxMQC5n2DG=!W$H$7$F0u$NIU$$$?5-;v$O!"$$$D$G$b(B gnus $B$K$h$C(B
+$B$F:o=|$5$l$k$3$H$,$"$j$^$9!#(B
 @end table
 
 @node Other Marks
@@ -5684,20 +5795,20 @@ gnus $B<+BN$O2D;k5-;v$r4|8B@Z$l>C5n$7$^$;$s(B) $B$N$G!"1J1s$K5-;v$rJ]B8$7$F$*
 @itemize @bullet
 
 @item
-$B8=:_$N5-;v$K$7$*$j$r64$`$3$H$,$G$-$^$9!#$"$J$?$OG-$NG"$N=,47$K4X$9$kD9$$(B
-$BO@J8$rFI$s$G$$$F!"$=$l$rFI$_=*$o$kA0$KMAw$7$?5-;v$O!"$9$Y$FFs7eL\$K(B @samp{F} $B$N0u$,IU$-$^(B
+$BE>Aw$7$?$9$Y$F$N5-;v$K$O!"Fs7eL\$K(B @samp{F} $B$N0u$,IU$-$^(B
 $B$9(B (@code{gnus-forwarded-mark})$B!#(B
 
 @item
@@ -5707,11 +5818,12 @@ gnus $B<+BN$O2D;k5-;v$r4|8B@Z$l>C5n$7$^$;$s(B) $B$N$G!"1J1s$K5-;v$rJ]B8$7$F$*
 
 @item
 @vindex gnus-saved-mark
-($B2?$i$+$NJ}K!$K$h$C$F!(I,$:$7$b=!65E*$H$$$&$o$1$G$O$J$/(B) $B!XJ]B8$5$l$?!Y(B
-$B5-;v$O!"Fs7eL\$K(B @samp{S} $B$N0u$,IU$-$^$9(B (@code{gnus-saved-mark})$B!#(B
+($B2?$i$+$NJ}K!$K$h$C$F(B; $BI,$:$7$b=!65E*$H$$$&$o$1$G$O$J$/(B) $B!X5_:Q$5$l$?!Y(B
+($B86J8$O(B saved==$BJ]B8$5$l$?(B) $B5-;v$O!"Fs7eL\$K(B @samp{S} $B$N0u$,IU$-$^(B
+$B$9(B (@code{gnus-saved-mark})$B!#(B
 
 @vindex gnus-recent-mark
-$B$=$N%5!<%P!<$G$^$@FI$^$l$F$$$J$$5-;v$O!"Fs7eL\$K(B @samp{N} $B$N0u$,IU$-$^(B
+$B$^$@%5!<%P!<$,MxMQl9g$OC1$KI=<($5$l$^$;$s!#(B@code{gnus-unseen-mark} $B$H8+Hf$Y$F2<$5$$!#(B
 
@@ -5723,18 +5835,19 @@ gnus $B<+BN$O2D;k5-;v$r4|8B@Z$l>C5n$7$^$;$s(B) $B$N$G!"1J1s$K5-;v$rJ]B8$7$F$*
 @item
 @vindex gnus-downloaded-mark
 gnus $B%(!<%8%'%s%H(B (@pxref{Agent Basics}) $B$r;H$C$F$$$k$H$-!"5-;v(B
-$B$O(B unplugged ($B%*%U%i%$%s(B) $B$G8+$k$?$a$K%@%&%s%m!<%I$5$l$F$$$k$+$b$7$l$^$;(B
-$B$s!#(B@samp{%O} $B$N;EMM$r;H$C$F$$$k$H!"$=$l$i$N5-;v$K$O$=$N;EMM(B
-$B$K(B @samp{+} $B$N0u$,IU$-$^$9!#(B($BJQ?t(B @code{gnus-downloaded-mark} $B$G$I$NJ8;z(B
-$B$r;H$&$+$r@)8f$7$^$9!#(B)
+$B$O(B unplugged ($B%M%C%H%o!<%/$+$i@Z$jN%$5$l$F$$$k>uBV(B) $B$G8+$k$?$a$K%@%&%s%m!<(B
+$B%I$5$l$k$+$b$7$l$^$;$s!#(B@samp{%O} $B$N;EMM$r;H$C$F$$$k$H!"$=$l$i$N5-;v$K$O(B
+$B$=$N;EMM$K(B @samp{+} $B$N0u$,IU$-$^$9!#(B($BJQ?t(B @code{gnus-downloaded-mark} $B$G(B
+$B$I$NJ8;z$r;H$&$+$r@)8f$7$^$9!#(B)
 
 @item
 @vindex gnus-undownloaded-mark
 gnus $B%(!<%8%'%s%H(B (@pxref{Agent Basics}) $B$r;H$C$F$$$k$H$-!"$$$/$D$+$N5-(B
-$B;v$O%@%&%s%m!<%I$5$l$F$$$J$$$+$b$7$l$^$;$s!#(BUnplugged ($B%*%U%i%$%s(B) $B$N>u(B
-$BBV$G$O$=$N$h$&$J5-;v$r8+$k$3$H$,$G$-$^$;$s!#(B@samp{%O} $B$N;EMM$r;H$C$F$$$k(B
-$B$H!"$=$l$i$N5-;v$K$O$=$N;EMM$K(B @samp{-} $B$N0u$,IU$-$^$9!#(B($BJQ(B
-$B?t(B @code{gnus-undownloaded-mark} $B$G$I$NJ8;z$r;H$&$+$r@)8f$7$^$9!#(B)
+$B;v$O%@%&%s%m!<%I$5$l$F$$$J$$$+$b$7$l$^$;$s!#(BUnplugged ($B%M%C%H%o!<%/$+$i(B
+$B@Z$jN%$5$l$F$$$k>uBV(B) $B$G$O$=$N$h$&$J5-;v$r8+$k$3$H$,$G$-$^$;$s!#(B
+@samp{%O} $B$N;EMM$r;H$C$F$$$k$H!"$=$l$i$N5-;v$K$O$=$N;EMM$K(B @samp{-} $B$N0u(B
+$B$,IU$-$^$9!#(B($BJQ?t(B @code{gnus-undownloaded-mark} $B$G$I$NJ8;z$r;H$&$+$r@)8f(B
+$B$7$^$9!#(B)
 
 @item
 @vindex gnus-downloadable-mark
@@ -5747,33 +5860,33 @@ gnus $B%(!<%8%'%s%H(B (@pxref{Agent Basics}) $B$O$$$/$D$+$N5-;v$r<+F0E*$K%@%&
 @item
 @vindex gnus-not-empty-thread-mark
 @vindex gnus-empty-thread-mark
-$B$b$7(B @samp{%e} $B$N;EMM$,;H$o$l$k$H!"%9%l%C%I$,$"$k$+$I$&$+$O!";07eL\(B
-$B$K(B @code{gnus-not-empty-thread-mark} $B$H(B @code{gnus-empty-thread-mark} $B$N(B
-$B$=$l$>$l$K$h$C$F0u$,IU$-$^$9!#(B
+@samp{%e} $B$N;EMM$,;H$o$l$k$H!"%9%l%C%I$,$"$k$+$I$&$+$N0u(B
+$B$,(B @code{gnus-not-empty-thread-mark} $B$^$?(B
+$B$O(B @code{gnus-empty-thread-mark} $B$K$h$C$F!";07eL\$KIU$-$^$9!#(B
 
 @item
 @vindex gnus-process-mark
-$B:G8e$K(B @dfn{$B%W%m%;%90u(B} $B$,$"$j$^$9(B(@code{gnus-process-mark})$B!#$$$m$$$m$J(B
-$Bl9g!"$I$N$h$&$K$J$k$N$G$7$g$&(B?
+$B$?$$$F$$$N$3$l$i!X9XFIEY$H4X78L5$$!Y0u$O!"%G%#%U%)%k%H$G$OFs7eL\$K8=$l$k(B
+$B$3$H$K5$IU$$$?$G$7$g$&!#$G$O!"%-%c%C%7%e$5$l$F$$$F!"J]B8$5$l$F$$$F!"JVEz(B
+$B$7$?5-;v$K%W%m%;%90u$rIU$1$?>l9g$O!"$I$&$J$k$N$G$7$g$&(B?
 
 $B$?$$$7$?$3$H$O$"$j$^$;$s!#M%@h=g0L$Ol9g!"%-%c%C%7%e0u$,$"$k$@$1$G!"JVEz:Q$_0u$O$"$j$^(B
+$B$F$$$FJVEz$5$l$F$$$?>l9g!"%-%c%C%7%e0u$,8+$($k$@$1$G!"JVEz:Q$_0u$O8+$($^(B
 $B$;$s!#(B
 
 @node Setting Marks
 @subsection $B0u$rIU$1$k(B
 @cindex setting marks
 
-$B$9$Y$F$N0u$D$1L?Na$O?tCM@\F,0z?t$rC5n$7$^(B
+@cindex mark as unread
+$B8=:_$N5-;v$+$i!"$9$Y$F$N9XFIEY$K4X$9$k0u$r>C5n$7$^(B
 $B$9(B (@code{gnus-summary-clear-mark-forward})$B!#MW$9$k$K!"5-;v$KL$FI$N0u$r(B
 $BIU$1$^$9!#(B
 
@@ -5791,7 +5904,7 @@ gnus $B%(!<%8%'%s%H(B (@pxref{Agent Basics}) $B$O$$$/$D$+$N5-;v$r<+F0E*$K%@%&
 @kindex ! ($B35N,(B)
 @kindex M t ($B35N,(B)
 @findex gnus-summary-tick-article-forward
-$B8=:_$N5-;v$K2D;k5-;v0u$rIU$1$^(B
+$B8=:_$N5-;v$K2D;k5-;v$N0u$rIU$1$^(B
 $B$9(B (@code{gnus-summary-tick-article-forward})$B!#(B@xref{Article Caching}.
 
 @item M ?
@@ -5799,9 +5912,17 @@ gnus $B%(!<%8%'%s%H(B (@pxref{Agent Basics}) $B$O$$$/$D$+$N5-;v$r<+F0E*$K%@%&
 @kindex ? ($B35N,(B)
 @kindex M ? ($B35N,(B)
 @findex gnus-summary-mark-as-dormant
-$B8=:_$N5-;v$KJ]N15-;v0u$rIU$1$^(B
+$B8=:_$N5-;v$KJ]N15-;v$N0u$rIU$1$^(B
 $B$9(B (@code{gnus-summary-mark-as-read-forward})$B!#(B@xref{Article Caching}.
 
+@item M d
+@itemx d
+@kindex M d ($B35N,(B)
+@kindex d ($B35N,(B)
+@findex gnus-summary-mark-as-read-forward
+$B8=:_$N5-;v$K4{FI$N0u$rIU$1$^(B
+$B$9(B (@code{gnus-summary-mark-as-read-forward})$B!#(B
+
 @item D
 @kindex D ($B35N,(B)
 @findex gnus-summary-mark-as-read-backward
@@ -5833,7 +5954,7 @@ gnus $B%(!<%8%'%s%H(B (@pxref{Agent Basics}) $B$O$$$/$D$+$N5-;v$r<+F0E*$K%@%&
 @item M C-c
 @kindex M C-c ($B35N,(B)
 @findex gnus-summary-catchup-all
-$B%0%k!<%W$N$9$Y$F$N5-;v$K!=!=2D;k5-;v$dJ]N15-;v$G$5$($b!"4{FI$N0u$rIU$1$^(B
+$B%0%k!<%W$N$9$Y$F$N5-;v$K(B---$B2D;k5-;v$dJ]N15-;v$G$5$($b!"4{FI$N0u$rIU$1$^(B
 $B$9(B (@code{gnus-summary-catchup-all})$B!#(B
 
 @item M H
@@ -5857,15 +5978,15 @@ gnus $B%(!<%8%'%s%H(B (@pxref{Agent Basics}) $B$O$$$/$D$+$N5-;v$r<+F0E*$K%@%&
 @item M V k
 @kindex M V k ($B35N,(B)
 @findex gnus-summary-kill-below
-$B=i4|@_Dj$N%9%3%"(B ($B$b$7$/$O?tCM@\F,0z?t(B) $B$h$j$bDc$$%9%3%"$N5-;v$r:o=|$7$^(B
-$B$9!#(B
+$B%G%#%U%)%k%H$N%9%3%"(B ($B$b$7$/$O?tCM@\F,0z?t(B) $B$h$j$bDc$$%9%3%"$N5-;v$r:o=|(B
+$B$7$^$9!#(B
 
 @item M e
 @itemx E
 @kindex M e ($B35N,(B)
 @kindex E ($B35N,(B)
 @findex gnus-summary-mark-as-expirable
-$B8=:_$N5-;v$r4|8B@Z$l:o=|2DG=$H$7$F0u$rIU$1$^(B
+$B8=:_$N5-;v$r4|8B@Z$l>C5n2DG=$H$7$F0u$rIU$1$^(B
 $B$9(B (@code{gnus-summary-mark-as-expirable})$B!#(B
 
 @item M b
@@ -5881,20 +6002,21 @@ gnus $B%(!<%8%'%s%H(B (@pxref{Agent Basics}) $B$O$$$/$D$+$N5-;v$r<+F0E*$K%@%&
 @item M V c
 @kindex M V c ($B35N,(B)
 @findex gnus-summary-clear-above
-$B=i4|@_Dj$N%9%3%"(B ($B$b$7$/$O?tCM@\F,0z?t(B) $B$h$j$bBg$-$$%9%3%"$r;}$D5-;v$N$9(B
-$B$Y$F$N0u$r>C5n$7$^$9(B (@code{gnus-summary-clar-above})$B!#(B
+$B%G%#%U%)%k%H$N%9%3%"(B ($B$b$7$/$O?tCM@\F,0z?t(B) $B$h$j$bBg$-$$%9%3%"$r;}$D5-;v(B
+$B$N$9$Y$F$N0u$r>C5n$7$^$9(B (@code{gnus-summary-clar-above})$B!#(B
 
 @item M V u
 @kindex M V u ($B35N,(B)
 @findex gnus-summary-tick-above
-$B=i4|@_Dj$N%9%3%"(B ($B$b$7$/$O?tCM@\F,0z?t(B) $B$h$j$bBg$-$$%9%3%"$r;}$D$9$Y$F$N(B
-$B5-;v$K2D;k0u$rIU$1$^$9(B (@code{gnus-summary-tick-above})$B!#(B
+$B%G%#%U%)%k%H$N%9%3%"(B ($B$b$7$/$O?tCM@\F,0z?t(B) $B$h$j$bBg$-$$%9%3%"$r;}$D$9$Y(B
+$B$F$N5-;v$K2D;k0u$rIU$1$^$9(B (@code{gnus-summary-tick-above})$B!#(B
 
 @item M V m
 @kindex M V m ($B35N,(B)
 @findex gnus-summary-mark-above
-$B0u$NF~NO$rB%$7!"=i4|@_Dj$N%9%3%"(B ($B$b$7$/$O?tCM@\F,0z?t(B) $B$h$j$bBg$-$J%9%3(B
-$B%"$r;}$D$9$Y$F$N5-;v$K$=$N0u$rIU$1$^$9(B (@code{gnus-summary-mark-above})$B!#(B
+$B0u$NF~NO$rB%$7!"%G%#%U%)%k%H$N%9%3%"(B ($B$b$7$/$O?tCM@\F,0z?t(B) $B$h$j$bBg$-$J(B
+$B%9%3%"$r;}$D$9$Y$F$N5-;v$K$=$N0u$rIU$1$^(B
+$B$9(B (@code{gnus-summary-mark-above})$B!#(B
 @end table
 
 @vindex gnus-summary-goto-unread
@@ -5903,28 +6025,28 @@ gnus $B%(!<%8%'%s%H(B (@pxref{Agent Basics}) $B$O$$$/$D$+$N5-;v$r<+F0E*$K%@%&
 $BFI5-;v$K0\F0$7$^$9!#$b$7(B @code{nil} $B$G$"$k$H!"%]%$%s%H$O0l9T>e$+2<$K9T$/(B
 $B$@$1$G$9!#FCJL$J>l9g$H$7$F!"$3$NJQ?t$,(B @code{never} $B$G$"$k$H!"$9$Y$F$N0u(B
 $B$rIU$1$kL?Na$H(B (@kbd{SPACE} $B$N$h$&$J(B) $BB>$NL?Na$O$N(B
-$B8=:_$N5-;v$KN1$^$C$F$b$i$$$?$$?M$b$$$k$G$7$g$&!#$=$7$F!"$^$@A0$N(B ($BL$(B
-$BFI(B) $B5-;v$K9T$C$F$[$7$$?M$,$$$k$H$OJ9$$$?$3$H$O$"$j$^$;$s$,!"$=$&$7$?$$$H(B
-$B;W$&?M$b4V0c$$$J$/$$$k$H;W$$$^$9!#(B
+$B5-;v$K2D;k$N0u$rIU$1$kL?Na(B (@kbd{!}) $B$K!"o$KJ#;($JJQ?t$NAH$r$b$D$3$H$K$J$j$^$9!#(B
+$B$-$+$NHs>o$KJ#;($JJQ?t$NAH$r;}$D$3$H$K$J$j$^$9!#(B
 
-$B$3$NHa7`$+$iF($l$k$?$a$K!"(Bgnus $B$O$3$l$i$9$Y$F$N0c$C$?$3$H$r$9$kL?Na$rDs(B
-$B6!$7$^$9!#$3$l$i$O35N,%P%C%U%!$N(B @kbd{M M} $B%^%C%W$K$"$j$^$9!#A4$F$r$_$k(B
-$B$?$a$K$O(B @kbd{M M C-h} $B$rF~NO$7$F$/$@$5$$(B---$B$3$N%^%K%e%"%k$G0lMw$r=P$9$K(B
+$B$3$N5gCO$rC&$9$k$?$a$K!"(Bgnus $B$O$3$l$i$9$Y$F$N0c$C$?$3$H$r$9$kL?Na$rDs6!(B
+$B$7$^$9!#$3$l$i$O35N,%P%C%U%!!<$N(B @kbd{M M} $B%^%C%W$K$"$j$^$9!#$9$Y$F$r8+(B
+$B$k$?$a$K$O(B @kbd{M M C-h} $B$rF~NO$7$F2<$5$$(B---$B$3$N%^%K%e%"%k$G0lMw$r=P$9$K(B
 $B$OB?2a$.$^$9!#(B
 
 $B$3$l$i$NL?Na$rD>@\;H$&$3$H$O$G$-$^$9$,!"$[$H$s$I$NMxMQ$N%3%^%s%I$G=hM}(B
-$B$5$;$k5-;v$K0u$rIU$1$k$?$a$K;H$o$l$^$9!#Nc$($P!";M$D$N5-;v$K$K0u$rIU$1$F(B
-$B$+$i(B @kbd{*} $B%3%^%s%I$r;H$&$H!"(Bgnus $B$O$=$l$i;M$D$N5-;v$r%-%c%C%7%e$KF~$l(B
-$B$^$9!#>\$7$/$O(B @ref{Process/Prefix} $B$r$I$&$>!#(B
+$B$5$;$k5-;v$K0u$rIU$1$k$?$a$K;H$o$l$^$9!#Nc$($P!";M$D$N5-;v$K0u$rIU$1$F$+(B
+$B$i(B @kbd{*} $B%3%^%s%I$r;H$&$H!"(Bgnus $B$O$=$l$i;M$D$N5-;v$r%-%c%C%7%e$KF~$l$^(B
+$B$9!#>\$7$/$O(B @ref{Process/Prefix} $B$r$I$&$>!#(B
 
 @table @kbd
 @item M P p
@@ -5957,12 +6079,12 @@ gnus $B%(!<%8%'%s%H(B (@pxref{Agent Basics}) $B$O$$$/$D$+$N5-;v$r<+F0E*$K%@%&
 @findex gnus-summary-mark-as-processable
 $B8=:_$N5-;v$K%W%m%;%90u$rIU$1$^(B
 $B$9(B (@code{gnus-summary-mark-as-processable})$B!#(B
-@findex gnus-summary-unmark-as-processable
 
 @item M P u
 @itemx M-#
 @kindex M P u ($B35N,(B)
 @kindex M-# ($B35N,(B)
+@findex gnus-summary-unmark-as-processable
 $B$b$78=:_$N5-;v$K%W%m%;%90u$,$"$l$PH$7$F2<$5$$!#(B
 
 @node Limiting
 @section $B@)8B$r$9$k(B
-@cindex  limiting
+@cindex limiting
 
-$B35N,%P%C%U%!$,8=:_%0%k!<%W$K$"$k5-;v$N0lIt$@$1$rI=<($9$k$h$&$K@)8B$G$-$l(B
-$B$PJXMx$J$3$H$,$"$j$^$9!#B?$/$N@)8BL?Na$,;}$D8z2L$O35N,%P%C%U%!$+$i>/(B
-$B$7(B ($B$b$7$/$OB?$/(B) $B$N5-;v$r35N,%P%C%U%!$+$i:o=|$9$k$3$H$G$9!#(B
+$B8=:_%0%k!<%W$K$"$k5-;v$N0lIt$@$1$rI=<($9$k$h$&$K35N,%P%C%U%!!<$r@)8B$G$-(B
+$B$l$PJXMx$J$3$H$,$"$j$^$9!#B?$/$N@)8BL?Na$,;}$D8z2L$O!"35N,%P%C%U%!!<$+$i(B
+$B>/$7(B ($B$b$7$/$OB?$/(B) $B$N5-;v$r:o=|$9$k$3$H$G$9!#(B
 
-$B$9$Y$F$N@)8BL?Na$O%5!<%P!<$+$i4{$K\:Y$O(B @ref{Group Parameters} $B$r;2>H$7$F2<$5$$!#(B
+$B35N,%P%C%U%!!<$r(B @code{display} $B%0%k!<%W%Q%i%a!<%?!<$N=R8l$rK~B-$5$;$k$h(B
+$B$&$K@)8B$7$^$9(B (@code{gnus-summary-limit-to-display-predicate})$B!#$3$N=R(B
+$B8l$K4X$9$k>\:Y$O(B @ref{Group Parameters} $B$r;2>H$7$F2<$5$$!#(B
 
 @item / r
 @kindex / r ($B35N,(B)
 @findex gnus-summary-limit-to-replied
-$B35N,%P%C%U%!$rJV?.$7$?5-;v$@$1$K@)8B$7$^(B
-$B$9(B (@code{gnus-summary-limit-to-replied})$B!#@\F,<-$,M?$($i$l$?>l9g$O!"JV(B
-$B?.$7$?5-;v0J30$N5-;v$K@)8B$7$^$9!#(B
+$B35N,%P%C%U%!!<$rJV?.$7$?5-;v$@$1$K@)8B$7$^(B
+$B$9(B (@code{gnus-summary-limit-to-replied})$B!#@\F,0z?t$,M?$($i$l$k$H!"JV?.(B
+$B$7$?5-;v0J30$N5-;v$K@)8B$7$^$9!#(B
 
 @item / E
 @itemx M S
 @kindex M S ($B35N,(B)
 @kindex / E ($B35N,(B)
 @findex gnus-summary-limit-include-expunged
-$B$9$Y$F$N>C5n$5$l$?5-;v$rI=<($7$^(B
+$B$9$Y$F$N>C5n$5$l$?5-;v$r@)8B$K4^$a$^(B
 $B$9(B (@code{gnus-summary-limit-include-expunged})$B!#(B
 
 @item / D
 @kindex / D ($B35N,(B)
 @findex gnus-summary-limit-include-dormant
-$B$9$Y$F$NJ]N15-;v$rI=<($7$^$9(B (@code{gnus-summary-limit-include-dormant})$B!#(B
+$B$9$Y$F$NJ]N15-;v$r@)8B$K4^$a$^(B
+$B$9(B (@code{gnus-summary-limit-include-dormant})$B!#(B
 
 @item / *
 @kindex / * ($B35N,(B)
 @findex gnus-summary-limit-include-cached
-$B$9$Y$F$N%-%c%C%7%e$KF~$C$F$$$k5-;v$rI=<($7$^(B
+$B$9$Y$F$N%-%c%C%7%e$KF~$C$F$$$k5-;v$r@)8B$K4^$a$^(B
 $B$9(B (@code{gnus-summary-limit-include-cached})$B!#(B
 
 @item / d
 @kindex / d ($B35N,(B)
 @findex gnus-summary-limit-exclude-dormant
-$B$9$Y$F$NJ]N15-;v$r1#$7$^$9(B (@code{gnus-summary-limit-exclude-dormant})$B!#(B
+$B$9$Y$F$NJ]N15-;v$r@)8B$+$i=|30$7$^(B
+$B$9(B (@code{gnus-summary-limit-exclude-dormant})$B!#(B
 
 @item / M
 @kindex / M ($B35N,(B)
 @findex gnus-summary-limit-exclude-marks
-$BA4$F$N0uIU$-5-;v$r=|30$7$^$9(B (@code{gnus-summary-limit-exclude-marks})$B!#(B
+$B$9$Y$F$N0uIU$-5-;v$r=|30$7$^$9(B (@code{gnus-summary-limit-exclude-marks})$B!#(B
 
 @item / T
 @kindex / T ($B35N,(B)
 @findex gnus-summary-limit-include-thread
-$B8=:_$N%9%l%C%I$N$9$Y$F$N5-;v$rI=<($7$^(B
+$B8=:_$N%9%l%C%I$N$9$Y$F$N5-;v$r@)8B$K4^$a$^(B
 $B$9(B (@code{gnus-summary-limit-include-thread})$B!#(B
 
 @item / c
 @kindex / c ($B35N,(B)
 @findex gnus-summary-limit-exclude-childless-dormant
-$B;R5-;v$NL5$$$9$Y$F$NJ]N15-;v$r1#$7$^(B
+$B;R5-;v$NL5$$$9$Y$F$NJ]N15-;v$r@)8B$+$i=|30$7$^(B
 $B$9(B (@code{gnus-summary-limit-exclude-childless-dormant})$B!#(B
 
 @item / C
 @kindex / C ($B35N,(B)
 @findex gnus-summary-limit-mark-excluded-as-read
-$B$9$Y$F$NL$FI$N$_$N0u$N5-;v$r4{FI$H$7$F0u$rIU$1$^(B
-$B$9(B (@code{gnus-summary-limit-mark-excluded-as-read})$B!#$b$7@\F,0z?t$,M?$((B
-$B$i$l$l$P!"2D;k$HJ]N1$N$_$N0u$N5-;v$b4{FI$H$7$F0u$rIU$1$^$9!#(B
+$B$9$Y$F$N=|30$5$l$?L$FI$N5-;v$K4{FI$N0u$rIU$1$^(B
+$B$9(B (@code{gnus-summary-limit-mark-excluded-as-read})$B!#@\F,0z?t$,M?$($i$l(B
+$B$k$H!"2D;k$HJ]N1$N$_$N0u$N5-;v$b4{FI$H$7$F0u$rIU$1$^$9!#(B
 
 @item / N
 @kindex / N ($B35N,(B)
 @findex gnus-summary-insert-new-articles
-$B$9$Y$F$N?7$7$$5-;v$r35N,%P%C%U%!$KA^F~$7$^$9!#$b(B
-$B$7(B @var{back-end}@code{-get-new-mail} $B$,Hs(B-@code{nil} $B$@$C$?$i!"?7$7$$%a!<(B
+$B$9$Y$F$N?7$7$$5-;v$r35N,%P%C%U%!!<$KA^F~$7$^$9!#(B
+@var{back-end}@code{-get-new-mail} $B$,Hs(B-@code{nil} $B$@$C$?$i!"?7$7$$%a!<(B
 $B%k$NE~Mh$rD4$Y$k$H$$$&$3$H$G$9!#(B
 
 @item / o
 @kindex / o ($B35N,(B)
 @findex gnus-summary-insert-old-articles
-$B$9$Y$F$N8E$$5-;v$r35N,%P%C%U%!$KA^F~$7$^$9!#$b$7?t;z$N@\F,<-$,M?$($i$l$l(B
-$B$P!"$=$N?t$N5-;v$r8e$KCV$/!=!=3,AXE*N.57$G(B $B$H$$$&$3$H$G$9!#(B
+gnus $B$O%G%#%U%)%k%H$G5-;v$r%9%l%C%II=<($7$^$9!#!V%9%l%C%I$K$9$k!W$H$O!"(B
+$B$"$k5-;v$X$N1~Ez$r1~Ez$7$?5-;v$ND>8e$KCV$/(B---$B3,AXE*N.57$G!"$H$$$&$3$H$G(B
+$B$9!#(B
 
-$B%9%l%C%I$O5-;v$N(B @code{References} $BMs$rD4$Y$k$3$H$K$h$C$F9T$o$l$^$9!#40(B
-$BA4$J@$3&$G$O!"$3$l$@$1$GNI$$LZ$r:n$j>e$2$k$N$K==J,$J$N$G$9$,!"IT1?$J$3$H(B
-$B$K!"(B@code{References} $BMs$O$7$P$7$P2u$l$F$$$k$+!";~$K$OC1$K$J$$$H$$$&$3$H(B
-$B$,$"$j$^$9!#IT;W5D$J%K%e!<%9$NA}?#$,LdBj$rA}$d$7$^$9$N$G!"4n$P$7$$7k2L$r(B
-$BF@$k$?$a$K$OB>$NH/8+K!$r:NMQ$7$J$1$l$P$J$j$^$;$s!#2a>j$JBP:vK!$OB8:_$7$F(B
-$B$$$F!"$=$N62$k$Y$->\:Y$O(B @ref{Customizing Threading} $B$K>\$7$/=q$$$F$"$j(B
-$B$^$9!#(B
+$B%9%l%C%I$O5-;v$N(B @code{References} $BMs$rD4$Y$k$3$H$K$h$C$F9T$J$o$l$^$9!#(B
+$BM}A[E*$J@$3&$G$O!"$3$l$@$1$GLZ$r40@.$5$;$k$N$K==J,$J$N$G$9$,!"IT1?$J$3$H(B
+$B$K(B @code{References} $BMs$O$7$P$7$P2u$l$F$$$k$+!";~$K$OC1$KL5$$$3$H$,$"$j(B
+$B$^$9!#2x$7$2$J%K%e!<%9$NEAHB$OLdBj$r0-2=$5$;$k$N$G!"K~B-$J7k2L$rF@$k$?$a(B
+$B$K$OB>$N8!=PK!$r:NMQ$7$J$1$l$P$J$j$^$;$s!#2a>j$JBP:vK!$OB8:_$7$F$$$F!"$=(B
+$B$N62$k$Y$->\:Y$O(B @ref{Customizing Threading} $B$K>\$7$/=q$$$F$"$j$^$9!#(B
 
 $B$^$:!"35G0$N354Q$G$9(B:
 
@@ -6253,26 +6378,27 @@ Gnus $B$O=i4|@_Dj$G5-;v$r%9%l%C%I$K$7$^$9!#(B@dfn{$B%9%l%C%I$K$9$k(B} $B$H$
 @item $B%9%l%C%I(B (thread)
 $BLZ$N$h$&$J5-;v$N9=@.$G$9!#(B
 
-@item $BItJ,%9%l%C%I(B (sub-thread)
+@item $BI{%9%l%C%I(B (sub-thread)
 $BLZ$N$h$&$J9=B$$N(B ($B$h$j(B) $B>.$5$JItJ,$G$9!#(B
 
 @item $BL5B+G{%9%l%C%I(B (loose threads)
-$B5-;v$N4|8B@Z$l:o=|$d!":,K\$,4{$KA02s$N%;%C%7%g%s$GFI$^$l$?$3$H$K$h$j35N,(B
-$B%P%C%U%!$KI=<($5$l$J$$!"Ey$NM}M3$K$h$j!"%9%l%C%I$O$7$P$7$P:,K\$r<:$$$^$9!#(B
-$B$=$N$h$&$J$H$-$K$O!"IaDL$OB?$/$NItJ,%9%l%C%I$,$"$C$F!"K\Ev$O0l$D$N%9%l%C(B
-$B%I$KB0$7$F$$$k$N$G$9$,!":,K\$K$O$D$J$,$C$F$$$J$$!"$H$$$&$3$H$K$J$j$^$9!#(B
-$B$3$&$$$&%9%l%C%I$,L5B+G{%9%l%C%I$H8F$P$l$F$$$^$9!#(B
+$B5-;v$N4|8B@Z$l>C5n$d!":,K\$,$9$G$KA02s$N%;%C%7%g%s$GFI$^$l$?$3$H$K$h$j35(B
+$BN,%P%C%U%!!<$KI=<($5$l$J$$!"Ey$NM}M3$K$h$j!"%9%l%C%I$O$7$P$7$P:,K\$r<:$$(B
+$B$^$9!#$=$N$h$&$J$H$-$K$O!"IaDL$OB?$/$NI{%9%l%C%I$,$"$C$F!"K\Ev$O0l$D$N%9(B
+$B%l%C%I$KB0$7$F$$$k$N$G$9$,!":,K\$K$O$D$J$,$C$F$$$J$$!"$H$$$&$3$H$K$J$j$^(B
+$B$9!#$3$&$$$&%9%l%C%I$,L5B+G{%9%l%C%I$H8F$P$l$F$$$^$9!#(B
 
 @item $B%9%l%C%I=8$a(B (thread gathering)
-$B$^$P$i%9%l%C%I$rBg$-$J%9%l%C%I$K=8$a$h$&$H$9$k;n$_$G$9!#(B
+$BI{%9%l%C%I$rBg$-$J%9%l%C%I$K=8$a$h$&$H$9$k;n$_$G$9!#(B
 
 @item $B$^$P$i%9%l%C%I(B (sparse threads)
-$BL5$$5-;v$,!X?dB,$5$l$?!Y%9%l%C%I$G!"35N,%P%C%U%!$K6u9T$GI=<($5$l$^$9!#(B
+$B$=$3$G$O$?$V$s$$$/$D$+$N5-;v$,<:$o$l$F$7$^$C$?$N$@$m$&$H!X?dB,$5$l$?!Y%9(B
+$B%l%C%I$N$3$H$G!"35N,%P%C%U%!!<$G$O6u9T$GI=<($5$l$^$9!#(B
 @end table
 
 @menu
-* Customizing Threading::       $BJQ992DG=$J%9%l%C%I$K1F6A$9$kJQ?t(B
-* Thread Commands::             $B35N,%P%C%U%!$G$N%9%l%C%I$K4p$E$$$?L?Na(B
+* Customizing Threading::       $B%9%l%C%I$K1F6A$r5Z$\$9JQ992DG=$JJQ?t(B
+* Thread Commands::             $B35N,%P%C%U%!!<$G$N%9%l%C%I$K4p$E$$$?L?Na(B
 @end menu
 
 @node Customizing Threading
@@ -6280,7 +6406,7 @@ Gnus $B$O=i4|@_Dj$G5-;v$r%9%l%C%I$K$7$^$9!#(B@dfn{$B%9%l%C%I$K$9$k(B} $B$H$
 @cindex customizing threading
 
 @menu
-* Loose Threads::               Gnus $B$,L5B+G{%9%l%C%I$r=8$a$FBg$-$J%9%l%C%I$K$9$kJ}K!(B
+* Loose Threads::               gnus $B$,L5B+G{%9%l%C%I$r=8$a$FBg$-$J%9%l%C%I$K$9$kJ}K!(B
 * Filling In Threads::          $B%9%l%C%I$rKd$a$k(B
 * More Threading::              $B%9%l%C%I$r$$$8$/$k$5$i$KB?$/$NJQ?t(B
 * Low-Level Threading::         $B$3$l$G=*$o$C$?$H;W$C$?$G$7$g$&(B@dots{} $B$G$b$"$J$?$O4V0c$C$F$$$?(B!
@@ -6295,16 +6421,15 @@ Gnus $B$O=i4|@_Dj$G5-;v$r%9%l%C%I$K$7$^$9!#(B@dfn{$B%9%l%C%I$K$9$k(B} $B$H$
 @table @code
 @item gnus-summary-make-false-root
 @vindex gnus-summary-make-false-root
-$B$b$7(B @code{nil} $B$G$J$$$H!"(Bgnus $B$OA4$F$N$D$J$,$C$F$$$J$$ItJ,LZ$r0l$D$NBg(B
-$B$-$JLZ$K$7$F!"D:>e$K$_$;$+$1$N:,K\$r:n$j$^$9!#(B($B$A$g$C$HBT$C$F$/$@$5$$!#(B
+$B$b$7(B @code{nil} $B$G$J$$$H!"(Bgnus $B$O$9$Y$F$N$D$J$,$C$F$$$J$$ItJ,LZ$r0l$D$N(B
+$BBg$-$JLZ$K$7$F!"D:>e$K$_$;$+$1$N:,K\$r:n$j$^$9!#(B($B$A$g$C$HBT$C$F2<$5$$!#(B
 $BD:>e$K:,85(B (root) $B$G$9$C$F(B? $B$($(!"$=$&$J$N$G$9!#(B) $B$D$J$,$C$F$$$J$$ItJ,LZ(B
-$B$OK\Ev$N:,K\$,4|8B@Z$l:o=|$5$l$?$+!"A02s$N%;%C%7%g%s$G:,K\$rFI$s$@$j:o=|(B
+$B$OK\Ev$N:,K\$,4|8B@Z$l>C5n$5$l$?$+!"A02s$N%;%C%7%g%s$G:,K\$rFI$s$@$j:o=|(B
 $B$7$?$H$-$K$G$-$^$9!#(B
 
 $BK\Ev$N%9%l%C%I$,L5$$$H$-$O!"(Bgnus $B$O2?$+$G$C$A>e$2$r$9$kI,MW$,$"$j$^$9!#(B
 $B$3$NJQ?t$O(B gnus $B$,;H$&$Y$-$4$^$+$7$NJ}K!$r<($7$F$$$^$9!#CM$H$7$F$H$k$3$H(B
 $B$,$G$-$k;M$D$N8uJd$,$"$j$^$9!#(B
-
 @iftex
 @iflatex
 \gnusfigure{The Summary Buffer}{390}{
@@ -6317,34 +6442,35 @@ Gnus $B$O=i4|@_Dj$G5-;v$r%9%l%C%I$K$7$^$9!#(B@dfn{$B%9%l%C%I$K$9$k(B} $B$H$
 @end iftex
 
 @cindex adopting articles
-
 @table @code
 @item $BM\;R(B (adopt)
-Gnus $B$O:G=i$N8I;y$r?F$K$7$^$9!#$3$N?F$O$9$Y$F$NB>$N5-;v$rM\;R$K$7$^$9!#(B
-$B$3$NM\;R5-;v$O!"I8=`$N3Q3g8L(B (@samp{[]}) $B$NBe$o$j$K!"@h$N@m$C$?3g(B
-$B8L(B (@samp{<>}) $B$G0uIU$1$i$l$^$9!#$3$l$,=i4|@_Dj$NJ}K!$G$9!#(B
+gnus $B$O8I;y$K$J$C$?5-;v72$N:G=i$N$b$N$r?F$K$7$^$9!#$3$N?F$O$9$Y$F$NB>$N(B
+$B5-;v$rM\;R$K$7$^$9!#$=$l$i$NM\;R5-;v$O!"I8=`$N3Q3g8L(B (@samp{[]}) $B$NBe$o(B
+$B$j$K!"@h$N@m$C$?3g8L(B (@samp{<>}) $B$G0u$,IU$1$i$l$^$9!#$3$l$,%G%#%U%)%k%H(B
+$B$Nl9g$O!"(B
-@code{gnus-summary-make-false-root-always} $B$r(B @code{t} $B$K@_Dj$7$F2<$5$$!#(B
+gnus $B$O?F$N$U$j$r$9$k$_$;$+$1$N35N,9T$r:n$j$^$9!#$3$N$_$;$+(B
+$B$1$N9T$O$I$NK\Ev$N5-;v$K$bBP1~$7$J$$$N$G!"$=$l$rA*Br$9$k$3$H$O!"(B
+$B$_$;$+$1$N5-;v$N8e$N:G=i$NK\Ev$N5-;v$rA*Br$r$9$k$@$1$K$J$j$^$9!#(B
+$B$_$;$+$1$N:,K\$NMM<0$r;XDj$9$k$?$a$K!"(B
+@code{gnus-summary-dummy-line-format} $B$,;H$o$l$^$9!#$3$l$O$?$C(B
+$B$?0l$D$@$1$N%U%)!<%^%C%H$N;EMM$rl9g$O!"(B
+@code{gnus-summary-make-false-root-always} $B$r(B @code{t} $B$K@_Dj$7(B
+$B$F2<$5$$!#(B
 
 @item $B6u(B (empty)
-Gnus $B$O$N5-;v$r(B
-$BI=<($9$k$@$1$G$9!#(B
+$B$^$C$?$/$I$N5-;v$b?F$K$7$^$;$s!#%9%l%C%I$r=8$a$F!"C1$K=g7+$j$KI=<($9$k$@(B
+$B$1$G$9!#(B
 
 @item nil
 $BL5B+G{%9%l%C%I$r=8$a$^$;$s!#(B
@@ -6356,23 +6482,23 @@ Gnus $B$Ou$G$O!"$"$^$j$K87$7$$MW5a$+$b$7$l$^$;$s!#$=$&;W$&$N$J$i!"$3$NJQ?t$rNc$((B
+$B$P(B 20 $B$K@_Dj$7$F!"I=Bj$N:G=i$N(B 20 $BJ8;z$@$1$,0lCW$9$k$3$H$rMW5a$9$k$h$&$K(B
+$B$7$F2<$5$$!#$3$NJQ?t$rK\Ev$KDc$$?tCM$K@_Dj$9$k$H!"L\$K$D$$$?$b$N$N$9$Y$F(B
+$B$r(B gnus $B$,0l$D$N%9%l%C%I$K=8$a$k$N$r8+$k$3$H$K$J$k$G$7$g$&!#$=$l$O$"$^$j(B
+$BM-MQ$G$O$"$j$^$;$s!#(B
 
 @cindex fuzzy article gathering
-$B$3$NJQ?t$rFCJL$JCM(B @code{fuzzy} $B$K@_Dj$9$l$P!"(Bgnus $B$OI=Bj$K$"$$$^$$$JJ8(B
-$B;zNsHf3S%"%k%4%j%:%`$r;H$$$^$9(B (@pxref{Fuzzy Matching})$B!#(B
+$B$3$NJQ?t$rFCJL$JCM(B @code{fuzzy} $B$K@_Dj$9$k$H!"(Bgnus $B$OI=Bj$NJ8;zNs$rBg;((B
+$BGD$KHf3S$9$k%"%k%4%j%:%`$r;H$$$^$9(B (@pxref{Fuzzy Matching})$B!#(B
 
 @item gnus-simplify-subject-fuzzy-regexp
 @vindex gnus-simplify-subject-fuzzy-regexp
-$B$3$l$O@55,I=8=$+!"$"$$$^$$I=Bj;XDj$,;H$o$l$F$$$k$H$-$KI=Bj$+$i9gCW$7$?$b(B
-$B$N$,e=q$-$7$^$9!#$3$NJQ?t$OJ8(B
-$B;zNs(B @code{Subject} $B$rH?I|$7$F4JC1$J7A$K$?$I$jCe$/$?$a$KE,MQ$9$k4X?t$N%j(B
+$B$O(B @code{gnus-summary-gather-subject-limit} $B$h$j$bM%@h$5$l$^$9!#$3$NJQ?t(B
+$B$O(B @code{Subject} $B$NJ8;zNs$KH?I|$7$F:nMQ$5$;$F4JC1$K$9$k$?$a$N!"4X?t$N%j(B
 $B%9%H$G$"$kI,MW$,$"$j$^$9!#(B
 
 $B$3$N%j%9%H$KF~$l$FLr$KN)$D$h$&$J4X?t$Ou67$r>/$7$h$/$9$k$?$a$K!"$I$NI=Bj$,=8$a$k2a(B
-$BDx$+$i=|$+$l$k$+$r7h$a$k@55,I=(B
-$B8=(B @code{gnus-summary-gather-exclude-subject} $B$r;H$&$3$H$,$G$-$^$9!#%G%#(B
-$B%U%)%k%H$O(B @samp{^ *$\\|^(none)$} $B$G$9!#(B
+$BL5B+G{%9%l%C%I=8$a$OI=Bj$@$1$G9T$J$o$l$k$N$G!"FC(B
+$B$K(B @samp{} $B$d(B @samp{(none)} $B$N$h$&$JNI$/$"$kI=Bj$N$H$-$O!"B?$/$N4V0c$$$r(B
+$B5/$3$92DG=@-$,$"$j$^$9!#$3$N>u67$r>/$7NI$/$9$k$?$a$K!"@55,I=(B
+$B8=(B @code{gnus-summary-gather-exclude-subject} $B$r;H$&$3$H$K$h$C$F!"=8$a$k(B
+$B2aDx$K$*$$$F$I$s$JI=Bj$r=|30$9$k$+$r;X<($9$k$3$H$,$G$-$^$9!#%G%#%U%)%k%H(B
+$B$O(B @samp{^ *$\\|^(none)$} $B$G$9!#(B
 
 @item gnus-summary-thread-gathering-function
-@vindex gnus-summmary-thread-gathering-function
-Gnus $B$O(B @code{Subject} $BMs$r8+$k$3$H$K$h$C$F%9%l%C%I$r=8$a$^$9!#$3$l$O!"(B
-$B7k2LE*$KA4$/4X78$NL5$$5-;v$,F1$8!X%9%l%C%I!Y$K4^$^$l$k$3$H$,$"$k$H$$$&$3(B
-$B$H$G!"$3$l$O:.Mp$N85$G$9!#BeBXZ(B
-$B$7$^$9$,!"$3$o$l$?%K%e!<%9%j!<%@!<$GEj9F$7$?5-;v$OE,@Z$K=8$a$i$l$J$$$H$$(B
-$B$&$3$H$G$b$"$j$^$9!#A*Br8"$O$"$J$?$K$"$j$^$9!=!=1VIB$+%3%l%i$+!#(B
+@vindex gnus-summary-thread-gathering-function
+gnus $B$O(B @code{Subject} $BMs$rD4$Y$k$3$H$K$h$C$F%9%l%C%I$r=8$a$^$9!#$3$l$O!"(B
+$B7k2LE*$K$^$C$?$/4X78$NL5$$5-;v$,F1$8!X%9%l%C%I!Y$K4^$^$l$k$+$b$7$l$J$$$3(B
+$B$H$r0UL#$7!":.Mp$N85$G$9!#BeBXZ$7$^(B
+$B$9$,!"$$$+$l$?%K%e!<%9%j!<%@!<$GEj9F$7$?5-;v$OE,@Z$K=8$a$i$l$J$$$H$$$&$3(B
+$B$H$G$b$"$j$^$9!#%Z%9%H$+%3%l%i$+$NA*Br8"$O$"$J$?$K$"$j$^$9!#(B
 
 @table @code
 @item gnus-gather-threads-by-subject
 @findex gnus-gather-threads-by-subject
-$B$3$N4X?t$O%G%#%U%)%k%H$N<}=84X?t$G!"GSB>E*$K(B @code{Subject} $B$r8+$^$9!#(B
+$B$3$N4X?t$O%G%#%U%)%k%H$N<}=84X?t$G!"GSB>E*$K(B @code{Subject} $B$rD4$Y$^$9!#(B
 
 @item gnus-gather-threads-by-references
-$B$3$N4X?t$OGSB>E*$K(B @code{References} $BMs$r8+$^$9!#(B
+@findex gnus-gather-threads-by-references
+$B$3$N4X?t$OGSB>E*$K(B @code{References} $BMs$rD4$Y$^$9!#(B
 @end table
 
 @code{References} $B$K$h$C$F=8$a$k$3$H$r;n$7$F$_$?$$$N$G$"$l$P!"/$J$$35N,9T$rI=<($7$?$$$1$l$I!"$G$-$k$@$1$?$/$5$s$NHsL)%9%l%C(B
-$B%I$K@\B3$7$F$*$-$?$$$H$-$O!"$3$NJQ?t$r(B @code{some} $B$+?t;z$K@_Dj$9$k$3$H(B
-$B$,$G$-$^$9!#$b$7?t;z$K@_Dj$7$?$H$-$O!"$=$l$h$jB?$$DI2C$N%X%C%@!<$Ol9g$G$b!"8E$$%X%C%@!<$N/$J$$35N,9T$rI=<($7$?$$$1$l$I!"$G$-$k$@$1$?$/$5$s$NL5B+G{(B
+$B%9%l%C%I$r$D$J$2$F$*$-$?$$$H$-$O!"$3$NJQ?t$r(B @code{some} $B$+?tCM$K@_Dj$7(B
+$B$F2<$5$$!#$b$7?tCM$K@_Dj$7$?$H$-$O!"$=$l$h$jB?$$DI2C$N%X%C%@!<$Ol9g$G$b!"8E$$%X%C%@!<$Nl9g$@$1F0:n$7$^$9!#$=$l$i$N%P%C%/%(%s%I(B
+$B$O!"IaDL$O(B @code{nntp}, @code{nnspool}, @code{nnml} $B$*$h(B
+$B$S(B @code{nnmaildir} $B$G$9!#%9%l%C%I$N:,K\$,%5!<%P!<$K$h$C$F4|8B@Z$l>C5n$5(B
+$B$l$F$7$^$C$?$i!"(Bgnus $B$O$I$&$7$h$&$b$J$$$3$H$b3P$($F$*$$$F2<$5$$!#(B
 
 $B$3$NJQ?t$O(B @code{invisible} $B$K@_Dj$9$k$3$H$b$G$-$^$9!#$3$l$O;k3PE*$J8z2L(B
-$B$O2?$b$"$j$^$;$s$,!"L?Na(B @kbd{A T} $B$r$h$/;H$&$N$G$"$l$PLr$KN)$D$G$7$g(B
+$B$O2?$b$"$j$^$;$s$,!"(B@kbd{A T} $BL?Na$r$h$/;H$&$N$G$"$l$PLr$KN)$D$G$7$g(B
 $B$&(B (@pxref{Finding the Parent})$B!#(B
 
 @item gnus-fetch-old-ephemeral-headers
@@ -6495,27 +6622,29 @@ Gnus $B$O(B @code{Subject} $BMs$r8+$k$3$H$K$h$C$F%9%l%C%I$r=8$a$^$9!#$3$l$O!"
 
 @item gnus-build-sparse-threads
 @vindex gnus-build-sparse-threads
-$B8E$$%X%C%@!<$rl9g$K;H$&$3$H$rA[Dj$7$F$$$^$9!#$=$l$Ol9g$O%G%#%U%)%k%H$N(B @code{nil} $B$N$^$^$K$7$F$*$/$N$,L5Fq$G(B
-$B$9!#;H$$$?$$>l9g$O%0%k!<%WL>$K9gCW$9$k@55,I=8=$+!"$9$Y$F$N%0%k!<%WL>$K9g(B
-$BCW$9$k(B @code{t} $B$K$7$F2<$5$$!#(B
+$B$3$l$O$"$^$jLr$KN)$?$J$$!"$$$5$5$+$O$C$-$j$7$J$$JQ?t$G$9!#%K%e!<%9$G$O$J(B
+$B$$%0%k!<%W$K$*$$$F!"35N,%P%C%U%!!<$r:n$k$?$a$K%P%C%/%(%s%I$,6K$a$FB?$/$N(B
+$B$b$N$rl9g$K;H$&(B
+$B$3$H$rA[Dj$7$F$$$^$9!#$=$l$Ol9g$G$9!#(B
+
+$B$=$s$J%0%k!<%W$r;H$o$J$$>l9g$O%G%#%U%)%k%H$N(B @code{nil} $B$N$^$^$K$7$F$*$/(B
+$B$N$,L5Fq$G$9!#;H$$$?$$>l9g$O%0%k!<%WL>$K9gCW$9$k@55,I=8=$+!"$9$Y$F$N%0%k!<(B
+$B%W$,BP>]$K$J$k(B @code{t} $B$K$7$F2<$5$$!#(B
 @end table
 
 @node More Threading
@@ -6525,13 +6654,14 @@ gnus $B$OA4$F$N5-;v$N40A4$J(B @code{References} $BMs$r8+$F!"F1$8%9%l%C%I$KB0$
 @item gnus-show-threads
 @vindex gnus-show-threads
 $B$3$NJQ?t$,(B @code{nil} $B$G$"$k$H!"%9%l%C%I$O:n$i$l$:!"$3$3$K$"$k;D$j$N$9$Y(B
-$B$F$NJQ?t$OA4$/8z2L$,L5$/$J$j$^$9!#%9%l%C%I:n$j$r;_$a$k$H%0%k!<%W$NA*Br$,(B
-$B>/$7B.$/$J$j$^$9$,!"5-;v$rFI$`$N$,$b$C$HCY$/!"ITJX$K$J$k$3$H$O3N/$7B.$/$J$j$^$9$,!"5-;v$rFI$`$N$,$b$C$HCY$/!"ITJX$K$J$k$3$H$O3N/$J$$Am9gE*%9%3%"(B (@code{gnus-thread-score-function}) $B$r;}(B
-$B$D$9$Y$F$N%9%l%C%I$O>C5n$5$l$^$9!#$3$NJQ?t$O%G%#%U%)%k%H$G(B
-$B$O(B @code{nil} $B$G!"$3$l$O$I$N%9%l%C%I$b>C5n$5$l$J$$$H$$$&$3$H$G$9!#(B
+$B$3$N?tCM$h$j>/$J$$Am%9%3%"(B (@code{gnus-thread-score-function} $B$GDj5A$5$l(B
+$B$?4X?t$r;H$C$F;;=P$5$l$^$9(B) $B$r;}$D$9$Y$F$N%9%l%C%I$O>C5n$5$l$^$9!#$3$NJQ(B
+$B?t$O%G%#%U%)%k%H$G$O(B @code{nil} $B$G!"$3$l$O$I$N%9%l%C%I$b>C5n$5$l$J$$$H$$(B
+$B$&$3$H$G$9!#(B
 
 @item gnus-thread-hide-killed
 @vindex gnus-thread-hide-killed
-$B$b$7%9%l%C%I$r:o=|$7$F!"$3$NJQ?t$,(B @code{nil} $B$G$J$$$H!"ItJ,LZ$O1#$5$l$^(B
+$B%9%l%C%I$r:o=|$9$k$H!"$3$NJQ?t$,(B @code{nil} $B$G$J$$>l9g!"ItJ,LZ$O1#$5$l$^(B
 $B$9!#(B
 
 @item gnus-thread-ignore-subject
 @vindex gnus-thread-ignore-subject
-$B;~!9!"C/$+$,%9%l%C%I$N??Cf$GI=Bj$rJQ99$9$k$3$H$,$"$j$^$9!#$b$7$3$NJQ?t(B
-$B$,(B @code{nil} $B$G$J$$$H!"$3$l$,%G%#%U%)%k%H$G$9$,!"I=Bj$NJQ99$OL5;k$5$l$^(B
-$B$9!#$b$7(B @code{nil} $B$@$H!"I=Bj$NJQ99$r$9$k$HJL$N%9%l%C%I$K$J$j$^$9!#(B
+$B$H$-$I$-C/$+$,%9%l%C%I$NESCf$GI=Bj$rJQ99$9$k$3$H$,$"$j$^$9!#$3$NJQ?t(B
+$B$,(B @code{nil} $B$G$J$$$H(B ($B$3$l$,%G%#%U%)%k%H$G$9$,(B)$B!"I=Bj$NJQ99$OL5;k$5$l(B
+$B$^$9!#$b$7(B @code{nil} $B$@$H!"I=Bj$NJQ99$r$9$k$HJL$N%9%l%C%I$K$J$j$^$9!#(B
 
 @item gnus-thread-indent-level
 @vindex gnus-thread-indent-level
-$B$3$N?t;z$OItJ,%9%l%C%I$,$I$l$/$i$$;z2<$2(B (indent) $B$5$l$k$Y$-$+$r7h$a$^$9!#(B
-$B%G%#%U%)%k%H$O(B 4 $B$G$9!#(B
+$B$3$l$O!"$=$l$>$l$NI{%9%l%C%I$,$I$l$/$i$$;z2<$2(B (indent) $B$5$l$k$Y$-$+$r7h(B
+$B$a$k?tCM$G$9!#%G%#%U%)%k%H$O(B 4 $B$G$9!#(B
 
 @item gnus-sort-gathered-threads-function
 @vindex gnus-sort-gathered-threads-function
-$B$H$-$I$-!"FC$K%a!<%j%s%0%j%9%H$G!"$C$F!"I{%9%l%C(B
-$B%I$r=i4|@_Dj$N(B @code{gnus-thread-sort-by-number} $B$GJB$S49$($k$H!"1~Ez$N(B
-$BJ}$,$=$l$,1~Ez$7$F$$$k5-;v$h$j@h$K8=$l$k$3$H$,$"$j$^$9!#%0%k!<%W%Q%i%a!<(B
-$B%?$dE,@Z$J%U%C%/(B ($BNc$($P(B @code{gnus-summary-generate-hook}) $B$G$3$NJQ?t$r(B
-$BBe$o$j$NCM(B ($BNc$($P!"(B@code{gnus-thread-sort-by-date}) $B$K@_Dj$9$k$3$H$G!"(B
-$B$=$N$h$&$J>l9g$K!"$h$jO@M}E*$JI{%9%l%C%I$N=gHV$r@8@.$9$k$3$H$,$G$-$^$9!#(B
+$B$H$j$o$1%a!<%j%s%0%j%9%H$G$O!"$H$-$H$7$Fl9g$K!"$h$jO@M}E*$JI{%9%l%C%I$N=gHV$r@8@.$9$k$3$H$,$G$-$^$9!#(B
 @end table
 
 @node Low-Level Threading
@@ -6588,19 +6720,22 @@ gnus $B$OA4$F$N5-;v$N40A4$J(B @code{References} $BMs$r8+$F!"F1$8%9%l%C%I$KB0$
 @item gnus-parse-headers-hook
 @vindex gnus-parse-headers-hook
 $B$9$Y$F$N%X%C%@!<$r2r@O$9$kA0$Kl9g$K$O(B @code{default-mime-charset-unlimited} $B$NCM(B
+$B$bF1MM$K@_Dj$7$^$9!#(B
 
 @item gnus-alter-header-function
 @vindex gnus-alter-header-function
-$B$3$l$,(B @code{nil} $B$G$J$$$H!"%X%C%@!<9=B$$N8r49$r2DG=$K$9$k$h$&$K$3$N4X?t(B
-$B$,8F$P$l$^$9!#4X?t$O0l$D$N0z?t!"5-;v%X%C%@!<$N%Y%/%H%k!"$H$H$b$K8F$P$l!"(B
-$B$=$l$,2?$i$+$NJ}K!$G8r49$5$l$^$9!#Nc$($P!"(B($B@\F,8l$d$=$NB>$N$b$N$rIU$12C(B
-$B$($k$3$H$K$h$k(B) $BBN7OE*$JJ}K!$G(B @code{Message-ID} $B$r8r49$9$k%a!<%k$+$i(B
-$B%K%e!<%9$X$N%2!<%H%&%'%$$,$"$k>l9g!"(B@code{Message-ID} $B$,$b$C$H0UL#$N$"$k(B
-$B$b$N$K$9$k$?$a$K!"$3$NJQ?t$r@_Dj$7$F85$KLa$9$3$H$,$G$-$^$9!#$3$l$O0l$D$N(B
-$BNc$G$9(B:
+$B$3$NJQ?t$NCM$,(B @code{nil} $B$G$O$J$/$F4X?t$G$"$k$H!"%X%C%@!<9=B$(B ($BLuCm(B: $B5-(B
+$B;v$Nl9g!"$3$NJQ?t(B
+$B$r@_Dj$9$k$3$H$K$h$C$F!"$=$N(B @code{Message-ID} $B$r85$N0UL#$N$"$k$b$N$KLa(B
+$B$9$3$H$,$G$-$^$9!#$3$l$O0l$D$NNc$G$9(B:
 
 @lisp
 (setq gnus-alter-header-function 'my-alter-message-id)
@@ -6613,6 +6748,11 @@ gnus $B$OA4$F$N5-;v$N40A4$J(B @code{References} $BMs$r8+$F!"F1$8%9%l%C%I$KB0$
        (concat (match-string 1 id) "@@" (match-string 2 id))
        header))))
 @end lisp
+
+@quotation
+$BLuCm(B: $Be$2$^(B
+@findex gnus-summary-raise-thread
+$B8=:_$N%9%l%C%I(B ($B$^$?$OI{%9%l%C%I(B) $B$N%9%3%"$r>e$2$^(B
 $B$9(B (@code{gnus-summary-raise-thread})$B!#(B
 
 @item T #
 @kindex T # ($B35N,(B)
 @findex gnus-uu-mark-thread
-$B%W%m%;%90u$r8=:_$N(B ($BItJ,(B) $B%9%l%C%I$KIU$1$^(B
+$B%W%m%;%90u$r8=:_$N%9%l%C%I(B ($B$^$?$OI{%9%l%C%I(B) $B$KIU$1$^(B
 $B$9(B (@code{gnus-uu-mark-thread})$B!#(B
 
 @item T M-#
 @kindex T M-# ($B35N,(B)
 @findex gnus-uu-unmark-thread
-$B8=:_$N(B ($BItJ,(B) $B%9%l%C%I$+$i%W%m%;%90u$r$7$^(B
-$B$9(B (@code{gnus-summary-rethread-current})$B!#$3$l$O35N,%P%C%U%!$,%9%l%C%I(B
-$BI=<($5$l$F$$$J$$$H$-$G$bF0:n$7$^$9!#(B
+$B$9(B (@code{gnus-summary-rethread-current})$B!#$3$l$O35N,%P%C%U%!!<$,%9%l%C(B
+$B%II=<($5$l$F$$$J$$$H$-$G$bF0:n$7$^$9!#(B
 
 @item T ^
 @kindex T ^ ($B35N,(B)
 @findex gnus-summary-reparent-thread
-$B8=:_$N5-;v$r0uIU$-(B ($B$b$7$/$OA0$N(B) $B5-;v$N;R5-;v$K$7$^(B
+$B8=:_$N5-;v$r0uIU$-$N(B ($B$b$7$/$OA0$N(B) $B5-;v$N;R5-;v$K$7$^(B
 $B$9(B (@code{gnus-summary-reparent-thread})$B!#(B
 @end table
 
@@ -6722,12 +6864,12 @@ gnus $B$OA4$F$N5-;v$N40A4$J(B @code{References} $BMs$r8+$F!"F1$8%9%l%C%I$KB0$
 @item T d
 @kindex T d ($B35N,(B)
 @findex gnus-summary-down-thread
-$B%9%l%C%I$r9_2<$7$^$9(B (@code{gnus-summary-down-thread})$B!#(B
+$B%9%l%C%I$r2<$j$^$9(B (@code{gnus-summary-down-thread})$B!#(B
 
 @item T u
 @kindex T u ($B35N,(B)
 @findex gnus-summary-up-thread
-$B%9%l%C%I$r>e>:$7$^$9(B (@code{gnus-summary-up-thread})$B!#(B
+$B%9%l%C%I$rEP$j$^$9(B (@code{gnus-summary-up-thread})$B!#(B
 
 @item T o
 @kindex T o ($B35N,(B)
@@ -6736,53 +6878,61 @@ gnus $B$OA4$F$N5-;v$N40A4$J(B @code{References} $BMs$r8+$F!"F1$8%9%l%C%I$KB0$
 @end table
 
 @vindex gnus-thread-operation-ignore-subject
-$B%9%l%C%I$r:n@.$9$k$H$-$KI=Bj$rL5;k$9$k$H!"<+A3$K%9%l%C%I$K$O$$$/$D$+$N0c$C(B
-$B$?I=Bj$,$"$k$3$H$K$J$j$^$9!#$=$l$+(B
-$B$i(B @kbd{T k} (@code{gnus-summary-kill-thread}) $B$N$h$&$JL?Na$rH/$9$k$H$-(B
+$B%9%l%C%I$r:n@.$9$k$H$-$KI=Bj$rL5;k$9$k$H!"EvA3$J$,$i$$$/$D$+$N0c$C$?I=Bj(B
+$B$,$"$k%9%l%C%I$,=PMh>e$,$j$^$9!#$=$7(B
+$B$F(B @kbd{T k} (@code{gnus-summary-kill-thread}) $B$N$h$&$JL?Na$rH/$9$k$H$-(B
 $B$K!"A4BN$N%9%l%C%I$r:o=|$9$k$N$G$O$J$/!"8=:_$N5-;v$HF1$8I=Bj$r;}$DItJ,$@(B
 $B$1$r:o=|$7$?$$$H$-$,$"$k$+$b$7$l$^$;$s!#$b$7$3$NH/A[$,NI$$$H;W$&$N$G$"$l(B
-$B$P!"(B@code{gnus-thread-operation-ignore-subject} $B$r$$$8$/$k$3$H$,$G$-$^$9!#(B
-$B$3$l$,(B @code{nil} $B$G$J$$$H(B ($B$3$l$,%G%#%U%)%k%H$G$9$,(B)$B!"%9%l%C%I$NL?Na$r(B
-$B]$K4^$^$l$^$;$s!#(B
+$B$3$NJQ?t$,(B @code{fuzzy} $B$G$"$k$H!"Bg;(GD$JHf3S$K$h$C$FEy$7$$$HH=Dj$5$l$k(B
+$BI=Bj$r;}$D5-;v$@$1$,BP>]$K4^$^$l$^$9(B (@pxref{Fuzzy Matching})$B!#(B
 
 @node Sorting the Summary Buffer
-@section $BJB$SBX$((B
+@section $BJB$YBX$((B
 
 @findex gnus-thread-sort-by-total-score
 @findex gnus-thread-sort-by-date
+@findex gnus-thread-sort-by-date-reverse
 @findex gnus-thread-sort-by-score
 @findex gnus-thread-sort-by-subject
 @findex gnus-thread-sort-by-author
-@c @findex gnus-thread-sort-by-recipient
+@findex gnus-thread-sort-by-recipient
 @findex gnus-thread-sort-by-number
 @findex gnus-thread-sort-by-random
 @vindex gnus-thread-sort-functions
 @findex gnus-thread-sort-by-most-recent-number
 @findex gnus-thread-sort-by-most-recent-date
-$B$b$7%9%l%C%I$N35N,I=<($r;H$C$F$$$k$N$G$"$l$P!"(B
-@code{gnus-thread-sort-functions} $B$r@_Dj$9$k$3$H$G%9%l%C%I$rJB$SBX$($k$3(B
-$B$H$,$G$-$^$9!#$=$l$O!"C1FH$N4X?t!"4X?t$N%j%9%H!"4X?t$H(B @code{($B4X?t$G$J$$(B
-$B$b$N(B)} $B$NMWAG$G$"$k$3$H$,$G$-$^$9!#%G%#%U%)%k%H$G$O!"JB$SBX$($O5-;vHV9f(B
-$B$K$h$C$F$J$5$l$^$9!#4{$K:n$i$l$F$$$kJB$SBX$(=R8l4X?t(B
-$B$O(B @code{gnus-thread-sort-by-number}, @code{gnus-thread-sort-by-author},
-@code{gnus-thread-sort-by-subject}, @code{gnus-thread-sort-by-date},
+$B35N,$G%9%l%C%I$NI=<($r;H$C$F$$$k$N$G$"$l$P!"(B
+@code{gnus-thread-sort-functions} $B$r@_Dj$9$k$3$H$K$h$C$F%9%l%C%I$rJB$YBX(B
+$B$($k$3$H$,$G$-$^$9!#$3$NJQ?t$NCM$OC1FH$N4X?t!"4X?t$N%j%9%H!"$^$?$O4X?t(B
+$B$H(B @code{($B4X?t$G$J$$$b$N(B)} $B$NMWAG$r4^$`%j%9%H$G$"$k$3$H$,$G$-$^$9!#(B
+
+$B%G%#%U%)%k%H$G$OJB$YBX$($O5-;vHV9f$K4p$E$$$F9T$J$o$l$^$9!#$9$G$KMQ0U$5$l(B
+$B$F$$$kJB$YBX$(=R8l4X?t$O(B @code{gnus-thread-sort-by-number},
+@code{gnus-thread-sort-by-author}, @code{gnus-thread-sort-by-recipient},
+@code{gnus-thread-sort-by-subject},
+@code{gnus-thread-sort-by-date}, @code{gnus-thread-sort-by-date-reverse},
 @code{gnus-thread-sort-by-score},
 @code{gnus-thread-sort-by-most-recent-number},
 @code{gnus-thread-sort-by-most-recent-date},
 @code{gnus-thread-sort-by-random} $B$*$h(B
 $B$S(B @code{gnus-thread-sort-by-total-score} $B$G$9!#(B
 
-$B3F4X?t$OFs$D$N%9%l%C%I$r$H$j!":G=i$N%9%l%C%I$,B>$N%9%l%C%I$h$j@h$KJB$SBX(B
-$B$($i$l$k$Y$-$G$"$l$P!"(B@code{nil} $B$G$J$$CM$r$+$($7$^$9!#IaDL!"JB$SBX$($O(B
-$BK\Ev$O$=$l$>$l$N%9%l%C%I$N:,K\$r8+$k$@$1$K$h$j$J$5$l$k$3$H$K5$$rIU$1$F$/(B
-$B$@$5$$!#$b$7Fs$D0J>e$N4X?t$r;H$&>l9g!"M%@hE*JB$SBX$(%-!<$O%j%9%H$N:G8e$N(B
-$B4X?t$G$9!#$*$=$i$/$$$D$b(B @code{gnus-thread-sort-by-number} $B$rJB$SBX$(4X(B
-$B?t$N%j%9%H!=!=:G=i$,9%$^$7$$(B $B$KF~$l$F$*$/$Y$-$G$7$g$&!#$3$l$OB>$NJB$SBX(B
-$B$(4p=`$K4X$7$FEy$7$$%9%l%C%I$O5-;v$,>e$,$C$F$$$/=gHV$KI=<($5$l$k$3$H$rJ](B
-$B>Z$7$^$9!#(B
+$B$=$l$>$l$N4X?t$OFs$D$N%9%l%C%I$r$H$j!":G=i$N%9%l%C%I$,$b$&0lJ}$h$j@h$KJB(B
+$B$YBX$($i$l$k$Y$-$G$"$l$P(B @code{nil} $B$G$J$$CM$rJV$7$^$9!#$l$N%9%l%C%I$N:,K\$@$1$rD4$Y$k$3$H$K$h$C$F9T$J$o$l$k$3$H$K5$$r(B
+$BIU$1$F2<$5$$!#(B
+
+$BFs$D0J>e$N4X?t$r;H$&>l9g!"JB$YBX$($NBh0l$N80$O%j%9%H$N:G8e$N4X?t$G$J$1$l(B
+$B$P$J$j$^$;$s!#JB$YBX$(4X?t$N%j%9%H$N$J$k$Y$/@hF,$K!"$*$=$i$/>o(B
+$B$K(B @code{gnus-thread-sort-by-number} $B$r4^$a$F$*$/$Y$-$G$7$g$&!#$3$l$O!"(B
+$BB>$NJB$YBX$($N4p=`$,Ey$7$$%9%l%C%I$,!"5-;vHV9f$NEP$j=g$KI=<($5$l$k$3$H$r(B
+$BJ]>Z$7$^$9!#(B
 
-$B%9%3%"$N5U=g!"I=Bj!"$=$7$F:G8e$KHV9f!"$N=g$KJB$SBX$($?$$$N$G$"$l$P!"l9g$O!"1Q;z=g$KJB$S$+$($i$l$^$9!#%9%3%"$HI=Bj$,F1$8%9%l%C%I$OHV9f(B
-$B$GJB$SBX$($i$l!"(B($BIaDL$O(B) $B5-;v$,E~Ce$7$?=gHV$K$J$j$^$9!#(B
+$B:GBg$N%9%3%"$r;}$D%9%l%C%I$,!":G=i$K35N,%P%C%U%!!<$KI=<($5$l$^$9!#%9%l%C(B
+$B%I$,F1$8%9%3%"$N>l9g$O!"1Q;z=g$KJB$SBX$($i$l$^$9!#F1$8%9%3%"$HI=Bj$r;}$D(B
+$B%9%l%C%I$OHV9f$GJB$YBX$($i$l!"(B($BIaDL$O(B) $B5-;v$,E~Ce$7$?=gHV$K$J$j$^$9!#(B
 
-$B%9%3%"!"E~Ce$N5U=g$KJB$SBX$($?$$$N$G$"$l$P!"h!"$b$7$/$O$"$J$?$N9%4q?4$r$/(B
+$BJQ?t(B @code{gnus-thread-score-function} ($B%G%#%U%)%k%H$O(B @code{+}) $B$K@_Dj(B
+$B$5$l$F$$$k4X?t$O!"%9%l%C%I$NAm%9%3%"$r7W;;$9$k$?$a$KMQ$$$i$l$^$9!#LrN)$D(B
+$B4X?t$O(B @code{max}, @code{min}, $B$b$7$/$OFs>h!"$b$7$/$O$"$J$?$N9%4q?4$r$/(B
 $B$9$0$k$h$&$J2?$+$G$7$g$&!#(B
 
 @findex gnus-article-sort-functions
@@ -6818,18 +6967,18 @@ gnus $B$OA4$F$N5-;v$N40A4$J(B @code{References} $BMs$r8+$F!"F1$8%9%l%C%I$KB0$
 @findex gnus-article-sort-by-author
 @findex gnus-article-sort-by-random
 @findex gnus-article-sort-by-number
-$B2?$+4qL/$JM}M3$J$I$G%9%l%C%II=<($r;H$C$F$$$J$$$N$J$i!"JQ(B
+$B2?$+JQ$JM}M3$G%9%l%C%II=<($r;H$C$F$$$J$$$N$J$i!"JQ(B
 $B?t(B @code{gnus-article-sort-functions} $B$r$$$8$/$kI,MW$,$"$j$^$9!#$3$l(B
 $B$O(B @code{gnus-thread-sort-functions} $B$HHs>o$K;w$F$$$^$9$,!"5-;v$NHf3S$K(B
-$B$O>/!90c$C$?4X?t$r;H$$$^$9!#;HMQ2DG=$JJB$SBX$(=R8l4X?t(B
+$B$O>/!90c$C$?4X?t$r;H$$$^$9!#;HMQ2DG=$JJB$YBX$(=R8l4X?t(B
 $B$O(B @code{gnus-article-sort-by-number},
 @code{gnus-article-sort-by-author},
 @code{gnus-article-sort-by-subject}, @code{gnus-article-sort-by-date},
 @code{gnus-article-sort-by-random} $B$*$h(B
 $B$S(B @code{gnus-article-sort-by-score} $B$G$9!#(B
 
-$B%9%l%C%I$r;H$C$F$$$J$$I=Bj$N35N,I=<($rJB$SBX$($?$$$N$G$"$l$P!"l(B
+$B9g$K$O!"$$$/$D$+$NMn$H$77j$,$"$j$^$9!#(B
 
-$BNc$($P!"$"$J$?$OC;$$5-;v(B 1 $B$rFI$s$G$$$F!"5-;v(B 2 $B$O$H$F$bD9$/$"$J$?$O$=$l(B
-$B$rFI$`$3$H$K$O6=L#$,L5$$$H$7$^$7$g$&!#(BGnus $B$O$3$N$3$H$O$o$+$i$J$$$N$G!"(B
-$B@h$K9T$C$F5-;v(B 2 $B$ru67$rHr$1$k$?$a$K!"(Bgnus $B$O%5!<%P!<$KFs$D$N(B ($B$=$l$O(B 2 $B$H?t$($F$/$@$5(B
-$B$$(B) $B@\B3$rD%$k$3$H$,$G$-$^$9!#$3$l$O$"$^$j$7$FNI$$$3$H$G$O$J$$$H9M$($k?M(B
-$B$b$$$k$G$7$g$&$,!";d$K$OJ,$J@\B3$r(B
-$B$9$k$?$a$K$O2?$i$+$N;~4V$,$+$+$j$^$9$N$G!"(Bgnus $B$N5/F0$OCY$/$J$j$^$9!#(B
+$B$3$N>u67$rHr$1$k$?$a$K!"(Bgnus $B$O%5!<%P!<$KFs$D(B ($BFs$^$G?t$($F2<$5$$(B) $B$N@\(B
+$BB3$rD%$j$^$9!#$3$l$O$"$^$jNI$$$3$H$G$O$J$$$H9M$($k?M$b$$$k$G$7$g$&$,!";d(B
+$B$K$OJ,$J@\B3$rN)$A>e$2$k$?$a$K$O$$(B
+$B$/$P$/$+$N;~4V$,$+$+$k$N$G!"(Bgnus $B$N5/F0$OCY$/$J$j$^$9!#(B
 
-Gnus $B$O$"$J$?$,FI$`$G$"$m$&5-;v$h$j$b$?$/$5$s$N5-;v$rJ,$J5-;v$NMW5a$H!"M>J,$J@\B3$G!#(B
+gnus $B$O$"$J$?$,FI$`$G$"$m$&5-;v$h$j$b$?$/$5$s$N5-;v$rJ,$J5-;v$NMW5a$H!"M>J,$J@\B3$K$h$C$F!#(B
 
-$B$O$$!"$3$l$GK\Ev$O$3$N$h$&$J$3$H$r$9$Y$-$GL5$$;v$,J,$+$C$?$G$7$g(B
+$B$O$$!"K\Ev$O$3$N$h$&$J$3$H$r$9$Y$-$GL5$$$3$H$,$3$l$GJ,$+$C$?$G$7$g(B
 $B$&(B@dots{} $BK\Ev$K$=$&$7$?$$$H;W$o$J$$8B$j$O!#(B
 
 @vindex gnus-asynchronous
-$B$3$l$,J}K!$G$9(B: @code{gnus-asynchronous} $B$r(B @code{t} $B$K@_Dj$7$F$/$@$5$$!#(B
-$B;D$j$N$3$H$O<+F0E*$K5/$3$j$^$9!#(B
+$B$d$jJ}$G$9(B: @code{gnus-asynchronous} $B$r(B @code{t} $B$K@_Dj$7$F2<$5$$!#$=$l(B
+$B0J30$N=t!9$N$3$H$O<+F0E*$K9T$J$o$l$^$9!#(B
 
 @vindex gnus-use-article-prefetch
-@code{gnus-use-article-prefetch} $B$r@_Dj$9$k$3$H$K$h$j!"$I$l$/$i$$$N5-;v(B
-$B$,@h$Ko$K(B}$BCY$$(B @acronym{NNTP} $B@\B3$G$"$k$J$i$P!"5-;v%-%c%C%7%e$r(B
-$B$9$k$3$H$r9M$($k$+$b$7$l$^$;$s!#$=$&$9$k$H!"$=$l$>$l$N5-;v$O$"$J$?$N%[!<(B
-$B%`%G%#%l%/%H%j$N2<$K%m!<%+%k$KN/$a$i$^$9!#4{$K?dB,$5$l$F$$$k$+$bCN$l$^$;(B
-$B$s$,!"$3$l$O(B @emph{$B5pBg$J(B}$B%G%#%9%/%9%Z!<%9$r?)$$!"(Bi$B%N!<%I$bHs>o$KB.$/?)(B
-$B$$$D$V$92DG=@-$,$"$k$?$a!"$=$l$O$"$J$?$NF,$r1K$,$;$k;v$K$J$k$+$b$7$l$^$;(B
-$B$s!#%&%)%C%+$NCf$G!#(B
+@emph{$BHs>o$K(B} $BCY$$(B @acronym{NNTP} $B@\B3$r;H$C$F$$$k$N$J$i$P!"5-;v$r%-%c%C(B
+$B%7%e$9$k$3$H$r9M$($F$bNI$$$G$7$g$&!#$=$l$r$9$k$H!"$=$l$>$l$N5-;v$O$"$J$?(B
+$B$N%[!<%`%G%#%l%/%H%j!<$N2<$K%m!<%+%k$KN/$a$i$l$^$9!#$b$&46IU$$$?$+$b$7$l(B
+$B$^$;$s$,!"$3$l$O(B i $B%N!<%I$rHs>o$KB.$/?)$$$D$V$9$@$1$G$J$/!"(B
+@emph{$B5pBg$J(B} $B%G%#%9%/%9%Z!<%9$r?)$&2DG=@-$,$"$j$^$9!#$=$l$O$"$J$?$K%&%)%C(B
+$B%+$NCf$G1K$0$h$&$J$a$^$$$r5/$3$5$;$k$G$7$g$&!#(B
 
-$B$G$bCm0U?<$/;H$o$l$l$P!"$=$l$O5-;v$rJ]B8$9$k4JC1$JJ}K!$K$J$jF@$^$9!#(B
+$B$G$bCm0U?<$/;H$o$l$l$P!"$=$l$O5-;v$rJ]B8$9$k!"$h$j3Z$JJ}K!$K$J$jF@$^$9!#(B
 
 @vindex gnus-use-long-file-name
 @vindex gnus-cache-directory
 @vindex gnus-use-cache
-$B%-%c%C%7%e$rl9g$O!"%5!<%P!<$NBe$o$j$K%-%c%C%7%e$+$ioDL$j!"JQ(B
+$B?t(B @code{gnus-use-long-file-name} $B$G@)8f$5$l$^$9!#(B
+
+$B2D;k5-;v$+J]N15-;v$r:FA*Br$7$?>l9g$O!"%5!<%P!<$NBe$o$j$K%-%c%C%7%e$+$iC5n$5$l$J$$$N$G!"5-;v$r$=$l$i(B
+$B$,B0$9$k$H$3$m$K5oB3$1$5$;$F$$$k4V!"$=$l$i$rJ]B8$9$kJ}K!$H$7$F$3$l$OLrN)(B
+$B$D$+$b$7$l$^$;$s!#J]B8$7$?$$$9$Y$F$N5-;v$KJ]N1$N0u$rIU$1$k$@$1$G!"8e$O?4(B
+$BG[L5MQ$G$9!#(B
 
 $B5-;v$K4{FI$N0u$,IU$$$?$H$-$K!"$=$l$O%-%c%C%7%e$+$i:o=|$5$l$k$N$G$7$g$&$+!#(B
 
 @vindex gnus-cache-remove-articles
 @vindex gnus-cache-enter-articles
-$B%-%c%C%7%e(B $B$XF~$k(B/$B$+$i:o=|$5$l$k(B $B$OJQ(B
-$B?t(B @code{gnus-cache-enter-articles} $B$H(B @code{gnus-cache-remove-articles} $B$K(B
-$B$h$C$F@)8f$5$l$^$9!#$3$l$i$ON>J}$H$b%7%s%\%k$N%j%9%H$G$9!#A0J}(B
+$B$H$b%7%s%\%k$N%j%9%H$G$9!#A0/$J$/$9$k0l$D$NJ}K!$O!"M_$7$/$J$$5-;v$N%9%3%"$rDc$/$7!"4{FI$N0u$rIU$1(B
-$B$k;v$G$9!#$=$&$7$?>l9g!"$=$l$i$O$3$NL?Na$G$O%@%&%s%m!<%I$5$l$^$;$s!#(B
+$B$=$l$G$O!"Bg5,LO$J5-;v$Nl=j$K%-%c%C%7%e$9$k$N$O0UL#(B
-$B$NL5$$;v$G$9!#$"$J$?$,FsG\$NMFNL$r;H$&;v$,NI$$$H46$8$J$$8B$j$O!#(B
+$B$9$Y$F$N%0%k!<%W$G$O%-%c%C%7%e$r$7$?$/$J$$$H$$$&$N$ONI$/$"$k$3$H$G$9!#Nc(B
+$B$($P(B @code{nnml} $B$N%a!<%k$,%[!<%`%G%#%l%/%H%j!<$K$"$k$N$J$i!"$=$l$r%[!<(B
+$B%`%G%#%l%/%H%j!<$NJL$N>l=j$K%-%c%C%7%e$9$k$N$O0UL#$,$"$j$^$;$s!#FsG\$NMF(B
+$BNL$r;H$&J}$,NI$$$H;W$&$N$G$J$1$l$P!#(B
 
-$B%-%c%C%7%e$r@)8B$9$k$?$a$K!"(B@code{gnus-cacheable-groups} $B$r%-%c%C%7%e$9(B
-$B$k%0%k!<%W$NO"A[%j%9%H!"Nc$($P(B @samp{^nntp} $B$H$9$k$+!"@55,I=(B
-$B8=(B @code{gnus-uncacheable-groups} $B$rNc$($P!"(B@samp{^nnml} $B$K@_Dj$7$F2<$5(B
-$B$$!#N>J}$NJQ?t$N=i4|CM$O(B @code{nil} $B$G$9!#$b$7%0%k!<%W$,N>J}$N@55,I=8=$K(B
-$B9gCW$9$k$H!"$=$N%0%k!<%W$O%-%c%C%7%e$5$l$^$;$s!#(B
+$B%-%c%C%7%e$r@)8B$9$k$K$O!"(B@code{gnus-cacheable-groups} $B$rNc$((B
+$B$P(B @samp{^nntp} $B$N$h$&$J%-%c%C%7%e$9$k%0%k!<%W$N@55,I=8=$K@_Dj$9$k$+!"$^(B
+$B$?$O@55,I=8=(B @code{gnus-uncacheable-groups} $B$rNc$($P(B @samp{^nnml} $B$K@_Dj(B
+$B$7$F2<$5$$!#N>J}$NJQ?t$H$b$K%G%#%U%)%k%H$O(B @code{nil} $B$G$9!#$b$7%0%k!<%W(B
+$B$,N>J}$NJQ?t$K9gCW$9$k$H!"$=$N%0%k!<%W$O%-%c%C%7%e$5$l$^$;$s!#(B
 
 @findex gnus-cache-generate-nov-databases
 @findex gnus-cache-generate-active
 @vindex gnus-cache-active-file
-$B%-%c%C%7%e$O$I$N5-;v$,4^$^$l$F$$$k$+$N>pJs$r%"%/%F%#%V%U%!%$(B
-$B%k(B (@code{gnus-cache-active-file}) $B$KN/$a$^$9!#$3$N%U%!%$%k(B ($B$b$7$/$O%-%c%C(B
-$B%7%e$NB>$NItJ,(B) $B$,2?$i$+$NM}M3$G$0$A$c$0$A$c$K$J$C$F$7$^$C$?>l9g!"(B
-gnus $B$OJ*;v$r@5$7$/$9$k$?$a$KFs$D$N4X?t$r$*4+$a$7$^$9!#(B
+$B%-%c%C%7%e$O!"$=$l$,$I$N5-;v$r4^$s$G$$$k$+$N>pJs$r!"$=$N%"%/%F%#%V%U%!%$(B
+$B%k(B (@code{gnus-cache-active-file}) $B$K3JG<$7$^$9!#$3$N%U%!%$%k(B ($B$b$7$/$O(B
+$B%-%c%C%7%e$NB>$NItJ,(B) $B$,2?$i$+$NM}M3$G$0$A$c$0$A$c$K$J$C$F$7$^$C$?>l9g!"(B
+gnus $B$O$b$N$4$H$r@5$7$/$9$k$?$a$NFs$D$N%3%^%s%I$rDs6!$7$^$9!#(B
 @kbd{M-x gnus-cache-generate-nov-databases} $B$O$9$Y$F$N(B @acronym{NOV} $B%U%!(B
-$B%$%k$r(B ($B:F(B) $B:n@.$7!"(B@kbd{gnus-cache-generate-active} $B$O%"%/%F%#%V%U%!%$(B
-$B%k$r(B ($B:F(B) $B:n@.$7$^$9!#(B
+$B%$%k$r(B ($B:F(B) $B:n@.$7!"(B@kbd{M-x gnus-cache-generate-active} $B$O%"%/%F%#%V%U%!(B
+$B%$%k$r(B ($B:F(B) $B:n@.$7$^$9!#(B
 
 @findex gnus-cache-move-cache
-@code{gnus-cache-move-cache} $B$O$9$Y$F$N(B @code{gnus-cache-directory} $B$r$I(B
-$B$3$+JL$N>l=j$K0\F0$7$^$9!#$"$J$?$O$I$3$K0\F0$5$;$k$+$r?R$M$i$l$^$9!#$=$l$C(B
-$B$F$+$C$3$$$$$G$7$g(B?
+@code{gnus-cache-move-cache} $B%3%^%s%I$O!"$9$Y$F(B
+$B$N(B @code{gnus-cache-directory} $B$r$I$3$+JL$N>l=j$K0\F0$7$^$9!#$"$J$?$O$I(B
+$B$3$K0\F0$5$;$k$+$r?R$M$i$l$^$9!#$=$l$C$F$+$C$3$$$$$G$7$g(B?
 
 @node Persistent Articles
 @section $B1JB35-;v(B
 @cindex persistent articles
-$B5-;v$N%-%c%C%7%e$H6a$$4X78$K$"$k$b$N$K!"(B@dfn{$B1JB35-;v(B}$B$,$"$j$^$9!#l=j$K1J1s$K;D$C$F$$$k(B
-$B$Y$-$G$7$g$&!#%K%e!<%9%5!<%P!<$K$*$1$k4|8B:o=|$K$O1F6A$5$l$J$$$G!#(B
+$B5-;v$N%-%c%C%7%e$H6a$$4X78$K$"$k$b$N$K!V1JB35-;v!W$,$"$j$^$9!#l=j$K1J1s$K;D$C$F$$$k$3$H$,9%$^$7$$$G$7$g$&!#%K%e!<%9%5!<%P!<(B
+$B$K$*$1$k4|8B@Z$l>C5n$K$O1F6A$5$l$J$$$G!#(B
+
+$B$3$l$,!V1JB35-;v!W$G$9(B---$B5-;v$O:o=|$5$l$^$;$s!#$=$l$OIaDL$N%-%c%C%7%eL?(B
+$BNa$r;H$C$FJ}$H$b%W%m%;%9(B/$B@\F,0z?t$N=,47$rM}2r$7$^$9!#(B
+$B$3$l$i$NL?Na$ON>J}$H$b%W%m%;%9(B/$B@\F,0z?t$N=,47$rM}2r$7$^$9!#(B
 
-$B$b$71JB35-;v$K$@$16=L#$,$"$k$N$G$7$?$i!"2D;k5-;v(B ($B$d$=$NB>$N$b$N(B) $B$,%-%c%C(B
-$B%7%e$KF~$k$N$rHr$1$k$?$a$K!"(B@code{gnus-use-cache} $B$r(B @code{passive} $B$K@_(B
-$BDj$9$k$N$,NI$$$G$7$g$&(B:
+$B1JB35-;v$K$@$16=L#$,$"$k$N$J$i!"2D;k5-;v(B ($B$d$=$NB>$N$b$N(B) $B$,%-%c%C%7%e$K(B
+$BF~$k$N$rHr$1$k$?$a$K!"(B@code{gnus-use-cache} $B$r(B @code{passive} $B$K@_Dj$9$k(B
+$B$N$,NI$$$G$7$g$&(B:
 
 @lisp
 (setq gnus-use-cache 'passive)
@@ -7050,21 +7205,22 @@ gnus $B$OJ*;v$r@5$7$/$9$k$?$a$KFs$D$N4X?t$r$*4+$a$7$^$9!#(B
 @section $B5-;v$N%P%C%/%m%0(B
 @cindex backlog
 @cindex article backlog
-$B$b$7CY$$@\B3$7$+$J$$>l9g$G!"%-%c%C%7%e$r;H$&$H$$$&H/A[$O$"$^$jL%NOE*$G$O(B
-$B$J$$$H$-(B ($Bu67$r2?$H$+$9$k$3$H$,$G$-$^$9!#$3$l$O4{$KFI$s$@5-;v$r:F/$7CY$/$7!"(B
-$B%a%b%j!<$N;HMQNL$r$$$/$i$+A}$d$7$^$9!#(B
+
+$B2s@~$,CY$$$?$a$K!"%-%c%C%7%e$r;H$&$H$$$&H/A[$,$"$^$jL%NOE*$G$O$J$$$H(B
+$B$-(B ($Bu67$r2?(B
+$B$H$+$9$k$3$H$,$G$-$^$9!#$3$l$O$9$G$KFI$s$@5-;v$r:F/$7CY$/$7!"(B
+$B%a%b%j!<$N;HMQNL$r$$$/$i$+A}$d$9$@$1$N$3$H$G$9!#(B
 
 @vindex gnus-keep-backlog
-$B$b$7(B @code{gnus-keep-backlog} $B$r?t;z(B @var{n} $B$K@_Dj$9$k$H!"(Bgnus $B$O:GBg(B
-$B$G(B @var{n} $B$N8E$$5-;v$r8e$N:Fl9g!"(Bgnus $B$O(B@emph{$BA4$F(B}$B$N4{FI5-(B
-$B;v$r$?$/$o$($^$9!#$3$l$O$"$J$?$N(B Emacs $B$,!"K=H/$7$F$"$J$?$N%^%7%s$,Mn$A(B
-$B$k$^$G@)8B$J$/KD$l>e$,$k$H$$$&$3$H$G$9!#;d$O$"$J$?J}A4$F$,855$$G$$$i$l$k(B
-$B$h$&$K$3$3$K=q$-2C$($^$7$?!#(B
+@code{gnus-keep-backlog} $B$r?tCM(B @var{n} $B$K@_Dj$9$k$H!"(Bgnus $B$O:GBg(B
+$B$G(B @var{n} $B8D$N8E$$5-;v$r8e$N:Fl9g!"(B
+gnus $B$O(B @emph{$B$9$Y$F(B} $B$N4{FI5-;v$rC_$($^$9!#$=$l$O(B Emacs $B$,GzH/$9$k$^$G(B
+$B@)8B$J$/KD$l>e$,$C$F!"%^%7%s$,$"$J$?$b$m$H$bMn$A$F$7$^$&$H$$$&$3$H$G$9!#(B
+$B;d$O$_$J$5$s$,$$$D$bCm0U$rBU$i$J$$$h$&$K$9$k$?$a$K!"$3$3$K=q$-2C$($^$7$?!#(B
 
 $B%G%#%U%)%k%HCM$O(B 20 $B$G$9!#(B
 
@@ -7072,24 +7228,23 @@ gnus $B$OJ*;v$r@5$7$/$9$k$?$a$KFs$D$N4X?t$r$*4+$a$7$^$9!#(B
 @section $B5-;v$NJ]B8(B
 @cindex saving articles
 
-Gnus $B$O$?$/$5$s$NJ}K!$G5-;v$rJ]B8$9$k;v$,$G$-$^$9!#0J2<$N$b$N$OHs>o$KN((B
-$BD>$JJ}K!(B ($BNc$($P!"5-;v$,J]B8$9$kA0$K$[$H$s$I2?$b$J$5$l$J$$(B) $B$G5-;v$rJ]B8(B
-$B$9$k$?$a$N@bL@$G$9!#0c$C$?o$K(B
+$BN(D>$JJ}K!(B ($B$9$J$o$A5-;v$,J]B8$9$kA0$K$[$H$s$I2?$b$J$5$l$J$$(B) $B$G5-;v$rJ](B
+$BB8$9$k$?$a$N@bL@$G$9!#0[$J$k]$,%U%!%$%k$G$9!#%0%k!<%W$KJ]B8$7$?$$>l9g(B
-$B$O(B @kbd{B c} (@code{gnus-summary-copy-article}) $B%3%^%s%I$r;2>H$7$F2<$5(B
+$B$3$3$KNs5s$5$l$F$$$k%3%^%s%I$OBP>]$,%U%!%$%k$G$9!#%0%k!<%W$KJ]B8$7$?$$>l(B
+$B9g$O(B @kbd{B c} (@code{gnus-summary-copy-article}) $B%3%^%s%I$r;2>H$7$F2<$5(B
 $B$$(B (@pxref{Mail Group Commands})$B!#(B
 
 @vindex gnus-save-all-headers
 @code{gnus-save-all-headers} $B$,(B @code{nil} $B$G$J$$$H!"(Bgnus $B$O5-;v$rJ]B8$9(B
-$B$kA0$KK>$^$7$/$J$$%X%C%@!<$r>C5n$7$^$;$s!#(B
+$B$kA0$KITMW$J%X%C%@!<$r>C5n$7$^$;$s!#(B
 
 @vindex gnus-saved-headers
-$B$b$7>e$NJQ?t$,(B @code{nil} $B$G$"$k$H!"@55,I=(B
-$B8=(B @code{gnus-saved-headers} $B$K9gCW$9$k$9$Y$F$N%X%C%@!<$O;D$5$l!";D$j$N(B
-$B$b$N$OJ]B8$9$kA0$K:o=|$5$l$^$9!#(B
+$B$b$7>e5-$NJQ?t$,(B @code{nil} $B$G$"$k$H!"@55,I=(B
+$B8=(B @code{gnus-saved-headers} $B$K9gCW$9$k$9$Y$F$N%X%C%@!<$,;D$5$l$k0lJ}!"(B
+$B;D$j$N$b$N$OJ]B8$9$kA0$K:o=|$5$l$^$9!#(B
 
 @table @kbd
 @item O o
@@ -7098,7 +7253,7 @@ Gnus $B$O$?$/$5$s$NJ}K!$G5-;v$rJ]B8$9$k;v$,$G$-$^$9!#0J2<$N$b$N$OHs>o$KN((B
 @kindex o ($B35N,(B)
 @findex gnus-summary-save-article
 @c @icon{gnus-summary-save-article}
-$B%G%#%U%)%k%H$N5-;vJ]B8$rMQ$$$F8=:_$N5-;v$rJ]B8$7$^(B
+$B%G%#%U%)%k%H$N5-;v$rJ]B8$9$ko$KN((B
 @item O b
 @kindex O b ($B35N,(B)
 @findex gnus-summary-save-article-body-file
-$B8=:_$N5-;v$NK\J8(B (body) $B$rIaDL$N%U%!%$%kMM<0$GJ]B8$7$^(B
+$B8=:_$N5-;v$NK\J8$rIaDL$N%U%!%$%kMM<0$GJ]B8$7$^(B
 $B$9(B (@code{gnus-summary-save-article-body-file})$B!#(B
 
 @item O h
@@ -7149,18 +7304,18 @@ Gnus $B$O$?$/$5$s$NJ}K!$G5-;v$rJ]B8$9$k;v$,$G$-$^$9!#0J2<$N$b$N$OHs>o$KN((B
 @kindex O p ($B35N,(B)
 @kindex | ($B35N,(B)
 @findex gnus-summary-pipe-output
-$B8=:_$N5-;v$r%Q%$%W$KJ]B8$7$^$9!#$&!<$s$H!"$"$N$)!";d$,8@$*$&$H$7$F$$$k;v(B
-$B$O!=!=8=:_$N5-;v$r%W%m%;%9$K%Q%$%W$9$k$H$$$&$3$H$G(B
-$B$9(B (@code{gnus-summary-pipe-output})$B!#%7%s%\%k@\F,<-(B (@pxref{Symbolic
+$B8=:_$N5-;v$r%Q%$%W$KJ]B8$7$^$9!#$&!<$s$H!"$"$N$)!";d$,8@$*$&$H$7$F$$$k$3(B
+$B$H$O(B---$B8=:_$N5-;v$r%W%m%;%9$K%Q%$%W$9$k$H$$$&$3$H$G(B
+$B$9(B (@code{gnus-summary-pipe-output})$B!#%7%s%\%k@\F,0z?t(B (@pxref{Symbolic
 Prefixes}) $B$,M?$($i$l$k$H!"%Q%$%W$X$N=PNO$K40A4$J%X%C%@!<$r4^$a$^$9!#(B
 
 @item O P
 @kindex O P ($B35N,(B)
 @findex gnus-summary-muttprint
 @vindex gnus-summary-muttprint-program
-$B8=:_$N5-;v$r(B muttprint $B$KJ]B8$7$^$9!#$3$l$O30It%W%m%0%i(B
+$B8=:_$N5-;v$r(B muttprint $B$KJ]B8$7$^$9!#$D$^$j!"30It%W%m%0%i(B
 $B%`(B @uref{http://muttprint.sourceforge.net/, Muttprint} $B$r;H$C$F5-;v$r0u(B
-$B:~$7$^$9!#%W%m%0%i%`L>$H;HMQ$9$k%*%W%7%g%s$O!"JQ(B
+$B:~$9$k$H$$$&$3$H$G$9!#%W%m%0%i%`L>$H;HMQ$9$k%*%W%7%g%s$O!"JQ(B
 $B?t(B @code{gnus-summary-muttprint-program} $B$G;XDj$5$l$^$9!#(B
 (@code{gnus-summary-muttprint})$B!#(B
 @end table
@@ -7168,37 +7323,38 @@ Prefixes}) $B$,M?$($i$l$k$H!"%Q%$%W$X$N=PNO$K40A4$J%X%C%@!<$r4^$a$^$9!#(B
 @vindex gnus-prompt-before-saving
 $B$9$Y$F$N$3$l$i$NL?Na$O%W%m%;%9(B/$B@\F,0z?t$N=,47$r;H$$$^(B
 $B$9(B (@pxref{Process/Prefix})$B!#$b$7$3$l$i$N4X?t$r;H$C$F$?$/$5$s$N5-;v$rJ](B
-$BB8$7$?>l9g!"$=$l$>$l$N$9$Y$F$N5-;v$KBP$7$F%U%!%$%kL>$NF~NO$rMW5a$5$l$k;v(B
-$B$KK0$-K0$-$9$k$G$7$g$&!#F~NOB%?JF0:n$OJQ(B
+$BB8$7$?>l9g!"$=$l$>$l$N$9$Y$F$N5-;v$KBP$7$F%U%!%$%kL>$NF~NO$rMW5a$5$l$k$3(B
+$B$H$KK0$-K0$-$9$k$G$7$g$&!#F~NO$r5a$a$kF0:n$OJQ(B
 $B?t(B @code{gnus-prompt-before-saving} $B$K$h$C$F@)8f$5$l$^$9!#$3$l$O%G%#%U%)(B
-$B%k%H$G$O(B @code{always} $B$G!"$"$J$?$,CN$C$F$$$F7y$,$C$F$$$k!"2a>j$JB%?JF0(B
-$B:n$r$7$^$9!#Be$o$j$K$3$NJQ?t$r(B @code{t} $B$K@_Dj$9$k$H!"$"$J$?$,J]B8$9$k$=(B
-$B$l$>$l$N0lO"$N5-;v$KBP$7$F0l2s$@$1B%$5$l$^$9!#K\Ev$K(B gnus $B$K$9$Y$F$N;W9M(B
-$B$r$5$;$?$$$N$G$"$l$P!"$3$NJQ?t$r(B @code{nil} $B$K$9$k$3$H$5$($G$-$^$9!#$=$7(B
-$B$F!"5-;v$rJ]B8$9$k$?$a$N%U%!%$%k$rB%$5$l$k;v$O$"$j$^$;$s!#(BGnus $B$OC1=c$K(B
-$B$9$Y$F$N5-;v$r%G%#%U%)%k%H$N%U%!%$%k$KJ]B8$7$^$9!#(B
+$B%k%H$G$O(B @code{always} $B$G!"$"$J$?$,7y$J;W$$$rL#$o$C$F$$$k!"2a>j$JF~NOMW(B
+$B5a$r$7$^$9!#Be$o$j$K$3$NJQ?t$r(B @code{t} $B$K@_Dj$9$k$H!"J]B8$9$k$=$l$>$l$N(B
+$B0lO"$N5-;v$KBP$7$F0l2s$@$1F~NO$rMW5a$7$^$9!#K\Ev$K(B gnus $B$K$9$Y$F$NH=CG$r(B
+$BG$$;$F$7$^$$$?$$$N$G$"$l$P!"$3$NJQ?t$r(B @code{nil} $B$K$9$k$3$H$5$($G$-$^$9!#(B
+$B$=$&$9$l$P!"5-;v$rJ]B8$9$k$?$a$N%U%!%$%k$rB%$5$l$k$3$H$O$"$j$^$;$s!#(B
+gnus $B$OC1=c$K$9$Y$F$N5-;v$r%G%#%U%)%k%H$N%U%!%$%k$KJ]B8$7$^$9!#(B
 
 @vindex gnus-default-article-saver
-Gnus $B$,$"$J$?$NK>$`$H$*$j$K$J$k$h$&$K!"JQ(B
-$B?t(B @code{gnus-default-article-saver} $B$r%+%9%?%^%$%:$9$k;v$,$G$-$^$9!#2<(B
-$B$NO;$D$N4{@=4X?t$r;H$&;v$,$G$-$^$9$7!"<+J,<+?H$N4X?t$r:n$k;v$b$G$-$^$9!#(B
+gnus $B$r;W$$DL$j$KF0:n$5$;$k$?$a$K!"JQ(B
+$B?t(B @code{gnus-default-article-saver} $B$r%+%9%?%^%$%:$9$k$3$H$,$G$-$^$9!#(B
+$B2<$NO;$D$N4{@=$N4X?t$r;H$&$3$H$,$G$-$k$7!"<+J,<+?H$N4X?t$r:n$k$3$H$b$G$-(B
+$B$^$9!#(B
 
 @table @code
 @item gnus-summary-save-in-rmail
 @findex gnus-summary-save-in-rmail
 @vindex gnus-rmail-save-name
 @findex gnus-plain-save-name
-$B$3$l$O%G%#%U%)%k%H$NMM<0!"(B@dfn{Babyl} $B$G$9!#JQ(B
-$B?t(B @code{gnus-ramil-save-name} $B$KF~$C$F$$$k4X?t$r!"5-;v$rJ]B8$9$k$?$a$N(B
-$B%U%!%$%kL>$rA0$r$rA0$ro$N%U%!%$%k$N8e$KDI2C$7$^$9!#JQ?t(B @code{gnus-file-save-name} $B$K(B
-$BF~$C$F$$$k4X?t$r!"5-;v$rJ]B8$9$k$?$a$N%U%!%$%kL>$rA0$ro$N%U%!%$%k$KJ]B8$7$^$9!#$=$N%U%!%$%k$,B8:_$7$F$$$?(B
-$B$i>e=q$-$5$l$^$9!#JQ?t(B @code{gnus-file-save-name} $B$KF~$C$F$$$k4X?t$r!"5-(B
-$B;v$rJ]B8$9$k$?$a$N%U%!%$%kL>$re=q$-$5$l$^$9!#JQ?t(B @code{gnus-file-save-name} $B$K@_Dj$5$l$F$$$k4X?t$r!"(B
+$B5-;v$rJ]B8$9$k%U%!%$%k$NL>A0$ro$N%U%!%$%k$N8e$KDI2C$7$^$9!#JQ(B
-$B?t(B @code{gnus-file-save-name} $B$KF~$C$F$$$k4X?t$r!"5-;v$rJ]B8$9$k$?$a$N%U%!(B
-$B%$%kL>$ro$N%U%!%$%k$N8e$KDI2C$7$^$9!#JQ(B
+$B?t(B @code{gnus-file-save-name} $B$K@_Dj$5$l$F$$$k4X?t$r!"5-;v$rJ]B8$9$k%U%!(B
+$B%$%k$NL>A0$r$rA0$r.J8;z$K$J$C$?L>A0$r$D$/$j$^(B
+$B;H$&$3$H$,$G$-$F!"$3$A$i$O@hF,$,BgJ8;z!";D$j$,>.J8;z$K$J$C$?L>A0$r:n$j$^(B
 $B$9!#(B
 
 @item gnus-summary-save-in-vm
@@ -7244,13 +7400,13 @@ MH $B%i%$%V%i%j!<$N(B @code{rcvstore} $B$rMQ$$$k;v$K$h$C$F5-;v$r(B MH $B%U%
 @end table
 
 @vindex gnus-article-save-directory
-$B$3$l$i$NA4$F$N4X?t$O:G8e$N0l$D$r=|$$$F!"4D6-JQ?t(B @env{SAVEDIR} $B$K$h$C$F(B
-$B=i4|2=$5$l$k(B @code{gnus-article-save-directory} $B$K5-;v$rJ]B8$7$^$9!#$3$l(B
-$B$O%G%#%U%)%k%H$G$O(B @file{~/News/} $B$G$9!#(B
+$B$3$l$i$N$9$Y$F$N4X?t$O:G8e$N0l$D$r=|$$$F!"4D6-JQ?t(B @env{SAVEDIR} $B$K$h$C(B
+$B$F=i4|2=$5$l$k(B @code{gnus-article-save-directory} $B$K5-;v$rJ]B8$7$^$9!#$3(B
+$B$l$O%G%#%U%)%k%H$G$O(B @file{~/News/} $B$G$9!#(B
 
-$B>e$K$"$k$h$&$K!"5-;v$rJ]B8$9$k$?$a$N%U%!%$%k$NE,@Z$JL>A0$r8+$D$1$k$?$a$K!"(B
-$B4X?t$O0c$C$?4X?t$rMQ$$$^$9!#0J2<$OL>A0$r@8@.$9$k$?$a$K;HMQ2DG=$J4X?t$N%j(B
-$B%9%H$G$9(B:
+$B>e$G=R$Y$?$h$&$K!"5-;v$rJ]B8$9$k$?$a$N%U%!%$%k$NE,@Z$JL>A0$r8+$D$1$k$?$a(B
+$B$K!"$=$l$i$O0c$C$?4X?t$rMQ$$$^$9!#0J2<$OL>A0$r@8@.$9$k$?$a$K;H$&$3$H$,$G(B
+$B$-$k4X?t$N%j%9%H$G$9(B:
 
 @table @code
 @item gnus-Numeric-save-name
@@ -7275,11 +7431,11 @@ MH $B%i%$%V%i%j!<$N(B @code{rcvstore} $B$rMQ$$$k;v$K$h$C$F5-;v$r(B MH $B%U%
 @end table
 
 @vindex gnus-split-methods
-$BO"A[%j%9%H(B @code{gnus-split-methods} $B$K@55,I=8=$rJ|$j9~$`;v$K$h$C$F!"(B
-gnus $B$K5-;v$rJ]B8$9$k>l=j$rDs0F$9$k;v$,$G$-$^$9!#Nc$($P!"(Bgnus $B$K4XO"$7$?(B
-$B5-;v$r%U%!%$%k(B @file{gnus-stuff} $B$K!"(BVM $B$K4XO"$7$?5-;v(B
-$B$r(B @file{vm-stuff} $BJ]B8$7$?$1$l$P!"$3$NJQ?t$r0J2<$N$h$&$K$9$k;v$,$G$-$^(B
-$B$9(B:
+$BO"A[%j%9%H(B @code{gnus-split-methods} $B$K@55,I=8=$rJ|$j9~$`$3$H$K$h$C$F!"(B
+gnus $B$K5-;v$rJ]B8$9$k>l=j$r$[$N$a$+$9$3$H$,$G$-$^$9!#Nc$($P(B gnus $B$K4XO"(B
+$B$9$k5-;v$r(B @file{gnus-stuff} $B%U%!%$%k$K!"(BVM $B$K4XO"$9$k5-;v(B
+$B$r(B @file{vm-stuff} $B%U%!%$%k$KJ]B8$7$?$1$l$P!"$3$NJQ?t$r0J2<$N$h$&$K$9$l(B
+$B$PNI$$$G$7$g$&(B:
 
 @lisp
 (("^Subject:.*gnus\\|^Newsgroups:.*gnus" "gnus-stuff")
@@ -7288,28 +7444,28 @@ gnus $B$K5-;v$rJ]B8$9$k>l=j$rDs0F$9$k;v$,$G$-$^$9!#Nc$($P!"(Bgnus $B$K4XO"$7$
  ((equal gnus-newsgroup-name "mail.misc") "mail-stuff"))
 @end lisp
 
-$B$3$l$O$=$l$>$l$NMWAG$,!"Fs$D$NMWAG!=!=(B@dfn{$B9gCW(B} $B$H(B @dfn{$B%U%!%$%k(B} $B$r;}(B
-$B$D%j%9%H$G$"$k%j%9%H$G$"$k$H$$$&;v$,$o$+$j$^$9!#9gCW$OJ8;zNs(B ($B$3$N>l9g$O(B
-$B5-;v$N%X%C%@!<$K9gCW$9$k@55,I=8=$H$7$F;H$o$l$^$9(B) $B$*$h$S!"%7%s%\%k(B ($B%0%k!<(B
-$B%WL>$r0z?t$H$7$F!"4X?t$H$7$F8F$P$l$^$9(B) $B$*$h$S!"%j%9%H(B ($B$3$l$OI>(B
-$B2A(B (@code{eval}) $B$5$l$^$9(B) $B$G$"$k$3$H$,$G$-$^$9!#$b$7$3$l$i$NF0:n$N0l$D(B
-$B$G$b(B @code{nil} $B$G$J$$7k2L$rJV$9$H!"(B@dfn{$B%U%!%$%k(B}$B$,%G%#%U%)%k%H$NB%?J$H(B
-$B$7$F;H$o$l$^$9!#2C$($F!"8F$P$l$?4X?t$+<0$,J8;zNs$+J8;zNs$N%j%9%H$rJV$7$?(B
-$B$H$-$O!"1i;;$N7k2L<+BN$,;H$o$l$^$9!#(B
+$B$3$l$O$=$l$>$l$NMWAG$,!"Fs$D$NMWAG(B---$B!V9gCW!W$H!V%U%!%$%k!W$r;}$D%j%9%H(B
+$B$G$"$k%j%9%H$G$"$k$H$$$&$3$H$,$o$+$j$^$9!#9gCW$OJ8;zNs(B ($B$3$N>l9g$O5-;v$N(B
+$B%X%C%@!<$K9gCW$9$k@55,I=8=$H$7$F;H$o$l$^$9(B)$B!"%7%s%\%k(B ($B%0%k!<%WL>$r0z?t(B
+$B$H$7$F!"4X?t$H$7$F8F$P$l$^$9(B) $B$*$h$S%j%9%H(B ($B$3$l$OI>2A(B (@code{eval}) $B$5(B
+$B$l$^$9(B) $B$N$I$l$+$G$"$k$3$H$,$G$-$^$9!#$3$l$i$NF0:n$N0l$D$G(B
+$B$b(B @code{nil} $B$G$J$$7k2L$rJV$9$H!"F~NO$r5a$a$k$H$-$N%G%#%U%)%k%H$H$7$F(B
+$B!V%U%!%$%k!W$,;H$o$l$^$9!#2C$($F!"8F$P$l$?4X?t$+<0$,J8;zNs$+J8;zNs$N%j%9(B
+$B%H$rJV$7$?$H$-$O!"1i;;$N7k2L<+BN$,;H$o$l$^$9!#(B
 
 $B4pK\E*$K$O!"8=:_$N5-;v$rJ]B8$9$k$N$K;H$o$l$k2DG=@-$N$"$k%U%!%$%kL>$N%j%9(B
-$B%H$rA0$H$7$F;H$$$?$$$b$N$rB%$5$l!"$3$NJQ?t$rE,MQ$9$k;v$K$h$jF@$i$l$?7k(B
-$B2L$+$i%U%!%$%kL>Jd40$r$7$FF~NO$7$^$9!#(B
+$B%H$rA0$H$7$F;H$$$?$$$b$N$NF~NO$rB%$5$l$^$9$,!"$=$N:]!"$3$NJQ?t$rE,MQ(B
+$B$7$FF@$i$l$?7k2L$,!"%U%!%$%kL>$rJd40$9$k$H$-$N8uJd$K$J$j$^$9!#(B
 
-$B$3$NJQ?t$O%G%#%U%)%k%H$G$O(B @code{((gnus-article-archive-name))} $B$G!"(B
-gnus $B$,J]B8$9$k5-;v$N(B @code{Archive-name} $B9T$rD4$Y$F!"$=$l$r%U%!%$%kL>$N(B
-$BDs0F$H$7$F;H$&$H$$$&;v$G$9!#(B
+$B$3$NJQ?t$O%G%#%U%)%k%H$G$O(B @code{((gnus-article-archive-name))} $B$G!"$3$l(B
+$B$O(B gnus $B$,J]B8$9$k5-;v$N(B @code{Archive-name} $B9T$rD4$Y$F!"$=$l$r%U%!%$%k(B
+$BL>$N8uJd$H$7$F;H$$$^$9!#(B
 
-$B$3$l$O%U%!%$%kL>$r>/$7$-$l$$$K$9$k4X?t$NNc$G$9!#(B
-@samp{nnml:mail.whatever} $B$N$h$&$J%a!<%k%0%k!<%W$,$?$/$5$s$"$k$N$G$"$l$P!"(B
-$BJ]B8$9$k$?$a$N%U%!%$%kL>$r:n$kA0$K$3$l$i$N%0%k!<%WL>$N:G=i$r@Z$jMn$H$9I,(B
-$BMW$,$"$k$+$b$7$l$^$;$s!#$rB?>/$-$l$$$K$9$k4X?t$NNc$G$9!#(B
+@samp{nnml:mail.whatever} $B$N$h$&$J%a!<%k%0%k!<%W$,$?$/$5$s$"$k$H$9$k$H!"(B
+$BJ]B8$9$k$?$a$N%U%!%$%kL>$r:n$kA0$K$=$l$i$N%0%k!<%WL>$N:G=i$NJ}$r@Z$jMn$H(B
+$B$9I,MW$,$"$k$+$b$7$l$^$;$s!#$
 @end lisp
 
 @vindex gnus-use-long-file-name
-$B:G8e$K(B @code{gnus-use-long-file-name} $B$H$$$&JQ?t$,$"$j$^$9!#$3$l(B
+$B:G8e$K!"(B@code{gnus-use-long-file-name} $B$H$$$&JQ?t$,$"$j$^$9!#$3$l(B
 $B$,(B @code{nil} $B$G$"$k$H!"$9$Y$F$N>e5-$N4X?t$O%0%k!<%WL>$N$9$Y$F$N%T%j%*(B
-$B%I(B (@samp{.}) $B$r%9%i%C%7%e(B (@samp{/}) $B$GCV$-49$($^$9!=!=$3$l$O4X?t$O$9$Y(B
-$B$F$N%U%!%$%k$r0lHV>e$N%G%#%l%/%H%j!<$KCV$/$N$G$O$J$/!"3,AXE*$J%G%#%l%/%H(B
-$B%j!<$r:n$k$H$$$&;v$G$9(B (@file{~/News/alt.andrea-dworkin} $B$NBe$o$j(B
-$B$K(B @file{~/News/alt/andrea-dworkin}$B!#(B) $B$3$NJQ?t$O$?$$$F$$$N%7%9%F%`$K$*(B
-$B$$$F%G%#%U%)%k%H$G(B @code{t} $B$G$9!#$7$+$7!"Nr;KE*$JM}M3$+(B
-$B$i(B Xenix $B$H(B usg-unix-v $B%^%7%s$G$O%G%#%U%)%k%H$G(B @code{nil} $B$G$9!#(B
+$B%I(B (@samp{.}) $B$r%9%i%C%7%e(B (@samp{/}) $B$GCV$-49$($^$9(B---$B$D$^$j!"$9$Y$F$N(B
+$B%U%!%$%k$r0lHV>e$N%G%#%l%/%H%j!<$KCV$/$N$G$O$J$/!"$=$l$i$N4X?t$,3,AXE*$J(B
+$B%G%#%l%/%H%j!<$r@8@.$9$k$H$$$&$3$H$G(B
+$B$9(B (@file{~/News/alt.andrea-dworkin} $B$G$O$J(B
+$B$/(B @file{~/News/alt/andrea-dworkin} $B$N$h$&$K(B)$B!#$?$$$F$$$N%7%9%F%`$K$*$$(B
+$B$F!"$3$NJQ?t$N%G%#%U%)%k%H$O(B @code{t} $B$G$9!#$7$+$7!"Nr;KE*$JM}M3$K$h$C(B
+$B$F(B Xenix $B$H(B usg-unix-v $B%^%7%s$G$O(B @code{nil} $B$,%G%#%U%)%k%H$K$J$j$^$9!#(B
 
-$B$3$N4X?t$O:o=|$H%9%3%"$N%U%!%$%kL>$K1F6A$7$^$9!#$3$NJQ?t$,%j%9%H$G!"%j%9(B
-$B%H$KMWAG(B @code{not-score} $B$,$"$k$H!"D9$$%U%!%$%kL>$O%9%3%"%U%!%$%k$K$O;H(B
-$B$o$l$:!"%j%9%H$KMWAG(B @code{not-save} $B$,$"$k$H!"D9$$%U%!%$%kL>$OJ]B8$K$O(B
-$B;H$o$l$:!"MWAG(B @code{not-kill} $B$,$"$k$H!"D9$$%U%!%$%kL>$O:o=|%U%!%$%k$K(B
-$B$O;H$o$l$^$;$s!#(B
+$B$3$N4X?t$O:o=|$H%9%3%"$N%U%!%$%kL>$K$b1F6A$7$^$9!#$3$NJQ?t$,%j%9%H$G!"$=(B
+$B$N%j%9%H$,(B @code{not-score} $B$H$$$&MWAG$r4^$s$G$$$k$H!"D9$$%U%!%$%kL>$O%9(B
+$B%3%"%U%!%$%k$K$O;H$o$l$^$;$s!#$=$N%j%9%H$,(B @code{not-save} $B$H$$$&MWAG$r(B
+$B4^$s$G$$$k$H!"J]B8$9$k$H$-$KD9$$%U%!%$%kL>$O;H$o$l$^$;$s!#$^$?!"$=$N%j%9(B
+$B%H$,(B @code{not-kill} $B$H$$$&MWAG$r4^$s$G$$$k$H!"D9$$%U%!%$%kL>$O:o=|%U%!(B
+$B%$%k$K$O;H$o$l$^$;$s!#(B
 
-$B$b$75-;v$r%9%W!<%k$N$h$&$J3,AX$KJ]B8$7$?$$$N$G$"$l$P!"l9g$O!"e$N%G%#%l%/%H%j!<$r0z?t(B (@file{~/News/}) $B$H$7$F(B
-$BEO$7$^$9!#(B
+$B$=$&$7$?$J$i$P!"(B@kbd{o} $B$G5-;v$rJ]B8$9$k$@$1$G$9!#$9$k$H!"3,AX(B
+$B$r(B @code{nneething} $B0l;~%0%k!<%W$K$h$C$FFI$`$3$H$,$G$-$^$9(B---$B%0%k!<%W%P%C(B
+$B%U%!!<$G(B @kbd{G D} $B$r%?%$%W$7$F!"0lHV>e$N%G%#%l%/%H(B
+$B%j!<(B (@file{~/News/}) $B$r0z?t$H$7$FEO$7$F2<$5$$!#(B
 
 @node Decoding Articles
-@section $B5-;v$NI|9f2=(B
+@section $B5-;v$N%G%3!<%I(B
 @cindex decoding articles
 
-$B$H$-$I$-MxMQO$G$O!"J#?t$KJ,3d$7$FAw?.$5$l$?0l$D$N5pBg$J5-;v$r!":F$S0l$D$K(B
+$B$^$H$a>e$2$F%G%3!<%I$9$k=hM}$K$D$$$F@bL@$7$F$$$^$9!#8=:_$G$O!"$=$N$h$&$J(B
+$BJ,3dAw?.$r%a!<%k%5!<%P!<$,A0!"(B
-@samp{[Cc][Ii][Nn][Dd][Yy][0-9]+.\\(gif\\|jpg\\)} $B$K%O!<%I%3!<%I$5$l$k!"(B
-$B$r;}$D5-;v$rI|9f2=$7$h$&$H$7$?$H$-$O!"(B@code{gnus-uu} $B$OLdBj$N5-;v$r$A$g(B
-$B$&$I1\Mw$7$?;v$rCN$i$;$k$?$a$K!"<+F0E*$K(B @samp{comp.unix.wizards} $B$K5-;v(B
-$B$rEj9F$7$^$9!#$3$N5!G=$r;H$o$J$$$h$&$K$9$k;v$O$G$-$^$;$s!#(B
+$BCm0U(B: $BDj?t(B @code{gnus-uu-notify-files} ($BCM(B
+$B$,(B @samp{[Cc][Ii][Nn][Dd][Yy][0-9]+.\\(gif\\|jpg\\)} $B$K%O!<%I%3!<%I$5$l(B
+$B$F$$$^$9(B) $B$K9gCW$9$kL>A0$r;}$D5-;v$r%G%3!<%I$7$h$&$H$9$k$H!"$"$J$?$,LdBj(B
+$B$N5-;v$r:#$^$5$K8+$?$3$H$r%P%i$9$?$a$K!"(B@code{gnus-uu} $B$O<+F0E*(B
+$B$K(B @samp{comp.unix.wizards} $B$K5-;v$rEj9F$7$^$9!#$3$N5!G=$r;H$o$J$$$h$&$K(B
+$B$9$k$3$H$O$G$-$^$;$s(B ($BLuCm(B: $B$=$s$J(B Cindy Crawford $B>n$N$NI|9f2=$NJQ?t(B
+* Other Decode Variables::      $BB>$N%G%3!<%I$N$?$a$NJQ?t(B
 * Uuencoding and Posting::      uuencode $B$9$k$N$r%+%9%?%^%$%:$9$kJQ?t(B
 @end menu
 
@@ -7526,8 +7697,8 @@ Gnus $B$O0J2<$N4JC1$J5,B'$KB'$C$F$I$N5-;v$,72$KB0$9$k$N$+$r?dB,$7$^$9(B: $BI=
 @subsubsection $B5,B'JQ?t(B
 @cindex rule variables
 
-Gnus $B$O%U%!%$%k$r1\Mw$9$k$N$r7hDj$9$k$N$K(B@dfn{$B5,B'JQ?t(B}$B$rMQ$$$^$9!#$3$l(B
-$B$i$NJQ?t$O$9$Y$F0J2<$N$h$&$JMM<0$G$9!#(B
+gnus $B$O%U%!%$%k$r$I$&$d$C$FI=<($9$k$+$r7h$a$k$?$a$K!V5,B'JQ?t!W$r;H$$$^(B
+$B$9!#$3$l$i$NJQ?t$O$9$Y$F0J2<$N$h$&$JMM<0$G$9!#(B
 
 @lisp
       (list '(regexp1 command2)
@@ -7539,9 +7710,9 @@ Gnus $B$O%U%!%$%k$r1\Mw$9$k$N$r7hDj$9$k$N$K(B@dfn{$B5,B'JQ?t(B}$B$rMQ$$$^$9
 @item gnus-uu-user-view-rules
 @vindex gnus-uu-user-view-rules
 @cindex sox
-$B$3$NJQ?t$O%U%!%$%k$r1\Mw$9$k$H$-$K:G=i$KD4$Y$i$l$^$9!#Nc$($P!"$b(B
-$B$7(B @file{.au} $B2;%U%!%$%k$rJQ49$9$k$?$a$K(B @code{sox} $B$r;H$$$?$$$H$-$O!"$NI|9f2=$NJQ?t(B
+@subsubsection $BB>$N%G%3!<%I$N$?$a$NJQ?t(B
 
 @table @code
 @vindex gnus-uu-grabbed-file-functions
 
 @item gnus-uu-grabbed-file-functions
-$B$3$N%j%9%H$N$9$Y$F$N4X?t$O$=$l$>$l$N%U%!%$%k$,>e8e$K8F(B
-$B$P$l$^$9!=!=$G$9$+$i!"$9$0$K%U%!%$%k$r0\F0$d1\Mw$7$?$j$9$k$3$H$,$G$-!"2?(B
-$B$+$r$9$kA0$K$9$Y$F$N%U%!%$%k$,I|9f2=$5$l$k$N$rBT$DI,MW$O$"$j$^$;$s!#$3$N(B
-$B%j%9%H$KF~$l$k;v$N$G$-$k4{@=4X?t$O(B:
+$B$3$l$O4X?t$N%j%9%H$G$9!#$9$0$K%U%!%$%k$r0\F0$7$?$jI=<($9$k$3$H$r2DG=$K$7!"(B
+$B2?$+$,$G$-$k$h$&$K$J$kA0$K$9$Y$F$N%U%!%$%k$,%G%3!<%I$5$l$k$N$rBT$DI,MW$,(B
+$BL5$$$h$&$K!"$=$l$>$l$N%U%!%$%k$N%G%3!<%I$K@.8y$7$?D>8e$K$=$l$i$N4X?t$,8F(B
+$B$P$l$^$9!#$3$N%j%9%H$KF~$l$k$3$H$,$G$-$k4{@=$N4X?t$O0J2<$NDL$j$G$9(B:
 
 @table @code
 @item gnus-uu-grab-view
 @findex gnus-uu-grab-view
-$B%U%!%$%k$r1\Mw$7$^$9!#(B
+$B%U%!%$%k$rI=<($7$^$9!#(B
 
 @item gnus-uu-grab-move
 @findex gnus-uu-grab-move
@@ -7583,21 +7754,21 @@ Gnus $B$O%U%!%$%k$r1\Mw$9$k$N$r7hDj$9$k$N$K(B@dfn{$B5,B'JQ?t(B}$B$rMQ$$$^$9
 
 @item gnus-uu-be-dangerous
 @vindex gnus-uu-be-dangerous
-$BI|9f2=$N:GCf$KJQ$J>u67$,5/$3$C$?$H$-$K2?$r$9$k$+$r;XDj$7$^$9!#$b(B
+$B%G%3!<%I$N:GCf$K0[>o$J>u67$,5/$3$C$?$H$-$K2?$r$9$k$+$r;XDj$7$^$9!#$b(B
 $B$7(B @code{nil} $B$G$"$k$H!"$G$-$k$@$1J]e=q$-$7$^$9!#$=$NB>$N>l(B
 $B9g$O!"$=$l$>$l$N$H$-$K?R$M$^$9!#(B
 
 @item gnus-uu-ignore-files-by-name
 @vindex gnus-uu-ignore-files-by-name
-$B$3$N@55,I=8=$K9gCW$9$kL>A0$N%U%!%$%k$O1\Mw$5$l$^$;$s!#(B
+$B$3$N@55,I=8=$K9gCW$9$kL>A0$N%U%!%$%k$OI=<($5$l$^$;$s!#(B
 
 @item gnus-uu-ignore-files-by-type
 @vindex gnus-uu-ignore-files-by-type
-$B$3$NJQ?t$K9gCW$9$k(B @acronym{MIME} $B$N7?$r;}$D%U%!%$%k$O1\Mw$5$l$^$;$s!#(B
-gnus $B$O%U%!%$%kL>$K4p$E$$$F7?$r?dB,$7$F$$$k;v$KCm0U$7$F$/$@$5$$!#(B
-@code{gnus-uu} $B$O(B ($B$^$@(B) @acronym{MIME} $B%Q%C%1!<%8$G$O$"$j$^$;$s$N$G!"$3(B
-$B$l$O>/$7JQ$G$9!#(B
+$B$3$NJQ?t$K9gCW$9$k(B @acronym{MIME} $B$N7?$r;}$D%U%!%$%k$OI=<($5$l$^$;$s!#(B
+gnus $B$O%U%!%$%kL>$K4p$E$$$F7?$r?dB,$7$F$$$k$3$H$KCm0U$7$F2<$5$$!#(B
+@code{gnus-uu} $B$O(B ($B$^$@(B) @acronym{MIME} $B%Q%C%1!<%8$G$O$J$$$N$G!"$3$l$O>/!9(B
+$B$*9T57$,0-$$$b$N$G$9!#(B
 
 @item gnus-uu-tmp-dir
 @vindex gnus-uu-tmp-dir
@@ -7605,57 +7776,56 @@ gnus $B$O%U%!%$%kL>$K4p$E$$$F7?$r?dB,$7$F$$$k;v$KCm0U$7$F$/$@$5$$!#(B
 
 @item gnus-uu-do-not-unpack-archives
 @vindex gnus-uu-do-not-unpack-archives
-@code{nil} $B$G$J$$$N$O!"(B@code{gnus-uu} $B$OI=<($9$k$?$a$N%U%!%$%k$rC5$9$?$a(B
-$B$K%"!<%+%$%V$NCf$^$G$OF~$C$F$$$+$J$$$H$$$&;v$G$9!#(B
+@code{nil} $B$G$J$$$H!"(B@code{gnus-uu} $B$OI=<($9$k$?$a$N%U%!%$%k$rC5$9$?$a$K(B
+$B%"!<%+%$%V$NCf?H$^$G$O8+$^$;$s!#(B
 
 @item gnus-uu-view-and-save
 @vindex gnus-uu-view-and-save
-@code{nil} $B$G$J$$$N$O!"MxMQo$KJ]B8$9$k$+$I$&(B
-$B$+$r?R$M$i$l$k$H$$$&;v$G$9!#(B
+@code{nil} $B$G$J$$$H!"MxMQo$KJ]B8$9$k$+$I$&$+(B
+$B$r?R$M$i$l$^$9!#(B
 
 @item gnus-uu-ignore-default-view-rules
 @vindex gnus-uu-ignore-default-view-rules
-@code{nil} $B$G$J$$$N$O!"(B@code{gnus-uu} $B$O%G%#%U%)%k%H$N1\Mw5,B'$rL5;k$9$k(B
-$B$H$$$&;v$G$9!#(B
+@code{nil} $B$G$J$$$H!"(B@code{gnus-uu} $B$O%G%#%U%)%k%H$NI=<(5,B'$rL5;k$7$^$9!#(B
 
 @item gnus-uu-ignore-default-archive-rules
 @vindex gnus-uu-ignore-default-archive-rules
-@code{nil} $B$G$J$$$N$O!"(B@code{gnus-uu} $B$O%G%#%U%)%k%H$N%"!<%+%$%VE83+L?Na(B
-$B$rL5;k$9$k$H$$$&;v$G$9!#(B
+@code{nil} $B$G$J$$$H!"(B@code{gnus-uu} $B$O%G%#%U%)%k%H$N%"!<%+%$%VE83+L?Na$r(B
+$BL5;k$7$^$9!#(B
 
 @item gnus-uu-kill-carriage-return
 @vindex gnus-uu-kill-carriage-return
-@code{nil} $B$G$J$$$N$O!"(B@code{gnus-uu} $B$O5-;v$+$i$9$Y$F$N%-%c%j%C%8%j%?!<(B
-$B%s(B (carriage return) $B$r$K4p$E$$$?(B @acronym{MIME} $BFbMF$N7?$K$K4p$E$$$?(B @acronym{MIME} Content-Type $B$r$G$C$A$"$2$^$9!#(B
+$B$=$N7k2L$OI=<($N$?$a$K(B @code{metamail} $B$K$+$1$i$l$^$9!#(B
 
 @item gnus-uu-save-in-digest
 @vindex gnus-uu-save-in-digest
-@code{nil} $B$G$J$$$N$O!"(B@code{gnus-uu} $B$,I|9f2=$r$7$J$$$GJ]B8$r$9$k$h$&$K(B
-$B8@$o$l$?$H$-$K!"MWLs$rJ]B8$9$k$H$$$&;v$G$9!#$3$NJQ?t$,(B @code{nil} $B$G$"$k(B
-$B$H!"(B@code{gnus-uu} $B$O2?$b>~$j$r$7$J$$$GA4$F$r%U%!%$%k$KJ]B8$7$^$9!#MWLs(B
-$B$O(B RFC1153 $B=`$8$F$$$^$9!=!=0UL#$N$"$kNL$r;XDj$7$F!"HV9f$rH/9T$9$k4JC1$J(B
-$BJ}K!$,8+$D$+$i$J$+$C$?$N$G!"C1=c$K$=$l$i$O@Z$jMn$H$7$F$$$^$9!#(B
+@code{nil} $B$G$J$$$H!"%G%3!<%I$;$:$KJ]B8$9$k$3$H$r;X<($5$l$?$H$-$K!"(B
+@code{gnus-uu} $B$OMWLs(B (digest) $B$rJ]B8$7$^$9!#$3$NJQ?t$,(B @code{nil} $B$G$"(B
+$B$k$H!"(B@code{gnus-uu} $B$O2?$b2C9)$r;\$5$:$K$9$Y$F$r0l$D$N%U%!%$%k$KJ]B8$7(B
+$B$^$9!#MWLs$N:n@.$O35$M(B RFC1153 $B$K=`5r$7$F$$$^$9$,!"0UL#$N$"$kL\$K4p$E$$$F7?$r?dB,$7$F$$$k;v$KCm0U$7$F$/$@$5$$!#(B
 @table @code
 @item gnus-uu-post-include-before-composing
 @vindex gnus-uu-post-include-before-composing
-@code{nil} $B$G$J$$$N$O!"(B@code{gnus-uu} $B$,5-;v$r:n@.$9$kA0$KId9f2=$9$k%U%!(B
-$B%$%k$r?R$M$k$H$$$&;v$G$9!#$3$NJQ?t$,(B @code{t} $B$G$"$k$H!"(B@kbd{C-c C-i} $B$K(B
-$B$h$C$FId9f2=$5$l$?%U%!%$%k$r$NI|9fAuCV$,B8:_$7$J$$$+$i$G$9!#(B($B$(!<$H!";d$O$=$l$r$9(B
-$B$k0l$D$N%Q%C%1!<%8$r8+$?;v$,$"$j$^$9!=!=(B@code{gnus-uu} $B$G$9!#$7$+$7$J$<(B
-$B$+!"$=$l$,?t$N$&$A$KF~$k$H$O;W$($J$$$N$G$9(B@dots{}) $B%G%#%U%)%k%H(B
+@code{nil} $B$G$J$$$H!"(B@code{gnus-uu} $B$O%(%s%3!<%I$5$l$?%U%!%$%k$r%9%l%C%I(B
+$B$GEj9F$7$^$9!#$3$l$O$"$^$j8-$$J}K!$G$O$J$$$+$b$7$l$^$;$s!#$H$$$&$N$O!":#(B
+$B$^$G;d$,8+$?Cf$G(B uuencode $B$5$l$?5-;v$r=8$a$k$N$K!"%9%l%C%I$rDI$C$F$$$/$3(B
+$B$H$N$G$-$kB>$N%G%3!<%@!<$,B8:_$7$J$$$+$i$G$9!#(B($B$(!<$H!";d$O$=$l$r$9$k0l(B
+$B$D$N%Q%C%1!<%8$r8+$?$3$H$,$"$j$^$9(B---@code{gnus-uu} $B$G$9!#$7$+$7$I$&$b!"(B
+$B$=$l$,?t$N$&$A$KF~$k$H$O;W$($J$$$N$G$9(B@dots{}) $B%G%#%U%)%k%H(B
 $B$O(B @code{nil} $B$G$9!#(B
 
 @item gnus-uu-post-separate-description
 @vindex gnus-uu-post-separate-description
-@code{nil} $B$G$J$$$N$O!"5-=R$OJL$N5-;v$GEj9F$5$l$k$H$$$&;v$G$9!#:G=i$N5-(B
-$B;v$OIaDL$O(B (0/x) $B$N$h$&$KHV9f$,IU$1$i$l$^$9!#$b$7$3$NJQ?t(B
-$B$,(B @code{nil} $B$G$"$k$H!"MxMQl9g!"(Bgnus $B$O%"!<%+%$%V(B
-$B$rE83+$7$h$&$H;n$_!"%"!<%+%$%V$NCf$K1\Mw$G$-$k%U%!%$%k$,$"$k$+$rD4$Y$^$9!#(B
-$BNc$($P!"(Bgzip $B$5$l$?(B tar $B%U%!%$%k(B @file{pics.tar.gz} $B$,$"$C$F!"%U%!%$(B
-$B%k(B @file{pic1.jpg} $B$H(B @file{pic2.gif} $B$r4^$s$G$$$k>l9g!"(Bgnus $B$O$l$NCj=P$5$l$?5-;v$4$H$K(B@dfn{$B5?;w5-;v(B}$B$r35N,(B
-$B%P%C%U%!$KA^F~$7$^$9!#$3$l$i$N!X5-;v!Y$K0\F0$7$?>l9g$O!"l9g!"(Bgnus $B$O%"!<%+%$(B
+$B%V$rE83+$7$h$&$H;n$_!"%"!<%+%$%V$NCf$KI=<($G$-$k%U%!%$%k$,$"$k$+$I$&$+$r(B
+$BD4$Y$^$9!#Nc$($P!"(Bgzip $B$5$l$?(B tar $B%U%!%$%k(B @file{pics.tar.gz} $B$,$"$C$F!"(B
+$B%U%!%$%k(B @file{pic1.jpg} $B$H(B @file{pic2.gif} $B$r4^$s$G$$$k>l9g!"(Bgnus $B$O$l$NCj=P$5$l$?5-;v$4$H$K!V5?;w5-;v!W$r35N,%P%C(B
+$B%U%!!<$KA^F~$7$^$9!#$3$l$i$N!X5-;v!Y$K0\F0$7$?>l9g$O!"$l$N%U%!%$%k$KBP$7$F:n@.$5$l$^$9!#(B@code{nil} $B$G$"$k(B
-$B$H!"F1$81\MwL?Na$r;H$&$9$Y$F$NL?Na$,$=$NL?Na$N0z?t$N%j%9%H$H$7$FEO$5$l$^(B
-$B$9!#(B
+@code{gnus-view-pseudos-separately} $B$,(B @code{nil} $B$G$J$$$H!"I=<($5$l$k$=(B
+$B$l$>$l$N%U%!%$%k$K$D$-0l$D$N5?;w5-;v$,:n@.$5$l$^$9!#(B@code{nil} $B$G$"$k$H!"(B
+$BF1$8I=<(L?Na$r;H$&$9$Y$F$NL?Na$,$=$NL?Na$N0z?t$N%j%9%H$H$7$FEO$5$l$^$9!#(B
 
 @vindex gnus-insert-pseudo-articles
-@code{gnus-insert-pseudo-articles} $B$,(B @code{nil} $B$G$J$$$H!"I|9f2=$N$H$-(B
-$B$K5?;w5-;v$rA^F~$7$^$9!#%G%#%U%)%k%H$G$O(B @code{t}$B$G$9!#(B
+@code{gnus-insert-pseudo-articles} $B$,(B @code{nil} $B$G$J$$$H!"%G%3!<%I$N$H(B
+$B$-$K5?;w5-;v$rA^F~$7$^$9!#%G%#%U%)%k%H$G$O(B @code{t} $B$G$9!#(B
 
-$B$=$l$G!"$=$N$h$&$J46$8$G$9!#(B@emph{$BA[%5!<%P!<(B} $B$N(B @emph{$B2>A[%0%k!<%W(B} $B$K(B
+$B$"$k(B @emph{$B5?;w5-;v(B} $B$rFI$`$3$H$K$J$k$o$1$G$9!#$I$&$7$F$9$Y$F$,8=o$K6lpJs$O>C$75n$j$?$$$H$b;W$&(B
 * Article Washing::             $B?M@8$r$b$C$H$h$/$9$k$?$/$5$s$N5$$NMx$$$?4X?t(B
@@ -7761,86 +7930,84 @@ gnus $B$O%U%!%$%kL>$K4p$E$$$F7?$r?dB,$7$F$$$k;v$KCm0U$7$F$/$@$5$$!#(B
 @subsection $B5-;v$N%O%$%i%$%H(B
 @cindex highlighting
 
-$B5-;v%P%C%U%!$r2LJ*%5%i%@$N$h$&$K$7$?$$$@$1$G$J$/!"2Z$d$+$J2LJ*%5%i%@$N$h(B
-$B$&$K8+$($k$h$&$K$7$?$$$G$7$g$&!#(B
+$B5-;v%P%C%U%!!<$r%U%k!<%D%5%i%@$N$h$&$K!"$$$dAmE7A3?'$N%U%k!<%D%5%i%@$N$h(B
+$B$&$K$7$?$/$"$j$^$;$s$+!#(B
 
 @table @kbd
 @item W H a
 @kindex W H a ($B35N,(B)
 @findex gnus-article-highlight
 @findex gnus-article-maybe-highlight
-$B8=:_$N5-;v$r$b$C$H%O%$%i%$%H(B (highlight) $B$7$^$9!#$3$N4X?t$O!"%X%C%@!$r%O%$%i%$%H$7!"K\BN(B (body) $B$HF,(B (head) $B$K%\%?%s$r2C$($^$9!#(B
+$B8=:_$N5-;v$r$b$C$H%O%$%i%$%H$7$^$9!#$3$N4X?t$O!"%X%C%@!$r(B
+$B%O%$%i%$%H$7!"K\J8$H%X%C%@!<$K%\%?%s$r2C$($^$9!#(B
 
 @item W H h
 @kindex W H h ($B35N,(B)
 @findex gnus-article-highlight-headers
 @vindex gnus-header-face-alist
 $B%X%C%@!<$r%O%$%i%$%H$7$^$9(B (@code{gnus-article-highlight-headers})$B!#%O%$(B
-$B%i%$%H$OJQ?t(B @code{gnus-header-face-alist} $B$K$7$?$,$C$F$J$5$l!"$=$l$O$=(B
-$B$l$>$l$NMWAG$,(B @code{(@var{$B@55,I=8=(B} @var{$BL>A0(B} @var{$BFbMF(B})} $B$H$$$&MM<0(B
-$B$N%j%9%H$G$9!#(B
-@var{$B@55,I=8=(B}$B$O%X%C%@!<$K9gCW$9$k@55,I=8=!"(B@var{$BL>A0(B}$B$O%X%C%@!<$NL>A0$r(B
-$B%O%$%i%$%H$9$k$N$K;H$o$l$k%U%'%$%9(B (face) (@pxref{Faces and Fonts})$B!"(B
-@var{$BFbMF(B}$B$O%X%C%@!<$NCM$r%O%$%i%$%H$9$k%U%'%$%9$G$9!#:G=i$K9gCW$7$?$b$N(B
-$B$,;H$o$l$^$9!#(B@var{$B@55,I=8=(B}$B$O(B @samp{^} $B$,IU$1$i$l$k$Y$-$G$O$J$$;v$KCm0U(B
-$B$7$F$/$@$5$$!=!=(Bgnus $B$,$=$l$rIU$12C$($^$9!#(B
+$B%i%$%H$OJQ?t(B @code{gnus-header-face-alist} $B$K=>$C$F9T$J$o$l!"$=$l$O$=$l(B
+$B$>$l$NMWAG$,(B @code{(@var{$B@55,I=8=(B} @var{$BL>A0(B} @var{$BFbMF(B})} $B$H$$$&MM<0$N(B
+$B%j%9%H$G$9!#(B@var{$B@55,I=8=(B} $B$O%X%C%@!<$K9gCW$9$k@55,I=8=!"(B@var{$BL>A0(B} $B$O%X%C(B
+$B%@!<$NL>A0$r%O%$%i%$%H$9$k$N$K;H$o$l$k%U%'!<%9(B (@pxref{Faces and Fonts})$B!"(B
+@var{$BFbMF(B} $B$O%X%C%@!<$NCM$r%O%$%i%$%H$9$k%U%'!<%9$G$9!#:G=i$K9gCW$7$?$b(B
+$B$N$,;H$o$l$^$9!#(B@var{$B@55,I=8=(B} $B$N@hF,$K(B @samp{^} $B$rIU$1$F$O$$$1$J$$$3$H(B
+$B$KCm0U$7$F2<$5$$(B---gnus $B$,$=$l$rIU$12C$($^$9!#(B
 
 @item W H c
 @kindex W H c ($B35N,(B)
 @findex gnus-article-highlight-citation
 $B0zMQ$5$l$?J8$r%O%$%i%$%H$7$^$9(B (@code{gnus-article-highlight-citation})$B!#(B
 
-$B0zMQ%O%$%i%$%H$r%+%9%?%^%$%:$9$k$$$/$D$+$NJQ?t$O(B:
+$B0zMQJ8$N%O%$%i%$%H$r%+%9%?%^%$%:$9$kJQ?t$O(B
-$B$l$N5-;v$+$i$N0zMQ$r$=$lMQ$N%U%'%$%9$GI=<($7$h$&$H$7$^$9!#$3$l$K$h$j!"C/(B
-$B$,2?$r=q$$$?$+$,J,$+$j$d$9$/$J$k$G$7$g$&!#(B
+$B0zMQJ8$r%O%$%i%$%H$9$k$?$a$K;H$o$l$k%U%'!<%9$N%j%9%H$G$9(B (@pxref{Faces
+and Fonts})$B!#F1$8%a%C%;!<%8$NCf$KJ#?t$N5-;v$+$i$N0zMQ$,$"$k$H!"(Bgnus $B$O$=(B
+$B$l$>$l$N5-;v$+$i$N0zMQ$r$=$lMQ$N%U%'!<%9$GI=<($7$h$&$H$7$^$9!#$3$l$K$h$j!"(B
+$BC/$,2?$r=q$$$?$+$,J,$+$j$d$9$/$J$k$G$7$g$&!#(B
 
 @item gnus-supercite-regexp
 @vindex gnus-supercite-regexp
-$BIaDL$N(B Supercite $BB0@-9T$K9gCW$9$k@55,I=8=$G$9!#(B
+$BIaDL$N(B Supercite $BCx.$NF10l@\F,8l$G$9!#(B
+$B$=$l$,0zMQJ8$G$"$k$HH=Dj$9$kA0$KD4$Y$J$1$l$P$J$i$J$$0zMQId$N:G>.$N?t$G$9!#(B
 
 @item gnus-cite-attribution-prefix
 @vindex gnus-cite-attribution-prefix
-$BB0@-9T$N;O$^$j$K9gCW$9$k@55,I=8=$G$9!#(B
+$BCxFrom } $B$G;O$^$k9T$G0zMQ%O%$%i%$%H$O9T$o$l(B
-$B$^$;$s!#$=$l$i$N9T$O!"%(%s%Y%m!<%W(B From $B9T$H:.F1$7$J$$$h$&$K!"(BMTA $B$,%/%*!<(B
-$B%H$7$?2DG=@-$,$"$j$^$9!#%G%#%U%)%k%HCM$O(B @code{t} $B$G$9!#(B
+$BHs(B-@code{nil} $B$@$C$?$i!"(B@samp{>From } $B$G;O$^$k9T$G0zMQJ8$N%O%$%i%$%H$O9T(B
+$B$J$o$l$^$;$s!#$=$l$i$N9T$O!"%(%s%Y%m!<%W(B From $B9T$H:.F1$7$J$$$h$&$K!"(B
+MTA $B$,%/%*!<%H$7$?2DG=@-$,$"$j$^$9!#%G%#%U%)%k%HCM$O(B @code{t} $B$G$9!#(B
 @end table
 
 @item W H s
@@ -7850,32 +8017,35 @@ Fonts})$B!#F1$8%a%C%;!<%8$NCf$KJ#?t$N5-;v$+$i$N0zMQ$,$"$k$H!"(Bgnus $B$O$=$l$
 @findex gnus-article-highlight-signature
 $B=pL>(B (signature) $B$r%O%$%i%$%H$7$^(B
 $B$9(B (@code{gnus-article-highlight-signature})$B!#(B
-@code{gnus-signature-separator} (@pxref{Article Signature}) $B$N8e$NA4$F$N(B
-$B$b$N$O=pL>$H9M$($i$l!"(B@code{gnus-signature-face} $B$G%O%$%i%$%H$5$l$^$9!#(B
-$B$=$l$O%G%#%U%)%k%H$G$O(B @code{italic} $B$G$9!#5-;v$r<+F0E*$K%O%$%i%$%H$9$k(B
-$BJ}K!$K$D$$$F$O(B @xref{Customizing Articles} $B$r;2>H$7$F2<$5$$!#(B
+@code{gnus-signature-separator} (@pxref{Article Signature}) $B$N8e$N$9$Y$F(B
+$B$N$b$N$O=pL>$G$"$k$H2rH$7$F2<$5$$!#(B
+
 @node Article Fontisizing
-@subsection $B5-;v$N%U%)%s%HJQ99(B
+@subsection $B5-;vCf$NJ8$N6/D4I=<((B
 @cindex emphasis
 @cindex article emphasis
 
-@cindex gnus-article-emphasize
+($BLuCm(B: Fontisize == Fontify + Emphasize)
+
+@findex gnus-article-emphasize
 @kindex W e ($B35N,(B)
 $B?M!9$O$h$/%K%e!<%9$N5-;v$G(B @samp{_$B$3$l(B_} $B$d(B @samp{*$B$3$l(B*} $B$^$?(B
-$B$O(B @samp{/$B$3$l(B/} $B$N$h$&$J$b$N$r;H$C$FC18l$r6/D4$7$^$9!#(BGnus $B$O5-;v$rL?(B
-$BNa(B @kbd{W e} (@code{gnus-article-emphasize}) $B$K$+$1$k;v$K$h$C$FAGE($K8+(B
-$B$($k$h$&$K$G$-$^$9!#(B
+$B$O(B @samp{/$B$3$l(B/} $B$N$h$&$J$b$N$r;H$C$FC18l$r6/D4$7$^$9!#(Bgnus $B$O5-;v(B
+$B$r(B @kbd{W e} $BL?Na(B (@code{gnus-article-emphasize}) $B$K$+$1$k$3$H$K$h$C$FAG(B
+$BE($K8+$($k$h$&$K$G$-$^$9!#(B
 
 @vindex gnus-emphasis-alist
-$B6/D4$,$I$N$h$&$K1i;;$5$l$k$+$OJQ?t(B @code{gnus-emphasis-alist} $B$K$h$C$F@)(B
-$B8f$5$l$^$9!#$3$l$O:G=i$NMWAG$,9gCW$9$k$Y$-@55,I=8=$G$"$kO"A[%j%9%H$G$9!#(B
-$BFsHVL\$NMWAG$O$I$N@55,I=8=$N%0%k!<%W$,6/D48lA4BN$r8+$D$1$k$?$a$K;H$o$l$k(B
-$B$+$r<($9?t;z$G$9!#;0HVL\$O$I$N@55,I=8=$N%0%k!<%W$,I=<($5$l%O%$%i%$%H$5$l(B
-$B$k$+$r7h$a$k?t;z$G$9!#(B
-($B$3$NFs$D$N%0%k!<%W$N4V$N5-;v$O1#$5$l$^$9!#(B) $B;MHVL\$O%O%$%i%$%H$N%U%'%$(B
-$B%9$G$9!#(B
+$B6/D4$,$I$N$h$&$K=hM}$5$l$k$+$OJQ?t(B @code{gnus-emphasis-alist} $B$K$h$C$F@)(B
+$B8f$5$l$^$9!#$3$l$OO"A[%j%9%H$G!":G=i$NMWAG$O9gCW$9$k$Y$-@55,I=8=$G$9!#Fs(B
+$BHVL\$NMWAG$O!"@55,I=8=$NCf$N$I$N%0%k!<%W$,6/D48lA4BN$r8+$D$1$k$?$a$K;H$o(B
+$B$l$k$+$r<($9?tCM$G$9!#;0HVL\$O@55,I=8=$N$I$N%0%k!<%W$,I=<($5$l%O%$%i%$%H(B
+$B$5$l$k$+$r7h$a$k?tCM$G$9!#(B($B$3$NFs$D$N%0%k!<%W$N4V$K$"$k%F%-%9%H$O1#$5$l(B
+$B$^$9!#(B) $B;MHVL\$O%O%$%i%$%H$5$;$k$?$a$N$N%U%'!<%9$G$9!#(B
 
 @lisp
 (setq gnus-emphasis-alist
@@ -7883,6 +8053,8 @@ Fonts})$B!#F1$8%a%C%;!<%8$NCf$KJ#?t$N5-;v$+$i$N0zMQ$,$"$k$H!"(Bgnus $B$O$=$l$
         ("\\*\\(\\w+\\)\\*" 0 1 gnus-emphasis-bold)))
 @end lisp
 
+($BLuCm(B: $B>e5-$NJQ?t$NCM$O!"%G%#%U%)%k%H$N$^$^$K$7$F$*$/$N$,L5Fq$G$9!#(B)
+
 @cindex slash
 @cindex asterisk
 @cindex underline
@@ -7896,17 +8068,17 @@ Fonts})$B!#F1$8%a%C%;!<%8$NCf$KJ#?t$N5-;v$+$i$N0zMQ$,$"$k$H!"(Bgnus $B$O$=$l$
 @vindex gnus-emphasis-underline-italic
 @vindex gnus-emphasis-bold-italic
 @vindex gnus-emphasis-underline-bold-italic
-$B=i4|@_Dj$G$O<7$D$N5,B'$,$"$j!"$=$l$i$O0J2<$N%U%'%$%9$rMQ$$$^(B
-$B$9(B: @code{gnus-emphasis-bold}, @code{gnus-emphasis-italic},
+$B%G%#%U%)%k%H$G$O<7$D$N5,B'$,$"$j!"$=$l$i$O0J2<$N%U%'!<%9$rMQ$$$^$9(B:@*
+@code{gnus-emphasis-bold}, @code{gnus-emphasis-italic},
 @code{gnus-emphasis-underline}, @code{gnus-emphasis-bold-italic},
 @code{gnus-emphasis-underline-italic},
 @code{gnus-emphasis-underline-bold},
 @code{gnus-emphasis-underline-bold-italic}$B!#(B
 
-$B$3$l$i$N%U%'%$%9$rJQ99$7$?$$$N$G$"$l$P!"(B
-@kbd{M-x customize} $B$+(B @code{copy-face} $B$r;H$&;v$,$G$-$^$9!#Nc$($P!"(B
-@code{gnus-emphasis-italic} $B$KBe$o$j$K@V$N%U%'%$%9$r;H$&$h$&$K$7$?$$$H$-(B
-$B$O!"H$7$F2<$5$$!#(B
+$B5-;v$r<+F0E*$K6/D4I=<($5$;$k$d$jJ}$K$D$$$F(B
+$B$O(B @ref{Customizing Articles} $B$r;2>H$7$F2<$5$$!#(B
 
 @node Article Hiding
 @subsection $B5-;v$r1#$9(B
 @cindex article hiding
 
-$B$b$7$/$O!"$=$l$>$l$N5-;v$NFCDj$N$b$N$r1#$7$?$$$+$b$7$l$^$;$s!#$?$$$F$$$N(B
-$B5-;v$K$OIaDL$O$"$j$9$.$k$/$i$$:n$j$+$($k$b$N$,$"$j$^$9!#(B
+$B$H8@$&$h$j$O$`$7$m!"5-;v$NCf$K$"$kFCDj$N$b$N$r1#$9$3$H$G$9!#$?$$$F$$$N5-(B
+$B;v$K$O!"IaDL$O$"$j$9$.$k$/$i$$$N$4$_$,$"$j$^$9!#(B
 
 @table @kbd
 @item W W a
 @kindex W W a ($B35N,(B)
 @findex gnus-article-hide
-$B5-;v%P%C%U%!$G$?$/$5$s$N1#F?$r$7$^$9(B (@kbd{gnus-article-hide})$B!#FC$K!"$3(B
-$B$N4X?t$O%X%C%@!$r1#$7$^$9!#(B
+$B5-;v%P%C%U%!!<$G$?$/$5$s$N$b$N$r1#$7$^$9(B (@kbd{gnus-article-hide})$B!#FC$K(B
+$B$3$N4X?t$O%X%C%@!$r1#$7$^$9!#(B
 
 @item W W h
 @kindex W W h ($B35N,(B)
@@ -7944,7 +8117,7 @@ Fonts})$B!#F1$8%a%C%;!<%8$NCf$KJ#?t$N5-;v$+$i$N0zMQ$,$"$k$H!"(Bgnus $B$O$=$l$
 @item W W b
 @kindex W W b ($B35N,(B)
 @findex gnus-article-hide-boring-headers
-$B$"$^$j6=L#$N$b$F$J$$%X%C%@!<$r1#$7$^(B
+$B$"$^$j6=L#$N;}$F$J$$%X%C%@!<$r1#$7$^(B
 $B$9(B (@code{gnus-article-hide-boring-headers})$B!#(B@xref{Hiding Headers}.
 
 @item W W s
@@ -7958,24 +8131,24 @@ Fonts})$B!#F1$8%a%C%;!<%8$NCf$KJ#?t$N5-;v$+$i$N0zMQ$,$"$k$H!"(Bgnus $B$O$=$l$
 @findex gnus-article-hide-list-identifiers
 @vindex gnus-list-identifiers
 @code{gnus-list-identifiers} $B$G;XDj$5$l$F$$$k%a!<%j%s%0%j%9%H$NI8<1$r:o(B
-$B=|$7$^$9!#$3$l$i$O$$$/$D$+$N%a!<%j%s%0%j%9%H$N%5!<%P!<$,A4$F(B
-$B$N(B @code{Subject} $B%X%C%@!<$N:G=i$K$D$1$kJ8;zNs$G$9(B---$BNc$($P!"(B
-@samp{[zebra 4711]}$B!#J8;zNs$N=i$a$K$"$k(B @samp{Re: } $B$O!":o=|$r9T$J$&A0$K(B
-$BD7$S1[$5$l$^$9!#(B@code{gnus-list-identifiers} $B$K(B @code{\\(..\\)} $B$r4^$a$F(B
-$B$O$$$1$^$;$s!#(B
+$B=|$7$^$9!#$3$l$i$O$$$/$D$+$N%a!<%j%s%0%j%9%H$N%5!<%P!<$,$9$Y$F(B
+$B$N(B @code{Subject} $B%X%C%@!<$N:G=i$KIU$1$kJ8;zNs!"Nc$((B
+$B$P(B @samp{[zebra 4711]} $B$N$h$&$J$b$N$G$9!#J8;zNs$N=i$a$K$"(B
+$B$k(B @samp{Re: } $B$O!":o=|$r9T$J$&A0$KD7$S1[$5$l$^$9!#(B
+@code{gnus-list-identifiers} $B$K(B @code{\\(..\\)} $B$r4^$a$F$O$$$1$^$;$s!#(B
 
 @table @code
 @item gnus-list-identifiers
 @vindex gnus-list-identifiers
-$BI=Bj$+$i:o=|$5$l$k$Y$-I8<1$N%j%9%H$K9gCW$9$k@55,I=8=$G$9!#$3$l$O@55,I=8=(B
-$B$N%j%9%H$G$"$k$3$H$b$G$-$^$9!#(B
+$BI=Bj$+$i:o=|$5$l$k$Y$-%a!<%j%s%0%j%9%H$NI8<1$K9gCW$9$k@55,I=8=$G$9!#$3$l(B
+$B$O@55,I=8=$N%j%9%H$G$"$k$3$H$b$G$-$^$9!#(B
 @end table
 
 @item W W P
 @kindex W W P ($B35N,(B)
 @findex gnus-article-hide-pem
-@acronym{PEM} (privacy enhanced messages ($B%W%i%$%P%7!<3HD%%a%C%;!<(B
-$B%8(B)) $BItJ,$r1#$7$^$9(B (@code{gnus-article-hide-pem})$B!#(B
+$BITMW$J(B @acronym{PEM} (privacy enhanced messages ($B%W%i%$%P%7!<3HD%%a%C%;!<(B
+$B%8(B)) $B$NItJ,$r1#$7$^$9(B (@code{gnus-article-hide-pem})$B!#(B
 
 @item W W B
 @kindex W W B ($B35N,(B)
@@ -7986,32 +8159,32 @@ Fonts})$B!#F1$8%a%C%;!<%8$NCf$KJ#?t$N5-;v$+$i$N0zMQ$,$"$k$H!"(Bgnus $B$O$=$l$
 @cindex OneList
 @cindex stripping advertisements
 @cindex advertisements
-@code{banner} $B%0%k!<%W%Q%i%a!<%?$G;XDj$5$l$?%P%J!<$r$r1#$9$?$a$K;HMQ$5$l$^$9!#$3$N4X?t$r;H$&J}K!(B
-$B$O(B @code{banner} $B%0%k!<%W%Q%i%a!<%?(B (@pxref{Group Parameters}) $B$r%P%J!<(B
-$B$rC5n$5$l$k%F%-%9%H$K9g(B
-$BCW$9$k@55,I=8=$H$7$F2r$,>C5n$5$l$k$H$$$&(B
-$B0UL#$G$"$k%7%s%\%k(B @code{signature} $B$^$?(B
-$B$O(B @code{gnus-article-banner-alist} $B$N@55,I=8=$KBP1~$7$?%7%s%\%k$G$"$k$3(B
-$B$H$,$G$-$^$9!#(B
+$B%j%9%H$d;J2q$r1#$9$?$a$K;HMQ$5$l$^$9!#$3$N4X?t$r;H$&J}K!(B
+$B$O(B @code{banner} $B%0%k!<%W%Q%i%a!<%?!<(B (@pxref{Group Parameters}) $B$r%P%J!<(B
+$B$rC5n$5$l$k%F%-(B
+$B%9%H$K9gCW$9$k@55,I=8=$H$7$F2r$r>C5n$9$k(B
+$B$?$a$N%7%s%\%k(B @code{signature}$B!"$^$?(B
+$B$O(B @code{gnus-article-banner-alist} $B$N@55,I=8=$KBP1~$7$?B>$N%7%s%\%k$N$$(B
+$B$:$l$+$G$"$k$3$H$,$G$-$^$9!#(B
 
 $B%0%k!<%W$K$+$+$o$i$:!"5-;v$NAw?.$l$NMWAG(B
 $B$O(B @code{(@var{address} . @var{banner})} $B$N7A<0$r;}$A!"$3$3(B
-$B$G(B @var{address} $B$O(B From $B%X%C%@!<$K$"$k%a!<%k%"%I%l%9$K%^%C%A$9$k@55,I=(B
-$B8=!"(B@var{banner} $B$O%7%s%\%k(B @code{signature}$B!"(B
+$B$G(B @var{address} $B$O(B From $B%X%C%@!<$K$"$k%a!<%k%"%I%l%9$K9gCW$9$k@55,I=8=(B
+$B$G$9!#$^$?!"(B@var{banner} $B$O%7%s%\%k(B @code{signature}$B!"(B
 @code{gnus-article-banner-alist} $B$NMWAG!"@55,I=8=$^$?$O(B @code{nil} $B$N$&(B
-$B$A$N0l$D$G$9!#(B@var{address} $B$,CxC$7$^$9!#Nc$($P!"Aw?.C$7$^$9!#Nc$($P!"Aw?.l9g!"0J2<$NMWAG$G$=$l$i$r>C$9$3$H$,$G$-$^(B
 $B$9!#(B
 
@@ -8023,19 +8196,18 @@ Yoo-hoo!?} $B$N$h$&$J$b$N$,$"$k>l9g!"0J2<$NMWAG$G$=$l$i$r>C$9$3$H$,$G$-$^(B
 @item W W c
 @kindex W W c ($B35N,(B)
 @findex gnus-article-hide-citation
-$B0zMQ$r1#$7$^$9(B (@code{gnus-article-hide-citation})$B!#1#JC$r%+%9%?%^%$%:$9(B
-$B$k$$$/$D$+$NJQ?t$O(B:
+$B0zMQJ8$r1#$7$^$9(B (@code{gnus-article-hide-citation})$B!#1#JC$r%+%9%?%^%$%:(B
+$B$9$k$$$/$D$+$NJQ?t$O(B:
 
 @table @code
-@item gnus-cited-opend-text-button-line-format
+@item gnus-cited-opened-text-button-line-format
 @itemx gnus-cited-closed-text-button-line-format
 @vindex gnus-cited-closed-text-button-line-format
-@vindex gnus-cited-opend-text-button-line-format
-
-Gnus $B$O$I$3$N0zMQJ8$,1#$5$l$F$$$k$+$r<($9$?$a$K%\%?%s$rIU$12C$(!"J8>O$N(B
-$B1#JC$r@Z$jBX$($i$l$k$h$&$K$7$^$9!#$3$NJQ?t$NMM<0$O$3$l$i$N%U%)!<%^%C%H$N(B
+@vindex gnus-cited-opened-text-button-line-format
+gnus $B$O$I$3$N0zMQJ8$,1#$5$l$F$$$k$+$r<($9$?$a$K%\%?%s$rIU$12C$(!"J8>O$N(B
+$B1#JC$r@Z$jBX$($i$l$k$h$&$K$7$^$9!#$3$NJQ?t$NMM<0$O!"0J2<$N%U%)!<%^%C%H$N(B
 $B$h$&$JJQ?t$K$h$C$F;XDj$5$l$^$9(B (@pxref{Formatting Variables})$B!#O$N(B
 
 @item gnus-cited-lines-visible
 @vindex gnus-cited-lines-visible
-$B0zMQJ8$N:G=i$+$i$NI=<($5$l$k9T?t$G$9!#(B
+$B1#$5$:$KI=<($7$F$*$/!"0zMQJ8$N@hF,$+$i$N9T?t$G$9!#$3$l$O!"1#$5$:$KI=<($9(B
+$B$k@hF,$+$i$N9T$H!"1#$5$:$KI=<($9$kKvHx$+$i$N9T$N!"$=$l$>$l$N?t$N(B cons $B%;(B
+$B%k$G$"$k$3$H$b$G$-$^$9!#(B
 @end table
 
-@item W W C
-@kindex W W C ($B35N,(B)
-@findex gnus-article-hide-citation-in-followups
-$B:,K\$G$J$$5-;v$N0zMQJ8$r1#$7$^(B
-$B$9(B (@code{gnus-article-hide-citation-in-followups})$B!#$3$l$OBPOCE*L?Na$H(B
-$B$7$F$O$"$^$jLr$KN)$?$J$$$+$b$7$l$^$;$s$,!"<+F0E*$K5/$3$k/$J$/$H$b$3$ND9$5(B ($B=i4|CM(B 10) $B$G$J$1$l$P$J$j$^$;$s!#(B
+$B1#$5$l$kA0$K!"0zMQJ8$O>/$J$/$H$b$3$ND9$5(B ($B%G%#%U%)%k%H$O(B 10) $B$G$J$1$l$P(B
+$B$J$j$^$;$s!#(B
 @end table
+
+@item W W C
+@kindex W W C ($B35N,(B)
+@findex gnus-article-hide-citation-in-followups
+$B:,K\$G$J$$5-;v$N0zMQJ8$r1#$7$^(B
+$B$9(B (@code{gnus-article-hide-citation-in-followups})$B!#$3$l$OBPOCE*L?Na$H(B
+$B$7$F$O$"$^$jLr$KN)$?$J$$$+$b$7$l$^$;$s$,!"<+F0E*$Ko$K1#$7$^$9!#(B
+$B$3$l$i$N$9$Y$F$N!X1#JC!YL?Na$O@Z$jBX$(L?Na$G$9$,!"$3$l$i$NL?Na$KIi$N@\F,(B
+$B0z?t$rM?$($k$H!"$=$l$i$OA0$K1#$5$l$F$$$?$b$N$rI=<($7$^$9!#@5$N@\F,0z?t$r(B
+$BM?$($l$P!"$=$l$i$O>o$K1#$7$^$9!#(B
 
-$B0zMQ%+%9%?%^%$%:$N$?$a$NB>$NJQ?t$N>pJs$N$?$a(B
-$B$K(B @ref{Article Highlighting} $B$b;2>H$7$F$/$@$5$$!#(B
+$B0zMQJ8$r%+%9%?%^%$%:$9$k$?$a$N$5$i$J$kJQ?t$K$D$$$F!"(B
+@ref{Article Highlighting} $B$b;2>H$7$F2<$5$$!#(B
 
 $B<+F0E*$K5-;v$NMWAG$r1#$9$?$a$NJ}K!$O(B @ref{Customizing Articles} $B$r;2>H(B
 $B$7$F2<$5$$!#(B
 
 @node Article Washing
-@subsection $B5-;v@vBu(B
+@subsection $B5-;v$N@vBu(B
 @cindex washing
 @cindex article washing
 
-$B;d$?$A$O$3$l$r$b$C$H$b$JM}M3$N2<$G!X5-;v@vBu!Y(B(article washing) $B$H8F$s$G(B
-$B$$$^$9!#$9$J$o$A!"%-!<(B @kbd{A} $B$O;H$o$l$F$$$k$N$G!"Be$o$j$K(B
-$B%-!<(B @kbd{W} $B$r;H$&I,MW$,$"$k$N$G$9!#(B
+$B;d$?$A$O$3$l$r$b$C$H$b$JM}M3$N2<$G!X5-;v$N@vBu!Y(B(article washing) $B$H8F$s(B
+$B$G$$$^$9!#(B@kbd{A} $B%-!<$O;H$o$l$F$$$?$N$G!"Be$o$j$K(B @kbd{W} $B%-!<$r;H$&I,(B
+$BMW$,$"$j$^$7$?!#(B
 
-$B;d$?$A$O(B @dfn{$B@vBu(B} $B$r!X2?$+$N2?$+$r2?$+JL$N$b$N$KJQ49$9$k!Y$HDj5A$7$F$$(B
-$B$^$9$,!"IaDL$O$b$C$HNI$/8+$($k2?$+$KMn$ACe$-$^$9!#$=$l$K$b$C$H$-$l$$$G$9!"(B
-$B$?$V$s!#(B
+$B!V@vBu!W$O!X2?$+$N2?$+$r2?$+JL$N$b$N$KJQ49$9$k!Y$HDj5A$5$l$^$9$,!"IaDL$O(B
+$B$b$C$HNI$/8+$($k2?$+$KMn$ACe$-$^$9!#$b$C$H$-$l$$$K$J$j$^$9!"$?$V$s!#(B
 
-gnus $B$,5-;v$rI=<($9$k4{Dj$N$d$jJ}$rJQ$($?$$$H$-(B
+gnus $B$,5-;v$rI=<($9$k%G%#%U%)%k%H$N$d$jJ}$rJQ$($?$$$H$-(B
 $B$O(B @ref{Customizing Articles} $B$r;2>H$7$F2<$5$$!#(B
 
 @table @kbd
 @item C-u g
-$B$3$l$O5-;v@vBu$G$O$J$/$F!"$=$N5U$G$9!#$3$l$r%?%$%W$9$k$H!"%G%#%9%/$d%5!<(B
-$B%P!<$K$"$k$,$^$^$N5-;v$,8+$($^$9!#(B
+$B$3$l$O@vBu$G$O$J$/$F!"$=$N5U$G$9!#$3$l$r%?%$%W$9$k$H!"%G%#%9%/$d%5!<%P!<(B
+$B$K$"$k$,$^$^$N5-;v$,8+$($^$9!#(B
 
 @item g
 $B8=:_$N5-;v$N:FI=<($r6/@)$7$^$9(B (@code{gnus-summary-show-article})$B!#$3$l(B
 $B$b$^$?K\Ev$N@vBu$G$O$"$j$^$;$s!#$3$l$r%?%$%W$9$k$H!"0JA0$KE,MQ$5$l$?BPOC(B
-$BE*$J@vBu5!G=$O$4GK;;$K$5$l!"$9$Y$F$N%G%#%U%)%k%H$N07$$(B (treatments) $B$riCL$J$I$G$9!#(B)
+$B$`$3$H$r;XDj$9$k!"H=FIIT2DG=$J5-;v$G$9(B ($BE57?E*$K$O967bE*$J>iCL$J$I$G$9!#(B)
 
-$BIaDL$O(B ``rot13'' $B$H8F$P$l$F$$$^$9!#$=$l$O%"%k%U%!%Y%C%H$N0LCV$,(B 13 $B8D2s(B
-$BE>$9$k$+$i$G$9!#Nc$($P!"(B@samp{B} (2 $BHVL\$NJ8;z(B) $B"*(B @samp{O} (15 $BHVL\$NJ8(B
-$B;z(B)$B!#$3$l$O;~!9!X%+%(%5%kJQ49!Y$H8F$P$l$k;v$b$"$j$^$9!#$H$$$&$N$O!"%+%((B
-$B%5%k$,$3$N7A<0$N!"$(!<$H!"$A$g$C$H4JC1$J0E9f2=$r:NMQ$7$?$H$$$&1=$,$"$k$+(B
-$B$i$G$9!#(B
+$BIaDL$O!H(Brot13$B!I$H8F$P$l$F$$$^$9!#$=$l$O%"%k%U%!%Y%C%H$N0LCV$,(B 13 $B8D2sE>(B
+$B$9$k$+$i$G$9!#Nc$($P!"(B@samp{B} (2 $BHVL\$NJ8;z(B) $B"*(B @samp{O} (15 $BHVL\$NJ8;z(B)$B!#(B
+$B$3$l$O;~!9!X%+%(%5%kJQ49!Y$H8F$P$l$k$3$H$b$"$j$^$9!#$H$$$&$N$O!"%+%(%5%k(B
+$B$,$3$N7A<0$N!"$(!<$H!"$$$5$5$+IO$O(B @samp{xn--bar} $B$N$h$&$K8+$($^$9!#$3$l(B
 $B$r$O(B @samp{xn--bar} $B$N$h$&$K8+$($^$9!#$3$l
 @findex gnus-article-treat-overstrike
 $B%*!<%P!<%9%H%i%$%/$r=hM}$7$^$9(B (@code{gnus-article-treat-overstrike})$B!#(B
 
+$BLuCm(B: $B0J2<$N$h$&$J=E$MBG$A$r;X<($9$kJ8;zNs$r(B bold $B$d(B underline $B$GI=<($7(B
+$B$^$9!#(B
+
+@samp{B^HBo^Hol^Hld^Hd}, @samp{U^H_n^H_d^H_e^H_r^H_l^H_i^H_n^H_e^H_}
+
 @item W d
 @kindex W d ($B35N,(B)
 @findex gnus-article-treat-dumbquotes
@@ -8187,20 +8366,20 @@ IDNA $B%(%s%3!<%I$5$l$?%I%a%$%sL>$O(B @samp{xn--bar} $B$N$h$&$K8+$($^$9!#$3$l
 @cindex Latin 1
 @code{gnus-article-dumbquotes-map} $B$K1~$8$F!"%^"#"#"#%="#(B
 $B"#(B sm*rtq**t*s $B$r=hM}$7$^$9!#$3$N4X?t$OJ8;z$,(B sm*rtq**t* $B$+$I$&$+$r?dB,(B
-$B$7$^$9$N$G!"BPOCE*$K$N$_;HMQ$5$l$k$Y$-$G$"$k$3$H$KCm0U$7$F$/$@$5$$!#(B
+$B$9$k$N$G!"BPOCE*$K$N$_;HMQ$5$l$k$Y$-$G$"$k$3$H$KCm0U$7$F2<$5$$!#(B
 
 Sm*rtq**t*s $B$O$b$C$HB?$/$N0zMQJ8;z$rDs6!$9$k$?$a$K!"%^"#"#"#%="#"#$,>!!.$*$h$S:GBg$ND9$5$rI=(B
 $B$9(B @code{gnus-outlook-deuglify-unwrap-min} $B$*$h(B
-$B$S(B @code{gnus-outlook-deuglify-unwrap-max} $B$rD4@0$9$k$3$H$K$h$C$F!"$I$N(B
-$B9T$N@^$jJV$7$,2r$+$l$k$+$r@)8f$9$k$3$H$,$G$-$^$9!#(B
+$B$S(B @code{gnus-outlook-deuglify-unwrap-max} $B$rD4@0$9$k$3$H$K$h$C$F!"$I$s(B
+$B$J9T$N@^$jJV$7$,2r$+$l$k$+$r@)8f$9$k$3$H$,$G$-$^$9!#(B
 (@code{gnus-article-outlook-unwrap-lines})$B!#(B
 
 @item W Y a
 @kindex W Y a ($B35N,(B)
 @findex gnus-article-outlook-repair-attribution
-$B2u$l$?B0@-9T$r=$I|$7$^$9!#(B
+$B2u$l$?Cx$9$3$H$K$h$C$F=$I|$7$^$9!#(B
+$B2u$l$?0zMQJ8$r!"%F%-%9%H$r@0M}$7D>$9$3$H$K$h$C$F=$I|$7$^$9!#(B
 (@code{gnus-article-outlook-rearrange-citation})$B!#(B
 
 @item W w
 @kindex W w ($B35N,(B)
 @findex gnus-article-fill-cited-article
-$B8l$N@^$jJV$7$r$7$^$9(B (@code{gnus-article-fill-cited-articles})$B!#(B
+$B9T$r@^$jJV$7$^$9(B (@code{gnus-article-fill-cited-articles})$B!#(B
 
-$B@^$jJV$7$r$9$k$H$-$K!"I}$r;XDj$9$k$?$a$KL?Na$K?tCM@\F,0z?t$rM?$($k;v$,$G(B
-$B$-$^$9!#(B
+$B@^$jJV$9I}$r;XDj$9$k$?$a$K!"L?Na$K?tCM@\F,0z?t$rM?$($k$3$H$,$G$-$^$9!#(B
 
 @item W Q
 @kindex W Q ($B35N,(B)
@@ -8243,25 +8421,26 @@ Sm*rtq**t*s $B$O$b$C$HB?$/$N0zMQJ8;z$rDs6!$9$k$?$a$K!"%^"#"#"#%="#"#$,>!$l$NJ,$N:G=i$N8l$rBgJ8;z$K$7$^(B
+$B$=$l$>$l$NJ8$N:G=i$N8l$rBgJ8;z$K$7$^(B
 $B$9(B (@code{gnus-article-capitalize-sentences})$B!#(B
 
 @item W c
 @kindex W c ($B35N,(B)
 @findex gnus-article-remove-cr
 CRLF $B$NAH(B ($B$9$J$o$A!"9T$N:G8e$N(B @samp{^M}) $B$r(B LF $B$KJQ49$7$^$9(B ($B$3$l(B
-$B$O(B 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$^(B
+$B$O(B DOS $B$N9TKv$N@$OC$r$7$^$9(B)$B!#$=$&$7$F$+$i;D$j$N(B CR $B$r(B LF $B$KJQ49$7$^(B
 $B$9(B ($B$3$l$O(B MAC $B$N9TKv$N@$OC$r$7$^$9(B) (@code{gnus-article-remove-cr})$B!#(B
 
 @ignore
+@item W q
 @kindex W q (Summary)
 @findex gnus-article-de-quoted-unreadable
 Treat quoted-printable (@code{gnus-article-de-quoted-unreadable}).
 Quoted-Printable is one common @acronym{MIME} encoding employed when
 sending non-@acronym{ASCII} (i.e., 8-bit) articles.  It typically
-makes strings like @samp{d,Ai(Bj,A`(B vu} look like @samp{d=E9j=E0 vu}, which
-doesn't look very readable to me.  Note that this is usually done
-automatically by Gnus if the message in question has a
+makes strings like @samp{d@'ej@`a vu} look like @samp{d=E9j=E0 vu},
+which doesn't look very readable to me.  Note that 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.  If a prefix is given, a charset will be asked for.
 
@@ -8306,14 +8485,18 @@ URL $B$K4^$^$l$k2~9T$r:o=|$7$^$9!#$$$/$D$+$N%a%$%i!<$O!"9T$rC;$/$9$k$?$a$K(B
 $B$r<($9(B @code{Content-Type} $B%X%C%@!<$r;}$C$F$$$?$J$i$P!"$=$l$O(B gnus $B$K$h$C(B
 $B$F<+F0E*$K9T$J$o$l$k$3$H$KCm0U$7$F2<$5$$!#(B
 
-$B@\F,<-$,M?$($i$l$k$H!"2?$NJ8;z=89g(B (charset) $B$H$7$F07$&$+$r?R$M$i$l$^$9!#(B
+$B@\F,0z?t$,M?$($i$l$k$H!"J8;z%;%C%H$r?R$M$i$l$^$9!#$=$l$,$b$7?tCM$@$C$?$i!"(B
+@code{gnus-summary-show-article-charset-alist} (@pxref{Paging the
+Article}) $B$GDj5A$5$l$F$$$kJ8;z%;%C%H$,;H$o$l$^$9!#(B($BLuCm(B: $Be$N;0$D$NL?Na$r$9$Y$F9T$$$^$9(B (@code{gnus-article-strip-blank-lines})$B!#(B
+$B>e$N;0$D$NL?Na$r$9$Y$FC5n$7$^(B
+$B5-;v$NK\J8$N$9$Y$F$N9TKv$K$"$k$9$Y$F$N6uGr$rH$7(B
-$B$F2<$5$$!#(B
+$B<+F0E*$K5-;v$N@vBu$r9T$J$o$;$kJ}K!$O(B @ref{Customizing Articles} $B$r;2>H$7(B
+$B$F2<$5$$(B ($BLuCm(B: $B7W$J6uGr$rJ,$J6uGr$r$N$b$N$X$N;2>H$,F~$l$i$l$k;v$,$"$j$^$9!#$=$7$F!"(Bgnus $B$,(B
-$B$=$l$K4X$9$k;v$r!"$=$l$i$N;2>H$N>e$G(B @kbd{RET} $B$rBG$D$+!"%^%&%9$N??Cf$N(B
-$B%\%?%s$r;H$&;v$K$h$C$F!":G>.8B$NEXNO$G$N;qNA$r;2>H$9$k$?$a$N0FFb$rF~$l$k$3$H$,$"$j$^$9$,!"(B
+$B$=$l$i$N;2>H$X$N0FFb$N>e$G(B @kbd{RET} $B$rBG$D$+!"%^%&%9$N??Cf$N%\%?%s$r;H$C(B
+$B$?$H$-$K!"H`$i$,OCBj$K$7$F$$$k$N$,2?$G$"$l!":G>.8B$N[#Kf$5$G(B gnus $B$,H$K(B@dfn{$B%\%?%s(B}$B$rIU$1$^$9(B: $B$A$c$s$H(B
-$B$7$?(B URL$B!"%a!<%k%"%I%l%9!"(BMessage-ID$B!"(BInfo $B$X$N%j%s%/!"(Bman $B%Z!<%8!"$=$l(B
-$B$K4XO"$9$k(B Emacs $B$^$?$O(B Gnus $B$N;29MJ88%$G$9!#$3$l$OFs$D$NJQ?t$K$h$C$F@)(B
-$B8f$5$l$F$$$F!"$=$N0l$D$O5-;v$NK\BN$r07$$!"$b$&0l$D$O5-;v$N%X%C%@!<$r07$$(B
-$B$^$9!#(B
+$BFCDj$NI8=`E*$J;2>H$K!"(Bgnus $B$O%G%#%U%)%k%H$G!V%\%?%s!W$rIU$1$^$9(B: $B$A$c$s(B
+$B$H$7$?(B URL$B!"%a!<%k%"%I%l%9!"(BMessage-ID$B!"(BInfo $B$X$N%j%s%/!"(Bman $B%Z!<%8!"$=(B
+$B$l$K4XO"$9$k(B Emacs $B$^$?$O(B gnus $B$N;29MJ88%$G$9!#$3$l$OFs$D$NJQ?t$K$h$C$F(B
+$B@)8f$5$l$F$$$F!"$=$N0l$D$O5-;v$NK\J8$r07$$!"$b$&0l$D$O5-;v$N%X%C%@!<$r07(B
+$B$$$^$9!#(B
 
 @table @code
 @item gnus-button-alist
 @vindex gnus-button-alist
-$B$=$l$>$l$NF~NOMWAG$,$l$NMWAG$,H$K(B@dfn{$B%\%?%s(B}$B$rIU$1$^$9(B:
 
 @table @var
 @item regexp
-$B$3$N@55,I=8=(B ($BBgJ8;z$H>.J8;z$O6hJL$5$l$J$$(B) $B$K9gCW$9$k$9$Y$F$NJ8$O30It;2(B
-$B>H$G$"$k$H$_$J$5$l$^$9!#$3$l$OKd$a9~$^$l$?(B URL $B$K9gCW$9$kE57?E*$J@55,I=(B
-$B8=$G$9(B @samp{]*\\)>}$B!#$3$l$O$^$?@55,I=8=$NCM$r;}$DJQ?t$G(B
-$B$"$C$F$b$h$/!"M-MQ$JJQ?t$H$7$F(B @code{gnus-button-url-regexp} $B$*$h(B
+$B$3$N@55,I=8=(B ($BBgJ8;z$H>.J8;z$O6hJL$5$l$^$;$s(B) $B$K9gCW$9$k$9$Y$F$N%F%-%9%H(B
+$B$O!"30It$X$N;2>H$G$"$k$H$_$J$5$l$^$9!#$3$l$OKd$a9~$^$l$?(B URL $B$K9gCW$9$k(B
+$BE57?E*$J@55,I=8=$G$9(B: @samp{]*\\)>}$B!#$3$l$O$^$?@55,I=8=$N(B
+$BCM$r;}$DJQ?t$G$"$C$F$b$h$/!"M-MQ$JJQ?t$H$7(B
+$B$F(B @code{gnus-button-url-regexp} $B$*$h(B
 $B$S(B @code{gnus-button-mid-or-mail-regexp} $B$,$"$j$^$9!#(B
 
 @item button-par
-Gnus $B$O9gCW$7$?$b$N$N$I$NItJ,$,%O%$%i%$%H$5$l$k$N$+$rCN$i$J$1$l$P$J$j$^(B
+gnus $B$O9gCW$7$?$b$N$N$I$NItJ,$,%O%$%i%$%H$5$l$k$N$+$rCN$i$J$1$l$P$J$j$^(B
 $B$;$s!#$3$l$O@55,I=8=$N$I$NI{I=8=$,%O%$%i%$%H$5$l$k$+$r;XDj$9$kHV9f$G$9!#(B
-$BA4$F$r%O%$%i%$%H$7$?$$$N$J$i!"$3$3$G(B 0 $B$r;H$C$F$/$@$5$$!#(B
+$B$9$Y$F$r%O%$%i%$%H$7$?$$$N$J$i!"$3$3$G(B 0 $B$r;H$C$F2<$5$$!#(B
 
 @item use-p
-$B$3$N<0$O(B @code{$BI>2A(B} $B$5$l!"7k2L$,(B @code{nil} $B$G$J$1$l$P!"$3$l$O9gCW$G$"(B
-$B$k$H$_$J$5$l$^$9!#$3$l$O4V0c$C$?9gCW$rHr$1$k$?$a$KFCJL$JA*JL$r$7$?$$$H$-(B
-$B$KLr$KN)$A$^$9!#$3$3$G$O$7$P$7$P(B @code{gnus-button-@var{*}-level} $B$N$h$&(B
-$B$JL>A0$NJQ?t$,;H$o$l$^$9$,!"B>$N$I$s$J7A<0$G$b;H$&$3$H$,$G$-$^$9!#(B
-
+$B$3$N<0$O(B @code{$BI>2A(B} $B$5$l!"7k2L$,(B @code{nil} $B$G$J$+$C$?$i!"$3$l$O9gCW$G(B
+$B$"$k$H$_$J$5$l$^$9!#$3$l$O4V0c$C$?9gCW$rHr$1$k$?$a$KFCJL$JA*JL$r$7$?$$$H(B
+$B$-$KLr$KN)$A$^$9!#$3$3$G$O$7$P$7$P(B @code{gnus-button-@var{*}-level} $B$N$h(B
+$B$&$JL>A0$NJQ?t$,;H$o$l$^$9$,!"(B@xref{Article Button Levels}, $BB>$N$I$s$J7A(B
+$B<0$G$b;H$&$3$H$,$G$-$^$9!#(B
+@c
 @c @code{use-p} is @code{eval}ed only if @code{regexp} matches.
 
 @item function
-$B$3$N4X?t(B (function) $B$O$3$N%\%?%s$r%/%j%C%/$7$?$H$-$K8F$P$l$^$9!#(B
+$B$3$N4X?t$,!"$3$N%\%?%s$r%/%j%C%/$7$?$H$-$K8F$P$l$^$9!#(B
 
 @item data-par
 @var{button-par} $B$N$h$&$K!"$3$l$OItJ,I=8=$NHV9f$G$9$,!"$3$l$O9gCW$N$I$N(B
 $BItJ,$,(B @var{function} $B$K%G!<%?$H$7$FAw$i$l$k$+$r;XDj$7$^$9!#(B
 @end table
 
-$B$G$9$+$i!"(BURL $B$r%\%?%s$K$9$k40A4$JF~NOMWAG$O(B
+$B$7$?$,$C$F(B URL $B$r%\%?%s$K$9$k40A4$JMWAG$O!"$3$&$J$j$^$9!#(B
 
 @lisp
 ("]*\\)>" 0 t gnus-button-url 1)
@@ -8509,35 +8698,37 @@ Gnus $B$O9gCW$7$?$b$N$N$I$NItJ,$,%O%$%i%$%H$5$l$k$N$+$rCN$i$J$1$l$P$J$j$^(B
 
 @item gnus-header-button-alist
 @vindex gnus-header-button-alist
-$B$=$l$,5-;v$N%X%C%@!<$@$1$KE,MQ$5$l!"$=$l$>$l$NF~NOMWAG$,$I$N%X%C%@!<$K%\(B
-$B%?%s2=$rE,MQ$9$k$+$r<($9DI2C$NMWAG$,$"$k;v$r=|$-!"$3$l$OB>$NO"A[%j%9%H$H(B
-$BF1$8$h$&$J$b$N$G$9(B:
+$B$3$l$OB>$NO"A[%j%9%H$HF1$8$h$&$J$b$N$G$9$,!"5-;v$N%X%C%@!<$@$1$KE,MQ$5$l(B
+$B$k$3$H$H!"$=$l$>$l$N9`L\$,$I$N%X%C%@!<$K%\%?%s$rIU$1$k$+$r;X<($9$k$?$a$N(B
+$BDI2C$NMWAG$r;}$C$F$$$k$3$H$,0[$J$j$^$9(B:
 
 @lisp
 (@var{header} @var{regexp} @var{button-par} @var{use-p} @var{function} @var{data-par})
 @end lisp
 
 @var{header} $B$O@55,I=8=$G$9!#(B
+@end table
 
 @subsubsection $B4XO"$9$kJQ?t$H4X?t(B
 
+@table @code
 @item gnus-button-@var{*}-level
-@xref{Article Button Levels}.
-
+@ref{Article Button Levels} $B$r;2>H$7$F2<$5$$!#(B
+@c
 @c Stuff related to gnus-button-browse-level
 
 @item gnus-button-url-regexp
 @vindex gnus-button-url-regexp
-$BKd$a9~$^$l$?(B URL $B$K9gCW$9$k@55,I=8=$G$9!#$=$l$O>e$NJQ?t$N%G%#%U%)%k%H$N(B
-$BCM$G;H$o$l$^$9!#(B
-
+$BKd$a9~$^$l$?(B URL $B$K9gCW$9$k@55,I=8=$G$9!#>e=R$NJQ?t$N%G%#%U%)%k%H$NCM$G(B
+$B;H$o$l$^$9!#(B
+@c
 @c Stuff related to gnus-button-man-level
 
 @item gnus-button-man-handler
 @vindex gnus-button-man-handler
-Man $B%Z!<%8$NI=<($K;H$&4X?t$G$9!#(BMan $B%Z!<%8$NL>A0$NJ8;zNs$G!">/$J$/$H$b0l(B
-$B$D$N0z?t$r/$J$/$H$b0l$D$N0z?t$H$7$F(B Man $B%Z!<%8$N(B
+$BL>A0$NJ8;zNs$ro$K$=$l$>$lJ8;zNs$,(B Message-ID $B$^$?$O%a!<(B
-$B%k%"%I%l%9$G$"$k$H2>Dj$7$^$9!#$3$NJQ?t$,(B @code{ask} $B$K@_Dj$5$l$k$H!"(B
-gnus $B$O$$$D$b%f!<%6$,2?$r$7$?$$$+$r?R$M$^$9!#$=$l$,4X?t$@$C$?>l9g!"$?$C(B
-$B$?0l$D$N0z?t$G$"$kJ8;zNs$,M?$($i$l$F8F$P$l$^$9!#$=$N4X?t$O(B @code{mid}$B!"(B
+$B%k%"%I%l%9$G$"$k$H2>Dj$7$^$9!#$3$NJQ?t$,(B @code{ask} $B$H$$$&%7%s%\%k$K@_Dj(B
+$B$5$l$k$H!"(Bgnus $B$O$$$D$bMxMQl9g!"$?$C$?0l$D$NJ8;zNs$r0z?t$H$7$F8F$P$l$^$9!#$=$N4X?t$O(B @code{mid}$B!"(B
 @code{mail}$B!"(B@code{invalid} $B$^$?$O(B @code{ask} $B$rJV$5$J$1$l$P$J$j$^$;$s!#(B
 $B%G%#%U%)%k%HCM$O4X?t(B @code{gnus-button-mid-or-mail-heuristic} $B$G$9!#(B
 
@@ -8567,43 +8758,44 @@ Message-ID $B$@$C$?$i(B @code{mid} $B$r!"%a!<%k%"%I%l%9$@$C$?$i(B @code{mail
 @vindex gnus-button-mid-or-mail-heuristic-alist
 $B4X?t(B @code{gnus-button-mid-or-mail-heuristic} $B$G;H$o$l$k(B @code{(RATE
 . REGEXP)} $BBP$NO"A[%j%9%H$G$9!#(B
-
+@c
 @c Stuff related to gnus-button-tex-level
 
 @item gnus-button-ctan-handler
 @findex gnus-button-ctan-handler
-CTAN $B%j%s%/$NI=<($K;H$&4X?t$G$9!#(BURL $BL>$NJ8;zNs$r0z?t$H$7$F!"0l$D$NJ8;zNs$r!"0z?t$H$7$F0l$De$K$"$k$H$-$K;H$o$l$k%U%'%$%9$G$9!#(B
+$B%^%&%9$N%+!<%=%k$,%\%?%s$N>e$K$"$k$H$-$K;H$o$l$k%U%'!<%9$G$9!#(B
 @end table
 
-$B5-;v$r<+F0E*$K%\%?%s2=$9$kJ}K!$O(B @ref{Customizing Articles} $B$r;2>H$7$F2<(B
-$B$5$$!#(B
+$B5-;v$K<+F0E*$K%\%?%s$rIU$1$kJ}K!$O!"(B@ref{Customizing Articles} $B$r;2>H$7(B
+$B$F2<$5$$!#(B
 
 @node Article Button Levels
 @subsection Article button levels
 @cindex button levels
-$BJQ?t(B @code{gnus-button-@var{*}-level} $B$N9b$$CM$K$h$C$F!"$h$jB?$/$N%\%?%s(B
-$B$,8=$l$^$9!#%l%Y%k$,%<%m$@$C$?$i%\%?%s$OI=<($5$l$^$;$s!#%G%#%U%)%k%H(B
+
+$BJQ?t(B @code{gnus-button-@var{*}-level} $B$NCM$,9b$$$[$I!"$h$jB?$/$N%\%?%s$,(B
+$B8=$l$^$9!#%l%Y%k$,%<%m$@$C$?$i%\%?%s$OI=<($5$l$^$;$s!#%G%#%U%)%k%H(B
 $BCM(B ($B$=$l$O(B 5) $B$G$O!"$H$F$b$?$/$5$s$N%\%?%s$r$9$G$K8+$F$$$k$O$:$G$9!#9b$$(B
-$B%l%Y%k$G$O$h$jB?$/$N%\%?%s$r8+$k$3$H$K$J$j$^$9$,!"B?$/$NMW$i$J$$$b$N$b$"(B
-$B$k$+$b$7$l$^$;$s!#$=$l$i$rHr$1$k$?$a$K!"FCDj$N%0%k!<%W$KBP$7$FJQ(B
+$B%l%Y%k$G$O$h$jB?$/$N%\%?%s$r8+$k$3$H$K$J$j$^$9$,!"B?$/$NMW$i$J$$$b$N$b8=(B
+$B$l$k$+$b$7$l$^$;$s!#$=$l$i$rHr$1$k$?$a$K!"FCDj$N%0%k!<%W$KBP$7$FJQ(B
 $B?t(B @code{gnus-button-@var{*}-level} $B$r@_Dj$7$F$bNI$$$G$7$g(B
-$B$&(B (@pxref{Group Parameters})$B!#JQ?t(B @code{gnus-parameters} $B$NNc$G$9(B:
+$B$&(B (@pxref{Group Parameters})$B!#(B@code{gnus-parameters} $BJQ?t$NNc$G$9(B:
 
 @lisp
 ;; @r{$B$$$/$D$+$N%0%k!<%W$G(B @code{gnus-button-*-level} $B$rA}$d$9(B:}
@@ -8616,13 +8808,13 @@ Archive Network) $B%"!<%+%$%V$N%G%#%l%/%H%j$G$9!#(B
 @table @code
 @item gnus-button-browse-level
 @vindex gnus-button-browse-level
-Message-ID$B!"%a!<%k%"%I%l%9$*$h$S%K%e!<%9$N(B URL $B$K4X$9$k;29MJ88%$NI=<($r(B
-$B@)8f$7$^$9!#4XO"$9$kJQ?t$H4X?t$K$O(B @code{gnus-button-url-regexp}$B!"(B
+Message-ID$B!"%a!<%k%"%I%l%9$*$h$S%K%e!<%9$N(B URL $B$r;2>H$9$k0FFb$NI=<($r@)(B
+$B8f$7$^$9!#4XO"$9$kJQ?t$H4X?t$K$O(B @code{gnus-button-url-regexp}$B!"(B
 @code{browse-url} $B$*$h$S(B @code{browse-url-browser-function} $B$,$"$j$^$9!#(B
 
 @item gnus-button-emacs-level
 @vindex gnus-button-emacs-level
-Emacs $B$^$?$O(B gnus $B$N;29MJ88%$NI=<($r@)8f$7$^$9!#4XO"$9$k4X?t$O!"(B
+Emacs $B$^$?$O(B gnus $B$X$N;2>H$NI=<($r@)8f$7$^$9!#4XO"$9$k4X?t$O!"(B
 @code{gnus-button-handle-custom},
 @code{gnus-button-handle-describe-function},
 @code{gnus-button-handle-describe-variable},
@@ -8636,8 +8828,8 @@ Emacs $B$^$?$O(B gnus $B$N;29MJ88%$NI=<($r@)8f$7$^$9!#4XO"$9$k4X?t$O!"(B
 
 @item gnus-button-man-level
 @vindex gnus-button-man-level
-(Unix $B$N(B) man $B%Z!<%8$NI=<($r@)8f$7$^$9!#(B
-@code{gnus-button-man-handler} $B$r;2>H$7$F2<$5$$!#(B
+(Unix $B$N(B) man $B%Z!<%8$X$N;2>H$NI=<($r@)8f$7$^$9!#(B
+@code{gnus-button-man-handler} $B$r8+$F2<$5$$!#(B
 
 @item gnus-button-message-level
 @vindex gnus-button-message-level
@@ -8650,19 +8842,19 @@ Message-ID$B!"%a!<%k%"%I%l%9$*$h$S%K%e!<%9$N(B URL $B$NI=<($r@)8f$7$^$9!#4XO"
 
 @item gnus-button-tex-level
 @vindex gnus-button-tex-level
-@TeX{} $B$^$?$O(B LaTex $B$K4X$9$k;29MJ88%!"Nc$($P(B CTAN $B$N(B URL$B!"$NI=<($r@)8f$7(B
-$B$^$9!#JQ?t(B @code{gnus-ctan-url},
+@TeX{} $B$^$?$O(B LaTex $B$X$N;2>H!"Nc$($P(B CTAN $B$N(B URL $B$NI=<($r@)8f$7$^$9!#JQ(B
+$B?t(B @code{gnus-ctan-url},
 @code{gnus-button-ctan-handler},
-@code{gnus-button-ctan-directory-regexp} $B$*$h$S(B
-@code{gnus-button-handle-ctan-bogus-regexp} $B$r;2>H$7$F2<$5$$!#(B
+@code{gnus-button-ctan-directory-regexp} $B$*$h(B
+$B$S(B @code{gnus-button-handle-ctan-bogus-regexp} $B$r8+$F2<$5$$!#(B
 @end table
 
 @node Article Date
 @subsection $B5-;v$NF|IU(B
 
-$BF|IU$OJ9$$$?;v$NL5$$2?$+JUnA$J;~4VBS(B (timezone) $B$G:n@.$5$l$F$$$k;v$,NI$/(B
-$B$"$k$N$G!"5-;v$,Aw$i$l$?$H$-$K2?;~$G$"$C$?$+$rCN$k;v$,$G$-$k$N$OHs>o$KNI(B
-$B$$;v$G$7$g$&!#(B
+$BF|IU$OJ9$$$?$3$H$NL5$$2?$+JUnA$J%?%$%`%>!<%s$G:n@.$5$l$F$$$k$3$H$,NI$/$"(B
+$B$k$N$G!"5-;v$,Aw$i$l$?$H$-$K2?;~$@$C$?$+$rCN$k$3$H$,$G$-$k$N$O$H$F$bNI$$(B
+$B$3$H$G$9!#(B
 
 @table @kbd
 @item W T u
@@ -8672,7 +8864,7 @@ UT ($BJLL>(B GMT, ZULU) $B$GF|IU$rI=<($7$^$9(B (@code{gnus-article-date-ut})
 
 @item W T i
 @kindex W T i ($B35N,(B)
-@findex gnus-article-date-iso-8601
+@findex gnus-article-date-iso8601
 @cindex ISO 8601
 $BF|IU$r9q:]E*$J7A<0!"(BISO 8601 $B$GI=<($7$^(B
 $B$9(B (@code{gnus-article-date-iso8601})$B!#(B
@@ -8680,12 +8872,13 @@ UT ($BJLL>(B GMT, ZULU) $B$GF|IU$rI=<($7$^$9(B (@code{gnus-article-date-ut})
 @item W T l
 @kindex W T l ($B35N,(B)
 @findex gnus-article-date-local
-$BF|IU$rMxMQ!<%s$GI=<($7$^(B
+$B$9(B (@code{gnus-article-date-local})$B!#(B
 
 @item W T p
 @kindex W T p ($B35N,(B)
 @findex gnus-article-date-english
-$BF|IU$r1Q8l$GH/2;$G$-$k7A<0$GI=<($7$^(B
+$BF|IU$r1Q8l$G3Z$KH/2;$G$-$k7A<0$GI=<($7$^(B
 $B$9(B (@code{gnus-article-date-english})$B!#(B
 
 @item W T s
@@ -8694,9 +8887,9 @@ UT ($BJLL>(B GMT, ZULU) $B$GF|IU$rI=<($7$^$9(B (@code{gnus-article-date-ut})
 @findex gnus-article-date-user
 @findex format-time-string
 $BF|IU$rMxMQrM}$KCV$-(B
-$B49$($k$3$H$G$9!#(B
+gnus $B$G%a!<%k$rFI$`$3$H$NMxE@$O!"$=$l$,C1=c$J%P%0$rAG@2$i$7$$IT>rM}$KCV(B
+$B$-49$($k$3$H$G$9!#(B
 
 $B$3$N9T$,O"B3$7$F99?7$5$l$k$h$&$K$7$?$$$N$G$"$l$P!"(B
 
@@ -8723,22 +8916,22 @@ gnus $B$G%a!<%k$rFI$`$3$H$NM-Mx$JE@$O!"C1=c$J%P%0$rAG@2$i$7$$IT>rM}$KCV$-(B
 (gnus-start-date-timer)
 @end lisp
 
-$B$r$"$J$?$N(B @file{~/.gnus.el} $B%U%!%$%k$KF~$l$k$+!"2?$+$N%U%C%/$Gl9g$O!"(B
+@code{gnus-stop-date-timer} $BL?Na$r;H$C$F2<$5$$!#(B
 
 @item W T o
 @kindex W T o ($B35N,(B)
 @findex gnus-article-date-original
 $BK\Mh$NF|IU$rI=<($7$^$9(B (@code{gnus-article-date-original})$B!#$3$l$O$"$J$?(B
-$B$,IaDL$OB>$NJQ494X?t$r;H$C$F$$$F!"$=$l$,40A4$K4V0c$C$?;v$r$7$F$$$k$N$G$O(B
-$B$J$$$+$H?4G[$7$F$$$k$H$-$KLr$KN)$A$^$9!#Nc$($P!"5-;v$,(B 1854$BG/$KEj9F$5$l(B
-$B$?$H$J$C$F$$$k$H$7$^$7$g$&!#$7$+$7!"$=$N$h$&$J;v$O(B @emph{$B40A4$K(B }$BIT2DG=(B
-$B$G$9!#;d$,?.MQ$G$-$^$;$s$+(B? *$B$/$9$/$9(B($B>P(B)*
+$B$,IaCJ$OB>$NJQ494X?t$r;H$C$F$$$F!"$=$l$,40A4$K4V0c$C$?$3$H$r$7$F$$$k$N$G(B
+$B$O$J$$$+$H?4G[$K$J$C$?$H$-$KLr$KN)$A$^$9!#Nc$($P!"5-;v$,(B 1854$BG/$KEj9F$5(B
+$B$l$?$HH(B
-$B$7$F2<$5$$!#(B
+$B9%$_$N=q<0$G<+F0E*$KF|IU$rI=<($9$kJ}K!$O(B @ref{Customizing Articles} $B$r;2(B
+$B>H$7$F2<$5$$!#(B
 
 @node Article Display
 @subsection Article Display
@@ -8747,19 +8940,19 @@ gnus $B$G%a!<%k$rFI$`$3$H$NM-Mx$JE@$O!"C1=c$J%P%0$rAG@2$i$7$$IT>rM}$KCV$-(B
 @cindex smileys
 
 $B$3$l$i$N%3%^%s%I$O!"$$$m$s$J.$5$JGr9u2hA|$G!"%a%C%;!<%8%X%C%@!<$+$i6!5k$5$l(B
+@code{X-Face} $B%X%C%@!<$O>.$5$JGr9u2hA|$G!"%a%C%;!<%8%X%C%@!<$+$i;}$C$F$-(B
 $B$^$9(B (@pxref{X-Face})$B!#(B
 
-@code{Face} $B%X%C%@!<$O>.$5$J%+%i!<2hA|$G!"%a%C%;!<%8%X%C%@!<$+$i6!5k$5$l(B
+@code{Face} $B%X%C%@!<$O>.$5$J%+%i!<2hA|$G!"%a%C%;!<%8%X%C%@!<$+$i;}$C$F$-(B
 $B$^$9(B (@pxref{Face})$B!#(B
 
 $B%9%^%$%j!<$O!"?M!9$,%a%C%;!<%8$K;6$i$+$7$?$,$k>.$5$J(B @samp{:-)} $B%7%s%\%k(B
 $B$G$9!#(B
 
-$B0lJ}(B Picon $B$O$"$J$?<+?H$N%7%9%F%`$K0MB8$7!"(Bgnus $B$O%X%C%@!<$K%^%C%A$9$k$"(B
-$B$J$?$N;}$AJ*$rC5$7$F$_$^$9(B (@pxref{Picons})$B!#(B
+$B0lJ}(B Picon $B$O$"$J$?<+?H$N%7%9%F%`$K0MB8$7!"(Bgnus $B$O%X%C%@!<$K9gCW$9$k$"$J(B
+$B$?$N;}$AJ*$rC5$7$F$_$^$9(B (@pxref{Picons})$B!#(B
 
 $B$3$l$i$9$Y$F$N5!G=$O%H%0%k$G$9!#$b$7$9$G$K$=$l$i$,B8:_$7$F$$$?$J$i$P!"$=(B
 $B$l$i$O:o=|$5$l$^$9!#(B
@@ -8803,7 +8996,7 @@ gnus $B$G%a!<%k$rFI$`$3$H$NM-Mx$JE@$O!"C1=c$J%P%0$rAG@2$i$7$$IT>rM}$KCV$-(B
 @item W D D
 @kindex W D D ($B35N,(B)
 @findex gnus-article-remove-images
-$B5-;v%P%C%U%!$+$i$9$Y$F$N2hA|$r:o=|$7$^(B
+$B5-;v%P%C%U%!!<$+$i$9$Y$F$N2hA|$r:o=|$7$^(B
 $B$9(B (@code{gnus-article-remove-images})$B!#(B
 @end table
 
@@ -8813,26 +9006,26 @@ gnus $B$G%a!<%k$rFI$`$3$H$NM-Mx$JE@$O!"C1=c$J%P%0$rAG@2$i$7$$IT>rM}$KCV$-(B
 @cindex article signature
 
 @vindex gnus-signature-separator
-$B$=$l$>$l$N5-;v$OFs$D$NItJ,$KJ,$1$i$l$^$9!=!=8+=P$7(B (header) $B$HK\(B
-$BBN(B (body) $B$G$9!#K\BN$O=pL>ItJ,$HJ8>OItJ,$KJ,$1$i$l$^$9!#$I$l$,=pL>$H$_$J(B
-$B$5$l$k$+$r7h$a$kJQ?t$O(B @code{gnus-signature-separator} $B$G$9!#$3$l$OIaDL(B
-$B$O(B son-of-RFC 1036 $B$G;X<($5$l$F$$$kI8=`$N(B @samp{^-- $} $B$G$9!#$7$+$7!"B?(B
-$B$/$N?M$,I8=`$G$J$$=pL>J,N%$rMQ$$$^$9$N$G!"$3$NJQ?t$O0l$D0l$D;n$5$l$k!"@5(B
-$B5,I=8=$N%j%9%H$G$"$k$3$H$b$G$-$^$9!#(B($BC5:w$OK\BN$N:G8e$+$i;O$a$X$H$J$5$l(B
-$B$^$9!#(B) $B$h$/$"$j$=$&$JCM$O(B:
+$B$=$l$>$l$N5-;v$OFs$D$NItJ,$KJ,$1$i$l$^$9(B---$B%X%C%@!<$HK\J8$G$9!#K\J8$O=p(B
+$BL>ItJ,$HJ8>OItJ,$KJ,$1$k$3$H$,$G$-$^$9!#$I$l$,=pL>$H$_$J$5$l$k$+$r7h$a$k(B
+$BJQ?t$O(B @code{gnus-signature-separator} $B$G$9!#$3$l$OIaDL$O(B son-of-RFC
+1036 $B$G5,Dj$5$l$F$$$kI8=`$N(B @samp{^-- $} $B$G$9!#$7$+$7!"B?$/$N?M$,I8=`$G(B
+$B$O$J$$=pL>%;%Q%l!<%?!<$r;H$&$N$G!"$3$NJQ?t$O0l$D0l$D;n$5$l$k!"@55,I=8=$N(B
+$B%j%9%H$G$"$k$3$H$b$G$-$^$9!#(B($BC5:w$OK\J8$N:G8e$+$i;O$a$X$H$J$5$l$^(B
+$B$9!#(B) $B$h$/$"$j$=$&$JCM$O(B:
 
 @lisp
 (setq gnus-signature-separator
-      '("^-- $"         ; @{$BI8=`(B}
-        "^-- *$"        ; @{$BIaDL$N2u$7J}(B}
-        "^-------*$"    ; @{$BB?$/$N?M$OD9!$H$_$J$5$l$k(B
@@ -8840,29 +9033,29 @@ gnus $B$G%a!<%k$rFI$`$3$H$NM-Mx$JE@$O!"C1=c$J%P%0$rAG@2$i$7$$IT>rM}$KCV$-(B
 
 @enumerate
 @item
-$B$3$l$,@0?t$G$"$l$P!"=pL>$O$3$N@0?t$h$j(B ($BJ8;z$G(B) $BD9$/$J$C$F$$$F$O$$$1$^$;(B
-$B$s!#(B
+$B$3$l$,@0?t$G$"$l$P!"=pL>$O$3$N@0?t$h$j(B ($BJ8;z?t$G(B) $BD9$/$J$C$F$$$F$O$$$1$^(B
+$B$;$s!#(B
 @item
-$B$3$l$,IbF0>.?tE@?t$G$"$l$P!"=pL>$O$=$N?t;z$h$j(B ($B9T$G(B) $BD9$/$J$C$F$$$F$O$$(B
-$B$1$^$;$s!#(B
+$B$3$l$,IbF0>.?tE@?t$G$"$l$P!"=pL>$O$=$N?tCM$h$j(B ($B9T?t$G(B) $BD9$/$J$C$F$$$F$O(B
+$B$$$1$^$;$s!#(B
 @item
 $B$3$l$,4X?t$G$"$l$P!"$=$N4X?t$O0z?t$J$7$G8F$P$l!"$=$l$,(B @code{nil} $B$rJV$;(B
-$B$P!"%P%C%U%!$K$O=pL>$,$"$j$^$;$s!#(B
+$B$P!"$=$N%P%C%U%!!<$K$O=pL>$,$"$j$^$;$s!#(B
 @item
 $B$3$l$,J8;zNs$G$"$l$P!"$=$l$O@55,I=8=$H$7$F;H$o$l$^$9!#$b$7$=$l$,9gCW$9$l(B
-$B$P!"$=$NEv$NJ8;zNs$O=pL>$G$O$"$j$^$;$s!#(B
+$B$P!"Ev$N$=$NJ8;zNs$O=pL>$G$O$"$j$^$;$s!#(B
 @end enumerate
 
-$B$3$NJQ?t$OMWAG$,>e$K5s$2$i$l$?7?$N%j%9%H$G$"$k;v$b$G$-$^$9!#$3$l$ONc$G$9(B:
+$B$3$NJQ?t$O!"MWAG$,>e$KNs5s$5$l$?7?$N%j%9%H$G$"$k$3$H$b$G$-$^$9!#Nc$G$9(B:
 
 @lisp
 (setq gnus-signature-limit
       '(200.0 "^---*Forwarded article"))
 @end lisp
 
-$B$3$l$O=pL>J,N%J*$N8e$K(B 200 $B$rD6$($k9T$+!"=pL>J,N%J*$N8e$NJ8>O$,@55,I=(B
-$B8=(B @samp{^---*Forwarded article} $B$K9gCW$9$l$P!"7k6I$=$l$O=pL>$G$O$J$$$H(B
-$B$$$&;v$G$9!#(B
+$B$3$l$O=pL>%;%Q%l!<%?!<$N8e$K(B 200 $B$rD6$($k9T$,$"$k$+!"%;%Q%l!<%?!<$N8e$N(B
+$B%F%-%9%H$,@55,I=8=(B @samp{^---*Forwarded article} $B$K9gCW$9$l$P!"7k6I$=$l(B
+$B$O=pL>$G$O$J$$$H$$$&$3$H$G$9!#(B
 
 @node Article Miscellanea
 @subsection $B5-;v$$$m$$$m(B
@@ -8871,10 +9064,9 @@ gnus $B$G%a!<%k$rFI$`$3$H$NM-Mx$JE@$O!"C1=c$J%P%0$rAG@2$i$7$$IT>rM}$KCV$-(B
 @item A t
 @kindex A t ($B35N,(B)
 @findex gnus-article-babel
-$B5-;v$r$"$k8@8l$+$iJL$N$b$N$XJQ49$7$^(B
-$B$9(B (@code{gnus-article-babel})$B!#(B
+$B5-;v$r$"$k8@8l$+$iJL$N$b$N$XJQ49$7$^$9(B (@code{gnus-article-babel})$B!#(B
 @end table
-
+@c
 @c The node `MIME Commands' and the node `Charsets' are stripped, which
 @c are Gnus specific.
 
@@ -8886,78 +9078,78 @@ gnus $B$G%a!<%k$rFI$`$3$H$NM-Mx$JE@$O!"C1=c$J%P%0$rAG@2$i$7$$IT>rM}$KCV$-(B
 @cindex PostScript
 @cindex printing
 @kindex A P ($B35N,(B)
-@vindex gnus-ps-print-article
+@vindex gnus-ps-print-hook
 @findex gnus-summary-print-article
-$B5-;v%P%C%U%!$N%]%9%H%9%/%j%W%H(B (PostScript) $B%$%a!<%8$r:n@.$7$F0u:~$7$^(B
+$B5-;v%P%C%U%!!<$N%]%9%H%9%/%j%W%H(B (PostScript) $B%$%a!<%8$r:n@.$7$F0u:~$7$^(B
 $B$9(B (@code{gnus-summary-print-article})$B!#(B@code{gnus-ps-print-hook} $B$,%P%C(B
-$B%U%!$r0u:~$9$kD>A0$K$K!"(BMuttprint $B$r;H$C$F0u:~$9$k(B
-$B$3$H$b$G$-$^$9(B (@pxref{Saving Articles})$B!#(B
+$B%U%!!<$r0u:~$9$kD>A0$K$K(B Muttprint $B$r;H$C$F0u:~$9$k$3$H(B
+$B$b$G$-$^$9(B (@pxref{Saving Articles})$B!#(B
 @end table
 
 @node Summary Sorting
-@section $B35N,$NJB$SBX$((B
+@section $B35N,$NJB$YBX$((B
 @cindex summary sorting
 
 $B;d$O$I$&$7$F$"$J$?$,$=$&$7$?$$$N$+$O$o$+$i$J$$$N$G$9$,!"$=$l$G$b$"$J$?$O(B
-$B$?$/$5$s$NJ}K!$G35N,%P%C%U%!$rJB$SBX$($k;v$,$G$-$^$9!#(B
+$B$?$/$5$s$NJ}K!$G35N,%P%C%U%!!<$rJB$YBX$($k$3$H$,$G$-$^$9!#(B
 
 @table @kbd
 @item C-c C-s C-n
 @kindex C-c C-s C-n ($B35N,(B)
 @findex gnus-summary-sort-by-number
-$B5-;vHV9f$K$h$C$FJB$SBX$($^$9(B (@code{gnus-summary-sort-by-number})$B!#(B
+$B5-;vHV9f$K$h$C$FJB$YBX$($^$9(B (@code{gnus-summary-sort-by-number})$B!#(B
 
 @item C-c C-s C-a
 @kindex C-c C-s C-a ($B35N,(B)
 @findex gnus-summary-sort-by-author
-$BCxJ}$GF0:n$7$^(B
-$B$9!#8el9g$O!"$9$Y$F$N35N,9T$,0l9T0l9TJB$SBX$($i$l$^$9!#A0l9g$O!"(B
-$B:,K\$H:,K\$r4pK\$H$7$FJB$SBX$($i$l!"$=$l$O$"$J$?$,5a$a$F$$$k;v$H$O0[(B
-$B$J$C$F$$$k$+$b$7$l$^$;$s!#%9%l%C%I$r;H$&;v$r@Z$jBX$($k$K$O(B @kbd{T T} $B$r(B
-$BBG$C$F$/$@$5$$(B (@pxref{Thread Commands})$B!#(B
+$B$9!#8erM}$KCV$-(B
 @item ^
 @kindex ^ ($B35N,(B)
 @findex gnus-summary-refer-parent-article
-$B8=:_$N5-;v$N?F5-;v$rFI$_$?$/$F!"$=$l$,35N,%P%C%U%!$KI=<($5$l$F$$$J$/$F$b!"(B
-$B$*$=$i$/$=$l$O2DG=$G$7$g$&!#$H$$$&$N$O!"8=:_$N%0%k!<%W(B
-$B$,(B @acronym{NNTP} $B$GC5n$5$l$F$$$J$$>e!"8=:_(B
-$B$N5-;v$N(B @code{References} $B$,$V$A2u$5$l$F$$$J$1$l$P!"$?$@!"(B
-@kbd{^} $B$+(B @kbd{A r} $B$r2!$;$PNI$$$@$1$G(B
-$B$9(B (@code{gnus-summary-refer-parent-article})$B!#$b$7A4$F$,>eC5n$5$l$F$$$J$$>e!"(B
+$B8=:_$N5-;v$N(B @code{References} $B$,$V$A2u$5$l$F$$$J$1$l$P!"$?(B
+$B$@(B @kbd{^} $B$+(B @kbd{A r} $B$r2!$;$PNI$$$@$1$G(B
+$B$9$+$i(B (@code{gnus-summary-refer-parent-article})$B!#$9$Y$F$,$&$^$/$$$1$P!"(B
+$B?F5-;v$rl9g$O!"$=$N?t$N@$Be$@$1A0$NAD@h$N5-;v$N$_$r/$7;~4V$,(B
-$B$+$+$j$^$9!#$b$7!"$3$l$r$7$P$7$P9T$&$N$G$"$l$P!"(B
+$B%k!<%W$N$9$Y$F$N%X%C%@!<$r/$7;~4V$,$+(B
+$B$+$j$^$9!#$3$l$r$7$P$7$P9T$J$&$N$G$"$l$P!"(B
 @code{gnus-fetch-old-headers} $B$r(B @code{invisible} $B$K@_Dj$9$k$3$H$r9M$($?(B
 $B$[$&$,NI$$$G$7$g$&(B (@pxref{Filling In Threads})$B!#$3$l$OIaDL$O;k3PE*$J8z(B
-$B2L$O$"$j$^$;$s$,!"$3$NL?Na$NF0:n$r$+$J$jB.$/$9$k$G$7$g$&!#$b$A$m$s!"%0%k!<(B
-$B%W$KF~$k$N$O>/$7CY$/$J$j$^$9!#(B
+$B2L$O$"$j$^$;$s$,!"$3$NL?Na$NF0:n$r$+$J$jB.$/$7$^$9!#$b$A$m$s%0%k!<%W$KF~(B
+$B$k$N$O$$$/$i$+CY$/$J$j$^$9$,!#(B
 
 @vindex gnus-refer-thread-limit
 $BJQ?t(B @code{gnus-refer-thread-limit} $B$O$3$NL?Na$re=q$-$9$k;v$,$G$-$^$9!#(B
+$B8E$$(B ($B$9$J$o$A!"8=:_$N%0%k!<%W$G:G=i$KI=<($5$l$?$b$N$h$j$bA0$N5-;v$N(B) $B%X%C(B
+$B%@!<$r} $B$N$h$&$J;2>H$r$"$J$?$K?R$M$^$9!#(B
+$B$I$N%0%k!<%W$KB0$7$F$$$k$+$K4X$o$i$:!"G$0U$N5-;v$r(B gnus $B$KMW5a$9$k$3$H$,(B
+$B$G$-$^$9!#(B
+@kbd{M-^} (@code{gnus-summary-refer-article}) $B$O(B @code{Message-ID}$B!"$D$^(B
+$B$j$"$ND9$/$F$J$+$J$+FI$`$3$H$N$G$-$J(B
+$B$$(B @samp{<38o6up$6f2@@hymir.ifi.uio.no>} $B$N$h$&$J$b$N$r$"$J$?$K?R$M$^$9!#(B
 $B$"$J$?$O$9$Y$F$r@53N$KBG$A9~$^$J$1$l$P$J$j$^$;$s!#;DG0$J$,$i!"$"$$$^$$$J(B
 $B8!:w$O$G$-$J$$$N$G$9!#(B
-@end table
 
-$B%K%e!<%9$G$J$$A*BrJ}K!$+$i(B @code{Message-ID} $B$Ge=q$-$9$k;v$,(B
-$B$G$-$^$9!#(B
+gnus $B$O$9$G$Kl9g!"(B
-@code{gnus-refer-article-method} $B$r(B @acronym{NNTP} $B$K@_Dj$9$k;v$,$G$-$^(B
-$B$9!#$*$=$i$/!"$"$J$?$,2qOC$7$F$$$k(B @acronym{NNTP} $B%5!<%P!<$,$"$J$?$NFI$s(B
-$B$G$$$k%9%W!<%k$r99?7$7$F$$$k$HHs>o$KNI$$$G$7$g$&!#$7$+$7!"$=$l$O$I$&$7$F(B
-$B$bI,MW$J$o$1$G$O$"$j$^$;$s!#(B
+$B$G$-$J$$$h$&$J%P%C%/%(%s%I(B (@code{nnspool} $B$J$I(B) $B$G$"$k$N$J$i!"(B
+@code{gnus-refer-article-method} $B$r(B @acronym{NNTP} $B$NA*BrJ}K!$K@_Dj$9$l(B
+$B$PNI$$$G$7$g$&!#$*$=$i$/!"$"$J$?$,Ld$$9g$o$;$k(B @acronym{NNTP} $B%5!<%P!<$,(B
+$B$"$J$?$NFI$s$G$$$k%9%W!<%k$r99?7$7$F$$$k$H:G$bNI$$$G$7$g$&!#$7$+$7!"$=$l(B
+$B$O$I$&$7$F$bI,MW$J$o$1$G$O$"$j$^$;$s!#(B
 
-$B$=$l$OA*BrJ}K!$N%j%9%H$G$"$k$3$H$b$G$-!"FCJL$J%7%s%\%k(B @code{current} $B$G(B
-$B$"$k$3$H$b$G$-$^$9!#8el9g$O!"(Bgnus $B$O9g$&$b$N$rH/8+$9$k$^$G%j%9%H$NA4$F$NJ}K!$r;n$7$^$9!#(B
+$B$=$l$OA*BrJ}K!$N%j%9%H$N$_$J$i$:!"8=:_$NA*BrJ}K!$r0UL#$9$kFCJL$J%7%s%\(B
+$B%k(B @code{current} $B$G$"$k$3$H$b$G$-$^$9!#(Bgnus $B$O9g$&$b$N$rH/8+$9$k$^$G$=(B
+$B$l$i$9$Y$F$NJ}K!$r;n$7$^$9!#(B
 
-$B$3$l$O8=:_$NJ}K!$r;n$7$F!"$=$l$,<:GT$7$?>l9g$K$O(B Google $B$K?V$/@_Dj$NNc$G(B
-$B$9(B:
+$B$3$l$O8=:_$NA*BrJ}K!$r;n$7$F!"$=$l$,<:GT$7$?>l9g$K$O(B Google $B$K?V$/@_Dj$N(B
+$BNc$G$9(B:
 
 @lisp
 (setq gnus-refer-article-method
@@ -9048,93 +9241,107 @@ gnus $B$G%a!<%k$rFI$`$3$H$NM-Mx$JE@$O!"C1=c$J%P%0$rAG@2$i$7$$IT>rM}$KCV$-(B
 
 $B$[$H$s$I$N%a!<%k%P%C%/%(%s%I$O(B @code{Message-ID} $B$G$N$N$b$N$O(B
-$B;~4V$,$+$+$j$9$.$^$9!#(B) @code{nnmh} $B$G$OA4$/IT2DG=$G$9!#(B
+@code{nnbabyl}, @code{nnmaildir} $B$*$h$S(B @code{nnml} $B$,$I$N%0%k!<%W$+$i$G(B
+$B$b5-;v$rA\:w$G$-$k$N$KBP$7$F!"(B@code{nnfolder} $B$H(B @code{nnimap} $B$O8=:_$N(B
+$B%0%k!<%W$KEj9F$5$l$?5-;v$7$+C5$9$3$H$,$G$-$^$;$s!#(B($B$=$NB>$N$b$N$O;~4V$,(B
+$B$+$+$j$9$.$^$9!#(B) @code{nnmh} $B$G$O$^$C$?$/IT2DG=$G$9!#(B
 
 @node Alternative Approaches
 @section $BBeBX/$7$NA*Br;h$rM?$($F$"$j$^$9!#(B
+$B%K%e!<%9$rFI$`J}K!$N9%$_$O?M$=$l$>$l$G$9!#$3$l$O(B gnus $B$J$N$G$9$+$i!"35N,(B
+$B%P%C%U%!!<$N$?$a$N%^%$%J!<%b!<%I$K>/$7$P$+$jA*Br;h$r@_$1$^$9!#(B
 
 @menu
 * Pick and Read::               $B$^$:!"5-;v$K0u$rIU$1$F!"$=$l$+$iFI$`(B
-* Binary Groups::               $B$9$Y$F$N5-;v$r<+F0(B-$BI|9f2=$9$k(B
+* Binary Groups::               $B$9$Y$F$N5-;v$r<+F0%G%3!<%I$9$k(B
 @end menu
 
 @node Pick and Read
 @subsection $BA*$s$GFI$`(B
 @cindex pick and read
 
-$B$$$/$D$+$N%K%e!<%9%j!<%@!<(B (@code{nn} $B$d!"$"$N$)!"(BVM/CMS $B$G(B
-$B$N(B @code{Netnews} $B$J$I(B) $B$OFsAj$NFI$`$?$a$N3&LL$r;H$$$^$9!#MxMQ/(B
-$B$7$N%W%m%;%90uL?Na$,0lBG80L?Na$K$J$j!"35N,%P%C%U%!$X@Z$jBX$($k$?$a$NDI2C(B
-$BL?Na$r0l$DDs6!$7$^$9!#(B
+gnus $B$O$3$l$r$9$k$?$a$N35N,%P%C%U%!!<%^%$%J!<%b!<%I$rDs6!$7$^(B
+$B$9(B---@code{gnus-pick-mode} $B$G$9!#$3$l$O!"4pK\E*$K$O4JC1$K0u$rIU$1$i$l$k(B
+$B$h$&$K>/?t$N%W%m%;%90uL?Na$r0l8D$N%-!<$@$1$G:Q$`L?Na$K$7$F!"35N,%P%C%U%!!<(B
+$B$X@Z$jBX$($k$?$a$NDI2C$NL?Na$r0l$DDs6!$7$^$9!#(B
+
+@quotation
+$BLuCm(B: Pick $B%^%$%J!<%b!<%I$rM-8z$K$9$k$K$O!"0J2<$N%U%C%/$r;H$C$F2<$5$$(B:
+
+@lisp
+(add-hook 'gnus-summary-mode-hook 'gnus-pick-mode)
+@end lisp
+
+$B$=$&$;$:$K!"35N,%P%C%U%!!<$KF~$C$F$+$i(B @kbd{M-x gnus-pick-mode} $B$rl9g$O$=$l$O5-;v$@(B
-$B$1$rL$A*Br$K$7$^$9!#$=$N9T$K$"$k%9%l%C%I$+5-;v$rL$A*Br$K$9$k$?$a$K$3$N%-!<(B
-$B$K?tCM@\F,0z?t$rM?$($k;v$,$G$-$^$9!#(B
+$B?t(B @code{gnus-thread-hide-subtree} $B$,Hs(B-@code{nil} $B$@$C$?$i!"$3$N%-!<$,(B
+$B%9%l%C%I$N:G=i$G;H$o$l$k$H$=$N%9%l%C%I$rL$A*Br$K$7$^$9!#$=$&$G$J$1$l$P!"(B
+$B$=$N5-;v$@$1$rL$A*Br$K$7$^$9!#$=$N9T$K$"$k%9%l%C%I$+5-;v$rL$A*Br$K$9$k(B
+$B$?$a$K!"$3$N%-!<$K?tCM@\F,0z?t$rM?$($k$3$H$,$G$-$^$9!#(B
 
 @item RET
 @kindex RET ($BA*Br(B)
 @findex gnus-pick-start-reading
 @vindex gnus-pick-display-summary
 $BA*Br$5$l$?5-;v$rFI$_;O$a$^$9(B (@code{gnus-pick-start-reading})$B!#@\F,0z?t(B
-$B$rM?$($i$l$l$P!"$^$:$9$Y$F$NL$A*Br5-;v$K4{FI$N0u$rIU$1$^$9!#(B
-@code{gnus-pick-display-summary} $B$,(B @code{nil} $B$G$J$$$H!"35N,%P%C%U%!$O(B
-$BFI$s$G$$$k4V$bI=<($5$l$^$9!#(B
+$B$,M?$($i$l$k$H!":G=i$K$9$Y$F$NL$A*Br5-;v$K4{FI$N0u$rIU$1$^$9!#(B
+@code{gnus-pick-display-summary} $B$,(B @code{nil} $B$G$J$$$H!"35N,%P%C%U%!!<(B
+$B$OFI$s$G$$$k4V$bI=<($5$l$^$9!#(B
 @end table
 
-$BA4$F$NIaDL$N35N,%b!<%IL?Na$OA*Br%b!<%I(B (pick-mode)$B$G$b;HMQ2DG=$G$9$,!"(B
-@kbd{u} $B$ONc30$G$9!#$7$+$7!"F1$84X(B
-$B?t(B @code{gnus-summary-tick-article-forward} $B$K3d$jEv$F$i$l$F$$(B
-$B$k(B @kbd{!} $B$r;H$&;v$,$G$-$^$9!#(B
+$B$9$Y$F$NIaDL$N35N,%b!<%IL?Na$O(B pick-mode $B$G$b;HMQ2DG=$G$9$,!"(B@kbd{u} $B$O(B
+$BNc30$G$9!#$=$l$G$b!"F1$84X?t(B @code{gnus-summary-tick-article-forward} $B$K(B
+$B3d$jEv$F$i$l$F$$$k(B @kbd{!} $B$r;H$&$3$H$,$G$-$^$9!#(B
 
-$B$3$l$,NI$$9M$($@$H;W$&$N$G$"$l$P!"/$70c$$$^$9!#$=$l$>$l$N9T$N(B
@@ -9150,20 +9357,20 @@ pick $B%b!<%I$G$N35N,9T$NMM<0$OI8=`$NMM<0$H$O>/$70c$$$^$9!#$=$l$>$l$N9T$N(B
 
 @findex gnus-binary-mode
 @kindex M-x gnus-binary-mode
-$B$b$7B?$/$N;~4V$r%P%$%J%j!<%0%k!<%W(B (binary group) $B$G2a$4$7$F$$$k$N$J$i!"(B
-$B$$$D$b(B @kbd{X u}, @kbd{n}, @kbd{RET} $B$rC!$/$N$,7y$K$J$C$F$$$k$G$7$g$&!#(B
-@kbd{M-x gnus-binary-mode} $B$O5-;v$rIaDL$NJ}K!$GI=<($9$kBe$o$j$K!"IaDL(B
-$B$N(B gnus $B$N5-;vA*Br4X?t$r5-;v72$r(B uudecode $B$7$=$N7k2L$rI=<($9$k$h$&$KJQ99(B
-$B$9$k!"35N,%P%C%U%!$N$?$a$N%^%$%J!<%b!<%I$G$9!#(B
+$BB?$/$N;~4V$r%P%$%J%j!<%0%k!<%W$G2a$4$7$F$$$k$N$J$i!"$$$D$b(B @kbd{X u},
+@kbd{n}, @kbd{RET} $B$rC!$/$N$,7y$K$J$C$F$$$k$G$7$g$&!#(B
+@kbd{M-x gnus-binary-mode} $B$O!"C1$K5-;v$rIaDL$NJ}K!$GI=<($9$kBe$o$j$K!"(B
+$B5-;v$rA*Br$9$k$?$a$NIaDL$N(B gnus $B$N4X?t$r!"0lO"$N5-;v$r(B uudecode $B$7$F$=$N(B
+$B7k2L$rI=<($9$k$h$&$KJQ99$9$k!"35N,%P%C%U%!!<$N$?$a$N%^%$%J!<%b!<%I$G$9!#(B
 
 @kindex g ($B%P%$%J%j!<(B)
 @findex gnus-binary-show-article
-$B/$70c$$$^$9!#$=$l$>$l$N9T$N(B
 @vindex gnus-use-trees
 $B$b$7IaDL$N(B gnus $B$N35N,I=<($r9%$-$G$J$$$J$i$P!"(B
 @code{gnus-use-trees} $B$r(B @code{t} $B$K@_Dj$7$F$_$k$HNI$$$+$b$7$l$^$;$s!#$3(B
-$B$l$O(B ($B%G%#%U%)%k%H$G(B) $BDI2C$N(B @dfn{$BLZ%P%C%U%!(B} (tree buffer) $B$r:n@.$7$^$9!#(B
-$BLZ%P%C%U%!$G$O$9$Y$F$N35N,%b!<%IL?Na$r/$7$"$j$^$9(B:
 
 @table @code
 @item gnus-tree-mode-hook
 @vindex gnus-tree-mode-hook
-$B$9$Y$F$NLZ%b!<%I%P%C%U%!$GH$7$F$/$@$5$$!#(B
+$BLZ%b!<%I$N%P%C%U%!!<$K$*$1$k%b!<%I9T$N$?$a$N%U%)!<%^%C%HJ8;zNs$G(B
+$B$9(B (@pxref{Mode Line Formatting})$B!#%G%#%U%)%k%H(B
+$B$O(B @samp{Gnus: %%b %S %Z} $B$G$9!#;HMQ2DG=$J;XDj(B
+$B$O(B @ref{Summary Buffer Mode Line} $B$r;2>H$7$F2<$5$$!#(B
 
 @item gnus-selected-tree-face
 @vindex gnus-selected-tree-face
-$BLZ%P%C%U%!$GA*Br$5$l$?5-;v$r%O%$%i%$%H$9$k$?$a$K;H$o$l$k%U%'%$%9$G$9!#%G%#(B
-$B%U%)%k%H$G$O(B @code{modeline} $B$G$9!#(B
+$BLZ%P%C%U%!!<$GA*Br$5$l$?5-;v$r%O%$%i%$%H$9$k$?$a$K;H$o$l$k%U%'!<%9$G$9!#(B
+$B%G%#%U%)%k%H$G$O(B @code{modeline} $B$G$9!#(B
 
 @item gnus-tree-line-format
 @vindex gnus-tree-line-format
-$BLZ$N@a$N$?$a$N%U%)!<%^%C%HJ8;zNs$G$9!#$G$b$3$NL>A0$O>/$78m$C$?L>>N$G(B
-$B$9!=!=$=$l$O9T$G$O$J$/!"$?$@@a$rDj5A$9$k$@$1$G$9!#%G%#%U%)%k%H$NCM(B
+$BLZ$N@a$N$?$a$N%U%)!<%^%C%HJ8;zNs$G$9!#$G$b$3$l$O>/$78m$C$?L>>N$G$9(B---$B$=(B
+$B$l$O9T$G$O$J$/!"$?$@@a$rDj5A$9$k$@$1$G$9!#%G%#%U%)%k%H$NCM(B
 $B$O(B @samp{%(%[%3,3n%]%)} $B$G!"$=$l$OEj9FA0$N:G=i$N;0J8;z$rI=<($7$^$9!#(B
-$B$9$Y$F$N@a$,F1$8D9$5$G$"$k$N$O=EMW$G$9$N$G!"(B@samp{%4,4n} $B$N$h$&$J;XDj(B
-$B$r(B @emph{$B;H$o$J$1$l$P$J$i$J$$(B} $B$N$G$9!#(B
+$B$9$Y$F$N@a$,F1$8D9$5$G$"$k$3$H$,=EMW$J$N$G!"(B@samp{%4,4n} $B$N$h$&$J;XDj(B
+$B$r(B @emph{$B;H$o$J$1$l$P$J$j$^$;$s(B}$B!#(B
 
 $BM-8z$J;XDj$O(B:
 
@@ -9225,28 +9433,36 @@ Line Formatting})$B!#%G%#%U%)%k%H$O(B @samp{Gnus: %%b %S %Z} $B$G$9!#;HMQ2DG=
 @table @code
 @item gnus-tree-brackets
 @vindex gnus-tree-brackets
-$B$3$l$O!XK\Ev$N!Y5-;v$H!X$^$P$i5-;v!Y$K0c$$$rIU$1$k$?$a$K;H$o$l$^$9!#MM<0(B
-$B$O(B @code{((@var{$BK\Ev$N3+(B} . @var{$BK\Ev$NJD(B}) (@var{$B$^$P$i3+(B} . @var{$B$^$P(B
-$B$iJD(B}) (@var{$B56$N3+(B} . @var{$B56$NJD(B}))} $B$H$J$C$F$$$F!"%G%#%U%)%k%H(B
+$B$3$l$O!XK\Ev$N!Y5-;v$H!X$^$P$i!Y$J5-;v$K0c$$$rIU$1$k$?$a$K;H$o$l$^$9!#MM(B
+$B<0$O(B
+
+@example
+((@var{$BK\Ev$N3+(B} . @var{$BK\Ev$NJD(B})
+ (@var{$B$^$P$i3+(B} . @var{$B$^$P$iJD(B})
+ (@var{$B56$N3+(B} . @var{$B56$NJD(B}))
+@end example
+
+$B$H$J$C$F$$$F!"%G%#%U%)%k%H(B
 $B$O(B @code{((?[ . ?]) (?( . ?)) (?@{ . ?@}) (?< . ?>))} $B$G$9!#(B
 
 @item gnus-tree-parent-child-edges
 @vindex gnus-tree-parent-child-edges
-$B$3$l$O?F$N@a$r;R$K@\B3$9$k$?$a$K;H$o$l$kJ8;z$r4^$s$@%j%9%H$G$9!#%G%#%U%)(B
-$B%k%H$O(B @code{(?- ?\\ ?|)} $B$G$9!#(B
+$B$3$l$O?F$N@a$r;R$K@\B3$9$k$?$a$K;H$o$l$kJ8;z$r4^$`%j%9%H$G$9!#%G%#%U%)%k(B
+$B%H$O(B @code{(?- ?\\ ?|)} $B$G$9!#(B
 @end table
 
 @item gnus-tree-minimize-window
-@vindex gnus-tree-minimize-winodw
+@vindex gnus-tree-minimize-window
 $B$b$7$3$NJQ?t$,(B @code{nil} $B$G$J$$$H!"B>$N(B gnus $B%&%#%s%I%&$,$b$C$H>l=j$r.$5$/$7$^$9!#$b$7$3$NJQ?t$,?t;z(B
-$B$G$"$k$H!"LZ%P%C%U%!$O$=$N?t;z$h$jBg$-$/$J$k;v$O$"$j$^$;$s!#%G%#%U%)%k%H(B
-$B$O(B @code{t} $B$G$9!#%U%l!<%`$G$$$/$D$+$N%&%#%s%I%&$,2#$KJB$s$GI=<($5$l$F$$(B
-$B$F!"LZ%P%C%U%!$,$=$N$&$A$N0l$D$G$"$k>l9g!"LZ%&%#%s%I%&$r:G>.2=$9$k$3$H$O(B
-$B$=$NNY$KI=<($5$l$F$$$k$9$Y$F$N%&%#%s%I%&$NBg$-$5$rJQ99$9$k;v$KCm0U$7$F$/(B
-$B$@$5$$!#(B
-
-$B0J2<$N%U%C%/$rDI2C$7$F!"$$$D$G$bLZ%&%#%s%I%&$r:G>.2=$7$F$bNI$$$G$7$g$&!#(B
+$B$l$k$h$&$K(B gnus $B$OLZ%P%C%U%!!<$r$G$-$k$@$1>.$5$/$7$^$9!#$b$7$3$NJQ?t$,?t(B
+$BCM$G$"$k$H!"LZ%P%C%U%!!<$N9b$5$O$=$N?tCM$h$jBg$-$/$J$k$3$H$O$"$j$^$;$s!#(B
+$B%G%#%U%)%k%H$O(B @code{t} $B$G$9!#%U%l!<%`$G$$$/$D$+$N%&%#%s%I%&$,2#$KJB$s$G(B
+$BI=<($5$l$F$$$F!"LZ%P%C%U%!!<$,$=$N$&$A$N0l$D$G$"$k>l9g!"LZ%&%#%s%I%&$r:G(B
+$B>.2=$9$k$3$H$O$=$NNY$KI=<($5$l$F$$$k$9$Y$F$N%&%#%s%I%&$NBg$-$5$r$bJQ99$9(B
+$B$k$3$H$KCm0U$7$F2<$5$$!#(B
+
+$B0J2<$N%U%C%/$rDI2C$7$F!"$$$D$G$bLZ%&%#%s%I%&$r:G>.2=$9$k$h$&$K$7$F$bNI$$(B
+$B$G$7$g$&!#(B
 
 @lisp
 (add-hook 'gnus-configure-windows-hook
@@ -9257,12 +9473,13 @@ Line Formatting})$B!#%G%#%U%)%k%H$O(B @samp{Gnus: %%b %S %Z} $B$G$9!#;HMQ2DG=
 @vindex gnus-generate-tree-function
 @findex gnus-generate-horizontal-tree
 @findex gnus-generate-vertical-tree
-$BLZ%P%C%U%!(B (vertical tree buffer) $B$GI=<($5$l$?$b$N$G$9(B:
+$BF1$8%9%l%C%I$,?bD>LZ%P%C%U%!!<(B (vertical tree buffer) $B$GI=<($5$l$?$b$N$G(B
+$B$9(B:
 
 @example
 @{***@}
@@ -9289,9 +9507,9 @@ Line Formatting})$B!#%G%#%U%)%k%H$O(B @samp{Gnus: %%b %S %Z} $B$G$9!#;HMQ2DG=
                         [Paa]
 @end example
 
-$B$b$7?eJ?LZ$r;H$C$F$$$k$N$J$i!"35N,%P%C%U%!$GLZ$rNY$j9g$o$;$GI=<($G$-$l$P(B
-$B4r$7$$$G$7$g$&!#C5n$HJT=8L?Na$O=|$/(B) $B%W%m%;%9(B/$B@\F,0z?t$N(B
+$B=,47$r;H$$$^$9(B (@pxref{Process/Prefix})$B!#(B
 
 @table @kbd
 @item B e
 @kindex B e ($B35N,(B)
 @findex gnus-summary-expire-articles
-$B8=:_$N%0%k!<%W$N$9$Y$F$N4|8B:o=|2DG=$J5-;v$K$D$$$F!"4|8B:o=|$N=h(B
+$B8=:_$N%0%k!<%W$N$9$Y$F$N4|8B@Z$l>C5n2DG=$J5-;v$K$D$$$F!"4|8B@Z$l>C5n$N=h(B
 $BM}(B (@code{gnus-summary-expire-articles}) $B$r9T$J$$$^$9!#$3$l$O!"$=$N%0%k!<(B
-$B%W$K$7$P$i$/B8:_$7$F$$$?4|8B@Z$l:o=|2DG=$J$9$Y$F$N5-;v$r>C5n$9$k$H$$$&$3(B
+$B%W$K$7$P$i$/B8:_$7$F$$$?4|8B@Z$l>C5n2DG=$J$9$Y$F$N5-;v$r>C5n$9$k$H$$$&$3(B
 $B$H$G$9!#(B(@pxref{Expiring Mail})$B!#(B
 
 @item B C-M-e
 @kindex B C-M-e ($B35N,(B)
 @findex gnus-summary-expire-articles-now
-$B%0%k!<%W$N$9$Y$F$N4|8B:o=|2DG=$J5-;v$r:o=|$7$^(B
-$B$9(B (@code{gnus-summay-expire-articles-now})$B!#$3$l$O8=:_$N%0%k!<%W$N3:Ev(B
-$B$9$k(B @strong{$BA4$F(B}$B$N4|8B:o=|5-;v$O1J1s$K6u$NBg$-$J(B @file{/dev/null} $B$X>C(B
-$B$(5n$k$H$$$&;v$G$9!#(B
+$B%0%k!<%W$N$9$Y$F$N4|8B@Z$l>C5n2DG=$J5-;v$r:o=|$7$^(B
+$B$9(B (@code{gnus-summay-expire-articles-now})$B!#$3$l$O!"8=:_$N%0%k!<%W$K$"(B
+$B$k(B @strong{$B$9$Y$F(B} $B$N4|8B@Z$l>C5n2DG=$J5-;v$,!"1J1s$K6u$NBg$-(B
+$B$J(B @file{/dev/null} $B$X>C$(5n$k$H$$$&$3$H$G$9!#(B
 
 @item B DEL
 @kindex B DEL ($B35N,(B)
 @findex gnus-summary-delete-article
 @c @icon{gnus-summary-mail-delete}
-$B%a!<%k5-;v$r:o=|$7$^$9!#$3$l$O!X$"$J$?$N%G%#%9%/$+$i:#$+$i1J1s$K:o=|$7$F!"(B
-$BFsEY$HLa$i$J$$!Y$N!X:o=|!Y$G$9!#Cm0U$7$F;H$C$F$/$@$5(B
+$B%a!<%k5-;v$r:o=|$7$^$9!#$3$l$O!X$"$J$?$N%G%#%9%/$+$i1J5W$K:o=|$7$FFsEY$H(B
+$BLa$i$J$$!Y$N0UL#$N!X:o=|!Y$G$9!#Cm0U$7$F;H$C$F2<$5(B
 $B$$(B (@code{gnus-summary-delete-article})$B!#(B
 
 @item B m
@@ -9348,26 +9566,26 @@ Line Formatting})$B!#%G%#%U%)%k%H$O(B @samp{Gnus: %%b %S %Z} $B$G$9!#;HMQ2DG=
 @cindex move mail
 @findex gnus-summary-move-article
 @vindex gnus-preserve-marks
-$B$"$k%a!<%k%0%k!<%W$+$iJL$N$H$3$m$X5-;v$r0\F0$7$^(B
+$B$"$k%a!<%k%0%k!<%W$+$iJL$N%a!<%k%0%k!<%W$X5-;v$r0\F0$7$^(B
 $B$9(B (@code{gnus-summary-move-article})$B!#(B@code{gnus-preserve-marks} $B$NCM(B
-$B$,(B @code{nil} $B$G$O$J$$$J$i$P(B ($B$3$l$,=i4|CM$G$9$,(B)$B!"%^!<%/$OJ]B8$5$l$^$9!#(B
+$B$,(B @code{nil} $B$G$J$1$l$P(B ($B$=$l$,%G%#%U%)%k%H(B)$B!"0u$OJ]B8$5$l$^$9!#(B
 
 @item B c
 @kindex B c ($B35N,(B)
 @cindex copy mail
 @findex gnus-summary-copy-article
 @c @icon{gnus-summary-mail-copy}
-$B$"$k%0%k!<%W(B ($B%a!<%k%0%k!<%W$dB>$N$b$N(B) $B$+$i%a!<%k%0%k!<%W$K5-;v$rJ#@=$7(B
-$B$^$9(B (@code{gnus-summary-copy-article})$B!#(B@code{gnus-preserve-marks} $B$NCM(B
-$B$,(B @code{nil} $B$G$O$J$$$J$i$P(B ($B$3$l$,=i4|CM$G$9$,(B)$B!"%^!<%/$OJ]B8$5$l$^$9!#(B
+$B$"$k%0%k!<%W(B ($B%a!<%k%0%k!<%W$dB>$N$b$N(B) $B$+$i%a!<%k%0%k!<%W$K5-;v$r%3%T!<(B
+$B$7$^$9(B (@code{gnus-summary-copy-article})$B!#(B@code{gnus-preserve-marks} $B$N(B
+$BCM$,(B @code{nil} $B$G$J$1$l$P(B ($B$=$l$,%G%#%U%)%k%H(B)$B!"0u$OJ]B8$5$l$^$9!#(B
 
 @item B B
 @kindex B B ($B35N,(B)
 @cindex crosspost mail
 @findex gnus-summary-crosspost-article
 $B8=:_$N5-;v$rB>$N%0%k!<%W$K%/%m%9%]%9%H$7$^(B
-$B$9(B (@code{gnus-summary-crosspost-article})$B!#$3$l$OB>$N%0%k!<%W5-;v$N?7$7(B
-$B$$J#@=$r:n@.$7!"5-;v$N(B Xref $BMs$bE,@Z$K99?7$5$l$^$9!#(B
+$B$9(B (@code{gnus-summary-crosspost-article})$B!#$3$l$OB>$N%0%k!<%W$N5-;v$N?7(B
+$B$7$$J#@=$r:n@.$7!"5-;v$N(B Xref $BMs$bE,@Z$K99?7$5$l$^$9!#(B
 
 @item B i
 @kindex B i ($B35N,(B)
@@ -9389,10 +9607,16 @@ Line Formatting})$B!#%G%#%U%)%k%H$O(B @samp{Gnus: %%b %S %Z} $B$G$9!#;HMQ2DG=
 @vindex gnus-summary-respool-default-method
 $B%a!<%k5-;v$r%9%W!<%k$7D>$7$^$9(B (@code{gnus-summary-move-article})$B!#(B
 @code{gnus-summary-respool-default-method} $B$,:F%9%W!<%k$9$k$H$-$N%G%#%U%)(B
-$B%k%H$NA*BrJ}K!$H$7$F;HMQ$5$l$^$9!#$3$NJQ?t$O%G%#%U%)%k%H$G(B @code{nil} $B$G!"(B
-$B$3$l$O8=:_$N%0%k!<%W$NA*BrJ}K!$,Be$o$j$K;H$o$l$k$H$$$&;v$G$9!#(B
-@code{gnus-preserve-marks} $B$NCM$,(B @code{nil} $B$G$O$J$$$J$i$P(B ($B$3$l$,=i4|(B
-$BCM$G$9$,(B)$B!"%^!<%/$OJ]B8$5$l$^$9!#(B
+$B%k%H$NA*BrJ}K!$H$7$F;HMQ$5$l$^$9!#$3$NJQ?t$O%G%#%U%)%k%H$G(B
+$B$O(B @code{nil} $B$G!"$=$N>l9g$O8=:_$N%0%k!<%W$NA*BrJ}K!$,Be$o$j$K;H$o$l$^$9!#(B
+@code{gnus-preserve-marks} $B$NCM$,(B @code{nil} $B$G$J$1$l$P(B ($B$=$l$,%G%#%U%)(B
+$B%k%H(B)$B!"0u$OJ]B8$5$l$^$9!#(B
+
+$BLuCm(B: $B!V%9%W!<%k$7D>$9!W$H$$$&$N$O%a!<%k$NJ,(B
+$B3d(B (@ref{Splitting Mail} $B$^$?$O(B @ref{Fancy Mail Splitting}) $B$N5,B'$K4p$E(B
+$B$$$F!"%a!<%k$rE,@Z$J%0%k!<%W$KF~$lD>$9$3$H$G$9!#$=$N%0%k!<%W$K4V0c$C$FF~$C(B
+$B$F$7$^$C$?%a!<%k$r!"J,3d$N5,B'$r=$@5$7$?8e$G!"@5$7$$%0%k!<%W$K0\F0$5$;$k(B
+$B>l9g$J$I$K;H$$$^$9!#$3$N>O$N(B @kbd{B q} $B$H(B @kbd{B t} $B$b8+$F2<$5$$!#(B
 
 @item B w
 @itemx e
@@ -9402,37 +9626,45 @@ Line Formatting})$B!#%G%#%U%)%k%H$O(B @samp{Gnus: %%b %S %Z} $B$G$9!#;HMQ2DG=
 @kindex C-c C-c ($B5-;v(B)
 @findex gnus-summary-edit-article-done
 $B8=:_$N5-;v$rJT=8$7$^$9(B (@code{gnus-summary-edit-article})$B!#JT=8$r=*N;$7(B
-$B$FJQ99$r1J1s$K$9$k$?$a(B
-$B$K(B @kbd{C-c C-c} (@code{gnus-summary-edit-article-done}) $B$rBG$A$^$9!#$b(B
-$B$7L?Na(B @kbd{C-c C-c} $B$K?tCM@\F,0z?t$rM?$($k$H!"(Bgnus $B$O5-;v$r:F%O%$%i%$%H(B
-$B$7$^$;$s!#(B
+$B$FJQ99$r8GDj$9$k$K(B
+$B$O(B @kbd{C-c C-c} (@code{gnus-summary-edit-article-done}) $B$rBG$A$^$9!#$b(B
+$B$7(B @kbd{C-c C-c} $BL?Na$K@\F,0z?t$rM?$($k$H!"(Bgnus $B$O5-;v$r:F%O%$%i%$%H$7$^(B
+$B$;$s!#(B
+
+$BLuCm(B: $BJQ99$7$J$$$GJT=8$r=*$k$K$O!"(B@kbd{C-c C-k} $B$r%?%$%W$7$F2<$5$$!#(B
 
 @item B q
 @kindex B q ($B35N,(B)
 @findex gnus-summary-respool-query
-$B$b$75-;v$r:F%9%W!<%k$7$?$$$H$-$O!":F%9%W!<%k$r$9$kA0$K$I$N%0%k!<%W$K5-;v(B
-$B$,0\$k$+$K6=L#$,$"$k$G$7$g$&!#$3$NL?Na$G$=$l$,$o$+$j$^(B
+$B5-;v$r:F%9%W!<%k$9$k$H$-$O!":F%9%W!<%k$r$9$kA0$K$I$N%0%k!<%W$K5-;v$,0\$k(B
+$B$+$rCN$j$?$$$G$7$g$&!#$3$NL?Na$G$=$l$,$o$+$j$^(B
 $B$9(B (@code{gnus-summary-respool-query})$B!#(B
 
 @item B t
 @kindex B t ($B35N,(B)
 @findex gnus-summary-respool-trace
-$BF1MM$K!"$3$NL?Na$O:FN/$a9~$_$r$9$k$H$-$K;H$o$l$?A4$F$NFC5iJ,3dJ}<0$r!"$b(B
-$B$7$=$l$,$"$l$PI=<($7$^$9(B (@code{gnus-summary-respool-trace})$B!#(B
+$BF1MM$K!"$3$NL?Na$O:F%9%W!<%k$9$k$H$-$K;H$o$l$k$9$Y$F$NFC5iJ,3dJ}<0$r!"$b(B
+$B$7$"$l$PI=<($7$^$9(B (@code{gnus-summary-respool-trace})$B!#(B
 
 @item B p
 @kindex B p ($B35N,(B)
 @findex gnus-summary-article-posted-p
-$B0lIt$N?M$O$"$J$?$NEj9F$X$N%U%)%m!<%"%C%W$r$9$k$H$-$K!"(B``$B?F@Z$J(B'' $BJ#@=$r(B
-$BAw$k798~$,$"$j$^$9!#$3$l$i$OIaDL$O$=$3$K(B @code{Newsgroups} $BMs$,IU$$$F$$(B
-$B$k$N$G$9$,!"$$$D$b$=$&$G$"$k$H$O8B$j$^$;$s!#$3$NL?(B
+$B0lIt$N?M$?$A$K$O!"$"$J$?$,Ej9F$7$?5-;v$K%U%)%m!<%"%C%W$9$k$H$-$K!V?F@Z$J!W(B
+$BJ#@=$rAw$k798~$,$"$j$^$9!#$3$l$i$OIaDL$O$=$3$K(B @code{Newsgroups} $B%X%C%@!<(B
+$B$,IU$$$F$$$k$N$G$9$,!"$$$D$b$=$&$G$"$k$H$O8B$j$^$;$s!#$3$NL?(B
 $BNa(B (@code{gnus-summary-article-posted-p}) $B$O8=:_$N5-;v$r$"$J$?$N%K%e!<%9(B
 $B%5!<%P!<$+$i(B ($B$H$$$&$h$j$O!"$`$7(B
 $B$m(B @code{gnus-refer-article-method} $B$d(B @code{gnus-select-method} $B$+(B
-$B$i(B) $B$r;H$&$N$KBP$7(B
 $B$F(B @code{gnus-move-split-methods} $B$O%0%k!<%WL>$r;H$&$3$H$KCm0U$7$F2<$5(B
 $B$$!#(B)
@@ -9462,67 +9694,68 @@ Line Formatting})$B!#%G%#%U%)%k%H$O(B @samp{Gnus: %%b %S %Z} $B$G$9!#;HMQ2DG=
 @end lisp
 
 @node Various Summary Stuff
-@section $B$$$m$$$m$J35N,$NJ*7o(B
+@section $B35N,$N$$$m$$$m$J$b$N(B
 
 @menu
 * Summary Group Information::   $B>pJs;X8~$NL?Na(B
 * Searching for Articles::      $BJ#?t5-;vL?Na(B
 * Summary Generation Commands::
-* Really Various Summary Commands::  $B$"$N$d$C$+$$$JB>$KE,9g$7$J$$L?Na(B
+* Really Various Summary Commands::  $B$"$N$d$C$+$$$J;W$$DL$j$K$J$i$J$$L?Na(B
 @end menu
 
 @table @code
 @vindex gnus-summary-display-while-building
 @item gnus-summary-display-while-building
-$BHs(B-@code{nil} $B$@$C$?$i!"9=C[Cf$N35N,%P%C%U%!$r99?7$7$J$,$iI=<($7$^$9!#(B
-@code{t} $B$@$C$?>l9g$O!"9T$,A^F~$5$l$kEY$KKh2s%P%C%U%!$r99?7$7$^$9!#CM$,(B
-$B@0?t(B @var{n} $B$G$"$C$?>l9g$O!"(B@var{n} $B9TKh$KI=<($r99?7$7$^$9!#%G%#%U%)%k(B
-$B%H$O(B @code{nil} $B$G$9!#(B
+$BHs(B-@code{nil} $B$@$C$?$i!"9=C[Cf$N35N,%P%C%U%!!<$r99?7$7$J$,$iI=<($7$^$9!#(B
+@code{t} $B$@$C$?>l9g$O!"9T$,A^F~$5$l$kEY$KKh2s%P%C%U%!!<$r99?7$7$^$9!#CM(B
+$B$,@0?t(B @var{n} $B$G$"$C$?>l9g$O!"(B@var{n} $B9TKh$KI=<($r99?7$7$^$9!#%G%#%U%)(B
+$B%k%H$O(B @code{nil} $B$G$9!#(B
 
 @vindex gnus-summary-display-arrow
 @item gnus-summary-display-arrow
 $BHs(B-@code{nil} $B$@$C$?$i!"8=:_$N5-;v$r;X$7<($9$?$a$K%U%j%s%8$KLp0u$rI=<($7(B
-$B$^$9!#(B
+$B$^$9!#(B($BLuCm(B: $B%U%j%s%8$H$O(B Emacs 21 $B0J>e$G%&%#%s%I%&$N:81&$K8=$l$kM>Gr$N(B
+$B$3$H$G$9!#(B)
 
 @vindex gnus-summary-mode-hook
 @item gnus-summary-mode-hook
-$B35N,%b!<%I%P%C%U%!$r:n@.$9$k$H$-$K$3$N%U%C%/$,8F$P$l$^$9!#(B
+$B35N,%b!<%I$N%P%C%U%!!<$r:n@.$9$k$H$-$K$3$N%U%C%/$,8F$P$l$^$9!#(B
 
 @vindex gnus-summary-generate-hook
 @item gnus-summary-generate-hook
-$B$3$l$O%9%l%C%I:n@.$H35N,%P%C%U%!:n@.$NA0$Ko$KJXMx$G$9!#$3$N%U%C%/$O$[$H$s$I$N35N,%P%C%U%!(B
-$BJQ?t$,@_Dj$5$l$?8e$K8F$P$l$^$9!#(B
+$B$3$l$O%9%l%C%I:n@.$H35N,%P%C%U%!!<:n@.$NA0$Ko$KJXMx$G$9!#$3$N%U%C%/$O$[$H$s$I$N35N,%P%C%U%!!<(B
+$BJQ?t$,@_Dj$5$l$?8e$K35N,%P%C%U%!!<$+$i8F$P$l$^$9!#(B
 
 @vindex gnus-summary-prepare-hook
 @item gnus-summary-prepare-hook
-$B$=$l$O35N,%P%C%U%!$,:n@.$5$l$?8e$K8F$P$l$^$9!#Nc$($P!"$=$l$O2?$+B>$N$N5-;v$HF1$8$h$&$KI=<($7$^$9!#$3$NJQ?t$,(B @code{t} $B$G$"$k$H!"(B
-$B$=$l$O5-;v$rI=<($7$^$;$s(B---$B:G=i$+$iB8:_$7$J$+$C$?$+$N$h$&$K!#(B
+gnus $B$,F1$8(B @code{Message-ID} $B$r;}$DFs$D$N5-;v$rH/8+$7$?$H$-$O!"2?$+;W$$(B
+$B@Z$C$?$3$H$r$7$J$1$l$P$J$j$^$;$s!#JL$N5-;v$,F1$8(B @code{Message-ID} $B$r;}(B
+$B$D$3$H$O5v$5$l$F$$$^$;$s$,!"$=$l$O2?$i$+$N%=!<%9$+$i%a!<%k$rFI$s$G$$$k$H(B
+$B$-$K5/$3$k$+$b$7$l$^$;$s!#$3$NJQ?t$K$h$C$F(B gnus $B$,2?$r$9$k$+$r%+%9%?%^%$(B
+$B%:$G$-$k$h$&$K$J$C$F$$$^$9!#(B@code{nil} $B$@$C$?$i(B ($B$=$l$,%G%#%U%)%k%H$G$9(B)$B!"(B
+gnus $B$O(B @code{Message-ID} $B$rIU$1BX$($F(B ($BI=<($N$?$a$@$1$K(B) $B$=$N5-;v$rB>$N(B
+$B5-;v$HF1$8$h$&$KI=<($7$^$9!#(B@code{t} $B$K$9$k$H!"$=$l$O5-;v$rI=<($7$^$;(B
+$B$s(B---$B:G=i$+$iB8:_$7$J$+$C$?$+$N$h$&$K!#(B
 
 @vindex gnus-alter-articles-to-read-function
 @item gnus-alter-articles-to-read-function
 $B$3$NJQ?t$K@_Dj$7$?4X?t$G!"A*Br$9$k5-;v$N%j%9%H$rJQ99$9$k$3$H$,$G$-$^$9!#(B
 $B4X?t$OFs$D$N0z?t(B ($B%0%k!<%WL>$HA*Br$9$k5-;v$N%j%9%H(B) $B$r2A$5$l$k%G%#%U%)%k%H$NI=8=(B ($B%G%#%U%)%k%HCM$,(B @code{nil} $B$G$J$$>l(B
-$B9g(B) $B$N(B cons $B%;%k$N%j%9%H$G!"$=$N35N,%P%C%U%!$,3h$-$F$$$k4V$O%0%m!<%P%kJQ(B
-$B?t$K$J$j$^$9!#(B
+$B%K%e!<%9%0%k!<%W(B ($B$=$N35N,%P%C%U%!!<$N(B) $B$N%m!<%+%kJQ?t!"$^$?$OJQ?t$H$=$l(B
+$B$i$NI>2A$5$l$k%G%#%U%)%k%H$NI=8=(B ($B%G%#%U%)%k%HCM$,(B @code{nil} $B$G$J$$>l(B
+$B9g(B) $B$N(B cons $B%;%k$N%j%9%H$G!"$=$N35N,%P%C%U%!!<$,3h$-$F$$$k4V$O%0%m!<%P%k(B
+$BJQ?t$K$J$j$^$9!#(B($BLuCm(B: $B$$$o$f$k%P%C%U%!!<%m!<%+%kJQ?t$G$O$"$j$^$;$s!#(B)
 
 $BCm(B: $B%G%#%U%)%k%H$NI=8=$OC1$K%m!<%+%kJQ?t$K@_Dj$5$l$k$N$G$O$J$/!"$=$NA0(B
 $B$K(B (@code{eval} $B4X?t$r;H$C$F(B) $BI>2A$5$l$^$9!#%G%#%U%)%k%H$NI=8=(B
 $B$,(B @code{global} $B$H$$$&%7%s%\%k$@$C$?>l9g$OI>2A$5$l$:!"Be$o$j$K$=$N%m!<(B
 $B%+%kJQ?t$N%0%m!<%P%kCM$,;H$o$l$^$9!#(B
 
-$B$3$l$i%0%k!<%W%Q%i%a!<%?$NCM$,B>$N%P%C%U%!!<$G9T$J$o$l$k=hM}$K1F6A$9$k$h(B
-$B$&$K$J$C$F$$$F$b!"(B($BLuCm(B: $B$=$N35N,%P%C%U%!$N(B) $B%0%k!<%W%Q%i%a!<%?$r@_Dj$9(B
-$B$k$?$a$K;H$&$3$H$,$G$-$^$9!#Nc$G$9(B:
+$B$3$l$i%0%k!<%W%Q%i%a!<%?!<$NCM$,B>$N%P%C%U%!!<$G9T$J$o$l$k=hM}$K1F6A$9$k(B
+$B$h$&$K$J$C$F$$$F$b!"(B($BLuCm(B: $B$=$N35N,%P%C%U%!!<$N(B) $B%0%k!<%W%Q%i%a!<%?!<$r(B
+$B@_Dj$9$k$?$a$K;H$&$3$H$,$G$-$^$9!#Nc$G$9(B:
 
 @lisp
 (setq gnus-newsgroup-variables
@@ -9554,7 +9787,47 @@ Gnus $B$,F1$8(B @code{Message-ID} $B$r;}$DFs$D$N5-;v$rH/8+$7$?$H$-$O!"2?$+;W$
          "^From:\\|^Newsgroups:\\|^Subject:\\|^Date:\\|^To:")))
 @end lisp
 
-@pxref{Group Parameters} $B$b;2>H$7$F2<$5$$!#(B
+@ref{Group Parameters} $B$b;2>H$7$F2<$5$$!#(B
+
+$BLuCm(B: $B$b$C$HNI$$Nc$,I,MW$G$9!#(B@code{gnus-newsgroup-variables} $B$*$h(B
+$B$S(B @code{gnus-parameters} (@pxref{Group Parameters}) $B$NCM$ro$N%0%k!<%W%Q%i%a!<%?!<$O!"$=$N%0%k!<%W$N35N,%P%C%U%!!<$G$@$1CM$rCN$k(B
+$B$3$H$,$G$-$k$N$KBP$7$F!"(B@code{gnus-newsgroup-variables} $B$G@_Dj$7$?JQ?t$O!"(B
+$BF1$8(B Emacs $B$N$I$N%P%C%U%!!<$G$b!"8=:_A*Br$5$l$F$$$k%0%k!<%W8GM-$NCM$r;}(B
+$B$DE@$,0c$$$^$9!#0[$J$kJ#?t$N%0%k!<%W$N35N,%P%C%U%!!<$r;H$&>l9g$K$O!"Cm0U(B
+$B$9$kI,MW$,$"$j$^$9!#(B
+
+$BFCJL$J>l9g$H$7$F(B @var{foo} $B$,(B @code{nil} $B$GNI$$>l9g$O!"l9g$O!"$3$N(B
-$BL?Na$K@\F,0z?t$rM?$($k;v$G$$$m$$$m$J%5%$%H(B (site) $B$+$iA*$V;v$,$G$-$^$9!#(B
-$B$*$=$i$/(B @code{ange-ftp} $B$b$7$/$O(B @code{efs} $B$,%U%!%$%k$No$3$l$O1s3V%^%7%s$N%G%#%l%/(B
+$B%H%j!<(B) $B$+$i(B @acronym{FAQ} $B$rl9g!"$3$NL?Na$K@\F,0z?t$rM?$($k$3$H$K(B
+$B$h$C$F$$$m$$$m$J%5%$%H$+$iA*$V$3$H$,$G$-$^$9!#$*$=$i(B
+$B$/(B @code{ange-ftp} $B$b$7$/$O(B @code{efs} $B$,%U%!%$%k$No$KC;$$5-=R$rM?$($^(B
+$B:G$b=EMW$J35N,%3%^%s%I$N!"Hs>o$K4J7i$J@bL@$rI=<($7$^(B
 $B$9(B (@code{gnus-summary-describe-briefly})$B!#(B
 
 @item H i
 @kindex H i ($B35N,(B)
 @findex gnus-info-find-node
-Gnus $B$N(B info $B$N@a(B (node) $B$K0\F0$7$^$9(B (@code{gnus-info-find-node})$B!#(B
+gnus $B$N(B info $B$N@a(B (node) $B$K0\F0$7$^$9(B (@code{gnus-info-find-node})$B!#(B
 @end table
 
 @node Searching for Articles
@@ -9600,31 +9873,32 @@ Gnus $B$N(B info $B$N@a(B (node) $B$K0\F0$7$^$9(B (@code{gnus-info-find-no
 @item M-s
 @kindex M-s ($B35N,(B)
 @findex gnus-summary-search-article-forward
-$BD>8e$K$"$kA4$F$N(B ($B@8$N(B) $B5-;v$r@55,I=8=$G8!:w$7$^(B
+$B$=$l0J9_$N$9$Y$F$N(B ($B@8$N(B) $B5-;v$r@55,I=8=$G8!:w$7$^(B
 $B$9(B (@code{gnus-summary-search-article-forward})$B!#(B
 
 @item M-r
 @kindex M-r ($B35N,(B)
 @findex gnus-summary-search-article-backward
-$BA0$K$"$kA4$F$N(B ($B@8$N(B) $B5-;v$r@55,I=8=$G8!:w$7$^(B
+$B$=$l0JA0$N$9$Y$F$N(B ($B@8$N(B) $B5-;v$r@55,I=8=$G8!:w$7$^(B
 $B$9(B (@code{gnus-summary-search-article-backward})$B!#(B
 
 @item &
 @kindex & ($B35N,(B)
 @findex gnus-summary-execute-command
-$B$3$NL?Na$O$"$J$?$K%X%C%@!l9g(B
-$B$K$N5-;v$N=8$^$j$G$"$k$J$i$P(B ($BNc$($P!"E&MW(B (digest))$B!"(B
-$B$=$N$h$&$J5-;v$G$G$-$F$$$k%0%k!<%W$KF~$k$?$a$K$3$NL?Na$r;H$&$+$b$7$l$^$;(B
-$B$s(B(@code{gnus-summary-enter-digest-group})$B!#(BGnus $B$O$3$NL?Na$K@\F,0z?t$r(B
-$BM?$($J$$8B$j!"$I$N$h$&$J7?$N5-;v$,8=:_I=<($5$l$F$$$k$+$r?dB,$7$h$&$H$7!"(B
-$B$=$l$O6/@)E*$K!XE&MW!Y$H$$$&2r$NMM<0$+$i$J$kB>(B
-$B$N%a%C%;!<%8$N=89g$G$"$C$?$H$-$O!"(B@kbd{C-d} $B$H$9$k$3$H$K$h$j$b$C$HJXMx$J(B
-$BJ}K!$G$=$l$i$N%a%C%;!<%8$rFI$`;v$,$G$-$k$h$&$K$J$j$^$9!#(B
+$B8=:_$N5-;v$,JL$N5-;v$r4s$;=8$a$?$b$N(B ($BNc$($P%@%$%8%'%9%H(B) $B$G$"$k$J$i$P!"(B
+$B$=$l$i$N5-;v$G$G$-$F$$$k%0%k!<%W$KF~$k$?$a$K$3$NL?Na$r;H$&$3$H$,$G$-$^(B
+$B$9(B (@code{gnus-summary-enter-digest-group})$B!#$3$NL?Na$K@\F,0z?t$rM?$($J(B
+$B$$$H(B gnus $B$O$I$N$h$&$J7?$N5-;v$,8=:_I=<($5$l$F$$$k$+$r?dB,$7$h$&$H$7!"e$N$b$N$KHs>o$K;w$F$$$^$9$,!"$$$/$D$+$NJ8=q$r0l$D$NBg!<$-$$%0(B
-$B%k!<%W$K=8$a$^$9(B (@code{gnus-summary-read-read-document})$B!#$=$l$O$$$/$D(B
-$B$+$N(B @code{nndoc} $B%0%k!<%W$r$=$l$>$l$NJ8=q$N$?$a$K3+$-!"$=$l$+$i$3$l$i(B
-$B$N(B @code{nndoc} $B%0%k!<%W$N>e$K(B @code{nnvirtual} $B%0%k!<%W$r3+$/;v$K$h$C$F(B
-$B$3$N;v$r2DG=$K$7$F$$$^$9!#$3$NL?Na$O%W%m%;%9(B/$B@\F,0z?t$N=,47$rM}2r$7$^(B
+$B$3$NL?Na$O>e$N$b$N$K$h$/;w$F$$$^$9$,!"$$$/$D$+$NJ8=q$r0l$D$N$*$*!<$-$J%0(B
+$B%k!<%W$K=8$a$^$9(B (@code{gnus-summary-read-read-document})$B!#$=$l$r$l$NJ8=q$N$?$a$N(B @code{nndoc} $B%0%k!<%W$r3+$$$F(B
+$B$+$i!"$=$l$iJ#?t$N(B @code{nndoc} $B%0%k!<%W$N$F$C$Z$s$G(B @code{nnvirtual} $B%0(B
+$B%k!<%W$r3+$-$^$9!#$3$NL?Na$O%W%m%;%9(B/$B@\F,0z?t$N=,47$rM}2r$7$^(B
 $B$9(B (@pxref{Process/Prefix})$B!#(B
 
 @item C-t
 @kindex C-t ($B35N,(B)
-@findex gnus-summary-togle-truncation
-$B35N,9T$N@ZCG$r@Z$jBX$($^$9(B (@code{gnus-summary-toggle-truncation})$B!#$3$l(B
-$B$O$*$=$i$/35N,%P%C%U%!$N9TCf1{I=<(4X?t$r:.Mp$5$;$^$9$N$G!"5-;v$rFI$s$G$$(B
-$B$k4V$K@ZCG$r@Z$C$F$$$k$N$ONI$$9M$($G$O$J$$$G$7$g$&!#(B
+@findex gnus-summary-toggle-truncation
+$BD9$$35N,9T$r@Z$j5M$a$k$+$I$&$+$r@Z$jBX$($^(B
+$B$9(B (@code{gnus-summary-toggle-truncation})$B!#$3$l$O$*$=$i$/35N,%P%C%U%!!<(B
+$B$G9T$rCf1{$KI=<($9$k5!G=$r:.Mp$5$;$k$N$G!"5-;v$rFI$s$G$$$k$H$-$K9T$N@Z$j(B
+$B5M$a$r(B off $B$K$9$k$N$ONI$$9M$($G$O$J$$$G$7$g$&!#(B
 
 @item =
 @kindex = ($B35N,(B)
 @findex gnus-summary-expand-window
-$B35N,%P%C%U%!$N%&%#%s%I%&$r3HBg$7$^(B
-$B$9(B (@code{gnus-summary-expand-window})$B!#@\F,0z?t$rM?$($i$l$l$P!"(B
-@code{$B5-;v(B} $B%&%#%s%I%&$r3HBg$7$^$9!#(B
+$B35N,%P%C%U%!!<$N%&%#%s%I%&$r3HBg$7$^(B
+$B$9(B (@code{gnus-summary-expand-window})$B!#@\F,0z?t$rM?$($i$l$k$H!"5-;v%P%C(B
+$B%U%!!<$N$?$a$N%&%#%s%I%&$NG[CV$N@_Dj$r6/@)$7$^$9(B ($BLuCm(B: $B%G%#%U%)%k%H$G$O(B
+$B5-;v%P%C%U%!!<$N$?$a$N%&%#%s%I%&$NG[CV$N@_Dj$K$O35N,%P%C%U%!!<$rI=<($9$k(B
+$B$3$H$b4^$^$l$F$$$k$N$G!"IaDL$K5-;v$rFI$s$G$$$k$H$-$HF1$8$K$J$k$G$7$g$&(B)$B!#(B
 
 @item C-M-e
 @kindex C-M-e ($B35N,(B)
 @findex gnus-summary-edit-parameters
-$B8=:_$N%0%k!<%W$N%0%k!<%W$NG^2pJQ?t(B (parameter) (@pxref{Group
-Parameters}) $B$rJT=8$7$^$9(B (@code{gnus-summary-edit-parameters})$B!#(B
+$B8=:_$N%0%k!<%W$N%0%k!<%W%Q%i%a!<%?!<(B (@pxref{Group Parameters}) $B$rJT=8$7(B
+$B$^$9(B (@code{gnus-summary-edit-parameters})$B!#(B
 
 @item C-M-a
 @kindex C-M-a ($B35N,(B)
 @findex gnus-summary-customize-parameters
-$B8=:_$N%0%k!<%W$N%0%k!<%W%Q%i%a!<%?(B (@pxref{Group Parameters}) $B$r%+%9%?%^(B
-$B%$%:$7$^$9(B (@code{gnus-summary-customize-parameters})$B!#(B
+$B8=:_$N%0%k!<%W$N%0%k!<%W%Q%i%a!<%?!<(B (@pxref{Group Parameters}) $B$r%+%9%?(B
+$B%^%$%:$7$^$9(B (@code{gnus-summary-customize-parameters})$B!#(B
 @end table
 
 @node Exiting the Summary Buffer
-@section $B35N,%P%C%U%!$rH4$1$k(B
+@section $B35N,%P%C%U%!!<$rH4$1$k(B
 @cindex summary exit
 @cindex exiting groups
 
-$BIaDL$O35N,%P%C%U%!$+$iH4$1$k$H!"%0%k!<%W$NA4$F$N>pJs$r99?7$7$F%0%k!<%W%P%C(B
-$B%U%!$KLa$j$^$9!#(B
+$B35N,%P%C%U%!!<$+$iH4$1$k$H!"IaDL$O%0%k!<%W$N$9$Y$F$N>pJs$r99?7$7$F%0%k!<(B
+$B%W%P%C%U%!!<$KLa$j$^$9!#(B
 
 @table @kbd
 @item Z Z
@@ -9717,26 +9995,26 @@ Parameters}) $B$rJT=8$7$^$9(B (@code{gnus-summary-edit-parameters})$B!#(B
 @itemx q
 @kindex Z Z ($B35N,(B)
 @kindex Z Q ($B35N,(B)
-@findex q ($B35N,(B)
+@kindex q ($B35N,(B)
 @findex gnus-summary-exit
 @vindex gnus-summary-exit-hook
 @vindex gnus-summary-prepare-exit-hook
 @vindex gnus-group-no-more-groups-hook
 @c @icon{gnus-summary-exit}
-$B8=:_$N%0%k!<%W$r=P$F!"%0%k!<%W$NA4$F$N>pJs$r99?7$7$^(B
-$B$9(B (@code{gnus-summary-exit})$B!#H4$1=P$k$?$a$N$?$$$F$$$N;v$r$9$kA0(B
+$B8=:_$N%0%k!<%W$r=P$F!"%0%k!<%W$N$9$Y$F$N>pJs$r99?7$7$^(B
+$B$9(B (@code{gnus-summary-exit})$B!#H4$1=P$k$?$a$NB?$/$N=hM}$r9T$J$&A0(B
 $B$K(B @code{gnus-summary-prepare-exit-hook} $B$,8F$P$l!"$=$l$O%G%#%U%)%k%H(B
-$B$G(B @code{gnus-summary-expire-articles} $B$r8F$S$^$9!#H4$1=P$k2aDx$rDI$($?(B
-$B8e$K(B @code{gnus-summary-exit-hook} $B$,8F$P$l$^$9!#(B($BL$FI$N(B) $B%0%k!<%W$,;D$C(B
-$B$F$$$J$$$H$-$K%0%k!<%W%b!<%I$KLa$k$H$-(B
-$B$K(B @code{gnus-group-no-more-groups-hook} $B$,pJs$b99?7$;$:$K8=:_$N%0%k!<%W$rH4$1=P$^(B
+$B%0%k!<%W$N$I$s$J>pJs$b99?7$;$:$K8=:_$N%0%k!<%W$rH4$1=P$^(B
 $B$9(B (@code{gnus-summary-exit-no-update})$B!#(B
 
 @item Z c
@@ -9745,29 +10023,35 @@ Parameters}) $B$rJT=8$7$^$9(B (@code{gnus-summary-edit-parameters})$B!#(B
 @kindex c ($B35N,(B)
 @findex gnus-summary-catchup-and-exit
 @c @icon{gnus-summary-catchup-and-exit}
-$B%0%k!<%W$NA4$F$NJ]N1$G$J$$5-;v(B (unticked article) $B$K4{FI$N0u$rIU$1$F!"$=(B
-$B$l$+$iH4$1$^$9(B (@code{gnus-summary-catchup-and-exit})$B!#(B
+$B%0%k!<%W$N$9$Y$F$N2D;k$G$O$J$$(B (unticked) $B5-;v$K4{FI$N0u$rIU$1$F$+$iH4$1(B
+$B$^$9(B (@code{gnus-summary-catchup-and-exit})$B!#(B
 
 @item Z C
 @kindex Z C ($B35N,(B)
 @findex gnus-summary-catchup-all-and-exit
-$BJ]N15-;v$b4^$a$F!"A4$F$N5-;v$K4{FI$N0u$rIU$1$F!"$=$l$+$iH4$1$^(B
+$B2D;k5-;v$5$($b4^$`$9$Y$F$N5-;v$K4{FI$N0u$rIU$1$F$+$iH4$1$^(B
 $B$9(B (@code{gnus-summary-catchup-all-and-exit})$B!#(B
 
 @item Z n
 @kindex Z n ($B35N,(B)
 @findex gnus-summary-catchup-and-goto-next-group
-$BA4$F$N5-;v$K4{FI$N0u$rIU$1$F$7$^(B
-$B$9(B (@code{gnus-summary-reselect-current-group})$B!#$b$7@\F,0z?t$rM?$($i$l(B
-$B$l$P!"4{FI$HL$FI$NN>J}$NA4$F$N5-;v$rA*Br$7$^$9!#(B
+$B$9(B (@code{gnus-summary-reselect-current-group})$B!#@\F,0z?t$,M?$($i$l$k$H!"(B
+$B4{FI$HL$FI$NN>J}$N$9$Y$F$N5-;v$rA*Br$7$^$9!#(B
 
 @item Z G
 @itemx M-g
@@ -9775,9 +10059,9 @@ Parameters}) $B$rJT=8$7$^$9(B (@code{gnus-summary-edit-parameters})$B!#(B
 @kindex M-g ($B35N,(B)
 @findex gnus-summary-rescan-group
 @c @icon{gnus-summary-mail-get}
-$B%0%k!<%W$rH4$1!"%0%k!<%W$N?7$7$$5-;v$rD4$Y!"%0%k!<%W$rA*Br$7$^(B
-$B$9(B (@code{gnus-summary-rescan-group})$B!#$b$7@\F,0z?t$rM?$($i$l$l$P!"4{FI(B
-$B$HL$FI$NN>J}$NA4$F$N5-;v$rA*Br$7$^$9!#(B
+$B%0%k!<%W$rH4$1!"$=$N%0%k!<%W$N?7$7$$5-;v$rD4$Y$F$+$i!":F$S$=$N%0%k!<%W$r(B
+$BA*Br$7$^$9(B (@code{gnus-summary-rescan-group})$B!#@\F,0z?t$,M?$($i$l$k$H!"(B
+$B4{FI$HL$FI$NN>J}$N$9$Y$F$N5-;v$rA*Br$7$^$9!#(B
 
 @item Z N
 @kindex Z N ($B35N,(B)
@@ -9794,111 +10078,115 @@ Parameters}) $B$rJT=8$7$^$9(B (@code{gnus-summary-edit-parameters})$B!#(B
 @item Z s
 @kindex Z s ($B35N,(B)
 @findex gnus-summary-save-newsrc
-$B8=:_$N4{FI(B/$B0uIU$-5-;v$N?t$r%I%j%V%k%P%C%U%!(B (dribble buffer) $B$KJ]B8$7!"(B
-$B$=$l$+$i%I%j%V%k%P%C%U%!$rJ]B8$7$^$9(B (@code{gnus-summary-save-newsrc})$B!#(B
-$B$b$7@\F,0z?t$rM?$($i$l$l$P!"%U%!%$%k(B @file{.newsrc} $B$bJ]B8$7$^$9!#$3$NL?(B
-$BNa$r;H$&$H!"99?7$J$7$GH4$1=P$k;v(B (@kbd{Q} $BL?Na(B) $B$O0UL#$,L5$/$J$j$^$9!#(B
+$B8=:_$N4{FI$H0uIU$-5-;v$N?t$r%I%j%V%k%P%C%U%!!<(B (dribble buffer) $B$KJ]B8$7!"(B
+$B$=$l$+$i%I%j%V%k%P%C%U%!!<$rJ]B8$7$^$9(B (@code{gnus-summary-save-newsrc})$B!#(B
+$B@\F,0z?t$,M?$($i$l$k$H(B @file{.newsrc} $B%U%!%$%k(B ($B$H(B @file{.newsrc.eld} $B%U%!(B
+$B%$%k(B) $B$bJ]B8$7$^$9!#$3$NL?Na$r;H$&$H!"99?7$J$7$GH4$1=P$k$3$H(B (@kbd{Q} $BL?(B
+$BNa(B) $B$O0UL#$,L5$/$J$j$^$9!#(B
 @end table
 
 @vindex gnus-exit-group-hook
-$B8=:_$N%0%k!<%W$r!"%0%k!<%W$NA4$F$N>pJs$r99?7$7$FH4$1$k$H$-(B
-$B$K(B @code{gnus-exit-group-hook} $B$,8F$P$l$^$9!#(B
-@kbd{Q} $BL?Na(B (@code{gnus-summary-exit-no-update}) $B$G$O!"$3$N%U%C%/$r8F$S(B
+$B%0%k!<%W$N$9$Y$F$N>pJs$r!V99?7!W$7$F8=:_$N%0%k!<%W$rH4$1$k$H$-(B
+$B$K(B @code{gnus-exit-group-hook} $B$,8F$P$l$^$9!#Nc$((B
+$B$P(B @kbd{Q} $BL?Na(B (@code{gnus-summary-exit-no-update}) $B$O$3$N%U%C%/$r8F$S(B
 $B$^$;$s!#(B
 
 @findex gnus-summary-wake-up-the-dead
 @findex gnus-dead-summary-mode
 @vindex gnus-kill-summary-on-exit
-$B$"$J$?$K%0%k!<%W$rH4$1$F!"$=$l$+$i9M$($rJQ$($kJJ$,$"$k$N$G$"$l$P!"(B
-@code{gnus-kill-summary-on-exit} $B$r(B @code{nil} $B$K@_Dj$9$k$N$,NI$$$+$b$7(B
-$B$l$^$;$s!#$b$7$=$&$9$l$P!"(Bgnus $B$O$=$l$+$iH4$1=P$k$H$-$K35N,%P%C%U%!$r:o(B
-$B=|$7$^$;$s!#(B($B2?$H$$$&6C$-(B!) $B$=$NBe$o$j$K!"$=$l$O%P%C%U%!$NL>A0(B
-$B$r(B @samp{*Dead Summary ... *} $B$N$h$&$J$b$N$KJQ99$7!"(B
-@code{gnus-dead-summary-mode} $B$H8F$P$l$k%^%$%J!<%b!<%I$rF3F~$7$^$9!#:#$d!"(B
-$B$=$N%P%C%U%!$K@Z$jBX$($l$P!"A4$F$N%-!<$,4X(B
+$B%0%k!<%W$rH4$1$?8e$G$=$l$r8e2y$9$kJJ$,$"$k$N$J$i!"(B
+@code{gnus-kill-summary-on-exit} $B$r(B @code{nil} $B$K@_Dj$HNI$$$+$b$7$l$^$;(B
+$B$s!#$=$&$9$k$H(B gnus $B$OH4$1=P$k$H$-$K35N,%P%C%U%!!<$r:o=|$7$^$;$s!#(B($B2?$H(B
+$B$$$&6C$-(B!) $BBe$o$j$K!"$=$l$O%P%C%U%!!<$NL>A0(B
+$B$r(B @samp{*Dead Summary ... *} $B$N$h$&$J$b$N$KJQ99$7$F!"(B
+@code{gnus-dead-summary-mode} $B$H$$$&%^%$%J!<%b!<%I$rF3F~$7$^$9!#:#$d$=$N(B
+$B%P%C%U%!!<$K@Z$jBX$($k$H!"$9$Y$F$N%-!<$,4X(B
 $B?t(B @code{gnus-summary-wake-up-the-dead} $B$K3d$jEv$F$i$l$F$$$k$3$H$K5$IU$/(B
-$B$G$7$g$&!#;`$s$@35N,%P%C%U%!(B (dead summary buffer) $B$G$I$l$+$N%-!<$rC!$/(B
-$B;v$H!"@8$-$?IaDL$N35N,%P%C%U%!$K$J$k$G$7$g$&!#(B
+$B$G$7$g$&!#;`$s$@35N,%P%C%U%!!<(B (dead summary buffer) $B$G$I$s$J%-!<$G$bC!(B
+$B$/$H!"$=$l$O@8$-$?IaDL$N35N,%P%C%U%!!<$K$J$j$^$9!#(B
 
-$B;`$s$@35N,%P%C%U%!$OF1;~$K0l$D$7$+B8:_$9$k;v$O$G$-$^$;$s!#(B
+$B;`$s$@35N,%P%C%U%!!<$OF1;~$K0l$D$7$+B8:_$9$k$3$H$O$G$-$^$;$s!#(B
 
 @vindex gnus-use-cross-reference
-$B35N,%P%C%U%!$rH4$1=P$k$H!"8=:_$N%0%k!<%W$N%G!<%?$O99?7$5$l$^$9(B ($B$I$N5-;v(B
-$B$rFI$s$G!"$I$N5-;v$KJVEz$7$?$+!"$J$I$J$I!#(B) $B$b$7JQ(B
+$B35N,%P%C%U%!!<$rH4$1=P$k$H!"8=:_$N%0%k!<%W$N%G!<%?$O99?7$5$l$^$9(B ($B$I$N5-(B
+$B;v$rFI$s$G!"$I$N5-;v$KJVEz$7$?$+!"$J$I$J$I!#(B) $B$b$7JQ(B
 $B?t(B @code{gnus-use-cross-reference} $B$,(B @code{t} $B$G$"$k$H(B ($B$=$l$,%G%#%U%)(B
-$B%k%H$G$9(B)$B!"$=$N%0%k!<%W$KAj8_;2>H$5$l$?(B (cross referenced) $B5-;v$O4{FI$N(B
-$B0u$,IU$-!"$=$l$,Aj8_Ej9F(B (cross post) $B$5$l$?B>$N9XFI$7$F$$$k%0%k!<%W$G$b(B
-$B4{FI$N0u$,IU$-$^$9!#$3$NJQ?t$,(B @code{nil} $B$G$b(B @code{t} $B$G$J$1$l$P!"5-;v(B
-$B$O9XFI$HL$9XFI$NN>J}$N%0%k!<%W$G4{FI$N0u$,IU$-$^(B
+$B%k%H$G$9(B)$B!"$=$N%0%k!<%W$KAj8_;2>H$5$l$?(B (cross referenced) $B5-;v$K$O!"$=(B
+$B$l$,%/%m%9%]%9%H$5$l$?B>$N9XFI$7$F$$$k%0%k!<%W$K$"$C$F$b!"4{FI$N0u$,IU$-(B
+$B$^$9!#$3$NJQ?t$,(B @code{nil} $B$G$b(B @code{t} $B$G$b$J$1$l$P!"5-;v$K$O9XFI$7$F(B
+$B$$$k%0%k!<%W$H9XFI$7$F$$$J$$%0%k!<%W$NN>J}$G4{FI$N0u$,IU$-$^(B
 $B$9(B (@pxref{Crosspost Handling})$B!#(B
 
 @node Crosspost Handling
-@section $BAj8_Ej9F$N07$$(B
+@section $B%/%m%9%]%9%H$N07$$(B
 
 @cindex velveeta
 @cindex spamming
-$BAj8_Ej9F(B (cross post) $B$5$l$?5-;v$K4{FI$N0u$rIU$1$k;v$O!"F1$85-;v$rFs2s0J(B
-$B>eFI$^$J$$$G$9$`$H$$$&;v$rJ]>Z$7$^$9!#$b$A$m$s!"$@$l$+$,$=$l$r$$$/$D$+$N(B
-$B%0%k!<%W$KJL!9$KEj9F$7$J$$8B$j$O!#F1$85-;v$r$$$/$D$+$N%0%k!<%W$KEj9F$9$k(B
-$B;v(B ($BAj8_Ej9F$G$J$/$F(B) $B$O(B @dfn{spamming} $B$H8F$P$l!"$"$J$?$O$=$N$h$&$JA~$`(B
-$B$Y$-HH:a$r9T$J$&$b$N$KBP$7$F!"K!N'$K$h$C$FIT2w$J5-;v$rAw$k$3$H$,5AL3$E$1(B
-$B$i$l$F$$$^$9!#(Bspam $B$rA*JL$9$k$?$a$K$O!"(BNoCeM $B$NjAj8_Ej9F$KBP$7$FITK~$r8@$&$?$a$KL?(B
-$BNa(B @code{gnus-summary-mail-crosspost-complaint} $B$r;H$&$3$H$5$($G$-$^$9!#(B
+$B%/%m%9%]%9%H$5$l$?5-;v$K4{FI$N0u$rIU$1$k$3$H$K$h$C$F!"F1$85-;v$rFs2s0J>e(B
+$BFI$^$J$$$G:Q$`$3$H$rJ]>Z$7$^$9!#$b$A$m$s!"$@$l$+$,$=$l$rJ#?t$N%0%k!<%W$K(B
+$BJL!9$KEj9F$7$J$$8B$j$O!#F1$85-;v$rJ#?t$N%0%k!<%W$K(B ($B%/%m%9%]%9%H$G$O$G$O(B
+$B$J$/(B) $BEj9F$9$k$3$H$O(B @dfn{spamming} $B$H8F$P$l!"$"$J$?$O$=$N$h$&$JA~$`$Y$-(B
+$BHH:a$r9T$J$&$b$N$KBP$7$F!"K!N'$K$h$C$FIT2w$J5-;v$rAw$k$3$H$,5AL3$E$1$i$l(B
+$B$F$$$^$9!#(Bspam $B$r?6$$Mn$9$?$a$K!"(BNoCeM $B$G=hM}$9$k$3$H$r;n$7$F$_$kI,MW$,(B
+$B$"$k$+$b$7$l$^$;$s(B (@pxref{NoCeM})$B!#(B
+
+$B3P$($F$*$$$F2<$5$$(B: $B%/%m%9%]%9%H$O$^$"9=$$$^$;$s$,!"F1$85-;v$rJL!9$KJ#?t(B
+$B$N%0%k!<%W$KEj9F$9$k$N$O5v$5$l$^$;$s!#BgNL$N%/%m%9%]%9(B
+$B%H(B (@dfn{velveeta} $B$H$7$FCN$i$l$F$$$k$b$N(B) $B$O2?$H$7$F$bHr$1$i$l$k$Y$-$G!"(B
+$B2a>j$J%/%m%9%]%9%H$KBP$7$FITK~$r8@$&$?$a(B
+$B$K(B @code{gnus-summary-mail-crosspost-complaint} $BL?Na$r;H$&$3$H$5$($G$-$^(B
+$B$9!#(B
 
 @cindex cross-posting
 @cindex Xref
 @cindex @acronym{NOV}
-$BAj8_Ej9F$r(B gnus $B$,@5$7$/07$($J$$$h$&$K$J$k860x$N0l$D$O!"(B@acronym{NOV} $B9T(B
-$B$K(B @code{Xref} $BMs$r4^$^$J$$!"(B@sc{xover} ($B$3$l$OHs>o$KNI$$$G$9!"$H$$$&$N(B
-$B$O$=$l$OB.EY$r$H$F$bB.$/$9$k$+$i$G$9(B) $B$N;HMQ2DG=$J(B @acronym{NNTP} $B%5!<%P!<(B
-$B$r;H$C$F$$$k$3$H$G$9!#$3$l$O320-$J$N$G$9$,!"$"$!!"Ha$7$$$+$J!"Hs>o$KNI$/(B
-$B$"$k;v$G$9!#(BGnus $B$O$"$J$?$,FI$s$@A4$F$N5-;v$K(B @code{Xref} $B9T$rEPO?$9$k;v(B
-$B$G!"@5$7$$;v$r$7$h$&$H$7$^$9$,!"5-;v$r:o=|$9$k$+!"FI$^$J$$$G4{FI$N0u$rIU(B
-$B$1$k$H!"(Bgnus $B$O$3$l$i$N5-;v$K(B @code{Xref} $B$N9T$r$N$>$-$^$o$k5!2q$rF@$k;v(B
-$B$,L5$/!"Aj8_;2>H5!9=$rMQ$$$k;v$,$G$-$^$;$s!#(B
+gnus $B$K%/%m%9%]%9%H$r@5$7$/07$($J$/$5$;$k860x$N0l$D$O!"(B@sc{xover} ($B$3$l(B
+$B$OHs>o$KNI$$$G$9!"$H$$$&$N$O$=$l$OB.EY$r$H$F$bB.$/$9$k$+$i$G$9(B) $B$r%5%]!<(B
+$B%H$7$F$$$k$1$l$I$b(B @acronym{NOV} $B9T$K(B @code{Xref} $BMs$r4^$a$J(B
+$B$$(B @acronym{NNTP} $B%5!<%P!<$r;H$C$F$$$k$3$H$G$9!#$3$l$O320-$G$9!#$G$b!"(B
+$B$"$!!"Ha$7$$$+$J!"Hs>o$KNI$/$"$k$3$H$J$N$G$9!#(Bgnus $B$O$"$J$?$,FI$s$@$9$Y(B
+$B$F$N5-;v$K(B @code{Xref} $B9T$r5-O?$9$k$3$H$K$h$C$F(B The Right Thing ($B@5$7$$(B
+$B$3$H(B) $B$r$7$h$&$H$7$^$9$,!"5-;v$r:o=|$7$?$jC1$KFI$^$J$$$G4{FI$N0u$rIU$1$k(B
+$B$H!"(Bgnus $B$,$3$l$i$N5-;v$N(B @code{Xref} $B9T$r$N$>$-$^$o$k5!2q$,L5$/$J$C$F$7(B
+$B$^$&$N$G!"Aj8_;2>H(B (cross reference) $B$N5!9=$r;H$($J$/$J$C$F$7$^$$$^$9!#(B
 
 @cindex LIST overview.fmt
 @cindex overview.fmt
 $B$"$J$?$N(B @acronym{NNTP} $B%5!<%P!<$,$=$N354Q%U%!%$(B
-$B%k(B (overview file) $B$K(B @code{Xref} $BMs$r4^$s$G$$$k$+$rD4$Y$k$K$O!"(B
-@samp{telnet your.nntp.server nntp} $B$H$7$F!"(B@code{inn} $B%5!<%P!<(B
-$B$G(B @samp{More READER} $B$H$7!"$=$l$+$i(B @samp{LIST overview.fmt} $B$H$9$k;v$r(B
-$B;n$7$F$/$@$5$$!#$3$l$OF0:n$7$J$$$G$7$g$&$,!"$b$7F0:n$7$F!"o$KB.EY$r(B
 $BCY$/$7$^$9!#(B
 
 $B$^!"?M@8$O$=$N$h$&$J$b$N$G$9!#(B
 
-$BBeBXH$7$F$/$@$5$$!#(B
+$BBeBXH$7$F2<$5$$!#(B
 
 @node Duplicate Suppression
 @section $B=EJ#$NM^@)(B
 
-$B%G%#%U%)%k%H$G$O(B gnus $B$OAj8_Ej9F5!9=$rMxMQ$9$k;v$K$h$C$F!"F1$85-;v(B
+$B%G%#%U%)%k%H$G$O(B gnus $B$O%/%m%9%]%9%H5!9=$rMxMQ$9$k$3$H$K$h$C$F!"F1$85-;v(B
 $B$rFs2s0J>eFI$^$J$$$h$&$K$7$h$&$H$7$^$9(B (@pxref{Crosspost Handling})$B!#$7(B
 $B$+$7!"$=$NC1=c$G8z2LE*$JJ}K!$O!"$$$m$$$m$JM}M3$K$h$j!"K~B-$9$k7k2L$r$b$?(B
-$B$i$5$J$$$+$bCN$l$^$;$s!#(B
+$B$i$5$J$$$+$b$7$l$^$;$s!#(B
 
 @enumerate
 @item
-@acronym{NNTP} $B%5!<%P!<$O(B @code{Xref} $BMs$N@8@.$K<:GT$9$k$+$bCN$l$^$;$s!#(B
-$B$3$l$O0-$$;v$G!"$"$^$j5/$3$j$^$;$s!#(B
+@acronym{NNTP} $B%5!<%P!<$O(B @code{Xref} $BMs$N@8@.$K<:GT$9$k$+$b$7$l$^$;$s!#(B
+$B$3$l$O0-$$$3$H$G!"$"$^$j5/$3$j$^$;$s!#(B
 
 @item
 @acronym{NNTP} $B%5!<%P!<$O(B @file{.overview} $B%G!<%?%Y!<%9$K(B @code{Xref} $BMs(B
-$B$r4^$a$k$N$K<:GT$9$k$+$bCN$l$^$;$s!#$3$l$O0-$$;v$G!"Hs>o$KNI$/$"$k;v$G$9!"(B
-$B$"$!Ha$7$$!#(B
+$B$r4^$a$k$N$K<:GT$9$k$+$b$7$l$^$;$s!#$3$l$O0-$$$3$H$G!"Hs>o$KNI$/$"$k$3$H(B
+$B$G$9!"$"$!Ha$7$$!#(B
 
 @item
 $BF1$8%0%k!<%W(B ($B$b$7$/$O$$$/$D$+$N4XO"$7$?%0%k!<%W(B) $B$r0c$C(B
@@ -9908,22 +10196,23 @@ Gnus $B$K$$$D$G$b@5$7$$(B @code{Xref} $B$ru67$OB>$K$b$"$j$^$9$,!"$3$l$i;M$D$,$H$F$bNI(B
-$B$/$"$k>u67$G$9!#(B
+@code{Xref} $B$N07$$$K<:GT$9$k>u67$O3N$+$KB>$K$b$"$j$^$9$,!"$3$l$i;M$D$,:G(B
+$B$bNI$/$"$k>u67$G$9!#(B
 
-$B$b$7!"K\Ev$K$b$7$b(B @code{Xref} $B$N07$$$K<:GT$7$?$i!"(B@dfn{$B=EJ#M^@)(B}$B$K@Z$j(B
-$BBX$($k;v$r9M$($k$+$b$7$l$^$;$s!#$=$&$9$l$P!"(Bgnus $B$O$"$J$?$,FI$s$@A4$F$N(B
-$B5-;v$+$=$&$G$J$1$l$P!"4{FI$N0u$,IU$$$?A4$F$N5-;v$N(B @code{Message-ID} $B$r(B
-$B5-21$7!"$=$l$+$i!"KbK!$N$h$&$K!"$=$N8e$N$=$l$i$H=P2q$C$?A4$F$N>l9g$K!"4{(B
-$BFI$N0u$rIU$1$^$9!=!=(B@emph{$BA4$F(B}$B$N%0%k!<%W$G!#$3$N5!9=$r;H$&$N$OHs>o$KHs(B
-$B8zN(E*$G$9$,!"2aEY$KHs8zN($J$o$1$G$O$"$j$^$;$s!#$b$A$m$sF1$85-;v$r0l2s0J(B
-$B>eFI$`$[$&$,9%$^$7$$$G$9!#(B
+$B$b$7!"K\Ev$K$b$7$b(B @code{Xref} $B$N07$$$K<:GT$7$?$i!"!V=EJ#M^@)!W$K@Z$jBX(B
+$B$($k$3$H$r9MN8$9$kI,MW$,$"$k$+$b$7$l$^$;$s!#$=$&$9$l$P!"(Bgnus $B$O$"$J$?$,(B
+$BFI$s$@$9$Y$F$N5-;v!"$"$k$$$O4{FI$N0u$rIU$1$?$9$Y$F$N5-;v(B
+$B$N(B @code{Message-ID} $B$r5-21$7!"$=$7$F$^$k$GKbK!$N$h$&$K!"0J8e$=$l$i$rFI(B
+$B$`$H$-$O$$$D$G$b4{FI$N0u$,IU$$$F$$$k$h$&$K$7$^$9(B---@emph{$B$9$Y$F(B} $B$N%0%k!<(B
+$B%W$G!#$3$N5!9=$r;H$&$N$O2?$@$+$H$F$bHs8zN($K$J$j$=$&$G$9$,!"2aEY$KHs8zN((B
+$B$J$o$1$G$O$"$j$^$;$s!#F1$85-;v$rFs2s0J>eFI$`$h$j$O!"4V0c$$L5$/K>$^$7$$$G(B
+$B$9!#(B
 
-$B=EJ#M^@)$O$"$^$jA!:Y$J$b$N$G$O$"$j$^$;$s!#$I$A$i$+$H$$$&$H!"BgDH$N$h$&$J(B
-$B$b$N$G$9!#$=$l$OHs>o$KC1=c$JJ}K!$GF0:n$7$F$$$^$9!=!=$b$75-;v$K4{FI$N0u$r(B
-$BIU$1$l$P!"$=$l$O$3$N(B Message-ID $B$r%-%c%C%7%e$K2C$($^$9!#o$KC1=c$J$d$jJ}$GF0:n$7$F$$$^$9(B---$B$"$J$?$,5-;v$K4{FI$N(B
+$B0u$rIU$1$k$H!"$=$N(B Message-ID $B$r%-%c%C%7%e$K2C$($^$9!#uBV$G$O(B @code{nil} $B$G$9!#$7$+$7!"$3$l$O(B
-$BC10l$N(B gnus $B$NA0$G$9!#%G%#%U%)%k%H(B
+$B=EJ#M^@)$N%j%9%H$r3JG<$7$F$*$/%U%!%$%k$NL>A0$G$9!#%G%#%U%)%k%H(B
 $B$O(B @file{~/News/suppression} $B$G$9!#(B
 @end table
 
 $B2?EY$b(B gnus $B$r=*N;$7$F5/F0$9$k798~$,$"$k$N$G$"$l$P!"$*$=$i(B
 $B$/(B @code{gnus-save-duplicate-list} $B$r(B @code{t} $B$K$9$k$N$ONI$$9M$($G$7$g(B
 $B$&!#$b$7(B gnus $B$rB3$1$F2?=54V$bAv$i$;$F$*$/$N$G$"$l$P!"$=$l(B
-$B$r(B @code{nil} $B$K$9$k$+$b$7$l$^$;$s!#0lJ}$G!"%j%9%H$rJ]B8$9$k;v$O5/F0$H=*(B
-$BN;$r$:$C$HCY$/$7$^$9$N$G!"$h$/(B gnus $B$r=*N;$7$F5/F0$9$k$N$G$"$l$P!"(B
-@code{gnus-save-duplicate-list} $B$r(B @code{nil} $B$K@_Dj$9$k$Y$-$G$"$k$H$$$&(B
-$B;v$K$J$j$^$9!#$&!<$`!#;d$O$"$J$?$,$I$&$9$k$+$KG$$;$?$$!"$H;W$$$^$9!#(B
+$B$r(B @code{nil} $B$K$7$?J}$,NI$$$+$b$7$l$^$;$s!#0lJ}!"%j%9%H$rJ]B8$9$k$3$H$O(B
+$B5/F0$H=*N;$r$:$C$HCY$/$9$k$N$G!"IQHK$K(B gnus $B$r=*N;$7$F5/F0$9$k$N$G$"$l$P!"(B
+@code{gnus-save-duplicate-list} $B$r(B @code{nil} $B$K@_Dj$9$k$Y$-$G$9!#$&!<$`!#(B
+$B;d$O$"$J$?$,$I$&$9$k$+$KG$$;$h$&$H;W$$$^$9!#(B
 
 @ignore
 @node Security
@@ -9977,8 +10267,8 @@ or newer is recommended.
 
 @end enumerate
 
-More information on how to set things up can be found in the message
-manual (@pxref{Security, ,Security, message, Message Manual}).
+The variables that control security functionality on reading messages
+include:
 
 @table @code
 @item mm-verify-option
@@ -10009,6 +10299,15 @@ deprecated.
 
 @end table
 
+By default the buttons that display security information are not
+shown, because they clutter reading the actual e-mail.  You can type
+@kbd{K b} manually to display the information.  Use the
+@code{gnus-buttonized-mime-types} and
+@code{gnus-unbuttonized-mime-types} variables to control this
+permanently.  @ref{MIME Commands} for further details, and hints on
+how to customize these variables to always display security
+information.
+
 @cindex snarfing keys
 @cindex importing PGP keys
 @cindex PGP key ring import
@@ -10029,6 +10328,10 @@ application/pgp-keys; gpg --import --interactive --verbose; needsterminal
 This happens to also be the default action defined in
 @code{mailcap-mime-data}.
 
+More information on how to set things for sending outgoing signed and
+encrypted messages up can be found in the message manual
+(@pxref{Security, ,Security, message, Message Manual}).
+
 @end ignore
 @node Mailing List
 @section $B%a!<%j%s%0%j%9%H(B
@@ -10037,12 +10340,13 @@ This happens to also be the default action defined in
 
 @kindex A M ($B35N,(B)
 @findex gnus-mailing-list-insinuate
-Gnus $B$O(B RFC 2369 $B$G4{Dj$5$l$?3F(B
 @end menu
 
@@ -10101,43 +10405,43 @@ List-Archive $B%U%#!<%k%I$,$"$C$?$i!"%a!<%j%s%0%j%9%H$N%"!<%+%$%V$r1\Mw$7(B
 @cindex hiding headers
 @cindex deleting headers
 
-$B3F5-;v$NF,$NItJ,$O%X%C%@!<(B(@dfn{head})$B$H8F$P$l$^$9(B ($B;D$j$NItJ,$O%\(B
-$B%G%#(B (@dfn{body})$B$G$9!#$9$G$K$*5$$E$-$G$7$g$&$,(B)$B!#(B
+$B3F5-;v$NF,$NItJ,$O%X%C%@!<(B (@dfn{head}) $B$H8F$P$l$^$9!#(B($B;D$j$NItJ,$O%\(B
+$B%G%#!<(B (@dfn{body}) $B$G$9!#$9$G$K$*5$$E$-$G$7$g$&$,!#(B)
 
 @vindex gnus-show-all-headers
-$B%X%C%@!<$K$O$?$/$5$s$NJXMx$J>pJs$,4^$^$l$F$$$^$9!#5-;v$r=q$$$??M$NL>A0!"(B
-$B$=$l$,=q$+$l$?F|IU!"5-;v$NI=Bj$J$I$G$9!#$3$l$O$H$F$bNI$$$s$G$9$,!"%X%C%@!<(B
-$B$K$OBgItJ,$N?M$K$O8+$?$/$b$J$$>pJs!=!=5-;v$,$"$J$?$N$H$3$m$KCe$/$^$G$I$s(B
-$B$J%7%9%F%`$r7PM3$7$F$-$?$+!"(B@code{Message-ID}, @code{References} $B$J$I$J(B
-$B$I!D$b$&$d$s$J$C$A$c$&$/$i$$!=!=$b$?$/$5$s4^$^$l$F$$$^$9!#$?$V$s$"$J$?$O(B
-$B$3$l$i$N9T$O$$$/$D$+pJs$,4^$^$l$F$$$^$9!#5-;v$r=q$$$??M$NL>A0!"(B
+$B$=$l$,=q$+$l$?F|IU!"$*$h$S5-;v$NI=Bj$G$9!#$3$l$O$H$F$bNI$$$N$G$9$,!"%X%C(B
+$B%@!<$K$OBgItJ,$N?M$K$H$C$F$O8+$?$/$b$J$$>pJs(B---$B5-;v$,$"$J$?$N$H$3$m$KCe(B
+$B$/$^$G$K$I$s$J%7%9%F%`$r7PM3$7$F$-$?$+!"(B@code{Message-ID}$B!"(B
+@code{References} $B$J$I$J$I!D$b$&$&$s$6$j$9$k$/$i$$(B---$B$?$/$5$s4^$^$l$F$$(B
+$B$^$9!#$?$V$s$"$J$?$O$3$l$i$N9T$N$$$/$D$+$OA0$HI=Bj$N$_$r8+$?$1$l$P!"$3$&;XDj$7$^$9!#(B
+$BNc$($P!"5-;v$r=q$$$??M$NL>A0$HI=Bj$N$_$r8+$?$1$l$P!"$3$&;XDj$7$^$9(B:
 
 @lisp
 (setq gnus-visible-headers "^From:\\|^Subject:")
 @end lisp
 
-$B$3$NJQ?t$O!"I=<($5$;$?$$%X%C%@!<$K%^%C%A$9$k@55,I=8=$r%j%9%H$G;X(B
-$BDj$9$k$3$H$b$G$-$^$9!#(B
+$B$3$NJQ?t$O!"I=<($5$;$?$$%X%C%@!<$K9gCW$9$k@55,I=8=$r%j%9%H$G;XDj$9$k$3$H(B
+$B$b$G$-$^$9!#(B
 
 @item gnus-ignored-headers
 @vindex gnus-ignored-headers
 $B$3$NJQ?t$O(B @code{gnus-visible-headers} $B$NH?BP$G$9!#$3$NJQ?t$,@_Dj$5$l$F(B
 $B$$$l$P(B ($B$+$D(B @code{gnus-visible-headers} $B$,(B @code{nil} $B$G$"$l$P(B)$B!"$3$l$O(B
-$B1#$7$?$$%X%C%@!<9TA4$F$K%^%C%A$9$k@55,I=8=$G$"$k$H$_$J$5$l$^$9!#$3$NJQ?t(B
-$B$K%^%C%A$7$J$$A4$F$N%X%C%@!<9T$OI=<($5$l$^$9!#(B
+$B1#$7$?$$%X%C%@!<9T$9$Y$F$K9gCW$9$k@55,I=8=$G$"$k$H$_$J$5$l$^$9!#$3$NJQ?t(B
+$B$K9gCW$7$J$$$9$Y$F$N%X%C%@!<9T$,I=<($5$l$^$9!#(B
 
 $BNc$($P!"C1$K(B @code{References} $BMs$H(B @code{Xref} $BMs$N$_$r>C$75n$j$?$1$l$P!"(B
 $B0J2<$N$h$&$K$7$^$9(B:
@@ -10146,71 +10450,70 @@ Gnus $B$O%X%C%@!<$rA*$jJ,$1$k$?$a$KFs$D$NJQ?t$rMQ0U$7$F$$$^$9!#(B
 (setq gnus-ignored-headers "^References:\\|^Xref:")
 @end lisp
 
-$B$3$NJQ?t$O>C$7$?$$%X%C%@!<$K%^%C%A$9$k@55,I=8=$N%j%9%H$G$b9=$$$^(B
-$B$;$s!#(B
+$B$3$NJQ?t$O>C$7$?$$%X%C%@!<$K9gCW$9$k@55,I=8=$N%j%9%H$G$b9=$$$^$;$s!#(B
 
-$B$J$*!"(B@code{gnus-visible-headers} $B$,(B @code{nil} $B0J30$N>l9g$O!"$3(B
-$B$NJQ?t$K$O8z2L$,L5$$$3$H$KCm0U$7$F$/$@$5$$!#(B
+$B$J$*!"(B@code{gnus-visible-headers} $B$,(B @code{nil} $B0J30$N>l9g$O!"$3$NJQ?t$K(B
+$B$O8z2L$,L5$$$3$H$KCm0U$7$F2<$5$$!#(B
 @end table
 
 @vindex gnus-sorted-header-list
-Gnus $B$O%X%C%@!<$NJB$YBX$((B (sort) $B$b9T$$$^$9(B ($B$3$l$O%G%#%U%)%k%H$G9T$o$l(B
-$B$^$9(B)$B!#$3$NJB$YBX$($O(B @code{gnus-sorted-header-list} $BJQ?t$r@_Dj$9$k$3$H(B
-$B$G@)8f$9$k$3$H$,$G$-$^$9!#$3$l$O%X%C%@!<$r$I$&$$$&=g=x$GI=<($9$k$+$r;XDj(B
-$B$9$k@55,I=8=$N%j%9%H$G$9!#(B
+gnus $B$O%X%C%@!<$NJB$YBX$((B (sort) $B$b9T$J$$$^$9(B ($B$3$l$O%G%#%U%)%k%H$G9T$J(B
+$B$o$l$^$9(B)$B!#$3$NJB$YBX$($O(B @code{gnus-sorted-header-list} $BJQ?t$r@_Dj$9$k(B
+$B$3$H$G@)8f$9$k$3$H$,$G$-$^$9!#$3$l$O%X%C%@!<$r$I$&$$$&=g=x$GI=<($9$k$+$r(B
+$B;XDj$9$k@55,I=8=$N%j%9%H$G$9!#(B
 
-$BNc$($P!"5-;v$NCx$r:G=i$K!"$r:G=i$K!"A0$,F~$k$N$G$O$"$j$^$;$s!#Be$o$j(B
 $B$K(B gnus $B$,%A%'%C%/$7$F;k3&$+$i>C$75n$k$?$a$N$5$^$6$^$J!V$D$^$i$J$$>r7o!W(B
-@dfn{boring conditions} $B$N%j%9%H$r;XDj$7$^$9!#(B
+(@dfn{boring conditions}) $B$N%j%9%H$r;XDj$7$^$9!#(B
 
 $B$3$N>r7o$K$O0J2<$N$h$&$J$b$N$,$"$j$^$9!#(B
 
 @table @code
 @item empty
-$B6u$N%X%C%@!<$rA4$F>C5n$7$^$9!#(B
+$B6u$N%X%C%@!<$r$9$Y$F>C5n$7$^$9!#(B
 @item followup-to
 @code{Followup-To} $BMs$,(B @code{Newsgroups} $BMs$HF10l$G$"$k>l9g$K$O>C5n$7$^(B
 $B$9!#(B
 @item reply-to
 @code{Reply-To} $BMs$,(B @code{From} $BMs$HF1$8%"%I%l%9$r<($7$F$$$k$+!"(B
-@code{broken-reply-to} $B%0%k!<%W%Q%i%a!<%?$,@_Dj$5$l$F$$$k>l9g$K$O>C5n$7(B
-$B$^$9!#(B
+@code{broken-reply-to} $B%0%k!<%W%Q%i%a!<%?!<$,@_Dj$5$l$F$$$k>l9g$K$O>C5n(B
+$B$7$^$9!#(B
 @item newsgroups
 @code{Newsgroups} $BMs$,8=:_$N%0%k!<%WL>$7$+4^$s$G$$$J$$>l9g$K$O>C5n$7$^$9!#(B
 @item to-address
-@code{To} $BMs$,8=:_$N%0%k!<%W$N(B @code{to-address} $B%Q%i%a!<%?$HF1$8$b$N$7(B
-$B$+4^$s$G$$$J$$>l9g$K$O>C5n$7$^$9!#(B
+@code{To} $BMs$,8=:_$N%0%k!<%W$N(B @code{to-address} $B%Q%i%a!<%?!<$HF1$8$b$N(B
+$B$7$+4^$s$G$$$J$$>l9g$K$O>C5n$7$^$9!#(B
 @item to-list
-@code{To} $BMs$,8=:_$N%0%k!<%W$N(B @code{to-list} $B%Q%i%a!<%?$HF1$8$b$N$7$+4^(B
-$B$s$G$$$J$$>l9g$K$O>C5n$7$^$9!#(B
+@code{To} $BMs$,8=:_$N%0%k!<%W$N(B @code{to-list} $B%Q%i%a!<%?!<$HF1$8$b$N$7$+(B
+$B4^$s$G$$$J$$>l9g$K$O>C5n$7$^$9!#(B
 @item cc-list
-@code{CC} $BMs$,8=:_$N%0%k!<%W$N(B @code{to-list} $B%Q%i%a!<%?$HF1$8$b$N$7$+4^(B
-$B$s$G$$$J$$>l9g$K$O>C5n$7$^$9!#(B
+@code{CC} $BMs$,8=:_$N%0%k!<%W$N(B @code{to-list} $B%Q%i%a!<%?!<$HF1$8$b$N$7$+(B
+$B4^$s$G$$$J$$>l9g$K$O>C5n$7$^$9!#(B
 @item date
 $B$=$N5-;v$,2a5n;0F|0JFb$N$b$N$G$"$l$P!"(B@code{Date} $BMs$r>C5n$7$^$9!#(B
 @item long-to
 @code{To} $BMs$,$"$^$j$K$bD9$$>l9g$K$O>C5n$7$^$9!#(B
 @item many-to
-@code{To} $BMs$,0l$D$h$j$bB?$1$l$P!"$=$l$i$rA4$F>C5n$7$^$9!#(B
+@code{To} $BMs$,0l$D$h$j$bB?$1$l$P!"$=$l$i$r$9$Y$F>C5n$7$^$9!#(B
 @end table
 
-$B$3$l$i$N;0$D$NMWAG$rF~$l$?$1$l$P!"$3$s$JIw$K$J$j$^$9(B:
+$B$3$l$i$N$&$A$N;0$D$NMWAG$rF~$l$?$1$l$P!"$3$s$JIw$K$J$j$^$9(B:
 
 @lisp
 (setq gnus-boring-article-headers
@@ -10223,94 +10526,101 @@ Gnus $B$O%X%C%@!<$NJB$YBX$((B (sort) $B$b9T$$$^$9(B ($B$3$l$O%G%#%U%)%k%H$G
 @section MIME $B$r;H$&(B
 @cindex @acronym{MIME}
 
-$B%Q%s%H%^%$%`(B (mime) $B$H$O!"0UL#$bL5$/6uCf$G$N$_$@$i$J$b$N(B
-$B$rL5$N$_$@$i$J$b$N$rL5\$7$$>pJs$O!"%^%K%e%"%k$r;2>H$7$F$/$@(B
-$B$5$$(B ($B$^$@$J$$$1$I(B (;_;))$B!#(B
+$B$O(B @acronym{SEMI} MIME-View $B%W%m%0%i%`$r8F$S=P$7$F\$7$$>pJs$O!"%^%K%e%"%k$r;2>H$7$F2<$5(B
+$B$$(B (SEMI $B$NG[I[$KIUB0$7$F$$(B
+$B$k(B @file{mime-ui-ja.texi} $B$r(B @kbd{M-x find-file} $B$7$F!"(B
+@kbd{M-x texinfo-format-buffer} $B$ro$K;HMQ$7$?$1$l$P!"(B
-@code{gnus-show-mime} $B$r(B @code{t} $B$K@_Dj$7$F$/$@$5$$!#(B
-@code{gnus-show-mime} $B$r@_Dj$7$F$$$k$H!"1?$,0-$$$H5-;v%P%C%U%!$K$O8N>c$7(B
-$B$?$h$&$J2hLL$,8+$($k$3$H$b$"$k$G$7$g$&!#$3$l$OHr$1$h$&$,$"$j$^$;$s!#(B
+@code{gnus-show-mime} $B$r(B @code{t} $B$K@_Dj$7$F2<$5$$!#(B
+@code{gnus-show-mime} $B$r@_Dj$7$F$$$k$H!"1?$,0-$$$H5-;v%P%C%U%!!<$K$O8N>c(B
+$B$7$?$h$&$J2hLL$,8+$($k$3$H$b$"$k$G$7$g$&!#$3$l$OHr$1$h$&$,$"$j$^$;$s!#(B
 
-GNUS $B$d(B Gnus $B$G$O!"$3$N$?$A$N0-$$LdBj$G6C$+$5$l$J$$$h$&$K$9$k$K$O!"35N,(B
-$B%P%C%U%!$K$*$$$F@Z$jBX$(5!G=$r;H$&$H$$$&$N$,:GA1$+$bCN$l$^$;$s(B ($BNc$($P!"(B
+Gnus $B$d(B gnus $B$G$O!"$3$N$?$A$N0-$$LdBj$G6C$+$5$l$J$$$h$&$K$9$k$K$O!"35N,(B
+$B%P%C%U%!!<$K$*$$$F@Z$jBX$(5!G=$r;H$&$H$$$&$N$,:GA1$+$b$7$l$^$;$s(B ($BNc$($P!"(B
 @samp{alt.sing-a-long} $B%0%k!<%W$KF~$k$H!"$"$J$?$N5$$E$+$J$$$&$A(B
-$B$K(B @acronym{MIME} $B$O5-;vCf$N%5%&%s%I%U%!%$%k$rI|9f$7$F!"2?$d$i2x$7$2$JD9(B
-$B$$D9$$2N$,$"$J$?$N%9%T!<%+!<$+$iBg2;6A$GN.$l=P$7!"$"$J$?$O%\%j%e!<%`%\%?(B
-$B%s$r8+$D$1$i$l$:!"$H$$$&$N$O$=$s$J$b$N$O$b$H$b$H$D$$$F$J$$$+$i$G!"$_$s$J(B
-$B$O$"$J$?$NJ}$rbK$_$O$8$a!"$"$J$?$O%W%m%0%i%`$r;_$a$h$&$H$9$k$1$I$G$-$J$/(B
-$B$F!"%\%j%e!<%`$r@)8f$9$k%W%m%0%i%`$b8+$D$1$i$l$J$/$F!"$=$7$FIt20Cf$NA40w(B
-$B$OFMA3$"$J$?$N$3$H$r7ZJN$N4c:9$7$G8+$k$h$&$K$J$C$F$7$^$$!"$"$J$?$O$A$g$C(B
-$B$HLLGr$/$J$$;W$$$r$9$k!"$H$+(B)$B!#(B
+$B$K(B @acronym{MIME} $B$O5-;vCf$N%5%&%s%I%U%!%$%k$r%G%3!<%I$7$F!"2?$d$i2x$7$2(B
+$B$JD9$$D9$$2N$,$"$J$?$N%9%T!<%+!<$+$iBg2;6A$GN.$l=P$7!"$"$J$?$O%\%j%e!<%`(B
+$B%\%?%s$r8+$D$1$i$l$:!"$H$$$&$N$O$=$s$J$b$N$O$b$H$b$HIU$$$F$$$J$$$+$i$G!"(B
+$B$_$s$J$O$"$J$?$NJ}$rbK$_$O$8$a!"$"$J$?$O%W%m%0%i%`$r;_$a$h$&$H$9$k$1$l$I(B
+$B$b$G$-$J$/$F!"%\%j%e!<%`$r@)8f$9$k%W%m%0%i%`$b8+$D$1$i$l$J$/$F!"$=$7$FIt(B
+$B20Cf$NA40w$OFMA3$"$J$?$N$3$H$r7ZJN$N4c:9$7$G8+$k$h$&$K$J$C$F$7$^$$!"$"$J(B
+$B$?$O$A$g$C$HLLGr$/$J$$;W$$$r$9$k!"$H$+(B)$B!#(B
 
-$B8=o$K(B @code{gnus-show-mime} $B$r(B @code{nil} $B0J30(B
-$B$K$7$F$*$-!"<~$j$K?M$,$$$J$$;~$r8+7W$i$C$F5-;v%P%C%U%!$K8=$o$l$k%\%?%s$r(B
-$B2!$7$^$7$g$&!#(B
-
+$B$K$7$F$*$-!"<~$j$K?M$,$$$J$$;~$r8+7W$i$C$F5-;v%P%C%U%!!<$K8=$o$l$k%\%?%s(B
+$B$r2!$7$^$7$g$&!#(B
+@c
 @c Also @xref{MIME Commands}.
 
 @node Customizing Articles
 @section $B5-;v$N%+%9%?%^%$%:(B
 @cindex article customization
 
-$B5-;v$,$I$N$h$&$KB8:_$7$F$$$k$+$r%+%9%?%^%$%:$9$k$?$a$N$?$/$5$s$N4X?t$G$9!#(B
-$B$3$l$i$N4X?t$rBPOCE*$K8F$V$3$H$b$G$-$^$9$7(B (@pxref{Article Washing})$B!"5-(B
-$B;v$rA*Br$7$?$H$-$K<+F0E*$KA*Br$9$k$3$H$b$G$-$^$9!#(B
+$B5-;v$r$I$N$h$&$K8+$;$k$+$r%+%9%?%^%$%:$9$k$?$a$N$?$/$5$s$N4X?t$,B8:_$7$F(B
+$B$$$^$9!#$3$l$i$N4X?t$rBPOCE*$K8F$V$3$H$b$G$-$k(B
+$B$7(B (@pxref{Article Washing})$B!"5-;v$rA*Br$7$?$H$-$K<+F0E*$KA*Br$9$k$3$H$b(B
+$B$G$-$^$9!#(B
 
-$B<+F0E*$K8F$P$l$k$h$&$K$9$k$?$a$K$O!"BP1~$9$k(B ``treatment'' $BJQ?t$r@_Dj$7(B
-$B$^$9!#Nc$($P!"%X%C%@!<$r1#$9$?$a$K$O!"(B@code{gnus-treat-hide-headers} $B$r(B
-$B@_Dj$7$^$9!#0J2<$O@_Dj$G$-$kJQ?t$N0lMw$G$9$,!"$^$:$3$l$i$NJQ?t$NA0$N%0%k!<%W$GFI$^(B
-$B$l$?5-;v$NA4$F$NK\J8$NItJ,$G$3$N07$$$r9T$$$^$9!#(B
+$BJ8;zNs$N%j%9%H(B: $B$3$N%j%9%H$K4^$^$l$F$$$k@55,I=8=$K9gCW$9$kL>A0$N%0%k!<%W(B
+$B$GFI$^$l$?5-;v$N!"$9$Y$F$NK\J8$N%Q!<%H$G$3$N%H%j!<%H%a%s%H$r9T$J$$$^$9!#(B
 
 @item
 $B:G=i$NMWAG$,J8;zNs$G$J$$%j%9%H$G$9(B:
 
 $B%j%9%H$O:F5"E*$KI>2A$5$l$^$9!#%j%9%H$N:G=i$NMWAG$O=R8l$G$9!#0J2<$N=R8l$,(B
-$BG'<1$5$l$^$9(B: @code{or}, @code{and}, @code{not}, @code{typep}$B!#$3$l$,Nc(B
-$B$G$9(B:
+$BG'<1$5$l$^$9(B: @code{or}, @code{and}, @code{not}, @code{typep}$B!#Nc$G$9(B:
 
 @lisp
 (or last
@@ -10320,22 +10630,24 @@ GNUS $B$d(B Gnus $B$G$O!"$3$N$?$A$N0-$$LdBj$G6C$+$5$l$J$$$h$&$K$9$k$K$O!"35N,
 @end enumerate
 
 @c FIXTGNUS Is this true?
-$B$3$3$G(B @dfn{$B0lItJ,(B} $B$H$$$&8l$,;H$o$l$F$$$k$3$H$K5$IU$$$?$H;W$$$^$9!#$3$l(B
-$B$O%a%C%;!<%8$K$O(B @acronym{MIME} $B%^%k%A%Q!<%H5-;v$,$"$j!"$$$/$D$+$NItJ,$K(B
-$BJ,3d$5$l$F$$$k$+$b$7$l$J$$$H$$$&;ve$G@bL@$5$l$F(B
-$B$$$k$h$&$K=R8l$N%j%9%H$G$"$k$H$-$O!"$3$NJQ?t$OL5;k$5$l$^$9!#(B
-
-$B0J2<$N07$$$N%*%W%7%g%s$,;HMQ2DG=$G$9!#$3$l$r%+%9%?%^%$%:$9$k$?$a$N:G$b4J(B
-$BC1$JJ}K!$O(B @code{gnus-article-treat} $B%+%9%?%^%$%:%0%k!<%W$rD4::$9$k$3$H(B
-$B$G$9!#4]3g8L$NCf$NCM$ODs0F$5$l$F$$$k0UL#$N$"$kCM$G$9!#B>$N$b$N$b2DG=$G$9(B
-$B$,!"$[$H$s$I$N?M$O$*$=$i$/$3$3$K0lMwI=<($5$l$F$$$k$b$N$G==J,$G$7$g$&!#(B
+$B$3$N%H%j!<%H%a%s%H$O$9$Y$F$N%^%k%A%Q!<%H$N%Q!<%H$?$A$KE,MQ$5$l$k$N$G$7$g(B
+$B$&$+(B?  $B$O$$!"$=$&$7$?$1$l$P$=$&$J$j$^$9!#$G$9$,!"%G%#%U%)%k%H$G(B
+$B$O(B @samp{text/plain} $B%Q!<%H$@$1$K%H%j!<%H%a%s%H$,;\$5$l$^$9!#$3$l(B
+$B$O(B @code{gnus-article-treat-types} $BJQ?t$G@)8f$5$l!"$3$l$O%Q!<%H$N7?$K9g(B
+$BCW$9$k@55,I=8=$N%j%9%H$G$9!#@)8fJQ?t$NCM$,!">e$G@bL@$5$l$F$$$k$h$&$K=R8l(B
+$B$N%j%9%H$G$"$k$H$-$O!"$3$NJQ?t$OL5;k$5$l$^$9!#(B
+
+$B0J2<$N%H%j!<%H%a%s%H$N%*%W%7%g%s$,;HMQ2DG=$G$9!#$3$l$r%+%9%?%^%$%:$9$k$?(B
+$B$a$N:G$b4JC1$JJ}K!$O(B @code{gnus-article-treat} $B%+%9%?%^%$%:%0%k!<%W$rD4(B
+$B::$9$k$3$H$G$9!#4]3g8L$NCf$NCM$ODs0F$5$l$F$$$k0UL#$N$"$kCM$G$9!#B>$N$b$N(B
+$B$b2DG=$G$9$,!"$[$H$s$I$N?M$K$H$C$F$O$*$=$i$/$3$3$K0lMwI=<($5$l$F$$$k$b$N(B
+$B$G==J,$G$7$g$&!#(B
 
 @table @code
 @item gnus-treat-buttonize (t, integer)
@@ -10347,7 +10659,7 @@ GNUS $B$d(B Gnus $B$G$O!"$3$N$?$A$N0-$$LdBj$G6C$+$5$l$J$$$h$&$K$9$k$K$O!"35N,
 @item gnus-treat-overstrike (t, integer)
 @item gnus-treat-strip-cr (t, integer)
 @item gnus-treat-strip-headers-in-body (t, integer)
-@item gnus-treat-strip-leading-blank-lines (t, integer)
+@item gnus-treat-strip-leading-blank-lines (t, first, integer)
 @item gnus-treat-strip-multiple-blank-lines (t, integer)
 @item gnus-treat-strip-pem (t, last, integer)
 @item gnus-treat-strip-trailing-blank-lines (t, last, integer)
@@ -10424,54 +10736,56 @@ GNUS $B$d(B Gnus $B$G$O!"$3$N$?$A$N0-$$LdBj$G6C$+$5$l$J$$$h$&$K$9$k$K$O!"35N,
 @end table
 
 @vindex gnus-part-display-hook
-$B$b$A$m$s!"(B@code{gnus-part-display-hook} $B$+$i8F$P$l$k<+J,<+?H$N4X?t$r=q$/(B
-$B$3$H$b$G$-$^$9!#4X?t$O$=$NItJ,$KHO0O$,69$a$i$l$?>uBV$G8F$P$l!"$[$H$s$I$J(B
-$B$s$G$b9%$-$J$3$H$r$G$-$^$9!#%P%C%U%!$KJ]B8$7$F$*$+$J$1$l$P$J$i$J$$>pJs$O(B
-$B$"$j$^$;$s(B---$B2?$G$bJQ$($k$3$H$,$G$-$^$9!#$7$+$7!"%X%C%@!<$r>C$7$F$O$$$1(B
-$B$^$;$s!#(B
+$B$b$A$m$s!"(B@code{gnus-part-display-hook} $B$+$i8F$P$l$k<+J,MQ$N4X?t$r=q$/(B
+$B$3$H$b$G$-$^$9!#4X?t$O$=$N%Q!<%H$KHO0O$,69$a$i$l$?>uBV$G8F$P$l!"$[$H$s$I(B
+$B$J$s$G$b9%$-$J$3$H$,$G$-$^$9!#%P%C%U%!!<$KJ]B8$7$F$*$+$J$1$l$P$J$i$J$$>p(B
+$BJs$O$"$j$^$;$s(B---$B2?$G$bJQ$($k$3$H$,$G$-$^$9!#(B
 
 @node Article Keymap
-@section $B5-;v$N%-!$K$b$$$/$D$+$N%-!<$,MxMQ$G$-$^$9(B:
 
 @table @kbd
 @item SPACE
 @kindex SPACE ($B5-;v(B)
 @findex gnus-article-next-page
-$B0lJGA0$K$a$/$j$^$9(B (@code{gnus-article-next-page})$B!#(B@kbd{h SPACE h} $B$H$^$C(B
-$B$?$/F1$8$G$9!#(B
+$B5-;v$r0l%Z!<%8@h$K%9%/%m!<%k$7$^$9!#(B(@code{gnus-article-next-page})$B!#(B
+@kbd{h SPACE h} $B$H$^$C$?$/F1$8$G$9!#(B
 
 @item DEL
 @kindex DEL ($B5-;v(B)
 @findex gnus-article-prev-page
-$B0lJG8e$m$KLa$7$^$9(B (@code{gnus-article-prev-page})$B!#(B@kbd{h DEL h} $B$H$^$C(B
-$B$?$/F1$8$G$9!#(B
+$B5-;v$r0l%Z!<%8A0$K%9%/%m!<%k$7$^$9(B (@code{gnus-article-prev-page})$B!#(B
+@kbd{h DEL h} $B$H$^$C$?$/F1$8$G$9!#(B
 
 @item C-c ^
 @kindex C-c ^ ($B5-;v(B)
 @findex gnus-article-refer-article
-$B%+!<%=%k0LCV$,(B @code{Message-ID} $B$N6aJU$K$"$k$H$-$K(B @kbd{C-c ^} $B$r2!(B
-$B$9$H!"(Bgnus $B$O%5!<%P!<$+$i$=$N5-;v$r8e$K8F$S=P$5$l$^$9!#$3$l$O(B
-$B8e$K8F$S=P$5$l$^$9!#$3$l$O(B
+$Be%9%/%m!<%k$9$k?7$7$$%F%-%9%H$,(B
-$BL5$/$F$b5-;v%P%C%U%!$r%9%/%m!<%k$9$k$3$H$r2DG=$K$7$^$9!#%G%#%U%)%k%H(B
-$B$O(B @code{nil} $B$G$9!#(B($BLuCm(B: $B5-;v$N:G2<9T$,8+$($F$$$k$H$-$K!"(B@code{nil} $B$G(B
-$B$O(B @kbd{RET} $B$G$=$l0J>e%9%/%m!<%k$7$J$$$,!"Hs(B-@code{nil} $B$K$9$k$H5-;v$,(B
-$B8+$($J$/$J$k$^$G%9%/%m!<%k$9$k!#(B)
+$BL5$/$F$b5-;v%P%C%U%!!<$r%9%/%m!<%k$G$-$k$h$&$K$7$^$9!#%G%#%U%)%k%H(B
+$B$O(B @code{nil} $B$G$9!#(B($BLuCm(B: $B5-;v$N:G2<9T$,8+$($F$$$k$H$-$K!"(B@code{nil} $B$@(B
+$B$H(B @kbd{RET} $B%-!<$G$=$l0J>e%9%/%m!<%k$7$^$;$s$,!"Hs(B-@code{nil} $B$K$9$k$H(B
+$B5-;v$,8+$($J$/$J$k$^$G%9%/%m!<%k$7$^$9!#(B)
 
 @vindex gnus-article-mode-line-format
 @item gnus-article-mode-line-format
-$B$3$NJQ?t$O(B @code{gnus-summary-mode-line-format} $B$HF1$89T$K=>$C$?MM<0J8;z(B
-$BNs$G$9(B (@pxref{Summary Buffer Mode Line})$B!#$3$l$O0J2<$NFs$D$N3HD%$r=|$$(B
-$B$F!"$=$NJQ?t$HF1$8MM<0;XDj$ruBV!W(B@dfn{wash status}$B!#$3$l$O5-;v$KBP$7$F9T$o$l$?$G$"$m$&(B
-$B@vBuA`:n$r<($90lJ8;z$+$i$J$kC;$$J8;zNs$K$J$j$^$9!#J8;z$H$=$l$i$N0UL#$O(B:
+$B5-;v$N!V@vBu>uBV!W(B(@dfn{wash status})$B!#$3$l$O5-;v$KBP$7$F9T$J$o$l$?$G$"(B
+$B$m$&@vBuA`:n$r!"$=$l$>$l0lJ8;z$G<($9C;$$J8;zNs$K$J$j$^$9!#J8;z$H$=$l$i$N(B
+$B0UL#$Ol9g$KI=<($5(B
-$B$l$^$9!#(B
+$B5-;v%P%C%U%!!<$K$*$$$F!"0zMQ$5$l$?J8$,1#$5$l$F$$$k$+$b$7$l$J$$>l9g$KI=<((B
+$B$5$l$^$9!#(B
 
 @item h
-$B5-;v%P%C%U%!$K$*$$$F!"%X%C%@!<$,1#$5$l$F$$$k>l9g$KI=<($5$l$^$9!#(B
-
+$B5-;v%P%C%U%!!<$K$*$$$F!"%X%C%@!<$,1#$5$l$F$$$k>l9g$KI=<($5$l$^$9!#(B
+@c
 @c @item p
 @c Displayed when article is digitally signed or encrypted, and Gnus has
 @c hidden the security headers.  (N.B. does not tell anything about
 @c security status, i.e. good or bad signature.)
 
 @item s
-$B5-;v%P%C%U%!$K$*$$$F!"=pL>$,1#$5$l$F$$$k>l9g$KI=<($5$l$^$9!#(B
+$B5-;v%P%C%U%!!<$K$*$$$F!"=pL>$,1#$5$l$F$$$k>l9g$KI=<($5$l$^$9!#(B
 
 @item o
-$B5-;v%P%C%U%!$K=E$MBG$AJ8;z$,$"$k>l9g$KI=<($5$l$^$9!#(B
+$B5-;v%P%C%U%!!<$K$*$$$F!"(Bgnus $B$,=E$MBG$AJ8;z$N%H%j!<%H%a%s%H$r9T$J$C$?>l(B
+$B9g$KI=<($5$l$^$9!#(B
 
 @item e
-$B5-;v%P%C%U%!$K6/D4$5$l$?J8;zNs$,$"$k>l9g$KI=<($5$l$^$9!#(B
+$B5-;v%P%C%U%!!<$K$*$$$F!"(Bgnus $B$,6/D4$5$l$?J8;z$N%H%j!<%H%a%s%H$r9T$J$C$?(B
+$B>l9g$KI=<($5$l$^$9!#(B
 @end table
 
 @c FIXMETGNUS Does this work?
 @item m
-$B5-;v$N(B @acronym{MIME} $BItJ,$N?t$G$9!#(B
+$B5-;v$N(B @acronym{MIME} $B%Q!<%H$N?t$G$9!#(B
 @end table
 
 @vindex gnus-break-pages
-
 @item gnus-break-pages
-$B2~JG(B @dfn{page breaking} $B$r9T$&$+$I$&$+$r@)8f$7$^$9!#$3$NJQ?t(B
-$B$,(B @code{nil} $B0J30$G$"$l$P!"5-;vCf$KJG6h@Z$jJ8;z$,8=$l$?>l=j$4$H$KJGJ,3d(B
-$B$7$^$9!#$3$NJQ?t$,(B @code{nil} $B$G$"$l$PJGJ,$1$O9T$o$l$^$;$s!#(B
+$B2~%Z!<%8(B (@dfn{page breaking}) $B$r9T$J$&$+$I$&$+$r@)8f$7$^$9!#$3$NJQ?t(B
+$B$,(B @code{nil} $B0J30$G$"$l$P!"5-;vCf$K%Z!<%86h@Z$jJ8;z$,8=$l$k$4$H$K%Z!<%8(B
+$BJ,3d$r$7$^$9!#$3$NJQ?t$,(B @code{nil} $B$G$"$l$P%Z!<%8J,$1$O9T$J$o$l$^$;$s!#(B
 
 @item gnus-page-delimiter
 @vindex gnus-page-delimiter
-$B$3$l$,>e$G?($l$?6h@Z$jJ8;z$G$9!#%G%#%U%)%k%H$G$O(B @samp{^L} ($B%U%)!<%`(B
-$B%U%#!<%I!"2~JG(B) $B$G$9!#(B
+$B$3$l$,>e$G?($l$?6h@Z$jJ8;z$G$9!#%G%#%U%)%k%H$G$O(B @samp{^L} ($B%U%)!<%`%U%#!<(B
+$B%I(B) $B$G$9!#(B
 
 @cindex IDNA
-@cindex $B9q:]2=%I%a%$%sL>(B
+@cindex internationalized domain names
 @vindex gnus-use-idna
 @item gnus-use-idna
 $B$3$NJQ?t$O(B @samp{From:}$B!"(B@samp{To:} $B$*$h$S(B @samp{Cc:} $B%X%C%@!<$K$"$k9q:](B
 $B2=%I%a%$%sL>$r!"(Bgnus $B$,(B IDNA $B%G%3!<%I$9$k$+$I$&$+$r@)8f$7$^$9!#$=$N$h$&(B
 $B$J%a%C%;!<%8$N:n$jJ}$K$D$$$F(B
-$B$O(B @xref{IDNA, ,IDNA,message-ja, The Message Manual} $B$r;2>H$7$F2<$5$$!#(B
-$B$3$l$K$O(B @uref{http://www.gnu.org/software/libidn/, GNU Libidn} $B$,I,MW$G!"(B
-$B$3$NJQ?t$O$=$l$r%$%s%9%H!<%k$7$F$"$k>l9g$@$1M-8z$K$J$j$^$9!#(B
+$B$O(B @xref{IDNA, ,$B9q:]2=%I%a%$%sL>(B, message-ja, The Message Manual}, $B$r;2(B
+$B>H$7$F2<$5$$!#$3$l$K(B
+$B$O(B @uref{http://www.gnu.org/software/libidn/, GNU Libidn} $B$,I,MW$G!"$3$N(B
+$BJQ?t$O$=$l$r%$%s%9%H!<%k$7$F$"$k>l9g$@$1M-8z$K$J$j$^$9!#(B
 @end table
 
 @node Composing Messages
@@ -10625,21 +10941,21 @@ GNUS $B$d(B Gnus $B$G$O!"$3$N$?$A$N0-$$LdBj$G6C$+$5$l$J$$$h$&$K$9$k$K$O!"35N,
 @c @cindex using smime
 
 @kindex C-c C-c ($BEj9F(B)
-$BEj9F$N$?$a$NL?Na$r$9$k$H!"$"$J$?$O%a%C%;!<%8%P%C%U%!$K0\F0$7$^$9!#(B
-$B$=$3$G$O!"5-;v$r9%$-$J$h$&$KJT=8$9$k;v$,$G$-$^$9!#(B
-$B$=$N8e$G(B @kbd{C-c C-c} $B$r2!$9;v$K$h$C$F!"5-;v$rAw?.$7$^(B
-$B$9(B (@pxref{Top, , Overview, message-ja, Message Manual})$B!#5-;v$O$"$J$?$N(B
-$B@_Dj$K4p$E$$$FAw?.$5$l$^$9(B (@pxref{Posting Server})$B!#(B
+$B$9$Y$F$NEj9F$H%a!<%k$rAw$k$?$a$N%3%^%s%I$O!"$"$J$?$r%a%C%;!<%8%P%C%U%!!<(B
+$B$KF3$-$^$9!#$=$3$G$O(B @kbd{C-c C-c} $B$r2!$9$3$H$K$h$C$F5-;v$rAw?.$9$kA0$K!"(B
+$B5-;v$r9%$-$J$h$&$KJT=8$9$k$3$H$,$G$-$^$9!#(B@xref{Top, ,Overview, message,
+Message Manual}.  $B%a%C%;!<%8$O$"$J$?$N@_Dj$K4p$E$$$FEj9F$^$?$O%a!<%k$H$7(B
+$B$FAw?.$5$l$^$9(B (@pxref{Posting Server})$B!#(B
 
 @menu
-* Mail::                        $B%a!<%k$HJVEz(B
-* Posting Server::              $B$I$N%5!<%P!<$rDL$7$F%K%e!<%9$rEj9F$^$?$O%a!<%k$rAw?.$9$k$Y$-$+(B?
+* Mail::                        $B%a!<%k$NAw?.$HJVEz(B
+* Posting Server::              $B$I$N%5!<%P!<$GEj9F$^$?$O%a!<%k$rAw?.$9$k$Y$-$+(B?
 * POP before SMTP::             $B%a!<%k$rFI$^$J$$$H%a!<%k$rAw?.$G$-$J$$(B
-* Mail and Post::               $BF1;~$K%a!<%k$r=P$7JVEz$9$k(B
+* Mail and Post::               $B%K%e!<%9$H%a!<%k$rF1;~$KAw?.$9$k(B
 * Archived Messages::           $BAw$C$?%a%C%;!<%8$r(B gnus $B$,Cy$a$F$*$/$H$3$m(B
-* Posting Styles::              $B$"$J$?$,C/$G$"$k$+$r;XDj$9$k$h$j4JC1$JJ}K!(B
+* Posting Styles::              $B$"$J$?$,C/$G$"$k$+$rL@$i$+$K$9$k$h$j4JC1$JJ}K!(B
 * Drafts::                      $B%a%C%;!<%8$N1d4|$H5qH]$5$l$?%a%C%;!<%8(B
-* Rejected Articles::           $B%5!<%P!<$,$"$J$?$N5-;v$r9%$-$G$J$$$H$-$K2?$,5/$3$k(B?
+* Rejected Articles::           $B%5!<%P!<$,$"$J$?$N5-;v$r7y$$$@$H2?$,5/$3$k(B?
 @c * Signing and encrypting::      How to compose secure messages.
 @end menu
 
@@ -10660,23 +10976,26 @@ and Superseding} $B$b;2>H$7$F2<$5$$!#(B
 
 @item gnus-add-to-list
 @vindex gnus-add-to-list
-@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
+@code{nil} $B$G$J$1$l$P!"(B@kbd{a} $B$r2!$7$?$H$-$K!"(B@code{to-list} $B%0%k!<%W%Q(B
+$B%i%a!<%?!<$r$=$l$NL5$$%a!<%k%0%k!<%W$KIU$12C$($^$9!#(B
 
 @item gnus-confirm-mail-reply-to-news
 @vindex gnus-confirm-mail-reply-to-news
-$B$3$l$O!"3NG'$,I,MW$G$"$k>l9g$KHs(B-@code{nil} $B$rJV$9!"M#0l$N%Q%i%a!<%?$H$7(B
-$B$F%0%k!<%WL>$r$K9gCW$9$k@55,I=8=$G$9!#(B
+$BHs(B-@code{nil} $B$@$C$?$i!"$"$J$?$,%K%e!<%95-;v$X$NJVEz$r%a!<%k$G$7$h$&$H$9(B
+$B$k$H(B gnus $B$O3NG'$r5a$a$^$9!#(B@code{nil} $B$J$i$P!"$"$J$?$,$d$j$?$$$3$H$K2?(B
+$B$b8}=P$7$7$^$;$s!#$3$l$O4X?t$+@55,I=8=$G$"$k$3$H$b$G$-$^$9!#4X?t$OM#0l$N(B
+$B%Q%i%a!<%?!<$H$7$F%0%k!<%WL>$rl9g$K(B
+$BHs(B-@code{nil} $B$rJV$7$^$9!#$3$l$r@55,I=8=$K$9$k$H!"$=$l$K9gCW$9$kL>A0$N%0(B
+$B%k!<%W$G3NG'$r5a$a$^$9!#(B
 
 $B%a!<%k$GJV?.$9$k5$$OL5$$$N$K;~$?$^$>$s$6$$$K(B R $B$r2!$7$F$7$^$&JJ$,$"$k$J(B
 $B$i$P!"$3$NJQ?t$O$=$s$J$"$J$?$N$?$a$K$"$j$^$9!#(B
 
 @item gnus-confirm-treat-mail-like-news
 @vindex gnus-confirm-treat-mail-like-news
-$BHs(B-@code{nil} $B$@$C$?$i!"(Bgnus $B$O%a!<%k$X$NJV?.;~$K(B
+$BHs(B-@code{nil} $B$@$C$?$i!"(Bgnus $B$O%a!<%k$KJV?.$9$k;~$K(B
 $B$b(B @code{gnus-confirm-mail-reply-to-news} $B$K4p$E$$$?3NG'$r5a$a$^$9!#$3$l(B
-$B$O%a!<%j%s%0%j%9%H$r%K%e!<%:%0%k!<%W$N$h$&$K07$&$N$KJXMx$G$9!#(B
+$B$O%a!<%j%s%0%j%9%H$r%K%e!<%9%0%k!<%W$N$h$&$K07$&$N$KJXMx$G$9!#(B
 @end table
 
 @node Posting Server
@@ -10690,32 +11009,32 @@ and Superseding} $B$b;2>H$7$F2<$5$$!#(B
 $B$=$l$OHs>o$KJ#;($K$J$jF@$^$9!#(B
 
 @vindex gnus-post-method
-
 $B%K%e!<%9$rEj9F$9$k$H$-!"DL>o(B Message $B$O(B @code{message-send-news} $B$r8F$S(B
-$B=P$7$^$9(B (@pxref{News Variables, , News Variables, message-ja, Message
+$B=P$7$^$9(B (@pxref{News Variables, ,$B%K%e!<%9JQ?t(B, message-ja, The Message
 Manual})$B!#IaDL$O!"(Bgnus $B$O9VFIMQ$HF1$8A*BrJ}K!$r;H$C$FEj9F$7$^$9(B ($B$3$N$3(B
 $B$H$O!"$"$J$?$,$?$/$5$s$N%0%k!<%W$r0[$J$C$?%5!<%P!<$G9VFI$7$F$$$k>l9g$K!"(B
 $B$?$V$sET9g$,NI$$$N$G$9(B)$B!#$7$+$7!"$"$J$?$,9VFI$7$F$$$k$=$N%5!<%P!<$,Ej9F(B
 $B$r5v2D$;$:!"FI$`$3$H$N$_$r5v2D$7$F$$$k$N$J$i$P!"$*$=$i$/$"$J$?$N(B ($BHs>o$K(B
 $BCNE*$G$H$s$G$b$J$/6=L#?<$$(B) $B5-;v$rEj9F$9$k$?$a$K!"B>$N%5!<%P!<$r;H$$$?$$(B
-$B$H;W$&$G$7$g$&!#(B@code{gnus-post-method} $B$rB>$NJ}K!$K@_Dj$9$k;v$,$G$-$^$9!#(B
+$B$H;W$&$G$7$g$&!#$=$&$J$i$P(B @code{gnus-post-method} $B$rB>$NJ}K!$K@_Dj$9$k(B
+$B$3$H$,$G$-$^$9(B:
 
 @lisp
 (setq gnus-post-method '(nnspool ""))
 @end lisp
 
 $B$5$F!"$3$N@_Dj$r$7$?8e$G%5!<%P!<$,$"$J$?$N5-;v$r5qH]$7$?$j!"%5!<%P!<$,Mn(B
-$B$A$F$$$?$j$7$?$i!"$I$&$7$?$i$h$$$N$G$7$g$&(B? $B$3$NJQ?t$r>e=q$-$9$k$?$a$K!"(B
-$BL?Na(B @kbd{C-c C-c} $B$K%<%m$G$J$$?t$N@\F,0z?t$rM?$($k;v$G!"Ej9F(B
-$B$K(B ``current'' ($B8=:_$N(B) $B%5!<%P!<$r;H$o$;$k;v!"$9$J$o$A%G%#%U%)%k%H$NF0(B
+$B$A$F$$$?$j$7$?$i!"$I$&$7$?$i$h$$$N$G$7$g$&(B? $B$3$NJQ?t$h$j$bM%@h$5$;$k$?$a(B
+$B$K(B @kbd{C-c C-c} $BL?Na$K%<%m$G$J$$?t$N@\F,0z?t$rM?$($k$3$H$K$h$C$F!"Ej9F(B
+$B$K!H(Bcurrent$B!I(B($B8=:_$N(B) $B%5!<%P!<$r;H$o$;$k$3$H!"$9$J$o$A%G%#%U%)%k%H$NF0(B
 $B:n(B ($BLuCm(B: @code{gnus-post-method} $B$N%G%#%U%)%k%HCM$O(B @code{current}) $B$K(B
-$BLa$9;v$,$G$-$^$9!#(B
+$BLa$9$3$H$,$G$-$^$9!#(B
 
-$B$b$7!"%<%m$r@\F,0z?t$r$=$NL?Na$KM?$($?$J$i(B ($B$9$J$o$A!"(B@kbd{C-u 0 C-c
+$B$b$7!"%<%m$r@\F,0z?t$H$7$F$=$NL?Na$KM?$($?$J$i(B ($B$9$J$o$A!"(B@kbd{C-u 0 C-c
 C-c})$B!"(Bgnus $B$OEj9F$K$I$NJ}K!$r;H$&$+$r$"$J$?$K?R$M$^$9!#(B
 
-@code{gnus-post-method} $B$rA*BrJ}K!$N%j%9%H$K$9$k;v$b$G$-$^$9!#$=$N>l9g$O!"(B
-gnus $B$O>o$KEj9F$K$I$NJ}K!$r;H$&$+$r$"$J$?$K?R$M$^$9!#(B
+@code{gnus-post-method} $B$rA*BrJ}K!$N%j%9%H$K$9$k$3$H$b$G$-$^$9!#$=$N>l9g(B
+$B$O!"(Bgnus $B$O>o$KEj9F$K$I$NJ}K!$r;H$&$+$r$"$J$?$K?R$M$^$9!#(B
 
 $B:G8e$K!"$"$J$?$,$$$D$G$b4pK\$NA*BrJ}K!$r;H$C$FEj9F$7$?$$$N$J$i$P!"$3$NJQ(B
 $B?t$r(B @code{native} $B$K$7$F2<$5$$!#(B
@@ -10723,9 +11042,9 @@ gnus $B$O>o$KEj9F$K$I$NJ}K!$r;H$&$+$r$"$J$?$K?R$M$^$9!#(B
 $B%a!<%k$rAw?.$9$k$H$-$K!"(BMessage $B$O(B @code{message-send-mail-function} $B$r(B
 $B8F$S=P$7$^$9!#%G%#%U%)%k%H$N4X(B
 $B?t(B @code{message-send-mail-with-sendmail} $B$O5-;v$r=gHVBT$A$KF~(B
-$B$l(B (queuing) $B$?$jAw?.$9$k$?$a$K!"%P%$%J%j!<$G(B @code{sendmail} $B$K%Q%$%W$7(B
-$B$^$9!#%m!<%+%k%7%9%F%`$,(B @code{sendmail} $B$G%a!<%k$rAw?.$9$k$h$&$K@_Dj$5(B
-$B$l$F$$$J$/$F$b!"$"$J$?$,1s3V(B @acronym{SMTP} $B%5!<%P!<$K@\B3$9$k8"Mx$r;}$C(B
+$B$l(B (queuing) $B$?$jAw?.$9$k$?$a$K!"5-;v$r(B @code{sendmail} $B%3%^%s%I$K%Q%$%W(B
+$B$7$^$9!#%m!<%+%k%7%9%F%`$,(B @code{sendmail} $B$G%a!<%k$rAw?.$9$k$h$&$K@_Dj(B
+$B$5$l$F$$$J$/$F$b!"$"$J$?$,1s3V(B @acronym{SMTP} $B%5!<%P!<$K@\B3$9$k8"Mx$r;}$C(B
 $B$F$$$k$J$i$P!"(B
 @code{message-send-mail-function} $B$r(B @code{smtpmail-send-it} $B$K@_Dj$9$k(B
 $B$3$H$,$G$-$^$9!#(B@code{smtpmail} $B%Q%C%1!<%8$r;H$&$?$a$K@5$7$$@_Dj$,$J$5$l(B
@@ -10743,10 +11062,10 @@ gnus $B$O>o$KEj9F$K$I$NJ}K!$r;H$&$+$r$"$J$?$K?R$M$^$9!#(B
 ISP $B$,(B @acronym{POP}-before-@acronym{SMTP} $B$NG'>Z$rMW5a$7$F$$$k>l9g$KM-(B
 $BMQ$G$9!#(B@xref{POP before SMTP}.
 
-$BB>$N2DG=$J(B @code{message-send-mail-function} $B$NA*Br;h(B
+$BB>$N2DG=$J(B @code{message-send-mail-function} $B$NA*Br;h$K(B
 $B$O(B @code{message-send-mail-with-mh},
-@code{message-send-mail-with-qmail} $B$*$h$S(B @code{feedmail-send-it} $B$r4^(B
-$B$_$^$9!#(B
+@code{message-send-mail-with-qmail} $B$*$h$S(B @code{feedmail-send-it} $B$,$"(B
+$B$j$^$9!#(B
 
 @node POP before SMTP
 @section POP before SMTP
@@ -10804,42 +11123,41 @@ ISP $B$,(B @acronym{POP}-before-@acronym{SMTP} $B$NG'>Z$rMW5a$7$F$$$k>l9g$KM-
 @node Mail and Post
 @section $B%a!<%k$HEj9F(B
 
-$B$3$l$O%a!<%k$r=P$9;v$HEj9F$9$k;v$NN>J}$K4XO"$9$kJQ?t$N%j%9%H$G$9(B:
+$B$3$l$O%a!<%k$NAw?.$H%K%e!<%9$NEj9F$NN>J}$K4XO"$9$kJQ?t$N%j%9%H$G$9(B:
 
 @table @code
 @item gnus-mailing-list-groups
 @findex gnus-mailing-list-groups
 @cindex mailing lists
-
-$B$b$7$"$J$?$N%K%e!<%9%5!<%P!<$,K\Ev$K%a!<%j%s%0%j%9%H$+(B
-$B$i(B @acronym{NNTP} $B%5!<%P!<$X$N%2!<%H%&%'%$$rDs6!$7$F$$$k$N$G$"$l$P!"$=$l(B
-$B$i$N%0%k!<%W$OLdBj$J$/FI$a$k$G$7$g$&!#$7$+$74JC1$K$O$=$l$i$KEj9F(B/$B%U%)%m!<(B
-$B%"%C%W$9$k$3$H$O$G$-$^$;$s!#0l$D$N2r7hK!$O%0%k!<%W%Q%i%a!<(B
-$B%?(B (@pxref{Group Parameters}) $B$K(B @code{to-address} $B$r2C$($k;v$G$9!#4JC1(B
-$B$K$G$-$k$N$O!"(B@code{gnus-mailing-list-groups} $B$r!"K\Ev$K%a!<%j%s%0%j%9%H(B
-$B$G$"$k$h$&$J%0%k!<%W$K9gCW$9$k@55,I=8=$K@_Dj$9$k$3$H$G$9!#$=$N8e$O!"$9$/(B
-$B$J$/$H$b!"%a!<%j%s%0%j%9%H$X$N%U%)%m!<%"%C%W$O$?$$$F$$$N$H$-$KF0:n$7$^$9!#(B
-$B$3$l$i$N%0%k!<%W$KEj9F$9$k;v$O(B (@kbd{a}) $B$=$l$G$b6lDK$r0z$-5/$3$9$G$7$g(B
-$B$&$1$I!#(B
+$B$"$J$?$N%K%e!<%9%5!<%P!<$,!"K\Ev$K%a!<%j%s%0%j%9%H$N5-;v(B
+$B$r(B @acronym{NNTP} $B%5!<%P!<$KN.$79~$`%2!<%H%&%'%$$K$h$C$F!"$=$l$i$,%K%e!<(B
+$B%9%0%k!<%W$N5-;v$H$7$F8+$($k$h$&$K$7$F$$$k$N$G$"$l$P!"$=$l$i$N%0%k!<%W$O(B
+$BLdBj$J$/FI$a$k$G$7$g$&!#$7$+$7$$$/$i$+LLE]$J$3$H$r9nI~$9$k$3$HL5$7$K!"$=(B
+$B$l$i$KEj9F$^$?$O%U%)%m!<%"%C%W$9$k$3$H$O$G$-$^$;$s!#0l$D$N2r7hK!$O!"%0%k!<(B
+$B%W%Q%i%a!<%?!<(B (@pxref{Group Parameters}) $B$K(B @code{to-address} $B$r2C$($k(B
+$B$3$H$G$9!#4JC1$K$G$-$k$N$O!"(B@code{gnus-mailing-list-groups} $B$r!"K\Ev$O%a!<(B
+$B%j%s%0%j%9%H$G$"$k%0%k!<%W$K9gCW$9$k@55,I=8=$K@_Dj$9$k$3$H$G$9!#$=$&$9$l(B
+$B$P!">/$J$/$H$b%a!<%j%s%0%j%9%H$X$N%U%)%m!<%"%C%W$O$?$$$F$$$N$H$-$K9T$J$&(B
+$B$3$H$,$G$-$k$G$7$g$&!#$3$l$i$N%0%k!<%W$KEj9F$9$k$3$H(B (@kbd{a}) $B$O!"$=$l(B
+$B$G$b6lDK$r0z$-5/$3$9$G$7$g$&$1$l$I!#(B
 
 @item gnus-user-agent
 @vindex gnus-user-agent
 @cindex User-Agent
-
 $B$3$NJQ?t$O!"$I$N>pJs$,(B User-Agent $B%X%C%@!<$KDDNs$5$l$k$+$r@)8f$7$^$9!#(B
 $B$=$l$OH(B)$B!#(B
 @end table
 
-$B$"$J$?$O<+J,$,Aw$k%a%C%;!<%8$NDV$j$rD4$Y$kI,MW$,$"$k$+$b$7$l$^$;$s!#$b$7(B
-$B$/$O!"$b$7Z$rMW5a$7$F$$$k>l9g$KM-
 (add-hook 'message-send-hook 'ispell-message)
 @end lisp
 
-$B$b$7$"$J$?$,(B @code{ispell} $B$N<-=q$r%0%k!<%W$K1~$8$F@Z$jBX$($?$$$J$i$P!"(B
-$B0J2<$N$h$&$K$9$l$PNI$$$G$7$g$&!#(B
+@code{ispell} $B$N<-=q$r%0%k!<%W$K1~$8$F@Z$jBX$($?$$$J$i$P!"0J2<$N$h$&$K$9(B
+$B$l$PNI$$$G$7$g$&!#(B
 
 @lisp
 (add-hook 'gnus-select-group-hook
@@ -10868,20 +11186,19 @@ ISP $B$,(B @acronym{POP}-before-@acronym{SMTP} $B$NG'>Z$rMW5a$7$F$$$k>l9g$KM-
 @cindex archived messages
 @cindex sent messages
 
-Gnus $B$O$"$J$?$,Aw$C$?%a!<%k$H%K%e!<%9$rCy$a$F$*$/$?$a$N$$$/$D$+$N0c$C$?(B
+gnus $B$O$"$J$?$,Aw$C$?%a!<%k$H%K%e!<%9$rCy$a$F$*$/$?$a$N$$$/$D$+$N0c$C$?(B
 $BJ}K!$rDs6!$7$^$9!#%G%#%U%)%k%H$NJ}K!$O%a%C%;!<%8$rJ]B8$9$k$?$a(B
-$B$K(B @dfn{$B;ve$N=q8K%5!<%P!<(B}(archive virtual server) $B$r;H$$$^$9!#$3$l$r(B
-$B40A4$K6X;_$7$?$$$N$G$"$l$P!"(B
-$BJQ?t(B @code{gnus-message-archive-group} $B$O(B @code{nil} $B$K$J$k$Y$-$G!"$3$l(B
-$B$,%G%#%U%)%k%H$G$9!#(B
+$B$K!V%"!<%+%$%V2>A[%5!<%P!H$7$F2<$5(B
+$B%0%k!<%W$GFI$s$@6=L#$N$"$k%a%C%;!<%8$NJ]B8$K$D$$$F$O!"(B@kbd{B c}
+(@code{gnus-summary-copy-article}) $B%3%^%s%I$r;2>H$7$F2<$5(B
 $B$$(B (@pxref{Mail Group Commands})$B!#(B
 
 @vindex gnus-message-archive-method
-@code{gnus-message-archive-method} $B$OAw$C$?%a%C%;!<%8$rC_@Q$9$k$?$a$K$I(B
-$B$N;ve$N%5!<%P!<$r(B gnus $B$,;H$&$Y$-$+$r;XDj$7$^$9!#%G%#%U%)%k%H$O(B:
+@code{gnus-message-archive-method} $B$O!"Aw$C$?%a%C%;!<%8$rJ]B8$9$k$?$a$K(B
+$B$I$N2>A[%5!<%P!<$r(B gnus $B$,;H$&$+$r;XDj$7$^$9!#%G%#%U%)%k%H$O(B:
 
 @lisp
 (nnfolder "archive"
@@ -10891,10 +11208,10 @@ Gnus $B$O$"$J$?$,Aw$C$?%a!<%k$H%K%e!<%9$rCy$a$F$*$/$?$a$N$$$/$D$+$N0c$C$?(B
           (nnfolder-inhibit-expiry t))
 @end lisp
 
-$B$7$+$7!"$I$N%a!<%kA*BrJ}K!$G$b;H$&;v$,$G$-$^(B
+$B$7$+$7!"$I$N%a!<%kA*BrJ}K!$G$b;H$&$3$H$,$G$-$^(B
 $B$9(B (@code{nnml}, @code{nnmbox} $B$J$I$J$I(B)$B!#$7$+$7(B @code{nnfolder} $B$O$3$N(B
-$B$h$&$J;v$r$9$k$N$K$H$F$b9%$^$7$$A*BrJ}K!$G$9!#%G%#%U%)%k%H$N%G%#%l%/%H%j!<(B
-$BA*Br$r9%$-$G$J$$$J$i$P!"e5-$N$h$&$JNc$O!V0U?^$7$?DL$j$KF0:n$7$J$$!W(BFAQ $B$N%M%?$K$J$j$D$D$"(B
+$B$j!"IT6q9g$N860x$,FCDj$G$-$J$$;vNc$,>/$J$/$"$j$^$;$s!#Nc$($P!"F1(B
+$B$8(B "archive" $B$H$$$&L>A0$N2>A[%5!<%P!<$r2a5n$K;H$C$?$3$H$,$"$k$H!"$=$l(B
+$B$,(B @file{~/.newsrc.eld} $B%U%!%$%k$NCf$G(B @code{gnus-server-alist} $BJQ?t$KEP(B
+$BO?$5$l$F$$$k$+$b$7$l$^$;$s!#$=$l$r:o=|$9$k$K$O(B @file{~/.newsrc.eld} $B%U%!(B
+$B%$%k$r$N2>A[%5!<%P!<$r8=:_$b;H$C$F$$$k$+$b$7$l$^$;$s!#$=$N$h$&$J>l9g$O!"JL(B
+$B$NL>A0$r;H$&I,MW$,$"$j$^$9!#(B
+
 @vindex gnus-message-archive-group
 @cindex Gcc
-Gnus $B$O30$X=P$F9T$/A4$F$N%a%C%;!<%8$K!"0l$D$+$=$l0J>e$N$=$N%5!<%P!<$N%0(B
-$B%k!<%W$X8~$+$&(B @code{Gcc} $BMs$rA^F~$7$^$9!#$I$N%0%k!<%W$r;H$&$+$OJQ(B
+gnus $B$O30$X=P$F9T$/$9$Y$F$N%a%C%;!<%8$K!"(B
+@code{gnus-message-archive-method} $B$G;XDj$5$l$?%"!<%+%$%V2>A[%5!<%P!<$K(B
+$B$"$k(B ($B$"$k$$$O$=$l0J30$N%5!<%P!<$K$"$k(B) $B0l$D$+$=$l0J>e$N%0%k!<%W$KJ]B8$9(B
+$B$k$3$H$r0U?^$7$?(B @code{Gcc} $BMs$rA^F~$7$^$9!#$I$N%0%k!<%W$r;H$&$+$OJQ(B
 $B?t(B @code{gnus-message-archive-group} $B$K$h$C$F7h$^$j$^$9!#(B
 
-$B$3$NJQ?t$O$KA*BrJ}K!$r4^$a$k$3$H$,$G$-$^$9$,!"$=$&$9$k$H$=$N%a%C(B
-$B%;!<%8$O(B @code{gnus-message-archive-method} $B$G;XDj$7$?A*BrJ}K!$G$O$J$/$F!"(B
-$BBe$o$j$K%0%k!<%WL>$NA*BrJ}K!$GJ]B8$5$l$k$3$H$KCm0U$7$^$7$g$&!#>e$K<($7$?(B
-$B$h$&$K(B @code{gnus-message-archive-method} $B$O!"%G%#%U%)%k%HCM$r;}$D$b$N$G(B
-$B$"$k$H9M$($F2<$5$$!#$G$9$+(B
+$B%0%k!<%WL>$KA*BrJ}K!$r4^$a$k$3$H$,$G$-$^$9$,!"$=$&$9$k$H$=$N%a%C%;!<%8(B
+$B$O(B @code{gnus-message-archive-method} $B$G;XDj$7$?A*BrJ}K!$G$O$J$/$F!"Be$o(B
+$B$j$K%0%k!<%WL>$NA*BrJ}K!$GJ]B8$5$l$k$3$H$KCm0U$7$^$7$g$&!#(B
+@code{gnus-message-archive-method} $B$O!">e$K<($7$?$h$&$J%G%#%U%)%k%HCM$r(B
+$B;}$D$?$a$b$N$G$"$k$H9M$($F2<$5$$!#$G$9$+(B
 $B$i(B @code{gnus-message-archive-group} $B$r(B @code{"foo"} $B$K$7$F$*$1$P!"30$X(B
-$B=P$F9T$/%a%C%;!<%8$O(B @samp{nnfolder+archive:foo} $B$KJ]B8$5$l$^$9$,!"$b$7(B
-$B$"$J$?$,(B @code{"nnml:foo"} $B$H$$$&CM$r;H$&$H!"(B@samp{nnml:foo} $B$KJ]B8$5$l(B
-$B$^$9!#(B
+$B=P$F9T$/%a%C%;!<%8$O(B @samp{nnfolder+archive:foo} $B$KJ]B8$5$l$^$9$,!"(B
+@code{"nnml:foo"} $B$H$$$&CM$r;H$&$H!"30$X=P$F9T$/%a%C%;!<%8(B
+$B$O(B @samp{nnml:foo} $B$KJ]B8$5$l$k$G$7$g$&!#(B
 
 @item $BJ8;zNs$N%j%9%H(B
-$B%a%C%;!<%8$O$=$l$i$NA4$F$N%0%k!<%W$KJ]B8$5$l$^$9!#(B
+$B%a%C%;!<%8$O$=$l$i$N$9$Y$F$N%0%k!<%W$KJ]B8$5$l$^$9!#(B
+
+@item $B@55,I=8=!"4X?t!"(BLisp $B%U%)!<%`$NO"A[%j%9%H(B
+$B%-!<$,!X9gCW!Y$9$k$H!"$=$N7k2L$,;H$o$l$^$9!#(B
 
-@item $B@55,I=8=!"4X?t!"MM<0$NO"A[%j%9%H(B
-$B%-!<$,!X9gCW!Y$9$k$H!"7k2L$,;H$o$l$^$9!#(B
+$BLuCm(B: $B@53N$K$O0J2<$N;0(B ($B$^$?$OJ#?t$N%0%k!<%WL>%j%9%H(B) $B$NO"A[%j%9%H!#:G=i$K(B
+$B@55,I=8=$,9gCW$7$?MWAG$N%0%k!<%WL>(B ($B$^$?$O%0%k!<%WL>$N%j%9%H(B) $B$,;H$o$l$^(B
+$B$9!#(B
+@item
+$B4X?t$N%j%9%H!#$=$l$>$l$N4X?t$K$O8=:_$N%0%k!<%WL>$,0z?t$H$7$FM?$($i$l!":G(B
+$B=i$KJV$C$F$-$?(B @code{nil} $B0J30$NCM$,;H$o$l$^$9!#(B
+@item
+Lisp $B%U%)!<%`$N%j%9%H!#$=$l$>$l$N%U%)!<%`$,I>2A$5$l!":G=i$KJV$C$F$-(B
+$B$?(B @code{nil} $B0J30$NCM$,;H$o$l$^$9!#(B
+@end itemize
 
 @item @code{nil}
-$B%a%C%;!<%8$NJ]B8$O9T$o$l$^$;$s!#$3$l$,%G%#%U%)%k%H$G$9!#(B
+$B%a%C%;!<%8$NJ]B8$O9T$J$o$l$^$;$s!#$3$l$,%G%#%U%)%k%H$G$9!#(B
 @end table
 
-$B;n$7$F$_$^$7$g$&(B:
+$BNc$r$"$2$F$_$^$7$g$&(B:
 
-@samp{MisK} $B$H8F$P$l$k0l$D$N%0%k!<%W$KJ]B8$9$k$J$i$P(B:
+@samp{MisK} $B$H$$$&C10l$N%0%k!<%W$KJ]B8$9$k$@$1$J$i$P(B:
 @lisp
 (setq gnus-message-archive-group "MisK")
 @end lisp
@@ -10964,8 +11307,8 @@ Gnus $B$O30$X=P$F9T$/A4$F$N%a%C%;!<%8$K!"0l$D$+$=$l0J>e$N$=$N%5!<%P!<$N%0(B
           "misc-mail")))
 @end lisp
 
-$BA4$F$N%K%e!<%9%a%C%;!<%8$r0l$D$N%U%!%$%k$KJ]B8$7$F!"%a!<%k%a%C%;!<%8$r0l(B
-$B7n$K$D$-0l$D$N%U%!%$%k$KJ]B8$9$k$K$O(B:
+$B$9$Y$F$N%K%e!<%9%a%C%;!<%8$r0l$D$N%U%!%$%k$KJ]B8$7$F!"%a!<%k%a%C%;!<%8$r(B
+$B0l7n$K$D$-0l$D$N%U%!%$%k$KJ]B8$9$k$H$$$&$N$O$I$&$G$7$g$&(B:
 
 @lisp
 (setq gnus-message-archive-group
@@ -10975,21 +11318,17 @@ Gnus $B$O30$X=P$F9T$/A4$F$N%a%C%;!<%8$K!"0l$D$+$=$l0J>e$N$=$N%5!<%P!<$N%0(B
                            "%Y-%m" (current-time))))))
 @end lisp
 
-@c (XEmacs 19.13 $B$K$O(B @code{format-time-string} $B$O$"$j$^$;$s$N$G!"$=(B
-@c $B$N(B @code{gnus-message-archive-group} $B$N$?$a$K0c$C$?CM$r;H$o$J$1$l$P$J$j(B
-@c $B$^$;$s!#(B)
+$B$5$"!"%a%C%;!<%8$rAw$k$HE,@Z$J%0%k!<%W$KJ]B8$5$l$k$h$&$K$J$j$^$7$?!#(B($B$b(B
+$B$7FCDj$N%a%C%;!<%8$rJ]B8$r$7$?$/$J$$$N$G$"$l$P!"A^F~$5$l$?(B @code{Gcc} $BMs(B
+$B$r$N%0%k!<%W$HF1$8$h$&$K!"$=$N%0%k!<%W$KF~$C$F5-;v$rFI$`$3$H$,$G$-$^$9!#(B
+$B$=$N%0%k!<%W$,K\Ev$KBg$-$/$FG:$^$7$/$J$C$?$i!"$J$K$+NI$$$b$N$K$=$NL>A0$r(B
+$BJQ99$9$k$3$H$,$G$-$^$9(B ($B%0%k!<%W%P%C%U%!!<$G(B @kbd{G r} $B$r;H$&$3$H$K$h$C(B
+$B$F(B)---@samp{misc-mail-september-1995} $B$=$NB>2?$G$b!#?7$7$$%a%C%;!<%8$O8E(B
+$B$$(B ($B:#$O6u$K$J$C$?(B) $B%0%k!<%W$KN/$a$i$l$^$9!#(B
 
-$B:#$d!"%a%C%;!<%8$rAw$k$H!"$=$l$OE,@Z$J%0%k!<%W$KJ]B8$5$l$^$9!#(B($B$b$7FCDj(B
-$B$N%a%C%;!<%8$KBP$7$FJ]B8$r$7$?$/$J$$$N$G$"$l$P!"A^F~$5$l$?(B @code{Gcc} $BMs(B
-$B$r$N(B
-$B%0%k!<%W$HF1$8$h$&$K$=$N%0%k!<%W$KF~$C$F!"5-;v$rFI$`;v$,$G$-$^$9!#$=$N%0(B
-$B%k!<%W$,K\Ev$KBg$-$/$J$C$F7y$K$J$C$?$i!"$J$K$+NI$$$b$N$K$=$NL>A0$rJQ99$9(B
-$B$k;v$,$G$-$^$9(B ($B%0%k!<%W%P%C%U%!$G(B @kbd{G r} $B$r;H$&;v$K$h$C$F(B) $B!=!=(B
-@samp{misc-mail-september-1995} $B$dB>$N$b$K!#?7$7$$%a%C%;!<%8$O8E$$(B ($B:#$O(B
-$B6u$K$J$C$?(B) $B%0%k!<%W$KN/$a$i$l$^$9!#(B
-
-$B0J>e$,Aw$C$?%a%C%;!<%8$rJ]4I$9$k%G%#%U%)%k%H$NJ}K!$G$9!#(BGnus $B$O%G%#%U%)(B
+$B0J>e$,Aw$C$?%a%C%;!<%8$rJ]4I$9$k%G%#%U%)%k%H$NJ}K!$G$9!#(Bgnus $B$O%G%#%U%)(B
 $B%k%H$NJ}K!$r9%$-$G$O$J$$?M$K$O0c$C$?$d$jJ}$r4+$a$F$$$^$9!#$=$N$h$&$J>l9g(B
 $B$O!"(B@code{gnus-message-archive-group} $B$r(B @code{nil} $B$K@_Dj$9$k$Y$-$G$9!#(B
 $B$3$l$OJ]4I$r$7$J$$$h$&$K$7$^$9!#(B
@@ -10997,21 +11336,24 @@ Gnus $B$O30$X=P$F9T$/A4$F$N%a%C%;!<%8$K!"0l$D$+$=$l0J>e$N$=$N%5!<%P!<$N%0(B
 @table @code
 @item gnus-outgoing-message-group
 @vindex gnus-outgoing-message-group
-$BA4$F$N30$K$$$/%a%C%;!<%8$O$3$N%0%k!<%W$KF~$l$i$l$^$9!#$b$7A4$F$N30$K9T$/(B
-$B%a!<%k$H5-;v$r%0%k!<%W(B @samp{nnml:archive} $B$KJ]4I$7$?$$$N$G$"$l$P!"$3$N(B
-$BJQ?t$r$=$NCM$K@_Dj$9$k;v$,$G$-$^$9!#$3$NJQ?t$O%0%k!<%WL>$N%j%9%H$G$"$k;v(B
+$B$9$Y$F$N30$K$$$/%a%C%;!<%8$O$3$N%0%k!<%W$KF~$l$i$l$^$9!#$b$7$9$Y$F$N30$K(B
+$B9T$/%a!<%k$H5-;v$r(B @samp{nnml:archive} $B%0%k!<%W$KJ]4I$7$?$$$N$G$"$l$P!"(B
+$B$3$NJQ?t$r$=$NCM$K@_Dj$7$F2<$5$$!#$3$NJQ?t$O%0%k!<%WL>$N%j%9%H$G$"$k$3$H(B
 $B$b$G$-$^$9!#(B
 
 $B$b$7$=$l$>$l$N%a%C%;!<%8$r$I$N%0%k!<%W$KF~$l$k$+$r$b$C$H@)8f$7$?$$$N$G$"(B
 $B$l$P!"$3$NJQ?t$r8=:_$N%K%e!<%9%0%k!<%WL>$rD4$Y$F!"E,@Z$J%0%k!<%WL>(B ($B$b$7(B
-$B$/$OL>A0$N%j%9%H(B) $B$rJV$94X?t$K@_Dj$9$k;v$,$G$-$^$9!#(B
+$B$/$OL>A0$N%j%9%H(B) $B$rJV$94X?t$K@_Dj$9$k$3$H$,$G$-$^$9!#(B
+
+$B$3$NJQ?t$O(B @code{gnus-message-archive-group} $B$NBe$o$j$K;H$&$3$H$,$G$-$^(B
+$B$9$,!"8ee$N$=$N%5!<%P!<$N%0(B
 @cindex posting styles
 @cindex styles
 
-$B$=$l$i$O$9$Y$FJQ?t$G!";d$K$a$^$$$r5/$3$5$;$^$9!#(B
+$B$=$l$i$O$9$Y$FJQ?t$G!";d$NF,$r$/$i$/$i$5$;$^$9!#(B
 
 $BEj9F$9$k%0%k!<%W$K$h$C$F0c$C$?(B @code{Organization} $B$H=pL>$rIU$1$?$$$s$G(B
 $B$9$+(B?  $B$=$7$F!"2H$N%^%7%s$H?&>l$N%^%7%s$NN>J}$+$iEj9F$9$k$1$l$I$b!"0c$C(B
@@ -11035,9 +11377,9 @@ Gnus $B$O30$X=P$F9T$/A4$F$N%a%C%;!<%8$K!"0l$D$+$=$l0J>e$N$=$N%5!<%P!<$N%0(B
 $B$j$^$;$s$+!#(B
 
 @vindex gnus-posting-styles
-$B$=$N$h$&$J;v$r$9$kJ}K!$N0l$D$OJQ99$5$l$kI,MW$N$"$kJQ?t$rJQ99$9$k8-$$%U%C(B
-$B%/$r=q$/;v$G$9!#$=$l$O>/$7B`6~$J$N$G!"MxMQ/$7B`6~$J$N$G!"MxMQe$N$=$N%5!<%P!<$N%0(B
 @end lisp
 
 $B$3$NNc$+$i?dB,$5$l$k$h$&$K!"$3$NO"A[%j%9%H$O$$$/$D$+(B
-$B$N(B @dfn{$BMM<0(B} (style) $B$+$i$J$C$F$$$^$9!#$=$l$>$l$NMM<0$O:G=i$NMWAG$,2?$i(B
-$B$+$N7A$G(B ``$B9gCW(B'' $B$7$?$H$-$KE,MQ$5$l$^$9!#O"A[%j%9%HA4BN$O:G=i$+$i:G8e$^(B
-$B$GH?I|$7$F$l$N9gCW$,E,MQ$5$l$^$9!#$3$l$O!"8e$NMM<0$NB0@-(B
-$B$,A0$K9gCW$7$?MM<0$NB0@-$r>e=q$-$9$k$H8@$&;v$G$9!#$G$9$+$i!"(B
-@samp{comp.programming.literate} $B$O!"=p(B
-$BL>(B @samp{Death to everybody} $B$H(B @code{Organization} $B%X%C(B
-$B%@!<(B @samp{What me?} $B$r;}$A$^$9!#(B
-
-$B$=$l$>$l$NMM<0$N:G=i$NMWAG$O(B @code{$B9gCW(B} (match) $B$H8F$P$l$^$9!#$b$7$=$l(B
-$B$,J8;zNs$G$"$l$P!"(Bgnus $B$O$=$l$r%0%k!<%WL>$K@55,I=8=$H$7$F9gCWA`:n$r9T$$(B
-$B$^$9!#(B@code{(header $B9gCW(B $B@55,I=8=(B)} $B$H$$$&MM<0$G$"$l$P!"(Bgnus $B$O85$N5-;v(B
-$B$NCf$+$iL>A0$,9gCW$9$k%X%C%@!<$rC5$7!"$=$l$r@55,I=8=$HHf3S$7$^$9!#9gCW$H(B
-$B@55,I=8=$OJ8;zNs$G$9!#(B($B85$N5-;v$H$OJV?.$^$?$O%U%)%m!<%"%C%W$7$h$&$H$7$F(B
-$B$$$k$b$N$G$9!#JV?.$"$k$$$O%U%)%m!<%"%C%W$r:n@.$7$F$$$J$1$l$P!"9gCW$9$k$b(B
-$B$N$O2?$b$"$j$^$;$s!#(B) $B$b$7(B @code{$B9gCW(B} $B$,4X?t$N%7%s%\%k$G$"$l$P!"$=$N4X(B
-$B?t$,0z?tL5$7$G8F$P$l$^$9!#$=$l$,JQ?t$N%7%s%\%k$G$"$l$P!"$=$NJQ?t$,;2>H$5(B
-$B$l$^$9!#$=$l$,%j%9%H$G$"$l$P!"$=$N%j%9%H$,(B @code{$BI>2A(B} $B$5$l$^$9!#$I$N>l(B
-$B9g$G$b!"$3$l$,(B @code{nil}$B$G$J$$CM$r5"$;$P!"MM<0$O(B @code{$B9gCW$7$?(B} $B$H8@$$(B
-$B$^$9!#(B
-
-$B$=$l$>$l$NMM<0$OG$0U$NNL$N(B @dfn{$BB0@-(B} $B$r;}$D;v$,$G$-$^$9!#$=$l$>$l$NB0@-(B
-$B$O(B @code{(@var{name} @var{value})} $B$NBP$K$h$j@.$jN)$C$F$$$^$9!#2C$($F!"(B
-@code{(@var{name} :file @var{value})} $B$N7A<0$+(B @code{(@var{name} :value
-@var{value})} $B$N7A<0$r;H$&$3$H$b$G$-$^$9!#$3$3(B
-$B$G(B @code{:file} $B$O(B @var{value} $B$,%U%!%$%kL>$rI=$7$F!"$=$NFbMF$,B0@-CM$H(B
-$B$7$F;HMQ$5$l$k$Y$-$G$"$k$3$H$r<($7!"(B@code{:value} $B$O(B @var{value} $B$,%U%!(B
-$B%$%kL>$rI=$o$5$J$$$3$H$rL@<(E*$K<($7$^$9!#B0@-L>$O!"0J2<$N$I$l$+$G$"$k;v(B
-$B$,$G$-$^$9!#(B
+$B$N!VMM<0!W(B(style) $B$+$i$J$C$F$$$^$9!#$=$l$>$l$NMM<0$O:G=i$NMWAG$,2?$i$+$N(B
+$B7A$G!V9gCW!W$7$?$H$-$KE,MQ$5$l$^$9!#O"A[%j%9%HA4BN$O:G=i$+$i:G8e$^$GH?I|(B
+$B$7$F$l$N9gCW$,E,MQ$5$l$^$9!#$3$l$O!"8e$NMM<0$NB0@-$,A0$K(B
+$B9gCW$7$?MM<0$NB0@-$h$j$bM%@h$5$l$k$H$$$&$3$H$G$9!#$G$9$+(B
+$B$i(B @samp{comp.programming.literate} $B$O!"(B@samp{Death to everybody} $B$H$$$&(B
+$B=pL>$H(B @samp{What me?} $B$H$$$&(B @code{Organization} $B%X%C%@!<$r;}$A$^$9!#(B
+
+$B$=$l$>$l$NMM<0$N:G=i$NMWAG$O(B @code{$B%^%C%A(B} (match) $B$H8@$$$^$9!#$b$7$=$l(B
+$B$,J8;zNs$G$"$l$P!"(Bgnus $B$O$=$l$r@55,I=8=$G$"$k$b$N$H$7$F!"%0%k!<%WL>$K9g(B
+$BCW$9$k$+$I$&$+$rD4$Y$^$9!#(B@code{(header @var{$B9gCW(B} @var{$B@55,I=8=(B})} $B$H$$(B
+$B$&7A<0$G$"$l$P!"(Bgnus $B$O855-;v$NCf$+$i$=$NL>A0$,(B @var{$B9gCW(B} $B$G$"$k%X%C%@!<(B
+$B$rC5$7!"$=$l$r(B @var{$B@55,I=8=(B} $B$HHf3S$7$^$9!#(B
+@var{$B9gCW(B} $B$H(B @var{$B@55,I=8=(B} $B$OJ8;zNs$G$9!#(B($B855-;v$H$O!"$"$J$?$,$=$l$KBP(B
+$B$7$FJV?.$^$?$O%U%)%m!<%"%C%W$7$h$&$H$7$F$$$kBP>]$N5-;v$G$9!#JV?.$"$k$$$O(B
+$B%U%)%m!<%"%C%W$r:n@.$7$F$$$J$1$l$P!"9gCW$9$k$b$N$O2?$b$"$j$^$;$s!#(B) $B$b(B
+$B$7(B @code{$B%^%C%A(B} $B$,4X?t$N%7%s%\%k$G$"$l$P!"$=$N4X?t$,0z?tL5$7$G8F$P$l$^(B
+$B$9!#$=$l$,JQ?t$N%7%s%\%k$G$"$l$P!"$=$NJQ?t$,;2>H$5$l$^$9!#$=$l$,%j%9%H$G(B
+$B$"$l$P!"$=$N%j%9%H$,(B @code{$BI>2A(B} $B$5$l$^$9!#$I$N>l9g$G$b!"$3$l(B
+$B$,(B @code{nil} $B$G$J$$CM$rJV$;$P!"MM<0$O(B @code{$B9gCW$7$?(B} $B$H8@$$$^$9!#(B
+
+$B$=$l$>$l$NMM<0$OG$0U$NNL$N!VB0@-!W$r;}$D$3$H$,$G$-$^$9!#$=$l$>$l$NB0@-(B
+$B$O(B @code{(@var{name} @var{value})} $B$NBP$K$h$j@.$jN)$C$F$$$^$9!#2C$((B
+$B$F(B @code{(@var{name} :file @var{value})} $B$N7A<0(B
+$B$+(B @code{(@var{name} :value @var{value})} $B$N7A<0$r;H$&$3$H$b$G$-$^$9!#$3(B
+$B$3$G(B @code{:file} $B$O(B @var{value} $B$,%U%!%$%kL>$rI=$7$F!"$=$NFbMF$,B0@-CM(B
+$B$H$7$F;HMQ$5$l$k$Y$-$G$"$k$3$H$r<($7!"(B@code{:value} $B$O(B @var{value} $B$,%U%!(B
+$B%$%kL>$rI=$o$5$J$$$3$H$rL@<(E*$K<($7$^$9!#B0@-L>(B (@var{name}) $B$O!"0J2<$N(B
+$B$I$l$+$G$"$k$3$H$,$G$-$^$9!#(B
 
 @itemize @bullet
 @item @code{signature}
 @item @code{signature-file}
 @item @code{x-face-file}
-@item @code{address}, @code{user-mail-address} $B$r>e=q$-$7$^$9(B
-@item @code{name}, @code{(user-full-name)} $B$r>e=q$-$7$^$9(B
+@item @code{address} (@code{user-mail-address} $B$h$j$bM%@h$5$l$^$9(B)
+@item @code{name} (@code{(user-full-name)} $B$h$j$bM%@h$5$l$^$9(B)
 @item @code{body}
 @end itemize
 
-$BB0@-L>$OJ8;zNs$^$?$O%7%s%\%k$G$"$k;v$b$G$-$^$9!#$=$N>l9g$O!"$3$l$O%X%C%@!<(B
+$BB0@-L>$OJ8;zNs$^$?$O%7%s%\%k$G$"$k$3$H$b$G$-$^$9!#$=$N>l9g$=$l$O%X%C%@!<(B
 $BL>$H$7$F;H$o$l!"$=$NCM$,5-;v$N%X%C%@!<$KA^F~$5$l$^$9!#$b$7B0@-L>(B
-$B$,(B @code{nil} $B$@$C$?$i$=$N%X%C%@!$O:o=|$5$l$^$9!#$b$7B0@-L>(B
+$B$,(B @code{nil} $B$@$C$?$i!"$=$N%X%C%@!$O:o=|$5$l$^$9!#$b$7B0@-L>(B
 $B$,(B @code{eval} $B$@$C$?$i$=$NMM<0$,I>2A$5$l!"7k2L$O2A(B} $B$5$l$F!"JV$j(B
-$BCM$,;H$o$l$^$9(B) $B$G$"$k;v$,$G$-$^$9!#4X?t$O%;%C%H%"%C%W$5$l$?%a%C%;!<%8%P%C(B
-$B%U%!$G8F$P$l(B (@code{eval} $B$5$l(B) $B$^$9!#8=:_$N5-;v$N%X%C%@!<$OJQ(B
-$B?t(B @code{message-reply-headers} $B$+$iF@$i$l$^$9!#$3$l$O(B number subject
-from date id references chars lines xref extra $B$N3F%X%C%@!<$+$i@.$k%Y%/(B
-$B%H%k$G$9!#(B
+$BCM$,;H$o$l$^$9(B) $B$G$"$k$3$H$,$G$-$^$9!#4X?t$H(B S$B<0(B (sexp) $B$O%;%C%H%"%C%W$5(B
+$B$l$D$D$"$k%a%C%;!<%8%P%C%U%!!<$G8F$P$l$k$+I>2A$5$l$^$9!#8=:_$N5-;v$N%X%C(B
+$B%@!<72$OJQ?t(B @code{message-reply-headers} $B$+$iF@$i$l$^$9!#$3$l$O(B number
+subject from date id references chars lines xref extra $B$N3F%X%C%@!<$+$i(B
+$B@.$k%Y%/%H%k$G$9!#(B
 
 @vindex message-reply-headers
-
-$B$b$7!":n@.$7$h$&$H$7$F$$$k%a%C%;!<%8$,%K%e!<%95-;v$+%a!<%k%a%C%;!<%8$G$"(B
-$B$k$+$rD4$Y$?$$$H$-$O!"Fs$D$N4X(B
-$B?t(B @code{message-news-p} $B$H(B @code{message-mail-p} $B$r;H$&$3$H$K$h$C$FCN$k(B
-$B;v$,$G$-$^$9!#(B
+$B:n@.$7$h$&$H$7$F$$$k%a%C%;!<%8$,%K%e!<%95-;v$+%a!<%k%a%C%;!<%8$G$"$k$+$r(B
+$BD4$Y$?$$$H$-$O!"4X(B
+$B?t(B @code{message-news-p} $B$H(B @code{message-mail-p} $B$NLa$jCM$rD4$Y$F2<$5$$!#(B
 
 @findex message-mail-p
 @findex message-news-p
-
 $B$=$7$F!"$3$l$ONc$G$9(B:
 
 @lisp
@@ -11119,7 +11458,8 @@ from date id references chars lines xref extra $B$N3F%X%C%@!<$+$i@.$k%Y%/(B
       '((".*"
          (signature-file "~/.signature")
          (name "User Name")
-         ("X-Home-Page" (getenv "WWW_HOME"))
+         (x-face-file "~/.xface")
+         (x-url (getenv "WWW_HOME"))
          (organization "People's Front Against MWM"))
         ("^rec.humor"
          (signature my-funny-signature-randomizer))
@@ -11133,7 +11473,7 @@ from date id references chars lines xref extra $B$N3F%X%C%@!<$+$i@.$k%Y%/(B
         ;; @r{Organization $B%X%C%@!<$rIU$1$h$&!#(B}
         ((header "to" "larsi.*org")
          (Organization "Somewhere, Inc."))
-        ((posting-from-work-p) ;; @r{$B%f!<%6!<$,Dj5A$7$?4X?t(B}
+        ((posting-from-work-p) ;; @r{$BMxMQl9g$KJXMx$G$7$g$&!#(B
 
 $BJQ?t(B @code{gnus-named-posting-styles} $B$r@_Dj$9$k$3$H$G!"$h$/MxMQ$9$kEj9F(B
-$BMM<0$KL>A0$r$D$1$i$l$^$9!#35N,%P%C%U%!$G(B @kbd{S P} $B$H$9$k$3$H$G!"Ej9F;~(B
-$B$KG$0U$NMM<0$rA*Br$7$^$9!#(B@code{gnus-named-posting-styles} $B$OL>A0$HMM<0(B
-$B$+$i$J$kO"A[%j%9%H$G$9!#(B@code{gnus-posting-styles} $B$K4^$^$l$kB0@-L>(B
+$BMM<0$KL>A0$rIU$1$i$l$^$9!#35N,%P%C%U%!!<$G(B @kbd{S P} $B$H$9$k$3$H$G!"Ej9F(B
+$B;~$KG$0U$NMM<0$rA*Br$7$^$9!#(B@code{gnus-named-posting-styles} $B$OL>A0$HMM(B
+$B<0$+$i$J$kO"A[%j%9%H$G$9!#(B@code{gnus-posting-styles} $B$K4^$^$l$kB0@-L>(B
 $B$,(B @code{import} $B$@$C$?$i!"$=$NCM$G(B @code{gnus-named-posting-styles} $B$r(B
 $B0z$$$F!"B0@-CM$r$=$3$KE83+$7$^$9!#(B
 
@@ -11174,40 +11514,40 @@ from date id references chars lines xref extra $B$N3F%X%C%@!<$+$i@.$k%Y%/(B
 "Emacs" $B$HL>IU$1$i$l$?MM<0$O!"(B@code{organization} $B0J30$NB0@-(B
 $B$r(B "Default" $B$+$i0z$-7Q$.$^$9!#(B
 
-
 @node Drafts
 @section $B2<=q$-(B
 @cindex drafts
 
-$B$b$7%a%C%;!<%8(B ($B%a!<%k$b$7$/$O%K%e!<%9(B) $B$r=q$$$F$$$k$H$-$K!"FMA3%*!<%V%s(B
-$B$K%9%F!<%-$,F~$C$F$$$k(B ($B$b$7$/$O$"$J$?$,$H!<$C$F$b$9$4$$:Z?)C$75n$kM#0l$NJ}K!$O!"$=$l$rL$9XFI$K$9$k$3$H$G$9!#2<=q$-%0(B
-$B%k!<%W$NFCJL$NFC@-$O%0%k!<%WFC@-(B (@pxref{Group Parameters}) $B$K$h$C$F@8$8!"(B
-$B$=$l$,<:$o$l$F$7$^$&$HB>$N%0%k!<%W$N$h$&$K?6$kIq$&$h$&$K$J$j$^$9!#$3$l$O(B
-$B0J2<$N%3%^%s%I$,;H$($J$$$3$H$r0UL#$7$^$9!#$=$N%0%k!<%W$NFCJL$NFC@-$rI|3h(B
-$B$5$;$k4JC1$JJ}K!$O!"(B@kbd{C-k} $B$G$=$N%0%k!<%W$r:o=|$7$F$+$i(B gnus $B$r:F5/F0(B
-$B$9$k$3$H$G$9!#$=$N%0%k!<%W$NFbMFJ*$O<:$o$l$^$;$s!#(B
+$B2<=q$-%0%k!<%W$O(B @samp{nndraft:drafts} $B$H8F$P$l$kFCJL$J%0%k!<%W$G$9(B ($B$"(B
+$B$J$?$,@dBP$KCN$C$F$$$J$1$l$P$J$i$J$$$N$G$"$l$P!"$=$l$O(B @code{nndraft} $B%0(B
+$B%k!<%W$H$7$FC$75n$kM#0l$NJ}K!$O!"$=$l$r9XFI$7$J$$$h$&$K$9$k$3$H$G$9!#(B
+$B2<=q$-%0%k!<%W$NFCJL$NFC@-$O%0%k!<%W$NFC@-(B (@pxref{Group Parameters}) $B$K(B
+$B$h$C$F@8$8!"$=$l$,<:$o$l$F$7$^$&$HB>$N%0%k!<%W$N$h$&$K?6$kIq$&$h$&$K$J$j(B
+$B$^$9!#$3$l$O(B ($B%0%k!<%W$NFC@-$r>C$7$F$7$^$&$3$H$O(B) $B0J2<$N%3%^%s%I$,;H$($J(B
+$B$$$3$H$r0UL#$7$^$9!#$=$N%0%k!<%W$NFCJL$NFC@-$rI|3h$5$;$k:G$b4JC1$JJ}K!$O!"(B
+@kbd{C-k} $B$G$=$N%0%k!<%W$r:o=|$7$F$+$i(B gnus $B$r:F5/F0$9$k$3$H$G$9!#$=$N%0(B
+$B%k!<%W$NFbMFJ*$O<:$o$l$^$;$s!#(B
 
 @c @findex gnus-dissociate-buffer-from-draft
 @c @kindex C-c M-d (Mail)
@@ -11227,51 +11567,51 @@ from date id references chars lines xref extra $B$N3F%X%C%@!<$+$i@.$k%Y%/(B
 @c @vindex gnus-use-draft
 @c To leave association with the draft group off by default, set
 @c @code{gnus-use-draft} to @code{nil}.  It is @code{t} by default.
-
+@c
 @findex gnus-draft-edit-message
 @kindex D e ($B2<=q$-(B)
 $B5-;v$NJT=8$rB3$1$?$$$H$-$O!"2<=q$-%0%k!<%W$KF~$C(B
-$B$F(B @kbd{D e} (@code{gnus-draft-edit-message}) $B$r2!$9$@$1$G$9!#$"$J$?$,;D(B
-$B$7$?>uBV$N%P%C%U%!$K0\F0$7$^$9!#(B
+$B$F(B @kbd{D e} (@code{gnus-draft-edit-message}) $B$r2!$9$@$1$G$9!#JT=8$rCfCG(B
+$B$7$?$H$-$N>uBV$N%P%C%U%!!<$K0\F0$7$^$9!#(B
 
-$B5qH]$5$l$?5-;v$b$3$N2<=q$-%0%k!<%W$KF~$l$i$l$^(B
+$BAw?.$r5qH]$5$l$?5-;v$b!"$3$N2<=q$-%0%k!<%W$KF~$l$i$l$^(B
 $B$9(B (@pxref{Rejected Articles})$B!#(B
 
 @findex gnus-draft-send-all-messages
-@kindex D s (Draft)
+@kindex D s ($B2<=q$-(B)
 @findex gnus-draft-send-message
-@kindex D S (Draft)
-$B$=$l0J>eJT=8$7$J$$$GEj9F(B ($B$b$7$/$O%a!<%k(B) $B$7$?$$5qH]$5$l$?%a%C%;!<%8$,$?(B
-$B$/$5$s$"$k$N$G$"$l$P!"L?Na(B @kbd{D s} $B$r;H$&;v$,$G$-$^$9!#$3$NL?Na$O%W%m(B
-$B%;%9(B/$B@\F,0z?t$N=,47$rM}2r$7$^$9(B (@pxref{Process/Prefix})$B!#L?(B
-$BNa(B @kbd{D S} (@code{gnus-draft-send-all-messages}) $B$O%P%C%U%!$NA4$F$N%a%C(B
-$B%;!<%8$rAw$j=P$7$^$9!#(B
+@kindex D S ($B2<=q$-(B)
+$BAw?.$r5qH]$5$l$?%a%C%;!<%8$,$?$/$5$s$"$C$F!"$=$l0J>eJT=8$;$:$K$=$l$i$rAw(B
+$B?.$7$?$$>l9g$O!"(B@kbd{D s} $BL?Na$r;H$&$3$H$,$G$-$^$9!#$3$NL?Na$O%W%m%;%9(B/
+$B@\F,0z?t$N=,47$rM}2r$7$^$9(B (@pxref{Process/Prefix})$B!#(B@kbd{D S} $BL?(B
+$BNa(B (@code{gnus-draft-send-all-messages}) $B$O%P%C%U%!!<$N$9$Y$F$N%a%C%;!<(B
+$B%8$rAw$j=P$7$^$9!#(B
 
 @findex gnus-draft-toggle-sending
-@kindex D t (Draft)
-$BAw$j$?$/$J$$%a%C%;!<%8$,$$$/$D$+$"$k$N$G$"$l$P!"L?(B
-$BNa(B @kbd{D t} (@code{gnus-draft-toggle-sending}) $B$r;H$C$F%a%C%;!<%8$rG[Aw(B
-$BIT2D$N0u$rIU$1$k;v$,$G$-$^$9!#$3$l$O@Z$jBX$(L?Na$G$9!#(B
+@kindex D t ($B2<=q$-(B)
+$BAw$j$?$/$J$$%a%C%;!<%8$,$$$/$D$+$"$k$N$G$"$l$P!"(B@kbd{D t} $BL?(B
+$BNa(B (@code{gnus-draft-toggle-sending}) $B$r;H$C$F%a%C%;!<%8$KAw?.IT2D$N0u$r(B
+$BIU$1$k$3$H$,$G$-$^$9!#$3$l$O@Z$jBX$(L?Na$G$9!#(B
 
 @node Rejected Articles
 @section $B5qH]$5$l$?5-;v(B
 @cindex rejected articles
 
-$B;~!9%K%e!<%9%5!<%P!<$O5-;v$r5qH]$7$^$9!#$*$=$i$/%5!<%P!<$O$"$J$?$N4i$r9%(B
-$B$-$G$O$J$$$N$G$7$g$&!#$*$=$i$/Mn$A9~$s$G$$$k$N$G$7$g$&!#$*$=$i(B
-$B$/(B @emph{$B0-Kb(B (demon) $B$,$$$k$N$G$7$g$&(B}$B!#$*$=$i$/0zMQJ8$rF~$l$9$.$?$N$G(B
-$B$7$g$&!#$*$=$i$/%G%#%9%/$,0lGU$@$C$?$N$G$7$g$&!#$*$=$i$/%5!<%P!<$,Mn$A$F(B
-$B$$$?$N$G$7$g$&!#(B
+$B;~!9%K%e!<%9%5!<%P!<$O5-;v$rAw?.$9$k$3$H$r5qH]$7$^$9!#$*$=$i$/%5!<%P!<$O(B
+$B$"$J$?$N4i$r9%$-$G$O$J$$$N$G$7$g$&!#$*$=$i$/Mn$A9~$s$G$$$k$N$G$7$g$&!#$*(B
+$B$=$i$/(B @emph{$B0-Kb(B (demon) $B$,$$$k$N$G$7$g$&(B}$B!#$*$=$i$/0zMQJ8$rF~$l$9$.$?(B
+$B$N$G$7$g$&!#$*$=$i$/%G%#%9%/$,0lGU$@$C$?$N$G$7$g$&!#$*$=$i$/%5!<%P!<$,Mn(B
+$B$A$F$$$?$N$G$7$g$&!#(B
 
-$B$3$l$i$N>u67$O!"$b$A$m$s!"40A4$K(B gnus $B$N07$($kHO0O30$G$9!#(B(Gnus $B$O!"$b$A(B
-$B$m$s!"$"$J$?$N308+$r0&$7$F$*$j!"$$$D$b5!7y$,NI$/!"Cf$rHt$S2s$kE7;H$,$$$F!"(B
+$B$b$A$m$s$3$l$i$N>u67$O40A4$K(B gnus $B$N07$($kHO0O30$G$9!#(B($B$b$A$m$s(B gnus $B$O(B
+$B$"$J$?$NIwKF$r0&$7$F$$$k$7!"$$$D$b5!7y$,NI$$$7!"Cf$rHt$S2s$kE7;H$,$$$F!"(B
 $B$I$l$/$i$$0zMQJ8$,4^$^$l$F$$$h$&$H5$$K$;$:!"0lGU$K$J$C$?$j!"Mn$C$3$A$?$j(B
-$B$7$^$;$s!#(B) $B$G$9$+$i!"(Bgnus $B$O$3$l$i$N5-;v$r8e$G%5!<%P!<$N5$J,$,$h$/$J$k(B
+$B$7$^$;$s!#(B) $B$G$9$+$i(B gnus $B$O$3$l$i$N5-;v$r8e$G%5!<%P!<$N5!7y$,NI$/$J$k(B
 $B$^$GJ]B8$7$^$9!#(B
 
 $B5qH]$5$l$?5-;v$O<+F0E*$KFCJL$J2<=q$-%0%k!<%W(B (@pxref{Drafts}) $B$KF~$l$i$l(B
-$B$^$9!#%5!<%P!<$,La$C$F$-$?$J$i!"IaDL$O$=$N%0%k!<%W$KF~$C$FA4$F$N5-;v$rAw(B
-$B$j$^$9!#(B
+$B$^$9!#%5!<%P!<$,I|5l$7$?6G$K$O!"IaDL$"$J$?$O$=$N%0%k!<%W$KF~$C$F!"$9$Y$F(B
+$B$N5-;v$rAw$k$3$H$K$J$k$G$7$g$&!#(B
 
 @ignore
 @node Signing and encrypting
@@ -11353,91 +11693,93 @@ Remove security related @acronym{MML} tags from message.
 @cindex foreign groups
 @cindex select methods
 
-@dfn{$B30It%0%k!<%W(B} (foreign group) $B$H$O!"IaDL(B ($B$b$7$/$O%G%#%U%)%k%H(B) $B$N(B
-$BJ}K!$GFI$^$l$J$$%0%k!<%W$N;v$G$9!#Nc$($P!"$=$l$O0c$C$?(B @acronym{NNTP} $B%5!<(B
-$B%P!<$N%0%k!<%W$G$"$C$?$j!";ve$N%0%k!<%W$G$"$C$?$j!"8D?ME*$J%a!<%k%0%k!<(B
-$B%W$G$"$C$?$j$9$k$G$7$g$&!#(B
+$B!V30It%0%k!<%W!W(B(foreign group) $B$H$O!"IaDL(B ($B$b$7$/$O%G%#%U%)%k%H(B) $B$NJ}K!(B
+$B$GFI$^$l$J$$%0%k!<%W$N$3$H$G$9!#Nc$($P$=$l$OJL$N(B @acronym{NNTP} $B%5!<%P!<(B
+$B$N%0%k!<%W$G$"$C$?$j!"2>A[%0%k!<%W$G$"$C$?$j!"8D?ME*$J%a!<%k%0%k!<%W$G$"$C(B
+$B$?$j$9$k$G$7$g$&!#(B
 
-$B30It%0%k!<%W(B ($B$b$7$/$O!"K\Ev$KA4$F%0%k!<(B
-$B%W(B) $B$O(B @dfn{$BL>A0(B} $B$H(B @dfn{$BA*BrJ}K!(B} $B$G;XDj$5$l$^$9!#8e(B} $B$G$"$k(B
-$BO"A[%j%9%H$G$9!#A*BrJ}K!$K$O!"$=$NEv$N%P%C%/%(%s%I$K$H$C$FFCJL$N0UL#$r;}(B
-$B$DCM$G$"$kDI2C$NMWAG$,$"$k$+$bCN$l$^$;$s!#(B
+$B30It%0%k!<%W(B ($B$"$k$$$OA0!W$H!VA*BrJ}K!!W(B
+$B$G;XDj$5$l$^$9!#@h$K8e!W$rI=$7$^$9!#A*BrJ}K!$K$O!"(B
+$B$=$NEv$N%P%C%/%(%s%I$K$H$C$FFCJL$N0UL#$r;}$DCM$G$"$kDI2C$NMWAG$,$"$k$+$b(B
+$B$7$l$^$;$s!#(B
 
-$BA*BrJ}K!$O(B @dfn{$B;ve$N%5!<%P!<(B} $B$rDj5A$9$k$H8@$&$3$H$,$G$-$k$+$b$7$l$^(B
-$B$;$s(B---$B$G$9$+$i;d$?$A$O$A$g$&$I$=$l$r$7$^$7(B
-$B$?(B (@pxref{Server Buffer})$B!#(B
+$BA*BrJ}K!$H$O!V2>A[%5!<%P!A0(B} $B$O%P%C%/%(%s%I$,%0%k!<%W$rG'<1$9$kL>A0$G$9!#(B
+$B%0%k!<%W$N!VL>A0!W$O!"%P%C%/%(%s%I$,$=$N%0%k!<%W$rG'<1$9$kL>A0$G$9!#(B
 
-$B$?$H$($P!"(B@acronym{NNTP} $B%5!<%P!<$N%0%k!<%W(B @samp{soc.motss} $B$OL>(B
-$BA0(B @samp{soc.motss} $B$HA*BrJ}K!(B @code{(nntp "some.where.edu")} $B$r;}$A$^$9!#(B
-@code{nntp} $B%P%C%/%(%s%I$O$3$N%0%k!<%W$r(B @samp{soc.motss} $B$H$7$FCN$C$F$$(B
-$B$k$@$1$G$9$,!"(Bgnus $B$O$3$N%0%k!<%W(B
-$B$r(B @samp{nntp+some.where.edu:soc.motss}$B$H8F$S$^$9!#(B
+$BNc$($P(B @samp{some.where.edu} $B$H$$$&(B @acronym{NNTP} $B%5!<%P!<$K$"(B
+$B$k(B @samp{soc.motss} $B%0%k!<%W$O!"L>A0(B @samp{soc.motss} $B$HA*BrJ}(B
+$BK!(B @code{(nntp "some.where.edu")} $B$r;}$A$^$9!#(B@code{nntp} $B%P%C%/%(%s%I$O(B
+$B$3$N%0%k!<%W$r(B @samp{soc.motss} $B$H$7$FCN$C$F$$$k$@$1$G$9$,!"(Bgnus $B$O$3$N(B
+$B%0%k!<%W$r(B @samp{nntp+some.where.edu:soc.motss} $B$H8F$S$^$9!#(B
 
-$B$b$A$m$s!"0c$C$?J}K!$OA4$F$=$lFCM-$N$b$N$,$"$j$^$9!#(B
+$B$b$A$m$s!"0c$C$?J}K!$O$9$Y$F$=$lFCM-$NMWAG$r;}$C$F$$$^$9!#(B
 
 @menu
-* Server Buffer::               $B;ve$N%5!<%P!<$r:n$C$FJT=8$9$k(B
+* Server Buffer::               $B2>A[%5!<%P!<$r:n$C$FJT=8$9$k(B
 * Getting News::                USENET $B%K%e!<%9$r(B gnus $B$GFI$`(B
 * Getting Mail::                $B8D?ME*$J%a!<%k$r(B gnus $B$GFI$`(B
-* Browsing the Web::            $B2a>j$J%&%'%V$N;q8;$+$i%a%C%;!<%8$rpJs$rMW5a$9$k%^%7%s(B
-$B$+%=%U%H%&%'%"$G$9!#(Bgnus $B$OK\Ev$N$I$s$J%5!<%P!<$K$bD>@\$K$O@\B3$;$:!"%P%C(B
-$B%/%(%s%I$+B>$N$b$N$rDL$7$F$9$Y$F$N=hM}$r9T$J$$$^$9!#$7$+$7!"$=$l$Oe$N3,AX$rCV$/$3$H$G$"$C$F!"$=$l$>$l$N(B
-$B%P%C%/%(%s%I$,$^$5$K5?;wE*$J%5!<%P!<$KAjEv$9$k$H8@$C$F$bNI$$$G$7$g$&!#(B
-
-$BNc$($P(B @code{nntp} $B%P%C%/%(%s%I$O!"0[$J$k$$$/$D$+$Nc$,$A$J(B @acronym{NNTP} $B%5!<%P!<(B @samp{news.funet.fi} $B$N%]!<%H(B 13 $B$rFI(B
-$B$_$?$$>l9g$H$+!#$&$*$C$[$s!#$H$K$+$/$G$9$M!"$3$N%5!<%P!<$r;H$&$=$l$>$l$N(B
-$B%0%k!<%W$K$D$$$F$=$&$$$&$3$H$r@_Dj$7$J$1$l$P$J$i$J$$$H$7$?$i!"BgJQ$J:n6H(B
-$B$K$J$C$F$7$^$&$G$7$g$&!#$=$3$G(B gnus $B$O!"$=$&$$$&:n6H$r%5!<%P!<%P%C%U%!$G(B
-$B9T$J$&$?$a$K!"A*BrJ}K!$KL>A0$rIU$1$kpJs$rMW5a$9$k%^(B
+$B%7%s$+%=%U%H%&%'%"$NCGJR$G$9!#(Bgnus $B$O@\$K$O@\(B
+$BB3$;$:!"2?$+$N%P%C%/%(%s%I$rDL$7$F$9$Y$F$N=hM}$r9T$J$$$^$9!#$7$+$7$=$l$O(B
+$B$^$5$7$/e$N3,AX$rCV$/$3$H$G$"$C$F!"$A$g$&(B
+$B$I$=$l$>$l$N%P%C%/%(%s%I$,5?;wE*$J%5!<%P!<$KAjEv$9$k$H8@$C$F$bNI$$$G$7$g(B
+$B$&!#(B
+
+$BNc$($P(B @code{nntp} $B%P%C%/%(%s%I$O!"J#?t$NJL!9$Kl9g$G$9!#$&$*$C$[$s!#$H$K$+$/$3(B
+$B$N%5!<%P!<$r;H$&$=$l$>$l$N%0%k!<%W$K$D$$$F$=$&$$$&$3$H$r@_Dj$7$J$1$l$P$J(B
+$B$i$J$$$H$7$?$i!"BgJQ$J:n6H$K$J$C$F$7$^$&$G$7$g$&!#$=$3$G(B gnus $B$O!"$=$&$$(B
+$B$&:n6H$r%5!<%P!<%P%C%U%!!<$G9T$J$&$?$a$K!"A*BrJ}K!$KL>A0$rIU$1$k$rA*BrJ}K!$H$7$F;H$&;v$,$G$-$k(B
-* Unavailable Servers::         $B@\B3$7$h$&$H;n$_$?%5!<%P!<$N$$$/$D$+$,Mn$A$F$$$k$+$b$7$l$J$$(B
+* Servers and Methods::         $B%5!<%P!$rA*BrJ}K!$H$7$F;H$&$3$H$,$G$-$k(B
+* Unavailable Servers::         $B@\B3$7$h$&$H$7$?%5!<%P!<$N$$$/$D$+$OMn$A$F$$$k$+$b$7$l$J$$(B
 @end menu
 
 @vindex gnus-server-mode-hook
-$B%5!<%P!<%P%C%U%!$r:n@.$9$k$H$-$K(B @code{gnus-server-mode-hook} $B$,/$7$P$+$jC1=c$J3HD%$,$J$5$l$F$$$^$9(B:
 
 @table @samp
 @item h
@@ -11447,32 +11789,44 @@ Remove security related @acronym{MML} tags from message.
 $B%5!<%P!<$NL>A0!#(B
 
 @item w
-$B$I$3$+$i%K%e!<%9$,uBV!#(B
+
+@item a
+$B$=$N%5!<%P!<$,%(!<%8%'%s%H2=$5$l$F$$$k$+$I$&$+!#(B
 @end table
 
 @vindex gnus-server-mode-line-format
-$B%b!<%I9T$bJQ?t(B @code{gnus-server-mode-line-format} $B$r;H$&;v$K$h$C$F%+%9(B
-$B%?%^%$%:$9$k;v$,$G$-$^$9(B (@pxref{Mode Line Formatting})$B!#0J2<$N;XDj$OM}(B
-$B2r$5$l$^$9(B:
+$B%b!<%I9T$bJQ?t(B @code{gnus-server-mode-line-format} $B$r;H$&$3$H$K$h$C$F%+(B
+$B%9%?%^%$%:$9$k$3$H$,$G$-$^$9(B (@pxref{Mode Line Formatting})$B!#(B
+
+[$BLuCm(B: $B8=:_$3$NJQ?t$O;H$o$l$F$$$^$;$s!#(B]
+
+$B0J2<$N;EMM$,M}2r$5$l$^$9(B:
 
 @table @samp
 @item S
 $B%5!<%P!!#(B
 
 @item M
-$B%5!<%P!H$7$F$/$@$5$$!#(B
+@ref{Formatting Variables} $B$b;2>H$7$F2<$5$$!#(B
 
 @node Server Commands
 @subsection $B%5!<%P!\:Y$O%=!<(B
+$B%9%3!<%I$rFI$`$+!"o$K4JC1$G!"<+J,<+?H$r$h$/@bL@$7$F$$$^$9(B:
+$B$[$H$s$I$NA*BrJ}K!$O!"@bL@$9$kI,MW$,L5$$$/$i$$$K$+$J$jC1=c$G$9(B:
 
 @lisp
 (nntp "news.funet.fi")
 @end lisp
 
-$BD>@\%9%W!<%k$+$iFI$`$N$O$b$C$H4JC1$G$9(B:
+$BD>@\%9%W!<%k$+$iFI$`$N$O$b$C$HC1=c$G$9(B:
 
 @lisp
 (nnspool "")
 @end lisp
 
-$B8+$?$H$*$j!"A*BrJ}K!$N:G=i$NMWAG$O%P%C%/%(%s%I$NL>A0$G!"FsHVL\(B
-$B$O(B @dfn{$B%"%I%l%9(B} (address)$B!"$b$7$/$O$=$&8F$S$?$$$N$G$"$l$P!"(B
-@dfn{$BL>A0(B} $B$G$9!#(B
+$B8+$F$NDL$j!"A*BrJ}K!$N:G=i$NMWAG$O%P%C%/%(%s%I$NL>A0$G!"FsHVL\$O!V%"%I%l(B
+$B%9!W(B(address)$B!"$b$7$/$O$=$&8F$S$?$$$N$G$"$l$P!VL>A0!W$G$9!#(B
 
 $B$3$l$i$NFs$D$NMWAG$N8e$K$O!"G$0U$N?t(B
-$B$N(B @code{(@var{$BJQ?t(B} @var{$BMM<0(B})} $B$NBP$rF~$l$k;v$,$G$-$^$9!#(B
+$B$N(B @code{(@var{$BJQ?t(B} @var{$BMM<0(B})} $B$NBP$rCV$/$3$H$,$G$-$^$9!#(B
 
-$B:G=i$NNc$KLa$j$^$7$g$&(B---$B$=$N%^%7%s$N%]!<%H(B 15 $B$+$iFI$_$?$+$C$?$H;W$C$F(B
-$B$/$@$5$$!#$3$l$,$=$N;~$K!"$J$k$Y$-A*BrJ}K!$G$9(B:
+$B:G=i$NNc$KLa$j$^$7$g$&(B---$B$=$N%^%7%s$N%]!<%H(B 15 $B$+$iFI$_$?$$$N$@$H;W$C$F(B
+$B2<$5$$!#$3$l$,$=$N;~$K!"$=$&$J$k$O$:$NA*BrJ}K!$G$9(B:
 
 @lisp
 (nntp "news.funet.fi" (nntp-port-number 15))
 @end lisp
 
-$B$I$NJQ?t$,4XO"$9$k$+$r8+$D$1$k$?$a$K!"$=$l$>$l$N%P%C%/%(%s%I$N@bL@J8=q$r(B
-$BFI$`$Y$-$G$7$g$&$,!"$3$l$O(B @code{nnmh} $B$NNc$G$9!#(B
+$B$I$NJQ?t$,4XO"$9$k$+$r8+$D$1=P$9$?$a$K!"$=$l$>$l$N%P%C%/%(%s%I$N@bL@J8=q(B
+$B$rFI$`$Y$-$G$7$g$&$,!"$3$l$O(B @code{nnmh} $B$NNc$G$9!#(B
 
-@code{nnml} $B$O%9%W!<%k$N$h$&$J9=B$$GFI$`%a!<%k%P%C%/%(%s%I$G$9!#Nc$($P!"(B
-$B@\?($r?^$j$?$$Fs$D$N9=B$$,$"$k$H$7$^$7$g$&(B: $B0l$D$O$"$J$?$N;dE*$J%a!<%k%9(B
-$B%W!<%k$G!"B>J}$O8xE*$J$b$N$G$9!#$3$l$O;dE*$J%a!<%k$N$?$a$K;HMQ2DG=$J;XDj(B
-$B$G$9(B:
+@code{nnmh} $B$O%9%W!<%k$N$h$&$J9=B$$rFI$`$?$a$N%a!<%k%P%C%/%(%s%I$G$9!#Nc(B
+$B$($P%"%/%;%9$7$?$$Fs$D$N9=B$$,$"$k$H$7$^$7$g$&(B: $B0l$D$O$"$J$?$N;dE*$J%a!<(B
+$B%k%9%W!<%k$G!"B>J}$O8xE*$J$b$N$G$9!#$3$l$O;dE*$J%a!<%k$N$?$a$K;H$&$3$H$,(B
+$B$G$-$k;XDj$G$9(B:
 
 @lisp
 (nnmh "private" (nnmh-directory "~/private/mail/"))
 @end lisp
 
-($B$=$&$9$k$H$3$N%5!<%P!<$O(B @samp{private} $B$H8F$P$l$^$9$,!"$"$J$?$O4{$K?d(B
-$BB,$7$F$$$?$+$b$7$l$^$;$s!#(B)
+($B$=$l$G$3$N%5!<%P!<$O(B @samp{private} $B$H8F$P$l$^$9$,!"$"$J$?$O$9$G$K?dB,(B
+$B$7$F$$$?$+$b$7$l$^$;$s$M!#(B)
 
-$B$3$l$O8xE*%9%W!<%k$N$?$a$NJ}K!$G$9(B:
+$B$3$l$O8xE*$J%9%W!<%k$N$?$a$NJ}K!$G$9(B:
 
 @lisp
 (nnmh "public"
@@ -11583,12 +11944,11 @@ Remove security related @acronym{MML} tags from message.
 
 @cindex proxy
 @cindex firewall
-
-$BKIJI(B (firewall) $B$NCf$K$$$F!"KIJI%^%7%s$+$i$N(B @acronym{NNTP} $B%5!<%P!<$X$N(B
-$B@\B3$7$+$J$$$N$G$"$l$P!"(Bgnus $B$KKIJI%^%7%s$K(B @code{rlogin} $B$7$F!"$=$3$+(B
-$B$i(B @acronym{NNTP} $B%5!<%P!<$K(B telnet $B$r$9$k$h$&$K;X<($9$k;v$,$G$-$^$9!#(B
-$B$3$l$r$9$k;v$O>/$7$P$+$i$7$$$G$9$,!";ve$N%5!<%P!<$NDj5A$O$*$=$i$/$3$N(B
-$B$h$&$J$b$N$K$J$k$Y$-$G$9(B:
+$B$"$J$?$,KIJI(B (firewall) $B$NCf$K$$$F!"KIJI%^%7%s$rDL$7$F(B @acronym{NNTP} $B%5!<(B
+$B%P!<$K@\B3$9$k$7$+$J$$$N$G$"$l$P!"KIJI%^%7%s$K(B @code{rlogin} $B$7$F!"$=$3(B
+$B$+$i(B @acronym{NNTP} $B%5!<%P!<$K(B telnet $B$r$9$k$h$&$K(B gnus $B$K;X<($9$k$3$H$,(B
+$B$G$-$^$9!#$3$s$J$3$H$r$9$k$N$O$$$5$5$+$P$+$2$F$$$k$N$G$9$,!"$G$b2>A[%5!<(B
+$B%P!<$NDj5A$O$*$=$i$/$3$N$h$&$J$b$N$K$J$k$O$:$G$9(B:
 
 @lisp
 (nntp "firewall"
@@ -11598,19 +11958,31 @@ Remove security related @acronym{MML} tags from message.
       (nntp-end-of-line "\n"))
 @end lisp
 
-$B$b$7!"$9$P$i$7$$(B @code{ssh} $B%W%m%0%i%`$r!"%b%G%`@~$+$i$N05=L$5$l$?@\B3$r(B
-$BDs6!$9$k$?$a$K;H$$$?$$$N$G$"$l$P!">e5-$NNc$K0J2<$N@_Dj$r2C$($k$3$H$,$G$-(B
-$B$^$9!#(B
+$B$"$NAGE($J(B @code{ssh} $B%W%m%0%i%`$r!"%b%G%`$r7PM3$9$kDL?.$r05=L$9$k$?$a$K(B
+$B;H$$$?$$$N$J$i$P!">e5-$NNc$K0J2<$N@_Dj$r2C$($k$3$H$,$G$-$^$9!#(B
 
 @lisp
       (nntp-via-rlogin-command "ssh")
 @end lisp
 
-@code{nntp-via-rlogin-command-switches} $B$b;2>H$7$F2<$5$$!#(B
+@code{nntp-via-rlogin-command-switches} $B$b;2>H$7$F2<$5$$!#4V@\E*$K@\B3$9(B
+$B$k>l9g$NNc$G$9(B:
+
+@lisp
+(setq gnus-select-method
+      '(nntp "indirect"
+             (nntp-address "news.server.example")
+             (nntp-via-user-name "intermediate_user_name")
+             (nntp-via-address "intermediate.host.example")
+             (nntp-via-rlogin-command "ssh")
+             (nntp-end-of-line "\n")
+             (nntp-via-rlogin-command-switches ("-C" "-t" "-e" "none"))
+             (nntp-open-connection-function nntp-open-via-rlogin-and-telnet)))
+@end lisp
 
-$B$b$7$"$J$?$,KIJI$NCf$K$$$?$H$7$F$b!"(B"runsocks" $B$N$h$&$J%i%C%Q!<%3%^%s%I(B
-$B$rDL$7$F30$N@$3&$rD>@\%"%/%;%9$G$-$k$N$J$i$P!"0J2<$N$h$&$K(B socks $B$rDL$7(B
-$B$F%K%e!<%9%5!<%P!<$H(B telnet $B@\B3$9$k$3$H$,$G$-$^$9(B:
+$BKIJI$NCf$K$$$?$H$7$F$b(B "runsocks" $B$N$h$&$J%i%C%Q!<%3%^%s%I$rDL$7$F30$N@$(B
+$B3&$KD>@\%"%/%;%9$G$-$k$N$J$i$P!"0J2<$N$h$&$K(B socks $B2=$5$l$?(B telnet $B$G%K%e!<(B
+$B%9%5!<%P!<$K@\B3$9$k$3$H$,$G$-$k$G$7$g$&(B:
 
 @lisp
 (nntp "outside"
@@ -11620,33 +11992,33 @@ Remove security related @acronym{MML} tags from message.
       (nntp-end-of-line "\n"))
 @end lisp
 
-$B$3$l$O$b$A$m$s!"<+F0G'>Z$rDs6!$9$k$?$a$K(B @code{ssh-agent} $B$rE,@Z$K@_Dj$7(B
-$B$J$1$l$P$J$j$^$;$s!#05=L$5$l$?@\B3$rF@$k$?$a$K$O!"(B@code{ssh}$B$N%U%!%$(B
-$B%k(B @file{config} $B$G(B @samp{Compression} $B%*%W%7%g%s$,$"$kI,MW$,$"$j$^$9!#(B
+$B$b$A$m$s!"<+F0G'>Z$r9T$J$o$;$k$?$a$K$O(B @code{ssh-agent} $B$rE,@Z$K@_Dj$7$J(B
+$B$1$l$P$J$j$^$;$s!#2C$($F!"DL?.FbMF$r05=L$9$k$?$a$K(B
+$B$O!"(B@code{ssh} $B$N(B @file{config} $B%U%!%$%k$K(B @samp{Compression} $B%*%W%7%g%s(B
+$B$,B8:_$7$J$1$l$P$J$j$^$;$s!#(B
 
 @node Creating a Virtual Server
-@subsection $B;ve$N%5!<%P!<$r:n@.$9$k(B
+@subsection $B2>A[%5!<%P!<$r:n@.$9$k(B
 
-$B$b$7$"$J$?$,1JB35-;v$r;H$C$F$?$/$5$s$N5-;v$r%-%c%C%7%e$KJ]B8$7$F$$$k$N$G(B
-$B$"$l$P!"%-%c%C%7%e$rFI$`$?$a$N;ve$N%5!<%P!<$r:n$kI,MW$,$"$k$+$b$7$l$^(B
-$B$;$s!#(B
+$B1JB35-;v$r;H$C$F$?$/$5$s$N5-;v$r%-%c%C%7%e$KJ]B8$7$F$$$k$N$G$"$l$P!"%-%c%C(B
+$B%7%e$rFI$`$?$a$N2>A[%5!<%P!<$r:n$kI,MW$,$"$k$G$7$g$&!#(B
 
-$B:G=i$K!"?7$7$$%5!<%P!<$rIU$12C$($kI,MW$,$"$j$^$9!#L?Na(B @kbd{a} $B$,$=$l$r(B
-$B$7$^$9!#$*$=$i$/%-%c%C%7%e$rFI$`$?$a$K$O(B @code{nnml} $B$r;H$&$N$,0lHVNI$$(B
-$B$G$7$g$&!#(B@code{nnspool} $B$d(B @code{nnmh} $B$b;H$&;v$,$G$-$^$9$1$I!#(B
+$B:G=i$K?7$7$$%5!<%P!<$rDI2C$9$kI,MW$,$"$j$^$9!#$=$l$r$9$k$N$O(B @kbd{a} $BL?(B
+$BNa$G$9!#$*$=$i$/%-%c%C%7%e$rFI$`$?$a$K$O(B @code{nnml} $B$r;H$&$N$,0lHVNI$$(B
+$B$G$7$g$&!#(B@code{nnspool} $B$d(B @code{nnmh} $B$b;H$($k$G$7$g$&$l$1$I!#(B
 
-@kbd{a nnml RET cache RET} $B$HBG$C$F$/$@$5$$!#(B
+@kbd{a nnml RET cache RET} $B$H%?%$%W$7$F2<$5$$!#(B
 
-$B$9$k$H(B @samp{cache} $B$H8F$P$l$k!"(B@code{nnml} $B$N;ve$N%5!<%P!<$,$G$-$k$O(B
-$B$:$G$9!#A[%5!<%P!<$re$N%5!<%P!<$G(B @kbd{RET} $B$r2!$9$H!"1\Mw%P%C%U%!$KF~$k$Y$-$G!"I=<($5$l(B
-$B$F$$$k$I$N%0%k!<%W$K$G$bF~$k;v$,$G$-$k$O$:$G$9!#(B
+$B%5!<%P!<%P%C%U%!!<$KLa$k$K$O(B @kbd{C-c C-c} $B$r%?%$%W$7$F2<$5$$!#:#$G$O$3(B
+$B$N2>A[%5!<%P!<$G(B @kbd{RET} $B$r2!$9$H!"1\Mw%P%C%U%!!<$KF~$C$F!"I=<($5$l$F(B
+$B$$$k$I$N%0%k!<%W$K$G$bF~$k$3$H$,$G$-$k$O$:$G$9!#(B
 
 @node Server Variables
 @subsection $B%5!<%P!J}$G(B)$B!"(B
-$BJQ?t$NDj5A$,%m!<%I$5$l$F$$$k4V$K!"$$$/$D$+$NJQ?t$OB>$NJQ?t$G=i4|2=$5(B
-$B$l$k$H$$$&;v$G$9!#$b$7(B ``$B4p$H$J$k(B'' $BJQ?t$,%m!<%I$5$l$?8e$KJQ99$7$F$b!"(B
-``$BF3$-=P$5$l$?(B'' $BJQ?t$OJQ99$5$l$^$;$s!#(B
+$BJQ?t$r(B ($B%P%C%/%(%s%I$H(B Emacs $B0lHL$NN>J}$G(B) $BDj5A$9$k:]$N0l$D$N$d$C$+$$$J(B
+$BE@$O!"$$$/$D$+$NJQ?t$O!"35$7$F$=$NJQ?t$NDj5A$,%m!<%I$5$l$k$H$-$KB>$NJQ?t(B
+$B$G=i4|2=$5$l$k$3$H$G$9!#!V4p!W$K$J$kJQ?t$,%m!<%I$5$l$?8e$G$=$l$rJQ99$7$F(B
+$B$b!"!VGI@8!W$7$?JQ?t$OJQ99$5$l$^$;$s!#(B
 
-$B$3$l$OIaDL$O%G%#%l%/%H%j!<$d%U%!%$%k$NJQ?t$K1F6A$7$^$9!#Nc$($P!"(B
-@code{nnml-directory} $B$O%G%#%U%)%k%H$G(B @file{~/Mail} $B$G$9$,!"A4$F(B
-$B$N(B @code{nnml} $B%G%#%l%/%H%j!e$N(B @code{nnml} $B%5!<%P!<$rDj5A$7$?>l9g!"(B@code{nnml-directory} $B$r@_Dj(B
-$B$9$k$@$1$G$O=$s$@>uBV$K$J$k$h$&$K!"(B
-$BA4$F$N%U%!%$%kJQ?t$rL@<(E*$K@_Dj$7$J$1$l$P$J$j$^$;$s!#$=$l$>$l$N%P%C%/%((B
-$B%s%I$KBP$9$k40A4$JJQ?t$N%j%9%H$r8+$k$?$a$K$O!"$3$N%^%K%e%"%k$N8e$KB3$/$=(B
-$B$l$>$l$N%P%C%/%(%s%I$NItJ,$rFI$s$G$/$@$5$$!#$G$b!"(B@code{nnml} $B$NDj5A$NNc(B
-$B$O$3$3$K$"$j$^$9(B:
+$B$3$l$O0lHL$K%G%#%l%/%H%j!<$d%U%!%$%k$NJQ?t$K1F6A$7$^$9!#Nc$((B
+$B$P(B @code{nnml-directory} $B$O%G%#%U%)%k%H$G$O(B @file{~/Mail/} $B$G!"$^$?!"$9(B
+$B$Y$F$N(B @code{nnml} $B%G%#%l%/%H%j!A[%5!<%P!<$rDj5A$9$k>l9g!"(B@code{nnml-directory} $B$r@_Dj(B
+$B$9$k$@$1$G$O==J,$G$O(B @emph{$B$"$j$^$;$s(B}---$B$"$J$?$O$9$Y$F$N%U%!%$%kJQ?t$r!"(B
+$B$=$&$7$?$$$HK>$s$@CM$KL@<(E*$K@_Dj$7$J$1$l$P$J$j$^$;$s!#$=$l$>$l$N%P%C%/(B
+$B%(%s%I$N$?$a$N40A4$JJQ?t$N%j%9%H$r8+$k$K$O!"$3$N%^%K%e%"%k$N8e$KB3$/$=$l(B
+$B$>$l$N%P%C%/%(%s%I$NItJ,$rFI$s$G2<$5$$!#$G$b(B @code{nnml} $B$NDj5A$NNc$O$3(B
+$B$3$K$"$j$^$9(B:
 
 @lisp
 (nnml "public"
@@ -11686,40 +12058,39 @@ Remove security related @acronym{MML} tags from message.
       (nnml-newsgroups-file "~/my-mail/newsgroups"))
 @end lisp
 
-$B%5!<%P!e$N%5!<%P!$r;H$&;v$,$G$-$^$9!#$3$N$3$H$K$h$j$?$/$5$s%-!<(B
-$B%\!<%I$rC!$+$J$/$F$9$`2DG=@-$,$"$j$^$9!#$=$7$F!"A4$F$K$o$?$C$F!"$=$NJ}$,(B
-$BNI$$$G$9!#(B
+$BIaDL$KA*BrJ}K!$r;H$&(B ($BNc$($P30It%5!<%P!<$+$i5-;v$rFI$`$H$-$K%0%k!<%W$rA*(B
+$BBr$9$klLL$G$O$I$3(B
+$B$G$b!"Be$o$j$K2>A[%5!<%P!<$NL>A0$r;H$&$3$H$,$G$-$^$9!#$3$l$K$h$C$F!"$?$/(B
+$B$5$s%-!<%\!<%I$rC!$+$J$/$F:Q$`$+$b$7$l$^$;$s!#$=$7$F!"$I$s$J$H$-$G$b$=$N(B
+$BJ}$,NI$$$G$9!#(B
 
 @node Unavailable Servers
 @subsection $B;HMQIT2DG=$J%5!<%P!<(B
 
-$B$b$7%5!<%P!<$K@\B3IT2DG=$G$"$k$J$i$P!"(Bgnus $B$O%5!<%P!<$r(B @code{$B5qH](B} $B$H$7(B
-$B$F0u$rIU$1$^$9!#$3$l$O$=$N8e$N$=$N%5!<%P!<$H$N@\B3$r$O$+$k$I$N$h$&$J;n$_(B
-$B$bL5;k$5$l$k$H$$$&;v$G$9!#(BGnus $B$O@\B3$,3+$1$J$$$3$H$,K\Ev$G$"$k$+$I$&$+(B
-$B$r>/$7$b3N$+$a$:!"(B``It can't be opend,'' ($B@\B3$r3+$/;v$,$G$-$^$;$s(B) $B$H9p(B
-$B$2$^$9!#(B
+$B$"$k%5!<%P!<$K@\B3$9$k$3$H$,$G$-$J$$$h$&$K8+$($k$H$-!"(Bgnus $B$O$=$N%5!<%P!<(B
+$B$K5qH]$5$l$?(B (@code{denied}) $B$3$H$r5-O?$7$^$9!#$=$N8e$G$=$N%5!<%P!<$H@\(B
+$BB3$7$h$&$H$9$k$I$s$J;n$_$b!"C1$KL5;k$5$l$^$9!#/$7$b(B
+$B3N$+$a$:$K!"(Bgnus $B$O!V@\B3$r3+$/$3$H$,$G$-$^$;$s!W$H(B ($B1Q8l$G(B) $B9p$2$^$9!#(B
 
-$B$=$l$O9T57$,0-$$$H;W$&;v$,$"$k$+$b$7$l$^$;$s$,!"$=$l$O$?$$$F$$$N$H$-$K$O(B
-$BNI$$J}K!$G$9!#Nc$($P!"%5!<%P!<(B @samp{nephelococcdyia.com} $B$K(B 10 $B8D9XFI$7(B
-$B$F$$$k%0%k!<%W$,$"$k$H$7$^$7$g$&!#%5!<%P!<$O$I$3$+Hs>o$K1s$/$K$"$j!"%^%7(B
-$B%s$O$H$F$bCY$$$N$G!"$=$l$,:#F|$O$"$J$?$H$N@\B3$r5qH]$9$k$+$I$&$+$rD4$Y$k(B
-$B$@$1$G0lJ,$+$+$j$^$9!#$b$7(B gnus $B$,$=$l$r(B 10 $B2s;n$9$h$&$K$J$C$F$$$?$J$i!"(B
-$B$"$J$?$OHs>o$K$&$k$5$/;W$&$G$7$g$&!#$G$9$+$i!"(Bgnus $B$O$=$l$r;n$=$&$H$O$7(B
-$B$^$;$s!#0lEY(B ``connection refused'' ($B@\B3$O5qH]$5$l$^$7$?(B) $B$rl9g$OM-0U5A(B
+$B$J$N$G$9!#Nc$($P(B @samp{nephelococcdyia.com} $B$H$$$&%5!<%P!<$G==8D$N%0%k!<(B
+$B%W$r9XFI$7$F$$$k$H$7$^$7$g$&!#%5!<%P!<$O$I$3$+$H$F$b1s$$$H$3$m$K$"$C$F!"(B
+$B$=$N%^%7%s$O$H$F$bCY$$$N$G!":#F|$=$l$,@\B3$r5qH]$9$k$+$I$&$+$rD4$Y$k$@$1(B
+$B$G$b0lJ,$+$+$j$^$9!#$b$7(B gnus $B$,$=$l$r==2s;n$9$h$&$K$J$C$F$$$?$H$9$k$H!"(B
+$B$H$F$bHQ$o$7$$$G$7$g$&!#$G$9$+$i(B gnus $B$O$=$l$r;n$=$&$H$O$7$^$;$s!#0lEY$G(B
+$B$b!V@\B3$,5qH]$5$l$?!W(B(connection refused) $B$H$$$&7k2L$rC5n$7$^(B
-$B$9(B (@code{gnus-server-remove-denials})$B!#(B
+gnus $B$,@\B3$r5qH]$5$l$?$9$Y$F$N%5!<%P!<$N!"$9$Y$F$N0u$r>C5n$7(B
+$B$^$9(B (@code{gnus-server-remove-denials})$B!#(B
 
 @item L
 @kindex L ($B%5!<%P!<(B)
@@ -11762,9 +12140,9 @@ Gnus $B$,$I$l$+$N%5!<%P!<$+$i@\B35qH]$rC5n$7$^(B
 @cindex reading news
 @cindex news back ends
 
-$B%K%e!<%9%j!<%@!<$OIaDL$O%K%e!<%9$rFI$`;v$K;H$o$l$^$9!#(BGnus $B$O8=:_$O%K%e!<(B
-$B%:$rC5n$7$^(B
 @subsection NNTP
 @cindex nntp
 
-@acronym{NNTP} $B%5!<%P!<$N30It%0%k!<%W$r9XFI$9$k$N$OHf3SE*4JC1$G$9!#C1(B
-$B$K(B @code{nntp} $B$rJ}K!$H$7$F;XDj$7!"(B@acronym{NNTP} $B%5!<%P!<$N%"%I%l(B
-$B%9(B (address) $B$r!"$&!<$s!"%"%I%l%9$H$7$F;XDj$9$k$@$1$G$9!#(B
+@acronym{NNTP} $B%5!<%P!<$+$i30It%0%k!<%W$r9XFI$9$k$N$OHf3SE*4JC1$G$9!#C1(B
+$B$KA*BrJ}K!$H$7$F(B @code{nntp} $B$r;XDj$7!"(B@acronym{NNTP} $B%5!<%P!<$N%"%I%l%9(B
+$B$r!"$&!<$s!"%"%I%l%9$H$7$F;XDj$9$k$@$1$G$9!#(B
 
-$B$b$7(B @acronym{NNTP} $B%5!<%P!<$,I8=`$G$J$$%]!<%H(B (port) $B$K0LCV$7$F$$$k$H$-(B
-$B$O!"A*BrJ}K!$N;0HVL\$NMWAG$r$3$N%]!<%H$N?t;z$K@_Dj$9$k;v$G@5$7$$%]!<%H$K(B
-$B@\B3$9$k;v$,$G$-$k$G$7$g$&!#$=$N$?$a$K%0%k!<%W>pJs$rJT=8$7$J$1$l$P$J$j$^(B
-$B$;$s(B (@pxref{Foreign Groups})$B!#(B
+@acronym{NNTP} $B%5!<%P!<$,I8=`$G$O$J$$%]!<%H(B (port) $B$K@_CV$5$l$F$$$k$H$-(B
+$B$O!"A*BrJ}K!$N;0HVL\$NMWAG$r$3$N%]!<%H$NHV9f$K@_Dj$9$l$P!"@5$7$$%]!<%H$K(B
+$B@\B3$9$k$3$H$,$G$-$k$G$7$g$&!#$=$N$?$a$K$O%0%k!<%W>pJs$rJT=8$7$J$1$l$P$J(B
+$B$j$^$;$s(B (@pxref{Foreign Groups})$B!#(B
 
-$B30It%0%k!<%W$NL>A0$O4pK\%0%k!<%W$HF1$8$G$b9=$$$^$;$s!#A0$N>WFM$O5/$3$j$^$;$s!#(B
+$B30It%0%k!<%W$NL>A0$O4pK\%0%k!<%W$HF1$8$G$b9=$$$^$;$s!#A0$N>WFM$O5/$3$j$^$;$s!#(B
 
-$B0J2<$NJQ?t$O;ve$N(B @code{nntp} $B%5!<%P!<$r:n$k$?$a$K;H$o$l$^$9(B:
+$B0J2<$NJQ?t$O2>A[(B @code{nntp} $B%5!<%P!<$r:n$k$?$a$K;H$o$l$^$9(B:
 
 @table @code
 @item nntp-server-opened-hook
-@vindex gnus-server-opend-hook
+@vindex nntp-server-opened-hook
 @cindex @sc{mode reader}
 @cindex authinfo
 @cindex authentification
 @cindex nntp authentification
 @findex nntp-send-authinfo
 @findex nntp-send-mode-reader
-$B$O@\B3$,$G$-$?8e$Ko$K$3$N%U%C%/$K$"$k$Y$-$G$9!#(B
+$B$O@\B3$,$G$-$?8e$Ko$K$3$N%U%C%/$K$"$k$Y$-(B
+$B$G$9!#(B
 
 @item nntp-authinfo-function
 @vindex nntp-authinfo-function
-@findex nntp-send-authoinfo
+@findex nntp-send-authinfo
 @vindex nntp-authinfo-file
 $B$3$N4X?t$O(B @acronym{NNTP} $B%5!<%P!<$K(B @samp{AUTHINFO} $B$rAw$k$?$a$K;H$o$l(B
-$B$^$9!#%G%#%U%)%k%H$N4X?t$O(B @code{nntp-send-authinfo} $B$G!"(B
-@file{~/.authinfo} ($B$b$7$/$OJQ?t(B @code{nntp-authinfo-file} $B$K@_Dj$7$?$I(B
-$B$N$h$&$J$b$N$G$b(B) $B$r;HMQ2DG=$J5-:\$rD4$Y$k$?$a$KC5$7$^$9!#$b$70l$D$b8+$D(B
-$B$+$i$J$+$C$?$i!"$"$J$?$K%m%0%$%sL>$H%Q%9%o!<%I$NF~NO$rB%?J$7$^$9!#%U%!%$(B
-$B%k(B @file{~/.authinfo} $B$NMM<0$O(B ($B$[$H$s$I(B) @code{ftp} $B$N%U%!%$(B
-$B%k(B @file{~/.netrc} $B$HF1$8$G!"$=$l$O(B @code{ftp} $B$N%^%K%e%"%k%Z!<%8$KDj5A(B
-$B$5$l$F$$$^$9$,!"$3$3$N$b$N$O82Cx$J;v$H(B
+$B%Q%9%o!<%I$NF~NO$rMW5a$7$^$9!#(B@file{~/.authinfo} $B%U%!%$%k$NMM<0(B
+$B$O(B @code{ftp} $B$N$?$a$N(B @file{~/.netrc} $B%U%!%$%k$H(B ($B$[$H$s$I(B) $BF1$8$G$9!#(B
+$B$=$l$O(B @code{ftp} $B$N%^%K%e%"%k%Z!<%8$GDj5A$5$l$F$$$^$9$,!"$3$3$K82Cx$Je$N9T$r4^$_!"$=$l$>$l$O0l$D$N%5!<%P!<$rDj5A$7$^$9!#(B
 
 @item
-$B$=$l$>$l$N9T$OG$0U$N?t$N(B $B6h@Z$j0u(B/$BCM(B $B$NBP$r4^$`;v$,$G$-$^$9!#(B
+$B$=$l$>$l$N9T$OG$0U$N?t$NI8>O(B (token) $B$HCM$NBP$r4^$`$3$H$,$G$-$^$9!#(B
 
-$BM-8z$J6h@Z$j0u$O(B @samp{machine}, @samp{login}, @samp{password},
+$BM-8z$JI8>O$O(B @samp{machine}, @samp{login}, @samp{password},
 @samp{default} $B$G$9!#2C$($F!"(Bgnus $B$O(B @file{.netrc}/@code{ftp} $B$N9=J8$N86(B
-$B7?$K$O8=$l$J$$Fs$D$N?7$7$$6h@Z$j0u!"L>IU$1(B
-$B$F(B @samp{port} $B$H(B @samp{force} $B$rF3F~$7$^$9!#(B
-($B$3$l$,(B @file{.authinfo} $B%U%!%$%k$NMM<0$,(B @file{.netrc} $B%U%!%$%k$NMM<0$+(B
-$B$i0o$l$kM#0l$NJ}K!$G$9!#(B) @samp{port} $B$O%5!<%P!<$N$I$N%]!<%H$rG'>Z$KMQ$$(B
-$B$k$+$r<($7!"(B@samp{force} $B$O0J2<$G@bL@$7$^$9!#(B
-
+$B7?$K$O8=$l$J$$Fs$D$N?7$7$$I8>O!"L>IU$1$F(B @samp{port} $B$H(B @samp{force} $B$r(B
+$BF3F~$7$^$9!#(B($B$3$l$,(B @file{.authinfo} $B%U%!%$%k$NMM<0$,(B @file{.netrc} $B%U%!(B
+$B%$%k$NMM<0$+$i0oC&$9$kM#0l$NJ}K!$G$9!#(B) @samp{port} $B$O%5!<%P!<$N$I$N%]!<(B
+$B%H$rG'>Z$KMQ$$$k$+$r<($7!"(B@samp{force} $B$O0J2<$G@bL@$7$^$9!#(B
 @end enumerate
 
 $B$3$l$,$=$N%U%!%$%k$NNc$G$9(B:
@@ -11841,41 +12218,41 @@ machine news.uio.no login larsi password geheimnis
 machine nntp.ifi.uio.no login larsi force yes
 @end example
 
-$B6h@Z$j0u(B/$BCM(B $B$NBP$O$I$N$h$&$J=gHV$G$G$b8=$l$k;v$,$G$-$^$9!#Nc$($P!"(B
-@samp{machine} $B$O:G=i$K8=$l$kI,MW$O$"$j$^$;$s!#(B
+$BI8>O$HCM$NBP$O$I$s$J=gHV$G$G$b8=$l$k$3$H$,$G$-$^$9!#Nc$((B
+$B$P(B @samp{machine} $B$,:G=i$G$J$1$l$P$J$i$J$$I,MW$O$"$j$^$;$s!#(B
 
-$B$3$NNc$G$O!"%m%0%$%sL>$H%Q%9%o!<%I$NN>J}$,A0$@$1$r5s$2$F$$$F!"MxMQZ>pJs(B (authinfo) $B$,Aw$i$l$k$H$$$&;v$G$9!#%G%#(B
-$B%U%)%k%H(B ($B$9$P$o$A!"(B@samp{force} $B%?%0$,L5$$$H$-(B) $B$G$O(B @var{nntp} $B%5!<%P!<(B
-$B$,G'>Z>pJs$r?R$M$J$$8B$j$=$l$r(B @var{nntp} $B%5!<%P!<$KAw$j$^$;$s!#(B
+$B$3$NNc$G$O!"A0$H%Q%9%o!<%I$NN>J}$,M?$($i$l$F$$$k(B
+$B$N$KBP$7$F!"8e$@$1$,$"$j!"MxMQZ>pJs(B (authinfo) $B$,Aw$i$l$^$9!#%G%#%U%)%k(B
+$B%H(B ($B$9$J$o$A!"(B@samp{force} $B%?%0$,L5$$$H$-(B) $B$G$O!"(B@var{nntp} $B%5!<%P!<$,G'(B
+$B>Z>pJs$r?R$M$J$$8B$j$=$l$r(B @var{nntp} $B%5!<%P!<$KAw$j$^$;$s!#(B
 
-@samp{machine} $B9T$K9gCW$7$J$$A4$F$N%5!<%P!<$KE,MQ$5$l(B
-$B$k(B @samp{default} $B9T$rDI2C$9$k;v$b$G$-$^$9!#(B
+@samp{machine} $B9T$K9gCW$7$J$$$9$Y$F$N%5!<%P!<$KE,MQ$5$l(B
+$B$k(B @samp{default} $B9T$rDI2C$9$k$3$H$b$G$-$^$9!#(B
 
 @example
 default force yes
 @end example
 
-$B$3$l$O0JA0$K=q$+$l$F$$$J$$A4$F$N%5!<%P!<$KL?Na(B @samp{AUTHINFO} $B$r6/@)E*(B
-$B$KAw$j$^$9!#(B
+$B$3$l$O!"$=$l0JA0$K=q$+$l$F$$$J$$$9$Y$F$N%5!<%P!<$K(B @samp{AUTHINFO} $BL?Na(B
+$B$r6/@)E*$KAw$j$^$9!#(B
 
-$B%U%!%$%k(B @file{~/.authinfo} $B$r@$3&Cf$,FI$a$k$h$&$J@_Dj$KJ|CV$7$J$$$h$&$K(B
-$BCm0U$7$F$/$@$5$$!#(B
+@file{~/.authinfo} $B%U%!%$%k$r@$3&Cf$,FI$a$k$h$&$J@_Dj$N$^$^$GJ|CV$7$J$$(B
+$B$h$&$KCm0U$7$F2<$5$$!#(B
 
 @item nntp-server-action-alist
 @vindex nntp-server-action-alist
 $B$3$l$O%5!<%P!<$N7?$K9gCW$9$k@55,I=8=$H!"9gCW$,5/$3$C$?$H$-$Kc$,$A$G$"$k$J$i!"$3$NJQ?t$r(B 1 $B$K@_Dj$9$k$Y$-$G$7$g(B
-$B$&!#(B
+$B$b$7%M%C%H%o!<%/$N6q9g$,NI$/$J$$$h$&$J$i!"$3$NJQ?t$r(B 1 $B$K@_Dj$9$k$Y$-$G(B
+$B$7$g$&!#(B
 
 @item nntp-connection-timeout
 @vindex nntp-connection-timeout
-$BDj4|E*$K@\B3$9$k30It(B @code{nntp} $B%0%k!<%W$,$?$/$5$s$"$k$J$i!"E,@Z$K1~Ez(B
-$B$7$J$$(B @code{nntp} $B%5!<%P!<$,$"$C$?$j!"$"$k%5!<%P!<$O>o<1E*$J;~4VFb$G$O(B
-$BJVEz$G$-$J$$$/$i$$Ii2Y$,$+$+$C$F$$$k!"$J$I$NLdBj$,$"$k$G$7$g$&!#$3$l$O:$$C(B
-$B$?LdBj$K$J$k$3$H$,$"$j$^$9$,!"(B@code{nntp-connection-timeout} $B$r@_Dj$9$k(B
-$B;v$K$h$j$"$kDxEY2r>C$9$k;v$,$G$-$^$9!#$3$l$O@\B3$r$"$-$i$a$k$^$($K!"(B
-@code{nntp} $B%P%C%/%(%s%I$,2?ICBT$D$+$r<($9@0?t$G$9!#$b$7$3$l(B
-$B$,(B @code{nil} $B$G$"$k$H!"$3$l$,=i4|@_Dj$G$9$,!";~4V@Z$l@ZCG$O$J$5$l$^$;$s!#(B
-
-@c @item nntp-command-timeout
-@c @vindex nntp-command-timeout
-@c @cindex PPP connections
-@c @cindex dynamic IP addresses
-@c If you're running Gnus on a machine that has a dynamically assigned
-@c address, Gnus may become confused.  If the address of your machine
-@c changes after connecting to the @acronym{NNTP} server, Gnus will simply sit
-@c waiting forever for replies from the server.  To help with this
-@c unfortunate problem, you can set this command to a number.  Gnus will
-@c then, if it sits waiting for a reply from the server longer than that
-@c number of seconds, shut down the connection, start a new one, and resend
-@c the command.  This should hopefully be transparent to the user.  A
-@c likely number is 30 seconds.
-@c
-@c @item nntp-retry-on-break
-@c @vindex nntp-retry-on-break
-@c If this variable is non-@code{nil}, you can also @kbd{C-g} if Gnus
-@c hangs.  This will have much the same effect as the command timeout
-@c described above.
-
-@item nntp-server-hook
-@vindex nntp-server-hook
-$B$3$N%U%C%/$O(B @acronym{NNTP} $B%5!<%P!<$K@\B3$9$k:G8e$N0lJb$H$7$Fc$,$A$G$"$k$H$-$K$3$l$r(B @code{nil} $B$G$J$$CM(B
-$B$K@_Dj$7$F$/$@$5$$!#(B
+$BDj4|E*$K@\B3$7$F$$$k30It(B @code{nntp} $B%0%k!<%W$,$?$/$5$s$"$k$H!"$A$c$s$H(B
+$B1~Ez$7$J$+$C$?$j>o<1E*$J;~4VFb$KJVEz$G$-$J$$$/$i$$$NIi2Y$,$+$+$C$F$$(B
+$B$k(B @acronym{NNTP} $B%5!<%P!<$NLdBj$,$"$k$O$:$G$9!#$3$l$O$d$C$+$$$JLdBj$r$b(B
+$B$?$i$7$^$9$,!"(B@code{nntp-connection-timeout} $B$r@_Dj$9$k$3$H$K$h$C$F$"$k(B
+$BDxEY2r>C$9$k$3$H$,$G$-$^$9!#$3$l$O@\B3$rD|$a$kA0$K!"(B@code{nntp} $B%P%C%/%((B
+$B%s%I$,2?ICBT$D$+$r<($9@0?t$G$9!#$b$7$3$l$,(B @code{nil} $B$G$"$k$H!"$=$l$,%G%#(B
+$B%U%)%k%H$G$9$,!";~4V@Z$l$K$h$k@ZCG$O9T$J$$$^$;$s!#(B
 
 @item nntp-nov-is-evil
 @vindex nntp-nov-is-evil
-@acronym{NNTP} $B%5!<%P!<$,(B @acronym{NOV} $B5!G=$rDs6!$7$F$$$J$1$l$P$3$NJQ?t(B
-$B$r(B @code{t} $B$K@_Dj$9$k;v$,$G$-$^$9$,!"(B@code{nntp} $B$OIaDL(B
-$B$O(B @acronym{NOV} $B$,;H$o$l$k$+$I$&$+$r<+F0E*$KD4$Y$^$9!#(B
+@acronym{NNTP} $B%5!<%P!<$,(B @acronym{NOV} $B$r%5%]!<%H$7$F$$$J$$>l9g$O!"$3$N(B
+$BJQ?t$r(B @code{t} $B$K@_Dj$9$l$PNI$$$G$7$g$&!#$G$b(B @code{nntp} $B$OIaDL(B
+$B$O(B @acronym{NOV} $B$,;H$($k$+$I$&$+$r<+F0E*$KD4$Y$^$9!#(B($BLuCm(B: $B$G$9$+$i!"$o(B
+$B$6$o$6@_Dj$7$J$/$F$b9=$$$^$;$s!#(B)
 
 @item nntp-xover-commands
 @vindex nntp-xover-commands
@@ -11951,47 +12299,42 @@ default force yes
 @cindex XOVER
 $B%5!<%P!<$+$i(B @acronym{NOV} $B9T$rl9g$O!"$3$NJQ?t$rK\Ev$K>.$5$J?t;z$K@_Dj$9$k$H$*$=$i$/l9g$K!"$3$NJQ?t$rK\Ev$K>.$5$J?tCM$K@_Dj$7$F$7$^$&$H!"$*$=$i(B
+$B$//$7;(2;$,$?(B
-$B$F$i$l$^$9!#(B
+@acronym{NNTP} $B%5!<%P!<$K@\B3$r;n$_$kA0$K@\@\B3$9$k$?$a$N4X?t(B
-$B72(B ($B;0$D(B) $B$H4V@\E*$K@\B3$9$k$?$a$N$b$N(B ($BFs$D(B) $B$,$"$j$^$9!#(B
+$B$I$N$h$&$K(B @acronym{NNTP} $B%5!<%P!<$H@\B3$9$k$+$r%+%9%?%^%$%:$9$k$3$H$,$G(B
+$B$-$^$9!#(B@code{nntp-open-connection-function} $B%Q%i%a!<%?!<$r@_Dj$7$F$*$/(B
+$B$H!"(Bgnus $B$O@\B3$r3NN)$9$k$?$a$K$=$N4X?t$r;H$$$^$9!#$=$N$?$a$K<7$D$N4X?t(B
+$B$,$"$i$+$8$aMQ0U$5$l$F$$$^$9!#$=$l$i$OFs@\@\(B
+$BB3$9$k$?$a$N4X?t72(B ($B;M$D(B) $B$H4V@\E*$K@\B3$9$k$?$a$N$b$N(B ($B;0$D(B) $B$,$"$j$^$9!#(B
 
 @item nntp-prepare-post-hook
 @vindex nntp-prepare-post-hook
-$B5-;v$r%]%9%H$9$kD>A0$KA0$K)(B ID $B$rDs6!$7(B
 $B$F$/$l$k$J$i$P!"$3$N%U%C%/$,)(B ID $B$r%5%]!<%H$7$F$$$k$o$1$G$O$J$$$3$H$KCm0U$7$F2<(B
 $B$5$$!#$3$l$ONc$($P(B INN 2.3.0 $B0J>e$GF0:n$7$^$9!#(B
 
-@item nntp-read-timeout
-@vindex nntp-read-timeout
-Nntp $B$,=PNO$,=*N;$7$?$3$H$r3NG'$9$k$?$a$KBT$D$Y$-;~4V$G$9!#CM$rC;$/$9$l(B
-$B$PH?1~$,B.$/$J$j$^$9$,(B CPU $B$r?)$$$^$9!#%G%#%U%)%k%H$O(B 0.1 $BIC$G$9!#%5!<%P!<(B
-$B$KCY$$2s@~$G@\B3$7$F$$$k>l9g$O(B ($B$=$7$F(B Emacs $B$,(B CPU $B%Q%o!<$r?)$&$N$rK>$^(B
-$B$J$1$l$P(B)$B!"$3$l$rNc$($P(B 1 $B$K$7$F$b9=$$$^$;$s!#(B
-
 @item nntp-list-options
 @vindex nntp-list-options
 LIST $B%3%^%s%I$N%*%W%7%g%s$K;H$C$F!"(B($B%5!<%P!<$N(B) $B%j%9%H=PNO$r@_Dj$7$?%K%e!<(B
@@ -12067,24 +12403,24 @@ LIST $B%3%^%s%I$N%*%W%7%g%s$K;H$C$F!"(B($B%5!<%P!<$N(B) $B%j%9%H=PNO$r@_Dj$
 @subsubsection $BD>@\@\B3$9$k$?$a$N4X?t(B
 @cindex direct connection functions
 
-$B$3$l$i$N4X?t$O!"$"$J$?$N%^%7%s$H(B @acronym{NNTP}$B%5!<%P!<$r@\B3$9$k$?$a$K(B
+$B$3$l$i$N4X?t$O!"$"$J$?$N%^%7%s$H(B @acronym{NNTP} $B%5!<%P!<$r@\B3$9$k$?$a$K(B
 $BD>@\8F$P$l$^$9!#$^$?!"$=$l$i$NF0:n$O$=$l$i$,6&DL$K;2>H$9$kJQ?t$K1F6A$5$l(B
 $B$^$9(B (@pxref{Common Variables})$B!#(B
 
 @table @code
 @findex nntp-open-network-stream
 @item nntp-open-network-stream
-$B$3$l$O%G%#%U%)%k%H$G!"C1=c$K1s3V%7%9%F%`$N%]!<%H$J$I$K@\B3$7$^$9!#(B
+$B$3$l$O%G%#%U%)%k%H$G!"C1=c$K1s3V%7%9%F%`$N2?$i$+$N%]!<%H$K@\B3$7$^$9!#(B
 
 @findex nntp-open-tls-stream
 @item nntp-open-tls-stream
-@dfn{$B0BA4$J(B} $B%A%c%s%M%k$r;H$C$F%5!<%P!<$K@\B3$7$^$9!#$3$l$r;H$&$?$a$K(B
+$B!V0BA4$J!W%A%c%s%M%k$r;H$C$F%5!<%P!<$K@\B3$7$^$9!#$3$l$r;H$&$?$a$K(B
 $B$O(B @uref{http://www.gnu.org/software/gnutls/, GNUTLS} $B$r%$%s%9%H!<%k$7$F(B
 $B$*$+$J$1$l$P$J$j$^$;$s!#$=$l$+$i%5!<%P!<$rA0$O;H$($^$;$s!#(B}
+;; @r{$B%]!<%H(B 563 $B$,(B "nntps" $B$H$7$F(B @file{/etc/services} $B$GDj5A:Q$_(B}
+;; @r{$B$G$"$C$F$b!"(B@samp{gnutls-cli -p} $B$G$=$NL>A0$O;H$($^$;$s!#(B}
 ;;
 (nntp "snews.bar.com"
       (nntp-open-connection-function nntp-open-tls-stream)
@@ -12094,14 +12430,14 @@ LIST $B%3%^%s%I$N%*%W%7%g%s$K;H$C$F!"(B($B%5!<%P!<$N(B) $B%j%9%H=PNO$r@_Dj$
 
 @findex nntp-open-ssl-stream
 @item nntp-open-ssl-stream
-@dfn{$B0BA4$J(B} $B%A%c%s%M%k$r;H$C$F%5!<%P!<$K@\B3$7$^$9!#$3$l$r;H$&$?$a$K(B
+$B!V0BA4$J!W%A%c%s%M%k$r;H$C$F%5!<%P!<$K@\B3$7$^$9!#$3$l$r;H$&$?$a$K(B
 $B$O(B @uref{http://www.openssl.org, OpenSSL} $B$^$?(B
 $B$O(B @uref{ftp://ftp.psy.uq.oz.au/pub/Crypto/SSL, SSLeay} $B$r%$%s%9%H!<%k$7(B
 $B$F$*$+$J$1$l$P$J$j$^$;$s!#$=$l$+$i%5!<%P!<$rA0$O;H$($^$;$s!#(B}
+;; @r{$B%]!<%H(B 563 $B$,(B "snews" $B$H$7$F(B @file{/etc/services} $B$GDj5A:Q$_$G(B}
+;; @r{$B$"$C$F$b!"(B@samp{openssl s_client -port} $B$G$=$NL>A0$O;H$($^$;$s!#(B}
 ;;
 (nntp "snews.bar.com"
       (nntp-open-connection-function nntp-open-ssl-stream)
@@ -12111,12 +12447,12 @@ LIST $B%3%^%s%I$N%*%W%7%g%s$K;H$C$F!"(B($B%5!<%P!<$N(B) $B%j%9%H=PNO$r@_Dj$
 
 @findex nntp-open-telnet-stream
 @item nntp-open-telnet-stream
-$BC1$K(B @samp{telnet} $B$7$F(B @acronym{NNTP} $B%5!<%P!<$K@\B3$7$^$9!#$"$J$?$O!"(B
-$B%G%#%U%)%k%H$N(B @code{nntp-open-network-stream} $B$,$=$l$r$9$k$N$K$b$+$+$o(B
-$B$i$:!"$J$<$3$N4X?t$,$"$k$N$+IT;W5D$K;W$&$+$b$7$l$^$;$s!#$=$NM}M3(B ($B$N0l(B
-$B$D(B) $B$O!"$b$7$"$J$?$,KIJI$NCf$K$$$?$H$7$F$b(B @code{runsocks} $B$N$h$&$J%3%^(B
-$B%s%I%i%C%Q!<$N$*$+$2$G30$N@$3&$rD>@\%"%/%;%9$G$-$k$J$i$P!"$"$J$?$O$=$l$r(B
-$B$3$N$h$&$K;H$&$3$H$,$G$-$k$N$G$9(B:
+$BC1$K(B @samp{telnet} $B$7$F(B @acronym{NNTP} $B%5!<%P!<$K@\B3$7$^$9!#%G%#%U%)%k(B
+$B%H$N(B @code{nntp-open-network-stream} $B$,$=$l$r$9$k$N$K$b$+$+$o$i$:!"$J$<(B
+$B$3$N4X?t$,$"$k$N$+IT;W5D$K;W$&$+$b$7$l$^$;$s!#$=$NM}M3(B ($B$N0l$D(B) $B$O!"$b$7(B
+$B$"$J$?$,KIJI$NCf$K$$$?$H$7$F$b(B @code{runsocks} $B$N$h$&$J%3%^%s%I%i%C%Q!<(B
+$B$N$*$+$2$G30$N@$3&$rD>@\%"%/%;%9$G$-$k$J$i$P!"$=$l$r$3$N$h$&$K;H$&$3$H$,(B
+$B$G$-$k$N$G$9(B:
 
 @lisp
 (nntp "socksified"
@@ -12134,10 +12470,10 @@ Emacs $B$N%;%C%7%g%sA4BN$r%i%C%W$7$F!"%G%#%U%)%k%H$N%a%=%C%I$r;H$&$H$$$&$N(B
 @cindex indirect connection functions
 
 $B$3$l$i$N4X?t$O!"H$9$kJQ?t$K1F6A$5$l$^$9(B (@pxref{Common Variables})$B!#(B
+$B$K@\B3$9$k$?$a$K4V@\E*$K8F$P$l$^$9!#$9$Y$F$N$3$l$i$N4X?t$H4XO"$9$kJQ?t$O(B
+$B!H(Bvia$B!I@\B3$NCg4V$KB0$7$F$$$k$H$b8@$($k$N$G!"$=$l$rL@3N$K$9$k$?$a$K$9$Y(B
+$B$F!H(Bvia$B!I$H$$$&@\F,8l$,IU$1$i$l$^$9!#$^$?!"$=$l$i$NF0:n$O$=$l$i$,6&DL$K(B
+$B;2>H$9$kJQ?t$K1F6A$5$l$^$9(B (@pxref{Common Variables})$B!#(B
 
 @table @code
 @item nntp-open-via-rlogin-and-telnet
@@ -12171,8 +12507,8 @@ Emacs $B$N%;%C%7%g%sA4BN$r%i%C%W$7$F!"%G%#%U%)%k%H$N%a%=%C%I$r;H$&$H$$$&$N(B
 @item nntp-open-via-rlogin-and-netcat
 @findex nntp-open-via-rlogin-and-netcat
 $BK\$N%3(B
-$B%^%s%I$r;H$&$3$H$b$G$-$^$9!#(B
+$B%^%s%I$G$9!#%G%#%U%)%k%H$O(B @samp{nc} $B$G$9!#Be$o$j(B
+$B$K(B @uref{http://www.imasy.or.jp/~gotoh/ssh/connect.html, connect} $B$N$h$&(B
+$B$J!"B>$N%3%^%s%I$r;H$&$3$H$b$G$-$^$9!#(B
 
 @item nntp-via-netcat-switches
 @vindex nntp-via-netcat-switches
@@ -12190,17 +12526,19 @@ Emacs $B$N%;%C%7%g%sA4BN$r%i%C%W$7$F!"%G%#%U%)%k%H$N%a%=%C%I$r;H$&$H$$$&$N(B
 $B$N%j%9%H$G$9!#%G%#%U%)%k%H$O(B @code{nil} $B$G$9!#(B
 
 @item nntp-via-rlogin-command
+@vindex nntp-via-rlogin-command
 $BCf4V$N%[%9%H$K%m%0%$%s$9$k$?$a$K;H$o$l$k%3%^%s%I$G$9!#%G%#%U%)%k%H(B
 $B$O(B @samp{rsh} $B$G$9$,!"(B@samp{ssh} $B$,?M5$$N$"$kBeBXJ}(B) $B$G(B @code{ENVIRON} $B%*%W%7%g%s$r%5%]!<%H$7!"%m%0%$%sL>$NF~(B
-$BNO$rMW5a$7$^$;$s!#$3$l$ONc$($P(B Solaris $B$N(B @code{telnet} $B$GF0:n$7$^$9!#(B
+$B$b$7Hs(B-@code{nil} $B$J$i!"Cf4V$N(B @code{telnet} $B$N%;%C%7%g%s(B ($B%/%i%$%"%s%H(B
+$B$H%5!<%P!<$NN>J}(B) $B$G(B @code{ENVIRON} $B%*%W%7%g%s$r%5%]!<%H$7!"%m%0%$%sL>$N(B
+$BF~NO$rMW5a$7$^$;$s!#$3$l$ONc$($P(B Solaris $B$N(B @code{telnet} $B$GF0:n$7$^$9!#(B
 
 @item nntp-via-shell-prompt
 @vindex nntp-via-shell-prompt
@@ -12236,7 +12574,7 @@ Emacs $B$N%;%C%7%g%sA4BN$r%i%C%W$7$F!"%G%#%U%)%k%H$N%a%=%C%I$r;H$&$H$$$&$N(B
 $B$H$KCm0U$7$F2<$5$$(B (@pxref{Common Variables})$B!#(B
 @end table
 
-$B$3$l$i$O>e5-$N4X?t$,;2>H$9$kIU2CE*$JJQ?t$G$9(B:
+$B$3$l$i$O>e5-$N$9$Y$F$N4X?t$,;2>H$9$kIU2CE*$JJQ?t$G$9(B:
 
 @table @code
 @item nntp-via-user-name
@@ -12252,16 +12590,18 @@ Emacs $B$N%;%C%7%g%sA4BN$r%i%C%W$7$F!"%G%#%U%)%k%H$N%a%=%C%I$r;H$&$H$$$&$N(B
 @subsubsection $B6&DL$NJQ?t(B
 
 $B0J2<$NJQ?t$O!"$9$Y$F$N!"$^$?$O$$$/$D$+$N$"$i$+$8$aMQ0U$5$l$F$$$k4X?t$NF0(B
-$B:n$K1F6A$r5Z$\$7$^$9!#@_Dj$5$l$F$$$J$1$l$P!"$9$Y$F$N4X?t$,1F6A$5$l$^$9!#(B
+$B:n$K1F6A$r5Z$\$7$^$9!#@_Dj$5$l$F$$$J$1$l$P!"$9$Y$F$N4X?t$,1F6A$5$l$^(B
+$B$9(B ($B$=$l$>$l$N2>A[%5!<%P!<$K$*$$$F!"%5!<%P!l9g$K!"0J2<$NCM$,%G%#%U%)%k%H$G;H$o$l$^$9(B)$B!#(B
 
 @table @code
 @item nntp-pre-command
 @vindex nntp-pre-command
-$BAG$N@\B3MQ$N4X(B
-$B?t(B (@code{nntp-open-network-stream}$B!"(B@code{nntp-open-tls-stream} $B$*$h(B
-$B$S(B @code{nntp-open-ssl-stream} $B$@$1$@$H;W$&(B) $B$G$O$J$$$b$N$rDL$7$F@\B3$9(B
-$B$k$H$-$K;H$&%3%^%s%I%i%C%Q!<$G$9!#Nc$($P$"$J$?$O(B @samp{SOCKS} $B%i%C%Q!<$r(B
-$B3d$jEv$F$k$G$7$g$&!#(B
+$BAG$N@\B3MQ$N4X?t$G$O$J$$$b(B
+$B$N(B (@code{nntp-open-network-stream}$B!"(B@code{nntp-open-tls-stream} $B$^$?(B
+$B$O(B @code{nntp-open-ssl-stream} $B0J30$N$9$Y$F(B) $B$rDL$7$F@\B3$9$k$H$-$K;H$&(B
+$B%3%^%s%I%i%C%Q!<$G$9!#Nc$($P$"$J$?$O(B @samp{SOCKS} $B%i%C%Q!<$r3d$jEv$F$k$G(B
+$B$7$g$&!#(B($BLuCm(B: @code{telnet} $B$J$I$N30It%3%^%s%I$KHo$;$F;H$o$l$^$9!#(B)
 
 @item nntp-address
 @vindex nntp-address
@@ -12280,13 +12620,13 @@ Emacs $B$N%;%C%7%g%sA4BN$r%i%C%W$7$F!"%G%#%U%)%k%H$N%a%=%C%I$r;H$&$H$$$&$N(B
 @vindex nntp-end-of-line
 @acronym{NNTP} $B%5!<%P!<$H$*OC$r$7$F$$$k$H$-$K9T$N=*$o$j$N0u$H$7$F;H$o$l(B
 $B$kJ8;zNs$G$9!#$3$l$O%G%#%U%)%k%H$G(B @samp{\r\n} $B$G$9$,!"AG$G$O$J$$@\B3MQ(B
-$B$N(B telnet $B4X?t$r;H$C$F$$$k$H$-$O(B @samp{\n} $B$G$"$k$Y$-$G$9!#(B
+$B$N(B telnet $BF1Ey$N4X?t$r;H$C$F$$$k$H$-$O(B @samp{\n} $B$G$"$k$Y$-$G$9!#(B
 
 @item nntp-telnet-command
 @vindex nntp-telnet-command
 @samp{telnet} $B$rDL$7$F(B @acronym{NNTP} $B%5!<%P!<$H@\B3$9$k$H$-$K;H$&%3%^%s(B
 $B%I$G$9!#$3$l$OCf4V$N%[%9%H$H@\B3$9$k$?$a$N$b$N$G$O(B @emph{$B$"$j$^$;$s(B}$B!#$3(B
-$B$l$OC1$KK\Ev$N(B @acronym{NNTP} $B%5!<%P!<$H@\B3$9$k$?$a$N$b$N$G$9!#%G%#%U%)(B
+$B$l$O$^$5$KK\Ev$N(B @acronym{NNTP} $B%5!<%P!<$H@\B3$9$k$?$a$N$b$N$G$9!#%G%#%U%)(B
 $B%k%H$O(B @samp{telnet} $B$G$9!#(B
 
 @item nntp-telnet-switches
@@ -12299,33 +12639,34 @@ Emacs $B$N%;%C%7%g%sA4BN$r%i%C%W$7$F!"%G%#%U%)%k%H$N%a%=%C%I$r;H$&$H$$$&$N(B
 @subsubsection NNTP marks
 @cindex storing NNTP marks
 
-Gnus $B$O(B @acronym{NNTP} $B%5!<%P!$l$N%U%!%$%k$O!"BP1~(B
-$B$9$k%5!<%P!<$N$=$l$>$l$KBP$7$F@lMQ$G$9!#0u%U%!%$%k$O!"%K%e!<%9%5!<%P!<$K(B
-$B;w$F$$$k8EE5E*$J3,AX(B
+gnus $B$O(B @acronym{NNTP} $B%5!<%P!<$N$?$a$N5-;v$N0u(B (marks) (@pxref{Marking
+Articles}) $B$r0u%U%!%$%k$KJ]B8$7$^$9!#0u%U%!%$%k$O$"$k%0%k!<%W$G@_Dj$7$?(B
+$B0u$r5-O?$7!"$=$l$>$l$N%U%!%$%k$O!"BP1~$9$k%5!<%P!<$KBP$7$F@lMQ$G$9!#0u%U%!(B
+$B%$%k$O!"%K%e!<%9%5!<%P!<$K;w$F$$$k8EE5E*$J3,AX(B
 $B$G(B @file{~/News/marks} (@code{nntp-marks-directory}) $B$KJ]B8$5$l$^$9!#Nc(B
 $B$($P(B news.gmane.org $B%5!<%P!<$K$*$1$k(B @samp{gmane.discuss} $B%0%k!<%W$N$?$a(B
 $B$N0u%U%!%$%k(B
 $B$O(B @file{~/News/marks/news.gmane.org/gmane/discuss/.marks} $B$KJ]B8$5$l$^(B
 $B$9!#(B
 
-$B0u%U%!%$%k$OLr$KN)$A$^$9!#(B@file{~/News/marks} $B%G%#%l%/%H%j$O(B (rsync$B!"(B
-scp $B$^$?$OB>$N2?$+$r;H$C$F(B) Gnus $B$rAv$i$;$kJL$N%[%9%H$K%3%T!<$9$k$3$H$,(B
+$B0u%U%!%$%k$OLr$KN)$A$^$9!#(B@file{~/News/marks} $B%G%#%l%/%H%j!<$O(B (rsync$B!"(B
+scp $B$^$?$OB>$N2?$+$r;H$C$F(B) gnus $B$rAv$i$;$kJL$N%[%9%H$K%3%T!<$9$k$3$H$,(B
 $B$G$-!"$I$N5-;v$rFI$s$G0u$rIU$1$?$+$r$=$A$i$G:F8=$7$^$9!#(B
 @file{~/News/marks} $B$N%G!<%?$O!"(B@file{~/.newsrc.eld} $B$K$"$kF1$8$b$N$h$j(B
 $B$bM%@h$5$l$^$9!#(B
 
-$B0u%U%!%$%k$O!"$=$l$>$l$N%5!<%P!<$4$H$KHs>o$KFC2=$5$l$k$3$H$KCm0U$7$F2<$5(B
-$B$$!#(BGnus $B$O5-;vHV9f$r5-21$9$k$N$G!"N>J}$N%[%9%H$GF1$8%5!<%P!<$r;H$C$F$$(B
-$B$J$$$H!"J*;v$O2u$l$F$7$^$&$G$7$g$&(B ($BBgDq$N%5!<%P!<$OB>$N$I$s$J%5!<%P!<$H(B
-$B$bF1$85-;vHV9f$r;H$$$^$;$s(B)$B!#$7$+$7!"$"$k%[%9%H$G%5!<%P!<(B A$B!"(BB$B!"(BC $B$r;H$$!"(B
-$BJL$N%[%9%H$G%5!<%P!<(B A$B!"(BD$B!"(BE $B$r;H$&>l9g$K$O!"(BA $B$N$?$a$N0u%U%!%$%k$rF1$8(B
-$B$K$9$k$3$H$,$G$-!"Fs$D$N%[%9%H4V$G$=$N%5!<%P!<$OF14|$7$^$9!#(B
+$B0u%U%!%$%k$O!"$=$l$>$l$N%5!<%P!<$G$=$l@lMQ$KHs>o$KFC2=$5$l$k$3$H$KCm0U$7(B
+$B$F2<$5$$!#(Bgnus $B$O5-;vHV9f$r5-21$9$k$N$G!"N>J}$N%[%9%H$GF1$8%5!<%P!<$r;H$C(B
+$B$F$$$J$$$H!"$b$N$4$H$O2u$l$F$7$^$&$G$7$g$&(B ($BBgDq$N(B @acronym{NNTP} $B%5!<%P!<(B
+$B$OB>$N$I$s$J%5!<%P!<$H$bF1$85-;vHV9f$r;H$$$^$;$s(B)$B!#$7$+$7!"$"$k%[%9%H$G(B
+$B%5!<%P!<(B A$B!"(BB$B!"(BC $B$r;H$$!"JL$N%[%9%H$G%5!<%P!<(B A$B!"(BD$B!"(BE $B$r;H$&>l9g$K$O!"(B
+A $B$N$?$a$N0u%U%!%$%k$rF1$8$K$9$k$3$H$,$G$-$k$N$G!"Fs$D$N%[%9%H4V$G$=$N%5!<(B
+$B%P!<$OF14|$9$k$G$7$g$&!#(B
 
-@acronym{NNTP} $B0u$N;HMQ$O@-G=$NNt2=$r>7$-!"(BGnus $B$r$N$m$/46$8$5$;$k2DG=@-(B
+@acronym{NNTP} $B0u$N;HMQ$O@-G=$NNt2=$r>7$-!"(Bgnus $B$r$N$m$/46$8$5$;$k2DG=@-(B
 $B$,$"$j$^$9!#$=$&$$$&>l9g$O(B @code{nntp-marks-is-evil} $BJQ?t$r(B @code{t} $B$K(B
 $B@_Dj$7$F$_$F2<$5$$!#$9$k$H!"0u$O(B @file{~/.newsrc.eld} ($B$@$1(B) $B$K3JG<$5$l(B
-$B$k$G$7$g$&!#(B
+$B$k$h$&$K$J$k$G$7$g$&!#(B
 
 $B4XO"$9$kJQ?t(B:
 
@@ -12337,26 +12678,26 @@ scp $B$^$?$OB>$N2?$+$r;H$C$F(B) Gnus $B$rAv$i$;$kJL$N%[%9%H$K%3%T!<$9$k$3$H$,
 
 @item nntp-marks-directory
 @vindex nntp-marks-directory
-@acronym{NNTP} $B%0%k!<%W$N0u$,3JG<$5$l$k%G%#%l%/%H%j$G$9!#(B
+@acronym{NNTP} $B%0%k!<%W$N0u$,3JG<$5$l$k%G%#%l%/%H%j!<$G$9!#(B
 @end table
 
 @node News Spool
 @subsection $B%K%e!<%9%9%W!<%k(B
 @cindex nnspool
-@cindex new spool
+@cindex news spool
 
-$B%m!<%+%k%9%W!<%k$+$i30It%0%k!<%W$r9XFI$9$k;v$OHs>o$K4JC1$G!"Lr$KN)$A$^$9!#(B
-$B$?$H$($P!"Hs>o$KBg$-$J5-;v$,$"$k%0%k!<%W(B---$BNc$((B
+$B%m!<%+%k%9%W!<%k$+$i30It%0%k!<%W$r9XFI$9$k$3$H$O6K$a$F4JC1$@$7JXMx$+$b$7(B
+$B$l$^$;$s!#Hs>o$KBg$-$J5-;v$,$"$k%0%k!<%W(B---$BNc$((B
 $B$P(B @samp{alt.binaries.pictures.furniture} $B$rFI$`B.EY$,B.$/$J$j$^$9!#(B
 
-$B$H$K$+$/!"(B@code{nnspool} $B$rJ}K!$H$7$F!"(B@code{""} ($B$b$7$/$O2?$G$b(B) $B$r%"%I(B
-$B%l%9$H$7$F;XDj$9$k$@$1$G$9!#(B
+$B$H$K$+$/!"(B@code{nnspool} $B$rA*BrJ}K!$H$7$F!"$+$D(B @code{""} ($B$b$7$/$O2?$G(B
+$B$b(B) $B$r%"%I%l%9$H$7$F;XDj$9$k$@$1$G$9!#(B
 
-$B$b$7%m!<%+%k%9%W!<%k$K$D$J$0;v$,2DG=$J$i!"$*$=$i$/$=$l$r4pK\A*BrJ}K!$H$7(B
-$B$F;H$&$Y$-$G$7$g$&(B (@pxref{Finding the News})$B!#$=$l$OIaDL(B
-$B$O(B @code{nntp} $BA*BrJ}K!$h$jB.$$$G$9$,!"$=$&$G$J$$$+$b$7$l$^$;$s!#$=$l$O(B
-$B>u67$K0MB8$7$^$9!#2?$,$"$J$?$N%5%$%H$G0lHVNI$$$+$r8+$D$1$k$?$a$K!"$$$m$$(B
-$B$m$H;n$7$F$_$J$1$l$P$J$j$^$;$s!#(B
+$B$b$7%m!<%+%k%9%W!<%k$K$D$J$0$3$H$,2DG=$J$i!"$*$=$i$/$=$l$r4pK\A*BrJ}K!$H(B
+$B$7$F;H$&$Y$-$G$7$g$&(B (@pxref{Finding the News})$B!#$=$l$OIaDL(B
+$B$O(B @code{nntp} $BA*BrJ}K!$r;H$&$h$jB.$$$G$9$,!"$=$&$G$J$$$+$b$7$l$^$;$s!#(B
+$B$=$l$O>l9g$K$h$j$^$9!#2?$,$"$J$?$N%5%$%H$G0lHVNI$$$+$r8+$D$1$k$?$a$K!"$$(B
+$B$m$$$m$H;n$7$F$_$J$1$l$P$J$j$^$;$s!#(B
 
 @table @code
 @item nnspool-inews-program
@@ -12365,9 +12706,10 @@ scp $B$^$?$OB>$N2?$+$r;H$C$F(B) Gnus $B$rAv$i$;$kJL$N%[%9%H$K%3%T!<$9$k$3$H$,
 
 @item nnspool-inews-switches
 @vindex nnspool-inews-switches
-$B5-;v$rEj9F$9$k$H$-$K(B inews $B%W%m%0%i%`$KM?$($i$l$k%Q%i%a!<%?$G$9!#(B
+$B5-;v$rEj9F$9$k$H$-$K(B inews $B%W%m%0%i%`$KM?$($i$l$k%Q%i%a!<%?!<$G$9!#(B
 
 @item nnspool-spool-directory
+@vindex nnspool-spool-directory
 @code{nnspool} $B$,5-;v$rC5$9$H$3$m$G$9!#$3$l$OIaDL(B
 $B$O(B @file{/usr/spool/news/} $B$G$9!#(B
 
@@ -12378,24 +12720,24 @@ scp $B$^$?$OB>$N2?$+$r;H$C$F(B) Gnus $B$rAv$i$;$kJL$N%[%9%H$K%3%T!<$9$k$3$H$,
 
 @item nnspool-lib-dir
 @vindex nnspool-lib-dir
-$B%K%e!<%9$N%i%$%V%i%j!<%G%#%l%/%H%j!<$N>l=j$G$9(B ($B%G%#%U%)%k%H(B
-$B$G(B @file{/usr/lib/news/} $B$G$9(B)$B!#(B
+$B%K%e!<%9$N%i%$%V%i%j!<$,CV$+$l$F$$$k%G%#%l%/%H%j!<$N>l=j$G$9(B ($B%G%#%U%)%k(B
+$B%H$G(B @file{/usr/lib/news/} $B$G$9(B)$B!#(B
 
 @item nnspool-active-file
 @vindex nnspool-active-file
-$B%"%/%F%#%V%U%!%$%k$NL>A0$G$9!#(B
+$B%"%/%F%#%V%U%!%$%k$N@dBP%Q%9L>$G$9!#(B
 
 @item nnspool-newsgroups-file
 @vindex nnspool-newsgroups-file
-$B%0%k!<%W5-=R%U%!%$%k$NL>A0$G$9!#(B
+@file{newsgroups} $B%U%!%$%k$N@dBP%Q%9L>$G$9!#(B
 
 @item nnspool-history-file
 @vindex nnspool-history-file
-$B%K%e!<%9MzNr%U%!%$%k$NL>A0$G$9!#(B
+@file{history} $B%U%!%$%k$N@dBP%Q%9L>$G$9!#(B
 
 @item nnspool-active-times-file
 @vindex nnspool-active-times-file
-$B8=>uF|IU%U%!%$%k$X$NL>A0$G$9!#(B
+@file{active.times} $B%U%!%$%k$N@dBP%Q%9L>$G$9!#(B
 
 @item nnspool-nov-is-evil
 @vindex nnspool-nov-is-evil
@@ -12405,9 +12747,10 @@ scp $B$^$?$OB>$N2?$+$r;H$C$F(B) Gnus $B$rAv$i$;$kJL$N%[%9%H$K%3%T!<$9$k$3$H$,
 @item nnspool-sift-nov-with-sed
 @vindex nnspool-sift-nov-with-sed
 @cindex sed
-@code{nil} $B$G$J$$$H!"$3$l$,%G%#%U%)%k%H$G$9$,!"354Q%U%!%$%k(B (overview)
-$B$+$i4XO"$9$kItJ,$rF@$k$?$a$K(B @code{sed} $B$r;H$$$^$9!#$b$7(B @code{nil} $B$@$H!"(B
-@code{nnspool} $B$O%U%!%$%kA4BN$r%P%C%U%!$KFI$_9~$s$G!"$=$3$G$N2?$+$r;H$C$F(B) Gnus $B$rAv$i$;$kJL$N%[%9%H$K%3%T!<$9$k$3$H$,
 @cindex reading mail
 @cindex mail
 
-$B%K%e!<%9%j!<%@!<$G%a!<%k$rFI$`(B---$B$=$l$OL@Gr$KD6<+A3E*$J;v$G$O$J$$$N$G$9(B
-$B$+(B? $B$$$d!"$b$A$m$s$G$-$^$9!#(B
+$B%K%e!<%9%j!<%@!<$G%a!<%k$rFI$`$J$s$F$N%U%!%$%k$rFI$`$?$a$K%a!<%k%P%C%/%(%s%I$r;H$&(B
-* Choosing a Mail Back End::    Gnus $B$O?'!9$J%a!<%kMM<0$rFI$`;v$,$G$-$k(B
+* Expiring Mail::               $BMW$i$J$$%a!<%k$rh$j49$($k$3$H$r7hCG$7$?$J$i$P!"(B
-$B$"$J$?$O$$$m$$$m$J%+%k%A%c!<%7%g%C%/$rh$j49$($k$3$H$r7hCG$7$?$J$i(B
+$B$P!"$+$J$j$N%+%k%A%c!<%7%g%C%/$r7P83$9$k$3$H$K$J$k$G$7$g$&!#(B
 
-gnus $B$OEAE}E*$J%a!<%k%j!<%@$N$h$&$J$U$k$^$$$r$7$^$;$s!#$"$J$?$,K>$`$J(B
+gnus $B$OEAE}E*$J%a!<%k%j!<%@!<$N$h$&$J$U$k$^$$$r$7$^$;$s!#$"$J$?$,K>$`$J(B
 $B$i$=$N$h$&$K$b$G$-$^$9$,!"$=$l$O9|@^$jB;$N$/$?$S$lLY$1$G$9!#(B
 
-gnus $B$O$U$D$&F1$8C$9$?$a$KFCJL$JA`:n$O$7$^$;$s!#(B
+$B%a%C%;!<%8$r>C$9$?$a$K!"C$5$l$F$7$^$&$3$H$r0UL#$9$k$N$+$C$F(B? $B$=$j$c(B
-$B$"$s$^$j$G$9$h$M(B!
+$B$3$N$3$H$O4{FI$N%a%C%;!<%8$O$9$Y$F>C$5$l$F$7$^$&$3$H$r0UL#$9$k$N$+$C(B
+$B$F(B? $B$=$j$c$"$s$^$j$G$9$h$M(B!
 
-$B$=$&$G$O$"$j$^$;$s!#8E$$5-;v$O$$$m$s$J;EAH$_$K$h$C$F(B @dfn{expire} $B$5$l(B
-$B$k$N$G$9!#%K%e!<%95-;v$O%K%e!<%9$N4IM}?M(B ($B$,4IM}$7$F$$$k%5!<%P(B) $B$K$h$C(B
-$B$F(B expire $B$N=hM}$,@)8f$5$l!"%a!<%k$N(B expire $B$N=hM}$O$"$J$?$,@)8f$7$^$9!#(B
-$B%a!<%k$N(B expire $B$K$D$$$F$O(B @ref{Expiring Mail} $B$r;2>H$7$F2<$5$$!#(B
+$B$7$+$7!"$=$&$G$O$"$j$^$;$s!#8E$$%a%C%;!<%8$O2?$i$+$N;EAH$_$K$h$C$F4|8B@Z(B
+$B$l>C5n(B (@dfn{expire}) $B$5$l$k$N$G$9!#%K%e!<%9$N%a%C%;!<%8$O%K%e!<%9$N4IM}(B
+$B?M(B ($B$,4IM}$7$F$$$k%5!<%P!<(B) $B$K$h$C$F4|8B@Z$l>C5n$N=hM}$,@)8f$5$l!"%a!<%k(B
+$B$N4|8B@Z$l>C5n$N=hM}$O$"$J$?$,@)8f$7$^$9!#%a!<%k$N4|8B@Z$l>C5n$K$D$$$F$O!"(B
+@ref{Expiring Mail} $B$GE0DlE*$KLVMe$5$l$F$$$^$9!#(B
 
-$B$7$P$i$/%a!<%k$H%K%e!<%9$NN>J}$r;H$C$F$_$l$P!"5-;v$NJ}$G$7$P$i$/;H$C$F$_$?(B
+$B8e$G5$$,IU$/$N$O!"$=$NG[Aw$N5!9=$,%a%C%;!<%8$N07$$J}$K4X$7$F9T$J$&$3$H$,!"(B
+$B$[$s$N>/$7$7$+L5$$$3$H$G$9!#(B
 
-$BB?$/$N?M$?$A$OJ#?t$N%a!<%j%s%0%j%9%H$r9VFI$7$F$$$^$9!#$=$l$i(B
-$B$O(B @acronym{SMTP} $B$GG[Aw$5$l$k!"%a!<%k!"$G$9!#$=$l$i$N5-;v$r$H$F$bCm0U?<(B
-$B$/FI$s$G$$$k$K$b$+$+$o$i$:!"2?=54V$bJV;v$,L5$$$3$H$,$"$k$G$7$g$&!#;d$?$A(B
-$B$O$=$&$$$&5-;v$r%;!<%V$9$kI,MW$O$"$j$^$;$s!#$J$<$J$i$P!"$b$&0lEYFI$`I,MW(B
-$B$,@8$8$F$b!"$=$l$i$O$I$3$+$KJ]B8$5$l$F$$$k$+$i$G$9!#(B
+$BB?$/$N?M$?$A$,J#?t$N%a!<%j%s%0%j%9%H$r9VFI$7$F$$$^$9!#$=$l$i(B
+$B$O(B @acronym{SMTP} $B$GG[Aw$5$l$k$b$N!"$9$J$o$A%a!<%k$G$9!#$=$l$i$N%a%C%;!<(B
+$B%8$KJVEz$r$7$J$$$^$^!"$"$k$$$O$5$i$K!"$=$l$i$rHs>o$KCm0U?<$/$OFI$^$J$$$^(B
+$B$^$K!";d$?$A$O2?=54V$b2a$4$9$+$b$7$l$^$;$s!#$G$b!"$=$&$$$&%a%C%;!<%8$rJ](B
+$BB8$7$F$*$/I,MW$O$"$j$^$;$s!#$J$<$J$i$P!"$b$&0lEYFI$`I,MW$,@8$8$?$H$7$F$b!"(B
+$B$=$l$i$O$I$3$+$KJ]B8$5$l$F$$$k$+$i$G$9!#(B
 
 $B$"$k?M$?$A$O>.?M?t$KMxMQ$5$l$F$$$k%m!<%+%k%K%e!<%9%0%k!<%W$r9VFI$7$F$$$^(B
-$B$9!#$=$l$i$O(B @acronym{NNTP} $B$GG[Aw$5$l$k!"%K%e!<%9!"$G$9!#;d$?$A$O<+J,$N(B
-$B;E;v$KLrN)$F$k$?$a$K!"$=$l$i$NKDBg$J5-;v$NCGJR$rFI$s$@$jJV;v$r$7$J$1$l$P(B
-$B$J$j$^$;$s!#$=$7$F$=$l$i$OJ]B8$5$l$F$$$J$$$+$b$7$l$^$;$s$+$i!"6=L#$N$"$k(B
-$B5-;v$r8D?M%a!<%k$HF1$8$h$&$KJ]B8$7$J$1$l$P$J$i$J$$$G$7$g$&!#(B
+$B$9!#$=$l$i$O(B @acronym{NNTP} $B$GG[Aw$5$l$k$b$N!"$9$J$o$A%K%e!<%9$G$9!#;d$?(B
+$B$A$O<+J,$N;E;v$KLrN)$F$k$?$a$K!"$=$l$i$NKDBg$J%a%C%;!<%8$NCGJR$rFI$s$@$j(B
+$BJV;v$r$7$J$1$l$P$J$j$^$;$s!#$7$+$b$=$l$i$,$I$3$+$KJ]B8$5$l$F$$$k$H$O8B$i(B
+$B$J$$$N$G!"6=L#$N$"$k%a%C%;!<%8$r8D?M%a!<%k$HF1$8$h$&$KJ]B8$7$J$1$l$P$J$j(B
+$B$^$;$s!#(B
 
 $BG[Aw$N;EAH$_$N0c$$$O$I$&$G$b$h$$$3$H$G!"Bg;v$J$N$O$$$+$K/$/$H$b!";d$,(B gnus $B$KF~$l$?!"(BEmacs $B$N%5%V%j%_%J%kG>L#A9@vBu4X?t$rGd$C(B
-$B$F$/$l$??M$O$=$l$rJ]>Z$7$F$$$^$9!#$"$J$?$bF12=$7$^$9!#$"$J$?$O(B gnus $B$r0&(B
-$B$7$^$9!#$"$J$?$O(B gnus $B$G$N%a!<%k$NJ}K!$r0&$7$^$9!#@dBP$K!#(B)
+$B6<$+$9$o$1$G$O$J$$$N$G$9$,!"$O$C$-$j$5$;$F$*$-$?$$$N$O!"$"$J$?$K%a%C%;!<(B
+$B%8$K$D$$$F$N?7$7$$$d$jJ}$r=$F@$7$FM_$7$$$H$$$&$3$H$G$9!#$"$J$?$,(B gnus $B$N(B
+$B$d$jJ}$r/$/$H$b!";d$,(B gnus $B$KF~$l$?(B Emacs $B$N%5%V%j%_%J%kG>L#A9(B
+$B@vBu4X?t$rGd$C$F$/$l$??M$O$=$l$rJ]>Z$7$F$$$^$9!#$"$J$?$bF12=$7$^$9!#$"$J(B
+$B$?$O(B gnus $B$r0&$7$^$9!#$"$J$?$O(B gnus $B$G$N%a!<%k$NJ}K!$r0&$7$^$9!#@dBP$K!#(B)
 
 @node Getting Started Reading Mail
-@subsection $B%a!<%k$rFI$`;v$r;O$a$k(B
+@subsection $B%a!<%k$rFI$`$3$H$r;O$a$k(B
 
-Gnus $B$r;H$C$F?7$7$$%a!<%k$rFI$`;v$OHs>o$K4JC1$G$9!#$"$J$?$N%a!<%k%P%C%/(B
-$B%(%s%I$N$"$J$?$NA*Br$r(B @code{gnus-secondary-select-methods} $B$KJ|$j9~$`$@(B
-$B$1$G!"$"$H$N$3$H$O<+F0E*$K5/$3$j$^$9!#(B
+gnus $B$r;H$C$F?7$7$$%a!<%k$rFI$`$3$H$O$^$C$?$/4JC1$G$9!#$"$J$?$,A*$s$@%a!<(B
+$B%k%P%C%/%(%s%I$r(B @code{gnus-secondary-select-methods} $B$KJ|$j9~$`$@$1$G!"(B
+$B<+F0E*$KFI$`$3$H$,$G$-$k$h$&$K$J$j$^$9!#(B
 
-$BNc$($P!"(B@code{nnml} ($B$3$l$O(B ``$B0l%a!<%k0l%U%!%$%k(B'' $B%P%C%/%(%s%I$G$9(B) $B$r(B
-$B;H$$$?$$$J$i!"$N%0%k!<%W$HF1$8$h$&$KFI$`;v$,$G$-$^(B
-$B$9!#(B
+$B$=$&$9$k$H!"$N%0%k!<%W$HF1$8$h$&$KFI$`$3$H$,$G$-$k$h$&$K$J$j$^$9!#(B
 
-$B$"$J$?$O$*$=$i$/%a!<%k$r$$$/$D$+$N%0%k!<%W$KJ,3d$7$?$$$G$7$g$&$1$I(B:
+$B$?$V$s%a!<%k$r$$$/$D$+$N%0%k!<%W$KJ,3d$7$?$$$G$7$g$&$1$l$I(B:
 
 @lisp
 (setq nnmail-split-methods
@@ -12524,13 +12869,14 @@ Gnus $B$r;H$C$F?7$7$$%a!<%k$rFI$`;v$OHs>o$K4JC1$G$9!#$"$J$?$N%a!<%k%P%C%/(B
         ("other" "")))
 @end lisp
 
-$B$3$l$O7k2L$H$7$F;0$D$N?7$7$$(B @code{nnml} $B%a!<%k%0%k!<%W$r:n$j$^(B
-$B$9(B: @samp{nnml:junk}, @samp{nnml:crazy}, @samp{nnml:other} $B$G$9!#:G=i(B
-$B$NFs$D$N%0%k!<%W$K9g$o$J$$%a!<%k$OA4$F:G8e$N%0%k!<%W$KF~$l$i$l$^$9!#(B
+$B$3$l$O;0$D$N?7$7$$(B @code{nnml} $B%a!<%k%0%k!<%W(B @samp{nnml:junk},
+@samp{nnml:crazy} $B$*$h$S(B @samp{nnml:other} $B$r:n$k$3$H$K$J$j$^$9!#=i$a$N(B
+$BFs$D$N%0%k!<%W$K$U$5$o$7$/$J$$$9$Y$F$N%a!<%k$O!":G8e$N%0%k!<%W$KCV$+$l$^(B
+$B$9!#(B
 
-$B$3$l$O(B gnus $B$G%a!<%k$rFI$`$?$a$K=$N9`$r=OFI$9$kI,MW$,$"$k$+$b$7$l$^$;$s$,!#FC(B
-$B$K(B @ref{Choosing a Mail Back End} $B$H(B @ref{Expiring Mail} $B$r!#(B
+gnus $B$G%a!<%k$rFI$`$K$O$3$l$G==J,$J$O$:$G$9!#%^%K%e%"%k$N$3$NItJ,$NB>$N(B
+$B>O$r=OFI$9$kI,MW$,$"$k$+$b$7$l$^$;$s$,!#FC$K(B @ref{Choosing a Mail Back
+End} $B$H(B @ref{Expiring Mail} $B$r!#(B
 
 @node Splitting Mail
 @subsection $B%a!<%k$NJ,3d(B
@@ -12538,6 +12884,14 @@ Gnus $B$r;H$C$F?7$7$$%a!<%k$rFI$`;v$OHs>o$K4JC1$G$9!#$"$J$?$N%a!<%k%P%C%/(B
 @cindex mail splitting
 @cindex mail filtering (splitting)
 
+@quotation
+$BLuCm(B: $B$3$N%^%K%e%"%k$NB?J}LL$G;H$o$l$F$$$k!VJ,3d!W$H$$$&8l$N$&$A!"$l$N3JG<@h$K0lDL$:$D!V?6$jJ,$1(B
+$B$k!W0UL#$G;H$C$F$$$^$9!#(B
+@end quotation
+
 @vindex nnmail-split-methods
 $BJQ?t(B @code{nnmail-split-methods} $B$OF~$C$F$/$k%a!<%k$r$I$N$h$&$K%0%k!<%W(B
 $BJ,$1$9$k$+$r;XDj$7$^$9!#(B
@@ -12549,12 +12903,12 @@ Gnus $B$r;H$C$F?7$7$$%a!<%k$rFI$`;v$OHs>o$K4JC1$G$9!#$"$J$?$N%a!<%k%P%C%/(B
     ("mail.other" "")))
 @end lisp
 
-$B$3$NJQ?t$O%j%9%H$N%j%9%H$G!"$3$l$i$N%j%9%H$N:G=i$N$=$l$>$l$NMWAG$,%a!<%k(B
-$B%0%k!<%W$NL>A0$G(B ($B$H$3$m$G!"$=$l$i$O(B @samp{mail} $B$G;O$^$kI,MW$O$"$j$^$;(B
-$B$s(B)$B!"Fs$D$a$NMWAG$,$=$l$>$l$N%a!<%k$N%X%C%@!<$+$i$=$l$,$I$N%0%k!<%W$KB0(B
-$B$9$k$+$r7hDj$9$k@55,I=8=$G$9!#:G=i$NJ8;zNs$O!"(B@code{replace-match} $B$K$h$C(B
-$B$F!"9gCW$7$?J8>O$+$i$NI{I=8=$rA^F~$9$k$?$a$K;H$o$l$k$h$&$J!"(B
-@code{samp\\1} $B$NMM<0$r4^$`$+$b$7$l$^$;$s!#$?$H$($P(B:
+$B$3$NJQ?t$O%j%9%H$N%j%9%H$G!"$=$l$>$l$N%j%9%H$N:G=i$NMWAG$O%a!<%k%0%k!<%W(B
+$B$NL>A0!"Fs$D$a$NMWAG$O$=$l$>$l$N%a!<%k$,$=$N%0%k!<%W$KB0$9$k$+$I$&$+$r%X%C(B
+$B%@!<$GH=Dj$9$k$?$a$K;H$&@55,I=8=$G$9(B ($B$H$3$m$G!"%a!<%k%0%k!<%W$NL>A0(B
+$B$,(B @samp{mail} $B$G;O$^$kI,MW$O$"$j$^$;$s(B)$B!#:G=i$NJ8;zNs$O!"(B
+@code{replace-match} $B$,9gCW$7$?J8>O$+$io$K4JC1$G$9!#$"$J$?$N%a!<%k%P%C%/(B
 $B$r(B @code{nnmail-split-lowercase-expanded} $B$,@)8f$7$^$9!#(B@xref{Fancy Mail
 Splitting}.
 
-$BFsHVL\$NMWAG$O4X?t$G$"$k;v$b$G$-$^$9!#$=$N>l9g$O!"$=$l$OK!B'$N:G=i$NMWAG(B
-$B$r0z?t$H$7$F!"%X%C%@!<$KHO0O$r69$a$F(B (narrowed to headers) $B8F$P$l$^$9!#(B
-$B$=$l$O!"%a!<%k$,$=$N%0%k!<%W$KB0$9$k$H9M$($k$N$G$"$l$P!"(B@code{nil} $B$G$J(B
-$B$$CM$r5"$9I,MW$,$"$j$^$9!#(B
+$BFsHVL\$NMWAG$O4X?t$G$b9=$$$^$;$s!#$=$N>l9g!"$=$l$O5,B'$N:G=i$NMWAG(B ($B%a!<(B
+$B%k%0%k!<%W$NL>A0(B) $B$r0z?t$H$7$F!"%X%C%@!<$@$1$KHO0O$r69$a$i$l$?%P%C%U%!!<(B
+$B$G8F$P$l$^$9!#%a!<%k$,$=$N%0%k!<%W$KB0$9$k$HH=CG$7$?$i!"$=$N4X?t(B
+$B$O(B @code{nil} $B$G$J$$CM$rJV$9I,MW$,$"$j$^$9!#(B
 
 @cindex @samp{bogus} group
-$B$3$l$i$N%0%k!<%W$N:G8e$O>o$KAm9gE*$J$b$N$G$"$k$Y$-$G!"B>$N@55,I=8=$K9gCW(B
-$B$7$J$$%a!<%k$K9gCW$9$k$?$a$K!"$3$N@55,I=8=$O(B @emph{$B$$$D$b(B} @samp{""}$B$G$"(B
-$B$k$Y$-$G$9!#(B($B$3$l$i$NK!B'$OO"A[%j%9%H$N=i$a$+$i=*$o$j$^$G=gHV$K!$A$^$9(B''$B!#Aj8_Ej9F$r;HMQ2DG=$K$7$F$$$k>l9g!"A4$F$N9gCW$7$?K!B'(B
-$B$,(B ``$B>!$A$^$9(B''$B!#(B)  $B9gCW$9$k5,B'$,$J$+$C$?$i!"%a!<%k$O:G8e(B
-$B$K(B @samp{bogus} $B%0%k!<%W$G=*$o$j$^$9!#%a!<%kJ,3d$K$h$C$F?7$7$$%0%k!<%W$,(B
-$B:n$i$l$?>l9g$O!"$=$l$i$r8+$k$?$a$K(B @code{gnus-group-find-new-groups} $B$r(B
-$B$N%j%9%H$rJV$9$Y$-$G(B
-$B$9!#(B
+$B$3$l$i$N%0%k!<%W$N:G8e$O>o$KAm9gE*$J$b$N$G$"$k$Y$-$G!"$=$N@55,I=8=$OB>$N(B
+$B@55,I=8=$K9gCW$7$J$+$C$?%a!<%k$K9gCW$9$k$?$a$K!"(B
+@emph{$B$$$D$b(B} @samp{""} $B$G$J$1$l$P$J$j$^$;$s!#(B($B$3$l$i$N5,B'$OO"A[%j%9%H(B
+$B$N=i$a$+$i=*$o$j$^$G=gHV$K=hM}$5$l$^$9!#%/%m%9%]%9%H$rM-8z$K$7$F$$$J$$8B(B
+$B$j!":G=i$K9gCW$7$?5,B'$,!V>!$A!W$^$9!#%/%m%9%]%9%H$rM-8z$K$7$F$$$k>l9g$O!"(B
+$B$9$Y$F$N9gCW$7$?5,B'$,!V>!$A!W$^$9!#(B)  $B9gCW$9$k5,B'$,$J$+$C$?$i!"%a!<%k(B
+$B$O:G8e$K(B @samp{bogus} $B%0%k!<%W$G=*$o$j$^$9!#%a!<%kJ,3d$K$h$C$F?7$7$$%0%k!<(B
+$B%W$,:n$i$l$?>l9g$O!"$=$l$i$r8+$k$?$a(B
+$B$K(B @code{gnus-group-find-new-groups} $B$r$N%j%9%H$rJV$5$J$1$l$P$J$j(B
+$B$^$;$s!#(B
 
-$BA4$F$N%a!<%k%P%C%/%(%s%I$O!"F~$C$FMh$?IOK3$G=c?h$J%X%C%@!<$rMpK=$K07$C$F(B
-$B$bNI$$;v$KCm0U$7$F$/$@$5$$!#$=$l$i$O$9$Y$F(B @code{Lines} $B%X%C%@!<$rDI2C$7(B
-$B$^$9!#$$$/$D$+$O(B @code{X-Gnus-Group} $B%X%C%@!<$r2C$($^$9!#$?$$$F$$$N$b$N(B
-$B$O(B Unix $B$N(B mbox $B$N(B @code{From} $B9T$r2?$+JL$NL>A0$KJQ$($^$9!#(B
+$B$9$Y$F$N%a!<%k%P%C%/%(%s%I$O!"F~$C$FMh$?5$$NFG$JL5} $B9T$r2?$+JL$N$b$N$KJQ$($^$9!#(B
 
 @vindex nnmail-crosspost
-$B%a!<%k%P%C%/%(%s%I$O$9$Y$FAj8_Ej9F$N5!G=$rDs6!$7$F$$$^$9!#$$$/$D$+$N@55,(B
-$BI=8=$,9gCW$9$k$H!"%a!<%k$OA4$F$N%0%k!<%W$K(B ``$BAj8_Ej9F(B'' $B$5$l$^$9!#(B
+$B$9$Y$F$N%a!<%k%P%C%/%(%s%I$O%/%m%9%]%9%H$r%5%]!<%H$7$^$9!#J#?t$N@55,I=8=(B
+$B$,9gCW$9$k$H!"%a!<%k$O$=$l$i$9$Y$F$N%0%k!<%W$K!V%/%m%9%]%9%H!W$5$l$^$9!#(B
 @code{nnmail-crosspost} $B$O$3$N5!G=$r;H$&$+$I$&$+$r;XDj$7$^$9!#$I$N5-;v$b(B
-$BAm9g$N(B (@samp{""}) $B%0%k!<%W$KAj8_Ej9F$5$l$J$$;v$KCm0U$7$F$/$@$5$$!#(B
+$BAm9g$N(B (@samp{""}) $B%0%k!<%W$K%/%m%9%]%9%H$5$l$J$$$3$H$KCm0U$7$F2<$5$$!#(B
 
 @vindex nnmail-crosspost-link-function
 @cindex crosspost
 @cindex links
-@code{nnmh} $B$H(B @code{nnml} $B$OAj8_Ej9F$5$l$?5-;v$K%O!<%I%j%s%/(B (hardlink)
-$B$r:n$k;v$K$h$C$FAj8_Ej9F$r9T$$$^$9!#$7$+$7!"A4$F$N%U%!%$%k%7%9%F%`$,%O!<(B
-$B%I%j%s%/$N5!G=$rDs6!$7$F$$$k$o$1$G$O$"$j$^$;$s!#$b$7$"$J$?$,$=$N>l9g$KEv(B
-$B$F$O$^$k$N$G$"$l$P!"(B
-@code{nnmail-crosspost-link-function} $B$r(B @code{copy-file} $B$K@_Dj$7$F$/$@(B
-$B$5$$!#(B($B$3$NJQ?t$O%G%#%U%)%k%H$G(B @code{add-name-to-file} $B$G$9!#(B)
+@code{nnmh} $B$H(B @code{nnml} $B$O%/%m%9%]%9%H$5$l$?5-;v$K%O!<%I%j%s(B
+$B%/(B (hardlink) $B$r:n$k$3$H$K$h$C$F%/%m%9%]%9%H$r9T$J$$$^$9!#$7$+$7!"$9$Y$F(B
+$B$N%U%!%$%k%7%9%F%`$,%O!<%I%j%s%/$N5!G=$rDs6!$7$F$$$k$o$1$G$O$"$j$^$;$s!#(B
+$B$b$7$"$J$?$,$=$N>l9g$KEv$F$O$^$k$N$G$"$l$P!"(B
+@code{nnmail-crosspost-link-function} $B$r(B @code{copy-file} $B$K@_Dj$7$F2<$5(B
+$B$$!#(B($B$3$NJQ?t$O%G%#%U%)%k%H$G(B @code{add-name-to-file} $B$G$9!#(B)
 
 @kindex M-x nnmail-split-history
 @findex nnmail-split-history
-$BA0$N%a!<%kJ,3d$,%a%C%;!<%8$r$I$3$KF~$l$?$+$r8+$?$$>l9g$O!"L?Na(B @kbd{M-x
-nnmail-split-history} $B$r;H$&;v$,$G$-$^$9!#$3$l$+$i%9%W!<%k$7D>$=$&$H$9$k(B
-$B%a%C%;!<%8$,$I$3$KF~$k$+$r8+$?$$>l9g$O!"(B
-@code{gnus-summary-respool-trace} $B$H4XO"$9$kL?(B
-$BNa(B (@pxref{Mail Group Commands}) $B$r;H$&;v$,$G$-$^$9!#(B
+$B0JA0$K9T$J$o$l$?%a!<%kJ,3d$,%a%C%;!<%8$r$I$3$KF~$l$?$+$r8+$?$$>l9g$O!"(B
+@kbd{M-x nnmail-split-history} $BL?Na$r;H$C$F2<$5$$!#$3$l$+$i%9%W!<%k$7D>(B
+$B$=$&$H$9$k%a%C%;!<%8$,$I$3$KF~$k$+$r8+$?$$>l9g$O!"(B
+@code{gnus-summary-respool-trace} $B$*$h$S4XO"$9$kL?Na(B (@pxref{Mail Group
+Commands}) $B$r;H$C$F2<$5$$!#(B
 
 @vindex nnmail-split-header-length-limit
 @code{nnmail-split-header-length-limit} $B$N@)8B$h$jD9$$%X%C%@!<9T$O!"J,3d(B
@@ -12624,86 +12978,86 @@ nnmail-split-history} $B$r;H$&;v$,$G$-$^$9!#$3$l$+$i%9%W!<%k$7D>$=$&$H$9$k(B
 @vindex nnmail-mail-splitting-charset
 @vindex nnmail-mail-splitting-decodes
 ($BLuCm(B: $B%*%j%8%J%k$N(B Gnus $B$H$O;EMM$,HyL/$K0[$J$k$3$H$KCm0U$7$F2<$5$$(B) $B%G%#(B
-$B%U%)%k%H$G$OJ,3d%3!<%I$O(B @acronym{MIME} $B%(%s%3!<%I$5$l$?%X%C%@!<$r%G%3!<(B
-$B%I$9$k$N$G!"Hs(B-@acronym{ASCII} $BJ8;zNs$K%^%C%A$5$;$k$3$H$,$G$-$^$9!#JQ(B
-$B?t(B @code{nnmail-mail-splitting-charset} $B$,(B @acronym{MIME} $BJ8;z=8(B
-$B9g(B (mime-charset) $B$G$"$C$?$i$=$l!"(B@acronym{MIME} $BJ8;z=89g$G$O$J$$(B
+$B%U%)%k%H$G$OJ,3d$N=hM}$K$*$$$F%X%C%@!<$r(B @acronym{MIME} $B%G%3!<%I$9$k$N$G!"(B
+$BHs(B-@acronym{ASCII} $BJ8;zNs$K9gCW$5$;$k$3$H$,$G$-$^$9!#JQ(B
+$B?t(B @code{nnmail-mail-splitting-charset} $B$,(B @acronym{MIME} $BJ8;z%;%C(B
+$B%H(B (mime-charset) $B$G$"$C$?$i$=$l!"(B@acronym{MIME} $BJ8;z%;%C%H$G$O$J$$(B
 $BHs(B-@code{nil} $B$JCM$@$C$?$i$=$N$H$-$N(B @code{default-mime-charset} $B$NCM$G!"(B
 (@acronym{MIME} $B%(%s%3!<%I$5$l$?$b$N$G$O$J$$(B) $BHs(B-@acronym{ASCII} $B%S%C%H(B
-$B%Q%?!<%s$b%G%3!<%I$7$^$9!#$3$NF0:n(B
-$B$O(B @code{nnmail-mail-splitting-decodes} $B$r(B @code{nil} $B$K$9$k$3$H$K$h$C$F(B
-$B40A4$K;_$a$k$3$H$,$G$-!"@8$N%X%C%@!<$N%G!<%?$r85$K5-;v$K%^%C%A$5$;$?$$>l(B
-$B9g$K$OM-8z$G$7$g$&!#(B
+$B%Q%?!<%s$b%G%3!<%I$7$^$9!#(B
+@code{nnmail-mail-splitting-decodes} $B$r(B @code{nil} $B$KB+G{$9$k$3$H$K$h$C(B
+$B$F$^$C$?$/%G%3!<%I$r9T$J$o$J$$$h$&$K$9$k$3$H$,$G$-!"$=$l$O!"@8$N%X%C%@!<(B
+$B$N%G!<%?$r85$K5-;v$N9gCW$rH=Dj$7$?$$>l9g$K$OLrN)$D$G$7$g$&!#(B
 
 @vindex nnmail-resplit-incoming
-$B%G%#%U%)%k%H$G$OF~$C$F$/$k$9$Y$F$N%a%C%;!<%8$KBP$7$FJ,3d$,F/$-$^$9!#$b(B
-$B$7(B @code{mail-sources} $BJQ(B
-$B?t(B (@pxref{Mail Source Specifiers}) $B$K(B @code{directory} $B$N9`$r@_Dj$7$F$b!"(B
-$B$7$+$7!"%G%#%U%)%k%H$G$OJ,3d$O(B @emph{$B5/$3$j$^$;$s(B}$B!#JQ(B
-$B?t(B @code{nnmail-resplit-incoming} $B$rHs(B-@code{nil} $B$JCM$K@_Dj$9$k$3$H$K$h$C(B
-$B$F!"$3$N>l9g$G$bJ,3d$r5/$3$5$;$k$3$H$,$G$-$^$9!#(B($B$3$NJQ?t$OB>$Ne;J$+$i$/$kA4$F$N%a!<%k$r4^$s$@%0%k!<%W$r:n$C(B
-$B$?$H$7$^$7$g$&!#$=$l$+$i!"6vH/E*$K$=$N%0%k!<%W$N9XFIe;J$+$i$NA4$F$N%a!<%k$rL$9XFI$N%0%k!<%W$KF~$l$^(B
-$B$9$N$G!">e;J$,(B ''$B7nMKF|$^$G$K$=$NJs9p=q$r=`Hw$7$J$$$Hl9g$G$bJ,3d$r5/$3$5$;$k$3$H$,$G$-$^$9!#(B($B$3$NJQ?t$OB>$N$`$9$Y$F$N5!2q$r(B
+$BDs6!$7$^$9!#Nc$($P!"$"$J$?$N>e;J$+$i$/$k$9$Y$F$N%a!<%k$rF~$l$k%0%k!<%W$r(B
+$B:n$C$?$H$7$^$7$g$&!#$=$N8e!"6vH/E*$K$=$N%0%k!<%W$N9XFI$r$d$a$F$7$^$&$H$I(B
+$B$&$J$k$G$7$g$&!#$=$l$G$b(B gnus $B$O>e;J$+$i$N$9$Y$F$N%a!<%k$rL$9XFI$N%0%k!<(B
+$B%W$KF~$l$k$N$G!">e;J$,!V7nMKF|$^$G$K$=$NJs9p=q$r=`Hw$7$J$$$HA0$G$9!#=i4|CM$O(B @env{MAIL} $B4D6-JQ?t$NCM(B
+$B%U%!%$%k$NL>A0$G$9!#%G%#%U%)%k%H$O(B @env{MAIL} $B4D6-JQ?t$NCM(B
 $B$+(B @code{rmail-spool-directory} $B$NCM(B ($BIaDL(B
 $B$O(B @file{usr-mail/spool/user-name} $B$N$h$&$J$b$N(B) $B$G$9!#(B
 
 @item :prescript
 @itemx :postscript
-$B%a!<%k$r$l$N%a!<%k$r$O;HMQ$G$-$^$;$s(B---$B%a!<%k$r0\F0$7$F$$$k$H$-$K(B
 $B%a!<%k%9%W!<%k$r%m%C%/$9$kJ}K!$,$"$j$^$;$s!#(B
 
-$BE,@Z$J%5!<%P!<$r@_CV$9$k$3$H$,IT2DG=$J$i!"JQ$o$j$K(B  ssh $B$r;H$&$3$H$,$G$-(B
+$BE,Ev$J%5!<%P!<$r@_CV$9$k$3$H$,IT2DG=$J$i!"JQ$o$j$K(B ssh $B$r;H$&$3$H$,$G$-(B
 $B$^$9!#(B
 
 @lisp
@@ -12731,7 +13085,7 @@ Gnus $B$O$"$J$?$K<+J,<+?H$KD7$MJV$C$F$/$k$h$&$J2DG=@-$N$"$kA4$F$N5!2q$rDs(B
       '((file :prescript "ssh host bin/getmail >%t")))
 @end lisp
 
-@samp{getmail} $B%9%/%j%W%H$O0J2<$N$h$&$J$b$N$K$J$j$^$9(B:
+@samp{getmail} $B%9%/%j%W%H$O0J2<$N$h$&$J$b$N$K$J$k$G$7$g$&(B:
 
 @example
 #!/bin/sh
@@ -12743,43 +13097,48 @@ TMP=$HOME/Mail/tmp
 rm -f $TMP; $MOVEMAIL $MAIL $TMP >/dev/null && cat $TMP
 @end example
 
-$BL\E*$K9g$&$h$&$K;HMQ$7$?$$(B @samp{movemail} $B$K9g$o$;$F%9%/%j%W%H$r=q$-49(B
-$B$($F$/$@$5$$!#(B
+$B$"$J$?$,;H$$$?$$(B @samp{movemail} $B$K9g$o$;$F!"%9%/%j%W%H$r=q$-49$($F2<$5(B
+$B$$!#(B
 
 @item directory
 @vindex nnmail-scan-directory-mail-source-once
-$B%G%#%l%/%H%j!o$NJ,3d=hM}$,%G%#%l%/%H%j!o$NJ,3d=hM}$,$=$N%G%#%l%/%H%j!<$K$"$k$9$Y$F$N%U%!%$%k$KBP$7$F9T(B
+$B$J$o$l$^$9(B (@pxref{Splitting Mail})$B!#(B
 
 $B%-!<%o!<%I(B:
 
 @table @code
 @item :path
-$B%U%!%$%k$N$"$k%G%#%l%/%H%j!<$NL>A0$G$9!#$3$l$K$O=i4|CM$O$"$j$^$;$s!#(B
+$B%U%!%$%k$,$"$k%G%#%l%/%H%j!<$NL>A0$G$9!#$3$l$K$O%G%#%U%)%k%HCM$O$"$j$^$;(B
+$B$s!#(B
 
 @item :suffix
-$B$3$N@\Hx8l$G=*$o$k%U%!%$%k$@$1$,;HMQ$5$l$^$9!#=i4|CM$O(B @samp{.spool} $B$G(B
-$B$9!#(B
+$B$3$N@\Hx8l$G=*$o$kL>A0%U%!%$%k$@$1$,;H$o$l$^$9!#%G%#%U%)%k%H(B
+$B$O(B @samp{.spool} $B$G$9!#(B
 
 @item :predicate
-$B$3$N=R8l$,(B @code{nil} $B$G$J$$CM$rJV$9%U%!%$%k$N$_$G$9!#=i4|CM(B
-$B$O(B @code{identity} $B$G$9!#$3$l$ODI2C$NA*JL4o$H$7$F;HMQ$5$l$^$9(B---$B@5$7$$@\(B
-$BHx8l(B @emph{$B$H(B} $B$3$N=R8l$rK~B-$9$k%U%!%$%k$@$1$,9MN8$5$l$^$9!#(B
+$B$3$N=R8l$,(B @code{nil} $B$G$J$$CM$rJV$9%U%!%$%k$@$1$,;H$o$l$^$9!#%G%#%U%)%k(B
+$B%H$O(B @code{identity} $B$G$9!#$3$l$ODI2C$NA*JL4o$H$7$F;HMQ$5$l$^$9(B---$B@5$7$$(B
+$B@\Hx8l$G!"(B@emph{$B$+$D(B} $B$3$N=R8l$rK~B-$9$k%U%!%$%k$@$1$,BP>]$K$J$j$^$9!#(B
+
+$BLuCm(B: $B$3$N>l9g$N=R8l$O4X?t$G!"@5$7$$@\Hx8l$r;}$D%U%!%$%k$NL>A0$,0z?t$H$7(B
+$B$FEO$5$l$^$9!#(B
 
 @item :prescript
 @itemx :postscript
-$B%a!<%k$N$l$N%a!<%k$r/dev/null && cat $TMP
 
 @table @code
 @item :server
-@acronym{POP} $B%5!<%P!<$NL>A0$G$9!#=i4|CM$O(B @env{MAILHOST} $B4D6-JQ?t$+$iA0$G$9!#%G%#%U%)%k%H$O(B @env{MAILHOST} $B4D6-JQ?t(B
+$B$+$i$G$J$1$l$P$J$j$^$;$s!#=i4|CM$O(B @samp{pop3} $B$G$9!#%7%9%F%`$K$h$C$F(B
-$B$O(B @samp{"pop-3"} $B$H$7$J$1$l$P$J$i$J$$$+$b$7$l$^$;$s!#(B
+$BL>$G$J$1$l$P$J$j$^$;$s!#%G%#%U%)%k%H$O(B @samp{"pop3"} $B$G$9!#%7%9%F%`$K$h$C(B
+$B$F$O(B @samp{"pop-3"} $B$H$7$J$1$l$P$J$i$J$$$+$b$7$l$^$;$s!#(B
 
 @item :user
-@acronym{POP} $B%5!<%P!<$KM?$($kMxMQ$G$9!#=i4|CM$O%m%0%$%sL>$G$9!#(B
+@acronym{POP} $B%5!<%P!<$KM?$($kMxMQ$G$9!#%G%#%U%)%k%H$O%m%0%$%sL>$G$9!#(B
 
 @item :password
-@acronym{POP} $B%5!<%P!<$KM?$($k%Q%9%o!<%I$G$9!#;XDj$5$l$J$$>l9g$O!"MxMQA0$G$9!#$3$l$O>o$K$3$NJ8;zNs$K4^$^$l$F$$$J(B
-$B$1$l$P$J$j$^$;$s!#(B
+$B%a!<%k$,$=$3$K0\F0$5$;$i$l$k%U%!%$%k$NL>A0$G$9!#$3$l$O>o$K$3$NJ8;zNs$K4^(B
+$B$^$l$F$$$J$1$l$P$J$j$^$;$s!#(B
 
 @item s
 $B%5!<%P!<$NL>A0$G$9!#(B
@@ -12841,41 +13200,41 @@ fetchmail %u@@%s -P %p %t
 $B;HMQ$9$k%Q%9%o!<%I$G$9!#(B
 @end table
 
-$B$3$l$i$N;EMM$G;H$o$l$kCM$OBP1~$9$k%-!<%o!<%I$KM?$($?CM$+$iA0(B) $B$H$H$b$K(B
+$B8F$P$l$^$9(B
 
 @item :authentication
-$B$3$l$O(B @code{password} $B$+%7%s%\%k(B @code{apop} $B$G!"$I$NG'>ZJ}<0$r;H$&$+$r(B
-$B7h$a$k$b$N$N$I$A$i$+$G$9!#=i4|@_Dj$O(B @code{password} $B$G$9!#(B
+$B$3$l$O(B @code{password} $B$+%7%s%\%k(B @code{apop} $B$N$I$A$i$+$G!"2?$NG'>ZJ}<0(B
+$B$r;H$&$+$r;X<($7$^$9!#%G%#%U%)%k%H$O(B @code{password} $B$G$9!#(B
 
 @item :connection
-$B%5!<%P!<$K@\B3$9$k$H$-$K;H$&%9%H%j!<%`$G!"(B@code{ssl}, @code{tls} $B$^$?$O(B
-$B$=$l0J30$r;XDj$G$-$^$9!#%G%#%U%)%k%H$O(B @code{nil} $B$G!"0BA4$G$O$J$$@\B3$r(B
-$BMQ$$$^$9!#(BSSL/TLS $B$G$O30It%W%m%0%i%`$H%i%$%V%i%j$,I,MW$G$"$k$3$H$KCm0U$7(B
-$B$F2<$5$$(B:
+$B%5!<%P!<$K@\B3$9$k$H$-$K;H$&%9%H%j!<%`$G!"(B@code{ssl}$B!"(B@code{tls} $B$^$?(B
+$B$O(B @code{nil} $B$r;XDj$9$k$3$H$,$G$-$^$9!#%G%#%U%)%k%H$O(B @code{nil} $B$G!"0B(B
+$BA4$G$O$J$$@\B3$rMQ$$$^$9!#(B@code{ssl} $B$H(B @code{tls} $B$G$O30It%W%m%0%i%`$H(B
+$B%i%$%V%i%j!<$,I,MW$G$"$k$3$H$KCm0U$7$F2<$5$$(B:
 
-@itemize @bullet
-@item
-@dfn{ssl:} @acronym{SSL} $B$r;H$$$^$9!#(BOpenSSL (@samp{openssl} $B%W%m%0%i(B
-$B%`(B) $B$+(B SSLeay (@samp{s_client}) $B$H30It%i%$%V%i%j(B @samp{ssl.el} $B$,I,MW$G(B
-$B$9!#(B
-@item
-@dfn{starttls:} STARTTLS (@acronym{SSL} $B$KN`;w(B) $B$r;H$$$^$9!#30It%i%$%V%i(B
-$B%j(B @samp{starttls.el} $B$H(B @samp{starttls} $B%W%m%0%i%`$,I,MW$G$9!#(B
-@samp{starttls}.
-@end itemize
+@table @code
+@item ssl
+@acronym{SSL} $B$r;H$$$^$9!#(BOpenSSL (@samp{openssl} $B%W%m%0%i(B
+$B%`(B) $B$+(B SSLeay (@samp{s_client}) $B$H30It%i%$%V%i%j!<(B @samp{ssl.el} $B$,I,MW(B
+$B$G$9!#(B
+
+@item tls
+STARTTLS (@acronym{SSL} $B$KN`;w(B) $B$r;H$$$^$9!#30It%i%$%V%i(B
+$B%j!<(B @samp{starttls.el} $B$H(B @samp{starttls} $B%W%m%0%i%`$,I,MW$G$9!#(B
+@end table
 
 @item :leave
 $BHs(B-@code{nil} $B$G%a!<%k$r%5!<%P!<$K;D$7!"%a%C%;!<%8$Nl9g!"(B
-@code{pop3-leave-mail-on-server} $B$,Hs(B-@code{nil} $B$@$C$?$i!"%a!<%k$OuBV$N>pJs$r0];}$7$^$;$s!#%/%i%$%"%s%H$,?.Mj$G$-$k>pJs$O%/%i%$(B
-$B%"%s%H$=$N$b$N$K$"$j$^$9$,!"pJs$r0];}$7$J$$>l9g$O!"$9$Y$F$,Jx2u(B
-$B$7$F!"$"$J$?$O2u$l$?%a!<%k%\%C%/%9$H$H$b$KCV$-5n$j$K$J$k2DG=@-$,$"$j$^$9!#(B
+@code{:program} $B$H(B @code{:function} $B%-!<%o!<%I$,;XDj$5$l$F$$$J$$>l9g(B
+$B$O(B @code{pop3-movemail} $B$,;H$o$l$^$9!#(B@code{pop3-movemail} $B$r;H$&>l9g(B
+$B$K(B @code{pop3-leave-mail-on-server} $B$,Hs(B-@code{nil} $B$@$C$?$i!"%a!<%k$OuBV$N>pJs$r0];}$7$J$$$N$G!"$=$3$K$"$k%/%i(B
+$B%$%"%s%H$,?.Mj$G$-$k>pJs$H!"$G!"=i4|(B @acronym{POP} $B%5!<%P!<$+$i(B
-$B$r;H$C$F!"%G%#%U%)%k%H$N(B @acronym{POP} $B%5!<%P!<$+(B
+$B$i$5$l$?%5!<%P!<$+$i;XL>$5$l$?MxMQ$7$?%5!<%P!<$+$i!";XL>$7$?MxMQ$l$N%U%!%$%k$,(B
-$B@53N$K(B 1 $B%a!<%k$H$J$C$F$$$^$9!#(B
+Maildir $B$+$i%a!<%k$r/$J$/$H$b(B qmail $B$H(B postfix $B$K$h$C(B
+$B$F%5%]!<%H$5$l$F$$$k%a!<%k%\%C%/%9$N7A<0$G!"FCJL$N%G%#%l%/%H%j!<$K$"$k$=(B
+$B$l$>$l$N%U%!%$%k$O!"87L)$K0lDL$N%a!<%k$r4^$s$G$$$^$9!#(B
 
 $B%-!<%o!<%I(B:
 
 @table @code
 @item :path
-$B%a!<%k$,J]B8$5$l$k%G%#%l%/%H%j!<$NL>A0$G$9!#=i4|CM$O4D6-JQ(B
+$B%a!<%k$,J]B8$5$l$k%G%#%l%/%H%j!<$NL>A0$G$9!#%G%#%U%)%k%H$O4D6-JQ(B
 $B?t(B @env{MAILDIR} $B$+$ie$G%a!<%k$rFI$`%W%m%H%3(B
-$B%k$H$7$F07$$$?$/$J$$$H$-$O!"(Bgnus $B$G$O(B @acronym{POP} $B%5!<%P!<$HF1MM$K07$&(B
-$B$3$H$,$G$-!"M?$($i$l$?(B @acronym{IMAP} $B%a!<%k%\%C%/%9$+$i5-;v$r\$7$/$O(B @xref{IMAP} $B$r;2>H$7$F2<$5$$!#(B
+@acronym{IMAP} $B%5!<%P!<$+$i%a!<%k$re$G%a!<%k$rFI$`%W%m(B
+$B%H%3%k$H$7$F$O(B ($B$9$J$o$A(B @code{nnimap} $B$G(B) $B;H$$$?$/$J$$$H$-$O!"(Bgnus $B$G(B
+$B$O(B @acronym{POP} $B%5!<%P!<$HF1MM$K07$C$F!";XDj$5$l$?(B @acronym{IMAP} $B%a!<(B
+$B%k%\%C%/%9$+$i5-;v$r\$7$/$O(B @ref{IMAP} $B$r;2>H$7(B
+$B$F2<$5$$!#(B
 
 Kerberos, GSSAPI, @acronym{TLS}/@acronym{SSL} $B$*$h$S(B STARTTLS $B$N$?$a$N30(B
-$BIt%W%m%0%i%`$H%i%$%V%i%j$,I,MW$G$"$k$3$H$KN10U$7$F2<$5$$!#(B@xref{IMAP}.
+$BIt%W%m%0%i%`$H%i%$%V%i%j!<$,I,MW$G$"$k$3$H$KN10U$7$F2<$5$$!#(B@xref{IMAP}.
 
 $B%-!<%o!<%I(B:
 
 @table @code
 @item :server
-@acronym{IMAP} $B%5!<%P!<$NL>A0!#=i4|CM$O4D6-JQ?t(B @env{MAILHOST} $B$+$iF@$^(B
-$B$9!#(B
+@acronym{IMAP} $B%5!<%P!<$NL>A0!#%G%#%U%)%k%H$O4D6-JQ?t(B @env{MAILHOST} $B$+(B
+$B$iF@$^$9!#(B
 
 @item :port
-@acronym{IMAP} $B%5!<%P!<$N%]!<%HHV9f!#IaDL$O=i4|CM$O(B @samp{143} $B$G!"(B
+@acronym{IMAP} $B%5!<%P!<$N%]!<%HHV9f!#IaDL$O%G%#%U%)%k%H$O(B @samp{143} $B$G!"(B
 @acronym{TLS}/@acronym{SSL} $B@\B3$K$O(B @samp{993} $B$G$9!#(B
 
 @item :user
-@acronym{IMAP} $B%5!<%P!<$KEO$9MxMQ$G$9!#=i4|CM$O%m%0%$%sL>$G$9!#(B
+@acronym{IMAP} $B%5!<%P!<$KEO$9MxMQ$G$9!#%G%#%U%)%k%H$O%m%0%$%sL>$G$9!#(B
 
 @item :password
 @acronym{IMAP} $B%5!<%P!<$KEO$9%Q%9%o!<%I$G$9!#;XDj$5$l$F$$$J$$$H$-$O!"Mx(B
-$BMQu$G$O(B @samp{gssapi},
 @samp{kerberos4}, @samp{starttls}, @samp{tls}, @samp{ssl},
-@samp{shell} $B$^$?$O=i4|CM$N(B @samp{network} $B$K$J$j$^$9!#(B
+@samp{shell} $B$^$?$O%G%#%U%)%k%H$N(B @samp{network} $B$K$J$j$^$9!#(B
 
 @item :authentication
-$B%5!<%P!<$G$NG'>Z$K$I$NG'>ZK!$r;H$&$+!#$3$l(B
-$B$O(B @code{imap-authenticator-alist} $B$N%7%s%\%k$N0l$D$r@_Dj$7$^$9!#8=>u$G(B
-$B$O(B @samp{gssapi}, @samp{kerberos4}, @samp{digest-md5}, @samp{cram-md5},
-@samp{anonymous} $B$^$?$O=i4|CM$N(B @samp{login} $B$K$J$j$^$9!#(B
+$B%5!<%P!<$G$NG'>Z$K$I$NG'>ZK!$r;H$&$+!#$3$l$K(B
+$B$O(B @code{imap-authenticator-alist} $B$GDj5A$5$l$F$$$k%7%s%\%k$N0l$D$r@_Dj(B
+$B$7$^$9!#8=>u$G$O(B @samp{gssapi}, @samp{kerberos4}, @samp{digest-md5},
+@samp{cram-md5}, @samp{anonymous} $B$^$?$O%G%#%U%)%k%H$N(B @samp{login} $B$K$J(B
+$B$j$^$9!#(B
 
 @item :program
 :stream $B$K(B `shell' $B$,@_Dj$5$l$F$$$k$H$-$O!"$3$NCM$,JQ(B
 $B?t(B @code{imap-shell-program} $B$K3d$jEv$F$i$l$^$9!#$3$l$O(B @code{format} $B$U(B
-$B$&$NJ8;zNs(B ($B$^$?$OJ8;zNs$N%j%9%H(B) $B$G$J$1$l$P$J$j$^$;$s!#Nc$r<($7$^$7$g$&!#(B
+$B$&$NJ8;zNs(B ($B$^$?$OJ8;zNs$N%j%9%H(B) $B$G$J$1$l$P$J$j$^$;$s!#Nc$r<($7$^$7$g$&(B:
 
 @example
 ssh %s imapd
 @end example
 
-$BM-8z$J(B format $B;X<(;R$O0J2<$NDL$j$G$9!#(B
+$BM-8z$J=qK!;EMM;X<(;R$O0J2<$NDL$j$G$9!#(B
 
 @table @samp
 @item s
 $B%5!<%P!<$NL>A0!#(B
 
 @item l
-@code{imap-default-user} $B$G@_Dj$5$l$?%f!<%6L>!#(B
+@code{imap-default-user} $B$G@_Dj$5$l$?MxMQ!#(B
 
 @item p
 $B%5!<%P!<$N%]!<%HHV9f!#(B
@@ -13012,22 +13375,23 @@ ssh %s imapd
 $B$3$l$i$N;XDj$K;H$o$l$kCM$O!"BP1~$9$k%-!<%o!<%I$KM?$($?CM$+$iA0!#=i4|CM$O(B @samp{INBOX} $B$G!"$3$l$OIa(B
-$BDL$OF~$C$F$/$k%a!<%k$rA0!#%G%#%U%)%k%H$O(B @samp{INBOX} $B$G!"$3(B
+$B$l$OIaDL$OF~$C$F$/$k%a!<%k$rC5n$N0u$rIU$1$^$9$,!"B>$K(B @samp{\Seen} $B$G$OC1$K4{FI$N0u$rIU$1$^$9!#(B
-$B$3$l$i$O:G$b$"$j$=$&$JFs$D$NA*Br$G$9$,!"B>$N0u$b(B RFC2060 $B$N(B 2.3.2 $B@a$GDj(B
-$B5A$5$l$F$$$^$9!#(B
+$B%5!<%P!<$G!"C5n$N%U%i%0$rIU$1$^$9$,!"C1$K4{FI$N%U%i%0(B
+$B$rIU$1$k$?$a$N(B @samp{\Seen} $B$,Be0F$K$J$k$G$7$g$&!#$3$l$i$O:G$b$"$j$=$&$J(B
+$BFs$D$NA*Br$G$9$,!"B>$N%U%i%0$b(B RFC2060 $B$N(B 2.3.2 $B@a$GDj5A$5$l$F$$$^$9!#(B
 
 @item :dontexpunge
 @code{nil} $B$G$J$+$C$?$i!"5-;v$rC5n$N0u$,IU$$$F$$(B
@@ -13056,19 +13420,19 @@ UNDELETED} $B$O$*$=$i$/$?$$$F$$$N?M$K$O:GNI$NA*Br$G$7$g$&$,!"$H$-$I(B
 
 @table @code
 @item :subtype
-$B%&%'%V%a!<%k%5!<%P!<$N7?$G$9!#=i4|CM$O(B @code{hotmail} $B$G$9!#B>$N8uJd(B
-$B$O(B @code{netscape}, @code{netaddress}, @code{my-deja} $B$G$9!#(B
+$B%&%'%V%a!<%k%5!<%P!<$N7?$G$9!#%G%#%U%)%k%H$O(B @code{hotmail} $B$G$9!#B>$N8u(B
+$BJd$K$O(B @code{netscape}, @code{netaddress}, @code{my-deja} $B$,$"$j$^$9!#(B
 
 @item :user
-$B%&%'%V%a!<%k%5!<%P!<$NMxMQ$G$9!#=i4|CM$O%m%0%$%sL>$G$9!#(B
+$B%&%'%V%a!<%k%5!<%P!<$KEO$9MxMQ$G$9!#%G%#%U%)%k%H$O%m%0%$%sL>$G$9!#(B
 
 @item :password
-$B%&%'%V%a!<%k%5!<%P!<$N%Q%9%o!<%I$G$9!#;XDj$7$J$$>l9g$O!"MxMQl9g$O!"MxMQuBV(B) $B$G$"$C$F$b%a!<%k$rl9g$KJXMx$G$9!#(B
+$B$3$&$7$F$*$/$3$H$K$h$C$F(B unplugged $B$G$"$C$F$b(B gnus $B$O%a!<%k$rl9g$KJXMx$G$9!#(B
 @end table
 @end table
 
 @subsubsection $B4X?t%$%s%?!<%U%'!<%9(B
 
 $B>e5-$N$$$/$D$+$N%-!<%o!<%I$O!"$l$N%-!<%o!<%I(B @code{:foo} $B$NCM$H$7(B
-$B$F(B Lisp $BJQ?t(B @code{foo} $B$,;H$o$l$^$9!#Nc$($P!"0J2<$N%a!<%k%=!<%9$N@_DjNc(B
-$B$K$D$$$F9M$($F$_$F2<$5$$!#(B
+$B$,$l$N%-!<%o!<%I(B @code{:foo} $B$KBP$7(B
+$B$F(B Lisp $BJQ?t(B @code{foo} $B$,!"$=$N%-!<%o!<%I$NCM$KB+G{$5$l$^$9!#Nc$($P!"0J(B
+$B2<$N%a!<%k%=!<%9$N@_DjNc$K$D$$$F9M$($F$_$F2<$5$$!#(B
 
 @lisp
 (setq mail-sources '((pop :user "jrl"
@@ -13117,36 +13481,36 @@ UNDELETED} $B$O$*$=$i$/$?$$$F$$$N?M$K$O:GNI$NA*Br$G$7$g$&$,!"$H$-$I(B
 @end lisp
 
 $B4X?t(B @code{fetchfunc} $B$,$l$N7?$N%a!<%k%=!<%9$N$?$a$N%-!<%o!<%I$N%j%9%H$K$D$$$F$O!">e5-$r;2(B
-$B>H$7$F2<$5$$!#(B
+$B$=$l$>$l$N7?$N%a!<%k%=!<%9$N$?$a$N%-!<%o!<%I$N%j%9%H$K$D$$$F$O!"A0=R$N@b(B
+$BL@$r;2>H$7$F2<$5$$!#(B
 
 @node Mail Source Customization
 @subsubsection $B%a!<%k%=!<%9$N%+%9%?%^%$%:(B
 
-$B0J2<$O%a!<%k$Nl=j$G$9!#=i4|CM(B
+$B%a!<%k$,!"$=$l$r=hM}$7$F$$$k4|4VCf$K3JG<$5$l$F$$$k>l=j$G$9!#%G%#%U%)%k%H(B
 $B$O(B @file{~/.emacs-mail-crash-box} $B$G$9!#(B
 
 @item mail-source-delete-incoming
 @vindex mail-source-delete-incoming
-@code{nil} $B$G$J$1$l$P!"F~$C$FMh$?%U%!%$%k$O!"$=$l$r=hM}$7$?8e$K>C5n$5$l(B
-$B$^$9!#(B@code{t} $B$G$O%U%!%$%k$r$?$@$A$K>C5n$7!"(B@code{nil} $B$G$O$$$+$J$k%U%!(B
-$B%$%k$b>C$7$^$;$s!#@5$N?t$@$C$?>l9g$O!"$=$NF|?t0J>e$K8E$$%U%!%$%k$r>C5n$7(B
-$B$^$9(B ($B$3$l$O?7Ce%a!<%k$rC5n$7$^$9!#(B@code{t} $B$G$O%U%!%$%k$r$?$@$A$K>C5n$7!"(B
+@code{nil} $B$G$O$$$+$J$k%U%!%$%k$b>C$7$^$;$s!#@5$N?t$@$C$?>l9g$O!"$=$NF|(B
+$B?t0J>e$K8E$$%U%!%$%k$r>C5n$7$^$9(B ($B>C5n$O?7Ce%a!<%k$rl9g!"F~$C$F$-$?%U%!%$%k$,J]B8$5$l$k>l=j$N;XDj$G$9!#(B
+$BF~$C$F$-$?%a!<%k%=!<%9$N%U%!%$%k$,(B ($B$b$7$"$l$P(B) $B3JG<$5$l$k%G%#%l%/%H%j!<(B
+$B$G$9!#%G%#%U%)%k%H$O(B @file{~/Mail/} $B$G$9!#8=;~E@$G$3$l$,;H$o$l$kM#0l$N$b(B
+$B$N$O!"JQ?t(B @code{mail-source-delete-incoming} $B$,(B @code{nil} $B$^$?$O?tCM$G(B
+$B$"$C$?>l9g$K!"F~$C$F$-$?%a!<%k$r3JG<$9$k%U%!%$%k$NCV$->l=j$N;XDj$G$9!#(B
 
 @item mail-source-incoming-file-prefix
 @vindex mail-source-incoming-file-prefix
-$BF~$C$F$-$?%a!<%k$rJ]B8$9$k%U%!%$%k$N%W%l%U%#%C%/%9$G$9!#=i4|CM(B
-$B$O(B @file{Incoming} $B$G!"$3$N>l9g%U%!%$%k(B
+$BF~$C$F$-$?%a!<%k$r0l;~E*$K3JG<$9$k%U%!%$%k$NL>A0$N@\F,8l$G$9!#%G%#%U%)%k(B
+$B%H$O(B @file{Incoming} $B$G!"$3$N>l9g%U%!%$%k(B
 $B$O(B @file{Incoming30630D_} $B$d(B @file{Incoming298602ZD} $B$N$h$&$K$J$j$^$9!#(B
-@code{mail-source-delete-incoming} $B$,(B @code{nil} $B$N>l9g$@$1$G$9$,!#(B
+$B$3$l$,K\Ev$K4X78$9$k$N(B
+$B$O(B @code{mail-source-delete-incoming} $B$,(B @code{nil} $B$^$?$O?tCM$N>l9g$@$1(B
+$B$9$,!#(B
 
 @item mail-source-default-file-modes
 @vindex mail-source-default-file-modes
-$BA4$F$N?7$7$$%a!<%k%U%!%$%k$O$3$N%U%!%$%k%b!<%I$K$J$j$^$9!#=i4|CM(B
+$B$9$Y$F$N?7$7$$%a!<%k%U%!%$%k$O$3$N%U%!%$%k%b!<%I$K$J$j$^$9!#%G%#%U%)%k%H(B
 $B$O(B 384 $B$G$9!#(B
 
 @item mail-source-movemail-program
 @vindex mail-source-movemail-program
-$BHs(B-@code{nil} $B$@$C$?$i?7Ce%a!<%k$NA0!#(B
-@code{nil} $B$@$C$?$i(B @var{exec-directory} $B$K$"$k(B @code{movemail}$B!#(B
+@code{nil} $B$G$J$+$C$?$i!"?7Ce%a!<%k$rA0$G$"(B
+$B$k$H2re$2(B
-$B$F!"%[!<%`%G%#%l%/%H%j!<$KJ|$jEj$2$^$9!#$"$J$?$,%a!<%k%P%C%/%(%s%I$r;H$C(B
-$B$F$$$J$$>l9g$O!"(Bgnus $B$O0lDL$b%a!<%k$r0\F0$7$^$;$s(B---$B:G=i$KKbK!$N8F$S=P$7(B
-$B$r$?$/$5$s$7$J$1$l$P$J$j$^$;$s!#$^$:8^3Q7A$rIA$-!"O9?$$K2P$rIU$1!";3MS$r(B
-$B@8$1lS$H$7$FJ{$2=*$($?8e$G!"(Bgnus $B$,$"$J$?$N%a!<%k$r0\F0$7$F$bK\Ev$K$"$^(B
-$B$j6C$$$F$O$$$1$^$;$s!#(B
+$B$"$J$?$,%a!<%k%P%C%/%(%s%I$r;H$&$H$-!"(Bgnus $B$O$9$Y$F$N%a!<%k$r(B inbox $B$+$i(B
+$B5[$$>e$2$F%[!<%`%G%#%l%/%H%j!<$KJ|$j9~$_$^$9!#$"$J$?$,%a!<%k%P%C%/%(%s%I(B
+$B$r;H$C$F$$$J$$$H$-$O!"(Bgnus $B$O0lDL$b%a!<%k$r0\F0$7$^$;$s(B---$B$=$&$$$&>l9g$K(B
+$B$O!":G=i$K$?$/$5$s$NKbK!$r>'$($J$1$l$P$J$j$^$;$s!#$^$:8^K'@1$rIA$-!"O9?$(B
+$B$rEt$7!";3MS$r@8$1lS$H$7$FJ{$2=*$($?8e$K$O!"(Bgnus $B$,$"$J$?$N%a!<%k$r0\F0(B
+$B$7$?$H$7$F$b!"$"$J$?$Ol9g(B) $BA4$F$N0c$C$?%a!<%k%P%C%/%(%s%I$K4XO"$7$^(B
-$B$9!#(B
+$B$3$l$i$NJQ?t(B ($B$N$[$H$s$I(B) $B$O!"$9$Y$F$N$5$^$6$^$J%a!<%k%P%C%/%(%s%I$K4XO"(B
+$B$7$^$9!#(B
 
 @table @code
 @vindex nnmail-read-incoming-hook
 @item nnmail-read-incoming-hook
-$B%a!<%k%P%C%/%(%s%I$O?7$7$$%a!<%k$rFI$_9~$s$@8e$K$3$N%U%C%/$r8F$S$^$9!#$b(B
-$B$7$=$&$7$?$$$H;W$&$J$i!"$3$N%U%C%/$r%a!<%k4F;k%W%m%0%i%`$KCN$i$;$k$?$a$K(B
-$B;H$&;v$,$G$-$^$9!#(B
+$B$9$Y$F$N%a!<%k%P%C%/%(%s%I$O!"?7$7$$%a!<%k$rFI$_9~$s$@8e$K$3$N%U%C%/$r8F(B
+$B$S$^$9!#$=$&$7$?$1$l$P!"2?$+$N%a!<%k4F;k%W%m%0%i%`$KCN$i$;$k$?$a$K$3$N%U%C(B
+$B%/$r;H$&$3$H$,$G$-$^$9!#(B
 
 @vindex nnmail-split-hook
 @item nnmail-split-hook
 @findex gnus-article-decode-encoded-words
-@cindex RFC1522 decoding
-@cindex RFC2047 decoding
-$B$=$l$>$l$N%a%C%;!<%8$,$=$N%X%C%@!<$K4p$E$$$FJ,3d$,$J$5$l$kD>A0$K$=$l$,J](B
-$BB8$5$l$F$$$k%P%C%U%!$GC5n$5$l!"%P%C%U%!$G9T$o$l$?JQ99$O$I$N%U%!%$%k$K$b8=$l$^$;(B
-$B$s!#(B@code{gnus-article-decode-rfc1522} $B$,$3$N%U%C%/$K2C$($k;v$,E,@Z$J4X(B
-$B?t$N0l$D$G$9!#(B
+@cindex RFC 1522 decoding
+@cindex RFC 2047 decoding
+$B$=$l$>$l$N%a%C%;!<%8$,$=$N%X%C%@!<$K4p$E$$$FJ,3d$,$J$5$l$kD>A0$K!"$=$l$,(B
+$B3JG<$5$l$F$$$k%P%C%U%!!<$GA0$K(B
-$B8F$P$l$^$9(B) $B$H(B @code{nnmail-post-get-new-mail-hook} ($B$3$l$O%a!<%k$N07$$(B
-$B$,=*$o$C$?$H$-$K8F$P$l$^$9(B) $B$G$9!#A0(B
+$B$K8F$P$l!"(B@code{nnmail-post-get-new-mail-hook} $B$O%a!<%k$N07$&=hM}$,=*$o$C(B
+$B$?$H$-$K8F$P$l$^$9!#0J2<$O$3$l$i$NFs$D$N%U%C%/$r;H$C$F!"?7$7$$%a!<%k$N%U%!(B
+$B%$%k$N%U%!%$%k%b!<%I$rJQ99$9$kNc$G$9(B:
 
 @lisp
 (add-hook 'nnmail-pre-get-new-mail-hook
@@ -13270,28 +13639,28 @@ UNDELETED} $B$O$*$=$i$/$?$$$F$$$N?M$K$O:GNI$NA*Br$G$7$g$&$,!"$H$-$I(B
 @item nnmail-use-long-file-names
 @vindex nnmail-use-long-file-names
 @code{nil} $B$G$J$$$J$i!"%a!<%k%P%C%/%(%s%I$OD9$$%U%!%$%kL>$H%G%#%l%/%H%j!<(B
-$BL>$r;H$$$^$9!#(B@samp{mail.misc} $B$N$h$&$J%0%k!<%WL>$O(B @file{mail.misc} $B$H(B
-$B$$$&%G%#%l%/%H%j!<(B (@code{nnml} $B%P%C%/%(%s%I$,;H$o$l$F$$$k$H$_$J$9$H(B) $B$+(B
-$B%U%!%$%k(B (@code{nnfolder} $B%P%C%/%(%s%I$,;H$o$l$F$$$k$H$_$J$9$H(B) $B$H$$$&7k(B
-$B2L$K$J$j$^$9!#$b$7$=$l$,(B @code{nil} $B$G$"$k$J$i!"F1$8%0%k!<%W(B
-$B$O(B @file{mail/misc} $B$H$$$&7k2L$K$J$j$^$9!#(B
+$BL>$r;H$$$^$9!#(B@samp{mail.misc} $B$N$h$&$J%0%k!<%W$O(B @file{mail.misc} $B$H$$(B
+$B$&D9$$L>A0$N%G%#%l%/%H%j!<$+%U%!%$%k$K<}$a$i$l$^$9(B (@code{nnml} $B%P%C%/%((B
+$B%s%I$N>l9g$O%G%#%l%/%H%j!l9g$O%U%!%$%k(B
+$B$G$9(B)$B!#(B@code{nil} $B$@$C$?$i!"F1$8%0%k!<%W$O(B @file{mail/misc} $B$K<}$a$i$l$^(B
+$B$9!#(B
 
 @item nnmail-delete-file-function
 @vindex nnmail-delete-file-function
 @findex delete-file
-$B%U%!%$%k$r>C5n$9$k$?$a$K8F$P$l$k4X?t$G$9!#=i4|CM(B
+$B%U%!%$%k$r>C5n$9$k$?$a$K8F$P$l$k4X?t$G$9!#%G%#%U%)%k%H(B
 $B$O(B @code{delete-file} $B$G$9!#(B
 
 @item nnmail-cache-accepted-message-ids
 @vindex nnmail-cache-accepted-message-ids
-@code{nil} $B$G$J$$$H!"%P%C%/%(%s%I$KF~$C$FMh$?5-;v(B ($BNc$($P!"(B@code{Gcc} $B$K(B
-$B$h$C$F(B) $B$N(B @code{Message-ID} $B$r%a!<%k=EJ#H/8+%U%!%$%k$KF~$l$^$9!#%G%#%U%)(B
-$B%k%H$O(B @code{nil} $B$G$9!#(B
+@code{nil} $B$G$J$$$H!"%P%C%/%(%s%I$K(B ($BNc$($P(B @code{Gcc} $B$K$h$C$F(B) $BF~$C$F(B
+$BMh$?5-;v$N(B @code{Message-ID} $B$r!"%a!<%k$N=EJ#$rH/8+$9$k$?$a$N%-%c%C%7%e(B
+$B$KF~$l$^$9!#%G%#%U%)%k%H$O(B @code{nil} $B$G$9!#(B
 
 @item nnmail-cache-ignore-groups
 @vindex nnmail-cache-ignore-groups
-$B@55,I=8=$+@55,I=8=$N%j%9%H$G$9!#@55,I=8=$K%0%k!<%WL>$,%^%C%A$9$k(B
-$B$H(B @code{Message-ID} $B%-%c%C%7%e$K5-O?$5$l$^$;$s!#(B
+$B@55,I=8=$+@55,I=8=$N%j%9%H$G$9!#L>A0$,$I$l$+$N@55,I=8=$K9gCW$9$k%0%k!<%W(B
+$B$N5-;v$O!"(B@code{Message-ID} $B%-%c%C%7%e$K5-O?$5$l$^$;$s!#(B
 
 $BNc$($PFC5iJ,3d(B (@pxref{Fancy Mail Splitting}) $B$r4X(B
 $B?t(B @code{nnmail-split-fancy-with-parent} $B$H$H$b$K;H$C$F$$$k>l9g$KLrN)$D(B
@@ -13303,77 +13672,95 @@ UNDELETED} $B$O$*$=$i$/$?$$$F$$$N?M$K$O:GNI$NA*Br$G$7$g$&$,!"$H$-$I(B
 @cindex mail splitting
 @cindex fancy mail splitting
 
+@quotation
+$BLuCm(B: @dfn{Fancy} $B$H$$$&C18l$O!"AOB$E*!"6uA[E*!"5$$^$0$l$J!"9%$-$J!"GIeEy$J!"6K>e$N!"JQ$o$j$`;v$,$G$-$J$$>l9g!"(B
-@code{nnmail-split-methods} $B$r(B @code{nnmail-split-fancy} $B$K@_Dj$9$k;v$,(B
-$B$G$-$^$9!#$=$l$+$iJQ?t(B @code{nnmail-split-fancy} $B$GM7$V;v$,$G$-$^$9!#(B
+$BHf3SE*C1=c$J!"I8=`$N%a!<%kJ,3d;XDj$NJ}K!$G$O;W$$DL$j$K$J$i$J$$$J$i$P!"(B
+@code{nnmail-split-methods} $B$r(B @code{nnmail-split-fancy} $B$K@_Dj$9$k$HNI(B
+$B$$$G$7$g$&!#$=$&$9$k$H!"JQ?t(B @code{nnmail-split-fancy} $B$GM7$V$3$H$,$G$-(B
+$B$k$h$&$K$J$j$^$9!#(B
 
 $B$^$:$3$NJQ?t$NCM$NNc$r8+$F$_$^$7$g$&(B:
 
 @lisp
-;; @r{$B%a!<%k%G!<%b%s(B (mailer deamon) $B$OIaDL$N%0%k!<%W$K$OAj8_Ej9F$5$l$^(B}
-;; @r{$B$;$s!#7Y9p$OK\Ev$N%(%i!<$H$O0c$C$?%0%k!<%W$KF~$l$i$l$^$9!#(B}
+;; @r{$B%a%$%i!<%G!<%b%s$+$iAw$i$l$?%a%C%;!<%8$,!"IaDL$N%0%k!<%W$K%/%m%9(B}
+;; @r{$B%]%9%H$5$l$J$$$h$&$K$7$^$9!#7Y9p$OK\Ev$N%(%i!<$H$O0c$C$?%0%k!<%W(B}
+;; @r{$B$KF~$l$^$9!#(B}
 (| ("from" mail (| ("subject" "warn.*" "mail.warning")
                    "mail.misc"))
-   ;; @r{$B%(%i!<$G$J$$%a%C%;!<%8$OA4$F$N4XO"$7$?%0%k!<%W$KAj8_Ej9F$5$l$^(B}
-   ;; @r{$B$9$,!"(B(ding) $B%j%9%H$HB>$N(B (ding) $B4XO"$N%a!<%k$N$?$a$N%0%k!<%W$K(B}
-   ;; @r{$B$OAj8_Ej9F$7$^$;$s!#(B}
+   ;; @r{$B%(%i!<$G$J$$%a%C%;!<%8$O$9$Y$F$N4XO"$9$k%0%k!<%W$K%/%m%9%]%9%H(B}
+   ;; @r{$B$7$^$9$,!"(B(ding) $B%a!<%j%s%0%j%9%H$HB>$N(B (ding) $B4XO"$N%a!<%k$N(B}
+   ;; @r{$B$?$a$N%0%k!<%W$K$O%/%m%9%]%9%H$7$^$;$s!#(B}
    (& (| (any "ding@@ifi\\.uio\\.no" "ding.list")
          ("subject "ding" "ding.misc"))
       ;; @r{$BB>$N%a!<%j%s%0%j%9%H(B@dots{}}
       (any "procmail@@informatik\\.rwth-aachen\\.de" "procmail.list")
       (any "SmartList@@informatik\\.rwth-aachen\\.de" "SmartList.list")
-      ;; @r{$B0J2<$N$I$A$i$N%a!<%j%s%0%j%9%H$bF1$8@\F,<-$J$N$G!"(Bbugs-}
-      ;; @r{$B$@$1$KEj9F$5$l$?$b$N$,(B mypkg.list $B$KAj8_Ej9F$5$l$J$$$h(B}
-      ;; @r{$B$&$K$7$F$$$^$9!#$7$+$7K\Ev$KAj8_Ej9F$5$l$?5-;v$rAj8_Ej9F(B}
-      ;; @r{$B$9$k$3$H$O5v$7$F$$$^$9!#(B}
+      ;; @r{$B0J2<$N$I$A$i$N%a!<%j%s%0%j%9%H$bF1$8@\Hx8l$J$N$G!"(Bbugs- $B$@(B}
+      ;; @r{$B$1$KEj9F$5$l$?$b$N$,(B mypkg.list $B$K%/%m%9%]%9%H$5$l$J$$$h$&(B}
+      ;; @r{$B$K$7$F$$$^$9!#$7$+$7K\Ev$K%/%m%9%]%9%H$5$l$?5-;v$r%/%m%9%](B}
+      ;; @r{$B%9%H$9$k$3$H$O$G$-$k$h$&$K$J$C$F$$$^$9!#(B}
       (any "bugs-mypackage@@somewhere" "mypkg.bugs")
       (any "mypackage@@somewhere" - "bugs-mypackage" "mypkg.list")
       ;; @r{$B?M!9(B@dots{}}
       (any "larsi@@ifi\\.uio\\.no" "people.Lars_Magne_Ingebrigtsen"))
-   ;; @r{$B9gCW$7$J$+$C$?%a!<%k$OA4$F$rJa$^$($k%0%k!<%W$X9T$-$^$9!#(B}
+   ;; @r{$B9gCW$7$J$+$C$?%a!<%k$O$9$Y$F$rJa$^$($k%0%k!<%W$X9T$-$^$9!#(B}
    "misc.misc")
 @end lisp
 
-$B$3$NJQ?t$O(B @dfn{$BJ,3d(B} $B$NMM<0$K$J$C$F$$$^$9!#J,3d$O(B ($B$"$k$$$O(B) $B$=$l$>$l$N(B
-$BJ,3d$,B>$NJ,3d$r4^$`:F5"E*9=B$$G$9!#$3$l$O;HMQ2DG=$JJ,3d9=J8$G$9(B:
+$B$3$NJQ?t$O!VJ,3d!W$NMM<0$K$J$C$F$$$^$9!#J,3d$O(B ($B$3$H$K$h$k$H(B) $B$=$l$>$l$N(B
+$BJ,3d$,B>$NJ,3d$r4^$`:F5"E*9=B$$G$9!#0J2<$O;H$&$3$H$,$G$-$kJ,3d$N9=J8$G$9(B:
 
 @table @code
-
 @item group
-$B$b$7J,3d$,J8;zNs$G$"$k$H!"$=$l$O%0%k!<%WL>$H$7$F$_$J$5$l$^$9!#IaDL$N@55,(B
-$BI=8=$N9gCW$,$J$5$l$^$9!#Nc$O2<$NJ}$r8+$F2<$5$$!#(B
-
-@item (@var{field} @var{value} [- @var{restrict} [@dots{}] ] @var{split})
-$B$b$7J,3d$,%j%9%H$G!":G=i$NMWAG$,J8;zNs$G$"$j!"%X%C%@!<(B @var{field} ($B@55,(B
-$BI=8=(B) $B$,(B @var{value} ($B$3$l$b@55,I=8=(B) $B$r4^$s$G$$$k>l9g!"%a%C%;!<%8(B
-$B$r(B @var{split} $B$G;XDj$5$l$?$H$3$m$KC_@Q$7$^$9!#(B@var{restrict} ($B$^$?B>$N(B
-$B@55,I=8=(B) $B$,(B @var{field} $B$N8e$G!"9gCW$7$?(B @var{value} $B$N:G8e$NA0$N$$$/$D(B
-$B$+$NJ8;zNs$K9gCW$7$?$i!"(B@var{split} $B$OL5;k$5$l$^$9!#(B@var{restrict} $B$NJD(B
-$BJq$N$I$l$b$,9gCW$7$J$1$l$P(B @var{split} $B$,$G$"$k$H$_$J$5$l$^$9!#DL>o$N@55,I=(B
+$B8=$NE83+$,9T$J$o$l$^$9!#8e=R$NNc(B ($BLuCm(B: @samp{\\&},
+@samp{\\1}$B!A(B@samp{\\9}) $B$r8+$F2<$5$$!#(B
+
+@c $B$3$N9T$r@^$jJV$5$J$$$G2<$5$$!#(B
+@item (@var{field} @var{value} [- @var{restrict} [@dots{}] ] @var{split} [@var{invert-partial}])
+$B$3$NJ,3d$O>/$J$/$H$b;0$D$NMWAG$r4^$s$G$$$kI,MW$,$"$j$^$9!#:G=i$NMW(B
+$BAG(B @var{field} ($B@55,I=8=(B) $B$K9gCW$9$k%X%C%@!<$,(B @var{value} ($B$3$l$b@55,I=(B
+$B8=(B) $B$K9gCW$9$kJ8;zNs$r4^$s$G$$$?$J$i$P!"(B@var{split} $B$G;XDj$5$l$?%0%k!<%W(B
+$B$K%a%C%;!<%8$r3JG<$7$^$9!#(B
+
+@var{field} $B$N8e$K$"$C$F!"$7$+$b9gCW$7$?(B @var{value} $B$N:G8eHx$h$jA0$K$"(B
+$B$k2?$+$NJ8;zNs$K(B @var{restrict} ($B$3$l$b$^$?@55,I=8=(B) $B$,9gCW$7$?$i!"(B
+@var{split} $B$OL5;k$5$l$^$9!#$$$/$D$+$N(B @var{restrict} $B$N$I$l$b$,9gCW$7$J(B
+$B$1$l$P(B @var{split} $B$,JN,$5$l$F$$$J$/$F!"$7(B
+$B$+$bCM$,(B @code{nil} $B$G$J$1$l$P!"8l(B (word) $B$N6-3&$r$^$?$$$G@55,I=8=$N9gCW(B
+$B$r9T$J$&$+$I$&$+$N?6$kIq(B
+$B$$(B (@code{nnmail-split-fancy-match-partial-words} $BJQ?t$K$h$C$F@)8f$5$l$^(B
+$B$9(B; $B2<5-;2>H(B) $B$,H?E>$7$^$9!#(B(Gnus 5.10.7 $B$N?75!G=(B)
 
 @item (| @var{split} @dots{})
-$BJ,3d$,%j%9%H$G!":G=i$NMWAG$,(B @code{|} ($B?bD>K@(B) $B$G$"$k$H!"$=$l$>$l(B
-$B$N(B @var{split} $B$r$=$N$&$A$N0l$D$,9gCW$9$k$^$Ge$N%0%k!<%W$KC_@Q$5$l$?$H$-$K(B ``$B9gCW$7$?(B'' $B$H$7(B
-$B$^$9!#(B
+$BJ,3d$,%j%9%H$G!":G=i$NMWAG$,(B @code{|} ($B?bD>K@(B) $B$@$C$?$i!"$=$l$>$l(B
+$B$N(B @var{split} $B$r$=$N$&$A$N0l$D$,9gCW$9$k$^$Ge$N%0%k!<%W$K3JG<$7$h$&(B
+$B$H$9$k$3$H$G$9!#(B
 
 @item (& @var{split} @dots{})
-$BJ,3d$,%j%9%H$G!":G=i$NMWAG$,(B @code{&} $B$G$"$k$H!"%j%9%H$NA4$F(B
-$B$N(B @var{split} ($BJ#?t(B) $B$rC5n$7$F$7$^$$$^$9(B)$B!#Hs>o$KCm0U$7$F;H$C$F2<$5$$!#(B
 
 @item (: @var{function} @var{arg1} @var{arg2} @dots{})
-$B$b$7J,3d$,%j%9%H$G!":G=i$NMWAG$,(B @code{:} $B$G$"$k$H!"FsHVL\$NMWAG(B
+$B$b$7J,3d$,%j%9%H$G!":G=i$NMWAG$,(B @code{:} $B$@$C$?$i!"FsHVL\$NMWAG(B
 $B$,(B @var{args} $B$r0z?t$H$7$F4X?t$H$7$F8F$P$l$^$9!#4X?t$O(B @var{split} $B$rJV(B
-$B$9$Y$-$G$9!#(B
+$B$5$J$1$l$P$J$j$^$;$s!#(B
 
 @cindex body split
-$BNc$($P0J2<$N4X?t$O!"5-;v$N%\%G%#$K4p$E$$$?J,3d$K;H$($k$G$7$g$&(B:
+$BNc$($P0J2<$N4X?t$O!"5-;v$N%\%G%#!<$K4p$E$$$?J,3d$K;H$($k$G$7$g$&(B:
 
 @lisp
 (defun split-on-body ()
@@ -13385,36 +13772,75 @@ UNDELETED} $B$O$*$=$i$/$?$$$F$$$N?M$K$O:GNI$NA*Br$G$7$g$&$,!"$H$-$I(B
         "string.group"))))
 @end lisp
 
-@var{function} $B$,Av$i$5$l$k$H$-!"%P%C%U%!$O%a%C%;!<%8$NItJ,$K69$a$i$l$^(B
-$B$9!#$=$l$,>e5-$NNc$G(B @code{save-excursion} $B$H(B @code{save-restriction} $B$N(B
-$B8e$G(B @code{(widen)} $B$,8F$P$l$kI,MW$,$"$kM}M3$G$9!#$5$i$K(B nnimap $B%P%C%/%((B
-$B%s%I$N>l9g!"%G%#%U%)%k%H$G$O5-;v$N%\%G%#$,%@%&%s%m!<%I$5$l$J$$$3$H$KCm0U(B
-$B$7$F2<$5$$!#$=$l$r$9$k$?$a$K(B
+@var{function} $B$,e5-$NNc(B
+$B$G(B @code{save-excursion} $B$H(B @code{save-restriction} $B$N8e(B
+$B$G(B @code{(widen)} $B$r8F$VI,MW$,$"$kM}M3$G$9!#$5$i$K(B @code{nnimap} $B%P%C%/(B
+$B%(%s%I$N>l9g!"%G%#%U%)%k%H$G$O5-;v$N%\%G%#!<$,%@%&%s%m!<%I$5$l$J$$$3$H$K(B
+$BCm0U$7$F2<$5$$!#$=$l$r$9$k$?$a$K(B
 $B$O(B @code{nnimap-split-download-body} $B$r(B @code{t} $B$K@_Dj$9$kI,MW$,$"$j$^(B
 $B$9(B (@pxref{Splitting in IMAP})$B!#(B
 
 @item (! @var{func} @var{split})
-$BJ,3d$,%j%9%H$G!":G=i$NMWAG$,(B @code{!} $B$G$"$k$H(B @var{split} $B$,$K9gCW$7$J$1$l$P$J$j$^(B
-$B$;$s!#(B@var{value} $B$O4pAC%b!<%I(B (fundamental mode) $B9=J8%F!<%V%k(B (syntax
-table) $B$K=>$C$F40A4$K9gCW$7$J$1$l$P$J$j$^$;$s!#@55,I=8=$G%U%#!<%k%IL>$+(B
-$B8l$NItJ,$K9gCW$5$;$k$?$a$K(B @code{.*} $B$r;H$&;v$,$G$-$^$9!#8@$$49$($l$P!"(B
-$BA4$F$N(B @var{value} $B$O(B @samp{\<} $B$H(B @samp{\>} $B$NBP$G0O$^$l$^$9!#(B
+$B$3$l$i$NJ,3d$G(B @var{fileld} $B$O40A4$J%U%#!<%k%IL>(B ($B$H8@$&$+%X%C%@!(B) $B$K(B
+$B9gCW$7$J$1$l$P$J$j$^$;$s!#(B
+
+$BDL>o$3$l$i$NJ,3d$K$*$1$k(B @var{value} $B$O!"4pAC%b!<%I(B (fundamental
+mode) $B9=J8%F!<%V%k(B (syntax table) $B$K=>$C$F!"40A4$K(B @emph{$B8l(B} (word) $B$K9g(B
+$BCW$7$J$1$l$P$J$j$^$;$s!#8@$$49$($l$P!"$9$Y$F$N(B @var{value} $B$O0E(B
+$B$K(B @code{\<...\>} $B0u(B ($B8l$N6h@Z$j5-9f(B) $B$G0O$^$l$^$9!#$7$?$,$C$F!"Nc$($P0J(B
+$B2<$NJ,3d$r;H$&$H!"(B
+
+@example
+(any "joe" "joemail")
+@end example
+
+@noindent
+@samp{joedavis@@foo.org} $B$+$i$d$C$FMh$?%a%C%;!<%8$O!"DL(B
+$B>o(B @samp{joemail} $B$K$O3JG<$5$l$J$$$G$7$g$&!#$3$N?6$kIq$$$rJQ99$7$?$1$l$P!"(B
+$B0J2<$N;0$D$N$d$jJ}$N$I$l$G$b$r;H$&$3$H$,$G$-$^$9(B:
+
+@enumerate
+@item
+@vindex nnmail-split-fancy-match-partial-words
+@code{nnmail-split-fancy-match-partial-words} $BJQ?t$r(B @code{nil} $B$G$O$J$$(B
+$BCM$K@_Dj$9$k$3$H$K$h$C$F!"8l$N6-3&$rL5;k$5$;$k$3$H$,$G$-$^$9!#$9$k$H!"9g(B
+$BCW$O$h$j(B grep $B$U$&$K$J$j$^$9!#$3$NJQ?t$O!"FC5iJ,3d$G8l$N6-3&$r$^$?$$$@9g(B
+$BCW$r9T$J$&$+$I$&$+$r@)8f$7$^$9!#%G%#%U%)%k%HCM$O(B @code{nil} $B$G$9!#(B
+
+$BJ,3d$N5,B'$N$9$Y$F$N(B @var{value} $B$K1F6A$9$k$3$H$KCm0U$7$F2<$5$$!#(B
+
+@item
+@code{.*} $B$G;O$^$k(B @var{value} $B$O!"8l$NA0$K$"$k8l$N6-3&$rL5;k$5$;$^$9!#(B
+$BF1MM$K(B @code{.*} $B$G=*$o$k(B @var{value} $B$O!"8l$N8e$m$K$"$k8l$N6-3&$rL5;k$5(B
+$B$;$^$9!#Nc$($P(B @code{"@@example\\.com"} $B$H$$(B
+$B$&(B @var{value} $B$O(B @samp{foo@@example.com} $B$K9gCW$7$^$;$s$,!"(B
+@code{".*@@example\\.com"} $B$J$i$P9gCW$7$^$9!#(B
+
+@item
+$B$3$N>O$N:G=i$NJ}$G=R$Y$?(B @var{invert-partial} $B%U%i%0$r!"(B
+@samp{(@var{field} @var{value} @dots{})} $B7?$NJ,3d5,B'$G;H$&$3$H$,$G$-$^(B
+$B$9!#$3$N%U%i%0$,@_Dj$5$l$F$$$k$H!"(B
+@code{nnmail-split-fancy-match-partial-words} $B$,(B @code{nil} $B$G$"$C$F$b!"(B
+$B8l$NN>B&$K$"$k8l$N6-3&$OL5;k$5$l$^$9!#5U$K!"$3$N%U%i%0$,@_Dj$5$l$F$$$k$H!"(B
+@code{nnmail-split-fancy-match-partial-words} $B$,(B @code{nil} $B$G$O$J$$CM$G(B
+$B$"$C$F$b!"8l$N6-3&$OL5;k$5$l$^$;$s!#(B(Gnus 5.10.7 $B$N?75!G=(B)
+@end enumerate
 
 @vindex nnmail-split-abbrev-alist
-@var{field} $B$H(B @var{value} $B$O(B Lisp $B%7%s%\%k(B (symbol) $B$G$"$k;v$b$G$-!"$=(B
-$B$N>l9g$=$l$i$O(B @code{nnmail-split-abbrev-alist} $B$G;XDj$5$l$F$$$k$h$&$KE8(B
-$B3+$5$l$^$9!#$3$l$O%;%k$N(B @sc{car} $B$,%-!<$r4^$s$G$$$F!"(B@sc{cdr} $B$,4XO"IU(B
-$B$1$i$l$?CM$r;}$C$F$$$k%3%s%9%;%k(B (cons cell) $B$NO"A[%j%9%H$G$9!#0J2<$N9`(B
-$BL\$,!"$"$i$+$8$a(B @code{nnmail-split-abbrev-alist} $B$KDj5A$5$l$F$$$^$9(B:
+@var{field} $B$H(B @var{value} $B$O(B Lisp $B%7%s%\%k$G$"$k$3$H$b$G$-$^$9!#$=$N>l(B
+$B9g$=$l$i$O(B @code{nnmail-split-abbrev-alist} $B$G;XDj$5$l$?FbMF$K=>$C$FE83+(B
+$B$5$l$^$9!#$3$l$O%;%k$N(B @sc{car} $B$,%-!<$r4^$s$G$$$F!"(B@sc{cdr} $B$,4XO"IU$1(B
+$B$i$l$?CM$r;}$C$F$$$k%3%s%9%;%k(B (cons cell) $B$NO"A[%j%9%H$G$9!#0J2<$N9`L\(B
+$B$,!"$"$i$+$8$a(B @code{nnmail-split-abbrev-alist} $B$KDj5A$5$l$F$$$^$9(B:
 
 @table @code
 @item from
@@ -13428,67 +13854,52 @@ table) $B$K=>$C$F40A4$K9gCW$7$J$1$l$P$J$j$^$;$s!#@55,I=8=$G%U%#!<%k%IL>$+(B
 @end table
 
 @vindex nnmail-split-fancy-syntax-table
-@code{nnmail-split-fancy-syntax-table} $B$,$3$l$i$NA4$F$NJ,3d$,pJs$K4p$E$$$F!"(Bgnus $B$KF0E*$K%0%k!<%W$r:n$i$;$?$$$N(B
-$B$G$"$l$P(B ($BNc$($P!"%0%k!<%WL>$G(B @code{replace-match} $B$N$h$&$JBeMQ$r$9$k(B)$B!"(B
-$BpJs$K4p$E$$$F!"(Bgnus $B$KF0E*$K%0%k!<%W$r:n$i$;$?(B
+$B$$(B ($BNc$($P!"%0%k!<%WL>$N0lIt$r(B @code{replace-match} $B$N$h$&$J$d$jJ}$GCV$-(B
+$B49$($5$;$?$$(B) $B$J$i$P!"l9g$O!"D>A0$K9gCW$7$?J8;zNs$GCV$-49(B
+$B$($i$l$^$9!#F1MM$K!"MWAG(B @samp{\\1} $B$+$i(B @samp{\\9} $B$^$G$O!"9gCW$7$?J8;z(B
+$BNs$N0lIt$GCV$-49$($i$l$^$9(B ($BLuCm(B: $B@55,I=8=$NCf(B
+$B$K(B @samp{\\(} $B$H(B @samp{\\)} $B$r;H$C$F%0%k!<%W$K$^$H$a$i$l$?$b$N$,0l$D0J>e(B
+$B$"$k>l9g$K!"(B@samp{\\@var{n}} $B$O$=$N@55,I=8=$N(B @var{n} $B8DL\$N%0%k!<%W$K9g(B
+$BCW$9$kJ8;zNs$N0lIt$GCV$-49$($i$l$^$9(B)$B!#(B
 
 @vindex nnmail-split-lowercase-expanded
-$B$3$3$G!"9gCW$7$?J8;zNs$r>.J8;z$K$7$?$b$N$GBeBX$9$k$Y$-$+$I$&$+(B
-$B$r(B @code{nnmail-split-lowercase-expanded} $B$,@)8f$7$^$9!#$3$l$r(B
-$BHs(B-@code{nil} $B$K$9$k$3$H$K$h$C$F!"%"%I%l%9$KBgJ8;z$H>.J8;z$,6hJL$;$:$K;H(B
+$B$=$N:]!"9gCW$7$?J8;zNs$r>.J8;z$K$7$?$b$N$GCV$-49$($k$Y$-$+$I$&$+(B
+$B$r(B @code{nnmail-split-lowercase-expanded} $B$,7hDj$7$^$9!#$3$l$r(B
+$BHs(B-@code{nil} $B$K$9$k$3$H$K$h$C$F!"%"%I%l%9$GBgJ8;z$H>.J8;z$,6hJL$;$:$K;H(B
 $B$o$l$F$$$k(B ($BNc$($P(B mailing-list@@domain $B$H(B Mailing-List@@Domain) $B>l9g$G(B
 $B$b!"J#?t$N%0%k!<%W$,@8@.$5$l$F$7$^$&$3$H$rHr$1$k$3$H$,$G$-$^$9!#%G%#%U%)(B
 $B%k%H$O(B @code{t} $B$G$9!#(B
 
-@vindex nnmail-split-fancy-match-partial-words
-@code{nnmail-split-fancy-match-partial-words} $B$O!"FC5iJ,3d$GItJ,E*$J8l$,(B
-$B9gCW$9$k$+$I$&$+$r@)8f$7$^$9!#(B
-
-$BDL>o(B @code{nnmail-split-fancy} $B$GM?$($i$l$k@55,I=8=$O!"0E$K8l$N6h@Z$j$r(B
-$BI=$9(B @code{\<...\>} $B0u$G0O$^$l$F$$$^$9!#$3$NJQ?t$,??$G$"$k$H!"$=$l$i$O2?(B
-$B$K$h$C$F$b0E$K0O$^$l$^$;$s!#(B
-
-@example
-(any "joe" "joemail")
-@end example
-
-$B$3$NNc$G!"DL>o(B @samp{joedavis@@foo.org} $B$+$iMh$?%a%C%;!<%8(B
-$B$O(B @samp{joemail} $B$K3JG<$5$l$^$;$s!#$7$+$7!"(B
-@code{nnmail-split-fancy-match-partial-words} $B$r(B t $B$K@_Dj$9$k$H9gCW$,5/(B
-$B$-$^$9!#MW$9$k$K!"8l$r6h@Z$k>r7o$,:o=|$5$l!"Be$o$j$K9gCW$,$h(B
-$B$j(B grep $B$i$7$/$J$k$N$G$9!#(B
-
 @findex nnmail-split-fancy-with-parent
 $B4X?t(B @code{nnmail-split-fancy-with-parent} $B$O!"%U%)%m!<%"%C%W5-;v$r?F5-(B
 $B;v$HF1$8%0%k!<%W$K?6$jJ,$1$k$?$a$K;H$$$^$9!#%a!<%k$N?6$jJ,$1$r0l@87|L?@_(B
 $BDj$7$F$_$F$b40`z$K$O$G$-$J$$$3$H$,$"$j$^$9$M!#Nc$($P!">e;J$+$i8D?M08$F$N(B
 $B%a!<%k$,FO$$$?$H$7$^$9!#<+J,$,7H$C$F$$$k%W%m%8%'%/%H$H$OJL$NOC$G$9!#$1$l(B
-$B$I!VB>$N%a!<%k$H6hJL$G$-$k$h$&$K$3$l$3$l$3$&$$$&8@MU$rI=Bj$K=q$$$F$/$@$5(B
-$B$$!W$H>e;J$K8~$+$C$F;X?^$9$k$o$1$K$O$$$-$^$;$s$+$i!"7k6I<+J,$N$N%a!<%k$H6hJL$G$-$k$h$&$K$3$l$3$l$3$&$$$&8@MU$rI=Bj$K=q$$$F2<$5$$!W(B
+$B$H>e;J$K8~$+$C$F;X?^$9$k$o$1$K$O$$$-$^$;$s$+$i!"7k6I<+J,$N$C$F40A4$K9gCW$7$J$1$l$P$J$j$^$;$s!#@55,I=8=$G%U%#!<%k%IL>$+(B
         ))
 @end lisp
 
-$B$3$N5!G=$Ol9g!"(BGnus $B$O8+$D$1(B
-$B$?A45-;v$N%a%C%;!<%8(B ID $B$rJQ?t(B @code{nnmail-message-id-cache-file} $B$,;X(B
-$BDj$9$k%U%!%$%k$K5-O?$7$^$9!#$3$N$H$-!"$=$l$>$l$N5-;v$,B8:_$9$k%0%k!<%W$N(B
-$BL>A0$rJ;5-$7$^$9(B ($B$?$@$7%a!<%k$N>l9g$@$1!"$5$b$J$1$l$P%0%k!<%WL>$OD4$Y$^(B
-$B$;$s(B)$B!#$5$F!"$$$h$$$h%a!<%k$N?6$jJ,$1$,;O$^$k$H!"4X?t(B
-@code{nnmail-split-fancy-with-parent} $B$O!"BP>]$H$J$k3F5-;v$N(B References
-($B$H(B In-Reply-To) $B%X%C%@$rD4$Y!"(B@code{nnmail-message-id-cache-file} $B$K;X(B
-$BDj$5$l$F$$$k%U%!%$%k$K$=$l$i$N%a%C%;!<%8(B ID $B$,$"$k$+$I$&$+D4$Y$^$9!#?F5-(B
-$B;v$,8+$D$+$k$H!"$=$N%0%k!<%WL>$,@55,I=(B
-$B8=(B @code{nnmail-split-fancy-with-parent-ignore-groups} $B$K%^%C%A$7$J$1$l(B
-$B$P!"$3$N4X?t$OBP1~$9$k%0%k!<%WL>$rJV$9$o$1$G$9!#$3$3$G!"JQ(B
-$B?t(B @code{nnmail-message-id-cache-length} $B$NCM$r4{DjCM$h$j$b4v$i$+Bg$-$J(B
-$BCM$K@_Dj$9$k$3$H$r$*4+$a$7$^$9!#$=$&$9$k$H!":#D4$Y$i$l$?%a%C%;!<%8(B ID $BC#(B
-$B$O:#$7$P$i$/%-%c%C%7%e$NCf$KB8B3$G$-$^$9(B (5000 $B$K@_Dj$9$k$H%-%c%C%7%e%U%!(B
-$B%$%k$NBg$-$5$O$@$$$?$$(B 300 $B%-%m%P%$%H$0$i$$$K$J$k$_$?$$$G$9(B)$B!#(B
+$B$3$N5!G=$Ol9g!"(Bgnus $B$O8+(B
+$B$D$1$?A45-;v$N%a%C%;!<%8(B ID $B$rJQ(B
+$B?t(B @code{nnmail-message-id-cache-file} $B$G;XDj$5$l$?%U%!%$%k$K5-O?$7$^$9!#(B
+$B$3$N$H$-!"$=$l$>$l$N5-;v$,3JG<$5$l$?%0%k!<%W$NL>A0$rJ;5-$7$^$9(B ($B$?$@$7%a!<(B
+$B%k$G$O$J$$%a%C%;!<%8$N>l9g$O!"%0%k!<%WL>$O>JN,$5$l$^$9(B)$B!#$5$F!"$$$h$$$h(B
+$B%a!<%k$N?6$jJ,$1$,;O$^$k$H!"4X(B
+$B?t(B @code{nnmail-split-fancy-with-parent} $B$O!"J,3d$5$l$k3F5-;v(B
+$B$N(B References ($B$H(B In-Reply-To) $B%X%C%@!<$rD4$Y!"(B
+@code{nnmail-message-id-cache-file} $B$G;XDj$5$l$?%U%!%$%k$K$=$l$i$N%a%C%;!<(B
+$B%8(B ID $B$,$"$k$+$I$&$+D4$Y$^$9!#?F5-;v$,8+$D$+$k$H!"$=$N%0%k!<%WL>$,@55,I=(B
+$B8=(B @code{nnmail-split-fancy-with-parent-ignore-groups} $B$K9gCW$7$J$1$l$P!"(B
+$B$3$N4X?t$OBP1~$9$k%0%k!<%WL>$rJV$9$o$1$G$9!#$3$3$G!"JQ(B
+$B?t(B @code{nnmail-message-id-cache-length} $B$NCM$r%G%#%U%)%k%H$h$j$b4v$i$+(B
+$BBg$-$JCM$K@_Dj$9$k$3$H$r4+$a$^$9!#$=$&$9$k$H!":#D4$Y$i$l$?%a%C%;!<(B
+$B%8(B ID $B$?$A$O:#$7$P$i$/%-%c%C%7%e$NCf$KB8B3$G$-$^$9(B (5000 $B$K@_Dj$9$k$H%-%c%C(B
+$B%7%e%U%!%$%k$NBg$-$5$O$@$$$?$$(B 300 $B%-%m%P%$%H$0$i$$$K$J$k$_$?$$$G$9(B)$B!#(B
 @vindex nnmail-cache-accepted-message-ids
 $B$5$i$K!"JQ?t(B @code{nnmail-cache-accepted-message-ids} $B$NCM$r(B
 $BHs(B-@code{nil} $B$K@_Dj$9$l$P!"(Bgnus $B$O0\F0$5$l$?5-;v$N%a%C%;!<%8(B ID $B$r$b5-(B
 $BO?$9$k$N$G!"%U%)%m!<%"%C%W5-;v$O?F5-;v$N0\F0@h$HF1$8%0%k!<%W$KF~$k$h$&$K(B
 $B$J$j$^$9!#(B
 
-$B$"$k%0%k!<%W$r%-%c%C%7%e$K5-O?$7$?$/$J$$>l9g$O!"JQ(B
+$BFCDj$N%0%k!<%W$r%-%c%C%7%e$K5-O?$7$?$/$J$$>l9g$O!"JQ(B
 $B?t(B @code{nnmail-cache-ignore-groups} $B$b;2>H$7$F2<$5$$!#Nc$($P!"30$K=P$9(B
-$B$9$Y$F$N%a%C%;!<%8$,(B ``outgoing'' $B%0%k!<%W$G=q$+$l$F$$$k$J$i$P!"(B
-@code{nnmail-cache-ignore-groups} $B$r$=$N%0%k!<%WL>$K%^%C%A$9$k$h$&$K@_Dj(B
-$B$9$k$N$,NI$$$G$9!#$5$b$J$$$H$"$J$?$N$9$Y$F$N%a%C%;!<%8$KBP$9$kJV;v$,!":G(B
-$B8e$O(B ``outgoing'' $B%0%k!<%W$KF~$C$F$7$^$&$G$7$g$&!#(B
+$B$9$Y$F$N%a%C%;!<%8$r!H(Boutgoing$B!I%0%k!<%W$KJ]B8$7$F$$$k$N$J$i$P!"(B
+@code{nnmail-cache-ignore-groups} $B$r$=$N%0%k!<%WL>$K9gCW$9$k$h$&$K@_Dj$9(B
+$B$l$PNI$$$G$7$g$&!#$5$b$J$$$H$"$J$?$N$9$Y$F$N%a%C%;!<%8$KBP$9$kJV;v$,(B
+$B!H(Boutgoing$B!I%0%k!<%W$KF~$C$F$7$^$$$^$9!#(B
 
 @node Group Mail Splitting
 @subsection $B%0%k!<%W%a!<%kJ,3d(B
@@ -13534,54 +13946,57 @@ table) $B$K=>$C$F40A4$K9gCW$7$J$1$l$P$J$j$^$;$s!#@55,I=8=$G%U%#!<%k%IL>$+(B
 @cindex group mail splitting
 
 @findex gnus-group-split
-$B$?!<$/$5$s$N%a!<%j%s%0%j%9%H$r9XFI$7$F$$$k$1$l$I!"J}$b$7$/$O$I$A$i$+$r@_Dj$7(B
+$B2?%@!<%9$b$N%a!<%j%s%0%j%9%H$r9XFI$7$F$$$k$1$l$I!"J}$b$7$/$O$I$A$i$+$r@_Dj$7(B
 $B$F(B @code{nnmail-split-methods} $B$r(B @code{gnus-group-split} $B$K@_Dj$9$k$@$1(B
-$B$G$9!#J,3d4X?t$OA4$F$N%0%k!<%W$G$3$l$i$N%Q%i%a!<%?$rAv::$7!"$=$l$K=>$C$F(B
-$BJ,3d$7$^$9!#$9$J$o$A!"%a!<%k%0%k!<%W$N%Q%i%a!<(B
-$B%?(B @code{to-list} $B$+(B @code{to-address} $B$G;XDj$5$l$?%"%I%l%9$+$iEj9F$5$l(B
-$B$?$b$N$+!"$=$N%"%I%l%9$XEj9F$5$l$?%a%C%;!<%8$,$=$N%0%k!<%W$KJ]B8$5$l$^$9!#(B
-
-$B$H$-$K$O!"%a!<%j%s%0%j%9%H$K$OJ#?t$N%"%I%l%9$,$"$j!"%a!<%kJ,3d$K$=$l$iA4(B
-$B$F$rG'<1$5$;$kI,MW$,$"$k$+$b$7$l$^$;$s(B: @code{extra-aliases} $B%0%k!<%W%Q(B
-$B%i%a!<%?$rDI2C$N%"%I%l%9$N%j%9%H$K@_Dj$9$k$@$1$G=*$j$G$9!#@55,I=8=$r;H$$(B
-$B$?$1$l$P!"(B@code{split-regexp} $B$r@_Dj$7$F$/$@$5$$!#(B
-
-$B$3$l$i$NA4$F$N%0%k!<%W$N%Q%i%a!<%?$O!"(B@code{nnmail-split-fancy} $BJ,3d$r:n(B
-$B@.$9$k$?$a$K;HMQ$5$l!"$=$l$O(B @var{field} $B$,(B @samp{any} $B$G!"(B
-@var{value} $B$,(B @code{to-list}, @code{to-address},
-@code{extra-aliases} $B$N$9$Y$F!"(B@code{split-regexp} $B$NA4$F$N9gCW$K9gCW$9(B
-$B$kC1FH$N@55,I=8=!"(B@var{split} $B$,%0%k!<%W$NL>A0$K$J$j$^$9!#(B@var{restrict}
-$B$b;HMQ$G$-$^$9(B: @code{split-exclude} $B%Q%i%a!<%?$r@55,I=8=$N%j%9%H$K@_Dj(B
-$B$9$k$@$1$G$9!#(B
-
-$B$3$l$i$NA4$F$N%Q%i%a!<%?$r;H$C$F@5$7$$J,3d$,@8@.$5$l$J$$$H$-$d!"2?$+0c$C(B
-$B$?$b$N$,I,MW$J$H$-$O!"%Q%i%a!<(B
-$B%?(B @code{split-spec} $B$r(B @code{nnmail-split-fancy} $BJ,3d$K@_Dj$9$k$3$H$,$G(B
-$B$-$^$9!#$3$N>l9g$O!"B>$NA0$K=q$$$?A4$F$N%Q%i%a!<%?(B
-$B$O(B @code{gnus-group-split} $B$KL5;k$5$l$^$9!#FC$K!"(B
-@code{split-spec} $B$O(B @code{nil} $B$K@_Dj$9$k$3$H$,$G$-!"$=$N>l9g$O%0%k!<%W(B
-$B$O(B @code{gnus-group-split} $B$KL5;k$5$l$^$9!#(B
+$B$G$9!#J,3d4X?t$O$9$Y$F$N%0%k!<%W$G$3$l$i$N%Q%i%a!<%?!<$rAv::$7!"$=$l$K=>$C(B
+$B$FJ,3d$7$^$9!#$9$J$o$A!"%a!<%k%0%k!<%W$N%Q%i%a!<(B
+$B%?!<(B @code{to-list} $B$+(B @code{to-address} $B$G;XDj$5$l$?%"%I%l%9$+$iEj9F$5(B
+$B$l$?$b$N$+!"$=$N%"%I%l%9$XEj9F$5$l$?%a%C%;!<%8$,$=$N%0%k!<%W$KJ]B8$5$l$^(B
+$B$9!#(B
+
+$B$H$-$K$O!"%a!<%j%s%0%j%9%H$K$OJ#?t$N%"%I%l%9$,$"$j!"%a!<%kJ,3d$K$=$l$i$9(B
+$B$Y$F$rG'<1$5$;$kI,MW$,$"$k$+$b$7$l$^$;$s(B: @code{extra-aliases} $B%0%k!<%W(B
+$B%Q%i%a!<%?!<$rDI2C$N%"%I%l%9$N%j%9%H$K@_Dj$9$k$@$1$G=*$j$G$9!#$"$($F@55,(B
+$BI=8=$r;H$$$?$1$l$P!"(B@code{split-regexp} $B$r@_Dj$7$F2<$5$$!#(B
+
+$B$3$l$i$N$9$Y$F$N%0%k!<%W$N%Q%i%a!<%?!<$O!"(B@code{nnmail-split-fancy} $B$NJ,(B
+$B3d$r:n@.$9$k$?$a$K;HMQ$5$l$^$9!#$=$NJ,3d$N;EMM$NCf?H(B
+$B$O!"(B@var{field} $B$NCM$,(B @samp{any} $B$G$"$j!"(B
+@var{value} $B$NCM(B
+$B$,(B @code{to-list} $B$H(B @code{to-address} $B$H(B @code{extra-aliases} $B$N$9$Y$F(B
+$B$H(B @code{split-regexp} $B$K9gCW$9$k$b$N$N$9$Y$F$K9gCW$9$kC10l$N@55,I=8=!"(B
+$B$=$7$F(B @var{split} $B$,%0%k!<%W$NL>A0$K$J$j$^$9!#(B@var{restrict} $B$b;H$&$3$H(B
+$B$,$G$-$^$9(B: $B$=$l$K$O(B @code{split-exclude} $B%Q%i%a!<%?!<$r@55,I=8=$N%j%9%H(B
+$B$K@_Dj$7$F2<$5$$!#(B
+
+$B$3$l$i$N$9$Y$F$N%Q%i%a!<%?!<$r;H$C$F@5$7$$J,3d$,@8@.$5$l$J$$$H$-$d!"2?$+(B
+$B$b$C$H6E$C$?$b$N$,I,MW$J$H$-$O!"(B@code{split-spec} $B%Q%i%a!<%?!<(B
+$B$r(B @code{nnmail-split-fancy} $B$NJ,3d$K@_Dj$9$k$3$H$,$G$-$^$9!#$3$N>l9g$O!"(B
+$BA0$b$C$F=q$+$l$?$9$Y$F$N%Q%i%a!<%?!<$O(B @code{gnus-group-split} $B$KL5;k$5(B
+$B$l$^$9!#FC$K!"(B@code{split-spec} $B$O(B @code{nil} ($BLuCm(B: $B$3$l(B
+$B$b(B @code{nnmail-split-fancy} $B$NJ,3d$N0ll9g$=$N%0%k!<%W$O(B @code{gnus-group-split} $B$KL5;k$5$l$^$9!#(B
 
 @vindex gnus-group-split-default-catch-all-group
-@code{gnus-group-split} $B$O$=$l$>$l$N%0%k!<%W$K0l$D$NJ,3d$r4^$`C10l(B
-$B$N(B @code{&} $BFC5iJ,3d$rDj5A$9$k$3$H$G9gCW$9$kA4$F$N%0%k!<%W$KAj8_Ej9F$r$7(B
-$B$^$9!#%a%C%;!<%8$,$I$NJ,3d$K$b9gCW$7$J$1$l$P!"$I$l$+$N%0%k!<%W(B
-$B$G(B @var{split-spec} $B$,(B @code{catch-all} $B$K@_Dj$5$l$F$$$J$$>l9g(B
-$B$O(B @code{gnus-group-split-default-catch-all-group} $B$G;XDj$5$l$F$$$k%0%k!<(B
-$B%W$KJ]B8$5$l$^$9!#(B@code{split-spec} $B$,(B @code{catch-all} $B$K@_Dj$5$l$F$$$k(B
-$B%0%k!<%W$,$"$k>l9g$O!"$=$N%0%k!<%W$,A4$F$rJa3M$9$k%0%k!<%W$H$7$F;HMQ$5$l(B
-$B$^$9!#$3$NJQ?t$O$7$P$7$PC1$K%0%k!<%W$r;XDj$9$k$?$a$K;H$o$l$^$9$,!"G$0U$N(B
-$BJ#;($JFC5iJ,3d$r$b@_Dj$9$k(B ($B7k6I!"%0%k!<%WL>$OFC5iJ,3d$J$N$G$9(B) $B$N$G!"8D(B
-$B?M$N%a!<%k%U%)%k%@!<$N$I$N%a!<%j%s%0%j%9%H$K$bEv$F$O$^$i$J$$%a!<%k$rJ,3d(B
-$B$9$k$N$KJXMx$G$7$g$&!#$J$*$3$NFC5iJ,3d$O!"(B@code{|} $BJ,3d%j%9%H$N:G8e$NMW(B
-$BAG(B - $B%0%k!<%W%Q%i%a!<%?$+$iCj=P$5$l$?5,B'$r;}$D(B @code{&} $BJ,3d$r4^$`(B - $B$H(B
-$B$7$FDI2C$5$l$k$3$H$KCm0U$7$F$/$@$5$$!#(B
-
-$B$=$m$=$mNc$r=P$9$Y$-$G$7$g$&!#0J2<$N%0%k!<%W%Q%i%a!<%?$,Dj5A$5$l$F$$$k$H(B
-$B$7$^$9(B:
+$B$=$l$>$l$N%0%k!<%W$N$?$a$K!"0l$D$NJ,3d$r4^$`C10l$N(B @code{&} $BFC5iJ,3d$rDj(B
+$B5A$9$k$3$H$K$h$C$F!"(B@code{gnus-group-split} $B$O9gCW$9$k$9$Y$F$N%0%k!<%W$K(B
+$B%/%m%9%]%9%H$r$7$^$9!#$I$NJ,3d$K$b9gCW$7$J$$%a%C%;!<%8$O!"$I$l$+$N%0%k!<(B
+$B%W$G(B @var{split-spec} $B$,(B @code{catch-all} $B$K@_Dj$5$l$F$$$J$$>l9g(B
+$B$O(B @code{gnus-group-split-default-catch-all-group} $B$G;XDj$5$l$?L>A0$N%0(B
+$B%k!<%W$K3JG<$5$l$^$9!#$=$N>l9g!"$=$N%0%k!<%W$O$9$Y$F$r$OFC5iJ,3d$J$N$G$9(B)$B!"8D?M$N%a!<%k%U%)%k%@!<(B
+$B$K$=$l$i$N%a!<%k$,3JG<$5$l$k$I$N%a!<%j%s%0%j%9%H$K$bEv$F$O$^$i$J$$%a!<%k(B
+$B$r!"J,3d$9$k$N$KJXMx$G$7$g$&!#$J$*$3$NFC5iJ,3d$O!"(B@code{|} $BJ,3d%j%9(B
+$B%H(B ($B$=$l$O!"%0%k!<%W%Q%i%a!<%?!<$+$iCj=P$5$l$?5,B'$r;}$C$?(B @code{&} $BJ,3d(B
+$B$r$b4^$s$G$$$^$9(B) $B$N:G8e$NMWAG$H$7$FDI2C$5$l$k$3$H$KCm0U$7$F2<$5$$!#(B
+
+$B$=$m$=$mNc$r=P$9$Y$-$G$7$g$&!#0J2<$N%0%k!<%W%Q%i%a!<%?!<$,Dj5A$5$l$F$$$k(B
+$B$3$H$r2>Dj$7$^$9(B:
 
 @example
 nnml:mail.bar:
@@ -13597,7 +14012,7 @@ nnml:mail.others:
 @end example
 
 @code{nnmail-split-methods} $B$r(B @code{gnus-group-split} $B$K@_Dj$9$k$H!"(B
-@code{nnmail-split-fancy} $B$,A*Br$5$l$F!"JQ(B
+@code{nnmail-split-fancy} $B$,A*Br$5$l$F$$$F!"$+$DJQ(B
 $B?t(B @code{nnmail-split-fancy} $B$,0J2<$N$h$&$K@_Dj$5$l$F$$$k$+$N$h$&$K?6Iq(B
 $B$$$^$9(B:
 
@@ -13609,165 +14024,177 @@ nnml:mail.others:
 @end lisp
 
 @findex gnus-group-split-fancy
-$BA4$F$N%a!<%k%0%k!<%W$G%0%k!<%WJ,3d$r;HMQ$7$?$/$O$J$$$H$-$O!"(B
-@code{nnmail-split-fancy} $BJ,3d$r$N%j%9%H$+@55,I=8=$G$9!#(B@var{no-crosspost} $B$OAj8_Ej9F$r;HMQ6X;_$K$k$?(B
-$B$a$K;H$&$3$H$,$G$-$^$9!#$=$N>l9g!"C10l$N(B @code{|} $BJ,3d$,=PNO$5$l$^$9!#(B
+@var{groups} $B$O!"=PNO$NJ,3d$r@8@.$9$k$?$a$K%Q%i%a!<%?!<$,Av::$5$l$k%0%k!<(B
+$B%WL>$N%j%9%H$+!"$=$l$i$N%0%k!<%WL>$K9gCW$9$k@55,I=8=$G$9!#(B
+@var{no-crosspost} $B$O%/%m%9%]%9%H$r6X;_$9$k$?$a$K;H$&$3$H$,$G$-!"$=$N>l(B
+$B9g$O!"C10l$N(B @code{|} $BJ,3d$,=PNO$5$l$^$9!#(B
 @var{catch-all} $B$O(B @code{gnus-group-split-default-catch-all-group} $B$N$h(B
 $B$&$K!":G8e$Nl9g!"%0%k!<%W$K(B @code{split-spec} $B$,(B @code{catch-all} $B$K@_Dj$5$l$F$$(B
-$B$k$b$N$,$"$k$H!"$3$N%0%k!<%W$,(B @var{catch-all} $B0z?t$r>e=q$-$7$^$9!#(B
+@var{catch-all} $B$,(B @code{nil} $B$K@_Dj$5$l$F$$$k$+!"(B@code{split-regexp} $B$,(B
+$B$I$l$+$NA*Br$5$l$?%0%k!<%W$G6u$NJ8;zNs$K9gCW$9$k$H!"$9$Y$F$rl9g!"$"$k%0%k!<%W(B
+$B$K(B @code{catch-all} $B$K@_Dj$5$l$F$$$k(B @code{split-spec} $B$,$"$k$H!"$=$N%0(B
+$B%k!<%W$O(B @var{catch-all} $B0z?t$NCM$h$j$bM%@h$5$l$^$9!#(B
 
 @findex gnus-group-split-setup
-$BIT1?$J$3$H$K!"A4$F$N%0%k%W$H%Q%i%a!<%?$rAv::$9$k$3$H$OHs>o$KCY$$$G$9!#FC(B
-$B$KA4$F$N%a%C%;!<%8$KBP$7$F$J$5$l$k$3$H$r9M$($k$H!#$1$l$I$b!"@dK>$7$J$$(B
-$B$G(B! $B4X?t(B @code{gnus-group-split-setup} $B$,(B @code{gnus-group-split} $B$r$h$j(B
-$B$:$C$H8zN(E*$JJ}K!$G;H$&$3$H$,$G$-$^$9!#$=$l(B
+$BIT1?$J$3$H$K!"$9$Y$F$N%0%k!<%W$H$=$l$i$N%Q%i%a!<%?!<$rAv::$9$k$3$H$O!"FC(B
+$B$K$9$Y$F$N%a%C%;!<%8$KBP$7$F9T$J$o$J$1$l$P$J$i$J$$$3$H$r9MN8$KF~$l$k$H!"(B
+$BHs>o$KCY$/$J$k$G$7$g$&!#$G$b!"@dK>$7$F$O$$$1$^$;$s!#(B
+@code{gnus-group-split-setup} $B4X?t$r!"$O$k$+$K8zN(E*$JJ}K!(B
+$B$G(B @code{gnus-group-split} $B$rF0:n$5$;$k$?$a$K;H$&$3$H$,$G$-$^$9!#$=$l(B
 $B$O(B @code{nnmail-split-methods} $B$r(B @code{nnmail-split-fancy} $B$K@_Dj$7!"(B
-@code{nnmail-split-fancy} $B$r(B @code{gnus-group-split-fancy} $B$G@8@.$5$l$?(B
-$BJ,3d$K@_Dj$7$^$9!#$3$&$7$F$I$s$J$KJ,3d$9$k%a%C%;!<%8$,$?$/$5$s$"$C$F$b!"(B
-$B%0%k!<%W%Q%i%a!<%?$O0lEY$@$1Av::$5$l$^$9!#(B
+@code{nnmail-split-fancy} $B$r(B @code{gnus-group-split-fancy} $B$G@8@.$5$l$k(B
+$BJ,3d$K@_Dj$7$^$9!#$=$&$9$k$3$H$K$h$C$F!"$I$s$J$KJ,3d$9$k%a%C%;!<%8$,$?$/(B
+$B$5$s$"$C$F$b!"%0%k!<%W%Q%i%a!<%?!<$O0lEY$@$1Av::$5$l$k$h$&$K$J$j$^$9!#(B
 
 @findex gnus-group-split-update
-$B$7$+$7!"%0%k!<%W%Q%i%a!<%?$rJQ99$9$k$H!"(B@code{nnmail-split-fancy} $B$rl9g$K$O!"(B
+@code{gnus-group-split-setup} $B$K$=$l$rJN,$7$J$$>l9g$O(B ($B$=$l$O%*%W%7%g%s(B
-$B$G(B @code{nil} $B$HEy(B
-$B2A(B)$B!"(B@code{gnus-group-split-default-catch-all-group} $B$O$=$NCM$K@_Dj$5$l(B
+@var{auto-update} $B$,(B @code{nil} $B$G$J$1$l(B
+$B$P(B @code{gnus-group-split-update} $B$,(B @code{nnmail-pre-get-new-mail-hook} $B$K(B
+$BDI2C$5$l$k$N$G!"FsEY$H(B @code{nnmail-split-fancy} $B$N99?7$K$D$$$F?4G[$9$k(B
+$BI,MW$O$"$j$^$;$s!#(B@var{catch-all} $B$r>JN,$7$J$$>l9g$O(B ($B$=$l$O%*%W%7%g%s(B
+$B$G(B @code{nil} $B$HEy2A$G(B
+$B$9(B)$B!"(B@code{gnus-group-split-default-catch-all-group} $B$,$=$NCM$K@_Dj$5$l(B
 $B$^$9!#(B
 
 @vindex gnus-group-split-updated-hook
-@code{nnmail-split-fancy} $B$,(B @code{gnus-group-split-update} $B$G@_Dj$5$l$?(B
-$B8e$GJQ99$9$kI,MW$,$"$k$H$-$N$?$a$K!"$3$N4X?t(B
-$B$O(B @code{gnus-group-split-update-hook} $B$r=*N;$9$kD>A0$KA0(B
+$B$K(B @code{gnus-group-split-update-hook} $B$rA0$rM?$($^$9(B (@pxref{Foreign
-Groups})$B!#(B
+@kbd{G f} $B$r%?%$%W$7$F2<$5$$!#(B@code{nndoc} $B%0%k!<%W$r:n@.$9$k$?$a$N85$K(B
+$B$J$k(B mbox $B%U%!%$%k$NL>A0$r5a$a$i$l$k$N$G!"$=$l$rF~NO$7$F2<$5(B
+$B$$(B (@pxref{Foreign Groups})$B!#(B
 
 @item
-@kbd{SPACE} $B$rBG$C$F!"?7$7$/:n$i$l$?%0%k!<%W$KF~$j$^$9!#(B
+@kbd{SPACE} $B$r%?%$%W$7$F!"?7$7$/:n$i$l$?%0%k!<%W$KF~$C$F2<$5$$!#(B
 
 @item
-@kbd{M P b} $B$rBG$C$F!"%0%k!<%W%P%C%U%!$NA4$F$N5-;v$Kc$b$J$/J*;v$,>efIW$J$h$&$G$"$l$P!"(Bmbox $B%U%!%$%k$r>C$9;v(B
-$B$r9M$($k$+$b$7$l$^$;$s$,!";d$OA4$F$N%a!<%k$,$"$k$Y$-$H$3$m$KG<$^$C$F$$$k(B
-$B$N$r40A4$K3NG'$9$k$^$G$O!"$=$&$O$7$^$;$s!#(B
+$B:#$d(B mbox $B%U%!%$%k$N$9$Y$F$N%a!<%k%a%C%;!<%8$O!"$"$J$?$N(B @code{nnml} $B%0(B
+$B%k!<%W72$K$b$P$i$^$+$l$F$$$^$9!#$=$l$i$KF~$C$F!"$b$N$4$H$,JQ$J8N>c$bL5$/!"(B
+$B$&$^$/$$$C$?$+$I$&$+$rD4$Y$F2<$5$$!#Bg>fIW$J$h$&$G$"$l$P!"(Bmbox $B%U%!%$%k(B
+$B$r>C$=$&$H;W$&$+$b$7$l$^$;$s$,!";d$O$9$Y$F$N%a!<%k$,$"$k$Y$-$H$3$m$KG<$^$C(B
+$B$?$3$H$r40A4$K3NG'$9$k$^$G$O!"$=$&$O$7$^$;$s!#(B
+
+$B:F%9%W!<%k$9$k$3$H$O!"$"$k%a!<%k%P%C%/%(%s%I$rJL$N$b$N$KJQ99$9$k$H$-$K$b(B
+$BJXMx$J$b$N$G$9!#8E$$%a!<%k%0%k!<%W$K$"$k%a!<%k$O!"?7$7$$%a!<%k%P%C%/%(%s(B
+$B%I$r;H$C$F$?$@:F%9%W!<%k$9$l$PNI$$$N$G$9!#(B
 
 @node Expiring Mail
 @subsection $B%a!<%k$N4|8B@Z$l>C5n(B
 @cindex article expiry
 
-$BEAE}E*$J%a!<%k%j!<%@!<$O!"2?$+!"4{FI$N0u$rIU$1$k$H5-;v$r:o=|$9$k798~$,$"(B
-$B$j$^$9!#(BGnus $B$O%a!<%k$rFI$`;v$KBP$7$F!"4pK\E*$KA4$/0c$C$?J}K!$rC$98"NO$,$"(B
-$B$k$H$O9M$($^$;$s!#%a!<%k%0%k!<%W$KF~$C$F!"5-;v$K(B ``$B4{FI(B'' $B$N0u$rIU$1$?$j!"(B
-$BB>$NN.57$G@Z$C$?$j$7$F$b!"%a!<%k5-;v$O$^$@%7%9%F%`$KB8:_$7$F$$$^$9!#7+$j(B
-$BJV$7$^$9(B: gnus $B$O$"$J$?$N8E$$!"4{FI%a!<%k$r>C5n$7$^$;$s!#$b$A$m$s!"$"$J(B
-$B$?$,$=$&$7$m$HMj$^$J$$8B$j$NOC$G$9$,!#(B
-
-Gnus $B$KK>$^$7$/$J$$%a!<%k$r:o=|$5$;$k$?$a$K$O!"5-;v$r(B @dfn{$B4|8B@Z$l>C5n(B
-$B2DG=(B} (expirable) $B$H$7$F0u$rIU$1$J$1$l$P$J$j$^$;$s!#(B($B%G%#%U%)%k%H$N%-!<(B
-$B3d$jEv$F$G$O!"(B@kbd{E} $B$r%?%$%W$7$J$1$l$P$J$i$J$$$3$H$r0UL#$7$^$9!#(B) $B$7$+(B
-$B$7$J$,$i!"$3$l$O5-;v$,B(:B$K>C$(5n$k$H$$$&;v$G$O$"$j$^$;$s!#0lHLE*$K!"%a!<(B
-$B%k5-;v$Ol9g$K%7%9%F%`$K$h$C$F:o=|$5$l$^$9(B 1) $B4|8B@Z$l>C5n2DG=(B
-$B$N0u$rIU$1$i$l$k(B 2) $B0l=54V0J>e7P$C$?5-;v$G$"$k!#$b$75-;v$r4|8B@Z$l>C5n2D(B
-$BG=$K$7$J$1$l$P!"$=$l$OCO9v$,E`$j$D$/$^$G%7%9%F%`$K;D$j$D$E$1$^$9!#$3$l$O(B
-$B$b$&0lEY6/D4IU$-$G7+$jJV$5$l$k$KB-$k$b$N$G$9(B: ``$B$b$7(B'' $B$"$J$?$,5-;v(B
-$B$r(B ``$B4|8B@Z$l>C5n2DG=(B'' $B$G$"$k$H(B ``$B$7$J$$(B'' $B$J$i!"(Bgnus $B$O(B ``$B7h$7$F(B'' $B$=(B
-$B$l$i$N(B ``$B5-;v(B'' $B$r>C5n$7$^$;$s!#(B
+$BEAE}E*$J%a!<%k%j!<%@!<$O!"4{FI$N0u$rIU$1$k$H%a!<%k$N5-;v$r2?$i$+$NJ}K!$G(B
+$B:o=|$9$k798~$,$"$j$^$9!#(Bgnus $B$O%a!<%k$rFI$`$3$H$KBP$7$F!"4pK\E*$K0c$&J}(B
+$BK!$r/!9JQ$o$C$?J}K!$GC$98"8B$,$"$k$H(B
+$B$O9M$($^$;$s!#$"$J$?$,%a!<%k%0%k!<%W$KF~$C$F5-;v$K!V4{FI!W$N0u$rIU$1$?$j!"(B
+$B2?$i$+$NB>$N$d$jJ}$G@Z$C$?$j$7$F$b!"%a!<%k$N5-;v$O$^$@%7%9%F%`$KB8:_$7$F(B
+$B$$$^$9!#7+$jJV$7$^$9(B: gnus $B$O$"$J$?$N8E$$4{FI$N%a!<%k$r>C5n$7$^$;$s!#$b(B
+$B$A$m$s!"$"$J$?$,$=$&$7$m$HMW5a$7$J$$8B$j$NOC$G$9$,!#(B
+
+$BMW$i$J$$%a!<%k$r(B gnus $B$K:o=|$5$;$k$K$O!"5-;v$K!V4|8B@Z$l>C5n2DG=!W(B
+(expirable) $B$N0u$rIU$1$J$1$l$P$J$j$^$;$s!#(B($B%G%#%U%)%k%H$N%-!<3d$jEv$F$G(B
+$B$O!"(B@kbd{E} $B$r%?%$%W$7$J$1$l$P$J$i$J$$$H$$$&$3$H$G$9!#(B) $B$7$+$7$J$,$i!"$3(B
+$B$l$O5-;v$,B(:B$K>C$(5n$k$H$$$&$3$H$G$O$"$j$^$;$s!#0lHLE*$K%a!<%k5-;v$O!"(B
+1) $B4|8B@Z$l>C5n2DG=$N0u$,IU$$$F$$$F!"$+$D(B 2) $B0l=54V0J>e7P$C$F$$$k!"$H$$(B
+$B$&>l9g$K!"%7%9%F%`$K$h$C$F:o=|$5$l$^$9!#5-;v$r4|8B@Z$l>C5n2DG=$K$7$J$1$l(B
+$B$P!"$=$l$OCO9v$,E`$j$D$/$^$G%7%9%F%`$K;D$jB3$1$^$9!#$3$N$3$H$O!"$b$&0lEY(B
+$B6/D4IU$-$G7+$jJV$5$l$k$KB-$k$b$N$G$9(B: $B!V$b$7!W$"$J$?$,5-;v$r!V4|8B@Z$l>C(B
+$B5n2DG=!W$K!V$7$J$$!W$J$i!"(Bgnus $B$O!V7h$7$F!W$=$l$i$N!V5-;v!W$r>C5n$7$^$;(B
+$B$s!#(B
 
 $BC5n2DG=$N0u$rIU$1$J$1$l$P$J$i$J$$$o$1$G$O$"$j$^$;(B
-$B$s!#(Bgnus $B$O(B ``auto-expire'' $B$*$h$S(B ``total-expire'' $B$H8F$P$l$kFs$D$N5!G=(B
-$B$rDs6!$7$F!"$"$J$?$NC5n2DG=$G$"$k$H(B gnus $B$,2rC5n2DG=$G$"$k$H2r(B
-$B$l$N%j%9%H$r$=$l<+?H$N%0%k!<(B
-$B%W$KJ,3d$7!"$=$l$i$N%0%k!<%W$KBP$7$F(B auto-expire $B$^$?$O(B total-expire $B$r(B
-$BM-8z$K$7$^$9!#(B(@xref{Splitting Mail}, $B$=$l$>$l$N%j%9%H$N$=$l<+?H$N%0%k!<(B
-$B%W$X$NJ,3d$K$D$$$F$N$5$i$J$k>pJs!#(B)
-
-Auto-expire $B$^$?$O(B total-expire $B$N$I$A$i$,NI$$$G$9$+(B? $B$=$l$OEz$($K$/$$$G(B
-$B$9!#35$7$F8@$($P!"$?$V$s(B auto-expire $B$,B.$$$G$7$g$&!#(Bauto-expire $B$NJL$N(B
-$BMxE@$O$h$jB?$/$N%^!<%/$r;H$($k(B - $B:F$SFI$`$3$H$K$J$C$F$$$k(B (be supposed
-to stick around $B$N0ULu(B) $B5-;v$K$D$$$F$O!":#$^$G$I$*$j2D;k(B (tick)$B!"J](B
-$BN1(B (dormant) $B$^$?$O4{FI(B (read) $B$NCf$+$iA*$V$3$H$,$G$-$k(B - $B$H$$$&$3$H$G$9!#(B
-$B$7$+$7(B total-expire $B$G$O(B dormant $B$H(B ticked $B$+$i$7$+A*$Y$^$;$s!#(B
-total-expire $B$NMxE@$O!"E,1~%9%3%"IU$1(B (@pxref{Adaptive Scoring}) $B$GNI9%(B
-$B$KF/$/$3$H$G$9!#(BAuto-expire $B$ODL>o$N%9%3%"IU$1$G$OF0:n$7$^$9$,!"E,1~%9%3(B
-$B%"IU$1$G$O$@$a$G$9!#(B
+$B$s!#(Bgnus $B$O!H(Bauto-expire$B!I$*$h$S!H(Btotal-expire$B!I$H8F$P$l$kFs$D$N5!G=$rDs(B
+$B6!$7$F!"$"$J$?$NC5n2DG=$G$"$k(B
+$B$H(B gnus $B$,2rC5n2DG=$G$"$k$H2r$l$N%j%9%H$,(B
+$B$=$lMQ$N%0%k!<%W$KJ,3d$5$l$k$h$&$K$7$F!"$=$l$i$N%0%k!<%W$KBP$7(B
+$B$F(B auto-expire $B$^$?$O(B total-expire $B$rM-8z$K$7$F$$$^$9!#(B($B$=$l$>$l$N%j%9%H(B
+$B$r$=$lMQ$N%0%k!<%W$X$NJ,3d$9$k7o$K$D$$$F$N$5$i$J$k>pJs$O(B @ref{Splitting
+Mail} $B$r;2>H$7$F2<$5$$!#(B)
+
+auto-expire $B$H(B total-expire $B$N$I$A$i$,NI$$$N$G$7$g$&$+(B?  $B$=$l$KEz$($k$N(B
+$B$O4JC1$G$O$"$j$^$;$s!#35$7$F8@$($P!"$?$V$s(B auto-expire $B$,B.$$$G$7$g$&!#(B
+auto-expire $B$NJL$NMxE@$O!"$h$jB?$/$N0u$r8e$GFI$_JV$9$D$b$j$N5-;v$K;H$&$3(B
+$B$H$,$G$-$k!"$D$^$j:#$^$G$I$*$j$K2D;k(B (tick)$B!"J]N1(B (dormant) $B$^$?$O4{(B
+$BFI(B (read) $B$NCf$+$iA*$V$3$H$,$G$-$k$H$$$&$3$H$G$9!#$7$+$7(B total-expire $B$G(B
+$B$O!"(Bdormant $B$H(B ticked $B$+$i$7$+A*$Y$^$;$s!#(Btotal-expire $B$NMxE@$O!"E,1~%9(B
+$B%3%"IU$1(B (@pxref{Adaptive Scoring}) $B$GNI9%$KF/$/$3$H$G$9!#(Bauto-expire $B$O(B
+$BDL>o$N%9%3%"IU$1$G$OF0:n$7$^$9$,!"E,1~%9%3%"IU$1$G$O$@$a$G$9!#(B
 
 @vindex gnus-auto-expirable-newsgroups
-$B@55,I=8=(B @code{gnus-auto-expirable-newsgroups} $B$K9gCW$9$k%0%k!<%W$OA4$F(B
-$B$N4{FI5-;v$K<+F0E*$K4|8B@Z$l>C5n2DG=$N0u$,IU$1$i$l$^$9!#A4$F$N4|8B@Z$l>C(B
-$B5n2DG=$N0u$NIU$$$?5-;v$O35N,%P%C%U%!$N:G=i$N7e$K(B @samp{E} $B$,I=<($5$l$^$9!#(B
+$B@55,I=8=(B @code{gnus-auto-expirable-newsgroups} $B$K9gCW$9$k%0%k!<%W$G$O!"(B
+$BFI$s$@$9$Y$F$N5-;v$K<+F0E*$K4|8B@Z$l>C5n2DG=$N0u$,IU$1$i$l$^$9!#4|8B@Z$l(B
+$B>C5n2DG=$N0u$NIU$$$?$9$Y$F$N5-;v$O!"35N,%P%C%U%!!<$N:G=i$N7e(B
+$B$K(B @samp{E} $B$,I=<($5$l$^$9!#(B
 
-$B%G%#%U%)%k%H$G$O<+F04|8B@Z$l>C5n2DG=$r;HMQ$9$k$H!"(Bgnus $B$O$"$J$?$,FI$s$@(B
-$BA4$F$N5-;v$r!"$=$l$,4{FI$G$"$C$?$+L$FI$G$"$C$?$+$K4X$o$i$:!"4|8B@Z$l>C5n(B
-$B2DG=$H$7$F0u$rIU$1$^$9!#4{FI$N0u$NIU$$$?5-;v$,<+F0E*$K4|8B@Z$l>C5n2DG=$H(B
-$B$7$F0uIU$1$i$l$k$N$rHr$1$k$?$a$K!"0J2<$N$h$&$J$b$N(B
-$B$r(B @file{~/.gnus.el} $B%U%!%$%k$K=q$/;v$,$G$-$^$9(B:
+$B<+F04|8B@Z$l>C5n$rM-8z$K$9$k$H!"%G%#%U%)%k%H$G$O$"$J$?$,FI$s$@$9$Y$F$N5-(B
+$B;v$K!"0JA0$KFI$^$l$?$+$I$&$+$K4X$o$i$:!"(B gnus $B$O4|8B@Z$l>C5n2DG=$N0u$rIU(B
+$B$1$^$9!#4{FI$N0u$,IU$$$F$$$k5-;v$K!"<+F0E*$K4|8B@Z$l>C5n2DG=$N0u$,IU$1$i(B
+$B$l$k$N$rHr$1$k$K$O!"0J2<$N$h$&$J$b$N$r(B @file{~/.gnus.el} $B%U%!%$%k$KCV$$(B
+$B$F$*$1$PNI$$$G$7$g$&(B:
 
 @vindex gnus-mark-article-hook
 @lisp
@@ -13776,35 +14203,38 @@ total-expire $B$NMxE@$O!"E,1~%9%3%"IU$1(B (@pxref{Adaptive Scoring}) $B$GNI9%
 (add-hook 'gnus-mark-article-hook 'gnus-summary-mark-unread-as-read)
 @end lisp
 
-$B<+F04|8B@Z$l>C5n2DG=%0%k!<%W$r:n$k;v$O!"A4$F$N4{FI5-;v$,4|8B@Z$l>C5n$5$l(B
-$B$k;v$G$O$J$$;v$K5$$rIU$1$F$/$@$5$$(B---$B4|8B@Z$l>C5n2DG=$H$7$F0u$NIU$$$?5-(B
-$B;v$@$1$,4|8B@Z$l>C5n$5$l$^$9!#L?Na(B @kbd{d}$B$,<+F0E*$K5-;v$r4|8B@Z$l>C5n2D(B
-$BG=$K$9$k$N$G$OL5$$$H$$$&;v$K$b5$$rIU$1$F$/$@$5$$(B---$BH><+F0$N!"<+F04|8B@Z(B
-$B$l>C5n2DG=%0%k!<%W$G5-;v$r4{FI$K0uIU$1$k$3$H$@$1$,5-;v$r4|8B@Z$l>C5n2DG=(B
-$B$K$7$^$9!#(B
+$B%0%k!<%W$r<+F04|8B@Z$l>C5n2DG=$K$7$F$b!"$9$Y$F$N4{FI$N5-;v$,4|8B@Z$l>C5n(B
+$B$5$l$k$o$1$G$O$J$/!"4|8B@Z$l>C5n2DG=$N0u$,IU$$$F$$$k5-;v$@$1$,4|8B@Z$l>C(B
+$B5n$5$l$k$3$H$K5$$rIU$1$F2<$5$$!#$^$?!"(B@kbd{d} $BL?Na$,<+F0E*$K5-;v$r4|8B@Z(B
+$B$l>C5n2DG=$K$9$k$N$G$OL5$$$3$H$K$b5$$rIU$1$F2<$5$$(B---$B<+F04|8B@Z$l>C5n2D(B
+$BG=$K$7$?%0%k!<%W$G$O!"5-;v$K4{FI$N0u$,H><+F0$GIU$1$i$l$k$3$H$K$h$C$F$N$_!"(B
+$B5-;v$,4|8B@Z$l>C5n2DG=$K$J$k$H$$$&$3$H$G$9!#(B
+
+2$B!A(B3 $B$N%a!<%j%s%0%j%9%H$r9VFI$7$F$$$F!"FI$_=*$o$C$F$7$P$i$/7P$C$?$i5-;v(B
+$B$,>C$($F$7$^$&$h$&$K$7$?$$$J$i!"Nc$($P$3$s$JIw$K@_Dj$7$^$7$g$&(B:
 
 @lisp
 (setq gnus-auto-expirable-newsgroups
       "mail.nosense-list\\|mail.nice-list")
 @end lisp
 
-$B<+F04|8B@Z$l>C5n$r$NJ}K!$O!"%0%k!<%W$N%0%k!<%W%Q%i%a!<%?$H$7$F!"(B
-$BMWAG(B @code{auto-expirable} $B$r;}$D;v$G$9!#(B
+$B<+F04|8B@Z$l>C5n$r9T$J$o$;$k$b$&0l$D$NJ}K!$O!"$=$N%0%k!<%W$N%0%k!<%W%Q%i(B
+$B%a!<%?!<$K(B @code{auto-expirable} $B$H$$$&MWAG$r;}$?$;$k$3$H$G$9!#(B
 
 $B$b$7E,1~%9%3%"IU$1(B (@pxref{Adaptive Scoring}) $B$H<+F04|8B@Z$l>C5n$r;HMQ$7(B
-$B$F$$$k$J$i!"LdBj$,5/$3$k$G$7$g$&!#<+F04|8B@Z$l>C5n$HE,1~%9%3%"IU$1$O$"$^(B
-$B$jNI$/Aj8_:nMQ$7$^$;$s!#(B
+$B$F$$$k$H!"LdBj$,5/$3$k$G$7$g$&!#<+F04|8B@Z$l>C5n$HE,1~%9%3%"IU$1$O$"$^$j(B
+$BNI$/D4OB$7$^$;$s!#(B
 
 @vindex nnmail-expiry-wait
-$BJQ?t(B @code{nnmail-expiry-wait} $B$O4|8B@Z$l>C5n2DG=5-;v$,$I$l$/$i$$$N4|4V(B
-$B@8B8$7$F$$$k$+$N%G%#%U%)%k%H$N;~4V@_Dj$rDs6!$7$^$9!#(BGnus $B$O%a%C%;!<%8$,(B
-$BAw$i$l$?$H$-$G$O$J$/!"$=$l$,(B @emph{$BE~Ce(B} $B$7$F$+$i$NF|$r7W;;$7$^$9!#%G%#(B
-$B%U%)%k%H$O(B 7 $BF|4V$G$9!#(B
+$BJQ?t(B @code{nnmail-expiry-wait} $B$G!"4|8B@Z$l>C5n2DG=$J5-;v$r$I$l$/$i$$$N(B
+$B4|4V;D$7$F$*$/$+$N%G%#%U%)%k%H$N;~4V$r@_Dj$7$^$9!#(Bgnus $B$O%a%C%;!<%8$,Aw(B
+$B$j=P$5$l$?$H$-$G$O$J$/!"$=$l$,(B @emph{$BE~Ce(B} $B$7$F$+$i$NF|?t$r7W;;$7$^$9!#(B
+$B%G%#%U%)%k%H$O(B 7 $BF|4V$G$9!#(B
 
-Gnus $B$O5-;v$,$I$N%0%k!<%W$KB0$7$F$$$k$+$K4p$E$$$F!"$=$l$,$I$N$/$i$$@8B8(B
-$B$9$k$+$r@.8y$K@_Dj$9$k4X?t$bDs6!$7$F$$$^$9!#%0%k!<(B
-$B%W(B @samp{mail.private} $B$O4|8B$r(B 1$B%v7n$K!"%0%k!<%W(B @samp{mail.junk} $B$G$O(B
-$B4|8B$r(B 1 $BF|$K!"$=$NB>$N$b$N$K$O4|8B$r(B 6 $BF|4V$K$9$k$K$O(B:
+gnus $B$O5-;v$,$I$N%0%k!<%W$KB0$7$F$$$k$+$K4p$E$$$F!"$=$l$r$I$N$/$i$$;D$7(B
+$B$F$*$/$+$r$3$^$a$K@_Dj$9$k4X?t$bDs6!$7$F$$$^$9!#0J2<$NNc$G(B
+$B$O(B @samp{mail.private} $B%0%k!<%W$O0l%v7n!"(B@samp{mail.junk} $B%0%k!<%W$O0lF|!"(B
+$B$=$NB>A4It$OO;F|4V$K!"$=$l$>$l4|8B$r@_Dj$7$^$9(B:
 
 @vindex nnmail-expiry-wait-function
 @lisp
@@ -13820,28 +14250,28 @@ Gnus $B$O5-;v$,$I$N%0%k!<%W$KB0$7$F$$$k$+$K4p$E$$$F!"$=$l$,$I$N$/$i$$@8B8(B
                6))))
 @end lisp
 
-$B$3$N4X?t$KM?$($i$l$k%0%k!<%WL>$O(B ``$BAu>~L5$7(B'' $B$N%0%k!<%WL>$G$9(B---
-@samp{nnml:} $B$d$=$NB>$N;w$?$h$&$J$b$N$OIU$-$^$;$s!#(B
+$B$3$N4X?t$KM?$($i$l$k%0%k!<%WL>$K$O!VAu>~!W$9$J$o$A(B @samp{nnml:} $B$N$h$&$J(B
+$B$b$N$OIU$-$^$;$s!#(B
 
 $BJQ?t(B @code{nnmail-expiry-wait} $B$H4X(B
-$B?t(B @code{nnmail-expiry-wait-function} $B$O?t;z(B ($B@0?t$G$"$kI,MW$O$"$j$^$;(B
-$B$s(B) $B$+%7%s%\%k(B @code{immediate} $B$+(B @code{never} $B$N$I$A$i$+$G$"$k;v$,$G$-(B
-$B$^$9!#(B
+$B?t(B @code{nnmail-expiry-wait-function} $B$O!"?tCM(B ($B@0?t$G$"$kI,MW$O$"$j$^$;(B
+$B$s(B) $B$+%7%s%\%k$N(B @code{immediate} $B$+(B @code{never} $B$N$I$A$i$+$K$9$k$3$H$,(B
+$B$G$-$^$9!#(B
 
-$B4|8B@Z$l4|4V$rA*BrE*$KJQ99$9$k$?$a$K%0%k!<%W%Q%i%a!<(B
-$B%?(B @code{expiry-wait} $B$r;H$&;v$b$G$-$^$9(B (@pxref{Group Parameters})$B!#(B
+$B4|8B@Z$l4|4V$rA*BrE*$KJQ99$9$k$?$a$K!"%0%k!<%W%Q%i%a!<%?!<(B
+$B$N(B @code{expiry-wait} $B$r;H$&$3$H$b$G$-$^$9(B (@pxref{Group Parameters})$B!#(B
 
 @vindex nnmail-expiry-target
-$B5-;v$N4|8B@Z$l>C5n$NIaDL$NF0:n$O$=$l$i$r>C5n$9$k$3$H$G$9!#$7$+$7!">l9g$K(B
-$B$h$C$F$O$=$l$i$r>C5n$9$k$h$j$bJL$N%0%k!<%W$K0\F0$7$?J}$,M-0U5A$+$b$7$l$^(B
-$B$;$s!#JQ?t(B @code{nnmail-expiry-target} ($B$H%0%k!<%W%Q%i%a!<(B
-$B%?(B @code{expiry-target}) $B$O$3$l$r@)8f$7$^$9!#$3$NJQ?t$NCM$O$9$Y$F$N%0%k!<(B
-$B%W$KBP$9$k%G%#%U%)%k%H$K$J$j$^$9$,!"FCDj$N%0%k!<%W$4$H$K%0%k!<%W%Q%i%a!<(B
-$B%?$r;H$C$F;XDj$9$l$P>e=q$-$9$k$3$H$,$G$-$^$9!#%G%#%U%)%k%H$NCM(B
-$B$O(B @code{delete} $B$G$9$,!"J8;zNs(B ($B5-;v$r0\F0$9$k@h$N%0%k!<%WL>(B) $B$^$?$O0\(B
-$BF0@h$N%0%k!<%WL>$+(B @code{delete} $B$rJV$94X?t(B ($B5-;v$KHO0O$r69$a$?%P%C%U%!(B
-$B$G!"$=$N5-;v$,B8:_$7$F$$$k%0%k!<%WL>$,0z?t$H$7$FM?$($i$l$^$9(B) $B$K$9$k$3$H(B
-$B$,$G$-$^$9!#(B
+$B5-;v$r4|8B@Z$l>C5n$9$k$H$-$Ko$NF0:n$O!"$=$l$i$r>C5n$9$k$3$H$G(B
+$B$9!#$7$+$7!">l9g$K$h$C$F$O$=$l$i$r>C5n$9$k$h$j$bJL$N%0%k!<%W$K0\F0$7$?J}(B
+$B$,M-0U5A$+$b$7$l$^$;$s!#JQ?t(B @code{nnmail-expiry-target} ($B$H%0%k!<%W%Q%i(B
+$B%a!<%?!<(B @code{expiry-target}) $B$O$3$l$r@)8f$7$^$9!#$3$NJQ?t$NCM$O$9$Y$F(B
+$B$N%0%k!<%W$KBP$9$k%G%#%U%)%k%H$K$J$j$^$9$,!"FCDj$N%0%k!<%W$4$H$K%0%k!<%W(B
+$B%Q%i%a!<%?!<$r;H$C$F;XDj$9$l$P!"$=$A$i$rM%@h$5$;$k$3$H$,$G$-$^$9!#%G%#%U%)(B
+$B%k%H$NCM$O(B @code{delete} $B$G$9$,!"J8;zNs(B ($B5-;v$r0\F0$9$k@h$N%0%k!<%WL>(B)
+$B$^$?$O0\F0@h$N%0%k!<%WL>$+(B @code{delete} $B$rJV$94X?t$K$9$k$3$H$,$G$-$^(B
+$B$9(B ($B4X?t$N>l9g$O!"5-;v$KHO0O$r69$a$?%P%C%U%!!<$G!"$=$N5-;v$,B8:_$7$F$$$k(B
+$B%0%k!<%WL>$,0z?t$H$7$FM?$($i$l$^$9(B)$B!#(B
 
 $B%0%k!<%WL>$r;XDj$9$k>l9g$NNc(B:
 @lisp
@@ -13850,9 +14280,8 @@ Gnus $B$O5-;v$,$I$N%0%k!<%W$KB0$7$F$$$k$+$K4p$E$$$F!"$=$l$,$I$N$/$i$$@8B8(B
 
 @findex nnmail-fancy-expiry-target
 @vindex nnmail-fancy-expiry-targets
-gnus $B$K$OJQ?t(B @code{nnmail-fancy-expiry-targets} $B$K=>$C$F%a!<%k$r4|8B@Z(B
-$B$l>C5n$9$k$?$a$N4X?t(B @code{nnmail-fancy-expiry-target} $B$,$"$j$^$9!#$3$l(B
-$B$ONc$G$9(B:
+gnus $B$K$O4|8B@Z$l$N%a!<%k$r%0%k!<%W$K0\F0$5$;$k$?$a$N4X?t$,$"$j$^$9!#$=(B
+$B$l$OJQ?t(B @code{nnmail-fancy-expiry-targets} $B$K=>$C$FF0:n$7$^$9!#Nc$G$9(B:
 
 @lisp
  (setq nnmail-expiry-target 'nnmail-fancy-expiry-target
@@ -13862,39 +14291,39 @@ gnus $B$K$OJQ?t(B @code{nnmail-fancy-expiry-targets} $B$K=>$C$F%a!<%k$r4|8B@Z
          ("from" ".*" "nnfolder:Archive-%Y")))
 @end lisp
 
-$B$3$N@_Dj$K$h$C$F!"BjL>$K(B @code{IMPORTANT} $B$r;}$A!"(B
-@code{YYYY} $BG/(B @code{MMM} $B7n$KH/?.$5$l$?$$$+$J$k%a!<%k$b!"%0%k!<(B
-$B%W(B @code{nnfolder:IMPORTANT.YYYY.MMM} $B$K4|8B@Z$l>C5n(B ($BLuCm(B: $BC5n$5$l$^$9!#$=$l0J30$N$9$Y$F$N(B
-$B%a!<%k$O(B @code{nnfolder:Archive-YYYY} $B$K4|8B@Z$l>C5n$5$l$^$9!#(B
+$B$3$N@_Dj$r9T$J$&$3$H$K$h$j!"I=Bj%X%C%@!<$K(B @code{IMPORTANT} $B$r;}$C$F$$$F!"(B
+@code{YYYY} $BG/(B @code{MMM} $B7n$KH/?.$5$l$?$$$+$J$k%a!<%k$b!"4|8B$K$J$k(B
+$B$H(B @code{nnfolder:IMPORTANT.YYYY.MMM} $B%0%k!<%W$K0\F0$5$;$i$l$^$9!#$^$?!"(B
+From $B$^$?$O(B To $B%X%C%@!<$,J8;zNs(B @code{boss} $B$r4^$s$G$$$k%a!<%k(B
+$B$O(B @code{nnfolder:Work} $B$K!"$=$l0J30$N$9$Y$F$N%a!<%k(B
+$B$O(B @code{nnfolder:Archive-YYYY} $B$K!"$=$l$>$l4|8B$K$J$k$H0\F0$5$;$i$l$^$9!#(B
 
 @vindex nnmail-keep-last-article
-@code{nnmail-keep-last-article} $B$,(B @code{nil} $B$G$J$$$H!"(Bgnus $B$O%a!<%k%K%e!<(B
-$B%9%0%k!<%W$N:G8e$N5-;v$r7h$7$F4|8B@Z$l>C5n$7$^$;$s!#$3$l$O(B procmail $B$NMx(B
-$BMQC5n$7$^$;$s!#$3$l$O(B procmail $B$NMxMQC5n2DG=$G$J$$5-;v$r4|8B@Z$l(B
-$B>C5n$9$k;v$O$J$$!"$H$$$&$N$O13$G$9!#(B@code{total-expire} $B$r%0%k!<%W%Q%i%a!<(B
-$B%?$KF~$l$k$H!"5-;v$O4|8B@Z$l>C5n$N0u$,IU$-$^$;$s$,!"A4$F$N5-;v$O4|8B@Z$l(B
-$B>C5n2aDx$KF~$l$i$l$^$9!#Hs>o$KCm0U$7$F;H$C$F$/$@$5$$!#$5$i$K$b$C$H4m81$J(B
-$B$b$N$OJQ?t(B @code{gnus-total-expirable-newsgroups} $B$G$9!#$3$N@55,I=8=$K9g(B
-$BCW$9$kA4$F$N%0%k!<%W$OA4$F$N4{FI5-;v$,4|8B@Z$l>C5n2DG=$N2aDx$KFM$C9~$^$l(B
-$B$^$9!#$3$l$O!"Ev$N%0%k!<%W$N(B @emph{$BA4$F(B} $B$N8E$$%a!<%k5-;v$O>/$78e$G:o=|(B
-$B$5$l$k$H$$$&;v$G$9!#Hs>o$KCm0U$7$F;H$C$F!"$"$J$?$,;HMQ$7$?@55,I=8=$,4V0c$C(B
-$B$?%0%k!<%W$K9gCW$7$F!"$"$J$?$NA4$F$N=EMW$J%a!<%k$,>C$($F$7$^$C$?$H8@$C$F!"(B
-$B;d$N$H$3$m$K5c$-IU$$$FMh$J$$$G$/$@$5$$!#(B@emph{$BCK(B}$B$K$J$j$J$5$$(B! $B$b$7$/$O!"(B
-@emph{$B=w(B} $B$K$J$j$J$5$$(B! $B$"$J$?$,5$;}$A$h$$$H46$8$kA4$F$N$b$N$H(B! $B$G$9$+$i(B
-$B$=$3$K(B!
+$BJdB-(B: $B>e5-$N!"(Bgnus $B$,7h$7$F4|8B@Z$l>C5n2DG=$G$J$$5-;v$r4|8B@Z$l>C5n$9$k(B
+$B$3$H$O$J$$!"$H$$$&$N$O13$G$9!#(B@code{total-expire} $B$r%0%k!<%W%Q%i%a!<%?!<(B
+$B$KF~$l$F$b!"5-;v$K4|8B@Z$l>C5n$N0u$,IU$/$3$H$O$"$j$^$;$s$,!"FI$s$@$9$Y$F(B
+$B$N5-;v$O4|8B@Z$l>C5n$N=hM}$KDL$5$l$^$9!#Hs>o$KCm0U$7$F;H$C$F2<$5$$!#$5$i(B
+$B$K4m81$J$N$OJQ?t(B @code{gnus-total-expirable-newsgroups} $B$G$9!#$3$N@55,I=(B
+$B8=$K9gCW$9$k$9$Y$F$N%0%k!<%W$G$O!"FI$s$@$9$Y$F$N5-;v$,4|8B@Z$l>C5n$N=hM}(B
+$B$KDL$5$l$^$9!#$3$l$O!"Ev$N%0%k!<%W$N(B @emph{$B$9$Y$F(B} $B$N8E$$%a!<%k$N5-;v$O!"(B
+$B$7$P$i$/8e$G:o=|$5$l$k$H$$$&$3$H$G$9!#Hs>o$KCm0U$7$F;H$C$F2<$5$$!#$=$7$F!"(B
+$B$"$J$?$,;H$C$?@55,I=8=$,4V0c$C$?%0%k!<%W$K9gCW$7$F$7$^$$!"$9$Y$F$N=EMW$J(B
+$B%a!<%k$,>C$($F$7$^$C$?$H8@$C$F!";d$K5c$-IU$$$FMh$J$$$G2<$5$$!#$7$C$+$7$j(B
+$B$J$5$$(B! ($BD>Lu(B: $BCK$K$J$j$J$5$$!"$"$k$$$O=w$K$J$j$J$5$$!"$5$b$J$1$l$P$b$C(B
+$B$H5$;}$A$$$$2?$K$G$b$J$j$J$5$$(B!) $B$[$&$i!"8@$o$s$3$C$A$c$J$$(B!
 
 $B$?$$$F$$$N?M$O$[$H$s$I$N%a!<%k%0%k!<%W$r(B total-expirable ($BA4BN4|8B@Z$l>C(B
 $B5n2DG=(B) $B$K$7$^$9$,!#(B
 
 @vindex gnus-inhibit-user-auto-expire
 @code{gnus-inhibit-user-auto-expire} $B$,(B @code{nil} $B$G$J$1$l$P!"%0%k!<%W(B
-$B$,<+F0;~8B>C5n$,;HMQ$5$l$k$h$&$K$J$C$F$$$F$b!"MxMQC5n2DG=$N0u$rIU$1$^$;$s!#(B
+$B$G<+F04|8B@Z$l>C5n$,M-8z$K$J$C$F$$$F$b!"MxMQC5n2DG=$N0u$rIU$1$k$3$H$O$"$j$^$;$s!#(B
 
 @node Washing Mail
 @subsection $B%a!<%k@vBu(B
@@ -13902,28 +14331,30 @@ gnus $B$K$OJQ?t(B @code{nnmail-fancy-expiry-targets} $B$K=>$C$F%a!<%k$r4|8B@Z
 @cindex list server brain damage
 @cindex incoming mail treatment
 
-$B%a%$%i!<(B (mailer) $B$d%j%9%H%5!<%P!<(B (list server) $B$OK\Ev$KK\Ev$KGO9b$$$G$9!#(B``$B$o$!!"(BRFC822 $B$O2f!9$N%5!<%P!<$rDL$C$F$$$/(B
-$B%a%C%;!<%8$NA4$F$N9T$N:G8e$K(B @code{wE aRe ElIte!!!!!1!!} $B$r2C$($k;v$rL@(B
-$B<(E*$K6X;_$O$7$F$$$J$$$>!#$5$!!"$d$C$F$_$h$&(B!!!!1'' $B$($'!"$=$N$H$*$j$G$9(B
-$B$,!"(BRFC822 $B$OG=NO$NDc$$?M$K$h$C$FFI$^$l$k$h$&$K$O=q$+$l$F$$$^$;$s!#L@Gr(B
-$B$J;v$O$=$3$G$O5DO@$5$l$F$$$^$;$s!#$G$9$+$i!#$=$&$$$&$3$H$G$9!#(B
-
-$BLdBjE@(B: $B%I%$%DHG(B Microsoft Exchange $B$OJVEz$NI=Bj$K(B @samp{Re: } $B$NBe$o$j(B
-$B$K(B @samp{AW: } $B$rIU$12C$($^$9!#;d$O$3$l$KF0MI$7$FO5Gb$7$F$$$k$U$j$r$9$k(B
-$B$3$H$b$G$-$^$7$?$,!"$=$&$9$k5$NO$,$"$j$^$;$s$G$7$?!#$=$l$O>P$&$Y$-;v$G$9!#(B
+$B%a%$%i!<$d%a!<%j%s%0%j%9%H$N%5!<%P!<$O!"%a!<%k$KBP$7$FK\Ev$KK\Ev$KGO9b$$$G$9!#!V$o$!!"(BRFC822 $B$O%5!<%P!<$rDL$C$F$$$/%a%C(B
+$B%;!<%8$N$9$Y$F$N9T$N:G8e$K(B @code{wE aRe ElItE!!!!!1!!} $B$r2C$($k$3$H$rL@(B
+$B<(E*$K6X;_$O$7$F$$$J$$$>!#$5$!!"$d$C$F$_$h$&(B!!!!1!$B!W$($'!"$=$N$H$*$j$G$9(B
+$B$,!"(BRFC822 $B$O$*$m$+O(B
+$B$,I,MW$J$N$G$9!#(B
+
+$BE,Nc(B: $B%I%$%D8lHG$N(B Microsoft Exchange $B$OJVEz$NI=Bj$K(B @samp{Re: } $B$NBe$o(B
+$B$j$K(B @samp{AW: } $B$rIU$12C$($^$9!#;d$O$3$l$KF0MI$7$FO5Gb$7$F$$$k$U$j$r$9(B
+$B$k$3$H$b$G$-$^$7$?$,!"$=$&$9$k5$NO$,$"$j$^$;$s$G$7$?!#$=$l$O>P$&$Y$-$3$H(B
+$B$G$9!#(B
 
-Gnus $B$O5-;v$rI=<($9$k$H$-$K$=$l$r@vBu$9$k$?$a$K2aEY$N4X?t$rDs6!$7$F$$$^(B
-$B$9$,!"%a!<%k$r%G%#%9%/$KJ]B8$9$kA0$KA*JL$r$9$k$3$H$,$G$-$?J}$,NI$$$G$7$g(B
-$B$&!#$=$NL\E*$N$?$a$K!";0$D$N%U%C%/$H$=$N%U%C%/$KF~$l$k;v$N$G$-$k?'!9$J4X(B
-$B?t$,$"$j$^$9!#(B
+gnus $B$OI=<($9$k5-;v$r@vBu$9$k$?$a$KB?$9$.$k$[$I$N4X?t$rDs6!$7$F$$$^$9$,!"(B
+$B%a!<%k$r%G%#%9%/$KJ]B8$9$kA0$K$U$k$$$K$+$1$k$3$H$,$G$-$?J}$,NI$$$+$b$7$l(B
+$B$^$;$s!#$=$NL\E*$N$?$a$K!";0$D$N%U%C%/$H$=$l$i$N%U%C%/$KF~$l$k$3$H$,$G$-(B
+$B$k?'!9$J4X?t$rMQ0U$7$F$$$^$9!#(B
 
 @table @code
 @item nnmail-prepare-incoming-hook
 @vindex nnmail-prepare-incoming-hook
-$B$3$N%U%C%/$O%a!<%k$K2?$+$r$9$kA0$K8F$P$l!"4pK\E*$J!"%a!<%k$rA]$$$F$-$l$$(B
-$B$K$9$k=j:n$N$?$a$K$"$j$^$9!#$=$l$OA4$F$N?7$7$$!"F~$C$F$-$?%a!<%k$r4^$s$G(B
-$B$$$k%P%C%U%!$G8F$P$l$^$9!#;H$&;v$N$G$-$k4X?t$O(B:
+$B$3$N%U%C%/$O%a!<%k$K2?$+$r$9$kA0$K8F$P$l!"Am3gE*$KA]=|$7$F$-$l$$$K$9$k=j(B
+$B:n$N$?$a$K$"$j$^$9!#$=$l$O?7$7$$$9$Y$F$NF~$C$F$-$?%a!<%k$r4^$s$G$$$k%P%C(B
+$B%U%!!<$G8F$P$l$^$9!#;H$&$3$H$N$G$-$k4X?t$O(B:
 
 @table @code
 @item nnheader-ms-strip-cr
@@ -13934,45 +14365,49 @@ Gnus $B$O5-;v$rI=<($9$k$H$-$K$=$l$r@vBu$9$k$?$a$K2aEY$N4X?t$rDs6!$7$F$$$^(B
 
 @item nnmail-prepare-incoming-header-hook
 @vindex nnmail-prepare-incoming-header-hook
-$B$3$N%U%C%/$O$=$l$>$l$N%X%C%@!<$KHO0O$r69$a$i$l$F(B (narrowed) $B8F$P$l$^$9!#(B
-$B%X%C%@!<$r$-$l$$$K$9$k$H$-$K;H$&;v$,$G$-$^$9!#;H$&;v$N$G$-$k4X?t$O(B:
+$B$3$N%U%C%/$O$=$l$>$l$N%a!<%k$N%X%C%@!<$KHO0O$r69$a$i$l$F8F$P$l$^$9!#%X%C(B
+$B%@!<$r$-$l$$$K$9$k$H$-$K;H$&$3$H$,$G$-$^$9!#;H$&$3$H$N$G$-$k4X?t$O(B:
 
 @table @code
 @item nnmail-remove-leading-whitespace
 @findex nnmail-remove-leading-whitespace
-$B%X%C%@!<$K$=$l$,NI$/8+$($k$h$&$K(B ``$BM-MQ$J(B'' $B%j%9%H%5!<%P!<$,A0$NJ}$KIU$1(B
-$B2C$($?6uGr$rL5$/$7$^$9!#$"$!$!!#(B
+$B!VLr$KN)$D!W%a!<%j%s%0%j%9%H$N%5!<%P!<$,!"8+1I$($rNI$/$9$k$?$a$@$H>N$7$F!"(B
+$B%X%C%@!<$NA0$NJ}$KIU$12C$($?6uGr$rL5$/$7$^$9(B ($BLuCm(B: $BNc$((B
+$B$P(B @samp{Subject:} $B$J$I$ND>8e$KFs$D0J>e$N6uGrJ8;z$,$"$C$?$i!"0l$D$r;D$7(B
+$B$F>C$7$^$9(B)$B!#$^$C$?$/$b$&!#(B
 
-($B$3$N4X?t$O$9$Y$F$N%a%C%;!<%8$N%\%G%#Cf$K$"$k%X%C%@!<(B ($B%\%G%#Cf$N%a%C%;!<(B
-$B%8$,;}$C$F$$$k%X%C%@!<9T$N$h$&$J$b$N(B) $B$KBP$7$F$bF0:n$9$k$N$G!";HMQ$K:]$7(B
-$B$F$O@x:_E*$J4m81$rUT$s$G$$$^$9!#$7$?$,$C$F%P%0$r=$@5$9$k$h$j$O!"J8=q$GFC(B
-$BD'$r<($9$N$,!"$b$A$m$s@5$7$$2r7h$NF;$G$9!#(B)
+($B$3$N4X?t$O$9$Y$F$N%a%C%;!<%8$N%\%G%#!<$NCf$K$"$k%X%C%@!<(B ($B%\%G%#!<$NCf(B
+$B$K$"$kJL$N%a%C%;!<%8$,;}$C$F$$$k%X%C%@!<9T$N$h$&$J$b$N(B) $B$KBP$7$F$bF0:n$9(B
+$B$k$N$G!";HMQ$K:]$7$F$O@x:_E*$J4m81$rUT$s$G$$$^$9!#$7$?$,$C$F%P%0$r=$@5$9(B
+$B$k$h$j$O!"$=$&$$$&FCD'$,$"$k$3$H$rJ8=q$G@bL@$9$k$N$,!"$b$A$m$s@5$7$$2r7h(B
+$B$NF;$G$9!#(B)
 
 @item nnmail-remove-list-identifiers
 @findex nnmail-remove-list-identifiers
-$B$$$/$D$+$N%j%9%H%5!<%P!<$OF10l<1JL;R$rIU$12C$($^$9(B---$BNc$($P!"(B
-@samp{(idm)}---$B$rA4$F$N(B @code{Subject} $B%X%C%@!<$N:G=i$KIU$1$^$9!#$=$l$O!"(B
-$B@P4o;~Be$N%a!<%k%X%C%@!<$r;H$C$F$$$k?M$K$ONI$$;v$@$H;W$$$^$9!#$3$N4X?t$O(B
-$B@55,I=8=(B @code{nnmail-list-identifiers} $B$K9gCW$9$kJ8;zNs$r$l$N%a%C%;!<%8$KHO0O$r69$a$i$l$F8F$P$l$^$9!#;H$&;v$N$G(B
-$B$-$k4X?t$O(B:
+$B$3$N%U%C%/$O$=$l$>$l$N%a%C%;!<%8$KHO0O$r69$a$i$l$F8F$P$l$^$9(B ($BLuCm(B: $B0lEY(B
+$B$KJ#?t$N%a!<%k$rl9g$G$b!"0lDL$:$D8F$P$l$k$H$$$&$3$H$G$9(B)$B!#;H$&(B
+$B$3$H$N$G$-$k4X?t$O(B:
 
 @table @code
 @item article-de-quoted-unreadable
 @findex article-de-quoted-unreadable
-Quoted Readable $BId9f2=$rI|9f2=$7$^$9!#(B
+Quoted Readable $B%(%s%3!<%I$r%G%3!<%I$7$^$9(B ($BLuCm(B: $BC5n$7$^$;$s!#$=$NBe$o$j$K!"%a!<%k$N@hF,$K$3$l$O0c$C$?%a%C%;!<%8$N=E(B
-$BJ#$G$"$k$H$$$&7Y9p$rA^F~$7$^$9!#(B
-
-$B$3$NJQ?t$O4X?t$G$"$k;v$b$G$-$^$9!#$=$N>l9g$O!"4X?t(B
-$B$O(B @code{Message-ID} $B$r0z?t$H$7$F!"Ev$N%a%C%;!<%8$KHO0O$r69$a$i$l$?%P%C(B
-$B%U%!$+$i8F$P$l$^$9!#$3$N4X?t$O(B @code{nil}, @code{warn}, @code{delete} $B$N(B
-$B$I$l$+$rJV$5$J$1$l$P$J$j$^$;$s!#(B
-
-$BJQ?t$r(B @code{nil} $B$K@_Dj$9$k;v$K$h$C$F!"$3$N5!G=$r40A4$K;H$o$J$$$h$&$K$9(B
-$B$k;v$,$G$-$^$9!#(B
-
-$B$b$7A4$F$N=EJ#%a!<%k$rFCJL$J(B @dfn{duplicate} $B%0%k!<%W$KF~$l$?$$$N$G$"$l(B
-$B$P!"IaDL$N%a!<%kJ,3dJ}K!$r;H$C$F$=$l$r$9$k$3$H$,$G$-$^$9(B:
+$B$$$/$D$+$N%a!<%j%s%0%j%9%H$N%a%s%P!<$J$i!";~!9F1$8%a!<%k$rFs$DC5n$7$J$$Be$o$j$K!"$=$l$,JL$N%a%C%;!<(B
+$B%8$N=EJ#$G$"$k$H$$$&7Y9p$r%a!<%k$N%X%C%@!<$KA^F~$7$^$9!#(B
+
+$B$3$NJQ?t$O4X?t$G$"$k$3$H$b$G$-$^$9!#$=$N>l9g!"4X?t$OEv$N%a%C%;!<%8$KHO0O(B
+$B$r69$a$i$l$?%P%C%U%!!<$+$i(B @code{Message-ID} $B$r0z?t$H$7$F8F$P$l$^$9!#$3(B
+$B$N4X?t$O(B @code{nil}, @code{warn}, @code{delete} $B$N$I$l$+$rJV$5$J$1$l$P$J(B
+$B$j$^$;$s!#(B
+
+$BJQ?t$r(B @code{nil} $B$K@_Dj$9$k$3$H$K$h$C$F!"$3$N5!G=$r40A4$K;H$o$J$$$h$&$K(B
+$B$9$k$3$H$,$G$-$^$9!#(B
+
+$B$b$7$9$Y$F$N=EJ#$7$?%a!<%k$rFCJL$J(B @dfn{duplicates} $B%0%k!<%W$KF~$l$?$$$N(B
+$B$G$"$l$P!"IaDL$N%a!<%kJ,3dJ}K!$r;H$C$F$=$l$r$9$k$3$H$,$G$-$^$9(B:
 
 @lisp
 (setq nnmail-split-fancy
-      '(| ;; @r{$B=EJ#%a%C%;!<%8$OJ,N%$5$l$?%0%k!<%W$X9T$-$^$9!#(B}
+      '(| ;; @r{$B=EJ#$7$?%a%C%;!<%8$OJ,$+$l$?%0%k!<%W$X!#(B}
         ("gnus-warning" "duplicat\\(e\\|ion\\) of message" "duplicate")
-        ;; @r{$B%G!<%b%s$d%]%9%H%^%9%?!<$d;w$?$h$&$J$b$N$+$i$N(B}
-        ;; @r{$B%a%C%;!<%8$OB>$N$H$3$m$X!#(B}
+        ;; @r{$B%G!<%b%s$d%]%9%H%^%9%?!<$J$I$+$i$N%a%C%;!<%8$OB>$X!#(B}
         (any mail "mail.misc")
-        ;; @r{$BB>$NK!B'!#(B}
+        ;; @r{$BB>$N5,B'!#(B}
         [ ... ] ))
 @end lisp
 
+@noindent
 $B$b$7$/$O$NK!B'!#(B}
+        ;; @r{$BB>$N5,B'!#(B}
         [...]))
 @end lisp
 
-$B$9$P$i$7$$5!G=$,$"$j$^$9(B: $B$b$7Dj$9$k$H$$$&$&$k$5$$JJ$,$"$j$^$9!#$3$l$O$b$C$H$b$G$J(B
-$B$$;v$G$O$J$$$+$b$7$l$^$;$s$,!"$"$J$?$NK>$`;v$G$O$J$$$+$b$7$l$^$;$s!#(B
+$B$"$J$?$,;H$$;O$a$?$I$s$J%a!<%k%P%C%/%(%s%I$G$b!"$"$J$?$,$=$l$i$G%a!<%k$r(B
+$BFI$_$?$$$H;W$C$F$$$k$H2>Dj$9$k$H$$$&!"G:$^$7$$JJ$r;}$C$F$$$k$3$H$K5$$,IU(B
+$B$/$G$7$g$&!#$3$l$O7h$7$FIT9gM}$G$O$J$$$+$b$7$l$^$;$s$,!"$"$J$?$NK>$`$3$H(B
+$B$G$O$J$$$+$b$7$l$^$;$s!#(B
 
-$B$b$7(B @code{mail-sources} $B$H(B @code{nnmail-spool-file} $B$r(B @code{nil} $B$K@_(B
-$BDj$9$k$H!"$I$N%P%C%/%(%s%I$bF~$C$F$/$k%a!<%k$rFI$b$&$H;n$_$k;v$O$J$/!"K>(B
-$B$`;v$No$KK~B-$7$F$$$F!"8E(B
-$B$$(B Rmail $B%U%!%$%k$,(B @code{nnbabyl} $B$G1#$5$l$F$$$k$N$r$5$C$H8+$?$$$@$1$J(B
-$B$i!"$3$l$OM>J,$G$7$g$&!#$9$Y$F$N%P%C%/%(%s%I$O(B $B%P%C%/%(%s%I(B-
-@code{get-new-mail} $B$H$$$&JQ?t$r;}$C$F$$$^$9!#$b$7(B @code{nnbabyl} $B$N%a!<(B
-$B%kFI$_9~$_$r;HMQIT2D$K$7$?$$$N$G$"$l$P!"%0%k!<%W$N;ve$N%5!<%P!<(B
-$B$r(B @code{nnbabyl-get-new-mail} $B$r(B @code{nil} $B$K@_Dj$9$k$h$&$KJT=8$7$^$9!#(B
-
-$BA4$F$N%a!<%k%P%C%/%(%s%I$OF~$C$F$/$k%a!<%k$rFI$_9~$`$H$-$K!"J]B8$5$l$k$Y(B
-$B$-5-;v$KHO0O$r69$a$F(B @code{nn}*@code{-prepare-save-mail-hook} $B$r8F$S$^$9!#(B
+$B$G$b!"$=$l$O9T$-2a$.$G$7$g$&!#$"$J$?$,!"Nc$($P(B @code{nnml} $B$G%a!<%k$rFI(B
+$B$`$3$H$H!"$7$^$$$3$s$G$"$k8E$$(B Rmail $B%U%!%$%k$r(B @code{nnbabyl} $B$r;H$C$F(B
+$B$6$C$HGA$/$3$H$@$1$G!"$^$C$?$/K~B-$7$F$$$F$$$k$N$J$i$P!#$9$Y$F$N%P%C%/%((B
+$B%s%I$K$O(B  $B%P%C%/%(%s%I(B-@code{get-new-mail}  $B$H$$$&JQ?t$,$"$j$^$9!#$b(B
+$B$7(B @code{nnbabyl} $B$,%a!<%k$rFI$_9~$_$r$d$a$5$;$?$$$N$G$"$l$P!"$=$N%0%k!<(B
+$B%W$N2>A[%5!<%P!$l$N%a!<%k5-;v$K$=$l$,$I$N%0%k!<%W$K(B
 $BB0$7$F$$$k$+$r<($9DI2C$N%X%C%@!<$r2C$($^$9!#(B
 
-$B;ve$N%5!<%P!<$N@_Dj(B:
+$B2>A[%5!<%P!<$N@_Dj(B:
 
 @table @code
 @item nnmbox-mbox-file
 @vindex nnmbox-mbox-file
-$BMxMQA0!#4{DjCM(B
+$BMxMQA0!#%G%#%U%)%k%H(B
 $B$O(B @file{~/mbox} $B$G$9!#(B
 
 @item nnmbox-activate-file
 @vindex nnmbox-active-file
-$B%a!<%k%\%C%/%9$N%"%/%F%#%V%U%!%$%k$NL>A0!#4{DjCM(B
+$B%a!<%k%\%C%/%9$N%"%/%F%#%V%U%!%$%k$NL>A0!#%G%#%U%)%k%H(B
 $B$O(B @file{~/.mbox-active} $B$G$9!#(B
 
 @item nnmbox-get-new-mail
 @vindex nnmbox-get-new-mail
 @code{nil} $B$G$J$1$l$P!"(B@code{nnmbox} $B$OF~$C$FMh$?%a!<%k$rFI$_9~$s$G%0%k!<(B
-$B%W$KJ,3d$7$^$9!#4{DjCM$O(B @code{t} $B$G$9!#(B
+$B%W$KJ,3d$7$^$9!#%G%#%U%)%k%H$O(B @code{t} $B$G$9!#(B
 @end table
 
 @node Rmail Babyl
@@ -14132,26 +14573,26 @@ Gnus $B$O%a!<%k%0%k!<%W$rF0:n$9$k$h$&$K$9$k$H%a!<%k%9%W!<%k$rFI$_9~$_$^$9!#(B
 
 @vindex nnbabyl-active-file
 @vindex nnbabyl-mbox-file
-@dfn{nnbabyl} $B%P%C%/%(%s%I$O%a!<%k$rC_B"$9$k$?$a$K(B Babyl $B%a!<%k%\%C%/(B
+@dfn{nnbabyl} $B%P%C%/%(%s%I$O%a!<%k$r3JG<$9$k$?$a$K(B Babyl $B%a!<%k%\%C%/(B
 $B%9(B ($BJLL>(B @dfn{Rmail mbox}) $B$r;H$$$^$9!#(B@code{nnbabyl} $B$O$=$l$>$l$N5-;v$K(B
 $B$=$l$,$I$N%0%k!<%W$KB0$7$F$$$k$+$r<($9DI2C$N%X%C%@!<$r2C$($^$9!#(B
 
-$B;ve$N%5!<%P!<$N@_Dj(B:
+$B2>A[%5!<%P!<$N@_Dj(B:
 
 @table @code
 @item nnbabyl-mbox-file
 @vindex nnbabyl-mbox-file
-Rmail mbox $B%U%!%$%k$NL>A0!#4{DjCM$O(B @file{~/RMAIL} $B$G$9!#(B
+Rmail mbox $B%U%!%$%k$NL>A0!#%G%#%U%)%k%H$O(B @file{~/RMAIL} $B$G$9!#(B
 
 @item nnbabyl-active-file
 @vindex nnbabyl-active-file
-rmail box $B$N$?$a$N%"%/%F%#%V%U%!%$%k$NL>A0!#4{DjCM(B
+Rmail mbox $B$N$?$a$N%"%/%F%#%V%U%!%$%k$NL>A0!#%G%#%U%)%k%H(B
 $B$O(B @file{~/.rmail-active} $B$G$9!#(B
 
 @item nnbabyl-get-new-mail
 @vindex nnbabyl-get-new-mail
 @code{nil} $B$G$J$1$l$P!"(B@code{nnbabyl} $B$OF~$C$F$/$k%a!<%k$rFI$_9~$_$^$9!#(B
-$B4{DjCM$O(B @code{t} $B$G$9!#(B
+$B%G%#%U%)%k%H$O(B @code{t} $B$G$9!#(B
 @end table
 
 @node Mail Spool
@@ -14159,31 +14600,31 @@ rmail box $B$N$?$a$N%"%/%F%#%V%U%!%$%k$NL>A0!#4{DjCM(B
 @cindex nnml
 @cindex mail @acronym{NOV} spool
 
-@dfn{nnml} $B%9%W!<%k%a!<%kMM<0$OB>$NCN$i$l$?MM<0$H$O8_49@-$,$"$j$^$;$s!#(B
-$B$=$l$O>/$7Cm0U$7$F;H$o$l$k$Y$-$G$9!#(B
+@dfn{nnml} $B%9%W!<%k%a!<%kMM<0$OB>$NCN$i$l$F$$$kMM<0$H$O8_49@-$,$"$j$^$;(B
+$B$s!#$=$l$O>/$7Cm0U$7$F;H$o$l$k$Y$-$G$9!#(B
 
 @vindex nnml-directory
-$B$b$7$3$N%P%C%/%(%s%I$r;H$&$H!"(Bgnus $B$OF~$C$F$/$k%a!<%k$r!"$=$l$>$l$N%a!<(B
-$B%k$r(B 1 $B%U%!%$%k$H$7$F%U%!%$%k$KJ,3d$7!"5-;v$rJQ(B
-$B?t(B @code{nnml-directory} $B$G;XDj$5$l$?%G%#%l%/%H%j!<$N2<$NBP1~$9$k%G%#%l(B
-$B%/%H%j!<$KF~$l$^$9!#%G%#%U%)%k%H$NCM$O(B @file{~/Mail/} $B$G$9!#(B
-
-$BA0$b$C$F%G%#%l%/%H%j!<$r:n$C$F$*$/I,MW$O$"$j$^$;$s!#$=$l$NLLE]$O(B gnus $B$,(B
-$B8+$F$/$l$^$9!#(B
-
-$B$b$7$"$J$?$N%"%+%&%s%H$KC_@Q$G$-$k%U%!%$%k$N?t$K87L)$J@)8B$,$"$k$J$i!"$3(B
-$B$N%P%C%/%(%s%I$r;H$&$Y$-$G$O$"$j$^$;$s!#$=$l$>$l$N%a!<%k$O$=$l<+?H$N%U%!(B
-$B%$%k$rF@$^$9$N$G!"?t=54V$G$?$/$5$s$N(B i$B%N!<%I$r@jM-$9$k2DG=@-$O==J,$K$"$j(B
-$B$^$9!#JL$K$3$l$,LdBj$G$J$/!"?F@Z$J%7%9%F%`4IM}$l$N%a!<%k(B
+$B$r(B 1 $B%U%!%$%k$H$7$F%U%!%$%k$KJ,3d$7!"5-;v$rJQ?t(B @code{nnml-directory} $B$G(B
+$B;XDj$5$l$?%G%#%l%/%H%j!<$N2<$NBP1~$9$k%G%#%l%/%H%j!<$KF~$l$^$9!#%G%#%U%)(B
+$B%k%H$NCM$O(B @file{~/Mail/} $B$G$9!#(B
+
+$BA0$b$C$F%G%#%l%/%H%j!<$r:n$C$F$*$/I,MW$O$"$j$^$;$s!#$=$NLLE]$O(B gnus $B$,$9(B
+$B$Y$F8+$F$/$l$^$9!#(B
+
+$B$"$J$?$N%"%+%&%s%H$KJ]B8$G$-$k%U%!%$%k$N?t$K87L)$J@)8B$,$"$k$J$i!"$3$N%P%C(B
+$B%/%(%s%I$r;H$&$Y$-$G$O$"$j$^$;$s!#$=$l$>$l$N%a!<%k$O$=$l<+?H$N%U%!%$%k$r(B
+$BH<$&$N$G!"?t=54V$G?t@i$N(B i$B%N!<%I$r@jM-$9$k2DG=@-$O==J,$K$"$j$^$9!#$"$J$?(B
+$B$K$H$C$F$3$l$,LdBj$G$J$/!"?F@Z$J%7%9%F%`4IM}A0!#4{DjCM(B
 @code{nnml} $B%5!<%P!<$O(B @code{tar} $B$J$I$r;H$C$F%P%C%/%"%C%W$7$?$j!"8e$G$"(B
 $B$J$?$,IU$1$?0u$,$9$Y$FJ]$?$l$?>uBV$G(B gnus $B$KLa$9(B ($BK\Mh$N(B @code{nnml} $B%5!<(B
 $B%P!<$K$h$C$FDI2C$9$k(B) $B$3$H$,$G$-$kFC$l$N(B @code{nnml} $B%0%k!<%W$N%G%#%l%/%H%jFb$N!"DL(B
+$B$O$=$l$>$l$N(B @code{nnml} $B%0%k!<%W$N%G%#%l%/%H%j!o(B @file{.marks} $B%U%!%$%k(B (@code{nnml-marks-file-name} $B$r;2>H(B) $B$K3JG<$5(B
 $B$l$^$9!#$^$?!"8D!9$N(B @code{nnml} $B%0%k!<%W$K$D$$$F$b%P%C%/%"%C%W$9$k$3$H(B
-$B$,2DG=$G!"(B($B%P%C%/%"%C%W$r(B nnml $B%G%#%l%/%$%H%j$KLa$7$?8e$G(B) @kbd{G m} $B%-!<(B
-$B$r;H$C$F$=$N%0%k!<%W$r85$KLa$7$^$9!#(B
+$B$,2DG=$G!"$=$&$9$k$K$O(B ($B%P%C%/%"%C%W$r(B nnml $B%G%#%l%/%H%j!<$KLa$7$?8e(B
+$B$G(B) @kbd{G m} $B%-!<$r;H$C$F$=$N%0%k!<%W$r85$KLa$7$F2<$5$$!#(B
 
-$B$b$72?$i$+$NM}M3$K$h$C$F(B @file{.marks} $B%U%!%$%k$,$*$+$7$/$J$C$F$$$k$H;W$C(B
-$B$?$H$-$O!"C1$K$=$l$iA4It$r>C$7$F$7$^$&$3$H$,$G$-$^$9!#(Bgnus $B$OC$7$F$7$^$($PNI$$$G$7$g$&!#(Bgnus $B$Oe$N%5!<%P!<$N@_Dj(B:
+$B2>A[%5!<%P!<$N@_Dj(B:
 
 @table @code
 @item nnml-directory
 @vindex nnml-directory
-$BA4$F$N(B @code{nnml} $B%G%#%l%/%H%j!<$O$3$N%G%#%l%/%H%j!<$N2<$KCV$+$l$^$9!#(B
-$B4{DjCM$O(B @code{message-directory} $B$NCM(B ($B$=$N4{DjCM$O(B @file{~/Mail}) $B$G$9!#(B
+$B$9$Y$F$N(B @code{nnml} $B%G%#%l%/%H%j!<$O$3$N%G%#%l%/%H%j!<$N2<$KCV$+$l$^$9!#(B
+$B%G%#%U%)%k%H$O(B @code{message-directory} $B$NCM(B ($B$=$N%G%#%U%)%k%HCM(B
+$B$O(B @file{~/Mail}) $B$G$9!#(B
 
 @item nnml-active-file
 @vindex nnml-active-file
-@code{nnml} $B%5!<%P!<$N$?$a$N%"%/%F%#%V%U%!%$%k!#4{DjCM(B
+@code{nnml} $B%5!<%P!<$N$?$a$N%"%/%F%#%V%U%!%$%k!#%G%#%U%)%k%H(B
 $B$O(B @file{~/Mail/active} $B$G$9!#(B
 
 @item nnml-newsgroups-file
-@vindex nnml-newgroups-file
-@code{nnml} $B%0%k!<%W5-=R%U%!%$%k!#(B@xref{Newsgroups File Format}. $B4{DjCM(B
-$B$O(B @file{~/Mail/newsgroups} $B$G$9!#(B
+@vindex nnml-newsgroups-file
+@code{nnml} $B%0%k!<%W5-=R%U%!%$%k!#(B@xref{Newsgroups File Format}. $B%G%#%U%)(B
+$B%k%H$O(B @file{~/Mail/newsgroups} $B$G$9!#(B
 
 @item nnml-get-new-mail
 @vindex nnml-get-new-mail
-@code{nil} $B$G$J$1$l$P!"(B@code{nnml} $B$OF~$C$FMh$?%a!<%kFI$_9~$_$^$9!#4{Dj(B
-$BCM$O(B @code{t} $B$G$9!#(B
+@code{nil} $B$G$J$1$l$P!"(B@code{nnml} $B$OF~$C$FMh$?%a!<%kFI$_9~$_$^$9!#%G%#(B
+$B%U%)%k%H$O(B @code{t} $B$G$9!#(B
 
 @item nnml-nov-is-evil
 @vindex nnml-nov-is-evil
 @code{nil} $B$G$J$1$l$P!"$3$N%P%C%/%(%s%I$O$I$N(B @acronym{NOV} $B%U%!%$%k$bL5(B
-$B;k$7$^$9!#4{DjCM$O(B @code{nil} $B$G$9!#(B
+$B;k$7$^$9!#%G%#%U%)%k%H$O(B @code{nil} $B$G$9!#(B
 
 @item nnml-nov-file-name
 @vindex nnml-nov-file-name
@@ -14235,30 +14677,44 @@ rmail box $B$N$?$a$N%"%/%F%#%V%U%!%$%k$NL>A0!#4{DjCM(B
 
 @item nnml-prepare-save-mail-hook
 @vindex nnml-prepare-save-mail-hook
-$BJ]B8$9$kA0$K5-;v$KHO0O$r69$a$FA0$G$9!#%G%#%U%)%k%H$O(B @file{.marks} $B$G$9!#(B
+$B!V0u!W%U%!%$%k$NL>A0$G$9!#%G%#%U%)%k%H$O(B @file{.marks} $B$G$9!#(B
 
 @item nnml-use-compressed-files
 @vindex nnml-use-compressed-files
-$BHs(B-@code{nil} $B$@$C$?$i(B @code{nnml} $B$O05=L$5$l$?%a%C%;!<%8%U%!%$%k$r;H$&(B
-$B$3$H$r9MN8$KF~$l$^$9!#(B
+$BHs(B-@code{nil} $B$@$C$?$i!"(B@code{nnml} $B$O05=L$5$l$?%a%C%;!<%8%U%!%$%k$r07$&(B
+$B$3$H$,$G$-$k$h$&$K$J$j$^$9!#$?$@$7(B @code{auto-compression-mode} $B$,M-8z$K(B
+$B$J$C$F$$$J$1$l$P$J$j$^$;$s(B (@pxref{Compressed Files, ,Compressed Files,
+emacs, The Emacs Editor})$B!#(B@code{nnml-use-compressed-files} $B$NCM$,J8;zNs(B
+$B$@$C$?>l9g!"$=$l$O05=L%W%m%0%i%`$r;XDj$9$k%U%!%$%k3HD%;R$H$7$F;H$o$l$^$9!#(B
+Emacs $B$,$=$l$r%5%]!<%H$7$F$$$l$P!"$=$l$r(B @samp{.bz2} $B$K@_Dj$9$k$3$H$,$G(B
+$B$-$^$9!#CM(B @code{t} $B$O(B @samp{.gz} $B$HEy2A$G$9!#(B
+
+@item nnml-compressed-files-size-threshold
+@vindex nnml-compressed-files-size-threshold
+$B%a%C%;!<%8%U%!%$%k$r05=L$9$k$+$I$&$+$rH=CG$9$k$?$a$N!"%5%$%:$NogCM$G$9!#(B
+@code{nnml-use-compressed-files} $B$,Hs(B-@code{nil} $B$K@_Dj$5$l$F$$$F!"K\J8(B
+$B$NJ8;z?t$,$3$NJQ?t$NCM$h$jBg$-$+$C$?$i!"%a%C%;!<%8%U%!%$%k$O05=L$5$l$^$9!#(B
 @end table
 
 @findex nnml-generate-nov-databases
-@code{nnml} $B%0%k!<%W$H(B @acronym{NOV} $B%U%!%$%k$,40A4$KNI$$>uBV$G$J$/$J$C(B
-$B$F$7$^$C$?$J$i!"(B@kbd{M-x nnml-generate-nov-databases} $B$HBG$D;v$K$h$C$F!"(B
-$B40A4$K99?7$9$k;v$,$G$-$^$9!#$3$NL?Na$O!"$=$l$>$lA4$F$N%U%!%$%k$r8+$k;v$K(B
-$B$h$C$F(B @code{nnml} $B3,AXA4BN$r%H%m!<%k5{LV$G$5$i$$$^$9$N$G!"$=$l$,=*$o$k(B
+@code{nnml} $B%0%k!<%W$H(B @acronym{NOV} $B%U%!%$%k$ND4;R$,40A4$K68$C$F$7$^$C(B
+$B$?$i!"(B@kbd{M-x nnml-generate-nov-databases} $B$H%?%$%W$9$k$3$H$K$h$C$F!"40(B
+$BA4$K99?7$9$k$3$H$,$G$-$^$9!#$3$NL?Na$O!"$=$l$>$l$9$Y$F$N%U%!%$%k$r8+$k$3(B
+$B$H$K$h$C$F(B @code{nnml} $B3,AXA4BN$r%H%m!<%k5{LV$G$5$i$&$N$G!"$=$l$,=*$o$k(B
 $B$^$G$K$O;~4V$,$+$+$k$+$b$7$l$^$;$s!#$3$N5!G=$X$N$h$jNI$$%$%s%?!<%U%'!<%9(B
-$B$O%5!<%P!<%P%C%U%!$G8+$D$+$k$G$7$g$&(B (@pxref{Server Commands})$B!#(B
+$B$O%5!<%P!<%P%C%U%!!<$G8+$D$+$k$G$7$g$&(B (@pxref{Server Commands})$B!#(B
+
+$BLuCm(B: $BC10l$N(B @code{nnml} $B%0%k!<%W$N(B @acronym{NOV} $B%G!<%?%Y!<%9$r:F@8@.$5(B
+$B$;$k$?$a$N(B @code{nnml-generate-nov-databases-1} $B$H$$$&L?Na$b$"$j$^$9!#(B
 
 @node MH Spool
 @subsubsection MH $B%9%W!<%k(B
@@ -14266,32 +14722,33 @@ rmail box $B$N$?$a$N%"%/%F%#%V%U%!%$%k$NL>A0!#4{DjCM(B
 @cindex mh-e mail spool
 
 @code{nnmh} $B$O!"(B@acronym{NOV} $B%G!<%?%Y!<%9$r:n$i$J$$$3$H$H%"%/%F%#%V%U%!(B
-$B%$%k$d0u%U%!%$%k$rJ];}$7$J$$;v$r=|$$$F!"(B@code{nnml} $B$H;w$F$$$^$9!#$=$N$3(B
-$B$H$O(B @code{nnmh} $B$r(B @code{nnml} $B$h$j(B @emph{$B$+$J$j(B} $BCY$$%P%C%/%(%s%I$K$7(B
-$B$F$$$^$9$,!"$=$l$O(B procmail $B$N%9%/%j%W%H$r=q$/$?$a$K$:$C$H$d$j$d$9$/$J$C(B
-$B$F$b$$$^$9!#(B
+$B%$%k$d0u%U%!%$%k$rJ];}$7$J$$$3$H$r=|$$$F!"(B@code{nnml} $B$H;w$F$$$^$9!#$3$N(B
+$B$3$H$O(B @code{nnmh} $B$r(B @code{nnml} $B$h$j(B @emph{$B$+$J$j(B} $BCY$$%P%C%/%(%s%I$K(B
+$B$7$F$$$^$9$,!"(Bprocmail $B$N%9%/%j%W%H$r=q$/$3$H$O$:$C$H$d$j$d$9$/$J$C$F$b(B
+$B$$$^$9!#(B
 
-$B;ve$N%5!<%P!<$N@_Dj(B:
+$B2>A[%5!<%P!<$N@_Dj(B:
 
 @table @code
 @item nnmh-directory
 @vindex nnmh-directory
-$BA4$F$N(B @code{nnmh} $B%G%#%l%/%H%j!<$O$3$N%G%#%l%/%H%j!<$N2<$KCV$+$l$^$9!#(B
-$B4{DjCM$O(B @code{message-directory} $B$NCM(B ($B$=$N4{DjCM$O(B @file{~/Mail}) $B$G$9!#(B
+$B$9$Y$F$N(B @code{nnmh} $B%G%#%l%/%H%j!<$O$3$N%G%#%l%/%H%j!<$N2<$KCV$+$l$^$9!#(B
+$B%G%#%U%)%k%H$O(B @code{message-directory} $B$NCM(B ($B$=$N%G%#%U%)%k%H(B
+$B$O(B @file{~/Mail}) $B$G$9!#(B
 
 @item nnmh-get-new-mail
 @vindex nnmh-get-new-mail
-@code{nil} $B$G$J$1$l$P!"(B@code{nnmh} $B$OF~$C$F$/$k%a!<%k$rFI$_9~$_$^$9!#4{(B
-$BDjCM$O(B @code{t} $B$G$9!#(B
+@code{nil} $B$G$J$1$l$P!"(B@code{nnmh} $B$OF~$C$F$/$k%a!<%k$rFI$_9~$_$^$9!#%G%#(B
+$B%U%)%k%H$O(B @code{t} $B$G$9!#(B
 
 @item nnmh-be-safe
 @vindex nnmh-be-safe
 @code{nil} $B$G$J$1$l$P!"(B@code{nnmh} $B$O%U%)%k%@!<$K$"$k5-;v$,pJs$rD4$Y$^$9$N$G!"$3$l$r(B @code{t} $B$K@_Dj$9$k(B
-$B;v$O?<9o$JB.EYDc2<$,5/$3$k$H$$$&;v$G$9!#$b$7(B @code{nnmh} $B5-;v$rFI$`$N(B
-$B$K(B gnus $B0J30$N$b$N$r;H$C$F$$$J$$$N$G$"$l$P!"$3$NJQ?t$r(B @code{t} $B$K@_Dj$9(B
-$B$kI,MW$O$"$j$^$;$s!#4{DjCM$O(B @code{nil} $B$G$9!#(B
+$B$K(B gnus $B$,9M$($F$$$k$b$N$HF1$8$G$"$k$+$rD4$Y$k$H$$$&GOpJs$rD4$Y$k$N$G!"$3$l$r(B @code{t} $B$K@_Dj(B
+$B$9$k$H?<9o$JB.EYDc2<$,5/$3$j$^$9!#(B@code{nnmh} $B$N5-;v$rFI$`$N$K(B gnus $B0J30(B
+$B$N$b$N$r;H$C$F$$$J$$$N$G$"$l$P!"$3$NJQ?t$r(B @code{t} $B$K@_Dj$9$kI,MW$O$"$j(B
+$B$^$;$s!#%G%#%U%)%k%H$O(B @code{nil} $B$G$9!#(B
 @end table
 
 @node Maildir
@@ -14299,58 +14756,60 @@ rmail box $B$N$?$a$N%"%/%F%#%V%U%!%$%k$NL>A0!#4{DjCM(B
 @cindex nnmaildir
 @cindex maildir
 
-@code{nnmaildir} $B$O(B Gnus $B$N%0%k!<%W$KBP1~$7$?3F!9(B
-$B$N(B maildir $B$K(B maildir $B%U%)!<%^%C%H$G%a!<%k$r3JG<$7$^$9!#$3$N%U%)!<%^%C(B
-$B%H$O(B @uref{http://cr.yp.to/proto/maildir.html} $B$*$h(B
+@code{nnmaildir} $B$O3F!9$N(B gnus $B$N%0%k!<%W$KBP1~$9$k(B maildir $B$K!"(B
+maildir $B%U%)!<%^%C%H$G%a!<%k$r3JG<$7$^$9!#$3$N%U%)!<%^%C%H(B
+$B$O(B @uref{http://cr.yp.to/proto/maildir.html} $B$*$h(B
 $B$S(B @uref{http://www.qmail.org/man/man5/maildir.html} $B$GJ8=q2=$5$l$F$$$^(B
 $B$9!#$^$?(B @code{nnmaildir} $B$O(B maildir $B$NCf$N(B @file{.nnmaildir/} $B%G%#%l%/(B
-$B%H%j$KFCJL$J>pJs$r3JG<$7$^$9!#(B
+$B%H%j!<$KDI2C$N>pJs$r3JG<$7$^$9!#(B
 
-Maildir $B%U%)!<%^%C%H$O%m%C%/$rI,MW$H$7$J$$F1;~G[Aw$H9VFI$r2DG=$K$9$k$?$a(B
-$B$K@_7W$5$l$^$7$?!#B>$N%P%C%/%(%s%I$G$O!"%a!<%k$r2?$i$+$N%9%W!<%k$KEO$7$F(B
-$B$=$N%9%W!<%k$+$i%0%k!<%W$KJ,3d$9$k$?$a$K(B Gnus $B$r@_Dj$7$J$1$l$P$J$i$J$$$G(B
-$B$7$g$&!#$=$l$O:#$^$GDL$j(B @code{nnmaildir} $B$G9T$J$&$3$H$,$G$-$^$9$,!"$b$C(B
-$B$H0lHLE*$J@_Dj$O(B Gnus $B$N%0%k!<%W$H$7$F8=$o$l$k(B maildir $B$K%a!<%k$rD>@\G[(B
-$BAw$9$k$3$H$G$9!#(B
+Maildir $B%U%)!<%^%C%H$O!"G[Aw$H9VFI$r!"%m%C%/$rI,MW$H$;$:$KF1;~$K9T$J$&$3(B
+$B$H$,$G$-$k$h$&$K$9$k$?$a$K@_7W$5$l$^$7$?!#B>$N%P%C%/%(%s%I$G$O!"%a!<%k$r(B
+$B2?$i$+$N%9%W!<%k$KEO$7$?8e$G!"$=$N%9%W!<%k$+$i%0%k!<%W$KJ,3d$9$k$?$a$K!"(B
+gnus $B$r@_Dj$7$J$1$l$P$J$i$J$$$G$7$g$&!#$=$l$O:#$^$GDL(B
+$B$j(B @code{nnmaildir} $B$G9T$J$&$3$H$,$G$-$^$9$,!"$b$C$HIaDL$N$d$jJ}$O!"(B
+gnus $B$N%0%k!<%W$H$7$F8=$o$l$k(B maildir $B$KG[Aw$5$l$?%a!<%k$r!"D>@\$l$N(B maildir
-$B$K3JG<$7$^$9!#$=$l$K$h$C$F!"$"$k(B Gnus $B$N4D6-$+$iJL$N>l=j$K(B maildir $BA4BN(B
-$B$r%3%T!<$9$k$3$H$,$G$-!"0u$OJ]B8$5$l$^$9!#(B
+@code{nnmaildir} $B$O5-;v$N0u$H(B @acronym{NOV} $B%G!<%?$r!"$=$l$>$l(B
+$B$N(B maildir $B$K3JG<$7$^$9!#$=$l$K$h$C$F!"$"$k(B gnus $B$N4D6-$+$iJL$N>l=j(B
+$B$K(B maildir $BA4BN$r%3%T!<$9$k$3$H$,$G$-!"0u$OJ];}$5$l$^$9!#(B
 
 $B2>A[%5!<%P!<$N@_Dj(B:
 
 @table @code
 @item directory
 $B$=$l$>$l$N(B @code{nnmaildir} $B%5!<%P!<(B ($B0l$D$r1[$($k%5!<%P!<$,I,MW$@$H$O$H(B
-$B$F$b;W$($^$;$s$,(B) $B$KBP$7$F%G%#%l%/%H%j$r:n$j!"$=$l$r(B maildir $B$^$?(B
-$B$O(B maildir $B$X$N%7%s%\%j%C%/%j%s%/$H$7$F$NL\E*(B
-$B$N$?$a$K$9$G$K;H$o$l$F$$$k%G%#%l%/%H%j$rA*$s$G$O$$$1$^$;$s(B)$B!#$=$l$>$l(B
-$B$N(B maildir $B$O!"$=$N%5!<%P!<$N%K%e!<%9%0%k!<%W$H$7$F(B Gnus $B$K8=$l!"%7%s%\(B
-$B%j%C%/%j%s%/$N%U%!%$%kL>$,$=$N%0%k!<%W$NL>A0$K$J$j$^$9!#%G%#%l%/%H%j$K$"(B
-$B$k(B @samp{.} $B$G;O$^$k$I$s$J%U%!%$%kL>$bL5;k$5$l$^$9!#%G%#%l%/%H%j$O:G=i(B
-$B$K(B Gnus $B$r5/F0$7$?$H$-$H%0%k!<%W%P%C%U%!$G(B @kbd{g} $B$r%?%$%W$7$?$H$-$O$$(B
-$B$D$G$bAv::$5$l!"$I$l$+$N(B maildir $B$,:o=|$^$?$ODI2C$5$l$?$H$-(B
-$B$K(B @code{nnmaildir} $B$ODLCN$7$^$9!#(B
-
-@code{directory} $B%Q%i%a!<%?$NCM$O(B Lisp $B<0$G$J$1$l$P$J$j$^$;$s!#(B
-@code{eval} $B$G=hM}$5$l$?8e$G!"(B@code{expand-file-name} $B$K$h$C$F$3$N%5!<%P!<(B
-$B$N$?$a$N%G%#%l%/%H%j$N%Q%9$r3MF@$7$^$9!#$=$N7k2LF@$i$l$?J8;zNs$,!"%5!<%P!<(B
+$B$F$b;W$($^$;$s$,(B) $B$KBP$7$F%G%#%l%/%H%j!<$r:n$j!"$=$l$r(B maildir $B$^$?(B
+$B$O(B maildir $B$X$N%7%s%\%j%C%/%j%s%/$H$7$F$NL\E*$N$?$a$K$9$G$K;H$o$l$F$$$k%G%#%l%/(B
+$B%H%j!<$rA*$s$G$O$$$1$^$;$s(B)$B!#$=$l$>$l$N(B maildir $B$O!"$=$N%5!<%P!<$N%K%e!<(B
+$B%9%0%k!<%W$H$7$F(B gnus $B$K8=$l!"%7%s%\%j%C%/%j%s%/$N%U%!%$%kL>$,$=$N%0%k!<(B
+$B%W$NL>A0$K$J$j$^$9!#%G%#%l%/%H%j!<$K$"$k(B @samp{.} $B$G;O$^$k$I$s$J%U%!%$%k(B
+$BL>$bL5;k$5$l$^$9!#%G%#%l%/%H%j!<$O:G=i$K(B gnus $B$r5/F0$7$?$H$-$H%0%k!<%W%P%C(B
+$B%U%!!<$G(B @kbd{g} $B$r%?%$%W$7$?$H$-$O$$$D$G$bAv::$5$l!"$I$l$+$N(B maildir $B$,(B
+$B:o=|$^$?$ODI2C$5$l$F$$$k$H!"(B@code{nnmaildir} $B$O$=$N$H$-$K$=$l$rCN$j$^$9!#(B
+
+@code{directory} $B%Q%i%a!<%?!<$NCM$O(B Lisp $B<0$G$J$1$l$P$J$j$^$;$s!#$=$l$O(B
+$B$3$N%5!<%P!<$N$?$a$N%G%#%l%/%H%j!<$N%Q%9$rF@$k$?$a(B
+$B$K(B @code{eval} $B$H(B @code{expand-file-name} $B$G=hM}$5$l$^$9!#$=$N<0$O%5!<%P!<(B
+$B$,3+$+$l$?$H$-$@$1(B @code{eval} $B$5$l!"$=$N7k2LF@$i$l$?J8;zNs$,!"%5!<%P!<(B
 $B$,JD$8$i$l$k$^$G;H$o$l$^$9(B ($B$b$7!"<0$d(B @code{eval} $B$rCN$i$J$/$G$b?4G[$4(B
-$BL5MQ(B; $BC1$J$kJ8;zNs$GF0:n$7$^$9(B)$B!#$3$N%Q%i%a!<%?$OG$0U$G$O$J$/!"@_Dj$7$J(B
-$B$1$l$P$J$j$^$;$s!#(B@code{"~/Mail"} $B$d$=$l$N%5%V%G%#%l%/%H%j$r;H$&$3$H$O?d(B
-$B>)$G$-$^$;$s!#$$$/$D$+$N(B Gnus $B$NB>$NItJ,$,$=$l$r%G%#%U%)%k%H$G$$$m$s$J$b(B
-$B$N$K;H$&$N$G!"(B@code{nnmaildir} $B$G$b$=$l$r;H$&$H:.Mp$9$k$+$b$7$l$^$;$s!#(B
-@code{"~/.nnmaildir"} $B$,0lHLE*$JCM$G$9!#(B
+$BL5MQ(B; $BC1$J$kJ8;zNs$GF0:n$7$^$9(B)$B!#$3$N%Q%i%a!<%?!<$OG$0U$G$O$J$/!"I,$:@_(B
+$BDj$7$J$1$l$P$J$j$^$;$s!#(B@code{"~/Mail"} $B$d$=$l$N%5%V%G%#%l%/%H%j!<$r;H$&(B
+$B$3$H$O?d>)$7$^$;$s!#$J$<$+$H8@$&$H!"(Bgnus $B$NB>$NJ#?t$NItJ,$,$=$l$r%G%#%U%)(B
+$B%k%H$G$$$m$s$J$b$N$K;H$&$N$G!"(B@code{nnmaildir} $B$G$b$=$l$r;H$&$H:.Mp$9$k(B
+$B$+$b$7$l$J$$$+$i$G$9!#(B@code{"~/.nnmaildir"} $B$,0lHLE*$JCM$G$9!#(B
 
 @item target-prefix
-$B$3$l$O(B Lisp $B<0$G$J$1$l$P$J$j$^$;$s!#(B@code{eval} $B$G=hM}$5$l$?8e$G!"(B
-@code{expand-file-name} $B$K$h$C$F?7$7$$(B maildir $B$,@8@.$5$l$k%G%#%l%/%H%j(B
-$B$NL>A0$r3MF@$7$^$9!#<0$O%5!<%P!<$,3+DL$7$?$H$-$@$1(B @code{eval} $B$5$l!"$=(B
-$B$N7k2LF@$i$l$?J8;zNs$,!"%5!<%P!<$,JD$8$i$l$k$^$G;H$o$l$^$9!#(B
+$B$3$l$O(B Lisp $B<0$G$J$1$l$P$J$j$^$;$s!#$=$l(B
+$B$O(B @code{eval} $B$H(B @code{expand-file-name} $B$G=hM}$5$l$^$9!#$=$N<0(B
+$B$,(B @code{eval} $B$5$l$k$N$O%5!<%P!<$,3+$+$l$?$H$-$@$1$G!"$=$N7k2LF@$i$l$?(B
+$BJ8;zNs$,%5!<%P!<$,JD$8$i$l$k$^$G;H$o$l$^$9!#(B
 
 @code{nnmaildir} $B%5!<%P!<$K%0%k!<%W$r:n$k$H!"$=$NL>A0$NF,(B
 $B$K(B @code{target-prefix} $B$,IU2C$5$l$?(B maildir $B$H!"$=$N(B maildir $B$r;X$7<($9(B
@@ -14363,182 +14822,198 @@ Maildir $B%U%)!<%^%C%H$O%m%C%/$rI,MW$H$7$J$$F1;~G[Aw$H9VFI$r2DG=$K$9$k$?$a(B
 
 $BF1$8(B @code{directory} $B$K(B maildirs $B$H%7%s%\%j%C%/%j%s%/$NN>J}$r:n@.$9$k$?(B
 $B$a$K!"%9%i%C%7%e$r4^$^$J$$J8;zNs$r(B @code{target-prefix} $B$K@_Dj$9$k$3$H$,(B
-$B$G$-$^$9!#$3$N>l9g$O!"L>A0$,(B @code{target-prefix} $B$G;O$^(B
-$B$k(B @code{directory} $B$G8+$D$+$k$I$N(B maildir $B$b!"%0%k!<%W$H$O8+$J$5$l$^$;(B
-$B$s(B ($B$,!"$=$l$i$r;X$7<($9%7%s%\%j%C%/%j%s%/$,%0%k!<%W$K$J$j$^$9(B)$B!#(B
+$B$G$-$^$9!#$3$N>l9g$O!"(B@code{directory} $B$G8+$D$+$kL>A0(B
+$B$,(B @code{target-prefix} $B$G;O$^$k$I$N(B maildir $B$b!"%0%k!<%W$H$O8+$J$5$l$^(B
+$B$;$s(B ($B$,!"$=$l$i$r;X$7<($9%7%s%\%j%C%/%j%s%/$,%0%k!<%W$K$J$j$^$9(B)$B!#(B
 
-$BFCJL$J>l9g$H$7$F(B @code{target-prefix} $B$,(B @code{""} ($B%G%#%U%)%k%H(B) $B$@$C$?(B
-$B$i!"%0%k!<%W$r:n$k$H$-$K!"(B@code{directory} $B$K$*$$$FBP1~$9$k%7%s%\%j%C%/(B
-$B%j%s%/$r;}$?$J$$(B maildir $B$,:n@.$5$l$^$9!#$=$N$h$&$J%0%k!<%W$KBP$7$F(B
-$B$O!"(B@code{force} $B0z?t$rM?$($J$$$H(B @code{gnus-group-delete-group} $B$,;H$((B
-$B$J$$$3$H$KCm0U$7$F2<$5$$!#(B
+$BFCJL$J>l9g$H$7$F(B @code{target-prefix} $B$,(B @code{""} ($B$=$l$,%G%#%U%)%k%H$G(B
+$B$9(B) $B$@$C$?$i!"%0%k!<%W$r:n$k$H$-$K!"BP1~$9$k%7%s%\%j%C%/%j%s%/$r;}$?$J(B
+$B$$(B maildir $B$,(B @code{directory} $B$K$*$$$F:n@.$5$l$^$9!#$=$N$h$&$J%0%k!<%W(B
+$B$KBP$7$F$O!"(B@code{force} $B0z?t$rM?$($J$$(B
+$B$H(B @code{gnus-group-delete-group} $B$,;H$($J$$$3$H$K5$$r$D$1$F2<$5$$!#(B
 
 @item directory-files
-$B$3$l$O(B @code{directory-files} $B$HF1$8%$%s%?!<%U%'!<%9$N4X(B
+$B$3$l$O(B @code{directory-files} $B$HF1$8%$%s%?!<%U%'!<%9$r;}$C$F$$$k4X(B
 $B?t(B ($B$^$?$O(B @code{directory-files} $B$=$N$b$N(B) $B$G$J$1$l$P$J$j$^$;$s!#$3$l(B
 $B$O(B maildir $BMQ$N%5!<%P!<$N(B @code{directory} $B$rAv::$9$k$?$a$K;H$o$l$^$9!#(B
-$B$3$N%Q%i%a!<%?$OG$0U$G$9!#%G%#%U%)%k%HCM$O!"(B
+$B$3$N%Q%i%a!<%?!<$OG$0U$G$9!#%G%#%U%)%k%H$O!"(B
 @code{nnheader-directory-files-is-safe} $B$,(B @code{nil} $B$@$C$?(B
 $B$i(B @code{nnheader-directory-files-safe} $B$G!"$=$l0J30$N>l9g(B
 $B$O(B @code{directory-files} $B$G(B
-$B$9(B (@code{nnheader-directory-files-is-safe} $B$O%5!<%P!<$,3+DL$7$?$H$-$K0l(B
-$B2s$@$18!::$5$l$^$9$,!"%G%#%l%/%H%j$,Av::$5$l$k$H$-$KKh2s%A%'%C%/$5$;$?$$(B
+$B$9(B (@code{nnheader-directory-files-is-safe} $B$O%5!<%P!<$,3+$$$?$H$-$K0l2s(B
+$B$@$18!::$5$l$^$9$,!"%G%#%l%/%H%j!<$,Av::$5$l$k$H$-$KKh2s%A%'%C%/$5$;$?$$(B
 $B$N$J$i$P!"$=$l$r9T$J$&4X?t$r$"$J$?$,<+A0$GMQ0U$9$kI,MW$,$"$j$^$9(B)$B!#(B
 
 @item get-new-mail
 $BHs(B-@code{nil} $B$K$7$F$*$/$H!"$$$D$b$NDL$j$K%0%k!<%W$N(B maildir $B<+BN$K$*$$(B
-$B$F?7Ce%a!<%k$rAv::$7$?8e$G!"$3$N%5!<%P!<(B
-$B$O(B @code{nnmail-split-methods} $B$+(B @code{nnmail-split-fancy} $B$K$h(B
-$B$k(B @code{mail-sources} $B$+$i!"=>Mh$N(B Gnus $B$NJ}K!$G%a!<%k$r$C(B
+$B$F!"=>Mh$N(B gnus $B$NJ}K!$G%a!<%k$rJ}$GF1$8(B maildir $B$r(B
 $B;H$C$F$O(B @emph{$B$$$1$^$;$s(B}$B!#$=$N7k2L$O1?NI$/M-1W$K$J$k$+$b$7$l$^$;$s$,!"(B
-$B$=$s$J0U?^$G$O@_7W$5$l$F$$$^$;$s!#>-Mh$O0c$&7k2L$r$b$?$i$92DG=@-$,$"$j$^(B
-$B$9!#$"$J$?$NJ,3d5,B'$,?7$7$$%0%k!<%W$r:n$k$h$&$K$J$C$F$$$k>l9g$O!"(B
-@code{create-directory} $B%5!<%P!<%Q%i%a!<%?$rM?$($k$3$H$rK:$l$J$$$G2<$5$$!#(B
+$B$=$s$J0U?^$G$O@_7W$5$l$F$$$^$;$s$7!">-Mh$O0c$&7k2L$r$b$?$i$92DG=@-$,$"$j(B
+$B$^$9!#$"$J$?$NJ,3d5,B'$,?7$7$$%0%k!<%W$r:n$k$h$&$K$J$C$F$$$k>l9g$O!"(B
+@code{create-directory} $B%5!<%P!<%Q%i%a!<%?!<$r@_Dj$9$k$3$H$rK:$l$J$$$G2<(B
+$B$5$$!#(B
 @end table
 
-@subsubsection $B%0%k!<%W%Q%i%a!<%?(B
+@subsubsection $B%0%k!<%W%Q%i%a!<%?!<(B
 
-@code{nnmaildir} $B$O$$$/$D$+$N%0%k!<%W%Q%i%a!<%?$r;H$$$^$9!#$3$l$i$N$9$Y(B
-$B$F$rL5;k$7$F$b0BA4$G$9!#%G%#%U%)%k%H$N(B @code{nnmaildir} $B$NF0:n$O!"B>$N%a!<(B
+@code{nnmaildir} $B$OJ#?t$N%0%k!<%W%Q%i%a!<%?!<$r;H$$$^$9!#$3$l$i$N$9$Y$F(B
+$B$rL5;k$7$F$b0BA4$G$9!#%G%#%U%)%k%H$N(B @code{nnmaildir} $B$NF0:n$O!"B>$N%a!<(B
 $B%k%P%C%/%(%s%I$N%G%#%U%)%k%H(B ($B5-;v$,0l=54V8e$K>C5n$5$l$k!"$J$I(B) $B$HF1$8$G(B
-$B$9!#4|8B@Z$l>C5n$N%Q%i%a!<%?$r=|$$$F!"$3$N5!G=$O$9$Y(B
-$B$F(B @code{nnmaildir} $B$KFCM-$G$9!#$7$?$,$C$F!"JL$N%P%C%/%(%s%I$G$9$G$K9T$C(B
-$B$F$$$kF0:n$rC1$KF'=1$5$;$h$&$H$$$&$N$G$"$l$P!"$3$l$rL5;k$9$k$3$H$,$G$-$^(B
-$B$9!#(B
+$B$9!#4|8B@Z$l>C5n$N%Q%i%a!<%?!<$r=|$$$F!"$3$N5!G=$O$9$Y(B
+$B$F(B @code{nnmaildir} $B$@$1$K$"$k$b$N$G$9!#$7$?$,$C$F!"JL$N%P%C%/%(%s%I$G$9(B
+$B$G$K9T$J$C$F$$$kF0:n$rC1$KF'=1$5$;$h$&$H$$$&$N$G$"$l$P!"$3$l$rL5;k$9$k$3(B
+$B$H$,$G$-$^$9!#(B
 
-$B$3$l$i$N%Q%i%a!<%?$N$&$A$N$I$l$G$b!"$=$NCM$,%Y%/%H%k$G$"$k>l9g$O!"%*%j%8(B
-$B%J%k$NCM$KBe$o$C$F!"Bh0l$NMWAG$,(B Lisp $B<0$H$7$FI>2A$5$l$?7k2L$,;H$o$l$^$9!#(B
-$BCM$,%Y%/%H%k$G$J$$>l9g$O!"$=$NCM$=$N$b$N$,(B Lisp $B<0$H$7$FI>2A$5$l$^$9!#(B
-($B$=$N$?$a!"$3$l$i$N%Q%i%a!<%?$OB>$H$O0c$&L>A0!"0c$&$1$l$I$b;w$?0UL#$r;}(B
-$B$DB>$N%P%C%/%(%s%I$G%5%]!<%H$5$l$F$$$kF1MM$N%Q%i%a!<%?!"$r;H$$$^$9!#(B)
-($B?t!"J8;zNs!"(B@code{nil}$B!"$*$h$S(B @code{t} $B$K$D$$$F$O!"(B@code{eval} $B$N4XM?(B
-$B$r:F$SL5;k$9$k$3$H$,$G$-$^$9!#B>$NCM$K$D$$$F!"$=$l$,E,@Z$J>l9g$K$O!"M>J,(B
-$B$J%/%*!<%H$r;H$$!"$+$D%Y%/%H%k$GCM$rJq$`$3$H$rK:$l$J$$$G2<$5$$!#(B)
+$B$3$l$i$N%Q%i%a!<%?!<$N$&$A$N$I$l$G$b!"$=$NCM$,%Y%/%H%k$G$"$k>l9g$O!"%*%j(B
+$B%8%J%k$NCM$KBe$o$C$F!"Bh0l$NMWAG$,(B Lisp $B<0$H$7$FI>2A$5$l$?7k2L$,;H$o$l$^(B
+$B$9!#CM$,%Y%/%H%k$G$J$$>l9g$O!"$=$NCM$=$N$b$N$,(B Lisp $B<0$H$7$FI>2A$5$l$^$9!#(B
+($B$=$l$,!"$3$l$i$N%Q%i%a!<%?!<$,B>$H$O0c$&L>A0!"$9$J$o$AB>$N%P%C%/%(%s%I(B
+$B$G%5%]!<%H$5$l$F$$$k$b$N$H$O0c$&$1$l$I$b;w$?0UL#$r;}$C$F$$$kF1MM$N%Q%i%a!<(B
+$B%?!<$r;H$C$F$$$kM}M3$G$9!#(B)  ($B?tCM!"J8;zNs!"(B@code{nil}$B!"$*$h(B
+$B$S(B @code{t} $B$K$D$$$F$b(B @code{eval} $B$N4XM?$rL5;k$9$k$3$H$,$G$-$^$9!#B>$N(B
+$BCM$K$D$$$F!"$=$&$9$k$3$H$,$U$5$o$7$$>l9g$K$O!"DI2C$N%/%*!<%H$r;H$$!"$+$D(B
+$B%Y%/%H%k$GCM$rJq$`$3$H$rK:$l$J$$$G2<$5$$!#(B)
 
 @table @code
 @item expire-age
-$B5-;v$,>C5n$5$l$k$^$G$NC5n$5$l$F$O$J$i$J$$$3$H$r;XDj$7$^$9!#$3$N%Q%i%a!<%?$,@_Dj(B
-$B$5$l$F$$$J$$$H!"$$$D$b$N(B @code{nnmail-expiry-wait}(@code{-function}) $BJQ(B
-$B?t(B (@code{expiry-wait}(@code{-function}) $B%0%k!<%W%Q%i%a!<%?$G>e=q$-$5$l(B
-$B$k(B) $B$r:G8e$N$h$j$I$3$m$K$7$^$9!#(B3$BF|$NCM$,M_$7$$$J$i$P!"(B@code{[(* 3 24 60
-60)]} $B$N$h$&$J$b$N$r;H$C$F2<$5$$!#(B@code{nnmaildir} $B$O<0$rI>2A$7$F!"$=$N(B
-$B7k2L$r;H$$$^$9!#5-;v$No$3$l$O5-;v$,G[Aw$5$l$?;~9o$HF1$8$G$9$,!"5-;v$NJT=8$O$=$l$rC5n0J30$N(B) $B5-;v$N0\F0$b$^$?!"5-;v$rC5n$5$l$k$^$G$NC(B
+$B5n$5$l$F$O$J$i$J$$$3$H$r;XDj$9$k(B @code{never} $B$H$$$&%7%s%\%k$G$9!#$3$N%Q(B
+$B%i%a!<%?!<$,@_Dj$5$l$F$$$J$$$H!"$$$D$b$N(B @code{nnmail-expiry-wait} $BJQ?t(B
+$B$^$?$O(B @code{nnmail-expiry-wait-function} $BJQ?t$r:G8e$N$h$j$I$3$m$K$7$^(B
+$B$9(B (@code{expiry-wait} $B%0%k!<%W%Q%i%a!<%?!<$,@_Dj$5$l$F$$$k$H!"$=$NCM(B
+$B$,(B @code{nnmail-expiry-wait} $B$h$jM%@h$7$F;H$o$l!"(B
+@code{nnmail-expiry-wait-function} $B$OL58z$K$5$l$^$9(B)$B!#(B3$BF|$NCM$,I,MW$J$i(B
+$B$P!"(B@code{[(* 3 24 60 60)]} $B$N$h$&$J$b$N$r;H$C$F2<$5$$!#(B
+@code{nnmaildir} $B$O<0$rI>2A$7$F!"$=$N7k2L$r;H$$$^$9!#5-;v$No$3$l$O5-;v$,G[Aw$5$l$?;~9o$HF1$8(B
+$B$G$9$,!"5-;v$NJT=8$O$=$l$rC5n0J30$N(B) $B5-;v$N0\F0$b(B
+$B$^$?!"5-;v$r(B) $B$G!"$+$D$=$N%Q%i%a!<%?$,F1$8L>A0$N%0%k!<%W$KB0(B
-$B$5$J$$>l9g!"4|8B@Z$l>C5n$,9T$J$o$l$k:]$K!"5-;v$O>C5n$5$l$kA0$K;XDj$5$l$?(B
+$B$3$l$,0J2<$N$h$&$J40A4$J(B gnus $B$N%0%k!<%WL>$NJ8;zNs$G!"(B
+
+@example
+"backend+server.address.string:group.name"
+@end example
+
+@noindent
+$B$+$D$3$N%Q%i%a!<%?!<$,@_Dj$5$l$F$$$k%0%k!<%W$NL>A0$HF1$8$G$O$J$+$C$?$i!"(B
+$B4|8B@Z$l>C5n$,9T$J$o$l$k:]$K!"5-;v$O>C5n$5$l$kBe$o$j$K!"$3$l$G;XDj$5$l$?(B
 $B%0%k!<%W$K0\F0$5$;$i$l$^$9!#(B@emph{$B$3$l$,(B @code{nnmaildir} $B%0%k!<%W$K@_Dj(B
-$B$5$l$k$H!"0\F0@h$N%0%k!<%W$K$*$$$F!"5-;v$,85$N%0%k!<%W$K$"$C$?$H$-$H$A$g(B
-$B$&$IF1$8$@$18E$/$J$j$^$9!#(B} $B$7$?$,$C$F!"0\F0@h$N%0%k!<%W$K$*$1(B
-$B$k(B @code{expire-age} $B$K$OCm0U$7$F2<$5$$!#$3$l$,%Q%i%a!<%?$,B0$9$k$N$HF1(B
-$B$8%0%k!<%W$NL>A0$K@_Dj$5$l$k$H!"5-;v$O$^$C$?$/4|8B@Z$l>C5n$5$l$^$;$s!#%Y(B
-$B%/%H%k<0$r;H$&$H!":G=i$NMWAG$,0l2s!"$=$l$>$l$N5-;v$K$D$$$FI>2A$5$l$^$9!#(B
-$B$7$?$,$C$F!"5-;v$r$I$3$KCV$/$+$r7h$a$k$?$a$K!"$=$N<0(B
+$B$5$l$F$$$k$H!"0\F0@h$N%0%k!<%W$K$*$$$F!"5-;v$O85$N%0%k!<%W$K$"$C$?$H$-$H(B
+$B$A$g$&$IF1$88E$5$K$J$j$^$9!#(B} $B$7$?$,$C$F!"0\F0@h$N%0%k!<%W$K$*$1(B
+$B$k(B @code{expire-age} $B$K$OCm0U$7$F2<$5$$!#$3$l$,%Q%i%a!<%?!<$,@_Dj$5$l$F(B
+$B$$$k$N$HF1$8%0%k!<%W$NL>A0$K@_Dj$5$l$k$H!"5-;v$O$^$C$?$/4|8B@Z$l>C5n$5$l(B
+$B$^$;$s!#%Y%/%H%k$N<0$r;H$&$H!":G=i$NMWAG$,0l2s!"$=$l$>$l$N5-;v$K$D$$$FI>(B
+$B2A$5$l$^$9!#$7$?$,$C$F5-;v$r$I$3$KCV$/$+$r7h$a$k$?$a$K!"$=$N<0(B
 $B$O(B @code{nnmaildir-article-file-name} $B$J$I$K>H2q$9$k$3$H$,$G$-$^$9!#(B
-@emph{$B$3$N%Q%i%a!<%?$,@_Dj$5$l$F$$$J$$$H!"(B
-@code{nnmaildir} $B$O(B @code{expiry-target} $B%0%k!<%W%Q%i%a!<%?(B
+@emph{$B$?$H$($3$N%Q%i%a!<%?!<$,@_Dj$5$l$F$$$J$/$F$b!"(B
+@code{nnmaildir} $B$O(B @code{expiry-target} $B%0%k!<%W%Q%i%a!<%?!<(B
 $B$d(B @code{nnmail-expiry-target} $BJQ?t$r8\$_$^$;$s!#(B}
 
 @item read-only
-$B$3$l$,(B @code{t} $B$K@_Dj$5$l$F$$$k$H!"(B@code{nnmaildir} $B$O$=$N5-;v$r$3$N%0(B
-$B%k!<%W$GFI$_=P$7@lMQ$H$7$F07$$$^$9!#$3$N0UL#$O!"5-;v$O(B @file{new/} $B$+(B
-$B$i(B @file{cur/} $B$K2~L>$5$l$J$$!"5-;v$O(B @file{cur/} $B$G$O$J(B
-$B$/(B @file{new/} $B$G$N$_8+$D$+$k!"5-;v$O>C5n$5$l$J$$!"5-;v$OJT=8$G$-$J$$!"(B
-$B$H$$$&$3$H$G$9!#(B@file{new/} $B$OB>$N(B maildir $B$N(B @file{new/} $B%G%#%l%/%H%j!"(B
-$BNc$($P$_$s$J$,6=L#$,$"$k%a!<%j%s%0%j%9%H$r4^$s$G$$$k%7%9%F%`$G6&DL$N%a!<(B
-$B%k%\%C%/%9!"$X$N%7%s%\%j%C%/%j%s%/$G$"$k$HA[Dj$5$l$^$9!#(B@file{new/} $B0J30(B
-$B$N(B maildir $B$K$"$k$9$Y$F$N$b$N$O!"FI$_=P$7@lMQ$H$7$F07$o$l(B @emph{$B$^$;$s(B}$B!#(B
-$B$7$?$,$C$F6&M-$N%a!<%k%\%C%/%9$KBP$7$F$O!"$"$J$?<+?H$N(B maildir $B$r@_Dj$9(B
-$B$k(B ($B$^$?$O(B $B6&M-$N%a!<%k%\%C%/%9$K=q$-9~$_8"8B$r;}$D(B) $BI,MW$,0MA3$H$7$F$"(B
-$B$j$^$9!#$"$J$?$N(B maildir $B$O5-;v$NM>J,$J%3%T!<$r$^$C$?$/4^$^$J$$$G$7$g$&!#(B
+$B$3$l$,(B @code{t} $B$K@_Dj$5$l$F$$$k$H!"(B@code{nnmaildir} $B$O$=$N5-;v$r$3(B
+$B$N(B maildir $B$G$OFI$_=P$7@lMQ$H$7$F07$$$^$9!#$3$N0UL#$O!"5-;v(B
+$B$O(B @file{new/} $B$+$i(B @file{cur/} $B$K2~L>$5$l$J$$!"5-;v$O(B @file{cur/} $B$G$O(B
+$B$J$/(B @file{new/} $B$G$N$_8+$D$+$k!"5-;v$O>C5n$5$l$J$$!"5-;v$OJT=8$G$-$J$$!"(B
+$B$H$$$&$3$H$G$9!#(B@file{new/} $B$OB>$N(B maildir $B$N(B @file{new/} $B%G%#%l%/%H%j!<(B
+$B$X$N%7%s%\%j%C%/%j%s%/$G$"$k$HA[Dj$5$l$^$9(B ($B$=$N%G%#%l%/%H%j!<$K$O!"Nc$((B
+$B$P$_$s$J$,6=L#$,$"$k%a!<%j%s%0%j%9%H$r4^$s$G$$$k!"%7%9%F%`$G6&DL$N%a!<%k(B
+$B%\%C%/%9$,$"$j$^$9(B)$B!#(B@file{new/} $B0J30$N(B maildir $B$K$"$k$9$Y$F$N$b$N$O!"FI(B
+$B$_=P$7@lMQ$H$7$F07$o$l(B @emph{$B$^$;$s(B}$B!#$7$?$,$C$F!"$_$s$J$G6&M-$9$k%a!<%k(B
+$B%\%C%/%9$KBP$7$F$O!"$"$J$?<+?H$N(B maildir $B$r@_CV$9$k(B ($B$^$?$O(B $B6&M-$N%a!<%k(B
+$B%\%C%/%9$K=q$-9~$_8"8B$r;}$D(B) $BI,MW$,0MA3$H$7$F$"$j$^$9!#$=$&$9$l$P!"$"$J(B
+$B$?$N(B maildir $B$O5-;v$NM>J,$J%3%T!<$r$^$C$?$/4^$^$J$/$F:Q$`$G$7$g$&!#(B
 
 @item directory-files
 @code{directory-files} $B$HF1$8%$%s%?!<%U%'!<%9$N4X?t$G$9!#5-;v$r8+$D$1$k(B
-$B$?$a$K!"$3$N%0%k!<%W$KBP1~$9$k(B maildir $B$N%G%#%l%/%H%j$rAv::$9$k$?$a$K;H(B
-$B$o$l$^$9!#%G%#%U%)%k%H$O%5!<%P!<$N(B @code{directory-files} $B%Q%i%a!<%?$G@_(B
-$BDj$5$l$F$$$k4X?t$G$9!#(B
+$B$?$a$K!"$3$N%0%k!<%W$KBP1~$9$k(B maildir $B$N%G%#%l%/%H%j!<$rAv::$9$k$?$a$K(B
+$B;H$o$l$^$9!#%G%#%U%)%k%H$O$=$N%5!<%P!<$N(B @code{directory-files} $B%Q%i%a!<(B
+$B%?!<$G@_Dj$5$l$F$$$k4X?t$G$9!#(B
 
 @item distrust-Lines:
-$BHs(B-@code{nil} $B$G$"$k$H!"(B@code{nnmaildir} $B$O(B @code{Lines:} $B%X%C%@!<%U%#!<(B
-$B%k%I$r;H$&Be$o$j$K$$$D$b5-;v$N9T?t$r?t$($^$9!#(B@code{nil} $B$@$C$?>l9g$O!"(B
-$B$"$l$P$=$N%X%C%@!<%U%#!<%k%I$,;H$o$l$^$9!#(B
+$BHs(B-@code{nil} $B$K$7$F$*$/$H!"(B@code{nnmaildir} $B$O(B @code{Lines:} $B%X%C%@!<(B
+$B%U%#!<%k%I$r;H$&Be$o$j$K$$$D$b5-;v$N9T?t$r?t$($^$9!#(B@code{nil} $B$@$C$?>l(B
+$B9g$O!"$"$l$P$=$N%X%C%@!<%U%#!<%k%I$,;H$o$l$^$9!#(B
 
 @item always-marks
-@code{['(read expire)]} $B$N$h$&$J0u%7%s%\%k$N%j%9%H$G$9!#(BGnus $B$,5-;v$N0u(B
+@code{['(read expire)]} $B$N$h$&$J0u%7%s%\%k$N%j%9%H$G$9!#(Bgnus $B$,5-;v$N0u(B
 $B$r(B @code{nnmaildir} $B$K?R$M$k$H$-$O$$$D$G$b!"%U%!%$%k%7%9%F%`$K3JG<$5$l$F(B
 $B$$$k0u$,2?$G$"$k$+$H$OL54X78$K!"(B@code{nnmaildir} $B$O$9$Y$F$N5-;v$,$3$l$i(B
-$B$N0u$r;}$C$F$$$k$HEz$($^$9!#$3$l$O9=A[$r;n$9$?$a$N5!G=$G!"$*$=$i$/7k6I$O(B
-$B:o=|$5$l$k$G$7$g$&!#$=$l$O(B Gnus $BK\BN$G9T$o$l$k$+!"$"$k$$$OM-1W$G$J$1$l$P(B
-$BJ|4~$5$l$k$Y$-$G$9!#(B
+$B$N0u$r;}$C$F$$$k$HEz$($^$9!#$3$l$O5!G=$r8!>Z$9$k$?$a$N$b$N$G!"$*$=$i$/7k(B
+$B6I$O:o=|$5$l$k$G$7$g$&!#$=$l$O(B gnus $BK\BN$G9T$J$o$l$k$+!"$"$k$$$OM-1W$G$J(B
+$B$1$l$PJ|4~$5$l$k$Y$-$G$9!#(B
 
 @item never-marks
-@code{['(tick expire)]} $B$N$h$&$J0u%7%s%\%k$N%j%9%H$G$9!#(BGnus $B$,5-;v$N0u(B
+@code{['(tick expire)]} $B$N$h$&$J0u%7%s%\%k$N%j%9%H$G$9!#(Bgnus $B$,5-;v$N0u(B
 $B$r(B @code{nnmaildir} $B$K?R$M$k$H$-$O$$$D$G$b!"%U%!%$%k%7%9%F%`$K3JG<$5$l$F(B
 $B$$$k0u$,2?$G$"$k$+$H$OL54X78$K!"(B@code{nnmaildir} $B$O$3$l$i$N0u$r;}$C$F$$(B
-$B$k5-;v$OL5$$$HEz$($^$9!#(B@code{never-marks} $B$O(B @code{always-marks} $B$r>e=q(B
-$B$-$7$^$9!#$3$l$O9=A[$r;n$9$?$a$N5!G=$G!"$*$=$i$/7k6I$O:o=|$5$l$k$G$7$g$&!#(B
-$B$=$l$O(B Gnus $BK\BN$G9T$o$l$k$+!"$"$k$$$OM-1W$G$J$1$l$PJ|4~$5$l$k$Y$-$G$9!#(B
+$B$k5-;v$OL5$$$HEz$($^$9!#(B@code{never-marks} $B$O(B @code{always-marks} $B$h$j$b(B
+$BM%@h$5$l$^$9!#$3$l$O5!G=$r8!>Z$9$k$?$a$N$b$N$G!"$*$=$i$/7k6I$O:o=|$5$l$k(B
+$B$G$7$g$&!#$=$l$O(B gnus $BK\BN$G9T$J$o$l$k$+!"$"$k$$$OM-1W$G$J$1$l$PJ|4~$5$l(B
+$B$k$Y$-$G$9!#(B
 
 @item nov-cache-size
 @acronym{NOV} $B%a%b%j!<%-%c%C%7%e$N%5%$%:$r;XDj$9$k@0?t$G$9!#%9%T!<%I%"%C(B
 $B%W$N$?$a$K!"(B@code{nnmaildir} $B$O$=$l$>$l$N%0%k!<%W$N8BDj$5$l$??t$N5-;v$K(B
 $BBP$7$F!"%a%b%j!<>e$K(B @acronym{NOV} $B%G!<%?$rJ];}$7$^$9!#(B($B$3$l$O$?$V$sM-MQ(B
-$B$G$O$J$/!">-Mh$O$*$=$i$/:o=|$5$l$k$G$7$g$&(B)$B!#$3$N%Q%i%a!<%?$NCM$O!"%5!<(B
-$B%P!<$,3+DL$7$?8e$G:G=i$K%0%k!<%W$,8+$i$l$?$H$-!"$9$J$o$A0lHL$K$O:G=i(B
-$B$K(B Gnus $B$r5/F0$7$?$H$-!"$@$1CmL\$5$l$^$9!#%5!<%P!<$,JD$8$i$l$F:F$S3+DL$5(B
-$B$l$k$^$G$O!"(B@acronym{NOV} $B%-%c%C%7%e$N%5%$%:$OJQ99$5$l$^$;$s!#%G%#%U%)%k(B
-$B%H$O35N,%P%C%U%!$KI=<($5$l$k5-;v$N?t$N8+@Q$j(B (@code{tick} $B0u$,$"$C(B
-$B$F(B @code{read} $B$,L5$$5-;v$N?t$K>/!9$NM>J,$r2C$($?$b$N(B) $B$G$9!#(B
+$B$G$O$J$/!">-Mh$O$*$=$i$/:o=|$5$l$k$G$7$g$&(B)$B!#$3$N%Q%i%a!<%?!<$NCM$O!"%5!<(B
+$B%P!<$,3+$+$l$?8e$G:G=i$K%0%k!<%W$,8+$i$l$?$H$-!"$9$J$o$A0lHL$K$O:G=i(B
+$B$K(B gnus $B$r5/F0$7$?$H$-$@$1CmL\$5$l$^$9!#%5!<%P!<$,JD$8$i$l$F:F$S3+$+$l$k(B
+$B$^$G$O!"(B@acronym{NOV} $B%-%c%C%7%e$N%5%$%:$OJQ99$5$l$^$;$s!#%G%#%U%)%k%H$O(B
+$B35N,%P%C%U%!!<$KI=<($5$l$k5-;v$N?t$N8+@Q$j(B (@code{tick} $B0u$,$"$k5-;v$N?t(B
+$B$+(B @code{read} $B$,L5$$5-;v$N?t$K!">/!9$NM>J,$r2C$($?$b$N(B) $B$G$9!#(B
 @end table
 
 @subsubsection $B5-;v$N<1JL(B
-$B5-;v$O$=$l$>$l$N(B maildir $B$N(B @file{cur/} $B%G%#%l%/%H%j$K3JG<$5$l$^$9!#3F!9(B
+$B5-;v$O$=$l$>$l$N(B maildir $B$N(B @file{cur/} $B%G%#%l%/%H%j!<$K3JG<$5$l$^$9!#3F!9(B
 $B$N5-;v$K$O(B @code{uniq:info} $B$N$h$&$JL>A0$,IU$1$i$l$^$9!#$3$3(B
 $B$G(B @code{uniq} $B$O%3%m%s$r4^$_$^$;$s!#(B@code{nnmaildir} $B$O(B @code{:info} $B$N(B
 $BItJ,$rJ];}$7$^$9$,L5;k$7$^$9!#(B($BB>$N(B maildir $B%j!<%@!<$O0lHL$K0u$r3JG<$9$k(B
 $B$?$a$K$3$NItJ,$r;H$$$^$9!#(B) @code{uniq} $B$NItJ,$O5-;v$r%f%K!<%/$K<1JL$7!"(B
-maildir $B$N(B @file{.nnmaildir/} $B%5%V%G%#%l%/%H%j$N?'!9$J>l=j$K5-;v$K4XO"$7(B
-$B$?>pJs$r3JG<$9$k$?$a$K;H$o$l$^$9!#35N,%P%C%U%!$G5-;v$rMW5a$7$?8e$G!"5-;v(B
-$B$N40A4$J%Q%9L>$,(B @code{nnmaildir-article-file-name} $BJQ?t$+$iF@$i$l$^$9!#(B
+maildir $B$N(B @file{.nnmaildir/} $B%5%V%G%#%l%/%H%j!<$N?'!9$J>l=j$K!"BP1~$9$k(B
+$B5-;v$N>pJs$r3JG<$9$k$?$a$K;H$o$l$^$9!#5-;v$N40A4$J%Q%9L>$O!"35N,%P%C%U%!!<(B
+$B$G5-;v$rMW5a$7$?8e$G(B @code{nnmaildir-article-file-name} $BJQ?t$+$iF@$i$l$^(B
+$B$9!#(B
 
 @subsubsection NOV $B%G!<%?(B
 @code{uniq} $B$K$h$C$F<1JL$5$l$k5-;v$O!"$=$N(B @acronym{NOV} $B%G!<%?(B ($B35N,%P%C(B
-$B%U%!$N9T$r@8@.$9$k$?$a$K;H$o$l$k(B) $B$r(B @file{.nnmaildir/nov/uniq} $B$K3JG<$7(B
-$B$^$9!#(B@code{nnmaildir-generate-nov-databases} $B4X?t$O$"$j$^$;$s!#(B($B$=$NI,(B
-$BMW$O$"$^$j$"$j$^$;$s!#5-;v$N(B @acronym{NOV} $B%G!<%?$O5-;v(B
+$B%U%!!<$N9T$r@8@.$9$k$?$a$K;H$o$l$k(B) $B$r(B @file{.nnmaildir/nov/uniq} $B$K3JG<(B
+$B$7$^$9!#(B@code{nnmaildir-generate-nov-databases} $B4X?t$O$"$j$^$;$s!#(B($B$=$N(B
+$BI,MW$O$"$^$j$"$j$^$;$s!#5-;v$N(B @acronym{NOV} $B%G!<%?$O5-;v(B
 $B$+(B @code{nnmail-extra-headers} $B$,JQ2=$7$?$H$-$K<+F0E*$K99?7$5$l$^(B
-$B$9!#(B) $BBP1~$9$k(B @acronym{NOV} $B%U%!%$%k$r$?$@>C$9$3$H$K$h$C$FC10l$N5-;v(B
+$B$9!#(B) $BBP1~$9$k(B @acronym{NOV} $B%U%!%$%k$r>C$9$3$H$K$h$C$F!"C10l$N5-;v$@$1(B
 $B$N(B @acronym{NOV} $B%G!<%?$N@8@.$r(B @code{nnmaildir} $B$K6/@)$9$k$3$H$O$G$-$^(B
-$B$9!#$7$+$7(B @emph{$B$4MQ?4(B}$B!#$3$l$O(B @code{nnmaildir} $B$,$3$N5-;v$K?7$7$$5-;v(B
-$BHV9f$r3d$j?6$i$;!"(B@code{seen} $B0u!"%(!<%8%'%s%H!"$*$h$S%-%c%C%7%e$K$H$C$F(B
-$BLLE]$J$3$H$K$J$j$^$9!#(B
+$B$9!#$7$+$7(B @emph{$B$4MQ?4(B}$B!#$3$l$O(B @code{nnmaildir} $B$K$3$N5-;v$K?7$7$$5-;v(B
+$BHV9f$r3d$j?6$i$;$k$N$G!"(B@code{seen} $B0u!"%(!<%8%'%s%H!"$*$h$S%-%c%C%7%e$K(B
+$B$H$C$FLLE]$J$3$H$K$J$j$^$9!#(B
 
 @subsubsection $B5-;v$N0u(B
 @file{.nnmaildir/marks/flag/uniq} $B%U%!%$%k$,$"$k>l9g$K!"(B@code{uniq} $B$K$h$C(B
 $B$F<1JL$5$l$k5-;v$O!"(B@code{flag} $B0u$r;}$D$b$N$H9M$($i$l$^$9!#(B
-Gnus $B$,(B @code{nnmaildir} $B$K%0%k!<%W$N0u$r?R$M$k$H!"(B@code{nnmaildir} $B$O$=(B
+gnus $B$,(B @code{nnmaildir} $B$K%0%k!<%W$N0u$r?R$M$k$H!"(B@code{nnmaildir} $B$O$=(B
 $B$N$h$&$J%U%!%$%k$rC5$7$F!"8+$D$1$?0u$N%;%C%H$rJs9p$7$^$9!#(B
-Gnus $B$,(B @code{nnmaildir} $B$K0u$N%;%C%H$N3JG<$rMW5a$9$k$H!"(B
-@code{nnmaildir} $B$OI,MW$JBP1~$9$k%U%!%$%k$r@8@.$7!"$^$?$O>C5n$7$^$9!#(B($B$l$N0u$N$?$a$K?7$7$$%U%!%$%k$r:n$k$N$G$O$J$/!"(Bi$B%N!<%I(B $B$r@aLs(B
-$B$9$k$?$a$KC1$K(B @file{.nnmaildir/markfile} $B$X$N%O!<%I%j%s%/$rD%$j$^$9!#(B)
-
-@file{.nnmaildir/marks/} $B$K?7$7$$%G%#%l%/%H%j$r:n$k$3$H$K$h$C$F!"?7$7$$(B
-$B0u$rAOB$$9$k$3$H$,$G$-$^$9!#0u$rJ];}$7$D$D(B maildir $B$r(B tar $B$G$^$H$a$F%5!<(B
-$B%P!<$+$i$=$l$r:o=|$7!"8e$G(B tar $B$r$[$I$/$3$H$,$G$-$^$9!#0u%U%!%$%k$r:n@.(B
-$B$^$?$O>C5n$9$k$3$H$K$h$C$F!"$"$J$?<+?H$,0u$rDI2C$^$?$O:o=|$9$k$3$H$,$G$-(B
-$B$^$9!#(BGnus $B$,F0:n$7$F$$$F(B @code{nnmaildir} $B%5!<%P!<$,3+DL$7$F$$$k$H$-$K(B
-$B$3$l$r9T$J$&>l9g$O!":G=i$K$9$Y$F$N(B @code{nnmaildir} $B%0%k!<%W$N35N,%P%C%U%!(B
-$B$+$iB`=P$7$F%0%k!<%W%P%C%U%!$G(B @kbd{s} $B$r%?%$%W$7!"$=$N8e%0%k!<%W%P%C%U%!(B
-$B$G(B @kbd{g} $B$+(B @kbd{M-g} $B$r%?%$%W$9$k$N$,:GNI$G$9!#$=$&$7$J$$$H(B Gnus $B$OJQ(B
-$B99$rB*$($F$/$l$:$K!"$=$l$i$r85$KLa$7$F$7$^$&$+$b$7$l$^$;$s!#(B
+gnus $B$,(B @code{nnmaildir} $B$K0u$N%;%C%H$r3JG<$9$k$3$H$rMW5a$9$k$H!"(B
+@code{nnmaildir} $B$OI,MW$K1~$8$FBP1~$9$k%U%!%$%k$r@8@.$7!"$^$?$O>C5n$7$^(B
+$B$9!#(B($B$l$N0u$N$?$a$K?7$7$$%U%!%$%k$r:n$k$N$G$O$J$/!"(Bi$B%N!<%I(B
+$B$r@aLs$9$k$?$a$KC1$K(B @file{.nnmaildir/markfile} $B$X$N%O!<%I%j%s%/$rD%$j$^(B
+$B$9!#(B)
+
+@file{.nnmaildir/marks/} $B$K?7$7$$%G%#%l%/%H%j!<$r:n$k$3$H$K$h$C$F!"?7$7(B
+$B$$0u$rAOB$$9$k$3$H$,$G$-$^$9!#0u$rJ];}$7$D$D(B maildir $B$r(B tar $B$G$^$H$a$F%5!<(B
+$B%P!<$+$i$=$l$r:o=|$7!"8e$G(B tar $B$r$[$I$/$H!"0u$OJ];}$5$l$F$$$^$9!#0u%U%!(B
+$B%$%k$r:n@.$^$?$O>C5n$9$k$3$H$K$h$C$F!"$"$J$?<+?H$,0u$rDI2C$^$?$O:o=|$9$k(B
+$B$3$H$,$G$-$^$9!#(Bgnus $B$,F0:n$7$F$$$F(B @code{nnmaildir} $B%5!<%P!<$,3+$$$F$$(B
+$B$k$H$-$K$3$l$r9T$J$&>l9g$O!":G=i$K$9$Y$F$N(B @code{nnmaildir} $B%0%k!<%W$N35(B
+$BN,%P%C%U%!!<$+$iB`=P$7$F%0%k!<%W%P%C%U%!!<$G(B @kbd{s} $B$r%?%$%W$7!"$=$N8e(B
+$B%0%k!<%W%P%C%U%!!<$G(B @kbd{g} $B$+(B @kbd{M-g} $B$r%?%$%W$9$k$N$,:GNI$G$9!#$=$&(B
+$B$7$J$$$H(B gnus $B$OJQ99$rB*$($F$/$l$:$K!"$=$l$i$r85$KLa$7$F$7$^$&$+$b$7$l$^(B
+$B$;$s!#(B
 
 @node Mail Folders
 @subsubsection $B%a!<%k%U%)%k%@!<(B
@@ -14546,10 +15021,10 @@ Gnus $B$,(B @code{nnmaildir} $B$K0u$N%;%C%H$N3JG<$rMW5a$9$k$H!"(B
 @cindex mbox folders
 @cindex mail folders
 
-@code{nnfolder} $B$O$=$l$>$l$N%a!<%k%0%k!<%W$r0c$C$?%U%!%$%k$KC_B"$9$k%P%C(B
-$B%/%(%s%I$G$9!#$=$l$>$l$N%U%!%$%k$OI8=`$N(B Un*x mbox $BMM<0$G$9!#(B
-@code{nnfolder} $B$O5-;vHV9f$HE~CeF|$r5-O?$7$F$*$/$?$a$NDI2C$N%X%C%@!<$r2C(B
-$B$($^$9!#(B
+@code{nnfolder} $B$O$=$l$>$l$N%a!<%k%0%k!<%W$rJL!9%U%!%$%k$K3JG<$9$k%P%C%/(B
+$B%(%s%I$G$9!#$=$l$>$l$N%U%!%$%k$OI8=`$N(B Un*x mbox $BMM<0$G$9!#(B
+@code{nnfolder} $B$O5-;vHV9f$HE~Ce;~9o$r8+<:$o$J$$$h$&$K$9$k$?$a$NDI2C$N%X%C(B
+$B%@!<$r2C$($^$9!#(B
 
 @cindex self contained nnfolder servers
 @cindex marks
@@ -14557,45 +15032,45 @@ Gnus $B$,(B @code{nnmaildir} $B$K0u$N%;%C%H$N3JG<$rMW5a$9$k$H!"(B
 @code{nnfolder} $B%5!<%P!<$O(B @code{tar} $B$J$I$r;H$C$F%P%C%/%"%C%W$7$?$j!"8e(B
 $B$G$"$J$?$,IU$1$?0u$,$9$Y$FJ]$?$l$?>uBV$G(B gnus $B$KLa$9(B ($BK\Mh(B
 $B$N(B @code{nnfolder} $B%5!<%P!<$K$h$C$FDI2C$9$k(B) $B$3$H$,$G$-$kFCo(B @file{.mrk} (@code{nnfolder-marks-file-name} $B$r;2>H(B) $B$,IU2C$5$l(B
-$B$?L>A0$N%U%!%$%k$K3JG<$5$l$^$9!#$^$?!"8D!9$N(B @code{nnfolder} $B%0%k!<%W$K(B
-$B$D$$$F$b%P%C%/%"%C%W$9$k$3$H$,2DG=$G!"(B($B%P%C%/%"%C%W$r(B nnfolder $B%G%#%l%/(B
-$B%$%H%j$KLa$7$?8e$G(B) @kbd{G m} $B%-!<$r;H$C$F$=$N%0%k!<%W$r85$KLa$7$^$9!#(B
+$B$K$J$j$^$9!#%0%k!<%W$N0u$O(B @code{nnfolder} $B%G%#%l%/%H%j!o(B @file{.mrk} (@code{nnfolder-marks-file-name} $B$r;2>H(B) $B$,IU2C$5(B
+$B$l$?L>A0$N%U%!%$%k$K3JG<$5$l$^$9!#$^$?!"8D!9$N(B @code{nnfolder} $B%0%k!<%W(B
+$B$K$D$$$F$b%P%C%/%"%C%W$9$k$3$H$,2DG=$G!"(B($B%P%C%/%"%C%W$r(B nnfolder $B%G%#%l(B
+$B%/%H%j!<$KLa$7$?8e$G(B) @kbd{G m} $B%-!<$r;H$($P!"$=$N%0%k!<%W$O85$KLa$j$^$9!#(B
 
-$B;ve$N%5!<%P!<$N@_Dj(B:
+$B2>A[%5!<%P!<$N@_Dj(B:
 
 @table @code
 @item nnfolder-directory
 @vindex nnfolder-directory
-$BA4$F$N(B @code{nnfolder} $B%a!<%k%\%C%/%9$O$3$N%G%#%l%/%H%j!<$N2<$KCV$+$l$^(B
-$B$9!#4{DjCM$O(B @code{message-directory} $B$NCM(B ($B$=$N4{DjCM(B
+$B$9$Y$F$N(B @code{nnfolder} $B%a!<%k%\%C%/%9$O$3$N%G%#%l%/%H%j!<$N2<$KCV$+$l(B
+$B$^$9!#%G%#%U%)%k%H$O(B @code{message-directory} $B$NCM(B ($B$=$N%G%#%U%)%k%H(B
 $B$O(B @file{~/Mail}) $B$G$9!#(B
 
 @item nnfolder-active-file
 @vindex nnfolder-active-file
-$B%"%/%F%#%V%U%!%$%k$NL>A0!#4{DjCM$O(B @file{~/Mail/active} $B$G$9!#(B
+$B%"%/%F%#%V%U%!%$%k$NL>A0!#%G%#%U%)%k%H$O(B @file{~/Mail/active} $B$G$9!#(B
 
 @item nnfolder-newgroups-file
 @vindex nnfolder-newsgroups-file
-$B%0%k!<%W5-=R%U%!%$%k$NL>A0!#(B@xref{Newsgroups File Format}. $B4{DjCM(B
+$B%0%k!<%W5-=R%U%!%$%k$NL>A0!#(B@xref{Newsgroups File Format}. $B%G%#%U%)%k%H(B
 $B$O(B @file{~/Mail/newsgroups"} $B$G$9!#(B
 
 @item nnfolder-get-new-mail
 @vindex nnfolder-get-new-mail
 @code{nil} $B$G$J$1$l$P!"(B@code{nnfolder} $B$OF~$C$F$/$k%a!<%k$rFI$_9~$_$^$9!#(B
-$B4{DjCM$O(B @code{t} $B$G$9!#(B
+$B%G%#%U%)%k%H$O(B @code{t} $B$G$9!#(B
 
 @item nnfolder-save-buffer-hook
 @vindex nnfolder-save-buffer-hook
 @cindex backup files
-$B%U%)%k%@!<$rJ]B8$9$kA0$Ko$N%P%C%/%"%C%W$NJQL>$r$9$k;v$KCm0U$7$F2<$5$$!#(B
-$B$3$N5!G=$rL58z$K$7$?$$$N$G$"$l$P!"%U%!%$%k(B @file{.emacs} $B$Go$H$*$j%U%!%$%kL>$rJQ99$7$F%P%C%/%"%C%W$r9T$J(B
+$B$&$3$H$KCm0U$7$F2<$5$$!#$3$N5!G=$rL58z$K$7$?$$$N$G$"$l$P!"(B
+@file{~/.gnus.el} $B%U%!%$%k$GC5n$5$l$k%a%C%;!<%8$KHO0O$r69$a$i$l$FC5n$9$k$^$($K2?$i$+$N>pJs$r(B
-$Bl=j$K%a%C%;!<%8$r%3%T!<$7$?$j!">C5n$9$kA0$K2?$i$+$N>pJs$r$r;H$C$F$$$k$H$-$K$N$_F0:n$7$^$9$,!#(B
+@code{nnfolder} $B$GFI$_$?$$$?$/$5$s$N(B @code{nnfolder} $B$K;w$?%U%!%$%k$r;}$C(B
+$B$F$$$k$N$J$i!"$=$N$h$&$J$9$Y$F$N%U%!%$%k$,(B @code{nnfolder-directory} $B$K(B
+$B$"$k$3$H$r(B @code{nnfolder} $B$K5$IU$+$;$k$?$a$K!"(B@kbd{M-x
+nnfolder-generate-active-file} $BL?Na$r;H$C$F2<$5$$!#$b$C$H$b!"$3$l$OD9$$(B
+$B%U%!%$%kL>$r;H$C$F$$$k$H$-$@$1F0:n$7$^$9$,!#(B
 
 @node Comparing Mail Back Ends
 @subsubsection $B%a!<%k%P%C%/%(%s%I$NHf3S(B
 
-$B$^$:!"MQ8l$H$7$F!"(B@dfn{$B%P%C%/%(%s%I(B} (back end) $B$ODc$`$J$i!"F)2aE*$G$"$j!"$=$l$O2?$+$r@.$7?k$2$k$b$N$G(B
-$B$9!#$=$N$3$3$m$O!"%a!<%k$O$I$3$+$i$+Mh$J$1$l$P$J$i$:!"E,@Z$J%P%C%/%(%s%I(B
-$B$NA*Br$O!"%a!<%k$r(B gnus $B$N$9$06a$/$K@\$KF'$_9~$`%j!<%@!<$K$h$C$F9T(B
+$B$J$o$l$^$7$?!#$?$^$?$^$=$&$$$&%5!<%P!<$K$$$k$N$J$i(B ($B$"$k$$$O(B NFS $B$r2p$7(B
+$B$F!"$H$K$+$/$=$l$N%9%W!<%k$N%G%#%l%/%H%j!<$r8+$k$3$H$,$G$-$k$N$J$i(B)$B!":#(B
+$B$G$b(B @code{nntp} $B$+(B @code{nnspool} $B%P%C%/%(%s%I$N$I$A$i$+$rA*$V$3$H$,$G(B
+$B$-$^$9!#(B
 
-$BF1$835G0$,(B Usenet $B<+?H$K$bB8:_$7$^$9!#5-;v$X$N@\?($O:#F|$G$O!"IaDL(B
-$B$O(B @acronym{NNTP} $B$G$J$5$l$^$9$,!"@N!9$NM+]5$J?@\5-;v$N%G%#%l%/%H%j!<%9%W!<%k$KF'$_9~$`$H(B
-$B$$$&$b$N$G$7$?!#$=$l$G$b!"$?$^$?$^%5!<%P!<(B ($B$b$7$/$O!"(BNFS $B$G%9%W!<%k$,FI(B
-$B$a$k$h$&$J>l9g(B) $B$K$$$k$h$&$J>l9g$O!"$3$l$i$NJ}K!$rA*$V$?$a(B
-$B$K(B @code{nntp} $B$d(B @code{nnspool} $B%P%C%/%(%s%I$N$I$A$i$+$rA*$V$3$H$,$G$-(B
-$B$^$7$?!#(B
+@quotation
+($BLuCm(B:$B!V@(NC$?$k0E9u$N@N$K$O!W$O%]!<$N;m!VBgrm!W$NKAF,ItJ,!H(BOnce upon a
+midnight dreary$B!I!#(B)
+@end quotation
 
-$B%a!<%k%P%C%/%(%s%I$rA*Br$9$k$3$H$N%4!<%k$O!"85$N7A<0$r07$&$N$KE,$7$?J}K!(B
-$B$H!">-Mh;HMQ$9$k$?$a$KJXMx$J7A<0$K%a!<%k$r;D$9$3$H$NN>J}$rF1;~$KI=8=$9$k(B
-$B$3$H$G$9!#$=$l$>$l$K$ONI$$E@$H0-$$E@$,$$$/$D$+$"$j$^$9(B:
+$B%a!<%k%P%C%/%(%s%I$rA*Br$9$k$3$H$N9T$-Ce$/@h$O!"85$N7A<0$r=hM}$7!"$+$D>-(B
+$BMhJXMx$K;H$($k7A<0$G%a!<%k$r;D$9$3$H$r!"F1;~$K$l$$$/$D$+$NNI$$E@$H0-$$E@$,$"$j$^$9(B:
 
 @table @code
 @item nnmbox
-
-UNIX $B%7%9%F%`$ONr;KE*$KC10l$N!"Hs>o$K0lHLE*$J!">e2A$G$-$k(B) $BJQ99$r$;$:$KJ#@=$9$k$3$H$G$9!#$=$l$O(B gnus $B$N4D6-$N;H(B
-$BMQ2DG=HO0O$K%a!<%k$r0\F0$9$k(B ``$B:G$b6r$+$J(B''$BJ}K!$G$9!#$3$l$ODj$a$i$l$?>l(B
-$B=j$K0\F0$9$k$N$rB.$/$7$^$9$,!"(Bgnus $B$,$I$3$K2?$,$"$k$+$rD4$Y$k$H$-$O!"2r(B
-$B@O$,CY$/$J$j$^$9!#(B
+$BNr;KE*$K(B UNIX $B%7%9%F%`$O!"$H$F$b0lHLE*$G9T$-FO$$$?Dj5A$N$?$C$?0l$D$N7A<0(B
+$B$r;}$C$F$$$^$9!#$9$Y$F$N%a%C%;!<%8$OC10l$N!V%9%W!<%k%U%!%$%k!W$KE~Ce$7!"(B
+$B$=$l$i$O@55,I=8=(B @samp{^From_} $B$K9gCW$9$k9T$G6h@Z$i$l$F$$$^$9!#(B
+(@samp{_} $B$H$$$&5-9f$O%9%Z!<%9$r0UL#$7!"$3$NNc$G$O$3$l$,(B RFC $B$G5,Dj$5$l(B
+$B$F$$$k(B @samp{From:} $B%X%C%@!<$G$O$J$$$3$H$r$O$C$-$j$5$;$k$?$a$K;H$C$F$$$^(B
+$B$9!#(B)  Emacs $B$=$l$K(B gnus $B$bNr;KE*$K(B Unix $B4D6-$+$i;O$^$C$F$$$k$N$G!"85(B
+$B$N(B mailbox $B7A<0$r$"$^$j$$$8$/$j2s$5$:$K:Q$a$P!"$=$l$,:G$bC1=c$G$9!#$7$?(B
+$B$,$C$F$3$N%P%C%/%(%s%I$rA*$s$@>l9g$K!"K\Ev$N%9%W!<%k$+$i%a!<%k$ruBV%S%C%H$r%U%!(B
-$B%$%k$N$=$l$>$l$N%a%C%;!<%8$N@hF,$K2C$($k$3$H$r$7$F$$$^$7$?!#(B
-Rmail $B$O(B Emacs $B$N:G=i$N%a!<%k%j!<%@!<$G!"(BRichard Stallman $B$K$h$C$F=q$+$l!"(B
-Stallman $B$O$=$N(B TOPS/Babyl $B4D6-$N=P?H$G$"$k$?$a!"(BRmail $B$r4{$KB8:_$7$F$$(B
-$B$?%a!<%k%U%!%$%k$N0lB2$rM}2r$9$kMM$K=q$-$^$7$?!#(BGnus ($B$3$NLdBj$K4X$7$F(B
-$B$O(B VM $B$b(B) $B$3$N7A<0$r%5%]!<%H$7B3$1$F$$$^$9!#$=$l$O!"$=$N%a!<%i!e$N7A<0$NN>J}$O%a!<%k$r%U%!%$%k%7%9%F%`$NC1FH$N%U%!%$%k$KF~$l!"%a!<%k$r(B
-$B8+$k$?$S$K!"%U%!%$%kA4BN$r2r@O$7$J$1$l$P$J$j$^$;$s!#(B
+$B$`$+$7$`$+$7$"$k$H$3$m$K(B DEC-10 $B$H(B DEC-20 $B$,$"$j$^$7$?!#$=$l$i$O(B TOPS $B$H(B
+$B$$$&%*%Z%l!<%F%#%s%0%7%9%F%`$d;w$?$h$&$J$b$N$ruBV%S%C%H$r!"%U%!%$%k$K$"$k$=$l$>$l$N%a%C%;!<(B
+$B%8$N@hF,$KA^F~$9$k$?$a$N;EAH$_$K$h$C$F!"%9%W!<%k%U%!%$%kIw$Ne5-$NN>J}$N7A<0$O!"%a!<%k$r%U%!%$%k%7%9%F%`$K$*$1$kC10l$N%U%!%$%k$KCV$$(B
+$B$?$^$^$K$9$k$N$G!"%a!<%k$r8+$k$?$S$K%U%!%$%kA4BN$r2r@O$7$J$1$l$P$J$j$^$;(B
+$B$s!#(B
 
 @item nnml
-
-@code{nnml} $B$O$[$H$s$I(B @code{nnspool} $B@\B3$N(B Usenet $B%7%9%F%`$rA`:n$7$F$$(B
-$B$k$h$&$J46$8$N$9$k%P%C%/%(%s%I$G$9!#(B($Bo$K$?$/$5$s>CHq$7$^$9!#$9$J$o$A!"%U%!%$(B
-$B%k%7%9%F%`$G?7$7$$%U%!%$%k$rF~$l$k$?$a$N2DG=$J>l=j$rDj5A$9$k;q8;$r$?$/$5(B
-$B$s@jM-$7$^$9!#%7%9%F%`4IM}e$G@83h$7$F$$$k$J$i!"(B@code{nnml} $B$OHs>o$KBg$-$JMxE@$,(B
-$B$"$j$^$9!#(B
-
-$B$^$?!"(BFAT16 $B$N(B Windows $B$N@$3&$K@8$-$F$$$k$J$i!"LdBj$,$"$k$G$7$g$&!#$?$/(B
-$B$5$s$N>.$5$J%U%!%$%k$GB?$/$N>l=j$ro$K$?$/$5$s>CHq$7$^$9!#$9$J$o$A!"?7$7$$(B
+$B%U%!%$%k$rCV$/$3$H$,$G$-$k>l=j$r%U%!%$%k%7%9%F%`>e$KDj$a$k$?$a$N;q8;$r!"(B
+$B$?$/$5$s@jM-$7$^$9!#$.$C$7$j$D$^$C$?6&M-%U%!%$%k%7%9%F%`$GBgNL(B
+$B$N(B inode $B$r@jM-$9$k$3$H$r!"%7%9%F%`4IM}/$G$O$J$$8D?M$N%^%7%s$K$$(B
+$B$k$N$J$i$P!"(B@code{nnml} $B$K$OHs>o$KBg$-$JMxE@$,$"$k$N$G$9$,!#(B
+
+FAT16 $B$N(B Windows $B$N@$3&$K$$$k>l9g$K$b!"$?$/$5$s$N>.$5$J%U%!%$%k$GB?$/$N(B
+$B>l=j$r/$7$+!"A4$/$J$$$+$H$$$&DxEY$G$9(B -- @code{nnmh} $B$O0UL#E*(B
-$B$K$O(B ``@code{nnml} $B$K%"%/%F%#%V%U%!%$%k$H(B overview $B$N$J$$$b$N(B'' $B$HEy2A$G(B
-$B$9!#$3$l$O5DO@$N$"$k$H$3$m$G$9$,!":G0-$NA*Br$G$9!#$H$$$&$N$O!"8D!9$N%U%!(B
-$B%$%k$N:n@.$NCY$5$,!"%0%k!<%W$G2?$,?7$7$$$+$rCN$k$H$-$N2r@O$N$?$a$N;HMQ$N(B
-$BCY$5$,7k$SIU$/$+$i$G$9!#(B
+$B$=$l$O%a%C%;!<%8$N%9%W!<%k%U%!%$%k$r8D!9$N%U%!%$%k$KJ,3d$9$k$3$H$K$h$C$F(B
+$BF0:n$7$^$9$,!":w0z5!G=$O>/$7$7$+!"$"$k$$$O$^$C$?$/$"$j$^$;(B
+$B$s(B---@code{nnmh} $B$O!"0UL#E*$K$O!V%"%/%F%#%V%U%!%$%k$^$?$O(B overview $B$NL5(B
+$B$$(B @code{nnml}$B!W$HEy2A$G$9!#$3$l$O$*$=$i$/:G0-$NA*Br$G$7$g$&!#$J$<$J$i$P!"(B
+$B8D!9$N%U%!%$%k$r:n$k$3$H$NCY$5$,!"2?$,%0%k!<%W$G?7$7$$$+$rCN$k$H$-$K2r@O(B
+$B$9$k$?$a$K9T$J$&%"%/%;%9$NCY$5$K7k$SIU$/$+$i$G$9!#(B
 
 @item nnfolder
-
-$B4pK\E*$K(B @code{nnfolder} $B$N8z2L$O%0%k!<%WKh$N(B @code{nnmbox} ($B>e$G@bL@$5(B
-$B$l$F$$$k:G=i$NJ}K!(B) $B$G$9!#$9$J$o$A!"(B@code{nnmbox} $B<+?H$O(B @emph{$BA4$F(B} $B$N(B
-$B%a!<%k$r0l$D$N%U%!%$%k$KF~$l$^$9(B; @code{nnfolder} $B$O%a!<%k%0%k!<%W$=$l$>(B
-$B$l$,(B Unix mail box $B%U%!%$%k$r;}$D$h$&$K>/$7:GE,2=$r$7$^$9!#(B
-@code{nnmobx} $B$h$j$b!"$=$l$>$l$N%0%k!<%W$rJL$K2r@O$9$k$N$GB.$/!"$=$N$&$((B
-$B%a!<%k$r0\F0$5$;$k$N$K:G>.8B$NO+NO$rMW5a$9$kC1=c$J(B Unix mail box $B7A<0$r(B
-$BDs6!$7$^$9!#2C$($F!"(Bgnus $B$,$=$l$>$l$NJL$N%0%k!<%W$K$I$N$/$i$$$N%a%C%;!<(B
-$B%8$,$"$k$+$rD4$Y$k$?$a$N(B ``$B%"%/%F%#%V(B'' $B%U%!%$%k$r0];}$7$^$9!#(B
+$B4pK\E*$K(B @code{nnfolder} $B$,e$G@bL@$5$l$F$$$k:G=i$NJ}K!(B) $B$G$9!#$9$J$o(B
+$B$A(B @code{nnmbox} $B<+BN$O(B @emph{$B$9$Y$F(B} $B$N%a!<%k$r0l$D$N%U%!%$%k$KF~$l$^$9!#(B
+$B$G$b(B @code{nnfolder} $B$O%a!<%k%0%k!<%W$N$=$l$>$l$,(B Unix mail box $B%U%!%$%k(B
+$B$r;}$D$h$&$K!"$[$s$N>/$7:GE,2=$r$7$^$9!#$=$l$>$l$N%0%k!<%W$OJL!9$K2r@O$5(B
+$B$l$k$N$G(B @code{nnmobx} $B$h$j$bB.$/!"$7$+$b$J$*!"%a!<%k$r0\F0$5$;$k$N$K:G(B
+$B>.8B$NO+NO$7$+MW5a$7$J$$!"C1=c$J(B Unix mail box $B7A<0$rDs6!$7$^$9!#2C$($F(B
+$B!V%"%/%F%#%V!W%U%!%$%k$r0];}$7!"(Bgnus $B$,$=$l$>$l$NJL$N%0%k!<%W$K$I$N$/$i(B
+$B$$$N%a%C%;!<%8$,$"$k$+$rD4$Y$k$3$H$r$H$F$bB.$/$7$^$9!#(B
 
 $B$b$7$?$/$5$s$NNL$N%a%C%;!<%8$rC5n$dB>$N$3$H$,$i$r@_Dj$9$k$N$K!"(B@code{nnmaildir} $B$OB>$N%a!<%k(B
-$B%P%C%/%(%s%I$H$O>/!90[$J$C$?!"8_49@-$NL5$$%0%k!<%W%Q%i%a!<%?$r;H$$$^$9!#(B
+$B4|8B@Z$l>C5n$=$NB>$b$m$b$m$r@_Dj$9$k$N$K!"(B@code{nnmaildir} $B$OB>$N%a!<%k(B
+$B%P%C%/%(%s%I$H$O>/!90[$J$C$?!"8_49@-$NL5$$%0%k!<%W%Q%i%a!<%?!<$r;H$$$^$9!#(B
 
 @code{nnmaildir} $B$OBgJ}(B @code{nnml} $B$H;w$?$b$N$G$9$,!"$$$/$i$+82Cx$J0c$$(B
 $B$,$"$j$^$9!#$=$l$>$l$N%a%C%;!<%8$OJL!9$N%U%!%$%k$K3JG<$5$l$^$9$,!"%U%!%$(B
@@ -14774,13 +15253,14 @@ maildir $B$OJN,$G$-$k$3$H$r0UL#$7$^$9!#(B@code{mail-sources} $B$K$*$1(B
-$B$k(B @code{directory} $B$N9`$K$O;w$?8z2L$,$"$j$^$9$,!"G[Aw$5$l$F$/$k%a!<%k$r(B
-$B%9%W!<%k$9$k$?$a$N%a!<%k%\%C%/%9$N0lB7$$(B (mbox $B7A<0$G$O$=$N$?$a$K%a%C%;!<(B
-$B%8$NK\J8$,2u$l$k(B) $B$H!"B>$N(B ($B2?$G$"$l$"$J$?$N9%$_$N7A<0$N(B) $B%0%k!<%W$H$7$F(B
-$B;H$o$l$kAH$,I,MW$G$9!#(Bmaildir $B$O(B @code{new/} $B%5%V%G%#%l%/%H%j$KCV$+$l$k(B
-$BAH$_9~$_%9%W!<%k$G$9!#%a!<%kJ,3d$,Fs=E%A%'%C%/$N$h$&$J07$$$r$N(B ($B2?$G$"$l(B
+$B$"$J$?$N9%$_$N7A<0$N(B) $B%0%k!<%W$H$7$F;H$o$l$kAH$,I,MW$G$9!#0l(B
+$BJ}(B maildir $B$O!"(B@code{new/} $B%5%V%G%#%l%/%H%j!<$KCV$+$l$kAH$_9~$_%9%W!<%k(B
+$B$r;}$A$^$9!#%a!<%kJ,3d$K$h$kBe$o$j$K(B @code{new/} $B$+$i(B @code{cur/} $B$K0\F0(B
+$B$5$l$?%a!<%k$O!"%@%V$C$F$$$k$+$I$&$+$r%A%'%C%/$9$k$h$&$J=hM}$r:#$N$H$3$m(B
+$B$Oe$2$k$?$a$K$+$J$j$NNL$N%a%b%j$r;H$$$^$9!#(B
-(@code{nnml} $B$N>l9g$O%U%!%$%k$K3JG<$7!"(B@code{nnmh} $B$G$O2?EY$b5-;v%U%!%$(B
-$B%k$r2r@O$7$FF@$k$b$N$4$H$r!"$=$l$O%a%b%j>e$KJ];}$7$^$9!#(B) $B$3$l$,$"$J$?$K(B
-$B$H$C$FLdBj$J$i$P!"(B@code{nov-cache-size} $B%0%k!<%W%Q%i%a!<%?$r2?$+>.$5$J(B
-$BCM(B (0 $B$O$*$=$i$/$@$a$@$,(B 1 $B$@$C$?$i$?$V$sF0$/(B) $B$K@_Dj$9$k$3$H$K$h$C$F!"(B
-$B>/$J$$%a%b%j$r;H$&$h$&$K$9$k$3$H$,$G$-$^$9!#$3$N%-%c%C%7%e5!9=$O!"$*$=$i(B
-$B$/>-Mh$O:o=|$5$l$k$G$7$g$&!#(B
+(@code{nnml} $B$N>l9g$O%U%!%$%k$K3JG<$7!"(B@code{nnmh} $B$G$O2?EY$b%a%C%;!<%8(B
+$B%U%!%$%k$r2r@O$7$FF@$k$b$N$4$H$r!"$=$l$O%a%b%j>e$KJ];}$7$^$9!#(B) $B$3$l$,$"(B
+$B$J$?$K$H$C$FLdBj$J$i$P!"(B@code{nov-cache-size} $B%0%k!<%W%Q%i%a!<%?!<$r2?$+(B
+$B>.$5$JCM(B (0 $B$O$*$=$i$/$@$a$G$9$,(B 1 $B$@$C$?$i$?$V$sF/$-$^$9(B) $B$K@_Dj$9$k$3(B
+$B$H$K$h$C$F!">/$J$$%a%b%j$G:Q$`$h$&$K$9$k$3$H$,$G$-$^$9!#$3$N%-%c%C%7%e5!(B
+$B9=$O!"$*$=$i$/>-Mh$O:o=|$5$l$k$G$7$g$&!#(B
 
-$B5/F0$OB>$N%P%C%/%(%s%I$h$j$b(B @code{nnmaildir} $B$,CY$$$G$7$g$&!#%U%!%$%k%7(B
-$B%9%F%`$K0MB8$7$F$$$kItJ,0J30$N$9$Y$F$OB.$$$G$7$g$&!#(B
+$B5/F0$OB>$N%P%C%/%(%s%I$h$j$b(B @code{nnmaildir} $B$NJ}$,CY$$$G$7$g$&!#%U%!%$(B
+$B%k%7%9%F%`$K0MB8$7$F$$$J$$$9$Y$F$NItJ,$G$OB.$$$G$7$g$&!#(B
 
 @code{nnmaildir} $B$O(B @code{nnoo} $B$r;H$o$J$$$N$G!"(B@code{nnmaildir} $B$+$iGI(B
 $B@8$7$?%P%C%/%(%s%I$r=q$/$N$K(B @code{nnoo} $B$O;H$($^$;$s!#(B
@@ -14814,44 +15294,44 @@ maildir $B$Ol$K$J$j!"%a!<%j%s%0%j%9%H$d%K%e!<%9%0%k!<%W$N=EMW@-$r(B
 $BfJ$i$;$F$$$^$9!#M}M3$O4JC1$G$9(B---$B?7$7$$MxMQl(B
 $B=j$r%/%j%C%/$9$k$@$1$G!"5DO@$N>l$,$"$j$^$9!#%a!<%j%s%0%j%9%H$G$O!"LLE]$J(B
-$B9XFIe$,$kLdBj$O!"%&%'%V%V%i%&%6!<$O%K%e!<%9%j!<%@!<$H$7(B
+$B$F$O$"$^$jNI$/$J$$$H$$$&$3$H$G$9!#$I$s$J5-;v$rFI$s$@$+$r5-O?$7$^$;$s!#6=(B
+$BL#$N$"$kI=Bj$K%9%3%"$rIU$1$k$3$H$,$G$-$^$;$s!#%*%U%i%$%s$GFI$`$3$H$,$G$-(B
+$B$^$;$s!#2?EY$b%/%j%C%/$9$k$3$H$rMW5a$7!":G8e$K$O$"$J$?$rE\$i$;$^$9!#(B
 
-$B$=$l$G(B---$B%&%'%V%V%i%&%6!<$,7G<(HD$rFI$`$N$KE,$7$F$$$J$$$N$J$i!"$I$&$7$F(B
-$BBe$o$j$K(B gnus $B$r;H$o$J$$$N$G$7$g$&(B?
+$B$J$i$P(B---$B%&%'%V%V%i%&%6!<$,7G<(HD$rFI$`$N$KE,$7$F$$$J$$$N$J$i!"Be$o$j(B
+$B$K(B gnus $B$r;H$$$^$;$s$+(B?
 
-Gnus $B$O$3$l$i$N%=!<%9$X$N3&LL$rDs6!$9$k%P%C%/%(%s%I72$r>/$7Hw$($D$D$"$j(B
-$B$^$9!#(B
+gnus $B$O$3$l$i$N%=!<%9$X$N%$%s%?!<%U%'!<%9$rDs6!$9$k%P%C%/%(%s%I72$r>/$7(B
+$BHw$($D$D$"$j$^$9!#(B
 
 @menu
 * Archiving Mail::
-* Web Searches::                $BJ8;zNs$K%^%C%A$9$k5-;v$+$i%0%k!<%W$r:n$k(B
+* Web Searches::                $BJ8;zNs$K9gCW$9$k5-;v$+$i%0%k!<%W$r:n$k(B
 * Slashdot::                    Slashdot $B$N%3%a%s%H$rFI$`(B
 * Ultimate::                    Ultimate Bulletin Board $B%7%9%F%`(B
 * Web Archive::                 $B%&%'%V$KJ]4I$5$l$?%a!<%j%s%0%j%9%H$rFI$`(B
 * Web Newspaper::               $B%&%'%V$KJ]4I$5$l$??7J9$rFI$`(B
 * RSS::                         RDF Site Summary $B$rFI$`(B
-* Customizing w3::              Gnus $B$+$i(B Emacs/W3 $B$rA`:n$9$k(B
+* Customizing W3::              gnus $B$+$i(B Emacs/W3 $B$rA`:n$9$k(B
 @end menu
 
 @samp{Web Newspaper} $B$r=|$/$9$Y$F$N%&%'%V%=!<%9$O!"F0:n$5$;$k$?$a(B
-$B$K(B Emacs/W3 $B$H(B url $B%i%$%V%i%j$,I,MW$G$9!#(B
+$B$K(B Emacs/W3 $B$H(B url $B%i%$%V%i%j!pJs$r=8$a$k$N$O$;$$$<$$?dB,$G!"9=B$$,JQ2=$7$?(B
-$B$H$-$K$O!"(Bgnus $B%P%C%/%(%s%I$OF0:n$7$^$;$s!#$G$b!"$"$kDxEY?7$7$$%P!<%8%g(B
-$B%s$N%P%C%/%(%s%I$r;H$C$F$$$l$PBg>fIW$N$O$:$G$9!#(B
+$B$3$l$i$N%&%'%V%=!<%9$N0lHV$NLdBj$O!"D94|4V$OF0:n$7$J$$2DG=@-$,9b$$$3$H$G(B
+$B$9!#(B@acronym{HTML} $B$N%G!<%?$+$i>pJs$r=&$$=8$a$k$N$O$;$$$<$$?dB,$G!"$=$N(B
+$B9=B$$,JQ2=$7$?$H$-$K$O!"(Bgnus $B%P%C%/%(%s%I$OF0:n$7$^$;$s!#$G$b!"$"$kDxEY(B
+$B?7$7$$%P!<%8%g%s$N%P%C%/%(%s%I$r;H$C$F$$$l$PBg>fIW$N$O$:$G$9!#(B
 
-$B$3$l$i$N%&%'%VJ}K!$K6&DL$9$k$3$H$O!"%&%'%V%=!<%9$O$7$P$7$PMn$A$F$$$?$j!"(B
-$B;HMQ2DG=$G$J$+$C$?$j!"C1=c$K3Z$7$`$K$OCY$9$.$k$3$H$,$"$k!"$H$$$&$3$H$G$9!#(B
-$B$=$&$$$&>l9g$K$O!"(BGnu Agent (@pxref{Gnus Unplugged}) $B$K5-;v$N%@%&%s%m!<(B
-$B%I$rG$$;$F!"%m!<%+%k%G%#%9%/$+$i9%$-$J$H$-$KFI$`$h$&$K$9$k$3$H$,$G$-$^$9!#(B
-$B$3$l$G!"(BWorld Wide Wait $B$H$O$*$5$i$P$G$9!#(B
+$B$3$l$i$N%&%'%V$Nl9g$K!"(Bgnus Agent (@pxref{Gnus Unplugged}) $B$K5-;v$N%@%&%s%m!<%I(B
+$B$rG$$;$F!"%m!<%+%k%G%#%9%/$+$i9%$-$J$H$-$KFI$`$h$&$K$9$k$3$H$O!"Bg$$$K0U(B
+$B5A$,$"$j$^$9!#$3$l$G(B World Wide Wait $B$H$O$*$5$i$P$G$9!#(B
 
 @node Archiving Mail
 @subsection $B%a!<%k$NJ]B8(B
@@ -14859,30 +15339,32 @@ Gnus $B$O$3$l$i$N%=!<%9$X$N3&LL$rDs6!$9$k%P%C%/%(%s%I72$r>/$7Hw$($D$D$"$j(B
 @cindex backup of mail
 
 $B$$$/$D$+$N%P%C%/%(%s%I!"FC$K(B @code{nnml}, @code{nnfolder} $B$*$h(B
-$B$S(B @code{nnmaildir} $B$O!"$=$l$>$l$N%0%k!<%W$N5-;v$N0u$rK\Ev$KJ];}$7$^$9!#(B
-$B$3$l$i$N%5!<%P!<$G!"%0%k!<%W$N0u$rJ]$A$D$DJ]B8$7$?$j85$KLa$9$N$O$+$J$j4J(B
-$BC1$G$9!#(B
+$B$S(B @code{nnmaildir} $B$O!":#$G$O$=$l$>$l$N%0%k!<%W$N5-;v$N0u$rK\Ev$KJ];}$9(B
+$B$k$h$&$K$J$j$^$7$?(B ($BLuCm(B: $B$=$&$J$C$?$N$O$@$$$VA0$G$9$,(B)$B!#$3$l$i$N%5!<%P!<(B
+$B$G!"%0%k!<%W$N0u$rJ]$A$D$DJ]B8$7$?$j85$KLa$9$N$O$+$J$j4JC1$G$9!#(B
 
-($B$G$b!"%0%k!<%W%l%Y%k$H%0%k!<%W%Q%i%a!<%?$r$bJ];}$9$k$K$O!":#$^$G$H$*(B
+($B$G$b!"%0%k!<%W%l%Y%k$H%0%k!<%W%Q%i%a!<%?!<$r$bJ];}$9$k$K$O!":#$^$G$H$*(B
 $B$j(B @file{.newsrc.eld} $B$N?@$K!"Iq$$$H@8lS$rJ{$2$J$1$l$P$J$j$^$;$s$,!#(B)
 
 @code{nnml}, @code{nnfolder} $B$^$?$O(B @code{nnmaildir} $B%5!<%P!<$K$^$k$4$H(B
-$BJ]B8$9$k$K$O!"%5!<%P!<$N%G%#%l%/%H%j$r:F5"E*$K%3%T!<$7$^$9!#(Bgnus $B$r=*N;(B
-$B$9$kI,MW$OL5$$$N$G!"J]B8$O(B @code{cron} $B$d$=$l$KN`$9$k$b$N$,9T$J$&$3$H$,(B
-$B$G$-$^$9!#%G!<%?$rI|5"$5$;$k$K$O%G%#%l%/%H%jLZ(B (tree) $B$r85$KLa$9$3$H$G9T(B
-$B$J$$!"$=$N%G%#%l%/%H%j$r;X$7<($9$h$&$K(B gnus $B$N%5!<%P!<$NDj5A$KDI2C$7$^$9!#(B
-@ref{Article Backlog}, @ref{Asynchronous Fetching} $B$*$h$S$=$NB>$O!"%G!<(B
-$B%?$r>e=q$-$7$FJ}$r%3%T!<$9$kI,MW$,$"$j$^$9!#%0%k!<%W$r85$KLa$9(B
-$B$N$O!"%0%k!<%W%P%C%U%!$G(B @kbd{G m} $B%-!<$r;H$$$^$9!#$=$N:G8e$Nl9g(B @kbd{G m} $B$OITMW$G$9!#(B
+$BJ]B8$9$k$K$O!"%5!<%P!<$N%G%#%l%/%H%j!<$r:F5"E*$K%3%T!<$7$F2<$5$$!#(B
+gnus $B$r=*N;$9$kI,MW$OL5$$$N$G!"J]B8$O(B @code{cron} $B$d$=$l$KN`$9$k$b$N$,9T(B
+$B$J$&$3$H$,$G$-$^$9!#%G!<%?$rI|5"$5$;$k$K$O%G%#%l%/%H%j!$N$b$N$O%G!<%?$r>e=q$-$7$FJ}$r%3%T!<(B
+$B$9$kI,MW$,$"$j$^$9!#%0%k!<%W$r85$KLa$9$K$O!"%0%k!<%W%P%C%U%!!<(B
+$B$G(B @kbd{G m} $B%-!<$r;H$$$^$7$g$&!#$=$N:G8e$Nl9g(B @kbd{G m} $B$OITMW$G$9!#(B
 
 @node Web Searches
 @subsection $B%&%'%V8!:w(B
@@ -14893,78 +15375,87 @@ Gnus $B$O$3$l$i$N%=!<%9$X$N3&LL$rDs6!$9$k%P%C%/%(%s%I72$r>/$7Hw$($D$D$"$j(B
 @cindex Usenet searches
 @cindex searching the Usenet
 
-$B$=$l$O!"$J$s$H$$$&$+!"(BUsenet $B$+$iJ8;zNs$K%^%C%A$9$k5-;v$r8!:w$9$k$N$O$H(B
-$B$F$bAG@2$i$7$$$s$@$1$I!"$=$N!"$"$N%&%'%V%V%i%&%6!<$C$F$d$D$r;H$C$F!"$=$s(B
-$B$G$b$C$F!"@kEA$rFI$^$;$i$l$k$C$F$$$&$N$O!"$=$N!"$J$s$H$$$&$+!"$[$s$H$&(B
-$B$K(B @emph{$B!VITMM$M!W(B} $B$H$$$&$+!"$=$l$G!"(Bgnus $B$G$O%V%i%&%6!<$r;H$o$:$K!"$=(B
-$B$N!"(B@emph{$BD6$+$C$3$h$/(B}$B$=$l$,$G$-$k!"$C$F$3$H$G$9!#(B
-
-@code{nnweb} $B%P%C%/%(%s%I$O!"6/NO$J8!:w%(%s%8%s$KBP$7$F4JC1$J%$%s%?!<%U%'!<(B
-$B%9$rDs6!$7$^$9!#(B@code{nnweb} $B%0%k!<%W$r:n@.$7!"8!:w%Q%?!<%s$rF~NO$7!"$=(B
-$B$7$F$=$N%0%k!<%W$KF~$C$FB>$NIaDL$N%0%k!<%W$N$h$&$K5-;v$rFI$_$^$9!#%0%k!<(B
-$B%W%P%C%U%!(B (@pxref{Foreign Groups}) $B$N(B @kbd{G w} $BL?Na$K$h$C$F$*%s!&%G!<%H%k(B} ($BB8:_M}M3(B) $B$G$"$j!"e$J$$$N$G$O$"$j$^$9$,!"$7$+$7!"(B
+$B2?$H?=$7$^$7$g$&$+!"%&%'%V%V%V%i%&%6!<$H$$$$$^$9$+!"$=$&$$$&$b$N$r;H$C$F(B
+$B$3$H$r9T$J$&$N$O!"2?$H$b$=$N!"$O$P$+$j$J$,$i!"$V$6$^$H8@$$$^$9$+!"$=$&$9(B
+$B$k$H!"%3%^!<%7%c%k$r8+$J$$$o$1$K$O$$$+$J$$$N$G$"$j$^$7$F!"$7$+$k$K!"(B
+@c $B!V%V%V%V!W$O%?%$%]$8$c$J$$$s$@$h!<$s!#(B
+gnus $B$r;H$($P%V%i%&%6!$NIaDL$N%0%k!<%W$N$h$&$K5-;v$rFI$s$G2<$5$$!#%0(B
+$B%k!<%W%P%C%U%!!<(B (@pxref{Foreign Groups}) $B$N(B @kbd{G w} $BL?Na$K$h$C$F!"%s!&%G!<%H%k(B} ($BB8:_M}M3(B) $B$G$"$j!"A[%5!<%P!$K$J$C$F$$$k$3$H$KCm0U$7$F2<$5$$!#(B
 
 @item nnweb-search
 @vindex nnweb-search
-$B8!:w%(%s%8%s$KM?$($k8!:wJ8;zNs!#(B
+$B8!:w%(%s%8%s$KM?$($k8!:wJ8;zNs$G$9!#(B
 
 @item nnweb-max-hits
 @vindex nnweb-max-hits
-$BI=<($9$k8!:w7k2L$N:GBg?t!#=i4|CM$O(B 999 $B$G$9!#(B
+$B0l$D$N8!:w$GI=<($9$k:GBg$N%R%C%H?t$N4uK>CM$G!"%G%#%U%)%k%H$O(B 999 $B$G$9!#(B
 
 @item nnweb-type-definition
 @vindex nnweb-type-definition
-$B7?!&Dj5AO"A[%j%9%H!#$3$NO"A[%j%9%H$O!"$5$^$6$^$J8!:w%(%s%8%s$N/$7Hw$($D$D$"$j(B
 @cindex nnslashdot
 
 @uref{http://slashdot.org/, Slashdot} $B$O?M5$$N$"$k%K%e!<%9%5%$%H$G!"%K%e!<(B
-$B%95-;v$N8e$K3hH/$J5DO@$,$J$5$l$F$$$^$9!#(B@code{nnslashdot} $B$G$OJXMx$JJ}K!(B
-$B$G$3$N2q5D<<$rFI$`$3$H$,$G$-$^$9!#(B
+$B%95-;v$K4X$7$F3hH/$J5DO@$,$J$5$l$F$$$^$9!#(B@code{nnslashdot} $B$G$OJXMx$JJ}(B
+$BK!$G$3$N2q5D<<$rFI$`$3$H$,$G$-$^$9!#(B
 
-$B$3$3$+$iFI$`$?$a$N0lHV4JC1$JJ}K!$O0J2<$N$h$&$J$b$N(B
+$B$3$3$+$iFI$`$?$a$N0lHV4JC1$JJ}K!$O!"0J2<$N$h$&$J$b$N(B
 $B$r(B @file{~/.gnus.el} $B%U%!%$%k$KF~$l$k$3$H$G$9!#(B
 
 @lisp
@@ -14985,33 +15476,33 @@ Gnus $B$O$3$l$i$N%=!<%9$X$N3&LL$rDs6!$9$k%P%C%/%(%s%I72$r>/$7Hw$($D$D$"$j(B
       '((nnslashdot "")))
 @end lisp
 
-$B$3$l$O(B gnus $B$K(B @code{nnslashdot} $B%P%C%/%(%s%I$K?7$7$$%3%a%s%H$H%0%k!<%W(B
-$B$r?R$M$k$h$&$K$7$^$9!#(B@kbd{F} $BL?Na$O$=$l$>$l$N?7$7$$%K%e!<%95-;v$r?7$7(B
-$B$$(B gnus $B$N%0%k!<%W$H$7$F9XFI$7!"$3$l$i$N%0%k!<%W$KF~$k$3$H$G%3%a%s%H$rFI(B
-$B$`$3$H$,$G$-$^$9!#(B($B=i4|@_Dj$N9XFIJ}K!$G$O!"?7$7$$%0%k!<%W$r%>%s%S$H$7$F(B
-$B9XFI$9$k$3$H$KCm0U$7$F$/$@$5$$!#B>$NJ}K!$b;H$($^(B
+$B$3$l$O(B gnus $B$K(B @code{nnslashdot} $B%P%C%/%(%s%I$KBP$7$F?7$7$$%3%a%s%H$H%0(B
+$B%k!<%W$r?R$M$5$;$^$9!#(B@kbd{F} $BL?Na$O$=$l$>$l$N?7$7$$%K%e!<%95-;v$r?7$7(B
+$B$$(B gnus $B$N%0%k!<%W$H$7$F:n$k$N$G!"$3$l$i$N%0%k!<%W$KF~$k$3$H$K$h$C$F%3%a(B
+$B%s%H$rFI$`$3$H$,$G$-$^$9!#(B($B%G%#%U%)%k%H$N9VFIJ}K!$G$O!"?7$7$$%0%k!<%W$r(B
+$B%>%s%S$H$7$F:n$k$3$H$KCm0U$7$F2<$5$$!#B>$NJ}K!$r;H$&$3$H$b$G$-$^(B
 $B$9(B (@pxref{Subscription Methods})$B!#(B
 
-$B$b$7$"$J$?$,8E$$(B @code{nnslashdot} $B%0%k!<%W$r:o=|$7$?$$$N$J$i$P!"(B
-@kbd{G DEL} $B$,:G$bl9g$K$O!"(B@kbd{G DEL} $B$,:G$b(B
+$B/$7(B @acronym{HTML} $B$KJQ49$5$l$^$9!#FC$K!"(B@samp{> } $B$G0zMQ(B
-$B$5$l$?%F%-%9%H$O$=$NBe$o$j$K(B @samp{blockquote} $B$G0zMQ$5$l!"=pL>$K$O$=$l(B
-$B$>$l$N9T$N:G8e$K(B @samp{br} $B$,DI2C$5$l$^$9!#$=$l0J30$O!"%a%C%;!<%8%P%C%U%!(B
-$B$KD>@\(B @acronym{HTML} $B$r=q$/$3$H$,$G$-$^$9!#(BSlashdot $B$O$$$/$D(B
-$B$+(B @acronym{HTML} $B$rA*JL$9$k$3$H$K5$$r$D$1$F$/$@$5$$!#(B
+@code{nnslashdot} $B$N%3%a%s%H$K%U%)%m!<%"%C%W(B ($B$^$?$O?7$7$$%3%a%s%H$NEj(B
+$B9F(B) $B$r$9$k$H$-$O!"$$$/$D$+$N7Z$$(B @acronym{HTML} $BJQ49$,9T$J$o$l$^$9!#FC(B
+$B$K(B @samp{> } $B$G0zMQ$5$l$?%F%-%9%H$OBe$o$j$K(B @samp{blockquote} $B$G0zMQ$5$l!"(B
+$B=pL>$K$O$=$l$>$l$N9T$N:G8e$K(B @samp{br} $B$,DI2C$5$l$^$9!#$=$l0J30$O!"%a%C(B
+$B%;!<%8%P%C%U%!!<$KD>@\(B @acronym{HTML} $B$r=q$/$3$H$,$G$-$^$9!#(BSlashdot $B$O(B
+$B$$$/$D$+$N(B @acronym{HTML} $BMM<0$r$U$k$$Mn$H$9$3$H$K5$$rIU$1$F2<$5$$!#(B
 
 $B0J2<$NJQ?t$G?6$kIq$$$rJQ$($k$3$H$,$G$-$^$9(B:
 
 @table @code
 @item nnslashdot-threaded
-@code{nnslashdot} $B$,%0%k!<%W$r%9%l%C%I$GI=<($9$k$+$I$&$+!#=i4|CM(B
-$B$O(B @code{t} $B$G$9!#%9%l%C%I$rI=<($G$-$k$?$a$K$O!"(B@code{nnslashdot} $B$O%0%k!<(B
-$B%W$KF~$k:]$K$=$NA4$F$N%3%a%s%H$rl9g$h$j!"$:$C$H$:$C$HCY$/$J$j$^$9!#(B
 
 @item nnslashdot-login-name
 @vindex nnslashdot-login-name
@@ -15023,30 +15514,33 @@ Gnus $B$O$3$l$i$N%=!<%9$X$N3&LL$rDs6!$9$k%P%C%/%(%s%I72$r>/$7Hw$($D$D$"$j(B
 
 @item nnslashdot-directory
 @vindex nnslashdot-directory
-@code{nnslashdot} $B$,%U%!%$%k$rJ]B8$9$k>l=j$G$9!#=i4|CM(B
+@code{nnslashdot} $B$,%U%!%$%k$rJ]B8$9$k>l=j$G$9!#%G%#%U%)%k%H(B
 $B$O(B @file{~/News/slashdot/} $B$G$9!#(B
 
 @item nnslashdot-active-url
 @vindex nnslashdot-active-url
-$B%K%e!<%95-;v$H%3%a%s%H$rpJs$H%3%a%s%H$r/$7Hw$($D$D$"$j(B
 @cindex Ultimate Bulletin Board
 
 @uref{http://www.ultimatebb.com/, The Ultimate Bulletin Board} $B$O$*$=$i(B
-$B$/0lHVNI$/;H$o$l$F$$$k%&%'%V7G<(HD%7%9%F%`$G$7$g$&!#$H$F$b@0A3$H$7$FNI$$(B
-$B3&LL$G!"(Bgnus $B$,%0%k!<%W$r:G?7$N>uBV$KJ]$C$F$*$/$?$a$K>pJs$rF@$k$3$H$,2D(B
-$BG=$G$9!#(B
+$B$/0lHVNI$/;H$o$l$F$$$k%&%'%V7G<(HD%7%9%F%`$G$7$g$&!#$H$F$b5,B'E*$GNIuBV$KJ]$C$F$*$/$?(B
+$B$a$KI,MW$J>pJs$rF@$k$3$H$,2DG=$G$9!#(B
 
-@code{nnultimate} $B$r;O$a$k$?$a$N0lHV4JC1$JJ}K!$O%0%k!<%W%P%C%U%!$G0J2<$N(B
-$B$h$&$J$b$N$r$9$k$3$H$G$9(B: @kbd{B nnultimate RET
+@code{nnultimate} $B$r;O$a$k$?$a$N0lHV4JC1$JJ}K!$O!"%0%k!<%W%P%C%U%!!<$G0J(B
+$B2<$N$h$&$J$b$N$r$9$k$3$H$G$9(B: @kbd{B nnultimate RET
 http://www.tcj.com/messboard.ubbcgi/ RET}$B!#(B($B6=L#$N$"$k2q5D<<(B
 $B$N(B @acronym{URL} (@samp{Ultimate.cgi} $BEy$r:G8e$K4^$s$G$$$J$$$b$N(B) $B$KJQ$((B
-$B$F$/$@$5$$!#(BUltimate $B%&%'%V%5%$%H$K$O$?$/$5$s5s$2$i$l$F$$$^$9!#(B) $B$=$l$+(B
-$B$i%5!<%P!<%P%C%U%!$G6=L#$N$"$k%0%k!<%W$r9XFI$7!"%0%k!<%W%P%C%U%!$+$i$=$l(B
-$B$i$rFI$s$G$/$@$5$$!#(B
+$B$F2<$5$$!#(BUltimate $B%&%'%V%5%$%H$K$O$?$/$5$s5s$2$i$l$F$$$^$9!#(B) $B$=$l$+$i(B
+$B%5!<%P!<%P%C%U%!!<$G6=L#$N$"$k%0%k!<%W$r9XFI$7!"%0%k!<%W%P%C%U%!!<$+$i$=(B
+$B$l$i$rFI$s$G2<$5$$!#(B
 
-$B0J2<$N(B @code{nnutimate} $BJQ?t$rJQ992DG=$G$9(B:
+$B0J2<$N(B @code{nnutimate} $BJQ?t$,JQ992DG=$G$9(B:
 
 @table @code
 @item nnultimate-directory
 @vindex nnultimate-directory
-@code{nnultimate} $B$,%U%!%$%k$rJ]B8$9$k%G%#%l%/%H%j!<$G$9!#=i4|CM(B
+@code{nnultimate} $B$,%U%!%$%k$rJ]B8$9$k%G%#%l%/%H%j!<$G$9!#%G%#%U%)%k%H(B
 $B$O(B @file{~/News/ultimate/} $B$G$9!#(B
 @end table
 
@@ -15081,27 +15575,27 @@ http://www.tcj.com/messboard.ubbcgi/ RET}$B!#(B($B6=L#$N$"$k2q5D<<(B
 @cindex nnwarchive
 @cindex Web Archive
 
-$B%a!<%j%s%0%j%9%H$NCf$K$ONc$($P!"(B
+$B$$$/$D$+$N%a!<%j%s%0%j%9%H$O!"(B
 @uref{http://www.egroups.com/} $B$d(B @uref{http://www.mail-archive.com/} $B$N(B
-$B$h$&$K%&%'%V%5!<%P!<$K$7$+%"!<%+%$%V$,L5$$$b$N$b$"$j$^$9!#$H$F$b@0A3$H$7(B
-$B$FNI$$3&LL$G!"(Bgnus $B$,%0%k!<%W$r:G?7$N>uBV$KJ]$C$F$*$/$?$a$K>pJs$rF@$k$3(B
-$B$H$,2DG=$G$9!#(B
+$B$h$&$J%&%'%V%5!<%P!<$G$@$1!"$=$N%"!<%+%$%V$r;}$C$F$$$^$9!#$=$l$O$H$F$b5,(B
+$BB'E*$GNIu(B
+$BBV$KJ]$C$F$*$/$?$a$KI,MW$J>pJs$rF@$k$3$H$,2DG=$G$9!#(B
 
 @findex gnus-group-make-warchive-group
-@code{nnwarchive} $B$r;O$a$k$?$a$N0lHV4JC1$JJ}K!$O%0%k!<%W%P%C%U%!$G0J2<$N(B
-$B$h$&$J$b$N$r$9$k$3$H$G$9(B: @kbd{M-x gnus-group-make-warchive-group RET
-@var{an_egroup} RET egroups RET www.egroups.com RET
+@code{nnwarchive} $B$r;O$a$k$?$a$N0lHV4JC1$JJ}K!$O!"%0%k!<%W%P%C%U%!!<$G0J(B
+$B2<$N$h$&$J$b$N$r$9$k$3$H$G$9(B: @kbd{M-x gnus-group-make-warchive-group
+RET @var{an_egroup} RET egroups RET www.egroups.com RET
 @var{your@@email.address} RET}$B!#(B(@var{an_egroup} $B$r9XFI$7$F$$$k%a!<%j%s(B
 $B%0%j%9%H$K!"(B@var{your@@emailaddress} $B$rEE;R%a!<%k%"%I%l%9$KCV$-49$($F2<(B
 $B$5$$!#(B) $B$^$?$O(B @kbd{B nnwarchive RET mail-archive RET} $B$G%P%C%/%(%s%I$r(B
 $B%V%i%&%:$7$F2<$5$$!#(B
 
-$B0J2<$N(B @code{nnwarchive} $BJQ?t$rJQ$($k$3$H$,2DG=$G$9(B:
+$B0J2<$N(B @code{nnwarchive} $BJQ?t$,JQ992DG=$G$9(B:
 
 @table @code
 @item nnwarchive-directory
 @vindex nnwarchive-directory
-@code{nnwarchive} $B$,%U%!%$%k$rJ]B8$9$k%G%#%l%/%H%j!<$G$9!#=i4|CM(B
+@code{nnwarchive} $B$,%U%!%$%k$rJ]B8$9$k%G%#%l%/%H%j!<$G$9!#%G%#%U%)%k%H(B
 $B$O(B @file{~/News/warchive} $B$G$9!#(B
 
 @item nnwarchive-login
@@ -15133,38 +15627,39 @@ http://emacs-w3m.namazu.org/
 http://w3m.sourceforge.net/
 @end example
 
-@c This comment line is needed to prevent texinfmt bug. :-(
 $B$"$J$?$N%7%9%F%`$K$9$G$K(B emacs-w3m $B$,%$%s%9%H!<%k$5$l$F$$$k$N$J$i$P!"(B
-(@pxref{Nnshimbun, , Nnshimbun, emacs-w3m-ja, Emacs-w3m-ja}) $B$r;2>H$7$F(B
-$B2<$5$$!#(B
+@xref{Nnshimbun, ,Nnshimbun, emacs-w3m-ja, Emacs-w3m-ja}, $B$r;2>H$7$F2<$5(B
+$B$$!#(B
 
 @node RSS
 @subsection RSS
 @cindex nnrss
 @cindex RSS
 
-$B$$$/$D$+$N%5%$%H$O(B RDF site summary (@acronym{RSS}) $B$r;}$C$F$$$^$9!#(B
-@acronym{RSS} $B$O!"%K%e!<%9$K4XO"$9$k%5%$%H(B (BBC $B$d(B CNN $B$N$h$&$J(B) $B$N]$K$J(B
+$B$j$^$9!#(B
 
-@acronym{RSS} $B$O$H$F$b5,B'E*$+$DNIo$K?7$7$/$7$F$*$/$?$a$N>pJs$rF@$k$3$H$,$G$-$^$9!#(B
+@acronym{RSS} $B$O$H$F$b5,B'E*$GNIuBV$KJ]$C$F$*$/$?$a$KI,MW$J>pJs$rF@$k$3$H$,2DG=(B
+$B$G$9!#(B
 
-$BCm(B: @code{utf-8} coding system $B$r%5%]!<%H$9$k(B Emacs $B$r;H$&$N$,NI$$$G$9!#(B
-@acronym{RSS} $B$O!"Hs(B-@acronym{ASCII} $B%F%-%9%H$r%(%s%3!<%I$9$k$?$a$K!"%G%#(B
-$B%U%)%k%H$G(B UTF-8 $B$r;H$&$+$i$G$9!#$=$l$O$^$?!"%G%#%U%)%k%H$G(B
-$BHs(B-@acronym{ASCII} $B%0%k!<%WL>$K$b;H$o$l$^$9!#(B
+$BCm(B: @code{utf-8} coding system $B$r%5%]!<%H$9$k(B Emacs $B$r;H$&$N$,NI$$$G$7$g(B
+$B$&!#(B@acronym{RSS} $B$OHs(B-@acronym{ASCII} $B%F%-%9%H$r%(%s%3!<%I$9$k$?$a$K!"(B
+$B%G%#%U%)%k%H$G(B UTF-8 $B$r;H$&$+$i$G$9!#$=$l$O$^$?!"Hs(B-@acronym{ASCII} $B%0%k!<(B
+$B%WL>$K$b%G%#%U%)%k%H$G;H$o$l$^$9!#(B
 
-@kindex G R ($B35N,(B)
-Feed $B$r9VFI$9$k$K$O!"35N,%P%C%U%!$+$i(B @kbd{G R} $B$r;H$C$F2<$5$$(B---feed $B$N(B
-$B=j:_!"%?%$%H%k$*$h$S@bL@$NF~NO$r5a$a$i$l$k$G$7$g$&!#%?%$%H%k$O$I$s$JJ8;z(B
-$B$G$b$h$/!"$=$l$O%0%k!<%WL>$H%0%k!<%W$N%G!<%?!&%U%!%$%k$NL>A0$K;H$o$l$^$9!#(B
-$B@bL@$O>JN,$G$-$^$9!#(B
+@kindex G R ($B%0%k!<%W(B)
+Feed $B$r9VFI$9$k$K$O!"%0%k!<%W%P%C%U%!!<$+$i(B @kbd{G R} $B$r;H$C$F2<$5(B
+$B$$(B---feed $B$N=j:_!"%?%$%H%k$*$h$S@bL@$NF~NO$r5a$a$i$l$k$G$7$g$&!#%?%$%H%k(B
+$B$O$I$s$JJ8;z$G$b$h$/!"$=$l$O%0%k!<%WL>$H%0%k!<%W$N%G!<%?!&%U%!%$%k$NL>A0(B
+$B$K;H$o$l$^$9!#@bL@$O>JN,$G$-$^$9!#(B
 
-$B4JC1$K(B @code{nnrss} $B$r$O$8$a$kJ}K!$O!"%0%k!<%W%P%C%U%!$G(B @kbd{B nnrss
+$B4JC1$K(B @code{nnrss} $B$r;O$a$kJ}K!$O!"%0%k!<%W%P%C%U%!!<$G(B @kbd{B nnrss
 RET RET y} $B$N$h$&$J$3$H$r>'$(!"$=$7$F%0%k!<%W$r9VFI$9$k$3$H$G$9!#(B
 
 @code{nnrss} $B%P%C%/%(%s%I$O!"$=$l$>$l$N(B @code{nnrss} $B%0%k!<%W$N$?$a$N%G!<(B
@@ -15178,6 +15673,15 @@ system $B$G%(%s%3!<%I$5$l$^$9!#$=$l$,(B @code{nil} $B$G$"$k$H!"(BEmacs $B$G
 @code{nnmail-pathname-coding-system} $BJQ?t$NCM$rE,@Z$K@_Dj$7$J$1$l$P$J$j(B
 $B$^$;$s!#(B
 
+@code{nnrss} $B%P%C%/%(%s%I$O(B @samp{text/plain} $B$+(B @samp{text/html} $B$N5-;v(B
+$B$r:n$j$^$9!#$I$A$i$r:n$k$+$O(B @code{mime-preview-condition} $BJQ?t$NCM$K$h$C(B
+$B$F7h$^$j$^$9!#$b$7(B @uref{http://emacs-w3m.namazu.org/, emacs-w3m} $B$K4^$^(B
+$B$l$F$$$k(B @code{mime-w3m} $B%b%8%e!<(B
+$B%k(B (@pxref{SEMI MUAs, ,@acronym{SEMI} MUA $B$G(B HTML $B%a!<%k$rFI$`(B,
+emacs-w3m-ja, Emacs-w3m-ja}) $B$r;H$C$F$$$k$N$J$i$P!"(B@samp{text/html} $B$N5-(B
+$B;v$r:n$k$h$&$K!"<+F0E*$K(B @code{mime-preview-condition} $BJQ?t$,@_Dj$5$l$k(B
+$B$G$7$g$&!#(B
+
 @cindex OPML
 $B$"$J$?$N9VFIL\O?$r(B @acronym{OPML} $B%U%)!<%^%C%H(B (Outline Processor Markup
 Language) $B$G%m!<%I(B/$B%;!<%V$9$k$?$a$K!"0J2<$N%3%^%s%I$r;H$&$3$H$b$G$-$^$9!#(B
@@ -15188,8 +15692,8 @@ Language) $B$G%m!<%I(B/$B%;!<%V$9$k$?$a$K!"0J2<$N%3%^%s%I$r;H$&$3$H$b$G$-$^$9
 @end defun
 
 @defun nnrss-opml-export
-$B8=:_$N(B @acronym{RSS} $B9VFIL\O?$r(B @acronym{OPML} $B%U%)!<%^%C%H$G%P%C%U%!$K(B
-$B=q$-=P$7$^$9!#(B
+$B8=:_$N(B @acronym{RSS} $B9VFIL\O?$r(B @acronym{OPML} $B%U%)!<%^%C%H$G%P%C%U%!!<(B
+$B$K=q$-=P$7$^$9!#(B
 @end defun
 
 $B0J2<$N(B @code{nnrss} $BJQ?t$,JQ992DG=$G$9(B:
@@ -15211,12 +15715,13 @@ Language) $B$G%m!<%I(B/$B%;!<%V$9$k$?$a$K!"0J2<$N%3%^%s%I$r;H$&$3$H$b$G$-$^$9
 @vindex nnrss-use-local
 @findex nnrss-generate-download-script
 @code{nnrss-use-local} $B$r(B @code{t} $B$K@_Dj$9$k$H!"(B
-@code{nnrss} $B$O(B @code{nnrss-directory} $B$K$"$k%m!<%+%k%U%!%$%k$+$i(B feed
-$B$rFI$_$^$9!#(B@code{nnrss-generate-download-script}$B%3%^%s%I$r;H$&$3$H$K$h$C(B
-$B$F!"(B@command{wget} $B$r;H$C$?%@%&%s%m!<%I!&%9%/%j%W%H$r:n$k$3$H$,$G$-$^$9!#(B
+@code{nnrss} $B$O(B @code{nnrss-directory} $B$K$"$k%m!<%+%k%U%!%$%k$+(B
+$B$i(B feed $B$rFI$_$^$9!#(B@code{nnrss-generate-download-script} $B%3%^%s%I$r;H$&(B
+$B$3$H$K$h$C$F!"(B@command{wget} $B$r;H$C$?%@%&%s%m!<%I!&%9%/%j%W%H$r:n$k$3$H(B
+$B$,$G$-$^$9!#(B
 @end table
 
-$B35N,%P%C%U%!$K@bL@$rI=<($5$;$?$$$J$i$P!"0J2<$N%3!<%I$,Lr$KN)$D$G$7$g$&!#(B
+$B35N,%P%C%U%!!<$K@bL@$rI=<($5$;$?$$$J$i$P!"0J2<$N%3!<%I$,Lr$KN)$D$G$7$g$&!#(B
 
 @lisp
 (add-to-list 'nnmail-extra-headers nnrss-description-field)
@@ -15228,8 +15733,9 @@ Language) $B$G%m!<%I(B/$B%;!<%V$9$k$?$a$K!"0J2<$N%3%^%s%I$r;H$&$3$H$b$G$-$^$9
     (if descr (concat "\n\t" (cdr descr)) "")))
 @end lisp
 
-$B0J2<$N%3!<%I$O!"35N,%P%C%U%!$+$iD>@\(B nnrss $B$N(B url $B$r%*!<%W%s$9$k$N$KJXMx(B
-$B$+$b$7$l$^$;$s!#(B
+$B0J2<$N%3!<%I$O!"35N,%P%C%U%!!<$+$iD>@\(B nnrss $B$N(B url $B$r%*!<%W%s$9$k$N$KJX(B
+$BMx$+$b$7$l$^$;$s!#(B
+
 @lisp
 (require 'browse-url)
 
@@ -15252,21 +15758,21 @@ Language) $B$G%m!<%I(B/$B%;!<%V$9$k$?$a$K!"0J2<$N%3%^%s%I$r;H$&$3$H$b$G$-$^$9
 (add-to-list 'nnmail-extra-headers nnrss-url-field)
 @end lisp
 
-@node Customizing w3
-@subsection w3 $B$N%+%9%?%^%$%:(B
-@cindex w3
+@node Customizing W3
+@subsection W3 $B$N%+%9%?%^%$%:(B
+@cindex W3
 @cindex html
 @cindex url
 @cindex Netscape
 
-Gnus $B$O%&%'%V%Z!<%8$rH$5$;(B
-$B$k$K$O$I$&$7$?$i$h$$$+!"$H$$$&$N$,$"$j$^$9!#0J2<$O0l$D$NJ}K!$G$9!#(B
+$BNc$($P$h$/$"$kH$5$;$k$K$O$I$&$7$?$i(B
+$B$h$$$+!"$H$$$&$b$N$G$9!#0J2<$O0l$D$NJ}K!$G$9(B:
 
 @lisp
 (eval-after-load "w3"
@@ -15279,9 +15785,9 @@ Gnus $B$O%&%'%V%Z!<%8$rH$9$k$h$&$K$J$k$G$7$g$&!#(B
+$B$3$l$r$"$J$?$N(B .emacs $B%U%!%$%k$K=q$-9~$s$G2<$5$$!#$=$&$9$l$P!"(Bgnus $B$N5-(B
+$B;v%P%C%U%!!<$G(B W3 $B$,IA2h$7$?(B @acronym{HTML} $B%j%s%/$rC!$/$H!"(B
+@code{browse-url} $B$r;H$C$F$=$N%j%s%/$r;2>H$7$F$/$l$k$G$7$g$&!#(B
 
 @node IMAP
 @section IMAP
@@ -15289,7 +15795,7 @@ Gnus $B$O%&%'%V%Z!<%8$ro$K;w$F$$(B
 $B$F!"$=$N%5!<%P!<$N%M%C%H%o!<%/%"%I%l%9$r;XDj$9$k$@$1$K$J$C$F$$$^$9!#(B
 
@@ -15298,32 +15804,32 @@ Gnus $B$O%&%'%V%Z!<%8$rH$7$F2<$5$$!#(B
 
 @acronym{IMAP} $B$r%a!<%k$rCyB"$9$k%W%m%H%3%k$H$7$F;H$$$?$$$H$-$O!"(B
-@code{gnus-secondary-select-methods} $B$K(B nnimap $B$rEPO?$7$F2<$5$$!#$3$l$K(B
-$B$h$C$F(B gnus $B$O(B @acronym{IMAP} $B%5!<%P!<$KCyB"$5$l$F$$$k%a!<%k$rA`:n$9$k$h(B
-$B$&$K$J$j$^$9!#$3$l$,$3$3$G@bL@$9$k;H$$J}$G$9!#(B
+@code{gnus-secondary-select-methods} $B$K(B nnimap $B$N9`L\$rEPO?$7$F2<$5$$!#(B
+$B$3$l$K$h$C$F(B gnus $B$O(B @acronym{IMAP} $B%5!<%P!<$K3JG<$5$l$F$$$k%a!<%k$rA`:n(B
+$B$9$k$h$&$K$J$j$^$9!#$3$l$,$3$3$G@bL@$9$kH$7$F2<$5$$!#(B)
+$B$O30It%W%m%0%i%`$H%i%$%V%i%j!<$,I,MW$G$9!#0J2<$r;2>H$7$F2<$5$$!#(B)
 
 @lisp
 (setq gnus-secondary-select-methods
-      '((nnimap "simpleserver") ; @r{$BIaDL$N@_Dj(B}
-        ; @r{SSH $B%]!<%H$r%U%)%o!<%I$7$?%5!<%P!<(B:}
+      '((nnimap "simpleserver") ; @r{$BFC$7$F$$$k(B UW $B%5!<%P!<(B:}
+        ; @r{$B%m!<%+%k%[%9%H$G2TF0$7$F$$$k(B UW $B%5!<%P!<(B:}
         (nnimap "barbar"
                 (nnimap-server-port 143)
                 (nnimap-address "localhost")
@@ -15341,9 +15847,9 @@ Gnus $B$O%&%'%V%Z!<%8$ro$N%3%^%s%I$r%0(B
-$B%k!<%W%P%C%U%!$G;H$&(B (@pxref{Subscription Commands}) $B$+!"$^$?$O%5!<%P!<(B
-$B%P%C%U%!(B (@pxref{Server Buffer}) $B$r2p$7$F!"$=$N%5!<%P!<$N%0%k!<%W$r9VFI(B
-$B$9$k$3$H$,$G$-$^$9!#(B
+$B%k!<%W%P%C%U%!!<$G;H$&(B (@pxref{Subscription Commands}) $B$+!"$^$?$O%5!<%P!<(B
+$B%P%C%U%!!<(B (@pxref{Server Buffer}) $B$r2p$7$F!"$=$N%5!<%P!<$N%0%k!<%W$r9V(B
+$BFI$9$k$3$H$,$G$-$^$9!#(B
 
 $B0J2<$NJQ?t$O2>A[(B @code{nnimap} $B%5!<%P!<$r:n@.$9$k$?$a$K;H$&$3$H$,$G$-$^(B
 $B$9!#(B
@@ -15351,16 +15857,16 @@ Gnus $B$O%&%'%V%Z!<%8$rl9g$O2>A[%5!<(B
-$B%P!<$N$b$N$K$J$j$^$9!#(B
+$B%P!<$NL>A0$K$J$j$^$9!#(B
 
 @item nnimap-server-port
 @vindex nnimap-server-port
-$B@\B3$r;n$_$k%5!<%P!<$N%]!<%H$G$9!#%G%#%U%)%k%H$O%]!<%H(B 143$B!"$^$?(B
+$B@\B3$9$k%5!<%P!<$N%]!<%H$G$9!#%G%#%U%)%k%H$O%]!<%H(B 143$B!"$^$?(B
 $B$O(B @acronym{TLS}/@acronym{SSL} $B$G$O(B 993 $B$G$9!#(B
 
-$B$3$l$O@0?t$G$J$1$l$P$J$j$^$;$s!#0J2<$O%5!<%P!<;XDj$NNc$G$9!#(B
+$B$3$l$O@0?t$G$J$1$l$P$J$i$J$$$3$H$KCm0U$7$F2<$5$$!#0J2<$O%5!<%P!<;XDj$NNc(B
+$B$G$9(B:
 
 @lisp
 (nnimap "mail.server.com"
@@ -15369,17 +15875,17 @@ Gnus $B$O%&%'%V%Z!<%8$ro$KB?$/$N%a!<%k%\%C%/%9$,$"$k$1$l$I!"6=L#$N$"$k$b$N$O>/$7$@$1$G(B
-$B$"$k$H$-$K;HMQ$7$^$9!#%5!<%P!<$K$O%[!<%`%G%#%l%/%H%j!<(B
-$B$r(B @acronym{IMAP} $B7PM3$G=P$9$b$N$b$"$j$^$9$N$G!"$=$N>l9g$O$*$=$i$/%a!<%k(B
-$B%\%C%/%9$r(B @file{~/Mail/*} $B$K@)8B$7$?$$$G$7$g$&!#(B
+$B;H$&$3$H$,$G$-$k%0%k!<%W$r@)8B$9$k$?$a$N!"%a!<%k%\%C%/%9$NJ8;zNs$^$?$OJ8(B
+$B;zNs$N%j%9%H$G$9!#$3$l$O!"%5!<%P!<$KHs>o$KB?$/$N%a!<%k%\%C%/%9$,$"$k$1$l(B
+$B$I!"6=L#$N$"$k$b$N$O>/$7$@$1$G$"$k$H$-$K;HMQ$7$^$9!#$$$/$D$+$N%5!<%P!<$O(B
+$B%[!<%`%G%#%l%/%H%j!<$r(B @acronym{IMAP} $B7PM3$G%"%/%;%9$G$-$k$h$&$K$9$k$N$G!"(B
+$B$=$N>l9g$O$*$=$i$/%a!<%k%\%C%/%9$r(B @file{~/Mail/*} $B$K@)8B$7$?$$$G$7$g$&!#(B
 
-$BJ8;zNs$O(B REFERENCE $B$H>e$NJ8;zNs$H$N(B cons $B$G$"$k$3$H$b$G$-$^$9!#$I(B
-$B$N(B REFERENCE $B$,;HMQ$5$l$k$+$O%5!<%P!e5-$NJ8;zNs$H$N(B cons $B$G$"$k$3$H$b$G$-$^$9!#$I(B
+$B$N(B REFERENCE $B$,;HMQ$5$l$k$+$O%5!<%P!<$K$h$j$^$9$,!"%o%7%s%H%sBg3X$N%5!<(B
+$B%P!<$G$O!"%a!<%k%\%C%/%9$HO"7k$5$l$k%G%#%l%/%H%j!<$G$9!#(B
 
-$B0J2<$O%5!<%P!<;XDj$NNc$G$9!#(B
+$B0J2<$O%5!<%P!<;XDj$NNc$G$9(B:
 
 @lisp
 (nnimap "mail.server.com"
@@ -15389,65 +15895,63 @@ Gnus $B$O%&%'%V%Z!<%8$rl9g$K$O!"(Bgnus $B$,L54|8B$K%O%s%0$9$k$h$&$K8+$($k$+$b$7(B
+$B$l$^$;$s!#JQ?t(B @code{imap-kerberos4-program} $B$O(B imtest $B%W%m%0%i%`$KEO$9(B
+$B%Q%?%a!<%?$r4^$_$^$9!#(B
 
 @acronym{TLS} $B@\B3$G$O(B GNUTLS $BM3Mh$N(B @code{gnutls-cli} $B%W%m%0%i%`$,I,MW(B
-$B$G$9!#$3$l$O(B @uref{http://www.gnu.org/software/gnutls/} $B$+$iZ$K$h$k(B @acronym{IMAP} $B@\B3$r5/F0(B
-$B$9$k$?$a$N%3%^%s%I9T$N%j%9%H$r;XDj$7$^$9!#$3$l$i$O@\B3$,3NN)$9$k$^$G!"$^(B
-$B$?$O%j%9%H$,;H$$?T$/$5$l$k$^$G!"=g$0$j$K;n$5$l$^$9!#%G%#%U%)%k%H$G$O!"(B
+$B$3$N%Q%i%a!<%?!<$O!"I{%7%'%k$G(B GSSAPI $BG'>Z$K$h$k(B @acronym{IMAP} $B@\B3$r5/(B
+$BF0$9$k$?$a$N%3%^%s%I9T$N%j%9%H$r;XDj$7$^$9!#$3$l$i$O@\B3$,3NN)$9$k$^$G!"(B
+$B$^$?$O%j%9%H$,;H$$?T$/$5$l$k$^$G!"=g$0$j$K;n$5$l$^$9!#%G%#%U%)%k%H$G$O!"(B
 @uref{http://www.gnu.org/software/gsasl/} $B$K$"$k(B GNU SASL $B$K$h(B
 $B$k(B @samp{gsasl} $B$H!"(BCyrus IMAPD $B$K$h$k(B @samp{imtest} $B%W%m%0%i(B
 $B%`(B (@code{imap-kerberos4-program} $B;2>H(B) $B$,;n$5$l$^$9!#(B
@@ -15456,30 +15960,29 @@ Gnus $B$O%&%'%V%Z!<%8$rl9g!"JQ(B
-$B?t(B @code{imap-shell-program} $B$O2?$N%W%m%0%i%`$r8F$V$+$r;XDj$7$^$9!#(B
+@code{shell} $B%9%H%j!<%`$r;H$&(B @acronym{IMAP} $B@\B3$G$O!"2?$N%W%m%0%i%`$r(B
+$B8F$V$+$rJQ?t(B @code{imap-shell-program} $B$G;XDj$7$^$9!#(B
 
 @item nnimap-authenticator
 @vindex nnimap-authenticator
+$B%5!<%P!<$K@\B3$9$k$?$a$K;H$o$l$kG'>ZZZ$G$9!#=i4|@_Dj$G$O!"(Bnnimap $B$O%5!<%P!<(B
-$B$,;HMQ2DG=$J0lHV0BA4$JG'>Z$r;HMQ$7$^$9!#(B
-
-$B0J2<$O%5!<%P!<;XDj$NNc$G$9!#(B
+$B0J2<$O%5!<%P!<;XDj$NNc$G$9(B:
 
 @lisp
 (nnimap "mail.server.com"
         (nnimap-authenticator anonymous))
 @end lisp
 
-@code{nnimap-authenticator} $B$NCM$O%7%s%\%k$G$J$1$l$P$J$i$J$$$3$H$KCm0U$7(B
-$B$F2<$5$$(B!
+@code{nnimap-authenticator} $B$NCM$O%7%s%\%k$G$"$k$3$H$KCm0U$7$F2<$5$$(B!
 
 @itemize @bullet
 @item
@@ -15490,47 +15993,46 @@ Gnus $B$O%&%'%V%Z!<%8$r(B/$B%Q%9%o!<%I(B $B$G$9!#30(B
-$BIt%i%$%V%i%j(B @file{digest-md5.el} $B$,I,MW$G$9!#(B
+$BIt%i%$%V%i%j!<(B @file{digest-md5.el} $B$,I,MW$G$9!#(B
 @item
 @dfn{cram-md5:} CRAM-MD5 $B$G0E9f2=$5$l$?(B $BMxMQ(B/$B%Q%9%o!<%I(B $B$G$9!#(B
 @item
 @dfn{login:} LOGIN $B7PM3$G$N@8$N(B $BMxMQ(B/$B%Q%9%o!<%I(B $B$G$9!#(B
 @item
-@dfn{anonymous:} $BEE;R%a!<%k%"%I%l%9$r%Q%9%o!<%I$H$7$FM?$(!"(B
-``anonymous'' $B$H$7$F%m%0%$%s$7$^$9!#(B
+@dfn{anonymous:} $BEE;R%a!<%k%"%I%l%9$r%Q%9%o!<%I$H$7$FM?$(!"!H(Banonymous$B!I(B
+$B$H$7$F%m%0%$%s$7$^$9!#(B
 @end itemize
 
 @item nnimap-expunge-on-close
 @cindex expunging
 @vindex nnimap-expunge-on-close
-
 $B%Q%k%a%K%G%9$H0c$C$F!"(B@acronym{IMAP} $B$N@_7W\$7$/@bL@$9$k$H!"(B
-@acronym{IMAP} $B$OC5n$7$J$$!"5-;v$K(B @code{Deleted} $B$H$$$&(B
-$B0u$rIU$1$k35G0$,$"$j!"$3$l(B ($B$($C$H!"(B@code{Deleted} $B$H$$$&0u$rIU$1$k$3$H(B
-$B$G$9(B) $B$,(B nnimap $B$,(B Gnus $B$G5-;v$r>C5n$9$k$H$-$K$9$k$3$H$G(B
+@acronym{IMAP} $B$K$OC5n$;$:$K(B @code{Deleted} $B$H$$$&0u$r5-(B
+$B;v$KIU$1$k$H$$$&35G0$,$"$j$^$9!#$3$l(B ($B$9$J$o$A(B @code{Deleted} $B$N0u$rIU$1(B
+$B$k$3$H(B) $B$,(B gnus $B$G5-;v$r>C5n$9$k$H$-$K(B nnimap $B$,9T$J$&$3$H$G(B
 $B$9(B (@kbd{B DEL} $B$J$I$G(B)$B!#(B($BLuCm(B: $B%Q%k%a%K%G%9$O5*85A0(B 5 $B@$5*$N%.%j%7%"(B
-$B$N(B Elea $BGI$NE/3XC5n$5$l$F$$$J$$$N(B
-$B$G!"C5n$9$k$?$a$NJ}K!$,I,MW$H$J$j$^$9!#=[4D$7$F$$$k$h$&$K46$8$^$9(B
-$B$+(B?
+$B$G!"C5n$9$k$?$a$NJ}K!$,I,MW$H$J$j$^$9!#$^$@$I$&$I$&$a$0$j$r$7$F$$(B
+$B$k$h$&$K46$8$^$9$+(B?
 
-$BEAE}E*$K!"(Bnnimap $B$O%a!<%k%\%C%/%9$rJD$8$k$H$-$K(B @code{Deleted} $B$H$$$&0u(B
-$B$NIU$$$?A4$F$N5-;v$r>C5n$7$F$-$^$7$?$,!":#$O%5!<%P!C5n$7$F$-$^$7$?$,!":#$G$O$3$N%5!<%P!C5n$7$^$9!#(B
+$B$3$l$,%G%#%U%)%k%H$N?6Iq$$$G!"%a!<%k%\%C%/%9$rJD$8$k$H$-$K!H(BDeleted$B!I$H(B
+$B$7$F0u$,IU$1$i$l$F$$$k5-;v$r>C5n$7$^$9!#(B
 @item never
-$B7h$7$F5-;v$r>C5n$7$^$;$s!#8=:_$O!">C5n$N0u$,IU$$$?5-;v$r(B nnimap $B$GI=<($9(B
-$B$kJ}K!$O$"$j$^$;$s$,!"B>$N(B @acronym{IMAP} $B%/%i%$%"%s%H$O$G$O$G$-$k$+$b$7(B
-$B$l$^$;$s!#C5n$7$^$;$s!#8=:_$O>C5n$N0u$,IU$$$?5-;v$r(B nnimap $B$GI=<($9$k(B
+$BJ}K!$O$"$j$^$;$s$,!"B>$N(B @acronym{IMAP} $B%/%i%$%"%s%H$G$O$G$-$k$+$b$7$l$^(B
+$B$;$s!#$$$D$bH$7$F2<$5$$!#(B
 @item ask
 $B%a!<%k%\%C%/%9$rJD$8$k$H$-$K!"(Bnnimap $B$,>C5n$5$l$?5-;v$r:o=|$9$k$+$I$&$+(B
 $B$r?R$M$^$9!#(B
@@ -15538,16 +16040,16 @@ Gnus $B$O%&%'%V%Z!<%8$r$N(B @acronym{IMAP} $B%/%i%$%"%s%H(B
-$B$N$?$a$KJ]N15-;v$r0uIU$-$H$7$F$b0u$rIU$1$^$9!#(Bgnus $B$NFbIt$G$O!"J]N15-;v(B
-$B$O85!9$9$G$KJ]N15-;v$H$7$F$N$_0u$,IU$1$i$l$F$$$^$9!#$3$l$O!"B>(B
-$B$N(B @acronym{IMAP} $B%/%i%$%"%s%H$K$*$1$kJ]N15-;v$r!"$"$?$+$b0uIU$-$N$h$&$K(B
-$B$-$oN)$?$;$^$9!#(B($BJL$N8@$$J}$r$9$k$H!"(Bgnus $B$OFs$D$N0u$rIU$1!"(B
-@acronym{IMAP} $B$O$?$C$?0l$D$@$H$$$&$3$H$G$9!#(B)
+$B$N$?$a$KJ]N15-;v$K2D;k5-;v$H$7$F(B ($B$b(B) $B0u$rIU$1$^$9(B ($BLuCm(B: $BJ]N1(B==dormant$B!"(B
+$B2D;k(B==ticked)$B!#(Bgnus $B$NFbIt$G$O!"EvA3$J$,$iJ]N15-;v$K$OJ]N15-;v$H$7$F$N$_(B
+$B0u$,IU$1$i$l$^$9!#0lJ}$3$l$O!"J]N15-;v$r!"B>$N(B @acronym{IMAP} $B%/%i%$%"%s(B
+$B%H$K$*$$$F!"$"$?$+$b2D;k5-;v$N$h$&$K$-$oN)$?$;$^$9!#(B($BJL$N8@$$J}$r$9$k$H!"(B
+gnus $B$K$OFs$D$N!V2D;k!W0u$,$"$j!"(B@acronym{IMAP} $B$K$O$O$?$C$?0l$D$@$H$$$&(B
+$B$3$H$G$9!#(B)
 
-$B$?$V$s$3$l$r$$$8$j$^$o$9$N$O!"$"$J$?$,%f!<%6C10L$NJ]N1%U%i%0$rIU$1$h$&$H(B
-$B$9$k$@$1$NM}M3$K$h$k$G$7$g$&!#$3$s$J46$8$G(B:
+$B$*$=$i$/$3$l$r$$$8$kM#0l$NM}M3$O!"$"$J$?$,MxMQl9g!"$"$J$?$O%f!<%6C10L$NJ]N1%U%i%0$r!"B>$N%f!<%6$K0uIU$-$H$7$F8+$i(B
-$B$l$?$/$J$$$H;W$C$F$$$^$9!#(B
+$B$3$N>l9g!"$"$J$?$OMxMQ$NMxMQC5n$9$k$N$,K>$^$7$$5-;v$rC5$9$H$-$K%5!<%P!<$KAw$C(B
 $B$?(B @acronym{IMAP} $B$N8!:w%3%^%s%I$,F~$C$F$$$^$9!#%G%#%U%)%k%H(B
-$B$O(B @code{"UID %s NOT SINCE %s"} $B$G!"$3$3$G:G=i$N(B @code{%s} $B$O(B UID $B$GCV$-(B
-$B49$($i$l!"FsHVL\$N(B @code{%s} $B$OF|IU$GCV$-49$($i$l$^$9!#(B
+$B$O(B @code{"UID %s NOT SINCE %s"} $B$G!"$3$3$G:G=i$N(B @code{%s} $B$O(B UID $B$N0lB7(B
+$B$$$GCV$-49$($i$l!"FsHVL\$N(B @code{%s} $B$OF|IU$GCV$-49$($i$l$^$9!#(B
 
-$B$?$V$s;H$$$b$N$K$J$kJL$NCM$O(B @code{"UID %s NOT SENTSINCE %s"} $B$G!"(B
-nnimap $B$K5-;v$NFbItE*$JF|IU$NBe$o$j$K(B Date: $B$r;H$&$h$&$K$5$;$^$9!#$5$i$J(B
-$B$k>pJs$d;H$&$3$H$,$G$-$kJ8;zNs$K$D$$$F$O!"(BRFC 2060 $B$N%;%/%7%g%s(B 6.4.4 $B$r(B
-$B8+$F$/$@$5$$!#(B
+$B$3$NBe$o$j$K;H$$$b$N$K$J$kCM$O$?$V$s(B @code{"UID %s NOT SENTSINCE %s"} $B$@(B
+$B$1$G!"$=$l$O(B nnimap $B$K5-;v$NFbItE*$JF|IU$NBe$o$j$K(B Date: $B$r;H$&$h$&$K$5(B
+$B$;$^$9!#(B $B;H$&$3$H$,$G$-$kJ8;zNs$K4X$9$k$5$i$J$k>pJs$O!"(BRFC 2060 $B$N(B
+$BBh(B 6.4.4 $B>O$r8+$F2<$5$$!#(B
 
 @item nnimap-authinfo-file
 @vindex nnimap-authinfo-file
-
-$B%5!<%P$K%m%0%$%s$9$k$?$a$K;H$&G'>Z>pJs(B (authinfo) $B$r4^$`%U%!%$%k$G$9!#$=(B
-$B$N7A<0$O(B ($B$[$H$s$I(B) @code{ftp} $B$N(B @file{~/.netrc} $B%U%!%$%k$HF1$8$G$9!#87(B
-$BL)$JDj5A$O!"JQ?t(B @code{nntp-authinfo-file} $B$r8+$F2<$5$$!#$=$7(B
-$B$F(B @ref{NNTP} $B$b8+$F2<$5$$!#(BIMAP $B%5!<%P!Z>pJs(B (credentials) $B$r4^$`%U%!%$%k$G(B
+$B$9!#$=$N7A<0$O(B @code{ftp} $B$N(B @file{~/.netrc} $B%U%!%$%k$H(B ($B$[$H$s$I(B) $BF1$8(B
+$B$G$9!#87L)$JMM<0$K$D$$$F$O!"JQ?t(B @code{nntp-authinfo-file} $B$r8+$F2<$5$$!#(B
+$B$=$7$F(B @ref{NNTP} $B$b8+$F2<$5$$!#(BIMAP $B%5!<%P!l9g!"$=(B
 $B$l$O(B @code{port imap} $B$^$?$O(B @code{port 143} $B$G$J$1$l$P$J$i$J$$$3$H$KCm(B
-$B0U$7$F2<$5$$!#JX59>e(B Gnus $B$O(B @code{port imap} $B$NF15A8l$H$7(B
+$B0U$7$F2<$5$$!#JX59>e(B gnus $B$O(B @code{port imap} $B$NF15A8l$H$7(B
 $B$F(B @code{port imaps} $B$ru67$N85$G!"(B
-$B4v$i$+$N%5!<%P!<$,!"$3$l$rI,MW$H$9$k$h$&$G$9!#(BCourier 1.7.1 $B$O$=$&$@$H$$(B
-$B$&Js9p$,$"$j$^$7$?!#(B
+$B%a!<%k%\%C%/%972$G?7Ce%a!<%k$rC5$9A0$K!"$=$l$i$rL$A*Br$K$7$^$9!#$$$/$D$+(B
+$B$N%5!<%P!<$,!"2?$i$+$N>u67$N85$G$3$l$rI,MW$H$9$k$h$&$G$9!#(BCourier
+1.7.1 $B$O$=$&$@$H$$$&Js9p$,$"$j$^$7$?!#(B
 @end table
 
 @menu
 * Splitting in IMAP::           nnimap $B$G%a!<%k$rJ,3d$9$k(B
 * Expiring in IMAP::            nnimap $B$K$h$k%a!<%k$N4|8B@Z$l>C5n(B
-* Editing IMAP ACLs::           $B%a!<%k%\%C%/%9$X$NB>$NMxMQA06u4V$r;H$&(B($B;H$o$J$$(B)$BJ}K!(B
+* Editing IMAP ACLs::           $BB>$NMxMQA06u4V$r;H$&(B ($B;H$o$J$$(B) $BJ}K!(B
 * Debugging IMAP::              $B$b$N$4$H$,F/$+$J$$$H$-$K$9$k$Y$-$3$H(B
 @end menu
 
@@ -15612,11 +16111,12 @@ machine students.uio.no login larsi password geheimnis port imap
 @subsection IMAP $B$G$NJ,3d(B
 @cindex splitting imap mail
 
-$BJ,3d$O(B gnus $B$NMxMQ!A0$r;XDj$7$?J8;zNs$+J8(B
-$B;zNs$N%j%9%H$G$9!#=i4|CM$O(B @code{nil} $B$G!"J,3d$O;HMQ$7$J$$$h$&$K$J$C$F$$(B
-$B$^$9(B!
+$BJ,3d$N85$H$J$k(B @acronym{IMAP} $B$N%a!<%k%\%C%/%9$NL>A0$r;XDj$9$kJ8;zNs$+J8(B
+$B;zNs$N%j%9%H$G$9!#%G%#%U%)%k%H$O(B @code{nil} $B$G!"J,3d$O;HMQ$7$J$$$h$&$K$J$C(B
+$B$F$$$^$9(B!
 
 @lisp
 (setq nnimap-split-inbox
@@ -15657,9 +16155,8 @@ Nnmail $B$KBP1~$9$k$b$N$O$"$j$^$;$s!#(B
 @item nnimap-split-rule
 @cindex splitting, rules
 @vindex nnimap-split-rule
-
-@code{nnimap-split-inbox} $B$G8+$D$+$C$??7$7$$%a!<%k$O$3$NJQ?t$K=>$C$FJ,3d(B
-$B$5$l$^$9!#(B
+@code{nnimap-split-inbox} $B$G8+$D$+$C$??7$7$$%a!<%k$O!"$3$NJQ?t$K=>$C$FJ,(B
+$B3d$5$l$^$9!#(B
 
 $B$3$NJQ?t$O%j%9%H$N%j%9%H$+$i@.$j$^$9!#I{%j%9%H$N:G=i$NMWAG(B
 $B$O(B @acronym{IMAP} $B$N%a!<%k%\%C%/%9$G!"Fs$D$a$NMWAG$N@55,I=8=$K9gCW$7$?5-(B
@@ -15674,9 +16171,9 @@ Nnmail $B$KBP1~$9$k$b$N$O$"$j$^$;$s!#(B
         ("INBOX.private" "")))
 @end lisp
 
-$B$3$l$O(B nnimap $B%a!<%j%s%0%j%9%H$+$i$NA4$F$N5-;v$r%a!<%k%\%C%/(B
-$B%9(B INBOX.nnimap $B$KF~$l!"(BSubject: $B9T$K(B MAKE MONEY $B$N$"$kA4$F$N5-;v(B
-$B$r(B INBOX.junk $B$KF~$l!"$=$NB>A4$F$N$b$N$r(B INBOX.private $B$KF~$l$^$9!#(B
+$B$3$l$O(B nnimap $B%a!<%j%s%0%j%9%H$+$i$N$9$Y$F$N5-;v$r%a!<%k%\%C%/(B
+$B%9(B INBOX.nnimap $B$KF~$l!"(BSubject: $B9T$K(B MAKE MONEY $B$N$"$k$9$Y$F$N5-;v(B
+$B$r(B INBOX.junk $B$KF~$l!"$=$NB>$9$Y$F$N$b$N$r(B INBOX.private $B$KF~$l$^$9!#(B
 
 $B:G=i$NJ8;zNs$O!"(Breplace-match $B$G9gCW$7$?%F%-%9%H$+$iI{I=8=$rA^F~$9$k$H$-(B
 $B$K;HMQ$5$l$k$N$HF1$8$h$&$J!"(B@samp{\\1} $B7A<0$r4^$`$3$H$,$G$-$^$9!#Nc$($P(B:
@@ -15685,33 +16182,33 @@ Nnmail $B$KBP1~$9$k$b$N$O$"$j$^$;$s!#(B
 ("INBOX.lists.\\1"     "^Sender: owner-\\([a-z-]+\\)@@")
 @end lisp
 
-$B:G=i$NMWAG$r%7%s%\%k(B @code{junk} $B$K$7$F!"%^%C%A$9$k%a%C%;!<%8$rC1$K>C$9(B
-$B$Y$-$G$"$k$3$H$rI=$9$3$H$b$G$-$^$9!#5$$rIU$1$F;H$C$F2<$5$$!#(B
+$B:G=i$NMWAG$r%7%s%\%k(B @code{junk} $B$K$7$F!"9gCW$9$k%a%C%;!<%8$rC1$K>C$9$Y(B
+$B$-$G$"$k$3$H$rI=$9$3$H$b$G$-$^$9!#5$$rIU$1$F;H$C$F2<$5$$!#(B
 
-$BFs$DL\$NMWAG$O4X?t$G$"$k$3$H$b$G$-$^$9!#$=$N>l9g$O!"5-;v$N%X%C%@!<$,$"$k(B
-$B%P%C%U%!$G!"$=$N5,B'$N:G=i$NMWAG$r0z?t$H$7$F8F$P$l$^$9!#%a!<%k$,$=$N%0%k!<(B
-$B%W$KB0$9$k$H9M$($k>l9g$O!"(B@code{nil} $B$G$J$$CM$rJV$9I,MW$,$"$j$^$9!#(B
+$BFs$DL\$NMWAG$O4X?t$G$"$k$3$H$b$G$-$^$9!#$=$N>l9g$O!"$=$N5,B'$N:G=i$NMWAG(B
+$B$r0z?t$H$7$F!"5-;v$N%X%C%@!<$,$"$k%P%C%U%!!<$G8F$P$l$^$9!#%a!<%k$,$=$N%0(B
+$B%k!<%W$KB0$9$k$H9M$($k>l9g$O!"(B@code{nil} $B$G$J$$CM$rJV$9I,MW$,$"$j$^$9!#(B
 
-Nnmail $B$NMxMQe$NNc$N$h$&$K(B)$B!#$3$l(B
+Nnmail $B$NMxMQe$NNc$N$h$&$K(B)$B!#$3$l(B
 $B$O(B nnimap $B$G$OI,MW$G$O$"$j$^$;$s!#@55,I=8=$N$I$l$K$b9gCW$7$J$$5-;v(B
 $B$O(B inbox $B$+$i0\F0$5$l$^$;$s!#(B(inbox $B$KL$FI5-;v$rBgNL$KCV$$$F$*$/$H!"J,3d(B
-$B$N%3!<%I$O?7$7$$%a!<%k$r!$A(B'' $B$^$9!#Aj8_Ej(B
-$B9F$r$7$F$$$k>l9g$O!"A4$F$N9gCW$7$?5,B'$,(B ``$B>!$A(B'' $B$^$9!#(B
+$B$3$l$i$N5,B'$OO"A[%j%9%H$N:G=i$+$i=*$j$K8~$+$C$F!$A!W$^$9!#M-8z$K$7$F$$(B
+$B$k>l9g$O!"$9$Y$F$N9gCW$7$?5,B'$,!V>!$A!W$^$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
+$B$3$NJQ?t$O$=$NCM$H$7$F4X?t$r;}$D$3$H$b$G$-$^$9!#$=$N4X?t$O5-;v$N%X%C%@!<(B
+$B$NItJ,$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
+$BJ,3d%3!<%I$OI,MW$J$i%a!<%k%\%C%/%9$r:n@.$7$h$&$H$7$^$9!#(B
 
 $B0[$J$k2>A[%5!<%P!A[%5!<%P!$Oe5-$NJ,3d$N5,B'$NJ}$G$9!#(B
+$B2>A[%5!<%P!$O!"F1$85,B'$rJ#?t$N%5!<%P!<$KE,MQ$G$-$k$h$&$K!"J}$,F1$85,B'$r;H$$$^$9!#F1(B
+$BMM$K(B inbox $BJ8;zNs$b@55,I=8=$G$9!#J}(B
+$B$G$9!#(B
 
 Nnmail $B$GBP1~$9$k$b$N(B: @code{nnmail-split-methods}.
 
 @item nnimap-split-predicate
 @cindex splitting
 @vindex nnimap-split-predicate
+$B$3$N=R8l$K9gCW$9$k(B @code{nnimap-split-inbox} $B$K$"$k%a!<%k$OJ,3d$5$l$^$9!#(B
+$B$3$l$OJ8;zNs$G!"%G%#%U%)%k%H$O(B @samp{UNSEEN UNDELETED} $B$G$9!#(B
 
-$B$3$N=R8l$K%^%C%A$9$k(B @code{nnimap-split-inbox} $B$K$"$k%a!<%k$OJ,3d$5$l$^(B
-$B$9!#$3$l$OJ8;zNs$G4{DjCM$O(B @samp{UNSEEN UNDELETED} $B$G$9!#(B
-
-$B$b$7$"$J$?$,(B inbox $B$K$"$k%a!<%k$rFI$`$?$a$KJL$N(B @acronym{IMAP} $B%/%i%$%"(B
-$B%s%H$r;H$C$F$$$k$,!"9XFIEY$K4X$o$i$:$K$9$Y$F$N5-;v$r(B gnus $B$KJ,3d$5$;$?$$(B
-$B$J$i$P!"$3$l$OLr$KN)$D$+$b$7$l$^$;$s!#$=$N>l9g$O(B @samp{UNDELETED} $B$KJQ$((B
-$B$l$PNI$$$G$7$g$&!#(B
+inbox $B$K$"$k%a!<%k$rFI$`$?$a$KJL$N(B @acronym{IMAP} $B%/%i%$%"%s%H$r;H$C$F$$(B
+$B$k$,!"9XFIEY$K4X$o$i$:$K$9$Y$F$N5-;v$r(B gnus $B$KJ,3d$5$;$?$$$J$i$P!"$3$l$O(B
+$BLr$KN)$D$+$b$7$l$^$;$s!#$=$N>l9g$O(B @samp{UNDELETED} $B$KJQ$($l$PNI$$$G$7$g(B
+$B$&!#(B
 
 @item nnimap-split-fancy
 @cindex splitting, fancy
 @findex nnimap-split-fancy
 @vindex nnimap-split-fancy
-
-$B$b$7$"$J$?$,FC5iJ,3d$r;H$$$?$$$J$i$P!"(B@code{nnimap-split-rule} $B$NCM(B
+$BFC5iJ,3d$r;H$$$?$$$J$i$P!"(B@code{nnimap-split-rule} $B$NCM(B
 $B$r(B @code{nnmail-split-fancy} $B$K@_Dj$9$k$3$H$,$G$-$^$9!#(B
 @xref{Fancy Mail Splitting}.
 
@@ -15767,11 +16263,10 @@ Nnmail $B$GBP1~$9$k$b$N(B: @code{nnmail-split-fancy}.
 @item nnimap-split-download-body
 @findex nnimap-split-download-body
 @vindex nnimap-split-download-body
-
-$BJ,3d$7$F$$$k$H$-$K$9$Y$F$N5-;v$r%@%&%s%m!<%I$9$k$K$OHs(B-@code{nil} $B$K@_Dj(B
-$B$7$F2<$5$$!#$3$l$OIaDL$OI,MW$G$O$J$/!"J*;v$rAjEv$KCY$/$7$F$7$^$&$G$7$g$&!#(B
-$B5-;v$rJ,3d$9$k$?$a$KK\J8$rJ,@O$9$k9bEY$J4X?t$r;H$$$?$$>l9g$K$O!"I,MW$+$b(B
-$B$7$l$^$;$s!#(B
+$BJ,3d$7$F$$$k:GCf$K$9$Y$F$N5-;v$r%@%&%s%m!<%I$9$k$K$O!"Hs(B-@code{nil} $B$K@_(B
+$BDj$7$F2<$5$$!#$3$l$OIaDL$OI,MW$H$7$J$$$7!"$b$N$4$H$rAjEv$KCY$/$7$F$7$^$&(B
+$B$G$7$g$&!#5-;v$rJ,3d$9$k$?$a$K$=$NK\J8$rJ,@O$9$k9bEY$J4X?t$r;H$$$?$$>l9g(B
+$B$K$O!"I,MW$+$b$7$l$^$;$s!#(B
 @end table
 
 @node Expiring in IMAP
@@ -15779,38 +16274,37 @@ Nnmail $B$GBP1~$9$k$b$N(B: @code{nnmail-split-fancy}.
 @cindex expiring imap mail
 
 @code{nnimap} $B$O40A4$J(B @code{nnmail} $BM3Mh$N%P%C%/%(%s%I$G$O$"$j$^$;$s$,!"(B
-$B$?$$$F$$$N4|8B@Z$l>C5n(B (@pxref{Expiring Mail}) $B$NI8=`5!G=$r%5%]!<%H$7$^(B
-$B$9!#(B@acronym{IMAP} $B$NJ,3d(B (@pxref{Splitting in IMAP}) $B$G(B
+$BI8=`E*$J$?$$$F$$$N4|8B@Z$l>C5n(B (@pxref{Expiring Mail}) $B$N5!G=$r%5%]!<%H(B
+$B$7$^$9!#(B@acronym{IMAP} $B$NJ,3d(B (@pxref{Splitting in IMAP}) $B$G(B
 $B$O(B @code{nnmail} $B$NJQ?t$rJ#@=$7$J$$(B ($BNc$($P(B @var{nnimap-expiry-wait} $B$r(B
 $B@8@.$7$J$$(B) $BE@$,0c$&$N$G$9$,!"(B@code{nnmail} $B$NJQ?t$rN.MQ$7$^$9!#0J2<(B
-$B$O(B @code{nnimap} $B$N4|8B@Z$l>C5n=hM}$G;H$o$l$kJQ?t$G$9!#(B
-
-$B4|8B@Z$l>C5n$N0u$,$I$N$h$&$KE,@Z$K(B @acronym{IMAP} $B%5!<%P!<$K5-O?$5$l$k$+(B
-$B$K$D$$$F$b$3$3$G8@5Z$7$F$*$-$^$7$g$&!#4|8B@Z$l>C5n$N0u$O(B @code{imap} $B%/(B
-$B%i%$%"%s%HFCM-$N0u$G$"$k(B @code{gnus-expire} $B$KJQ49$5$l!"%a%C%;!<%8$K5-O?(B
-$B$5$l$^$9!#$3$l$O!"B>$N%/%i%$%"%s%H$O%a%C%;!<%8$N%/%i%$%"%s%HFCM-$N%U%i%0(B
-$B$r8+$k$+$b$7$l$J$$$N$KBP$7$F!"(BGnus $B$O$?$V$s(B @code{gnus-expire} $B$N0u$rE,(B
-$B@Z$K07$$M}2r$9$k$@$1$G$"$k$3$H$r0UL#$7$^$9!#$^$?$3$l$O%5!<%P!<$,!"%/%i%$(B
-$B%"%s%HFCM-$N%U%i%0$N%a%C%;!<%8$X$N915WE*$JJ]B8$r%5%]!<%H$7$J$1$l$P$J$i$J(B
-$B$$$3$H$b0UL#$7$^$9!#9,$$$K!"$?$$$F$$$O%5%]!<%H$7$^$9!#(B
+$B$O(B @code{nnimap} $B$N4|8B@Z$l>C5n$N=hM}$G;H$o$l$kJQ?t$G$9!#(B
+
+$B$^$?!"4|8B@Z$l>C5n$N0u$,$I$N$h$&$K(B @acronym{IMAP} $B%5!<%P!<$K5-O?$5$l$k$+(B
+$B$K$D$$$F$b!"$3$3$G8@5Z$7$F$*$/$N$,E,@Z$G$7$g$&!#4|8B@Z$l>C5n$N0u(B
+$B$O(B @code{imap} $B%/%i%$%"%s%HFCM-$N0u$G$"$k(B @code{gnus-expire} $B$KJQ49$5$l!"(B
+$B%a%C%;!<%8$K5-O?$5$l$^$9!#$=$&$9$k$N$O!"$*$=$i$/(B gnus $B$@$1$,E,@Z(B
+$B$K(B @code{gnus-expire} $B$N0u$rM}2r$7$F07$&$+$i$G$9!#$b$C$H$bB>$N%/%i%$%"%s(B
+$B%H$O!"%a%C%;!<%8$N%/%i%$%"%s%HFCM-$N%U%i%0$r8+$5$;$F$/$l$k$G$7$g$&$,!#$3(B
+$B$N$3$H$O!"%/%i%$%"%s%HFCM-$N%U%i%0$r915WE*$K%a%C%;!<%8$KJ]B8$9$k$3$H$r!"(B
+$B%5!<%P!<$,%5%]!<%H$7$J$1$l$P$J$i$J$$$3$H$b0UL#$7$^$9!#$?$$$F$$$O%5%]!<%H(B
+$B$7$^$9!#9,$$$K$b!#(B
 
 @table @code
 @item nnmail-expiry-wait
 @item nnmail-expiry-wait-function
-
 $B$3$l$i$NJQ?t$O40A4$K%5%]!<%H$5$l$F$$$^$9!#4|8B@Z$l>C5n$NCM$O!"?t!"%7%s%\(B
 $B%k$N(B @code{immediate} $B$^$?$O(B @code{never} $B$G$9!#(B
 
 @item nnmail-expiry-target
-
 $B$3$NJQ?t$O%5%]!<%H$5$l$F$$$F!"FbItE*$K$O$3$l$r07$&(B @code{nnmail} $B4X?t$r(B
-$B8F$V$3$H$K$h$C$F$5$l$k(B) $B$H$$$&:GE,2=$b4^$_$^$9!#(B
+$B8F$V$3$H$K$h$C$F$9(B) $B$H$$$&:GE,2=$b4^$_$^$9!#(B
 @end table
 
 @node Editing IMAP ACLs
-@subsection IMAP $B$N(B ACL $B$rJT=8$9$k!#(B
+@subsection IMAP $B$N(B ACL $B$rJT=8$9$k(B
 @cindex editing imap acls
 @cindex Access Control Lists
 @cindex Editing @acronym{IMAP} ACLs
@@ -15818,26 +16312,27 @@ Nnmail $B$GBP1~$9$k$b$N(B: @code{nnmail-split-fancy}.
 @findex gnus-group-nnimap-edit-acl
 
 ACL $B$O(B Access Control List ($B;HMQ@)8B0lMw(B) $B$NN,$G$9!#(B@acronym{IMAP} $B$G(B
-$B$O(B ACL $B$OB>$NMxMQ$NMxMQ\$7$$;X<($H$H$b$K(B ACL $BJT=8%&%#%s%I%&$,8=$l$^$9!#(B
+$B$"$k%a!<%k%\%C%/%9$N$?$a$N(B ACL $B$rJT=8$9$k$K$O!"(B
+@kbd{G l} (@code{gnus-group-edit-nnimap-acl}) $B$r%?%$%W$7$F2<$5$$!#$=$&$9(B
+$B$k$H!">\$7$$@bL@$r$H$b$J$C$?(B ACL $BJT=8%&%#%s%I%&$,8=$l$^$9!#(B
 
-$B;HMQ$NNc(B:
+$B;H$&$3$H$,$"$j$=$&$JNc(B:
 
 @itemize @bullet
 @item
-$B%a!<%j%s%0%j%9%H$N%a!<%k%\%C%/%9$G(B ``anyone'' $B$K(B ``lrs'' $B5v(B
-$B2D(B (lookup, read, seen/unseen $B%U%i%0$NJ];}(B) $B$rM?$($k$3$H$G!"F1$8%5!<%P!<(B
-$B$NB>$NMxMQ$NMxMQ/$J$/$H$b(B Cyrus $B$N%5!<%P!<$K$*$$$F$O!"(B``plussing'' $B$,F0:n$9$k$?$a$K(B ($B$D(B
-$B$^$j!"(Buser+mail@@domain $B$,(B INBOX.mailbox $B$H$$$&(B @acronym{IMAP} $B$N%a!<%k(B
-$B%\%C%/%9$K$J$k(B)$B!"MxMQ/$J$/$H$b(B Cyrus $B$N%5!<%P!<$G$O!"C/$b$,!H(Bplussing$B!I$r;H$&$3$H$,$G$-$k$h(B
+$B$&$K$9$k$?$a$K$O!"MxMQC5n$5$l$?5-;v$rC5n$5$l$?5-;v$rI=<($9$kJ}K!$O$"$j$^$;$s!#$?$@>C5n$G$-$k$@$1(B
+@code{nnimap-expunge-on-close} $B$K(B @code{never} $B$r@_Dj$7$F$$$k>l9g$K$O!"(B
+$B%a!<%k%\%C%/%9$N$9$Y$F$N>C5n(B (deleted) $B$5$l$?5-;v$rC5n$5$l$?5-;v$rI=<($9$kJ}K!$O$"$j$^$;$s!#$?$@>C5n$G$-$k$@$1$G(B
+$B$9!#(B
+
 @node A note on namespaces
 @subsection $BL>A06u4V$K4X$9$kCm0U(B
-@cindex @acronym{IMAP} namespace
+@cindex IMAP namespace
 @cindex namespaces
 
 @acronym{IMAP} $B%W%m%H%3%k$K$OL>A06u4V(B (namespaces) $B$H8F$P$l$k35G0$,$"$j!"(B
-$B0J2<$N(B RFC2060 $B$NJ8=q$G5-=R$5$l$F$$$^$9!#(B
+$B0J2<$N(B RFC2060 $B$NJ8=q$G5-=R$5$l$F$$$^$9(B:
 
 @example
 5.1.2.  $B%a!<%k%\%C%/%9L>A06u4VL?L>5,B'(B
@@ -15876,28 +16371,28 @@ ACL $B$O(B Access Control List ($B;HMQ@)8B0lMw(B) $B$NN,$G$9!#(B@acronym{I
       $B%K%e!<%9%0%k!<%WL>A06u4V$rB>$N%a!<%k%\%C%/%9$+$iJ,N%$9$k$?$a$K!"(B
       "#news" $BL>A06u4V$rMQ$$$F$b$h$$!#$3$&$7$F(B comp.mail.misc $B%K%e!<%9%0(B
       $B%k!<%W$O(B "#news.comp.mail.misc" $B$H$$$&%a!<%k%\%C%/%9L>$r;}$A!"L>A0(B
-      "comp.mail.misc" $B$OJL$N%*%V%8%'%/%H(B ($BNc$($P!"%f!<%6$N8D?M%a!<%k%\%C(B
+      "comp.mail.misc" $B$OJL$N%*%V%8%'%/%H(B ($BNc$($P!"MxMQ:\(B)
 @end example
 
-$B$3$3$K$O(B gnus $B$K$*$1$k(B @acronym{IMAP} $B$NZ$9$kJ8=q$,(B
-$BL5$$$N$G$9$,!"$$$/$D$+$N%5!<%P!<$O(B gnus $B$N%a!<%k%\%C%/%9$NL>A0$N;H$$J}$G(B
-$B$OF0:n$7$J$$$d$jJ}$GL>A06u4V@\F,<-$r;H$C$F$$$^$9!#(B
+gnus $B$K$*$1$k(B @acronym{IMAP} $B$NZ$9$k5-=R$,$3$NJ8=q$K$OL5$$0lJ}(B
+$B$G!"$$$/$D$+$N%5!<%P!<$O(B gnus $B$N%a!<%k%\%C%/%9$NL>A0$N;H$$J}$G$OF0:n$7$J(B
+$B$$$d$jJ}$GL>A06u4V@\F,8l(B (namespace prefix) $B$r;H$C$F$$$^$9!#(B
 
 $B6qBNE*$K$O!"%o%7%s%H%sBg3X$N(B @acronym{IMAP} $B%5!<%P!<(B
 $B$O(B @code{#driver.mbx/read-mail} $B$N$h$&$J%a!<%k%\%C%/%9L>$r;H$C$F$$$F!"$=(B
 $B$l$O(B @sc{create} $B$H(B @sc{append} $B%3%^%s%I$G$@$1M-8z$G$9!#%a!<%k%\%C%/%9$,(B
 $B:n$i$l$?8e(B ($B$^$?$O%a%C%;!<%8$,%a!<%k%\%C%/%9$KDI2C$5$l$?8e(B) $B$G$O!"$=$l$O(B
-$BL>A06u4V@\F,<-$rIU$1$:$K%"%/%;%9!"$9$J$o$A(B @code{read-mail} $B$5$l$J$1$l$P(B
-$B$J$j$^$;$s!#(Bgnus $B$O%f!<%6!<$,(B CREATE $B$H(B APPEND $B%3%^%s%I$@$1$GF~NO$7$?%a!<(B
-$B%k%\%C%/%9L>$rJ]>Z$G$-$J$$$N$G!"@dBP$KL>A06u4V@\F,<-$,IU$$$?%a!<%k%\%C%/(B
+$BL>A06u4V@\F,8l$rIU$1$:$K%"%/%;%9!"$9$J$o$A(B @code{read-mail} $B$5$l$J$1$l$P(B
+$B$J$j$^$;$s!#(Bgnus $B$OMxMQ$rJ]>Z$G$-$J$$$N$G!"@dBP$KL>A06u4V@\F,8l$,IU$$$?%a!<%k%\%C%/(B
 $B%9L>$r(B gnus $B$G;H$C$F$O$$$1$^$;$s!#(B
 
-@code{#driver.*/} $B@\F,<-$K$D$$$F$N$5$i$J$k;H$$J}$N>pJs$O(B UoW IMAPD $B$NJ8(B
-$B=q$r8+$F2<$5$$!#$=$l$i$O6/NO$J9)6q$J$N$G!"$I$s$J8z2L$,$"$k$+$,3N$+$J>l9g(B
-$B$@$1;H$C$F2<$5$$!#(B
+@code{#driver.*/} $B$K$D$$$F!"$I$N$h$&$K@\F,8l$r;H$($PNI$$$+$K$D$$$F$N$5$i(B
+$B$J$k>pJs$O!"(BUoW IMAPD $B$NJ8=q$r8+$F2<$5$$!#$=$l$i$O6/NO$J9)6q$J$N$G!"$I$s(B
+$B$J8z2L$,$"$k$+$,3N$+$J>l9g$@$1;H$C$F2<$5$$!#(B
 
 @node Debugging IMAP
 @subsection IMAP $B$N%G%P%C%0(B
@@ -15909,12 +16404,12 @@ ACL $B$O(B Access Control List ($B;HMQ@)8B0lMw(B) $B$NN,$G$9!#(B@acronym{I
 $B$i$rD>$9$?$a$K:GA1$r?T$/$7$^$9!#$"$J$?$,4qL/$J?6$kIq$$$K=P2q$C$?$H$7$?$i!"(B
 $B%5!<%P!<$+(B gnus $B$N$I$A$i$+$K%P%0$,$"$k2DG=@-$,$"$j$^$9!#(B
 
-$B$"$J$?$,0lHLE*$J%M%C%H%o!<%/!&%W%m%H%3%k$K@:DL$7$F$$$k$J$i$P!"(BGnus $B$H%5!<(B
+$B$"$J$?$,0lHLE*$J%M%C%H%o!<%/!&%W%m%H%3%k$K@:DL$7$F$$$k$J$i$P!"(Bgnus $B$H%5!<(B
 $B%P!<$N4V$G$d$j$H$j$5$l$k%W%m%H%3%k!&%@%s%W$rFI$`$3$H$K$h$C$F!"$*$=$i$/$$(B
 $B$/$D$+$N)Ne$7$^$9!#(B
+$B=EMW$J%G!<%?$G;d$?$A$r=u$1$k$3$H$K$J$j$^$9!#$7$?$,$C$F(B gnus $B$N(B IMAP $B%P%0(B
+$B$rJs9p$9$k$H$-$K!"%W%m%H%3%k!&%@%s%W$r4^$a$k$3$H$r6/$/>)Ne$7$^$9!#(B
 
 @vindex imap-log
 $B%W%m%H%3%k!&%@%s%W$O!"$=$l$rM-8z$K$7$F$$$k$H$?$/$5$s$N%G!<%?$r@8@.$9$k$N(B
@@ -15925,24 +16420,23 @@ ACL $B$O(B Access Control List ($B;HMQ@)8B0lMw(B) $B$NN,$G$9!#(B@acronym{I
 (setq imap-log t)
 @end lisp
 
-$B$3$l$O(B @code{imap.el} $B%Q%C%1!<%8$K!"%5!<%P!<$H$N$d$j$H$j$r2?$G$b5-O?$5$;(B
-$B$^$9!#$=$N5-O?$O(B @samp{*imap-log*} $B$H$$$&%P%C%U%!$K3JG<$5$l$^$9!#$H$-$H(B
-$B$7$F(B @code{BAD} $B$H$$$&;%$,IU$1$i$l$k!"%(%i!<%a%C%;!<%8$rC5$7$F2<$5$$!#$G(B
+$B$3$l$O%5!<%P!<$H$N$d$j$H$j$r2?$G$b(B @code{imap.el} $B%Q%C%1!<%8$K5-O?$5$;$^(B
+$B$9!#$=$N5-O?$O(B @samp{*imap-log*} $B$H$$$&%P%C%U%!!<$K3JG<$5$l$^$9!#$H$-$H(B
+$B$7$F!"(B@code{BAD} $B$H$$$&;%$,IU$1$i$l$k%(%i!<%a%C%;!<%8$rC5$7$F2<$5$$!#$G(B
 $B$b!"%P%0$rDs=P$9$k$H$-$O!"$9$Y$F$N%G!<%?$r4^$a$k$h$&$K$7$F2<$5$$!#(B
 
 @node Other Sources
 @section $B$=$NB>$N%0%k!<%W8;(B
 
-Gnus $B$O$?$@C1$K%K%e!<%9$d%a!<%k$rFI$`0J>e$N$3$H$,$G$-$^$9!#0J2<(B
-$B$K<($9J}K!$K$h$C$F!"(Bgnus $B$G%G%#%l%/%H%j!<$d%U%!%$%k$r!"$"$?$+$b(B
-$B%K%e!<%9%0%k!<%W$G$"$k$+$N$h$&$K1\Mw$9$k$3$H$,$G$-$k$h$&$K$J$j$^(B
-$B$9!#(B
+gnus $B$O$?$@C1$K%K%e!<%9$d%a!<%k$rFI$`0J>e$N$3$H$,$G$-$^$9!#0J2<$K<($9J}(B
+$BK!$K$h$C$F!"(Bgnus $B$G%G%#%l%/%H%j!<$d%U%!%$%k$r!"$"$?$+$b%K%e!<%9%0%k!<%W(B
+$B$G$"$k$+$N$h$&$K1\Mw$9$k$3$H$,$G$-$k$h$&$K$J$j$^$9!#(B
 
 @menu
 * Directory Groups::            $B%G%#%l%/%H%j!<$r%K%e!<%9%0%k!<%W$N$h$&$KFI$`(B
 * Anything Groups::             Dired?  $BC/$,(B dired $B$J$s$F;H$&$N(B?
 * Document Groups::             $B8DJL$N%U%!%$%k72$O%0%k!<%W$NAG(B
-* SOUP::                        @sc{soup} $B%Q%1%C%H$r(B ``$B%*%U%i%$%s(B'' $B$GFI$`(B
+* SOUP::                        @sc{soup} $B%Q%1%C%H$r!V%*%U%i%$%s!W$GFI$`(B
 * Mail-To-News Gateways::       $B%a!<%k$+$i%K%e!<%9$X$N%2!<%H%&%'%$$rDL$7$F5-;v$rEj9F$9$k(B
 @end menu
 
@@ -15951,27 +16445,31 @@ Gnus $B$O$?$@C1$K%K%e!<%9$d%a!<%k$rFI$`0J>e$N$3$H$,$G$-$^$9!#0J2<(B
 @cindex nndir
 @cindex directory groups
 
-$B$b$7!"$?$/$5$s$N5-;v$,8DJL$N%U%!%$%k$H$7$FF~$C$F$$$k%G%#%l%/%H%j!<$,$"$l(B
-$B$P!"$=$l$r%K%e!<%9%0%k!<%W$H$7$F07$&$3$H$,$G$-$^$9!#$b$A$m$s!"%U%!%$%k$O(B
-$B?t;z$N%U%!%$%kL>$r$b$C$F$$$J$1$l$P$J$j$^$;$s!#(B
+$B$?$/$5$s$N5-;v$,8DJL$N%U%!%$%k$H$7$FF~$C$F$$$k%G%#%l%/%H%j!<$,$"$l$P!"$=(B
+$B$l$r%K%e!<%9%0%k!<%W$H$7$F07$&$3$H$,$G$-$^$9!#$b$A$m$s!"%U%!%$%k$O?t;z$N(B
+$B%U%!%$%kL>$r$b$C$F$$$J$1$l$P$J$j$^$;$s!#(B
+
+$BAG@2$i$7$$(B Emacs $B$N%Q%C%1!<%8$NCf$G$b:G$bAG@2$i$7$$(B @code{ange-ftp} ($B$H(B
+$B$=$N8e7Q$N(B @code{efs}) $B$K$D$$$F?($l$k$N$K!"$3$3$ONI$$5!2q$G$7$g$&!#;d(B
+$B$,(B @code{nndir} $B$r=q$$$?$H$-$O!"$3$l(B ($B%G%#%l%/%H%j!<$rFI$`%P%C%/%(%s(B
+$B%I(B) $B$K$D$$$F$O$"$^$j9M$($F$$$^$;$s$G$7$?!#$H$s$G$b$J$$$3$H$@$M!#(B
 
-$B$3$3$G(B Emacs $B$NAG@2$i$7$$%Q%C%1!<%8$NCf$G$b:G$bAG@2$i$7(B
-$B$$(B @code{ange-ftp} ($B$H$=$N8e7Q$N(B @code{efs}) $B$K$D$$$F?($l$kNI$$5!2q$G$7$g(B
-$B$&!#;d$,(B @code{nndir} $B$r=q$$$?$H$-$O!"$3$l(B --- $B%G%#%l%/%H%j!<$rFI$`%P%C(B
-$B%/%(%s%I$K$D$$$F$O$"$^$j9M$($F$$$^$;$s$G$7$?!#$H$s$G$b$J$$$3$H$@$M!#(B
+@code{ange-ftp} $B$O$3$N>p67$r7`E*$KJQ2=$5$;$^$7$?!#Nc$($P%G%#%l%/%H%j!(B
+$B$H$7$F(B @code{ange-ftp} $B$NMM<0(B
+$B$G(B @file{/ftp.hpc.uh.edu:/pub/emacs/ding-list/} $B$H$$$&%U%!%$%kL>$r%G%#%l(B
+$B%/%H%j!$H$7$FF~NO$7$?$H$9$k$H!"(B@code{ange-ftp} $B$"$k$$$O(B @code{efs} $B$O(B
+$B!<$C(B!
 
-@code{ange-ftp} $B$O$3$N>p67$r7`E*$KJQ2=$5$;$^$7$?!#Nc$($P!"(B
-@code{ange-ftp} $B%U%!%$%k(B
-$BL>(B @file{/ftp.hpc.uh.edu:/pub/emacs/ding-list/} $B$r%G%#%l%/%H%j!$H$7$F(B
-$BF~NO$7$?$H$9$k$H!"(B@code{ange-ftp} $B$"$k$$$O(B @code{efs} $B$OC5n$r9T$J$&$3$H$O$G$-$^$;$s!#(B@code{nndir} $B$,;H$($k(B
-$B$b$N$J$i2?$G$b(B @code{nnmh} $B$"$k$$$O(B @code{nnml} $B$r;H$&$3$H$,$G$-$k$N$G!"(B
+@code{nndir} $B$O!VFI$_=P$7@lMQ!W$N%P%C%/%(%s%I$G$9(B---$B$3$NA*BrJ}K!$G$O!"5-(B
+$B;v$N:o=|$d4|8B@Z$l>C5n$r9T$J$&$3$H$O$G$-$^$;$s!#(B@code{nndir} $B$,;H$($k$b(B
+$B$N$J$i2?$G$b!"(B@code{nnmh} $B$"$k$$$O(B @code{nnml} $B$G$b;H$&$3$H$,$G$-$k$N$G!"(B
 $B$b$7FI$_=P$7@lMQ$G$O$J$$(B @code{nndir} $B$,I,MW$@$H;W$C$?$i!"$3$l$i$N$I$A$i(B
 $B$+$NJ}K!$K@Z$jBX$($k$3$H$b$G$-$^$9!#(B
 
@@ -15979,65 +16477,64 @@ Gnus $B$O$?$@C1$K%K%e!<%9$d%a!<%k$rFI$`0J>e$N$3$H$,$G$-$^$9!#0J2<(B
 @subsection $B$J$s$G$b%0%k!<%W(B
 @cindex nneething
 
-($B0l$D$N%9%W!<%kIw%G%#%l%/%H%j!<$H2r$lA':w$7$F$^$o$j$^$9!#$b$7$=$N%U%!%$%k$,5-;v$N$h$&$K8+$((B
-$B$?$J$i(B ($B$9$J$o$A!":G=i$N?t9T$,%X%C%@!<$N$h$&$K8+$($?$i(B) $B$=$l$r%X%C%@$H$7(B
-$B$F;H$$$^$9!#$b$7$=$l$,%X%C%@!<$N$J$$$?$@$NE,Ev$J%U%!%$%k(B ($BNc$($P(B C $B$N%=!<(B
-$B%9%U%!%$%k(B) $B$G$"$C$?$J$i!"(B@code{nneething} $B$O%X%C%@!<$r5u6u$+$i:n$j=P$7(B
-$B$^$9!#$3$l$O%U%!%$%k$N=jM-A0!"F|IU$r;H$$!"$3$l$i$NMWAG$KBP$7$F$G$-(B
-$B$k$3$H$r2?$G$b$d$j$^$9!#(B
-
-$B$3$l$O$"$J$?$K$H$C$F$OA4$F<+F0E*$K5/$3$k$3$H$G!"$"$J$?$O%K%e!<%9%0%k!<%W(B
-$B$K$H$F$bNI$/;w$?2?$+$r8+$;$i$l$k$3$H$K$J$k$G$7$g$&!#$[$s$H$&$K@#J,0c$o$J(B
-$B$$!"%K%e!<%9%0%k!<%W$N$h$&$J$b$N$r!#5-;v$rA*Br$9$k$H!"$=$l$O$$$D$b$N$h$&(B
-$B$K!"5-;v%P%C%U%!$KI=<($5$l$k$G$7$g$&!#(B
-
-$B%G%#%l%/%H%j!<$rI=$o$7$F$$$k9T$rA*Br$9$k$H!"(Bgnus $B$O$"$J$?$r$3(B
-$B$N(B @code{nneething} $B%0%k!<%W$N$?$a$N?7$7$$35N,%P%C%U%!$KO"$l$F9T$/$G$7$g(B
-$B$&!#0J2pJs$r21$($F$*$-$^$;$s!#$b$7(B @kbd{G m} $B$GIaDL$K8G(B
-$BDj(B @code{nneething} $B%0%k!<%W$r:n$k$H!"(Bgnus $B$O5-;vHV9f$H%U%!%$%kL>$NBP1~(B
-$BI=$r21$($F$*$-!"$3$N%0%k!<%W$rB>$N%0%k!<%W$HF1MM$K07$&$3$H$,$G$-$k$h$&$K(B
-$B$J$j$^$9!#8GDj(B @code{nneething} $B%0%k!<%W$r:nF0$5$;$k$H!"L$FI5-;v$,$$$/$D(B
-$B4^$^$l$F$$$k$+$rCN$i$5$l$?$j!"$J$I$J$I!#(B
-
-$B$$$/$D$+$NJQ?t$,$"$j$^$9!#(B
+@code{nneething} $B$O(B @code{nndir} $B%P%C%/%(%s%I(B ($BC10l$N%9%W!<%kIw%G%#%l%/(B
+$B%H%j!<$rFI$`%P%C%/%(%s%I(B) $B$N$[$s$N>/$7@h$K$"$k$b$N$G!"$=$l$O$I$s$J%G%#%l(B
+$B%/%H%j!<$G$b%K%e!<%9%0%k!<%W$K8+$;$+$1$F$7$^$$$^$9!#IT;W5D$G$9$,??]$H$J(B
+$B$k$=$l$>$l$N%U%!%$%k$rGA$$$F$^$o$j$^$9!#$b$7$=$N%U%!%$%k$,5-;v$N$h$&$K8+(B
+$B$($?$J$i(B ($B$9$J$o$A:G=i$N?t9T$,%X%C%@!<$N$h$&$K8+$($?$i(B) $B$=$l$r%X%C%@!<$H(B
+$B$7$F;H$$$^$9!#$b$7$=$l$,%X%C%@!<$NL5$$$?$@$NE,Ev$J%U%!%$%k(B ($BNc$($P(B C $B$N(B
+$B%=!<%9%U%!%$%k(B) $B$@$C$?$i!"(B@code{nneething} $B$O%X%C%@!<$r5u6u$+$i$G$C$A>e(B
+$B$2$^$9!#$3$l$O%U%!%$%k$N=jM-A0$*$h$SF|IU$r;H$$!"$=$l$i$NMWAG$r85$K(B
+$B$G$-$k$3$H$r2?$G$b$d$j$^$9!#(B
+
+$B$3$l$O$"$J$?$K$H$C$F$O$9$Y$F<+F0E*$K5/$3$k$3$H$G!"$"$J$?$O%K%e!<%9%0%k!<(B
+$B%W$K$H$F$bNI$/;w$?2?$+$r8+$;$i$l$k$3$H$K$J$k$G$7$g$&!#K\Ev$K@#J,0c$o$J$$!"(B
+$B%K%e!<%9%0%k!<%W$N$h$&$J$b$N$r!#5-;v$rA*Br$9$k$H!"$=$l$O$$$D$b$N$h$&$K5-(B
+$B;v%P%C%U%!!<$KI=<($5$l$k$G$7$g$&!#(B
+
+$B%G%#%l%/%H%j!<$rI=$o$7$F$$$k9T$rA*Br$9$k$H!"(Bgnus $B$O$$$-$J$j$"$J$?$r$3(B
+$B$N(B @code{nneething} $B%0%k!<%W$N$?$a$N?7$7$$35N,%P%C%U%!!<$KO"$l$F9T$/$G$7$g(B
+$B$&!#0J2pJs$r21$($F$*$-$^$;$s!#IaDL$K(B @kbd{G m} $B$G8GDj(B @code{nneething} $B%0(B
+$B%k!<%W$r:n$l$P!"(Bgnus $B$O5-;vHV9f$H%U%!%$%kL>$NBP1~I=$r21$($F$*$/$N$G!"$3(B
+$B$N%0%k!<%W$rB>$N%0%k!<%W$HF1MM$K07$&$3$H$,$G$-$k$h$&$K$J$j$^$9!#8G(B
+$BDj(B @code{nneething} $B%0%k!<%W$r3h$+$9$H!"$=$l$,L$FI5-;v$r$$$/$D4^$s$G$$$k(B
+$B$+$rCN$i$;$F$b$i$($k!"Ey!9$NMxJX$,$"$j$^$9!#(B
+
+$B$$$/$D$+$NJQ?t$,$"$j$^$9(B:
 
 @table @code
 @item nneething-map-file-directory
 @vindex nneething-map-file-directory
-$BA4$F$N8GDj(B @code{nneething} $B%0%k!<%W$NBP1~I=$O$3$N%G%#%l%/%H%j!<$K3JG<$5(B
-$B$l$^$9!#$3$N=i4|@_DjCM$O(B @file{~/.nneething/} $B$G$9!#(B
+$B$9$Y$F$N8GDj(B @code{nneething} $B%0%k!<%W$NBP1~I=$,!"$3$N%G%#%l%/%H%j!<$K3J(B
+$BG<$5$l$^$9!#$3$N%G%#%U%)%k%H$O(B @file{~/.nneething/} $B$G$9!#(B
 
 @item nneething-exclude-files
 @vindex nneething-exclude-files
-$B$3$N@55,I=8=$K%^%C%A$9$k%U%!%$%k$O$9$Y$FL5;k$5$l$^$9!#<+F0J]B8%U%!%$%k$J(B
-$B$I$r=|$/$N$KJXMx$K;H$($^$9!#$=$7$F$=$l$,$^$5$K=i4|@_Dj$G9T$J$o$l$kF0:n$G(B
-$B$9!#(B
+$B$3$N@55,I=8=$K9gCW$9$k%U%!%$%k$O$9$Y$FL5;k$5$l$^$9!#<+F0J]B8%U%!%$%k$J$I(B
+$B$r=|30$9$k$N$KJXMx$K;H$($^$9!#$=$7$F$=$l$,$^$5$K%G%#%U%)%k%H$G9T$J$o$l$k(B
+$BF0:n$G$9!#(B
 
 @item nneething-include-files
 @vindex nneething-include-files
-$B$=$N%U%!%$%k$r%0%k!<%W$K4^$a$k$+$r<($9@55,I=8=$G$9!#$3$NJQ?t(B
+$B$I$N%U%!%$%k$r%0%k!<%W$K4^$a$k$+$r<($9@55,I=8=$G$9!#$3$NJQ?t(B
 $B$,(B @code{nil} $B$G$J$1$l$P!"$3$N@55,I=8=$K9gCW$9$k%U%!%$%k$@$1$,4^$^$l$^$9!#(B
 
 @item nneething-map-file
 @vindex nneething-map-file
-$BBP1~I=%U%!%$%k$NL>A0!#(B
+$BBP1~I=%U%!%$%k$NL>A0$G$9!#(B
 @end table
 
 @node Document Groups
@@ -16046,19 +16543,18 @@ Gnus $B$O$?$@C1$K%K%e!<%9$d%a!<%k$rFI$`0J>e$N$3$H$,$G$-$^$9!#0J2<(B
 @cindex documentation group
 @cindex help group
 
-@code{nndoc} $B$O0l$D$N%U%!%$%k$r%K%e!<%9%0%k!<%W$H$7$FFI$`$3$H$r$G$-$k$h(B
-$B$&$K$9$k!"$A$g$C$H5$$NMx$$$?$d$D$G$9!#$$$/$D$+$N%U%!%$%kAw7A<0!#(B
-@cindex forwarded messages
-
-@item forward
-$BE>Aw$5$l$?5-;v!#(B
 
 @item nsmail
 Netscape $B$N%a!<%k%\%C%/%9!#(B
 
 @item mime-parts
-@acronym{MIME} $BItJ,%a%C%;!<%8(B (multipart)$B!#(B
+@acronym{MIME} $B$N%^%k%A%Q!<%H$N%a%C%;!<%8!#(B
 
 @item standard-digest
-$BI8=`(B (RFC 1153) $B$^$H$aAw$j7A<0!#(B
+$BI8=`(B (RFC1153) $B$N$^$H$aAw$j7A<0!#(B
 
 @item mime-digest
 @acronym{MIME} $B$N$^$H$aAw$j%a%C%;!<%8!#(B
@@ -16092,6 +16584,7 @@ Netscape $B$N%a!<%k%\%C%/%9!#(B
 @item lanl-gov-announce
 $B%m%9%"%i%b%99qN)8&5f=j(B (LANL) Gov Announce $B$+$i$NH/I=%a%C%;!<%8!#(B
 
+@cindex forwarded messages
 @item rfc822-forward
 RFC822 $B$GE>Aw$5$l$?%a%C%;!<%8!#(B
 
@@ -16117,34 +16610,35 @@ mailman $B$N$^$H$aAw$j!#(B
 Clarinet $B$N%K%e!<%99`L\$rMWLs$7$?$^$H$aAw$j!#(B
 
 @item slack-digest
-$BHsI8=`$^$H$aAw$j7A<0(B --- $B$@$$$?$$$O$&$^$/%^%C%A$9$k$,!"$G$b07$$$O2<J,$J%X%C%@!<$rA^F~$7$h(B
-$B$&$H$7$?$j$O$7$^$;$s(B --- $BC1=c$K!"%U%!%$%k$r$=$N%0%k!<%W$NA[%5!<%P!l9g$O!"$=$N(B
+$B%U%!%$%k$r(B @code{nndoc} $B$r;H$C$F3+$-(B ($B%0%k!<%W%P%C%U%!!<$G(B @kbd{G f} $BL?(B
+$BNa(B (@pxref{Foreign Groups}) $B$r;H$$$^$7$g$&(B)$B!"%P%C%U%!!A[%5!<%P!e$2!"$=$NJ8=qA0(B (@dfn{name}) $B$H$=$l$KB3$/@55,I=8=$H2>A[JQ?t@_(B
-$BDj$NNs$+$i$J$j$^$9!#0J2<$,$3$l$K;H$($kJQ?t$G$9(B --- $BJQ?t$N?t$K05E]$5$l$J(B
-$B$$$G$/$@$5$$!#$[$H$s$I$NJ8=qA0(B (@dfn{name}) $B$H!"$=$l$KB3$/2>A[(B
+$BE*$JJQ?tL>$*$h$S$=$N@_DjCM$NC1=c$JO"$J$j$+$i$J$j$^$9!#0J2<$,;H$&$3$H$,$G(B
+$B$-$kJQ?t$G$9(B---$BJQ?t$N?t$K05E]$5$l$J$$$G2<$5$$!#$[$H$s$I$NJ8=q$N$l$N5-;v$N;O$^$j$,$I$N$h$&$K8+$($k$+$r;XDj$9$k@55,I=8=$G$9!#C1=c$J@55,(B
+$BI=8=$G$OBP=h$G$-$J$$$b$C$HJ#;($J$3$H$r$7$?$$>l9g$O!"$3$l$NBe$o$j(B
+$B$K(B @code{article-begin-function} $B$r;H$&$3$H$,$G$-$^$9!#(B
+
+@item article-begin-function
+$B$3$l$r@_Dj$9$k>l9g$O!"$=$l$>$l$N5-;v$N3+;O0LCV$K%]%$%s%H$r0\F0$5$;$k4X?t(B
+$B$r;XDj$7$F2<$5$$!#$3$l$O(B @code{article-begin} $B$h$jM%@h$5$l$^$9!#(B
+
+@item head-begin
+$B$3$l$r@_Dj$9$k>l9g$O!"5-;v$N%X%C%@!<$N;O$^$j$K9gCW$9$k@55,I=8=$r;XDj$7$F(B
+$B2<$5$$!#C1=c$J@55,I=8=$G$OBP=h$G$-$J$$$b$C$HJ#;($J$3$H$r$7$?$$>l9g$O!"$3(B
+$B$l$NBe$o$j$K(B @code{head-begin-function} $B$r;H$&$3$H$,$G$-$^$9!#(B
 
 @item head-begin-function
-$B$3$l$,$"$k>l9g!"$3$l$O5-;v$N@hF,$K%]%$%s%H$r0\F0$5$;$k4X?t$G$J$/$F$O$J$j(B
-$B$^$;$s!#(B
+$B$3$l$r@_Dj$9$k>l9g$O!"5-;v$N%X%C%@!<$N3+;O0LCV$K%]%$%s%H$r0\F0$5$;$k4X?t(B
+$B$r;XDj$7$F2<$5$$!#$3$l$O(B @code{head-begin} $B$h$jM%@h$5$l$^$9!#(B
 
-@item nndoc-head-begin
-$B$3$l$,$"$k>l9g!"$3$l$O5-;v$N%X%C%@!<$K%^%C%A$9$k@55,I=8=$G$J$/$F$O$J$j$^(B
-$B$;$s!#(B
+@item head-end
+$B$3$l$r@_Dj$9$k>l9g$O!"5-;v$N%X%C%@!<$N:G8e$K9gCW$9$k@55,I=8=$r;XDj$7$F2<(B
+$B$5$$!#%G%#%U%)%k%H$O(B @samp{^$}$B!"$D$^$j6u9T$G$9!#(B
 
-@item nndoc-head-end
-$B$3$l$O5-;v$N%X%C%@!<$N:G8e$K%^%C%A$7$J$/$F$O$J$j$^$;$s!#$3$N=i4|@_DjCM(B
-$B$O(B @samp{^$} --- $B6u9T$G$9!#(B
+@item body-begin
+$B$3$l$r@_Dj$9$k>l9g$O!"5-;v$N%\%G%#!<$N;O$^$j$K9gCW$9$k@55,I=8=$r;XDj$7$F(B
+$B2<$5$$!#%G%#%U%)%k%H$O(B @samp{^\n} $B$G$9!#C1=c$J@55,I=8=$G$OBP=h$G$-$J$$$b$C(B
+$B$HJ#;($J$3$H$r$7$?$$>l9g$O!"$3$l$NBe$o$j$K(B @code{body-begin-function} $B$r(B
+$B;H$&$3$H$,$G$-$^$9!#(B
 
 @item body-begin-function
-$B$3$l$,$"$k>l9g!"$3$N4X?t$O5-;v$N%\%G%#$N3+;O0LCV$K%]%$%s%H$r0\F0$5$;$k4X(B
-$B?t$G$J$/$F$O$J$j$^$;$s!#(B
+$B$3$l$r@_Dj$9$k>l9g$O!"5-;v$N%\%G%#!<$N3+;O0LCV$K%]%$%s%H$r0\F0$5$;$k4X?t(B
+$B$r;XDj$7$F2<$5$$!#$3$l$O(B @code{body-begin} $B$h$jM%@h$5$l$^$9!#(B
 
-@item body-begin
-$B$3$l$O5-;v$N%\%G%#$N3+;O0LCV$K%^%C%A$7$J$/$F$O$J$j$^$;$s!#$3$N=i4|@_DjCM(B
-$B$O(B @samp{^\n} $B$G$9!#(B
+@item body-end
+$B$3$l$r@_Dj$9$k>l9g$O!"5-;v$N%\%G%#!<$N:G8e$K9gCW$9$k@55,I=8=$r;XDj$7$F2<(B
+$B$5$$!#C1=c$J@55,I=8=$G$OBP=h$G$-$J$$$b$C$HJ#;($J$3$H$r$7$?$$>l9g$O!"$3$l(B
+$B$NBe$o$j$K(B @code{body-end-function} $B$r;H$&$3$H$,$G$-$^$9!#(B
 
 @item body-end-function
-$B$3$l$,$"$k>l9g!"$3$N4X?t$O5-;v$N%\%G%#$N:G8e$N0LCV$K%]%$%s%H$r0\F0$5$;$k(B
-$B4X?t$G$J$/$F$O$J$j$^$;$s!#(B
+$B$3$l$r@_Dj$9$k>l9g$O!"5-;v$N%\%G%#!<$N:G8e$N0LCV$K%]%$%s%H$r0\F0$5$;$k4X(B
+$B?t$r;XDj$7$F2<$5$$!#$3$l$O(B @code{body-end} $B$h$jM%@h$5$l$^$9!#(B
 
-@item body-end
-$B$3$l$,$"$l$P!"5-;v$N%\%G%#$N:G8e$K%^%C%A$7$J$/$F$O$J$j$^$;$s!#(B
+@item file-begin
+$B$3$l$r@_Dj$9$k>l9g$O!"%U%!%$%k$N;O$^$j$K9gCW$9$k@55,I=8=$r;XDj$7$F2<$5$$!#(B
+$B$=$l$h$jA0$N$9$Y$F$N%F%-%9%H$O40A4$KL5;k$5$l$^$9!#(B
 
 @item file-end
-$B$3$l$,$"$k>l9g!"$3$l$O%U%!%$%k$N:G8e$K%^%C%A$7$J$/$F$O$J$j$^$;$s!#$3$N@5(B
-$B5,I=8=$N8e$m$N%F%-%9%H$OA4$F!"40A4$KL5;k$5$l$^$9!#(B
+$B$3$l$r@_Dj$9$k>l9g$O!"%U%!%$%k$N:G8e$K9gCW$9$k@55,I=8=$r;XDj$7$F2<$5$$!#(B
+$B$=$l$h$j8e$m$N$9$Y$F$N%F%-%9%H$O40A4$KL5;k$5$l$^$9!#(B
 @end table
 
-$B$3$N$h$&$K!"$3$l$i$NJQ?t$r;H$C$F(B @code{nndoc} $B$OJ8=q%U%!%$%k$r!"$=$l$>$l(B
-$B%X%C%@!<$H%\%G%#$r;}$C$?5-;v$NO"$J$j$H$7$F2rK6$9$k$3$H$,$G$-$^$9!#$7$+$7!"(B
-$BA4$F$NJ8=q$l%X%C(B
+$B%@!<$H%\%G%#!<$r;}$C$?5-;v$NO"$J$j$H$7$F@Z$jJ,$1$k$3$H$,$G$-$^$9!#$7$+$7!"(B
+$B$9$Y$F$NJ8=q$Nl9g$KM-MQ$G$9!#(B
+$B$3$l$K4X?t$r@_Dj$7$F$*$/$H!"5-;v$,MW5a$5$l$?$H$-$K8F$S=P$5$l$^$9!#$3$l$O(B
+$B%\%G%#!<$N3+;O0LCV$N%]%$%s%H$r0z?t$H$7$F8F$S=P$5$l!"J8=q$K$$$/$D$+$N%(%s(B
+$B%3!<%I$5$l$?FbMFJ*$N%Q!<%H$,$"$k>l9g$KM-MQ$G$9!#(B
 
 @item article-transform-function
-$B$3$l$,$"$l$P!"$3$N4X?t$O5-;v$,MW5a$5$l$?$H$-$K8F$S=P$5$l$^$9!#$3$l$O!"5-(B
-$B;v$N%X%C%@!<$H%\%G%#$NN>J}$K$h$j9-HO0O$JJQ7A$r9T$J$&$?$a$K;H$o$l$k$b$N$G(B
-$B$9!#(B
+$B$3$l$K4X?t$r@_Dj$7$F$*$/$H!"5-;v$,MW5a$5$l$?$H$-$K8F$S=P$5$l$^$9!#$3$l$O(B
+$B5-;v$N%X%C%@!<$H%\%G%#!<$NN>J}$K!"$h$j9-HO0O$JJQ7A$r9T$J$&$?$a$K;H$o$l$k(B
+$B$b$N$G$9!#(B
 
 @item generate-head-function
-$B$3$l$,$"$l$P!"$3$N4X?t$O(B gnus $B$,M}2r$G$-$k%X%C%@!<$r@8@.$9$k$?$a$K8F$S=P(B
-$B$5$l$^$9!#$3$l$O5-;vHV9f$r%Q%i%a!<%?$H$7$F8F$S=P$5$l!"LdBj$N5-;v$N$-$l$$(B
-$B$J%X%C%@!<$r@8@.$9$k$3$H$r5a$a$i$l$^$9!#$3$l$OA4$F$N5-;v$N%X%C%@!<$,MW5a(B
-$B$5$l$k$H$-$K8F$S=P$5$l$^$9!#(B
+$B$3$l$K4X?t$r@_Dj$7$F$*$/$H!"(Bgnus $B$,M}2r$G$-$k%X%C%@!<$r@8@.$9$k$?$a$K8F(B
+$B$S=P$5$l$^$9!#$3$l$O5-;vHV9f$r%Q%i%a!<%?!<$H$7$F8F$S=P$5$l!"$=$N5-;v$N$?(B
+$B$a$NNIJN,2DG=$J(B) $B%Q%i%a!<%?$O$3$NDj(B
-$B5A$r!"J8=ql9g$O(B @code{nil} $B$rJV$7!"$=(B
-$B$Nl9g$O(B @code{t} $B$rJV$7!"$=$NJN,2DG=$J(B) $B%Q%i%a!<%?!<$O!"$3(B
+$B$NDj5A$rJ8=q$N$Nl9g$bF1MM$G$9!#$3$l(B
+$B$i$Nl9g$O(B @code{nil} $B$rJV$7!"$=$Nl9g$O(B @code{t} $B$rJV$7!"$=$N$_$=$K3Z$r$5$;$kJ}$r$9$k$N$b;~$K$OJXMx$G$9!#(B
+$B6=L#$,L5$1$l$P!"$[$s$N>/$7G>$_$=$K3Z$r$5$;$kJ}$r$9$k$N$b;~$K$OJXMx$G$7$g(B
+$B$&!#(B
 
-@sc{soup} $B$H8F$P$l$k%U%!%$%k7A<0$O%K%e!<%9$H%a!<%k$r%5!<%P!<$+$i2H$N%^%7(B
-$B%s$X$HE>Aw$7!"$=$l$r$^$?La$9$?$a$K3+H/$5$l$^$7$?!#$A$g$C$HLLE]$/$5$$$+$b(B
-$B$7$l$J$$$1$I$M!#(B
+@sc{soup} $B$H$$$&%U%!%$%k7A<0$O!"%K%e!<%9$H%a!<%k$r%5!<%P!<$+$i2H$N%^%7%s(B
+$B$X$HE>Aw$7!"$=$l$r$^$?La$9$?$a$K3+H/$5$l$^$7$?!#$A$g$C$HLLE]$/$5$$$+$b$7(B
+$B$l$^$;$s$,$M!#(B
 
-$B$O$8$a$K$$$/$D$+MQ8l$r!#(B
+$B$O$8$a$K$$$/$D$+MQ8l$r(B:
 
 @table @dfn
 @item server
-$B$3$l$O30$N@$3&$K7R$,$C$F$$$F!"$"$J$?$,%K%e!<%9$H%a!<%k$rAw$N@$3&$H$$$+$J$k7A$G$b@\B3$5$l$F$$$^$;$s!#(B
 
 @item packet
-$B%a%C%;!<%8$HL?Na$r4^$s$@$b$N!#%Q%1%C%H$K$OFsA0$G$9!#$3$3$G(B @var{x} $B$O?t;z$G$9!#(B
+$B%;!<%8$r4^$s$G$$$^$9!#$3$l$i$O%G%#%U%)%k%H$G$O(B @file{SoupoutX.tgz} $B$H$$(B
+$B$&L>A0$G$9!#$3$3$G(B @var{x} $B$O?t;z$G$9!#(B
 
 @item response packets
-($BJV?.%Q%1%C%H(B) $B$3$N%Q%1%C%H$O<+Bp%^%7%s$G:n$i$l$k%Q%1%C%H$G!"IaDL$O$"$J(B
-$B$?$N=q$$$?JV;v$,4^$^$l$F$$$^$9!#$3$l$i$O=i4|@_Dj$G(B
-$B$O(B @file{SoupinX.tgz} $B$H$$$&L>A0$G$9!#$3$3$G(B @var{x} $B$O?t;z$G$9!#(B
+$B$3$N%Q%1%C%H$O<+Bp%^%7%s$G:n$i$l$k%Q%1%C%H$G!"IaDL$O$"$J$?$,=q$$$?JV;v$r(B
+$B4^$s$G$$$^$9!#$3$l$i$O%G%#%U%)%k%H$G$O(B @file{SoupinX.tgz} $B$H$$$&L>A0$G$9!#(B
+$B$3$3$G(B @var{x} $B$O?t;z$G$9!#(B
 @end table
 @end table
 
 @enumerate
-
 @item
-$B$^$:(B @sc{soup} $B%Q%1%C%H$r:n$k$?$a$K%5!<%P!<$K%m%0%$%s$7$^$9!#(B
-@sc{soup} $B$N$?$a$N@lMQ$N%V%D(B (@code{awk} $B%W%m%0%i%`$N$h$&$J(B) $B$r;H$C$F$b(B
-$BNI$$$7!"(Bgnus $B$N(B @sc{soup} $BL?Na$r;H$C$F%Q%1%C%H$r:n$C$F$bNI$$$G(B
-$B$9(B (@kbd{O s} $B$"$k$$$O(B @kbd{G s b} $B$=$7$F(B @kbd{G s p})
-
-(@pxref{SOUP Commands})$B!#(B
+$B$^$:%5!<%P!<$K%m%0%$%s$7$F(B @sc{soup} $B%Q%1%C%H$r:n$j$^$7$g$&!#(B
+@sc{soup} $B@lMQ$K6!$5$l$?$b$N(B (@code{awk} $B%W%m%0%i%`$N$h$&$J$b$N(B) $B$r;H$C(B
+$B$F$bNI$$$7!"(Bgnus $B$N(B @sc{soup} $BL?Na$r;H$C$F%Q%1%C%H$r:n$C$F$bNI$$$G(B
+$B$9(B (@kbd{O s} $B$d(B @kbd{G s b} $B$KB3$$$F(B @kbd{G s p}) (@pxref{SOUP
+Commands})$B!#(B
 
 @item
-$B%Q%1%C%H$r<+Bp$KE>Aw$7$^$9!#EEAw$7$^$7$g$&!#EEAw$7$^$9!#(B
+$B$3$N%Q%1%C%H$r%5!<%P!<$KE>Aw$7$^$7$g$&!#(B
 
 @item
-Gnus $B$+$i(B @kbd{G s s} $BL?Na$r;H$C$F$3$N%Q%1%C%H$+$i%a!<%k$r=P$7$^$9!#(B
+$B$3$N%Q%1%C%H$r(B gnus $B$N(B @kbd{G s s} $BL?Na$GAw?.$7$^$7$g$&!#(B
 
 @item
-$B$"$H$O$3$l$r;`$L$^$GB3$1$^$9!#(B
-
+$B$"$H$O$3$l$r;`$L$^$G7+$jJV$7$^$7$g$&!#(B
 @end enumerate
 
-$B$D$^$j4pK\E*$KFs$$$^$9!#(B
 
 @item G s w
 @kindex G s w ($B%0%k!<%W(B)
 @findex gnus-soup-save-areas
-$BA4$F$N(B @sc{soup} $B%G!<%?%U%!%$%k$rJ]B8$7$^(B
+$B$9$Y$F$N(B @sc{soup} $B%G!<%?%U%!%$%k$rJ]B8$7$^(B
 $B$9(B (@code{gnus-soup-save-areas})$B!#(B
 
 @item G s s
 @kindex G s s ($B%0%k!<%W(B)
 @findex gnus-soup-send-replies
-$BJV?.%Q%1%C%H$+$iA4$F$NJV?.$rAw=P$9$k(B (@code{gnus-soup-send-replies})$B!#(B
+$BJV?.%Q%1%C%H$+$i$9$Y$F$NJV?.$rAw=P$7$^$9(B (@code{gnus-soup-send-replies})$B!#(B
 
 @item G s p
 @kindex G s p ($B%0%k!<%W(B)
 @findex gnus-soup-pack-packet
-$BA4$F$N%U%!%$%k$r(B  @sc{soup} $B%Q%1%C%H$K:-Jq$9(B
-$B$k(B (@code{gnus-soup-pack-packet})$B!#(B
+$B$9$Y$F$N%U%!%$%k$r(B @sc{soup} $B%Q%1%C%H$K$^$H$a$^(B
+$B$9(B (@code{gnus-soup-pack-packet})$B!#(B
 
 @item G s r
 @kindex G s r ($B%0%k!<%W(B)
 @findex nnsoup-pack-replies
-$BA4$F$NJV?.$rJV?.%Q%1%C%H$K:-Jq$9$k(B (@code{nnsoup-pack-replies})$B!#(B
+$B$9$Y$F$NJV?.$rJV?.%Q%1%C%H$K$^$H$a$^$9(B (@code{nnsoup-pack-replies})$B!#(B
 
 @item O s
 @kindex O s ($B35N,(B)
@@ -16424,43 +16948,43 @@ Gnus $B$+$i(B @kbd{G s s} $BL?Na$r;H$C$F$3$N%Q%1%C%H$+$i%a!<%k$r=P$7$^$9!#(B
 $B$9(B (@pxref{Process/Prefix})$B!#(B
 @end table
 
-gnus $B$,$3$l$i$N!#=i4|@_DjCM(B
-$B$O(B @samp{gnus-prefix}$B!#(B
+gnus $B$,:G8e$K;H$C$?@\F,8l$rJ]B8$9$k%U%!%$%kL>$G$9!#%G%#%U%)%k%H(B
+$B$O(B @samp{gnus-prefix} $B$G$9!#(B
 
 @item gnus-soup-packer
 @vindex gnus-soup-packer
-@sc{soup} $B%Q%1%C%H$r:-Jq$9$kL?NaJ8;zNs$N7A<0!#=i4|@_DjCM(B
-$B$O(B @samp{tar cf - %s | gzip > $HOME/Soupout%d.tgz}$B!#(B
+@sc{soup} $B%Q%1%C%H$r$^$H$a$kL?Na$r:n$k$?$a$N%U%)!<%^%C%HJ8;zNs$G$9!#%G%#(B
+$B%U%)%k%H$O(B @samp{tar cf - %s | gzip > $HOME/Soupout%d.tgz} $B$G$9!#(B
 
 @item gnus-soup-unpacker
 @vindex gnus-soup-unpacker
-@sc{soup} $B%Q%1%C%H$rl=j!#=i4|@_DjCM$O(B @file{~/}$B!#(B
+gnus $B$,JV?.%Q%1%C%H$rC5$9>l=j$G$9!#%G%#%U%)%k%H$O(B @file{~/} $B$G$9!#(B
 
 @item gnus-soup-packet-regexp
 @vindex gnus-soup-packet-regexp
-@code{gnus-soup-packet-directory} $BFb$N(B @sc{soup} $B%Q%1%C%H$K%^%C%A$9$k@5(B
-$B5,I=8=!#(B
+@code{gnus-soup-packet-directory} $B$K$"$k(B @sc{soup} $B%Q%1%C%H$K9gCW$9$k@5(B
+$B5,I=8=$G$9!#(B
 @end table
 
 @node SOUP Groups
@@ -16468,149 +16992,150 @@ gnus $B$,JV?.%Q%1%C%H$rC5$7$K9T$/>l=j!#=i4|@_DjCM$O(B @file{~/}$B!#(B
 @cindex nnsoup
 
 @code{nnsoup} $B$O(B @sc{soup} $B%Q%1%C%H$rFI$`$?$a$N%P%C%/%(%s%I$G$9!#$3$l$O(B
-$BF~$C$F$-$?%Q%1%C%H$rFI$_!"$=$l$r$l$N%a%C%;!<%8$H:w0z%U%!%$%k$r$3$N%G%#%l%/(B
-$B%H%j!<$K0\F0$5$;$k!#=i4|@_Dj$O(B @file{~/SOUP/}$B!#(B
+$B$l$N%a%C%;!<%8$H:w0z%U%!%$%k$r$3$N%G%#%l%/(B
+$B%H%j!<$K0\F0$5$;$^$9!#%G%#%U%)%k%H$O(B @file{~/SOUP/} $B$G$9!#(B
 
 @item nnsoup-replies-directory
 @vindex nnsoup-replies-directory
-$BA4$F$NJV?.$O!"JV?.%Q%1%C%H$K:-Jq$5$l$kA0$K$3$N%G%#%l%/%H%j!<$K3JG<$5$l$k!#(B
-$B=i4|@_Dj$O(B @file{~/SOUP/replies/}$B!#(B
+$B$9$Y$F$NJV?.$O!"JV?.%Q%1%C%H$K$^$H$a$i$l$kA0$K$3$N%G%#%l%/%H%j!<$K3JG<$5(B
+$B$l$^$9!#%G%#%U%)%k%H$O(B @file{~/SOUP/replies/} $B$G$9!#(B
 
 @item nnsoup-replies-format-type
 @vindex nnsoup-replies-format-type
-$BJV?.%Q%1%C%H$N(B @sc{soup} $B7A<0!#=i4|@_DjCM(B
-$B$O(B @samp{?n} (rnews) $B$G!"$3$NJQ?t$K$O?($k$Y$-$G$O$J$$$H;d$O;W$$$^$9!#$?(B
-$B$V$sJ8=q$KL@5-$9$Y$-$G$5$($J$+$C$?$M!#$A$'$C(B! $B$b$&pJs$r3JG<$9$k>l=j!#$3$l$O(B @code{nntp} $B$N0UL#(B
-$B$G$N(B ``$B%"%/%F%#%V%U%!%$%k(B'' $B$G$O$J$/!"(BEmacs Lisp $B$N%U%!%$%k$G$9!#$3$N%U%!(B
-$B%$%k$rL5$/$7$F$7$^$C$?$j!"2?$+2u$7$F$7$^$C$?$i!"$"$J$?$O;`$K$^$9!#=i4|@_(B
-$BDjCM$O(B @file{~/SOUP/active} $B$G$9!#(B
+@code{nnsoup} $B$,$?$/$5$s$N>pJs$r3JG<$9$k>l=j$G$9!#$3$l$O(B @code{nntp} $B$G(B
+$B8@$&$H$3$m$N!V%"%/%F%#%V%U%!%$%k!W$G$O$J$/!"(BEmacs Lisp $B$N%U%!%$%k$G$9!#(B
+$B$3$N%U%!%$%k$rL5$/$7$F$7$^$C$?$j!"2?$+2u$7$F$7$^$C$?$i!"$"$J$?$O;`$K$^$9!#(B
+$B%G%#%U%)%k%H$O(B @file{~/SOUP/active} $B$G$9!#(B
 
 @item nnsoup-packer
 @vindex nnsoup-packer
-$BJV?.(B @sc{soup} $B%Q%1%C%H$r:-Jq$9$kL?NaJ8;zNs$N7A<0!#=i4|@_DjCM(B
-$B$O(B @samp{tar cf - %s | gzip > $HOME/Soupin%d.tgz}$B!#(B
+$BJV?.(B @sc{soup} $B%Q%1%C%H$r$^$H$a$kL?Na$r:n$k$?$a$N%U%)!<%^%C%HJ8;zNs$G$9!#(B
+$B%G%#%U%)%k%H$O(B @samp{tar cf - %s | gzip > $HOME/Soupin%d.tgz} $B$G$9!#(B
 
 @item nnsoup-unpacker
 @vindex nnsoup-unpacker
-$BF~$C$F$/$k(B @sc{soup} $B%Q%1%C%H$rl=j!#=i4|@_DjCM$O(B @file{~/}$B!#(B
+$BF~$C$F$-$?%Q%1%C%H$r(B @code{nnsoup} $B$,C5$9>l=j$G$9!#%G%#%U%)%k%H(B
+$B$O(B @file{~/} $B$G$9!#(B
 
 @item nnsoup-packet-regexp
 @vindex nnsoup-packet-regexp
-$BF~$C$F$-$?(B @sc{soup} $B%Q%1%C%H$K%^%C%A$9$k@55,I=8=!#=i4|@_DjCM(B
-$B$O(B @samp{Soupout}$B!#(B
+$BF~$C$F$-$?(B @sc{soup} $B%Q%1%C%H$K9gCW$9$k@55,I=8=$G$9!#%G%#%U%)%k%H(B
+$B$O(B @samp{Soupout} $B$G$9!#(B
 
 @item nnsoup-always-save
 @vindex nnsoup-always-save
-@code{nil} $B0J30$G$"$l$P!"%a%C%;!<%8$rEj9F$7$?8e$KJV?.%P%C%U%!$rJ]B8$9$k!#(B
+@code{nil} $B0J30$G$"$l$P!"%a%C%;!<%8$r0lDLEj9F$9$kEY$K$=$NJV?.%P%C%U%!!<(B
+$B$rJ]B8$7$^$9!#(B
 @end table
 
 @node SOUP Replies
 @subsubsection SOUP $BJV?.(B
 
-$BC1$K(B @code{nnsoup} $B$r;H$&$@$1$G$O!"(B@sc{soup} $BJV?.%Q%1%C%HCf$N$"$J$?$NEj(B
-$B9F$H%a!<%k$NAw?.$,!"KbK!$N$h$&$K<+F0E*$K=*N;$9$k$o$1$G$O$"$j$^$;$s!#$=$l(B
-$B$r5/$3$9$K$O$b$&$A$g$C$HF/$+$J$/$F$O$$$1$^$;$s!#(B
+$BC1$K(B @code{nnsoup} $B$r;H$&$@$1$G!"<+F0E*$KAw?.$7$?%K%e!<%95-;v$d%a!<%k(B
+$B$,(B @sc{soup} $BJV?.%Q%1%C%H$KG<$^$k$o$1$G$O$"$j$^$;$s!#$=$&$9$k$?$a$K$O!"(B
+$B$b$&$A$g$C$HF/$+$J$/$F$O$J$j$^$;$s!#(B
 
 @findex nnsoup-set-variables
-@code{nnsoup-set-variables} $BL?Na$O!"$"$J$?$NA4$F$N%U%)%m!<%"%C%W5-;v$HJV(B
-$B?.$r(B @sc{soup} $B%7%9%F%`$K3NA[%0%k!<%W(B
 @cindex nnvirtual
 @cindex virtual groups
+@cindex merging groups
 
-nnvirtual $B%0%k!<%W(B (@dfn{nnvirtual group}) $B$O$N%0%k!<%W$N=89g0J>e(B
-$B$N2?J*$G$b$"$j$^$;$s!#(B
+@dfn{nnvirtual} $B%0%k!<%W$O!".$5$J%0%k!<%W$r$?$/$5$sFI$`$N$,7y$K$J$C$F$-$?$i!"$=$l$i$r0l(B
-$B$D$NBg$-$J%0%k!<%W$KF~$l$F!"7y$K$J$k$/$i$$5pBg$G.$5$J%0%k!<%W$r$?$/$5$sFI$`$N$,7y$K$J$C$F$-$?$i!"$=$l$i$r0l$D$N(B
+$BBg$-$J%0%k!<%W$KF~$l$F!"7y$K$J$k$/$i$$5pBg$GA[%0%k!<%WFb$GIU$1$i$l$?A4$F$N0u$O!"$=$N9=@.%0%k!<%W$N5-;v$K$/$C$D$1$i(B
-$B$l$^$9!#$D$^$j!"$b$72>A[%0%k!<%WFb$G5-;v$K2D;k5-;v$N0u$r$D$1$k$H!"$=$N5-(B
-$B;v$O$b$H$b$H$N9=@.%0%k!<%W$NCf$G$b2D;k5-;v$K$J$j$^$9!#(B($B$=$7$F5U$b@.$jN)(B
-$B$A$^$9(B --- $B9=@.%0%k!<%WFb$GIU$1$?0u$O2>A[%0%k!<%WFb$G$bI=<($5$l$^$9!#(B)
-$B6u$N2>A[%0%k!<%W$r:n$k$K$O!"%0%k!<%W%P%C%U%!$G(B @kbd{G V}
+$B2>A[%0%k!<%W$GIU$1$i$l$?$9$Y$F$N0u$O!"$=$N9=@.MWAG$N%0%k!<%W$N5-;v$K$/$C(B
+$B$D$1$i$l$^$9!#$D$^$j!"2>A[%0%k!<%W$G5-;v$K2D;k5-;v$N0u$rIU$1$k$H!"$=$N5-(B
+$B;v$O$b$H$b$H$N9=@.MWAG$N%0%k!<%W$G$b2D;k5-;v$K$J$j$^$9!#(B($B$=$7$F5U$b@.$j(B
+$BN)$A$^$9(B---$B9=@.MWAG$N%0%k!<%W$GIU$1$?0u$O!"2>A[%0%k!<%W$G$bI=<($5$l$^(B
+$B$9!#(B)  $B6u$N2>A[%0%k!<%W$r:n$k$K$O!"%0%k!<%W%P%C%U%!!<$G(B @kbd{G V}
 (@code{gnus-group-make-empty-virtual}) $B$rl9g$O!"Hs>o$KNI$$(B
-$B$+$bCN$l$^$;$s!#$b$7$"$J$?$,(B @samp{soc.motss} $B$r!"F|K\$N%5!<%P!<$H%N%k%&%'!<(B
-$B$N%5!<%P!<$NN>J}$+$iFI$_$?$1$l$P!"%0%k!<%W$N@55,I=8=$H$7$F0J2<$NCM$,;H$((B
-$B$^$9!#(B
+$BMxMQl9g$K!"F1$8%0%k!<%W$rJ#?t$N%5!<%P!<$+$i4s$;=8$a$k$3(B
+$B$H$O!"K\Ev$K$&$^$$9M$($+$b$7$l$^$;$s!#(B@samp{soc.motss} $B$rF|K\$N%5!<%P!<(B
+$B$H%N%k%&%'!<$N%5!<%P!<$NN>J}$+$iFI$_$?$1$l$P!"%0%k!<%W$N@55,I=8=$H$7$F0J(B
+$B2<$N$b$N$r;H$&$3$H$,$G$-$k$G$7$g$&(B:
 
 @example
 "^nntp\\+server\\.jp:soc\\.motss$\\|^nntp\\+server\\.no:soc\\.motss$"
 @end example
 
 ($B$G$b$A$g$C$HCm0U!#(B@kbd{G m} $B$G%0%k!<%W$r:n@.$9$k$H$-$O!"%P%C%/%9%i%C%7%e(B
-$B$rFs=E$KIU$1$F$O$$$1$^$;$s!#$=$7$FJ8;zNs$N:G=i$H:G8e$N0zMQ5-9f$bJ}$N%0%k!<%W$N5-;v$OA4It40A4(B
-$B$K0l$D$N%0%k!<%W$K$J$j!"=EJ#$bL5$$$O$:$G$9!#%9%l%C%II=<((B ($B$H$=$NB>(B) $B$bDL(B
-$B>oDL$j$&$^$/F0:n$9$k$G$7$g$&$1$I!"5-;v$NJB$V=g=x$K$OLdBj$,$"$k$+$b$7$l$^(B
-$B$;$s!#F|IU$K$h$kJB$YBX$($O$3$3$G$O;EMM30$H$J$k$+$b$7$l$^$;(B
+$B$3$l$O$^$"!"$9$i$9$i$HF0:n$9$k$O$:$G$9(B---$BN>J}$N%0%k!<%W$N$9$Y$F$N5-;v$O(B
+$B0l$D$N%0%k!<%W$KF~$j!"=EJ#$bL5$$$O$:$G$9!#%9%l%C%II=<((B ($B$H$=$NB>(B) $B$bDL>o(B
+$BDL$jF0:n$9$k$G$7$g$&$1$l$I!"5-;v$NJB$V=g=x$K$OLdBj$,$"$k$+$b$7$l$^$;$s!#(B
+$BF|IU$K$h$kJB$YBX$($,!"$3$3$G$O0l$D$NA*Br;h$K$J$k$+$b$7$l$^$;(B
 $B$s(B (@pxref{Selecting a Group})$B!#(B
 
-$B$J$*!"$3$3$G0l$D$@$1@)8B$,$"$j$^$9(B --- $B2>A[%0%k!<%W$K4^$^$l$k%0%k!<%W$O(B
-$BA4$F@8$-$F$$$k(B($B$9$J$o$A!"9XFI$^$?$OHs9XFI$N(B)$B>uBV$G$J$/$F$O$J$j$^$;$s!#:o(B
-$B=|$"$k$$$O%>%s%S%0%k!<%W$O(B @code{nnvirtual} $B%0%k!<%W$N9=@.%0%k!<%W$K$J$k(B
-$B$3$H$O$G$-$^$;$s!#(B
+$B$J$*!"$3$3$G0l$D$@$1@)8B$,$"$j$^$9(B---$B2>A[%0%k!<%W$K4^$^$l$k%0%k!<%W$O$9(B
+$B$Y$F@8$-$F$$$k(B ($B$9$J$o$A9XFI$^$?$OHs9XFI$N(B) $B>uBV$G$J$/$F$O$J$j$^$;$s!#:o(B
+$B=|$5$l$?(B (killed) $B%0%k!<%W$"$k$$$O%>%s%S$N%0%k!<%W$O(B @code{nnvirtual} $B%0(B
+$B%k!<%W$r9=@.$9$k%0%k!<%W$K$J$k$3$H$O$G$-$^$;$s!#(B
 
 @vindex nnvirtual-always-rescan
-@code{nnvirtual-always-rescan} $B$,(B @code{nil} $B0J30$G$"$l$P!"(B
-@code{nnvirtual} $B$O2>A[%0%k!<%W$KF~$C$?$H$->o$K!"L$FI5-;v$rAv::$7$^$9!#(B
-$B$3$NJQ?t$,(B @code{nil} ($B$3$l$,=i4|@_Dj(B)$B$G$"$C$F!"2>A[%0%k!<%W$r:n@.$7$?8e(B
-$B$K9=@.%0%k!<%WFb$N5-;v$rFI$s$@>l9g$O!"$=$N9=@.%0%k!<%W$GFI$^$l$?5-;v$O!"(B
-$B2>A[%0%k!<%W$KF~$C$?$H$-$KI=<($5$l$k$G$7$g$&!#$b$76&DL$N9=@.%0%k!<%W$r;}(B
-$B$DFs$D$N2>A[%0%k!<%W$,$"$k>l9g$K$b$3$N1F6A$,$"$j$^$9!#$=$N>l9g$O$3$NJQ?t(B
-$B$r(B @code{t} $B$K$7$?J}$,NI$$$G$9!#$"$k$$$O2>A[%0%k!<%W$KF~$k;~$K!"Kh2s$=$N(B
-$B%0%k!<%W$N>e$G(B @code{M-g} $B$rC!$$$F$bNI$$$G$9(B --- $B$3$l$O$[$\F1MM$N8z2L$,(B
-$B$"$j$^$9!#(B
-
-@code{nnvirtual} $B$O%a!<%k$H%K%e!<%9$NN>J}$N%0%k!<%W$r9=@.%0%k!<%W$H$9$k(B
-$B;v$,$G$-$^$9!#(B@code{nnvirtual} $B%0%k!<%W$N5-;v$KJVEz$9$k$H$-$O!"(B
-@code{nnvirtual} $B$O5-;v$N=P=j$N9=@.%0%k!<%W$N%P%C%/%(%s%I$K$=$l$,%K%e!<(B
-$B%9$N%P%C%/%(%s%I$G$"$k$+%a!<%k$N%P%C%/%(%s%I$G$"$k$+$r?R$M$J$1$l$P$J$j$^(B
-$B$;$s!#$7$+$7!"(B@kbd{^} $B$r$7$?$H$-$K$O!"IaDL$O9=@.%P%C%/%(%s%I$,$3$l$rCN$k(B
-$B3N$+$JJ}K!$O$J$/!"$=$N>l9g$O!"(B@code{nnvirtual} $B$O(B gnus $B$K5-;v$O%K%e!<%9(B
-$B$G$J$$%P%C%/%(%s%I$+$iMh$?$H9p$2$k;v$K$J$j$^$9!#(B($B0BA4$N$?$a$K!#(B)
-
-$B$3$N$h$&$J>l9g$O!"%a%C%;!<%8%P%C%U%!$G$N(B @kbd{C-c C-n} $B$,1~Ez$7$h$&$H$7(B
-$B$F$$$k5-;v$+$i(B @code{Newsgroups} $B9T$rH4$-=P$7$FA^F~$7$^$9!#(B
-
-@code{nnvirtual} $B%0%k!<%W$O!"9=@.%0%k!<%W$+$i5-;v$H0u0J30$O7Q>5$7$^$;$s!#(B
-$BNc$($P%0%k!<%W%Q%i%a!<%?$b$=$&$J$N$G$9$,!"$=$l$i$O7Q>5$5$l$^$;$s!#(B
+@code{nnvirtual-always-rescan} $BJQ?t$,(B @code{nil} $B$G$J$1$l(B
+$B$P(B ($B$=$l!"$D$^$jHs(B-@code{nil} $B$,%G%#%U%)%k%H(B)$B!"(B@code{nnvirtual} $B$O2>A[%0(B
+$B%k!<%W$KF~$C$?$H$-$K>o$KL$FI5-;v$rAv::$7$^$9!#$3$NJQ?t$,(B @code{nil} $B$K$J$C(B
+$B$F$$$F!"2>A[%0%k!<%W$r:n$C$?8e$K9=@.MWAG$N%0%k!<%W$G5-;v$rFI$s$@>l9g$O!"(B
+$B$=$N9=@.MWAG$N%0%k!<%W$GFI$^$l$?5-;v$O!"2>A[%0%k!<%W$K8=$l$F$7$^$&$G$7$g(B
+$B$&!#6&DL$J9=@.MWAG$N%0%k!<%W$r;}$DFs$D$N2>A[%0%k!<%W$,$"$k>l9g$K$b!"$3$N(B
+$B1F6A$,$"$j$^$9!#$=$&$$$&>l9g$K$O!"$3$NJQ?t$r(B @code{t} $B$K$9$k$Y$-$G$9!#$5(B
+$B$b$J$1$l$P!"2>A[%0%k!<%W$KF~$kEY$K!"Kh2s$=$N2>A[%0%k!<%W$N>e(B
+$B$G(B @code{M-g} $B$rC!$$$F$bNI$$$G$7$g$&(B---$B$3$l$K$O$[$\F1MM$N8z2L$,$"$j$^$9!#(B
+
+@code{nnvirtual} $B$O%a!<%k$H%K%e!<%9$NN>J}$N%0%k!<%W$r9=@.MWAG$N%0%k!<%W(B
+$B$K$9$k$3$H$,$G$-$^$9!#(B@code{nnvirtual} $B%0%k!<%W$N5-;v$KJVEz$9$k$H$-$O!"(B
+@code{nnvirtual} $B$O5-;v$N=P=j$N9=@.MWAG$N%0%k!<%W$N%P%C%/%(%s%I$K!"$=$l(B
+$B$,%K%e!<%9$N%P%C%/%(%s%I$G$"$k$+%a!<%k$N%P%C%/%(%s%I$G$"$k$+$r?R$M$J$1$l(B
+$B$P$J$j$^$;$s!#$7$+$7(B @kbd{^} $B$r$7$?$H$-$K$O!"IaDL$O9=@.MWAG$N%P%C%/%(%s(B
+$B%I$,$3$l$rCN$k$?$a$N3Nl9g(B @code{nnvirtual} $B$O!"(B
+gnus $B$K5-;v$O%K%e!<%9$G$O$J$$%P%C%/%(%s%I$+$i$d$C$FMh$?$H9p$2$^$9!#(B($BC1$K(B
+$B$=$l$,0BA4$JB&$J$N$G!#(B)
+
+$B$3$l$i$N>l9g$K%a%C%;!<%8%P%C%U%!!<$G(B @kbd{C-c C-n} $B$r9T$J$&$H!"1~Ez$7$h(B
+$B$&$H$7$F$$$k5-;v$+$i(B @code{Newsgroups} $B9T$rH4$-=P$7$FA^F~$7$^$9!#(B
+
+@code{nnvirtual} $B%0%k!<%W$O!"5-;v$H0u0J30$O9=@.MWAG$N%0%k!<%W$+$i7Q>5$7(B
+$B$^$;$s(B---$BNc$($P%0%k!<%W%Q%i%a!<%?!<$b$=$&$J$N$G$9$,!"$=$l$i$O7Q>5$5$l$^(B
+$B$;$s!#(B
 
 @node Kibozed Groups
 @subsection Kiboze $B%0%k!<%W(B
 @cindex nnkiboze
 @cindex kibozing
 
-@dfn{Kiboze} $B$9$k!"$H$O!"(B``$B%K%e!<%9%9%W!<%kA4It(B ($B$"$k$$$O$=$N0lIt(B) $B$+(B
-$B$i(B grep $B$9$k$3$H(B'' $B$H(B @acronym{OED} ($B%*%C%/%9%U%)!<%IBg<-E5(B) $B$K$h$C$FDj(B
-$B5A$5$l$F$$$^$9!#(B@code{nnkiboze} $B$O$3$l$r$"$J$?$N$?$a$K9T$C$F$/$l$k%P%C%/(B
-$B%(%s%I$G$9!#4r$7$$$M(B! $B$3$l$G$I$s$J(B @acronym{NNTP} $B%5!<%P!<$G$b!"Lr$KN)$?(B
-$B$J$$MW5a$G;_$^$C$F$7$^$&$^$G9s;H$9$k$3$H$,$G$-$k$M!#$"$"!"$J$s$F9,$;$J$s(B
-$B$@(B!
+@acronym{OED} ($B%*%C%/%9%U%)!<%I1Q8lBg<-E5(B) $B$K$h$l$P!"(B@dfn{Kiboze} $B$9$k!"(B
+$B$H$O!"!V%K%e!<%9%9%W!<%kA4BN(B ($B$"$k$$$O$=$N0lIt(B) $B$r(B grep $B$9$k$3$H!W$HDj5A(B
+$B$5$l$F$$$^$9!#(B@code{nnkiboze} $B$O$3$l$r$"$J$?$N$?$a$K9T$J$C$F$/$l$k%P%C%/(B
+$B%(%s%I$G$9!#4r$7$$$J$"(B! $B$3$l$G$I$s$J(B @acronym{NNTP} $B%5!<%P!<$G$b!"MW$j$b(B
+$B$7$J$$8!:w$G;_$^$C$F$7$^$&$^$G9s;H$9$k$3$H$,$G$-$k$>!#$"$"!"$J$s$F9,$;$J(B
+$B$s$@(B!
 
 @kindex G k ($B%0%k!<%W(B)
-kiboze $B%0%k!<%W$r:n@.$9$k$K$O!"%0%k!<%W%P%C%U%!$G(B @kbd{G k} $BL?Na$r;H$$$^(B
-$B$9!#(B
+kiboze $B%0%k!<%W$r:n$k$K$O!"%0%k!<%W%P%C%U%!!<$G(B @kbd{G k} $BL?Na$r;H$C$F2<(B
+$B$5$$!#(B
 
 @code{nnkiboze} $BJ}K!$K$*$1$k%"%I%l%9Ms$O!"(B@code{nnvirtual} $B$HF1MM$K!"(B
-@code{nnkiboze} $B$K(B ``$B4^$a$?$$(B'' $B%0%k!<%W$K%^%C%A$9$k@55,I=8=$G$9!#$3$3(B
+@code{nnkiboze} $B$K!V4^$a$?$$!W%0%k!<%W$K9gCW$9$k@55,I=8=$G$9!#$3$3(B
 $B$,(B @code{nnkiboze} $B$H(B @code{nnvirtual} $B%P%C%/%(%s%I$N:G$bN`;w$7$F$$$kE@(B
 $B$G$9!#(B
 
-$B$3$N9=@.%0%k!<%W$rNs5s$9$k@55,I=8=$K2C$($F!"(B@code{nnkiboze} $B%0%k!<%W$K$O!"(B
-$B%0%k!<%WFb$N$I$N5-;v$r4^$a$k$+$r7h$a$k%9%3%"%U%!%$%k$,$J$/$F$O$J$j$^$;(B
-$B$s(B (@pxref{Scoring})$B!#(B
+$B9=@.MWAG$N%0%k!<%W$rNs5s$9$k$3$N@55,I=8=$K2C$($F!"(B@code{nnkiboze} $B%0%k!<(B
+$B%W$K$O!"%0%k!<%WFb$N$I$N5-;v$r4^$a$k$+$r7h$a$k%9%3%"%U%!%$%k$,$J$/$F$O$J(B
+$B$j$^$;$s(B (@pxref{Scoring})$B!#(B
 
 @kindex M-x nnkiboze-generate-groups
 @findex nnkiboze-generate-groups
-$B$"$J$?$NM_$7$$(B @code{nnkiboze} $B%0%k!<%W$r:n@.$7$?8e$K$O!"(B
+$B$"$J$?$,M_$7$$(B @code{nnkiboze} $B%0%k!<%W$r:n@.$7$?8e$G!"(B
 @kbd{M-x nnkiboze-generate-groups} $B$rpJs$r3JG<$9$k!"(B@file{.newsrc} $B$NJd=u%U%!(B
 $B%$%k$G$9!#(B
 
-@code{nnkiboze} $B%0%k!<%WFb$N4{FI$H$J$C$?5-;v$O!"$=$N5-;v(B
+$B4{FI$K$J$C$?(B @code{nnkiboze} $B%0%k!<%W$N5-;v$O!"$=$l$i$N5-;v(B
 $B$N(B @acronym{NOV} $B9T$,(B @acronym{NOV} $B%U%!%$%k$+$i:o=|$5$l$^$9!#(B
 
 @node Namazu Groups
@@ -16786,7 +17312,7 @@ Gnus $B$O$=$N(B @code{nnkiboze} $B%0%k!<%W$N0lIt$H$J$k$Y$-5-;v$,$"$k$+$I$&$+$
 $B$F$$$k>l9g$K$O!"FC$K!#$G$b!"BgDq$N>l9g!"2ACM$"$k5-;v$O$4$/>/?t$G!"$=$N(B
 $B5-;v$rBgNL$N5-;v$N;3$+$i8+$D$1=P$9$N$O!"$H$F$b:$Fq$J$3$H$G$9!#(B
 
-$B$3$&$$$C$?$3$H$3$=!"%3%s%T%e!<%?$,$7$F$/$l$k$Y$-;E;v$G$9$h$M!#(BGnus $B$O!"(B
+$B$3$&$$$C$?$3$H$3$=!"%3%s%T%e!<%?$,$7$F$/$l$k$Y$-;E;v$G$9$h$M!#(Bgnus $B$O!"(B
 Namazu $B$r;H$C$F!"%a!<%k$N;3$+$i$"$J$?$N9%$-$J%-!<%o!<%I$r4^$`5-;v$r8+(B
 $B$D$1=P$9J}K!$rDs6!$7$^$9!#(B
 
@@ -16805,33 +17331,33 @@ Namazu $B$r;H$C$F!"%a!<%k$N;3$+$i$"$J$?$N9%$-$J%-!<%o!<%I$r4^$`5-;v$r8+(B
 
 @findex gnus-namazu-create-index
 $BA[%0%k!<%W$r:n@.$7$^$9(B (@pxref{Virtual
 Groups})$B!#(B
 
-@kbd{C-c C-n}$B$K$h$C$F8F$S=P$5$l$kL?Na(B @code{gnus-namazu-search} $B$O!"(B
-gnus $B$NDL>o$N?t;z@\F,<-$d!"%W%m%;%9@\F,<-$rM}2r$7$^$9!#$G$9$+$i!"$"$J(B
-$B$?$,!"$"$k%0%k!<%W$@$1$rBP>]$H$7$F8!:w$ro$N?tCM@\F,0z?t$d!"%W%m%;%9@\F,0z?t$rM}2r$7$^$9!#$G$9$+$i!"$"(B
+$B$J$?$,!"$"$k%0%k!<%W$@$1$rBP>]$H$7$F8!:w$rl9g!"8!:w(B
+$B$^$?!"35N,%P%C%U%!!<$+$i!"$$$-$J$j8!:w$9$k$3$H$b$G$-$^$9!#$3$N>l9g!"8!:w(B
 $BBP>]$O!"<+F0E*$K$=$N%0%k!<%W$K8BDj$5$l$^$9!#Nc$($P!"$"$J$?$,$"$k%0%k!<(B
 $B%W$r1\MwCf$K!"$=$N%0%k!<%W$K$*$1$k<+J,$N2a5n$r?6$jJV$j$?$/$J$C$?$i!"o$N?t;z@\F,<-$d!"%W%m%;%9@\F,<-$rM}2r$7$^$9!#$G$9$+$i!"$"$J(B
 @end example
 
 @vindex gnus-namazu-index-update-interval
-Namazu $B$O!";vA0$K=`Hw$5$l$?:w0z$rMQ$$$F8!:w$r9T$&$h$&$K@_7W$5$l$?8!:w(B
+Namazu $B$O!";vA0$K=`Hw$5$l$?:w0z$rMQ$$$F8!:w$r9T$J$&$h$&$K@_7W$5$l$?8!:w(B
 $B%(%s%8%s$J$N$G!":w0z$KEPO?$5$l$F$$$J$$%U%!%$%k$O40A4$KL5;k$5$l$^$9!#$D(B
 $B$^$j!"Dj4|E*$K(B @code{mknmz} $B$r8F$S=P$7$F!"?7$?$J%a!<%k$N:w0z$rDI2C$7$J(B
 $B$$$H!"?7$7$$%a!<%k$O$$$D$^$G$?$C$F$b8!:wBP>]$K$J$i$J$$$3$H$K$J$j$^$9!#(B
 @file{gnus-namazu.el} $B$O!"(B@code{gnus-namazu-index-update-interval} $B$K(B
 $B;XDj$5$l$?4|4VKh$K<+F0E*$K:w0z$r99?7$9$k5!G=$rDs6!$7$F$$$^$9!#%G%#%U%)%k(B
 $B%H$N@_Dj$G$O!"(B3$BF|$*$-$K:w0z$r99?7$9$k$h$&$K$J$C$F$$$^$9$,!"$b$C$HIQHK(B
-$B$K(B ($BNc$($P(B1$BF|$*$-(B) $B$K99?7$9$k$h$&$K$7$?$$$J$i$P!"0J2<$N@_Dj(B
-$B$r(B @file{~/.gnus.el} $B$KDI2C$7$F$/$@$5$$!#(B
+$B$K(B ($BNc$($P(B 1$BF|$*$-(B) $B$K99?7$9$k$h$&$K$7$?$$$J$i$P!"0J2<$N@_Dj(B
+$B$r(B @file{~/.gnus.el} $B$KDI2C$7$F2<$5$$!#(B
 
 
 @example
 (setq gnus-namazu-index-update-interval 86400)
 @end example
 
-$B5U$K!":w0z$N99?7$r<+F0E*$K9T$$$?$/$J$$$J$i$P!"0J2<$N;XDj(B
-$B$r(B @file{~/.gnus.el} $B$KDI2C$7$F$/$@$5$$!#(B
+$B5U$K!":w0z$N99?7$r<+F0E*$K9T$J$$$?$/$J$$$J$i$P!"0J2<$N;XDj(B
+$B$r(B @file{~/.gnus.el} $B$KDI2C$7$F2<$5$$!#(B
 
 @example
 (setq gnus-namazu-index-update-interval nil)
@@ -16867,51 +17393,426 @@ Namazu $B$O!";vA0$K=`Hw$5$l$?:w0z$rMQ$$$F8!:w$r9T$&$h$&$K@_7W$5$l$?8!:w(B
 $B$3$N>l9g!":w0z$rO$G$O(B @code{nndiary} $B$H$$$&FCJL$J%a!<%k!&%P%C%/%(%s%I$H!"$=$NCg4V(B
+$B$N(B @code{gnus-diary} $B%i%$%V%i%j!<$K$D$$$F@bL@$7$^$9!#$=$l$,!VFCJL!W$J$N(B
+$B$O!"(Bgnus $B$G%a!<%k$rFI$`$?$a$NI8=`$NA*Br;h$N0l$D$G$"$k$D$b$j$OL5$$$+$i$G(B
+$B$9!#$=$l(B ($BI8=`$NA*Br;h(B) $B$K$D$$$F$O(B @ref{Choosing a Mail Back End} $B$r;2>H(B
+$B$7$F2<$5$$!#Be$o$j$K!"FCJL$JJ}K!$G$"$J$?$N%a!<%k$N(B @emph{ $B$$$/$D$+(B} $B$r07(B
+$B$&!"$9$J$o$A$3$l$O%j%^%$%s%@!<(B ($BM=Dj$r;W$$=P$5$;$k$b$N(B) $B$H$7$F;H$o$l$^$9!#(B
+
+$BE57?E*$J6Z=q$-$O!"$3$&$G$9!#(B
+
+@itemize @bullet
+@item
+$B$"$J$?$O%"%s%G%#!&%^%/%I%&%'%k$+%V%k!<%9!&%&%#%j%9(B ($B$"$J$?$N9%$_$K9g$o$;(B
+$B$F!"$I$A$i$+$rA*$s$G2<$5$$(B) $B$H!"0l%v7n8e$K%G!<%H$NLsB+$r$7$^$7$?!#$=$l$r(B
+$BK:$l$k$o$1$K$O$$$-$^$;$s!#(B
+@item
+$B$=$3$G!"<+J,08$F$K%j%^%$%s%@!<$N%a%C%;!<%8$r(B ($BK\Ev$KKhF|0lDL(B) $BAw$k$3$H$K(B
+$B$7$^$7$?!#(B
+@item
+$B$"$J$?$O$=$N$3$H$r$9$C$+$jK:$l$F!"$$$D$b$I$*$j$K?7$7$$%a!<%k$rC5n$N0u$,IU$$$F$$$l$P!"%a%C%;!<%8$O<+F0E*$K>C5n$5$l$^$9!#(B
+@end itemize
+
+gnus Diary $B%P%C%/%(%s%I$O!"(B($B>o$KC$5$l$k$3$H$,L5$$(B) $BDj4|E*$JM=Dj$r!"(B
+$BQ\D"LL$J?M$?$A$HF1$8$h$&$K07$&G=NO$r;}$C$F$$$F!"K\Ev$N%a!<%k!&%P%C%/%(%s(B
+$B%I$N$h$&$KF0:n$7!"$$$m$s$J$d$jJ}$G@_Dj$9$k$3$H$,$G$-$^$9!#$3$N$9$Y$F$,!"(B
+$B0J2<$N3F>O$G@bL@$5$l$F$$$^$9!#(B
+
+@menu
+* The NNDiary Back End::        $B4pK\E*$J@_Dj$H;H$$J}(B
+* The Gnus Diary Library::      nndiary $B$N>e0L3,AX$K$"$k} $B$N(B
+$BMM<0$GI=$5$l!"(B@code{} $B$NItJ,$O(B @code{Minute}, @code{Hour},
+@code{Dom}, @code{Month}, @code{Year}, @code{Time-Zone} $B$*$h(B
+$B$S(B @code{Dow} $B$N$&$A$N0l$D$G$9!#(B@code{Dom} $B$O!VF|(B (Day of Month)$B!W$r!"(B
+@code{Dow} $B$O!VMKF|(B (Day ofWeek)$B!W$r0UL#$7$^$9!#$3$l$i$N%X%C%@!<(B
+$B$O(B crontab $B$N@_Dj$N$h$&$KF/$$$F!"M=DjF|$rDj5A$7$^$9!#(B
+
+@itemize @bullet
+@item
+@code{Time-Zone} $B$N$b$N0J30$N$9$Y$F$N%X%C%@!<$K$D$$$F!"%X%C%@!<$NCM$O@1(B
+$B0u(B ($B2DG=$J$9$Y$F$NCM$r0UL#$7$^$9(B) $B$+%3%s%^$G6h@Z$i$l$?%U%#!<%k%I$N%j%9%H(B
+$B$G$9!#(B
+@item
+$B%U%#!<%k%I$O@0?t$+HO0O$N$I$A$i$+$G$9!#(B
+@item
+$BHO0O$H$O!"%@%C%7%e(B (-) $B$G6h@Z$i$l$?Fs$D$N@0?t$G$9!#(B
+@item
+$B2DG=$JCM$O!"$=$l$>$l(B @code{Minute} $B$K$O(B 0--59$B!"(B@code{Hour} $B$K$O(B 0--23$B!"(B
+@code{Dom} $B$K$O(B 1--31$B!"(B@code{Month} $B$K$O(B 1--12$B!"(B@code{Year} $B$K$O(B 1971 $B$h(B
+$B$jBg$-$$CM!"$=$7$F(B @code{Dow} $B$K$O(B 0--6 (0 $B$,F|MKF|(B) $B$G$9!#(B
+@item
+$BFCJL$J>l9g$H$7$F!"(B@code{Dom} $B$^$?$O(B @code{Dow} $B$N$I$A$i$+0lJ}$K$*$1$k@1(B
+$B0u$O!V2DG=$J$9$Y$F$NCM!W$G$O$J$/!"!V$b$&0lJ}$N%U%#!<%k%I$@$1$r;H$&!W0UL#(B
+$B$K$J$j$^$9!#N>J}$H$b@10u$K$7$?>l9g$O!"$I$A$i$r;H$C$F$bF1$87k2L$K$J$k$3$H(B
+$B$KCm0U$7$F2<$5$$!#(B
+@item
+@code{Time-Zone} $B%X%C%@!<$O!"CM$r0l$D$7$+;}$F$J$$(B ($BNc$($P(B @code{GMT}) $BE@(B
+$B$GFCJL$G$9!#@10u$O!V2DG=$J$9$Y$F$NCM!W$G$O$J$/(B ($B$=$l$O0UL#$r$J$5$J$$$N$G(B)$B!"(B
+$B!V8=:_$N%m!<%+%k$J%?%$%`%>!<%s!W$r0UL#$7$^$9!#$3$3$G$O$?$$$F$$@10u$r;H$&(B
+$B$G$7$g$&!#$7$+$7!"MxMQ$G$-$k%?%$%`%>!<%s$NCM$K$D$$$F$O!"JQ(B
+$B?t(B @code{nndiary-headers} $B$r8+$F2<$5$$!#(B
+@end itemize
+
+1999$BG/$+$i(B 2010$BG/$^$G$NKh=57nMKF|$HKh7n$N0lF|$N(B 12:00, 20:00, 21:00,
+22:00, 23:00 $B$*$h$S(B 24:00 $B$r@_Dj$9$k$?$a$K!"%a%C%;!<%8$K2C$($kF|Dx%X%C%@!<(B
+$B$N6qBNNc$G$9(B ($B$=$N;~2?$r$7$?$iNI$$$+$O!"<+J,$G9M$($F2<$5$$(B):
+
+@example
+X-Diary-Minute: 0
+X-Diary-Hour: 12, 20-24
+X-Diary-Dom: 1
+X-Diary-Month: *
+X-Diary-Year: 1999-2010
+X-Diary-Dow: 1
+X-Diary-Time-Zone: *
+@end example
+
+@node Running NNDiary
+@subsubsection NNDiary $B$rF0$+$9(B
+@cindex running nndiary
+@cindex nndiary operation modes
+
+@code{nndiary} $B$K$OFs$D$NF0:n%b!<%I$,$"$j$^$9!#0l$D$O%G%#%U%)%k%H$N(B
+$B!VEAE}7?(B (traditional)$B!W!"$b$&0l$D$O!V<+N'7?(B (autonomous)$B!W$G$9!#EAE}7?(B
+$B$N%b!<%I$G$O!"(B@code{nndiary} $B$O$=$l<+?H$,?7Ce%a!<%k$r@\(B
+$BAw$C$F!"$=$l$i$rC$9$k$3$H$r4j$$$^$9$,(B)$B!"<+N'7?$N%b!<%I$G$O:F%9%W!<%k(B
+$B$,$G$-$^$;$s!#(B
+
+$B<+N'7?$N%b!<%I$G(B @code{nndiary} $B$r;H$&$?$a$K$O!"$$$/$D$+$N$3$H$r$d$C$F$b(B
+$B$i$o$J$1$l$P$J$j$^$;$s(B:
+
+@itemize @bullet
+@item
+$B?7Ce%a!<%k$r(B @code{nndiary} $B$,<+J,$GA[%5!<%P!<(B (@code{(nndiary "diary")} $B$,9T$J$&$Y$-$G(B
+$B$"$k$h$&$J$b$N(B) $B$rDI2C$7$F$bNI$$$G$7$g$&!#(B
+
+$B$&$^$/$$$1$P!"(Bgnus $B$r:F5/F0$9$k$H!"$[$H$s$I$9$Y(B
+$B$F(B (@file{nndiary.el} $B$N(B TODO $B$N9`$r;2>H(B) $B$,4|BTDL$j$KF0:n$9$k$G$7$g$&!#(B
+$B<+N'7?$N%b!<%I$G$O!"(B@kbd{g} $B$d(B @kbd{M-g} $B$r%0%k!<%W%P%C%U%!!<$G%?%$%W$9(B
+$B$l$P?7$7$$F|Dx%a!<%k$r$b$C$F$=$l$i$r(B
+$BJ,3d$9$k$7!"(B@kbd{F} $B$O?7$7$$F|Dx%0%k!<%W$r8+$D$1$F$/$l$k!"$J$I!#(B
+
+@node Customizing NNDiary
+@subsubsection NNDiary $B$N%+%9%?%^%$%:(B
+@cindex customizing nndiary
+@cindex nndiary customization
+
+$B$5$"(B @code{nndiary} $B$,N)$A>e$,$C$FF0:n$7$F$$$^$9!#$=$l$r%+%9%?%^%$%:$9$k(B
+$B$H$-$,Mh$^$7$?!#%+%9%?%^%$%:$9$k$?$a$N%0%k!<%W$O(B @code{nndiary} $B$G$9(B ($B$X(B
+$B$(!<(B)$B!#$I$N%*%W%7%g%s$r%+%9%?%^%$%:$7E]$7$?$$$+$r8+$D$1$k$?$a$K!"$=$l$K(B
+$BL\$rDL$7$F2<$5$$!#$"$J$?$,JQ99$7$?$$$N$O!"$*$=$i$/0J2<$N$?$C$?Fs$D$NJQ?t(B
+$B$G$7$g$&(B:
+
+@defvar nndiary-reminders
+$BM=Dj$r;W$$=P$5$;$F$b$i$$$?$$;~9o$N%j%9%H(B ($BNc$($P;0=54VA0!"$=$l$+$iFsF|A0!"(B
+$B$=$l$+$i0l;~4VA0!"$=$7$F$=$N$H$-(B) $B$G$9!#!V;W$$=P$5$;$F$b$i$&!W$N0UL#$O!"(B
+$B?7Ce%a!<%k$rDj$5$l$^$9(B ($B$=$l$,%G%#%U%)%k%H$G$9(B)$B!#(B
+@end defvar
+
+@node The Gnus Diary Library
+@subsection Gnus Diary $B%i%$%V%i%j!<(B
+@cindex gnus-diary
+@cindex the gnus diary library
+
+@code{nndiary} $B$re0L3,AX$K=q$+$l(B
+$B$?(B @code{gnus-diary} $B$H$$$&%i%$%V%i%j!<$,$"$C$F!"$?$/$5$s$NJXMx$J$3$H$r(B
+$B$d$C$F$/$l$^$9!#(B
+
+$B$=$l$r;H$&$?$a$K$O!"0J2<$N9T$r(B @file{~/.gnus.el} $B%U%!%$%k$K2C$($F2<$5$$(B:
+
+@lisp
+(require 'gnus-diary)
+@end lisp
+
+$B$5$i$K!"$I$s$J(B @code{gnus-user-format-function-[d|D]} (@pxref{Summary
+Buffer Lines}) $B$b!";H$C$F$O$$$1$^$;$s!#(B@code{gnus-diary} $B$O$=$l$i$NN>J}(B
+$B$rDs6!$7$^$9(B ($B$"$J$?$,$=$l$i$r;H$C$F$$$?$i!"$9$_$^$;$s(B)$B!#(B
+
+@menu
+* Diary Summary Line Format::   $B$h$jNI$$35N,9T;EMM(B
+* Diary Articles Sorting::      $B%a%C%;!<%8$rJB$YBX$($k5$$NMx$$$?J}K!(B
+* Diary Headers Generation::    $Bo(B @samp{From Joe: Subject} $B$N$h$&$J$b$N(B) $B$GF|Dx%a%C(B
+$B%;!<%8$rI=<($9$k$N$O!"$^$C$?$/Lr$KN)$A$^$;$s!#$?$$$F$$$O$"$J$?$,%a%C%;!<(B
+$B%8$r=q$$$??M$G!"$*$*$+$?M=Dj$NF|IU$r8+$?$$$H;W$C$F$$$k$G$7$g$&!#(B
+
+@code{gnus-diary} $B$O!"35N,9T;EMM$G;H$&Fs$D$NDI2C$NMxMQC$5$l$J$$$3$H$r=|$$$F!"%a%C%;!<%8$,4|8B@Z$l>C5n2DG=$G$"$k$3$H$K5$$r(B
+$BIU$1$F2<$5$$(B):
+
+@example
+   E  Sat, Sep 22 01, 12:00: Joe's birthday (in 6 months, 1 week)
+@end example
+
+$B>e5-$N$h$&$J$b$N$rF@$k$?$a$K!"IaCJ$@$C$?$i!"$"$J$?$O0J2<$N9T$rF|Dx%0%k!<(B
+$B%W$N%Q%i%a!<%?!<$K2C$($h$&$H$9$k$G$7$g$&(B:
+
+@lisp
+(gnus-summary-line-format "%U%R%z %uD: %(%s%) (%ud)\n")
+@end lisp
+
+$B$7$+$7(B @code{gnus-diary} $B$O$=$l$r<+F0$G9T$J$$$^$9(B (@pxref{Diary Group
+Parameters})$B!#$=$l$G$b$"$J$?$O!"0J2<$N%f!<%6!\:Y$OJQ?t$N@bL@J8$r8+$F2<$5$$!#(B
+@end defvar
+
+@defvar gnus-diary-delay-format-function
+$BF|Dx$N35N,%P%C%U%!!<$KCY1d(B ($B;D$j;~4V(B) $B$rI=<($9$k$?$a$N@07A4X?t$rDj5A$7$^(B
+$B$9!#$3$l$OMxMQ\:Y$OJQ?t(B
+$B$N@bL@J8$r8+$F2<$5$$!#(B
+@end defvar
+
+@node Diary Articles Sorting
+@subsubsection $BF|Dx5-;v$NJB$YBX$((B
+@cindex diary articles sorting
+@cindex diary summary lines sorting
+@findex gnus-summary-sort-by-schedule
+@findex gnus-thread-sort-by-schedule
+@findex gnus-article-sort-by-schedule
+
+@code{gnus-diary} $B$OJB$YBX$((B (@pxref{Sorting the Summary Buffer}) $B$N$?$a(B
+$B$K(B @code{gnus-summary-sort-by-schedule}$B!"(B
+@code{gnus-thread-sort-by-schedule} $B$*$h(B
+$B$S(B @code{gnus-article-sort-by-schedule} $B$H$$$&?7$7$$4X?t$rDs6!$7$^$9!#$3(B
+$B$l$i$N4X?t$K$h$C$F!":G$b6a$$M=Dj$+$i:G$b1s$$J}$^$G!"F|Dx$N35N,%P%C%U%!!<(B
+$B$r@0M}$9$k$3$H$,$G$-$^$9!#(B
+
+@code{gnus-diary} $B$O<+F0E*$K35N,%P%C%U%!!<$N!VJB$YBX$((B (sort)$B!W%a%K%e!<(B
+$B$K(B @code{gnus-summary-sort-by-schedule} $B$rAH$_9~$_!"B>$NFs$D$rBh0lo$N%a!<%k$rF|DxMQ$N$b$N$KJQ49$9(B
+$B$kA`:n$r4JC1$K$9$k$?$a$K!"(B
+@code{message-mode} $B$H(B @code{article-edit-mode} $B$K$*$$(B
+$B$F(B @kbd{C-c D c} $B%-!<$H$7$F@_Dj$b$5$l$F$$$^$9!#(B
+
+$B@\F,0z?t$rH<$C$F$3$N4X?t$r8F$V$H!"$=$l$i$,$"$k$+!"@5$7$$$+$I$&$+$H$OL54X(B
+$B78$K!"F|Dx%X%C%@!<$NF~NO$r6/@)$7$^$9!#$=$&$d$C$F!"Nc$($P$9$G$K@5$7$/@_Dj(B
+$B$5$l$?%a%C%;!<%8$NF|Dx$r!"$H$F$b4JC1$KJQ99$9$k$3$H$,$G$-$^$9!#(B
+
+@node Diary Group Parameters
+@subsubsection $BF|Dx%0%k!<%W$N%Q%i%a!<%?!<(B
+@cindex diary group parameters
+
+$B?7$7$$F|Dx%0%k!<%W$r:n$k$+!"$^$?$O$=$l$r3+$/$H!"(B@code{gnus-diary} $B$O<+F0(B
+$BE*$K%0%k!<%W%Q%i%a!<%?!<$r8!::$7!"I,MW$J$i35N,9T;EMM$rF|DxMQ$KFC2=$7$?CM(B
+$B$K@_Dj$7!"F|DxMQ$NJB$YBX$(4X?t$rAH$_9~$_!"$5$i$K$=$N%0%k!<%W$NEj9FMM(B
+$B<0(B (posting-style) $B$Ke$N@bL@$rFI$s$G$/$l$?$b$N$H$7$F!"0J2<$O(B @code{nndiary} $B$G%a!<%k(B
+$B$rAw?.$9$k$3$H$K4X$9$k!"Fs$D$N:G8e$NCm0U;v9`$G$9(B:
+
+@itemize @bullet
+@item
+@code{nndiary} $B$O(B @emph{$BK\Ev$N(B} $B%a!<%k!&%P%C%/%(%s%I$G$9!#K\Ev$K$"$J$?$O(B
+$BK\Ev$NF|Dx%a%C%;!<%8$rK\Ev$KAw$j$^$9!#$3$l$O!"F|Dx%a%C%;!<%8$rAw$k$3$H$K(B
+$B$h$C$F!"C/$K$G$b(B ($BH`$i$,(B gnus $B$H(B @code{nndiary} $B$r;H$C$F$$$k$N$J$i$P(B) $BM=(B
+$BDj$rEA$($k$3$H$,$G$-$k$3$H$r$b0UL#$7$^$9!#(B
+@item
+$B$7$+$7$J$,$i(B @code{nndiary} $B$O(B @code{request-post} $B%a%=%C%I$r;}$C$F$b$$(B
+$B$k$N$G!"F|Dx%0%k!<%W$G(B @kbd{C-u m} $B$NBe$o$j$K(B @kbd{C-u a} $B$r;H$&$3$H$K$h$C(B
+$B$F!"%a%C%;!<%8$re$G%M%C%H%o!<%/$K1JB3E*$K@\B3$7$FAv$i$;$F$$$^$7$?!#%K%e!<%9$NG[Aw(B
-$B$O%K%e!<%9%5!<%P!<$K$h$C$Fo;~@\B3$7$?Bg$-$J%^%7%s$GAv$i$;$F$$$^$7$?!#%K%e!<%9$NG[Aw$O%K%e!<%9(B
+$B%5!<%P!<$K$h$C$Fe$i$J$$$h$&$K!"(B
-$BA4$F$N%K%e!<%9$H%a!<%k$r5[$$>e$2!"EEOC$r@Z$j!"?t;~4V3]$1$FFI$_!"$=$7$FAw(B
-$B$j$?$$JV?.$rA4$FAw?.$9$k!"$H$$$&e$i$J$$$h$&$K!"(B
+$B$9$Y$F$N%K%e!<%9$H%a!<%k$r$9$9$j9~$s$GEEOC$r@Z$j!"?t;~4V$+$1$FFI$s$G$+$i(B
+$BAw$j$?$$JV?.$r$9$Y$FAw?.$9$k!"$H$$$&O$NA0?H$O(B 1997$BG/:"$K=q$+$l$^$7(B
+$B$?!#(B)
 
-$B$b$A$m$s!"$3$l$r9T$&$?$a$K%K%e!<%9%5!<%P!<$r;H$&$3$H$b$G$-$^$9!#;d(B
+$B$b$A$m$s!"$3$l$r9T$J$&$?$a$K%K%e!<%9%5!<%P!<$r;H$&$3$H$b$G$-$^$9!#;d(B
 $B$O(B @code{inn} $B$r(B @code{slurp}, @code{pop}, @code{sendmail} $B$H0l=o$K$3$3(B
 $B?tG/;H$C$F$-$^$7$?$,!"$7$+$7$3$l$OB`6~$J;E;v$G$9!#$b$7$"$k%^%7%s>e$G%K%e!<(B
 $B%9$rFI$`?M$,$"$J$?$7$+$$$J$1$l$P!"%K%e!<%9%5!<%P!<$N5!G=$r%K%e!<%9%j!<%@!<(B
 $B$KG$$;$k$h$&$K$9$k$3$H$OM}$K$+$J$C$F$$$^$9!#(B
 
-Gnus $B$r(B ``$B%*%U%i%$%s(B'' $B$N%K%e!<%9%j!<%@!<$H$7$F;EN)$F$k$N$O6K$a$F4JC1$G(B
-$B$9!#C$9J}K!(B
+* Agent Expiry::                $B8E$$5-;v$rDI$$J'$&J}K!(B
 * Agent Regeneration::          $BDL?.@ZCG$dB>$N;v8N$+$i2sI|$9$kJ}K!(B
+* Agent and flags::             $B%(!<%8%'%s%H$O$I$&%U%i%0$r0];}$9$k$N$+(B
 * Agent and IMAP::              $B%(!<%8%'%s%H$r(B @acronym{IMAP} $B$G;H$&J}K!(B
-* Outgoing Messages::           $BEj9F!"%a!<%k$r=P$9$H$-$K$J$K$,5/$3$k$N$+(B?
+* Outgoing Messages::           $B%K%e!<%9$d%a!<%k$r=P$9$H$-$K$J$K$,5/$3$k$N$+(B?
 * Agent Variables::             $B%+%9%?%^%$%:$O3Z$7(B
 * Example Setup::               $B%*%U%i%$%s?M4V$N$?$a$N(B @file{~/.gnus.el} $B$NNc(B
-* Batching Agents::             @code{cron} $B%8%g%V$K$h$k%K%e!<%9$N%K%e!<%9%j!<%@!<$OM-L5$r8@$o$:$"$J$?$K%I%8$rF'$^$;$k$+$b$7$l$^(B
-$B$;$s$,!"(Bgnus $B$G$O$"$J$?$KA*Br8"$,$"$j$^$9(B!
+$B=@Fp@-$H8@$&?M$b$$$^$9!#$5$i$K(B gnus $B$OBg$$$K%+%9%?%^%$%:2DG=$G!"$=$l$OMx(B
+$BMQ$N%K%e!<%9%j!<%@!<$OM-L5$r8@$o$:$"$J$?$K%I%8$rF'$^$;$k$+$b$7$l(B
+$B$^$;$s$,!"(Bgnus $B$G$O$"$J$?$KA*Br8"$,$"$j$^$9(B!
 
-Gnus $B$OuBV$K$b$"$j$^$;$s!#(B
+gnus $B$OuBV$K$b$"$j$^$;$s!#(B
 $B$b$C$H@53N$K8@$($P!"%5!<%P!<$4$H$K$=$l$>$l$N>uBV$r;}$A$^$9!#$3$l$O!"$$$/(B
-$B$D$+$N%5!<%P!<$,@\B3$G$-$J$$$H$-$K!"B>$N%5!<%P!<$O@\B3$G$-$k$3$H$r0UL#$7(B
-$B$^$9!#$5$i$K!"(B Agent $B$K$h$C$F$$$/$D$+$N%5!<%P!<$r$9$Y$FL5;k$9$k$3$H$,$G(B
-$B$-$^$9(B ($B$=$N0UL#$O!"$=$l$i$,$$$D$b(B plugged $B$K$J$C$F$$$k$N$H;w$F$$$k$H$$(B
-$B$&$3$H$G$9(B)$B!#(B
+$B$D$+$N%5!<%P!<$,(B unplugged $B$G$b!"B>$N%5!<%P!<$O(B plugged $B$K$J$k$3$H$,$G$-(B
+$B$k$H$$$&$3$H$G$9!#$5$i$K!"%(!<%8%'%s%H$,$$$/$D$+$N%5!<%P!<$r$^$H$a$FL5;k(B
+$B$9$k(B ($B$=$l$i$r>o$K(B plugged $B$K$J$C$F$$$k$h$&$K8+$;$+$1$k(B) $B$h$&$K$b$G$-$^(B
+$B$9!#(B
 
-Agent $B$r@Z$jN%$7$F$b!"$J$<(B gnus $B$,%M%C%H$K@\B3$7$F$$$k$N$+$,$$$V$+$7$/;W(B
-$B$o$l$?$H$-!"9T$&$Y$-uBV$O(B @dfn{offline} $B$G$9!#%5!<%P!<$O$H$-$I$-E~C#2DG=$G$O$J$/(B
-$B$J$j$^$9!#(BGnus $B$,$3$N$3$H$rCN$k$H!"$=$N%5!<%P!<$r(B offline $B$N>uBV$K@Z$j49(B
-$B$($F$bNI$$$+$I$&$+$r?R$M$^$9!#$O$$!"$HEz$($?$J$i$P!"(B(offline $B$KLa$7$FNI(B
-$B$$$+$H(B gnus $B$,?R$M$?>l9g0J30$O(B) $B%5!<%P!<$OB?>/(B unplugged $B$@$C$?$H$-$N$h(B
-$B$&$K?6$kIq$$$^$9!#(B
+$B$b$&0l$D$O!V%*%U%i%$%s!W$H$$$&>uBV$G$9!#%5!<%P!<$O$H$-$I$-@\B3$G$-$J$/$J(B
+$B$j$^$9!#(Bgnus $B$,$3$N$3$H$K5$IU$/$H!"$=$N%5!<%P!<$r%*%U%i%$%s$N>uBV$K@Z$j(B
+$B49$($F$bNI$$$+$I$&$+$r?R$M$^$9!#(BYes $B$HEz$($?$J$i$P(B ($B%*%s%i%$%s$KLa$7$FNI(B
+$B$$$+$H(B gnus $B$,?R$M$?>l9g0J30$O(B)$B!"%5!<%P!<$O$$$/$i$+(B unplugged $B$@$C$?$H$-(B
+$B$N$h$&$K?6$kIq$$$^$9!#(B
 
-$B%(!<%8%'%s%H$r;H$C$?E57?E*$J(B gnus $B$NBPOCA`:n$r8+$F$_$^$7$g$&!#(B
+$B%(!<%8%'%s%H$r;H$C$?E57?E*$J(B gnus $B$NBPOCA`:n$r8+$F$_$^$7$g$&(B:
 
 @itemize @bullet
-
 @item
 @findex gnus-unplugged
-Gnus $B$r(B @code{gnus-unplugged} $B$G5/F0$7$^$9!#$3$l$O(B gnus $B%(!<%8%'%s%H$r@Z(B
-$B$jN%$5$l$F$$$k>uBV$G5/F0$7$^$9!#$3$N>uBV$G$O!"$9$G$Ke$2$^$9!#$3$N%b!<%I$G$O!"$9$G$KH$7$F2<$5$$!#(B
+$BH$7$F2<$5$$!#(B
 
 @item
-$B$=$7$F!"$=$N>l$G$9$0$K?7$7$$%K%e!<%9$rFI$`$3$H$b$G$-$^$9$7!"%K%e!<%9$r%m!<(B
-$B%+%k%^%7%s$K%@%&%s%m!<%I$9$k$3$H$b$G$-$^$9!#8eH$7$F$/$@$5$$!#(B)
+$B$=$&$9$l$P!"D>$A$K?7$7$$%K%e!<%9$rFI$`$3$H$b$G$-$k$7!"%K%e!<%9$r%m!<%+%k(B
+$B%^%7%s$K%@%&%s%m!<%I$9$k$3$H$b$G$-$^$9!#8er7o$K9gCW$9(B
+$B$k(B) $B5-;v$rH$7$F2<$5$$!#(B)
 
 @item
-$B5-;v$ruBV$K$5$;!"(B
-PPP $B4X78(B($B$J$I(B)$B$rJD$8$^$9!#$=$&$7$F%K%e!<%9$r%*%U%i%$%s$GFI$`$3$H$,$G$-$^(B
-$B$9!#(B
+$B5-;v$rJ}$O!"B??t$N%0%k!<%W$KE,MQ$9$kJ}?K$N@_(B
-$BDj$rMQ0U$7$F$$$^$9!#$I$l$r;H$&$+$O40A4$K$"$J$?$N@UG$$G$9!#N>J}$r:.$<$F;H(B
-$B$&>l9g$O!"%H%T%C%/%Q%i%a!<%?$OJ,N`$rL58z$K$9$k$3$H$r9MN8$KF~$l$J$1$l$P$J(B
-$B$i$J$$$G$7$g$&!#$"$J$?$NJ}?K$K$=$0$o$J$$>/?t$N%0%k!<%W$,$"$k$N$J$i$P!"$=(B
-$B$l$i$N@_Dj$rJQ99$9$k$?$a$K%0%k!<%W%Q%i%a!<(B
-$B%?(B (@pxref{Group Parameters}) $B$r;H$&$3$H$,$G$-$^$9!#(B
+$B%H%T%C%/%Q%i%a!<%?!<(B (@pxref{Topic Parameters}) $B$H%(!<%8%'%s%HJ,(B
+$BN`(B (@pxref{Agent Categories}) $B$NN>J}$H$b!"B??t$N%0%k!<%W$KE,MQ$9$kJ}?K$N(B
+$B@_Dj$rMQ0U$7$F$$$^$9!#$I$l$r;H$&$+$O40A4$K$"$J$?$N@UG$$G$9!#N>J}$r:.$<$F(B
+$B;H$&>l9g$O!"%H%T%C%/%Q%i%a!<%?!<$OJ,N`$rL58z$K$9$k$3$H$r9MN8$KF~$l$J$1$l(B
+$B$P$J$i$J$$$G$7$g$&!#$"$J$?$NJ}?K$K$=$0$o$J$$>/?t$N%0%k!<%W$,$"$k$N$J$i$P!"(B
+$B$=$l$i$N@_Dj$rJQ99$9$k$?$a$K%0%k!<%W%Q%i%a!<(B
+$B%?!<(B (@pxref{Group Parameters}) $B$r;H$&$3$H$,$G$-$^$9!#(B
 
 @item
 $B$($($H(B@dots{}$B!"0J>e$G$9!#(B
@@ -17028,32 +17926,32 @@ Commands}) $B$+!"$^$?$O%(!<%8%'%s%H$K07$C$FM_$7$/$J$$$N$K<+F0E*$KDI2C$5$l(B
 @node Agent Categories
 @subsection $B%(!<%8%'%s%HJ,N`(B
 
-$B%K%e!<%9G[Aw5!9=$H%K%e!<%9%j!<%@!<$rE}9g$9$k0l$D$NBg$-$JM}M3$O!"$I$N5-;v(B
-$B$r%@%&%s%m!<%I$9$k$+$K$D$$$F!"$h$jNI$$@)8f$r2DG=$H$9$k$3$H$G$9!#G|Bg$JNL(B
-$B$N5-;v$r%@%&%s%m!<%I$7$F$b$"$^$j0UL#$O$J$/!"$=$l$i$rFI$s$G$b$"$^$jLLGr$/(B
-$B$J$$$3$H$,J,$+$k$@$1$G$9!#2?$r%@%&%s%m!<%I$9$k$+$NA*Br$O$b$C$H?5=E$G$"$k(B
-$B$Y$-$G$"$j!"$=$N5-;v$,LLGr$$$HJ,$+$C$?;~E@$G!"%@%&%s%m!<%I$9$k$?$a$N0u$r(B
-$B/$7J]$NJ,N`$KB0$5$J$$%0%k!<%W(B
-$B$O(B @code{$B=i4|(B} $BJ,N`$KB0$7$^$9!#(BGnus $B$OJ,N`$N:n@.$H4IM}$N$?$a$NFH<+$N%P%C(B
-$B%U%!!<$r;}$C$F$$$^$9!#(B
-
-$B$b$7$=$&$7$?$1$l$P!"%0%k!<%W%Q%i%a!<%?(B (@pxref{Group Parameters}) $B$H%H%T%C(B
-$B%/%Q%i%a!<%?(B (@pxref{Topic Parameters}) $B$r!"%(!<%8%'%s%H$r@)8f$9$kBeBXl=j$G@_Dj$9$k$3$H$,$G$-$k$N$G!"$I$N%=!<(B
-$B%9$,?.MQ$G$-$k$+$r7h$a$k$?$a$N5,B'$r@_$1$^$7$?!#$3$N5,B'$O!"%Q%i%a!<%?$N(B
-$B%=!<%9$,l=j$G@_Dj$9$k$3$H$,$G$-$k$N$G!"$I$N(B
+$B%=!<%9$,?.MQ$G$-$k$+$r7h$a$k$?$a$N5,B'$r@_$1$^$7$?!#$3$N5,B'$O!"%Q%i%a!<(B
+$B%?!<$N%=!<%9$,A0!"$=$NJ,N`$KB0$9$k%0%k!<%W$N%j%9%H!"$*$h$S%+%9%?%^%$%:2DG=$J(B
-$BJQ?t$r>e=q$-$9$kB?$/$NG$0U$J%Q%i%a!<%?$+$i@.$j$^$9!#%(!<%8%'%s%H%Q%i%a!<(B
-$B%?$N40A4$J%j%9%H$r0J2<$K<($7$^$9!#(B
+$BJQ?t$h$j$bM%@h$5$l$kB?$/$NG$0U$J%Q%i%a!<%?!<$+$i@.$j$^$9!#%(!<%8%'%s%H%Q(B
+$B%i%a!<%?!<$N40A4$J%j%9%H$r0J2<$K<($7$^$9!#(B
 
 @cindex Agent Parameters
 @table @code
-@item agent-cat-name
-$BJ,N`$NL>A0!#(B
-
 @item agent-groups
 $B$3$NJ,N`$K$"$k%0%k!<%W$N%j%9%H!#(B
 
@@ -17080,10 +17975,10 @@ Commands}) $B$+!"$^$?$O%(!<%8%'%s%H$K07$C$FM_$7$/$J$$$N$K<+F0E*$KDI2C$5$l(B
 ($BDL>o(B) $B$I$N5-;v$r%@%&%s%m!<%I$9$k$N$,E,Ev$+$H$$$&Bg$^$+$JNX3T$rM?$($k=R(B
 $B8l!#$=$7$F(B
 
-@item agent-score-file
+@item agent-score
 ($BDL>o(B) $B$I$N5-;v$r%@%&%s%m!<%I$9$k$+$r7h$a$k$H$-$N$h$j$-$a$N:Y$+$$%9%3%"(B
 $B5,B'!#(B($B$3$N%@%&%s%m!<%I%9%3%"(B (@dfn{download score}) $B$ODL>o$N%9%3%"$H$O(B
-$BI,$:$7$b4X78$,L5$$$3$H$KCm0U$7$F$/$@$5$$!#(B)
+$BI,$:$7$b4X78$,L5$$$3$H$KCm0U$7$F2<$5$$!#(B)
 
 @item agent-enable-expiration
 $B$3$N%0%k!<%W$N8E$$5-;v$r%(!<%8%'%s%H$,4|8B@Z$l>C5n$9$Y$-$+$I$&$+$r<($9(B
@@ -17096,55 +17991,56 @@ Commands}) $B$+!"$^$?$O%(!<%8%'%s%H$K07$C$FM_$7$/$J$$$N$K<+F0E*$KDI2C$5$l(B
 $B%H$,BT$C$F$$$k$Y$-F|?t$r<($9@0?t!#(B
 
 @item agent-low-score
-@code{gnus-agent-low-score} $B$r>e=q$-$9$k@0?t!#(B
+@code{gnus-agent-low-score} $B$h$j$bM%@h$5$l$k@0?t!#(B
 
 @item agent-high-score
-@code{gnus-agent-high-score} $B$r>e=q$-$9$k@0?t!#(B
+@code{gnus-agent-high-score} $B$h$j$bM%@h$5$l$k@0?t!#(B
 
-@item agent-length-when-short
-@code{gnus-agent-short-article} $B$r>e=q$-$9$k@0?t!#(B
+@item agent-short-article
+@code{gnus-agent-short-article} $B$h$j$bM%@h$5$l$k@0?t!#(B
 
-@item agent-length-when-long
-@code{gnus-agent-long-article} $B$r>e=q$-$9$k@0?t!#(B
+@item agent-long-article
+@code{gnus-agent-long-article} $B$h$j$bM%@h$5$l$k@0?t!#(B
 
 @item agent-enable-undownloaded-faces
 $B%@%&%s%m!<%I$5$l$F$$$J$$5-;v(B
-$B$r(B @code{gnus-summary-*-undownloaded-face} $B$r;H$C$F35N,%P%C%U%!$KI=<($9(B
-$B$Y$-$+$I$&$+$r<($9%7%s%\%k!#(B@code{nil} $B0J30$J$i$I$s$J%7%s%\%k$G$b!"%@%&(B
-$B%s%m!<%I$5$l$F$$$J$$5-;vMQ$N%U%'!<%9$r;H$&$h$&$K$J$j$^$9!#(B
+$B$r(B @code{gnus-summary-*-undownloaded-face} $B$N%U%'!<%972$r;H$C$F35N,%P%C(B
+$B%U%!!<$KI=<($9$Y$-$+$I$&$+$r<($9%7%s%\%k!#(B@code{nil} $B0J30$J$i$I$s$J%7%s(B
+$B%\%k$G$b!"%@%&%s%m!<%I$5$l$F$$$J$$5-;vMQ$N%U%'!<%9$r;H$&$h$&$K$J$j$^$9!#(B
 @end table
 
 $B$$$C$?$sJ,N`$,:n$i$l$?$i!"J,N`$NL>A0$rJQ$($k$3$H$O$G$-$^$;$s!#(B
 
-$B$=$l$>$l$NJ,N`$O!"$=$NJ,N`$N8B$i$l$?%a%s%P!<$G$"$k%0%k!<%W$N%j%9%H$r0];}(B
-$B$7$^$9!#8B$i$l$?5,B'$O<+F0E*$K<99T$5$l$^$9!#?7$7$$J,N`$K%0%k!<%W$rDI2C$9(B
-$B$k$H!"$=$l$O8E$$J,N`$+$i<+F0E*$K$l$NJ,N`$O!"$=$NJ,N`$NGSB>E*$J(B ($BB>$NJ,N`$K$OL5$$(B) $B%a%s%P!<$G$"$k%0(B
+$B%k!<%W$N%j%9%H$r0];}$7$^$9!#GSB>5,B'$O<+F0E*$K<99T$5$l!"?7$7$$J,N`$K%0%k!<(B
+$B%W$rDI2C$9$k$H!"$=$l$O8E$$J,N`$+$i<+F0E*$K$l!"A4$F$N2DG=$J5-;v$r%@%&%s%m!<%I$9$k$+!"(B
-$BA4$/2?$b$7$J$$$+!"$G$9!#$3$l$i$NFs$D$NFCJL$J=R8l$N>l9g$O!"DI2C$N%9%3%"5,(B
-$BB'$OM>J,$G$9!#(B
+$B$i$J$j$^$9!#$3$l$i$NFs$D$O$=$l$>$l!"$9$Y$F$N2DG=$J5-;v$r%@%&%s%m!<%I$9$k(B
+$B$+!"$^$C$?$/2?$b$7$J$$$+!"$G$9!#$3$l$i$NFs$D$NFCJL$J=R8l$N>l9g$O!"DI2C$N(B
+$B%9%3%"5,B'$OITMW$G$9!#(B
 
 @code{high} $B$d(B @code{low} $B$H$$$&=R8l$O2<$G@bL@$5$l$F$$$k$h$&$K!"(B
 @code{gnus-agent-high-score} $B$H(B @code{gnus-agent-low-score} $B$H$N5-;v$N%9(B
 $B%3%"$H$N4X78$K$h$j5-;v$r%@%&%s%m!<%I$7$^$9!#(B
 
-$B%@%&%s%m!<%I$,E,@Z$+$I$&$+$N!"$5$i$K:Y$+$$@)8f$rF@$k$?$a$K!"=R8l$OO@M}1i(B
-$B;;;R$,4V$K;6$j$P$a$i$l$?=R8l$NAH$_9g$o$;$+$i$J$k$3$H$,$G$-$^$9!#(B
+$B2?$r$b$C$F%@%&%s%m!<%I$9$k$3$H$,E,3J$@$H8+$J$5$l$k$+$K$D$$$F!"$5$i$K:Y$+(B
+$B$$@)8f$rF@$k$?$a$K!"=R8l$OO@M}1i;;;R$,4V$K;6$j$P$a$i$l$?=R8l$NAH$_9g$o$;(B
+$B$+$i$J$k$3$H$,$G$-$^$9!#(B
 
-$B$*$=$i$/$$$/$D$+$NNc$,$=$N$^$^;H$($^$9!#(B
+$B$*$=$i$/$$$/$D$+$NNc$,I,MW$G$7$g$&!#(B
 
-$B0J2<$O4JC1$J=R8l$G$9!#(B($B$3$l$O=i4|@_Dj$N=R8l$G$9!#$D$^$j!"B>$N$I$NJ,N`$K(B
-$B$b4^$^$l$J$$A4$F$N%0%k!<%W$KBP$7$F;HMQ$5$l$^$9!#(B)
+$B0J2<$O4JC1$J=R8l$G$9!#(B($B$3$l$O%G%#%U%)%k%H$N=R8l$G$9!#$N$I$NJ,N`(B
+$B$K$b4^$^$l$J$$$9$Y$F$N%0%k!<%W$KBP$7$F;HMQ$5$l$^$9!#(B)
 
 @lisp
 short
 @end lisp
 
-$B$H$C$F$b4JC1$G$7$g(B? $B$3$N=R8l$O!"5-;v$,C;$$(B(``$BC;$$(B'' $B2ACM$,$"$k(B) $B>l9g$K8B(B
-$B$j??$K$J$j$^$9!#(B
+$B$H$C$F$b4JC1$G$7$g(B? $B$3$N=R8l$O!"5-;v$,C;$$(B ($B!VC;$$!W$3$H$r0UL#$9$k2?$i$+(B
+$B$N2ACM$,$"$k(B) $B>l9g$K8B$j??$K$J$j$^$9!#(B
 
-$B$3$l$O$b$C$HJ#;($J=R8l$G$9!#(B
+$B$3$l$O$b$C$HJ#;($J=R8l$G$9(B:
 
 @lisp
 (or high
@@ -17154,60 +18050,59 @@ short
 @end lisp
 
 $B$3$N0UL#$O!"9b$$%9%3%"$r;}$C$F$$$k$+!"$"$k$$$O%9%3%"$,Dc$/$J$/$F$+$DD9$/(B
-$B$J$$!"$H$$$&5-;v$r%@%&%s%m!<%I$9$k!"$H$$$&$3$H$G$9!#$o$+$k$@$m!#(B
+$B$J$$!"$H$$$&5-;v$r%@%&%s%m!<%I$9$k!"$H$$$&$3$H$G$9!#MM;R$O$o$+$j$^$7$?$M!#(B
 
-$B;H$C$F$b$h$$O@M}1i;;;R$O!"(B@code{or}, @code{and}, @code{not} $B$G$9!#(B($B$b$7(B
-$B;H$$$?$1$l$P!"$h$j(B ``C'' $BIw$N1i;;;R(B @samp{|}, @code{&}, @code{!} $B$rBe$j(B
-$B$K;H$&$3$H$,$G$-$^$9!#(B)
+$B;H$C$F$b$h$$O@M}1i;;;R$O(B @code{or}, @code{and} $B$*$h$S(B @code{not} $B$G$9!#(B
+($B$b$7;H$$$?$1$l$P!"$h$j!H(BC$B!IIw$N1i;;;R(B @samp{|}, @code{&}, @code{!} $B$rBe(B
+$B$j$K;H$&$3$H$,$G$-$^$9!#(B)
 
-$B0J2<$N=R8l$O$"$i$+$8$aDj5A$5$l$F$$$^$9$,!"$3$l$i$N$I$l$b$"$J$?$N$d$j$?$$(B
-$B$3$H$K0lCW$7$J$1$l$P!"<+J,$GFH<+$N$b$N$r=q$/$3$H$b$G$-$^$9!#(B
+$B0J2<$N=R8l$,$"$i$+$8$aDj5A$5$l$F$$$^$9$,!"$3$l$i$N$I$l$b$"$J$?$N$d$j$?$$(B
+$B$3$H$KE,$5$J$1$l$P!"<+J,$GFH<+$N$b$N$r=q$/$3$H$b$G$-$^$9!#(B
 
 $B$=$l$>$l$N$3$l$i$N=R8l$rI>2A$9$k$H$-!"L>A0$,IU$1$i$l$?Dj?t$O!"E,@Z$J%Q%i(B
-$B%a!<%?$N85$K(B @code{gnus-agent-find-parameter} $B$r8F$V$3$H$K$h$C$F7hDj$5$l(B
-$B$?CM$GB+G{$5$l$^$9!#Nc$((B
+$B%a!<%?!<$rM?$($F(B @code{gnus-agent-find-parameter} $B$r8F$V$3$H$K$h$C$F7hDj(B
+$B$5$l$kCM$KB+G{$5$l$^$9!#Nc$((B
 $B$P(B gnus-agent-short-article $B$O(B @code{(gnus-agent-find-parameter group
-'agent-short-article)} $B$KB+G{$5$l$^$9!#$3$l$O!"$"$J$?$,$"$J$?$NJ,N`$G=R(B
-$B8l$r;XDj$7$F$+$i!"$=$N=R8l$r8D!9$N%0%k!<%W$K$D$$$FD4@0$G$-$k$3$H$r0UL#$7(B
-$B$^$9!#(B
+'agent-short-article)} $B$KB+G{$5$l$^$9!#$3$l$O!"$"$J$?$NJ,N`$G=R8l$r;XDj(B
+$B$7$F$+$i!"$=$N=R8l$r8D!9$N%0%k!<%W$K$D$$$FD4@0$G$-$k$3$H$r0UL#$7$^$9!#(B
 
 @table @code
 @item short
-$B5-;v$,(B @code{gnus-agent-short-article} $B9T$h$jC;$+$1$l$P??!#=i4|@_DjCM(B
-$B$O(B 100$B!#(B
+$B5-;v$,(B @code{gnus-agent-short-article} $B$N9T?t$h$jC;$+$$>l9g$@$1??$G$9!#(B
+$B%G%#%U%)%k%H$O(B 100 $B$G$9!#(B
 
 @item long
-$B5-;v$,(B @code{gnus-agent-long-article} $B9T$h$jD9$1$l$P??!#=i4|@_DjCM$O(B 200$B!#(B
+$B5-;v$,(B @code{gnus-agent-long-article} $B$N9T?t$h$jD9$$>l9g$@$1??$G$9!#%G%#(B
+$B%U%)%k%H$O(B 200 $B$G$9!#(B
 
 @item low
-$B5-;v$N%@%&%s%m!<%I%9%3%"$,(B @code{gnus-agent-low-score} $B0J2<$G$"$l$P??!#(B
-$B=i4|@_DjCM$O(B 0$B!#(B
+$B5-;v$N%@%&%s%m!<%I%9%3%"$,(B @code{gnus-agent-low-score} $B$NCM$h$j>.$5$$>l(B
+$B9g$@$1??$G$9!#%G%#%U%)%k%H$O(B 0 $B$G$9!#(B
 
 @item high
-$B5-;v$N%@%&%s%m!<%I%9%3%"$,(B @code{gnus-agent-high-score} $B0J>e$G$"$l$P??!#(B
-$B=i4|@_DjCM$O(B 0$B!#(B
+$B5-;v$N%@%&%s%m!<%I%9%3%"$,(B @code{gnus-agent-high-score} $B$NCM$h$jBg$-$$>l(B
+$B9g$@$1??$G$9!#%G%#%U%)%k%H$O(B 0 $B$G$9!#(B
 
 @item spam
-gnus $B%(!<%8%'%s%H$,$=$N5-;v$r(B spam $B$@$H8+Pv$7$?$i??!#$3$NH/8+E*l9g$@$1??$G$9!#$3$N8!=P(B
+$BK!$O:#8eJQ99$5$l$k$+$b$7$l$^$;$s$,!#8=;~E@$G$O!"$3$l$O%A%'%C%/%5%`$r7W;;(B
+$B$7!"5-;v$,0lCW$9$k$+$I$&$+$rD4$Y$F$$$k$@$1$G$9!#(B
 
 @item true
-$B>o$K??!#(B
+$B>o$K??$G$9!#(B
 
 @item false
-$B>o$K56!#(B
+$B>o$K56$G$9!#(B
 @end table
 
-$B$"$J$?$,<+J,$NFH<+$N=R8l4X?t$r:n@.$7$?$1$l$P!"$3$l$rCN$C$F$*$$$F$/$@$5(B
-$B$$(B:
-$B4X?t$O0z?tL5$7$G8F$S=P$5$l$^$9$,!"(B
-@code{gnus-headers} $B$H(B @code{gnus-score} $BF0E*JQ?t$K$OJXMx$JCM$,B+G{$5$l(B
-$B$^$9!#(B
+$BFH<+$N=R8l4X?t$r:n@.$7$?$1$l$P!"$3$N$3$H$rCN$C$F$*$+$J$1$l$P$J$j$^$;(B
+$B$s(B: $B4X?t$O0z?tL5$7$G8F$S=P$5$l$^$9$,!"(B
+@code{gnus-headers} $B$H(B @code{gnus-score} $B$H$$$&F0E*$JJQ?t$,M-0U$JCM$KB+(B
+$BG{$5$l$k$H$$$&$3$H$r!#(B
 
-$BNc$($P!"0lDj$NF|IU0J>eA0$KEj9F$5$l$?5-;v(B ($BNc$($P!"(B
-@code{gnus-agent-expire-days} $B0JA0$KEj9F$5$l$?$b$N(B) $B$r%@%&%s%m!<%I$7$J$$(B
-$B$H$9$k$3$H$b$G$-$^$9!#$=$N>l9g!"0J2<$N$h$&$J4X?t$r=q$/$G$7$g$&(B:
+$BNc$($P!"0lDj$NF|?t0J>eA0$KEj9F$5$l$?5-;v(B ($BNc$((B
+$B$P(B @code{gnus-agent-expire-days} $B$NF|?t0J>eA0$KEj9F$5$l$?$b$N(B) $B$r%@%&%s(B
+$B%m!<%I$7$J$$$H7hCG$9$k$3$H$b$G$-$^$9!#$=$N>l9g!"0J2<$N$h$&$J4X?t$r=q$$$F!"(B
 
 @lisp
 (defun my-article-old-p ()
@@ -17216,15 +18111,15 @@ gnus $B%(!<%8%'%s%H$,$=$N5-;v$r(B spam $B$@$H8+Pv$7$?$i??!#$3$NH/8+E*$N$b$N$G$b!"4{Dj(B
-$B$N(B @code{gnus-category-predicate-list} $B$K<+J,$N=R8l$rDI2C$9$k$3$H$b$G$-(B
-$B$^$9!#(B
+$B$b$7$/$O(B @file{~/.gnus.el} $B$+2?$+$G!"$"$i$+$8$aDj5A$5$l$F$$(B
+$B$k(B @code{gnus-category-predicate-list} $B$NCM$K!"<+J,$N=R8l$rDI2C$9$k$3$H(B
+$B$b$G$-$^$9!#(B
 
 @lisp
 (require 'gnus-agent)
@@ -17233,50 +18128,50 @@ gnus $B%(!<%8%'%s%H$,$=$N5-;v$r(B spam $B$@$H8+Pv$7$?$i??!#$3$NH/8+E*l9g$O!"e$N$h$&$J$b$N$r;H$&$H$-$O!"@$$NCf$K$O@5$7$/@_Dj$5$l$F$$$J$$%7%9%F%`(B/$B%a(B
-$B!<%i!<$,$"$j!"5-;v$NF|IU$O$$$DEj9F$5$l$?$+$r>o$K3Ne$N$h$&$J$b$N$r;H$&$H$-$O!"@$$NCf$K$O@5$7$/@_Dj$5$l$F$$$J$$%7%9%F%`(B/$B%a!<(B
+$B%i!<$,$"$j!"5-;v$NF|IU$O$$$DEj9F$5$l$?$+$r>o$K3N/$7$b5$$K$+$1$J$$?M$b$$$k$s$G$9!#(B
 
-$B>e$N=R8l$O$=$NJ,N`$KB0$9$k(B @emph{$BA4$F(B} $B$N%0%k!<%W$KE,MQ$5$l$^$9!#$7$+$7!"(B
-$BJ,N`Cf$N8D!9$N%0%k!<%W$KFCDj$N=R8l$rK>$s$@$j!"BUBF2a$.$F?7$7$$J,N`$r@_Dj(B
-$B$G$-$J$$$H$-$O!"%0%k!<%W$N8D!9$N=R8l$r%0%k!<%W%Q%i%a!<%?$Ge5-$N=R8l$O$=$NJ,N`$KB0$9$k(B @emph{$B$9$Y$F(B} $B$N%0%k!<%W$KE,MQ$5$l$^$9!#$7(B
+$B$+$7!"J,N`Cf$N8D!9$N%0%k!<%W$N$?$a$NFCDj$N=R8l$r@_Dj$7$?$+$C$?$j!"C1$KIT(B
+$B@:$r7h$a9~$s$G?7$7$$J,N`$r@_Dj$7$?$/$J$$$N$J$i$P!"%0%k!<%W$N8D!9$N=R8l$r(B
+$Be$N$b$N$HEy2A$JD9$$J}$NNc$O(B:
+$B>e$N$b$N$HEy2A$JD9$$J}$NNc$O$3$&$J$k$G$7$g$&(B:
 
 @lisp
 (agent-predicate or high (and (not low) (not long)))
 @end lisp
 
-$BJ,N`$N;XDj$GMW5a$5$l$k30$N4]3g8L$O$3$3$G$OF~NO$5$l$F$*$i$:!"%I%C%HBP$N5-(B
-$BK!$G$b$J$/!"=R8l$NCM$O%j%9%H$"$k$H$_$J$5$l$^$9!#(B
+$B=R8l$NCM$,%I%C%HBP$GI=5-$5$l$F$$$J$/$F!"$=$NCM$O%j%9%H$@$H2>Dj$5$l$k$N$G!"(B
+$BJ,N`$N@_Dj$GMW5a$5$l$k30B&$N3g8L$,!"$3$3$G$OF~$l$i$l$^$;$s!#(B
 
 $B$5$F!"%@%&%s%m!<%I%9%3%"$NJ8K!$ODL>o$N%9%3%"%U%!%$%k$NJ8K!$HF1$8$G$9$,!"(B
-$BNc30$H$7$F!"l9g$N$h$&$K!"(B@code{$B%@%&%s%m!<%I%9%3%"5,B'(B} $B$N@_Dj$O!"$=$l$r%0%k!<(B
+$B%W$K4X$7$F;H$&8B$j$O!"$=$3$N$9$Y$F$N%0%k!<%W$KE,MQ$G$-$k$b$N$J$i$PJ,N`$N(B
+$BDj5A!"%0%k!<%W$KFCM-$J$i$P%0%k!<%W%Q%i%a!<%?!J}$N>l=j$G!"(B@code{$B%@%&%s%m!<%I%9%3%"5,B'(B} $B$O0J2<$N;0$D$N7A<0$rJ}$N>l=j$G!"(B@code{$B%@%&%s%m!<%I%9%3%"5,B'(B} $B$O0J2<$N;0$D$N7A<0$N0l(B
+$B$D$rJN,$5$l$F$$$k$3$H$KCm0U$7$F$/$@$5$$!#(B
+$B$3$3$G$b0lHV30B&$N3g8L$,>JN,$5$l$F$$$k$3$H$KCm0U$7$F2<$5$$!#(B
 @end itemize
 
 @item
 $B%(!<%8%'%s%H%9%3%"%U%!%$%k(B
 
-$B$3$l$i$N%9%3%"%U%!%$%k$O>e$G=R$Y$i$l$F$$$k;HMQ2DG=$J%9%3%"IU$1%-!<%o!<(B
-$B%I(B @emph{$B$N$_(B} $B$G$"$kI,MW$,$"$j$^$9!#(B
+$B$3$l$i$N%9%3%"%U%!%$%k$O!">e$G=R$Y$i$l$F$$$k;HMQ2DG=$J%9%3%"IU$1%-!<%o!<(B
+$B%I(B @emph{$B$@$1(B} $B$r4^$s$G$$$J$1$l$P$J$j$^$;$s!#(B
 
 $BNc(B:
 
@@ -17327,34 +18222,35 @@ gnus $B%(!<%8%'%s%H$,$=$N5-;v$r(B spam $B$@$H8+Pv$7$?$i??!#$3$NH/8+E*e$NMM$K!"DI2C$N%9%3%"%U%!%$%k$r;XDj$9$k$3$H$,$G$-$^$9!#$^$?3g8L$K$D$$$F(B
-$B8@$o$J$1$l$P$$$1$^$;$s$+(B?
+$B$3$3$G$bA0=R$N$h$&$K!"DI2C$N%9%3%"%U%!%$%k$r;XDj$9$k$3$H$,$G$-$^$9!#3g8L(B
+$B$K$D$$$F8@$o$J$1$l$P$$$1$^$;$s$+(B?
 @end itemize
 
 @item
 @code{$BIaDL(B} $B$N%9%3%"%U%!%$%k$N;HMQ(B
 
-$B0l$D$N%0%k!<%W$GFs$D$N%9%3%"5,B'$r0];}$7$?$/$J$/!"%0%k!<%W$NK>$_(B
-$B$N(B @code{$B%@%&%s%m!<%I(B} $B$N4p=`$,(B @code{$BFI$`(B} $B4p=`$HF1$8$J$i!"%(!<%8%'%s%H(B
-$B$K2?$r%@%&%s%m!<%I$9$k$+$r7h$a$k:]$K(B @code{$BIaDL(B} $B$N%9%3%"%U%!%$%k$r;2>H(B
-$B$9$k$h$&$K$9$k$3$H$,$G$-$^$9!#(B
+$B$"$k%0%k!<%W$N$?$a$K$"$J$?$,K>$s$@!V%@%&%s%m!<%I!W$N4p=`$,!"!VFI$`!W4p=`(B
+$B$HF1$8$J$i$P!"0l$D$N%0%k!<%W$N$?$a$KFs$D$N%9%3%"5,B'$r0];}4IM}$7$?$$$H$O(B
+$B;W$o$J$$$G$7$g$&!#$=$&$$$&>l9g$O!"2?$r%@%&%s%m!<%I$9$k$+$r7h$a$k:]$K!"%(!<(B
+$B%8%'%s%H$K(B @code{$BIaDL(B} $B$N%9%3%"%U%!%$%k$r;2>H$5$;$k$3$H$,$G$-$^$9!#(B
 
-$BJ,N`Dj5A$+!"%0%k!<%W%Q%i%a!<%?$N$3$l$i$N;X<($O%(!<%8%'%s%H$K%0%k!<%W$KE,(B
-$BMQ2DG=$JA4$F$N%9%3%"%U%!%$%k$rFI$^$;!"%9%3%"IU$1%-!<%o!<%I$N;HMQ2DG=$JIt(B
-$BJ,=89g$KL5$$$b$N$r(B @emph{$BA*JL$7$FH4$-o$OA4$F$NJ,N`$OJ,N`%P%C%U%!!<$+$i4IM}$7$^$9!#(B($B%0%k!<%W%P%C%U%!!<(B
-$B$+$i(B @kbd{J c} $BL?Na$K$h$C$F(B) $B=i$a$F$3$l$KF~$C$?$H$-!"=i4|@_Dj$N(B
-$BJ,N`$@$1$,I=<($5$l$^$9!#(B
+$BDL>o$9$Y$F$NJ,N`$OJ,N`%P%C%U%!!<$+$i4IM}$7$^$9!#$3$l$K(B ($B%0%k!<%W%P%C%U%!!<(B
+$B$G(B @kbd{J c} $BL?Na$r;H$C$F(B) $B=i$a$FF~$k$H!"%G%#%U%)%k%H$NJ,N`$@$1$,I=<($5(B
+$B$l$^$9!#(B
 
-$B0J2<$NL?Na$,$3$N%P%C%U%!!<$G;HMQ$G$-$^$9!#(B
+$B$3$N%P%C%U%!!<$G$O0J2<$NL?Na$r;H$&$3$H$,$G$-$^$9(B:
 
 @table @kbd
 @item q
 @kindex q ($BJ,N`(B)
 @findex gnus-category-exit
-$B%0%k!<%W%P%C%U%!!<$KLa$k(B (@code{gnus-category-exit})$B!#(B
+$B%0%k!<%W%P%C%U%!!<$KLa$j$^$9(B (@code{gnus-category-exit})$B!#(B
 
 @item e
 @kindex e ($BJ,N`(B)
 @findex gnus-category-customize-category
-$BA*Br$5$l$?J,N`$N%Q%i%a!<%?$r0l3g$7$F@_Dj$9$k$?$a$K!"%+%9%?%^%$%:%P%C%U%!(B
+$BA*Br$5$l$?J,N`$N%Q%i%a!<%?!<$r0l3g$7$F@_Dj$9$k$?$a$K!"%+%9%?%^%$%:%P%C%U%!!<(B
 $B$r;H$$$^$9(B (@code{gnus-category-customize-category})$B!#(B
 
-Use a customization buffer to set all of the selected category's
-parameters at one time (@code{gnus-category-customize-category}).
-
 @item k
 @kindex k ($BJ,N`(B)
 @findex gnus-category-kill
-$B8=:_$NJ,N`$r>C5n$9$k(B (@code{gnus-category-kill})$B!#(B
+$B8=:_$NJ,N`$r>C5n$7$^$9(B (@code{gnus-category-kill})$B!#(B
 
 @item c
 @kindex c ($BJ,N`(B)
 @findex gnus-category-copy
-$B8=:_$NJ,N`$rJ#@=$9$k(B (@code{gnus-category-copy})$B!#(B
+$B8=:_$NJ,N`$rJ#@=$7$^$9(B (@code{gnus-category-copy})$B!#(B
 
 @item a
 @kindex a ($BJ,N`(B)
 @findex gnus-category-add
-$B?7$7$$J,N`$rDI2C$9$k(B (@code{gnus-category-add})$B!#(B
+$B?7$7$$J,N`$rDI2C$7$^$9(B (@code{gnus-category-add})$B!#(B
 
 @item p
 @kindex p ($BJ,N`(B)
 @findex gnus-category-edit-predicate
-$B8=:_$NJ,N`$N=R8l$rJT=8$9$k(B (@code{gnus-category-edit-predicate})$B!#(B
+$B8=:_$NJ,N`$N=R8l$rJT=8$7$^$9(B (@code{gnus-category-edit-predicate})$B!#(B
 
 @item g
 @kindex g ($BJ,N`(B)
 @findex gnus-category-edit-groups
-$B8=:_$NJ,N`$KB0$9$k%0%k!<%W$N0lMw$rJT=8$9(B
-$B$k(B (@code{gnus-category-edit-groups})$B!#(B
+$B8=:_$NJ,N`$KB0$9$k%0%k!<%W$N%j%9%H$rJT=8$7$^(B
+$B$9(B (@code{gnus-category-edit-groups})$B!#(B
 
 @item s
 @kindex s ($BJ,N`(B)
 @findex gnus-category-edit-score
-$B8=:_$NJ,N`$N%@%&%s%m!<%I%9%3%"5,B'$rJT=8$9(B
-$B$k(B (@code{gnus-category-edit-score})$B!#(B
+$B8=:_$NJ,N`$N%@%&%s%m!<%I%9%3%"5,B'$rJT=8$7$^(B
+$B$9(B (@code{gnus-category-edit-score})$B!#(B
 
 @item l
 @kindex l ($BJ,N`(B)
 @findex gnus-category-list
-$BA4$F$NJ,N`$rI=<($9$k(B (@code{gnus-category-list})$B!#(B
+$B$9$Y$F$NJ,N`$rI=<($7$^$9(B (@code{gnus-category-list})$B!#(B
 @end table
 
 @node Category Variables
@@ -17441,53 +18334,56 @@ parameters at one time (@code{gnus-category-customize-category}).
 @table @code
 @item gnus-category-mode-hook
 @vindex gnus-category-mode-hook
-$BJ,N`%P%C%U%!!<$GA0!#(B
+$BJ,N`$NL>A0$G$9!#(B
 
 @item g
-$BJ,N`$KB0$9$k%0%k!<%W$N?t!#(B
+$B$=$NJ,N`$KB0$9$k%0%k!<%W$N?t$G$9!#(B
 @end table
 
 @item gnus-category-mode-line-format
 @vindex gnus-category-mode-line-format
-$BJ,N`%b!<%I9T$NMM<0(B (@pxref{Mode Line Formatting})$B!#(B
+$BJ,N`%b!<%I9T$NMM<0$G$9(B (@pxref{Mode Line Formatting})$B!#(B
 
 @item gnus-agent-short-article
 @vindex gnus-agent-short-article
-$B$3$NJQ?t$h$j>/$J$$9T?t$N5-;v$OC;$$!#=i4|@_DjCM$O(B 100$B!#(B
+$B$3$NCM$h$j>/$J$$9T?t$N5-;v$OC;$$$H8+$J$7$^$9!#%G%#%U%)%k%H$O(B 100 $B$G$9!#(B
 
 @item gnus-agent-long-article
 @vindex gnus-agent-long-article
-$B$3$NJQ?t$h$jB?$$9T?t$N5-;v$OD9$$!#=i4|@_DjCM$O(B 200$B!#(B
+$B$3$NCM$h$jB?$$9T?t$N5-;v$OD9$$$H8+$J$7$^$9!#%G%#%U%)%k%H$O(B 200 $B$G$9!#(B
 
 @item gnus-agent-low-score
 @vindex gnus-agent-low-score
-$B$3$NCM$h$j>.$5$$%9%3%"$r;}$D5-;v$ODc%9%3%"$G$"$k!#=i4|@_DjCM$O(B 0$B!#(B
+$B$3$NCM$h$j>.$5$$%9%3%"$r;}$D5-;v$ODc%9%3%"$@$H8+$J$7$^$9!#%G%#%U%)%k%H(B
+$B$O(B 0 $B$G$9!#(B
 
 @item gnus-agent-high-score
 @vindex gnus-agent-high-score
-$B$3$NCM$h$jBg$-$$%9%3%"$r;}$D5-;v$O9b%9%3%"$G$"$k!#=i4|@_DjCM$O(B 0$B!#(B
+$B$3$NCM$h$jBg$-$$%9%3%"$r;}$D5-;v$O9b%9%3%"$@$H8+$J$7$^$9!#%G%#%U%)%k%H(B
+$B$O(B 0 $B$G$9!#(B
 
 @item gnus-agent-expire-days
 @vindex gnus-agent-expire-days
-$B4|8B@Z$l>C5n$K$U$5$o$7$/$J$k$^$G4{FI5-;v$r%(!<%8%'%s%H$N%m!<%+%k%G%#%9%/(B
-$B$KN1$a$F$*$/F|?t(B ($B$G$bL>A0$,F1$8$@$C$?$i!"$3$l$O$=$N%5!<%P!<$K$*$1$k4|8B(B
-$B@Z$l>C5n$r0UL#$7$^$;$s!#$=$l$OC1$K5-;v$N%m!<%+%k$JJ#@=$r>C$9$3$H$r0UL#$7(B
-$B$^$9(B)$B!#$5$i$KM}2r$9$Y$-Bg;v$J$3$H$O!"5-;v$,FI$^$l$?;~$G$O$J$/%m!<%+%k%G%#(B
-$B%9%/$K5-;v$,=q$+$l$?;~$+$i7W?t$,;O$^$k$H$$$&$3$H$G$9!#%G%#%U%)%k%H$O(B 7$BF|!#(B
+$B4|8B@Z$l>C5n$9$kA0$K!"4{FI5-;v$r%(!<%8%'%s%H$N%m!<%+%k%G%#%9%/$KN1$a$F$*(B
+$B$+$J$1$l$P$J$i$J$$F|?t(B ($B!V4|8B@Z$l>C5n!W$H$$$&L>A0$OF1$8$G$9$,!"%5!<%P!<(B
+$B$G4|8B@Z$l>C5n$9$k$3$H$G$O$"$j$^$;$s!#C1$K5-;v$N%m!<%+%k$JJ#@=$r>C$9$3$H(B
+$B$r0UL#$7$^$9(B)$B!#$5$i$KM}2r$9$Y$-Bg;v$J$3$H$O!"5-;v$,FI$^$l$?;~$G$O$J$/%m!<(B
+$B%+%k%G%#%9%/$K5-;v$,=q$+$l$?;~$+$i7W?t$,;O$^$k$H$$$&$3$H$G$9!#%G%#%U%)%k(B
+$B%H$O(B 7$BF|$G$9!#(B
 
 @item gnus-agent-enable-expiration
 @vindex gnus-agent-enable-expiration
 $B%0%k!<%W$N5-;v$,!"%G%#%U%)%k%H$G4|8B@Z$l>C5n$5$l$k$+!"L54|8B$KJ];}$5$l$k(B
-$B$+$r7hDj$7$^$9!#%G%#%U%)%k%H$O(B @code{ENABLE} $B$G!"K>$`$J$i$P4|8B@Z$l>C5n(B
-$B$r$5$;$J$$$h$&$K$7$J$1$l$P$J$i$J$$$3$H$r0UL#$7$^$9!#0lJ}!"$3$l(B
+$B$+$r7hDj$7$^$9!#%G%#%U%)%k%H$O(B @code{ENABLE} $B$G!"$"$J$?$,K>$`$J$i$P4|8B(B
+$B@Z$l>C5n$r$5$;$J$$$h$&$K$7$J$1$l$P$J$i$J$$$3$H$r0UL#$7$^$9!#0lJ}!"$3$l(B
 $B$r(B @code{DISABLE} $B$K@_Dj$9$k$3$H$,$G$-$^$9!#$=$N>l9g!"A*Br$5$l$?%0%k!<%W(B
 $B$G$N4|8B@Z$l>C5n$rM-8z$K$7$J$1$l$P$J$j$^$;$s!#(B
 @end table
@@ -17495,15 +18391,15 @@ parameters at one time (@code{gnus-category-customize-category}).
 @node Agent Commands
 @subsection $B%(!<%8%'%s%HL?Na(B
 @findex gnus-agent-toggle-plugged
-@kindex J j (Agent)
+@kindex J j ($B%(!<%8%'%s%H(B)
 
-$BA4$F$N(B gnus $B%(!<%8%'%s%HL?Na$O(B @kbd{J} $B%5%V%^%C%W$K$"$j$^$9!#(B
-@kbd{J j} (@code{gnus-agent-toggle-plugged}) $BL?Na$OA4$F$N%b!<%I(B
-$B$GF0:n$7!"(Bgnus $B%(!<%8%'%s%H$N@Z$jN%$7(B/$B:9$79~$_>uBV$r@Z$jBX$($^$9!#(B
+$B$9$Y$F$N(B gnus $B%(!<%8%'%s%HL?Na$O(B @kbd{J} $B%5%V%^%C%W$K$"$j$^$9!#(B
+@kbd{J j} (@code{gnus-agent-toggle-plugged}) $BL?Na$O$9$Y$F$N%b!<%I$GF0:n(B
+$B$7!"(Bgnus $B%(!<%8%'%s%H$N(B plugged/unplugged $B>uBV$r@Z$jBX$($^$9!#(B
 
 @menu
-* Group Agent Commands::        $B%0%k!<%W$N@_Dj$H$=$l$i$NFbMF$Nr7o$K9gCW$9$k(B) $B5-;v$r$9$Y(B
+$B$Fr7o$K9gCW$9$k(B) $B5-;v$r$9$Y$FC5n$7$^(B
-$B$9(B (@code{gnus-agent-remove-group})$B!#$3$NL?Na$O%W%m%;%9(B/$B@\F,<-$N=,47$rM}(B
-$B2r$7$^$9!#(B(@pxref{Process/Prefix})$B!#(B
+$B$9(B (@code{gnus-agent-remove-group})$B!#$3$NL?Na$O%W%m%;%9(B/$B@\F,0z?t$N=,47$r(B
+$BM}2r$7$^$9!#(B(@pxref{Process/Prefix})$B!#(B
 
 @item J Y
 @kindex J Y ($B%(!<%8%'%s%H(B $B%0%k!<%W(B)
 @findex gnus-agent-synchronize-flags
-$B%j%b!<%H%5!<%P!<$,(B @dfn{unplugged} $B$N$H$-$KJQ99$5$l$?%U%i%0$,$"$l$PF14|(B
-$B$5$;$^$9!#(B
+$B%j%b!<%H%5!<%P!<$,(B unplugged $B$N$H$-$KJQ99$5$l$?%U%i%0$,$"$l$PF14|$5$;$^(B
+$B$9!#(B
 @end table
 
 @node Summary Agent Commands
@@ -17560,44 +18458,45 @@ parameters at one time (@code{gnus-category-customize-category}).
 @item J #
 @kindex J # ($B%(!<%8%'%s%H(B $B35N,(B)
 @findex gnus-agent-mark-article
-$B5-;v$K%@%&%s%m!<%I$9$k$h$&$K0u$rIU$1$k(B (@code{gnus-agent-mark-article})$B!#(B
+$B5-;v$K%@%&%s%m!<%I0u$rIU$1$^$9(B (@code{gnus-agent-mark-article})$B!#(B
 
 @item J M-#
 @kindex J M-# ($B%(!<%8%'%s%H(B $B35N,(B)
 @findex gnus-agent-unmark-article
-$B5-;v$+$i%@%&%s%m!<%I$9$k0u$r>C5n$9$k(B (@code{gnus-agent-unmark-article})$B!#(B
+$B5-;v$+$i%@%&%s%m!<%I0u$r>C5n$7$^$9(B (@code{gnus-agent-unmark-article})$B!#(B
 
 @cindex %
 @item @@
 @kindex @@ ($B%(!<%8%'%s%H(B $B35N,(B)
 @findex gnus-agent-toggle-mark
-$B5-;v$r%@%&%s%m!<%I$9$k$+$I$&$+$r@Z$jBX$((B
-$B$k(B (@code{gnus-agent-toggle-mark})$B!#%G%#%U%)%k%H$G$O%@%&%s%m!<%I$N0u(B
-$B$O(B @samp{%}$B!#(B
+$B5-;v$r%@%&%s%m!<%I$9$k$+$I$&$+$r@Z$jBX$($^(B
+$B$9(B (@code{gnus-agent-toggle-mark})$B!#%G%#%U%)%k%H$G$O%@%&%s%m!<%I$N0u(B
+$B$O(B @samp{%} $B$G$9!#(B
 
 @item J c
 @kindex J c ($B%(!<%8%'%s%H(B $B35N,(B)
 @findex gnus-agent-catchup
 $B%-%c%C%7%e$5$l$F$$$J$$!"%@%&%s%m!<%I$5$l$F$$$J$$!"$^$?$O%@%&%s%m!<%I$G$-(B
-$B$J$$$9$Y$F$N5-;v$r4{FI$K$9$k(B (@code{gnus-agent-catchup})$B!#(B
+$B$J$$$9$Y$F$N5-;v$r4{FI$K$7$^$9(B (@code{gnus-agent-catchup})$B!#(B
 
 @item J S
 @kindex J S ($B%(!<%8%'%s%H(B $B35N,(B)
 @findex gnus-agent-fetch-group
-$B$3$N%0%k!<%W$N$9$Y$F$NK>$^$7$$5-;v(B (@pxref{Agent Categories} $B;2>H(B) $B$r%@(B
-$B%&%s%m!<%I$9$k!#(B(@code{gnus-agent-fetch-group})$B!#(B
+$B$3$N%0%k!<%W$N$9$Y$F$NK>$^$7$$(B ($BLuCm(B: $B$"$J$?$,;XDj$7$?>r7o$K9gCW$9$k(B) $B5-(B
+$B;v(B (@pxref{Agent Categories}) $B$r%@%&%s%m!<%I$7$^(B
+$B$9!#(B(@code{gnus-agent-fetch-group})$B!#(B
 
 @item J s
 @kindex J s ($B%(!<%8%'%s%H(B $B35N,(B)
-@findex gnus-agent-fetch-series
-$B$3$N%0%k!<%W$N$9$Y$F$N%W%m%;%90u$,IU$$$?5-;v$r%@%&%s%m!<%I$9$k!#(B
-(@code{gnus-agent-fetch-series})$B!#(B
+@findex gnus-agent-summary-fetch-series
+$B$3$N%0%k!<%W$N$9$Y$F$N%W%m%;%90u$,IU$$$?5-;v$r%@%&%s%m!<%I$7$^(B
+$B$9!#(B(@code{gnus-agent-summary-fetch-series})$B!#(B
 
 @item J u
 @kindex J u ($B%(!<%8%'%s%H(B $B35N,(B)
 @findex gnus-agent-summary-fetch-group
-$B8=:_$N%0%k!<%W$N%@%&%s%m!<%I2DG=$J5-;v$r!"$9$Y$F%@%&%s%m!<%I$9(B
-$B$k(B (@code{gnus-agent-summary-fetch-group})$B!#(B
+$B8=:_$N%0%k!<%W$N%@%&%s%m!<%I2DG=$J5-;v$r!"$9$Y$F%@%&%s%m!<%I$7$^(B
+$B$9(B (@code{gnus-agent-summary-fetch-group})$B!#(B
 @end table
 
 @node Server Agent Commands
@@ -17607,103 +18506,105 @@ parameters at one time (@code{gnus-category-customize-category}).
 @item J a
 @kindex J a ($B%(!<%8%'%s%H(B $B%5!<%P!<(B)
 @findex gnus-agent-add-server
-$B8=:_$N%5!<%P!<$r!"(Bgnus $B%(!<%8%'%s%H$G07$o$l$k%5!<%P!<$N0lMw$KDI2C$9(B
-$B$k(B (@code{gnus-agent-add-server})$B!#(B
+$B8=:_$N%5!<%P!<$r(B gnus $B%(!<%8%'%s%H$G07$o$l$k%5!<%P!<$N%j%9%H$KDI2C$7$^(B
+$B$9(B (@code{gnus-agent-add-server})$B!#(B
 
 @item J r
 @kindex J r ($B%(!<%8%'%s%H(B $B%5!<%P!<(B)
 @findex gnus-agent-remove-server
-$B8=:_$N%5!<%P!<$r!"(Bgnus $B%(!<%8%'%s%H$G07$o$l$k%5!<%P!<$N0lMw$+$i:o=|$9(B
-$B$k(B (@code{gnus-agent-remove-server})$B!#(B
+$B8=:_$N%5!<%P!<$r(B gnus $B%(!<%8%'%s%H$G07$o$l$k%5!<%P!<$N%j%9%H$+$i:o=|$7$^(B
+$B$9(B (@code{gnus-agent-remove-server})$B!#(B
 @end table
 
 @node Agent Visuals
 @subsection $B%(!<%8%'%s%H$N;k3P8z2L(B
 
-$B%*%U%i%$%s(B (unplugged) $B$N$H$-$K35N,$r3+$$$?>l9g$K!"(Bgnus $B$,8=:_%(!<%8%'%s(B
-$B%H$K3JG<$5$l$F$$$k%X%C%@!<$h$j$bB?$/$N5-;v$,$"$k$3$H$r!"$=$N%0%k!<%W(B
-$B$N(B active ($BLuCm(B: $B2?HV$+$i2?HV$^$G$N5-;v$,$"$k$+$r<($94IM}>pJs(B) $B$NHO0O$+(B
-$B$iCN$C$F$$$k>l9g!"I=Bj$,(B @samp{[Undownloaded article #####]} $B$N$h$&$K$J$C(B
-$B$F$$$k$$$/$D$+$N5-;v$r8+$k$+$b$7$l$^$;$s!#$=$l$i$O8+Ev$?$i$J$$%X%C%@!<$N(B
-$B$?$a$N7jKd$a(B (placeholders) $B$G$9!#0u(B (mark) $B$r@_Dj$9$k$3$H$O$H$b$+$/!"$=(B
-$B$l$i$N7jKd$a$N0l$D$G$G$-$k$3$H$OB?$/$O$"$j$^$;$s!#:G=*E*$K(B gnus $B$,%0%k!<(B
-$B%W$N%X%C%@!<$rH(B)$B!#(B
+Unplugged $B$N$H$-$K35N,$r3+$/$H!"8=:_%(!<%8%'%s%H$K3JG<$5$l$F$$$k%X%C%@!<(B
+$B$h$j$bB?$/$N5-;v$,$"$k$3$H$r(B gnus $B$,$=$N%0%k!<%W$N(B active ($BLuCm(B: $B2?HV$+(B
+$B$i2?HV$^$G$N5-;v$,$"$k$+$r<($94IM}>pJs(B) $B$NHO0O$+$iCN$C$F$$$k>l9g$K$O!"I=(B
+$BBj$,(B @samp{[Undownloaded article #####]} $B$N$h$&$K$J$C$F$$$k$$$/$D$+$N5-(B
+$B;v$r8+$k$+$b$7$l$^$;$s!#$=$l$i$O8+Ev$?$i$J$$%X%C%@!<$N$?$a$N7jKd(B
+$B$a(B (placeholders) $B$G$9!#0u$r@_Dj$9$k$3$H$OJL$H$7$F!"$=$l$i$N7jKd$a$N0l$D(B
+$B$G$G$-$k$3$H$OB?$/$O$"$j$^$;$s!#:G=*E*$K(B gnus $B$,%0%k!<%W$N%X%C%@!<$rH(B)$B!#(B
 
 $B$9$Y$F$N?M$K$H$C$FL@Gr$+$b$7$l$^$;$s$,!"%*%U%i%$%s$N$H$-$KMxMQ$G$-$k$N$O!"(B
-$B0JA0$K:9$79~$^$l$F$$$?4V(B (plugged) $B$K%(!<%8%'%s%H$KuBV$rI=<($7$^$9!#(B
-
-$BBh0l$N;k3P8z2L$O(B @samp{%O} $B;EMM$G$9!#$3$N;X<(;R$r4^$a$k$?$a(B
-$B$K(B @code{gnus-summary-line-format} $B$r%+%9%?%^%$%:$9$k$H!"5-;v$N%@%&%s%m!<(B
-$B%I$N>uBV$r<($9C10l$NJ8;z$,2C$o$k$G$7$g$&!#%(!<%8%'%s%H$+%-%c%C%7%e$N$I$A(B
-$B$i$+$K$l$N5-;v$N%@%&%s%m!<%I$N>uBV$rI=<($7$^$9!#(B
+
+$BBh0l$N;k3P8z2L$O(B @samp{%O} $B;EMM$G$9!#(B@code{gnus-summary-line-format} $B$r(B
+$B%+%9%?%^%$%:$7$F$3$N;X<(;R$r4^$a$k$H!"5-;v$N%@%&%s%m!<%I$N>uBV$r<($9$?$a(B
+$B$KC10l$NJ8;z$rI=<($9$k>l=j$,2C$o$j$^$9!#%(!<%8%'%s%H$+%-%c%C%7%e$N$I$A$i(B
+$B$+$Kr7o8!::$H%U%'!<%9L>$N%j%9%H(B (@code{gnus-summary-highlight} $B;2(B
-$B>H(B) $B$G@)8f$5$l$k$3$H$G$9!#$=$l$>$l$N>r7o$O!"$=$l$,%j%9%H$NCf$K8=$l$k=g$K(B
-$B8!::$5$l$k$N$G!"8e$N>r7o$h$j$bA0$N>r7o$,M%@h$5$l$^$9!#$3$l$,0UL#$9$k$9$Y(B
-$B$F$O!"%@%&%s%m!<%I$5$l$F$$$J$$5-;v$K2D;k5-;v(B (ticked) $B$N0u$rIU$1$F$b!"$=(B
-$B$N5-;v$O2D;k5-;v$N%U%'!<%9$G$O$J$/$F!"%@%&%s%m!<%I$5$l$F$$$J$$5-;v$N%U%'!<(B
-$B%9$GI=<($7B3$1$i$l$k$H$$$&$3$H$G$9!#(B
+$B>H(B) $B$K$h$C$F@)8f$5$l$k$3$H$G$9!#$=$l$>$l$N>r7o$O!"$=$l$,%j%9%H$NCf$K8=$l(B
+$B$k=g$K8!::$5$l$k$N$G!"8e$N>r7o$h$j$bA0$N>r7o$,M%@h$5$l$^$9!#$3$l$,0UL#$9(B
+$B$k$9$Y$F$O!"%@%&%s%m!<%I$5$l$F$$$J$$5-;v$K2D;k5-;v(B (ticked) $B$N0u$rIU$1$F(B
+$B$b!"$=$N5-;v$O2D;k5-;v$N%U%'!<%9$G$O$J$/$F!"%@%&%s%m!<%I$5$l$F$$$J$$5-;v(B
+$B$N%U%'!<%9$GI=<($7B3$1$i$l$k$H$$$&$3$H$G$9!#(B
 
 ($B5-;v$rFI$`$?$S$KF1$85-;v$r%@%&%s%m!<%I$7$J$$$h$&$K$9$k$?$a!"$^$?$O@\B3(B
 $B;~4V$r:G>.$K$9$k$?$a$K(B) $B%(!<%8%'%s%H$r%-%c%C%7%e$H$7$F;H$&>l9g$O!"%@%&%s(B
 $B%m!<%I$5$l$F$$$J$$5-;v$N%U%'!<%9$O$*$=$i$/NI$$9M$($N$h$&$K;W$($k$G$7$g$&!#(B
 $B%@%&%s%m!<%I$5$l$?5-;v$KBP$7$F$9$Y$F$N;E;v(B ($B0u$rIU$1$k!"FI$`!":o=|$9(B
-$B$k(B) $B$r9T$J$($P!"$$$D$bDL>o$N%U%'!<%9$,8=$l$k$+$i$G$9!#(B@acronym{NOV} $B$r(B
-$B%-%c%C%7%e$9$k$3$H$K$h$C$F%*%s%i%$%s@-G=$r2~A1$9$k$?$a$K%(!<%8%'%s%H$r;H$C(B
-$B$F$$$k%f!<%6$K$H$C$F!"%@%&%s%m!<%I$5$l$F$$$J$$5-;v$N%U%'!<%9$,8+$($k$+$b(B
-$B$7$l$J$$$3$H$O!"$^$C$?$/$>$C$H$9$k$[$I$$$d$J$3$H$G$7$g$&!#$=$l$i$N$I$N5-(B
-$B;v$b%(!<%8%'%s%H$Ko$N%U%'!<%9$,8=$l$k$+$i$G$9!#$7$+$7!"(B
+@acronym{NOV} $B$r%-%c%C%7%e$9$k$3$H$K$h$C$F%*%s%i%$%s@-G=$r2~A1$9$k$?$a$K(B
+$B%(!<%8%'%s%H$r;H$C$F$$$kMxMQl9g$O!"(B
-@code{agent-enable-undownloaded-faces} $B%0%k!<%W%Q%i%a!<%?$r(B @code{t} $B$K(B
-$B@_Dj$7$F!"%@%&%s%m!<%I$5$l$F$$$J$$5-;v$N%U%'!<%9$rM-8z$K$7$J$1$l$P$J$j$^(B
-$B$;$s!#$3$N%Q%i%a!<%?$OB>$N$9$Y$F$N%(!<%8%'%s%H%Q%i%a!<%?$HF1MM$K!"%(!<%8%'(B
-$B%s%HJ,N`(B (@pxref{Agent Categories})$B!"%0%k!<%W%H%T%C%/(B (@pxref{Topic
-Parameters})$B!"$"$k$$$O8D!9$N%0%k!<%W(B (@pxref{Group Parameters}) $B$KBP$7$F(B
-$B@_Dj$9$k$3$H$,$G$-$^$9!#(B
-
-$B%(!<%8%'%s%H$r;H$&$9$Y$F$N%f!<%6$K6&DL$7$?0l$D$NLdBj$O!"$=$l$,%G%#%9%/$N(B
-$BMFNL$r$$$+$KB.$/;H$$?T$/$9$3$H$,$G$-$k$+$G$9!#$"$J$?$,B?$/$N%0%k!<%W$G%(!<(B
-$B%8%'%s%H$r;HMQ$7$F$$$k>l9g!";ve%G%#%9%/MFNL$r2sI|$9$k$3$H$O$5$i$K:$Fq(B
-$B$G$9!#0l$D$N2r$O(B @code{gnus-group-line-format} $B$K$"$k(B @samp{%F} $B7A<0$G$9!#(B
-$B$3$N7A<0$O!"%(!<%8%'%s%H$H%-%c%C%7%e$NN>J}$GC5n!W$9$k>l9g$K!"$I(B
-$B$3$KEXNO$r=8Cf$9$k$Y$-$+$,$o$+$j$^$9!#(B
+@code{agent-enable-undownloaded-faces} $B%0%k!<%W%Q%i%a!<%?!<(B
+$B$r(B @code{t} $B$K@_Dj$7$F!"%@%&%s%m!<%I$5$l$F$$$J$$5-;v$N%U%'!<%9$rM-8z$K$7(B
+$B$J$1$l$P$J$j$^$;$s!#$3$N%Q%i%a!<%?!<$OB>$N$9$Y$F$N%(!<%8%'%s%H%Q%i%a!<%?!<(B
+$B$HF1MM$K!"%(!<%8%'%s%HJ,N`(B (@pxref{Agent Categories})$B!"%0%k!<%W%H%T%C(B
+$B%/(B (@pxref{Topic Parameters})$B!"$"$k$$$O8D!9$N%0%k!<(B
+$B%W(B (@pxref{Group Parameters}) $B$KBP$7$F@_Dj$9$k$3$H$,$G$-$^$9!#(B
+
+$B%(!<%8%'%s%H$r;H$&$9$Y$F$NMxMQl9g!";ve%G%#%9%/MFNL$r2sI|$9$k$3$H$O(B
+$B$5$i$K$b$C$H:$Fq$G$9!#0l$D$N2r7hJ}$GC5n!W$9$k>l9g$K!"$I$3$KEXNO$r=8Cf$9$k$Y$-$+$,$o$+$j$^$9!#(B
 
 @node Agent as Cache
 @subsection $B%-%c%C%7%e$H$7$F$N%(!<%8%'%s%H(B
 
-gnus $B$,(B @dfn{plugged} $B$G$"$k$H$-$K!"$9$G$K%(!<%8%'%s%H$K3JG<$5$l$F$$$k%X%C(B
-$B%@!<$d5-;v$r%@%&%s%m!<%I$9$k$N$O8zN(E*$G$O$"$j$^$;$s!#$=$3$G(B gnus $B$ODL>o(B
-$B%X%C%@!<$r0l2s$@$1%@%&%s%m!<%I$7$F%(!<%8%'%s%H$K3JG<$7$^$9!#(B
-@dfn{plugged} $B$+(B @dfn{unplugged} $B$K$+$+$o$i$:!"$=$l$i$N%X%C%@!<$O8e$K35(B
-$BN,%P%C%U%!$r@8@.$9$k$H$-$K;H$o$l$^$9!#%G%#%U%)%k%H$G$O5-;v$O(B ($B$=$l$O@x:_(B
-$BE*$K%G%#%9%/6u4V$rO2Hq$9$k$G$"$m$&$+$i(B) $B%(!<%8%'%s%H$K%-%c%C%7%e$5$l$^$;(B
-$B$s$,!"$9$G$K%(!<%8%'%s%H$K%@%&%s%m!<%I$7$?5-;v$,$"$k$J$i$P!"(Bgnus $B$O%5!<(B
-$B%P!<$+$i:F$S5-;v$r%@%&%s%m!<%I$;$:$K!"$`$N$G$"$l$P!"(B@dfn{plugged} $B$J4|4V$O>o$K%X%C%@!<$H5-;v$r%@(B
-$B%&%s%m!<%I$9$k$h$&$K!"%(!<%8%'%s%H(B (@code{gnus-agent-cache} $B;2(B
-$B>H(B @ref{Agent Variables}) $B$r@_Dj$9$k$3$H$,$G$-$^$9!#(Bgnus $B$O$[$H$s$I3N$+(B
-$B$K$b$C$HCY$/$J$j$^$9$,!"%5!<%P!<$H$NF14|$OJ]$?$l$^$9!#(Bnntp $B$+(B nnimap $B%P%C(B
-$B%/%(%s%I$r;H$C$F$$$k>l9g$O!"$?$V$s$3$N:G8e$NE@$O0UL#$r$J$5$J$$$G$7$g$&!#(B
+gnus $B$,(B plugged $B$G$"$k$H$-$K!"$9$G$K%X%C%@!<$d5-;v$,%(!<%8%'%s%H$K3JG<$5(B
+$B$l$F$$$k$N$J$i$P!"$=$l$i$r:F$S%@%&%s%m!<%I$9$k$N$O8zN(E*$G$O$"$j$^$;$s!#(B
+$B$=$N$?$a(B gnus $B$ODL>o%X%C%@!<$r0l2s$@$1%@%&%s%m!<%I$7$F%(!<%8%'%s%H$K3JG<(B
+$B$7$^$9!#$=$l$i$N%X%C%@!<$O8e$K35N,%P%C%U%!!<$r@8@.$9$k$H$-$K!"(B
+plugged $B$+(B unplugged $B$K$+$+$o$i$:$K;H$o$l$^$9!#%G%#%U%)%k%H$G$O5-;v(B
+$B$O(B ($B$=$l$O$?$/$5$s$N%G%#%9%/MFNL$rO2Hq$9$k$+$b$7$l$J$$$N$G(B) $B%(!<%8%'%s%H(B
+$B$K%-%c%C%7%e$5$l$^$;$s$,!"$9$G$K%(!<%8%'%s%H$K%@%&%s%m!<%I$7$?5-;v$,$"$k(B
+$B$J$i$P!"(Bgnus $B$O%5!<%P!<$+$i:F$S5-;v$r%@%&%s%m!<%I$;$:$K!"$`$N$G$"$l$P!"(Bplugged $B$J4|4V$O>o$K%X%C%@!<$H5-;v$r%@%&%s%m!<(B
+$B%I$9$k$h$&$K!"%(!<%8%'%s%H(B (@code{gnus-agent-cache} $B;2>H(B @ref{Agent
+Variables}) $B$r@_Dj$9$k$3$H$,$G$-$^$9!#(Bgnus $B$O$[$H$s$I3N$+$K$b$C$HCY$/$J(B
+$B$j$^$9$,!"%5!<%P!<$H$NF14|$OJ]$?$l$^$9!#(Bnntp $B$+(B nnimap $B%P%C%/%(%s%I$r;H$C(B
+$B$F$$$k>l9g$O!"$?$V$s$3$N:G8e$NE@$O0UL#$r$J$5$J$$$G$7$g$&!#(B
 
 @node Agent Expiry
 @subsection $B%(!<%8%'%s%H4|8B@Z$l>C5n(B
@@ -17714,48 +18615,48 @@ gnus $B$,(B @dfn{plugged} $B$G$"$k$H$-$K!"$9$G$K%(!<%8%'%s%H$K3JG<$5$l$F$$$k%
 @kindex M-x gnus-agent-expire-group
 @findex gnus-agent-expire-group
 @cindex agent expiry
-@cindex Gnus agent expiry
+@cindex gnus agent expiry
 @cindex expiry
 
-$B%(!<%8%'%s%H%P%C%/%(%s%I(B @code{nnagent} $B$O4|8B@Z$l>C5n$r07$$$^$;$s!#$($((B
-$B$H!">/$J$/$H$bB>$N%P%C%/%(%s%I$N$h$&$K$=$l$r07$$$^$;$s!#$=$NBe$o$j$K!"FC(B
-$BJL$J(B @code{gnus-agent-expire} $B$H(B @code{gnus-agent-expire-group} $BL?Na(B
-$B$,(B @code{gnus-agent-expire-days} $B$NF|?t$h$j$b8E$$4{FI5-;v$r$9$Y$F>C5n$7(B
-$B$^$9!#$3$l$i$O$"$J$?$,%G%#%9%/MFNL$r;H$$@Z$j$=$&$@$H;W$C$?$H$-$K$$$D$G$b(B
-$B$G(B) $BCfCG$9$k$3$H$b$"$^$j(B
-$BNI$$$3$H$G$O$"$j$^$;$s!#(B
+$B%(!<%8%'%s%H%P%C%/%(%s%I(B @code{nnagent} $B$O4|8B@Z$l>C5n$r07$$$^$;$s!#$(!<(B
+$B$H!">/$J$/$H$bB>$N%P%C%/%(%s%I$N$h$&$K$=$l$r07$$$^$;$s!#$=$NBe$o$j$K!"(B
+@code{gnus-agent-expire-days} $B$NF|?t$h$j$b8E$$4{FI5-;v$r$9$Y$F>C5n$9$k!"(B
+$BFCJL$J(B @code{gnus-agent-expire} $B$H(B @code{gnus-agent-expire-group} $BL?Na$,(B
+$B$"$j$^$9!#$3$l$i$O$"$J$?$,%G%#%9%/MFNL$r;H$$@Z$j$=$&$@$H;W$C$?$H$-$K!"$$(B
+$B$D$G$b$G(B) $BCfCG$9$k$3$H$b$"$^(B
+$B$jNI$$$3$H$G$O$"$j$^$;$s!#(B
 
 $BNc$($P(B @code{gnus-request-expire-articles} $B$N$h$&$JB>$N4X?t$O!"%(!<%8%'(B
 $B%s%H$r%0%k!<%W$KF14|$5$;$k$?$a$K(B @code{gnus-agent-expire} $B$rC5n$rM^@)$9$k$?$a$K;H$o$l$k$+$b$7$l$^$;$s!#(B
+@code{agent-enable-expiration} $B$H$$$&%(!<%8%'%s%H$N%Q%i%a!<%?!<$r!"A*Br(B
+$B$7$?%0%k!<%W$G$N4|8B@Z$l>C5n$rM^@)$9$k$?$a$K;H$&$3$H$,$G$-$^$9!#(B
 
 @vindex gnus-agent-expire-all
 @code{gnus-agent-expire-all} $B$,(B @code{nil} $B$G$J$1$l$P!"%(!<%8%'%s%H$N4|(B
-$B8B@Z$l>C5n%3%^%s%I72$O$9$Y$F$N5-;v(B --- $BL$FI!"4{FI!"2D;k!"J]N15-;v$r>C5n(B
-$B$7$^$9!#$b$7(B @code{nil} ($B$3$l$,=i4|@_DjCM(B) $B$G$"$l$P!"4{FI5-;v$N$_$,>C5n(B
-$B$NBP>]$H$J$j!"L$FI!"2D;k!"J]N15-;v$O$5$i$KL54|8B$KJ];}$7$^$9!#(B
+$B8B@Z$l>C5n%3%^%s%I72$O$9$Y$F$N5-;v(B---$BL$FI!"4{FI!"2D;k!"J]N15-;v$r>C5n$7(B
+$B$^$9!#$b$7(B @code{nil} ($B$3$l$,%G%#%U%)%k%H(B) $B$G$"$l$P!"4{FI5-;v$N$_$,>C5n(B
+$B$NBP>]$H$J$j!"L$FI!"2D;k!"$5$i$KJ]N15-;v$OL54|8B$KJ];}$5$l$^$9!#(B
 
-$B4|8B@Z$l>C5n$5$l$F$$$k$O$:$J$N$K;D$C$F$$$k5-;v$r8+$D$1$?$J$i$P!"$?$V$s$$(B
-$B$/$D$+$N(B gnus $B%(!<%8%'%s%H%U%!%$%k$,2u$l$F$$$^$9!#(B
-@code{gnus-agent-regenerate} $B$H(B @code{gnus-agent-regenerate-group} $B$O!"(B
-$B5/$3$j$&$kLdBj$r=$I|$9$k$?$a$NFCJL$J%3%^%s%I$G$9!#(B
+$B4|8B@Z$l>C5n$5$l$k$O$:$J$N$K;D$C$F$$$k5-;v$r8+$D$1$?$J$i$P!"$b$7$+$9$k$H(B
+$B$$$/$D$+$N(B gnus $B%(!<%8%'%s%H%U%!%$%k$,2u$l$F$$$^$9!#5/$3$j$&$kLdBj$r=$I|(B
+$B$9$k$?$a$K!"(B
+@code{gnus-agent-regenerate} $B$H(B @code{gnus-agent-regenerate-group} $B$H$$(B
+$B$&FCJL$J%3%^%s%I$,$"$j$^$9!#(B
 
 @node Agent Regeneration
 @subsection $B%(!<%8%'%s%H$r:n$jD>$9(B
-
 @cindex agent regeneration
-@cindex Gnus agent regeneration
+@cindex gnus agent regeneration
 @cindex regeneration
 
 @code{nnagent} $B$K$h$C$F;H$o$l$k%m!<%+%k$N%G!<%?9=B$$O!"$"$kNc30E*$J>r7o(B
-$B$K$h$C$F$*$+$7$/$J$C$F$7$^$&$+$b$7$l$^$;$s!#$3$l$,5/$3$k$H!"(B
-@code{nnagent} $B$N5!G=@-$,2<$,$k$+$b$7$l$J$$$7!"<:GT$7$5$($9$k$+$b$7$l$^(B
-$B$;$s!#$3$NLdBj$N2r7h:v$O!"FbIt$NL7=b$r$9$Y$F:o=|$9$k$3$H$K$h$C$F!"%m!<%+(B
-$B%k$N%G!<%?9=B$$r=$I|$9$k$3$H$G$9!#(B
+$B$K$h$C$F$*$+$7$/$J$C$F$7$^$&$+$b$7$l$^$;$s!#$3$l$,5/$3$k(B
+$B$H(B @code{nnagent} $B$N5!G=@-$,2<$,$k$+$b$7$l$J$$$7!"<:GT$7$5$($9$k$+$b$7$l(B
+$B$^$;$s!#$3$NLdBj$N2r7h:v$O!"FbIt$NL7=b$r$9$Y$F:o=|$9$k$3$H$K$h$C$F!"%m!<(B
+$B%+%k$N%G!<%?9=B$$r=$I|$9$k$3$H$G$9!#(B
 
 $BNc$($P!"5-;v$r%(!<%8%'%s%H$K%@%&%s%m!<%I$7$F$$$k4V$K%5!<%P!<$X$N@\B3$,@Z(B
 $B$l$F$7$^$&>l9g!"%m!<%+%k$N%G!<%?9=B$$O@\B3$,@Z$l$kA0$K5-;v$,e(B
-$B$G$b(B @code{gnus-agent-regenerate} $B$re$G$b(B @code{gnus-agent-regenerate} $B$rpJs$rDs6!(B
-$B$7$^$9!#(B
+@node Agent and flags
+@subsection $B%(!<%8%'%s%H$H%U%i%0(B
 
-$B?4$KN1$a$F$*$/:G=i$N$3$H$O!"A4$F$N%U%i%0(B (read, ticked $B$J$I(B) $B$O(B nntp $B$N(B
-$B>l9g$K$*$1$k(B @file{.newsrc} $B$G$O$J$/$F(B @acronym{IMAP} $B%5!<%P!<$KJ];}$5$l(B
-$B$k$H$$$&$3$H$G$9!#$7$?$,$C$F!"(Bgnus $B$O(B @dfn{unplugged} $B$N$H$-$N%U%i%0$NJQ(B
-$B2=$r3P$($F$*$$$F!":F$S@\B3$7$?$H$-$K$=$l$i$N%U%i%0$rF14|$5$;$kI,MW$,$"$j(B
-$B$^$9!#(B
+$B%(!<%8%'%s%H$O(B gnus $B$N$I$s$J%P%C%/%(%s%I$G$b!"Nc$($P%5!<%P!<$K%U%i%0(B ($B4{(B
+$BFI(B(read)$B!"2D;k(B(ticked) $B$J$I(B) $B$r3JG<$9$k(B nnimap $B$N$h$&$J$b$N$G$bF0:n$7$^(B
+$B$9!#$7$+$7Ha$7$$$+$J!"%(!<%8%'%s%H$O$I$N%P%C%/%s%I$,$=$l$i$N%U%i%0(B
+$B$r(B @file{.newsrc} $B$G$O$J$/!"$=$N%P%C%/%(%s%I$N%5!<%P!<$G0];}$9$k$+$r!"o$K<+?H$N%U%!%$%k$K5-O?$7$^$9!#(B
 
-gnus $B$O%(!<%8%'%s%H$N85$G(B nnimap $B%0%k!<%W$rFI$`$H$-!"%U%i%0$NJQ2=$K@d$((B
-$B$:Cm0U$7$F$$$^$9!#$"$J$?$,:F$S@\B3$7$?$H$-!"(Bgnus $B$O$"$J$?$,2?$i$+$N%U%i(B
-$B%0$rJQ99$7$?$+$I$&$+$rD4$Y$F!"$"$J$?$,$=$l$i$r%5!<%P!<$HF14|$5$;$?$$$+$I(B
-$B$&$+$r?R$M$^$9!#$3$N5sF0$O(B @code{gnus-agent-synchronize-flags} $B$G%+%9%?(B
-$B%^%$%:$9$k$3$H$,$G$-$^$9!#(B
+$B:F$S@\B3$9$k$H!"(Bgnus $B$OJQ99$5$l$?$9$Y$F$N%U%i%0$r8!::$7$F!"$=$l$i$r%5!<(B
+$B%P!<$HF14|$5$;$k$+$I$&$+$r?R$M$^$9!#$3$N5sF0(B
+$B$O(B @code{gnus-agent-synchronize-flags} $B$G%+%9%?%^%$%:$9$k$3$H$,$G$-$^$9!#(B
 
 @vindex gnus-agent-synchronize-flags
-$B$b$7(B @code{gnus-agent-synchronize-flags} $B$,(B @code{nil} $B$@$C$?$i!"%(!<%8%'(B
-$B%s%H$O<+F0E*$K%U%i%0$rF14|$5$;$k$3$H$O$7$^$;$s!#$b$7$=$l$,=i4|CM(B
+@code{gnus-agent-synchronize-flags} $B$,(B @code{nil} $B$@$C$?$i!"%(!<%8%'%s%H(B
+$B$O<+F0E*$K%U%i%0$rF14|$5$;$k$3$H$O$7$^$;$s!#$=$l$,%G%#%U%)%k%H(B
 $B$N(B @code{ask} $B$@$C$?$i!"%(!<%8%'%s%H$O$"$J$?$,:F@\B3$7$?$H$-$K$"$J$?$,2?(B
-$B$i$+$NJQ99$r9T$J$C$F$$$?$+$I$&$+$rD4$Y$F!"$=$l$i$rF14|$5$;$?$$$+$I$&$+$r(B
-$B?R$M$^$9!#$b$7$=$l$i0J30$NCM$@$C$?>l9g$O!"A4$F$N%U%i%0$O<+F0E*$KF14|$5$;(B
-$B$i$l$^$9!#(B
+$B$i$+$NJQ99$r9T$J$C$F$$$?$+$I$&$+$rD4$Y$F!"$b$7$=$&$@$C$?$i!"$=$l$i$rF14|(B
+$B$5$;$?$$$+$I$&$+$r?R$M$^$9!#$=$l$i0J30$NCM$@$C$?>l9g$O!"$9$Y$F$N%U%i%0$O(B
+$B<+F0E*$KF14|$5$;$i$l$^$9!#(B
+
+$B:F@\B3$7$?$H$-$K<+F0$G%U%i%0$rF14|$5$;$?$/$J$$$J$i!"C$;$P!"$"$J$?$,!VF14|!W$NA`:n$r9T$J$C$?$H$-$K!"(B
+$B$=$N%U%i%0$O%;%C%H$5$l$F%5!<%P!<$+$i$O:o=|$5$l$^$9!#=gHVBT$A(B (queue) $B$K(B
+$BF~$l$i$l$?%U%i%0$K4X$9$kF0:n$O!"%(!<%8%'%s%H%G%#%l%/%H%j!<$K$"$k%5!<%P!<(B
+$BKh$N(B @code{flags} $B%U%!%$%k$NCf$G8+$D$+$k$G$7$g$&!#$=$l$i$O$"$J$?$,%U%i%0(B
+$B$rF14|$5$;$?$H$-$K6u$K$J$j$^$9!#(B
+
+@node Agent and IMAP
+@subsection $B%(!<%8%'%s%H$r(B IMAP $B$G;H$&J}K!(B
 
-$B$b$7$"$J$?$,!":F@\B3$7$?$H$-$K<+F0$G%U%i%0$rF14|$5$;$?$/$J$$$J$i!"O$G$O%5!<%P!<$H$N@\B3$,@d$?$l$?%b!<%I$G$N(B @acronym{IMAP} $B$N%/%i%$%"(B
+$B%s%H$H$7$F!"(Bgnus $B%(!<%8%'%s%H$r$h$j1_3j$K;H$($k$h$&$K$9$k$?$a$N!"$$$/$D(B
+$B$+$N>pJs$rDs6!$7$^$9!#(B
 
-$B$"$J$?$,!"(B@dfn{unplugged} $B$N$H$-$N(B @acronym{IMAP} $B%/%i%$%"%s%H$K4|BT$9$k(B
-$B$G$"$m$&$$$/$D$+$N5!G=$O!"8=:_$N%(!<%8%'%s%H$K$O@9$j9~$^$l$F$$$^$;$s!#$=(B
-$B$l$i$O0J2<$NDL$j$G$9!#(B
+$B%5!<%P!<$H$N@\B3$,@d$?$l$F$$$k$H$-$N(B @acronym{IMAP} $B%/%i%$%"%s%H$K$"$J$?(B
+$B$,4|BT$9$k$G$"$m$&$$$/$D$+$N5!G=$O!"8=:_$N%(!<%8%'%s%H$K$O@9$j9~$^$l$F$$(B
+$B$^$;$s!#$=$l$i$O0J2<$NDL$j$G$9(B:
 
 @itemize @bullet
-
 @item
-@dfn{unplugged} $B$N$H$-$N(B nnimap $B%0%k!<%W$X$N%3%T!<$H0\F0!#(B
+Unplugged $B$N$H$-$N(B nnimap $B%0%k!<%W$X$N%3%T!<$H0\F0!#(B
 
 @item
-@dfn{unplugged} $B$N$H$-$N(B nnimap $B%0%k!<%W$N:n@.$H:o=|!#(B
+Unplugged $B$N$H$-$N(B nnimap $B%0%k!<%W$N:n@.$H:o=|!#(B
 @end itemize
 
-$B5;=QE*CmC$;$P!"$"$J$?$,(B ``$BF14|(B'' $B$NA`:n$r9T$J$C(B
-$B$?$H$-$K!"$=$N%U%i%0$O%;%C%H$5$l$F%5!<%P!<$+$i$O:o=|$5$l$^$9!#(B
-@c FIXMETGNUS Does it make sense?
-"The queued flag" $B$K4X$9$kF0:n$O!"%(!<%8%'%s%H%G%#%l%/%H%j$K$"$k%5!<%P!<(B
-$BKh$N(B @code{flags} $B%U%!%$%k$NCf$G8+$D$+$k$G$7$g$&!#$=$l$i$O$"$J$?$,%U%i%0(B
-$B$rF14|$5$;$?$H$-$K6u$K$J$j$^$9!#(B
-
 @node Outgoing Messages
 @subsection $B:9=PMQ%a%C%;!<%8(B
 
-$B%G%#%U%)%k%H$G!"(BGnus $B$,@Z$jN%$5$l$F$$$k$H$-!"A4$F$N:9=PMQ%a%C%;!<%8(B ($B%a!<(B
-$B%k$H%K%e!<%9$NN>J}(B) $B$O2<=q$-%0%k!<%W(B ``queue'' (@pxref{Drafts}) $B$K3JG<$5(B
-$B$l$^$9!#Ej9F$7$?8e$G$b!"$3$3$G$=$N%a%C%;!<%8$r8+$?$jJT=8$9$k$N$O0U$N$^$^(B
-$B$G$9!#(B
+gnus $B$,(B unplugged $B$N$H$-!"%G%#%U%)%k%H$G$O$9$Y$F$N:9=PMQ%a%C%;!<%8(B ($B%a!<(B
+$B%k$H%K%e!<%9$NN>J}(B) $B$O2<=q$-%0%k!<%W!H(Bqueue$B!I(B(@pxref{Drafts}) $B$K3JG<$5$l(B
+$B$^$9!#Ej9F$7$?8e$G$b!"$=$3$G$=$N%a%C%;!<%8$r8+$?$jJT=8$9$k$N$O0U$N$^$^$G(B
+$B$9!#(B
 
 $BAw=P$9$k%a!<%k$,(B queue $B$5$l$k(B ($B=gHVBT$A$K$J$k(B) $B>u67$r@)8f$9$k$3$H$O2DG=(B
-$B$G$9(B (@code{gnus-agent-queue-mail}, @pxref{Agent Variables} $B;2>H(B)$B!#(B
-Gnus $B$,@Z$jN%$5$l$F$$$k>l9g!"%K%e!<%9$O>o$K(B queue $B$5$l$k$@$1$G$9!#(B
+$B$G$9(B (@code{gnus-agent-queue-mail}, @ref{Agent Variables} $B;2>H(B)$B!#(B
+gnus $B$,(B unplugged $B$N$H$-!"30$KAw$j=P$9%K%e!<%9$O>o$K(B queue $B$5$l$k$@$1$G(B
+$B$9!#(B
 
-$B%a%C%;!<%8$rAw?.$9$k$?$a$K!"2<=q$-%0%k!<%W$+$i!"$=$3$G;H$($kFCJL$JL?Na$r(B
-$B;H$C$FAw$k$3$H$b!"%0%k!<%W%P%C%U%!Fb$G(B @kbd{J S} $B$r;H$C$F!"2<=q$-%0%k!<(B
-$B%WFb$N$9$Y$F$NAw?.2DG=$J%a%C%;!<%8Aw?.$9$k$3$H$b$G$-$^$9!#%K%e!<%9$NEj9F(B
-$B$O(B Gnus $B$,:9$79~$^$l$F$$$k$H$-$@$1$G$-$^$9$,!"%a!<%k$O$$$D$G$bAw?.$9$k$3(B
-$B$H$,$G$-$^$9!#(B
+$B2<=q$-%0%k!<%W$+$i!"$=$3$G;H$($kFCJL$JL?Na$r;H$C$F%a%C%;!<%8$rAw?.$9$k$3(B
+$B$H$b$G$-$k$7!"%0%k!<%W%P%C%U%!!H(B)$B!#(B
 
 @node Agent Variables
@@ -17863,52 +18766,53 @@ Variables} $B;2>H(B)$B!#(B
 @table @code
 @item gnus-agent
 @vindex gnus-agent
-$B%(!<%8%'%s%H$,M-8z$K$J$C$F$$$k$+$I$&$+!#%G%#%U%)%k%H$O(B @code{t} $B$G$9!#(B
-$B:G=i$KM-8z$K$5$l$k$H!"$$$/$D$+$N%P%C%/%(%s%I$r%(!<%8%'%s%H2=$9$k$?$a$K!"(B
-$B%(!<%8%'%s%H$O(B @code{gnus-agent-auto-agentize-methods} $B$r;H$$$^$9!#%5!<(B
-$B%P!<%P%C%U%!$G%(!<%8%'%s%H$N%3%^%s%I$r;H$&$3$H$K$h$C$F!"$I$N%P%C%/%(%s(B
-$B%I$r%(!<%8%'%s%H2=$9$k$+$rJQ99$9$k$3$H$,$G$-$^$9!#(B
+$B%(!<%8%'%s%H$,M-8z$K$J$C$F$$$k$+$I$&$+!#%G%#%U%)%k%H$O(B @code{t} $B$G$9!#:G(B
+$B=i$KM-8z$K$5$l$k$H!"$$$/$D$+$N%P%C%/%(%s%I$r<+F0E*$K%(!<%8%'%s%H2=$9$k$?(B
+$B$a$K!"%(!<%8%'%s%H$O(B @code{gnus-agent-auto-agentize-methods} $B$r;H$$$^$9!#(B
+$B%5!<%P!<%P%C%U%!!<$G%(!<%8%'%s%H$N%3%^%s%I$r;H$&$3$H$K$h$C$F!"$I$N%P%C%/(B
+$B%(%s%I$r%(!<%8%'%s%H2=$9$k$+$rJQ99$9$k$3$H$,$G$-$^$9!#(B
 
-$B%5!<%P!<%P%C%U%!$KF~$k$K$O!"%0%k!<%W%P%C%U%!(B
+$B%5!<%P!<%P%C%U%!!<$KF~$k$K$O!"%0%k!<%W%P%C%U%!!<(B
 $B$G(B @kbd{^} (@code{gnus-group-enter-server-mode}) $B$r;H$C$F2<$5$$!#(B
 
 @item gnus-agent-directory
 @vindex gnus-agent-directory
-Gnus $B%(!<%8%'%s%H$,%U%!%$%k$r3JG<$9$k>l=j!#=i4|@_DjCM(B
-$B$O(B @file{~/News/agent/}$B!#(B
+gnus $B%(!<%8%'%s%H$,%U%!%$%k$r3JG<$9$k>l=j$G$9!#%G%#%U%)%k%H(B
+$B$O(B @file{~/News/agent/} $B$G$9!#(B
 
 @item gnus-agent-handle-level
 @vindex gnus-agent-handle-level
 $B$3$NJQ?t$NCM$h$j9b$$%l%Y%k(B (@pxref{Group Levels}) $B$N%0%k!<%W$O!"%(!<%8%'(B
-$B%s%H$+$i$OL5;k$5$l$^$9!#=i4|@_DjCM$O(B @code{gnus-level-subscribed} $B$G!"$3(B
-$B$l$O=i4|@_Dj$G$O!"9XFI$7$F$$$k%0%k!<%W$N$_$,%(!<%8%'%s%H$N=hM}$NBP>]$H$J(B
-$B$k$H$$$&$3$H$G$9!#(B
+$B%s%H$+$i$OL5;k$5$l$^$9!#%G%#%U%)%k%H$O(B @code{gnus-level-subscribed} $B$G!"(B
+$B$3$l$O%G%#%U%)%k%H$G$O!"9XFI$7$F$$$k%0%k!<%W$N$_$,%(!<%8%'%s%H$N=hM}$NBP(B
+$B>]$H$J$k$H$$$&$3$H$G$9!#(B
 
 @item gnus-agent-plugged-hook
 @vindex gnus-agent-plugged-hook
-$B%M%C%H%o!<%/$K@\B3$5$l$?$H$-$KuBV$N%5!<%P!<$r%*%s%i%$%s>uBV$K$7$^$;$s!#(B@code{ask} $B$@$C$?$i!"$=$l(B
 $B$,%G%#%U%)%k%H$G$9$,!"%(!<%8%'%s%H$O:F@\B3$9$k$H$-$K%*%U%i%$%s>uBV$N%5!<(B
-$B%P!<$r%*%s%i%$%s>uBV$K$9$k$+$I$&$+$r?R$M$^$9!#$=$l0J30$NCM$@$C$?$i!"%*%U(B
-$B%i%$%s>uBV$N%5!<%P!<$O<+F0E*$K%*%s%i%$%s>uBV$K$J$j$^$9!#(B
+$B%P!<$r%*%s%i%$%s>uBV$K$7$?$$$+$I$&$+$r?R$M$^$9!#$=$l0J30$NCM$@$C$?$i!"%*(B
+$B%U%i%$%s>uBV$N%5!<%P!<$O<+F0E*$K%*%s%i%$%s>uBV$K$J$j$^$9!#(B
 
 @item gnus-agent-mark-unread-after-downloaded
 @vindex gnus-agent-mark-unread-after-downloaded
@@ -17917,25 +18821,33 @@ plugged $B$N$H$-$K!"%m!<%+%k$K;}$C$F$$$k(B @acronym{NOV} $B$H5-;v$r;H$&$+$I$&
 $B%I$5$l$?5-;v$rL@3N$KL$FI$K$9$k$?$a$N0BA4$J9T0Y$G$9!#%G%#%U%)%k%H(B
 $B$O(B @code{t} $B$G$9!#(B
 
+@item gnus-agent-synchronize-flags
+@vindex gnus-agent-synchronize-flags
+@code{gnus-agent-synchronize-flags} $B$,(B @code{nil} $B$@$C$?$i!"%(!<%8%'%s%H(B
+$B$O7h$7$F<+F0E*$K%U%i%0$rF14|$5$;$^$;$s!#$=$l$,(B @code{ask} $B$@$C$?$i(B ($B$=$l(B
+$B$,%G%#%U%)%k%H$G$9(B)$B!"%(!<%8%'%s%H$O$9$Y$F$NJQ99$r8!::$7$F!":F$S@\B3$7$?(B
+$B$H$-$K$=$l$i$rF14|$5$;$k$+$I$&$+$r?R$M$^$9!#(B@code{nil} $B$G(B
+$B$b(B @code{ask} $B$G$b$J$+$C$?$i!"$9$Y$F$N%U%i%0$,<+F0E*$KF14|$5$;$i$l$^$9!#(B
+
 @item gnus-agent-consider-all-articles
 @vindex gnus-agent-consider-all-articles
 @code{gnus-agent-consider-all-articles} $B$,Hs(B-@code{nil} $B$@$C$?$i!"%(!<%8%'(B
 $B%s%H$O$9$Y$F$N5-;v$K$D$$$F!"$=$l$i$r%@%&%s%m!<%I$9$kI,MW$,$"$k$+$I$&$+$r(B
 $B%(!<%8%'%s%H$N=R8l$K7hDj$5$;$^$9!#(B@code{nil} $B$@$C$?>l9g!"$=$l$,%G%#%U%)(B
 $B%k%H$G$9$,!"%(!<%8%'%s%H$OL$FI$N5-;v$r%@%&%s%m!<%I$9$k$+$I$&$+$@$1$r=R8l(B
-$B$K7hDj$5$;$^$9!#$3$l$rM-8z$K$9$k$K$O!"8e$G%(!<%8%'%s%H$,4|8B@Z$l>C5n$9$k(B
-$B5-;v$r2?EY$b7+$jJV$7%@%&%s%m!<%I$7$J$$$h$&$K!"%(!<%8%'%s%H$N4|8B@Z$l>C5n(B
-$B$N@_Dj(B (@pxref{Category Variables}) $B$r8+D>$9I,MW$b$"$k$+$b$7$l$^$;$s!#(B
+$B$K7hDj$5$;$^$9!#$3$l$rM-8z$K$9$k$N$J$i$P!"8e$G%(!<%8%'%s%H$,4|8B@Z$l>C5n(B
+$B$9$k5-;v$r2?EY$b7+$jJV$7%@%&%s%m!<%I$7$J$$$h$&$K!"%(!<%8%'%s%H$N4|8B@Z$l(B
+$B>C5n$N@_Dj(B (@pxref{Category Variables}) $B$r8+D>$9I,MW$,$"$k$G$7$g$&!#(B
 
 @item gnus-agent-max-fetch-size
 @vindex gnus-agent-max-fetch-size
 $B%(!<%8%'%s%H$O!".$5$JCM$O!"K|$,0ll(B
-$B9g$K!"CY$l;~4V$r:G>.$K$7$^$9(B ($B%0%k!<%W$N>uBV$r99?7$9$k$?$a(B
+$B$K!"$=$l$i$r0l;~E*$J%P%C%U%!!<$Xe$5$;$^$9!#>.$5$JCM$O!"K|$,0ll9g$K!"CY$l;~4V$r:G>.$K$7$^$9(B ($B%0%k!<%W$N>uBV$r99?7$9$k$?$a(B
 $B$K(B @code{gnus-agent-regenerate-group} $B$r$NA*Br;h$K$O(B @code{denied} $B$H(B @code{offline} $B$,$"$j!"%(!<%8%'(B
-$B%s%H$,;H$o$l$k>l9g$O8e$NA*Br;h$K$O(B @code{denied} $B$H(B @code{offline} $B$,$"$j!"8el9g$@$1M-8z$G$9!#(B
 
 @item gnus-auto-goto-ignores
 @vindex gnus-auto-goto-ignores
-$BBgDq$N?M$O!"%(!<%8%'%s%HJQ?t$G$O$J$$$,L)@\$K4XO"$9$k$b$&0l$D$NJQ?t$r$3$3(B
-$B$GC5$9$G$7$g$&!#$3$NJQ?t$O!"%@%&%s%m!<%I$5$l$F$$$J$$(B ($B%X%C%@!<$@$1$,%(!<(B
-$B%8%'%s%H$K3JG<$5$l$?(B)$B!"$=$7$Fo$KL5;k$9$k$3$H(B)$B!"(B@code{unfetched} ($BA`:n$O%X%C%@!<$,o$KL5;k$9$k(B)$B!"(B
+@code{unfetched} ($B%X%C%@!<$,o$K(B queue ($B=gHVBT$A(B) $B$KF~$l$^$9!#(B
-@code{t} $B$@$C$?$i(B Gnus $B$O@Z$jN%$5$l$F$$$k$H$-$@$1%a!<%k$r(B queue $B$KF~$l$^(B
-$B$9!#(B@code{nil} $B$@$C$?$i(B queue $B$KF~$l$^$;$s!#%G%#%U%)%k%H$O(B @code{t} $B$G$9!#(B
+@code{t} $B$@$C$?$i(B gnus $B$O(B unplugged $B$N$H$-$@$1%a!<%k$r(B queue $B$KF~$l$^$9!#(B
+@code{nil} $B$@$C$?$i(B queue $B$KF~$l$^$;$s!#%G%#%U%)%k%H$O(B @code{t} $B$G$9!#(B
 
 @item gnus-agent-prompt-send-queue
 @vindex gnus-agent-prompt-send-queue
-@code{gnus-agent-prompt-send-queue} $B$,Hs(B-@code{nil} $B$@$C$?$i!"@Z$jN%$5$l(B
-$B$F$$$k$N$K$b$+$+$o$i$:(B @kbd{J S} $B$rC!$$$?>l9g$K!"(BGnus $B$OK\Ev$K$=$l$r9T$J$C(B
-$B$F$bNI$$$+$I$&$+$r3NG'$7$^$9!#%G%#%U%)%k%H$O(B @code{nil} $B$G$9!#(B
+@code{gnus-agent-prompt-send-queue} $B$,Hs(B-@code{nil} $B$@$C$?$i!"(B
+unplugged $B$G$"$k$N$K$b$+$+$o$i$:(B @kbd{J S} $B$rC!$$$?>l9g$K!"(Bgnus $B$OK\Ev$K(B
+$B$=$l$r9T$J$C$F$bNI$$$+$I$&$+$r3NG'$7$^$9!#%G%#%U%)%k%H$O(B @code{nil} $B$G$9!#(B
 
 @item gnus-agent-auto-agentize-methods
 @vindex gnus-agent-auto-agentize-methods
-$B$"$J$?$,0JA0$K%(!<%8%'%s%H$r;H$C$?$3$H$,L5$$(B ($B$b$C$H5;=QE*$K$O!"(B
-@file{~/News/agent/lib/servers} $B$,L5$$>l9g(B)$B!"(BGnus $B$O$[$s$N>/?t$N%5!<%P!<(B
-$B$r<+F0E*$K%(!<%8%'%s%H2=$7$^$9!#$3$NJQ?t$O$I$N%P%C%/%(%s%I$r<+F0$G%(!<%8%'(B
-$B%s%H2=$9$Y$-$+$r@)8f$7$^$9!#0lHL$K!"%(!<%8%'%s%H2=$O1s3V%P%C%/%(%s%I$@$1(B
-$B$KM-MQ$G$9!#<+F0$N%(!<%8%'%s%H2=$O!"%5!<%P!<$KBP$7$F(B @kbd{J a} $B$rl9g(B)$B!"(Bgnus $B$O$[$s$N>/?t$N%5!<(B
+$B%P!<$r<+F0E*$K%(!<%8%'%s%H2=$7$^$9!#$3$NJQ?t$O$I$N%P%C%/%(%s%I$r<+F0$G%(!<(B
+$B%8%'%s%H2=$9$Y$-$+$r@)8f$7$^$9!#0lHL$K!"%(!<%8%'%s%H2=$9$k$3$H$,M-MQ$J$N(B
+$B$O1s3V%P%C%/%(%s%I$KBP$7$F$@$1$G$9!#<+F0E*$K%(!<%8%'%s%H2=$9$k$3$H$O!"%5!<(B
+$B%P!<$KBP$7$F(B @kbd{J a} $B$r$K9g$o$;$FJT=8$7!"(BPPP ($B$d2?$+(B) $B$r5/F0$7$F!"(B
-@kbd{M-x gnus} $B$HBG80$7$F$/$@$5$$!#(B
+$B4pK\E*$K$O$3$l$@$1$GNI$$$O$:$G$9!#$3$l$r(B @file{~/.gnus.el} $B%U%!%$%k$KF~(B
+$B$l$F!"I,MW$K1~$8$FJT=8$7!"(BPPP ($B$d2?$+(B) $B$r5/F0$7$F!"(B@kbd{M-x gnus} $B$H%?%$(B
+$B%W$7$F2<$5$$!#(B
 
-$B$"$J$?$,=i$a$F(B gnus $B$ro$H$F$b;~(B
-$B4V$,$+$+$j$^$9$,!"0lEY$@$1$7$+C5n$7$^$9!#(B(@kbd{A k} $B$G:o=|(B
-$B%0%k!<%W$OA4$FLa$C$F$-$^$9!#(B)
+$BFI$_9~$_$H2r@O$K$7$P$i$/;~4V$rHq$d$7$?8e$G!"%0%k!<%W$N0lMw$,8=$l$^$9!#$=(B
+$B$&$7$?$i!"FI$_$?$$%0%k!<%W$r(B @kbd{u} $BL?Na$G9XFI$G$-$k$h$&$K$7$F2<$5$$!#(B
+$BFI$_$?$$%0%k!<%W$rA4It9XFI$G$-$k$h$&$K$7$?$i!"(B@kbd{l} $B$G(B killed ($B:o=|$5(B
+$B$l$?(B) $B%0%k!<%W$r$9$Y$F2hLL$+$i>C5n$7$^$7$g$&!#(B(@kbd{A k} $B$G(B killed $B%0%k!<(B
+$B%W$O$9$Y$FLa$C$F$-$^$9!#(B)
 
-$B$5$F!"$3$3$G$=$N>l$G%0%k!<%W$rFI$`$3$H$b$G$-$^$9$7!"$"$k$$(B
-$B$O(B @kbd{J s} $BL?Na$G5-;v$r%@%&%s%m!<%I$9$k$3$H$b$G$-$^$9!#$"$H$O$3$N%^%K%e(B
-$B%"%k$N;D$j$rFI$s$G!"$=$NB>$N2?I42/$N9`L\$+$i%+%9%?%^%$%:$7$?$$$3$H$r8+$D(B
-$B$1=P$7$F$/$@$5$$!#(B
+$B:#$d$9$0$K%0%k!<%W$rFI$`$3$H$b$G$-$k$7!"(B@kbd{J s} $BL?Na$G5-;v$r%@%&%s%m!<(B
+$B%I$9$k$3$H$b$G$-$^$9!#$"$H$O$3$N%^%K%e%"%k$N;D$j$rFI$s$G!"B>$N2/@iK|$N9`(B
+$BL\$+$i%+%9%?%^%$%:$7$?$$$3$H$r8+$D$1=P$7$F2<$5$$!#(B
 
 @node Batching Agents
 @subsection $B0l3g%(!<%8%'%s%H=hM}(B
 @findex gnus-agent-batch
 
-Gnus $B%(!<%8%'%s%H$K5-;v$ro$K4JC1$G$9!#(B
-$B0J2<$N%7%'%k%9%/%j%W%H$OI,MW$J$3$H$rA4$F$d$C$F$/$l$k$G$7$g$&!#(B
+gnus $B%(!<%8%'%s%H$K5-;v$ro$K4J(B
+$BC1$G$9!#0J2<$N%7%'%k%9%/%j%W%H$OI,MW$J$3$H$r$9$Y$F$d$C$F$/$l$k$G$7$g$&!#(B
 
 $B0J2<$N/dev/null 2>&1
 
 @node Control Agents
 @subsection gnus-agent $B4D6-$r(B Control $B$9$k(B
-$B$3$3$^$GFI$s$GMh$i$l$F!"%(!<%8%'%s%H$,Hs>o$KJXMx$J5!G=$G$"$k;v$,J,$+$C$?(B
-$B$H;W$$$^$9!#$?$@!"ITK~$JE@$,$"$k$H$9$k$H!"Kh2s(B @kbd{J j} $B$d(B @kbd{J S} $BEy(B
-$B$r%-!<$G:n6H$7$J$1$l$P$J$i$J$$$3$H$G$7$g$&!#%*%s%i%$%s$HF1$8$h$&$JA`:n$G(B
-$B$d$j$H$j$G$-$?$i!"$H9M$($?;v$O$"$j$^$;$s$+(B?
-gnus-offline $B$O$=$N5!G=$rDs6!$7$^$9!#(B($BI.)$7$^$9!#(B@code{MIEE} $B$K$D$$$F$O8e=R;2>H(B)
 
-*Group* $B%P%C%U%!$G(B @kbd{g} $B$r2!$9;v$G(B
+$B$3$3$^$GFI$s$GMh$i$l$F!"%(!<%8%'%s%H$,Hs>o$KJXMx$J5!G=$G$"$k$3$H$,J,$+$C(B
+$B$?$H;W$$$^$9!#$?$@!"ITK~$JE@$,$"$k$H$9$k$H!"Kh(B
+$B2s(B @kbd{J j} $B$d(B @kbd{J S} $BEy$r%-!<$G:n6H$7$J$1$l$P$J$i$J$$$3$H$G$7$g$&!#(B
+$B%*%s%i%$%s$HF1$8$h$&$JA`:n$G$d$j$H$j$G$-$?$i!"$H9M$($?$3$H$O$"$j$^$;$s(B
+$B$+(B?  gnus-offline $B$O$=$N5!G=$rDs6!$7$^$9!#(B($BI.)$7$^$9!#(B@code{MIEE} $B$K$D$$$F$O8e=R;2>H(B)
+
+*Group* $B%P%C%U%!!<$G(B @kbd{g} $B$r2!$9$3$H$G(B
 
 @lisp
  (Dialup $B$NI,MW$J4D6-$G$O(B Dialup) ->
@@ -18071,11 +18983,10 @@ gnus-offline $B$O$=$N5!G=$rDs6!$7$^$9!#(B($BI.Dj$7$^(B
-$B$9(B) @file{~/.emacs} $B$N(B gnus-agent $B$N@_Dj$N$A$g$$$HA0$K(B
+$B%$%s%9%H!<%k$O$$$?$C$F4JC1(B ($B$3$3$^$G$G(B gnus-agent $B$N@_Dj$O=*$C$F$$$k$H(B
+$B2>Dj$7$^$9(B)$B!#(B@file{~/.emacs} $B$N(B gnus-agent $B$N@_Dj$N$A$g$$$HA0$K(B
 
 @lisp
 (load "gnus-ofsetup")
@@ -18083,24 +18994,26 @@ gnus-offline $B$O$=$N5!G=$rDs6!$7$^$9!#(B($BI.l9g$K(B
-$B$O!"(B@code{MIEE} $B$N@_Dj$O$$$C$5$$$7$J$/$F$b$+$^$$$^$;$s!#(B
+$B$9(B) @code{MIEE} $B$O!"(B
+@uref{http://www.shiojiri.ne.jp/%7Et-ichi/lisp/miee.el} $B$+$il9g$K$O!"(B
+@code{MIEE} $B$N@_Dj$O$$$C$5$$$7$J$/$F$b$+$^$$$^$;$s!#(B
 
 @table @code
 @vindex gnus-offline-articles-to-fetch
@@ -18115,18 +19028,18 @@ Mail/News $BN>J}$ruBV$K$J$kD>A0$KI>2A$5$l$k(B hook $B$G$9!#(B
+$B$3$NJQ?t$O(B gnus $B$,(B Online(Plugged) $B>uBV$K$J$kD>A0$KI>2A$5$l$k(B hook $B$G$9!#(B
 
 @vindex gnus-offline-after-online-hook
 @item gnus-offline-after-online-hook
-$B$3$NJQ?t$O(B Gnus $B$,(B Offline(UnPlugged) $B>uBV$K$J$C$?8e$KI>2A$5$l$k(B hook $B$G(B
+$B$3$NJQ?t$O(B gnus $B$,(B Offline(UnPlugged) $B>uBV$K$J$C$?8e$KI>2A$5$l$k(B hook $B$G(B
 $B$9!#(B
 
 @vindex gnus-offline-interval-time
 @item gnus-offline-interval-time
 $B$3$NJQ?t$G;XDj$5$l$?4V(B
 $B3V(B ($BIC?t(B) $B$G(B @code{gnus-offline-articles-to-fetch} $B$G;XDj$5$l(B
-$B$?(B article $B$rJ}$r$N%*%U%i%$%s%K%e!<%9%j!<%@!<$N$h$&$K$OF0:n$7$^$;(B
-$B$s!#$3$l$i$OA[A|E*$J?M$+$i$NNI$/$"$k$N%*%U%i%$%s%K%e!<%9%j!<%@!<$N$h$&$K$OF0(B
+$B:n$7$^$;$s!#$3$l$i$O2M6u$N?M!9$+$i$NNI$/$"$k$`$N$J$i$P!"(B
-@code{gnus-select-article-hook} $B$K(B @code{gnus-agent-fetch-selected-article} $B$r(B
-$B2C$($F2<$5$$!#(B
+@strong{$B$$$$$((B}$B!#$3$NF0:n$r$*K>$_$J$i(B @code{gnus-select-article-hook} $B$K(B
+$B4X?t(B @code{gnus-agent-fetch-selected-article} $B$r2C$($F2<$5$$!#(B
 
-@item $B@\B3$5$l$F$$$k$H$-$K5-;v$rFI$s$G!"(BAgent $B$K5-;v$,B8:_$7$F$$$k>l9g!"(B
+@item Plugged $B$N$H$-$K5-;v$rFI$s$G!"%(!<%8%'%s%H$K5-;v$,B8:_$7$F$$$k>l9g!"(B
 $B$b$&0l2s%@%&%s%m!<%I$5$l$k$N$G$9$+(B?
 
 @strong{$B$$$$$((B}$B!"$?$@$7(B @code{gnus-agent-cache} $B$,(B @code{nil} $B$G$J$+$C$?(B
 $B$i!"$G$9$,!#(B
 @end table
 
-$BMWLs$9$k$H!"(Bgnus $B$,@Z$jN%$5$l$F$$$k$H$-$O%m!<%+%k$KJ]B8$5$l$?5-;v$r8+$k(B
-$B$@$1$G$9!#@\B3$5$l$F$$$k$H$-$O(B ISP $B$HOC$7!"$+$D%m!<%+%k$K;}$C$F$$$k5-;v(B
-$B$b;H$&$+$b$7$l$^$;$s!#(B
+$BMWLs$9$k$H!"(Bgnus $B$,(B unplugged $B$N$H$-$O%m!<%+%k$KJ]B8$5$l$?5-;v$r8+$k$@$1(B
+$B$G$9!#(BPlugged $B$N$H$-$O(B ISP $B$HOC$7!"$+$D%m!<%+%k$K;}$C$F$$$k5-;v$b;H$&$G(B
+$B$7$g$&!#(B
 
 @node Scoring
 @chapter $B%9%3%"(B
 @cindex scoring
 
-$BB>$N?M!9$O(B @dfn{$B:o=|%U%!%$%k(B} $B$r;H$$$^$9$,!"$3$3(B gnus $B%?%o!<$O:o=|$h$j$b(B
-$B%9%3%"$NJ}$r9%$_$^$9$N$G!"B>$H3JF.$9$k$h$j$O@Z$jBX$($k;v$K$7$^$7$?!#$=$l(B
-$B$i$O40A4$K0c$&;v$r$7$^$9$N$G!"??$CD>$0$K:B$C$FCm0U$rJ'$C$F$/$@$5$$(B!
+$B$[$+$N?M$?$A$O!V:o=|%U%!%$%k!W(B(@dfn{kill files}) $B$r;H$$$^$9$,!"$3(B
+$B$3(B Gnus $B%?%o!<$K$$$k;d$?$A$O:o=|$h$j$b%9%3%"$NJ}$,9%$-$G$9!#H`$i$H$1$s$+(B
+$B$r$9$k$h$j$O@Z$jBX$($F$7$^$&J}$,$^$7$G$7$g$&!#$=$l$i$O40A4$K0c$&$3$H$r$9(B
+$B$k$N$G!"??$CD>$0$K:B$C$FCm0U$rJ'$C$F2<$5$$(B!
 
-@vindex gnus-summary-below
-$BA4$F$N5-;v$O%9%3%"$N=i4|CM$r;}$C$F$*(B
-$B$j(B (@code{gnus-summary-default-score})$B!"$3$l$O%G%#%U%)%k%H$G(B 0 $B$G$9!#$3(B
-$B$N%9%3%"$OBPOCE*$d!"%9%3%"%U%!%$%k(B (score file) $B$NJ}K!$K$h$j!">e$2$i$l$?(B
-$B$j2<$2$i$l$?$j$7$^$9!#(B@code{gnus-summary-mark-below} $B$h$j$bDc$$%9%3%"$N(B
-$B5-;v$K$O4{FI$N0u$,IU$-$^$9!#(B
+@vindex gnus-summary-mark-below
+$B$9$Y$F$N5-;v$O%G%#%U%)%k%H$N%9%3(B
+$B%"(B (@code{gnus-summary-default-score}) $B$NCM$r;}$C$F$$$F!"%G%#%U%)%k%H$G(B
+$B$O(B 0 $B$G$9!#$3$N%9%3%"$OBPOCE*$K!"$^$?$O%9%3%"%U%!%$%k(B (score file) $B$K$h$C(B
+$B$F!">e$2$i$l$k$+2<$2$i$l$k$+$7$^$9!#(B@code{gnus-summary-mark-below} $B$h$j(B
+$B$bDc$$%9%3%"$r;}$C$F$$$k5-;v$K$O4{FI$N0u$,IU$-$^$9!#(B
 
-Gnus $B$O35N,%P%C%U%!$r:n@.$9$kA0$K!"8=:_$N%0%k!<%W$KE,MQ$5$l$k$I$s(B
-$B$J(B @dfn{$B%9%3%"%U%!%$%k(B} $B$bFI$_9~$_$^$9!#(B
+gnus $B$O35N,%P%C%U%!!<$r:n@.$9$kA0$K!"8=:_$N%0%k!<%W$KE,MQ$5$l$k$I$s$J(B
+$B!V%9%3%"%U%!%$%k!W$bFI$_9~$_$^$9!#(B
 
-$B8=:_$N5-;v$K4p$E$$$F%9%3%"$NEPO?$rA^F~$9$k$$$/$D$+$NL?Na$,35N,%P%C%U%!$K(B
-$B$"$j$^$9!#Nc$($P!"(Bgnus $B$KFCDj$NI=Bj$N5-;v$N%9%3%"$r2<$2$?$j>e$2$?$j$9$k(B
-$B$h$&$K5a$a$k;v$,$G$-$^$9!#(B
+$B8=:_$N5-;v$K4p$E$$$F%9%3%"$N%(%s%H%j!<$rA^F~$9$k!"J#?t$N35N,%P%C%U%!!<$N(B
+$BL?Na$,$"$j$^$9!#Nc$($P!"(Bgnus $B$KFCDj$NI=Bj$N5-;v$N%9%3%"$r2<$2$?$j>e$2$?(B
+$B$j$9$k$h$&$K5a$a$k$3$H$,$G$-$^$9!#(B
 
-$BFse;H$o$l$F$$$J$$$I$s$J(B
-$BEPO?$b!"%9%3%"%U%!%$%k$NBg$-$5$r>.$5$/$9$k$?$a$K!"@E$+$K:o=|$5$l$^$9!#(B
+$BFsC5n$9$k%(%s%H%j!<$G$9!#Nc(B
+$B$($P0l=54V0J>e;H$o$l$F$$$J$$%(%s%H%j!<$O!"%9%3%"%U%!%$%k$NBg$-$5$r>.$5$/(B
+$B$7$F$*$/$?$a$K@E$+$K:o=|$5$l$^$9!#(B
 
 @menu
-* Summary Score Commands::      $B8=:_$N%0%k!<%W$N$?$a$N%9%3%"EPO?$rDI2C$9$k(B
+* Summary Score Commands::      $B8=:_$N%0%k!<%W$N$?$a$N%9%3%"!&%(%s%H%j!<$rDI2C$9$k(B
 * Group Score Commands::        $B0lHLE*$J%9%3%"L?Na(B
-* Score Variables::             $B$"$J$?$N%9%3%"$r%+%9%?%^%$%:$9$k(B ($B$^$!!"$J$s$FMQ8l(B (Scoring) $B$G$7$g$&(B)
-* Score File Format::           $B%9%3%"%U%!%$%k$K2?$rF~$l$k$+(B
-* Score File Editing::          $BC5n%U%!%$%k$r%9%3%"%U%!%$%k$KJQ49$9$k(B
-* Advanced Scoring::            $B%9%3%"$NK!B'$r:n$k$?$a$KO@M}I=8=$r;H$&(B
-* Score Decays::                $B%9%3%"$r8O$l$F$$$+$;$k$N$OLr$KN)$D;v$b$"$k(B
+* Scoring Tips::                $B8z2LE*$K%9%3%"$rIU$1$kJ}K!(B
+* Reverse Scoring::             $B:P$r$H$C$?LdBj;y$OLdBj$G$O$J$$(B
+* Global Score Files::          $BCO$rJ$$$!"<*$r@Z$jNv$/%9%3%"%U%!%$%k(B
+* Kill Files::                  $B$=$l$i$O$^$@$3$3$K$"$k$,!"L5;k$9$k$3$H$,$G$-$k(B
+* Converting Kill Files::       $B>C5n%U%!%$%k$r%9%3%"%U%!%$%k$KK]Lu$9$k(B
+* Advanced Scoring::            $B%9%3%"$N5,B'$r:n$k$?$a$KO@M}I=8=$r;H$&(B
+* Score Decays::                $B%9%3%"$r8:?j$5$;$k$N$OLr$KN)$D$3$H$b$"$k(B
 @end menu
 
 @node Summary Score Commands
 @section $B35N,%9%3%"L?Na(B
 @cindex score commands
 
-$B%9%3%"EPO?$rJQ99$9$k%9%3%"L?Na$Ol9g$G$b!"=i4|@_Dj$G%0%k!<%W$N%m!<%+%k%9%3%"%U%!%$%k$K$J$C$F$$(B
-$B$^$9!#%9%3%"L?Na$r2?$+B>$N%9%3%"%U%!%$%k(B ($BNc!"(B@file{all.SCORE}) $B$KA^F~$7(B
-$B$?$$$J$i!"$^$:$3$N%9%3%"%U%!%$%k$r8=:_$N$b$N$K$7$J$1$l$P$J$j$^$;$s!#(B
+$B8=:_$N%9%3%"%U%!%$%k$O!"l9g$G(B
+$B$b!"%G%#%U%)%k%H$G%0%k!<%W$N%m!<%+%k%9%3%"%U%!%$%k$K$J$j$^$9!#%9%3%"L?Na(B
+$B$r2?$+B>$N%9%3%"%U%!%$%k(B ($BNc$($P(B @file{all.SCORE}) $B$KA^F~$9$k$K$O!"$^$:(B
+$B$3$N%9%3%"%U%!%$%k$r8=:_$N$b$N$K$7$J$1$l$P$J$j$^$;$s!#(B
 
-$B0lHLE*$J%9%3%"L?Na$Oo$K5,B'@5$7$$K!B'$K=>$$$^$9(B
-$B$N$G!"$=$l$i$NL?NaA4$F$rI=$K>e$2$kI,MW$O$"$j$^$;$s!#(B($B$?!<$/$5$s$"$j$^$9!#(B)
+$B%9%3%"!&%(%s%H%j!<$ro$K5,B'@5$7$$MM<0$K$N$C(B
+$B$H$C$F$$$k$N$G!"$=$l$i$9$Y$F$N(B ($B2?I4$b$"$k(B) $BL?Na$rNs5s$9$kI,MW$OL5$$$G$7$g(B
+$B$&!#(B
 
 @findex gnus-summary-increase-score
 @findex gnus-summary-lower-score
-
 @enumerate
 @item
-$B:G=i$N%-!<$O%9%3%"$rA}$d$9$?$a$N(B @kbd{I} (i $B$NBgJ8;z(B) $B$+!"%9%3%"$r2<$2$k(B
-$B$?$a$N(B @kbd{L} $B$G$9!#(B
+$B:G=i$K%?%$%W$9$k%-!<$O!"%9%3%"$rA}$d$9$H$-$O(B @kbd{I} (i $B$NBgJ8;z(B) $B$G!"%9(B
+$B%3%"$r2<$2$k$H$-$O(B @kbd{L} $B$G$9!#(B
 @item
-$BFsHVL\$N%-!<$O$I$N%X%C%@!<$K%9%3%"$r$7$?$$$+$rI=$7$^$9!#0J2<$N%-!<$,;HMQ(B
-$B2DG=$G$9(B:
+$BFsHVL\$N%-!<$O!"$I$N%X%C%@!<$G%9%3%"$rIU$1$k$+$r;XDj$7$^$9!#0J2<$N%-!<$r(B
+$B;H$&$3$H$,$G$-$^$9(B:
 
 @table @kbd
 @item a
-$BCxA0$K%9%3%"$rIU$1$^$9!#(B
+$BCxA0$G%9%3%"$rIU$1$^$9!#(B
 
 @item s
-$BI=Bj(B (subject) $B$N9T$K%9%3%"$rIU$1$^$9!#(B
+$BI=Bj(B (subject) $B$N9T$G%9%3%"$rIU$1$^$9!#(B
 
 @item x
-@code{Xref} $B9T$K%9%3%"$rIU$1$^$9(B---$B$9$J$o$A!"Aj8_Ej9F9T$G$9!#(B
+@code{Xref} $B9T!"$9$J$o$A%/%m%9%]%9%H9T$G%9%3%"$rIU$1$^$9!#(B
 
 @item r
-@code{References} $B9T$K%9%3%"$r$D$1$^$9!#(B
+@code{References} $B9T$G%9%3%"$rIU$1$^$9!#(B
 
 @item d
-$BF|IU(B (date) $B$K%9%3%"$rIU$1$^$9!#(B
+$BF|IU(B (date) $B$G%9%3%"$rIU$1$^$9!#(B
 
 @item l
-$B9T?t(B (number of lines) $B$K%9%3%"$rIU$1$^$9!#(B
+$B9T?t(B (number of lines) $B$G%9%3%"$rIU$1$^$9!#(B
 
 @item i
-@code{Messsage-ID} $B%X%C%@!<$K%9%3%"$rIU$1$^$9!#(B
+@code{Messsage-ID} $B%X%C%@!<$G%9%3%"$rIU$1$^$9!#(B
 
 @item e
-``$BDI2C(B'' $B$N%X%C%@!<(B ($B$9$J$o$A!"(B(@code{gnus-extra-headers} $B$K@_Dj$5$l$F$$(B
-$B$F!"(B@acronym{NNTP} $B%5!<%P!<$,(B overview $B$K$=$l$i$N>pJs$r5-O?$7$F$$$k(B) $B$K(B
-$B%9%3%"$rIU$1$^$9!#(B
+@acronym{NNTP} $B%5!<%P!<$,DI2C$N%X%C%@!<$N%G!<%?$r(B overview $B$GJaB*$7$F$$(B
+$B$l$P!"$=$N!VDI2C!W$N%X%C%@!<(B ($B$9$J$o$A(B (@code{gnus-extra-headers} $B$K@_Dj(B
+$B$5$l$F$$$k$b$N(B) $B$N0l$D$G%9%3%"$rIU$1$^$9!#(B
 
 @item f
-$B%U%)%m!<%"%C%W(B (followup) $B$K%9%3%"$rIU$1$^$9(B---$B$3$l$OCx$H$N9gCW$r$7!"(B
-$B$3$NCx$H9gCW$9$k$+(B
+$B$I$&$+$rD4$Y$F!"$3$NCx.$5$$$b$N$G$9!#(B
+$B?tCM$h$j>.$5$$$b$N$G$9!#(B
 
 @item =
-$B?t;z$HEy$7$$$b$N$G$9!#(B
+$B?tCM$HEy$7$$$b$N$G$9!#(B
 
 @item >
-$B?t;z$h$jBg$-$$$b$N$G$9!#(B
+$B?tCM$h$jBg$-$$$b$N$G$9!#(B
 @end table
 @end table
 
 @item
-$B;M$D$a$GDL>o$O:G8e$N%-!<$G$9!#$3$l$,0l;~E*(B ($B$9$J$o$A4|8B@Z$l>C5n(B) $B$N%9%3(B
-$B%"EPO?$+!"1JB3E*$J(B ($B$9$J$o$A4|8B@Z$l>C5n$G$J$$(B) $B%9%3%"EPO?$G$"$k$+$H$$$&(B
-$B$3$H!"$b$7$/$O$9$0$K$J$5$l$k$Y$-$+!"%9%3%"%U%!%$%k$KDI2C$9$k;v$O$7$J$$$+(B
-$B$H$$$&;v$r;XDj$7$^$9!#(B
+$BIaDL$O$3$l$G:G8e$N;M$DL\$N%-!<$O!"$3$l$,0l;~E*$J(B ($B$9$J$o$A4|8B@Z$l>C5n$5(B
+$B$l$k(B) $B%9%3%"!&%(%s%H%j!<$+!"1JB3E*$J(B ($B$9$J$o$A4|8B@Z$l>C5n$G$J$$(B) $B%9%3%"!&(B
+$B%(%s%H%j!<$+!"$^$?$O%9%3%"%U%!%$%k$KDI2C$;$:$K$?$@$A$K%9%3%"IU$1$r9T$J$&(B
+$B$+!"$N$I$l$+$r;XDj$7$^$9!#(B
 
 @table @kbd
 @item t
-$B0l;~E*$J(B (temporary) $B%9%3%"EPO?$G$9!#(B
+$B0l;~E*$J(B (temporary) $B%9%3%"!&%(%s%H%j!<$G$9!#(B
 
 @item p
-$B1JB3E*$J(B (permanent) $B%9%3%"EPO?$G$9!#(B
+$B1JB3E*$J(B (permanent) $B%9%3%"!&%(%s%H%j!<$G$9!#(B
 
 @item i
-$BB(:B$N(B (immediate) $B%9%3%"IU$1$G$9!#(B
+$B$?$@$A$K(B (immediate) $B%9%3%"IU$1$r9T$J$$$^$9!#(B
 @end table
 
 @item
-$B$b$7(B `e' ($BDI2C$N(B (extra)) $B%X%C%@!<$G%9%3%"IU$1$r9T$J$C$F$$$k$H!"$I$NL>A0(B
-$B$N%X%C%@!<$G9T$J$&$+$r?R$M$i$l$^$9!#$3$l$O(B @code{gnus-extra-headers} $B$K(B
-$B$"$kL>A0$G$J$1$l$P$J$j$^$;$s!#(B@samp{TAB} $B$K$h$kJd40$,$G$-$^$9!#(B
+$B$b$7(B `e' ($BDI2C$N(B (extra)) $B%X%C%@!<$G%9%3%"IU$1$r9T$J$C$F$$$k$H!"$=$l$G%9(B
+$B%3%"IU$1$r$7$?$$%X%C%@!<$NL>A0$r?R$M$i$l$k$G$7$g$&!#$3$l(B
+$B$O(B @code{gnus-extra-headers} $B$K$"$kL>A0$G$J$1$l$P$J$j$^$;$s!#(B
+@samp{TAB} $B$K$h$kJd40$,$G$-$^$9!#(B
 @end enumerate
 
-$B$G$9$+$i!"8=:_$NCxo$K4JC1$G$9!#(B
+$B$=$&$$$&$o$1$G!"8=:_$NCxl9g$N%-!<$O(B @kbd{I a e p} $B$G$9!#I=Bj$X$N!"J8;zNs$N0l(B
+$BIt9gCW$K4p$E$$$F!"0l;~E*$J%9%3%"!&%(%s%H%j!<$r:n$j!"$=$N%9%3%"$r2<$2$?$$!"(B
+$B$H$$$&>l9g$N%-!<$O(B @kbd{L s s t} $B$G$9!#$:$$$V$s4JC1$G$9$M!#(B
 
-$BJ*;v$rJ#;($K$9$k$N$O!"C;=LBG80$,B8:_$9$k$+$i$G$9!#FsHVL\$+;0HVL\$NJ8;z$K(B
-$BBgJ8;z$r;H$&$H!"(Bgnus $B$O;D$k0l$D$+Fs$D$NBG80$K=i4|CM$r;H$$$^$9!#=i4|CM(B
-$B$O(B ``$BJ8;zNs$N0lIt(B'' $B$H(B ``$B0l;~E*(B'' $B$G$9!#$G$9$+$i!"(B
-@kbd{I A} $B$O(B @kbd{I a s t} $B$HF1$8$G!"(B@kbd{I a R} $B$O(B @kbd{I a r t} $B$HF1$8(B
-$B$G$9!#(B
+$B$b$N$4$H$r>/$7J#;($K$9$k$?$a$K%7%g!<%H%+%C%H!&%-!<$,$"$j$^$9!#FsHVL\$+;0(B
+$BHVL\$N%-!<$KBgJ8;z$r;H$&$H!"(Bgnus $B$O;D$k0l$D$+Fs$D$N%-!<$K%G%#%U%)%k%HCM(B
+$B$r;H$$$^$9!#%G%#%U%)%k%H$O!VJ8;zNs$N0lIt!W$H!V0l;~E*!W$G$9!#$G$9$+(B
+$B$i(B @kbd{I A} $B$O(B @kbd{I a s t} $B$HF1$8$G!"(B@kbd{I a R} $B$O(B @kbd{I a r t} $B$H(B
+$BF1$8$G$9!#(B
 
-$B$3$l$i$N4X?t$O?t;z@\F,0z?t$H!"%7%s%\%k@\F,0z?t$re$2$k(B) $B$+$r;XDj$7$^$9!#%7%s%\%k@\F,0z?t(B @code{a} $B$OL?Na$,(B
-$B8=:_$N%9%3%"%U%!%$%k$G$O$J$/%U%!%$%k(B @file{all.SCORE} $B$r;H$&;v$r;XDj$7$^(B
-$B$9!#(B
+$B$3$l$i$N4X?t$O!"?tCM@\F,0z?t$H%7%s%\%k@\F,0z?t$re$2$k(B) $B$+$r;XDj$7$^$9!#%7%s%\%k@\F,0z?t(B @code{a} $B$O!"8=:_(B
+$B$N%9%3%"%U%!%$%k$NBe$o$j$K(B @file{all.SCORE} $B%U%!%$%k$r$=$NL?Na$N$?$a$K;H(B
+$B$&$3$H$r;X<($7$^$9!#(B
 
 @vindex gnus-score-mimic-keymap
 @code{gnus-score-mimic-keymap} $B$O$3$l$i$NL?Na$,%-!<%^%C%W$G$"$k$+$N$h$&(B
@@ -18467,20 +19381,19 @@ File Editing})$B!#(B
 @item W e
 @kindex W e ($B%0%k!<%W(B)
 @findex gnus-score-edit-all-score
-$B$9$Y$F$N%0%k!<%W$KE,MQ$5$l$k(B all.SCORE $B%U%!%$%k$rJT=8$7$^$9!#%]%C%W%"%C(B
-$B%W$9$k(B @code{gnus-score-mode} $B$N%P%C%U%!$KF~$j$^$9(B (@pxref{Score File
+$B$9$Y$F$N%0%k!<%W$KE,MQ$5$l$k(B all.SCORE $B%U%!%$%k$rJT=8$7$^$9!#(B
+@code{gnus-score-mode} $B$N%P%C%U%!!<$,8=$l$k$G$7$g$&(B (@pxref{Score File
 Editing})$B!#(B
 
 @item W f
 @kindex W f ($B%0%k!<%W(B)
 @findex gnus-score-flush-cache
-Gnus $B$O2?EY$b%9%3%"O"A[%j%9%H$rFI$_9~$`$N$rHr$1$k$?$a$K!"$=$l$N%-%c%C%7%e(B
-$B$rJ];}$7$F$$$^$9!#$3$NL?Na$O%-%c%C%7%e$r=q$-=P$7$^(B
+$B2?EY$b%9%3%"O"A[%j%9%H$r:FFI$_9~$_$9$k$3$H$rHr$1$k$?$a$K!"(Bgnus $B$O$=$l$i(B
+$B$N%-%c%C%7%e$rJ];}$7$F$$$^$9!#$3$NL?Na$O%-%c%C%7%e$r6u$C$]$K$7$^(B
 $B$9(B (@code{gnus-score-flush-cache})$B!#(B
 @end table
 
-$B0J2<$N$h$&$J;v$r$9$k;v$K$h$C$F!"%3%^%s%I9T$+$i%9%3%"IU$1$r$9$k;v$,$G(B
-$B$-$^$9!#(B
+$B0J2<$N$h$&$J$d$jJ}$G!"%3%^%s%I9T$+$i%9%3%"IU$1$r$9$k$3$H$,$G$-$^$9(B:
 
 @findex gnus-batch-score
 @cindex batch scoring
@@ -18495,84 +19408,84 @@ Gnus $B$O2?EY$b%9%3%"O"A[%j%9%H$rFI$_9~$`$N$rHr$1$k$?$a$K!"$=$l$N%-%c%C%7%e(B
 @table @code
 @item gnus-use-scoring
 @vindex gnus-use-scoring
-@code{nil} $B$G$"$l$P!"(Bgnus $B$O%9%3%"%U%!%$%k$rD4$Y$:!"0lHLE*$K!"%9%3%"4XO"(B
-$B$N;E;v$rA4$/$7$^$;$s!#$3$l$O=i4|@_Dj$G(B @code{t} $B$G$9!#(B
+@code{nil} $B$G$"$l$P!"(Bgnus $B$O%9%3%"%U%!%$%k$rD4$Y$:!"0lHLE*$K$O%9%3%"4XO"(B
+$B$N;E;v$r$^$C$?$/$7$^$;$s!#$3$l$O%G%#%U%)%k%H$G(B @code{t} $B$G$9!#(B
 
 @item gnus-kill-killed
 @vindex gnus-kill-killed
-$B$3$NJQ?t$,(B @code{nil} $B$G$"$l$P!"(Bgnus $B$O4{$K:o=|2aDx$r$K2C$($k@\Hx8l$G$9(B ($B=i4|CM(B
-$B$G(B @file{SCORE} $B$G$9!#(B)
+$B%9%3%"%U%!%$%k$NL>A0$rF@$k$?$a$K%0%k!<%WL>$K2C$($k@\Hx8l$G$9(B ($B%G%#%U%)%k(B
+$B%H$O(B @file{SCORE} $B$G$9(B)$B!#(B
 
 @item gnus-score-uncacheable-files
 @vindex gnus-score-uncacheable-files
 @cindex score cache
-$BA4$F$N%9%3%"%U%!%$%k$OIaDL$O%9%3%"%U%!%$%k$N2a>jFI$_9~$_$rHr$1$k$?$a$K(B
-$B%-%c%C%7%e$5$l$^$9!#$7$+$7!"$3$l$K$h$j$"$J$?$N(B Emacs $B$,Bg$-$/HnBg2=$9$k(B
-$B$N$G$"$l$P!":F$SI,MW$H$5$l$J$$$h$&$J%9%3%"%U%!%$%k$r=|5n$9$k$?$a$K$3$N@5(B
-$B5,I=8=$r;H$&;v$,$G$-$^$9!#(B@file{all.SCORE} $B$N%-%c%C%7%e$r;_$a$k$N$O0-$$(B
-$B9M$($G$9$,!"(B@file{comp.infosystems.www.authoring.misc.ADAPT} $B$r%-%c%C%7%e(B
-$B$7$J$$$N$ONI$$9M$($G$7$g$&!#o$9$Y$F$N%9%3%"%U%!%$%k$O!"%9%3%"%U%!%$%k$N2a>j$J:FFI$_9~$_$rHr$1$k$?(B
+$B$a$K%-%c%C%7%e$5$l$^$9!#$7$+$7!"$3$N$?$a$K(B Emacs $B$,Bg$-$/HnBg2=$9$k$h$&(B
+$B$J$i$P!":F$SI,MW$H$5$l$=$&$b$J$$%9%3%"%U%!%$%k$re$2(B/$B2<$2L?Na$K$h$C$F;H$o$l$k>e$2(B/$B2<$2$9$k%9%3%"$G$9!#(B
-$B%G%#%U%)%k%H$O(B 1000 $B$G!"2a>j$@$H;W$&$+$b$7$l$^$;$s$,!"$3$l$OE,1~%9%3%"IU(B
-$B$1$r$9$kM>CO$NB8:_$9$k;v$r3N.$5$JJQ99$G>e=q$-$5$l$?$/$O$"$j$^$;$s!#(B
+$B%9%3%"$r>e$2(B/$B2<$2$9$k$?$a$K!"$9$Y$F$NBPOCE*%9%3%">e$2(B/$B2<$2L?Na$K$h$C$F;H(B
+$B$o$l$k%9%3%"$G$9!#%G%#%U%)%k%H$O(B 1000 $B$G!"2a>j$K;W$($k$+$b$7$l$^$;$s$,!"(B
+$BE,1~%9%3%"IU$1$r$9$k$?$a$N==J,$JM>CO$r3NJ]$9$k$?$a$G$9!#.$5$JJQ99$G>e=q$-$5$l$?$/$O$J$$$N$G$9!#(B
 
 @item gnus-summary-default-score
 @vindex gnus-summary-default-score
-$B5-;v$N%9%3%"$N=i4|CM$G!"=i4|@_Dj$G$O(B 0 $B$K$J$C$F$$$^$9!#(B
+$B5-;v$N%9%3%"$N%G%#%U%)%k%H$G!"%G%#%U%)%k%H$G$O(B 0 $B$K$J$C$F$$$^$9!#(B
 
 @item gnus-summary-expunge-below
 @vindex gnus-summary-expunge-below
-$B$3$NJQ?t$h$jDc$$%9%3%"$r;}$D5-;v$O35N,$N9T$KI=<($5$l$^$;$s!#$3$l$O=i4|@_(B
-$BDj$G(B @code{nil} $B$G!"$3$l$O$I$N5-;v$b1#$5$l$J$$$H$$$&;v$G$9!#$3$NJQ?t$O3F(B
-$B35N,%P%C%U%!$K8GM-$G!"(B@code{gnus-summary-mode-hook} $B$K$h$C$F@_Dj$5$l$k$Y(B
-$B$-$G$9!#(B
+$B$3$NJQ?t$h$jDc$$%9%3%"$r;}$D5-;v$O35N,$N9T$KI=<($5$l$^$;$s!#%G%#%U%)%k%H(B
+$B$O(B @code{nil} $B$G!"$I$N5-;v$b1#$5$l$J$$$H$$$&$3$H$G$9!#$3$l$O3F35N,%P%C(B
+$B%U%!!<$K$*$1$k%m!<%+%kJQ?t$G!"(B@code{gnus-summary-mode-hook} $B$K$h$C$F@_Dj(B
+$B$5$l$J$1$l$P$J$j$^$;$s!#(B
 
 @item gnus-score-over-mark
 @vindex gnus-score-over-mark
-$B=i4|@_Dj$N%9%3%"$h$jBg$-$J%9%3%"$r;}$D5-;v$KBP$7$F(B ($B;07eL\$K(B) $B;H$o$l$k0u(B
-$B$G$9!#=i4|@_Dj$O(B @samp{+} $B$G$9!#(B
+$B%G%#%U%)%k%H$N%9%3%"$h$jBg$-$J%9%3%"$r;}$D5-;v$KBP$7$F(B ($B35N,9T$N;07eL\(B
+$B$G(B) $B;H$o$l$k0u$G$9!#%G%#%U%)%k%H$O(B @samp{+} $B$G$9!#(B
 
 @item gnus-score-below-mark
 @vindex gnus-score-below-mark
-$B=i4|@_Dj$N%9%3%"$h$j>.$5$J%9%3%"$r;}$D5-;v$KBP$7$F(B ($B;07eL\$K(B) $B;H$o$l$k0u(B
-$B$G$9!#=i4|@_Dj$O(B @samp{-} $B$G$9!#(B
+$B%G%#%U%)%k%H$N%9%3%"$h$j>.$5$J%9%3%"$r;}$D5-;v$KBP$7$F(B ($B35N,9T$N;07eL\(B
+$B$G(B) $B;H$o$l$k0u$G$9!#%G%#%U%)%k%H$O(B @samp{-} $B$G$9!#(B
 
 @item gnus-score-find-score-files-function
 @vindex gnus-score-find-score-files-function
-$B8=:_$N%0%k!<%W$N%9%3%"%U%!%$%k$r8+$D$1$k$?$a$K;H$o$l$k4X?t$G$9!#$3$N4X?t(B
-$B$O%0%k!<%WL>$r0z?t$H$7$F8F$P$l$^$9!#(B
+$B8=:_$N%0%k!<%W$N$?$a$N%9%3%"%U%!%$%k$r8+$D$1$k$?$a$K;H$o$l$k4X?t$G$9!#$3(B
+$B$N4X?t$O%0%k!<%WL>$r0z?t$H$7$F8F$P$l$^$9!#(B
 
-$B;HMQ2DG=$J4{Dj4X?t$O(B:
+$B$"$i$+$8$aDj5A$5$l$F$$$k;HMQ2DG=$J4X?t$O(B:
 
 @table @code
 @item gnus-score-find-single
@@ -18581,39 +19494,39 @@ Gnus $B$O2?EY$b%9%3%"O"A[%j%9%H$rFI$_9~$`$N$rHr$1$k$?$a$K!"$=$l$N%-%c%C%7%e(B
 
 @item gnus-score-find-bnews
 @findex gnus-score-find-bnews
-bnews $B9=J8$r;H$C$F!"A4$F$N9gCW$9$k%9%3%"%U%!%$%k$rE,MQ$7$^$9!#$3$l$,=i4|(B
-$B@_Dj$G$9!#Nc$($P!"8=:_$N%0%k!<%W$,(B @samp{gnu.emacs.gnus} $B$J$i$P!"(B
+$B$9$Y$F$N9gCW$9$k%9%3%"%U%!%$%k$r(B bnews $B9=J8$r;H$C$FE,MQ$7$^$9!#$3$l$,%G%#(B
+$B%U%)%k%H$G$9!#Nc$($P!"8=:_$N%0%k!<%W$,(B @samp{gnu.emacs.gnus} $B$J$i$P!"(B
 @file{gnu.all.SCORE}, @file{not.alt.SCORE} $B$H(B @file{gnu.all.SCORE} $B$,$9(B
 $B$Y$FE,MQ$5$l$^$9!#MW$9$k$K!"%9%3%"%U%!%$%kL>(B
 $B$N(B @samp{all} $B$,(B @samp{.*} $B$KJQ49$5$l!"$=$l$+$i@55,I=8=$N9gCW$,$J$5$l$^(B
 $B$9!#(B
 
-$B$3$l$O!"A4$F$N%0%k!<%W$KE,MQ$7$?$$%9%3%"EPO?$,$$$/$D$+$"$k>l9g$O!"$=$l$i(B
-$B$NEPO?$r(B @file{all.SCORE} $B%U%!%$%k$KF~$l$k$H$$$&$3$H$G$9!#(B
+$B$3$l$O!"$9$Y$F$N%0%k!<%W$KE,MQ$7$?$$%9%3%"!&%(%s%H%j!<$,$$$/$D$+$"$k>l9g(B
+$B$O!"$=$l$i$N%(%s%H%j!<$r(B @file{all.SCORE} $B%U%!%$%k$KF~$l$k$H$$$&$3$H$G$9!#(B
 
-Gnus $B$O0lHLE*$J%9%3%"%U%!%$%k$rFCDj$N%9%3%"%U%!%$%k8~$1$N$b$N$h$jA0$KE,(B
-$BMQ$7$h$&$H;n$_$^$9$,!"%9%3%"%U%!%$%k$O$[$H$s$IL5:n0Y$N=gHV$GE,MQ$5$l$^$9!#(B
-$B$3$l$O%9%3%"%U%!%$%kL>$NMWAG$N?t$rD4$Y$k;v$K$h$C$F$J$5$l$^$9(B---
-@samp{all} $BMWAG$r$NMWAG$N?t$rD4$Y$k$3$H$K$h$C$F9T$J$o$l$^(B
+$B$9(B---@samp{all} $BMWAG$r$l(B
-$B$N%5!<%P!<$KBP$7$F;}$D;v$,$G$-$k$H$$$&;v$G$9!#(B
+$B$9$Y$F$N?F%0%k!<%W$+$i!"=g$K$9$Y$F$N%9%3%"%U%!%$%k$rE,MQ$7$^$9!#$3$l(B
+$B$O(B @file{all.SCORE} $B$N$h$&$J%9%3%"%U%!%$%k$r;}$D$3$H$O$G$-$J$$$1$l$I!"(B
+@file{SCORE}, @file{comp.SCORE} $B$*$h$S(B @file{comp.emacs.SCORE} $B$r!"$=$l(B
+$B$>$l$N%5!<%P!<$KBP$7$F;}$D$3$H$,$G$-$k$H$$$&$3$H$G$9!#(B
 @end table
 
-$B$3$NJQ?t$O4X?t$N%j%9%H$G$"$k;v$b$G$-$^$9!#$=$N>l9g$O!"$3$l$i$NA4$F$N4X?t(B
-$B$,%0%k!<%WL>$r0z?t$H$7$F8F$P$l!"%9%3%"%U%!%$%k$NJV$5$l$?A4$F$N%j%9%H$,E,(B
-$BMQ$5$l$^$9!#$3$l$i$N4X?t$OD>@\%9%3%"O"A[%j%9%H$N%j%9%H$N%j%9%H$rJV$9;v$b(B
-$B$G$-$^$9!#$=$N>l9g$O!"$=$l$i$N%U%!%$%k$G$J$$%9%3%"O"A[%j%9%H$rJV$94X?t$O!"(B
-$BJV$5$l$k:G8e$N%9%3%"%U%!%$%k$,%m!<%+%k%9%3%"%U%!%$%k$G$"$k;v$r3Nl9g!"$3$l$i$9$Y$F$N4X?t(B
+$B$,%0%k!<%WL>$r0z?t$H$7$F8F$P$l!"JV$5$l$?$9$Y$F$N%9%3%"%U%!%$%k$N%j%9%H$,(B
+$BE,MQ$5$l$^$9!#$3$l$i$N4X?t$O!"D>@\%9%3%"O"A[%j%9%H$N%j%9%H$N%j%9%H$rJV$9(B
+$B$3$H$b$G$-$^$9!#$=$N>l9g!"$=$l$i$N%U%!%$%k$G$J$$%9%3%"O"A[%j%9%H$rJV$94X(B
+$B?t$O!"JV$5$l$k:G8e$N%9%3%"%U%!%$%k$,%m!<%+%k%9%3%"%U%!%$%k$G$"$k$3$H$r3N(B
+$BC5n$5$l$k$^(B
+$B$G$K!"$I$N$/$i$$$NF|?t$,7P2a$9$Y$-$+$r;XDj$7$^$9!#$3$NJQ?t(B
+$B$,(B @code{nil} $B$G$"$k$H!"%9%3%"%U%!%$%k%(%s%H%j!<$O:o=|$5$l$^$;$s!#%G%#%U%)(B
+$B%k%H$O(B 7 $B$G$9!#(B
 
 @item gnus-update-score-entry-dates
 @vindex gnus-update-score-entry-dates
-$B$3$NJQ?t$,(B @code{nil} $B$G$J$$$H!"0l;~E*$K9gCW$7$?%9%3%"EPO?$OF|IU$,99?7$5(B
-$B$l$^$9!#(B($B$3$l$O(B gnus $B$,4|8B@Z$l>C5n$rA`:n$7$F$$$kJ}K!$G$9(B---$BA4$F$N9gCW$7(B
-$B$J$$EPO?$O8E$/$J$j$9$.!"9gCW$9$kEPO?$r?7A/$GLL$9$k;v$K$J$k$G$7$g$&!#(B
+$B$3$NJQ?t$,(B @code{nil} $B$G$J$$$H!"0l;~E*$K9gCW$7$?%9%3%"!&%(%s%H%j!<$OF|IU(B
+$B$,99?7$5$l$^$9!#(B($B$3$l$O(B gnus $B$,4|8B@Z$l>C5n$rA`:n$7$F$$$kJ}K!$G$9(B---$B$9$Y(B
+$B$F$N9gCW$7$J$$%(%s%H%j!<$O8E$/$J$j$9$.$k$N$KBP$7$F!"9gCW$9$k%(%s%H%j!<$O(B
+$B?7A/$GLL$9$k$3$H(B
+$B$K$J$k$G$7$g$&!#(B
 
 @item gnus-score-after-write-file-function
 @vindex gnus-score-after-write-file-function
-$B$=$3$G$A$g$&$I=q$+$l$?%9%3%"%U%!%$%k$NL>A0$H6&$K8F$P$l$k4X?t$G$9!#(B
+$B%9%3%"%U%!%$%k$,=q$+$l$?D>8e$K!"$=$NL>A0$r0z?t$H$7$F8F$P$l$k4X?t$G$9!#(B
 
 @item gnus-score-thread-simplify
 @vindex gnus-score-thread-simplify
-$B$3$NJQ?t$,(B @code{nil} $B$G$J$$$H!"5-;vI=Bj$O%9%l%C%I$HF1$8J}K!$GI=Bj%9%3%"(B
-$B$N$?$a$KC1=c2=$5$l$^$9(B---$B8=:_(B
-$B$N(B @code{gnus-simplify-subject-functions} $B$NCM$K$h$C$F!#%9%3%"EPO?(B
-$B$,(B @code{$BJ8;zNsItJ,(B} $B$+(B @code{$B@53N$J(B} $B9gCW$r;H$C$F$$$k$H!"9gCW$b$3$NJ}K!(B
-$B$GC1=c2=$5$l$^$9!#(B
+$B$3$NJQ?t$,(B @code{nil} $B$G$J$$$H!"5-;v$NI=Bj$OI=Bj$G%9%3%"IU$1$r9T$J$&$?$a(B
+$B$K!"%9%l%C%I$HF1$8$d$jJ}$G(B ($B8=:_(B
+$B$N(B @code{gnus-simplify-subject-functions} $B$NCM$K=>$C$F(B) $BC1=c2=$5$l$^$9!#(B
+$B%9%3%"!&%(%s%H%j!<$,!VJ8;zNs$N0lIt$X$N9gCW!W$+!V@53N$J9gCW!W$r;H$C$F$$$k(B
+$B$H!"$=$N9gCW$b$3$N$d$jJ}$GC1=c2=$5$l$^$9!#(B
 @end table
 
 @node Score File Format
 @section $B%9%3%"%U%!%$%kMM<0(B
 @cindex score file format
 
-$B%9%3%"%U%!%$%k$OIaDL$OC1=c$JMM<0$N$b$N$@$1$r4^$`(B @code{emacs-lisp} $B%U%!(B
-$B%$%k$G$9!#L5F\Ce$JMxMQ2A(B} (eval) $B$5$l$^$;$s!#$7$+$7!"(BLisp $B%j!<%@!<$,$3$NMM<0$rFI$_(B
-$B9~$`$N$K;H$o$l$^$9$N$G!"0UL#E*$KM-8z$G$J$$$H$7$F$b!"J8K!E*$K$OM-8z$G$9!#(B
+$B$3$l$,$H$F$b(B Lisp $B%3!<%I$N$h$&$K8+$($k$H$7$F$b!"2A(B) $B$5$l$^$;$s!#$7$+$7$3$NMM<0$rFI$_9~$`$?$a$K(B Lisp $B%j!<(B
+$B%@!<$,;H$o$l$k$N$G!"0UL#E*$KM-8z$G$J$$$H$7$F$b!"J8K!E*$K$O@5Ev$J$b$N$G$9!#(B
 
-$B$3$NO"A[%j%9%H$G$OO;$D$N%-!<$r;H$&;v$,$G$-$^$9!#(B
+$B$3$NO"A[%j%9%H$G$OO;$D$N%-!<$,%5%]!<%H$5$l$F$$$^$9(B:
 
 @table @code
 @item $BJ8;zNs(B (STRING)
-$B$b$7%-!<$,J8;zNs$G$"$k$H!"$=$l$O9gCW$,A0$G$9!#%9%3(B
-$B%"$O$3$l$i$NH,$D$N%X%C%@!<$@$1$KA0$G$9!#%9%3%"IU(B
+$B$1$O$3$l$iH,$D$N%X%C%@!<$@$1$G9T$J$&$3$H$,$G$-$^$9(B: @code{From},
 @code{Subject}, @code{References}, @code{Message-ID}, @code{Xref},
-@code{Lines}, @code{Chars}@code{Date} $B$G$9!#$3$l$i$N%X%C%@!<$K2C$($F!"(B
-gnus $B$K5-;vA4BN$r$l$N%9%3%"EPO?$O0l$D$+$i(B
-$B;M$D$^$G$NMWAG$r;}$A$^$9!#(B
+@code{Lines}, @code{Chars} $B$*$h$S(B @code{Date} $B$G$9!#$3$l$i$N%X%C%@!<$K2C(B
+$B$($F!"(Bgnus $B$K!"5-;vA4BN$r$l$N%9%3%"!&%(%s(B
+$B%H%j!<$O0l$D$+$i;M$D$^$G$NMWAG$r;}$A$^$9!#(B
 @enumerate
 
 @item
-$B:G=i$NMWAG$O(B @dfn{$B9gCWMWAG(B} $B$G$9!#$?$$$F$$$N%X%C%@!<$G$O$3$l$OJ8;zNs$G$9(B
-$B$,!"(BLines $B$H(B Chars $B%X%C%@!<$G$O$3$l$O@0?t$G$J$1$l$P$J$j$^$;$s!#(B
+$B:G=i$NMWAG$O!V9gCWMWAG!W$G$9!#$3$l$O$?$$$F$$$N%X%C%@!<$G$OJ8;zNs$G$9$,!"(B
+Lines $B$H(B Chars $B%X%C%@!<$G$O@0?t$G$J$1$l$P$J$j$^$;$s!#(B
 
 @item
-$B$b$7FsHVL\$NMWAG$,B8:_$9$k$J$i!"$=$l$O?t;z$G$"$k$Y$-$G(B
-$B$9(B---@dfn{$B%9%3%"MWAG(B}$B!#$3$N?t;z$OIi$NL58BBg$+$i@5$NL58BBg$^$G$N4V$N@0?t(B
-$B$G$"$k$Y$-$G$9!#$b$79gCW$,@.8y$9$l$P!"$3$N?t;z$,5-;v$N%9%3%"$K2C$($i$l$^(B
-$B$9!#$b$7$3$NMWAG$,B8:_$7$F$$$J$1$l$P!"?t(B
-$B;z(B @code{gnus-score-interactive-default-score}$B$,Be$o$j$K;H$o$l$^$9!#$3$l(B
-$B$O=i4|@_Dj$G(B 1000 $B$G$9!#(B
+$B$b$7FsHVL\$NMWAG$,$"$k$J$i!"$=$l$O?tCM$N!V%9%3%"MWAG!W$G$J$1$l$P$J$j$^$;(B
+$B$s!#$3$N?tCM$OIi$NL58BBg$+$i@5$NL58BBg$^$G$N4V$N@0?t$G$J$1$l$P$J$j$^$;$s!#(B
+$B9gCW$,@.8y$9$k$H!"$3$N?tCM$,5-;v$N%9%3%"$K2C$($i$l$^$9!#$3$NMWAG$,B8:_$7(B
+$B$F$$$J$$>l9g$O!"Be$o$j$K(B @code{gnus-score-interactive-default-score} $B$N(B
+$B?tCM$,;H$o$l$^$9!#%G%#%U%)%k%H$O(B 1000 $B$G$9!#(B
 
 @item
-$B$b$7;0HVL\$NMWAG$,B8:_$7$F$$$k$H!"$=$l$O?t;z$G$"$k$Y$-$G(B
-$B$9(B---@dfn{$BF|IUMWAG(B} $B$G$9!#$3$NF|IU$O:G8e$K$3$N%9%3%"EPO?$,9gCW$7$?;~9o$r(B
-$B<($7!"$3$l$O%9%3%"EPO?$N4|8B@Z$l>C5n5!9=$N5!G=$N$?$a$K;H$o$l$^$9!#$3$NMW(B
-$BAG$,B8:_$7$F$$$J$1$l$P!"%9%3%"EPO?$O1JB3$7$^$9!#F|IU$O5*85A0(B 1$BG/(B12$B7n(B31$BF|(B
-$B$+$i7P2a$7$?F|$K$A$N?t$GI=$5$l$^$9!#(B
+$B$b$7;0HVL\$NMWAG$,$"$k$J$i!"$=$l$O?tCM$N!VF|IUMWAG!W$G$J$1$l$P$J$j$^$;$s!#(B
+$B$3$NF|IU$O:G8e$K$3$N%9%3%"!&%(%s%H%j!<$,9gCW$7$?;~9o$r<($7!"$=$l$O%9%3%"!&(B
+$B%(%s%H%j!<$r4|8B@Z$l>C5n$9$k$?$a$N5!9=$rDs6!$7$^$9!#$3$NMWAG$,B8:_$7$F$$(B
+$B$J$$$H!"%9%3%"!&%(%s%H%j!<$O1JB3$K$J$j$^$9!#F|IU$O5*85A0(B 1$BG/(B12$B7n(B31$BF|$+$i(B
+$B$N7P2a$7$?F|?t$GI=$5$l$^$9!#(B
 
 @item
-$B$b$7;MHVL\$NMWAG$,B8:_$7$F$$$k$H!"$=$l$O%7%s%\%k$G$"$k$Y$-$G(B
-$B$9(B---@dfn{$B7?MWAG(B} $B$G$9!#$3$NMWAG$O$3$N%9%3%"EPO?$,5-;v$K9gCW$9$k$+$I$&$+(B
-$B$rD4$Y$k$N$K$I$N4X?t$,;H$o$l$k$Y$-$G$"$k$+$r;XDj$7$^$9!#(B
+$B$b$7;MHVL\$NMWAG$,$"$k$J$i!"$=$l$O%7%s%\%k$N!V7?MWAG!W$G$J$1$l$P$J$j$^$;(B
+$B$s!#$3$NMWAG$O!"$3$N%9%3%"!&%(%s%H%j!<$,5-;v$K9gCW$9$k$+$I$&$+$rD4$Y$k$?(B
+$B$a$K!"$I$N4X?t$,;H$o$l$k$Y$-$+$r;XDj$7$^$9!#(B
 
 @table @dfn
 @item From, Subject, References, Xref, Message-ID
-$B$?$$$F$$$N%X%C%@!<$N7?$KBP$7$F!"(B@code{r} $B$H(B @code{R} ($B@55,I=(B
-$B8=(B) (regexp) $B$d!"(B@code{s} $B$H(B @code{S} ($BJ8;zNs$N0lIt(B) (substring) $B7?!"(B
-@code{e} $B$H(B @code{E} ($B@53N$J9gCW(B) (exact match)$B!"(B
-@code{w} ($B8l$N9gCW(B) (word match) $B7?$,B8:_$7$^$9!#$b$7$3$NMWAG$,B8:_$7$J(B
-$B$$$H!"(Bgnus $B$OJ8;zNs$N0lIt$N9gCW$,MQ$$$i$l$k$Y$-$G$"$k$H$_$J$7$^$9!#(B
-@code{R}, @code{S}, @code{E} $B$O9gCW$,BgJ8;z$H>.J8;z$r6hJL$9$kJ}K!$G9T$o(B
-$B$l$k$H$$$&E@$GB>$N$b$N$H0[$J$j$^$9!#A4$F$N$3$l$i$N0lJ8;z7?$OK\Ev(B
-$B$O(B @code{regexp}, @code{exact}, @code{word} $B7?$NC;=L7A$G!"$b$7$=$&$7$?$$(B
-$B$H;W$($P$3$A$i$rBe$o$j$K;H$&;v$,$G$-$^$9!#(B
+$B$?$$$F$$$N%X%C%@!<7?$N$?$a$K!"(B@code{r} $B$H(B @code{R} ($B@55,I=8=(B(regexp))$B!"(B
+@code{s} $B$H(B @code{S} ($BJ8;zNs$N0lIt(B(substring)) $B7?!"(B@code{e} $B$H(B @code{E}
+($B@53N$J9gCW(B(exact match))$B!"$*$h$S(B @code{w} ($B8l$N9gCW(B((word match)) $B7?$,(B
+$B$"$j$^$9!#$b$7$3$NMWAG$,L5$$$H!"(Bgnus $B$OJ8;zNs$N0lIt$N9gCW$,MQ$$$i$l$k$Y(B
+$B$-$G$"$k$H2>Dj$7$^$9!#(B@code{R}, @code{S}, @code{E} $B$O!"9gCW$,BgJ8;z$H>.(B
+$BJ8;z$r6hJL$9$kJ}K!$G9T$J$o$l$kE@$GB>$N$b$N$H0[$J$j$^$9!#$3$l$i$9$Y$F$N0l(B
+$BJ8;z7?$O!"K\Ev$O(B @code{regexp}, @code{exact}, @code{word} $B7?$NC;=L7A$G!"(B
+$B$3$NJ}$,9%$_$J$i$PBe$o$j$K;H$&$3$H$,$G$-$^$9!#(B
 
 @item Extra
-$BI8=`$N(B overview $B%X%C%@!<$NJ8;zNs$HF1MM!"(B@code{gnus-extra-headers} $B$r;H$C(B
-$B$F$$$k$H!"$=$l$i$N%X%C%@!<$NCM$K%9%3%"$rIU$1$k$3$H$,$G$-$^$9!#$3$N>l9g%9(B
-$B%3%"EPO?$N(B 5 $BHVL\$NMWAG$,%9%3%"$rIU$1$k%X%C%@!<$NL>A0$K$J$j$^$9!#(B
-@acronym{NNTP} $B%5!<%P!<$,(B overview $B$K(B @samp{NNTP-Posting-Host} $B$r5-O?$7(B
-$B$F$$$k$J$i$P!"(B@file{all.SCORE} $B%U%!%$%k$N0J2<$NEPO?$O!"C10l$N%[%9%H$+(B
-$B$i(B spam $B$N967b$,$"$k>l9g$KM-8z$G$9!#(B
+overview $B%X%C%@!<$NI8=`$NJ8;zNs$KE*$r9J$C$F(B @code{gnus-extra-headers} $B$r(B
+$B;H$C$F$$$l$P!"$=$l$i$N%X%C%@!<$NCM$G%9%3%"$rIU$1$k$3$H$,$G$-$^$9!#$3$N>l(B
+$B9g%9%3%"!&%(%s%H%j!<$N8^HVL\$NMWAG$,!"%9%3%"$rIU$1$k%X%C%@!<$NL>A0$K$J$j(B
+$B$^$9!#(B@acronym{NNTP} $B%5!<%P!<$,(B overview $B$G(B @samp{NNTP-Posting-Host} $B$r(B
+$BJaB*$7$F$$$k$J$i$P!"(B@file{all.SCORE} $B%U%!%$%k$N0J2<$N%(%s%H%j!<$O!"C10l(B
+$B$N%[%9%H$r5/8;$H$9$k(B spam $B$N967b$KBP$7$FM-8z$G$9(B:
 
 @lisp
 ("111.222.333.444" -1000 nil s
@@ -18759,236 +19673,236 @@ gnus $B$K5-;vA4BN$r},
+$B$3$l$i$NFs$D$N%X%C%@!<$OJL$N9gCW$N7?$r;H$$$^$9(B: @code{<}, @code{>},
 @code{=}, @code{>=}, @code{<=} $B$G$9!#(B
 
-$B$3$l$i$N=R8l$O$b$7(B
+$B$3$l$i$N=R8l$O(B
 
 @example
 (PREDICATE HEADER MATCH)
 @end example
 
-$B$NI>2A$,(B @code{nil} $B$G$J$$$H!"??$H$J$j$^$9!#Nc$($P!">e5i9g(B
+$B$NI>2A$,(B @code{nil} $B$G$O$J$$>l9g$K??$G$9!#Nc$($P!">e5i9g(B
 $BCW(B @code{("lines" 4 <)} (@pxref{Advanced Scoring}) $B$O7k2L$H$7$F0J2<$N<0(B
-$B$K$J$j$^$9!#(B
+$B$K$J$j$^$9(B:
 
 @lisp
 (< header-value 4)
 @end lisp
 
-$B$b$7$/$OB>$NJ}K!$K$7$^$7$g$&(B: @code{<} $B$r(B @code{Lines} $B$G(B 4 $B$r9gCW$H$7$F(B
-$B;H$C$F$$$k$H$-$O!"5-;v$,(B 4 $B9T$h$j$b>/$J$$$H$-$K%9%3%"$,DI2C$5$l$^$9!#(B($B:.(B
-$BMp$7$F!"H?BP$G$O$J$$$+$H9M$(0W$$$G$9!#$G$b!"$=$&$G$O$J$$$N$G$9!#;d$,;W$&(B
+$B8@$$49$($k$H!"(B4 $B$r9gCW$H$7$F(B @code{<} $B$r(B @code{Lines} $B$G;H$C$F$$$k$H$-$O!"(B
+$B5-;v$,(B 4 $B9T$h$j$b>/$J$$$H$-$K%9%3%"$,2C;;$5$l$k$H$$$&$3$H$G$9!#(B($B:.Mp$7$F!"(B
+$B$=$l$,H?BP$G$O$J$$$+$H9M$($,$A$G$9!#$G$b!"$=$&$G$O$J$$$N$G$9!#;d$,;W$&(B
 $B$K!#(B)
 
-$B9gCW$,(B @code{Lines} $B$G$J$5$l$F$$$k$H!"$$$/$D$+$N%P%C%/%(%s(B
-$B%I(B (@code{nndir}$B$N$h$&$J$b$N(B) $B$O(B @code{Lines} $B%X%C%@!<$r:n@.$7$J$$$?$a$K(B
-$BA4$F$N5-;v$,(B 0 $B9T$G$"$k$H$7$F07$o$l$k;v$K5$$rIU$1$F$/$@$5$$!#$3$l$O$b$7(B
-$B>/$7$N9T$7$+$J$$5-;v$N%9%3%"$r2<$2$F$$$k$N$J$i!"JQ$J7k2L$,5/$3$jF@$k;v$K(B
-$B$J$j$^$9!#(B
+$B9gCW$r(B @code{Lines} $B$G9T$J$C$F$$$k$H!"$$$/$D$+$N%P%C%/%(%s(B
+$B%I(B (@code{nndir} $B$N$h$&$J$b$N(B) $B$O(B @code{Lines} $B%X%C%@!<$r:n@.$7$J$$$N$G!"(B
+$B$9$Y$F$N5-;v$,(B 0 $B9T$G$"$k$H$7$F07$o$l$F$7$^$&$3$H$K5$$rIU$1$F2<$5$$!#$3(B
+$B$l$O!">/$7$N9T$7$+$J$$5-;v$N%9%3%"$r2<$2$F$$$k>l9g$K!"JQ$J7k2L$rF3$/$3$H(B
+$B$,$"$jF@$^$9!#(B
 
 @item Date
 Date ($BF|IU(B) $B%X%C%@!<$K$O;0$D$N$J$s$H$J$/$P$+$2$F$$$k9gCW$N7?$,$"$j$^$9(B:
 @code{before}, @code{at}, @code{after} $B$G$9!#;d$OK\Ev$K$3$l$,LrN)$D$h$&(B
 $B$J5!2q$rA[A|$G$-$J$$$N$G$9$,!"$3$N4X?t$rDs6!$7$J$$$N$b$J$s$H$J$/$P$+$2$F(B
 $B$$$^$9!#$=$&$7$?>l9g$N$?$a$K$"$k$N$G$9!#$$$DI,MW$K$J$k$+$OC/$K$b$o$+$j$^(B
-$B$;$s!#E>$P$L@h$N>s!#C;5$$OB;5$!#K\$r%+%P!<$GH=CG$7$F$O9T$1$^$;$s!#=i$a$F(B
-$B$N%G!<%H$G%(%C%A$7$F$O$$$1$^$;$s!#(B($B$7$+$7!";d$O>/$J$/$H$b0l?M!"0zMQ$7$^(B
-$B$9$,!"(B``$B$3$N4X?t$O7g$+$;$J$$$b$N$G$"$k;v$,$o$+$C$?(B'' $B$H8@$C$??M$,$$$k$H(B
-$BJ9$$$F$$$^$9!#(B)
-
-($BLuCm(B: $B86E5$N(B "Once burnt, twice shy" $B$r(B "$BC;5$$OB;5$(B" $B$H$7$^$7$?$,!"$b$C(B
-$B$HE,@Z$JLu$,$"$l$P$*CN$i$;2<$5$$!#(B)
+$B$;$s!#E>$P$L@h$N>s!#f=(B($B$"$D$b$N(B)$B$KD($j$Fg:(B($B$J$^$9(B)$B$r?a$/!#K\$r%+%P!<$GH=(B
+$BCG$7$F$O9T$1$^$;$s!#=i$a$F$N%G!<%H$G%(%C%A$7$F$O$$$1$^$;$s!#(B($B$7$+$7!";d(B
+$B$O>/$J$/$H$b0l?M!"0zMQ$7$^$9$,!"!V$3$N4X?t$O7g$+$;$J$$$b$N$G$"$k$3$H$,$o(B
+$B$+$C$?!W$H8@$C$??M$,$$$k$HJ9$$$F$$$^$9!#(B)
 
 @cindex ISO8601
 @cindex date
-$B$b$C$HLrN)$D9gCW$N7?$O(B @code{$B@55,I=8=(B} $B$G$9!#$=$l$K$h$C$FF|IUJ8;zNs$K@5(B
-$B5,I=8=$rMQ$$$F9gCW$5$;$k;v$,$G$-$^$9!#F|IU$O$^$:(B ISO8601 $BC;=LMM(B
+$B$b$C$HLr$KN)$D9gCW$N7?$O!V@55,I=8=!W$G$9!#$=$l$K$h$C$F!"F|IU$NJ8;zNs$K@5(B
+$B5,I=8=$r;H$C$F9gCW$5$;$k$3$H$,$G$-$^$9!#F|IU$O$^$:(B ISO8601 $B$NC;=LMM(B
 $B<0(B (compact format) $B$KI8=`2=$5$l$^(B
-$B$9(B---@var{YYYYMMDD}@code{T}@var{HHMMSS} $B$G$9!#Nc$($P!"$b$7A4$F$NG/(B
-$B$N(B 4$B7n(B1$BF|(B $B$KEj9F$5$l$?A4$F$N5-;v$K$,<#$5$;$?$$$N$G$"$l$P!"(B
-@samp{....0401.........} $B$r9gCWJ8;zNs$H$7$F;H$&;v$,$G$-$^$9!#(B($BF|IU$O85!9(B
-$B$NI8=`;~$GJ]B8$5$l$F$$$^$9$N$G!"$=$N5-;v$,Ej9F$5$l$?$H$3$m$G(B 4$B7n(B1$BF|(B $B$KEj(B
-$B9F$5$l$?5-;v$K9gCW$9$k;v$KCm0U$7$F$/$@$5$$!#I8=`;~$O0l2H$K$H$C$FHs>o$KM-(B
-$B1W$J3Z$7$_$G$7$g$&(B?)
+$B$9(B---@var{YYYYMMDD}@code{T}@var{HHMMSS} $B$G$9!#Nc$($P!"$9$Y$F$NG/(B
+$B$N(B 4$B7n(B1$BF|$KEj9F$5$l$?$9$Y$F$N5-;v$K9gCW$5$;$?$$$N$G$"$l$P!"9gCWJ8;zNs$H(B
+$B$7$F(B @samp{....0401.........} $B$r;H$&$3$H$,$G$-$^$9!#(B($BF|IU$O85!9$NI8=`;~(B
+$B$GJ]B8$5$l$F$$$k$N$G!"$=$N5-;v$,Ej9F$5$l$?>l=j$G$N(B 4$B7n(B1$BF|$KEj9F$5$l$?5-(B
+$B;v$K9gCW$9$k$3$H$KCm0U$7$F2<$5$$!#!H(BTime zones$B!I$O2HB2A40w$N7rA4$J3Z$7$_(B
+$B$G$9$M(B? ($BLuCm(B: $B$$$/$D$+$"$k!H(BTime zones$B!I$H$$$&%?%$%H%k$N6J$N$3$H$r8@$C(B
+$B$F$$$k$N$+$b$7$l$^$;$s!#(B))
 
 @item Head, Body, All
 $B$3$l$i$N;0$D$N9gCW$N%-!<$O(B @code{From} $B%X%C%@!<(B ($B$J$I(B) $B$HF1$89gCW$N7?$r(B
 $B;H$$$^$9!#(B
 
 @item Followup
-$B$3$N9gCW$N%-!<$O>/$7FCJL$G!"$=$l$O(B @code{From} $B%X%C%@!<$K9gCW$7!"9gCW$7(B
-$B$?5-;v$@$1$G$J$/$=$N5-;v$X$NA4$F$N%U%)%m!<%"%C%W$N%9%3%"$K$b1F6A$7$^$9!#(B
-$B$3$l$O$?$H$($P!"$"$J$?<+?H$N5-;v$X$N%U%)%m!<%"%C%W$N%9%3%"$rA}$d$7$?$j!"(B
-$BNI$/CN$i$l$?LdBj;y$X$N%U%)%m!<%"%C%W5-;v$N%9%3%"$r2<$2$?$j$9$k$N$K;H$o$l(B
-$B$^$9!#(B@code{From} $B%X%C%@!<$,;H$&$N$HF1$87?$N9gCW$r;H$$$^$9!#(B($B$3$N9gCW%-!<(B
-$B$r;H$&$H!"%U%!%$%k(B @file{ADAPT} $B$r:n$k;v$K$J$j$^$9!#(B)
+$B$3$N9gCW$N%-!<$O$d$dFCJL$G!"$=$l$O(B @code{From} $B%X%C%@!<$K9gCW$7!"9gCW$7(B
+$B$?5-;v$@$1$G$J$/$=$N5-;v$X$N$9$Y$F$N%U%)%m!<%"%C%W$N%9%3%"$K$b1F6A$7$^$9!#(B
+$B$3$l$ONc$($P!"$"$J$?<+?H$N5-;v$X$N%U%)%m!<%"%C%W$N%9%3%"$rA}$d$7$?$j!"NI(B
+$B$/CN$i$l$?LdBj;y$X$N%U%)%m!<%"%C%W5-;v$N%9%3%"$r2<$2$?$j$9$k$N$K;H$o$l$^(B
+$B$9!#(B@code{From} $B%X%C%@!<$,;H$&$N$HF1$87?$N9gCW$r;H$$$^$9!#(B($B$3$N9gCW%-!<(B
+$B$r;H$&$H!"(B@file{ADAPT} $B%U%!%$%k$r:n$k$3$H$K$J$j$^$9!#(B)
 
 @item Thread
-$B$3$N9gCW%-!<$O(B @code{Followup} $B9gCW%-!<$HF1$89T$KF0:n$7$^$9!#(B
-@code{Message-ID} @var{x} $B$G;O$^$C$F$$$k(B ($BI{(B)$B%9%l%C%I$K%9%3%"$rIU$1$?$$(B
-$B$N$G$"$l$P!"(B@samp{thread} $B9gCW$rIU$12C$($^$9!#$3$l$O(B @code{Reference} $B%X%C(B
-$B%@!<$K(B @var{x} $B$r;}$D$=$l$>$l$N5-;v$K?7$7$$(B @samp{thread} $B9gCW$rDI2C$7$^(B
-$B$9!#(B($B$3$l$i$N?7$7$$(B @samp{thread} $B9gCW$O$3$l$i$N9gCW$9$k5-;v(B
-$B$N(B @code{Message-ID} $B$r;H$$$^$9!#(B) $B$3$l$O%9%l%C%I$N$$$/$D$+$N5-;v$,40A4(B
-$B$J(B @code{References} $B%X%C%@!<$r;}$C$F$$$J$+$C$?$H$7$F$b!"%9%l%C%IA4BN$N(B
-$B%9%3%"$r>e$2(B/$B2<$2$G$-$k;v$rJ]>Z$7$^$9!#$3$l$r;H$&$H!"%9%l%C%I$N5-;v$K7h(B
-$BDjE*$G$J$$%9%3%"$,IU$/$+$b$7$l$J$$$H$$$&$3$H$KCm0U$7$F$/$@$5$$!#(B($B$3$N9g(B
-$BCW%-!<$r;H$&$H!"%U%!%$%k(B @file{ADAPT} $B$r:n$k;v$K$J$j$^$9!#(B)
+$B$3$N9gCW%-!<$O(B @code{Followup} $B9gCW%-!<$HF1$8J}?K$K1h$C$FF0:n$7$^$9!#(B
+@code{Message-ID} @var{x} $B$G;O$^$C$F$$$k%9%l%C%I(B ($B$^$?$OI{%9%l%C%I(B) $B$K%9(B
+$B%3%"$rIU$1$?$$$N$G$"$l$P!"(B@samp{thread} $B9gCW$rIU$12C$($F2<$5$$!#$3$l(B
+$B$O(B @code{Reference} $B%X%C%@!<$K(B @var{x} $B$r;}$D$=$l$>$l$N5-;v$K!"?7$7(B
+$B$$(B @samp{thread} $B9gCW$rDI2C$7$^$9!#(B($B$3$l$i$N?7$7$$(B @samp{thread} $B9gCW$O(B
+$B$3$l$i$N9gCW$9$k5-;v$N(B @code{Message-ID} $B$r;H$$$^$9!#(B) $B$3$l$O%9%l%C%I$N(B
+$B$$$/$D$+$N5-;v$,40A4$J(B @code{References} $B%X%C%@!<$r;}$C$F$$$J$+$C$?$H$7(B
+$B$F$b!"%9%l%C%IA4BN$N%9%3%"$r>e$2(B/$B2<$2$G$-$k$3$H$rJ]>Z$7$^$9!#$3$l$r;H$&(B
+$B$H!"%9%l%C%I$N5-;v$K7hDjE*$G$J$$%9%3%"$,IU$/$+$b$7$l$J$$$H$$$&$3$H$KCm0U(B
+$B$7$F2<$5$$!#(B($B$3$N9gCW%-!<$r;H$&$H!"(B@file{ADAPT} $B%U%!%$%k$r:n$k$3$H$K$J$j(B
+$B$^$9!#(B)
 @end table
 @end enumerate
 
 @cindex score file atoms
 @item mark
-$B$3$NEPO?$NCM$O?t;z$G$"$k$Y$-$G$9!#$3$N?t;z$h$jDc$$%9%3%"$N5-;v$K$O4{FI$N(B
-$B0u$,IU$-$^$9!#(B
+$B$3$N%(%s%H%j!<$NCM$O?tCM$G$J$1$l$P$J$j$^$;$s!#$3$N?tCM$h$jDc$$%9%3%"$N$I(B
+$B$s$J5-;v$K$b4{FI$N0u$,IU$-$^$9!#(B
 
 @item expunge
-$B$3$NEPO?$NCM$O?t;z$G$"$k$Y$-$G$9!#$3$N?t;z$h$jDc$$%9%3%"$N5-;v$O35N,%P%C(B
-$B%U%!$+$i:o=|$5$l$^$9!#(B
+$B$3$N%(%s%H%j!<$NCM$O?tCM$G$J$1$l$P$J$j$^$;$s!#$3$N?tCM$h$jDc$$%9%3%"$N$I(B
+$B$s$J5-;v$b35N,%P%C%U%!!<$+$i:o=|$5$l$^$9!#(B
 
 @item mark-and-expunge
-$B$3$NEPO?$NCM$O?t;z$G$"$k$Y$-$G$9!#$3$N?t;z$h$jDc$$%9%3%"$N5-;v$K$O4{FI$N(B
-$B0u$,IU$-!"35N,%P%C%U%!$+$i:o=|$5$l$^$9!#(B
+$B$3$N%(%s%H%j!<$NCM$O?tCM$G$J$1$l$P$J$j$^$;$s!#$3$N?tCM$h$jDc$$%9%3%"$N$I(B
+$B$s$J5-;v$K$b4{FI$N0u$,IU$-!"35N,%P%C%U%!!<$+$i:o=|$5$l$^$9!#(B
 
 @item thread-mark-and-expunge
-$B$3$NEPO?$NCM$O?t;z$G$"$k$Y$-$G$9!#%9%3%"$NAm7W$,$3$N?t;z$h$jDc$$%9%l%C%I(B
-$B$K$O4{FI$N0u$,IU$-!"35N,%P%C%U%!$+$i:o=|$5$l$^$9!#(B
-@code{gnus-thread-score-function} $B$O%9%l%C%I$N%9%3%"$NAm7W$r$I$N$h$&$K7W(B
-$B;;$9$k$+$r;XDj$7$^$9!#(B
+$B$3$N%(%s%H%j!<$NCM$O?tCM$G$J$1$l$P$J$j$^$;$s!#%9%3%"$NAm7W$,$3$N?tCM$h$j(B
+$BDc$$%9%l%C%I$N$9$Y$F$N5-;v$K$O4{FI$N0u$,IU$-!"35N,%P%C%U%!!<$+$i:o=|$5$l(B
+$B$^$9!#(B@code{gnus-thread-score-function} $B$O%9%l%C%I$N%9%3%"$NAm7W$r$I$N$h(B
+$B$&$K7W;;$9$k$+$r;XDj$7$^$9!#(B
 
 @item files
-$B$3$NEPO?$NCM$OG$0U$N?t$N%U%!%$%kL>$G$"$k$Y$-$G$9!#$3$l$i$N%U%!%$%k$b%9%3(B
-$B%"%U%!%$%k$G$"$k$H$_$J$5$l!"$3$l$,$5$l$?$N$HF1$8$h$&$JJ}K!$GFI$_9~$^$l$^(B
-$B$9!#(B
+$B$3$N%(%s%H%j!<$NCM$OG$0U$N?t$N%U%!%$%kL>$G$J$1$l$P$J$j$^$;$s!#$=$l$i$N%U%!(B
+$B%$%k$b%9%3%"%U%!%$%k$G$"$k$H$_$J$5$l!"$3$l$,$5$l$?$N$HF1$8J}K!$GFI$_9~$^(B
+$B$l$^$9!#(B
 
 @item exclude-files
-$B$3$NEPO?$N$G$"$k$Y$-$G$9!#$3$l$i$N%U%!%$%k(B
-$B$O2?$i$+$NM}M3$GIaDL$OFI$_9~$^$l$k$h$&$K$J$C$F$$$?$H$7$F$b!"FI$_9~$^$l$^(B
-$B$;$s!#(B
+$B$3$N%(%s%H%j!<$N$G$J$1$l$P$J$j$^$;$s!#$3$l(B
+$B$i$N%U%!%$%k$,2?$i$+$NM}M3$GIaDL$OFI$_9~$^$l$k$h$&$K$J$C$F$$$?$H$7$F$b!"(B
+$BFI$_9~$^$l$^$;$s!#(B
 
 @item eval
-$B$3$NEPO?$NCM$O(B @code{$BI>2A(B} $B$5$l$^$9!#$3$NMWAG$OA4BNE*%9%3%"%U%!%$%k$r07$C(B
-$B$F$$$k$H$-$OL5;k$5$l$^$9!#(B
+$B$3$N%(%s%H%j!<$NCM$O(B @code{eval} ($BI>2A(B) $B$5$l$^$9!#$3$NMWAG$O%0%m!<%P%k%9(B
+$B%3%"%U%!%$%k$r07$C$F$$$k$H$-$OL5;k$5$l$^$9!#(B
 
 @item read-only
-$BFI$_9~$_@lMQ%9%3%"%U%!%$%k$O99?7$5$l$?$jJ]B8$5$l$?$j$7$^$;$s!#A4BNE*%9%3(B
-$B%"%U%!%$%k$O$3$N%"%H%`$r;HMQ$9$k$Y$-$G$9(B (@pxref{Global Score Files})$B!#(B
-($BCm0U(B: @dfn{$BA4BNE*(B} $B$O$3$3$G$OK\Ev$K(B @dfn{$BA4BNE*(B} $B$H$$$&0UL#$G$9!#8D?ME*(B
-$B$JA4$F$N%0%k!<%W$KE,MQ$9$k%9%3%"%U%!%$%k$N;v$G$O$"$j$^$;$s!#(B)
+$BFI$_9~$_@lMQ%9%3%"%U%!%$%k$O99?7$5$l$?$jJ]B8$5$l$?$j$7$^$;$s!#%0%m!<%P%k(B
+$B%9%3%"%U%!%$%k$O$3$N%"%H%`$r;HMQ$9$k$Y$-$G$9(B (@pxref{Global Score
+Files})$B!#(B($BCm0U(B: $B!V%0%m!<%P%k!W$O$3$3$G$OK\Ev$K!VA4BNE*!W$H$$$&0UL#$G$9!#(B
+$B8D?ME*$J$9$Y$F$N%0%k!<%W$KE,MQ$9$k%9%3%"%U%!%$%k$N$3$H$G$O$"$j$^$;$s!#(B)
 
 @item orphan
-$B$3$NEPO?$NCM$O?t;z$G$"$k$Y$-$G$9!#?F5-;v$r;}$?$J$$5-;v$O%9%3%"$K$3$N?t;z(B
-$B$,2C$($i$l$^$9!#(B@samp{comp.lang.c} $B$N$h$&$JNL$NB?$$%K%e!<%9%0%k!<%W$rDI(B
-$B$$$+$1$F$$$k$H$7$F$/$@$5$$!#$*$=$i$/Fs!";0$N%9%l%C%I$H?7$7$$%9%l%C%I$@$1(B
-$B$rDI$$$?$$$G$7$g$&!#(B
+$B$3$N%(%s%H%j!<$NCM$O?tCM$G$J$1$l$P$J$j$^$;$s!#?F5-;v$r;}$?$J$$5-;v$N%9%3(B
+$B%"$K$3$N?tCM$,2C$($i$l$^$9!#(B@samp{comp.lang.c} $B$N$h$&$JN.DLNL$NB?$$%K%e!<(B
+$B%9%0%k!<%W$rDI$$$+$1$F$$$k$HA[A|$7$F2<$5$$!#$*$=$i$/$[$s$N>/$7$N%9%l%C%I(B
+$B$@$1$rDI$$$?$$$G$7$g$&!#$5$i$K?7$7$$%9%l%C%I$O8+$?$$$G$7$g$&!#(B
 
-$B0J2<$N;0$D$N%9%3%"%U%!%$%kEPO?$K$h$C$F$=$l$r$9$k;v$,$G$-$^$9(B:
+$B0J2<$NFs$D$N%9%3%"%U%!%$%k%(%s%H%j!<$K$h$C$F!"$=$l$r$9$k$3$H$,$G$-$^$9(B:
 
 @example
         (orphan -500)
         (mark-and-expunge -100)
 @end example
 
-$B:G=i$K$3$N%0%k!<%W$KF~$C$?$H$-$O!"?7$7$$%9%l%C%I$@$1$r8+$^$9!#$=$l$+$i$*(B
-$B$b$7$m$$$H;W$C$?%9%l%C%I$N%9%3%"$r>e$2(B (@kbd{I T} $B$b$7$/$O(B @kbd{I S} $B$K(B
-$B$h$C$F(B)$B!";D$j$rL5;k(B (@kbd{C y}) $B$7$^$9!#e$2(B (@kbd{I T} $B$^$?(B
+$B$O(B @kbd{I S} $B$G(B)$B!";D$j$rL5;k(B (@kbd{C y}) $B$7$F2<$5$$!#/$7B8:_$7$9$kNL$NB?$$%0%k!<%W$N$?$a$K$"$j$^$9!#(B
+$B$9$J$o$A(B orphan ($B8I;y(B) $B%9%3%"%"%H%`$O!"IaDL$N%9%3%"5,B'$G$O<+F0E*$KH/8+(B
+$B$G$-$J$$!"6=L#?<$$%9%l%C%I$,>/$7B8:_$7$9$k!"N.DLNL$,B?$$%0%k!<%W$N$?$a$K(B
+$B$"$j$^$9!#(B
 
 @item adapt
-$B$3$NEPO?$OE,1~%9%3%"$r@)8f$7$^$9!#$b$7$3$l$,(B @code{t} $B$G$"$k$H!"=i4|@_Dj(B
-$B$NE,1~%9%3%"K!B'$,;H$o$l$^$9!#$b$7$3$l$,(B @code{ignore} $B$G$"$k$H!"$3$N%0(B
-$B%k!<%W$K$OE,1~%9%3%"$O$N$b$N$G$"$l$P!"=i4|@_Dj$NE,1~%9%3%"K!(B
-$BB'$,;H$o$l$^$9!#$?$$$F$$$N%0%k!<%W$KE,1~%9%3%"$r;H$$$?$$$N$G$"$l$P!"(B
-@code{gnus-use-adaptive-scorint} $B$r(B @code{t} $B$K@_Dj$7!"(B@code{(adapt
-ignore)} $B$rE,1~%9%3%"$r$7$?$/$J$$%0%k!<%W$KA^F~$9$k$G$7$g$&!#>/$7$N%0%k!<(B
-$B%W$G$@$1E,1~%9%3%"$r9T$$$?$$$N$G$"$l$P!"(B
-@code{gnus-use-adaptive-scoring} $B$r(B @code{nil} $B$K@_Dj$7!"(B
-@code{(adaptive t)} $B$r$=$l$r9T$$$?$$%0%k!<%W$N%9%3%"%U%!%$%k$KA^F~$9$k$G(B
-$B$7$g$&!#(B
+$B$3$N%(%s%H%j!<$OE,1~%9%3%"IU$1$r@)8f$7$^$9!#$3$l$,(B @code{t} $B$@$C$?$i!"%G%#(B
+$B%U%)%k%H$NE,1~%9%3%"5,B'$,;H$o$l$^$9!#(B@code{ignore} $B$@$C$?$i!"$3$N%0%k!<(B
+$B%W$G$OE,1~%9%3%"IU$1$O9T$J$o$l$^$;$s!#$b$7%j%9%H$@$C$?$i!"$=$N%j%9%H$,E,(B
+$B1~%9%3%"5,B'$H$7$FMQ$$$i$l$^$9!#$b$7$=$l$,B8:_$7$J$$(B
+$B$+(B @code{t} $B$d(B @code{ignore} $B0J30$N2?$+$@$C$?$i!"%G%#%U%)%k%H$NE,1~%9%3(B
+$B%"5,B'$,;H$o$l$^$9!#$?$$$F$$$N%0%k!<%W$GE,1~%9%3%"IU$1$r;H$$$?$$$N$G$"$l(B
+$B$P!"(B@code{gnus-use-adaptive-scorint} $B$r(B @code{t} $B$K@_Dj$7!"E,1~%9%3%"IU(B
+$B$1$r$7$?$/$J$$%0%k!<%W$K(B @code{(adapt ignore)} $B$rA^F~$9$l$P$h$$$G$7$g$&!#(B
+$B>/$7$N%0%k!<%W$G$@$1E,1~%9%3%"$r9T$J$$$?$$$N$G$"$l$P!"(B
+@code{gnus-use-adaptive-scoring} $B$r(B @code{nil} $B$K@_Dj$7!"$=$l$r9T$J$$$?(B
+$B$$%0%k!<%W$N%9%3%"%U%!%$%k$K(B @code{(adaptive t)} $B$rA^F~$7$^$7$g$&!#(B
 
-@item adaptive-file
-$BA4$F$NE,1~%9%3%"EPO?$O$3$NEPO?$K$h$C$FL>$E$1$i$l$?%U%!%$%k$KF~$j$^$9!#$=(B
-$B$l$O%0%k!<%W$KF~$k$H$-$K$bE,MQ$5$l$^$9!#$3$N%"%H%`$OB?$/$N%0%k!<%W$KF1$8(B
-$BE,1~%9%3%"%U%!%$%k$rMQ$$$k;v$K$h$C$F!"J#?t$N%0%k!<%W$K0lEY$KE,1~%9%3%"$r(B
-$BIU$1$?$$$H$-$KJXMx$G$7$g$&!#(B
+@item adapt-file
+$B$9$Y$F$NE,1~%9%3%"!&%(%s%H%j!<$O!"$3$N%(%s%H%j!<$K$h$C$FL>$E$1$i$l$?%U%!(B
+$B%$%k$KF~$j$^$9!#$5$i$K$=$l$O%0%k!<%W$KF~$k$H$-$K$bE,MQ$5$l$^$9!#$3$N%"%H(B
+$B%`$O!"B?$/$N%0%k!<%W$GF1$8E,1~%9%3%"%U%!%$%k$rMQ$$$k$3$H$K$h$C$F!"J#?t$N(B
+$B%0%k!<%W$K0lEY$KE,1~%9%3%"$rIU$1$?$$$H$-$KJXMx$G$7$g$&!#(B
 
 @item local
 @cindex local variables
-$B$3$NEPO?$NCM$O(B @code{(@var{var} @var{value})} $BBP$N%j%9%H$G$"$k$Y$-$G$9!#(B
-$B$=$l$>$l$N(B @var{var} $B$O8=:_$N35N,%P%C%U%!$N%P%C%U%!8GM-$K$J$j!";XDj$5$l(B
-$B$?CM(B (value) $B$K@_Dj$5$l$^$9!#$3$l$OJXMx$J!"$b$7>/$7JQ$@$H$7$F$b!"%U%C%/(B
-$B$r$"$^$j9%$^$J$$$$$/$D$+$N%0%k!<%W$GJQ?t$r@_Dj$9$kJ}K!$G$9!#(B
-@var{value} $B$OI>2A$5$l$J$$;v$KCm0U$7$F$/$@$5$$!#(B
+$B$3$N%(%s%H%j!<$NCM$O(B @code{(@var{var} @var{value})} $B$N7A<0$NBP$N%j%9%H$G(B
+$B$J$1$l$P$J$j$^$;$s!#$=$l$>$l$N(B @var{var} $B$O8=:_$N35N,%P%C%U%!!<$G%P%C%U%!!<(B
+$B%m!<%+%k$K$J$j!";XDj$5$l$?CM(B (@var{value}) $B$K@_Dj$5$l$^$9!#$3$l$O>/$7Iw(B
+$BJQ$o$j$G$9$,!"%U%C%/$,$"$^$j9%$-$G$J$$$J$i$P!"$$$/$D$+$N%0%k!<%W$GJQ?t$r(B
+$B@_Dj$9$k$N$KJXMx$JJ}K!$G$9!#(B@var{value} $B$OI>2A$5$l$J$$$3$H$KCm0U$7$F2<$5(B
+$B$$!#(B
 @end table
 
 @node Score File Editing
-@section $B%9%3%"%U%!%$%kJT=8(B
+@section $B%9%3%"%U%!%$%k$NJT=8(B
 
-$BIaDL$OA4$F$N%9%3%"L?Na$r35N,%P%C%U%!$+$iH/9T$7$^$9$,!"/$7%+%9%?%^%$%:$5$l$?(B @code{emacs-lisp} $B%b!<%I$G!"0J2<$NDI(B
-$B2C$NL?Na$,B8:_$7$^$9(B:
+$B$=$l$O0J2<$KNs5s$9$kL?Na$r;H$($k$h$&$K!">/$7%+%9%?%^%$%:$7$?$@$1(B
+$B$N(B @code{emacs-lisp} $B%b!<%I$G$9(B:
 
 @table @kbd
 @item C-c C-c
 @kindex C-c C-c ($B%9%3%"(B)
 @findex gnus-score-edit-done
-$B$"$J$?$,9T$C$?JQ99$rJ]B8$7$F35N,%P%C%U%!$KLa$j$^(B
+$B$"$J$?$,9T$J$C$?JQ99$rJ]B8$7$F35N,%P%C%U%!!<$KLa$j$^(B
 $B$9(B (@code{gnus-score-edit-done})$B!#(B
 
 @item C-c C-d
 @kindex C-c C-d ($B%9%3%"(B)
 @findex gnus-score-edit-insert-date
-$B8=:_$NF|IU$r?t;zMM<0$GA^F~$7$^$9(B (@code{gnus-score-edit-insert-date})$B!#(B
-$B$b$7$3$l$,$I$N$h$&$J$b$N$G$"$m$&$H9M$($F$$$k$N$G$"$l$P!"$3$l$OK\Ev$KF|$N(B
-$B?t;z$G$9!#(B
+$B8=:_$NF|IU$r?tCM$NMM<0$GA^F~$7$^$9(B (@code{gnus-score-edit-insert-date})$B!#(B
+$B$3$l$O$I$N$h$&$J$b$N$@$m$&$H9M$($F$$$k$N$J$i!"$3$l$OK\Ev$KF|$N?tCM$G$9!#(B
 
 @item C-c C-p
 @kindex C-c C-p ($B%9%3%"(B)
 @findex gnus-score-pretty-print
-$BE,1~%9%3%"%U%!%$%k$O@0$($i$l$F$$$J$$N.57$GJ]B8$5$l$^$9!#$b$7$3$l$i$N%U%!(B
-$B%$%k$NFb$N0l$D$rFI$_$?$$$H;W$C$F$$$k$N$G$"$l$P!"$^$:(B @dfn{$BAGE($JI=<((B} $B$r(B
-$B$7$?$$$G$7$g$&!#$3$NL?Na(B (@code{gnus-score-pretty-print}) $B$,$"$J$?$N$?$a(B
-$B$K$=$l$r$7$^$9!#(B
+$BE,1~%9%3%"%U%!%$%k$O@07A$5$l$:$KJ]B8$5$l$^$9!#$b$7$3$l$i$N%U%!%$%k$N0l$D(B
+$B$rFI$`$D$b$j$J$i!"$^$:(B @dfn{pretty print} ($B@07A$7$F0u;z(B) $B$7$?$$$G$7$g$&!#(B
+$B$3$NL?Na(B (@code{gnus-score-pretty-print}) $B$,$=$l$r9T$J$$$^$9!#(B
 @end table
 
-$B$3$N%b!<%I$r;H$&$?$a$K$O(B @kbd{M-x gnus-score-mode} $B$HBG$C$F$/$@$5$$!#(B
+$B$3$N%b!<%I$r;H$&$K$O(B @kbd{M-x gnus-score-mode} $B$H%?%$%W$7$F2<$5$$!#(B
 
 @vindex gnus-score-mode-hook
-@code{gnus-score-menu-hook} $B$,%9%3%"%b!<%I%P%C%U%!$GJ}$NE,1~(B
-$BJ}K!$r;H$$$?$1$l$P!"$3$NJQ?t$r(B@code{(wordline)} $B$K@_Dj$7$F$/$@$5$$!#(B
+$B$9$k$HM-8z$K$J$j$^$9!#$b$7%9%3%"$r!"I=Bj$K8=$l$k8DJL$NC18l$r$b$H$KE,(B
+$B1~$5$;$?$1$l$P!"$3$NJQ?t$r(B @code{(word)} $B$K@_Dj$7$F2<$5$$!#N>J}$NE,1~J}(B
+$BK!$r;H$$$?$1$l$P!"$3$NJQ?t$r(B @code{(word line)} $B$K@_Dj$7$F2<$5$$!#(B
 
 @vindex gnus-default-adaptive-score-alist
-@code{gnus-default-adaptive-score-alist} $BJQ?t$r%+%9%?%^%$%:$9$k$3$H$G!"(B
-$B%9%3%"IU$1$N=hM}$r40A4$K@)8f$G$-$^$9!#Nc$($P!"$3$N$h$&$J46$8$K$J$j$^$9!#(B
+$B%9%3%"IU$1$N=hM}$r40A4$K@)8f$9$k$?$a(B
+$B$K(B @code{gnus-default-adaptive-score-alist} $BJQ?t$r%+%9%?%^%$%:$7$F2<$5$$!#(B
+$BNc$($P!"$3$s$J46$8$K$J$k$G$7$g$&(B:
 
 @lisp
 (setq gnus-default-adaptive-score-alist
@@ -19005,72 +19919,73 @@ gnus $B$K$O$3$l$i$rA4$F<+F0E*$K(B --- $B$^$k$GKbK!$G$b;H$C$?$h$&$K:n@.(B
         (gnus-catchup-mark (from -1) (subject -1))))
 @end lisp
 
-$B8+$F$*J,$+$j$N$h$&$K!"$3$NO"A[%j%9%H$N3FMWAG$O!"%-!<$H$7$F0u(B ($BJQ?tL>$+$b(B
-$B$7$/$O(B ``$BK\Ev$N(B'' $B0u(B --- $B$D$^$jJ8;z(B)$B$r;}$A$^$9!#$3$N%-!<$N8e$K$OG$0U$N?t(B
-$B$N%X%C%@!<(B/$B%9%3%"$NAH$,B3$-$^$9!#$b$7$=$N%-!<$N8e$K%X%C%@!<(B/$B%9%3%"$NAH$,(B
-$B0l$D$b$J$1$l$P!"$=$N%-!<$,5-;v$N0u$H$7$F$D$$$F$$$k5-;v$KBP$7$F$OE,1~@-%9(B
-$B%3%"$Oe5-$NNc$G$O!"(B@code{gnus-unread-mark} $B$,$D$$(B
-$B$F$$$k5-;v$OE,1~@-%9%3%"$NEPO?9`L\$K$O$J$j$^$;$s!#(B
+$B$4Mw$N$h$&$K!"$3$NO"A[%j%9%H$N3FMWAG$O!"%-!<$H$7$F0u(B ($BJQ?tL>$+!Ve5-$NNc$G$O!"(B@code{gnus-unread-mark} $B$,IU$$$F(B
+$B$$$k5-;v$O!"E,1~7?%9%3%"IU$1$N%(%s%H%j!<$r;}$A$^$;$s!#(B
 
-$B3F5-;v$O$?$@0l$D$N0u$7$+;}$AF@$J$$$N$G!"$=$l$>$l$N5-;v$K$O$3$l$i$N5,B'$N(B
-$B$&$A$?$@0l$D$7$+E,MQ$5$l$^$;$s!#(B
+$B3F5-;v$O0l$D$7$+0u$r;}$AF@$J$$$N$G!"$=$l$>$l$N5-;v$K$O$3$l$i$N5,B'$N$&$A(B
+$B$N0l$D$@$1$,E,MQ$5$l$^$9!#(B
 
-@code{gnus-del-mark} $B$rNc$KC5n(B ($B%a!<%k(B) $B%0%k!<%W(B (@pxref{Expiring Mail})$B$,$"$l$P!"(B
-$B4{FI5-;v$K$OA4$F(B @samp{E} $B0u$,$D$1$i$l$^$9!#$3$l$O$*$=$i$/!"E,1~@-%9%3%"(B
-$BIU$1$r$A$g$C$H$P$+$jIT2DG=$K$9$k$N$G!"<+F04|8B@Z$l>C5n$HE,1~@-%9%3%"$O0l(B
-$B=o$K$O$&$^$/$d$C$F$$$1$^$;$s!#(B
+$B$b$7<+F04|8B@Z$l>C5n(B ($B%a!<%k(B) $B%0%k!<%W(B (@pxref{Expiring Mail}) $B$,$"$l$P!"(B
+$B4{FI5-;v$K$O$9$Y$F(B @samp{E} $B0u$,IU$1$i$l$^$9!#$3$l$O$*$=$i$/E,1~7?%9%3%"(B
+$BIU$1$r$A$g$C$H$P$+$j$d$j$K$/$/$9$k$N$G!"<+F04|8B@Z$l>C5n$HE,1~7?%9%3%"IU(B
+$B$1$O!"0l=o$K$O8=.$5$JJQ99$rHr$1$k$?(B
-$B$a$K!"%9%3%"%U%!%$%k$N(B @code{mark} $B%"%H%`$r2?$+>.$5$$CM(B --- $B$3$H$K$h$l(B
-$B$P(B -300 $B$/$i$$$K@_Dj$7$F$*$$$?J}$,NI$$$G$9!#(B
+$B$a$K!"%9%3%"%U%!%$%k$N(B @code{mark} $B%"%H%`$r2?$+>.$5$$CM(B---$B$R$g$C$H$9$k(B
+$B$H(B -300 $B$/$i$$$K@_Dj$7$F$*$/$Y$-$G$9!#(B
 
-$BE,1~@-%9%3%"$r0l=54V$+$=$3$i;H$C$F$/$k$H!"(Bgnus $B$O$=$lAj1~$KD465$5$l!"$"(B
-$B$J$?$,2?$b8@$o$J$/$F$b!"$"$J$?$N9%$-$JEj9FC5n$9$k$h$&$K$J$k$O$:$G$9!#(B
+$BE,1~7?%9%3%"IU$1$r0l=54V$+$=$3$i;H$C$F$/$k$H!"(Bgnus $B$O$=$lAj1~$KD465$5$l!"(B
+$B$"$J$?$,2?$b8@$o$J$/$F$b!"$"$J$?$N9%$-$JEj9FC5n$9$k$h$&$K$J$k$O$:$G$9!#(B
 
-$B$I$N%0%k!<%W$K$*$$$FE,1~@-%9%3%"$r:nF0$5$;$k$+$O!"%9%3%"%U%!%$(B
+$B$I$N%0%k!<%W$K$*$$$FE,1~7?%9%3%"IU$1$r:nF0$5$;$k$+$O!"%9%3%"%U%!%$(B
 $B%k(B (@pxref{Score File Format}) $B$r;H$&$3$H$K$h$C$F@)8f$G$-$^$9!#$^$?$3$l(B
 $B$r;H$C$F!"0c$C$?%0%k!<%W$KBP$7$F0c$C$?5,B'$r;H$&$h$&$K$b$G$-$^$9!#(B
 
 @vindex gnus-adaptive-file-suffix
-$BE,1~@-%9%3%"EPO?9`L\$O!"%0%k!<%WL>$K(B @code{gnus-adaptive-file-suffix} $B$r(B
-$BIU2C$7$?L>A0$N%U%!%$%k$KF~$l$i$l$^$9!#=i4|@_DjCM$O(B @file{ADAPT} $B$G$9!#(B
+$BE,1~7?%9%3%"!&%(%s%H%j!<$O!"%0%k!<%WL>(B
+$B$K(B @code{gnus-adaptive-file-suffix} $B$rIU2C$7$?L>A0$N%U%!%$%k$KF~$l$i$l$^(B
+$B$9!#%G%#%U%)%k%H$O(B @file{ADAPT} $B$G$9!#(B
 
 @vindex gnus-adaptive-pretty-print
-$BE,1~@-%9%3%"%U%!%$%k$O5pBg$K$J$jF@$k$7!"?M$Nl9g$K$*$$$FNI$$7k2L$,F@$i$l$k$G$7$g$&!#$7$+$7!"%X%C%@!<(B
-$B$N0lCW$7$?ItJ,$,C;$$>l9g!"0U?^$KH?$9$k$h$&$JF0:n$r$9$k2DG=@-$,Bg$-$/$J$k(B
-$B$N$G!"(B@code{gnus-score-exact-adapt-limit} $B$h$jC;$$D9$5$7$+0lCW$7$J$$>l9g(B
-$B$O40A40lCW$,9T$o$l$^$9!#$3$NJQ?t$,(B @code{nil} $B$G$"$l$P!"$3$NLdBj$,5/$3$i(B
-$B$J$$$h$&$K>o$K40A40lCW$,9T$o$l$^$9!#(B
+$BE,1~7?%9%3%"IU$1$r9T$J$&$H$-$O!"ItJ,J8;zNs0lCW$d%U%!%8!<$J0lCW$r9T$J$C$?(B
+$BJ}$,!"$*$=$i$/$[$H$s$I$N>l9g$K$*$$$FNI$$7k2L$,F@$i$l$k$G$7$g$&!#$7$+$7!"(B
+$B%X%C%@!<$N0lCW$9$kItJ,$,C;$$>l9g!"0U?^$KH?$9$kF0:n$r$9$k2DG=@-$,Bg$-$$$N(B
+$B$G!"(B@code{gnus-score-exact-adapt-limit} $B$h$jC;$$D9$5$7$+0lCW$7$J$$>l9g$O(B
+$B40A40lCW$,9T$J$o$l$^$9!#$3$NJQ?t$,(B @code{nil} $B$G$"$l$P!"$3$NLdBj$,5/$3$i(B
+$B$J$$$h$&$K>o$K40A40lCW$,9T$J$o$l$^$9!#(B
 
 @vindex gnus-default-adaptive-word-score-alist
-$B>e$G=R$Y$?$h$&$K!"8DJL$NC18l$KBP$7$F$b%X%C%@!l9g!"(B
-@code{gnus-default-adaptive-word-score-alist} $BJQ?t$K$h$C$F!"3FC18l$KBP$7(B
-$B$F$"$k0u$X$I$s$J%9%3%"$rM?$($k$+$r;XDj$7$^$9!#(B
+$B>e$G=R$Y$?$h$&$K!"8DJL$NC18l$G$G$b%X%C%@!l9g$K$O!"$=$l$>$l$NC18l$N;vNc$,!"$"$k0u$K$I$s(B
+$B$J%9%3%"$r2C$($k$+$r!"(B@code{gnus-default-adaptive-word-score-alist} $BJQ?t(B
+$B$K$h$C$F;XDj$7$^$9!#(B
 
 @lisp
 (setq gnus-default-adaptive-word-score-alist
@@ -19080,106 +19995,105 @@ gnus $B$K$O$3$l$i$rA4$F<+F0E*$K(B --- $B$^$k$GKbK!$G$b;H$C$?$h$&$K:n@.(B
         (,gnus-del-mark . -15)))
 @end lisp
 
-$B$3$l$,=i4|@_DjCM$G$9!#C18l$KBP$9$kE,1~$rM-8z$K$9$k$H!"(B
-@code{gnus-read-mark} $B$N0u$N$D$$$?5-;v$NI=Bj$K8=$l$kA4$F$NC18l$,!"%9%3%"(B
-$B$K(B 30 $BE@DI2C$9$k$H$$$&%9%3%"5,B'$r@8$_=P$7$^$9!#(B
+$B$3$l$,%G%#%U%)%k%HCM$G$9!#C18l$G$NE,1~$rM-8z$K$9$k$H!"(B
+@code{gnus-read-mark} $B$N0u$,IU$$$F$$$k5-;v$NI=Bj$K8=$l$k$9$Y$F$NC18l$,!"(B
+$B%9%3%"$K(B 30 $BE@DI2C$9$k$H$$$&%9%3%"5,B'$r@8$_=P$7$^$9!#(B
 
 @vindex gnus-default-ignored-adaptive-words
 @vindex gnus-ignored-adaptive-words
 @code{gnus-default-ignored-adaptive-words} $B$N%j%9%H$K8=$l$kC18l$OL5;k$5(B
 $B$l$^$9!#L5;k$7$?$$C18l$rDI2C$7$?$$$H$-$O!"$3$NJQ?t$G$O$J(B
-$B$/(B @code{gnus-ignored-adaptive-words} $B%j%9%H$NJ}$r;H$C$F$/$@$5$$!#(B
+$B$/(B @code{gnus-ignored-adaptive-words} $B%j%9%H$NJ}$r;H$C$F2<$5$$!#(B
 
 @vindex gnus-adaptive-word-length-limit
-$BC;$$C18l$G$OE,1~@-%9%3%"$r:nF0$5$;$k$Y$-$G$O$J$$$H;W$&?M$b$$$k$G$7$g$&!#(B
-$B$b$7$=$&$J$i(B @code{gnus-adaptive-word-length-limit} $B$K@0?t$r@_Dj$9$k$3$H(B
-$B$,$G$-!"$3$N?tCM$h$jC;$$C18l$OL5;k$5$l$^$9!#$3$NJQ?t$N=i4|@_DjCM(B
+$BC;$$C18l$G$OE,1~7?%9%3%"IU$1$r:nF0$5$;$k$Y$-$G$O$J$$$H;W$&?M$b$$$k$G$7$g(B
+$B$&!#$b$7$=$&$J$i(B @code{gnus-adaptive-word-length-limit} $B$K@0?t$r@_Dj$9$k(B
+$B$3$H$,$G$-!"$3$N?tCM$h$jC;$$C18l$OL5;k$5$l$^$9!#$3$NJQ?t$N%G%#%U%)%k%H(B
 $B$O(B @code{nil} $B$G$9!#(B
 
 @vindex gnus-adaptive-word-syntax-table
-$B%9%3%"IU$1$,=*N;$7$?$H$-!"(B@code{gnus-adaptive-word-syntax-table} $B$NJ8K!(B
-$BI=$,$=$N1F6A$r.$5$/$J$k$3$H$O(B
-$B$"$j$^$;$s!#=i4|@_DjCM$O(B @code{nil} $B$G$9!#(B
+$B$b$7(B @code{gnus-adaptive-word-minimum} $B$K?tCM$,@_Dj$5$l$F$$$k$H!"C18lE,(B
+$B1~7?%9%3%"IU$1=hM}$K$*$$$F!"5-;v$N%9%3%"$,$3$N?tCM$h$j$b>.$5$/$J$k$3$H$O(B
+$B$"$j$^$;$s!#%G%#%U%)%k%H$O(B @code{nil} $B$G$9!#(B
 
 @vindex gnus-adaptive-word-no-group-words
 @code{gnus-acaptive-word-no-group-words} $B$,(B @code{t} $B$K@_Dj$5$l$F$$$k$H!"(B
-gnus $B$O%0%k!<%WL>$NA4$F$N8l$K$D$$$F!"C18lE,1~@-%9%3%"$r$7$^$;$s!#$[$H$s(B
-$B$I$NI=Bj$,(B @samp{emacs} $B$H$$$&8l$r4^$s$G$$$k(B @samp{comp.editor.emacs} $B$N(B
-$B$h$&$J%0%k!<%W$GJXMx$G$9!#(B
+gnus $B$O%0%k!<%WL>$N$9$Y$F$N8l$K$D$$$F!"C18lE,1~7?%9%3%"IU$1$r$7$^$;$s!#(B
+$B$[$H$s$I$NI=Bj$,(B @samp{emacs} $B$H$$$&8l$r4^$s$G$$(B
+$B$k(B @samp{comp.editors.emacs} $B$N$h$&$J%0%k!<%W$GJXMx$G$9!#(B
 
-$B$3$N5!9=$r$7$P$i$/;H$C$F$_$?8e$K$O!"$"$J$?$,$I$s$JC18l$,9%$-$G$I$s$JC18l(B
-$B$,7y$$$+$r!"$3$N5,B'$rDL$7$F?GCG$9$kMxMQo$K]$G$O!"$3$l$O8=>u$G$OA4$/;H(B
-$B$$J*$K$J$i$J$$$h$&$K;W$($^$9!#$3$l$r$b$C$H;H$($k$h$&$K$9$k$?$a$K$O!"(B($B$h(B
-$B$j87L)$JE}7WE*-MhJQ99$5$l$k$G$"$m$&$3(B
+$B$H$O?4$KN1$a$F$*$$$F2<$5$$!#Bh0l0u>]$G$O!"$3$l$O8=>u$G$O$^$C$?$/;H$$J*$K(B
+$B$J$i$J$$$h$&$K;W$($^$9!#$3$l$r$b$C$H;H$($k$h$&$K$9$k$?$a$K$O!"(B($B$h$j87L)(B
+$B$JE}7WE*o(B ($B=i4|@_Dj$G(B) $B$=$N%0(B
-$B%k!<%WMQ$N%9%3%"%U%!%$%k$K$J$j$^$9!#Nc$($P!"(B@samp{gnu.emacs.gnus} $BMQ$N%[!<(B
-$B%`%9%3%"%U%!%$%k$O(B @file{gnu.emacs.gnus.SCORE} $B$H$J$k$o$1$G$9!#(B
+$B?7$7$$%9%3%"%U%!%$%k%(%s%H%j!<$,F~$l$i$l$k%9%3%"%U%!%$%k$O!"%[!<%`%9%3%"(B
+$B%U%!%$%k(B @dfn{home score file} $B$H8F$P$l$^$9!#$3$l$ODL>o(B ($B%G%#%U%)%k%H(B
+$B$G(B) $B$=$N%0%k!<%W<+?H$N$?$a$N%9%3%"%U%!%$%k$K$J$j$^$9!#Nc$((B
+$B$P(B @samp{gnu.emacs.gnus} $BMQ$N%[!<%`%9%3%"%U%!%$%k(B
+$B$O(B @file{gnu.emacs.gnus.SCORE} $B$G$9!#(B
 
 $B$7$+$7$J$,$i!"$3$l$O$"$J$?$N$*K>$_$G$O$J$$$+$b$7$l$^$;$s!#$?$/$5$s$N%0%k!<(B
-$B%W4V$G6&DL$N%[!<%`%9%3%"%U%!%$%k$r6&M-$9$k$HJXMx$J$H$-$,B?$$$G$7$g(B
-$B$&(B --- $BNc$($PA4$F$N(B @samp{emacs} $B%0%k!<%W$GF1$8%[!<%`%9%3%"%U%!%$%k$r;H(B
-$B$&$3$H$b$G$-$^$9!#(B
+$B%W$N4V$G6&DL$N%[!<%`%9%3%"%U%!%$%k$r6&M-$9$k$3$H$O$7$P$7$PJXMx$G$9(B---$BNc(B
+$B$($P$9$Y$F$N(B @samp{emacs} $B%0%k!<%W$,!"$3$H$K$h$k$HF1$8%[!<%`%9%3%"%U%!%$(B
+$B%k$r;H$&$3$H$,$G$-$^$9!#(B
 
 @vindex gnus-home-score-file
 $B$3$l$r@)8f$9$kJQ?t$,(B @code{gnus-home-score-file} $B$G$9!#$3$l$O0J2<$NCM$r(B
-$Bl9g$3$N%U%!%$%k$,A4$F$N%0%k!<%W$G%[!<%`%9%3%"%U%!%$%k$H$7$F(B
-$B;HMQ$5$l$^$9!#(B
+$BJ8;zNs!#$3$N>l9g!"$3$N%U%!%$%k$,$9$Y$F$N%0%k!<%W$G%[!<%`%9%3%"%U%!%$%k$H(B
+$B$7$F;HMQ$5$l$^$9!#(B
 
 @item
 $B4X?t!#$3$N4X?t$N7k2L$,%[!<%`%9%3%"%U%!%$%k$H$7$F;HMQ$5$l$^$9!#$3$N4X?t$O(B
 $B%0%k!<%W$NL>A0$r0z?t$H$7$F8F$S=P$5$l$^$9!#(B
 
 @item
-$B%j%9%H!#$3$N%j%9%H$NMWAG$O0J2<$NCM$r$K%^%C%A(B
-$B$9$l$P!"(B@var{file-name} $B$,%[!<%`%9%3%"%U%!%$%k$H$7$F;HMQ$5$l$^$9!#(B
+@code{(@var{regexp} @var{file-name})}$B!#(B@var{regexp} $B$,%0%k!<%WL>$K9gCW$9(B
+$B$k$H!"(B@var{file-name} $B$,%[!<%`%9%3%"%U%!%$%k$H$7$F;HMQ$5$l$^$9!#(B
 
 @item
-$B4X?t!#$3$N4X?t$,(B @code{nil} $B0J30$rJV$;$P!"$=$NJV5QCM$,%[!<%`%9%3%"%U%!%$(B
-$B%k$H$7$F;HMQ$5$l$^$9!#(B
+$B4X?t!#$3$N4X?t$,(B @code{nil} $B0J30$rJV$;$P!"$=$NLa$jCM$,%[!<%`%9%3%"%U%!%$(B
+$B%k$H$7$F;HMQ$5$l$^$9!#%0%k!<%WL>$,0z?t$H$7$F4X?t$KEO$5$l$^$9!#(B
 
 @item
 $BJ8;zNs!#$3$NJ8;zNs$r%[!<%`%9%3%"%U%!%$%k$H$7$F;HMQ$7$^$9!#(B
 @end enumerate
 
-$B$3$N%j%9%H$NCf$+$i%^%C%A$9$k$b$N$r!":G=i$+$i8e$m$NJ}$K8~$+$C$FC5$7$F$$$-(B
-$B$^$9!#(B
-
+$B$3$N%j%9%H$O!"9gCW$9$k$b$N$rC5$9$?$a$K@hF,$+$i=*$j$K8~$+$C$F$J$>$i$l$^$9!#(B
 @end enumerate
 
-$B$H$$$&$o$1$G!"C1$K0l8D$N%9%3%"%U%!%$%k$r;H$$$?$$>l9g$O!"0J2<$N$h$&$K$9$l(B
-$B$P$G$-$^$9!#(B
+$B$H$$$&$o$1$G!"C10l$N%9%3%"%U%!%$%k$@$1$r;H$$$?$$>l9g$O!"0J2<$N$h$&$K$9$l(B
+$B$PNI$$$G$7$g$&(B:
 
 @lisp
 (setq gnus-home-score-file
       "my-total-score-file.SCORE")
 @end lisp
 
-$B$b$7A4(B @samp{gnu} $B%0%k!<%W$KBP$7$F(B @file{gnu.SCORE} $B$r!"A4(B @samp{rec} $B%0(B
-$B%k!<%W$KBP$7$F(B @file{rec.SCORE} ($BEy!9(B) $B$r;H$$$?$1$l$P!"$3$N$h$&$K$G$-$^(B
-$B$9!#(B
+$B$9$Y$F$N(B @samp{gnu} $B%0%k!<%W$KBP$7$F(B @file{gnu.SCORE} $B$r!"$9$Y$F(B
+$B$N(B @samp{rec} $B%0%k!<%W$KBP$7$F(B @file{rec.SCORE} ($BEy!9(B) $B$r;H$$$?$$>l9g$O!"(B
+$B$3$N$h$&$K@_Dj$9$k$3$H$,$G$-$^$9(B:
 
 @findex gnus-hierarchial-home-score-file
 @lisp
@@ -19187,19 +20101,19 @@ gnus $B$O%0%k!<%WL>$NA4$F$N8l$K$D$$$F!"C18lE,1~@-%9%3%"$r$7$^$;$s!#$[$H$s(B
       'gnus-hierarchial-home-score-file)
 @end lisp
 
-$B$3$l$OJXMx$J$h$&$K$"$i$+$8$aDs6!$5$l$F$$$k4X?t$G$9!#B?$N4X?t$O0J2<$N0J2<(B
-$B$N$b$N$r4^$_$^$9!#(B
+$B$3$l$OMxMQ$K0J2<$N(B
+$B4X?t$,$"$j$^$9(B:
 
 @table @code
-@item gnus-current-home-scre-file
+@item gnus-current-home-score-file
 @findex gnus-current-home-score-file
-``$B8=:_$N(B'' $BI8=`%9%3%"%U%!%$%k$rJV$7$^$9!#$3$l$O%9%3%"L?Na$K%9%3%"%U%!%$(B
-$B%k$N(B ``$B:GFbIt(B'' $B9gCW$X$NEPO?$r2C$($k$h$&$K$7$^$9!#(B
+$B!V8=:_$N!WI8=`%9%3%"%U%!%$%k$rJV$7$^$9!#$3$l$O%9%3%"L?Na72$K!V:G?$NA4It$N%0%k!<%W$G$O(B
-$B$=$l$>$lFH<+$N%9%3%"%U%!%$%k$r;H$$$?$$$N$G$"$l$P!"(B
+@samp{emacs} $B%0%k!<%WMQ$K0l$D$N%9%3%"%U%!%$%k$r!"$=$l$H$OJL$N$b$N(B
+$B$r(B @samp{comp} $B%0%k!<%WMQ$KMQ0U$9$k0lJ}!"B>$N$9$Y$F$N%0%k!<%W$G$O$=$l$>(B
+$B$lFH<+$N%9%3%"%U%!%$%k$r;H$&$h$&$K$7$?$$$J$i!"$3$s$J@_Dj$GNI$$$G$7$g$&(B:
 
 @lisp
 (setq gnus-home-score-file
@@ -19210,56 +20124,56 @@ gnus $B$O%0%k!<%WL>$NA4$F$N8l$K$D$$$F!"C18lE,1~@-%9%3%"$r$7$^$;$s!#$[$H$s(B
 @end lisp
 
 @vindex gnus-home-adapt-file
-@code{gnus-home-adapt-file} $B$O(B @code{gnus-home-score-file} $B$HA4$/F1$8$h(B
-$B$&$KF0:n$7$^$9$,!"$3$l$OBe$o$j$K2?$r%[!<%`E,MQ%9%3%"%U%!%$%k$K$9$k$+$r;X(B
-$BDj$7$^$9!#?7$7$$E,MQ%U%!%$%kEPO?9`L\$OA4$F!"$3$NJQ?t$G;XDj$5$l$k%U%!%$%k(B
-$B$KF~$l$i$l$^$9!#CM$K$OF1$8J8K!$,5v$5$l$^$9!#(B
+@code{gnus-home-adapt-file} $B$O(B @code{gnus-home-score-file} $B$H$^$C$?$/F1(B
+$B$8$d$jJ}$GF0:n$7$^$9$,!"Be$o$j$K$3$l$G!"2?$r%[!<%`E,1~%9%3%"%U%!%$%k$K$9(B
+$B$k$+$r;XDj$7$^$9!#$9$Y$F$N?7$7$$E,1~%U%!%$%k%(%s%H%j!<$O!"$3$NJQ?t$G;XDj(B
+$B$5$l$k%U%!%$%k$KF~$l$i$l!"F1$8J8K!$r;H$&$3$H$,$G$-$^$9!#(B
 
-@code{gnus-home-score-file} $B$H(B @code{gnus-home-adapt-file} $B$N;HMQ$K2C$((B
-$B$F!"%0%k!<%W%Q%i%a!<%?(B (@pxref{Group Parameters}) $B$H%H%T%C%/%Q%i%a!<(B
-$B%?(B (@pxref{Topic Parameters}) $B$r;H$C$F$[$\F1MM$N$3$H$,$G$-$^$9!#%0%k!<%W!"(B
-$B%H%T%C%/%Q%i%a!<%?$O$3$NJQ?t$h$j$bM%@h$5$l$^$9!#(B
+@code{gnus-home-score-file} $B$H(B @code{gnus-home-adapt-file} $B$r;H$&$3$H$K(B
+$B2C$($F!"%0%k!<%W%Q%i%a!<%?!<(B (@pxref{Group Parameters}) $B$H%H%T%C%/%Q%i%a!<(B
+$B%?!<(B (@pxref{Topic Parameters}) $B$r;H$C$F$b!"$[$\F1MM$N$3$H$r@.$7?k$2$k$3(B
+$B$H$,$G$-$^$9!#%0%k!<%W!"%H%T%C%/%Q%i%a!<%?!<$O$3$NJQ?t$h$j$bM%@h$5$l$^$9!#(B
 
 @node Followups To Yourself
 @section $B<+J,<+?H$X$N%U%)%m!<%"%C%W(B
 
-Gnus $B$O8=:_$N%P%C%U%!!<$+$i(B @code{Message-ID} $B%X%C%@!<$r8+$D$1=P$9$?$a$K(B
-$BFs$D$NL?Na$rDs6!$7$F$$$^$9!#$=$7$F(B gnus $B$O!"B>$N5-;v$K$*$1(B
-$B$k(B @code{References} $B%X%C%@!$N5-;v$N(B @code{References} $B%X%C(B
+$B%@!<$K$"$k$3$N(B @code{Message-ID} $B$r;H$C$F%9%3%"$rIU$1$k$?$a$N%9%3%"5,B'(B
+$B$rDI2C$7$^$9!#$3$l$O;ve!"8=:_$N%P%C%U%!!<$K$"$k5-;v$KJVEz$7$?$9$Y$F$N(B
+$B5-;v$N%9%3%"$rA}2C$5$;$^$9!#$3$l$O!"$"$J$?$,8@$C$?$3$H$K?M!9$,Ez$($?$i!"(B
+$B$=$l$KMF0W$K5$IU$+$;$F$b$i$$$?$$$H$-$K!"$H$F$bJXMx$G$9!#(B
 
 @table @code
 @item gnus-score-followup-article
 @findex gnus-score-followup-article
-$B$3$l$O$"$J$?<+?H$N5-;v$KD>@\%U%)%m!<%"%C%W$7$?5-;v$K%9%3%"$r2C;;$7$^$9!#(B
+$B$3$l$O!"$"$J$?<+?H$N5-;v$KD>@\%U%)%m!<%"%C%W$7$?5-;v$K%9%3%"$r2C$($^$9!#(B
 
 @item gnus-score-followup-thread
 @findex gnus-score-followup-thread
-$B$3$l$O$"$J$?$N5-;v$h$j(B ``$B2<(B'' $B$N%9%l%C%I$K8=$l$k5-;vA4$F$KBP$7$F%9%3%"$r(B
-$B2C;;$7$^$9!#(B
+$B$3$l$O!"$"$J$?$N5-;v$h$j!V2o$KF1$8$G$"$k$3$H$K5$$,$D$/$G$7$g$&!#0J2<$NFs$D$O;d$N$b$N$G$9!#(B
+$B<+J,$N(B @code{Message-ID} $B$r$8$C$/$j$HD/$a$F$_$k$H!"$O$8$a$NFs!A;0J8;z$O(B
+$B>o$KF1$8$G$"$k$3$H$K5$$,IU$/$G$7$g$&!#0J2<$NFs$D$O;d$N$b$N$G$9(B:
 
 @example
 
 
 @end example
 
-$B$D$^$j$3$N%^%7%s>e$G$N(B ``$B;d$N(B'' $B$N<1JL$O(B @samp{x6} $B$G$"$k$H$$$&$3$H$G$9!#(B
-$B$3$l$O;H$($^$9(B --- $B0J2<$N5,B'$O;d<+?H$X$N%U%)%m!<%"%C%WA4$F$KBP$7$F%9%3(B
-$B%"$rA}2C$5$;$k$G$7$g$&!#(B
+$B$7$?$,$C$F!"$3$N%^%7%s$G$O(B @samp{x6} $B$G!V;d!W$+$I$&$+$r8+J,$1$k$3$H$,$G(B
+$B$-$^$9!#$3$l$O;H$($^$9(B---$B0J2<$N5,B'$O!";d<+?H$X$N$9$Y$F$N%U%)%m!<%"%C%W(B
+$B$N%9%3%"$r>e$2$k$G$7$g$&(B:
 
 @lisp
 ("references"
@@ -19267,24 +20181,24 @@ Gnus $B$O8=:_$N%P%C%U%!!<$+$i(B @code{Message-ID} $B%X%C%@!<$r8+$D$1=P$9$?$a$
   1000 nil r))
 @end lisp
 
-``$B$"$J$?$N(B'' $B$,:G=i$NFsJ8;z$K$J$k$+:G=i$N;0J8;z$K$J$k$+$O%7%9%F%`$K0MB8(B
+$B!V$"$J$?$N!W$,:G=i$NFsJ8;z$K$J$k$+:G=i$N;0J8;z$K$J$k$+$O!"%7%9%F%`$K0MB8(B
 $B$7$^$9!#(B
 
 @node Scoring On Other Headers
 @section $BB>$N%X%C%@!<$K%9%3%"$rIU$1$k(B
 @cindex scoring on other headers
 
-gnus $B$,(B ``$BEAE}E*(B'' $B$J%X%C%@!<(B -- @samp{From}, @samp{Subject} $B$J$I(B -- $B$K(B
-$B%9%3%"$rIU$1$k$N$O$H$F$bB.$$$G$9!#$G$9$,!"B>$N%X%C%@!<$K%9%3%"$rIU$1$k$K(B
+gnus $B$,!VEAE}E*!W$J%X%C%@!<(B ---@samp{From}, @samp{Subject} $B$J$I(B---$B$K%9%3(B
+$B%"$rIU$1$k$N$O$H$F$bB.$$$G$9!#$G$9$,!"B>$N%X%C%@!<$K%9%3%"$rIU$1$k$K(B
 $B$O(B @code{head} $B$N%9%3%"$N$?$a$N5,B'$r=q$/I,MW$,$"$j!"$=$l$O9gCW$rC5$9$?(B
 $B$a$K(B gnus $B$,Kh2s%P%C%/%(%s%I$+$iC1FH$N5-;v$r\$7$/@bL@$5$l(B
-$B$F$$$^$9$,!"$3$3$G$O(B @code{nnml} $B$G(B @samp{To} $B$H(B @samp{Cc} $B%X%C%@!<$K%9(B
-$B%3%"$rIU$1$kJ}K!$ND4M}$NNc$r5s$2$^$7$g$&!#(B
+$B$5$F!"$3$l$K4X$7$F%K%e!<%9%0%k!<%W$N$?$a$K$G$-$k$3$H$OB?$/$O$"$j$^$;$s$,!"(B
+$B%a!<%k%0%k!<%W$N$?$a$K$O$h$jM%$l$?O$G$3$N5!9=$,$I$&F/$/$+$,>\$7$/@bL@$5$l$F$$(B
+$B$^$9$,!"$3$3$G$O$I$&$7$?$i(B @code{nnml} $B$G(B @samp{To} $B$H(B @samp{Cc} $B%X%C%@!<(B
+$B$K%9%3%"$rIU$1$k$3$H$,$G$-$k$+$ND4M}$NNc$r5s$2$^$7$g$&!#(B
 
 $B0J2<$r(B @file{~/.gnus.el} $B%U%!%$%k$KCV$$$F2<$5$$!#(B
 
@@ -19294,12 +20208,12 @@ gnus $B$,(B ``$BEAE}E*(B'' $B$J%X%C%@!<(B -- @samp{From}, @samp{Subject} 
 @end lisp
 
 gnus $B$r:F5/F0$7$F!"(B@kbd{M-x nnml-generate-nov-databases} $B%3%^%s%I(B
-$B$G(B @code{nnml} $B$N(B overview $B%U%!%$%k$r:n$jD>$7$^$9!#$b$7$"$J$?$,$?$/$5$s(B
-$B$N%a!<%k$r;}$C$F$$$k$H!"$3$l$K$OD9$$;~4V$,$+$+$j$^$9!#(B
+$B$G(B @code{nnml} $B$N(B overview $B%U%!%$%k$r:n$jD>$7$F2<$5$$!#$?$/$5$s$N%a!<%k(B
+$B$r;}$C$F$$$k$H!"$3$l$K$OD9$$;~4V$,$+$+$k$G$7$g$&!#(B
 
-$B$=$7$F(B @kbd{I e s p To RET  RET} $B$N$h$&$K$9$k$H!"$"$J$?(B
-$B$O(B @samp{To} $B$H(B @samp{Cc} $B%X%C%@!<$K(B ``extra headers'' $B$H$7$F%9%3%"$rIU(B
-$B$1$k$3$H$,$G$-$^$9!#(B
+$B$=$7$F(B @kbd{I e s p To RET  RET} $B$N$h$&$K$9$k$H!"(B
+@samp{To} $B$H(B @samp{Cc} $B%X%C%@!<$K!H(Bextra headers$B!I$H$7$F%9%3%"$rIU$1$k$3(B
+$B$H$,$G$-$^$9!#(B
 
 $B$o$+$C$?$+$J(B? $B4JC1$@$h$M!#(B
 
@@ -19311,8 +20225,8 @@ gnus $B$r:F5/F0$7$F!"(B@kbd{M-x nnml-generate-nov-databases} $B%3%^%s%I(B
 @item $B%/%m%9%]%9%H(B
 @cindex crossposts
 @cindex scoring crossposts
-$B%/%m%9%]%9%H$N%9%3%"$rDc$/$7$?$1$l$P!"%^%C%A$5$;$k$Y$-9T(B
-$B$O(B @code{Xref} $B%X%C%@!<$G$9!#(B
+$B%/%m%9%]%9%H$N%9%3%"$rDc$/$7$?$1$l$P!"9gCW$5$;$k$Y$-9T$O(B @code{Xref} $B%X%C(B
+$B%@!<$G$9!#(B
 
 @lisp
 ("xref" (" talk.politics.misc:" -1000))
@@ -19328,32 +20242,32 @@ gnus $B$r:F5/F0$7$F!"(B@kbd{M-x nnml-generate-nov-databases} $B%3%^%s%I(B
    -1000 nil r))
 @end lisp
 
-@item $BK\J8$X$N%^%C%A(B
-$B$3$l$O0lHLE*$K$O$"$^$jNI$$9M$($G$O$"$j$^$;$s(B --- $B$=$l$O$H$F$bD9;~4V$+$+$C(B
-$B$F$7$^$&$+$i$G$9!#$l$N5-;v$r8DJL$K%5!<%P!<$+$i$l$N5-;v$O(B @emph{$BFs2s(B} $B$K(B @code{All} $B$r;H$C$FA4It%^%C%A$5$;$F$/$@$5(B
-$B$$!#(B
+@item $BK\J8$X$N9gCW(B
+$B$3$l$O0lHLE*$K$O$"$^$jNI$$9M$($G$O$"$j$^$;$s(B---$B$H$F$bD9$$;~4V$,$+$+$k$+(B
+$B$i$G$9!#$l$N5-;v$r8DJL$K%5!<%P!<$+$i$l(B
+$B$N%9%3%"%U%!%$%k$G0l$D$rA*$s$G!"$=$l$K8G<9$9$Y$-$G$9!#$b$7Fs$D$r;H$&$H!"(B
+$B$=$l$>$l$N5-;v$O(B @emph{$BFs2s(B} $B$K(B @code{All} $B$r;H$C$FA4It9gCW$5$;$F2<$5$$!#(B
 
-@item $B4{FI$N0uIU$1(B
-$B$"$k0lDj?t;z0J2<$N%9%3%"$r;}$D5-;v$K$O!"$*$=$i$/4{FI$N0u$r$D$1$F$7$^$$$?(B
-$B$/$J$k$G$7$g$&!#$3$l$O(B @file{all.SCORE} $B%U%!%$%k$K0J2<$N$b$N$rF~$l$F$*$/(B
-$B$3$H$K$h$C$F:G$b4JC1$K$N5-;vA4$F$r>C5n$7$F$7$^$$$?$1$l$P!"%9%3%"%U%!%$%k$K0J2<$N$h(B
-$B$&$J$b$N$rF~$l$k$3$H$b$G$-$^$9!#(B
+$B$7$F!"$=$NB>$N5-;v$9$Y$F$r>C5n$7$F$7$^$$$?$1$l$P!"%9%3%"%U%!%$%k$K0J2<$N(B
+$B$h$&$J$b$N$rF~$l$k$3$H$,$G$-$^$9(B:
 
 @lisp
 (("subject"
@@ -19371,33 +20285,33 @@ gnus $B$r:F5/F0$7$F!"(B@kbd{M-x nnml-generate-nov-databases} $B%3%^%s%I(B
  (expunge 1))
 @end lisp
 
-$B$=$7$F(B @samp{Sex with Emacs} $B$K%^%C%A$9$kA4$F$N5-;v$r=8$a$F!";D$j$r=3Ht(B
-$B$P$9$?$a$K4{FI$N0u$r$D$1!">C5n$7$^$9!#(B
+$B$3$l$G(B @samp{Sex with Emacs} $B$K9gCW$9$k$9$Y$F$N5-;v$N%9%3%"$,>e$,$C$F!"(B
+$B;D$j$N5-;v$K$O4{FI$N0u$,IU$-!"$*$^$1$K$=$l$i$O>C5n$5$l$k$G$7$g$&!#(B
 
 @node Global Score Files
 @section $B%0%m!<%P%k%9%3%"%U%!%$%k(B
 @cindex global score files
 
-$B4V0c$$$J$/!"B>$N%K%e!<%9%j!<%@!<$O(B ``$B%0%m!<%P%k:o=|%U%!%$(B
-$B%k(B (global kill file)'' $B$r;}$C$F$$$^$9!#$3$l$OIaDL!"A4$F$N%0%k!<%W$KE,MQ(B
-$B$5$l$k!"%f!<%6$N%[!<%`%G%#%l%/%H%j!<$K3JG<$5$l$F$$$k0l$D$N:o=|%U%!%$%k0J(B
-$B>e$N2?J*$G$b$"$j$^$;$s!#$O$s(B! $B$A$C$]$1$J%K%e!<%9%j!<%@!<$@$M!#$N%K%e!<%9%j!<%@!<$O!V%0%m!<%P%k:o=|%U%!%$%k(B (global kill
+file)$B!W$r;}$C$F$$$^$9!#$=$l$i$OIaDL!"$9$Y$F$N%0%k!<%W$KE,MQ$5$l$k!"MxMQ(B
+$Be$N2?J*$G$b(B
+$B$"$j$^$;$s!#$U$U$s(B!  $B$D$^$i$J$$!"DcG=$J%K%e!<%9%j!<%@!<$@$M!#(B
 
-$BKM$,$3$3$GOC$7$F$$$k$N$O%0%m!<%P%k%9%3%"%U%!%$%k$G$9!#A4@$3&Cf$+$i$N!";j(B
-$B$k=j$+$i$N%f!<%6$K$h$k%9%3%"%U%!%$%k!"@$3&$N9q!9$rA4$F!"5pBg$J0l$D$N9,$;(B
-$B$J%9%3%"%U%!%$%kF1LA$KCD7k$5$;$k%9%3%"%U%!%$%k(B !Ange-score! $B?7$7$/$F%F%9(B
-$B%H$7$F$$$J$$(B!
+$B;d$,$3$3$GOC$7$F$$$k$N$O%0%m!<%P%k%9%3%"%U%!%$%k$G$9!#A4@$3&$N!"$"$i$f$k(B
+$BCO0h$NMxMQ$N?M$N%9%3%"%U%!%$%k$r;H$&$?$a$K$7$J$1$l$P$J$i$J$$$3$H$O!"(B
-@code{gnus-global-score-files} $BJQ?t$r@_Dj$9$k$3$H$@$1$G$9!#$=$l$>$l$N%9(B
-$B%3%"%U%!%$%kKh$K!"$"$k$$$O$=$l$>$l$N%9%3%"%U%!%$%k%G%#%l%/%H%jKh$KBP$7$F(B
-$B0l$D$N9`L\$K$J$j$^$9!#(BGnus $B$O$I$N%9%3%"%U%!%$%k$r$I$N%0%k!<%W$K;H$&$N$,(B
-$BE,@Z$G$"$k$+$r<+J,$G7hDj$7$^$9!#(B
+$BB>?M$N%9%3%"%U%!%$%k$r;H$&$?$a$K$7$J$1$l$P$J$i$J$$$N$O!"(B
+@code{gnus-global-score-files} $BJQ?t$r@_Dj$9$k$3$H$,$9$Y$F$G$9!#$=$l$>$l(B
+$B$N%9%3%"%U%!%$%k$K$D$-0l$D!"$^$?$O$=$l$>$l$N%9%3%"%U%!%$%k%G%#%l%/%H%j!<(B
+$B$K$D$-0l$D$N%(%s%H%j!<$K$J$j$^$9!#(Bgnus $B$O$I$N%9%3%"%U%!%$%k$r$I$N%0%k!<(B
+$B%W$K;H$&$N$,E,@Z$G$"$k$+$r<+J,$G7hDj$7$^$9!#(B
 
-$BNc$($P(B @file{/ftp@@ftp.gnus.org:/pub/larsi/ding/score/soc.motss.SCORE} $B$N(B
-$B%9%3%"%U%!%$%k$H(B @file{/ftp@@ftp.some-where:/pub/score} $B%G%#%l%/%H%j$K$"(B
-$B$kA4$F$N%9%3%"%U%!%$%k$r;H$$$?$1$l$P!"(B
+$BNc$($O%9%3%"%U%!%$(B
+$B%k(B @file{/ftp@@ftp.gnus.org:/pub/larsi/ding/score/soc.motss.SCORE} $B$*$h(B
+$B$S(B @file{/ftp@@ftp.some-where:/pub/score} $B%G%#%l%/%H%j!<$K$"$k$9$Y$F$N%9(B
+$B%3%"%U%!%$%k$r;H$$$?$1$l$P!"$3$N$h$&$K@_Dj$7$F2<$5$$(B:
 
 @lisp
 (setq gnus-global-score-files
@@ -19407,22 +20321,29 @@ gnus $B$r:F5/F0$7$F!"(B@kbd{M-x nnml-generate-nov-databases} $B%3%^%s%I(B
 
 @findex gnus-score-search-global-directories
 @noindent
-$B$I$&$@$$!"4JC1$@$m$&(B? $B%G%#%l%/%H%jL>$O(B @samp{/} $B$G=*$o$i$J$/$F$O$J$j$^$;(B
-$B$s!#$3$l$i$N%G%#%l%/%H%j$OIaDL$O!"0l2s$N(B gnus $B;HMQ4|4VCf$K0l2s$@$1$7$+FI(B
-$B$_9~$_$^$;$s!#$b$71s3V%G%#%l%/%H%j$r$O(B @samp{/} $B$G=*$o$i$J$/$F$O$J$j$^$;$s!#(B
+$B$3$l$i$N%G%#%l%/%H%j!<$O!"0lHL$K(B gnus $B$r;H$&0l2s$N4|4VCf$K0l2s$@$1$7$+FI(B
+$B$_9~$^$l$^$;$s!#$b$71s3V%G%#%l%/%H%j!<$r$N?M$?$A$K;H$C$F$b$i$&$h$&$K0];}$7$?$/$J$C$F$-$?(B
-$B$i!"C1$K$"$J$?$N%9%3%"%U%!%$%k$rF?L>(B FTP $B$KCV$$$F!"@$3&Cf$K8xI=$7$F$/$@(B
-$B$5$$!#5U;J2q!$A$N?M$?$A$K;H$C$F$b$i$&$?$a$K%9%3%"%U%!%$%k$r0];}4IM}$7$?$/$J$C$?$i!"C1(B
+$B$K$"$J$?$N%9%3%"%U%!%$%k$rF?L>(B ftp $B$KCV$$$F!"@$3&$K8xI=$7$F2<$5$$!#5U9T(B
+$B;J2q!$A/$J$/$J$$$N$G$9$,!"$3$3$G$OK\Mh$N(B
+$B!V;~Be$K5U9T$7$?!W!V;H$($M!OL5;k$NEj9F$rIQHK$K7+$jJV$9Ej9FO$rL5;k$7$?Ej9F$rIQHK$K7+$jJV$9Ej9FC5n$N%9%3%"9`L\$r;H$C$F%U%!%$%k$NBg$-$5$r>.$5$/M^$($k!#$G$b$*$=$i$/$O!"(B
-$B%5%$%H$K$h$C$F8E$$5-;v$rD94|4VJ]B8$9$k$h$&$K!"4|8B@Z$l>C5n$N4|4V$OD9$/C5n$N%9%3%"!&%(%s%H%j!<$r;H$C$F!"%U%!%$%k$NBg$-$5$r>.$5$/M^$($k!#(B
+$B$b$C$H$b!"%5%$%H$K$h$C$F8E$$5-;v$rD94|4VJ]B8$9$k$h$&$K!"$*$=$i$/D9$$4|8B(B
+$B@Z$l>C5n$N4|4V$r$N%K%e!<%9%j!<%@!<$O>-Mh!"%0%m!<%P%k%9%3%"%U%!%$%k$r%5(B
-$B%]!<%H$9$k$G$7$g$&$+(B? @emph{$B$&$U$U(B}$B!#$=$&!"$I$&9M$($F$_$?$C$F!"(BBlue
-Wave $B$d(B xrn $B$d(B 1stReader $B$H$+$$$C$?%K%e!<%9%j!<%@!<$O%9%3%"$r%5%]!<%H$9(B
-$B$k$Y$-$@$M!#:#$O8GBC$r0{$s$G8+$N%K%e!<%9%j!<%@!<$O!">-Mh%0%m!<%P%k%9%3%"%U%!%$%k$r%5(B
+$B%]!<%H$9$k$G$7$g$&$+(B?  @emph{$B$&$U$U(B}$B!#$=$&!"$I$&9M$($F$_$?$C$F!"(BBlue
+Wave $B$d(B xrn $B$d(B 1stReader $B$H$+$$$C$?%K%e!<%9%j!<%@!<$O!"%9%3%"$r%5%]!<%H(B
+$B$9$k$Y$-$G$9$M!#:#$O8GBC$r0{$s$G8+C5n%U%!%$%k(B
 @cindex kill files
 
-Gnus $B$O$^$@!"$"$N$&$6$C$?$$8E$$>C5n%U%!%$%k$r%5%]!<%H$7$F$$$^$9!#C(B
+gnus $B$O$^$@!"$"$N$&$6$C$?$$8E$$>C5n%U%!%$%k$r%5%]!<%H$7$F$$$^$9!#C(B
 $B5n%U%!%$%k$N9`L\$O$b$&>C$7$F$b$h$$$N$G$9$,!"$=$l$O(B Daniel Quinlan $B$,%9%3(B
-$B%"%U%!%$%k$r9M$(=P$9A0$K;d$,=q$$$?$b$N$J$N$G!"$=$N%3!<%I$O$^$@;D$C$F$$$^(B
-$B$9!#(B
+$B%"%U%!%$%k$r9M$(=P$9A0$K;d$,=q$$$?$b$N$J$N$G!"$=$N%3!<%I$O$^$@;D$7$F$"$k(B
+$B$N$G$9!#(B
 
-$BMW$9$k$K!">C5n=hM}$O%9%3%"=hM}$h$j$b$+$J$jCY$$$N$G(B ($B;d$N8@$$$?$$$N(B
-$B$O(B @emph{$B$b$N$9$4$/(B})$B!"$"$J$?$N>C5n%U%!%$%k$O%9%3%"%U%!%$%k$K=q$-49$($?(B
-$BJ}$,NI$$$+$b$7$l$^$;$s!#(B
+$BMW$9$k$K!">C5n=hM}$O%9%3%"=hM}$h$j$b$+$J$j(B ($B;d$K8@$o$;$l(B
+$B$P(B @emph{$B$b$N$9$4$/(B}) $BCY$$$N$G!"$"$J$?$N>C5n%U%!%$%k$O%9%3%"%U%!%$%k$K=q(B
+$B$-49$($?J}$,NI$$$+$b$7$l$^$;$s!#(B
 
 $B$$$:$l$K$;$h!">C5n%U%!%$%k$OIaDL$N(B @code{emacs-lisp} $B%U%!%$%k$G$9!#$3$N(B
 $B%U%!%$%k$NCf$K$O$I$s$J7A<0$G$bF~$l$k$3$H$,$G$-$^$9!#$D$^$j>C5n%U%!%$%k$r(B
 $B%0%k!<%W$KF~$C$?$H$-$Ko$N>C5n%U%!%$%k$O0J2<$N$h$&$K$J$j$^$9!#(B
+$BDL>o$N>C5n%U%!%$%k$O0J2<$N$h$&$K$J$j$^$9(B:
 
 @lisp
 (gnus-kill "From" "Lars Ingebrigtsen")
@@ -19476,71 +20397,72 @@ Gnus $B$O$^$@!"$"$N$&$6$C$?$$8E$$>C5n%U%!%$%k$r%5%]!<%H$7$F$$$^$9!#C(B
 (gnus-expunge "X")
 @end lisp
 
-$B$3$l$O;d$,=q$$$?A4$F$N5-;v$K4{FI$N0u$r$D$1!"35N,%P%C%U%!$+$i0u$N$D$$$?5-(B
-$B;v$r:o=|$7$^$9!#$H$C$F$bJXMx$G$9!#$"$J$?$b$=$&;W$&$G$7$g!#(B
+$B$3$l$O;d$,=q$$$?$9$Y$F$N5-;v$K4{FI$N0u$rIU$1!"35N,%P%C%U%!!<$+$i0u$NIU$$(B
+$B$?5-;v$r:o=|$7$^$9!#$H$C$F$bJXMx$G$9!#$"$J$?$b$=$&;W$&$G$7$g!#(B
 
-$BB>$N%W%m%0%i%`$G$OA4$/0c$&>C5n%U%!%$%k$N9=J8$r;H$C$F$$$^$9!#$b(B
-$B$7(B gnus $B$,(B @code{rn} $B$N>C5n%U%!%$%k$i$7$-$b$N$K=P2q$C$?$i!"2?$H$+$=$l$r(B
-$B2r$N%W%m%0%i%`$G$O$^$C$?$/0c$&>C5n%U%!%$%k$N9=J8$r;H$C$F$$$^$9!#(B
+gnus $B$O(B @code{rn} $B$N>C5n%U%!%$%k$i$7$-$b$N$K=P2q$&$H!"2?$H$+$=$l$r2rC5n%U%!%$%k$rJT=8$9$k$?$a$NFs$D$N35N,%P%C%U%!4X?t$,$"$j$^$9!#(B
+@sc{gnus} $B>C5n%U%!%$%k$rJT=8$9$k$?$a$NFs$D$N35N,%P%C%U%!!<4X?t$,$"$j$^$9(B:
 
 @table @kbd
 @item M-k
 @kindex M-k ($B35N,(B)
 @findex gnus-summary-edit-local-kill
-$B$=$N%0%k!<%W$N>C5n%U%!%$%k$rJT=8$9(B
-$B$k(B (@code{gnus-summary-edit-local-kill})$B!#(B
+$B$3$N%0%k!<%W$N>C5n%U%!%$%k$rJT=8$7$^(B
+$B$9(B (@code{gnus-summary-edit-local-kill})$B!#(B
 
 @item M-K
 @kindex M-K ($B35N,(B)
 @findex gnus-summary-edit-global-kill
-$B0lHL>C5n%U%!%$%k$rJT=8$9$k(B (@code{gnus-summary-edit-global-kill})$B!#(B
+$B0lHL>C5n%U%!%$%k$rJT=8$7$^$9(B (@code{gnus-summary-edit-global-kill})$B!#(B
 @end table
 
-$B>C5n%U%!%$%k$rJT=8$9$kFs$D$N%0%k!<%W%b!<%I4X?t$,$"$j$^$9!#(B
+$B>C5n%U%!%$%k$rJT=8$9$kFs$D$N%0%k!<%W%b!<%I4X?t$,$"$j$^$9(B:
 
 @table @kbd
 @item M-k
 @kindex M-k ($B%0%k!<%W(B)
 @findex gnus-group-edit-local-kill
-$B$=$N%0%k!<%W$N>C5n%U%!%$%k$rJT=8$9$k(B (@code{gnus-group-edit-local-kill})$B!#(B
+$B$3$N%0%k!<%W$N>C5n%U%!%$%k$rJT=8$7$^(B
+$B$9(B (@code{gnus-group-edit-local-kill})$B!#(B
 
 @item M-K
 @kindex M-K ($B%0%k!<%W(B)
 @findex gnus-group-edit-global-kill
-$B0lHL>C5n%U%!%$%k$rJT=8$9$k(B (@code{gnus-group-edit-global-kill})$B!#(B
+$B0lHL>C5n%U%!%$%k$rJT=8$7$^$9(B (@code{gnus-group-edit-global-kill})$B!#(B
 @end table
 
-$B>C5n%U%!%$%kJQ?t!#(B
+$B>C5n%U%!%$%kJQ?t(B:
 
 @table @code
 @item gnus-kill-file-name
 @vindex gnus-kill-file-name
 @samp{soc.motss} $B%0%k!<%WMQ$N>C5n%U%!%$%k$ODL(B
 $B>o(B @file{soc.motss.KILL} $B$H$$$&L>A0$G$9!#$3$N%U%!%$%kL>$rF@$k$?$a$K%0%k!<(B
-$B%WL>$KIU2C$5$l$k@\Hx<-$O!"(B@code{gnus-kill-file-name} $BJQ?t$GM?$($i$l$^$9!#(B
-``$B%0%m!<%P%k(B'' $B>C5n%U%!%$%k$O(B ($B%9%3%"%U%!%$%k$N0UL#$G(B
-$B$N(B ``$B%0%m!<%P%k(B'' $B$8$c$J$$$h!"$b$A$m$s(B) $BC1$K(B @file{KILL}$B$H$$$&L>A0$G$9!#(B
+$B%WL>$KIU2C$5$l$k@\Hx8l$O!"(B@code{gnus-kill-file-name} $BJQ?t$GM?$($i$l$^$9!#(B
+$B!V%0%m!<%P%k!W>C5n%U%!%$%k$O(B ($B%9%3%"%U%!%$%k$N0UL#$G$N!V%0%m!<%P%k!W$8$c(B
+$B$J$$$h!"$b$A$m$s(B) $BC1$K(B @file{KILL} $B$H$$$&L>A0$G$9!#(B
 
 @vindex gnus-kill-save-kill-file
 @item gnus-kill-save-kill-file
 $B$3$NJQ?t$,(B @code{nil} $B0J30$G$"$l$P!"(Bgnus $B$O=hM}$N8e$K>C5n%U%!%$%k$rJ]B8(B
-$B$7$^$9!#$3$l$O4|8B@Z$l:o=|$r9T$&>C5n$r;H$C$F$$$k$H$-$KI,MW$G$9!#(B
+$B$7$^$9!#$3$l$O4|8B@Z$l>C5n$r9T$J$&>C5n$r;H$C$F$$$k$H$-$KI,MW$G$9!#(B
 
 @item gnus-apply-kill-hook
 @vindex gnus-apply-kill-hook
 @findex gnus-apply-kill-file-unless-scored
 @findex gnus-apply-kill-file
-$B%0%k!<%W$K>C5n%U%!%$%k$rE,MQ$9$k$?$a$K8F$S=P$5$l$k%U%C%/!#$3$l$O=i4|@_Dj(B
-$B$G$O(B @code{(gnus-apply-kill-file)} $B$G$9!#$b$7F1$8%0%k!<%W$KBP$7$F%9%3%"(B
-$B%U%!%$%k$,$"$k>l9g$K$O>C5n%U%!%$%k$rL5;k$7$?$1$l$P!"$3$N%U%C%/(B
-$B$r(B @code{(gnus-apply-kill-file-unless-scored)} $B$K@_Dj$7$^$9!#>C5n%U%!%$(B
-$B%k$r=hM}$5$;$?$/$J$1$l$P!"$3$NJQ?t$r(B@code{nil} $B$K@_Dj$7$F$/$@$5$$!#(B
+$B%0%k!<%W$K>C5n%U%!%$%k$rE,MQ$9$k$?$a$K8F$S=P$5$l$k%U%C%/!#$3$l$O%G%#%U%)(B
+$B%k%H$G$O(B @code{(gnus-apply-kill-file)} $B$G$9!#F1$8%0%k!<%W$N$?$a$N%9%3%"(B
+$B%U%!%$%k$,$"$k>l9g$K>C5n%U%!%$%k$rL5;k$7$?$1$l$P!"$3$N%U%C%/(B
+$B$r(B @code{(gnus-apply-kill-file-unless-scored)} $B$K@_Dj$7$F2<$5$$!#>C5n%U%!(B
+$B%$%k$r=hM}$5$;$?$/$J$1$l$P!"$3$NJQ?t$r(B @code{nil} $B$K@_Dj$7$F2<$5$$!#(B
 
 @item gnus-kill-file-mode-hook
 @vindex gnus-kill-file-mode-hook
-$B>C5n%U%!%$%k%b!<%I%P%C%U%!Fb$G8F$S=P$5$l$k%U%C%/!#(B
+$B>C5n%U%!%$%k%b!<%I$N%P%C%U%!!C5n%U%!%$%k$r%5%]!<%H$7$F$$$^$9!#C(B
 @cindex converting kill files
 
 $B$"$J$?$,8E$$>C5n%U%!%$%k$r$I$C$5$j;}$C$F$$$k$N$G$"$l$P!"$=$l$i$r%9%3%"%U%!(B
-$B%$%k$KJQ49$7$?$/$J$k$G$7$g$&!#$b$7$=$l$i$,(B ``$BIaDL$N(B'' $B$d$D$G$"$l$P!"(B
+$B%$%k$KJQ49$7$?$/$J$k$G$7$g$&!#$b$7$=$l$i$,!VIaDL$N!W$b$N$G$"$l$P!"(B
 @file{gnus-kill-to-score.el} $B%Q%C%1!<%8$r;H$&$3$H$,$G$-$^$9!#$=$&$G$J$1(B
 $B$l$P!"C5n%U%!%$%k$+$i%9%3%"%U%!%$%k$X$NJQ49%Q%C%1!<%8$O!"I8=`$G$O(Bgnus $B$K$O4^(B
-$B$^$l$^$;$s!#(B
+$B>C5n%U%!%$%k$+$i%9%3%"%U%!%$%k$X$NJQ49%Q%C%1!<%8$O!"I8=`$G$O(B gnus $B$K$O4^(B
+$B$^$l$F$$$^$;$s!#(B
 @uref{http://www.stud.ifi.uio.no/~larsi/ding-various/gnus-kill-to-score.el} $B$+(B
 $B$iF~C5n%U%!%$%k$,Hs>o$KJ#;($J$b$N$G$"$l$P(B --- $B$=$l(B
-$B$K(B @code{gnus-kill} $B7A<00J30$N$b$N$,$?$/$5$s4^$^$l$F$$$l$P!"$=$l$i$rC5n%U%!%$%k$,Hs>o$KJ#;($J$N$G$"$l$P(B---$B$=$l(B
+$B$K(B @code{gnus-kill} $B7A<00J30$N$b$N$,$?$/$5$s4^$^$l$F$$$k$N$J$i!"$=$l$i$r(B
+$Be5i%9%3%"IU$1(B
 
-$BI=Bj$d(B From $B%X%C%@!<$K%9%3%"$rIU$1$k$N$O==J,AGE($G$9$,!"$"$k?MFCDj$NBj$K(B
-$B4X$7$F8@$C$F$$$k;v$K$@$1K\Ev$K6=L#$,$"$k>l9g$O$I$&$9$l$PNI$$$N$G$7$g(B
-$B$&(B? $B$b$7$/$O!"(BA $B$5$s$,(B B $B$5$s$K%U%)%m!<%"%C%W$7$F$$$k$H$-$K8@$C$F$$$k;v(B
-$B$rFI$_$?$/$J$$$1$l$I!"(BC$B$5$s$K%U%)%m!<%"%C%W$7$F$$$k$H$-$O2?$r8@$C$F$$$k(B
-$B$+$rCN$j$?$$$H$$$&>l9g$O(B?
+$BI=Bj$d(B From $B%X%C%@!<$K%9%3%"$rIU$1$k$N$O==J,AGE($G$9$,!"K\Ev$K6=L#$,$"$k(B
+$B$N$,!"FCDj$NI=Bj$K4X$7$F$"$k?M$,8@$C$F$$$k$3$H$@$1$@$C$?>l9g$O$I$&$9$l$P(B
+$BNI$$$G$7$g$&(B?  $B$b$7$/$O!"(BA $B$5$s$,(B B $B$5$s$K%U%)%m!<%"%C%W$7$F$$$k$H$-$OH`(B
+$B=w$,8@$C$F$$$k$3$H$rFI$_$?$/$J$$$1$l$I!"(BC $B$5$s$K%U%)%m!<%"%C%W$7$F$$$k$H(B
+$B$-$O2?$r8@$C$F$$$k$+$rCN$j$?$$$H$$$&>l9g$O(B?
 
-$B>e5i%9%3%"K!B'$r;H$&;v$G!"G$0U$NJ#;($J%9%3%"$NIU$1J}$r:n@.$9$k;v$,$G$-$^(B
-$B$9!#(B
+$B>e5i%9%3%"5,B'$r;H$($P!"$I$s$JJ#;($J%9%3%"$N%Q%?!<%s$G$b:n@.$9$k$3$H$,$G(B
+$B$-$^$9!#(B
 
 @menu
 * Advanced Scoring Syntax::     $BDj5A(B
 * Advanced Scoring Examples::   $B$I$N$h$&$K8+$($k$+(B
-* Advanced Scoring Tips::       $B$=$l$r:GBg8BMxMQ$9$k(B
+* Advanced Scoring Tips::       $B$=$l$r:GBg8B$KMxMQ$9$k(B
 @end menu
 
 @node Advanced Scoring Syntax
 @subsection $B>e5i%9%3%"IU$19=J8(B
 
-$BIaDL$N%9%3%"K!B'$OK!B'$N:G=i$NMWAG$KJ8;zNs$,$"$j$^$9!#>e5i%9%3%"IU$1K!B'(B
-$B$O:G=i$NMWAG$K%j%9%H$,$"$j$^$9!#FsHVL\$N%j%9%H$O:G=i$NMWAG(B
-$B$,(B @code{nil} $B$G$J$$CM$KI>2A$5$l$?$H$-$KE,MQ$5$l$^$9!#(B
+$BIaDL$N%9%3%"5,B'$G$O!"5,B'$N:G=i$NMWAG$,J8;zNs$G$9!#>e5i%9%3%"IU$15,B'$G(B
+$B$O!":G=i$NMWAG$O%j%9%H$G$9!#FsHVL\$NMWAG$O!":G=i$NMWAG$,(B @code{nil} $B$G$J(B
+$B$$CM$H$7$FI>2A$5$l$?$H$-$KE,MQ$5$l$k%9%3%"$G$9!#(B
 
-$B$3$l$i$N%j%9%H$O;0$D$NO@M}:nMQ;R$+$i$J$C$F$*$j!"$=$l$i$O0lJ}8~:nMQ;R$G!"(B
-$B?'!9$J9gCW:nMQ;R$G$9!#(B
+$B$3$l$i$N%j%9%H$O;0$D$NO@M}1i;;;R!"0l$D$N%j%@%$%l%/%H1i;;;R(B ($BLuCm(B: $BK\J8$G(B
+$B$O4V@\1i;;;R$HI=5-$5$l$F$$$^$9(B)$B!"$*$h$SMM!9$J9gCW1i;;;R$G9=@.$9$k$3$H$,(B
+$B$G$-$^$9!#(B
 
-$BO@M}:nMQ;R(B:
+$BO@M}1i;;;R(B:
 
 @table @code
 @item &
 @itemx and
-$B$3$NO@M}:nMQ;R$O$=$l$>$l$N0z?t$r(B @code{false} $B$KI>2A$5$l$k$b$N$r8+$D$1$k(B
-$B$^$GI>2A$7!"$=$l$+$iDd;_$7$^$9!#A4$F$N0z?t$,(B @code{true} $B$NCM$KI>2A$5$l(B
-$B$?>l9g$O!"$3$N:nMQ;R$O(B @code{true} $B$rJV$7$^$9!#(B
+$B$3$NO@M}1i;;;R$O!"$=$l$>$l$N0z?t$r=g$KI>2A$7$F!"$"$kI>2A$N7k2L(B
+$B$,(B @code{false} $B$K$J$C$?$iDd;_$7$^$9!#$9$Y$F$N0z?t$,(B @code{true} $B$NCM$K(B
+$BI>2A$5$l$?>l9g!"$3$N1i;;;R$O(B @code{true} $B$rJV$7$^$9!#(B
 
 @item |
 @itemx or
-$B$3$NO@M}:nMQ;R$O$=$l$>$l$N0z?t$r(B @code{true} $B$KI>2A$5$l$k$b$N$r8+$D$1$k(B
-$B$^$GI>2A$7$^$9!#$b$7$I$N0z?t$b(B @code{true} $B$G$J$$$H!"$3$N:nMQ;R(B
-$B$O(B @code{false} $B$rJV$7$^$9!#(B
+$B$3$NO@M}1i;;;R$O!"$=$l$>$l$N0z?t$r=g$KI>2A$7$F!"$"$kI>2A$N7k2L(B
+$B$,(B @code{true} $B$K$J$C$?$iDd;_$7$^$9!#$I$N0z?t$b(B @code{true} $B$G$J$+$C$?$i!"(B
+$B$3$N1i;;;R$O(B @code{false} $B$rJV$7$^$9!#(B
 
 @item !
 @itemx not
 @itemx ,A,(B
-$B$3$NO@M}:nMQ;R$OC10l$N0z?t$N$_$r$H$j$^$9!#$=$l$O$=$N0z?t$NCM$NO@M}H]Dj$r(B
-$BJV$7$^$9!#(B
+$B$3$NO@M}1i;;;R$O$?$C$?0l$D$N0z?t$r$NJ8;zNs$G!"$=$N8e$K9gCW$H9gCW$N7?$,B3$-$^$9!#E57?E*$J9gCW(B
-$B:nMQ;R$O(B @samp{("form" "Lars Ingebrigtsen" s)} $B$N$h$&$J$b$N$G$9!#%X%C%@!<(B
+$B:G8e$K9gCW1i;;;R$,$"$j$^$9!#$3$l$i$,K\Ev$N;E;v$r$9$k$b$N$G$9!#9gCW1i;;;R(B
+$B$O%X%C%@!$NJ8;zNs$G!"$=$N8e$K9gCW$H9gCW$N7?$,B3$-$^$9!#E57?E*$J9gCW1i(B
+$B;;;R$O(B @samp{("form" "Lars Ingebrigtsen" s)} $B$N$h$&$J$b$N$G$9!#%X%C%@!<(B
 $BL>$OC1=c$J%9%3%"IU$1$r$9$k$H$-$N$b$N$HF1$8$G!"9gCW$N7?$bF1$8$G$9!#(B
 
 @node Advanced Scoring Examples
 @subsection $B>e5i%9%3%"IU$1$NNc(B
 
-$B0J2<$NNc$O%9%3%"%U%!%$%k$N5,B'$G$"$k$3$H$K$4Cm0U2<$5$$!#40`z$J%9%3%"%U%!(B
-$B%$%k$r:n$k$K$O!"JL$N3g8L$NAH$G$=$l$i$r0O$s$G2<$5$$!#(B
+$B0J2<$NNc$O%9%3%"%U%!%$%k$N5,B'$G$"$k$3$H$KCm0U$7$F2<$5$$!#$=$l$i$r;H$C$F(B
+$B40`z$J%9%3%"%U%!%$%k$r:n$k$K$O!"JL$N3g8L$NAH$G$=$l$i$r0O$s$G2<$5$$!#(B
 
-Lars $B$,(B Gnus $B$K4X$7$FOC$r$7$F$$$k$H$-$KH`$K$h$C$F=q$+$l$?5-;v$N%9%3%"$r(B
-$BA}$d$7$?$$$H$7$^$7$g$&(B:
+Lars $B$,(B Gnus $B$K4X$7$FOC$r$7$F$$$k$H$-$K!"H`$K$h$C$F=q$+$l$?5-;v$N%9%3%"(B
+$B$rA}$d$7$?$$$H$7$^$7$g$&(B:
 
 @example
 @group
@@ -19642,9 +20565,9 @@ Lars $B$,(B Gnus $B$K4X$7$FOC$r$7$F$$$k$H$-$KH`$K$h$C$F=q$+$l$?5-;v$N%9%3%"$r
 @end group
 @end example
 
-$B$M!"$H$F$bC1=c$G$7$g(B?
+$B$U$s!"4JC1$9$.$k$+$J(B?
 
-$BD9$$5-;v$r=q$$$F$$$k$H$-$O!";~!92?$+AGE($J;v$r8@$$$^$9(B:
+$BH`$,D9$$5-;v$r=q$/$H$-!";~!92?$+AGE($J$3$H$r8@$$$^$9(B:
 
 @example
 ((&
@@ -19665,10 +20588,10 @@ Lars $B$,(B Gnus $B$K4X$7$FOC$r$7$F$$$k$H$-$KH`$K$h$C$F=q$+$l$?5-;v$N%9%3%"$r
  -100000)
 @end example
 
-Redmondo $B$,>C$($?7$2<$K$D$$$F=q$$$?$H$-$K%U%)%m!<%"%C%W$7$?A4$F$N?M$O%9(B
-$B%3%"$,>e$2$i$l$^$9$,!"$=$l$OH`$i$,Gr$$7$2<$K$D$$$F8l$C$F$$$k$H$-$N$_$G$9!#(B
-$B$7$+$7!"(BLars $B$,7$2<$K$D$$$FOC$r$7$F$$$k$H$-$O!"$?$$$F$$$"$^$j$*$b$7$m$/(B
-$B$"$j$^$;$s(B:
+Redmondo $B$,>C$($?7$2<$K$D$$$F=q$$$?$H$-$K%U%)%m!<%"%C%W$7$?$9$Y$F$N?M$N(B
+$B%9%3%"$,>e$2$i$l$^$9$,!"$=$l$OH`$i$,Gr$$7$2<$K$D$$$F8l$C$F$$$k$H$-$N$_$G(B
+$B$9!#$7$+$7(B Lars $B$,7$2<$K$D$$$FOC$r$7$F$$$k$H$-$O!"$?$$$F$$$"$^$j$*$b$7$m(B
+$B$/$"$j$^$;$s(B:
 
 @example
 ((&
@@ -19681,21 +20604,33 @@ Redmondo $B$,>C$($?7$2<$K$D$$$F=q$$$?$H$-$K%U%)%m!<%"%C%W$7$?A4$F$N?M$O%9(B
  1000)
 @end example
 
+$BBgNL$N5-;v$,N.$l$F$$$k%0%k!<%W$rFI$s$G$$$F!"JVEz$K$7$+6=L#$,L5$$$H$7$^$7$g(B
+$B$&!#$=$&$$$&>l9g$K$d$k$3$H$O!"(B"Re:"$B!"(B"Fw:" $B$^$?$O(B "Fwd:" $B$G;O$^$kI=Bj$r(B
+$B;}$C$F$$$J$$$9$Y$F$N5-;v$N%9%3%"$r2<$2$F!"JVEz$N0u$G;O$^$kI=Bj$r;}$C$F$$(B
+$B$k5-;v$N$9$Y$F$N?F$N%9%3%"$r>e$2$k$3$H$G$9!#(B
+
+@example
+((! ("subject" "re:\\|fwd?:" r))
+  -200)
+((1- ("subject" "re:\\|fwd?:" r))
+  200)
+@end example
+
 $B2DG=@-$OL58BBg$G$9!#(B
 
 @node Advanced Scoring Tips
 @subsection $B>e5i%9%3%"$N$A$g$C$H$7$?Hk7m(B
 
-@code{&} $B$H(B @code{|} $BO@M}:nMQ;R$O!"C;=L2sO)O@M}$r9T$$$^$9!#$9$J$o$A!"$=(B
-$B$N:nMQ$N7k2L$,L@$i$+$K$J$C$F;~E@$G!"0z?t$r2A$,(B @code{false} $B$K$J$k$H!";D$j$N0z?t$rI>2A(B
-$B$9$kL\E*$OB8:_$7$J$/$J$j$^$9!#$3$l$OCY$$9g(B
-$BCW(B (@samp{body} $B$d(B @samp{header}) $B$r:G8e$K;}$C$F$-$F!"B.$$9g(B
-$BCW(B (@samp{from} $B$d(B @samp{subject}) $B$r:G=i$K;}$C$F$/$k$Y$-$G$"$k$H$$$&;v(B
-$B$r0UL#$7$^$9!#(B
+@code{&} $B$H(B @code{|} $BO@M}1i;;;R$O!"L50UL#$J=hM}$r1*2s$9$kO@M}(B ($B86E5(B:
+short-circuit logic) $B$K4p$E$$$FF0:n$7$^$9!#$9$J$o$A!"$=$N=hM}$N7k2L$,L@(B
+$B$i$+$K$J$C$?;~E@$G!"0z?t$r=hM}$9$k$3$H$r;_$a$^$9!#Nc$($P(B @code{&} $B$N0z?t(B
+$B$N0l$D$,(B @code{false} $B$KI>2A$5$l$k$H!";D$j$N0z?t$rI>2A$9$k0UL#$,$"$j$^$;(B
+$B$s$+$i!#$3$l$OCY$$9gCW(B (@samp{body} $B$d(B @samp{header}) $B$r:G8e$K;}$C$F$-$F!"(B
+$BB.$$9gCW(B (@samp{from} $B$d(B @samp{subject}) $B$r:G=i$K;}$C$F$/$k$Y$-$G$"$k$3(B
+$B$H$r<(:6$7$^$9!#(B
 
-$B4V@\:nMQ;R(B (@code{1-} $B$J$I(B) $B$O$=$l$i$N0z?t$r%9%l%C%I$N0l@$BeA0$K:nMQ$9$k(B
-$B$h$&$K$7$^$9!#C$($?7$2<$K$D$$$F=q$$$?$H$-$K%U%)%m!<%"%C%W$7$?A4$F$N?M$O%9(B
 ...
 @end example
 
-$B$3$l$O!V8=:_$N5-;v$NADIcJl$N(B from $B%X%C%@!<$K%9%3%"$rIU$1$k!W$H$$$&;v$r0U(B
-$BL#$7$^$9!#4V@\$O$H$F$bB.$$$G$9$,!"C$($?7$2<$K$D$$$F=q$$$?$H$-$K%U%)%m!<%"%C%W$7$?A4$F$N?M$O%9(B
   ("subject" "Gnus")))
 @end example
 
-$BC$($?7$2<$K$D$$$F=q$$$?$H$-$K%U%)%m!<%"%C%W$7$?A4$F$N?M$O%9(B
 @end example
 
 @node Score Decays
-@section $B%9%3%"IeGT(B
+@section $B%9%3%"$r8:?j$5$;$k(B
 @cindex score decays
 @cindex decays
 
-$B%9%3%"$O:F8=L5$/KD$l>e$,$k798~$,$"$k;v$K5$IU$/$+$b$7$l$^$;$s!#FC$K!"E,1~(B
-$B%9%3%"$r;H$C$F$$$k$H$-$O!#%9%3%"$,Bg$-$/$J$j$9$.$k$H!"$=$l$i$O0UL#$r<:$$(B
-$B$^$9(B---$B$=$l$i$OC1$K:GBg$rDL$j1[$7$F$7$^$C$F!"$=$l$r0UL#$N$"$kJ}K!$G;H$&(B
-$B;v$OFq$7$/$J$j$^$9!#(B
+$B%9%3%"$O(B ($BFC$KE,1~%9%3%"$r;H$C$F$$$k$H(B) $B:]8BL5$/KD$l>e$,$k798~$,$"$k$3$H(B
+$B$K5$$,IU$/$G$7$g$&!#%9%3%"$,Bg$-$/$J$j$9$.$k$H!"$=$l$i$O$9$Y$F$N0UL#$r<:(B
+$B$$$^$9(B---$B$=$l$i$OC1$K:GBgCM$KC#$7$F$7$^$&$N$G!"0UL#$N$"$kJ}K!$G;H$&$3$H(B
+$B$OFq$7$/$J$j$^$9!#(B
 
 @vindex gnus-decay-scores
 @findex gnus-decay-score
 @vindex gnus-decay-score-function
-Gnus $B$O$3$NLdBj$N2r7h$r=u$1$k$?$a$K%9%3%"$rIe$i$;$k5!9=$rDs6!$7$^$9!#%9(B
-$B%3%"%U%!%$%k$OFI$_9~$^$l!"(B@code{gnus-decay-scores} $B$,(B @code{nil} $B$G$J$$(B
-$B$H!"(Bgnus $B$O%9%3%"%U%!%$%k$rIeGT5!9=$rDL$7!"A4$F$N1JB3$G$J$$%9%3%"K!B'$N(B
-$B%9%3%"$r2<$2$^$9!#$b$7(B @code{gnus-decay-scores} $B$,@55,I=8=$@$C$?$i!"$=$l(B
-$B$K9gCW$9$k%9%3%"%U%!%$%k$@$1$,07$o$l$^$9!#Nc$($P(B @emph{adaptive} $B%9%3%"(B
-$B%U%!%$%k$@$1$rIeGT$5$;$k$?$a$K!"$=$l$r(B @samp{\\.ADAPT\\'} $B$K@_Dj$9$k$3$H(B
-$B$,$G$-$^$9!#IeGT<+?H$O4X?t(B @code{gnus-decay-score-function} $B$K$h$C$F$$5$J$$$J$i!"<+J,MQ$N4X?t$r=q$$$F2<$5$$!#$=$l$O(B
+$B8:?j$5$;$k$Y$-%9%3%"$rM#0l$N0z?t$H$7$F8F$P$l!"?7$7$$%9%3%"$r@0?t$GJV$5$J(B
+$B$1$l$P$J$j$^$;$s!#(B
 
-Gnus $B$O0lF|$K0l2s%9%3%"$rIeGT$5$;$h$&$H$7$^$9!#Nc$($P!"$b$7(B gnus $B$r;MF|(B
-$B4Ve$2$k$+(B
+* Formatting Variables::        $B%P%C%U%!!<$N8+1I$($r;XDj$9$k$3$H$,$G$-$k(B
+* Window Layout::               gnus $B$N3F%P%C%U%!!<$N%&%#%s%I%&$r@_Dj$9$k(B
+* Faces and Fonts::             $B%U%'!<%9$,$I$N$h$&$K8+$($k$+$rJQ99$9$k(B
+* Compilation::                 gnus $B$rB.$/$9$k$K$O(B
 * Mode Lines::                  $B%b!<%I9T$K>pJs$rI=<($9$k(B
-* Highlighting and Menus::      $B%P%C%U%!$rAGE($G?4CO$h$/8+$;$k(B
-* Buttons::                     $B4JC1$J==Jb$G%"%-%l%9g'$rF@$k(B
-* Daemons::                     Gnus $B$O$"$J$?$NN"$GJ*;v$rd1j$K$J$k(B!
+* Daemons::                     gnus $B$O$"$J$?$NN"$G;E;v$r$9$k$3$H$,$G$-$k(B
 * NoCeM::                       Spam $B$dB>$NB@$j$d$9$$?);v$rHr$1$kJ}K!(B
-* Undo::                        $B$$$/$D$+$NF0:n$O85$KLa$9;v$,$G$-$k(B
+* Undo::                        $B$$$/$D$+$NF0:n$O85$KLa$9$3$H$,$G$-$k(B
 * Predicate Specifiers::        $B=R8l$r@_Dj$9$k(B
 * Moderation::                  $B$"$J$?$,%b%G%l!<%?!<$@$C$?$i$I$&$9$k$+(B
 * Fetching a Group::            $B%0%k!<%W$rFI$`$?$a$@$1$K(B gnus $B$r5/F0$9$k(B
-* Image Enhancements::          $B:G?7$N(B Emacs/XEmacs $B$O3($rI=<($G$-$k(B
-* Fuzzy Matching::              $BBg$-$JLJLS$C$F2?(B?
-* Thwarting Email Spam::        $BM>7W$J>&6HE*EE;R%a!<%k$rHr$1$kJ}K!(B
+* Image Enhancements::          $B:G?7$N(B Emacs/XEmacs $B$O2hA|$rI=<($G$-$k(B
+* Fuzzy Matching::              $BBg$-$J$R$:$s$@2;(B (big fuzz) $B$C$F2?(B?
+* Thwarting Email Spam::        $BMj$s$G$b$$$J$$9-9p%a!<%k$rHr$1$kJ}K!(B
 * Other modes::                 $BB>$N%b!<%I$H$NAj8_:nMQ(B
 * Various Various::             $BK\Ev$K$$$m$$$m$J$b$N(B
 @end menu
@@ -19832,170 +20768,173 @@ Gnus $B$O0lF|$K0l2s%9%3%"$rIeGT$5$;$h$&$H$7$^$9!#Nc$($P!"$b$7(B gnus $B$r;MF|
 @section $B%W%m%;%9(B/$B@\F,0z?t(B
 @cindex process/prefix convention
 
-$BB?$/$N4X?t!"$=$NCf$G$b5-;v$N0\F0!"I|9f2=!"J]B8$r$9$k$?$a$N4X?t$O!"(B
-@dfn{$B%W%m%;%9(B/$B@\F,0z?t$N=,47(B} $B$H$7$FCN$i$l$F$$$k$b$N$r;H$$$^$9!#(B
+$BB?$/$N4X?t!"$=$NCf$G$b5-;v$N0\F0!"%G%3!<%I!"J]B8$r$9$k$?$a$N4X?t$O!"!V%W(B
+$B%m%;%9(B/$B@\F,0z?t$N=,47!W$H$7$FCN$i$l$F$$$k$b$N$r;H$$$^$9!#(B
 
-$B$3$l$OMxMQl(B
-$B9g$O!"%W%m%;%90u$NIU$$$F$$$k5-;v$K:n6H$,l9g$K$O!"(B
+$B%W%m%;%90u$,IU$$$F$$$k5-;v$G:n6H$,l9g$O!"8=:_$N5-;v$K$@$1:n(B
+$B?tCM@\F,0z?t$d%W%m%;%90u$NIU$$$F$$$k5-;v$,L5$$>l9g$O!"8=:_$N5-;v$G$@$1:n(B
 $B6H$ro$K4JC1$G$9$,!"6CC2$rHr$1$i$l$k$h$&$K>\:Y$rL@$i$+$K$7$F$*(B
-$B$/I,MW$,$"$k$N$G$9!#(B
+$B$3$l$OC5n$7$^$9!#A02s$N@_Dj(B
-$B$r(B @kbd{M P y} $B$GI|5l$5$;$k;v$,$G$-$^$9(B (@pxref{Setting Process Marks})$B!#(B
+$B%W%m%;%90u$KH?1~$9$k%3%^%s%I$O!"8=:_%W%m%;%90u$,IU$$$F$$$k5-;v$N%j%9%H$r(B
+$B%9%?%C%/$K@Q$s$G!"5-;v$N$9$Y$F$N%W%m%;%90u$r>C5n$7$^$9!#A02s$N@_Dj(B
+$B$r(B @kbd{M P y} $B$GI|5l$5$;$k$3$H$,$G$-$^$9(B (@pxref{Setting Process Marks})$B!#(B
 
 @vindex gnus-summary-goto-unread
-$BB?$/$N?M!9$r6C$+$;!"62$,$i$;$k$H;W$o$l$k$3$H$O!"Nc$($P!"(B@kbd{3 d} $B$OK\Ev(B
-$B$K(B @kbd{d} @kbd{d} @kbd{d} $B$HF1$8;v$r$9$k;v$G$9!#$=$l$>$l$N(B @kbd{d} ($B$3(B
-$B$l$O8=:_$N5-;v$K4{FI$N0u$rIU$1$^$9(B) $B$O=i4|@_Dj$G$O0u$rIU$1$?8e$K$l$N(B @kbd{d} ($B$3$l$O8=:_$N5-;v$K4{FI$N0u$rIU$1$^$9(B) $B$O!"%G%#%U%)%k(B
+$B%H$G$O0u$rIU$1$?8e$GC5n2DG=$H$7$F0u$rIU$1$k$K(B
 $B$O(B @kbd{M P b M-& E} $B$H$7$^$9!#(B
 
 @node Interactive
-@section $BBPOCE*(B
+@section $BMxMQo$K?5=E$J?M$G!"$3$l$OK\Ev$KNI$$;v$G$9!#2?$+4m81$J;v$r(B
-$B$9$kA0$K!"(B``$BK\Ev$K$3$l$r$7$?$$$N$G$9$+(B?'' $B$H$$$&$h$&$Jo$K(B
+$B?5=E$J?M$N$I$A$i$+$@$H$$$&$G$9!#$3$l$OK\Ev$KNI$$$3$H$G$9!#2?$+4m81$J$3$H(B
+$B$r$9$kA0$K!"!VK\Ev$K$3$l$r$7$?$$$N$G$9$+(B?$B!W$H$$$&$h$&$Jo$KB?$/$N(B Emacs $B$NL?Na$O(B ($B?tCM(B) $B@\F,0z?t$KH?1~$7$^$9!#Nc$($P!"(B
-@kbd{C-u 4 C-f} $B$O%]%$%s%H$r(B 4 $BJ8;z@h$K0\F0$7!"(B
-@kbd{C-u 9 0 0 I s s p} $B$O1JB3(B @code{Suject} $BJ8;zNs$N0lIt%9%3%"K!B'(B
-$B$N(B 900 $B$r8=:_$N5-;v$K2C$($^$9!#(B
+$BHs>o$KB?$/$N(B Emacs $B$NL?Na$,(B ($B?tCM(B) $B@\F,0z?t$KH?1~$7$^$9!#Nc$((B
+$B$P(B @kbd{C-u 4 C-f} $B$O%]%$%s%H$r(B 4 $BJ8;z@h$K0\F0$7!"(B
+@kbd{C-u 9 0 0 I s s p} $B$O(B 900 $B$N%9%3%"(B ($B1JB3!"(B@code{Suject}$B!"J8;zNs$N0l(B
+$BIt!"$H$$$&5,B'(B) $B$r8=:_$N5-;v$K2C$($^$9!#(B
 
-$B$3$l$OAGE($GNI$$$N$G$9$,!"L?Na$K$b$&>/$7DI2C$N>pJs$rM?$($?$$$H$-$O$I$&$9(B
-$B$l$PNI$$$N$G$7$g$&(B? $B$(!<$H!"$?$$$F$$$NL?Na$,$7$F$$$k;v$O!"(B``$B@8$N(B'' $B@\F,(B
-$B0z?t$rFCJL$JJ}K!$G2r/$7DI2C$N>pJs$rM?$($?$$$H$-$O(B
+$B$I$&$9$l$PNI$$$N$G$7$g$&(B?  $B$(!<$H!"$?$$$F$$$NL?Na$,$7$F$$$k$3$H$O!V@8$N!W(B
+$B@\F,0z?t$r2?$i$+$NFCJL$JJ}K!$G2r$`$@$1B?$/$N(B @kbd{M-i} $B@\F,8l$r@Q$_=E$M$k;v$,$G$-$^$9!#(B
-@kbd{M-i a C-M-u} $B$O(B ``$BL?Na(B @kbd{C-M-u} $B$K%7%s%\%k@\F,0z?t(B @code{a} $B$rM?(B
-$B$($k(B'' $B$H$$$&$3$H$G$9!#(B@kbd{M-i a M-i b C-M-u} $B$OL?Na(B @kbd{C-M-u} $B$K%7%s(B
-$B%\%k@\F,0z?t(B @code{a} @code{b} $B$rM?$($k(B'' $B$H$$$&;v$G$9!#o$K$?$/$5$s$N$b$N$,$"$j$^$9!#9,1?$J;v$K!"$=$l(B
-$B$i$O$9$Y$FF1$89=J8$r;H$$$^$9$N$G!"$"$^$j7y$JL\$K$O2q$o$J$$$G$7$g$&!#(B
+$B$"$k$3$H$K5$IU$$$?$G$7$g$&!#$3$l$i$O(B gnus $B$,?'!9$J%P%C%U%!!<$G$I$N$h$&$K(B
+$B9T$r=PNO$9$k$+$r@)8f$7$^$9!#Hs>o$K$?$/$5$s$N$b$N$,$"$j$^$9!#9,1?$J$3$H$K!"(B
+$B$=$l$i$O$9$Y$FF1$89=J8$r;H$&$N$G!"$"$^$j7y$JL\$K$O2q$o$J$$$G$7$g$&!#(B
 
-$B=qK!;EMM(B (format) $B;XDj$NNc$,$"$j$^$9(B ($B%0%k!<%W%P%C%U%!$h$j(B):
-@samp{%M%S%5y: %(%g%)\n}$B!#$=$l$Oo$K=9$/!"$?$/$5$s$N%Q!<%;%s%H5-(B
-$B9f$,$I$3$K$G$b$"$j$^$9!#(B
+$B=qK!;EMM(B (format) $B;XDj$NNc$G$9(B ($B%0%k!<%W%P%C%U%!!<$h$j(B):@*
+@samp{%M%S%5y: %(%g%)\n}$B!#$=$l$O6K$a$F=9$/!"$?$/$5$s$N%Q!<%;%s%H5-9f$,$$(B
+$B$?$k$H$3$m$K$"$j$^$9!#(B
 
 @menu
 * Formatting Basics::           $B=qK!;EMMJQ?t$O4pK\E*$K=qK!;XDjJ8;zNs$G$"$k(B
 * Mode Line Formatting::        $B%b!<%I9T$N=qK!;EMMJQ?t$K4X$9$k$$$/$D$+$N5,B'(B
-* Advanced Formatting::         $B?'!9$JJ}K!$G=PNO$r=$@5$9$k(B
-* User-Defined Specs::          Gnus $B$K$"$J$?<+?H$N4X?t$r8F$P$;$k(B
+* Advanced Formatting::         $B?'!9$JJ}K!$G=PNO$rJQ2=$5$;$k(B
+* User-Defined Specs::          gnus $B$K$"$J$?<+?H$N4X?t$r8F$P$;$k(B
 * Formatting Fonts::            $B;EMM$rB?:L$GAGE($K8+$;$k(B
 * Positioning Point::           $BA`:n$N8e$G%]%$%s%H$r0\F0$9$k(B
 * Tabulation::                  $B=PNO$N@0Ns(B
 * Wide Characters::             $BI}$,9-$$J8;z$r07$&(B
 @end menu
 
-$B8=:_$N$H$3$m!"(Bgnus $B$O0J2<$N=qK!;EMMJQ?t$r;H$$$^$9(B:
+$B8=:_$N$H$3$m(B gnus $B$O0J2<$N=qK!;EMMJQ?t$r;H$$$^$9(B:
 @code{gnus-group-line-format}, @code{gnus-summary-line-format},
 @code{gnus-server-line-format}, @code{gnus-topic-line-format},
-@code{gnus-group-mode-line-format}, @code{gnus-summary-mode-line-format},
-@code{gnus-article-mode-line-format}, @code{gnus-server-mode-line-format},
-@code{gnus-summary-pick-line-format}$B!#(B
+@code{gnus-group-mode-line-format},
+@code{gnus-summary-mode-line-format},
+@code{gnus-article-mode-line-format},
+@code{gnus-server-mode-line-format}, $B$*$h(B
+$B$S(B @code{gnus-summary-pick-line-format}$B!#(B
 
-$B$3$l$iA4$F$N=qK!;EMMJQ?t$OG$0U$N(B elisp $B<0$G$"$k;v$b$G$-$^$9!#$=$N>l9g$O!"(B
-$B$=$l$i$OMW5a$5$l$k9T$KA^F~$9$k$?$a$K(B @code{$BI>2A(B} $B$5$l$^$9!#(B
+$B$3$l$i$9$Y$F$N=qK!;EMMJQ?t$OG$0U$N(B elisp $B<0$G$"$k$3$H$b$G$-$^$9!#$=$N>l(B
+$B9g!"$=$l$i$OMW5a$5$l$k9T$KA^F~$9$k$?$a$K(B @code{eval} ($BI>2A(B) $B$5$l$^$9!#(B
 
 @kindex M-x gnus-update-format
 @findex gnus-update-format
-Gnus $B$O$"$J$?<+?H$N=qK!;EMM;XDj$r:n$k2A(B} $B$7!"Ev$N;XDj$r99?7(B
-$B$7!"7k2L$N(B Lisp $B<0$r$l$NMWAG(B @samp{%} $B$OEv$N%P%C%U%!$,:n@.$5$l$k$H$-$K2?$i$+$NJ8;zNs$d(B
-$BB>$N$b$N$GCV$-49$($i$l$^$9!#(B@samp{%5y} $B$O(B ``@samp{y} $B;XDj$rA^F~$7!"(B5 $BJ8(B
-$B;z$N>l=j$rF@$k$?$a$K6uGr$rF~$l$J$5$$(B'' $B$H$$$&;v$G$9!#(B
+$B$=$l$>$l$N(B @samp{%} $B$NMWAG$O!"Ev$N%P%C%U%!!<$,:n@.$5$l$k$H$-$K2?$i$+$NJ8(B
+$B;zNs$dB>$N$b$N$GCV$-49$($i$l$^$9!#(B@samp{%5y} $B$O!V(B@samp{y} $B;XDj$rA^F~$7$F!"(B
+5 $BJ8;z$N>l=j$rF@$k$?$a$K6uGr$r5M$a9~$_$J$5$$!W$H$$$&$3$H$G$9!#(B
 
 $BIaDL$N(B C $B$d(B Emacs Lisp $B$N=qK!;EMM(B (format) $BJ8;zNs$HF1$8$h$&$K!"(B
-@samp{%} $B$H=qK!;EMM$N7?$NJ8;z$N4V$N?tCM=$>~;R$O>o$K>/$J$/$H$b$=$ND9$5$K(B
-$B$J$k$h$&$K!"=PNO$K(B @dfn{$B5M$a(B} $B$l$i$l$^$9!#(B@samp{%5y} $B$O$=$NItJ,$r>o(B
-$B$K(B ($B>/$J$/$H$b(B) 5 $BJ8;z$ND9$5$K$J$k$h$&$K!":8$K6uGr$r5M$a$^$9!#$b(B
-$B$7(B @samp{%-5y} $B$H$9$l$P!"Be$o$j$K1&B&$K5M$a9~$_$^$9!#(B
+@samp{%} $B$H=qK!;EMM$N7?$NJ8;z$N4V$N?tCM=$>~;R$O!">o$K>/$J$/$H$b$=$ND9$5(B
+$B$K$J$k$h$&$K!"=PNO$K(B ($B6uGrJ8;z$J$I$r(B)$B!V5M$a9~$_!W$^$9!#(B@samp{%5y} $B$O$=$N(B
+$B>l=j$,>o$K(B ($B>/$J$/$H$b(B) 5 $BJ8;z$ND9$5$K$J$k$h$&$K!":8$K6uGr$r5M$a9~$_$^$9!#(B
+$B$b$7(B @samp{%-5y} $B$H$9$l$P!"Be$o$j$K1&B&$K5M$a9~$_$^$9!#(B
 
-$BFC$KD9$$CM$+$i$=$NItJ,$rJ]8n$9$k$?$a$K!"D9$5$r@)8B$7$?$$$H$b;W$&$G$7$g$&!#(B
-$B$=$N$?$a$K$O!"(B@samp{%4,6y} $B$H$9$k;v$,$G$-$F!"$3$l$O$=$NNN0h$O7h$7$F(B 6 $BJ8(B
-$B;z$rD6$($kD9$5$K$O$J$i$:!"(B4 $BJ8;z$h$j>/$J$$D9$5$K$J$i$J$$$H$$$&;v$G$9!#(B
+$BFC$K9-$$I}$NCM$KBP$7$FJ]8n$9$k$?$a$K!"$=$N>l=j$ND9$5$r@)8B$7$?$$$3$H$b$"(B
+$B$k$G$7$g$&!#$=$N$?$a$K(B @samp{%4,6y} $B$J$I$H;XDj$9$k$3$H$,$G$-$^$9!#$3$l$O!"(B
+$B$=$N>l=j$O7h$7$F(B 6 $BJ8;z$rD6$($kI}$K$O$J$i$:!"$+$D(B 4 $BJ8;z$h$j>/$J$$I}$K$b(B
+$B$J$i$J$$$H$$$&$3$H$G$9!#(B
 
 gnus $B$O(B @samp{%&user-date;} $B$N$h$&$J!"$$$/$D$+$N3HD%MM<0;X<($b%5%]!<%H$7(B
 $B$^$9!#(B
@@ -20003,50 +20942,48 @@ gnus $B$O(B @samp{%&user-date;} $B$N$h$&$J!"$$$/$D$+$N3HD%MM<0;X<($b%5%]!<%H$
 @node Mode Line Formatting
 @subsection $B%b!<%I9T=qK!;EMM(B
 
-$B%b!<%I9T=qK!;EMMJQ?t(B ($B$9$J$o$A!"(B@code{gnus-summary-mode-line-format}) $B$O(B
-$B0J2<$NFs$D$N0c$$0J30$O!"%P%C%U%!9T$K4p$E$/=qK!;EMMJQ?t(B
-$B$H(B (@pxref{Formatting Basics}) $BF1$8$h$&$J5,B'$K=>$$$^$9(B:
+$B%b!<%I9T=qK!;EMMJQ?t(B ($BNc$($P(B @code{gnus-summary-mode-line-format}) $B$O!"(B
+$B0J2<$NFs$D$N0c$$0J30$O!"%P%C%U%!!<9T$KE,1~$7$?=qK!;EMMJQ(B
+$B?t(B (@pxref{Formatting Basics}) $B$HF1$85,B'$K=>$$$^$9(B:
 
 @enumerate
-
 @item
 $B:G8e$K2~9T(B (@samp{\n}) $B$,$"$C$F$O$J$j$^$;$s!#(B
 
 @item
-$BFCJL$J(B @samp{%%b} $B;XDj$r%P%C%U%!L>$rI=<($9$k$?$a$K;H$&$3$H$,$G$-$^$9!#$(!<(B
-$B$H!"K\Ev$O$=$l$O;XDj$G$O$J$$$N$G$9(B---@samp{%%} $B$OC1$K=qK!;EMM$,5!3#E*$K(B
-$B@Z$jNv$/$N$r@Z$jH4$1$F(B @samp{%} $B$r$=$N$^$^EO$9$?$a$NJ}K!$G!"(B
-Emacs $B$,(B @samp{%b} $B$r$rI=<($7$J$5$$(B'' $B$H2r$rI=<($9$k$?$a$K;H$&$3$H$,$G$-$^$9!#(B
+$B$(!<$H!"$r(B
+$BI=<($7$J$5$$!W$H2re5i=qK!;EMM(B
 
-$B2?$i$+$NJ}K!$GNN0h$r8e$G=hM}$9$k$N$OIQHK$KLr$KN)$A$^$9!#ItJ,$r5M$a9~$`!"(B
-$B@)8B$9$k!"@Z$j~;R(B} $B$r;H(B
-$B$&;v$K$h$jC#@.$5$l$^$9!#$h$/$"$k%A%k%@;XDj$O$3$N$h$&$K8+$($k$+$b$7$l$^$;(B
-$B$s(B @samp{%~(cut 3)~(ignore "0")y}$B!#(B
+$BI=<($5$l$?NN0h$r8e$G2?$i$+$NJ}K!$G=hM}$9$k$N$O!"$7$P$7$PLr$KN)$A$^$9!#5M(B
+$B$a9~$_!"@)8B!"@Z$j~;R!W$r;H$&$3(B
+$B$H$K$h$C$F~;R$G$9(B:
 
 @table @code
 @item pad
 @itemx pad-left
-$BMW5a$5$l$?D9$5$K$J$k$^$G!"NN0h$K6uGr$r:8B&$+$i5M$a9~$_$^$9!#(B
+$BNN0h$N:8B&$K!"MW5a$5$l$?D9$5$K$J$k$^$G6uGr$r5M$a9~$_$^$9!#(B
 
 @item pad-right
-$BMW5a$5$l$?D9$5$K$J$k$^$G!"NN0h$K6uGr$r1&B&$+$i5M$a9~$_$^$9!#(B
+$BNN0h$N1&B&$K!"MW5a$5$l$?D9$5$K$J$k$^$G6uGr$r5M$a9~$_$^$9!#(B
 
 @item max
 @itemx max-left
-$B;XDj$5$l$?D9$5$K$J$k$h$&$K!"J8;z$r:8B&$+$i@Z$j.7?$N(B ISO0861 $BMM(B
-$B<0$NF|IU$rJV$7$^$9(B---@samp{19960809T230410} $B$G$9!#$3$l$OH/2;$7$K$/$$$N$G!"(B
-$B@$5*$rI=$9?t$H;~4V$r:o$.Mn$H$7$F!"(B6 $BJ8;z$NF|IU$r;D$7$?$$$H;W$$$^$9!#$=$l(B
-$B$O(B @samp{%~(cut-left 2)~(max-right 6)~(pad 6)o} $B$H$J$k$G$7$g$&!#(B($B@Z$jMn(B
-$B$H$7(B (cutting) $B$O(B $B:GBg8B(B (maxing) $B$h$j@h$K$J$5$l$^$9$N$G!"7e$GAGE($K8+$((B
-$B$k$h$&$K$9$k$?$a$KF|IU$,(B 6 $BJ8;z$h$j>/$J$/L5$/$J$i$J$$;v$rJ]>Z$9$k$?$a$K(B
-$B5M$a9~$_(B (padding) $B$,I,MW$K$J$j$^$9!#(B)
+$BNc$r=P$7$F$_$^$7$g$&!#35N,%b!<%I9T$G$N(B @samp{%o} $B;EMM$O(B ISO0861 $BMM<0$N6E(B
+$B=L$5$l$?F|IU(B (@samp{19960809T230410} $B$N$h$&$J$b$N(B) $B$rJV$7$^$9!#$3$l$O$H(B
+$B$F$bH/2;$7$K$/$$$N$G!"@$5*$rI=$9?t$H;~9o$r:o$.Mn$H$7$F!"(B6 $BJ8;z$NF|IU$r;D(B
+$B$7$?$$$H;W$$$^$9!#$=$l$O(B @samp{%~(cut-left 2)~(max-right 6)~(pad 6)o} $B$H(B
+$B$J$k$G$7$g$&!#(B($B@Z$jMn$H$7(B (cutting) $B$O(B $B:GBgI}$N@)8B(B (maxing) $B$h$j@h$K9T(B
+$B$J$o$l$k$N$G!"I=<(Ms$G$N8+1I$($rNI$/$9$k$?$a$K!"F|IU$,(B 6 $BJ8;z$h$j>/$J$/(B
+$B$J$i$J$$$3$H$rJ]>Z$9$k5M$a9~$_(B (padding) $B$,I,MW$K$J$j$^$9!#(B)
 
-$BL5;k(B (ignore) $B$,:G=i$K$J$5$l$^$9!#$=$l$+$i@Z$jMn$H$7(B (cut) $B$,9T$o$l$^$9!#(B
-$B$=$7$F!"$=$l$+$i:G8e$NA`:n!"5M$a9~$_(B (pad) $B$,9T$o$l$^$9!#(B
+$BL5;k(B (ignore) $B$,:G=i$K9T$J$o$l$^$9!#$=$l$+$i@Z$jMn$H$7(B (cutting)$B!"e5i;2>H$r$?$/$5$s;H$C(B
-$B$F$$$k$J$i!"(BT-gnus $B$,$H$F$bCY$/$J$k$N$,$o$+$k$G$7$g$&!#$3$l$O$"$J$?$,9T(B
-$B$N308+$KK~B-$7$?$H$-$K(B @kbd{M-x gnus-compile} $B$re5i;2>H$r$?$/$5$s;H$C$F$$$k$J$i!"(Bgnus $B$,$H$F$bCY(B
+$B$/$J$k$N$,$o$+$k$G$7$g$&!#$3$l$O$"$J$?$,9T$N308+$KK~B-$7$?$H$-(B
+$B$K(B @kbd{M-x gnus-compile} $B$r$N;XDj$+$i$N>pJs$HA4$/F1$8(B
-$B$h$&$K%P%C%U%!$KA^F~$5$l$^$9!#4X?t$O0UL#$NL5$$CM$H6&$K8F$P$l$k;v$b$"$j$((B
-$B$^$9$N$G!"$=$l$NBP:v$r$9$k$Y$-$G$9!#(B
-
-gnus $B$O(B @samp{%u&foo;} $B$N$h$&$J3HD%MxMQ~(B
-$B;R(B (@pxref{Advanced Formatting}) $B$r;H$C$F$[$H$s$IF1$8;v$rC#@.$9$k;v$,$G(B
-$B$-$^$9!#Nc$G$9(B: @samp{%~(form (count-lines (point-min) (point)))@@}$B!#(B
-$B$3$3$GM?$($i$l$?<0$OI>2A$5$l$F!"8=:_$N9T?t$r$b$?$i$7!"$=$l$+$iA^F~$5$l$^(B
+$B$9$Y$F$N;EMM$K!"MxMQ$N(B
+$B=R8l$K$h$C$F@8@.$5$l$k>pJs$H$^$C$?$/F1$8$h$&$K!"%P%C%U%!!<$KA^F~$5$l$^$9!#(B
+$B4X?t$O0UL#$NL5$$CM$H6&$K8F$P$l$k>l9g$b$"$k$N$G!"$=$l$NBP:v$r$7$F$*$/$Y$-(B
+$B$G$9!#(B
+
+gnus $B$OMxMQl9g$O(B @code{gnus-user-format-function-}@samp{foo} $B$H$$$&4X?t(B
+$B$r8F$S=P$7$^$9!#(B
+
+$B?7$7$$4X?t$rDj5A$7$J$/$F$b!"$[$H$s$IF1$8$3$H$r%A%k%@=$>~(B
+$B;R(B (@pxref{Advanced Formatting}) $B$r;H$C$FC#@.$G$-$k$G$7$g$&!#Nc$G$9(B:
+
+@samp{%~(form (count-lines (point-min) (point)))@@}
+
+$B$3$3$GM?$($i$l$?<0$OI>2A$5$l$F8=:_$N9THV9f$r$b$?$i$7!"$=$l$+$iA^F~$5$l$^(B
 $B$9!#(B
 
 @node Formatting Fonts
 @subsection $B=qK!;EMM%U%)%s%H(B
 
-$B%O%$%i%$%H$N$?$a$N;XDj$,$"$j!"$=$l$i$OA4$F$N=qK!;EMMJQ?t$K$h$C$F6&M-$5$l(B
-$B$F$$$^$9!#(B@samp{%(} $B$H(B @samp{%)} $B;XDj$N4V$NJ8>O$OFCJL(B
-$B$J(B @code{mouse-face} $B%W%m%Q%F%#$,@_Dj$5$l!"$=$l$O$=$3$K%^%&%9$N%]%$%s%?!<(B
-$B$r$"$o$;$?$H$-$K(B (@code{gnus-mouse-face} $B$K$h$C$F(B) $B%O%$%i%$%H$5$l$k$3$H(B
-$B$K$J$j$^$9!#(B
-
-@samp{%@{} $B$H(B @samp{%@}} $B;XDj$N4V$NJ8>O$O(B @code{gnus-face-0} $B$r;H$C$FIa(B
-$BDL$N%U%'%$%9$,@_Dj$5$l!"$=$l$O=i4|@_Dj$G(B @code{bold} $B$G$9!#$b(B
-$B$7(B @samp{%@{1} $B$H$7$?$J$i!"Be$o$j$K(B @code{gnus-face-1} $B$rF@!"0J2>} $B;X<(;R$N4V$N%F%-%9%H$OFCJL(B
-$B$J(B @code{balloon-help} $B%W%m%Q%F%#$,(B @code{gnus-balloon-face-0} $B$K@_Dj$5(B
-$B$l$^$9!#(B@samp{%1<<} $B$H$9$k$H!"(B@code{gnus-balloon-face-1} $B$rF@$F!"B>$bF1(B
-$BMM$G$9!#(B@code{gnus-balloon-face-*} $BJQ?t$OJ8;zNs$+J8;zNs$rJV$94X?t$r;X$9(B
-$B%7%s%\%k$N$I$A$i$+$G$"$kI,MW$,$"$j$^$9!#%^%&%9$,%W%m%Q%F%#$N@_Dj$5$l$F$$(B
-$B$k%F%-%9%H$N>e$rDL2a$9$k$H!"%P%k!<%s%&%#%s%I%&$,8=$l$F!"J8;zNs$rI=<($7$^(B
-$B$9!#$3$l$N>\$7$$>pJs$O(B @ref{Tooltips, ,Tooltips, emacs, The Emacs
-Manual} (GNU Emacs) $B$^$?$O(B @code{balloon-help-mode} (XEmacs) $B$N@bL@J8;z(B
-$BNs$r;2>H$7$F$/$@$5$$!#(B($B5;=QE*$JM}M3$N$?$a$K!"%.%#%a(B (guillemets:
-@footnote{guillemets ($BJ)8l(B) $B$O%.%e%a$H$bI=5-$5$l$^$9!#F|K\8l$N!V!W$KEv$?(B
-$B$k$b$N$G!"8}F,I=8=$rI=5-$7$?$j!"6/D4$7$?$$C18l$r0O$`!"2?$+$+$i$N0zMQItJ,(B
-$B$r0O$`!"=qJ*Ey$N%?%$%H%k$r5-$9EyMM!9$K;H$o$l$^$9!#(B}) $B$O$3$N@a$G(B
-$B$O(B @samp{<<} $B$*$h$S(B @samp{>>} $B$H$7$F6a;w$5$l$^$7$?!#(B)
-
-$B$3$l$O%0%k!<%W%P%C%U%!$NBeBXe$r(B
+$B%^%&%9$,DL2a$9$k$H!"?a$-=P$7$,8=$l$FJ8;zNs$rI=<($7$^$9!#$3$l$N>\$7$$>pJs(B
+$B$O(B @xref{Tooltips, ,Tooltips, emacs, The Emacs Editor}, (GNU Emacs) $B$^$?(B
+$B$O(B @code{balloon-help-mode} (XEmacs) $B$N@bL@$r;2>H$7$F2<$5$$!#(B($B5;=QE*$JM}(B
+$BM3$N$?$a$K!"%.%#%a(B (guillemets) $B$O$3$N@a$G$O(B `$B!T(B' $B$H(B `$B!U(B' $B$G6a;w$5$l$^$7(B
+$B$?!#(B)
+
+@quotation
+$BLuCm(B: guillemets ($BJ)8l(B) $B$O%.%e%a$H$bI=5-$5$l$^$9!#eEy$N=qK!;EMM$r@_Dj$9$k!#(B}
+;; @r{$B?7$7$$FC@=$N=qK!;EMM$r@_Dj$7$^$9!#(B}
 (setq gnus-group-line-format
       "%M%S%3@{%5y%@}%2[:%] %(%1@{%g%@}%)\n")
 @end lisp
 
-$B$"$J$?$,$3$N0F$r;H$C$F40A4$KFI$a$J$/$FHs>o$K2o$K2o$[$H$s$I$N%P%C%U%!$G!"%]%$%s%H$r3F9T$N$"$i$+$8$a7h$a$i$l$?>l(B
-$B=j$K0\F0$7$^$9!#%G%#%U%)%k%H$G$O!"%]%$%s%H$O9T$N:G=i$N%3%m%s$K0\F0$7$^$9!#(B
-$B$"$J$?$O$3$N?6$k$^$$$r!";0$D$N0c$&J}K!$G%+%9%?%^%$%:$9$k$3$H$,$G$-$^$9!#(B
+gnus $B$ODL>o$[$H$s$I$N%P%C%U%!!<$G!"%]%$%s%H$r3F9T$N$"$i$+$8$a7h$a$i$l$?(B
+$B>l=j$K0\F0$7$^$9!#%G%#%U%)%k%H$G$O!"%]%$%s%H$O9T$N:G=i$N%3%m%s$K0\F0$7$^(B
+$B$9!#$3$N?6$k$^$$$O!";0$D$N0c$&J}K!$G%+%9%?%^%$%:$9$k$3$H$,$G$-$^$9!#(B
 
-$B$^$?!"$"$J$?$O%3%m%s$r9T$N$I$N>l=j$K$G$b0\F0$9$k$3$H$,$G$-$^$9!#(B
+$B$^$?!"%3%m%s$r9T$N$I$N>l=j$K$G$b0\F0$9$k$3$H$,$G$-$^$9!#(B
 
 @findex gnus-goto-colon
-$B$"$J$?$O%3%m%s$N0LCV$K%]%$%s%H$r0\F0$5$;$k$?$a$N4X?t$rDj5A$7D>$9$3$H$,$G(B
-$B$-$^$9!#$=$N4X?t$O(B @code{gnus-goto-colon} $B$H8F$P$l$F$$$^$9!#(B
+$B%3%m%s$N0LCV$K%]%$%s%H$r0\F0$5$;$k$?$a$N4X?t$rDj5A$7D>$9$3$H$,$G$-$^$9!#(B
+$B$=$N4X?t$O(B @code{gnus-goto-colon} $B$H8F$P$l$F$$$^$9!#(B
 
-$B$G$b!"$b$7$"$J$?$,9T$K%3%m%s$r4^$a$?$/$J$$$J$i$P!"$3$l$r07$&$?$a$N$*$=$i(B
-$B$/:G$bo$O!"1d$P$7$?$j=L$a$?$j$7$FJ8;zNs$r%G%#%9%W%l%$$KJB$Y$k$3$H$,(B
-$B$G$-$^$9!#$G$bBg$-$5$,0c$&0[$J$kJ8;zNs$rO"7k$5$;$k>l9g$O!"C1$KJ8;zNs$r=P(B
-$BNO$7$F$7$^$&$N$,$h$jo$O!"6uGrJ8;z$r5M$a9~$s$@$jC<$r@Z$jMn$H$9$3$H$K$h$C$F!"J8;zNs$r%G%#%9(B
+$B%W%l%$$KJB$Y$k$3$H$,$G$-$^$9!#$G$bBg$-$5$,0c$&0[$J$kJ8;zNs$rO"7k$5$;$k>l(B
+$B9g$O!"C1$KJ8;zNs$r=PNO$7$F$7$^$&$N$,$h$jl9g$O2?$bA^F~$7$^$;$s!#$3$l$O2:$d(B
-$B$+(B (soft) $B$J@0Ns;R$G$9!#(B
+@samp{%50=} $B$OJ8;zNs$,(B 50$B7e$^$G$N>l=j$r@j$a$k$h$&$K6uGrJ8;z$r5M$a9~$_$^(B
+$B$9!#$b$7A^F~$9$k%F%-%9%H$NKvC<$,(B 50$B7e$h$j8e$m$K$J$k>l9g$O2?$bA^F~$7$^$;(B
+$B$s!#$3$l$O2:$d$+(B (soft) $B$J@0Ns;R$G$9!#(B
 
-@samp{%-50=} $B$b$^$?!"J8;zNs$,(B 50$B7e$+$i;O$^$k$h$&$K6uGrJ8;z$r5M$a9~$_$^$9!#(B
-$B$G$9$,!"$b$7(B 50$B7e$h$j8e$m$K$9$G$K%F%-%9%H$,$"$k>l9g!"(B50$B7e$h$j8e$m$K$"$k(B
-$B2a>j$J%F%-%9%H$O:o=|$5$l$^$9!#$3$l$O87L)(B (hard) $B$J@0Ns;R$G$9!#(B
+@samp{%-50=} $B$b$^$?!"J8;zNs$,(B 50$B7e$^$G$N>l=j$r@j$a$k$h$&$K6uGrJ8;z$r5M$a(B
+$B9~$_$^$9!#$G$9$,!"$b$7A^F~$9$k%F%-%9%H$NKvC<$,(B 50$B7e$h$j8e$m$K$J$k>l9g$O!"(B
+50$B7e$h$j8e$m$K$J$k2a>j$J%F%-%9%H$O:o=|$5$l$^$9!#$3$l$O87L)(B (hard) $B$J@0Ns(B
+$B;R$G$9!#(B
 
 @node Wide Characters
 @subsection Wide Characters
@@ -20215,26 +21164,29 @@ gnus $B$ODL>o$[$H$s$I$N%P%C%U%!$G!"%]%$%s%H$r3F9T$N$"$i$+$8$a7h$a$i$l$?>l(B
 @vindex gnus-use-correct-string-widths
 $B$=$l$r5_:Q$9$k$?$a$K!"$"$J$?(B
 $B$O(B @code{gnus-use-correct-string-widths} $B$r(B @code{t} $B$K@_Dj$9$k$3$H$,$G(B
-$B$-$^$9!#$3$l$O%P%C%U%!$N@8@.$rCY$/$7$^$9$,!"$h$jH~$7$$7k2L$rF@$k$3$H$,$G(B
-$B$-$k$G$7$g$&!#4{DjCM$O(B @code{t} $B$G$9!#(B
+$B$-$^$9!#$3$l$O%P%C%U%!!<$N@8@.$rCY$/$7$^$9$,!"$h$jH~$7$$7k2L$rF@$k$3$H$,(B
+$B$G$-$k$G$7$g$&!#%G%#%U%)%k%HCM$O(B @code{t} $B$G$9!#(B($BLuCm(B: $BF|K\8l$J$I(B
+$B$r(B Emacs $B$GI=<($9$k>l9g$K!"=qK!;EMM$K$h$C$F$O(B @code{nil} $B$K$7$F$bLdBj$"(B
+$B$j$^$;$s!#$=$N>l9g$O!"35N,%P%C%U%!!<$NI=<($,ITB7$$$K$J$i$J$$$3$H$r3NG'$7(B
+$B$F2<$5$$!#(B)
 
 @node Window Layout
 @section $B%&%#%s%I%&$NG[CV(B
 @cindex window layout
 
-$B$$$(!"(BX $B$K4X$9$k;v$O$"$j$^$;$s$N$G!"$*$H$J$7$/$7$F2<$5$$!#(B
+$B$$$(!"(BX $B$K4X$9$k$3$H$O$"$j$^$;$s$+$i!"$*$H$J$7$/$7$F2<$5$$!#(B
 
 @vindex gnus-use-full-window
-$B$b$7(B @code{gnus-use-full-window} $B$,(B @code{nil} $B$G$J$$$H!"(Bgnus $B$OA4$F$NB>(B
-$B$N%&%#%s%I%&$r>C$7$F!"(BEmacs $B$N2hLLA4BN$r@jM-$7$^$9!#$3$l$O=i4|@_Dj(B
+$B$b$7(B @code{gnus-use-full-window} $B$,(B @code{nil} $B$G$J$$$H!"(Bgnus $B$O$9$Y$F$N(B
+$BB>$N%&%#%s%I%&$r>C$7$F!"(BEmacs $B$N2hLLA4BN$r@jM-$7$^$9!#$3$l$O%G%#%U%)%k%H(B
 $B$G(B @code{t} $B$G$9!#(B
 
-$B$3$NJQ?t$r(B @code{nil} $B$K@_Dj$9$k$N$O$=$l$J$j$KF0:n$7$^$9$,!"LdBj$b$"$j$^(B
-$B$9!#4m81$r3P8g$N>e$G;H$C$F$/$@$5$$!#(B
+$B$3$NJQ?t$r(B @code{nil} $B$K@_Dj$7$F$b$=$l$J$j$KF0:n$7$^$9$,!"LdBj$b$"$j$^(B
+$B$9!#4m81$r3P8g$N>e$G;H$C$F2<$5$$!#(B
 
 @vindex gnus-buffer-configuration
-@code{gnus-buffer-configuration} $B$O$=$l$>$l$N(B gnus $B$N%P%C%U%!$,$I$N$/$i(B
-$B$$$N6u4V$rM?$($i$l$k$Y$-$+$r8=$7$^$9!#$3$l$O$3$NJQ?t$NH4?h$G$9(B:
+@code{gnus-buffer-configuration} $B$O$=$l$>$l$N(B gnus $B$N%P%C%U%!!<$,$I$N$/(B
+$B$i$$$N6u4V$rM?$($i$l$k$Y$-$+$r8=$7$^$9!#$3$l$O$3$NJQ?t$NH4?h$G$9(B:
 
 @lisp
 ((group (vertical 1.0 (group 1.0 point)
@@ -20243,31 +21195,33 @@ gnus $B$ODL>o$[$H$s$I$N%P%C%U%!$G!"%]%$%s%H$r3F9T$N$"$i$+$8$a7h$a$i$l$?>l(B
                         (article 1.0))))
 @end lisp
 
-$B$3$l$OO"A[%j%9%H$G$9!#(B@dfn{$B%-!<(B} $B$O2?$i$+$NF0:n$dB>$N$b$N$rG$L?$9$k%7%s(B
-$B%\%k$G$9!#Nc$($P!"%0%k!<%W%P%C%U%!$rI=<($9$k$H$-$O!"%&%#%s%I%&@_Dj4X?t(B
-$B$O(B @code{group} $B$r%-!<$H$7$F;H$$$^$9!#;HMQ2DG=$JL>A0$N40A4$J0lMw$O2<$K5s(B
-$B$2$i$l$F$$$^$9!#(B
+$B$3$l$OO"A[%j%9%H$G$9!#!V%-!IU$1$k$?$a$N%7%s%\%k$G$9!#(B
+$BNc$($P!"%0%k!<%W%P%C%U%!!<$rI=<($9$k$H$-$O!"%&%#%s%I%&$r@_Dj$9$k$?$a$N4X(B
+$B?t$O(B @code{group} $B$r%-!<$H$7$F;H$$$^$9!#;HMQ2DG=$JL>A0$N40A4$J0lMw$O2<$K(B
+$B5s$2$i$l$F$$$^$9!#(B
 
-@dfn{$BCM(B} ($B$9$J$o$A!"(B@dfn{$BJ,3d(B}) $B$O$=$l$>$l$N%P%C%U%!$,$I$l$/$i$$$r@j$a$k(B
-$B$Y$-$+$r;XDj$7$^$9!#(B@code{article} $BJ,3d$rNc$K$l$N%P%C%U%!!<$,$I$l$/$i$$$N6u4V$r@j(B
+$B$a$k$Y$-$+$r;XDj$7$^$9!#(B@code{article} $B$NJ,3d$rNc$Ke$N(B 25% $B$r@j$a(B
-$B$k$Y$-$G!"$=$l$O5-;v%P%C%U%!(B (article buffer) $B$N>e$KG[CV$5$l$^$9!#$*5$$E(B
-$B$-$NDL$j!"(B100% + 25% $B$Oe$N(B 25% $B$r@j$a$k$Y$-$G!"$=$l$O5-;v(B
+$B%P%C%U%!!<$N>e$KG[CV$5$l$k$H8@$C$F$$$^$9!#$*5$$E$-$N$h$&$K!"(B
+100% + 25% $B$OJN,2DG=$J;0$DL\$NMWAG!"(B@code{point} $B$r;}$D%P%C%U%!$KCV$+$l$^(B
-$B$9!#(B@code{frame} $BJ,3d$G$O!"%?%0(B @code{frame-focus} $B$,9=@.MWAG$G$"$k(B ($B$9(B
-$B$J$o$A!"(B@code{point} $B%?%0$,B8:_$9$k$+$I$&$+$K$h$C$F!"%j%9%H$N;0HVL\$+;M(B
-$BHVL\$+$KB8:_$9$kMWAG(B) $BMUJ,3d$r;}$D:G8e$NI{J,3d$,>GE@$rF@$k;v$K$J$j$^$9!#(B
+$B%]%$%s%H(B ($B%+!<%=%k(B) $B$O>JN,2DG=$J;0$DL\$NMWAG!"(B@code{point} $B$r;}$D%P%C%U%!!<(B
+$B$KCV$+$l$^$9!#(B@code{frame} $BJ,3d$G$O!"(B@code{frame-focus} $B%?%0$,4^$^$l$F$$(B
+$B$k;^MU$NJ,3d$r;}$C$F$$$kI{J,3d$N!":G8e$N$b$N$N%U%l!<%`$,%U%)!<%+%9$rF@$k(B
+$B$3$H$K$J$j$^$9(B (@code{frame-focus} $B%?%0$O!"$=$l$r4^$s$G$$$k;^MU%j%9%H$K(B
+$B$*$$$F!"(B@code{point} $B%?%0$,L5$1$l$P;0HVL\$N!"$"$l$P;MHVL\$NMWAG$K$J$j$^(B
+$B$9!#(B
 
 $Bo$[$H$s$I$N%P%C%U%!$G!"%]%$%s%H$r3F9T$N$"$i$+$8$a7h$a$i$l$?>l(B
                        (article 1.0)))
 @end lisp
 
-$B$b$7Bg$-$5;XDj$,IbF0>.?tE@?t$NBe$o$j$K@0?t$G$"$C$?$J$i!"$=$l$O3d9g$G$O$J(B
-$B$/!"$I$N$/$i$$B?$/$N9T$r%P%C%U%!$,@j$a$k$Y$-$+$r;XDj$9$k$?$a$K;H$o$l$^$9!#(B
+$B$b$7Bg$-$5$N;XDj$,IbF0>.?tE@?t$NBe$o$j$K@0?t$@$C$?$J$i!"$=$l$O3d9g$G$O$J(B
+$B$/!"$I$N$/$i$$B?$/$N9T$r%P%C%U%!!<$,@j$a$k$Y$-$+$r;XDj$9$k$?$a$K;H$o$l$^(B
+$B$9!#(B
 
-$B$b$7(B @dfn{$BJ,3d(B} $B$,(B @code{$BI>2A(B} $B$5$l$k$b$N$N$h$&$K8+$($k$H$-$O(B ($BL@3N$K$9(B
-$B$k$H(B---$BJ,3d$N(B @code{car} $B$,4X?t$+86;O4X?t(B (subr) $B$G$"$k$H$-$O(B)$B!"$3$NJ,3d(B
-$B$O(B @code{$BI>2A(B} $B$5$l$^$9!#7k2L$,(B @code{nil} $B$G$J$$$J$i!"$=$l$OJ,3d$H$7$F(B
-$BMQ$$$i$l$^$9!#$3$l$O!"(B@code{gnus-carpal} $B$,(B @code{nil} $B$G$"$l$P;0$D$N%P%C(B
-$B%U%!$,!"(B@code{gnus-carpal} $B$,(B @code{nil} $B$G$J$$$J$i!";M$D$N%P%C%U%!$,B8(B
-$B:_$9$k$H$$$&;v$G$9!#(B
+$B$b$7!VJ,3d!W$,(B @code{eval} ($BI>2A(B) $B$5$l$k$b$N$N$h$&$K8+$($k$H$-$O(B ($B@53N$K(B
+$B8@$&$H(B---$BJ,3d$N(B @code{car} $B$,4X?t$+86;O4X?t(B (subr) $B$G$"$k$H$-$O(B)$B!"$3$NJ,(B
+$B3d$O(B @code{eval} $B$5$l$^$9!#7k2L$,(B @code{nil} $B$G$J$$$J$i!"$=$l$OJ,3d$H$7(B
+$B$FMQ$$$i$l$^$9!#$3$l$O!"(B@code{gnus-carpal} $B$,(B @code{nil} $B$G$"$l$P;0$D$N(B
+$B%P%C%U%!!<$,!"(B@code{gnus-carpal} $B$,(B @code{nil} $B$G$J$$$J$i!";M$D$N%P%C%U%!!<(B
+$B$,B8:_$9$k$3$H$K$J$k$H$$$&$3$H$G$9!#(B
 
-$B$^$@J#;($G$O$J$$$G$9$C$F(B? $B$=$l$G$O!"Bg$-$5$K$3$l$r;n$7$F$_$F2<$5$$(B:
+$B$^$@J#;($G$O$J$$$G$9$C$F(B? $B$=$l$G$O!"Bg$-$5$H$7$F$3$l$r;n$7$F$_$F2<$5$$(B:
 
 @lisp
 (article (horizontal 1.0
@@ -20301,20 +21256,20 @@ gnus $B$ODL>o$[$H$s$I$N%P%C%U%!$G!"%]%$%s%H$r3F9T$N$"$i$+$8$a7h$a$i$l$?>l(B
                  (article 1.0))))
 @end lisp
 
-$B$*$)$C$H!#Fs$D$N%P%C%U%!$KIT;W5D$J(B 100% $B%?%0$,IU$$$F$$$^$9!#$=$7$F!"$"(B
-$B$N(B @code{horizontal} $B$C$F$$$&$b$N$O2?$G$7$g$&(B?
+$B$*$)$C$H!#Fs$D$N%P%C%U%!!<$KFf$N(B 100% $B%?%0$,IU$$$F$$$^$9!#$=$7(B
+$B$F(B @code{horizontal} $B$C$F2?$G$7$g$&(B?
 
 $B$b$7J,3d$N0l$D$N:G=i$NMWAG$,(B @code{horizontal} $B$G$"$C$?$J$i!"(Bgnus $B$O%&%#(B
 $B%s%I%&$r?eJ?$KJ,3d$7!"Fs$D$N%&%#%s%I%&$r2#$KJB$Y$^$9!#$3$l$i$N$=$l$>$l$N(B
-$B>.JR$NCf$G$O!"A4$F$rIaDL$NN.57$G9T$&;v$,$G$-$^$9!#(B@code{horizontal} $B$N8e(B
-$B$N?t;z$O!"$3$N>.JR$K2hLL$N$I$l$/$i$$$N3d9g$,M?$($i$l$k$+$r;XDj$7$^$9!#(B
+$B>.JR$NCf$G$O!"$"$J$?$N$d$j$?$$$3$H$r$9$Y$FIaDL$NN.57$G9T$J$&$3$H$,$G$-$^(B
+$B$9!#(B@code{horizontal} $B$N8e$N?tCM$O!"$3$N>.JR$K2hLL$N$I$l$/$i$$$N3d9g$,M?(B
+$B$($i$l$k$+$r;XDj$7$^$9!#(B
 
 $B$=$l$>$l$NJ,3d$G$O!"(B100% $B$N%?%0$r;}$DMWAG$,(B @emph{$BI,$:(B} $B0l$D$"$kI,MW$,$"(B
-$B$j$^$9!#J,3d$O7h$7$F@53N$K$O9T$o$l$^$;$s$N$G!"$3$N%P%C%U%!$,J,3d$+$i;D$5(B
-$B$l$?A4$F$N9T$r@jNN$7$^$9!#(B
+$B$j$^$9!#J,3d$O7h$7$F@53N$G$O$J$$$N$G!"J,3d$K$h$C$FM>$C$?$9$Y$F$N9T$r!"$3(B
+$B$N%P%C%U%!!<$,J,Ja$j$^$9!#(B
 
-$B$b$&>/$7@5<0$K$9$k$?$a$K!"$3$3$KM-8z$JJ,3d$,$I$N$h$&$K$J$k$+$NDj5A$,$"$j(B
-$B$^$9(B:
+$B$b$&>/$77A<0E*$K!"M-8z$JJ,3d$,$I$N$h$&$K$J$k$+$NDj5A$r5s$2$F$*$-$^$7$g$&(B:
 
 @example
 split      = frame | horizontal | vertical | buffer | form
@@ -20326,37 +21281,37 @@ size       = number | frame-params
 buf-name   = group | article | summary ...
 @end example
 
-$B@)8B$K$O!"(B@code{frame} $B$O:G>e0L$NJ,3d$H$7$F$7$+8=$l$k;v$,$G$-$J$$$H$$$&(B
-$B$b$N$,$"$j$^$9!#(B@var{form} $B$OM-8z$JJ,3d$rJV$9(B Emacs Lisp $B$N<0(B (form) $B$G(B
-$B$J$1$l$P$J$j$^$;$s!#$=$l$>$l$NJ,3d$O40A4$K:F5"E*$G!"G$0U$N?t(B
-$B$N(B @code{vertical} $B$H(B @code{horizontal} $BJ,3d$r4^$`;v$,$G$-$^$9!#(B
+$B@)8B$H$7$F!"(B@code{frame} $B$O:G$b>e0L3,AX$NJ,3d$H$7$F$7$+8=$l$k$3$H$,$G$-(B
+$B$J$$$H$$$&$b$N$,$"$j$^$9!#(B@code{form} $B$OM-8z$JJ,3d$rJV$9(B Emacs Lisp $B$N(B
+$B<0(B (form) $B$G$J$1$l$P$J$j$^$;$s!#$=$l$>$l$NJ,3d$O40A4$K:F5"E*$G!"G$0U$N?t(B
+$B$N(B @code{vertical} $B$H(B @code{horizontal} $BJ,3d$r4^$`$3$H$,$G$-$^$9!#(B
 
 @vindex gnus-window-min-width
 @vindex gnus-window-min-height
 @cindex window height
 @cindex window width
-$B@5$7$$Bg$-$5$r8+$D$1$k$N$O>/$7J#;($G$9!#$I$N%&%#%s%I%&(B
-$B$b(B @code{gnus-window-min-height} ($B=i4|CM(B 1) $B$NJ8;z$N9b$5$h$j$b>.$5$/$F$O(B
-$B$J$i$:!">/$J$/$H$b(B @code{gnus-window-min-width} ($B=i4|CM(B 1) $B$NJ8;zI}$G$J(B
-$B$/$F$O$J$j$^$;$s!#(BGnus $B$OJ,3d$rE,MQ$9$kA0$K$3$l$r6/@)$7$h$&$H;n$_$^$9!#(B
-$B$b$7IaDL$N(B Emacs $B$N%&%#%s%I%&$NI}(B/$B9b$5@)8B$r;H$$$?$$$J$i!"$3$NFs$D$NJQ?t(B
-$B$r(B @code{nil} $B$K$9$k$@$1$GNI$$$G$9!#(B
-
-$B$b$7(B Emacs $B$NMQ8l$K$J$8$s$G$$$J$$$N$J$i!"(B
-@code{horizontal} $B$H(B @code{vertical} $BJ,3d$O!"4|BT$9$k$b$N$HH?BP$NF0:n$r(B
-$B$9$k$G$7$g$&!#(B@code{horizontal} $BJ,3d$NCf$N%&%#%s%I%&$O2#$KJB$s$GI=<($5$l!"(B
-@code{vertical} $BJ,3d$NCf$N%&%#%s%I%&$O>e2<$KI=<($5$l$^$9!#(B
+$B@5$7$$Bg$-$5$r8+$D$1$k$3$H$O!">/$7J#;($K$J$j$^$9!#$I$N%&%#%s%I%&(B
+$B$b(B @code{gnus-window-min-height} ($B%G%#%U%)%k%H$O(B 1) $B$NJ8;z$N9b$5$h$j$b>.(B
+$B$5$/$F$O$J$i$J$$$7!">/$J$/$H$b(B @code{gnus-window-min-width} ($B%G%#%U%)%k(B
+$B%H$O(B 1) $B$NJ8;zI}$G$J$/$F$O$J$j$^$;$s!#(Bgnus $B$OJ,3d$rE,MQ$9$kA0$K$3$l$r6/(B
+$B@)$7$h$&$H;n$_$^$9!#$b$7I8=`$N(B Emacs $B$N%&%#%s%I%&$NI}(B/$B9b$5@)8B$r;H$$$?$$(B
+$B$J$i!"$3$NFs$D$NJQ?t$r(B @code{nil} $B$K$9$k$@$1$GNI$$$G$9!#(B
+
+Emacs $B$NMQ8l$K$J$8$s$G$$$J$$$N$J$i!"(B
+@code{horizontal} $B$H(B @code{vertical} $B$NJ,3d$O!"4|BT$7$?$b$N$HH?BP$NF0:n(B
+$B$r$9$k$G$7$g$&!#(B@code{horizontal} $BJ,3d$NCf$N%&%#%s%I%&$O2#$KJB$s$GI=<($5(B
+$B$l!"(B@code{vertical} $BJ,3d$NCf$N%&%#%s%I%&$O>e2<$KI=<($5$l$^$9!#(B
 
 @findex gnus-configure-frame
-$B%&%#%s%I%&$N@_CV$K4X$7$F(B
-$B@\(B @code{gnus-configure-frame} $B$r8F$V$3$H$G$9!#$3$l$O%P%C%U%!$rJ,3d$9$k(B
-$B$H$-$KA4$F$NK\Ev$N;E;v$r$9$k4X?t$G$9!#2<$N$b$N$O(B 5 $B%&%#%s%I%&$N$H$F$b$P(B
-$B$+$2$?@_Dj$G$9!#Fs$D$r%0%k!<%W%P%C%U%!$K!";0$D$r5-;v%P%C%U%!$N$?$a$K=<$F(B
-$B$^$9!#(B($B$=$l$O$P$+$2$F$$$k$H8@$C$?$G$7$g!#(B) $B$b$72<$NJ8$r(B @code{$BI>2A(B} $B$9$k(B
-$B$H!"IaDL$N(B gnus $B$N7PO)$r;H$o$J$$$G!"$9$0$K$=$l$,$I$N$h$&$K8+$($k$+$N9M$((B
-$B$rF@$k;v$,$G$-$^$9!#K~B-$9$k$^$G$=$l$GM7$s$G!"$=$l$+(B
-$B$i(B @code{gnus-add-configuration} $B$r;H$C$F?7$7$$A[A|$r%P%C%U%!@_Dj%j%9%H(B
-$B$K2C$($F2<$5$$!#(B
+$B%&%#%s%I%&$NG[CV$K4X$7$F@\(B @code{gnus-configure-frame} $B$r8F$V$3$H$G$9!#$3$l$O%P%C%U%!!<(B
+$B$rJ,3d$9$k$H$-$K$9$Y$F$N2A(B} $B$9$k$H!"IaDL$N(B gnus $B$N7PO)$r;H$o$J$$$G!"$9$0$K$=$l(B
+$B$,$I$N$h$&$K8+$($k$+$ND>4Q$rF@$k$3$H$,$G$-$^$9!#K~B-$9$k$^$G$=$l$GM7$s$G!"(B
+$B$=$l$+$i(B @code{gnus-add-configuration} $B$r;H$C$F?7$7$$:nIJ$r%P%C%U%!!.$5$JDI2C$N%U%l!<%`$,(B picon $B$rI=<($9$k$?$a$K:n$i$l$k(B
-$B$H$$$&;v$K$J$j$^$9!#$4Mw$NDL$j!"IaDL$N(B @code{1.0} $B:G>e0L;XDj$NBe$o$j$K!"(B
-$B$=$l$>$l$NDI2C$NJ,3d$,%U%l!<%`%Q%i%a!<%?O"A[%j%9%H$rBg$-$5;XDj$H$7$F;}$?(B
-$B$J$1$l$P$J$j$^$;$s(B (@pxref{Frame Parameters, , Frame Parameters, elisp,
-The GNU Emacs Lisp Reference Manual})$B!#(BXEmacs $B$G$O!"%U%l!<%`%W%m%Q%F%#%j(B
-$B%9%H$b;H$($^$9(B---$BNc$($P!"(B@code{(height 5 width 15 left -1 top 1)} $B$O$=$N(B
-$B$h$&$J%Q%i%a!<%?%j%9%H$G$9!#(B
-@code{gnus-buffer-configuration} $B$K;HMQ2DG=$JA4$F$N%-!<$N0lMw$O$=$N=i4|(B
-$BCM$G8+$D$1$k$3$H$,$G$-$^$9!#(B
+$B$3$NJ,3d$N7k2L$O!":G=i$N(B ($B$b$7$/$O!V.$5$JDI2C$N%U%l!<%`$,(B picon $B$rI=<($9$k$?$a$K:n$i(B
+$B$l$^$9!#$4Mw$NDL$j!"IaDL$N:G>e0L3,AX$N(B @code{1.0} $B$NDj$NBe$o$j$K!"$=$l$>(B
+$B$l$NDI2C$NJ,3d$,Bg$-$5$N;XDj$H$7$F!"%U%l!<%`%Q%i%a!<%?!<$NO"A[%j%9%H$r;}(B
+$B$?$J$1$l$P$J$j$^$;$s(B (@pxref{Frame Parameters, ,Frame Parameters, elisp,
+The GNU Emacs Lisp Reference Manual})$B!#(BXEmacs $B$G$O!"%U%l!<%`%W%m%Q%F%#!<(B
+$B%j%9%H$b;H$($^$9(B---$BNc$($P(B @code{(height 5 width 15 left -1 top 1)} $B$,$=(B
+$B$N$h$&$J(B plist $B$G$9!#(B@code{gnus-buffer-configuration} $B$G;H$&$3$H$,$G$-$k(B
+$B$9$Y$F$N%-!<$N0lMw$O!"$=$N%G%#%U%)%k%HCM$G8+$D$1$k$3$H$,$G$-$^$9!#(B
 
 $B%-!<(B @code{message} $B$O(B @code{gnus-group-mail} $B$*$h(B
-$B$S(B @code{gnus-summary-mail-other-window} $B$NN>J}$G;H$o$l$k;v$KCm0U$7$F2<(B
-$B$5$$!#$b$7Fs$D$r6hJL$9$k$[$&$,K>$^$7$$$J$i!"$3$N$h$&$JJ*$r;H$&;v$,$G$-$^(B
-$B$9(B:
+$B$S(B @code{gnus-summary-mail-other-window} $B$NN>J}$G;H$o$l$k$3$H$KCm0U$7$F(B
+$B2<$5$$!#$b$7Fs$D$r6hJL$9$k$[$&$,K>$^$7$$$J$i!"$3$N$h$&$JJ*$r;H$&$3$H$,$G(B
+$B$-$^$9(B:
 
 @lisp
 (message (horizontal 1.0
@@ -20412,9 +21365,9 @@ The GNU Emacs Lisp Reference Manual})$B!#(BXEmacs $B$G$O!"%U%l!<%`%W%m%Q%F%#%
                                (group 1.0))))
 @end lisp
 
-$BJ#?t$N%U%l!<%`$X$NNI$/$"$kMWK>$O!"%a!<%k$H%K%e!<%9$N:n@.$K$OJL$N%U%l!<%`(B
-$B$r;H$$!"85$N%U%l!<%`$O$=$N$^$^$K;D$9$H$$$&$b$N$G$9!#$3$l$NC#@.$K$O!"0J2<(B
-$B$N$h$&$J$b$N$G$G$-$^$9!#(B
+$BNI$/$"$kJ#?t$N%U%l!<%`J,3d$NMWK>$O!"%a!<%k$H%K%e!<%9$N:n@.$K$OJL$N%U%l!<(B
+$B%`$r;H$$!"85$N%U%l!<%`$O$=$N$^$^$K;D$9$H$$$&$b$N$G$9!#$3$l$NC#@.$K$O!"0J(B
+$B2<$N$h$&$J$b$N$G$G$-$^$9!#(B
 
 @lisp
 (message
@@ -20427,11 +21380,14 @@ The GNU Emacs Lisp Reference Manual})$B!#(BXEmacs $B$G$O!"%U%l!<%`%W%m%Q%F%#%
                    (message 1.0 point))))
 @end lisp
 
+$BLuCm(B: $B$3$l$r9bEY$KH/E8$5$;$?$b$N(B
+$B$,(B @uref{http://www.jpl.org/elips/message-multiple-frames.el.gz} $B$H$7$F(B
+$BF~o$K(B ``$B@5$7$$(B'' $B%&%#%s%I%&@_Dj$r6/@)(B
-$B$7$?$$$N$G$"$l$P!"(B
+$B$b$7J,3d$N@_Dj$G;XDj$5$l$?$9$Y$F$N%&%#%s%I%&$,$9$G$K8+$($F$$$k$N$G$"$l$P!"(B
+gnus $B$O%&%#%s%I%&$NG[CV$rJQ99$7$^$;$s!#>o$K!V@5$7$$!W%&%#%s%I%&@_Dj$r6/(B
+$B@)$7$?$$$N$G$"$l$P!"(B
 @code{gnus-always-force-window-configuration} $B$r(B @code{nil} $B$G$J$$CM$K@_(B
-$BDj$9$k;v$,$G$-$^$9!#(B
+$BDj$7$F2<$5$$!#(B
 
-$BLZI=<($r;H$C$F$$$F(B (@pxref{Tree Display})$B!"LZ%&%#%s%I%&$O?bD>J}8~$KJL$N(B
-$B%&%#%s%I%&$GI=<($5$l$k$J$i!"%&%#%s%I%&$NBg$-$5$,JQ99$5$l$k$3$H$rHr$1$k$?(B
-$B$a$K(B @code{gnus-tree-minimize-window} $B$r$$$8$k$N$,NI$$$G$7$g$&!#(B
+$BLZI=<((B (@pxref{Tree Display}) $B$r;H$C$F$$$F!"LZ%&%#%s%I%&$,?bD>J}8~$Ke(B 1/6) $B$H(B
-$B5-;v%P%C%U%!(B ($B2<(B) $B$K!#(B
+$B:8B&$r69$a$F%0%k!<%W%P%C%U%!!<$K!#1&B&$rJ,3d$7$F35N,%P%C(B
+$B%U%!!<(B ($B>e(B 1/6) $B$H5-;v%P%C%U%!!<(B ($B2<(B) $B$K!#(B
 
 @ifinfo
 @example
@@ -20493,14 +21449,15 @@ The GNU Emacs Lisp Reference Manual})$B!#(BXEmacs $B$G$O!"%U%l!<%`%W%m%Q%F%#%
 @end itemize
 
 @node Faces and Fonts
-@section $B%U%'%$%9$H%U%)%s%H(B
+@section $B%U%'!<%9$H%U%)%s%H(B
 @cindex faces
 @cindex fonts
 @cindex colors
 
-$B%U%)%s%H$H%U%'%$%9$rO.$k$N$OHs>o$KFq$7$+$C$?$N$G$9$,!":#F|$G$OHs>o$K4JC1(B
-$B$G$9!#C1$K(B @kbd{M-x customize-face} $B$H$d$C$F!"JQ$($?$$%U%'%$%9$rA*$S=P$7(B
-$B$F!"I8=`$N%+%9%?%^%$%:%$%s%?!<%U%'!<%9$r;H$C$FJQ99$9$k;v$,$G$-$^$9!#(B
+$B$+$D$F%U%)%s%H$H%U%'!<%9$r$$$8$/$k$N$OHs>o$KFq$7$+$C$?$N$G$9$,!":#F|$G$O(B
+$BHs>o$K4JC1$G$9!#C1$K(B @kbd{M-x customize-face} $B$H$d$C$F!"JQ$($?$$%U%'!<%9(B
+$B$rA*$S=P$7$F!"I8=`$N%+%9%?%^%$%:%$%s%?!<%U%'!<%9$r;H$C$FJQ99$9$k$3$H$,$G(B
+$B$-$^$9!#(B
 
 @node Compilation
 @section $B%3%s%Q%$%k(B
@@ -20508,27 +21465,31 @@ The GNU Emacs Lisp Reference Manual})$B!#(BXEmacs $B$G$O!"%U%l!<%`%W%m%Q%F%#%
 @cindex byte-compilation
 
 @findex gnus-compile
-
 $B$"$N9T=qK!;EMM;XDjJQ?t$r3P$($F$$$^$9(B
 $B$+(B? @code{gnus-summary-line-format}, @code{gnus-group-line-format} $B$J$I(B
 $B$J$I$G$9!#DL>o(B T-gnus $B$O$3$l$i$NJQ?t$r%P%$%H%3%s%Q%$%k$7$F;H$&$N$G!"B.EY(B
 $BDc2<$O:G>.8B$K?)$$;_$a$i$l$^$9!#$7$+(B
-$B$7(B @code{gnus-compile-user-specs} $B$r(B @code{nil} ($B=i4|CM$O(B @code{t}) $B$K$7(B
-$B$?>l9g$O!"IT1?$J;v$K$=$l$i$rJQ99$9$k$HBgJQ=EBg$JB.EYDc2<$r0z$-5/$3$9;v$K(B
-$B$J$j$^$9!#(B($B$3$l$i$NJQ?t$N=i4|CM$O$=$l$i$K4XO"IU$1$i$l$?%P%$%H%3%s%Q%$%k(B
-$B$5$l$?4X?t$r;}$C$F$$$^$9$,!"MxMQl9g$O!";DG0$J$,$i$=$l$i$rJQ99$9$k$HBgJQ=EBg$JB.EYDc(B
+$B2<$r0z$-5/$3$9$3$H$K$J$j$^$9!#(B($B$3$l$i$NJQ?t$N%G%#%U%)%k%HCM$O!"$=$l$i$K(B
+$B4XO"IU$1$i$l$?%P%$%H%3%s%Q%$%k$5$l$?4X?t$r;}$C$F$$$^$9$,!"MxMQo$K:G?7$N(B
-$B$b$N$K$7$F$*$/$+$r;XDj$7$^$9!#$=$l$O%7%s%\%k$N%j%9%H$G$9!#;H$&;v$N$G$-$k(B
-$B%7%s%\%k$O(B @code{group}, @code{article}, @code{summary}, @code{server},
-@code{browse}, @code{tree} $B$J$I$G$9!#$b$7BP1~$9$k%7%s%\%k$,B8:_$9$k$H!"(B
-gnus $B$O3:Ev$9$k$G$"$m$&>pJs$G%b!<%I9T$r99?7$7$^$9!#$3$NJQ?t(B
-$B$,(B @code{nil} $B$G$"$k$J$i!"2hLL$N:FIA2h$O$b$C$HB.$$$G$7$g$&!#(B
+@vindex gnus-updated-mode-lines
+@code{gnus-updated-mode-lines} $B$O$I$N%P%C%U%!!<$,$=$l$i$N%b!<%I9T$r>o$K(B
+$B:G?7$N$b$N$K$7$F$*$/$+$r;XDj$7$^$9!#$=$l$O%7%s%\%k$N%j%9%H$G$9!#;H$&$3$H(B
+$B$N$G$-$k%7%s%\%k$O(B @code{group}, @code{article}, @code{summary},
+@code{server}, @code{browse}, @code{tree} $B$J$I$G$9!#$b$7BP1~$9$k%7%s%\%k(B
+$B$,B8:_$9$k$H!"(Bgnus $B$O3:Ev$9$k>pJs$G%b!<%I9T$r99?7$7$^$9!#$3$NJQ?t(B
+$B$,(B @code{nil} $B$J$i$P!"2hLL$N:FIA2h$O$b$C$HB.$$$G$7$g$&!#(B
 
 @cindex display-time
-
 @vindex gnus-mode-non-string-length
-$B=i4|@_Dj$G$O!"(Bgnus $B$O35N,%P%C%U%!$H5-;v%P%C%U%!$N%b!<%I9T$K8=:_$N5-;v$N(B
-$B>pJs$rI=<($7$^$9!#(BGnus $B$,I=<($7$?$$>pJs(B ($BNc$($P!"5-;v$NI=Bj(B) $B$O$7$P$7$P(B
-$B%b!<%I9T$h$j$bD9$$$3$H$,$"$k$N$G!"$I$3$+$G@Z$jMn$H$5$l$J$1$l$P$J$j$^$;$s!#(B
-$BJQ?t(B @code{gnus-mode-non-string-length} $B$O$=$N9T$NB>$NMWAG(B ($B$9$J$o$A!">p(B
-$BJs$G$J$$ItJ,(B) $B$,$I$N$/$i$$$ND9$5$G$"$k$+$r;XDj$7$^$9!#$b$7%b!<%I9T$KDI2C(B
-$B$NMWAG$rF~$l$?$J$i!"$3$NJQ?t$r=$@5$9$kI,MW$,$"$j$^$9(B:
+$B%G%#%U%)%k%H$G$O!"(Bgnus $B$O35N,%P%C%U%!!<$H5-;v%P%C%U%!!<$N%b!<%I9T$K8=:_(B
+$B$N5-;v$N>pJs$rI=<($7$^$9!#(Bgnus $B$,I=<($7$?$$>pJs(B ($BNc$($P5-;v$NI=Bj(B) $B$O$7(B
+$B$P$7$P%b!<%I9T$h$j$bD9$$$3$H$,$"$k$N$G!"$I$3$+$G@Z$jMn$H$5$l$J$1$l$P$J$j(B
+$B$^$;$s!#JQ?t(B @code{gnus-mode-non-string-length} $B$O$=$N9T$NB>$NMWAG(B ($B$9$J(B
+$B$o$A>pJs$G$J$$ItJ,(B) $B$,$I$N$/$i$$$ND9$5$G$"$k$+$r;XDj$7$^$9!#$b$7%b!<%I9T(B
+$B$KDI2C$NMWAG$rF~$l$?$J$i!"$3$NJQ?t$r=$@5$9$kI,MW$,$"$j$^$9(B:
 
 @c Hook written by Francesco Potorti` 
 @lisp
@@ -20564,11 +21524,11 @@ gnus $B$O3:Ev$9$k$G$"$m$&>pJs$G%b!<%I9T$r99?7$7$^$9!#$3$NJQ?t(B
                               (length display-time-string)))))
 @end lisp
 
-$B$b$7$3$NJQ?t$,(B @code{nil} $B$G$"$k$J$i(B ($B$3$l$,=i4|CM$G$9$,(B)$B!"%b!<%I9T$O@Z(B
-$B$jMn$H$5$l$:!"5M$a9~$_$b$5$l$^$;$s!#=i4|@_Dj$O!"%P%C%U%!$N40A4$J%Q!<%;%s(B
-$B%HI=<($5$($b%b!<%I9T$+$iDI$$$d$i$l$k2DG=@-$b$"$j$^$9$N$G!"$*$=$i$/K>$^$7(B
-$B$$@_Dj$G$O$J$$$H$$$&;v$KCm0U$7$F2<$5$$!#MxMQ$^$7$$@_Dj$G$O$J$$$3$H$KCm0U$7$F2<$5$$!#MxMQpJs$G%b!<%I9T$r99?7$7$^$9!#$3$NJQ?t(B
 @cindex menus
 
 @vindex gnus-visual
-$BJQ?t(B @code{gnus-visual} $B$O$?$$$F$$$N(B gnus $B$rAGE($K$9$kItJ,$NA`:n$r$7$^$9!#(B
+$BJQ?t(B @code{gnus-visual} $B$O(B gnus $B$rAGE($K$9$k$?$$$F$$$NJ}LL$NA`:n$r$7$^$9!#(B
 @code{nil} $B$G$"$k$H!"(Bgnus $B$O%a%K%e!<$r:n$C$?$j!"AGE($J?'$d%U%)%s%H$r;H$C(B
-$B$?$j$7$h$&$H$7$^$;$s!#$3$l$O%U%!%$%k(B @file{gnus-vis.el} $B$rFI$_9~$`;v$b6X(B
-$B;_$7$^$9!#(B
+$B$?$j$7$h$&$H$7$^$;$s!#$3$l$O$5$i$K(B @file{gnus-vis.el} $B%U%!%$%k$rFI$_9~$`(B
+$B$3$H$b6X;_$7$^$9!#(B
 
-$B$3$NJQ?t$O;HMQ2DG=$J;k3PE*%W%m%Q%F%#$N%j%9%H$G$"$k;v$,$G$-$^$9!#0J2<$NMW(B
-$BAG$OM-8z$G!"=i4|@_Dj$G$9$Y$F4^$^$l$F$$$^$9(B:
+$B$3$NJQ?t$OM-8z$K$5$l$F$$$k;k3PE*$J%W%m%Q%F%#!<$N%j%9%H$G$"$k$3$H$,$G$-$^(B
+$B$9!#0J2<$NMWAG$OM-8z$G!"%G%#%U%)%k%H$G$9$Y$F4^$^$l$F$$$^$9(B:
 
 @table @code
 @item group-highlight
-$B%0%k!<%W%P%C%U%!$G%O%$%i%$%H$r$7$^$9!#(B
+$B%0%k!<%W%P%C%U%!!<$G%O%$%i%$%H(B ($B6/D4I=<((B) $B$r$7$^$9!#(B
 @item summary-highlight
-$B35N,%P%C%U%!$G%O%$%i%$%H$r$7$^$9!#(B
+$B35N,%P%C%U%!!<$G%O%$%i%$%H$r$7$^$9!#(B
 @item article-highlight
-$B5-;v%P%C%U%!$G%O%$%i%$%H$r$7$^$9!#(B
+$B5-;v%P%C%U%!!<$G%O%$%i%$%H$r$7$^$9!#(B
 @item highlight
-$BA4$F$N%P%C%U%!$G%O%$%i%$%H$r$9$k$h$&$K$7$^$9!#(B
+$B$9$Y$F$N%P%C%U%!!<$G%O%$%i%$%H$r$9$k$h$&$K$7$^$9!#(B
 @item group-menu
-$B%0%k!<%W%P%C%U%!$G%a%K%e!<$r:n@.$7$^$9!#(B
+$B%0%k!<%W%P%C%U%!!<$G%a%K%e!<$r:n@.$7$^$9!#(B
 @item summary-menu
-$B35N,%P%C%U%!$G%a%K%e!<$r:n@.$7$^$9!#(B
+$B35N,%P%C%U%!!<$G%a%K%e!<$r:n@.$7$^$9!#(B
 @item article-menu
-$B5-;v%P%C%U%!$G%a%K%e!<$r:n@.$7$^$9!#(B
+$B5-;v%P%C%U%!!<$G%a%K%e!<$r:n@.$7$^$9!#(B
 @item browse-menu
-$B%V%i%&%:%P%C%U%!$G%a%K%e!<$r:n@.$7$^$9!#(B
+$B%V%i%&%:%P%C%U%!!<$G%a%K%e!<$r:n@.$7$^$9!#(B
 @item server-menu
-$B%5!<%P!<%P%C%U%!$G%a%K%e!<$r:n@.$7$^$9!#(B
+$B%5!<%P!<%P%C%U%!!<$G%a%K%e!<$r:n@.$7$^$9!#(B
 @item score-menu
-$B%9%3%"%P%C%U%!$G%a%K%e!<$r:n@.$7$^$9!#(B
+$B%9%3%"%P%C%U%!!<$G%a%K%e!<$r:n@.$7$^$9!#(B
 @item menu
-$BA4$F$N%P%C%U%!$G%a%K%e!<$r:n@.$7$^$9!#(B
+$B$9$Y$F$N%P%C%U%!!<$G%a%K%e!<$r:n@.$7$^$9!#(B
 @end table
 
-$B$G$9$+$i!"5-;v%P%C%U%!$@$1$r%O%$%i%$%H$7$?$/!"A4$F$N%P%C%U%!$G%a%K%e!<$r(B
-$B:n$j$?$$>l9g$O!"$3$N$h$&$K$9$k;v$,$G$-$^$9(B:
+$B$G$9$+$i!"5-;v%P%C%U%!!<$@$1$r%O%$%i%$%H$7$?$/$F!"$9$Y$F$N%P%C%U%!!<$G%a(B
+$B%K%e!<$r:n$j$?$$>l9g$O!"$3$N$h$&$K$9$k$3$H$,$G$-$^$9(B:
 
 @lisp
 (setq gnus-visual '(article-highlight menu))
@@ -20623,45 +21583,45 @@ gnus $B$O3:Ev$9$k$G$"$m$&>pJs$G%b!<%I9T$r99?7$7$^$9!#$3$NJQ?t(B
 (setq gnus-visual '(highlight))
 @end lisp
 
-@code{gnus-visual} $B$,(B @code{t} $B$G$"$k$H!"%O%$%i%$%H$H%a%K%e!<$OA4$F(B
-$B$N(B gnus $B$N%P%C%U%!$G;HMQ$5$l$^$9!#(B
+@code{gnus-visual} $B$,(B @code{t} $B$G$"$k$H!"%O%$%i%$%H$H%a%K%e!<$O$9$Y$F(B
+$B$N(B gnus $B$N%P%C%U%!!<$G;HMQ$5$l$^$9!#(B
 
-$BB>$NA4$F$N%P%C%U%!$N308+$K1F6A$9$kAm9gE*$JJQ?t$O(B:
+$BB>$N$9$Y$F$N%P%C%U%!!<$N308+$K1F6A$9$kAm9gE*$JJQ?t$O(B:
 
 @table @code
 @item gnus-mouse-face
 @vindex gnus-mouse-face
-$B$3$l$O(B gnus $B$G%^%&%9$N%O%$%i%$%H$K;H$o$l$k%U%'%$%9(B ($B$9$J$o$A!"%U%)%s(B
-$B%H(B) $B$G$9!#(B@code{gnus-visual} $B$,(B @code{nil} $B$G$"$k$H!"%^%&%9%O%$%i%$%H$O(B
-$B$J$5$l$^$;$s!#(B
+$B$3$l$O(B gnus $B$G%^%&%9$N%O%$%i%$%H$K;H$o$l$k%U%'!<%9(B ($B$9$J$o$A%U%)%s%H(B) $B$G(B
+$B$9!#(B@code{gnus-visual} $B$,(B @code{nil} $B$G$"$k$H!"%^%&%9%O%$%i%$%H$O$J$5$l(B
+$B$^$;$s!#(B
 @end table
 
-$BA4$/0c$C$?%a%K%e!<$r:n@.$9$k$?$a$K4XO"$9$k%U%C%/$,$"$j$^$9(B:
+$B$^$C$?$/0c$C$?%a%K%e!<$r:n@.$9$k$?$a$K!"4XO"$9$k%U%C%/$,$"$j$^$9(B:
 
 @table @code
 @item gnus-article-menu-hook
 @vindex gnus-article-menu-hook
-$B5-;v%b!<%I(B (article mode) $B%a%K%e!<$r:n@.$7$?8e$K8F$P$l$k%U%C%/$G$9!#(B
+$B5-;v%b!<%I(B (article mode) $B$N%a%K%e!<$r:n@.$7$?8e$K8F$P$l$k%U%C%/$G$9!#(B
 
 @item gnus-group-menu-hook
 @vindex gnus-group-menu-hook
-$B%0%k!<%W%b!<%I(B (group mode) $B%a%K%e!<$r:n@.$7$?8e$K8F$P$l$k%U%C%/$G$9!#(B
+$B%0%k!<%W%b!<%I(B (group mode) $B$N%a%K%e!<$r:n@.$7$?8e$K8F$P$l$k%U%C%/$G$9!#(B
 
 @item gnus-summary-menu-hook
 @vindex gnus-summary-menu-hook
-$B35N,%b!<%I(B (summary mode) $B%a%K%e!<$r:n@.$7$?8e$K8F$P$l$k%U%C%/$G$9!#(B
+$B35N,%b!<%I(B (summary mode) $B$N%a%K%e!<$r:n@.$7$?8e$K8F$P$l$k%U%C%/$G$9!#(B
 
 @item gnus-server-menu-hook
 @vindex gnus-server-menu-hook
-$B%5!<%P!<%b!<%I(B (server mode) $B%a%K%e!<$r:n@.$7$?8e$K8F$P$l$k%U%C%/$G$9!#(B
+$B%5!<%P!<%b!<%I(B (server mode) $B$N%a%K%e!<$r:n@.$7$?8e$K8F$P$l$k%U%C%/$G$9!#(B
 
 @item gnus-browse-menu-hook
 @vindex gnus-browse-menu-hook
-$B354Q%b!<%I(B (browse mode) $B%a%K%e!<$r:n@.$7$?8e$K8F$P$l$k%U%C%/$G$9!#(B
+$B354Q%b!<%I(B (browse mode) $B$N%a%K%e!<$r:n@.$7$?8e$K8F$P$l$k%U%C%/$G$9!#(B
 
 @item gnus-score-menu-hook
 @vindex gnus-score-menu-hook
-$B%9%3%"%b!<%I(B (score mode) $B%a%K%e!<$r:n@.$7$?8e$K8F$P$l$k%U%C%/$G$9!#(B
+$B%9%3%"%b!<%I(B (score mode) $B$N%a%K%e!<$r:n@.$7$?8e$K8F$P$l$k%U%C%/$G$9!#(B
 @end table
 
 @node Buttons
@@ -20670,109 +21630,111 @@ gnus $B$O3:Ev$9$k$G$"$m$&>pJs$G%b!<%I9T$r99?7$7$^$9!#$3$NJQ?t(B
 @cindex mouse
 @cindex click
 
-$B:G6a$G$O!":G?7N.9T$N%^%&%9(B @dfn{mouse} $BAuCV$,!"$A$c$s$H$7$?A`:nK!$r3X$S(B
-$B$?$,$i$J$$%J%&$J%d%s%0$N4V$GBg?M5$$G$9!#$=$l$G$O!";d$,(B Tops 20 $B%7%9%F%`(B
-$B>e$G(B Emacs $B$r;H$C$F$$$?:"$N(B '89 $BG/$N2F$r;W$$5/$3$7$F$_$^$7$g$&!#(B300 $B?M$N(B
-$BMxMQe$G!"$_$s$J$,(B Simula $B%3%s%Q%$%i$rAv$i$;$F$$$^$7$?!#(B
-$B$"$"!"$P$+$P$+$7$$(B!
+$B:G?7N.9T$N%^%&%9(B @dfn{mouse} $BAuCV$,!"6a$4$m$G$O$A$c$s$H$7$?A`:nK!$r3X$S(B
+$B$?$,$i$J$$e$G(B Emacs $B$r;H$C$F$$$?:"$N!"(B'89 $BG/$N2F$r;W$$5/$3$7$F$_$^$7$g(B
+$B$&!#(B300 $B?M$NMxMQe$G!"$_$s$J$,(B Simula $B%3%s%Q%$%i$rAv$i(B
+$B$;$F$$$^$7$?!#$"$"!"$P$+$P$+$7$$(B!
 
-$B$[$s$H$K$=$&$@$M!#(B
+$B$[$s$H$&$K!#(B
 
 @vindex gnus-carpal
-$B$^$:$G$9$M!"(B@code{gnus-carpal} $B$r(B @code{t} $B$K@_Dj$9$k$3$H$K$h$C$F!"%/%j%C(B
-$B%/$9$k$@$1$G2?$G$b$G$-$k%\%?%s$@$i$1$N%P%C%U%!$r(B gnus $B$KI=<($5$;$k$3$H$,(B
-$B$G$-$^$9!#$H$C$F$b4JC1$G$9!"$[$s$H$K!#;X05NEK!$N@h@8$K65$($F$"$2$F!#(B($BLu(B
-$BCm(B: carpal $B$H$O$K$b2?$+$=$&$$$C(B
-$B$?$3$H$G$9!#(B
+gnus$B!"$=$l$O(B ($B8@$$EA$($K$h$l$P(B) $B$+$D$F=q$+$l$?$$$+$J$k%W%m%0%i%`$h$j$bBg(B
+$B$-$/!"$"$J$?$,$d$C$FM_$7$$$H;W$&$5$^$6$^$J4qL/$J$3$H$r!"$"$J$?$N$$$J$$$H(B
+$B$3$m$G9T$J$C$F$/$l$k$b$N$G$9!#Nc$($P!"$"$J$?$O;~$?$^?7Ce%a!<%k$r%A%'%C%/(B
+$B$7$F$b$i$$$?$$$+$b$7$l$^$;$s!#$"$k$$$O(B Emacs $B$r$7$P$i$/J|$C$F$*$$$?$H$-(B
+$B$9$Y$F$N%5!<%P!<$N@\B3$r@ZCG$7$F$b$i$$$?$/$J$k$+$b$7$l$^$;$s!#B>$K$b2?$+(B
+$B$=$&$$$C$?$3$H$G$9!#(B
 
-Gnus $B$O$5$^$6$^$J@)8f;R(B @dfn{handlers} $B$rDj5A$9$k$3$H$K$h$C$F$=$N$h$&$J(B
-$B$3$H$r2DG=$K$7$^$9!#3F@)8f;R$O;0$D$NMWAG$+$i@.$j$^$9!#(B
-@var{$B4X?t(B}, @var{$B;~4V(B}, @var{$B6uE>(B} $B%Q%i%a!<%?$G$9!#(B
+gnus $B$O$5$^$6$^$J!V%O%s%I%i!uBV$r<($9$b$N(B) $B%Q%i(B
+$B%a!<%?!<$G$9!#(B
 
-$B0J2<$O(B Emacs $B$,2?$b$7$J$$6uE>>uBV$,;0==J,B3$$$?$H$-$K@\B3$r@ZCG$9$k@)8f(B
-$B;R$NNc$G$9!#(B
+$B$3$l$O(B Emacs $B$N%"%$%I%k>uBV$,;0==J,B3$$$?$H$-$K@\B3$r@ZCG$9$k%O%s%I%i!<(B
+$B$NNc$G$9(B:
 
 @lisp
 (gnus-demon-close-connections nil 30)
 @end lisp
 
-$B0J2<$O(B Emacs $B$,2?$b$7$F$$$J$$$H$-!"0l;~4VKh$K(B @acronym{PGP} $B%X%C%@!<$rAv(B
-$B::$9$k@)8f;R$G$9!#(B
+$B$3$l$O(B Emacs $B$,%"%$%I%k$N$H$-!"0l;~4VKh$K(B @acronym{PGP} $B%X%C%@!<$rAv::$9(B
+$B$k%O%s%I%i!<$G$9(B:
 
 @lisp
 (gnus-demon-scan-pgp 60 t)
 @end lisp
 
-$B$3$N(B @var{$B;~4V(B} $B%Q%i%a!<%?$H$=$7$F(B @var{$B6uE>(B} $B%Q%i%a!<%?$O!"4qL/$G$+$DAG(B
-$B@2$i$7$$J}K!$G0l=o$KF0:n$7$^$9!#4pK\E*$K$O!"(B@var{$B6uE>(B} $B$,(B @code{nil} $B$N(B
-$B;~$K$O$3$N4X?t$O(B @var{$B;~4V(B} $BJ,Kh$K8F$S=P$5$l$^$9!#(B
+$B$3$N!V;~4V!W%Q%i%a!<%?!<$H!V%"%$%I%k!W%Q%i%a!<%?!<$O!"4qL/$+$DAG@2$i$7$$(B
+$B$d$jJ}$G0l=o$KF0:n$7$^$9!#4pK\E*$K!V%"%$%I%k!W$,(B @code{nil} $B$@$C$?$i!"4X(B
+$B?t$O!V;~4V!WJ,Kh$K8F$S=P$5$l$^$9!#(B
 
-$B$b$7(B @var{$B6uE>(B} $B$,(B @code{t} $B$G$"$l$P!"$3$N4X?t$O(B Emacs $B$,2?$b$7$F$$$J$$(B
-$B;~$K8B$j!"(B@var{$B;~4V(B} $BJ,8e$K8F$S=P$5$l$^$9!#0lC6(B Emacs $B$,$:$C$H6uE>>uBV$K(B
-$B$J$C$?8e$O!"$3$N4X?t$O(B @var{$B;~4V(B} $BJ,Kh$K8F$S=P$5$l$^$9!#(B
+$B!V%"%$%I%k!W$,(B @code{t} $B$@$C$?$i!"4X?t$O(B Emacs $B$,%"%$%I%k$@$C$?$H$-$K8B$C(B
+$B$F!V;~4V!WJ,8e$K8F$S=P$5$l$^$9!#$7$?$,$C$F(B Emacs $B$,%"%$%I%k$K$J$i$J$1$l(B
+$B$P!"4X?t$O8F$S=P$5$l$^$;$s!#$$$C$?$s(B Emacs $B$,%"%$%I%k>uBV$K$J$k$H!"$3$N(B
+$B4X?t$O!V;~4V!WJ,Kh$K8F$S=P$5$l$^$9!#(B
 
-@var{$B6uE>(B} $B$,?t$G(B @var{$B;~4V(B} $B$b?t$G$"$k>l9g!"$3$N4X?t$O!"(BEmacs $B$N6uE>>u(B
-$BBV$,(B @var{$B6uE>(B} $BJ,B3$$$?;~$K8B$j!"(B@var{$B;~4V(B} $BJ,Kh$K8F$S=P$5$l$^$9!#(B
+$B!V%"%$%I%k!W$,?tCM$G!V;~4V!W$b?tCM$@$C$?>l9g!"(BEmacs $B$N%"%$%I%k>uBV$,!V%"(B
+$B%$%I%k!WJ,B3$$$?>l9g$K8B$C$F!"!V;~4V!WJ,Kh$K4X?t$,8F$S=P$5$l$^$9!#(B
 
-@var{$B6uE>(B} $B$,?t$G(B @var{$B;~4V(B} $B$,(B @code{nil} $B$N>l9g!"$3$N4X?t$O!"(BEmacs $B$N(B
-$B6uE>>uBV$,(B @var{$B6uE>(B} $BJ,B3$/EY$K0lEY8F$S=P$5$l$^$9!#(B
+$B!V%"%$%I%k!W$,?tCM$G!V;~4V!W$,(B @code{nil} $B$@$C$?>l9g!"4X?t$O(B Emacs $B$N%"(B
+$B%$%I%k>uBV$,!V%"%$%I%k!WJ,B3$/EY$K0lEY8F$S=P$5$l$^$9!#(B
 
-$B$=$7$F(B @var{$B;~4V(B} $B$,J8;zNs$N>l9g$O!"(B@samp{07:31} $B$N$h$&$J7A<0$G$J$1$l$P(B
-$B$J$i$:!"$3$N4X?t$OKhF|$=$N:"$N;~4V$K$J$k$H0lEY8F$S=P$5$l$^$9!#$b$A$m$s!"(B
-@var{$B6uE>(B} $B%Q%i%a!<%?$GF0:n$,JQ$o$j$^$9!#(B
+$B$=$7$F!V;~4V!W$,J8;zNs$@$C$?>l9g(B ($B$=$l$O(B @samp{07:31} $B$N$h$&$J7A<0$G$J$1(B
+$B$l$P$J$j$^$;$s(B)$B!"4X?t$OKhF|$=$N;~9o$N:"$K$J$k$H0lEY8F$S=P$5$l$^$9!#$b$A(B
+$B$m$s!V%"%$%I%k!W%Q%i%a!<%?!<$K$h$C$FF0:n$,JQ$o$j$^$9!#(B
 
 @vindex gnus-demon-timestep
-($B$3$3$G(B ``$BJ,(B'' $B$H8@$C$?$H$-!"$=$l$O@\DI2C$7$?>l9g$K$O!"$=$l$r8z(B
-$B$+$;$k$?$a$K(B @code{gnus-demon-init} $B$r@\%O%s%I%i!<$rDI2C$7$?>l9g$K$O!"$=$l$r8z(B
+$B$+$;$k$?$a$K(B @code{gnus-demon-init} $B$rC$9$K$O!"(B@code{gnus-demon-cancel} $B4X?t$r;H$&$3$H$,$G$-$^$9!#(B
 
-$B%G!<%b%s$NDI2C$O!"$d$j$9$.$k$N$O$H$C$F$b$*9T57$N$h$/$J$$$3$H$G$9!#A4$F$N(B
-$B%5!<%P!<$+$iA4$F$N%K%e!<%9$H%a!<%k$rFsICKh$KD4$Y$^$o$94X?t$rIU$12C$($A$c$C(B
-$B$?$j$9$k$H!"$I$s$JN)GI$J%7%9%F%`$G$b4V0c$$$J$/$*J'$$H"$K$7$F$7$^$$$^$9!#(B
-$B$=$&F0$/$s$@$b$s!#(B
+$B%G!<%b%s$NDI2C$r$d$j$9$.$k$N$O$+$J$j%^%:$$$3$H$G$9!#$9$Y$F$N%5!<%P!<$+$i(B
+$B$9$Y$F$N%K%e!<%9$H%a!<%k$rFsICKh$KD4$Y$^$o$94X?t$rIU$12C$($?$j$9$k$3$H$O!"(B
+$B$I$s$JN)GI$J%7%9%F%`$+$i$b3No0lF|$+$=$3$i$G!"$5$^$6$^$JH?(B spam $B5!4X$+$iC$7$5$l$^$9!#(B
-$B$3$l$i$N5!4X$ODL>o0l=o$K!"(B@dfn{NoCeM} $B%a%C%;!<%8$bAw?.$7$^$9!#(B
-@dfn{NoCeM} $B$O(B ``no see-'em'' ($BH`$i$r8+$?$/$J$$(B)$B$HH/2;$5$l!"0UL#$O$=$NL>(B
-$BA0$NDL$j$G$9(B --- $B$3$N%a%C%;!<%8$O!":a$rHH$7$F$$$k5-;v$r!"$D$^$j!">C$7$F(B
-$B$7$^$$$^$9!#(B
+Spam $B$O$5$^$6$^$JH?(B spam $B5!4X$K$h$C$F!"DL>o0lF|$+$=$3$i$GC$7$5$l$^(B
+$B$9!#DL>o$3$l$i$N5!4X$O!"0l=o$K(B @dfn{NoCeM} $B%a%C%;!<%8$bAw$j=P$7$^$9!#(B
+@dfn{NoCeM} $B$O!H(Bno see-'em$B!I(B($BH`$i$r8+$?$/$J$$(B) $B$HH/2;$5$l!"0UL#$O$=$NL>(B
+$BA0$NDL$j$G$9(B---$B$3$l$i$N%a%C%;!<%8$O5$$K?($k5-;v$r!"$D$^$j!">C$7$F$7$^$$(B
+$B$^$9!#(B
 
-$B$I$&$;$=$N5-;v$,C$7$5$l$F$7$^$&$N$J$i!"$3$l$i(B NoCeM $B%a%C%;!<%8$O2?(B
-$B$K;H$o$l$k$N$G$7$g$&(B? $B$"$k%5%$%H$G$OC$7%a%C%;!<%8$r0z$-C$7%a%C%;!<%8$N$_$7$+0z$-C$7$5$l$F$7$^$&$N$J$i!"$3$l$i$N(B NoCeM $B%a%C%;!<(B
+$B%8$O2?$K;H$o$l$k$N$G$7$g$&(B? $B$"$k%5%$%H$G$OC$7%a%C%;!<%8$r=E;k$7$^$;(B
+$B$s!#$^$?!"$"$k%5%$%H$G$OFCDj$N?t?M$+$i$NC$7%a%C%;!<%8$@$1$rB:=E$7$^(B
+$B$9!#$=$3$G!"$"$J$?$O(B NoCeM $B%a%C%;!<%8$r;H$$$?$/$J$k$+$b$7$l$J$$$o$1$G$9!#(B
+$B$3$l$i$O(B @samp{alt.nocem.misc} $B%K%e!<%9%0%k!<%W$GG[I[$5$l$F$$$^$9(B ($BLu(B
+$BCm(B: $BB>$K(B @samp{fj.news.lists.filters} $B$d(B @samp{news.lists.filters} $B$J$I(B
+$B$G$bFH<+$N(B NoCeM $B%a%C%;!<%8$,G[I[$5$l$F$$$^$9(B)$B!#(B
 
-Gnus $B$O$3$N%0%k!<%W$N%a%C%;!<%8$r<+F0E*$KFI$_!"2rC$75n$j$^$9!#(B
 
-$B$b$A$m$s!"$3$l$i$r%+%9%?%^%$%:$9$k$?$a$NJQ?t$,$$$/$D$+$"$j$^$9!#(B
+$B$b$A$m$s!"$3$l$i$r%+%9%?%^%$%:$9$k$?$a$NJQ?t$,$$$/$D$+$"$j$^$9(B:
 
 @table @code
 @item gnus-use-nocem
 @vindex gnus-use-nocem
-$B$3$NJQ?t$r(B @code{t} $B$K@_Dj$9$k$3$H$G3hF0$r3+;O$5$;$^$9!#=i4|@_Dj$G(B
-$B$O(B @code{nil} $B$G$9!#(B
+$B$b$N$4$H$r;O$a$5$;$k$K$O!"$3$NJQ?t$r(B @code{t} $B$K@_Dj$7$F2<$5$$!#%G%#%U%)(B
+$B%k%H$G$O(B @code{nil} $B$G$9!#(B
+
+$B$3$NJQ?t$K%0%k!<%W%l%Y%k$H$7$F@5$N?tCM$r@_Dj$9$k$3$H$b$G$-$^$9!#$=$N>l9g!"(B
+$B$3$NCM$,(B @code{gnus} $B$d(B @code{gnus-group-get-new-news} $B$J$I$N%3%^%s%I$N(B
+$B@\F,0z?t$H$7$FM?$($k%0%k!<%W%l%Y%k0J2<$@$C$?$i!"(Bgnus $B$O?7Ce%K%e!<%9$r%A%'%C(B
+$B%/$9$k$H$-$K(B NoCeM $B%a%C%;!<%8$rAv::$7$^$9!#$5$b$J$1$l$P!"$=$l$i$N%3%^%s(B
+$B%I$K%0%k!<%W%l%Y%k$rM?$($k$H!"(Bgnus $B$O(B NoCeM $B%a%C%;!<%8$rAv::$7$^$;$s!#Nc(B
+$B$($P!"%a!<%k%0%k!<%W$G(B 1 $B$+(B 2 $B$r;H$C$F$$$F%K%e!<%9%0%k!<%W$N%l%Y%k$,%G%#(B
+$B%U%)%k%H$N$^$^$@$C$?$i!"(B3 $B$,:G$bNI$$A*Br$G$9!#(B
 
 @item gnus-nocem-groups
 @vindex gnus-nocem-groups
-Gnus $B$O$3$N%0%k!<%W%j%9%H$+$i(B NoCeM $B%a%C%;!<%8$rC5$7$^$9!#=i4|@_DjCM(B
-$B$O(B @code{("news.lists.filters" "news.admin.net-abuse.bulletins"
-"alt.nocem.misc" "news.admin.net-abuse.announce")} $B$G$9!#(B
+gnus $B$O$3$N%0%k!<%W$N%j%9%H$+$i(B NoCeM $B%a%C%;!<%8$rC5$7$^$9!#%G%#%U%)%k%H(B
+$B$O$$$?$$$+$r;XDj$7$^$9!#=i4|@_DjCM$O(B @code{(("Automoose-1"
-"clewis@@ferret.ocunix.on.ca" "cosmo.roadkill" "SpamHippo"
-"hweede@@snafu.de")} $B$G$9!#H`$i$O$_$s$J!"N)GI$G9b7i$J;TL1$G$9!#(B
+NoCeM $B%a%C%;!<%8$rH/9T$9$k?M$O$?$/$5$s$$$^$9!#$3$N%j%9%H$G$O!"C/$N$$$&$3(B
+$B$H$K=>$$$?$$$+$r;XDj$7$^$9!#%G%#%U%)%k%H$O$JH?(B spam $B2H$?$A(B
 $B$O(B @uref{http://www.xs4all.nl/~rosalind/nocemreg/nocemreg.html} $B$K:\$C$F(B
 $B$$$^$9!#(B
 
-$B$3$l$iA4$F$N?M!9$N(B NoCeM $B%a%C%;!<%8$KN10U$9$kI,MW$O$"$j$^$;$s(B --- $B8@$&$3(B
-$B$H$rJ9$-$?$$?M$@$1$G$$$$$s$G$9!#$^$?$=$N?M$+$i$N(B NoCeM$B%a%C%;!<%8A4$F$r$l/$O(B
-$B87L)$J!"DxEY$M!#$?$$$F$$$O>/$@$1$I(B)$B!#NI$/;H$o$l$kr(B
-$B7o(B} @dots{})} $BMWAG$r;H$&I,MW$,$"$j$^$9!#3F>r7o$OJ8;zNs(B ($B;H$$$?$$l9g$O(B @var{$BJ8;zNs(B} $B$O;H$$$?$/$J$$$l$N(B NoCeM $B%a%C%;!<%8$O!"(B
+$B$=$N%a%C%;!<%8$N87L)$J(B ($BB?>/$O87L)!"$?$$$F$$$O$=$&$G$b$J$$(B) $BDj5A$rM?$($k(B
+$Br7o(B@dots{})} $B$H$$$&MWAG$r;H$&(B
+$BI,MW$,$"$j$^$9!#$=$l$>$l$N>r7o$O!"J8;zNs(B ($B;H$$$?$$l9g$N!VJ8;zNs!W(B
+$B$O;H$$$?$/$J$$l9g$K$O!"(B
+$BNc$($P!"(BChris Lewis $B$+$i$N!"(B@samp{troll} $B%a%C%;!<%80J30$N$9$Y$F(B
+$B$N(B NoCeM $B%a%C%;!<%8$rM_$7$$>l9g$K$O!"$3$&$9$l$PNI$$$G$7$g$&(B:
 
 @lisp
 ("clewis@@ferret.ocunix.on.ca" ".*" (not "troll"))
 @end lisp
 
-$B0lJ}!"H`$N(B @samp{spam} $B$H(B @samp{spew} $B%a%C%;!<%80J30$O2?$b$7$?$/$J$1$l$P!"(B
-$B0J2<$N$h$&$K$G$-$^$9!#(B
+$B0lJ}!"H`$N(B @samp{spam} $B$H(B @samp{spew} $B%a%C%;!<%80J30$O2?$bMW$i$J$$$N$G$"(B
+$B$l$P!"0J2<$N$h$&$K$G$-$^$9(B:
 
 @lisp
 ("clewis@@ferret.ocunix.on.ca" (not ".*") "spew" "spam")
@@ -20881,104 +21861,102 @@ NoCeM $B%a%C%;!<%8$rH/9T$9$k?M$O$?$/$5$s$$$^$9!#$3$N%j%9%H$G$O!"C/$N8@$&$3(B
 
 @item gnus-nocem-verifyer
 @vindex gnus-nocem-verifyer
-@findex mc-verify
-$B$3$l$O(B NoCeM $BH/9TZL@$9$k4X?t$G$J$/$F$O$J(B
-$B$j$^$;$s!#=i4|@_Dj$G$O(B @code{mc-verify} $B$G$"$j!"$3$l$O(B Mailcrypt $B4X?t$G(B
-$B$9!#$b$7$3$l$,Hs>o$KCY$/$F!"$"$J$?$,>ZL@7k2L$r5$$K$7$J$$(B ($B$3$l$O$?$V$s4m(B
-$B81$G$9(B) $B$N$G$"$l$P!"$3$NJQ?t$r(B @code{nil} $B$K$9$k$3$H$,$G$-$^$9!#(B
-
-$B$b$7=pL>:Q$_$N(B NoCeM $B%a%C%;!<%8$r>ZL@:Q$_!"L$=pL>$N%a%C%;!<%8$rL$>Z(B
-$BL@(B ($B$G$b$=$l$r;H$&(B) $B$H$7$?$$$N$J$i!"0J2<$N$h$&$K$9$k$3$H$,$G$-$^$9!#(B
+@findex pgg-verify-region
+$B$3$l$O(B NoCeM $BH/9TZ$9$k4X?t$G$J$/$F$O$J$j$^$;$s!#(B
+$B%G%#%U%)%k%H$G$O!"0J2<$K<($9(B @code{pgg-verify-region} $B$r;H$&4X?t$G(B
+$B$9(B ($BCp(B: Gnus $B$G$O(B @code{pgg-verify} $B$,%G%#%U%)%k%H$G$9(B)$B!#(B
 
 @lisp
-(setq gnus-nocem-verifyer 'my-gnus-mc-verify)
-
-(defun my-gnus-mc-verify ()
-  (not (eq 'forged
-           (ignore-errors
-             (if (mc-verify)
-                 t
-               'forged)))))
+(lambda ()
+  (pgg-verify-region (point-min) (point-max)))
 @end lisp
 
-$B$^$"!"$3$l$O$?$V$s4m81$G$7$g$&$1$I$M!#(B
+$B$3$l$O8!>Z$K@.8y$7$?$iHs(B-@code{nil} $B$rJV$7!"$=$&$G$J$1$l$P(B (NoCeM $B%a%C%;!<(B
+$B%8$,=pL>$5$l$F$$$J$$>l9g$r4^$_$^$9(B) @code{nil} $B$rJV$7$^$9!#$b$7$3$l$,Hs(B
+$B>o$KCY$/$F!"8!>Z7k2L$r5$$K$7$J$$(B ($B$3$l$O$?$V$s4m81$G$9(B) $B$N$G$"$l$P!"$3$N(B
+$BJQ?t$r(B @code{nil} $B$K$9$k$3$H$,$G$-$^$9!#(B
+
+$B0JA0!"%G%#%U%)%k%H$O(B Mailcrypt $B$N4X?t$G$"$k(B @code{mc-verify} $B$G$7$?!#$^(B
+$B$@$=$l$r;H$&$3$H$,$G$-$^$9$,!"(BPGP $B$N8x3+80$r(B GnuPG $B$N80B+$K2C$($k$3$H$r(B
+$B1^$o$J$1$l$P!"(BGnuPG $B$H$H$b$KF0:n$9$k%G%#%U%)%k%H$N4X?t$KJQ$($k$3$H$,$G$-(B
+$B$^$9!#(B
 
 @item gnus-nocem-directory
 @vindex gnus-nocem-directory
-$B$3$l$O(B gnus $B$,(B NoCeM $B%-%c%C%7%e%U%!%$%k$rJ]B8$9$k>l=j$G$9!#=i4|@_DjCM(B
+$B$3$l$O(B gnus $B$,(B NoCeM $B%-%c%C%7%e%U%!%$%k$rJ]B8$9$k>l=j$G$9!#%G%#%U%)%k%H(B
 $B$O(B @file{~/News/NoCeM/} $B$G$9!#(B
 
 @item gnus-nocem-expiry-wait
 @vindex gnus-nocem-expiry-wait
-$B8E$$(B NoCeM $B9`L\$r%-%c%C%7%e$+$i>C$9$^$G$NF|?t!#=i4|@_DjCM$O(B 15 $B$G$9!#$3(B
-$B$l$rC;$/$9$k$[$I(B gnus $B$OB.$/$J$j$^$9$,!"8E$$(B spam $B$r8+$k$3$H$K$J$C$F$7$^(B
-$B$&$+$b$7$l$^$;$s!#(B
+$B8E$$(B NoCeM $B9`L\$r%-%c%C%7%e$+$i>C$9$^$G$NF|?t!#%G%#%U%)%k%H$O(B 15 $B$G$9!#(B
+$B$3$l$rC;$/$9$k$[$I(B gnus $B$OB.$/$J$j$^$9$,!"8E$$(B spam $B$r8+$k$3$H$K$J$C$F$7(B
+$B$^$&$+$b$7$l$^$;$s!#(B
 
 @item gnus-nocem-check-from
 @vindex gnus-nocem-check-from
-$BHs(B@code{nil} $B$G$O!"5-;v$N%\%G%#$K$"$kH/9T?M$N@5Ev@-$rD4$Y$^$9!#$=$&$G$J(B
-$B$$>l9g$O!"Cxl9g$O!"CxC$75n$C$F$7$^$C$?J}$,NI$$$G(B
-$B$9(B (@pxref{Subscription Commands})$B!#(B
+$B$5$s$N@8$-$?%0%k!<%W(B ($B$D$^$j9XFI$"$k$$$OHs9XFI%0%k!<%W(B) $B$r;}$C$F$$$k$H!"(B
+Emacs $B$N%W%m%;%9$OBg$-$/$J$C$F$7$^$&$G$7$g$&!#$b$7$3$l$,LdBj$G$"$l$P!"Hs(B
+$B9XFI$N%0%k!<%W$rA4It(B ($B$"$k$$$O$=$NB?$/$r(B) $B>C$75n$C$F(B (kill $B$7$F(B) $B$7$^$&(B
+$B$Y$-$G$9(B (@pxref{Subscription Commands})$B!#(B
 
 @node Undo
 @section $B$d$jD>$7(B
 @cindex undo
 
-$B$7$,$G$-$k$H!"$H$F$bJXMx$G$9!#IaDL$N(B Emacs $B%P%C%U%!(B
-$B$G$O!"$3$l$O==J,4JC1$G$9(B --- $BC1$K(B @code{undo} $B%\%?%s$r2!$9$@$1$G$9!#$7$+(B
-$B$7(B gnus $B$N%P%C%U%!$G$O!"$3$l$O4JC1$G$O$"$j$^$;$s!#(B
+$B$7$,$G$-$k$H!"$H$F$bJXMx$G$9!#(BEmacs $B$NIaDL$N%P%C%U%!!<(B
+$B$G$O==J,$K4JC1$G$9(B---$BC1$K(B @code{undo} $B%\%?%s$r2!$9$@$1$G$9!#$7$+(B
+$B$7(B gnus $B$N%P%C%U%!!<$G$O!"$=$l$O4JC1$G$O$"$j$^$;$s!#(B
 
-Gnus $B$,%P%C%U%!!C5n$9$k(B
-$B$N$O!"$=$N9T$O>C$(5n$j$^$9$,!"$=$l$OC5n(B
+$B$9$k$H!"$=$N9T$O>C$(5n$j$^$9$,!"$=$l$O$7$O!"DL>o$N(B Emacs $B$N(B @code{undo} $B4X?t$G$O9T$J$&$3$H$,$G$-$^(B
 $B$;$s!#(B
 
-Gnus $B$O!"MxMQ$72DG=$J%-!<4X?t$O6O$+$7$+Ds6!$7$F$$$^$;$s!#(B
-$B$3$l$i$O!"%0%k!<%W$N:o=|!"%0%k!<%W$NE=$jIU$1!"%0%k!<%W$N4{FI5-;v$N%j%9%H(B
-$B$NJQ99!"$=$l$@$1$J$s$G$9!#>-Mh$O$b$C$H4X?t$,DI2C$5$l$k$+$b$7$l$^$;$s$,!"(B
-$B4X?t$NDI2C$O$=$l$>$lJ]B8$9$k$Y$-%G!<%?$rA}$d$9$3$H$K$J$k$N$G!"(Bgnus $B$O7h(B
-$B$7$F40A4$d$jD>$72DG=$K$O$J$i$J$$$G$7$g$&!#(B
+gnus $B$OMxMQ/$O5_:Q$7$h$&$H$7$^$9!#MxMQ$7(B
+$B2DG=$J%-!<$N5!G=$r6O$+$7$+Ds6!$7$F$$$^$;$s!#$3$l$i$O%0%k!<%W$N:o=|!"%0%k!<(B
+$B%W$NE=$jIU$1!"$*$h$S%0%k!<%W$N4{FI5-;v$N%j%9%H$NJQ99$G$9!#-Mh$O$b$C$H5!G=$,DI2C$5$l$k$+$b$7$l$^$;$s$,!"DI2C$5$l$k$=$l$>$l$N5!(B
+$BG=$OJ]B8$9$k$Y$-%G!<%?$rA}$d$9$N$G!"7h$7$F(B gnus $B$O40A4$K$d$jD>$72DG=$K$O(B
+$B$J$i$J$$$G$7$g$&!#(B
 
 @findex gnus-undo-mode
 @vindex gnus-use-undo
 @findex gnus-undo
 $B$d$jD>$75!G=$O(B @code{gnus-undo-mode} $B%^%$%J!<%b!<%I$K$h$C$FDs6!$5$l$^$9!#(B
-$B$3$l$O(B @code{gnus-use-undo} $B$,(B @code{nil} $B0J30$G$"$l$P;HMQ$5$l!"$3$l$,=i(B
-$B4|@_Dj$G$9!#(B@kbd{C-M-_} $B%-!<$,(B @code{gnus-undo} $BL?Na$ro$N(B Emacs $B$N(B @code{undo} $BL?Na$K$A$g$C$H$@$1;w$F$$$k$H;W$o$l$k$G$7$g$&!#(B
+$B$3$l$O(B @code{gnus-use-undo} $B$,(B @code{nil} $B0J30$G$"$l$P;HMQ$5$l!"$3$l$,%G%#(B
+$B%U%)%k%H$G$9!#(B@kbd{C-M-_} $B%-!<$,(B @code{gnus-undo} $BL?Na$ro$N(B Emacs $B$N(B @code{undo} $BL?Na$K$$$/$V$s;w$F$$$k$O$:$G$9!#(B
 
 @node Predicate Specifiers
-@section $B=R8l$N@_Dj(B
+@section $B=R8l;X<(;R(B
 @cindex predicate specifiers
 
-$B$$$/$D$+$N(B gnus $B$NJQ?t(B
-$B$O(B @dfn{$B=R8l;X<(;R(B} (@dfn{predicate specifiers}) $B$G$9!#$3$l$O=R8l$N;EMM(B
-$B$KM;DL$r8z$+$;$k$3$H$,$G$-$kFCJL$J7A<0$G$9!#(B
+$B$$$/$D$+$N(B gnus $B$NJQ?t$O!V=R8l;X<(;R!W(B(predicate specifiers) $B$G$9!#$3$l(B
+$B$O!"$=$NB?$/$r$9$Y$F5-=R$9$kI,MW$J$7$K!"=R8l$N;EMM$KM;DL$r8z$+$;$k$3$H$,(B
+$B$G$-$kFCJL$J7A<0$G$9!#(B
 
-$B$3$l$i$N;X<(;R$O4X?t$K$h$k%j%9%H!"%7%s%\%k$^$?$O%j%9%H$G$9!#(B
+$B$3$l$i$N;X<(;R$O4X?t!"%7%s%\%k$*$h$S%j%9%H$+$i$J$k%j%9%H$G$9!#(B
 
-$B$3$l$ONc$G$9(B:
+$BNc$G$9(B:
 
 @lisp
 (or gnus-article-unseen-p
@@ -20986,38 +21964,38 @@ Gnus $B$O!"MxMQC$7$G$-$^$9!#(B
 @end enumerate
 
-$BFs$D$N%0%k!<%W$G;J2qA0$r0z?t$H$7$F$H$j$^$9!#(B
+$B;~!9!V(Bgnus $B$,5/F0$7$F$$$k$+$I$&$+$r5$$K$7$J$$$G$3$N%0%k!<%W$rFI$_$?$$!#!W(B
+$B$H$$$&$3$H$,$G$-$l$PJXMx$J$3$H$,$"$j$^$9!#$3$l$O!"MxMQA0$r0z?t$H$7$F$H$j$^$9!#(B
 
 @node Image Enhancements
 @section $B2hA|$N3HD%(B
 
 XEmacs $B$=$l$K(B Emacs 21@footnote{MS $B%&%#%s%I%&%:$N(B Emacs 21 $B$O$^$@2hA|$r(B
-$B%5%]!<%H$7$F$$$^$;$s!#(B} $B$O3($d$=$NB>$N$b$N$rI=<($9$k$3$H$,$G$-$k$N$G!"(B
-gnus $B$O$3$l$rMxMQ$9$k$3$H$K$7$^$9!#(B
+$B%5%]!<%H$7$F$$$^$;$s!#(B} $B$O3($d$=$N$N(B XEmacs $B$G(B Gnus $B$JJQ?t(B
+* XVarious::                    XEmacs $B$N$?$a$N(B gnus $B$NJQ?t(B
 @end menu
 
 @node X-Face
 @subsection X-Face
 @cindex x-face
 
-@code{X-Face} $B%X%C%@!<$O!"%a%C%;!<%8$NCxl9g!"(Bgnus $B$O(B @code{pbmplus} $B%Q%C%1!<%8$H$=$NCg4V$N30It%W%m%0%i%`(B
+$B$r;H$C$F(B @code{X-Face} $B%X%C%@!<$rJQ49$7$h$&$H$7$^$9!#(B@code{X-Face} $B$r%5(B
+$B%]!<%H$9$k$h$&$K%3%s%Q%$%k$5$l$F$$$k(B XEmacs $B$OB.$$$G$9!#2hA|$r%5%]!<%H$7(B
+$B$F$$$J$$(B Emacs $B$G$O!"%G%#%U%)%k%H$G$OI=<($N$?$a$N=hM}(B
+$B$r(B @code{display} $B$H$$$&%W%m%0%i%`$K0Q$M$^$9!#(B
+
+GNU/Linux $B%7%9%F%`$N>l9g!"(BImageMagick $B%Q%C%1!<%8$N(B @code{display} $B%W%m%0(B
+$B%i%`$r;H$$$^$9!#30It%W%m%0%i%`$H$7$F$O(B @code{netpbm}$B!"(B
+@code{libgr-progs} $B$*$h$S(B @code{compface} $B$N$h$&$JL>A0$N$b$N$rC5$7$^$9!#(B
+
+$B$3$l$r@)8f$9$k$N$O(B @code{gnus-article-x-face-command} $BJQ?t$G$9!#$3$NJQ?t(B
 $B$,J8;zNs$J$i$P!"$3$NJ8;zNs$,%5%V%7%'%k$G%W%m%0%i%`$K$D$$$F$O!"(B
-`compface' $B$d(B GNU/Linux $B%7%9%F%`$K$*$1$k(B `faces-xface' $B$N$h$&$J%Q%C%1!<(B
-$B%8$rC5$7$F2<$5$$!#(B} $B$r%U%)!<%/$7$F8+$h$&$H$7$^$9!#(B
-
-XEmacs $B$+@E;_2h$r%5%]!<%H$7$F$$$k(B Emacs 21+ $B$G$N%G%#%U%)%k%H$NF0:n(B
-$B$O(B @code{From} $BMs$NA0$K4i$rI=<($9$k$3$H$G$9!#(B(XEmacs $B$,(B X-Face $B5!G=IU$-(B
-$B$G%3%s%Q%$%k$5$l$F$$$k$HNI$$$G$7$g$&!=!=$=$l$OI=<($r>/$7Aa$/$7$^$9!#$b$7(B
-$B:,K\E*(B X-Face $B5!G=$,$J$$$N$G$"$l$P!"(Bgnus $B$O(B @code{pbmplus} $B$d$=$NCg4V$N(B
-$B30It%W%m%0%i%`$r;H$C$F(B @code{X-Face} $BMs$rJQ49$7$h$&$H;n$_$^$9(B @footnote{
-GNU/Linux $B%7%9%F%`$G$O(B @code{netpbm}$B!"(B@code{libgr-progs} $B$^$?(B
-$B$O(B @code{compface} $B$N$h$&$JL>A0$N%Q%C%1!<%8$rC5$7$F2<$5$$!#(B}$B!#(B)
-
 ($BCm(B: $BJQ?t(B/$B4X?tL>$K$O(B @code{xface} $B$G$O$J$/(B @code{x-face} $B$,;H$o$l$^$9!#(B)
 
 $B%U%'!<%9$HJQ?t(B:
@@ -21113,12 +22086,12 @@ GNU/Linux $B%7%9%F%`$G$O(B @code{netpbm}$B!"(B@code{libgr-progs} $B$^$?(B
 @item gnus-x-face
 @vindex gnus-x-face
 X-Face $B$rI=<($9$k$?$a$N%U%'!<%9!#$3$N%U%'!<%9$N?'$,I=<($5$l$k(B X-Face $B$N(B
-$BA07J?'$HGX7J?'$H$7$F;H$o$l$^$9!#%G%#%U%)%k%H$N?'$OGr$H9u$G$9!#(B
+$BA07J?'$HGX7J?'$H$7$F;H$o$l$^$9!#%G%#%U%)%k%H$N?'$O9u$HGr$G$9!#(B
 
 @item gnus-face-properties-alist
 @vindex gnus-face-properties-alist
-Face (@pxref{Face}) $B$H(B X-Face $B2hA|$KE,MQ$5$l$k!"2hA|$N7A<0$H%W%m%Q%F%#$N(B
-$BO"A[%j%9%H$G$9!#%G%#%U%)%k%HCM$O(B Emacs $BMQ$N(B @code{((pbm . (:face
+Face (@pxref{Face}) $B$H(B X-Face $B2hA|$KE,MQ$5$l$k!"2hA|$N7A<0$H%W%m%Q%F%#!<(B
+$B$NO"A[%j%9%H$G$9!#%G%#%U%)%k%HCM$O(B Emacs $BMQ$N(B @code{((pbm . (:face
 gnus-x-face)) (png . nil))} $B$^$?$O(B XEmacs $BMQ$N(B @code{((xface . (:face
 gnus-x-face)))} $B$G$9!#Nc$r5s$2$^$7$g$&(B:
 
@@ -21134,25 +22107,31 @@ gnus-x-face)))} $B$G$9!#Nc$r5s$2$^$7$g$&(B:
         (png . (:relief -2))))
 @end lisp
 
-$B$$$m$$$m$J2hA|$N7A<0$GMxMQ2DG=$J%W%m%Q%F%#$K$D$$$F$O(B @pxref{Image
-Descriptors, ,Image Descriptors, elisp, The Emacs Lisp Reference
-Manual} $B$r;2>H$7$F2<$5$$!#:#$N$H$3$m(B Emacs $B$G$O(B @code{pbm} $B$,(B X-Face $B2h(B
-$BA|$K;H$o$l!"(B @code{png} $B$,(B Face $B2hA|$K;H$o$l$^$9!#(BXEmacs $B$G$O!"$=$l(B
-$B$,(B @samp{libcompface} $B%i%$%V%i%j$H$H$b$K9=C[$5$l$F$$$l$P!"(B
-@code{xface} $B2hA|7A<0$K(B @code{:face} $B%W%m%Q%F%#$@$1$,8z2L$r5Z$\$7$^$9!#(B
+$B$$$m$$$m$J2hA|$N7A<0$GMxMQ2DG=$J%W%m%Q%F%#!<$K$D$$$F(B
+$B$O(B @xref{Image Descriptors, ,Image Descriptors, elisp, The GNU Emacs
+Lisp Reference Manual}, $B$r;2>H$7$F2<$5$$!#:#$N$H$3$m(B Emacs $B$G(B
+$B$O(B @code{pbm} $B$,(B X-Face $B2hA|$K;H$o$l!"(B @code{png} $B$,(B Face $B2hA|$K;H$o$l$^(B
+$B$9!#(BXEmacs $B$G$O!"$=$l$,(B @samp{libcompface} $B%i%$%V%i%j!<$H$H$b$K9=C[$5$l(B
+$B$F$$$l$P!"(B@code{xface} $B2hA|7A<0$K(B @code{:face} $B%W%m%Q%F%#!<$@$1$,8z2L$r(B
+$B5Z$\$7$^$9!#(B
 @end table
 
-gnus $B$O!"30$K=P$9%a%C%;!<%8$K(B X-Face $B%X%C%@!<$r4JC1$KA^F~$9$k$?$a$N!"JX(B
-$BMx$J4X?t$HJQ?t$r>/$7$P$+$jDs6!$7$^$9!#(B
+$BEj9FMM<0(B (posting style) $B$r;H$&$N$G$"$l$P!"(B
+@code{gnus-posting-styles} $B$K(B @code{x-face-file} $B$N9`$r2C$($l$PNI$$$G$7$g(B
+$B$&(B (@pxref{Posting Styles})$B!#$5$b$J$1$P!"30$K=P$9%a%C%;!<%8$K(B X-Face $B%X%C(B
+$B%@!<$r4JC1$KA^F~$G$-$k$h$&$K$9$k$?$a$K(B gnus $B$,Ds6!$9$k!"$$$/$D$+$NJXMx$J(B
+$B4X?t$HJQ?t$rMxMQ$9$k$3$H$,$G$-$^$9!#$3$l$i$N5!G=$N$?$a$K$O!"A0=R(B
+$B$N(B ImageMagick$B!"(Bnetpbm $B$^$?$OB>$N2hA|$rJQ49$9$k%Q%C%1!<%8(B ($B2?$,I,MW$+$O!"(B
+$B2<5-$NJQ?t72$NCM$K$h$j$^$9(B) $B$bI,MW$G$9!#(B
 
 @findex gnus-random-x-face
 @vindex gnus-convert-pbm-to-x-face-command
 @vindex gnus-x-face-directory
 @code{gnus-random-x-face} $B$O(B @code{gnus-x-face-directory} $B$K$"$k$9$Y$F(B
-$B$N(B @samp{pbm} $B$r$/$^$J$/C5$7$F%i%s%@%`$K0l$D$rA*$S]D'$7$F$$$k$3$H$,4|BT$5$l$k!"(B
-48$B!_(B48 $B2hAG$N%+%i!<2hA|$rIA$-$^$9!#(B
+@c #### FIXME: faces and x-faces' implementations should really be harmonized.
+@code{Face} $B%X%C%@!<$O!"K\]D'$9$k$3$H$K$J$C$F$$(B
+$B$k(B 48$B!_(B48 $B2hAG$N%+%i!<2hA|$rIA$-$^$9!#(B
 
 @cindex face
 @findex gnus-article-display-face
-@code{Face} $B%X%C%@!<$NFbMF$O!"(Bbase64 $B$G%(%s%3!<%I$5$l$?(B PNG $B$N2hA|$G$J$1(B
+@code{Face} $B%X%C%@!<$NFbMF$O(B base64 $B$G%(%s%3!<%I$5$l$?(B PNG $B$N2hA|$G$J$1(B
 $B$l$P$J$j$^$;$s!#@53N$J;EMM$K$D$$$F!"(B
 @uref{http://quimby.gnus.org/circus/face/} $B$r;2>H$7$F2<$5$$!#(B
 
 $BJQ?t(B @code{gnus-face-properties-alist} $B$OI=<($5$l$k(B Face $B2hA|$N304Q$K1F(B
 $B6A$7$^$9!#(B@xref{X-Face}.
 
-$BAw?.$9$k%a%C%;!<%8$K4JC1$K(B Face $B%X%C%@!<$rA^F~$G$-$k$h$&$K$9$k$?$a$K!"(B
-Gnus $B$O(B 2$B!A(B3 $B$N4X?t$HJQ?t$rDs6!$7$^$9!#(B
+@code{Face} $B%X%C%@!<$r8+$k$K$O(B Emacs $B$,(B PNG $B2hA|$rI=<($G$-$kI,MW$,$"$j$^(B
+$B$9!#(B
+@c Maybe add this:
+@c (if (featurep 'xemacs)
+@c     (featurep 'png)
+@c   (image-type-available-p 'png))
+
+gnus $B$O30$K=P$9%a%C%;!<%8$K(B Face $B%X%C%@!<$r4JC1$KA^F~$G$-$k$h$&$K$9$k$?(B
+$B$a$N!"JXMx$J4X?t$HJQ?t$r>/$7$P$+$jDs6!$7$^$9!#(B
 
 @findex gnus-convert-png-to-face
 @code{gnus-convert-png-to-face} $B$O(B 726-byte $B0J2<$N(B 48$B!_(B48 $B$N(B PNG $B$N2hA|(B
-$B$rFI$_9~$s$G!"$=$l$r(B Face $B$KJQ49$7$^$9!#(B
+$B$r$r%Q%i%a!<%?$H$7$FA0$r%Q%i%a!<%?!<$H$7$F$X$NBP1~$N%j%9(B
-$B%H$G@)8f$5$l$^$9!#(B
+$B%9%^%$%j!<$O!"J8;z$N4i%^!<%/(B---@samp{:-)}, @samp{8-)}, @samp{:-(} $B$J$I$H(B
+$B$$$C$?$b$N(B---$B$r3($K3d$jEv$F$F!"J8;z$N4i%^!<%/$NBe$o$j$K$=$N3($rI=<($7$^(B
+$B$9!#$3$NJQ49$OJ8;z$K9gCW$9$k@55,I=8=$H!"$=$l$K3d$jEv$F$i$l$?%U%!%$%kL>$N(B
+$B%j%9%H$G@)8f$5$l$^$9!#(B
 
 @vindex smiley-regexp-alist
 $B;H$o$l$kO"A[%j%9%H$O!"JQ?t(B @code{smiley-regexp-alist} $B$G@_Dj$7$^$9!#3FMW(B
-$BAG$N:G=i$N9`L\$O%^%C%A$5$;$?$$@55,I=8=$G!"FsHVL\$NMWAG$O3($GCV$-49$($?$$(B
-$B%0%k!<%W$K%^%C%A$9$k@55,I=8=!"$=$7$F;0HVL\$NMWAG$OI=<($5$;$?$$%U%!%$%k$N(B
-$BL>A0$G$9!#(B
+$BAG$N:G=i$N9`L\$O9gCW$9$k@55,I=8=$G!"FsHVL\$NMWAG$O3($GCV$-49$($i$l$k@55,(B
+$BI=8=$N%0%k!<%WHV9f!"$=$7$F;0HVL\$NMWAG$OI=<($5$l$k%U%!%$%k$NL>A0$G$9!#(B
 
 $B0J2<$NJQ?t$O!"%9%^%$%j!<$,$3$l$i$N%U%!%$%k$rC5$9>l=j$r%+%9%?%^%$%:$7$^$9(B:
 
 @table @code
 @item smiley-data-directory
 @vindex smiley-data-directory
-$B%9%^%$%j!<$,4i%U%!%$%k$rC5$9>l=j!#(B
+$B%9%^%$%j!<$,4i%U%!%$%k$rC5$9>l=j$G$9!#(B
 
 @item gnus-smiley-file-types
 @vindex gnus-smiley-file-types
@@ -21277,11 +22260,10 @@ Gnus $B$O(B 2$B!A(B3 $B$N4X?t$HJQ?t$rDs6!$7$^$9!#(B
 \include{picons}
 @end iflatex
 @end iftex
-
-$B$=$l$G!D!"$"$J$?$O$3$N%K%e!<%9%j!<%@!<$r$5$i$K$b$C$HCY$/$7$?$$$C$F$o$1$@(B
-$B$M(B! $B$3$l$O$=$&$9$k$N$K$T$C$?$j$JJ}K!$G$9!#$5$i$K$3$l$O!"$"$J$?$,%K%e!<%9(B
-$B$rFI$s$G$$$k$s$@$H$$$&$3$H$r!"$"$J$?$N8*1[$7$K8+$D$a$F$$$k?M$K0u>]$E$1$k(B
-$B$?$a$NAG@2$i$7$$J}K!$G$b$"$j$^$9!#(B
+$B$=$l$G!D!"$"$J$?$O$3$N%K%e!<%9%j!<%@!<$r$5$i$K$b$C$HCY$/$7$?$$$C$F$o$1$G(B
+$B$9$M(B! $B$3$l$O$=$&$9$k$N$K$T$C$?$j$JJ}K!$G$9!#$5$i$K$3$l$O!"$"$J$?$,%K%e!<(B
+$B%9$rFI$s$G$$$k$s$@$H$$$&$3$H$r!"$"$J$?$N8*1[$7$K8+$D$a$F$$$k?M$K0u>]$E$1(B
+$B$k$?$a$NAG@2$i$7$$J}K!$G$b$"$j$^$9!#(B
 
 Picon $B$H$O$J$s$G$7$g$&(B? Picons $B%&%'%V%5%$%H$+$iD>@\0zMQ$7$^$7$g$&!#(B
 
@@ -21290,15 +22272,14 @@ Picon $B$H$O$J$s$G$7$g$&(B? Picons $B%&%'%V%5%$%H$+$iD>@\0zMQ$7$^$7$g$&!#(B
 \margindex{}
 @end iflatex
 @end iftex
-
 @quotation
-@dfn{Picon} $B$H$O!"(B``$B8D?M%"%$%3%s(B (personal icons)'' $B$NN,$G$9!#$3$l$O!"%M%C(B
-$B%H>e$NMxMQ.$5$J2hA|$G!"%G!<%?%Y!<(B
-$B%9$r;}$?$;$F!"$"$kEE;R%a!<%k%"%I%l%9$,$"$C$?$i!"$=$l$KE,@Z$J2hA|$r8+$D$1(B
-$B$i$l$k$h$&$K$7$F$*$/$b$N$G$9!#MxMQ.$5$/$7$F%G!<%?%Y!<%9$K$^$H$a$i$l$?2hA|$?$A$G!"%M%C%H>e$NMxMQl=j$G$9!#$3$l$O(B @file{news}, @file{domains},
 
 @item gnus-picon-user-directories
 @vindex gnus-picon-user-directories
-@code{gnus-picon-databases} $B$+$i%f!<%6$N%U%'!<%9$rC5$9$?$a$N%5%V%G%#%l%/(B
+@code{gnus-picon-databases} $B$+$iMxMQl=j$G$9!#$3$l$O(B @file{news}, @file{domains},
 
 @item gnus-picon-file-types
 @vindex gnus-picon-file-types
-Picon $B$N%U%!%$%kL>$H$7$F;n$7$F$_$k3HD%;R$N=gHV%j%9%H$G$9!#%G%#%U%)%k%H$O!"(B
-@code{("xpm" "gif" "xbm")} $B$+$i(B Emacs $B$KAH$_9~$^$l$F$$$J$$$b$N$r=|30$7$?(B
-$B$b$N$G$9!#(B
+Picon $B$N%U%!%$%kL>$H$7$F;n$7$F$_$k=g$KJB$Y$i$l$?3HD%;R$N%j%9%H$G$9!#%G%#(B
+$B%U%)%k%H$O(B @code{("xpm" "gif" "xbm")} $B$+$i(B Emacs $B$KAH$_9~$^$l$F$$$J$$$b(B
+$B$N$r=|30$7$?$b$N$G$9!#(B
 @end table
 
 @node XVarious
@@ -21359,25 +22340,13 @@ Picon $B$N%U%!%$%kL>$H$7$F;n$7$F$_$k3HD%;R$N=gHV%j%9%H$G$9!#%G%#%U%)%k%H$O!"(B
 @table @code
 @item gnus-xmas-glyph-directory
 @vindex gnus-xmas-glyph-directory
-$B$3$l$O(B gnus $B$,3($rC5$9>l=j$G$9!#(BGnus $B$ODL>o$3$N%G%#%l%/%H%j$r<+F08!=P$7(B
-$B$^$9$,!"$b$7I8=`E*$G$J$$%G%#%l%/%H%j!<9=B$$r;}$C$F$$$k>l9g$O!"$3$l$rl=j$G$9!#(Bgnus $B$ODL>o$3$N%G%#%l%/%H%j!<$r<+F08!=P(B
+$B$7$^$9$,!"$b$7I8=`E*$G$J$$%G%#%l%/%H%j!<9=B$$r;}$C$F$$$k>l9g$O!"$3$l$r$H$7$F;n$7$F$_$k3HD%;R$N=gHV%j%9%H$G$9!#%G%#%U%)%k%H$O!"(B
 @table @code
 @item gnus-use-toolbar
 @vindex gnus-use-toolbar
-@code{nil} $B$J$i$P%D!<%k%P!<$rI=<($7$^$;$s!#(B@code{nil} $B0J30$N>l9g$O!"(B
-@code{default-toolbar}, @code{top-toolbar}, @code{bottom-toolbar},
-@code{right-toolbar}, @code{left-toolbar} $B$N$I$l$+$G$J$/$F$O$J$j$^$;$s!#(B
+$B$3$NJQ?t$O%D!<%k%P!<$rI=<($9$k0LCV$r;XDj$7$^$9!#(B@code{nil} $B$@$C$?$i%D!<(B
+$B%k%P!<$rI=<($7$^$;$s!#Hs(B-@code{nil} $B$N>l9g!"$=$l$O(B @code{default},
+@code{top}, @code{bottom}, @code{right} $B$^$?$O(B @code{left} $B$NCf$N0l$D$N(B
+$B%7%s%\%k$G$J$1$l$P$J$j$^$;$s!#(B@code{default} $B$@$C$?$i%G%#%U%)%k%H$N%D!<(B
+$B%k%P!<$r;H$$!"B>$N$b$N$@$C$?$i$=$NL>A0$,<($9>l=j$K%D!<%k%P!<$rI=<($7$^$9!#(B
+$B%G%#%U%)%k%H$O(B @code{default} $B$G$9!#(B
+
+@item gnus-toolbar-thickness
+@vindex gnus-toolbar-thickness
+$B9b$5$HI}$N%3%s%9(B (cons) $B$G!"%D!<%k%P!<$N8|$5$r;XDj$7$^$9!#9b$5$O>eJU$+2<(B
+$BJU$KI=<($9$k%D!<%k%P!<$G;H$o$l!"I}$O1&C<$+:8C<$KI=<($9$k%D!<%k%P!<$G;H$o(B
+$B$l$^$9!#%G%#%U%)%k%H$O%G%#%U%)%k%H$N%D!<%k%P!<$NCM$G$9!#(B
 
 @item gnus-group-toolbar
 @vindex gnus-group-toolbar
-$B%0%k!<%W%P%C%U%!Fb$N%D!<%k%P!<$G$9!#(B
+$B%0%k!<%W%P%C%U%!!$H$7$F;n$7$F$_$k3HD%;R$N=gHV%j%9%H$G$9!#%G%#%U%)%k%H$O!"(B
 @section $B%U%!%8!<$J0lCW(B
 @cindex fuzzy matching
 
-Gnus $B$O!"%9%3%"IU$1!"%9%l%C%I$N7A@.!"%9%l%C%IHf3S$J$I$r9T$&$H$-$K!"(B
-@code{Subject} $B9T$N%U%!%8!<$J0lCW(B @dfn{fuzzy matching} $BJ}K!$rDs6!$7$F$$(B
-$B$^$9!#(B
+gnus $B$O%9%3%"IU$1!"%9%l%C%I$N7A@.!"$*$h$S%9%l%C%I$NHf3S$J$I$r9T$J$&$H$-(B
+$B$K!"(B@code{Subject} $B9T$N%U%!%8!<$J9gCW(B @dfn{fuzzy matching} $B$rDs6!$7$^$9!#(B
 
-$B@55,I=8=0lCW$H$O0c$C$F!"%U%!%8!<$J0lCW$O$H$C$F$b%U%!%8!<$G$9!#$"$^$j$K$b(B
-$B%U%!%8!<$9$.$F!"2?$,%U%!%8!<(B @dfn{fuzziness} $B$G$"$k$+$H$$$&Dj5A$5$($"$j(B
-$B$^$;$s$7!"l9gBEEv$J7k2L$r=P$7$^$9(B --- $B$?$H$(%K%e!<%9%j!<(B
-$B%@!<$N2>LL$r$+$V$C$?J8;zNs@Z$j9o$_5!$G@8@.$5$l$?J8;zNs$,:9$7=P$5$l$F$b!"(B
-$B$G$9!#(B
+$B4pK\E*$K!"$3$l$OHf3S$NA0$K9T$+$il9gBEEv$J7k2L$r$b$?$i$7$^$9(B---$B$?$H$(%K%e!<%9%j!<%@!<$N(B
+$B2>LL$r$+$V$C$?J8;zNs@Z$j9o$_5!$G@8@.$5$l$?J8;zNs$,:9$7=P$5$l$F$b!"$G$9!#(B
 
 @node Thwarting Email Spam
 @section spam $B%a!<%k$NN"$r$+$/(B
@@ -21434,23 +22410,27 @@ Gnus $B$O!"%9%3%"IU$1!"%9%l%C%I$N7A@.!"%9%l%C%IHf3S$J$I$r9T$&$H$-$K!"(B
 @cindex UCE
 @cindex unsolicited commercial email
 
-$B$3$3:G6a$N(B USENET $B$G$O!"@kEA$N%O%2%?%+$I$b$,!"H`$i$N:>5=$d@=IJ$r2!$7IU$1(B
-$B$k$?$a$NEE;R%a!<%k%"%I%l%9$rC5$=$&$H$7$F!"5$0c$$$N$h$&$K%K%e!<%9>e$r$&$m(B
-$B$D$$$F(B grep $B$7$^$/$C$F$$$^$9!#$3$l$KBP$9$kH?F0$H$7$F!"B?$/$N?M!9(B
-$B$,(B @code{From} $B9T$KL50UL#$J%"%I%l%9$rF~$l$O$8$a$k$h$&$K$J$C$F$7$^$$$^$7(B
-$B$?!#$3$l$OHs@8;:E*$J$3$H$@$H;d$O;W$$$^$9(B --- $B$"$J$?$,=q$$$?$3$H$KBP$9$k(B
-$BJV?.$H$7$F@5Ev$J%a!<%k$rAw$k$3$H$rLLE]$K$5$;!"$^$?C/$,=q$$$?$b$N$J$N$+$r(B
-$BJ,$+$j$E$i$/$7$^$9!#$3$s$J=q$-49$($O7k6I$O!"2!$7IU$1@kEA%a!<%k$=$l<+?H$h(B
-$B$j$bBg$-$J6<0R$H$J$k$+$b$7$l$^$;$s!#(B
+$B$3$3:G6a$N(B USENET $B$G$O!"@kEA$N%O%2%?%+$I$b$,H`$i$N:>5=$d@=IJ$r2!$7IU$1$k(B
+$B$?$a$NEE;R%a!<%k%"%I%l%9$rC5$=$&$H$7$F!"5$0c$$$N$h$&$K%K%e!<%9>e$r$&$m$D(B
+$B$$$F(B grep $B$7$^$/$C$F$$$^$9!#$3$l$KBP$9$kH?F0$H$7$F!"B?$/$N?M!9$,L50UL#$J(B
+$B%"%I%l%9$r(B @code{From} $B9T$KF~$l$O$8$a$k$h$&$K$J$C$F$7$^$$$^$7$?!#;d$O$3(B
+$B$l$O5U8z2L$r>7$/$H;W$$$^$9(B---$B$"$J$?$,=q$$$?$3$H$KBP$9$kJV?.$H$7$F?M!9$,(B
+$B@5Ev$J%a!<%k$rAw$k$3$H$rLLE]$K$5$;$k$@$1$G$J$/!"C/$,=q$$$?$b$N$J$N$+$rJ,(B
+$B$+$j$E$i$/$7$^$9!#$3$s$J=q$-49$($O!"7k6I$O2!$7IU$1@kEA%a!<%k$=$l<+?H$h$j(B
+$B$bBg$-$J6<0R$H$J$k$+$b$7$l$^$;$s!#(B
 
 $B;d$K$H$C$F$N(B spam $B%a!<%k$N:GBg$NLdBj$O!"13$N8}$^$l$J$$>&MQEE;R%a!<%k(B -- $B$NF,J8(B
+Commercial E-mail---$BK>$^$l$J$$>&MQEE;R%a!<%k(B---$B$NF,J8(B
 $B;z(B @acronym{UCE}) $B$N$3$H$O$h$/CN$C$F$$$k$G$7$g$&!#4JC1$K8@$($P$=$l$O;f$N(B
 $B%a!<%k$KHf$Y$FEE;R%a!<%k$NG[Aw$,$H$F$b0B$/$D$/$?$a$KB8:_$7!"Hs>o$K>.$5$J(B
 $B3d9g$N?M!9$,(B UCE $B$K1~Ez$9$k$@$1$G9-9p$^$l$J$$>&MQEE;R%a!<%k(B -- $B$NF,J8(B
 
 Spam $B$Ol9g$Ol9g$O@\$N_I2a$OM-1W$K$J$jF@$^$9!#(B
 
-$B$b$&0l$D$NEE;R%a!<%k_I2a$X$Nl9g!"H`$O$=$l$i$N(B @var{N} $B8D$N%7%9%F%`$N$&$A$N0l$D$rD4$Y$^(B
-$B$9!#(B
-
-$BJ,;67?(B spam $B=hM}$OF1;~$KB?$/$N%a%C%;!<%8$rAw$k(B spammers $B$HHs>o$K$h$/@o$C(B
-$B$F$/$l$^$9$,!"$=$l$O%f!<%6!<$,$+$J$jJ#;($J%A%'%C%/$r@_Dj$9$k$3$H$r5a$a$^(B
-$B$9!#>&MQ$H!"%U%j!<$JJ,;67?(B spam $B=hM}%7%9%F%`$,$"$j$^$9!#J,;67?(B spam $B=hM}(B
-$B$O!"$=$l<+BN$N4m81$b$O$i$s$G$$$^$9!#Nc$($P!"@5Ev$JAw?.o$=$NJ,@O$O!"$*$=$i$/C18l$NBP$+;0$D(B
-$B$NC18l$NAH9g$;$N9g@.$K$h$k!"C18l$N=P8=IQEY$NC1=c$J7W?t$G$9!#(BSpam $B$NE}7W(B
-$BJ,@O$O$[$H$s$I$N>l9g$K$H$F$b$h$/F/$/$N$G$9$,!";~$H$7$F@5Ev$JEE;R%a!<%k(B
-$B$r(B spam $B$H$7$FJ,N`$7$F$7$^$&$3$H$,$"$j$^$9!#J,@O$K$O;~4V$,$+$+$j$^$9!#$9(B
-$B$Y$F$N%a%C%;!<%8$rJ,@O$7$J$1$l$P$J$j$^$;$s!#$=$7$F%f!<%6!<$O(B spam $B$rJ,@O(B
-$B$9$k$?$a$N%G!<%?%Y!<%9$rMQ0U$7$J$1$l$P$J$j$^$;$s!#%5!<%P!<$G$NE}7WJ,@O$O(B
-$B?M5$$rF@$F$$$^$9!#$3$l$K$O!"%f!<%6!<$OC1$K%a!<%k$rFI$a$PNI$$$H$$$&D9=j$H!"(B
-$B$7$+$7%5!<%P!<$K$=$l$,2a$C$F%a!<%k$rJ,N`$7$?$3$H$rEA$($k$N$,:$Fq$@$H$$$&(B
-$BC;=j$,$"$j$^$9!#(B
+$B$b$&0l$D$NEE;R%a!<%k_I2a$X$Nl9g!"H`$O$=$l(B
+$B$i$N(B @var{N} $B8D$N%7%9%F%`$N$&$A$N0l$D$rD4$Y$^$9!#(B
+
+$BJ,;67?(B spam $B=hM}$O0lEY$K$?$/$5$s$N%a%C%;!<%8$rAw$k(B spammers $B$HHs>o$K$h$/(B
+$B@o$C$F$/$l$^$9$,!"$=$l$K$OMxMQ&MQ$H%U%j!<$JJ,;67?(B spam $B=hM}%7%9%F%`$,$"$j$^$9!#J,;67?(B spam $B=h(B
+$BM}$O!"$=$l<+BN$N4m81$b$O$i$s$G$$$^$9!#Nc$($P!"@5Ev$JAw?.o$=$NJ,@O$O!"$*$=$i(B
+$B$/C18l$NBP$+;0$D$NC18l$NAH9g$;$N9g@.$K$h$k!"C18l$N=P8=IQEY$NC1=c$J7W?t$G(B
+$B$9!#(BSpam $B$NE}7WJ,@O$O$[$H$s$I$N>l9g$K$H$F$b$h$/F/$/$N$G$9$,!";~$H$7$F@5(B
+$BEv$JEE;R%a!<%k$r(B spam $B$H$7$FJ,N`$7$F$7$^$&$3$H$,$"$j$^$9!#J,@O$K$O;~4V$,(B
+$B$+$+$j$^$9!#$9$Y$F$N%a%C%;!<%8$rJ,@O$7$J$1$l$P$J$j$^$;$s!#$=$7$FMxMQ?M$N8@$rBT$?$:$H$b!"(Bspam $B$H$N@o$$$O3Z$G$O$"$j$^$;$s!#%^%^$+$i$NEE;R%a!<(B
 $B%k$H%P%$%"%0%i9-9p$r6hJL$9$kKbK!$N%9%$%C%A$O$"$j$^$;$s!#?M!9$O(B
 $BHs(B-spam $B$H(B spam $B$r6hJL$9$k$N$KF$$$F$$$k$H$$$&$N$K!#$=$l$O!"(B
 spammers $B$,7|L?$K$=$l$i$r%^%^$@$H;W$o$;$h$&$H$7$F$$$k$N$,K\O$,(B spam $B$J$k1VIB$H$N@o$$$N=u(B
 $B$1$K$J$k$3$H$rK>$_$^$9!#(B
 
 @node Anti-Spam Basics
@@ -21556,24 +22536,24 @@ Spamming $B$O!"@$3&$,H`$i$K285A$,$"$k$H;W$C$F$$$k?M!9$N0lCD$+$i$N!"J"N)$?(B
 @cindex UCE
 @cindex unsolicited commercial email
 
-Spam $B$KBP=h$9$k0l$D$NJ}K!$O!"(Bgnus $B$KA4$F$N(B spam $B$r(B @samp{spam} $B%a!<%k%0(B
-$B%k!<%W$KJ,N%$5$;$F$7$^$&$3$H$G$9(B (@pxref{Splitting Mail})$B!#(B
+Spam $B$KBP=h$9$k0l$D$NJ}K!$O!"(Bgnus $B$K$9$Y$F$N(B spam $B$r(B @samp{spam} $B%a!<%k(B
+$B%0%k!<%W$KJ,N%$5$;$F$7$^$&$3$H$G$9(B (@pxref{Splitting Mail})$B!#(B
 
-$B:G=i$K!"$"$J$?$KE~C#@-$N$"$k@5$7$$%a!<%k%"%I%l%9$r0l$DA*$S!"$=$l$rA4$F$N(B
-$B$"$J$?$N%K%e!<%95-;v$N(B @code{From} $B%X%C%@!<$KF~$l$^$9!#(B($B$3$3$G$O(B
-@samp{larsi@@trym.ifi.uio.no} $B$rA*$S$^$7$?$,!"(B
-@samp{larsi+usenet@@ifi.uio.no} $B7A<0$N$?$/$5$s$N%"%I%l%9$NJ}$,NI$$A*Br$G(B
-$B$9!#$"$J$?$N%5%$%H$N(B sendmail $B$N@_Dj$,%a!<%k%"%I%l%9$N%m!<%+%kIt$H$7$F$I(B
-$B$s$J%-!<%o!<%I$r\n")
 @end lisp
 
-$B$=$7$F(B @code{nnmail-split-fancy} $B$K0J2<$NJ,N%5,B'$rF~$l$^(B
-$B$9(B (@pxref{Fancy Mail Splitting})$B!#(B
+$B$=$7$F(B @code{nnmail-split-fancy} $B$K0J2<$NJ,3d5,B'$rF~$F2<$5(B
+$B$$(B (@pxref{Fancy Mail Splitting})$B!#(B
 
 @lisp
 (...
@@ -21584,18 +22564,18 @@ Spam $B$KBP=h$9$k0l$D$NJ}K!$O!"(Bgnus $B$KA4$F$N(B spam $B$r(B @samp{spam}
  ...)
 @end lisp
 
-$B$3$N0UL#$O!"$3$N%"%I%l%9$KFO$$$?A4$F$N%a!<%k$r$^$:5?$$$^$9$,!"(B
-@samp{Re:} $B$G;O$^$k(B @code{Subject} $B$,$D$$$F$$$k$+!"(B@code{References} $B%X%C(B
-$B%@!<$,$D$$$F$$$l$P$*$=$i$/(B OK $B$@$m$&!"$H$$$&$3$H$G$9!#;D$j$OA4$F(B
-@samp{spam} $B%0%k!<%W$K9T$-$^$9!#(B($B$3$N%"%$%G%"$O$*$=$i$/(B Tim Pierce $B;a$K(B
-$B$h$k$b$N$G$9!#(B)
+$B$3$N0UL#$O!"$3$N%"%I%l%9$KFO$$$?$9$Y$F$N%a!<%k$,5?$o$7$$$,!"(B
+@samp{Re:} $B$G;O$^$k(B @code{Subject} $B$,IU$$$F$$$k$+!"(B@code{References} $B%X%C(B
+$B%@!<$,IU$$$F$$$l$P$*$=$i$/(B OK $B$@$m$&!"$H$$$&$3$H$G$9!#;D$j$O$9$Y(B
+$B$F(B @samp{spam} $B%0%k!<%W$K9T$-$^$9!#(B($B$3$N%"%$%G%"$O$*$=$i$/(B Tim Pierce $B;a(B
+$B$K$h$k$b$N$G$9!#(B)
 
 $B$3$l$K2C$($F!"B?$/$N%a!<%k(B spam $B20$O!"$"$J$?$N$H$3$m$N(B @acronym{SMTP} $B%5!<(B
-$B%P!<$HD>@\OC$7!"(B@code{To} $B%X%C%@!<$K$"$J$?$N%a!<%k%"%I%l%9$,L@<($5$l$J$$(B
-$B$h$&$K$7$^$9!#$J$s$G$=$s$J$3$H$r$9$k$N$+$O$o$+$j$^$;$s$,(B --- $B$*$=$i$/;d(B
-$B$?$A$NN"$r$+$/5!9=$NN"$r$+$/$?$a$+$J(B? $B$I$A$i$K$7$F$b!"BP=h$O4JC1$J$3$H$G(B
-$B$9(B --- $B$"$J$?08$F$G$J$$$b$N$rA4It(B @samp{spam} $B%0%k!<%W$K$$$l$k$@$1$G$9!#(B
-$B$3$l$O$*9%$_J,N%5,B'$N:G8e$K$3$s$JIw$KF~$l$k$3$H$G$G$-$^$9!#(B
+$B%P!<$HD>@\OC$7$F!"(B@code{To} $B%X%C%@!<$K$"$J$?$N%a!<%k%"%I%l%9$,L@<($5$l$J(B
+$B$$$h$&$K$7$^$9!#$J$s$G$=$s$J$3$H$r$9$k$N$+$O$o$+$j$^$;$s$,(B---$B$b$7$+$7$?(B
+$B$i!"$3$NN"$r$+$/5!9=$NN"$r$+$/$?$a$+$J(B? $B$I$A$i$K$7$F$b!"BP=h$O4JC1$J$3$H(B
+$B$G$9(B---$BFC5iJ,3d5,B'$r0J2<$N$h$&$K=*C<$5$;$k$3$H$K$h$C$F!"$"$J$?08$F$G$J(B
+$B$$$b$N$rA4It(B @samp{spam} $B%0%k!<%W$KF~$l$k$@$1$G$9(B:
 
 @lisp
 (
@@ -21604,16 +22584,21 @@ Spam $B$KBP=h$9$k0l$D$NJ}K!$O!"(Bgnus $B$KA4$F$N(B spam $B$r(B @samp{spam}
  "spam")
 @end lisp
 
-$B;d$N7P83$G$O!"$3$l$G;veA4$F$,@5$7$$%0%k!<%W$KJ,N`$5$l$^$9!#$^$"!"$=$l(B
-$B$G$b$H$-$I$-(B @samp{spam} $B%0%k!<%W$r%A%'%C%/$7$F!"@5$7$$%a!<%k$,$"$k$+%A%'%C(B
-$B%/$7$J$/$F$O$$$1$^$;$s$1$I$M!#$b$7$"$J$?$O<+J,$,NI$$%M%C%H%o!<%/;TL1$G$"(B
-$B$k$H;W$C$F$$$k$J$i!"$=$l$>$l$N2!$7IU$1@kEA%a!<%k$N4X78Ev6I$K6l>p$rAw$jIU(B
-$B$1$k$3$H$5$($b$G$-$^$9(B --- $B2K$J$H$-$K$G$b$M!#(B
+$B;d$N7P83$G$O!"$3$l$G$l$N2!$7IU$1@kEA%a!<%k$N4X78Ev6I$K6l>p$rAw(B
+$B$jIU$1$k$3$H$5$($b$G$-$^$9(B---$B2K$J$H$-$K$G$b$M!#(B
 
 $B$3$l$G;d$N$H$3$m$G$OF0$$$F$$$^$9!#$3$l$G$_$s$J$O4JC1$JJ}K!$G;d$KO"Mm$ruBV$G$9!#;d$N0U8+$H$7$F$O!"(B@code{From} $B%X%C%@!<(B
-$B$r56B$$7$FB8:_$7$J$$%I%a%$%s$KAw$i$;$k$N$O%-%?%J%$$G$9!#(B
+$B$3$H$O$^$C$?$/$"$j$^$;$s!#$*8_$$$KM-Mx$J>u67$G$9!#;d$K8@$o$;$l$P!"(B
+@code{From} $B%X%C%@!<$r56B$$7$FB8:_$7$J$$%I%a%$%s$KAw$i$;$k$N$O$9$4$/NI$/(B
+$B$J$$$G$9!#(B
+
+@quotation
+$BLuCm(B: $B0J>e$NJ8>O$O(B 1997$BG/(B4$B7n$K=q$+$l$^$7$?!#(B
+@end quotation
 
 $B$3$N$N$[$H$s$I$NF;6q$K$b4JC1$KE,9g$9$k$O(B
-$B$:$G$9!#(B
+Spam $B$rHr$1$k$?$a$NA0>O$N%R%s%H$,==J,$@$C$?F|!9$O2a$.5n$j$^$7$?!#:#$G$O(B
+$BO$O!"?7$7$$F;6q$,8E$$$b$N$KO$ONc$H$7$F(B SpamAssassin $B$r;H$C$F(B
+$B$$$^$9$,!"B>$N$[$H$s$I$NF;6q$K$b4JC1$KE,9g$9$k$O$:$G$9!#(B
 
-$B$3$N9`$O(B @code{spam.el} $B%Q%C%1!<%8$H$O4X78L5$$$3$H$KCm0U$7$F2<$5$$!#$=$l(B
-$B$OO$O(B @code{spam.el} $B%Q%C%1!<%8$H$O4X78L5$$$3$H$KCm0U$7$F2<$5$$!#$=$l(B
+$B$OO$GO@$8$i$l$^$9!#$9$Y$F$N(B @code{spam.el} $B$N5!G=$K4X?4$,L5$$$N$J$i(B
 $B$P!"$3$l$i$NC1=c$J%l%7%T$G4V$K9g$o$;$k$3$H$,$G$-$^$9!#(B
 
 $B$b$7$"$J$?$,;H$&F;6q$,%a!<%k%5!<%P!<$K%$%s%9%H!<%k$5$l$F$$$J$$$J$i$P!"$"(B
@@ -21648,10 +22633,9 @@ Spam $B$rHr$1$k$?$a$NA09`$N%R%s%H$,==J,$@$C$?F|!9$O2a$.5n$j$^$7$?!#:#$G$O(B
              "mv %t /tmp/foo; formail -bs spamc < /tmp/foo > %t")))
 @end lisp
 
-$B$$$C$?$s!"%a!<%k$rl9g!"%G%#%U%)%k%H$G$O5-;v$N%\%G%#$,%@%&%s%m!<(B
-$B%I$5$l$J$$$3$H$KCm0U$7$F2<$5$$!#$=$l$r$9$k$?$a$K$O!"(B
-@code{nnimap-split-download-body} $B$r(B @code{t} $B$K@_Dj$9$kI,MW$,$"$j$^(B
+Nnimap $B%P%C%/%(%s%I$N>l9g!"%G%#%U%)%k%H$G$O5-;v$N%\%G%#!<$,%@%&%s%m!<%I(B
+$B$5$l$J$$$3$H$KCm0U$7$F2<$5$$!#$=$l$r$9$k$?$a$K(B
+$B$O(B @code{nnimap-split-download-body} $B$r(B @code{t} $B$K@_Dj$9$kI,MW$,$"$j$^(B
 $B$9(B (@pxref{Splitting in IMAP})$B!#(B
 
-$B0J>e$,$3$l$K4X$9$k$3$H$G$9!#$$$/$D$+$N(B spam $B$O$I$&$7$F$bAGDL$j$7$F$7$^$&(B
-$B$N$G!"(Bspam $B$rFI$`$O$a$K$J$C$?$H$-$K8F$V$?$a$N5$$NMx$$$?4X?t$,M_$7$$$G$7$g(B
-$B$&!#$3$l$,$=$N5$$NMx$$$?4X?t$G$9(B:
+$B0J>e$,$3$l$K4X$9$k$3$H$G$9!#$"$kC5n2DG=$N0u$rIU$1$^$9!#(B"
   (interactive)
   (gnus-summary-show-raw-article)
   (gnus-summary-save-in-pipe "razor-report -f -d")
@@ -21705,35 +22690,37 @@ Spam $B$rHr$1$k$?$a$NA09`$N%R%s%H$,==J,$@$C$?F|!9$O2a$.5n$j$^$7$?!#:#$G$O(B
 @subsection Hashcash
 @cindex hashcash
 
-Spam $B$H@o$&$?$a$N?7$7$$5;K!$O!"$$$/$P$/$+$NIiC4$K$O$J$k$,L@$i$+$KFHFC$J(B
-$B$3$H$r!"Aw?.$9$k%a%C%;!<%8$KBP$7$FAw?..5,LO$J6&F1BN$G(B
-$B$OLr$KN)$D$G$7$g$&!#(B
+Spam $B$H@o$&$?$a$N;B?7$J5;K!$O!"$$$/$i$+IiC4$K$O$J$k$,L@$i$+$KFHFC$J$3$H(B
+$B$r!"Aw?.$9$k%a%C%;!<%8$KBP$7$FAw?..5,LO$J=8CD$G$OLr$K(B
+$BN)$D$G$7$g$&!#(B
 
-$BA09`$NF;6qN`$,.$5$J%Q!<%;%s%F!<%8$N(B spam $B$,$$$D$bAGDL$j$7$F$7$^$&$3$H$r0UL#$7(B
-$B$^$9!#$=$l$O$^$?!"$I$3$+$G$@$l$+$,$=$l$i$NF;6q$r99?7$9$k$?$a$K!"$?$/$5$s(B
+$BA0>O$NF;6qN`$O.$5$J%Q!<%;%s%F!<%8$N(B spam $B$,$$$D$bAGDL$j$7$F$7$^$&$3$H$r0UL#$7$^$9!#(B
+$B$=$l$O$^$?!"$I$3$+$G$@$l$+$,$=$l$i$NF;6q$r99?7$9$k$?$a$K!"$?$/$5$s(B
 $B$N(B spam $B$rFI$^$J$1$l$P$J$i$J$$$3$H$r$b0UL#$7$^$9!#(BHashcash $B$O$=$l$r2sHr(B
 $B$7$^$9$,!"Be$o$j$K$"$J$?$,EE;R%a!<%k$GO"Mm$9$k$9$Y$F$N?M$?$A$K!"$J$k$Y$/(B
-$B$=$N;EAH$_$r;H$C$F$b$i$&I,MW$,$"$j$^$9!#$"$J$?$Or(B (dogmatic) $B$NFs$D$N$N$P$i$P$i$J$b$N$h$j6/NO$J$N$G$9!#(B
+$B$=$N;EAH$_$r%5%]!<%H$7$F$b$i$$$?$$$N$G$9!#$"$J$?$OCHq$9$k$3$H$G!"6qBNE*$K$O0lDj?t$N%S%C(B
-$B%H$^$G%O%C%7%e$N>WFM(B (hash collision) $B$r7W;;$9$k$3$H$G$9!#$=$N7k2L$H$7$F(B
-$B$N(B hashcash $B%/%C%-!<$O(B @samp{X-Hashcash:} $B%X%C%@!<$KA^F~$5$l$^$9!#$b$C$H(B
-$B>\$7$$$3$H!"$=$7$F$3$N5!G=$r;H$&$?$a$K%$%s%9%H!<%k$9$kI,MW$,$"$k30It%"%W(B
-$B%j%1!<%7%g%s$N(B @code{hashcash} $B$K$D$$$F(B
+$B!V$$$/$i$+IiC4$K$O$J$k!W$H$O(B CPU $B;~4V$r>CHq$9$k$3$H$G!"$b$C$H6qBNE*$K$O(B
+$B0lDj?t$N%S%C%H$^$G%O%C%7%e$N>WFM(B (hash collision) $B$r7W;;$9$k$3$H$G$9!#$=(B
+$B$N7k2L$H$7$F$N(B hashcash $B%/%C%-!<$O(B @samp{X-Hashcash:} $B%X%C%@!<$KA^F~$5$l(B
+$B$^$9!#$b$C$H>\$7$$$3$H!"$=$7$F$3$N5!G=$r;H$&$?$a$K%$%s%9%H!<%k$9$kI,MW$,(B
+$B$"$k30It%"%W%j%1!<%7%g%s$N(B @code{hashcash} $B$K$D$$$F(B
 $B$O(B @uref{http://www.hashcash.org/} $B$r;2>H$7$F2<$5$$!#$5$i$J$k>pJs(B
 $B$,(B @uref{http://www.camram.org/} $B$G8+$D$+$k$G$7$g$&!#(B
 
 $BAw?.$9$k%a%C%;!<%8$N$=$l$>$l$K$D$$$F(B hashcash $B$r@8@.$5$;$h$&$H;W$&$J$i!"(B
-$B0J2<$N$h$&$K(B @code{message-generate-hashcash} (@pxref{Mail Headers,,Mail
-Headers,message-ja, The Message Manual}) $B$r%+%9%?%^%$%:$7$F2<$5$$(B:
+$B0J2<$N$h$&$K(B @code{message-generate-hashcash} (@pxref{Mail Headers,
+,$B%a!<%k%X%C%@!<(B, message-ja, The Message Manual}) $B$r%+%9%?%^%$%:$7$F2<$5(B
+$B$$(B:
 
 @lisp
 (setq message-generate-hashcash t)
@@ -21744,31 +22731,31 @@ Headers,message-ja, The Message Manual}) $B$r%+%9%?%^%$%:$7$F2<$5$$(B:
 @table @code
 @item hashcash-default-payment
 @vindex hashcash-default-payment
-$B$3$NJQ?t$O%O%C%7%e$N>WFM$r@.$9%G%#%U%)%k%H$N%S%C%H?t$r<($7$^$9!#5,DjCM(B
-$B$O(B 20 $B$G$9!#Ds>'$5$l$F$$$kM-8z$JCM$O(B 17 $B$+$i(B 29 $B$^$G$N?t$G$9!#(B
+$B$3$NJQ?t$O%O%C%7%e$N>WFM$r@.$9%G%#%U%)%k%H$N%S%C%H?t$r<($7$^$9!#%G%#%U%)(B
+$B%k%H$O(B 20 $B$G$9!#Ds>'$5$l$F$$$kM-8z$JCM$O(B 17 $B$+$i(B 29 $B$^$G$N?t$G$9!#(B
 
 @item hashcash-payment-alist
 @vindex hashcash-payment-alist
 $B2??M$+$NWFM$N%S%C%H?t$G$9!#$3$l$O$^(B
+$B%W(B)$B!"(B@var{amount} $B$O>WFM$GI,MW$H$5$l$k%S%C%H?t$G$9!#$3$l$O$^(B
 $B$?(B @samp{(@var{addr} @var{string} @var{amount})} $B$NMWAG$r;}$D$3$H$b2DG=(B
 $B$G!"(B@var{string} $B$OJ8;zNs(B ($BDL>o$O%a!<%k%"%I%l%9$+%K%e!<%9%0%k!<%WL>(B) $B$H(B
 $B$7$F;H$o$l$^$9!#(B
 
 @item hashcash-path
 @vindex hashcash-path
-@code{hashcash} $B%P%$%J%j$,%$%s%9%H!<%k$5$l$F$$$k>l=j!#$3$NJQ?t(B
+@code{hashcash} $B%P%$%J%j!<$,%$%s%9%H!<%k$5$l$F$$$k>l=j$G$9!#$3$NJQ?t(B
 $B$O(B @code{executable-find} $B$K$h$C$F<+F0E*$K@_Dj$5$l$k$O$:$G$9$,!"$=$l(B
-$B$,(B @code{nil} $B$@$C$?(B ($B$"$j$,$A$J$N$O(B @code{hashcash} $B%P%$%J%j$,l9g$O!"(Bhashcash payments $B$r%A%'%C%/$9$k$H$-$K7Y9p$5$l!"(B
 hashcash payments $B$r@8@.$9$k$H$-$O%(%i!<$K$J$k$G$7$g$&!#(B
 @end table
 
-Gnus $B$O(B hashcash $B%/%C%-!<$rG'>Z$9$k$3$H$,$G$-$^$9$,!"Z$9$k$3$H$,$G$-$^$9$,!"Z$9$k$K$O!"(B@code{hashcash.el} $B%i%$%V%i%j(B
+$B%-!<$rG'>Z$9$k$K$O!"(B@code{hashcash.el} $B%i%$%V%i%j!<(B
 $B$N(B @code{mail-check-payment} $B4X?t$r;H$C$F2<$5$$!#F~$C$F$-$?%a!<%k(B
 $B$N(B hashcash $B%/%C%-!<$r3NG'$7!"$=$l$K$h$C$F%a!<%k$r_I2a$9$k$?$a$K!"(B
 @code{spam-use-hashcash} $B%P%C%/%(%s%I$G(B @code{spam.el} $B$r;H$&$3$H$b$G$-(B
@@ -21779,13 +22766,13 @@ Gnus $B$O(B hashcash $B%/%C%-!<$rG'>Z$9$k$3$H$,$G$-$^$9$,!"A0$G$9!#(B
+@code{spam.el} $B$,@8$^$l$?GX7J$K$O!"(Bspam $B$N8!=P$H_I2a$N$?$a$N41@)%;%s%?!<(B
+$B$r(B gnus $B$NCf$K;}$D$H$$$&L\E*$,$"$j$^$7$?!#$=$N$?$a$K(B @code{spam.el} $B$OFs(B
+$B$D$N$3$H$r9T$J$$$^$9(B: $B?7$7$$%a!<%k$r_I2a$7!"(Bspam $B$^$?$O(B ham $B$H$7$FCN$i$l(B
+$B$F$$$k%a!<%k$rJ,@O$9$k$3$H$G$9!#(B@dfn{Ham} $B$O(B @code{spam.el} $B$N$$$?$k=j(B
+$B$G(B spam $B$G$O$J$$%a%C%;!<%8$r<($9$?$a$K;H$&L>A0$G$9!#(B
 
-@code{spam.el} $B%7!<%1%s%9$N%$%Y%s%H$N9`$r$A$c$s$HFI$_$^$7$g$&!#(B
+@code{spam.el} $B%7!<%1%s%9$N%$%Y%s%H$N>O$r$A$c$s$HFI$_$^$7$g$&!#(B
 @ref{Spam ELisp Package Sequence of Events} $B$r;2>H$7$F2<$5$$!#(B
 
 @cindex spam-initialize
@@ -21805,9 +22792,9 @@ spam filtering}) $B$N$G$"$l$P!"$=$l$r(B @code{spam-initialize} $B$h$jA0(B
 
 $BBh0l$K(B @code{spam-initialize} $B$K$h$C$F$$$/$D$+$N%U%C%/$,F0:n$9$k$h$&$K$J(B
 $B$j$^$9!#(B@code{spam-stat} $B$,$=$l$i$N%G!<%?%Y!<%9$r%;!<%V$G$-$k$h$&$K$9$k(B
-$B%U%C%/$H!"%0%k!<%W$KF~$k$H$-$HH4$1$k$H$-$K6=L#?<$$J*;v$r5/$3$9%U%C%/$,$"(B
-$B$j$^$9!#%7!<%1%s%9$N%$%Y%s%H$K$D$$$F$N>\:Y$O8e=R(B (@pxref{Spam ELisp
-Package Sequence of Events})$B!#(B
+$B%U%C%/$H!"%0%k!<%W$KF~$k$H$-$HH4$1$k$H$-$K6=L#?<$$$b$N$4$H$r5/$3$9%U%C%/(B
+$B$,$"$j$^$9!#%7!<%1%s%9$N%$%Y%s%H$K$D$$$F$N>\:Y$O8e=R$7$^$9(B (@pxref{Spam
+ELisp Package Sequence of Events})$B!#(B
 
 $B0J2<$N%-!<%\!<%IL?Na$,;H$($k$h$&$K$J$j$^$9(B:
 
@@ -21834,10 +22821,7 @@ Spam $B5-;v$r8+$?$H$-$O$$$D$G$b!"%0%k!<%W$rH4$1$kA0$KI,$:(B @kbd{M-d} $B$G$=$
 @code{spam-bogofilter-score}$B!#(B
 
 $B$3$N%3%^%s%I$,$A$c$s$HF/$/$?$a$K$O(B Bogofilter $B$r%$%s%9%H!<%k$7$J$1$l$P$J(B
-$B$j$^$;$s!#(B
-
-@xref{Bogofilter}.
-
+$B$j$^$;$s!#(B@xref{Bogofilter}.
 @end table
 
 $B$^$?!"(B@file{spam.el} $B$rFI$_9~$`$H!"$=$NJQ?t72$r%+%9%?%^%$%:$9$k$3$H$,$G(B
@@ -21869,102 +22853,107 @@ Spam $B5-;v$r8+$?$H$-$O$$$D$G$b!"%0%k!<%W$rH4$1$kA0$KI,$:(B @kbd{M-d} $B$G$=$
 @cindex spam filtering
 @cindex spam filtering sequence of events
 @cindex spam
-$B$I$N$h$&$K(B @code{spam.el} $B$,F/$/$+$rM}2r$9$k$?$a$K!"I,$:$3$N9`$rFI$s$G2<(B
+
+$B$I$N$h$&$K(B @code{spam.el} $B$,F/$/$+$rM}2r$9$k$?$a$K!"I,$:$3$N>O$rFI$s$G2<(B
 $B$5$$!#FI$_Ht$P$7!"B.FI!"$^$?$OH(B
-$B$7$F2<$5$$!#(B
+$B$,(B @dfn{Spool File} $B$H8F$P$l$k0l$D$N%U%!%$%k$KH$7$F2<$5$$!#(B
 
 @vindex gnus-spam-autodetect
 @vindex gnus-spam-autodetect-methods
 @code{nntp} $B$N$h$&$J%P%C%/%(%s%I$K$O?7Ce%a!<%k$N%9%W!<%k$,L5$$$N$G!"Be$o(B
 $B$j$N5!9=$r;H$o$J$1$l$P$J$j$^$;$s!#$3$l$O!"%5!<%P!<$,?7Ce%a!<%k$NJ,3d$rC4(B
-$BEv$7$F$$$F!"(BGnus $B$,$5$i$K$^$?J,3d$r9T$J$o$J$$%P%C%/%(%s%I$G$b!"(B($BBe$o$j$N(B
+$BEv$7$F$$$F!"(Bgnus $B$,$5$i$K$^$?J,3d$r9T$J$o$J$$%P%C%/%(%s%I$G$b!"(B($BBe$o$j$N(B
 $B5!9=$,(B) $BI,MW$K$J$k$+$b$7$l$^$;$s!#%0%k!<%W%Q%i%a!<(B
-$B%?(B @code{spam-autodetect} $B$H(B @code{spam-autodetect-methods} ($BIaDL(B @kbd{G
-c} and @kbd{G p} $B$GA`:n2D(B)$B!"$=$7$F$=$l$i$KBP1~$9$kJQ(B
+$B%?!<(B @code{spam-autodetect} $B$H(B @code{spam-autodetect-methods} ($BIaDLDL$j(B
+$B$K(B @kbd{G c} and @kbd{G p} $B$GA`:n$G$-$^$9(B)$B!"$=$7$F$=$l$i$KBP1~$9$kJQ(B
 $B?t(B @code{gnus-spam-autodetect} $B$*$h(B
 $B$S(B @code{gnus-spam-autodetect-methods} (@kbd{M-x customize-variable} $B$G(B
-$BA`:n2D(B) $B$,LrN)$A$^$9!#(B
-
-@code{spam-autodetect} $B$,;H$o$l$k>l9g(B ($B$=$l$O%0%k!<%W(B/$B%H%T%C%/$K$D$$$F!"(B
-$B$"$k$$$OI,MW$K1~$8$F!"@55,I=8=$N9gCW$K$h$C$F==GD$R$H$+$i$2$K(B ON $B$K$G$-$^(B
-$B$9(B)$B!"$=$l$O%0%k!<%W$KF~$k(B ($B$=$N%0%k!<%W$N35N,%P%C%U%!$K0\F0$9$k(B) $B=hM}$K(B
-$B$*$$$F/$J$j$H$b(B spam $B_I2a$N4IM}$r%f!<%6$K5v2D$7(B
-$B$^$9!#%f!<%6$O3F%0%k!<%W$N(B spam $B8!=P$Nl9g(B ($B$=$l$O%0%k!<%W(B/$B%H%T%C%/$G;H$&$?$a(B
+$B$K!"I,MW$K1~$8$F@55,I=8=$N9gCW$K$h$j!"$^$?$O==GD$R$H$+$i$2$K(B ON $B$K$9$k$3(B
+$B$H$,$G$-$^$9(B)$B!"$=$l$O%0%k!<%W$KF~$k$?$a$N(B ($B$=$N%0%k!<%W$N35N,%P%C%U%!!<(B
+$B$K0\F0$9$k$?$a$N(B) $B=hM}$K$*$$$F/$J$j$H$bG'$a$^$9!#MxMQo(B
-$B$N(B spam $B$H$7$F=hM}$5$l$^$9!#H`$,(B @code{spam-split} $B$G9T$J$C$F$bNI$$$h$&(B
-$B$K!"%f!<%6$O8!::$N(B @emph{sequence} $B$r$h$j>/$J$/4IM}$7$^$9!#(B
-
-$B?7$?$KJ,3d$5$l$?%a!<%k$,%0%k!<%W$KF~$C$?!"$^$?$O%a%C%;!<%8$,(B ham $B$^$?(B
-$B$O(B spam $B$H$7$F<+F08!=P$5$l$?>l9g!"8e$K(B spam $B=hM}$r9T$J$o$;$k$?$a$K!"$=$l(B
-$B$i$N%0%k!<%W$r(B ($BI,MW$J$iF~$C$?8e$G(B) $BH4$1=P$J$/$F$O$J$j$^$;$s!#%0%k!<%W$,(B
-$B$=$N(B @code{spam-content} $B%Q%i%a!<%?(B (@pxref{Spam ELisp Package Global
-Variables}) $B$K4p$E$$$F(B ham $B$^$?$O(B spam $B%0%k!<%W$H9M$($i$l$k$+!"L$J,N`$+(B
-$B$I$&$+$O=EMW$G$9!#(BSpam $B%0%k!<%W$O!"$=$3$KF~$k$H!"$^$@FI$^$l$?$3$H$,L5$$!"(B
-$B$^$?$OL$FI$N5-;v$K(B spam $B$N0u$,IU$1$i$l$k(B ($BJQ(B
-$B?t(B @code{spam-mark-only-unseen-as-spam} $B$K0MB8(B) $B$H$$$&IU2CE*$JFC@-$r;}$A(B
-$B$^$9!#$3$N$h$&$K!"J,3d$5$l$F(B spam $B%0%k!<%W$KF~$l$i$l$?5-;v$K$O!"$"$J$?$,(B
-$B$=$N%0%k!<%W$KF~$C$?$H$-$K<+F0E*$K(B spam $B$N0u$,IU$1$i$l$^$9!#(B
-
-$B$7$?$,$C$F!"%0%k!<%W(B ($B$N35N,%P%C%U%!(B) $B$rH4$1$k(B
+$B$F$N5-;v$K$O(B spam $B0u(B @samp{$} $B$,IU$1$i$l!"%0%k!<%W$rH4$1$k$H$-$KDL>o(B
+$B$N(B spam $B$H$7$F=hM}$5$l$^$9!#(B@code{spam-split} $B$G9T$J$C$F$bNI$$$h$&$K!"Mx(B
+$BMQl9g$G$b!"$=$l$i$,(B @code{nil} $B$@$C$?>l9g!"$=$N5-;v$O8=:_$N%0%k!<(B
-$B%W$K;D$5$l$^$9!#(B
-
-$B$I$l$+$N%0%k!<%W$G(B spam $B$,8+$D$+$C$?$i(B ($BHs(B-spam $B%0%k!<%W$K8B$C(B
-$B$F$O(B @code{spam-move-spam-nonspam-groups-only} $B$GJQ992D(B)$B!"%0%k!<%W$rH4$1(B
-$B$k$H$-$K3h$-$F$$$k(B @code{spam-processors} (@pxref{Spam ELisp Package
-Global Variables}) $B$G=hM}$5$l$^$9!#$5$i$K!"8e$G%H%l!<%K%s%0$^$?$O:o=|$9(B
-$B$k$?$a$K!"(Bspam $B$O(B @code{spam-process-destination} (@pxref{Spam ELisp
-Package Global Variables}) $B$K0\F0$5$;$i$l$^$9!#(BSpam $B$,:F;0=hM}$5$l$k$3$H(B
-$B$rK>$^$J$$$J$i$P!"(B@file{gnus-registry.el} $B%Q%C%1!<%8$rFI$_9~$_!"(B
-@code{spam-log-to-registry} $BJQ?t$rM-8z$K$7$J$1$l$P$J$j$^$;$s!#$3$N$h$&(B
-$B$K(B spam $B$O$I$3$G$b8!=P$5$l=hM}$5$l$^$9!#$=$l$O$[$H$s$I$N?M!9$,!"$=$&$7$?(B
-$B$$$H;W$&$3$H$G$9!#(B@code{spam-process-destination} $B$,(B @code{nil} $B$@$C$?>l(B
-$B9g!"(Bspam $B$K$O4|8B@Z$l>C5n$N0u$,IU$1$i$l$^$9!#IaDL$=$l$O@5$7$$9T$J$$$G$9!#(B
-
-Spam $B$,0\F0$G$-$J$$>l9g(B ($BNc$($P(B @acronym{NNTP} $B$N$h$&$JFI$_9~$_@lMQ%P%C(B
-$B%/%(%s%I$G$"$k$?$a$K(B)$B!"$=$l$O%3%T!<$5$l$^$9!#(B
-
-Ham $B%0%k!<%W$G(B @code{ham-marks} $B%Q%i%a!<%?$G7hDj$5$l$k(B ham $B%a!<%k$,8+$D(B
-$B$+$C$?$i!"%0%k!<%W$rH4$1$k$H$-$K3h$-$F$$$k(B ham @code{spam-processor} $B$G(B
-$B=hM}$5$l$^$9!#$5$i$K!"JQ?t(B @code{spam-process-ham-in-spam-groups} $B$*$h(B
+$B$O(B @code{spam-process-destination} $B$N$I$A$i$,$U$5$o$7$$(B ($BLuCp(B: $B0\F0@h$H(B
+$B$7$F(B) $B>l9g$G$b!"$=$l$i$,(B @code{nil} $B$@$C$?$i!"$=$N5-;v$O8=:_$N%0%k!<%W$K(B
+$B;D$5$l$^$9!#(B
+
+$B$I$N%0%k!<%W$G$G$b(B spam $B$,8+$D$+$C$?$i(B ($BHs(B-spam $B%0%k!<%W$K8B$C$F(B
+$B$O(B @code{spam-move-spam-nonspam-groups-only} $B$GJQ99$9$k$3$H$,$G$-$^$9(B)$B!"(B
+$B%0%k!<%W$rH4$1$k$H$-$KM-8z$K$J$C$F$$$k(B @code{spam-processors} (@pxref{Spam
+ELisp Package Global Variables}) $B$G=hM}$5$l$^$9!#$5$i$K8e$G%H%l!<%K%s%0(B
+$B$^$?$O:o=|$9$k$?$a$K!"(Bspam $B$O(B @code{spam-process-destination}
+(@pxref{Spam ELisp Package Global Variables}) $B$K0\F0$5$;$i$l$^$9!#(B
+Spam $B$,:F;0=hM}$5$l$k$3$H$rK>$^$J$$$J$i$P!"(B@file{gnus-registry.el} $B%Q%C(B
+$B%1!<%8$rFI$_9~$s$G!"(B@code{spam-log-to-registry} $BJQ?t$rM-8z$K$7$J$1$l$P$J(B
+$B$j$^$;$s!#$3$N$h$&$K(B spam $B$O$I$3$G$b8!=P$5$l=hM}$5$l$^$9!#$=$l$,!"$[$H$s(B
+$B$I$N?M!9$,$=$&$7$?$$$H;W$&$3$H$G$9!#(B
+@code{spam-process-destination} $B$,(B @code{nil} $B$@$C$?>l9g$K$O!"(Bspam $B$K$O(B
+$B4|8B@Z$l>C5n$N0u$,IU$1$i$l$^$9!#IaDL$=$l$O@5$7$$9T$J$$$G$9!#(B
+
+$BNc$($P(B @acronym{NNTP} $B$N$h$&$JFI$_9~$_@lMQ%P%C%/%(%s%I$G$"$k$?$a(B
+$B$K(B spam $B$r0\F0$G$-$J$$>l9g!"$=$l$O%3%T!<$5$l$^$9!#(B
+
+Ham $B%0%k!<%W$K$*$$$F(B @code{ham-marks} $B%Q%i%a!<%?!<$K$h$C$F7hDj$5$l(B
+$B$k(B ham $B%a!<%k$,8+$D$+$C$?$i!"%0%k!<%W$rH4$1$k$H$-$KM-8z$K$J$C$F$$(B
+$B$k(B ham @code{spam-processor} $B$G=hM}$5$l$^$9!#$5$i$K!"JQ(B
+$B?t(B @code{spam-process-ham-in-spam-groups} $B$*$h(B
 $B$S(B @code{spam-process-ham-in-nonham-groups} $B$K$h$C$F!"$I$3$G8+$D$+$C(B
 $B$?(B ham $B$G$b=hM}$G$-$k$h$&$KF0:n$rJQ99$9$k$3$H$,$G$-$^$9!#(BHam $B$,:F;0=hM}(B
 $B$5$l$k$3$H$rK>$^$J$$$J$i$P!"(B@file{gnus-registry.el} $B%Q%C%1!<%8$rFI$_9~$_!"(B
 @code{spam-log-to-registry} $BJQ?t$rM-8z$K$7$J$1$l$P$J$j$^$;$s!#$3$N$h$&(B
 $B$K(B ham $B$OI,MW$J>l9g$@$18!=P$5$l=hM}$5$l$^$9!#$=$l$O$[$H$s$I$N?M!9$,!"$=(B
-$B$&$7$?$$$H;W$&$3$H$G$9!#$3$l$K4X$9$k>\:Y$O(B @xref{Spam ELisp Package
-Configuration Examples}.
+$B$&$7$?$$$H;W$&$3$H$G$9!#$3$l$K4X$9$k>\:Y$O(B @ref{Spam ELisp Package
+Configuration Examples} $B$K$"$j$^$9!#(B
 
-Ham $B$,0\F0$G$-$J$$>l9g(B ($BNc$($P(B @acronym{NNTP} $B$N$h$&$JFI$_9~$_@lMQ%P%C%/(B
-$B%(%s%I$G$"$k$?$a$K(B)$B!"$=$l$O%3%T!<$5$l$^$9!#(B
+$BNc$($P(B @acronym{NNTP} $B$N$h$&$JFI$_9~$_@lMQ%P%C%/%(%s%I$G$"$k$?$a(B
+$B$K(B ham $B$r0\F0$G$-$J$$>l9g!"$=$l$O%3%T!<$5$l$^$9!#(B
 
 $B$3$l$i$N$9$Y$F$,$o$1$,$o$+$i$J$/$F$b!"?4G[$OMW$j$^$;$s(B ($BLuCm(B: $B$G$bLuJ8$,(B
 $B@53N$G$O$J$$$+$b$7$l$J$$$N$G!"JQ$@$H;W$C$?$i86J8$r8+$F$M(B :-p)$B!#$9$0$K$=(B
@@ -21978,9 +22967,9 @@ Ham $B$,0\F0$G$-$J$$>l9g(B ($BNc$($P(B @acronym{NNTP} $B$N$h$&$JFI$_9~$_@lM
 @cindex spam filtering incoming mail
 @cindex spam
 
-$BF~$C$F$/$k%a!<%k$r_I2a$9$kL\E*$G(B @code{spam.el} $B$r;H$&$K$O!"FC5iJ,3d%j%9(B
-$B%H(B @code{nnmail-split-fancy} $B$^$?$O(B @code{nnimap-split-fancy} $B$K0J2<$rDI(B
-$B2C$7$J$1$l$P$J$j$^$;$s(B:
+$BF~$C$F$/$k%a!<%k$r_I2a$9$kL\E*$G(B @code{spam.el} $B$N5!9=$r;H$&$K$O!"FC5iJ,(B
+$B3d%j%9%H(B @code{nnmail-split-fancy} $B$^$?$O(B @code{nnimap-split-fancy} $B$K0J(B
+$B2<$N$b$N$rDI2C$7$J$1$l$P$J$j$^$;$s(B:
 
 @example
 (: spam-split)
@@ -21990,27 +22979,29 @@ Ham $B$,0\F0$G$-$J$$>l9g(B ($BNc$($P(B @acronym{NNTP} $B$N$h$&$JFI$_9~$_@lM
 $B;H$C$F$$$k$+$K1~$8$F!"(B@code{nnmail-split-fancy} $B$^$?(B
 $B$O(B @code{nnimap-split-fancy} $B$+$i8F$P$l$k$3$H$KCm0U$7$F2<$5$$!#(B
 
-$B$5$i$K!"(B@code{spam-split} $B$O$$$+$J$kJ}K!$K$h$C$F$b?7Ce%a!<%k$r2~JQ$7$^$;(B
-$B$s!#(B
-
-@code{spam-split} $B4X?t$OF~$C$F$/$k%a!<%k$r=hM}$7!"(Bspam $B$H;W$o$l$k%a!<%k(B
-$B$rJQ?t(B @code{spam-split-group} $B$GM?$($i$l$kL>A0$N%0%k!<%W$KAw$j$^$9!#%G%#(B
-$B%U%)%k%H$G$O$=$N%0%k!<%WL>$O(B @samp{spam} $B$G$9$,!"(B
-@code{spam-split-group} $B$r%+%9%?%^%$%:$9$k$3$H$,2DG=$G$9!#(B
-@code{spam-split-group} $B$NFbMF$,(B @emph{$B@dBP(B} $B%0%k!<%WL>$G$"$k$3$H!"Nc$((B
-$B$P(B @samp{your-server} $B$H$$$&(B @code{nnimap} $B%5!<%P!<$N>l9g$O!"(B
-@samp{spam} $BJQ?t$,:G=*E*$K(B @samp{nnimap+your-server:spam} $B$K$J$k$3$H$r3N(B
-$B$+$a$F2<$5$$!#=>$C$F(B @samp{nnimap+server:spam} $B$H$$$&CM$O4V0c$$$G!"$=$l(B
-$B$O$KBP$7(B
-$B$F42MF$+$I$&$+$K0MB8$9$k$G$7$g$&!#(B
-
-$B$^$?!"(B@code{spam-split} $B$K%Q%i%a!<%?!"Nc$((B
-$B$P(B @code{spam-use-regex-headers} $B$^$?$O(B @code{"maybe-spam"} $B$rM?$($k$3$H(B
-$B$b$G$-$^$9!#$J$<$3$l$,M-MQ$J$N$G$7$g$&$+(B?
-
-$B$3$l$i$N(B (@code{spam-use-regex-headers} $B$H(B @code{spam-use-blackholes} $B$N(B
-$B@_Dj$K$h$k(B) $BJ,3d$N5,B'$r8+$F2<$5$$(B:
+$B$^$?!"(B@code{spam-split} $B$O$$$+$J$kJ}K!$K$h$C$F$b?7Ce%a!<%k$r2~JQ$7$^$;$s!#(B
+
+@code{spam-split} $B4X?t$OF~$C$F$/$k%a!<%k$r=hM}$7$F!"(Bspam $B$H8+$J$5$l$?%a!<(B
+$B%k$rJQ?t(B @code{spam-split-group} $B$GM?$($i$l$kL>A0$N%0%k!<%W$KAw$j$^$9!#(B
+$B%G%#%U%)%k%H$G$O$=$N%0%k!<%WL>$O(B @samp{spam} $B$G$9$,!"(B
+@code{spam-split-group} $B$G%+%9%?%^%$%:$9$k$3$H$,2DG=$G$9!#(B
+@code{spam-split-group} $B$NFbMF$O!"I,$:(B @emph{$BAjBPE*$J(B} $B%0%k!<%WL>(B ($BLuCm(B:
+@samp{spam} $B$N$h$&$J%P%C%/%(%s%I$H%5!<%P!<$rFCDj$7$J$$%0%k!<%WL>(B) $B$K$7$F(B
+$B2<$5$$!#$3$l$O!"Nc$($P(B @samp{your-server} $B$H$$$&(B @code{nnimap} $B%5!<%P!<(B
+$B$K$*$$$F!"(B@samp{spam} $B$H$$$&CM$,:G=*E*(B
+$B$K(B @samp{nnimap+your-server:spam} $B$K$J$k$H$$$&$3$H$G$9!#=>$C(B
+$B$F(B @samp{nnimap+server:spam} $B$H$$$&CM$O4V0c$$$G$"$C$F!"$=$l$O$KBP$7$F42MF$+(B
+$B$I$&$+$K$h$k$G$7$g$&!#(B
+
+$B$^$?!"Nc$($P(B @code{spam-use-regex-headers} $B$^$?$O(B @code{"maybe-spam"} $B$N(B
+$B$h$&$J%Q%i%a!<%?!<$r!"(B@code{spam-split} $B$KM?$($k$3$H$b$G$-$^$9!#$J$<$3$l(B
+$B$,M-MQ$J$N$G$7$g$&$+(B?
+
+$Bl9g(B ($BNc$($P(B @acronym{NNTP} $B$N$h$&$JFI$_9~$_@lM
 @end example
 
 $B$5$F!"LdBj$O(B ding $B08$F$N%a%C%;!<%8$r$9$Y$F(B ding $B%U%)%k%@!<$KF~$l$h$&$H$7(B
-$B$F$$$k$3$H$G$9!#$G$b$=$l$O(B ding $B%a!<%j%s%0%j%9%H08$F$KAw$i$l$?(B spam ($BNc(B
-$B$($P(B SpamAssassin $B$H(B @code{spam-use-regex-headers} $B$K$h$C$F8!=P$5$l(B
-$B$k(B spam) $B$r5v$7$F$7$^$&$G$7$g$&!#0lJ}!"$$$/$D$+$N(B ding $B08$F$N%a%C%;!<%8(B
-$B$O%V%i%C%/%[!<%k%j%9%H$K:\$C$F$$$k%a!<%k%5!<%P!<$+$i$d$C$FMh$k$N$G!"(B
+$B$F$$$k$3$H$G$9!#$G$b$=$l$O!"(Bding $B%a!<%j%s%0%j%9%H08$F$KAw$i$l$?L@$i$+(B
+$B$J(B spam ($BNc$($P(B SpamAssassin $B$H(B @code{spam-use-regex-headers} $B$K$h$C$F8!(B
+$B=P$5$l$k(B spam) $B$r5v$7$F$7$^$&$G$7$g$&!#0lJ}!"$$$/$D$+$N(B ding $B08$F$N%a%C(B
+$B%;!<%8$O%V%i%C%/%[!<%k%j%9%H$K:\$C$F$$$k%a!<%k%5!<%P!<$+$i$d$C$FMh$k$N$G!"(B
 ding $B$N5,B'$h$jA0$K(B @code{spam-split} $B$rH/F0$9$k$3$H$,$G$-$^$;$s!#(B
 
-SpamAssassin $B%X%C%@!<$K(B ding $B$N5,B'$rCV$-49$($5$;$k$3$H$O$G$-$^$9$,!"B>(B
-$B$N$9$Y$F$N(B @code{spam-split} $B$N5,B'(B ($BBhFs$N@55,I=8=%X%C%@!<8!::$r4^(B
-$B$`(B) $B$O(B ding $B$N5,B'$N8e$K$J$C$F$7$^$&$G$7$g$&!#(B
+SpamAssassin $B%X%C%@!<$G(B ding $B$N5,B'$rCV$-49$($k$3$H$O$G$-$^$9$,!"B>$N$9(B
+$B$Y$F$N(B @code{spam-split} $B$N5,B'(B ($BBhFs$N@55,I=8=%X%C%@!<8!::$r4^(B
+$B$`(B) $B$O(B ding $B$N5,B'$N8e$K$J$C$F$7$^$&$G$7$g$&(B:
 
 @example
  nnimap-split-fancy '(|
-;;; @r{@code{spam-use-regex-headers} $B$G8!=P$5$l$?$9$Y$F$N(B spam $B$O(B @samp{regex-spam} $B$X!#(B}
+;;; @r{@code{spam-use-regex-headers} $B$G8!=P$5$l$?(B}
+;;; @r{$B$9$Y$F$N(B spam $B$O(B @samp{regex-spam} $B$X!#(B}
                       (: spam-split "regex-spam" 'spam-use-regex-headers)
                       (any "ding" "ding")
-;;; @r{spam-split $B$G8!=P$5$l$?B>$N$9$Y$F$N(B spam $B$O(B @code{spam-split-group} $B$X!#(B}
+;;; @r{spam-split $B$G8!=P$5$l$?B>$N$9$Y$F$N(B spam $B$O(B}
+;;; @r{@code{spam-split-group} $B$X!#(B}
                       (: spam-split)
                       ;; @r{$B%G%#%U%)%k%H$N%a!<%k%\%C%/%9!#(B}
                       "mail")
 @end example
 
-$B4pK\E*$K!"$3$l$OFC$K$"$J$?$NI,MW$K0MB8$7$?FCDj$N(B @code{spam-split} $B8!(B
-$B::$r5/F0$5$;!"$=$l$i$N8!::$N7k2L$OFCDj$N(B spam $B%0%k!<%W$r;X$7<($7$^$9!#$9(B
-$B$Y$F$N%a!<%k$r$9$Y$F$N(B spam $B%F%9%H$KEj$2$kI,MW$O$"$j$^$;$s!#$3$l$,NI$$JL(B
-$B$NM}M3$O!"5,B'$r;}$C$F$$$k%a!<%j%s%0%j%9%H$X$N%a%C%;!<%8$KBP$7$F!";q8;=8(B
-$BLsE*$J%V%i%C%/%[!<%k!&%A%'%C%/$rr7o(B
-$BIU$-$NFI$_9~$_$,9T$o$l$k$+$i$G$9!#(B
+$B$3$l$O!"$"$J$?$NFCJL$JI,MW$K1~$8$?FCDj$N(B @code{spam-split} $B8!::$r5/F0$7!"(B
+$B$=$l$i$N8!::$N7k2L$GFCDj$N(B spam $B%0%k!<%W$r;X$7<($7$^$9!#$9$Y$F$N%a!<%k$K(B
+$BBP$7$F!"$9$Y$F$N(B spam $B8!::$r9T$J$&I,MW$O$"$j$^$;$s!#$3$l$,NI$$$b$&0l$D$N(B
+$BM}M3$O!"J,3d5,B'$r@_Dj$7$F$"$k%a!<%j%s%0%j%9%H08$F$N%a%C%;!<%8$KBP$7$F!"(B
+$B;q8;=8LsE*$J%V%i%C%/%[!<%k!&%A%'%C%/$rr7oIU$-$NFI$_9~$_$,9T$J$o$l$k$+$i(B
+$B$G$9!#(B
 
 @emph{@acronym{IMAP} $BMxMQl9g$O!"%V!<(B
-$B%kJQ?t(B @code{nnimap-split-download-body} $B$,@_Dj$5$l$kI,MW$,$"$j$^$9!#%G%#(B
+$B%X%C%@!<$@$1$G$O$J$/%a%C%;!<%8A4BN$K4p$E$$$FJ,3d$r9T$J$$$?$$>l9g$O!"%V!<(B
+$B%kJQ?t(B @code{nnimap-split-download-body} $B$r@_Dj$9$kI,MW$,$"$j$^$9!#%G%#(B
 $B%U%)%k%H$G$O!"(Bnnimap $B%P%C%/%(%s%I$O%a%C%;!<%8%X%C%@!<$@$1$rpJs(B
-$B$rF@$k(B) $B$N$h$&$J(B @emph{$BE}7WE*$J(B} $B_I2a4o$r;H$&$J$i$P!"$3$NJQ?t$O<+F0E*$K(B
-$B@_Dj$5$l$k$G$7$g$&!#$=$l$O(B @acronym{IMAP} $B$NF0:n$rCY$/$7$F$7$^$&$N$G!"E}(B
-$B7WE*$G$O$J$$%P%C%/%(%s%I$KBP$7$F%G%#%U%)%k%H$G$O@_Dj$5$l$F$$$^$;$s!#(B
+$B$rF@$k$3$H$,$G$-$^$9(B) $B$N$h$&$J(B @emph{$BE}7WE*$J(B} $B_I2a4o$r;H$&>l9g$K$O!"$3(B
+$B$NJQ?t$O<+F0E*$K@_Dj$5$l$^$9!#$=$l$O(B @acronym{IMAP} $B$NF0:n$rCY$/$7$F$7$^(B
+$B$&$N$G!"E}7WE*$G$O$J$$%P%C%/%(%s%I$KBP$7$F%G%#%U%)%k%H$G$O@_Dj$5$l$F$$$^(B
+$B$;$s!#(B
 
 @xref{Splitting in IMAP}.
 
@@ -22079,8 +23074,8 @@ SpamAssassin $B%X%C%@!<$K(B ding $B$N5,B'$rCV$-49$($5$;$k$3$H$O$G$-$^$9$,!"B>
 @vindex gnus-spam-process-newsgroups
 Ham $B%W%m%;%C%5!<$H(B spam $B%W%m%;%C%5!<$N35G0$OHs>o$K=EMW$G$9!#$"$k%0%k!<%W(B
 $B$N(B ham $B%W%m%;%C%5!<$H(B spam $B%W%m%;%C%5!<$O!"(B@code{spam-process} $B%0%k!<%W(B
-$B%Q%i%a!<%?$+(B @code{gnus-spam-process-newsgroups} $BJQ?t$G@_Dj$9$k$3$H$,$G(B
-$B$-$^$9!#8e$GF1MM$N%a!<%k$r(B spam $B$G$O$J$$$H2re$N(B spam
 $B%k!<%W$K(B spam $B5-;v$r=8$a$F!"JQ?t(B @code{spam-junk-mailgroups} $B$rE,@Z$K@_(B
 $BDj$b$7$/$O%+%9%?%^%$%:$7$J$1$l$P$J$j$^$;$s!#$^$?!"(Bspam $B$r4^$a$k%0%k!<%W(B
 $B$r!"$=$N%0%k!<%W%Q%i%a!<(B
-$B%?(B @code{spam-contents} $B$r(B @code{gnus-group-spam-classification-spam} $B$K(B
+$B%?!<(B @code{spam-contents} $B$r(B @code{gnus-group-spam-classification-spam} $B$K(B
 $B@_Dj$9$k$+!"$^$?$O$=$l$KBP1~$9$kJQ(B
 $B?t(B @code{gnus-spam-newsgroup-contents} $B$r%+%9%?%^%$%:$9$k$3$H$K$h$C$F@k(B
-$B8@$9$k$3$H$,$G$-$^$9!#(B@code{spam-contents} $B%0%k!<%W%Q%i%a!<%?(B
+$B8@$9$k$3$H$,$G$-$^$9!#(B@code{spam-contents} $B%0%k!<%W%Q%i%a!<%?!<(B
 $B$H(B @code{gnus-spam-newsgroup-contents} $BJQ?t$O!"$=$l$i$Ne$N(B spam
 @cindex $
 Spam $B%0%k!<%W$G$O!"%G%#%U%)%k%H$G$9$Y$F$N%a%C%;!<%8$,(B spam $B$G$"$k$H2rC$;$P!"$=$N8e$=$N%0%k!<%W$KF~$C$?$H(B
-$B$-$K!"$=$l$K$O(B spam $B0u$OIU$-$^$;$s!#$?$@(B
-$B$7(B @code{spam-mark-only-unseen-as-spam} $B%Q%i%a!<%?$r(B @code{nil} $B$K$9$l$P!"(B
+$B$K(B @samp{$} $B0u(B (@code{gnus-spam-mark}) $B$,IU$-$^$9!#$"$k%a%C%;!<%8$r8+$F!"(B
+$B$$$C$?$s$=$l$K(B spam $B$N0u$rIU$1$F$b!"8e$GC$;$P!"$=$N8e$=$N%0%k!<%W$K(B
+$BF~$C$?$H$-$K!"$=$l$K$O(B spam $B0u$OIU$-$^$;$s!#(B
+@code{spam-mark-only-unseen-as-spam} $B%Q%i%a!<%?!<$r(B @code{nil} $B$K$9$l$P!"(B
 $B$=$&$$$&F0:n$r$d$a$5$;$k!"$D$^$j$9$Y$F$NL$FI%a%C%;!<%8$K(B spam $B0u$,IU$/$h(B
-$B$&$K$9$k$3$H$,$G$-$^$9!#$=$N%0%k!<%W$N35N,%P%C%U%!$K$$$k$H$-!"$d$C$Q(B
-$B$j(B spam $B$G$O$J$+$C$?$9$Y$F$N(B $B5-;v$+$i(B @samp{$} $B0u$r>C$5$J$1$l$P$J$j$^$;(B
-$B$s!#(B@samp{$} $B0u$r>C$9$K$O(B @kbd{M-u} $B$G$=$N5-;v$r(B ``$BL$FI(B'' $B$K$9$k$+!"$"$k(B
-$B$$$O(B @kbd{d} $B$G(B spam $B$G$O$J$$$b$N$H$7$FFI$s$@$3$H$r@k8@$9$l$PNI$$$G$7$g(B
-$B$&!#%0%k!<%W$rH4$1$k$H$-!"$9$Y$F$N(B spam $B0u(B (@samp{$}) $B$,IU$$$?5-;v(B
-$B$O(B spam $B%W%m%;%C%5!<$KAw$i$l!"$=$l$i$r(B spam $B$NI8K\$H$7$F3X=,$7$^$9!#(B
-
-$B%a%C%;!<%8$OB>$N$$$m$$$m$JJ}K!$K$h$C$F$b>C5n$5$l$k$+$b$7$l$^$;$s$7!"(B
-@code{ham-marks} $B%0%k!<%W%Q%i%a!<%?$,8e=R$N$h$&$K>e=q$-$5$l$J$1$l$P!"Dc(B
-$B$$%9%3%"$N$?$a$N(B @samp{Y} $B0u$HF1MM!"%G%#%U%)%k%H$N4{FI$+L@<(E*$J>C5n$N$?(B
-$B$a$N(B @samp{R} $B$H(B @samp{r} $B0u!"<+F0$^$?$OL@<(E*$J:o=|$N$?$a(B
-$B$N(B @samp{X} $B$H(B @samp{K} $B0u!"$=$l$i$9$Y$F$,(B spam $B$H$OL54X78$G$"$k$H2rDj$O!"K\J*$N(B spam $B$r8!=P$9$k$?$a$K>C5n(B (kill) $B%U%!%$%k$+%9(B
-$B%3%"%U%!%$%k$rFCJL$K;H$C$F$$$k>l9g$O4V0c$C$F$$$k$+$b$7$l$^$;$s!#$=$&$G$"(B
-$B$l$P(B @code{ham-marks} $B%0%k!<%W%Q%i%a!<%?$rD4@0$9$k$Y$-$G$9!#(B
+$B$&$K$9$k$3$H$,$G$-$^$9!#$=$N%0%k!<%W$N35N,%P%C%U%!!<$K$$$k$H$-$K!"$d$C$Q(B
+$B$j(B spam $B$G$O$J$+$C$?$H$o$+$C$?5-;v$,$"$C$?$i!"$=$l$i$N$9$Y$F$+(B
+$B$i(B @samp{$} $B0u$r>C$5$J$1$l$P$J$j$^$;$s!#(B@samp{$} $B0u$r>C$9$K(B
+$B$O(B @kbd{M-u} $B$G$=$N5-;v$r!VL$FI!W$K$9$k$+!"$"$k$$$O(B @kbd{d} $B$r;H$C(B
+$B$F(B spam $B$G$O$J$$$b$N$H$7$FFI$s$@$3$H$r@k8@$9$l$PNI$$$G$7$g$&!#%0%k!<%W$r(B
+$BH4$1$k$H$-!"$9$Y$F$N(B spam $B0u(B (@samp{$}) $B$,IU$$$?5-;v$O(B spam $B%W%m%;%C%5!<(B
+$B$KAw$i$l!"$=$l$i$r(B spam $B$NI8K\$H$7$F3X=,$7$^$9!#(B
+
+$B%a%C%;!<%8$OB>$N$$$m$$$m$JJ}K!$K$h$C$F$b>C5n$5$l$k$+$b$7$l$J$$$7!"(B
+@code{ham-marks} $B%0%k!<%W%Q%i%a!<%?!<$,L58z$K$5$l$J$1$l$P!"(B@samp{R} $B0u(B
+$B$H(B @samp{r} $B0u!"$*$h$S(B @samp{X} $B0u$H(B @samp{K} $B$O!"(B@samp{Y} $B0u$HF1MM(B
+$B$K!"$9$Y$F(B spam $B$G$OL5$$5-;v$K4XO"IU$1$i$l$k$b$N$H2r(B
+$B$l(B @samp{R} $B$O%G%#%U%)%k%H$N4{FI$N0u!"(B@samp{r} $BL@<(E*$J>C5n$N0u!"(B
+@samp{X} $B$O<+F0E*$J:o=|$N0u!"(B@samp{K} $B$OL@<(E*$J:o=|$N0u!"$=$7(B
+$B$F(B @samp{Y} $B$ODc$$%9%3%"$N$?$a0u$G$9(B)$B!#$3$N2>Dj$O!"FC$K??@-$N(B spam $B$r8!(B
+$B=P$9$k$?$a$K>C5n(B (kill) $B%U%!%$%k$+%9%3%"%U%!%$%k$r;H$C$F$$$k>l9g$O!"4V0c(B
+$B$$$+$b$7$l$^$;$s!#$=$&$G$"$l$P(B @code{ham-marks} $B%0%k!<%W%Q%i%a!<%?!<$rD4(B
+$B@0$9$k$Y$-$G$9!#(B
 
 @defvar ham-marks
-$B$3$N%0%k!<%W$^$?$O%H%T%C%/%Q%i%a!<%?$r(B ham $B$G$"$k$H2rC5n(B (deleted)$B!"4{FI(B (read)$B!"(B
-$B:o=|(B (killed)$B!"(Bkill $B%U%!%$%k$K$"$k$b$N(B (kill-filed) $B$*$h$SDc$$%9%3(B
-$B%"(B (low-score$B!"4{FI$@$1$l$I$b(B spam $B$G$O$J$$$H9M$($k(B) $B0u$N%j%9%H$G$9!#(B
-Ham $B0u$N%j%9%H$K2D;k(B (tick) $B0u$r4^$a$k$3$H$,LrN)$D$3$H$b$"$j$^$9!#L$FI0u(B
-$B$r(B ham $B0u$K$9$k$3$H$O!"DL>o$=$l$,J,N`$,B-$j$F$$$J$$$3$H$rI=$9$N$G!"4+$a(B
-$B$i$l$^$;$s!#$7$+$7!"$"$J$?$,$=$l$r9T$J$&$3$H$O$G$-$k$7!";d$?$A$KITK~$O$"(B
-$B$j$^$;$s!#(B
+$B$3$N%0%k!<%W$^$?$O%H%T%C%/%Q%i%a!<%?!<$r(B ham $B$G$"$k$H2rC5n(B (deleted)$B!"4{(B
+$BFI(B (read)$B!":o=|(B (killed)$B!"(Bkill $B%U%!%$%k$K$"$k$b$N(B (kill-filed) $B$*$h$SDc(B
+$B$$%9%3%"(B (low-score$B!"4{FI$@$1$l$I$b(B spam $B$G$O$J$$$H9M$($k(B) $B0u$N%j%9%H$G(B
+$B$9!#(BHam $B0u$N%j%9%H$K2D;k(B (tick) $B0u$r4^$a$k$3$H$,LrN)$D$3$H$b$"$j$^$9!#L$(B
+$BFI0u$r(B ham $B0u$K$9$k$3$H$O!"DL>o$=$l$,J,N`$5$l$F$$$J$$$3$H$rI=$9$N$G!"4+(B
+$B$a$i$l$^$;$s!#$7$+$7!"$"$J$?$,$=$l$r9T$J$&$3$H$O$G$-$k$7!";d$?$A$KITK~$O(B
+$B$"$j$^$;$s!#(B
 @end defvar
 
 @defvar spam-marks
-$B$3$N%0%k!<%W$^$?$O%H%T%C%/%Q%i%a!<%?$r(B spam $B$G$"$k$H2r!C5n$r9T$J$&$H!"$?$^$K$=$l$O8+$F$$$J$$(B @samp{K} $B0u$,IU(B
-$B$$$?5-;v$G=*$o$k$+$b$7$l$^$;$s!#$=$7$F$=$l$i$O6vA3$K(B spam $B$r4^$s$G$$$k$+(B
-$B$b$7$l$^$;$s!#:G$bNI$$$N$O!"K\Ev$N(B spam $B$K(B @samp{$} $B$,IU$$$F$$$F!"B>$K2?(B
-$B$bL5$$$3$H$r3N$+$a$k$3$H$G$9!#(B
+$B$$$?5-;v72$G=*$o$k$+$b$7$l$^$;$s!#$=$7$F$=$l$i$O6vA3$K(B spam $B$r4^$s$G$$$k(B
+$B$+$b$7$l$^$;$s!#:G$bNI$$$N$O!"K\Ev$N(B spam $B$K(B @samp{$} $B$,IU$$$F$$$F!"B>$K(B
+$B2?$b0u$,L5$$$3$H$r3N$+$a$k$3$H$G$9!#(B
 
 @vindex gnus-ham-process-destinations
 @emph{Spam} $B%0%k!<%W$rH4$1$k$H$-$K!"(Bspam $B0u$,IU$$$F$$$k$9$Y$F$N5-;v(B
 $B$K$O(B spam $B%W%m%;%C%5!<$G=hM}$7$?8e$G4|8B@Z$l>C5n$N0u$,IU$1$i$l$^$9!#$3$l(B
 $B$O(B @emph{$BL$J,N`(B} $B$^$?$O(B @emph{ham} $B%0%k!<%W$KBP$7$F$O9T$J$o$l$^$;$s!#$5(B
 $B$i$K(B spam $B%0%k!<%W$K$"$k$I$N(B @strong{ham} $B5-;v$b!"(B
-@code{ham-process-destination} $B%0%k!<%W%Q%i%a!<%?(B
-$B$+(B @code{gnus-ham-process-destinations} $BJQ?t$N$I$A$i$+$K9gCW$9$k>l=j$K0\(B
-$B$5$l$^$9!#$=$l$i$O%0%k!<%WL>$K9gCW$9$k@55,I=8=$N%j%9%H$G(B
-$B$9(B (@kbd{M-x customize-variable @key{RET}
-gnus-ham-process-destinations} $B$K$h$C$F$3$NJQ?t$r%+%9%?%^%$%:$9$k$N$,:G(B
-$B$b4JC1$G$9(B)$B!#JQ?t$r$l$N%0%k!<%WL>$N%j%9%H$OIaDL$N(B Lisp $B$N(B list $B$G$9!#(B
-@code{ham-process-destination} $B%Q%i%a!<%?$,@_Dj$5$l$F$$$J$$$H!"(Bham $B5-;v(B
-$B$O$=$3$KN1$aCV$+$l$^$9!#(B
-@code{spam-mark-ham-unread-before-move-from-spam-group} $B%Q%i%a!<%?$,@_Dj(B
-$B$5$l$F$$$k$H!"(Bham $B5-;v$O0\F0$5$;$i$l$kA0$KL$FI$N0u$,IU$1$i$l$^$9!#(B
-
-Ham $B$,0\F0$G$-$J$$>l9g(B ($BNc$($P(B @acronym{NNTP} $B$N$h$&$JFI$_9~$_@lMQ%P%C%/(B
-$B%(%s%I$G$"$k$?$a$K(B)$B!"$=$l$O%3%T!<$5$l$^$9!#(B
-
-$B%0%k!<%W$^$?$O@55,I=8=$4$H$KJ#?t$N0\F0@h$r;XDj$G$-$k$3$H$KCmL\$7$F2<$5$$(B!
-$B$3$l$K$h$C$F(B ham $B5-;v$r@55,$N%a!<%k%0%k!<%W$H(B @emph{ham $B%H%l!<%K%s%0(B} $B%0(B
-$B%k!<%W$KAw$k$3$H$,$G$-$^$9!#(B
+@code{ham-process-destination} $B%0%k!<%W%Q%i%a!<%?!<$,<($9>l=j(B
+$B$+(B @code{gnus-ham-process-destinations} $BJQ?t$NCf$G9gCW$9$k>l=j$N$I$A$i$+(B
+$B$K0\$5$l$^$9!#8e$K9gCW$9$k@55,I=8=$N%j%9%H$G$9(B (@kbd{M-x
+customize-variable @key{RET} gnus-ham-process-destinations} $B$K$h$C$F$3$N(B
+$BJQ?t$r%+%9%?%^%$%:$9$k$N$,:G$b4JC1$G$9(B)$B!#JQ?t$r$l$N%0%k!<%WL>$N%j%9%H$OIaDL(B
+$B$N(B Lisp $B$N(B list $B$G$9!#(B@code{ham-process-destination} $B%Q%i%a!<%?!<$,@_Dj(B
+$B$5$l$F$$$J$$$H!"(Bham $B5-;v$O0\F0$5$;$i$l$^$;$s!#(B
+@code{spam-mark-ham-unread-before-move-from-spam-group} $B%Q%i%a!<%?!<$,@_(B
+$BDj$5$l$F$$$k$H!"(Bham $B5-;v$K$O0\F0$5$;$i$l$kA0$KL$FI$N0u$,IU$1$i$l$^$9!#(B
+
+$BNc$($P(B @acronym{NNTP} $B$N$h$&$JFI$_9~$_@lMQ%P%C%/%(%s%I$G$"$k$?$a(B
+$B$K(B ham $B$,0\F0$G$-$J$$>l9g!"$=$l$O%3%T!<$5$l$^$9!#(B
+
+$B%0%k!<%W$4$H$K!"$^$?$O@55,I=8=$K9gCW$9$k%0%k!<%W$4$H$K!"J#?t$N0\F0@h$r;X(B
+$BDj$G$-$k$3$H$KCmL\$7$F2<$5$$(B!  $B$3$l$K$h$C$F(B ham $B5-;v$r@55,$N%a!<%k%0%k!<(B
+$B%W$H(B @emph{ham $B%H%l!<%K%s%0(B} $B%0%k!<%W$KAw$k$3$H$,$G$-$^$9!#(B
 
 @emph{Ham} $B%0%k!<%W$rH4$1$k$H$-$K!"(Bham $B0u$,IU$$$F$$$k$9$Y$F$N5-;v(B
 $B$O(B ham $B%W%m%;%C%5!<$KAw$i$l!"$=$l$i$r(B spam $B$G$O$J$$I8K\$H$7$F3X=,$7$^$9!#(B
@@ -22187,45 +23184,45 @@ Ham $B$,0\F0$G$-$J$$>l9g(B ($BNc$($P(B @acronym{NNTP} $B$N$h$&$JFI$_9~$_@lM
 @vindex spam-process-ham-in-spam-groups
 $BJQ?t(B @code{spam-process-ham-in-spam-groups} $B$O%G%#%U%)%k%H$G(B
 $B$O(B @code{nil} $B$G$9!#(BSpam $B%0%k!<%W$G8+$D$+$C$?(B ham $B$,%W%m%;%C%5!<$KAw$i$l(B
-$B$k$h$&$K$7$?$$>l9g$O(B @code{t} $B$K$7$F2<$5$$!#DL>o$3$l$O9T$J$o$l$^$;$s!#$"(B
-$B$J$?$,<+J,$G(B ham $B5-;v$r(B ham $B%0%k!<%W$KAw$C$F!"$=$3$G=hM}$9$k$3$H$,4|BT$5(B
-$B$l$F$$$^$9!#(B
+$B$k$h$&$K$7$?$$>l9g$O(B @code{t} $B$K$7$F2<$5$$!#DL>o$3$l$O9T$J$o$l$^$;$s!#$=(B
+$B$NBe$o$j!"$"$J$?$,<+J,$G(B ham $B5-;v$r(B ham $B%0%k!<%W$KAw$C$F!"$=$3$G=hM}$9$k(B
+$B$3$H$,A[Dj$5$l$F$$$^$9!#(B
 
 @vindex spam-process-ham-in-nonham-groups
 $BJQ?t(B @code{spam-process-ham-in-nonham-groups} $B$O%G%#%U%)%k%H$G(B
 $B$O(B @code{nil} $B$G$9!#(BHam $B$G$O$J$$(B (spam $B$^$?$OL$J,N`$N(B) $B%0%k!<%W$G8+$D$+$C(B
 $B$?(B ham $B$,%W%m%;%C%5!<$KAw$i$l$k$h$&$K$7$?$$>l9g$O(B @code{t} $B$K$7$F2<$5$$!#(B
-$BDL>o$3$l$O9T$J$o$l$^$;$s!#$"$J$?$,<+J,$G(B ham $B5-;v$r(B ham $B%0%k!<%W$KAw$C$F!"(B
-$B$=$3$G=hM}$9$k$3$H$,4|BT$5$l$F$$$^$9!#(B
+$BDL>o$3$l$O9T$J$o$l$^$;$s!#$=$NBe$o$j!"$"$J$?$,<+J,$G(B ham $B5-;v$r(B ham $B%0%k!<(B
+$B%W$KAw$C$F!"$=$3$G=hM}$9$k$3$H$,A[Dj$5$l$F$$$^$9!#(B
 
 @vindex gnus-spam-process-destinations
 @emph{Ham} $B$^$?$O(B @emph{$BL$J,N`(B} $B%0%k!<%W$rH4$1$k$H$-$K!"$9$Y$F(B
 $B$N(B @strong{spam} $B5-;v$O!"(B@code{spam-process-destination} $B%0%k!<%W%Q%i%a!<(B
-$B%?$+(B @code{gnus-spam-process-destinations} $BJQ?t$N$I$A$i$+$K9gCW$9$k>l=j(B
-$B$K0\$5$l$^$9!#$=$l$i$O%0%k!<%WL>$K9gCW$9$k@55,I=8=$N%j%9%H$G(B
-$B$9(B (@kbd{M-x customize-variable @key{RET}
+$B%?!<$,<($9>l=j$+(B @code{gnus-spam-process-destinations} $BJQ?t$NCf$G9gCW$9(B
+$B$k>l=j$N$I$A$i$+$K0\$5$l$^$9!#8e$K9gCW$9$k@55,I=8=$N%j%9%H(B
+$B$G$9(B (@kbd{M-x customize-variable @key{RET}
 gnus-spam-process-destinations} $B$K$h$C$F$3$NJQ?t$r%+%9%?%^%$%:$9$k$N$,:G(B
 $B$b4JC1$G$9(B)$B!#JQ?t$r$l$N%0%k!<%WL>$N%j%9%H$OIaDL$N(B Lisp $B$N(B list $B$G$9!#(B
-@code{spam-process-destination} $B%Q(B
-$B%i%a!<%?$,@_Dj$5$l$F$$$J$$$H!"(Bspam $B5-;v$OC1$K4|8B@Z$l>C5n$5$l$^$9!#%0%k!<(B
-$B%WL>$O40A47A$G$"$k$3$H!"$9$J$o$A%0%k!<%W%P%C%U%!$G%0%k!<%WL>$NA0(B
-$B$K(B @samp{nntp:servername} $B$N$h$&$J$b$N$,8+$($k>l9g$O!"$3$3$G$b$=$l$r;H$&(B
-$BI,MW$,$"$j$^$9!#(B
+@code{spam-process-destination} $B%Q%i%a!<%?!<$,@_Dj$5$l$F$$$J$$$H!"(B
+spam $B5-;v$OC1$K4|8B@Z$l>C5n$5$l$^$9!#%0%k!<%WL>$O40A47A$G$"$k$3$H!"$9$J(B
+$B$o$A%0%k!<%W%P%C%U%!!<$G%0%k!<%WL>$NA0$K(B @samp{nntp:servername} $B$N$h$&$J(B
+$B$b$N$,8+$($k>l9g$O!"$3$3$G$b$=$l$r;H$&I,MW$,$"$j$^$9!#(B
 
-Spam $B$,0\F0$G$-$J$$>l9g(B ($BNc$($P(B @acronym{NNTP} $B$N$h$&$JFI$_9~$_@lMQ%P%C(B
-$B%/%(%s%I$G$"$k$?$a$K(B)$B!"$=$l$O%3%T!<$5$l$^$9!#(B
+$BNc$($P(B @acronym{NNTP} $B$N$h$&$JFI$_9~$_@lMQ%P%C%/%(%s%I$G$"$k$?$a(B
+$B$K(B spam $B$,0\F0$G$-$J$$>l9g!"$=$l$O%3%T!<$5$l$^$9!#(B
 
-$B%0%k!<%W$^$?$O@55,I=8=$4$H$KJ#?t$N0\F0@h$r;XDj$G$-$k$3$H$KCmL\$7$F2<$5$$(B!
-$B$3$l$K$h$C$F(B spam $B5-;v$r@55,$N%a!<%k%0%k!<%W(B
-$B$H(B @emph{spam $B%H%l!<%K%s%0(B} $B%0%k!<%W$KAw$k$3$H$,$G$-$^$9!#(B
+$B%0%k!<%W$4$H$K!"$^$?$O@55,I=8=$K9gCW$9$k%0%k!<%W$4$H$K!"J#?t$N0\F0@h$r;X(B
+$BDj$G$-$k$3$H$KCmL\$7$F2<$5$$(B!  $B$3$l$K$h$C$F(B spam $B5-;v$r@55,$N%a!<%k%0%k!<(B
+$B%W$H(B @emph{spam $B%H%l!<%K%s%0(B} $B%0%k!<%W$KAw$k$3$H$,$G$-$^$9!#(B
 
 @vindex spam-log-to-registry
-Ham $B$H(B spam $B$K4X$9$kLdBj$O!"(BGnus $B$,%G%#%U%)%k%H$G$O$3$N=hM}$rDI@W$7$F$/(B
-$B$l$J$$$3$H$G$9!#=hM}$5$l$?5-;v$rDI@W$7!"$+$DJ#?t2s$K$o$?$C$F=hM}$9$k$3$H(B
-$B$r2sHr$9$k$?$a$K(B @code{spam.el} $B$,(B @code{gnus-registry.el} $B$r;H$&$h$&$K!"(B
-@code{spam-log-to-registry} $BJQ?t$rM-8z$K$7$F$/$@$5$$!#EPO??t$r@)8B$9$k$H!"(B
-$B@)8B$,L5$$>l9g$N$h$&$KF0:n$7$J$$$3$H$r3P$($F$*$$$F2<$5$$!#(B
+Ham $B$H(B spam $B$K4X$9$kLdBj$O!"(Bgnus $B$,%G%#%U%)%k%H$G$O$3$N=hM}$rDI@W$7$F$/(B
+$B$l$J$$$3$H$G$9!#J#?t2s$K$o$?$C$F=hM}$9$k$3$H$r2sHr$9$k$?$a$K!"(B
+@code{spam.el} $B$,(B @code{gnus-registry.el} $B$r;H$C$F=hM}$5$l$?5-;v$rDI@W$9(B
+$B$k$h$&$K!"(B@code{spam-log-to-registry} $BJQ?t$rM-8z$K$7$F2<$5$$!#(B
+@code{gnus-registry.el} $B$,EPO?$9$k?t$r@)8B$7$F$7$^$&$H!"@)8B$,L5$$>l9g$N(B
+$B$h$&$KF0:n$7$J$$$3$H$r3P$($F$*$$$F2<$5$$!#(B
 
 @vindex spam-mark-only-unseen-as-spam
 Spam $B%0%k!<%W$K$"$k!"$^$@FI$^$l$?$3$H$,L5$$5-;v$@$1$K(B spam $B$N0u$rIU$1$?(B
@@ -22234,14 +23231,15 @@ Spam $B%0%k!<%W$K$"$k!"$^$@FI$^$l$?$3$H$,L5$$5-;v$@$1$K(B spam $B$N0u$rIU$1$?
 
 @vindex spam-mark-ham-unread-before-move-from-spam-group
 Ham $B$,(B spam $B%0%k!<%W$+$i0\F0$5$l$kA0$K0u$r>C$7$?$$>l9g$O!"$3$NJQ?t$r%;%C(B
-$B%H$7$F2<$5$$!#$3$l$O(B ham $B$K0u$rIU$1$k$?$a$K2D;k(B (tick) $B0u$N$h$&$J$b$N$r(B
-$B;H$&>l9g$K!"$H$F$bLr$KN)$A$^$9!#5-;v$O$"$?$+$b$=$l$,%a!<%k%5!<%P$r=P$?$P(B
-$B$+$j$N$h$&$K!"L50u$G(B @code{ham-process-destination} $B$KCV$+$l$k$G$7$g$&!#(B
+$B%H$7$F2<$5$$!#$3$l$O(B ham $B$K0u$rIU$1$k$?$a$K2D;k(B (tick) $B0u(B (@samp{!}) $B$N(B
+$B$h$&$J$b$N$r;H$&>l9g$K!"$H$F$bLr$KN)$A$^$9!#5-;v$O$"$?$+$b$=$l$,%a!<%k%5!<(B
+$B%P!<$+$iMh$?$P$+$j$N$h$&$K!"L50u$G(B @code{ham-process-destination} $B$KCV$+(B
+$B$l$k$G$7$g$&!#(B
 
 @vindex spam-autodetect-recheck-messages
 $B$3$NJQ?t$O(B @code{spam.el} $B$,(B spam $B$N<+F08!=P$r9T$J$&>l9g$K!"$^$@FI$^$l$?(B
-$B$3$H$,L5$$5-;v$@$1!"$^$?$O$9$Y$F$NL$FI5-;v$N(B spam $B8!::$r9T$J$&$+$I$&$+$r(B
-$B;X<($7$^$9!#$3$l$O$=$N$^$^$K$7$F$*$/$3$H$r4+$a$^$9!#(B
+$B$3$H$,L5$$5-;v$@$1$+!"$^$?$O$9$Y$F$NL$FI5-;v$N$I$A$i$KBP$7$F(B spam $B8!::$r(B
+$B9T$J$&$+$r;X<($7$^$9!#$3$l$O$=$N$^$^$K$7$F$*$/$3$H$r4+$a$^$9!#(B
 
 @node Spam ELisp Package Sorting and Score Display in Summary Buffer
 @subsubsection Spam ELisp Package Sorting and Score Display in Summary Buffer
@@ -22251,38 +23249,39 @@ Ham $B$,(B spam $B%0%k!<%W$+$i0\F0$5$l$kA0$K0u$r>C$7$?$$>l9g$O!"$3$NJQ?t$r%;%
 @cindex spam sort summary buffer
 @cindex spam
 
-$B35N,%P%C%U%!$K(B spam $B$N%9%3%"$rI=<($9$k$3$H$,$G$-$^$9!#$^$?!"$=$l$i(B
-$B$N(B spam $B$N%9%3%"$K$h$C$F!"5-;v$r%=!<%H$9$k$3$H$b$G$-$^$9!#(B
+$B35N,%P%C%U%!!<$K(B spam $B$N%9%3%"$rI=<($9$k$3$H$,$G$-$^$9!#$^$?!"$=$l$i(B
+$B$N(B spam $B$N%9%3%"$K$h$C$F!"5-;v$rJB$YBX$($k$3$H$b$G$-$^$9!#(B
 
 $B:G=i$K!"$I$N%P%C%/%(%s%I$r;H$&$+$r7h$a$kI,MW$,$"$j$^$9!#(B
 @code{spam-use-spamassassin}$B!"(B@code{spam-use-spamassassin-headers} $B$^$?(B
 $B$O(B @code{spam-use-regex-headers} $B%P%C%/%(%s%I$r;H$&>l9g!"(B
 @code{X-Spam-Status} $B%X%C%@!<$,;H$o$l$^$9!#(B@code{spam-use-bogofilter} $B$r(B
 $B;H$&>l9g$O!"(B@code{X-Bogosity} $B$,;H$o$l$^$9!#(B@code{spam-use-crm114} $B$r;H(B
-$B$&$N$J$i$P!"(BCRM114 $B%9%3%"!&%U%)!<%^%C%H$K9gCW$9$k!"$$$:$l$+$N%X%C%@$,;H(B
+$B$&$N$J$i$P!"(BCRM114 $B%9%3%"!&%U%)!<%^%C%H$K9gCW$9$k!"$I$s$J%X%C%@!<$b$,;H(B
 $B$o$l$^$9!#(B@file{spam.el} $B$r%m!<%I$9$k(B @emph{$BA0(B} $B$K!"E,@Z$J%P%C%/%(%s%IJQ(B
-$B?t$r(B t $B$K@_Dj$9$k8B$j!"$&$^$/$$$/$G$7$g$&!#(B@code{spam.el} $B$O!"(BGnus $B$,Fb(B
+$B?t$r(B t $B$K@_Dj$9$k8B$j!"$&$^$/$$$/$G$7$g$&!#(B@code{spam.el} $B$O!"(Bgnus $B$,Fb(B
 $BItE*$KI,MW$H$9$k%X%C%@!<$N%j%9%H$K!"@5$7$$%X%C%@!<$r<+F0E*$KDI2C$7$^$9!#(B
 
-$B35N,%P%C%U%!$K(B spam $B$N%9%3%"$rI=<($5$;$k$K$O!"$3$N9T$r(B @code{gnus.el} $B%U%!(B
-$B%$%k$K2C$($F2<$5$$(B ($BCm(B: @code{spam.el} $B$O%G%#%U%)%k%H$G$O$=$l$r9T$J$o$J(B
-$B$$$N$G!"$"$J$?$,;}$C$F$$$k$+$b$7$l$J$$!"B8:_$9$k$I$s$J(B @code{S} $B%U%)!<%^%C(B
-$B%H$r$b>e=q$-$7$^$;$s(B)$B!#(B
+$B35N,%P%C%U%!!<$K(B spam $B$N%9%3%"$rI=<($5$;$k$K$O!"$3$N9T(B
+$B$r(B @code{~/.gnus.el} $B%U%!%$%k$K2C$($F2<$5$$(B ($BCm(B: @code{spam.el} $B$O%G%#%U%)(B
+$B%k%H$G$O$=$l$r9T$J$o$J$$$N$G!"$"$J$?$,;}$C$F$$$k$+$b$7$l$J$$!"B8:_$9$k$I(B
+$B$s$J(B @code{S} $B%U%)!<%^%C%H$h$j$bM%@h$5$l$^$;$s(B)$B!#(B
 
 @lisp
 (defalias 'gnus-user-format-function-S 'spam-user-format-function-S)
 @end lisp
 
-$B$G$O!"35N,%P%C%U%!$N9T=qK!;EMM(B (summary line format) $B$,(B @code{%uS} $B$r;H(B
-$B$&$h$&$K@_Dj$7$^$7$g$&!#0J2<$O(B spam $B$N%9%3%"$r(B 5$B7e$N%U%#!<%k%I$KI=<($9$k(B
-$BNc$G$9(B:
+$B$G$O!"35N,%P%C%U%!!<$N9T=qK!;EMM(B (summary line format) $B$,(B @code{%uS} $B$r(B
+$B;H$&$h$&$K@_Dj$7$^$7$g$&!#0J2<$O(B spam $B$N%9%3%"$r(B 5$B7e$NJ8;zOH$KI=<($9$kNc(B
+$B$G$9(B:
 
 @lisp
 (setq gnus-summary-line-format
  "%U%R %10&user-date; $%5uS %6k  %B %(%4L: %*%-25,25a%) %s \n")
 @end lisp
 
-$B:G8e$K!"(Bspam $B$N>uBV$K$h$k%=!<%H$rA4%0%k!<%W$G9T$J$o$;$k$h$&$K$7$^$7$g$&(B:
+$B:G8e$K!"(Bspam $B$N>uBV$K$h$kJB$YBX$($rA4%0%k!<%W$G9T$J$o$;$k$h$&$K$7$^$7$g(B
+$B$&(B:
 
 @lisp
 (setq
@@ -22304,8 +23303,8 @@ Ham $B$,(B spam $B%0%k!<%W$+$i0\F0$5$l$kA0$K0u$r>C$7$?$$>l9g$O!"$3$NJQ?t$r%;%
 @subsubheading Ted $B$N@_Dj(B
 
 From Ted Zlatanov .
-@example
 
+@example
 ;; @r{@code{gnus-registry-split-fancy-with-parent} $B$H(B spam $B$N<+F08!=P$N$?$a!#(B}
 ;; @r{$B>\:Y$O(B @file{gnus-registry.el} $B$r;2>H!#(B}
 (gnus-registry-initialize)
@@ -22317,91 +23316,97 @@ From Ted Zlatanov .
 (setq
  spam-log-to-registry t ;; @r{Spam $B$N<+F08!=P$N$?$a!#(B}
  spam-use-BBDB t
- spam-use-regex-headers t ;; @r{X-Spam-Flag (SpamAssassin) $B$r$D$+$^$($k!#(B}
+ spam-use-regex-headers t ;; @r{X-Spam-Flag (SpamAssassin) $B$rJa$^$($k!#(B}
  ;; @r{$BL>A0$K(B @samp{spam} $B$r4^$`$9$Y$F$N%0%k!<%W$K$O(B spam $B5-;v$,$"$k!#(B}
- gnus-spam-newsgroup-contents '(("spam" gnus-group-spam-classification-spam))
+ gnus-spam-newsgroup-contents '(("spam"
+                                 gnus-group-spam-classification-spam))
  ;; @r{$B$3$l$i$N(B docstring $B$r;2>H!#(B}
  spam-move-spam-nonspam-groups-only nil
  spam-mark-only-unseen-as-spam t
  spam-mark-ham-unread-before-move-from-spam-group t
  nnimap-split-rule 'nnimap-split-fancy
- ;; @{$B$"$J$?$N@_Dj$KDI2C$9$kA0$K!"$3$l$,2?$r$9$k$+M}2r$;$h(B!}
+ ;; @r{$B$"$J$?$N@_Dj$KDI2C$9$kA0$K!"$3$l$,2?$r$9$k$+M}2r$;$h(B!}
  nnimap-split-fancy '(|
-                      ;; @r{References $B$r?F$^$GC)$C$F$=$l$i$N%0%k!<%W$rF~$l$k!#(B}
+                      ;; @r{References $B$r?F$^$GC)$C$F$=$l$i$N%0%k!<%W(B}
+                      ;; @r{$B$rF~$l$k!#(B}
                       (: gnus-registry-split-fancy-with-parent)
-                      ;; @r{$B$3$l$O%5!<%P!e$G!";d$O(B SpamAssassin $B$,(B spam $B$rG'<1$9$k(B}
-;; @r{$B%H%l!<%K%s%0$N$?$a$K(B @samp{train} $B%0%k!<%W$r!"(Bham $B$rG'<1$9$k%H%l!<(B}
-;; @r{$B%K%s%0$N$?$a$K(B @samp{trainham} $B%0%k!<%W$r;H$$$^$9!#$G$b(B Gnus $B$O$=$&(B}
-;; @r{$B$$$&$3$H$O$d$C$F$/$l$^$;$s!#(B}
-
+;; @r{$B$=$N8e(B @acronym{IMAP} $B%5!<%P!<>e$G!";d$O(B SpamAssassin $B$,(B spam $B$r(B}
+;; @r{$BG'<1$9$k%H%l!<%K%s%0$N$?$a$K(B @samp{train} $B%0%k!<%W$r!"(Bham $B$r(B}
+;; @r{$BG'<1$9$k%H%l!<%K%s%0$N$?$a$K(B @samp{trainham} $B%0%k!<%W$r;H$&!#(B}
+;; @r{$B$G$b(B gnus $B$O$=$&$$$&$3$H$O$d$C$F$/$l$J$$!#(B}
 @end example
 
 @subsubheading $B%5!<%P!<>e$N(B IMAP $B%5!<%P!<$G!"E}7WE*$J_I2a4o$H(B @code{spam.el} $B$r;H$&(B
+
 From Reiner Steib .
 
-$B;d$N%W%m%P%$%@$O(B (@acronym{IMAP}) $B%a!<%k%5!<%P!<>e$G(B (@acronym{DCC} $B$HO"(B
-$B78$7$?(B) bogofilter $B$r2TF/$5$;$F$$$^$9!#G'<1$5$l(B
+$B;d$N%W%m%P%$%@!<$O(B (@acronym{IMAP}) $B%a!<%k%5!<%P!<>e$G(B (@acronym{DCC} $B$H(B
+$BO"78$7$?(B) bogofilter $B$rN)$A>e$2$^$7$?!#G'<1$5$l(B
 $B$?(B spam $B$O(B @samp{spam.detected} $B$X9T$-!";D$j$K$ODL>o$N_I2a5,B'$,E,MQ$5$l(B
-$B$k!"(B $B$9$J$o$A(B @samp{some.folder} $B$+(B @samp{INBOX} $B$K9T$-$^$9!#9NDj$N<:GT(B
-$B$"$k$$$OH]Dj$N%H%l!<%K%s%0$O!"(B@samp{training.ham} $B$^$?(B
-$B$O(B @samp{training.spam} $B$=$l$>$l$K5-;v$r%3%T!<$9$k$+0\F0$5$;$k$3$H$K$h$C(B
-$B$F9T$J$o$l$^$9!#%5!<%P!<>e$N(B cron $B%8%g%V$,!"$=$l$i$rE,@Z$J(B ham $B$^$?(B
-$B$O(B spam $B%*%W%7%g%s$H$H$b$K(B bogofilter $B$KM?$(!"(B@samp{training.ham} $B$*$h(B
-$B$S(B @samp{training.spam} $B%U%)%k%@$+$i$=$l$i$r:o=|$7$^$9!#(B
+$B$k!"$9$J$o$A(B @samp{some.folder} $B$+(B @samp{INBOX} $B$K9T$-$^$9!#8m8!=P$H8+F((B
+$B$7$N%H%l!<%K%s%0$O!"$=$l$>$l(B @samp{training.ham} $B$^$?(B
+$B$O(B @samp{training.spam} $B$K5-;v$r%3%T!<$9$k$+0\F0$5$;$k$3$H$K$h$C$F9T$J$o(B
+$B$l$^$9!#%5!<%P!<>e$N(B cron $B%8%g%V$,!"$=$l$i$rE,@Z$J(B ham $B$^$?$O(B spam $B%*%W(B
+$B%7%g%s$H$H$b$K(B bogofilter $B$KM?$(!"(B@samp{training.ham} $B$*$h(B
+$B$S(B @samp{training.spam} $B%U%)%k%@!<$+$i$=$l$i$r:o=|$7$^$9!#(B
 
-$B0J2<$N(B @code{gnus-parameters} $B$N9`$K$h$C$F!"(B@code{spam.el} $B$O$[$H$s$I$N(B
-$B;E;v$r;d$N$?$a$K$3$J$7$^$9(B:
+$B0J2<$N(B @code{gnus-parameters} $B$NMWAG72$K$h$C$F!"(B@code{spam.el} $B$O$[$H$s(B
+$B$I$N;E;v$r;d$N$?$a$K$3$J$7$^$9(B:
 
 @lisp
    ("nnimap:spam\\.detected"
@@ -22414,41 +23419,38 @@ From Reiner Steib .
 @end lisp
 
 @itemize
-
 @item @b{The Spam folder:}
-
-@samp{spam.detected} $B%U%)%k%@$K$*$$$F!";d$O9NDj$N<:GT(B ($B$9$J$o$A!"(B
-bogofilter $B$+(B DCC $B$,(B spam $B$G$"$k$H8m$C$FH=Dj$7$?@5Ev$J%a!<%k(B) $B$N%A%'%C%/(B
-$B$r$7$J$1$l$P$J$j$^$;$s!#(B
+@samp{spam.detected} $B%U%)%k%@!<$K$*$$$F!";d$O8m8!=P(B ($B$9$J$o(B
+$B$A(B bogofilter $B$+(B DCC $B$,(B spam $B$G$"$k$H8m$C$FH=Dj$7$?@5Ev$J%a!<%k(B) $B$N%A%'%C(B
+$B%/$r$7$J$1$l$P$J$j$^$;$s!#(B
 
 @code{gnus-group-spam-classification-spam} $B$N9`$N$?$a$K!"$9$Y$F$N%a%C%;!<(B
-$B%8$K$O(B spam $B$N0u(B (@code{$}) $B$,IU$1$i$l$^$9!#9NDj$K<:GT$7$?$b$N$r8+$D$1$?(B
-$B$i!";d$O5-;v$K$$$/$D$+$NB>$N(B ham $B0u(B (@code{ham-marks}, @ref{Spam ELisp
-Package Global Variables}) $B$rIU$1$^$9!#%0%k!<%W$r=P$k$H$-!"$=$l$i$N5-;v(B
+$B%8$K$O(B spam $B$N0u(B (@code{$}) $B$,IU$1$i$l$^$9!#8m8!=P$r8+$D$1$?$i!";d$O5-;v(B
+$B$K$$$/$D$+$NB>$N(B ham $B0u(B (@code{ham-marks}, @ref{Spam ELisp Package
+Global Variables}) $B$rIU$1$^$9!#%0%k!<%W$r=P$k$H$-!"$=$l$i$N5-;v(B
 $B$O(B @samp{INBOX} ($B;d$,5-;v$rCV$$$F$*$-$?$$$H$3(B
 $B$m(B) $B$H(B @samp{training.ham} (bogofilter $B$N%H%l!<%K%s%0MQ(B) $B$NN>J}$N%0%k!<(B
-$B%W$K%3%T!<$5$l!"(B@samp{spam.detected} $B%U%)%k%@$+$i:o=|$5$l$^$9!#(B
+$B%W$K%3%T!<$5$l!"(B@samp{spam.detected} $B%U%)%k%@!<$+$i:o=|$5$l$^$9!#(B
 
-@code{gnus-article-sort-by-chars} $B$N9`$O!";d$N<:GT$7$?9NDj$N8!=P$rC1=c$K(B
-$B$7$^$9!#;d$O!"$9$Y$F;w$?%5%$%:$N!"$?$/$5$s$N%o!<%`(B (sweN, @dots{}) $B$r$N4V0c$C$?9NDj(B
-$B$r8+$D$1$d$9$/$J$k$N$G$9!#(B($B$b$A$m$s87L)$K$O%o!<%`$O(B @i{spam}
-(@acronym{UCE}, @acronym{UBE}) $B$G$O$"$j$^$;$s!#$H$b$"$l!"$=$l$i$NMW$i$J(B
-$B$$%a!<%k$r_I2a$9$k$N$K(B bogofilter $B$O;d$K$H$C$FM%=($JF;6q$G$9!#(B)
+@code{gnus-article-sort-by-chars} $B$N9`$O!";d$N8m8!=P$NH/8+$r4JC1$K$7$^$9!#(B
+$B;d$O!"$9$Y$F;w$?%5%$%:$N!"$?$/$5$s$N%o!<%`(B (sweN, @dots{}) $B$r$N8m8!=P$r8+$D$1$d$9$/(B
+$B$J$k$N$G$9!#(B($B$b$A$m$s87L)$K$O%o!<%`$O(B @i{spam} (@acronym{UCE},
+@acronym{UBE}) $B$G$O$"$j$^$;$s!#$H$b$"$l!"$=$l$i$NMW$i$J$$%a!<%k$r_I2a$9(B
+$B$k$N$K(B bogofilter $B$O;d$K$H$C$FM%=($JF;6q$G$9!#(B)
 
 @item @b{Ham folders:}
-
-$B;d$N(B ham $B%U%)%k%@$G!"G'<1$5$l$J$+$C$?(B spam $B%a!<%k(B ($BH]Dj$N<:GT(B) $B$r8+$?$H(B
-$B$-$O$$$D$G$b!";d$OC1$K(B @kbd{S x} (@code{gnus-summary-mark-as-spam}) $B$rC!(B
-$B$-$^$9!#%0%k!<%W$r=P$k$H$-!"$=$l$i$N%a%C%;!<%8$O(B @samp{training.spam} $B$K(B
-$B0\$5$l$^$9!#(B
+$B;d$N(B ham $B%U%)%k%@!<$G!"G'<1$5$l$J$+$C$?(B spam $B%a!<%k(B ($B8+F($7(B) $B$r8+$D$1$?(B
+$B$H$-$O$$$D$G$b!";d$OC1$K(B @kbd{S x} (@code{gnus-summary-mark-as-spam}) $B$r(B
+$BC!$-$^$9!#%0%k!<%W$r=P$k$H$-!"$=$l$i$N%a%C%;!<%8(B
+$B$O(B @samp{training.spam} $B$K0\$5$l$^$9!#(B
 @end itemize
 
 @subsubheading @code{spam-report.el} $B$G(B Gmane $B%0%k!<%W$N(B spam $B$rJs9p$9$k(B
 
 From Reiner Steib .
 
-$B0J2<$N(B @code{gnus-parameters} $B$KG<$a$?9`L\$K$h$C$F!"(B@kbd{S x}
+$B0J2<$N(B @code{gnus-parameters} $B$KG<$a$?MWAG$K$h$C$F!"(B@kbd{S x}
 (@code{gnus-summary-mark-as-spam}) $B$G(B @code{gmane.*} $B%0%k!<%W$N(B spam $B5-(B
 $B;v$K0u$rIU$1!"%0%k!<%W$r=P$k$H$-$K(B Gmane $B$KJs9p$7$^$9(B:
 
@@ -22472,80 +23474,70 @@ From Reiner Steib .
 @cindex spam
 
 @defvar spam-use-blacklist
-
 $BF~$C$F$/$k%a!<%k$rJ,3d$9$k$H$-$K%V%i%C%/%j%9%H$r;H$$$?$$>l9g$O!"$3$NJQ?t(B
 $B$r(B @code{t} $B$K@_Dj$7$F2<$5$$!#Aw?.l9g$O!"$3$NJQ?t(B
 $B$r(B @code{t} $B$K@_Dj$7$F2<$5$$!#Aw?.l9g$O!"$3$N(B
 $BJQ?t$r(B @code{t} $B$K$7$F2<$5$$!#Cm0U$7$F;H$C$F2<$5$$!#(B
-
 @end defvar
 
 @defvar gnus-group-spam-exit-processor-blacklist
-
-$B$3$N%7%s%\%k$r!"%0%k!<%W%Q%i%a!<%?$N%+%9%?%^%$%:$K$h$C$F%0%k!<%W(B
-$B$N(B @code{spam-process} $B%Q%i%a!<%?$K2C$($k$+!"$^$?(B
+$B$3$N%7%s%\%k$r!"%0%k!<%W%Q%i%a!<%?!<$N%+%9%?%^%$%:$K$h$C$F%0%k!<%W(B
+$B$N(B @code{spam-process} $B%Q%i%a!<%?!<$K2C$($k$+!"$^$?(B
 $B$O(B @code{gnus-spam-process-newsgroups} $BJQ?t$K2C$($F2<$5$$!#$3$N%7%s%\%k(B
-$B$,%0%k!<%W$N(B @code{spam-process} $B%Q%i%a!<%?$K2C$($i$l$k$H!"(Bspam $B0u$,IU$$(B
-$B$?5-;v$NAw?.)$7$^$9!#$9$Y$FF1Ey$KF0(B
-$B:n$9$k$3$H$OJ]>Z$5$l$^$9!#(B
-
+$B5l<0$N(B @code{gnus-group-spam-exit-processor-blacklist} $B$NBe$o$j(B
+$B$K(B @code{(spam spam-use-blacklist)} $B$r;H$&$3$H$r?d>)$7$^$9!#$9$Y$FF1Ey$K(B
+$BF0:n$9$k$3$H$OJ]>Z$5$l$^$9!#(B
 @end defvar
 
 @defvar gnus-group-ham-exit-processor-whitelist
-
-$B$3$N%7%s%\%k$r!"%0%k!<%W%Q%i%a!<%?$N%+%9%?%^%$%:$K$h$C$F%0%k!<%W(B
-$B$N(B @code{spam-process} $B%Q%i%a!<%?$K2C$($k$+!"$^$?(B
+$B$3$N%7%s%\%k$r!"%0%k!<%W%Q%i%a!<%?!<$N%+%9%?%^%$%:$K$h$C$F%0%k!<%W(B
+$B$N(B @code{spam-process} $B%Q%i%a!<%?!<$K2C$($k$+!"$^$?(B
 $B$O(B @code{gnus-spam-process-newsgroups} $BJQ?t$K2C$($F2<$5$$!#$3$N%7%s%\%k(B
-$B$,%0%k!<%W$N(B @code{spam-process} $B%Q%i%a!<%?$K2C$($i$l$k$H!"(Bham $B0u$,IU$$(B
-$B$?(B @emph{ham} $B%0%k!<%W$N5-;v$NAw?.)$7$^$9!#$9$Y$FF1Ey$KF0(B
-$B:n$9$k$3$H$OJ]>Z$5$l$^$9!#(B
-
+$B5l<0$N(B @code{gnus-group-ham-exit-processor-whitelist} $B$NBe$o$j(B
+$B$K(B @code{(ham spam-use-whitelist)} $B$r;H$&$3$H$r?d>)$7$^$9!#$9$Y$FF1Ey$K(B
+$BF0:n$9$k$3$H$OJ]>Z$5$l$^$9!#(B
 @end defvar
 
 $B%V%i%C%/%j%9%H$O!"$"$J$?$,(B spam $B$NAw?.@\(B @code{spam-whitelist} $B$H(B @code{spam-blacklist} $BJQ?t$G%+%9%?%^%$%:(B
 $B$9$k$3$H$,$G$-$^$9!#%[%o%$%H%j%9%H$H%V%i%C%/%j%9%H$N%U%!%$%k$O!"%G%#%U%)(B
-$B%k%H$G$O(B @code{spam-directory} $B$N%G%#%l%/%H%j$K$"$j!"$=$l$>(B
+$B%k%H$G$O(B @code{spam-directory} $B$N%G%#%l%/%H%j!<$K$"$j!"$=$l$>(B
 $B$l(B @file{whitelist} $B$H(B @file{blacklist} $B$H$$$&L>A0$,IU$1$i$l$^$9!#(B
 
 @node BBDB Whitelists
@@ -22556,44 +23548,39 @@ From Reiner Steib .
 @cindex spam
 
 @defvar spam-use-BBDB
-
 @code{spam-use-whitelist} (@pxref{Blacklists and Whitelists}) $B$K;w$F$$$^(B
-$B$9$,!"%[%o%$%H%j%9%H$N%"%I%l%9$N8;$H$7$F!"@55,I=8=$G$O$J$$(B BBDB $B$r;H$$$^(B
-$B$9!#(B@code{spam-use-BBDB} $B$r$A$c$s$HF0:n$5$;$k$K$O(B BBDB $B$r(B load $B$7$J$1$l(B
-$B$P$J$j$^$;$s!#$=$NAw?.l9g$O!"$3$NJQ?t(B
 $B$r(B @code{t} $B$K$7$F2<$5$$!#Cm0U$7$F;H$C$F2<$5$$!#(BBBDB $B$K:\$C$F$$$kAw?.$N$9$Y$F$O(B spammers $B$H$7$FJ,N`$5$l$^$9!#(B
 
-@code {spam.el} $B$K4X$9$k8B$j$O!"(B@code{spam-use-BBDB} $B$NJLL>$H$7(B
+@code{spam.el} $B$K4X$9$k8B$j$O!"(B@code{spam-use-BBDB} $B$NJLL>$H$7(B
 $B$F(B @code{spam-use-BBDB-exclusive} $B$r;H$&$3$H$,$G$-$^$9$,!"$=$l$OJL$N%P%C(B
 $B%/%(%s%I$G$O$"$j$^$;$s!#(B@code{spam-use-BBDB-exclusive} $B$r(B @code{t} $B$K@_(B
 $BDj$9$l$P!"(BBBDB $B$K$h$kJ,3d$O$9$Y$FGSB>E*$K$J$j$^$9!#(B
-
 @end defvar
 
 @defvar gnus-group-ham-exit-processor-BBDB
-
-$B$3$N%7%s%\%k$r!"%0%k!<%W%Q%i%a!<%?$N%+%9%?%^%$%:$K$h$C$F%0%k!<%W(B
-$B$N(B @code{spam-process} $B%Q%i%a!<%?$K2C$($k$+!"$^$?(B
+$B$3$N%7%s%\%k$r!"%0%k!<%W%Q%i%a!<%?!<$N%+%9%?%^%$%:$K$h$C$F%0%k!<%W(B
+$B$N(B @code{spam-process} $B%Q%i%a!<%?!<$K2C$($k$+!"$^$?(B
 $B$O(B @code{gnus-spam-process-newsgroups} $BJQ?t$K2C$($F2<$5$$!#$3$N%7%s%\%k(B
-$B$,%0%k!<%W$N(B @code{spam-process} $B%Q%i%a!<%?$K2C$($i$l$k$H!"(Bham $B0u$,IU$$(B
-$B$?(B @emph{ham} $B%0%k!<%W$N5-;v$NAw?.)$7$^$9!#$9$Y$FF1Ey$KF0:n$9$k(B
+$B5l<0$N(B @code{gnus-group-ham-exit-processor-BBDB} $B$NBe$o$j$K!"(B
+@code{(ham spam-use-BBDB)} $B$r;H$&$3$H$r?d>)$7$^$9!#$9$Y$FF1Ey$KF0:n$9$k(B
 $B$3$H$OJ]>Z$5$l$^$9!#(B
-
 @end defvar
 
 @node Gmane Spam Reporting
@@ -22604,31 +23591,32 @@ From Reiner Steib .
 @cindex spam
 
 @defvar gnus-group-spam-exit-processor-report-gmane
-
-$B%0%k!<%W%Q%i%a!<%?$+JQ?t(B @code{gnus-spam-process-newsgroups} $B$r%+%9%?%^(B
-$B%$%:$7$F!"$3$N%7%s%\%k$r%0%k!<%W$N(B @code{spam-process} $B%Q%i%a!<%?$K2C$((B
-$B$F2<$5$$!#$3$l$,2C$($i$l$k$H!"(Bspam $B0u$,IU$$$?5-;v$N%0%k!<%W$,(B HTTP $B7PM3(B
-$B$G(B Gmane $B$N4IM})$7$^$9!#$9$Y$FF1Ey$KF0:n$9(B
-$B$k$3$H$OJ]>Z$5$l$^$9!#(B
-
+$B5l<0$N(B @code{gnus-group-spam-exit-processor-report-gmane} $B$NBe$o$j(B
+$B$K(B @code{(spam spam-use-gmane)} $B$r;H$&$3$H$r?d>)$7$^$9!#$9$Y$FF1Ey$KF0:n(B
+$B$9$k$3$H$OJ]>Z$5$l$^$9!#(B
 @end defvar
 
 @defvar spam-report-gmane-use-article-number
-
-$B$3$NJQ?t$O%G%#%U%)%k%H$G(B @code{t} $B$G$9!#$"$J$?<+?H$,%K%e!<%9%5!<%P!<$r1?(B
-$B1D$7$F$$$k!"$9$J$o$A%m!<%+%k$J5-;vHV9f$,(B Gmane $B$N5-;vHV9f$H9g$o$J$$>l9g(B
-$B$O!"(B@code{nil} $B$K@_Dj$7$F2<$5$$!#(B
+$B$3$NJQ?t$O%G%#%U%)%k%H$G(B @code{t} $B$G$9!#Nc$($P$"$J$?<+?H$,%K%e!<%9%5!<%P!<(B
+$B$r1?1D$7$F$$$k$J$I$NM}M3$K$h$C$F!"%m!<%+%k$J5-;vHV9f$,(B Gmane $B$N5-;vHV9f(B
+$B$H9g$o$J$$>l9g$O!"(B@code{nil} $B$K@_Dj$7$F2<$5$$!#(B
 @code{spam-report-gmane-use-article-number} $B$,(B @code{nil} $B$G$"$k$H!"(B
-@file{spam-report.el} $B$O(B Gmane $B$,Ds6!$9$k(B @code{X-Report-Spam} $B%X%C%@!<(B
-$B$r;H$$$^$9!#(B
+@code{spam-report.el} $B$O$=$NHV9f$r5-;v$N%X%C%@!<$+$iZ$7$H$7(B
+$B$F(B hashcash $B$N0u(B (tokens) $B$r;H$$$^$9!#(BHashcash $B0u$,L5$$%a%C%;!<%8$Ou$G$O(B @code{spam-use-dig} $B$r(B @code{nil} $B$K@_Dj$9$k$3$H$O!"$$(B
-$B$/?M$+$N%f!<%6!<$,;H$($J$$$+$b$7$l$J$$$N$G!"$=$l$,2DG=$J@-G=2~A1$G$"$k$K(B
-$B$b$+$+$o$i$:?d>)$5$l$^$;$s!#$7$+$7!"$=$l$,F0$/$+$I$&$+$r3N$+$a$k$3$H$O$G(B
-$B$-$^$9!#(B
-
+$B$/?M$+$NMxMQ)$5$l$^$;$s!#$7$+$7!"$=$l$,F0$/$+$I$&$+$r3N$+$a$k$3$H$O$G$-(B
+$B$^$9!#(B
 @end defvar
 
 @defvar spam-blackhole-servers
-
 $B%V%i%C%/%[!<%k!&%A%'%C%/$N$?$a$K0U8+$r5a$a$k%5!<%P!<$N%j%9%H$G$9!#(B
-
 @end defvar
 
 @defvar spam-blackhole-good-server-regex
-
-$B%V%i%C%/%[!<%k!&%5!<%P!<$N%j%9%H$H>H9g$5$l$F$O$J$i$J$$(B IP $B$N@55,I=8=!#(B
-@code{nil} $B$K@_Dj$5$l$k$HL58z$G$9!#(B
-
+$B%V%i%C%/%[!<%k!&%5!<%P!<$N%j%9%H$H>H9g$5$l$F$O$J$i$J$$(B IP $B$N@55,I=8=$G$9!#(B
+@code{nil} $B$K@_Dj$5$l$k$HL58z$K$J$j$^$9!#(B
 @end defvar
 
 @defvar spam-use-dig
-
 @file{dns.el} $B%Q%C%1!<%8$NBe$o$j$K(B @file{dig.el} $B%Q%C%1!<%8$r;H$$$^$9!#(B
 $B%G%#%U%)%k%H$N@_Dj$G$"$k(B @code{t} $B$,?d>)$5$l$^$9!#(B
-
 @end defvar
 
 $B%V%i%C%/%[!<%k!&%A%'%C%/$OF~$C$FMh$k%a!<%k$KBP$7$F$@$19T$J$o$l$^$9!#%V%i%C(B
@@ -22702,28 +23681,22 @@ Gmane $B$O(B @uref{http://gmane.org} $B$G8+$D$1$k$3$H$,$G$-$^$9!#(B
 @cindex spam
 
 @defvar spam-use-regex-headers
-
 $B$3$N%*%W%7%g%s$O%G%#%U%)%k%H$GL58z$K$J$C$F$$$^$9!#$3$N%*%W%7%g%s$r%;%C%H(B
 $B$9$k$H!"(Bgnus $B$K@55,I=8=$N%j%9%H$H%a%C%;!<%8%X%C%@!<$r>H9g$5$;$k$3$H$,$G(B
 $B$-$^$9!#JQ?t(B @code{spam-regex-headers-spam} $B$*$h(B
 $B$S(B @code{spam-regex-headers-ham} $B$,@55,I=8=$N%j%9%H$r;}$A$^$9!#%a%C%;!<(B
-$B%8$,(B spam $B$^$?$O(B ham $B$+$I$&$+$r7h$a$k$?$a$K!"(BGnus $B$O%a%C%;!<%8%X%C%@!<$N(B
-$B$=$l$>$l$r8!::$7$^$9!#(B
-
+$B%8$,(B spam $B$+(B ham $B$+$I$&$+$r$=$l$>$l$NJQ?t$r;H$C$F7h$a$k$?$a$K!"(Bgnus $B$O%a%C(B
+$B%;!<%8%X%C%@!<$r8!::$7$^$9!#(B
 @end defvar
 
 @defvar spam-regex-headers-spam
-
-$B%a%C%;!<%8%X%C%@!<$NCf$G0lCW$7$?;~$K!"$=$l$,L@$i$+$K(B spam $B$G$"$k$3$H$r8+(B
-$BJ,$1$k$?$a$N@55,I=8=$N%j%9%H$G$9!#(B
-
+$B%a%C%;!<%8%X%C%@!<$NCf$G0lCW$7$?;~$K!"$=$l$,(B spam $B$G$"$k$3$H$rCGDj$9$k$?(B
+$B$a$N@55,I=8=$N%j%9%H$G$9!#(B
 @end defvar
 
 @defvar spam-regex-headers-ham
-
-$B%a%C%;!<%8%X%C%@!<$NCf$G0lCW$7$?;~$K!"$=$l$,L@$i$+$K(B ham $B$G$"$k$3$H$r8+(B
-$BJ,$1$k$?$a$N@55,I=8=$N%j%9%H$G$9!#(B
-
+$B%a%C%;!<%8%X%C%@!<$NCf$G0lCW$7$?;~$K!"$=$l$,(B ham $B$G$"$k$3$H$rCGDj$9$k$?(B
+$B$a$N@55,I=8=$N%j%9%H$G$9!#(B
 @end defvar
 
 $B@55,I=8=$K$h$k%X%C%@!<$N8!::$O!"F~$C$F$-$?%a!<%k$KBP$7$F$@$19T$J$o$l$^$9!#(B
@@ -22736,85 +23709,79 @@ Gmane $B$O(B @uref{http://gmane.org} $B$G8+$D$1$k$3$H$,$G$-$^$9!#(B
 @cindex spam
 
 @defvar spam-use-bogofilter
-
 Eric Raymond $B$N?WB.$J(B Bogofilter $B$r(B @code{spam-split} $B$K;HMQ$7$?$$>l9g$O!"(B
-$B$3$NJQ?t$r%;%C%H$7$F$/$@$5$$!#(B
+$B$3$NJQ?t$r%;%C%H$7$F2<$5$$!#(B
 
-Spam $B5-;v$@$1$N(B @samp{$} $B0u$r4XO"IU$1$k:G>.$N@$OC$K$h$C$F!"(BBogofilter $B%H(B
-$B%l!<%K%s%0$O$9$Y$F$+$J$j<+F0E*$K$J$j$^$9!#3F%+%F%4%j!<$N(B spam $B$+$=$&$G$J(B
-$B$$?tI4$N5-;v$rF~.8BEY$N@$OC$@$1$G!"(BBogofilter $B%H%l!<(B
+$B%K%s%0$O$9$Y$F$+$J$j<+F0E*$K$J$j$^$9!#(BSpam $B$H$=$&$G$J$$$b$N$=$l$>$l$Nl9g!"(BBogofilter $B$N=hM}$O(B
 $BC$5$l$^$9!#(B
 
 @code{spam-use-bogofilter-headers} $B$r;H$&>l9g$O!"$3$l$rM-8z$K$7$F$O$$$1(B
 $B$^$;$s!#(B
-
 @end defvar
 
 @defvar spam-use-bogofilter-headers
-
 $B%a%C%;!<%8%X%C%@!<$@$1$rD4$Y$k$?$a$K(B Eric Raymond $B$N?WB.(B
 $B$J(B Bogofilter $B$r(B @code{spam-split} $B$K;HMQ$7$?$$>l9g$O!"$3$NJQ?t$r%;%C%H(B
-$B$7$F$/$@$5$$!#$3$l$O(B @code{spam-use-bogofilter} $B$HF1$8$h$&$KF0:n$7$^$9$,!"(B
+$B$7$F2<$5$$!#$3$l$O(B @code{spam-use-bogofilter} $B$HF1$8$h$&$KF0:n$7$^$9$,!"(B
 $B$"$i$+$8$a(B @code{X-Bogosity} $B%X%C%@!<$,%a%C%;!<%8$KB8:_$7$J$1$l$P$J$j$^(B
 $B$;$s!#DL>o$3$l$O(B procmail $B$N5;K!$+!"2?$+$=$l$K;w$?$b$N$G9T$J$&$3$H$K$J$k(B
 $B$G$7$g$&!#(BBogofilter $B$N%$%s%9%H!<%k$K4X$9$kJ8=q$rD4$Y$F2<$5$$!#(B
 
 @code{spam-use-bogofilter} $B$r;H$&>l9g$O!"$3$l$rM-8z$K$7$F$O$$$1$^$;$s!#(B
-
 @end defvar
 
 @defvar gnus-group-spam-exit-processor-bogofilter
-$B$3$N%7%s%\%k$r!"%0%k!<%W%Q%i%a!<%?$N%+%9%?%^%$%:$K$h$C$F%0%k!<%W(B
-$B$N(B @code{spam-process} $B%Q%i%a!<%?$K2C$($k$+!"$^$?(B
+$B$3$N%7%s%\%k$r!"%0%k!<%W%Q%i%a!<%?!<$N%+%9%?%^%$%:$K$h$C$F%0%k!<%W(B
+$B$N(B @code{spam-process} $B%Q%i%a!<%?!<$K2C$($k$+!"$^$?(B
 $B$O(B @code{gnus-spam-process-newsgroups} $BJQ?t$K2C$($F2<$5$$!#$3$N%7%s%\%k(B
-$B$,%0%k!<%W$N(B @code{spam-process} $B%Q%i%a!<%?$K2C$($i$l$k$H!"(Bspam $B0u$,IU$$(B
-$B$?5-;v$,(B bogofilter $B$N(B spam $B%G!<%?%Y!<%9$K2C$($i$^$9!#(B
+$B$,%0%k!<%W$N(B @code{spam-process} $B%Q%i%a!<%?!<$K2C$($i$l$k$H!"(Bspam $B0u$,IU(B
+$B$$$?5-;v$,(B bogofilter $B$N(B spam $B%G!<%?%Y!<%9$K2C$($i$^$9!#(B
 
 @emph{$B7Y9p(B}
 
-$BGQ$l$?(B @code{gnus-group-spam-exit-processor-bogofilter} $B$NBe$o$j$K!"(B
-@code{'(spam spam-use-bogofilter)} $B$r;H$&$3$H$r?d>)$7$^$9!#$9$Y$FF1Ey$K(B
-$BF0:n$9$k$3$H$OJ]>Z$5$l$^$9!#(B
+$B5l<0$N(B @code{gnus-group-spam-exit-processor-bogofilter} $B$NBe$o$j(B
+$B$K(B @code{(spam spam-use-bogofilter)} $B$r;H$&$3$H$r?d>)$7$^$9!#$9$Y$FF1Ey(B
+$B$KF0:n$9$k$3$H$OJ]>Z$5$l$^$9!#(B
 @end defvar
 
 @defvar gnus-group-ham-exit-processor-bogofilter
-$B$3$N%7%s%\%k$r!"%0%k!<%W%Q%i%a!<%?$N%+%9%?%^%$%:$K$h$C$F%0%k!<%W(B
-$B$N(B @code{spam-process} $B%Q%i%a!<%?$K2C$($k$+!"$^$?(B
+$B$3$N%7%s%\%k$r!"%0%k!<%W%Q%i%a!<%?!<$N%+%9%?%^%$%:$K$h$C$F%0%k!<%W(B
+$B$N(B @code{spam-process} $B%Q%i%a!<%?!<$K2C$($k$+!"$^$?(B
 $B$O(B @code{gnus-spam-process-newsgroups} $BJQ?t$K2C$($F2<$5$$!#$3$N%7%s%\%k(B
-$B$,%0%k!<%W$N(B @code{spam-process} $B%Q%i%a!<%?$K2C$($i$l$k$H!"(Bham $B0u$,IU$$(B
-$B$?(B @emph{ham} $B%0%k!<%W$N5-;v$,Hs(B-spam $B5-;vMQ$N(B Bogofilter $B%G!<%?%Y!<%9$K(B
-$BDI2C$5$l$^$9!#(B
+$B$,%0%k!<%W$N(B @code{spam-process} $B%Q%i%a!<%?!<$K2C$($i$l$k$H!"(Bham $B0u$,IU(B
+$B$$$?(B @emph{ham} $B%0%k!<%W$N5-;v$,Hs(B-spam $B5-;vMQ$N(B Bogofilter $B%G!<%?%Y!<%9(B
+$B$KDI2C$5$l$^$9!#(B
 
 @emph{$B7Y9p(B}
 
-$BGQ$l$?(B @code{gnus-group-ham-exit-processor-bogofilter} $B$NBe$o$j$K!"(B
-@code{'(ham spam-use-bogofilter)} $B$r;H$&$3$H$r?d>)$7$^$9!#$9$Y$FF1Ey$KF0(B
-$B:n$9$k$3$H$OJ]>Z$5$l$^$9!#(B
+$B5l<0$N(B @code{gnus-group-ham-exit-processor-bogofilter} $B$NBe$o$j(B
+$B$K(B @code{(ham spam-use-bogofilter)} $B$r;H$&$3$H$r?d>)$7$^$9!#$9$Y$FF1Ey$K(B
+$BF0:n$9$k$3$H$OJ]>Z$5$l$^$9!#(B
 @end defvar
 
 @defvar spam-bogofilter-database-directory
-
-$B$3$l$O(B Bogofilter $B$,$=$N%G!<%?%Y!<%9$r3JG<$9$k%G%#%l%/%H%j$G$9!#%G%#%U%)(B
+$B$3$l$O(B Bogofilter $B$,$=$N%G!<%?%Y!<%9$r3JG<$9$k%G%#%l%/%H%j!<$G$9!#%G%#%U%)(B
 $B%k%H$G$O@_Dj$5$l$F$$$J$$$N$G!"(BBogofilter $B$O$=$l<+?H$N%G%#%U%)%k%H$N%G!<(B
-$B%?%Y!<%9!&%G%#%l%/%H%j$r;H$$$^$9!#(B
-
+$B%?%Y!<%9!&%G%#%l%/%H%j!<$r;H$$$^$9!#(B
 @end defvar
 
 Bogofilter $B$N%a!<%kJ,N`4o$O!"0U?^$HL\E*$NE@$G(B @command{ifile} $B$K;w$F$$$^(B
-$B$9!#(BSpam $B$H(B ham $B$N%W%m%;%C%5!<$,Ds6!$5$l!"2C$($F(B spam-$BJ,(B
-$B3d(B (spam-split) $B$K$b(B Bogofilter $B$,;H$o$l$k$Y$-$G$"$k$3$H!"$^$?$O$9$G$K5-(B
-$B;v$K;H$o$l$?$3$H$r<($9(B @code{spam-use-bogofilter} $B$*$h(B
-$B$S(B @code{spam-use-bogofilter-headers} $BJQ?t$,Ds6!$5$l$^$9!#$3$N5!G=$r8!::(B
-$B$9$k$?$a$K(B Bogofilter $B$N%P!<%8%g%s(B 0.9.2.1 $B$,;H$o$l$^$7$?!#(B
+$B$9!#(BHam $B$*$h$S(B spam $B$N%W%m%;%C%5!<$,Ds6!$5$l!"5-;v$G(B Bogofilter $B$,;H$o$l(B
+$B$k$Y$-$+!"$^$?$O4{$K;H$o$l$?$+$r(B spam-split $B$K<($9$?$a(B
+$B$N(B @code{spam-use-bogofilter} $BJQ?t(B
+$B$H(B @code{spam-use-bogofilter-headers} $B$,$"$j$^$9!#$3$N5!G=$r8!::$9$k$?$a(B
+$B$K(B Bogofilter $B$N%P!<%8%g%s(B 0.9.2.1 $B$,;H$o$l$^$7$?!#(B
 
 @node SpamAssassin back end
 @subsubsection SpamAssassin back end
@@ -22823,51 +23790,45 @@ Bogofilter $B$N%a!<%kJ,N`4o$O!"0U?^$HL\E*$NE@$G(B @command{ifile} $B$K;w$F$$$
 @cindex spam
 
 @defvar spam-use-spamassassin
-
 @code{spam-split} $B$K(B SpamAssassin $B$r;H$$$?$$>l9g$O!"$3$NJQ?t$r%;%C%H$7$F(B
 $B2<$5$$!#(B
 
-SpamAssassin $B$O!"%Y%$%8%"%s%U%#%k%?$rFbJq$9$k5,B'$HJ,@O$N%;%C%H$K4p$E$$(B
+SpamAssassin $B$O!"5,B'$HJ,@O$N%;%C%H(B ($B%Y%$%8%"%s%U%#%k%?$r4^$`(B) $B$K4p$E$$(B
 $B$F!"$=$l$>$l$N5-;v$N%9%3%"$r:[Dj$7$^$9!#%Y%$%8%"%s%U%#%k%?$O!"(Bspam $B5-;v(B
-$B$N(B @samp{$} $B0u$r4XO"$5$;$k$3$H$K$h$j71N}$9$k$3$H$,$G$-$^$9!#(BSpam $B$N%9%3(B
-$B%"$O!"35N,%b!<%I$G(B @kbd{S t} $B%3%^%s%I$r;H$&$3$H$K$h$C$F8+$k$3$H$,$G$-$^(B
-$B$9!#(B
+$B$K(B @samp{$} $B0u$r4XO"$5$;$k$3$H$K$h$C$F71N}$9$k$3$H$,$G$-$^$9!#(BSpam $B$N%9(B
+$B%3%"$O!"35N,%b!<%I$G(B @kbd{S t} $B%3%^%s%I$r;H$&$3$H$K$h$C$F8+$k$3$H$,$G$-(B
+$B$^$9!#(B
 
 $B$3$NJQ?t$r%;%C%H$9$k$H!"$=$l$>$l$N5-;v$O(B @code{spam-split} $B$,8F$P$l$k$H(B
 $B$-$K(B SpamAssassin $B$K$h$C$F=hM}$5$l$^$9!#%a!<%k$,(B SpamAssassin $B$G=hM}$5$l(B
-$B$k$h$&$K$J$C$F$$$k>l9g$K!"C1$K(B SpamAssassin $B%X%C%@!<$r;H$$$?$$$N$J$i$P!"(B
-$BBe$o$j$K(B @code{spam-use-spamassassin-headers} $B$r%;%C%H$7$F2<$5$$!#(B
+$B$k$h$&$K$J$C$F$$$F!"(BSpamAssassin $B%X%C%@!<$@$1$r;H$$$?$$$N$J$i$P!"Be$o$j(B
+$B$K(B @code{spam-use-spamassassin-headers} $B$r%;%C%H$7$F2<$5$$!#(B
 
 @code{spam-use-spamassassin-headers} $B$r;H$&>l9g!"$3$l$rM-8z$K$7$F$O$$$1(B
 $B$^$;$s!#(B
-
 @end defvar
 
 @defvar spam-use-spamassassin-headers
-
 $B%a!<%k$,(B SpamAssassin $B$G=hM}$5$l$k$h$&$K$J$C$F$$$k>l9g$K!"(B
 SpamAssassin $B%X%C%@!<$K4p$E$$$F(B @code{spam-split} $B$KJ,3d$r9T$J$o$;$?$$$N(B
 $B$J$i$P!"$3$NJQ?t$r%;%C%H$7$F2<$5$$!#(B
 
 @code{spam-use-spamassassin} $B$r;H$&>l9g!"$3$l$rM-8z$K$7$F$O$$$1$^$;$s!#(B
-
 @end defvar
 
 @defvar spam-spamassassin-path
-
 $B$3$NJQ?t$O(B SpamAssassin $B$NpJs$O!"(B
 SpamAssassin $B$N%I%-%e%a%s%H$r8+$F2<$5$$!#(B
-
 @end defvar
 
 SpamAssassin $B$O!"(Bspam $B$rF1Dj$9$k$?$a$K9-HO$JJ,@O$r9T$J$&!"6/NO$GM;DL@-$N(B
-$B$"$k(B spam $B_I2a4o$G$9!#(BSpamAssassin $B$,Ds6!$9$k(B ham $B$H(B spam $B$N%W%m%;%C%5!<(B
-$B$r;H$&$+!"$"$k$$$O4{$K$=$l$i$,5-;v$KE,MQ:Q$_$+$I$&$+$r!"(B
-@code{spam-use-spamassassin} $B$H(B @code{spam-use-spamassassin-headers} $BJQ(B
-$B?t$G(B @code{spam-split} $B$K;X<($7$^$9!#$3$N5!G=$r8!::$9$k$?$a(B
-$B$K(B SpamAssassin $B$N%P!<%8%g%s(B 2.63 $B$,;H$o$l$^$7$?!#(B
+$B$"$k(B spam $B_I2a4o$G$9!#(BHam $B$*$h$S(B spam $B$N%W%m%;%C%5!<$,Ds6!$5$l!"5-;v(B
+$B$G(B SpamAssassin $B$,;H$o$l$k$Y$-$+!"$^$?$O4{$K;H$o$l$?$+$r(B spam-split $B$K<((B
+$B$9$?$a$N(B @code{spam-use-spamassassin} $BJQ?t(B
+$B$H(B @code{spam-use-spamassassin-headers} $BJQ?t$,$"$j$^$9!#$3$N5!G=$r8!::$9(B
+$B$k$?$a$K(B SpamAssassin $B$N%P!<%8%g%s(B 2.63 $B$,;H$o$l$^$7$?!#(B
 
 @node ifile spam filtering
 @subsubsection ifile $B$K$h$k(B spam $B$N_I2a(B
@@ -22876,40 +23837,33 @@ SpamAssassin $B$O!"(Bspam $B$rF1Dj$9$k$?$a$K9-HO$JJ,@O$r9T$J$&!"6/NO$GM;DL@-$
 @cindex spam
 
 @defvar spam-use-ifile
-
 Bogofilter $B$K;w$?E}7WJ,@O4o$G$"(B
 $B$k(B @command{ifile} $B$r(B @code{spam-split} $B$K;H$$$?$$>l9g$O!"$3$NJQ?t$rM-8z(B
 $B$K$7$F2<$5$$!#(B
-
 @end defvar
 
 @defvar spam-ifile-all-categories
-
 @code{spam-use-ifile} $B$K!"C1$J$k(B spam/$BHs(B-spam $B$G$O$J$/$F(B ifile $B$N$9$Y$F(B
-$B$N%+%F%4%j!<$rM?$($F$b$i$$$?$$$J$i$P!"$3$NJQ?t$rM-8z$K$7$F2<$5$$!#$3$l$r(B
-$B;H$&>l9g$O!"$=$NJ88%$K=q$+$l$F$$$k$h$&$K(B ifile $B$r%H%l!<%K%s%0$7$F$*$+$J(B
-$B$1$l$P$J$j$^$;$s!#(B
-
+$B$N6hJ,(B ($B%+%F%4%j!<(B) $B$rM?$($F$b$i$$$?$$$J$i$P!"$3$NJQ?t$rM-8z$K$7$F2<$5$$!#(B
+$B$3$l$r;H$&>l9g$O!"$=$NJ88%$K=q$+$l$F$$$k$h$&$K(B ifile $B$r%H%l!<%K%s%0$7$F(B
+$B$*$+$J$1$l$P$J$j$^$;$s!#(B
 @end defvar
 
 @defvar spam-ifile-spam-category
-
 ifile $B$K4X$9$k8B$j!"$3$l$O(B spam $B%a%C%;!<%8$N%+%F%4%j!<$G$9!#$G$9!#%G%#%U%)%k%H$G$ODj5A$5$l$F$$(B
 $B$J$$$N$G!"(Bifile $B$O$=$l<+?H$N%G%#%U%)%k%H$N%G!<%?%Y!<%9L>$r;H$$$^$9!#(B
-
 @end defvar
 
 ifile $B$N%a!<%kJ,N`4o$O!"0U?^$HL\E*$NE@$G(B Bogofilter $B$K;w$F$$$^$9!#(B
-Spam $B$H(B ham $B$N%W%m%;%C%5!)$7$^$9!#$9$Y$FF1Ey$KF0:n$9(B
-$B$k$3$H$OJ]>Z$5$l$^$9!#(B
+$B5l<0$N(B @code{gnus-group-spam-exit-processor-stat} $B$NBe$o$j(B
+$B$K(B @code{(spam spam-use-stat)} $B$r;H$&$3$H$r?d>)$7$^$9!#$9$Y$FF1Ey$KF0:n(B
+$B$9$k$3$H$OJ]>Z$5$l$^$9!#(B
 @end defvar
 
 @defvar gnus-group-ham-exit-processor-stat
-$B$3$N%7%s%\%k$r!"%0%k!<%W%Q%i%a!<%?$N%+%9%?%^%$%:$K$h$C$F%0%k!<%W(B
-$B$N(B @code{spam-process} $B%Q%i%a!<%?$K2C$($k$+!"$^$?(B
+$B$3$N%7%s%\%k$r!"%0%k!<%W%Q%i%a!<%?!<$N%+%9%?%^%$%:$K$h$C$F%0%k!<%W(B
+$B$N(B @code{spam-process} $B%Q%i%a!<%?!<$K2C$($k$+!"$^$?(B
 $B$O(B @code{gnus-spam-process-newsgroups} $BJQ?t$K2C$($F2<$5$$!#$3$N%7%s%\%k(B
-$B$,%0%k!<%W$N(B @code{spam-process} $B%Q%i%a!<%?$K2C$($i$l$k$H!"(Bham $B0u$,IU$$(B
-$B$?(B @emph{ham} $B%0%k!<%W$N5-;v$,Hs(B-spam $B5-;vMQ$N(B spam-stat $B%G!<%?%Y!<%9$K(B
-$BDI2C$5$l$^$9!#(B
+$B$,%0%k!<%W$N(B @code{spam-process} $B%Q%i%a!<%?!<$K2C$($i$l$k$H!"(Bham $B0u$,IU(B
+$B$$$?(B @emph{ham} $B%0%k!<%W$N5-;v$,Hs(B-spam $B5-;vMQ$N(B spam-stat $B%G!<%?%Y!<%9(B
+$B$KDI2C$5$l$^$9!#(B
 
 @emph{$B7Y9p(B}
 
-$BGQ$l$?(B @code{gnus-group-ham-exit-processor-stat} $B$NBe$o$j$K!"(B
-@code{'(ham spam-use-stat)} $B$r;H$&$3$H$r?d>)$7$^$9!#$9$Y$FF1Ey$KF0:n$9$k(B
-$B$3$H$OJ]>Z$5$l$^$9!#(B
+$B5l<0$N(B @code{gnus-group-ham-exit-processor-stat} $B$NBe$o$j(B
+$B$K(B @code{(ham spam-use-stat)} $B$r;H$&$3$H$r?d>)$7$^$9!#$9$Y$FF1Ey$KF0:n$9(B
+$B$k$3$H$OJ]>Z$5$l$^$9!#(B
 @end defvar
 
 $B$3$l$O(B @code{spam.el} $B$,(B @file{spam-stat.el} $B$HF/$-9g$&$3$H$r2DG=$K$7$^(B
 $B$9!#(B@file{spam-stat.el} $B$O(B (Lisp $B$@$1$N(B) spam $BFbIt%G!<%?%Y!<%9$rDs6!$7$^(B
 $B$9$,!"$=$l$O(B ifile $B$d(B Bogofilter $B$H0c$C$F30It%W%m%0%i%`$rI,MW$H$7$^$;$s!#(B
-Spam $B$H(B ham $B$N%W%m%;%C%5!<$H(B @code{spam-split} $B$N$?$a(B
+Spam $B$H(B ham $B$N%W%m%;%C%5!l9g(B
-$B$K!"%a!<%k$O(B @emph{mark} $B%b!<%I$GF0:n$7$F$$$k(B SpamOracle $B$K%Q%$%W$5$l$^(B
-$B$9!#$9$k$H(B SpamOracle $B$O!"$=$N%a!<%k$r(B spam $B$@$H8+$J$7$?$+$I$&$+$r<((B
+gnus $B$G(B SpamOracle $B$r;H$&$K$O!"J#?t$N$d$jJ}$,$"$j$^$9!#$9$Y$F$N>l9g$K!"(B
+$B%a!<%k$O(B @emph{mark} $B%b!<%I$GF0:n$7$F$$$k(B SpamOracle $B$K%Q%$%W$5$l$^$9!#(B
+$B$9$k$H(B SpamOracle $B$O!"$=$N%a!<%k$r(B spam $B$@$H8+$J$7$?$+$I$&$+$r<((B
 $B$9(B @samp{X-Spam} $B%X%C%@!<$r5-F~$7$^$9!#(B
 
 $BO$G=R$Y$i$l$F$$$k$h$&(B
 $B$K(B @code{nnmail-split-fancy} $B$+(B @code{nnimap-split-fancy} $B$r@_Dj$7$F2<$5(B
-$B$$!#$3$NNc$G$O(B @code{nnimap} $B%5!<%P!<$N(B @samp{INBOX} $B$,(B SpamOracle $B$K$h$C(B
-$B$F_I2a$5$l$^$9!#(BSpam $B$@$H8+$J$5$l$?%a!<%k$O(B @code{spam-split-group}$B!"$3(B
-$B$N>l9g$O(B @samp{Junk} $B$K0\F0$5$;$i$l$^$9!#(BHam $B$J%a%C%;!<%8(B
+$B$$!#$3$NNc$G$O(B @code{nnimap} $B%5!<%P!<$N(B @samp{INBOX} $B$,(B SpamOracle $B$r;H$C(B
+$B$F_I2a$5$l$^$9!#(BSpam $B$@$HG'<1$5$l$?%a!<%k$O(B @code{spam-split-group} ($B$3(B
+$B$N>l9g$O(B @samp{Junk}) $B$K0\F0$5$;$i$l$^$9!#(BHam $B$J%a%C%;!<%8(B
 $B$O(B @samp{INBOX} $B$K;D$j$^$9(B:
 
 @example
@@ -23003,13 +23955,13 @@ Using The Spam ELisp Package} $B$N9`$G=R$Y$i$l$F$$$k$h$&(B
 @end example
 
 @defvar spam-use-spamoracle
-Gnus $B$K(B SpamOracle $B$r;H$C$F(B spam $B$N_I2a$r$5$;$?$$>l9g$K(B @code{t} $B$K$7$F(B
+gnus $B$K(B SpamOracle $B$r;H$C$F(B spam $B$N_I2a$r$5$;$?$$>l9g$K(B @code{t} $B$K$7$F(B
 $B2<$5$$!#(B
 @end defvar
 
 @defvar spam-spamoracle-binary
-Gnus $B$O%f!<%6$N(B PATH $B$G8+$D$+$C$?(B @file{spamoracle} $B$H$$$&(B SpamOracle $B$N(B
-$B%P%$%J%j$r;H$$$^$9!#$3$l$K$O%+%9%?%^%$%:2DG=$JJQ(B
+gnus $B$OMxMQl=j$K$"$k>l9g$O!"(B
+$B$l$k$3$H$r0UL#$7$^$9!#%G!<%?%Y!<%9$,$I$3$+FCJL$J>l=j$KCV$-$?$$>l9g$O!"(B
 @code{spam-spamoracle-database} $B$r$=$N%Q%9$K@_Dj$7$F2<$5$$!#(B
 @end defvar
 
@@ -23027,42 +23979,42 @@ SpamOracle $B$O%a%C%;!<%8$,(B spam $B$+(B ham $B$+$r8+6K$a$k$?$a$KE}7WE*$J<
 $B%K%s%0$rI,MW$H$7$^$9!#(BSpamOracle $B$O(B spam $B%a!<%k$NFCD'$r3X$S$^$9!#(B
 @emph{add} $B%b!<%I(B ($B%H%l!<%K%s%0!&%b!<%I(B) $B$r;H$C$F!"NI$$%a!<(B
 $B%k(B (ham) $B$H(B spam $B$r(B SpamOracle $B$KM?$($J$1$l$P$J$j$^$;$s!#$3$l$O!"35N,%P%C(B
-$B%U%!$G(B @kbd{|} $B$r2!$9$3$H$K$h$C$F%a!<%k$r(B SpamOracle $B$N%W%m%;%9$K%Q%$%W(B
-$B$9$k$+!"$^$?$O(B @code{spam.el} $B$N(B spam $B$*$h$S(B ham $B%W%m%;%C%5!<$r;H$&$3$H(B
-$B$K$h$C$F9T$J$&$3$H$,$G$-$^$9!"(B@xref{Filtering Spam Using The Spam ELisp
-Package}.
+$B%U%!!<$G(B @kbd{|} $B$r2!$9$3$H$K$h$C$F%a!<%k$r(B SpamOracle $B$N%W%m%;%9$K%Q%$(B
+$B%W$9$k$+!"$^$?$O(B @code{spam.el} $B$N(B spam $B$*$h$S(B ham $B%W%m%;%C%5!<$r;H$&$3(B
+$B$H$K$h$C$F9T$J$&$3$H$,$G$-$^$9!#(B@xref{Filtering Spam Using The Spam
+ELisp Package}.
 
 @defvar gnus-group-spam-exit-processor-spamoracle
-$B$3$N%7%s%\%k$r!"%0%k!<%W%Q%i%a!<%?$N%+%9%?%^%$%:$K$h$C$F%0%k!<%W(B
-$B$N(B @code{spam-process} $B%Q%i%a!<%?$K2C$($k$+!"$^$?(B
+$B$3$N%7%s%\%k$r!"%0%k!<%W%Q%i%a!<%?!<$N%+%9%?%^%$%:$K$h$C$F%0%k!<%W(B
+$B$N(B @code{spam-process} $B%Q%i%a!<%?!<$K2C$($k$+!"$^$?(B
 $B$O(B @code{gnus-spam-process-newsgroups} $BJQ?t$K2C$($F2<$5$$!#$3$N%7%s%\%k(B
-$B$,%0%k!<%W$N(B @code{spam-process} $B%Q%i%a!<%?$K2C$($i$l$k$H!"(Bspam $B0u$,IU$$(B
-$B$?5-;v$,(B spam $B$N%5%s%W%k$H$7$F(B SpamOracle $B$KAw$i$l$^$9!#(B
+$B$,%0%k!<%W$N(B @code{spam-process} $B%Q%i%a!<%?!<$K2C$($i$l$k$H!"(Bspam $B0u$,IU(B
+$B$$$?5-;v$,(B spam $B$N%5%s%W%k$H$7$F(B SpamOracle $B$KAw$i$l$^$9!#(B
 
 @emph{$B7Y9p(B}
 
-$BGQ$l$?(B @code{gnus-group-spam-exit-processor-spamoracle} $B$NBe$o$j$K!"(B
-@code{'(spam spam-use-spamoracle)} $B$r;H$&$3$H$r?d>)$7$^$9!#$9$Y$FF1Ey$K(B
-$BF0:n$9$k$3$H$OJ]>Z$5$l$^$9!#(B
+$B5l<0$N(B @code{gnus-group-spam-exit-processor-spamoracle} $B$NBe$o$j(B
+$B$K(B @code{(spam spam-use-spamoracle)} $B$r;H$&$3$H$r?d>)$7$^$9!#$9$Y$FF1Ey(B
+$B$KF0:n$9$k$3$H$OJ]>Z$5$l$^$9!#(B
 @end defvar
 
 @defvar gnus-group-ham-exit-processor-spamoracle
-$B$3$N%7%s%\%k$r!"%0%k!<%W%Q%i%a!<%?$N%+%9%?%^%$%:$K$h$C$F%0%k!<%W(B
-$B$N(B @code{spam-process} $B%Q%i%a!<%?$K2C$($k$+!"$^$?(B
+$B$3$N%7%s%\%k$r!"%0%k!<%W%Q%i%a!<%?!<$N%+%9%?%^%$%:$K$h$C$F%0%k!<%W(B
+$B$N(B @code{spam-process} $B%Q%i%a!<%?!<$K2C$($k$+!"$^$?(B
 $B$O(B @code{gnus-spam-process-newsgroups} $BJQ?t$K2C$($F2<$5$$!#$3$N%7%s%\%k(B
-$B$,%0%k!<%W$N(B @code{spam-process} $B%Q%i%a!<%?$K2C$($i$l$k$H!"(B@emph{ham} $B%0(B
-$B%k!<%W$K$"$k(B ham $B0u$,IU$$$?5-;v$,(B ham $B$N5-;v$N%5%s%W%k$H$7(B
+$B$,%0%k!<%W$N(B @code{spam-process} $B%Q%i%a!<%?!<$K2C$($i$l$k$H!"(B
+@emph{ham} $B%0%k!<%W$K$"$k(B ham $B0u$,IU$$$?5-;v$,(B ham $B$N5-;v$N%5%s%W%k$H$7(B
 $B$F(B SpamOracle $B$KAw$i$l$^$9!#(B
 
 @emph{$B7Y9p(B}
 
-$BGQ$l$?(B @code{gnus-group-ham-exit-processor-spamoracle} $B$NBe$o$j$K!"(B
-@code{'(ham spam-use-spamoracle)} $B$r;H$&$3$H$r?d>)$7$^$9!#$9$Y$FF1Ey$KF0(B
-$B:n$9$k$3$H$OJ]>Z$5$l$^$9!#(B
+$B5l<0$N(B @code{gnus-group-ham-exit-processor-spamoracle} $B$NBe$o$j(B
+$B$K(B @code{(ham spam-use-spamoracle)} $B$r;H$&$3$H$r?d>)$7$^$9!#$9$Y$FF1Ey$K(B
+$BF0:n$9$k$3$H$OJ]>Z$5$l$^$9!#(B
 @end defvar
 
 @emph{$BNc(B:} $B$3$l$i$O(B ham $B%0%k!<%W$H$7$FJ,N`$5$l$?!"$D$^$j(B ham $B$N5-;v$7$+(B
-$B$J$$%0%k!<%W$N%0%k!<%W%Q%i%a!<%?$G$9!#(B
+$B$J$$%0%k!<%W$N$?$a$N%0%k!<%W%Q%i%a!<%?!<$G$9!#(B
 
 @example
  ((spam-contents gnus-group-spam-classification-ham)
@@ -23070,12 +24022,12 @@ Package}.
                  (spam spam-use-spamoracle))))
 @end example
 
-$B$3$N%0%k!<%W$G$O(B @code{spam-use-spamoracle} $B$,(B ham $B$H(B spam $BN>J}$N=hM}$r(B
-$B9T$J$$$^$9!#$3$N%0%k!<%W$K(B spam $B5-;v$,$"$C$F(B (SpamOracle $B$,==J,$J%5%s%W(B
-$B%k$r?)$Y$5$;$F$b$i$C$F$$$J$1$l$P!"$=$&$J$j$^$9$M(B)$B!"$+$D%f!<%6$,$$$/$D$+(B
-$B$N5-;v$K(B spam $B$N0u$rIU$1$?$J$i$P!"$=$l$i$N5-;v$O(B SpamOracle $B$K$h$C$F=hM}(B
-$B$5$l$^$9!#$=$N%W%m%;%C%5!<$O!"?7$7$$(B spam $B$N%5%s%W%k$H$7$F(B SpamOracle $B$K(B
-$B5-;v$rAw$j$^$9!#(B
+$B$3$N%0%k!<%W$G$O(B @code{spam-use-spamoracle} $B$,(B ham $B$H(B spam $B$NN>J}$N=hM}(B
+$B$r9T$J$$$^$9!#$3$N%0%k!<%W$K(B spam $B5-;v$,$"$C$F(B (SpamOracle $B$,==J,$J%5%s(B
+$B%W%k$r?)$Y$5$;$F$b$i$C$F$$$J$1$l$P!"$=$&$J$j$^$9$M(B)$B!"$+$DMxMQ$N(B restister/unregister $B%k!<%A%s$r;H$C(B
+Blackbox $B$,(B spam $B$H(B ham $B$rEPO?$^$?$OEPO?2r=|$G$-$k$N$G$"$l$P!"$NEPO?(B/$B2r=|%k!<%A%s$r;H$C(B
 $B$F(B @code{spam-blackbox-register-routine} $B$*$h(B
 $B$S(B @code{spam-blackbox-unregister-routine} $B$r=q$$$F2<$5$$!#(B
 
@@ -23110,16 +24061,14 @@ Blackbox $B$,(B spam $B$H(B ham $B$r(B register/unregister $B$G$-$k$N$G$"
 
 @code{spam-check-blackbox} $B4X?t$O!"B>$N=,47$KJo$C(B
 $B$F(B @samp{nil} $B$+(B @code{spam-split-group} $B$rJV$5$J$1$l$P$J$j$^$;$s!#$"$J(B
-$B$?$K$G$-$k$3$H$NNc$O!"4{B8$N(B @code{spam-check-*} $B4X?t$r;2>H$7$F$/$@$5$$!#(B
-$B$^$?!"$"$J$?$,$=$&$G$J$$M}M3$r40A4$KM}2r$7$F$$$J$$$J$i$P!"%F%s%W%l!<%H$K(B
-$Bsv$jIU$$$F2<$5$$!#(B
-
+$B$?$K2?$,$G$-$k$+$NNc$H$7$F!"4{B8$N(B @code{spam-check-*} $B4X?t$r;2>H$7$F2<(B
+$B$5$$!#$^$?!"$"$J$?$,$=$&$G$J$$M}M3$r40A4$KM}2r$7$F$$$J$$$J$i$P!"%F%s%W%l!<(B
+$B%H$Ksv$jIU$$$F2<$5$$!#(B
 @end enumerate
 
-Spam $B$H(B ham $B%a%C%;!<%8$r=hM}$9$k$K$O!"0J2<$rMQ0U$7$F2<$5$$(B:
+Spam $B$H(B ham $B%a%C%;!<%8$r=hM}$9$k$?$a$K!"0J2<$N$b$N$rMQ0U$7$F2<$5$$(B:
 
 @enumerate
-
 @item
 $B%3!<%I(B
 
@@ -23128,9 +24077,10 @@ Blackbox $B$,(B spam $B$^$?$O(B ham $B$N=hM}$r%5%]!<%H$9$k>l9g$@$1!"$=$l$i$
 $B$F2<$5$$!#(B
 
 $B$5$i$K(B ham $B$H(B spam $B$N%W%m%;%C%5!<$OC10l$NJQ?t$G$O$J$/$5$l$D$D$"$j!"Be$o(B
-$B$j$K(B @code{'(spam spam-use-blackbox)} $B$^$?(B
-$B$O(B @code{'(ham spam-use-blackbox)} $B$N7A<0$,?d>)$5$l$^$9!#:#$N$H$3(B
-$B$m(B spam/ham $B%W%m%;%C%5!)$5$l$^$9!#:#$N$H$3(B
+$B$m(B spam/ham $B%W%m%;%C%5!$rMQ(B
-$B0U$7$^$9!#:#$N$H$3$m!"$3$l(B
+$B$3$N4X?t$O!"%*%j%8%J%k$N%P%C%/%(%s%I$N$h$&$K$9$Y$F$r9T$J$&%P%C%/%(%s%I$N(B
+$B$?$a$K!"JLL>$r;H$&$3$H$,$G$-$k$h$&$K$9$k$@$1$G$9!#:#$N$H$3$m!"$3$l(B
 $B$O(B @code{spam-use-BBDB-exclusive} $B$r(B @code{spam-use-BBDB} $B$N$h$&$KF/$+$;(B
 $B$k$?$a$@$1$K;H$o$l$^$9!#(B
 
 @item
 @code{spam-install-nocheck-backend}
 
-$B$3$N4X?t$O!"8!::$9$k5!G=$OL5$$$,(B ham $B$^$?(B
-$B$O(B spam $B$r(B register/unregister $B$9$k$3$H$,$G$-$k%P%C%/%(%s%I$rMQ0U$7$^$9!#(B
-@code{spam-use-gmane} $B$,$=$N$h$&$J%P%C%/%(%s%I$G$9!#(B
+$B$3$N4X?t$O!"8!::$9$k5!G=$OL5$$$1$l$I$b(B ham $B$^$?$O(B spam $B$rEPO?(B/$B2r=|$9$k$3(B
+$B$H$,$G$-$k%P%C%/%(%s%I$K$J$j$^$9!#(B@code{spam-use-gmane} $B$,$=$N$h$&$J%P%C(B
+$B%/%(%s%I$G$9!#(B
 
 @item
 @code{spam-install-checkonly-backend}
 
 $B$3$N4X?t$O!"F~$C$F$/$k%a!<%k$,(B spam $B$+$I$&$+$N8!::$@$1$r9T$J$&$3$H$,$G$-(B
-$B$k%P%C%/%(%s%I$rMQ0U$7$^$9!#$=$l$O%a%C%;!<%8$r(B register $B$^$?(B
-$B$O(B unregister $B$9$k$3$H$,$G$-$^$;$s!#(B@code{spam-use-blackholes} $B$*$h(B
-$B$S(B @code{spam-use-hashcash} $B$,$=$N$h$&$J%P%C%/%(%s%I$G$9!#(B
+$B$k%P%C%/%(%s%I$K$J$j$^$9!#$=$l$O%a%C%;!<%8$rEPO?$^$?$OEPO?2r=|$9$k$3$H$,(B
+$B$G$-$^$;$s!#(B@code{spam-use-blackholes} $B$H(B @code{spam-use-hashcash} $B$,$=(B
+$B$N$h$&$J%P%C%/%(%s%I$G$9!#(B
 
 @item
 @code{spam-install-statistical-checkonly-backend}
 
 $B$3$N4X?t$O!"F~$C$F$/$k%a!<%k$N8!::$@$1$r9T$J$&$3$H$,$G$-$k!"E}7W=hM}$r9T(B
-$B$J$&%P%C%/%(%s%I(B ($B8!::$N$?$a$K%a%C%;!<%8$NK\J8A4BN$rI,MW$H$9$k(B) $B$rMQ0U$7(B
+$B$J$&%P%C%/%(%s%I(B ($B8!::$N$?$a$K%a%C%;!<%8$NK\J8A4BN$rI,MW$H$7$^$9(B) $B$K$J$j(B
 $B$^$9!#(B@code{spam-use-regex-body} $B$,$=$N$h$&$J_I2a4o$G$9!#(B
 
 @item
 @code{spam-install-statistical-backend}
 
-$B$3$N4X?t$O!"F~$C$F$/$k%a!<%k$N8!::$H(B registration/unregistration $B%k!<%A(B
-$B%s$r;}$D!"E}7W=hM}$r9T$J$&%P%C%/%(%s%I$rMQ0U$7$^$9!#(B
-@code{spam-use-bogofilter} $B$O!"$=$N$h$&$K;EN)$F$i$l$F$$$^$9!#(B
+$B$3$N4X?t$O!"F~$C$F$/$k%a!<%k$N8!::$HEPO?(B/$B2r=|%k!<%A%s$r;}$D!"E}7W=hM}$r(B
+$B9T$J$&%P%C%/%(%s%I$K$J$j$^$9!#(B@code{spam-use-bogofilter} $B$O!"$=$N$h$&$K(B
+$B;EN)$F$i$l$F$$$^$9!#(B
 
 @item
 @code{spam-install-backend}
 
-$B$3$l$O:G$bIaDL$J%P%C%/%(%s%I$rMQ0U$7$^$9!#$=$l$O8!::$H%a%C%;!<%8(B
-$B$N(B register/unregister $B$r9T$J$&$3$H$,$G$-!"E}7W=hM}$NG=NO$O$"$j$^$;$s!#(B
+$B$3$l$O:G$bIaDL$J%P%C%/%(%s%I$K$J$j$^$9!#$=$l$O8!::$H%a%C%;!<%8$N(B
+$BEPO?(B/$B2r=|$r9T$J$&$3$H$,$G$-!"E}7W=hM}$NG=NO$O$"$j$^$;$s!#(B
 @code{spam-use-BBDB} $B$,$=$N$h$&$J%P%C%/%(%s%I$G$9!#(B
 
 @item
 @code{spam-install-mover-backend}
 
-$B0\F0$5$;$k(B (Mover) $B%P%C%/%(%s%I$O!"35N,%P%C%U%!$r=P$k$H$-$K(B
-@code{spam.el} $B$NFbIt$G!"$"$k0lDj$N$d$jJ}$G5-;v$r0\F0$5$;$^$9!#$*$=$i$/!"(B
-$B$=$N$h$&$J%P%C%/%(%s%I$O!"$"$^$j%$%s%9%H!<%k$7$J$$$G$7$g$&!#(B
+$B0\F0$5$;$k(B (mover) $B%P%C%/%(%s%I$O(B @code{spam.el} $B$NFbIt$G!"35N,%P%C%U%!!<(B
+$B$r=P$k$H$-$K$"$kL@3N$J$d$jJ}$G5-;v$r0\F0$5$;$^$9!#$*$=$i$/$=$N$h$&$J%P%C(B
+$B%/%(%s%I$r;H$&$3$H$OL5$$$G$7$g$&!#(B
 @end enumerate
-
 @end enumerate
 
 @node Filtering Spam Using Statistics with spam-stat
@@ -23232,30 +24179,30 @@ Blackbox $B$,!"F~$C$F$/$k%a!<%k$,(B spam $B$+$I$&$+$r8!::$G$-$k$N$G$"$l$P!"(
 @cindex Bayesian spam filtering, naive
 @cindex spam filtering, naive Bayesian
 
-Paul Graham $B$O!"E}7W$r;H$C$?(B spam $B$N_I2a$K4X$9$kM%$l$?%(%C%;%$$r=q$-$^$7(B
+Paul Graham $B$OE}7W$r;H$C$?(B spam $B$N_I2a$K4X$9$kM%$l$?%(%C%;%$$r=q$-$^$7(B
 $B$?(B: @uref{http://www.paulgraham.com/spam.html,A Plan for Spam}$B!#$=$3$GH`(B
-$B$O(B SpamAssassin $B$K$h$C$F;H$o$l$F$$$k$h$&$J%k!<%k%Y!<%9$N_I2a$K8GM-$J7g4Y(B
-$B$K$D$$$F=R$Y$F$$$^$9!#Nc$($P(B: $BC/$+$,%k!<%k$r=q$+$J$1$l$P$J$i$J$$$7!"B>$N(B
-$B$9$Y$F$N?M$O$3$l$i$N%k!<%k$r%$%s%9%H!<%k$7$J$1$l$P$J$j$^$;$s!#$"$J$?$O$$(B
-$B$D$bCY$l$r$H$C$F$7$^$$$^$9!#$=$l$h$j$b!"$=$l$,(B spam $B$^$?$OHs(B-spam $B$K2?$H(B
-$B$J$/;w$F$$$k$+$I$&$+$K4p$E$$$F%a!<%k$r_I2a$9$k$[$&$,$O$k$+$KNI$$$@$m$&$H(B
-$BH`$O$N(B spam $B%a!<%k$K;w$F$$$k$+$I$&$+$r%A%'%C%/$9$kJ}K!$N(B
-$B5-=R$K?J$_$^$9!#(B
-
-$B4pK\E*$J0F$O$3$l$G$9(B: $B$"$J$?$N%a!<%k$NFs$D$N%3%l%/%7%g%s$r:n$j$^$9!#0l$D(B
-$B$O(B spam$B!"$b$&0l$D$OHs(B-spam $B$G!#N>J}$N%3%l%/%7%g%s$K$*$1$k3FC18l$N=P8=IQ(B
-$BEY$r?t$($F!"%3%l%/%7%g%s$N%a!<%k$NAm?t$G=E$_IU$1$r9T$J$$!"$3$N>pJs$r<-=q(B
-$B$K3JG<$7$^$9!#?7Ce%a!<%k$N$9$Y$F$NC18l$K$D$$$F!"(Bspam $B$+Hs(B-spam $B%a!<%k$K(B
-$BB0$9$k3NN($r7hDj$7$^$9!#(B15 $B$N:G$b82Cx$JC18l$r;H$C$F!"$=$N%a!<%k(B
-$B$,(B spam $B$G$"$k$3$H$N3NN($NAm7W$r7W;;$7$^$9!#$3$N3NN($,$"$kogCM$h$j9b$+$C(B
-$B$?$i!"$=$N%a!<%k$O(B spam $B$G$"$k$H9M$($i$l$^$9!#(B
+$B$O(B SpamAssassin $B$K$h$C$F;H$o$l$F$$$k$h$&$J5,B'%Y!<%9$N_I2a$K8GM-$J7g4Y$K(B
+$B$D$$$F=R$Y$F$$$^$9!#Nc$($P(B: $BC/$+$,5,B'$r=q$+$J$1$l$P$J$i$J$$$7!"B>$N$9$Y(B
+$B$F$N?M$O$3$l$i$N5,B'$r%$%s%9%H!<%k$7$J$1$l$P$J$j$^$;$s!#$"$J$?$O$$$D$bCY(B
+$B$l$r$H$C$F$7$^$$$^$9!#$=$l$h$j$b!"$=$l$,(B spam $B$^$?$OHs(B-spam $B$K2?$H$J$/;w(B
+$B$F$$$k$+$I$&$+$K4p$E$$$F%a!<%k$r_I2a$9$kJ}$,MZ$+$KNI$$$@$m$&$HH`$O$N(B spam $B%a!<%k$K;w$F$$$k$+$I$&$+$r%A%'%C%/$9$kJ}K!$r=R$Y$F(B
+$B$$$^$9!#(B
+
+$B4pK\E*$J9M$($O$3$&$G$9(B: $B$"$J$?$N%a!<%k$NFs$D$N=89g$r:n$j$^$9!#0lJ}(B
+$B$O(B spam $B$r!"$b$&0lJ}$O(B spam $B$G$O$J$$%a!<%k$r=8$a$?$b$N$G$9!#N>J}$N=89g$K(B
+$B$*$1$k3FC18l$N=P8=IQEY$r?t$($F!"=89g$N%a!<%k$NAm?t$G=E$_IU$1$r9T$J$$!"$3(B
+$B$N>pJs$r<-=q$K3JG<$7$^$9!#?7Ce%a!<%k$N$9$Y$F$NC18l$K$D$$$F!"(B
+spam $B$+(B spam $B$G$O$J$$%a!<%k$KB0$9$k3NN($rH=Dj$7$^$9!#(B15 $B$N:G$b82Cx$JC18l(B
+$B$r;H$C$F!"$=$N%a!<%k$,(B spam $B$G$"$k$3$H$N3NN($NAm7W$r7W;;$7$^$9!#$3$N3NN((B
+$B$,$"$kogCM$h$j9b$+$C$?$i!"$=$N%a!<%k$O(B spam $B$G$"$k$H8+$J$5$l$^$9!#(B
 
 gnus $B$O$3$NJ}$N%3%l%/%7%g%s$K$D$-?tI4DL$N%a!<%k$,I,(B
-$BMW$G$9!#(B
+$BE}7W$K4p$E$$$?(B spam $B_I2a$r;O$a$k$K$O!"A0$b$C$FFs$D$N%a!<%k$N=89g(B ($B0lJ}(B
+$B$O(B spam $B$r!"$b$&0lJ}$O(B spam $B$G$O$J$$%a!<%k$r=8$a$?$b$N(B) $B$K4p$E$$$?E}7W$r(B
+$B:n$i$J$1$l$P$J$j$^$;$s!#$=$7$F$=$l$i$NE}7W$O!"8e$GMxMQ$9$k$?$a$K<-=q$K3J(B
+$BG<$5$l$^$9!#$=$l$i$NE}7W$r0UL#$N$"$k$b$N$K$9$k$?$a$K!"N>J}$N=89g$K$D$-?t(B
+$BI4DL$N%a!<%k$,I,MW$G$9!#(B
 
 $B:#$N$H$3$m(B gnus $B$O(B nnml $B%P%C%/%(%s%I$G$@$1<-=q$N<+F0@8@.$r%5%]!<%H$7$^$9!#(B
 nnml $B%P%C%/%(%s%I$O0lDL$N%a!<%k$K$D$-0l$D$N%U%!%$%k$G!"$9$Y$F$N%a!<%k$r(B
-$B%G%#%l%/%H%j$K3JG<$7$^$9!#0J2<$r;H$C$F2<$5$$!#(B
+$B0l$D$N%G%#%l%/%H%j!<$K3JG<$7$^$9!#0J2<$r;H$C$F2<$5$$(B:
 
 @defun spam-stat-process-spam-directory
-$B$3$N%G%#%l%/%H%j$K$"$k$9$Y$F$N%U%!%$%k$K$D$$$F(B spam $B$NE}7W$r@8@.$7$^$9!#(B
+$B$3$N%G%#%l%/%H%j!<$K$"$k$9$Y$F$N%U%!%$%k$K$D$$$F(B spam $B$NE}7W$r@8@.$7$^$9!#(B
 $B$9$Y$F$N%U%!%$%k$O0l$D$N(B spam $B%a!<%k$H$7$F07$o$l$^$9!#(B
 @end defun
 
 @defun spam-stat-process-non-spam-directory
-$B$3$N%G%#%l%/%H%j$K$"$k$9$Y$F$N%U%!%$%k$K$D$$$FHs(B-spam $B$NE}7W$r@8@.$7$^$9!#(B
-$B$9$Y$F$N%U%!%$%k$O0l$D$N(B spam $B$G$O$J$$%a!<%k$H$7$F07$o$l$^$9!#(B
+$B$3$N%G%#%l%/%H%j!<$K$"$k$9$Y$F$N%U%!%$%k$K$D$$$FHs(B-spam $B$NE}7W$r@8@.$7$^(B
+$B$9!#$9$Y$F$N%U%!%$%k$O0l$D$N(B spam $B$G$O$J$$%a!<%k$H$7$F07$o$l$^$9!#(B
 @end defun
 
-$BIaDL$O(B @file{~/Mail/mail/spam} $B$N$h$&$J%G%#%l%/%H%j(B ($BDL(B
-$B>o(B @samp{nnml:mail.spam} $B%0%k!<%W$KBP1~(B) $B$KBP$7(B
-$B$F(B @code{spam-stat-process-spam-directory} $B$r8F$V$G$7$g$&!#$^(B
-$B$?(B @file{~/Mail/mail/misc} $B$N$h$&$J%G%#%l%/%H%j(B ($BDL(B
-$B>o(B @samp{nnml:mail.misc} $B%0%k!<%W$KBP1~(B) $B$KBP$7(B
-$B$F(B @code{spam-stat-process-non-spam-directory} $B$r8F$V$G$7$g$&!#(B
-
-$B$"$J$?$,(B @acronym{IMAP} $B$r;H$C$F$$$k$J$i%a!<%k$r%m!<%+%k$K$O;}$C$F$$$J$$(B
-$B$N$G!"$=$l$OF0$+$J$$$G$7$g$&!#0l$D$N2r7h:v$O!"(Bgnus $B%(!<%8%'%s%H$G5-;v$r(B
-$B%-%c%C%7%e$9$k$3$H$G$9!#$=$&$9$l(B
-$B$P(B @code{spam-stat-process-spam-directory} $B$H$7(B
+$BIaDL$O(B @file{~/Mail/mail/spam} $B$N$h$&$J%G%#%l%/%H%j!<(B ($BDL(B
+$B>o(B @samp{nnml:mail.spam} $B%0%k!<%W$KBP1~(B) $B$K$D$$(B
+$B$F(B @code{spam-stat-process-spam-directory} $B$r8F$V$3$H$K$J$k$G$7$g$&!#$^(B
+$B$?(B @file{~/Mail/mail/misc} $B$N$h$&$J%G%#%l%/%H%j!<(B ($BDL(B
+$B>o(B @samp{nnml:mail.misc} $B%0%k!<%W$KBP1~(B) $B$K$D$$(B
+$B$F(B @code{spam-stat-process-non-spam-directory} $B$r8F$S$^$7$g$&!#(B
+
+@acronym{IMAP} $B$r;H$C$F$$$k>l9g$O%a!<%k$r%m!<%+%k$K$O;}$C$F$$$J$$$N$G!"(B
+$B$=$l$OF/$-$^$;$s!#0l$D$N2r7h:v$O!"(Bgnus $B%(!<%8%'%s%H$G5-;v$r%-%c%C%7%e$9(B
+$B$k$3$H$G$9!#$=$&$9$l$P(B @code{spam-stat-process-spam-directory} $B$H$7(B
 $B$F(B @file{"~/News/agent/nnimap/mail.yourisp.com/personal_spam"} $B$N$h$&$J(B
-$B$b$N$,;H$($^$9!#(B@xref{Agent as Cache}.
+$B$b$N$r;H$&$3$H$,$G$-$^$9!#(B@xref{Agent as Cache}.
 
 @defvar spam-stat
-$B$3$NJQ?t$O$9$Y$F$NE}7W$N%O%C%7%e%F!<%V%k(B -- $B2f!9$,<-=q$H8@$C$F$$$k$b(B
-$B$N(B -- $B$r;}$A$^$9!#$3$N%O%C%7%e%F!<%V%k$O!"APJ}$N%3%l%/%7%g%s$N$9$Y$F$NC1(B
-$B8l$K$D$$$F(B spam $B$*$h$SHs(B-spam $B%a!<%k$K$*$1$k=P8=IQEY$rI=$9%Y%/%H%k$r3JG<(B
-$B$7$^$9!#(B
+$B$3$NJQ?t$O$9$Y$F$NE}7W$N%O%C%7%e%F!<%V%k(B---$B<-=q$H8@$C$F$$$k$b$N(B---$B$rJ];}(B
+$B$7$^$9!#$3$N%O%C%7%e%F!<%V%k$O!"APJ}$N=89g$N$9$Y$F$NC18l$K$D$$$F(B spam $B$*(B
+$B$h$S(B spam $B$G$O$J$$%a!<%k$K$*$1$k=P8=IQEY$rI=$9%Y%/%H%k$r3JG<$7$^$9!#(B
 @end defvar
 
 $BE}7W$r:G=i$+$i:n$jD>$7$?$$$H$-$O!"<-=q$r%j%;%C%H$9$kI,MW$,$"$j$^$9!#(B
 
 @defun spam-stat-reset
-@code{spam-stat} $B%O%C%7%e%F!<%V%k$r%j%;%C%H$7!"$9$Y$F$NE}7W$r:o=|$7$^$9!#(B
+$B$9$Y$F$NE}7W$r:o=|$7$F(B @code{spam-stat} $B%O%C%7%e%F!<%V%k$r%j%;%C%H$7$^$9!#(B
 @end defun
 
 $B9T$J$C$?$i<-=q$r%;!<%V$7$J$1$l$P$J$j$^$;$s!#<-=q$O$+$J$jBg$-$/$J$k$+$b$7(B
 $B$l$^$;$s!#<-=q$rDI2C99?7$7$J$$>l9g(B ($B8@$$49$($k$H!"Nc$($PKh7n0l2s:n$jD>$9(B
-$B>l9g(B)$B!"IQHK$K8=$l$J$$$+!"$^$?$O(B spam $B$+Hs(B-spam $B$N$I$A$i$KB0$9$k$+$,$O$C(B
-$B$-$j$7$J$$$9$Y$F$NC18l$r:o=|$9$k$3$H$K$h$C$F!"<-=q$N%5%$%:$r>.$5$/$9$k$3(B
-$B$H$,$G$-$^$9!#(B
+$B>l9g(B)$B!"IQHK$K8=$l$J$$$+!"$^$?$O(B spam $B$+(B spam $B$G$O$J$$%a!<%k$N$I$A$i$KB0(B
+$B$9$k$+$,$O$C$-$j$7$J$$$9$Y$F$NC18l$r:o=|$9$k$3$H$K$h$C$F!"<-=q$N%5%$%:$r(B
+$B>.$5$/$9$k$3$H$,$G$-$^$9!#(B
 
 @defun spam-stat-reduce-size
 $B<-=q$N%5%$%:$r>.$5$/$7$^$9!#$3$l$O<-=q$rDI2C99?7$7$?$/$J$$>l9g$@$1;H$C$F(B
@@ -23344,18 +24289,18 @@ nnml $B%P%C%/%(%s%I$O0lDL$N%a!<%k$K$D$-0l$D$N%U%!%$%k$G!"$9$Y$F$N%a!<%k$r(B
 (spam-stat-load)
 @end lisp
 
-$B$3$l$OI,MW$J(B gnus $B$N%3!<%I$H$"$J$?$,:n$C$?<-=q$r(B load $B$7$^$9!#(B
+$B$3$l$OI,MW$J(B gnus $B$N%3!<%I$H$"$J$?$,:n$C$?<-=q$rFI$_9~$_$^$9!#(B
 
-$B$r;}$D%a!<%k$rB>$N%0%k!<%W$KF~$l$k_I2a$r$b9T$J$$$?$$$J$i$P!"0J(B
-$B2<$N<0$r;H$C$F2<$5$$!#@55,I=8=$K9gCW$7$J$$%a!<%k$@$1$r(B spam $B$+$b$7$l$J$$(B
-$B$H9M$($^$9!#(B
+$BFCDj$NI=Bj$r;}$D%a!<%k$rB>$N%0%k!<%W$KF~$l$k_I2a$r$b9T$J$$$?$$$J$i$P!"0J(B
+$B2<$N<0$r;H$C$F2<$5$$!#@55,I=8=$K9gCW$7$J$$%a!<%k$@$1$K(B spam $B$N2DG=@-$,$"(B
+$B$k$H9M$($^$9!#(B
 
 @lisp
 (setq nnmail-split-fancy
@@ -23381,9 +24326,9 @@ Spam $BMQ$N%0%k!<%W$G$9!#%G%#%U%)%k%H$O(B @samp{mail.spam} $B$G$9!#(B
 $B:G=i$K(B spam $B$N_I2a$r$7$?$$>l9g!"<-=q$r:n$k$H$-$K==J,$KCm0U$7$J$1$l$P$J$j(B
 $B$^$;$s!#(B
 @code{spam-stat-split-fancy} $B$O(B @samp{mail.emacs} $B$H(B @samp{mail.misc} $B$N(B
-$B$I$A$i$N%a!<%k$bHs(B-spam $B$G$"$k$H2rJ}$H$bF~$C$F$$$J$1$l$P$J$i$J$$$3$H$KCm0U$7$F(B
-$B2<$5$$!#(B
+$B$I$A$i$N%a!<%k$b(B spam $B$G$O$J$$$H2rJ}$H$bF~$C$F$$$J$1$l$P$J$i$J$$$3$H$KCm0U$7$F2<(B
+$B$5$$!#(B
 
 @lisp
 (setq nnmail-split-fancy
@@ -23392,11 +24337,11 @@ Spam $BMQ$N%0%k!<%W$G$9!#%G%#%U%)%k%H$O(B @samp{mail.spam} $B$G$9!#(B
           "mail.misc"))
 @end lisp
 
-$B$3$l$rEAE}E*$J_I2a$HAH$_9g$o$;$k$3$H$b$G$-$^$9!#$3$3$G$O2f!9$O$9$Y$F(B
-$B$N(B HTML $B$@$1$N%a!<%k$r(B @samp{mail.spam.filtered} $B%0%k!<%W$KF~$l$k$b$N$H(B
-$B$7$^$7$g$&!#(B@code{spam-stat-split-fancy} $B$O$=$l$i$N%a!<%k$r8+$J$$$N$G!"(B
-$B<-=q$r:n$k$H$-$K!"(B@samp{mail.spam.filtered} $B$N%a!<%k$,(B spam $B$^$?$O(B
-$BHs(B-spam $B%3%l%/%7%g%s$N$I$A$i$K$bF~$k$Y$-$G$O$J$$$3$H$KCm0U$7$F2<$5$$(B!
+$B$3$l$rEAE}E*$J_I2a$HAH$_9g$o$;$k$3$H$b$G$-$^$9!#$3$3$G$O$9$Y$F$N(B HTML $B$@(B
+$B$1$N%a!<%k$r(B @samp{mail.spam.filtered} $B%0%k!<%W$KF~$l$k$b$N$H$7$^$7$g$&!#(B
+@code{spam-stat-split-fancy} $B$O$=$l$i$N%a!<%k$r8+$J$$$N$G!"<-=q$r:n$k$H(B
+$B$-$K!"(B@samp{mail.spam.filtered} $B$N%a!<%k$,(B spam $B$N=89g$^$?$O(B spam $B$G$O$J(B
+$B$$=89g$N$I$A$i$K$bF~$k$Y$-$G$O$J$$$3$H$KCm0U$7$F2<$5$$(B!
 
 @lisp
 (setq nnmail-split-fancy
@@ -23409,28 +24354,28 @@ Spam $BMQ$N%0%k!<%W$G$9!#%G%#%U%)%k%H$O(B @samp{mail.spam} $B$G$9!#(B
 @node Low-level interface to the spam-stat dictionary
 @subsubsection spam-$BE}7W(B (spam-stat) $B<-=q$X$NDc3,AX%$%s%?!<%U%'!<%9(B
 
-@code{spam-stat} $B$r;H$&$?$a$No$N%a!<%k$@$H$O$b$O$d9M$($i$l$J$$%a!<%k$,$"$k%P%C%U%!$G(B
-$B8F$P$l$^$9!#$9$G$KHs(B-spam $B$G$"$k$b$N$H$7$F=hM}$5$l$F$7$^$C$?%a!<%k$NCO0L(B
-$B$NJQ99$K;H$C$F2<$5$$!#(B
+$B$=$l$,(B spam $B$G$O$J$/$FDL>o$N$b$N$@$H$O$b$O$d9M$($i$l$J$$%a!<%k$,$"$k%P%C(B
+$B%U%!!<$G8F$P$l$^$9!#$9$G$K(B spam $B$G$O$J$$$b$N$H$7$F=hM}$5$l$F$7$^$C$?%a!<(B
+$B%k$NCO0L$NJQ99$K;H$C$F2<$5$$!#(B
 @end defun
 
 @defun spam-stat-buffer-change-to-non-spam
-$BDL>o$N%a!<%k$G$O$J$$(B spam $B$@$H$O$b$O$d9M$($i$l$J$$%a!<%k$,$"$k%P%C%U%!$G(B
-$B8F$P$l$^$9!#$9$G$K(B spam $B$G$"$k$b$N$H$7$F=hM}$5$l$F$7$^$C$?%a!<%k$NCO0L$N(B
-$BJQ99$K;H$C$F2<$5$$!#(B
+$B$=$l$,DL>o$N$b$N$G$O$J$/$F(B spam $B$@$H$O$b$O$d9M$($i$l$J$$%a!<%k$,$"$k%P%C(B
+$B%U%!!<$G8F$P$l$^$9!#$9$G$K(B spam $B$G$"$k$b$N$H$7$F=hM}$5$l$F$7$^$C$?%a!<%k(B
+$B$NCO0L$NJQ99$K;H$C$F2<$5$$!#(B
 @end defun
 
 @defun spam-stat-save
@@ -23439,7 +24384,7 @@ Spam $B$G$O$J$$DL>o$N%a!<%k$@$H$O$b$O$d9M$($i$l$J$$%a!<%k$,$"$k%P%C%U%!$G(B
 @end defun
 
 @defun spam-stat-load
-$B%O%C%7%e%F!<%V%k$r%U%!%$%k$+$i(B load $B$7$^$9!#JQ(B
+$B%O%C%7%e%F!<%V%k$r%U%!%$%k$+$iFI$_9~$_$^$9!#JQ(B
 $B?t(B @code{spam-stat-file} $B$G@_Dj$5$l$?%U%!%$%kL>$,;H$o$l$^$9!#(B
 @end defun
 
@@ -23448,16 +24393,16 @@ Spam $B$G$O$J$$DL>o$N%a!<%k$@$H$O$b$O$d9M$($i$l$J$$%a!<%k$,$"$k%P%C%U%!$G(B
 @end defun
 
 @defun spam-stat-score-buffer
-$B%P%C%U%!$N(B spam $B%9%3%"$rJV$7$^$9!#(B
+$B%P%C%U%!!<$N(B spam $B%9%3%"$rJV$7$^$9!#(B
 @end defun
 
 @defun spam-stat-split-fancy
 $BFC5i%a!<%kJ,3d$N$?$a$K$3$N4X?t$r;H$C$F2<$5$$!#(B
 @code{nnmail-split-fancy} $B$K5,B'(B @samp{(: spam-stat-split-fancy)} $B$rDI2C(B
-$B$7$^$9!#(B
+$B$7$^$7$g$&!#(B
 @end defun
 
-$B$=$l$r;H$&A0$K!"I,$:<-=q$,(B load $B$5$l$F$$$k$h$&$K$7$F2<$5$$!#$3$l$K(B
+$B$=$l$r;H$&A0$K!"I,$:<-=q$,FI$_9~$^$l$F$$$k$h$&$K$7$F2<$5$$!#$3$l$K(B
 $B$O(B @file{~/.gnus.el} $B%U%!%$%k$K0J2<$,I,MW$G$9(B:
 
 @lisp
@@ -23465,34 +24410,34 @@ Spam $B$G$O$J$$DL>o$N%a!<%k$@$H$O$b$O$d9M$($i$l$J$$%a!<%k$,$"$k%P%C%U%!$G(B
 (spam-stat-load)
 @end lisp
 
-$BBeI=E*$J%F%9%H$O0J2<$N4X?t8F=P$7$rI,MW$H$7$^$9(B:
+$B0J2<$O0lHLE*$J%F%9%H$N$?$a$N4X?t8F$S=P$7$G$9(B:
 
 @example
-Reset: (setq spam-stat (make-hash-table :test 'equal))
-Learn spam: (spam-stat-process-spam-directory "~/Mail/mail/spam")
-Learn non-spam: (spam-stat-process-non-spam-directory "~/Mail/mail/misc")
-Save table: (spam-stat-save)
-File size: (nth 7 (file-attributes spam-stat-file))
-Number of words: (hash-table-count spam-stat)
-Test spam: (spam-stat-test-directory "~/Mail/mail/spam")
-Test non-spam: (spam-stat-test-directory "~/Mail/mail/misc")
-Reduce table size: (spam-stat-reduce-size)
-Save table: (spam-stat-save)
-File size: (nth 7 (file-attributes spam-stat-file))
-Number of words: (hash-table-count spam-stat)
-Test spam: (spam-stat-test-directory "~/Mail/mail/spam")
-Test non-spam: (spam-stat-test-directory "~/Mail/mail/misc")
+$B%j%;%C%H(B: (setq spam-stat (make-hash-table :test 'equal))
+Spam $B$N3X=,(B: (spam-stat-process-spam-directory "~/Mail/mail/spam")
+$BHs(B-spam $B$N3X=,(B: (spam-stat-process-non-spam-directory "~/Mail/mail/misc")
+$B<-=q$r%;!<%V(B: (spam-stat-save)
+$B<-=q%U%!%$%k$N%5%$%:$r3NG'(B: (nth 7 (file-attributes spam-stat-file))
+$BC18l?t$r3NG'(B: (hash-table-count spam-stat)
+Spam $B$N8!::(B: (spam-stat-test-directory "~/Mail/mail/spam")
+$BHs(B-spam $B$N8!::(B: (spam-stat-test-directory "~/Mail/mail/misc")
+$B<-=q$N%5%$%:$r>.$5$/$9$k(B: (spam-stat-reduce-size)
+$B<-=q$r%;!<%V(B: (spam-stat-save)
+$B<-=q%U%!%$%k$N%5%$%:$r3NG'(B: (nth 7 (file-attributes spam-stat-file))
+$BC18l?t$r3NG'(B: (hash-table-count spam-stat)
+Spam $B$N8!::(B: (spam-stat-test-directory "~/Mail/mail/spam")
+$BHs(B-spam $B$N8!::(B: (spam-stat-test-directory "~/Mail/mail/misc")
 @end example
 
-$B<-=q$r@8@.$9$kJ}K!(B:
+$B0J2<$O<-=q$r@8@.$9$kJ}K!$G$9(B:
 
 @example
-Reset: (setq spam-stat (make-hash-table :test 'equal))
-Learn spam: (spam-stat-process-spam-directory "~/Mail/mail/spam")
-Learn non-spam: (spam-stat-process-non-spam-directory "~/Mail/mail/misc")
-Repeat for any other non-spam group you need...
-Reduce table size: (spam-stat-reduce-size)
-Save table: (spam-stat-save)
+$B%j%;%C%H(B: (setq spam-stat (make-hash-table :test 'equal))
+Spam $B$N3X=,(B: (spam-stat-process-spam-directory "~/Mail/mail/spam")
+$BHs(B-spam $B$N3X=,(B: (spam-stat-process-non-spam-directory "~/Mail/mail/misc")
+$BJL$NI,MW$JHs(B-spam $B%0%k!<%W$KBP$7$F7+$jJV$7(B...
+$B<-=q$N%5%$%:$r>.$5$/$9$k(B: (spam-stat-reduce-size)
+$B<-=q$r%;!<%V(B: (spam-stat-save)
 @end example
 
 @node Other modes
@@ -23501,8 +24446,8 @@ Save table: (spam-stat-save)
 @subsection Dired
 @cindex dired
 
-@code{gnus-dired-minor-mode} $B$O(B dired $B%P%C%U%!$G;H$($k$$$/$D$+$NJXMx$J5!(B
-$BG=$rDs6!$7$^$9!#$3$l$O$C$F%U%!%$%k$r3+$-$^(B
-$B$9(B (@code{gnus-dired-find-file-mailcap})$B!#@\F,<-$rIU$1$k$H!"%U%!%$%k$r?7(B
-$B$7$$%P%C%U%!$G3+$-$^$9!#(B
+$B$9(B (@code{gnus-dired-find-file-mailcap})$B!#@\F,0z?t$rIU$1$k$H!"%U%!%$%k$r(B
+$B?7$7$$%P%C%U%!!<$G(B ($BC1$K(B) $B3+$-$^$9!#(B
 
 @item C-c C-m C-p
 @findex gnus-dired-print
 mailcap $B9`L\$K=>$C$F%U%!%$%k$r0u:~$7$^$9(B (@code{gnus-dired-print})$B!#0u:~(B
-$B%3%^%s%I$,L5$$>l9g$O(B PostScript $B2hA|$K0u:~$7$^$9!#(B
+$B%3%^%s%I$,L5$$>l9g$O(B PostScript $B2hA|$H$7$F0u:~$7$^$9!#(B
 @end table
 
 @node Various Various
@@ -23534,59 +24480,58 @@ mailcap $B9`L\$K=>$C$F%U%!%$%k$r0u:~$7$^$9(B (@code{gnus-dired-print})$B!#0u:
 @table @code
 @item gnus-home-directory
 @vindex gnus-home-directory
-$B$9$Y$F$N(B gnus $B$N%U%!%$%kL>$H%G%#%l%/%H%jL>$NJQ?t$O!"$3$l$K$h$C$F=i4|2=$5(B
-$B$l$^$9!#%G%#%U%)%k%HCM$O(B @file{~/} $B$G$9!#(B
+$B$9$Y$F$N(B gnus $B$N%U%!%$%kL>$H%G%#%l%/%H%j!$NJQ?t$O!"$3$l$r4pE@$K$7$F=i(B
+$B4|CM$,7hDj$5$l$^$9!#%G%#%U%)%k%H$O(B @file{~/} $B$G$9!#(B
 
 @item gnus-directory
 @vindex gnus-directory
-gnus $B$,3JG<$9$k$?$/$5$s$N%U%!%$%kL>$H%G%#%l%/%H%jL>$NJQ?t$O!"$3$l$K$h$C(B
-$B$F=i4|2=$5$l$^$9!#%G%#%U%)%k%HCM$O(B @env{SAVEDIR} $B4D6-JQ?t$NCM$+!"$=$NJQ(B
-$B?t$,@_Dj$5$l$F$$$J$$>l9g$O(B @file{~/News/} $B$G$9!#(B
+gnus $B$,%G!<%?$r3JG<$9$k$[$H$s$I$N%U%!%$%k$H%G%#%l%/%H%j!<$NL>A0$NJQ?t$O!"(B
+$B$3$l$r4pE@$K$7$F=i4|CM$,7hDj$5$l$^$9!#%G%#%U%)%k%H$O(B @env{SAVEDIR} $B4D6-(B
+$BJQ?t$NCM$+!"$=$NJQ?t$,@_Dj$5$l$F$$$J$$>l9g$O(B @file{~/News/} $B$G$9!#(B
 
 @file{~/.gnus.el} $B%U%!%$%k$,FI$^$l$?$H$-$O(B gnus $B$N$[$H$s$I$O$9$G$KFI$_9~(B
-$B$^$l$F$$$k$H$$$&$3$H$KCm0U$7$F$/$@$5$$!#$3$l$O$D$^$j!"$3$NJQ?t(B
+$B$^$l$F$$$k$H$$$&$3$H$KCm0U$7$F2<$5$$!#$3$l$O$D$^$j!"$3$NJQ?t(B
 $B$r(B @file{~/.gnus.el} $B$NCf$G@_Dj$7$F$b!"$3$NJQ?t$K$h$C$F=i4|2=$5$l$kB>$N(B
-$B%G%#%l%/%H%jJQ?t$O@5$7$/@_Dj$5$l$J$$$@$m$&$H$$$&$3$H$G$9!#$3$NJQ?t$OBe$o(B
-$B$j$K(B @file{.emacs} $B$G@_Dj$7$F$/$@$5$$!#(B
+$B%G%#%l%/%H%j!e5-$NJQ?t$K$OA4$/4X78$"$j$^$;$s(B --- $B$3$NJQ?t$OA4$F$N(B gnus $B%P%C%U%!!<$N(B
-$B%G%#%U%)%k%H%G%#%l%/%H%j!<$r$I$&$9$Y$-$+$r@_Dj$7$^$9!#$b(B
+$B>e5-$NJQ?t$K$O$^$C$?$/4X78$"$j$^$;$s(B---$B$3$NJQ?t$O$9$Y$F$N(B gnus $B%P%C%U%!!<(B
+$B$N%G%#%U%)%k%H%G%#%l%/%H%j!<$r$I$&$9$Y$-$+$r@_Dj$7$^$9!#$b(B
 $B$7(B @kbd{C-x C-f} $B$N$h$&$JL?Na$r/$J$$(B
-$BNL$@$1$rFI$b$&$HEXNO$7$^$9!#$3$NJQ?t(B ($B=i4|@_DjCM(B 4096) $B$O!"%P%C%/%(%s%I(B
-$B$,%X%C%@!<$HK\J8$N4V$N6h@Z$j9T$r8+$D$1$k$^$G$KFI$_9~$b$&$H$9$k@dBP:GBgD9(B
-$B$r;XDj$7$^$9!#$3$NJQ?t$,(B @code{nil} $B$G$"$l$P!"FI$_9~$_>e8B$O$"$j$^$;$s!#(B
-$B$b$7(B @code{t} $B$G$"$l$P!"%P%C%/%(%s%I$O5-;v$rItJ,ItJ,$GFI$_9~$b$&$H$O$;$:!"(B
+$B%P%C%/%(%s%I$,5-;v$NO"B3$7$?%X%C%@!/$J(B
+$B$$NL$@$1$rFI$b$&$H$7$^$9!#$3$NJQ?t(B ($B%G%#%U%)%k%H(B 8192) $B$O!"%P%C%/%(%s%I(B
+$B$,%X%C%@!<$HK\J8$N4V$N6h@Z$j9T$NA\:w$rD|$a$kA0$KFI$_9~$`@dBP:GBgD9$r;XDj(B
+$B$7$^$9!#$3$NJQ?t$,(B @code{nil} $B$G$"$l$P!"FI$_9~$_>e8B$O$"$j$^$;$s!#$b(B
+$B$7(B @code{t} $B$G$"$l$P!"%P%C%/%(%s%I$O5-;v$rItJ,ItJ,$GFI$_9~$b$&$H$O$;$:!"(B
 $B5-;vA4BN$rFI$_9~$_$^$9!#$3$l$O(B @code{ange-ftp} $B$d(B @code{efs} $B$N$"$k%P!<(B
-$B%8%g%s$G0UL#$r$b$A$^$9!#(B
+$B%8%g%s$G0UL#$r;}$A$^$9!#(B
 
 @item nnheader-head-chop-length
 @vindex nnheader-head-chop-length
-$B$3$NJQ?t(B ($B=i4|@_DjCM(B 2048) $B$O!"A05-$NA`:n$r9T$C$F$$$k$H$-$K!"$I$l$/$i$$(B
-$B$NBg$-$5$NC10L$G3F5-;v$rFI$_9~$`$+$r@_Dj$7$^$9!#(B
+$B$3$NJQ?t(B ($B%G%#%U%)%k%H(B 2048) $B$O!"A05-$NA`:n$r9T$J$C$F$$$k$H$-$K!"$I$l$/(B
+$B$i$$$NBg$-$5$NC10L$G3F5-;v$rFI$_9~$`$+$r@_Dj$7$^$9!#(B
 
 @item nnheader-file-name-translation-alist
 @vindex nnheader-file-name-translation-alist
@@ -23595,7 +24540,7 @@ gnus $B$,3JG<$9$k$?$/$5$s$N%U%!%$%kL>$H%G%#%l%/%H%jL>$NJQ?t$O!"$3$l$K$h$C(B
 @cindex characters in file names
 $B$3$l$O%U%!%$%kL>$NJ8;z$r$I$N$h$&$KJQ49$9$k$+$r;XDj$9$kO"A[%j%9%H$G$9!#Nc(B
 $B$($P!"$b$7(B @samp{:} $B$,$"$J$?$N%7%9%F%`$G$O%U%!%$%kL>$NJ8;z$H$7$F$O;H$($J(B
-$B$$>l9g(B ($B$"$J$?$O(B OS/2 $B%f!<%6$G$9(B)$B!"0J2<$N$h$&$K$9$k$3$H$,$G$-$^$9!#(B
+$B$$>l9g(B ($B$"$J$?$O(B OS/2 $BMxMQ$H%G%#%l%/%H%jL>$NJQ?t$O!"$3$l$K$h$C(B
 @end group
 @end lisp
 
-$Be$G$N$3$NJQ?t$N=i4|(B
-$B@_DjCM$G$9!#(B
+$Be$G$N$3$NJQ?t$N%G%#(B
+$B%U%)%k%HCM$G$9!#(B
 
 @item gnus-hidden-properties
 @vindex gnus-hidden-properties
-$B$3$l$O(B ``$BIT2D;k(B'' $B%F%-%9%H$r1#$9$?$a$K;H$o$l$kB0@-$N%j%9%H$G$9!#$[$H$s$I(B
-$B$N%7%9%F%`$G$O=i4|@_DjCM$O(B @code{(invisible t intangible t)} $B$G!"$3$l$O(B
-$BIT2D;k%F%-%9%H$r8+$($J$/$7$F?($l$J$/$7$^$9!#(B
+$B$3$l$O!VIT2D;k!W%F%-%9%H$r1#$9$?$a$K;H$o$l$kB0@-$N%j%9%H$G$9!#$[$H$s$I$N(B
+$B%7%9%F%`$G$O%G%#%U%)%k%H$O(B @code{(invisible t intangible t)} $B$G!"$3$l$O(B
+$BIT2D;k%F%-%9%H$r8+$($J$/$7$F?($l$J$$$h$&$K$7$^$9!#(B
 
 @item gnus-parse-headers-hook
 @vindex gnus-parse-headers-hook
@@ -23621,71 +24566,51 @@ gnus $B$,3JG<$9$k$?$/$5$s$N%U%!%$%kL>$H%G%#%l%/%H%jL>$NJQ?t$O!"$3$l$K$h$C(B
 
 @item gnus-shell-command-separator
 @vindex gnus-shell-command-separator
-$BFs$D$N%7%'%kL?Na$r6h@Z$k$N$K;HMQ$5$l$kJ8;zNs!#=i4|@_DjCM(B
-$B$O(B @samp{;} $B$G$9!#(B
+$BFs$D$N%7%'%kL?Na$r6h@Z$k$N$K;HMQ$5$l$kJ8;zNs!#%G%#%U%)%k%H$O(B @samp{;} $B$G(B
+$B$9!#(B
 
 @item gnus-invalid-group-regexp
 @vindex gnus-invalid-group-regexp
-
-$B%f!<%6$K%0%k!<%WL>$r3NG'$9$k$H$-$K;H$&!"(B``$B;H$($J$$(B'' $B%0%k!<%WL>$K%^%C%A(B
-$B$9$k@55,I=8=$G$9!#4{DjCM$O(B gnus $B$NFbItF0:n(B ($BA*BrJ}K!$H%0%k!<%W$N6-3&$K!"(B
-$BDL>o(B @samp{:} $B$r;H$C$F$$$k(B) $B$r$a$A$c$a$A$c$K$7$F$7$^$&$+$b$7$l$J$$!"$$$/(B
-$B$D$+$N(B @strong{$BK\Ev$K(B} $B;H$($J$$%0%k!<%WL>$rJa$^$($^$9!#(B
-
-@acronym{IMAP} $B%f!<%6$O%0%k!<%WL>$K(B @samp{/} $B$r;H$$$?$$$H;W$&$G$7$g$&$1(B
-$B$l$I!#(B
+$BMxMQ$r?R$M$k$H$-$K;H$&!"!VL58z$J!W%0%k!<%WL>$K9gCW$9$k@55,(B
+$BI=8=$G$9!#%G%#%U%)%k%HCM$O(B gnus $B$NFbItF0:n$r$a$A$c$a$A$c$K$7$F$7$^$&$+$b(B
+$B$7$l$J$$!"$$$/$D$+$N(B @strong{$BK\Ev$K(B} $B;H$($J$$%0%k!<%WL>$r0z$C$+$1$^$9!#(B
+($BDL>o!"A*BrJ}K!$H%0%k!<%W$N6-3&$K;H$C$F$$$k(B @samp{:} $B$J$I$r5v$7$F$7$^$&(B
+$B$H$^$:$$!"$H$$$&$3$H$G$9!#(B)
+
+@acronym{IMAP} $B$NMxMQ$K(B @samp{/} $B$r;H$$$?$$$+$b$7$l$^$;$s(B
+$B$,!#(B
 @end table
 
 @node The End
 @chapter $B=*$o$j(B
 
-$B$O$$!"0J>e$,%^%K%e%"%k$G$9(B---$B$"$J$?$O$b$&<+J,<+?H$N?M@8$rAw$k;v$,$G$-$^(B
-$B$9!#O"Mm$r$H$C$F2<$5$$!#$"$J$?$NG-$K:#F|$O!"$H$$$C$F$*$$$F2<$5$$!#(B
+$B$O$$!"0J>e$,%^%K%e%"%k$G$9(B---$B$"$J$?$O$b$&<+J,<+?H$N?M@8$rAw$k$3$H$,$G$-(B
+$B$^$9!#O"Mm$r$H$C$F2<$5$$!#$"$J$?$NG-$K$h$m$7$/EA$($F2<$5$$!#(B
 
-$B$*$*!"(B@strong{$B?@$h(B}---$B$5$h$J$i$rBQ$($k;v$O$G$-$^$;$s!#(B($B$9$9$j5c$-!#(B)
+$B$*$*!"(B@strong{$B?@$h(B}---$B$5$h$J$i$rBQ$($k$3$H$O$G$-$^$;$s!#(B($B$9$9$j5c$-!#(B)
 
-Ol' Charles Reznikoff $B$O$=$l$rHs>o$K$h$/8=$7$F$$$^$9$N$G!"$3$3$OH`$N$?$a(B
-$B$K>y$j$^$9(B:
+$B%A%c!<%k%:!&%l%:%K%3%U$O$=$l$rHs>o$K$h$/I=$7$F$$$k$N$G!"$3$3$OH`$N$?$a$K(B
+$B>y$j$^$9(B:
 
 @quotation
-@strong{Te Deum}
-
-@sp 1
-Not because of victories @*
-I sing,@*
-having none,@*
-but for the common sunshine,@*
-the breeze,@*
-the largess of the spring.
-
-@sp 1
-Not for victory@*
-but for the day's work done@*
-as well as I was able;@*
-not for a seat upon the dais@*
-but at the common table.@*
+$B;?H~$N2N(B ($B%F%G%&%`(B)
+
+$B>!Mx$f$($K$\$/$O(B@*
+$B2N$&$N$G$O$J$$!"(B@*
+$B>!Mx$J$I$R$H$D$b$J$$$+$i!"(B@*
+$B$"$j$U$l$?F|8w$N$?$a!"(B@*
+$B$=$hIw$N$?$a!"(B@*
+$B=U$N5$A0$h$5$N$?$a$K2N$&!#(B
+
+$B>!Mx$N$?$a$G$O$J$/(B@*
+$BKM$H$7$F$O@:0lGU$d$C$?(B@*
+$B0lF|$N;E;v$N$?$a$K!#(B@*
+$B6L:B$N$?$a$G$O$J$/(B@*
+$B$_$s$J$N%F!<%V%k$N@J$G!#(B
 @end quotation
 
-$B;nLu(B:
-
-@quotation
-@strong{Te Deum}
-
-@sp 1
-$B>!Mx$7$?$+$i$G$O$J$/(B @*
-$B;d$O2N$&(B @*
-$B2?$bL5$$$1$l$I(B @*
-$B$"$NF|8w$d(B @*
-$BB)?a$d(B @*
-$B=U$NBg$-$5$N$?$a$K(B @*
-
-@sp 1
-$B>!Mx$N$?$a$G$O$J$/(B @*
-$B0lF|$NO+F/$N$?$a$K(B @*
-$B$^$?!"$=$l$rC#@.$G$-$?$3$H$K(B @*
-$B9b:B$N>e$N@J$N$?$a$G$O$J$/(B @*
-$BIaDL$N%F!<%V%k$N$H$3$m$G(B @*
-@end quotation
+($B?7D,J88K!V6uJ"$N5;K!!WCx(B:$B%]!<%k%*!<%9%?!eR2p(B
+* Frequently Asked Questions::  gnus $B$N(B FAQ
 @end menu
 
 @node XEmacs
@@ -23707,47 +24632,47 @@ but at the common table.@*
 @cindex XEmacs
 @cindex installing under XEmacs
 
-XEmacs $B$O%Q%C%1!<%8$N=/=8$H$7$FG[I[$5$l$F$$$^$9!#(Bgnus $B$N(B XEmacs $B%Q%C%1!<(B
+XEmacs $B$O%Q%C%1!<%8$N=89g$H$7$FG[I[$5$l$F$$$^$9!#(Bgnus $B$N(B XEmacs $B%Q%C%1!<(B
 $B%8$,I,MW$H$9$k$b$N$O2?$G$"$l!"$"$J$?$O%$%s%9%H!<%k$9$Y$-$G$9!#:#$N$H$3$m(B
 $BI,MW$J$N$O(B @samp{gnus}, @samp{mail-lib}, @samp{xemacs-base},
 @samp{eterm}, @samp{sh-script}, @samp{net-utils}, @samp{os-utils},
-@samp{dired}, @samp{mh-e}, @samp{sieve}, @samp{ps-print}, @samp{w3},
+@samp{dired}, @samp{mh-e}, @samp{sieve}, @samp{ps-print}, @samp{W3},
 @samp{pgg}, @samp{mailcrypt}, @samp{ecrypto} $B$*$h$S(B @samp{sasl} $B$G$9!#(B
 
 @node History
 @section $BNr;K(B
 
 @cindex history
-@sc{gnus} $B$OG_ED@/?.;a$K$h$C$F=q$+$l$^$7$?!#(B94$BG/$N2F$,G&$S4s$C$F$/$k$3(B
-$B$m!"(BLars Magne Ingebrigtsen ($B%i%k%9(B $B%^%C%0%L(B $B%$%s%0%V%j%0%C%H%9%s(B) $B$OK0(B
-$B$-$F$-$F!"(BGnus $B$r=q$-D>$=$&$H7h?4$7$^$7$?!#(B
-
-$B$3$NL5Ni$r9T$C$??MJ*$rD4$Y$F$_$?$$$N$J$i!"$"$J$?$N(B ($B$/$=(B!) $B%&%'%V%V%i%&(B
-$B%6!<$r(B @uref{http://quimby.gnus.org/} $B$K8~$1$k;v$,$G$-$^$9!#(B
-$B$3$l$O?7$7$/$F?h$JHG$N(B gnus $B$NBh0lG[I[>l=j$G!"(BNewsrc $B$r$V$C2u$7$F?M!9$r(B
-$B7cE\$5$l$k%5%$%H$H$7$FCN$i$l$F$$$^$9!#(B
-
-$B:G=i$N%"%k%U%!HG$N3+H/4|4V$K!"?7$7$$(B Gnus $B$O(B ``(ding) Gnus'' $B$H8F$P$l$F(B
-$B$$$^$7$?!#(B@dfn{(ding)} $B$O$b$A$m$s!"(B@dfn{ding is not Gnus} $B$NC;=L7A$G!"$3(B
-$B$l$OA4$/40A4$J13$G$9$,!"$@$l$,$=$s$J$3$H$r5$$K$9$k$G$7$g$&$+(B? ($B$H$3$m$G!"(B
-$B$3$NC;=L7A$N(B ``Gnus'' $B$O$*$=$i$/G_ED$5$s$N0U?^DL$j(B ``$B%K%e!<%9(B'' $B$HH/2;$5(B
+@sc{gnus} $B$OG_ED@/?.;a$K$h$C$F=q$+$l$^$7$?!#(B1994$BG/$N=)$,G&$S4s$C$F$/$k$3(B
+$B$m!"B`6~$7$F$$$?%i%k%9!&%^%C%0%L!&%$%s%0%V%j%0%C%H%9%s(B (Lars Magne
+Ingebrigtsen) $B$O(B Gnus $B$r=q$-D>$=$&$H7h?4$7$^$7$?!#(B
+
+$B$3$NHsF;$J9T0Y$N@UG$l=j$G!"(BNewsrc $B$r$V$C2u$7$F?M!9$r7c(B
+$BE\$5$;$k%5%$%H$H$7$F$bCN$i$l$F$$$^$9!#(B
+
+$B:G=i$N%"%k%U%!HG$N3+H/4|4V$K!"?7$7$$(B Gnus $B$O!H(B(ding) Gnus$B!I$H8F$P$l$F$$(B
+$B$^$7$?!#(B@dfn{(ding)} $B$O$b$A$m$s!"(B@dfn{ding is not Gnus} $B$NC;=L7A$G!"$3$l(B
+$B$O$^$C$?$/40A4$J13$G$9$,!"$@$l$,$=$s$J$3$H$r5$$K$9$k$G$7$g$&$+(B? ($B$H$3$m(B
+$B$G!"$3$NC;=L7A$N!H(BGnus$B!I$O$*$=$i$/G_ED$5$s$N0U?^DL$j!V%K%e!<%9!W$HH/2;$5(B
 $B$l$k$Y$-$G!"$=$&$9$k$H$b$C$HE,@Z$JL>A0$K$J$j$^$9!#$=$&;W$$$^$;$s$+(B?)
 
-$B$I$A$i$K$;$h!"A4$F$N%(%M%k%.!<$r?7$7$$855$$NNI$$L>A0$rIU$1$k$N$K;H$$2L$?(B
-$B$7$?8e!"$=$NL>A0$O(B @emph{$B$"$^$j$K(B} $B855$$,NI$9$.$k$H$$$&;v$K$J$j!"$=$l(B
-$B$r(B ``Gnus'' $B$H:F$SL?L>$7$^$7$?!#$G$b!":#2s$OBgJ8;z$H>.J8;z$r:.$<$F$$$^$9!#(B
-``Gnus'' $B$H(B ``@sc{gnus}'' $B$G$9!#?7$7$$$b$N(B $B$H(B $B8E$$$b$N!#(B
+$B$I$A$i$K$;$h!"$9$Y$F$N%(%M%k%.!<$r?7$7$$855$$NNI$$L>A0$rIU$1$k$N$K;H$$2L(B
+$B$?$7$?8e$G!"$=$NL>A0$O(B @emph{$B$"$^$j$K(B} $B855$$,NI$9$.$k$H$$$&$3$H$K$J$j!"(B
+$B$=$l$r!H(BGnus$B!I$H:F$SL?L>$7$^$7$?!#$G$b!":#2s$OBgJ8;z$H>.J8;z$r:.$<$F$$$^(B
+$B$9!#!H(BGnus$B!I$H!H(B@sc{gnus}$B!I$G$9!#?7$7$$$b$N(B $B$H(B $B8E$$$b$N!#(B
 
 @menu
 * Gnus Versions::               $B$I$s$J%P!<%8%g%s$N(B Gnus $B$,%j%j!<%9$5$l$F$$$k$+(B
-* Other Gnus Versions::         $B%j%j!<%9$5$l$F$$$kB>$N%P!<%8%g%s$N(B Gnus
-* Why?::                        Gnus $B$NL\E*$O2?(B?
-* Compatibility::               Gnus $B$O(B @sc{gnus} $B$H$I$l$/$i$$8_49@-$,$"$k$N(B?
-* Conformity::                  Gnus $B$OA4$F$NI8=`$rK~$?$=$&$H$9$k(B
-* Emacsen::                     Gnus $B$O$$$/$D$+$N8=BeE*$J(B Emacs $B4D6-$G$N%P!<%8%g%s$N(B gnus
+* Why?::                        gnus $B$NL\E*$O2?(B?
+* Compatibility::               gnus $B$O(B @sc{gnus} $B$H$I$l$/$i$$8_49@-$,$"$k$N(B?
+* Conformity::                  gnus $B$O$9$Y$F$NI8=`$rK~$?$=$&$H$9$k(B
+* Emacsen::                     gnus $B$O>/?t$N8=BeE*$J(B Emacs $B$G(B ``September Gnus'' (99 $B%j%j!<%9$N8e(B
-$B$G(B)) $B$,(B ''Gnus 5.2`` $B$H$$$&L>A0$G%j%j!<%9$5$l$^$7$?(B (40 $B%j%j!<%9(B)$B!#(B
+1996$BG/(B3$B7n$K!H(BSeptember Gnus$B!I(B(99 $B%j%j!<%9$N8e(B
+$B$G(B)) $B$,!H(BGnus 5.2$B!I$H$$$&L>A0$G%j%j!<%9$5$l$^$7$?(B (40 $B%j%j!<%9(B)$B!#(B
 
 1996$BG/$N(B 7$B7n(B28$BF|$K(B Red Gnus $B$N:n6H$,;O$^$j!"$=$l$O(B 1997$BG/(B1$B7n(B25$BF|(B
-$B$K(B (84 $B%j%j!<%9$N8e$G(B) ``Gnus 5.4'' $B$H$7$F%j%j!<%9$5$l$^$7$?(B (67 $B%j%j!<(B
-$B%9(B)$B!#(B
+$B$K(B (84 $B%j%j!<%9$N8e$G(B)$B!H(BGnus 5.4$B!I$H$7$F%j%j!<%9$5$l$^$7$?(B (67 $B%j%j!<%9(B)$B!#(B
 
-1997$BG/(B9$B7n(B13$BF|$K!"(BQuassia Gnus $B$,3+;O$5$l!"(B37 $B%j%j!<%9B3$-$^$7$?!#$=$l(B
-$B$O(B ``Gnus 5.6'' $B$H$7$F(B 1998$BG/(B3$B7n(B8$BF|$K%j%j!<%9$5$l$^$7$?(B (46 $B%j%j!<%9(B)$B!#(B
+1997$BG/(B9$B7n(B13$BF|$K!"(BQuassia Gnus $B$,3+;O$5$l!"(B37 $B%j%j!<%9B3$-$^$7$?!#$=$l$O(B
+$B!H(BGnus 5.6$B!I$H$7$F(B 1998$BG/(B3$B7n(B8$BF|$K%j%j!<%9$5$l$^$7$?(B (46 $B%j%j!<%9(B)$B!#(B
 
 1998$BG/(B8$B7n(B29$BF|$K(B Gnus 5.6 $B$+$i(B Pterodactyl Gnus $B$,@8$^$l!"(B1999$BG/(B12$B7n(B3$BF|(B
-$B$K(B (99 $B%j%j!<%9$H(B CVS $B%j%]%8%H%j$G$N:n6H$N8e(B) ``Gnus 5.8'' $B$H$7$F%j%j!<(B
-$B%9$5$l$^$7$?!#(B
+$B$K(B (99 $B%j%j!<%9$H(B CVS $B%j%]%8%H%j$G$N:n6H$N8e(B)$B!H(BGnus 5.8$B!I$H$7$F%j%j!<%9(B
+$B$5$l$^$7$?!#(B
+
+2000$BG/(B10$B7n(B26$BF|$K(B Oort Gnus $B$,3+;O$5$l!"(B2003$BG/(B5$B7n(B1$BF|$K(B Gnus 5.10 $B$H$7$F%j(B
+$B%j!<%9$5$l$^$7$?(B (24 $B%j%j!<%9(B)$B!#(B
 
-2000$BG/(B10$B7n(B26$BF|$K(B Oort Gnus $B$,3+;O$5$l$^$7$?!#(B
+2004$BG/(B1$B7n(B4$BF|$K(B No Gnus $B$,;O$^$j$^$7$?!#(B
 
-$B$b$7@\F,<-$r;}$C$?HG$N(B Gnus -- ``(ding) Gnus'', ``September Gnus'',
-``Red Gnus'', ``Quassia Gnus'', ``Pterodactyl Gnus'', ``Oort Gnus''
--- $B$K=P2q$C$F$b!":.Mp$7$J$$$G$/$@$5$$!#$"$J$?$,62$,$C$F$$$k;v$rCN$i$l$F(B
-$B$O$$$1$^$;$s!#8e$m$K2<$,$j$J$5$$!#$f$C$/$j$H!#B>$K2?$r$7$F$b!"Av$C$F$O$$(B
-$B$1$^$;$s!#$=$l$,FO$+$/$J$k$^$G!"@E$+$KJb$-5n$j$J$5$$!#E,@Z$K%j%j!<%9$5$l(B
-$B$?HG$N(B Gnus $B$r8+$D$1$F!"Be$o$j$K$=$l$K4s$jE:$C$F2<$5$$!#(B
+$B@\F,8l$r;}$C$?HG$N(B Gnus---$B!H(B(ding) Gnus$B!I(B,$B!H(BSeptember Gnus$B!I(B,$B!H(BRed
+Gnus$B!I(B,$B!H(BQuassia Gnus$B!I(B,$B!H(BPterodactyl Gnus$B!I(B,$B!H(BOort Gnus$B!I(B,$B!H(BNo
+Gnus$B!I(B---$B$K=P2q$C$F$b!":.Mp$7$J$$$G2<$5$$!#$"$J$?$,62$,$C$F$$$k$3$H$rCN(B
+$B$i$l$F$O$$$1$^$;$s!#8e$m$K2<$,$j$J$5$$!#$f$C$/$j$H!#B>$K2?$r$7$F$b!"Av$C(B
+$B$F$O$$$1$^$;$s!#$=$l$,FO$+$/$J$k$^$G!"@E$+$KJb$-5n$j$J$5$$!#@5$7$/%j%j!<(B
+$B%9$5$l$?HG$N(B Gnus $B$r8+$D$1$F!"Be$o$j$K$=$l$K$9$j4s$j$J$5$$!#(B
 
 @node Other Gnus Versions
 @subsection $BB>$N(B gnus $B$N%P!<%8%g%s(B
@@ -23794,38 +24721,38 @@ XEmacs $B$O%Q%C%1!<%8$N=/=8$H$7$FG[I[$5$l$F$$$^$9!#(Bgnus $B$N(B XEmacs $B%
 
 Lars $B$5$s$,D4@=$7$F%j%j!<%9$7$?(B Gnus $B$K2C$($F!"F|K\$G$O(B Semi-gnus $B$N3+H/(B
 $B$,9T$J$o$l$F$$$^$9!#$3$l$O(B @acronym{SEMI} $B$H$$$&(B @acronym{MIME} $B$N5!G=$r(B
-$BN$5$l!"(BT-gnus, Nana-gnus $B$*$h$S(B Chaos $B$N0[$J$C$?7O(B
-$BE}$,$"$j$^$9!#$3$l$i$O6/NO$J(B @acronym{MIME} $B$N5!G=$H3F9q8lBP1~$N5!G=$rDs(B
-$B6!$9$k$b$N$G!"FC$KF|K\?M$N%f!<%6$K$H$C$FBg;v$J$b$N$G$9!#(B
+$B$3$l$i$N(B gnus $B$O!"N$5$l!"(BT-gnus, Nana-gnus $B$*$h$S(B Chaos $B$N0[$J$C$?(B
+$B7OE}$,$"$j$^$9!#$3$l$i$O6/NO$J(B @acronym{MIME} $B$N5!G=$H3F9q8lBP1~$N5!G=$r(B
+$BDs6!$9$k$b$N$G!"FC$KF|K\?M$NMxMQl$H$7$F;H$o$l$FM_$7$$$G$9!#G_ED$5(B
-$B$s$N%K%e!<%9%j!<%@!<$r%P%C%/%(%s%I$+$iJ,N%$9$k$H$$$&8-L@$JJ}?K$r3HD%$9$k(B
-$B;v$K$h$C$F!"(BGnus $B$O%a!<%k$r7$$$F$$$k$N$G$9!#(B
-
-$B$*$=$i$/(B Gnus $B$O40@.$9$k;v$O$J$$$N$+$b$7$l$^$;$s!#(B
+$B;d$O!"$"$J$?$N9M$(IU$/$3$H$r$9$Y$F$G$-$k!V$$$+$9!W!V@9$j>e$,$C$F$k!W!V$+$C(B
+$B$3$$$$!W!V$7$c$l$?!W%K%e!<%9%j!<%@!<$rDs6!$7$?$$$H;W$$$^$9!#$3$l$O;d$NBg(B
+$B85$NF05!$@$C$?$N$G$9$,!"(BGnus $B$N:n6H$r$7$F$$$k4V$K!"$3$N@$Be$N%K%e!<%9%j!<(B
+$B%@!<$OK\Ev$K@P4o;~Be$KB0$7$F$$$k$3$H$,L@$i$+$K$J$j$^$7$?!#%K%e!<%9%j!<%@!<(B
+$B$O!"%$%s%?!<%M%C%H$NMIdW4|$+$i$[$H$s$IH/E8$7$F$$$^$;$s$G$7$?!#$b$78=:_$N(B
+$BA}2CN($GN.DLNL$,A}2C$7$D$E$1$l$P!"$9$Y$F$N8=:_$N%K%e!<%9%j!<%@!<$O$^$C$?(B
+$B$/Lr$KN)$?$J$/$J$k$G$7$g$&!#KhF|2?@i$b$N?7$7$$5-;v$,$d$C$F$/$k%K%e!<%9%0(B
+$B%k!<%W$r07$&$K$O$I$&$9$l$PNI$$$N$G$7$g$&(B? $B?tI4K|$NEj9Fl$H$7$F;H$o(B
+$B$l$k$3$H$r!"@'Hs$H$b8+FO$1$?$$$N$G$9!#%K%e!<%9%j!<%@!<$r%P%C%/%(%s%I$+$i(B
+$BJ,N%$9$k$H$$$&G_ED$5$s$N8-L@$JJ}?K$r3HD%$9$k$3$H$K$h$C$F!":#$d(B Gnus $B$O%a!<(B
+$B%k$rl=j$K!"%+%9%?%^%$%:$N$?$a$N%U%C%/$r2C$($^$7$?!#$=$l(B
+$B$K$h$C$F!"C58!$7!"H/L@$7$?$$$9$Y$F$N?M$r>7$$$F$$$k$N$G$9!#(B
+
+$B$*$=$i$/(B Gnus $B$O40@.$9$k$3$H$O$J$$$N$+$b$7$l$^$;$s!#(B
 @kbd{C-u 100 M-x all-hail-emacs} $B$H(B @kbd{C-u 100 M-x all-hail-xemacs} $B$G(B
 $B$9!#(B
 
@@ -23833,78 +24760,86 @@ Gnus $B$O$3$l$i$Nl9g$r=|$$$F!"8E$$%P%$(B
-$B%s%G%#%s%0$,JQ99$5$l$?;v$O$"$j$^$;$s!#(B
+gnus $B$O(B @sc{gnus} $B$H40A4$K8_49@-$,$"$k$h$&$K@_7W$5$l$F$$$^$9!#$[$H$s$I$9(B
+$B$Y$F$N%-!<$N3d$jEv$F$O$=$N$^$^;D$C$F$$$^$9!#$b$A$m$s!"B?$/$N%-!<$N3d$jEv(B
+$B$F$,DI2C$5$l$^$7$?$,!"0l$D$+Fs$D$NL\$KIU$+$J$$$b$N$r=|$$$F!"8E$$3d$jEv$F(B
+$B$,JQ99$5$l$?$3$H$O$"$j$^$;$s!#(B
+
+$B;d$?$A$N%b%C%H!<$O(B:
 
-$B2f!9$N%b%C%H!<$O(B:
 @quotation
 @cartouche
-@center $B9]E4$N9|AH$_$N6u9b$/!#(B
+@center $B9]E4$N9|AH$_$N6u9b$/(B
 @end cartouche
 @end quotation
-$B$G$9!#(B
 
-$BA4$F$NL?Na$O$=$NL>A0$,JQ$o$C$F$$$^$;$s!#$$$/$D$+$NFbIt4X?t$OL>A0$rJQ$($^(B
-$B$7$?!#(B
+$B$G$9!#(B($BLuCm(B: $B%A%c!<%k%:!&%l%:%K%3%U$N;m!H(BThe Bridge$B!I$N0zMQ!#$3$N;m$NK\(B
+$BBN$O$?$C$?0l9T!H(BIn a cloud bones of steel.$B!I$@$1!#D>Lu$9$l$P!V1@$NCf$K9](B
+$B$N9|$?$A!W!#(B)
+
+$B$9$Y$F$NL?Na$OL>A0$,JQ$o$C$F$$$^$;$s!#$$$/$D$+$NFbIt4X?t$OL>A0$rJQ$($^$7(B
+$B$?!#(B
 
 @code{gnus-uu} $B%Q%C%1!<%8$O7`E*$KJQ2=$7$F$$$^$9!#(B@xref{Decoding
 Articles}.
 
-$B0l$D$Ne$2$^$9(B)$B!"D>@\O"A[%j%9%H$rJQ99$9$k;v$O0[>o$J7k2L$r$b$?$i$9$G$7$g$&!#(B
+@sc{gnus} $B$NFbIt$NCN<1$K0MB8$7$?$9$Y$F$N%3!<%I$Oe$2$^$9(B)$B!"D>@\O"A[%j%9%H$rJQ99$9$k$3$H$O0[>o$J7k2L$r$b$?$i$9$G(B
+$B$7$g$&!#(B
 
 @cindex hilit19
 @cindex highlighting
-$B8E$$(B hilit19 $B$N%3!<%I$OA4$/F0:n$7$^$;$s!#$N%3!<(B
+$B8E$$(B hilit19 $B$N%3!<%I$O$^$C$?$/F0:n$7$^$;$s!#$N%3!<(B
 $B%I(B) $B$r>C5n$9$k$Y$-$G$7$g$&!#(B@sc{gnus} $B$Ko$K(B} $B$h$/%P%0Js9p$rAw$kJJ$,$"$k$N$G$"$l$P!"$7$P$i$/$9$k$HLr$KN)(B
-$B$D(B help $B%P%C%U%!$,$&$k$5$$$H46$8$k$+$b$7$l$^$;$s!#$=$&$G$"$l$P!"$=$l$,I=(B
-$B<($5$l$k$N$rHr$1$k$?$a$K!"(B
+@emph{$BHs>o$K(B} $B$h$/%P%0Js9p$rAw$k=,47$,$"$k$N$J$i!"$"$J$?$NLr$KN)$H$&$H$9(B
+$B$k(B help $B%P%C%U%!!<$,!"$7$P$i$/$9$k$H$&$k$5$/46$8$k$+$b$7$l$^$;$s!#$=$&$J(B
+$B$i$P!"$=$l$,I=<($5$l$J$$$h$&$K$9$k$?$a$K!"(B
 @code{gnus-bug-create-help-buffer} $B$r(B @code{nil} $B$K@_Dj$7$F2<$5$$!#(B
 
 @node Conformity
-@subsection $B0lCW@-(B
+@subsection $BI8=`$X$N=`5r(B
 
-$B$3$l$O!"M}M3L5$-H?93!"$8$c$J$$$G$9$h!"1|$5$s!#2f!9$OA4$F$NCN$i$l$F$$$kI8(B
-$B=`$K1h$C$F$$$^$9!#$b$A$m$s!"2f!9$,;?@.$G$-$J$$I8=`$H(B/$B$b$7$/$O=,47$O=|$-(B
-$B$^$9$,!#(B
+$BM}M3L5$-H?93$J$I$H?=$9$b$N$O$4$6$$$^$;$s$h!"1|MM!#;d$?$A$O$9$Y$F$NCN$i$l(B
+$B$F$$$kI8=`$K=`5r$7$F$$$^$9!#$b$A$m$s;d$?$A$,;?@.$G$-$J$$I8=`$H(B/$B$b$7$/$O(B
+$B=,47$O=|$-$^$9$,!#(B
 
 @table @strong
 @item RFC (2)822
@@ -23916,34 +24851,33 @@ Gnus $B$OA4$F$N(B @sc{gnus} $B5/F0%U%!%$%k$rM}2r$7$^$9!#(B
 @cindex RFC 1036
 $B$3$NI8=`$bCN$i$l$F$$$k0cH?$O$"$j$^$;$s!#(B
 
-@item Son-of RFC 1036
-@cindex Son-of RFC 1036
+@item Son-of-RFC 1036
+@cindex Son-of-RFC 1036
 $B$3$l$K$O$$$/$D$+$N0cH?$,$"$j$^$9!#(B
 
 @table @emph
 @item X-Newsreader
 @item User-Agent
-$B$3$l$O(B ``$B$D$^$i$J$$%X%C%@!<(B'' $B$H9M$($i$l$F$$$^$9$,!";d$O>CHqpJs$G$"(B
-$B$k$H8+$J$7$F$$$^$9!#(B@code{tin} $B$H(B @code{Netscape} $B$+$iAw$i$l$F$/$kHs>o$K(B
-$BB?$/$NMM<0$K1h$C$F$$$J$$5-;v$r8+$?8e$G!";d$O$=$l$i$r5-;v$rEj9F$9$k$?$a$K(B
-$B$O;H$o$J$$J}$,NI$$$H$$$&;v$rCN$j$^$7$?!#$b$7(B @code{X-Newsreader} $B%X%C%@!<(B
-$B$,L5$1$l$P;d$O$=$N>pJs$rF@$k;v$O$J$+$C$?$G$7$g$&!#(B
+$B$3$l$i$O!V$D$^$i$J$$%X%C%@!CHqpJs$G$"(B
+$B$k$H9M$($F$$$^$9!#(B@code{tin} $B$H(B @code{Netscape} $B$+$iAw$i$l$F$/$kHs>o$KB?(B
+$B$/$N9s$$5-;v$r8+$?8e$G$O!";d$O5-;v$rEj9F$9$k$?$a$K$O$=$l$i$r;H$o$J$$J}$,(B
+$BNI$$$H$$$&$3$H$rCN$C$F$$$^$9!#$b$7(B @code{X-Newsreader} $B%X%C%@!<$,L5$1$l(B
+$B$P!";d$O$=$N>pJs$rF@$k$3$H$O$J$+$C$?$G$7$g$&!#(B
 @end table
 
 @item USEFOR
 @cindex USEFOR
-USEFOR $B$O!"(BIETF $B$N(B working group $B$,(B Son-of-RFC 1036 $B$K4p$E$$$F!"(B
-RFC 1036 $B$N8e7Q$H$7$F=q$$$F$$$k$b$N$G$9!#%K%e!<%95-;v$NMM<0$KBP$7$F!"$$(B
-$B$m$$$m$JJQ99$rDs0F$7$?(B draft $B$r:n@.$7$^$7$?!#(BGnus $B%?%o!<(B
-$B$O(B draft $B$,(B RFC $B$H$7$FG'$a$i$l$?$H$-$KJQ99$N/99?7$5$l$F$$$^$9!#(B
@@ -23978,8 +24911,9 @@ RFC 1731 $B$O(B @acronym{IMAP} $B$N(B GSSAPI/Kerberos4 $B$Ne$K=q$+$l$F$$$kJ8>O$K4X$9$k;v$G!"(BGnus $B$,$=$l$rK~$?$7$F$$$J$$$h$&$JF0:n(B
-$B$r$7$F$$$k;v$K5$IU$$$?$i!"$?$a$i$o$:$K(B Gnus $B%?%o!<$H2f!9$KCN$i$;$F2<$5$$!#(B
+$B>e$K=q$+$l$F$$$kJ8>O$K4X$9$k$3$H$G!"(BGnus $B$,$=$l$rK~$?$7$F$$$J$$$h$&$JF0(B
+$B:n$r$7$F$$$k$3$H$K5$IU$$$?$i!"$?$a$i$o$:$K(B Gnus $B%?%o!<$H;d$?$A$KCN$i$;$F(B
+$B2<$5$$!#(B
 
 @node Emacsen
 @subsection Emacsen
@@ -23991,7 +24925,6 @@ RFC 1731 $B$O(B @acronym{IMAP} $B$N(B GSSAPI/Kerberos4 $B$Ne!#(B
 
@@ -24002,81 +24935,80 @@ XEmacs 21.4 $B0J>e$N(B Mule $B5!G=IU$-(B
 Meadow 1.00 $B0J>e!#(B(Mule for Windows $B$G$OF0$-$^$;$s!#(B)
 @end itemize
 
-$B$3$N(B Gnus $B$NHG$O$3$l$h$j8E$$$I$s$J(B Emacsen $B$G$b40A4$KF0:n$7$J$$$G$7$g$&!#(B
-$B>/$J$/$H$b!"?.Mj$G$-$kF0:n$O$7$J$$$G$7$g$&!#8E$$HG$N(B gnus $B$O8E(B
-$B$$(B Emacs $B$NHG$G$bF0:n$9$k$G$7$g$&!#$H$O8@$&$b$N$N!"(BT-gnus $B$O%P!<%8%g(B
-$B%s(B 21.1.1 $BL$K~$N(B XEmacs, $BNc$($P(B 20.4 $B$G$b;H$($k$+$b$7$l$^$;$s!#>\$7$$$3(B
-$B$H$O(B T-gnus $B$NG[I[$K4^$^$l$F$$$k(B README $B%U%!%$%k$rFI$s$G2<$5$$!#(B
+$B$3$N(B gnus $B$NHG$O$3$l$h$j8E$$$I$s$J(B Emacsen $B$G$b40A4$KF0:n$7$J$$$G$7$g$&!#(B
+$B>/$J$/$H$b?.Mj$G$-$kF0:n$O$7$J$$$G$7$g$&!#8E$$HG$N(B gnus $B$O8E$$(B Emacs $B$N(B
+$BHG$G$bF0:n$9$k$G$7$g$&!#(B
 
-$B$$$m$$$m$J%W%i%C%H%U%)!<%`$N(B Gnus $B$N4V$K$O$$$/$D$+$NGyA3$H$7$?0c$$$,$"$j(B
-$B$^$9(B---XEmacs $B$O$b$C$H2hA|5!G=(B ($B%m%4$H%D!<%k%P!<(B) $B$rFCD'$K$7$F$$$^$9(B--$B$7(B
-$B$+$7!"$=$NB>$O!"A4$F$N(B Emacsen $B$G$[$H$s$IF1$8$O$:$G$9!#(B
+$B$$$m$$$m$J%W%i%C%H%U%)!<%`$N(B gnus $B$N4V$K$O$$$/$D$+$NGyA3$H$7$?0c$$$,$"$j(B
+$B$^$9(B---XEmacs $B$K$O2hA|5!G=(B ($B%m%4$H%D!<%k%P!<(B) $B$NFCD'$,$"$j$^$9(B---$B$7$+$7!"(B
+$B$=$NB>$O$9$Y$F$N(B Emacsen $B$G$[$H$s$IF1$8$O$:$G$9!#(B
 
 @node Gnus Development
 @subsection Gnus $B$N3+H/(B
 
-Gnus $B$OFs$D$NCJ3,$N=[4D$G3+H/$5$l$F$$$^$9!#:G=i$NCJ3,(B
-$B$O(B @samp{ding@@gnus.org} $B$G$N$?$/$5$s$N5DO@$,$"$j!"$=$3$GJQ99$d?7$7$$5!(B
-$BG=$rDs0F$7$^$9!#$3$NCJ3,$O(B @dfn{$B%"%k%U%!(B} $BCJ3,$H8F$P$l$^$9!#$H$$$&$N$O!"(B
-$B$3$NCJ3,$G%j%j!<%9$5$l$?(B Gnusae $B$O(B @dfn{$B%"%k%U%!%j%j!<%9(B} $B$b$7$/$O(B ($BB>(B
-$B$NCDBN$G$O$h$jNI$/;H$o$l$k(B) @dfn{$B%9%J%C%W%7%g%C%H(B} $B$H8F$P$l$k$b$N$@$+$i(B
-$B$G$9!#$3$NCJ3,$G$O!"(Bgnus $B$OIT0BDj$G$"$k$H9M$($i$l$F$*$j!"0lHL$NMxMQA0$K$J$C$F$$$^$9!#(B
-
-50-100 $B$/$i$$$N%j%j!<%9$N8e$G!"(BGnus $B$O(B @dfn{$BE`7k(B} $B$5$l$?$H@k8@$5$l!"%P%0(B
-$B=$@5$N$_$,E,MQ$5$l$^$9!#(BGnus $B$O@\F,<-$,$NCDBN$G$O$h$jNI$/;H$o$l(B
+$B$k(B)$B!V%9%J%C%W%7%g%C%H!W$H8F$P$l$k$b$N$@$+$i$G$9!#$3$NCJ3,$G$O(B Gnus $B$OIT(B
+$B0BDj$G!"0lHL$NMxMQA0$K$J$C(B
+$B$F$$$^$9!#(B
+
+$B$N$i$/$i$H(B 50-100 $B$/$i$$$N%"%k%U%!%j%j!<%9$r$7$?8e$G!"(BGnus $B$O!VE`7k!W$5(B
+$B$l$?$H@k8@$5$l!"%P%0=$@5$N$_$,E,MQ$5$l$^$9!#(BGnus $B$O@\F,8l$r<:$$!"$=$NBe(B
+$B$o$j$K!H(BGnus 5.6.32$B!I$N$h$&$K8F$P$l$^$9!#$3$l$i$OIaDL$N?M$,;H$&$3$H$,$G(B
+$B$-$k$b$N$H9M$($i$l!"l$G=q$/$N$O!"3'$r62$l(B
-$B$5$;$k$H$$$&$N$b;ve!";d$OKhF|$H$F$b$?$/$5$s$NAGE($J%P%0%l%]!<%H$r(B
-$B$l$,;d$r4n$S$GK~$?$7$^$7$?!#0&Io!#$3$N%j%9%H$N?M!9$O(B
-$BG&BQ$rD6$($F;d$N(B ``$B$"$!!"$=$l$O$9$P$i$7$$9M$($@(B $B!"$&$s!";d$O(B
-$BBT$?$:$K$=$l$r$9$0%j%j!<%9$7$h$&(B $B!"$=$l$OA4$/F0:n$7$J$$(B $B!"$&$s!";d$O$9$0$K=P$=$&(B  $B$$$d!"E;$&!"$=$l$OA4$/F0:n$7$J(B
-$B$$$>(B''' $B$H$$$&%j%j!<%9$K4X$9$ke$K$o$?$C$F!";d$OKhF|H`$i$+$iG|Bg$J?t$NAG(B
+$BE($J%P%0%l%]!<%H$r$l$,;d$r4n$S$GK~$?$7$^$7$?!#Ej$2%-%C(B
+$B%9!#$3$N%j%9%H$N?M$?$A$O!";d$N%j%j!<%9J}?K$N$?$a$KBQ$(Fq$-$rBQ$($k;nN}$K(B
+$BAx$$$^$7$?(B: $B!V$"$!!"$=$l$O$9$P$i$7$$9M$($@(B <$B$+$7$c$+$7$c$+$7$c!D(B> $B$h$7$C!"(B
+$B$9$0$K%j%j!<%9$@(B <$B$($$$d$C(B> $B$"$l$l$C!"$^$C$?$/F0$+$J$$$>(B <$B$+$7$c$+$7$c$+(B
+$B$7$c!D(B> $B$h$7$C!"$9$0$K=P$=$&(B <$B$[$i$h$C(B> $B$*$C$H!"BT$C$?!"$<$s$<$sF0:n$7$J(B
+$B$$!D!W!#(BMicro$oft---$B$"$C$+$s$Y!<$@!#%"%^%A%e%"$a!#;d$O(B @emph{$B$b$C$H(B} $B0-(B
+$B$$!#(B($B$=$l$H$b!V$h$j0-$$!W(B?$B!V$b$C$H0-$$!W(B?$B!V:G0-!W(B?)
 
-$B;d$O$3$N5!2q$K$3$N3X2q$K(B@dots{} $B$*$*$C$H!"0c$C$?!#(B
+$B;d$O$3$N5!2q$K3X2q$K46$N7A<0$NId9f2=(B/$BI|9f2=$d%P%0=$@5!"?7$7$$(B
-$B5!G=$J$I$N$[$s$H$&$KB?$/$N$b$N!#(B
+nnwarchive, $B$=$l$K0lHLE*$J%P%0=$@5!"?7$7$$5!G=$J$I$O$b$H$h(B
+$B$j(B @acronym{MIME} $B$HB>$N7A<0$N%(%s%3!<%I(B/$B%G%3!<%I$K4XO"$9$k$[$s$H$&$KB?(B
+$B$/$N$b$N!#(B
 
 @item
-Per Abrahamsen--custom$B!"%9%3%"!"%O%$%i%$%H$H(B @sc{soup} $B%3!<%I(B ($BB>$NB?$/(B
-$B$N;v$H6&$K(B)$B!#(B
+Per Abrahamsen---custom$B!"%9%3%"!"%O%$%i%$%H$H(B @sc{soup} $B%3!<%I(B ($BB>$NB?$/(B
+$B$N$3$H$H6&$K(B)$B!#(B
 
 @item
 Luis Fernandes---$B%G%6%$%s$H%0%i%U%#%C%/!#(B
@@ -24088,17 +25020,17 @@ Joe Reiss---$B%9%^%$%j!<$N4i$N:n!#(B
+Erik Naggum---$B!#(B
 
 @item
-Wes Hardaker---@file{gnus-picon.el} $B$H(B @dfn{picon} $B$NItJ,$N%^%K%e%"(B
-$B%k(B (@pxref{Picons})$B!#(B
+Wes Hardaker---@file{gnus-picon.el} $B$H%^%K%e%"%k$N(B @dfn{picon} $B$N(B
+$B>O(B (@pxref{Picons})$B!#(B
 
 @item
-Kim-Minh Kaplan---picon $B%3!<%I$KCV$1$k99$J$k:n6H!#(B
+Kim-Minh Kaplan---picon $B%3!<%I$K$*$1$k99$J$k:n6H!#(B
 
 @item
-Brad Miller---@file{gnus-gl.el} $B$H(B Grouplens $B$NItJ,$N%^%K%e%"%k!#(B
+Brad Miller---@file{gnus-gl.el} $B$H%^%K%e%"%k$N(B Grouplens $B$N>O!#(B
 
 @item
 Sudish Joseph---$B?t$(@Z$l$J$$$[$I$N%P%0$N=$@5!#(B
@@ -24120,7 +25052,7 @@ Felix Lee & Jamie Zawinski---$B;d$O(B Felix Lee $B$H(B JWZ $B$N(B XGnus $
 Scott Byer---@file{nnfolder.el} $B$N3HD%$H2~D{!#(B
 
 @item
-Peter Mutsaers---$B8E;v5-;v$N%9%3%"%3!<%I!#(B
+Peter Mutsaers---$B8I;y5-;v$N%9%3%"%3!<%I!#(B
 
 @item
 Ken Raebburn---@acronym{POP} $B%a!<%k%5%]!<%H!#(B
@@ -24133,7 +25065,7 @@ Hallvard B Furuseth---$B$$$m$$$m$J>.$5$JJ*$dItJ,!"FC$K(B .newsrc $B%U%!%$%k$r
 Brian Edmonds---@file{gnus-bbdb.el}$B!#(B
 
 @item
-David Moore--@file{nnvirtual.el} $B$N2~D{$HB?$/$NB>$N;v!#(B
+David Moore---@file{nnvirtual.el} $B$N2~D{$HB?$/$NB>$N$3$H!#(B
 
 @item
 Kevin Davidson---@dfn{ding} $B$NL>A0$r;W$$IU$-$^$7$?!#$G$9$+$i!"H`$r@U$a$F(B
@@ -24217,7 +25149,7 @@ Dave Edmondson,
 Paul Eggert,
 Mark W. Eichin,
 Karl Eichwalder,
-$B1]JB!!;LCR(B,
+$B1]JB(B $B;LCR(B,
 Michael Ernst,
 Luc Van Eycken,
 Sam Falkner,
@@ -24239,7 +25171,7 @@ Magnus Hammerin,
 Raja R. Harinath,
 $BNS(B $BK'$l$N?M!9$,9T$C$?;v$N40A4$J354Q$rF@$k$?$a$K!"(BChangeLog $B$,(B Gnus $B$N%"(B
-$B%k%U%!G[I[$K$O4^$^$l$F$$$F!"K-IY$JFI$_J*$rM?$($k$G$7$g$&!#(B(550KB $B$H$$$/(B
-$B$i$+(B)$B!#(B
+Gnus $B$N%"%k%U%!G[I[$K4^$^$l$F$$$k(B ChangeLog $B$O!"$=$l$>$l$N?M$?$A$,9T$J$C(B
+$B$?$3$H$N40A4$JBgMW$rEA$($kK-$+$JFI$_J*$G$9!#(B(550KB $B$H$$$/$i$+(B)$B!#(B($BLu(B
+$BCm(B: $BHs>o$K8E$$(B ChangeLog $B$N5-=R$,2?EY$+$P$C$5$jo$KBg$-$J%5%$%:$K$J$C$F$$$^$9!#(B)
 
-$B;d$,K:$l$?A4$F$N?M$Ke$N$b$N(B---Gnus 5.4/5.5
 * Quassia Gnus::                2 $B$+$1$k(B 2 $B$O(B 4$B!"$b$7$/$O(B Gnus 5.6/5.7
-* Pterodactyl Gnus::            $B8^HVL\!"(BP $B$G;O$^$k!"$b$7$/$O(B Gnus 5.8/5.9 $B$H$7$FCN$i$l$F$$$k$b$N(B
+* Pterodactyl Gnus::            $B?@Hk$N?t$b(B P $B$G;O$^$k$1$l$I!#(BGnus 5.8/5.9 $B$NJLL>(B
 * Oort Gnus::                   $B5pBg$J!#1s$/MZ$+$J!#(BGnus 5.10/5.11$B!#(B
-* No Gnus::                     Lars $B$5$s!"D>$7$F(B!
+* No Gnus::                     $BD6$d$P$$(B
 @end menu
 
-$B$3$N%j%9%H$O!"$b$A$m$s!"(B@emph{$B$?$$$F$$$N(B} $B=EMW$J?7$7$$5!G=$K4X$9(B
-$B$k(B @emph{$BC;$$(B}$B354Q$G$7$+$"$j$^$;$s!#$$$$$(!"K\Ev$O$=$&$G$O$"$j$^$;$s!#$b$C(B
-$B$H$b$C$H$?$/$5$s$N$b$N$,$"$j$^$9!#$O$$!"2f!9$OAOB$@-$N40A4$J8z2L$r46$8$F(B
-$B$$$k$N$G$9!#(B
+$B$3$l$i$N%j%9%H$O!"$b$A$m$s(B @emph{$B$?$$$F$$$N(B} $B=EMW$J?7$7$$5!G=$K4X$9(B
+$B$k(B @emph{$BC;$$(B} $BMWLs$G$7$+$"$j$^$;$s!#$$$$$(!"e;d$?$A$O==J,$KMQ$NL5$$$b(B
+$B$N(B (feeping creaturism) $B$r;}$C$F$$$k$N$G$9!#(B
 
 @node ding Gnus
 @subsubsection (ding) Gnus
@@ -24399,97 +25332,101 @@ Lloyd Zusman.
 Gnus 5.0/5.1 $B$N?7$7$$5!G=(B:
 
 @itemize @bullet
-
 @item
-$BA4$F$N%P%C%U%!$N304Q$O%U%)!<%^%C%H$N$h$&$JJQ?t(B (@pxref{Group Buffer
-Format} $B$H(B @pxref{Summary Buffer Format}) $B$K$h$C$F@_Dj$rJQ$($k;v$,$G$-$k(B
-$B$h$&$K$J$j$^$7$?!#(B
+$B$9$Y$F$N%P%C%U%!!<$N304Q$O!"%U%)!<%^%C%H$N$h$&$JJQ?t(B (@pxref{Group
+Buffer Format} and @pxref{Summary Buffer Format}) $B$K$h$C$F@_Dj$rJQ$($k$3(B
+$B$H$,$G$-$k$h$&$K$J$j$^$7$?!#(B
 
 @item
-$B%m!<%+%k%9%W!<%k$H!"$$$/$D$+$N(B @acronym{NNTP} $B%5!<%P!<$rF1;~$K;H$&;v$,$G(B
-$B$-$k$h$&$K$J$j$^$7$?(B (@pxref{Select Methods})$B!#(B
+$B%m!<%+%k%9%W!<%k$H!"$$$/$D$+$N(B @acronym{NNTP} $B%5!<%P!<$rF1;~$K;H$&$3$H$,(B
+$B$G$-$k$h$&$K$J$j$^$7$?(B (@pxref{Select Methods})$B!#(B
 
 @item
-$B%0%k!<%W$r;ve$N%0%k!<%W$K7k9g$G$-$k$h$&$K$J$j$^$7$?(B (@pxref{Virtual
+$BJ#?t$N%0%k!<%W$r2>A[%0%k!<%W$K9gJ;$G$-$k$h$&$K$J$j$^$7$?(B (@pxref{Virtual
 Groups})$B!#(B
 
 @item
-$BB?$/$N0c$C$?%a!<%kMM<0(B (@pxref{Getting Mail}) $B$rFI$a$k$h$&$K$J$j$^$7$?!#(B
-$BA4$F$N%a!<%k%P%C%/%(%s%I$OJXMx$J%a!<%k4|8B@Z$l>C5n5!9=$rC5n5!9=$re$2$k$N$K==J,$J%X%C%@!<$re$2$k$N$K==J,$J%X%C%@!<$r$$$C$?$sLa$C$F$C$F5-;v$K%9%3%"$rIU$1$k;v$,$G$-$^$9(B (@pxref{Scoring})$B!#(B
-$B$"$J$?$N$?$a$K5-;v$r$I$N$h$&$K%9%3%"$rIU$1$k$+$r(B Gnus $B$K8+$D$1$5$;$k;v$b(B
-$B$G$-$^$9(B (@pxref{Adaptive Scoring})$B!#(B
+$B2?$C$F!"5-;v$K%9%3%"$rIU$1$k$3$H$,$G$-$^(B
+$B$9(B (@pxref{Scoring})$B!#$I$N$h$&$K5-;v$K%9%3%"$rIU$1$k$+$r!"(BGnus $B$K8+$D$1(B
+$B$5$;$k$3$H$b$G$-$^$9(B (@pxref{Adaptive Scoring})$B!#(B
 
 @item
-Gnus $B$OIaDL$N(B Emacs $B$NJ}K!$G<+F0J]B8$5$l$k%I%j%V%k%P%C%U%!$rJ];}$7$F$$$^(B
-$B$9$N$G!"$"$J$?$N%^%7%s$,Mn$C$3$A$?$H$-$G$b$"$^$j%G!<%?$r<:$o$J$$$G$7$g(B
-$B$&(B (@pxref{Auto Save})$B!#(B
+Gnus $B$OIaDL$N(B Emacs $B$NJ}K!$G<+F0J]B8$5$l$k%I%j%V%k%P%C%U%!!<$r0];}$9$k$N(B
+$B$G!"$"$J$?$,2?$rFI$s$@$+$N%G!<%?$r%^%7%s$,Mn$A$?$H$-$G$b$"$^$j<:$o$J$$$G(B
+$B$7$g$&(B (@pxref{Auto Save})$B!#(B
 
 @item
-Gnus $B$O:#$d%U%!%$%k(B @file{.emacs} $B$r$0$A$c$0$A$c$K$9$k;v$rHr$1$k$?$a$K@l(B
-$BMQ$N5/F0%U%!%$%k(B (@file{~/.gnus.el}) $B$r;}$D$h$&$K$J$j$^$7$?!#(B
+Gnus $B$O(B @file{.emacs} $B%U%!%$%k$r$0$A$c$0$A$c$K$9$k$3$H$rHr$1$k$?$a$K!":#(B
+$B$G$O@lMQ$N5/F0%U%!%$%k(B (@file{~/.gnus.el}) $B$r;}$D$h$&$K$J$j$^$7$?!#(B
 
 @item
-$B%0%k!<%W$H5-;v$NN>J}$K%W%m%;%90u$rIU$1$k$3$H$,$G$-!"A4$F$N0u$NIU$$$?9`L\(B
-$B$K1i;;$r$9$k;v$,$G$-$^$9(B (@pxref{Process/Prefix})$B!#(B
+$B%0%k!<%W$H5-;v$NN>J}$K%W%m%;%90u$rIU$1$k$3$H$,$G$-!"$9$Y$F$N0u$NIU$$$?9`(B
+$BL\$G=hM}$rr7o$G$G$b!"I=<($9$k$3$H$,$G$-$^(B
 $B$9(B (@pxref{Listing Groups})$B!#(B
 
 @item
-$B30It%5!<%P!<$r354Q$7$F!"$=$l$i$N%5!<%P!<$N%0%k!<%W$r9XFI$9$k;v$,$G$-$^(B
+$B30It%5!<%P!<$r354Q$7$F!"$=$l$i$N%5!<%P!<$N%0%k!<%W$r9XFI$9$k$3$H$,$G$-$^(B
 $B$9(B (@pxref{Browse Foreign Server})$B!#(B
 
 @item
-Gnus $B$O%5!<%P!<$H$NFs$D@\B3$G!"5-;v$rHsF14|$K$H$C$F$/$k;v$,$G$-$^(B
+Gnus $B$O%5!<%P!<$H$NFs$DL\$N@\B3$G!"5-;v$rHsF14|$K$N5-;v(B) $B$Nc$9$k;vL5$/F0:n$9$k$h$&$K(B
-$B$J$j$^$7$?(B (@pxref{Finding the Parent})$B!#(B
+$B?F5-;v(B ($B$HB>$N5-;v(B) $B$N$N%U%!%$%k(B) $B$r!"%0%k!<%W$H$7$F;H$($k$h$&$K(B
+$B$J$j$^$7$?(B (@pxref{Document Groups})$B!#(B
+
+@item
+$B5-;v$r%O%$%i%$%H$7!"%+%9%?%^%$%:$9$k$3$H$,$G$-$^$9(B (@pxref{Customizing
 Articles})$B!#(B
 
 @item
@@ -24497,8 +25434,8 @@ URL $B$HB>$N30It;2>H$,%\%?%s$K$J$k$h$&$K$J$j$^$7$?(B (@pxref{Article
 Buttons})$B!#(B
 
 @item
-Gnus $B$N%&%#%s%I%&$H%U%l!<%`$N@_Dj$G$?$/$5$s$NJQ$J;v$r$G$-$k$h$&$K$J$j$^(B
-$B$7$?(B (@pxref{Window Layout})$B!#(B
+Gnus $B$N%&%#%s%I%&$H%U%l!<%`$N@_Dj$G$?$/$5$s$NJQ$J$3$H$r$G$-$k$h$&$K$J$j(B
+$B$^$7$?(B (@pxref{Window Layout})$B!#(B
 
 @item
 $B%-!<%\!<%I$r;H$&Be$o$j$K!"%\%?%s$r%/%j%C%/$G$-$k$h$&$K$J$j$^$7(B
@@ -24513,19 +25450,17 @@ Gnus $B$N%&%#%s%I%&$H%U%l!<%`$N@_Dj$G$?$/$5$s$NJQ$J;v$r$G$-$k$h$&$K$J$j$^(B
 \gnusfig{-28cm}{0cm}{\epsfig{figure=ps/september,height=20cm}}
 @end iflatex
 @end iftex
-
 Gnus 5.2/5.3 $B$N?7$7$$5!G=(B:
 
 @itemize @bullet
-
 @item
-$B?7$7$$%a%C%;!<%8:n@.%b!<%I$,;H$o$l$^$9!#(B
-@code{mail-mode}, @code{rnews-reply-mode} $B$H(B @code{gnus-msg} $B$NA4$F$N8E(B
-$B$$%+%9%?%^%$%:JQ?t$O:#$d5l<0$K$J$j$^$7$?!#(B
+$B?7$7$$%a%C%;!<%8:n@.%b!<%I$,;H$o$l$^$9!#(B@code{mail-mode},
+@code{rnews-reply-mode} $B$H(B @code{gnus-msg} $B$N$9$Y$F$N8E$$%+%9%?%^%$%:JQ(B
+$B?t$O:#$d5l<0$K$J$j$^$7$?!#(B
 
 @item
-Gnus $B$O(B @dfn{$B$^$P$i(B} $B%9%l%C%I$r:n@.$9$k;v$,$G$-$k$h$&$K$J$j$^$7$?(B---$B%9%l%C(B
-$B%I$N<:$o$l$?5-;v$,$"$k$H$3$m$O6u$N@a$GI=8=$5$l$k$h$&$K$J$C$F$$$^(B
+Gnus $B$O!V$^$P$i!W%9%l%C%I$r:n@.$9$k$3$H$,$G$-$k$h$&$K$J$j$^$7$?(B---$B%9%l%C(B
+$B%I$N<:$o$l$?5-;v$,$"$k$H$3$m$O!"6u$N@a$GI=8=$5$l$k$h$&$K$J$C$F$$$^(B
 $B$9(B (@pxref{Customizing Threading})$B!#(B
 
 @lisp
@@ -24533,21 +25468,21 @@ Gnus $B$O(B @dfn{$B$^$P$i(B} $B%9%l%C%I$r:n@.$9$k;v$,$G$-$k$h$&$K$J$j$^$7$?
 @end lisp
 
 @item
-$B30$K=P$F$$$/5-;v$OFCJL$JJ]4I%5!<%P!<$KJ]B8$5$l$k$h$&$K$J$j$^$7(B
+$B30$K=P$F$$$/5-;v$O!"FCJL$JJ]4I%5!<%P!<$KJ]B8$5$l$k$h$&$K$J$j$^$7(B
 $B$?(B (@pxref{Archived Messages})$B!#(B
 
 @item
-$B5-;v$,;2>H$5$l$?$H$-$K!"%9%l%C%I$NItJ,:n@.$,5/$3$k$h$&$K$J$j$^$7$?!#(B
+$B5-;v$,;2>H$5$l$?$H$-$K!"%9%l%C%I$NItJ,:n@.$,9T$J$o$l$k$h$&$K$J$j$^$7$?!#(B
 
 @item
-Gnus $B$O(B GroupLens $B$NM=8@$r;H$&;v$,$G$-$k$h$&$K$J$j$^$7$?!#(B
+Gnus $B$O(B GroupLens $B$NM=B,$rMxMQ$9$k$3$H$,$G$-$k$h$&$K$J$j$^$7$?!#(B
 
 @item
 Picons (personal icons) ($B8D?M%"%$%3%s(B) $B$,(B XEmacs $B$GI=<($G$-$k$h$&$K$J$j(B
 $B$^$7$?(B (@pxref{Picons})$B!#(B
 
 @item
-@code{trn} $B$N$h$&$JLZ%P%C%U%!$,I=<($5$l$k$h$&$K$J$j$^$7$?(B (@pxref{Tree
+@code{trn} $B$N$h$&$JLZ%P%C%U%!!<$rI=<($G$-$k$h$&$K$J$j$^$7$?(B (@pxref{Tree
 Display})$B!#(B
 
 @lisp
@@ -24555,19 +25490,19 @@ Display})$B!#(B
 @end lisp
 
 @item
-@code{nn} $B$N$h$&$Jv$_%H%T%C%/3,AX$K%0%k!<%WJ,$1$G$-$k$h$&$K$J$j$^$7(B
+$B%0%k!<%W72$r@^$j>v$_%H%T%C%/3,AX$K%0%k!<%WJ,$1$G$-$k$h$&$K$J$j$^$7(B
 $B$?(B (@pxref{Group Topics})$B!#(B
 
 @lisp
@@ -24575,85 +25510,85 @@ Group $B$,@^$j>v$_%H%T%C%/3,AX$K%0%k!<%WJ,$1$G$-$k$h$&$K$J$j$^$7(B
 @end lisp
 
 @item
-Gnus $B$,<:GT%a!<%k$r:FAw$G$-$k$h$&$K$J$j$^$7$?(B (@pxref{Summary Mail
-Commands})$B!#(B
+$B%a!<%k$N:FAw$H!"CF$+$l$?%a!<%k$rAw$jD>$9$3$H$,$G$-$k$h$&$K$J$j$^$7(B
+$B$?(B (@pxref{Summary Mail Commands})$B!#(B
 
 @item
-$B%0%k!<%W$,%9%3%"$r;}$D;v$,$G$-$k$h$&$K$J$j!"K,$l$k2s?t$K4p$E$$$FJB$SBX$((B
-$B$r$G$-$k$h$&$K$J$j$^$7$?(B (@pxref{Group Score})$B!#(B
+$B%0%k!<%W$,%9%3%"$r;}$D$3$H$,$G$-$k$h$&$K$J$j!"K,$l$k2s?t$K4p$E$$$?JB$YBX(B
+$B$($,2DG=$K$J$j$^$7$?(B (@pxref{Group Score})$B!#(B
 
 @lisp
 (add-hook 'gnus-summary-exit-hook 'gnus-summary-bubble-group)
 @end lisp
 
 @item
-$B%0%k!<%W$K%W%m%;%90u$rIU$1$i$l$k$h$&$K$J$j!"%0%k!<%W$N$0%k!<%W$KL?Na$,e$N%0%k!<%W$G%-%c%C%7%e$,$G$-$k$h$&$K$J$j$^$7$?!#(B
+$B2>A[%0%k!<%W$G%-%c%C%7%e$,$G$-$k$h$&$K$J$j$^$7$?!#(B
 
 @item
-@code{nndoc} $B$OA4$F$N=8G[G[Aw!"%a!<%k%\%C%/%9!"(Brnews $B%K%e!<%90l3g!"(B
-ClariNet $BC;<}=8!"$=$7$FA4$F$N$=$NB>$rM}2r$G$-$k$h$&$K$J$j$^$7(B
-$B$?(B (@pxref{Document Groups})$B!#(B
+@code{nndoc} $B$O$9$Y$F$N$N$9$Y$F$rM}2r$G$-$k$h$&$K$J(B
+$B$j$^$7$?(B (@pxref{Document Groups})$B!#(B
 
 @item
 Gnus $B$O(B SOUP $B%Q%1%C%H$r:n@.(B/$BFI$_9~$_$r$9$k$?$a$N?7$7$$%P%C%/%(%s(B
 $B%I(B (@code{nnsoup}) $B$r;}$C$F$$$^$9!#(B
 
 @item
-Gnus $B%-%c%C%7%e$,$:$C$HB.$/$J$j$^$7$?!#(B
+$B%-%c%C%7%e$,$:$C$HB.$/$J$j$^$7$?!#(B
 
 @item
-$B%0%k!<%W$rB?$/$N4p=`$K=>$C$FJB$SBX$($G$-$k$h$&$K$J$j$^$7(B
+$B%0%k!<%W$rB?$/$N4p=`$K=>$C$FJB$YBX$($k$3$H$,$G$-$k$h$&$K$J$j$^$7(B
 $B$?(B (@pxref{Sorting Groups})$B!#(B
 
 @item
-$B%"%I%l%9$N%j%9%H$H4|8B@Z$l>C5n$N;~4V$r@_Dj$9$k?7$7$$%0%k!<%W%Q%i%a!<%?$,(B
-$BF3F~$5$l$^$7$?(B (@pxref{Group Parameters})$B!#(B
+$B%a!<%j%s%0%j%9%H$N%"%I%l%9$H4|8B@Z$l>C5n$N;~4V$r@_Dj$9$k!"?7$7$$%0%k!<%W(B
+$B%Q%i%a!<%?!<$,F3F~$5$l$^$7$?(B (@pxref{Group Parameters})$B!#(B
 
 @item
-$BA4$F$N%U%)!<%^%C%H;XDj$,;H$o$l$k%U%'%$%9$r;XDj$G$-$k$h$&$K$J$j$^$7(B
+$B$9$Y$F$N%U%)!<%^%C%H;XDj$G!"%U%'!<%9$r;XDj$G$-$k$h$&$K$J$j$^$7(B
 $B$?(B (@pxref{Formatting Fonts})$B!#(B
 
 @item
-@kbd{M P} $BI{%^%C%W$K%W%m%;%90u$NIU$$$?5-;v$N@_Dj(B/$B:o=|(B/$B@\;HMQ$G$-$k$h$&$K$J$j$^$7(B
+$B$9$Y$F$N35N,%b!<%IL?Na$r!"5-;v%P%C%U%!!<$+$iD>@\;HMQ$G$-$k$h$&$K$J$j$^$7(B
 $B$?(B (@pxref{Article Keymap})$B!#(B
 
 @item
-$B%U%l!<%`$,(B @code{gnus-buffer-configuration} $B$NItJ,$K$J$k;v$,$G$-$^(B
-$B$9(B (@pxref{Window Layout})$B!#(B
+$B%U%l!<%`$,(B @code{gnus-buffer-configuration} $B$NItJ,$K$J$k$3$H$,$G$-$k$h$&(B
+$B$K$J$j$^$7$?(B (@pxref{Window Layout})$B!#(B
 
 @item
-$B%G!<%b%s$N%W%m%;%9$G%a!<%k$r:FAv::$9$k$3$H$,$G$-$k$h$&$K$J$j$^$7(B
+$B%G!<%b%s$N%W%m%;%9$K$h$C$F!"?7Ce%a!<%k$r8!::$G$-$k$h$&$K$J$j$^$7(B
 $B$?(B (@pxref{Daemons})$B!#(B
 @iftex
 @iflatex
@@ -24662,30 +25597,30 @@ Washing})$B!#(B
 @end iftex
 
 @item
-Gnus $B$O(B spam $B$r:,@d$d$7$K$9$k$?$a$K(B NoCeM $B%U%!%$%k$r;H$&;v$,$G$-$k$h$&$K(B
-$B$J$j$^$7$?(B (@pxref{NoCeM})$B!#(B
+Gnus $B$O(B spam $B$r:,@d$d$7$K$9$k$?$a$K!"(BNoCeM $B%U%!%$%k$rMxMQ$G$-$k$h$&$K$J(B
+$B$j$^$7$?(B (@pxref{NoCeM})$B!#(B
 
 @lisp
 (setq gnus-use-nocem t)
 @end lisp
 
 @item
-$B%0%k!<%W$r1J5W2D;k$K$9$k;v$,$G$-$k$h$&$K$J$j$^$7$?(B (@pxref{Listing
-Groups})$B!#(B
+$B%0%k!<%W$r>o$K8+$($k$h$&$K$7$F$*$/$3$H$,(B ($BLuCm(B: $B$=$N%0%k!<%W$KL$FI5-;v$,(B
+$BL5$/$F$b(B)$B!"$G$-$k$h$&$K$J$j$^$7$?(B (@pxref{Listing Groups})$B!#(B
 
 @lisp
 (setq gnus-permanently-visible-groups "^nnml:")
 @end lisp
 
 @item
-$B%+%9%?%^%$%:$r4JC1$K$9$k$?$a$KB?$/$N?7$7$$%U%C%/$,F3F~$5$l$^$7$?!#(B
+$B%+%9%?%^%$%:$r3Z$K$9$k$?$a$K!"B?$/$N?7$7$$%U%C%/$,F3F~$5$l$^$7$?!#(B
 
 @item
-Gnus $B$O(B @code{Mail-Copies-To} $B%X%C%@!<$KCm0U$rJ'$&$h$&$K$J$j$^$7$?!#(B
+Gnus $B$O(B @code{Mail-Copies-To} $B%X%C%@!<$rB:=E$9$k$h$&$K$J$j$^$7$?!#(B
 
 @item
-@code{References} $B%X%C%@!<$r=8$a$k;v$K$h$j%9%l%C%I$r=8$a$k;v$,$G$-$k$h$&(B
-$B$K$J$j$^$7$?(B (@pxref{Customizing Threading})$B!#(B
+@code{References} $B%X%C%@!<$rD4$Y$k$3$H$K$h$C$F!"%9%l%C%I$r=8$a$k$3$H$,$G(B
+$B$-$k$h$&$K$J$j$^$7$?(B (@pxref{Customizing Threading})$B!#(B
 
 @lisp
 (setq gnus-summary-thread-gathering-function
@@ -24693,23 +25628,23 @@ Gnus $B$O(B @code{Mail-Copies-To} $B%X%C%@!<$KCm0U$rJ'$&$h$&$K$J$j$^$7$?!#(B
 @end lisp
 
 @item
-$B4{FI5-;v$O:FO$KBP$7$F!"5-;v%P%C%U%!$G$N@^$jJV$7$,E,@Z$KF0:n$9$k$h$&$K$J(B
-$B$j$^$7$?(B (@pxref{Article Washing})$B!#(B
+$B5-;v%P%C%U%!!<$G!"0zMQ$5$l$?%F%-%9%H$N@^$jJV$7$,E,@Z$KF0:n$9$k$h$&$K$J$j(B
+$B$^$7$?(B (@pxref{Article Washing})$B!#(B
 
 @item
-$B1#$5$l$?0zMQJ8$O1#$9;v$r@Z$jBX$($k%\%?%s$r2C$(!"$I$N$/$i$$$N0zMQJ8$r1#$9(B
-$B$+$r%+%9%?%^%$%:$G$-$k$h$&$K$J$j$^$7$?(B (@pxref{Article Hiding})$B!#(B
+$B0zMQ$5$l$?%F%-%9%H$rI=<($9$k$+1#$9$+$r@Z$jBX$($k$?$a$N%\%?%s$,DI2C$5$l$^(B
+$B$7$?!#$^$?!"$I$N$/$i$$$N0zMQJ8$r1#$9$+$r%+%9%?%^%$%:$G$-$k$h$&$K$J$j$^$7(B
+$B$?(B (@pxref{Article Hiding})$B!#(B
 
 @lisp
 (setq gnus-cited-lines-visible 2)
 @end lisp
 
 @item
-$BB`6~$J%X%C%@!<$r1#$9;v$,$G$-$^$9(B (@pxref{Article Hiding})$B!#(B
+$B6=L#$NL5$$%X%C%@!<$r1#$9$3$H$,$G$-$^$9(B (@pxref{Article Hiding})$B!#(B
 
 @item
-$B%9%3%"$N=i4|CM$,%a%K%e!<%P!<$+$i@_Dj$G$-$k$h$&$K$J$j$^$7$?!#(B
+$B%9%3%"$N%G%#%U%)%k%HCM$r%a%K%e!<%P!<$+$i@_Dj$G$-$k$h$&$K$J$j$^$7$?!#(B
 
 @item
-$B=P$F9T$/5-;v$N99$J$k9=J8%A%'%C%/$,$G$-$k$h$&$K$J$j$^$7$?!#(B
+$BAw?.$5$l$k5-;v$N99$J$k9=J8%A%'%C%/$,DI2C$5$l$^$7$?!#(B
 @end itemize
 
 @node Red Gnus
@@ -24756,25 +25692,28 @@ Gnus 5.4/5.5 $B$N?7$7$$5!G=(B:
 \gnusfig{-5.5cm}{-4cm}{\epsfig{figure=ps/red,height=20cm}}
 @end iflatex
 @end iftex
-
 @itemize @bullet
+@item
+@file{nntp.el} $B$OHsF14|$KF0:n$9$k$d$jJ}$G!"40A4$K2~D{$5$l$^$7$?!#(B
 
 @item
-@file{nntp.el} $B$OHsF14|$NN.57$G40A4$K2~D{$5$l$^$7$?!#(B
+$B5-;v$N@h9TuBV$,5-;v%b!<%I9T$KI=<($5$l$k$h$&$K$J$j$^$7(B
+$B5-;v$N@vBu>uBV$r5-;v$N%b!<%I9T$KI=<($G$-$k$h$&$K$J$j$^$7(B
 $B$?(B (@pxref{Misc Article})$B!#(B
 
 @item
 @file{gnus.el} $B$,B?$/$N>.$5$$%U%!%$%k$KJ,3d$5$l$^$7$?!#(B
 
 @item
-Message-ID $B$K4p$E$$$?!"=EJ#5-;v$NM^@)$,$J$5$l$k$h$&$K$J$j$^$7(B
+Message-ID $B$K4p$E$$$F!"5-;v$N=EJ#$rM^@)$9$k$3$H$,$G$-$k$h$&$K$J$j$^$7(B
 $B$?(B (@pxref{Duplicate Suppression})$B!#(B
 
 @lisp
@@ -24782,47 +25721,47 @@ Message-ID $B$K4p$E$$$?!"=EJ#5-;v$NM^@)$,$J$5$l$k$h$&$K$J$j$^$7(B
 @end lisp
 
 @item
-$B$I$N%9%3%"$HE,1~%U%!%$%k$,%[!<%`$N%9%3%"$HE,1~%U%!%$%k$G$"$k$+$r;XDj$9(B
+$B$I$N%9%3%"$HE,1~%U%!%$%k$,!"%[!<%`%9%3%"$HE,1~%U%!%$%k$G$"$k$+$r;XDj$9(B
 $B$k(B (@pxref{Home Score File}) $B?7$7$$JQ?t$,2C$($i$l$^$7$?!#(B
 
 @item
-@code{nndoc} $B$,4JC1$K3HD%2DG=$K$J$k$h$&$K2~D{$5$l$^$7(B
+@code{nndoc} $B$,$h$j4JC1$K3HD%$G$-$k$h$&$K2~D{$5$l$^$7(B
 $B$?(B (@pxref{Document Server Internals})$B!#(B
 
 @item
-$B%0%k!<%W$O?F$N%H%T%C%/$+$i%0%k!<%W%Q%i%a!<%?$r7Q>5$G$-$k$h$&$K$J$j$^$7(B
+$B%0%k!<%W$O?F$N%H%T%C%/$+$i%0%k!<%W%Q%i%a!<%?!<$r7Q>5$G$-$k$h$&$K$J$j$^$7(B
 $B$?(B (@pxref{Topic Parameters})$B!#(B
 
 @item
-$B5-;vJT=8$,2~D{$5$l!"$,$b$C$HCNE*$JJ}K!$GG'<1$5$l$k$h$&$K$J$j$^$7$?(B (@pxref{Article
+$B=pL>$,$b$C$HMx8}$J$d$jJ}$GG'<1$5$l$k$h$&$K$J$j$^$7$?(B (@pxref{Article
 Signature})$B!#(B
 
 @item
-$B35N,%T%C%/%b!<%I$,$b$C$H(B @code{nn} $B$N$h$&$K$J$j$^$7$?!#9T?t$,I=<($5$l$F!"(B
-$BL?Na(B @kbd{.} $B$,5-;v$re(B
-$B$G(B) $B$,2C$($i$l$^$7$?(B---@kbd{C-M-d} (@pxref{Really Various Summary
-Commands})$B!#(B
+$BJ8=q$r4s$;=8$a$?$b$N$rFI$`$?$a$N?7$7$$L?Na(B (@code{nndoc} $B%0%k!<%W$N$F$C(B
+$B$Z$s$G(B @code{nnvirtual} $B$r;H$$$^$9(B) $B$,2C$($i$l$^$7$?(B---@kbd{C-M-d}
+(@pxref{Really Various Summary Commands})$B!#(B
 
 @item
-$B%W%m%;%90u$N@_Dj$,(B push $B$H(B pop $B$G$-$k$h$&$K$J$j$^$7$?(B (@pxref{Setting
-Process Marks})$B!#(B
+$B%W%m%;%90u$N@_Dj$r(B push $B$H(B pop $B$G%9%?%C%/$K=P$7F~$l$G$-$k$h$&$K$J$j$^$7(B
+$B$?(B (@pxref{Setting Process Marks})$B!#(B
 
 @item
-$B?7$7$$%a!<%k$+$i%K%e!<%9$X$N%P%C%/%(%s%I$,(B @acronym{NNTP} $B%5!<%P!<$,Ej9F(B
-$B$r5v2D$7$F$$$J$$>l9g$G$b!"Ej9F$G$-$k$h$&$K$J$j$^$7(B
+@acronym{NNTP} $B%5!<%P!<$,Ej9F$r5v2D$7$F$$$J$$>l9g$G$b!"?7$7(B
+$B$$(B mail-to-news $B%P%C%/%(%s%I$,!"Ej9F$9$k$3$H$r2DG=$K$7$^$7(B
 $B$?(B (@pxref{Mail-To-News Gateways})$B!#(B
 
 @item
-$B%&%'%V8!:w%(%s%8(B
-$B%s(B (@dfn{DejaNews}, @dfn{Alta Vista}, @dfn{InReference}) $B$+$i$N8!:w7k2L(B
-$B$rFI$`?7$7$$%P%C%/%(%s%I$,2C$($i$l$^$7$?(B (@pxref{Web Searches})$B!#(B
+$B%&%'%V8!:w%(%s%8%s(B (@dfn{DejaNews}, @dfn{Alta Vista},
+@dfn{InReference}) $B$+$i$N8!:w7k2L$rFI$`$?$a$N!"?7$7$$%P%C%/%(%s%I$,2C$((B
+$B$i$l$^$7$?(B (@pxref{Web Searches})$B!#(B
 
 @item
-$BI8=`$NJB$SBX$(4X?t$r;H$C$F%0%k!<%W$NCf$N%H%T%C%/$rJB$SBe$($9$k;v$,$G$-!"(B
-$B$=$l$>$l$N%H%T%C%/$,FHN)$7$FJB$SBX$($G$-$k$h$&$K$J$j$^$7(B
-$B$?(B (@pxref{Topic Sorting})$B!#(B
+$BI8=`$NJB$YBX$(4X?t$r;H$C$F!"%H%T%C%/$NCf$K$"$k%0%k!<%W$rJB$SBe$($k$3$H$,(B
+$B$G$-$k$h$&$K$J$j$^$7$?!#$^$?!"$=$l$>$l$N%H%T%C%/$rFHN)$7$FJB$YBX$($k$3$H(B
+$B$,$G$-$k$h$&$K$J$j$^$7$?(B (@pxref{Topic Sorting})$B!#(B
 
 @item
-$B%0%k!<%W$N0lItJ,$,FHN)$7$FJB$SBX$($G$-$k$h$&$K$J$j$^$7(B
+$B%0%k!<%W72$N0lIt$r!"FHN)$7$FJB$YBX$($k$3$H$,$G$-$k$h$&$K$J$j$^$7(B
 $B$?(B (@code{Sorting})$B!#(B
 
 @item
-$B%-%c%C%7%e$5$l$?5-;v$,%0%k!<%W$KF~$l$i$l$k$h$&$K$J$j$^$7(B
+$B%-%c%C%7%e$5$l$?5-;v$r!"%0%k!<%W$K0z$-9~$`$3$H$,$G$-$k$h$&$K$J$j$^$7(B
 $B$?(B (@pxref{Summary Generation Commands})$B!#(B
 @iftex
 @iflatex
@@ -24882,19 +25822,19 @@ Process Marks})$B!#(B
 @end iftex
 
 @item
-$B%9%3%"%U%!%$%k$,$b$C$H?.Mj$G$-$k=gHV$GE,MQ$G$-$k$h$&$K$J$j$^$7(B
+$B%9%3%"%U%!%$%k$,$b$C$H?.Mj$G$-$k=gHV$GE,MQ$5$l$k$h$&$K$J$j$^$7(B
 $B$?(B (@pxref{Score Variables})$B!#(B
 
 @item
-$B%a!<%k%a%C%;!<%8$,$I$3$K9T$/$+$NJs9p$r:n@.$9$k;v$,$G$-$k$h$&$K$J$j$^$7(B
-$B$?(B (@pxref{Splitting Mail})$B!#(B
+$B%a!<%k%a%C%;!<%8$,J,3d$5$l$F$I$3$K9T$/$+$NJs9p$r!":n@.$9$k$3$H$,$G$-$k$h(B
+$B$&$K$J$j$^$7$?(B (@pxref{Splitting Mail})$B!#(B
 
 @item
-$BF~$C$FMh$?%a!<%k$rJ]B8$9$kA0$K$,$i$/$?$rj(B
-$B$J$[$I$N?7$7$$L?Na$H%b!<%I$,DI2C$5$l$^$7$?!#40A4$JOC$KIU$$$F(B
-$B$O(B @ref{Gnus Unplugged} $B$r8+$F2<$5$$!#(B
+$B$J$[$I$N?7$7$$L?Na$H%b!<%I$,DI2C$5$l$^$7$?!#A4KF$K$D$$$F$O(B @ref{Gnus
+Unplugged} $B$r8+$F2<$5$$!#(B
 
 @item
-@code{nndraft} $B%P%C%/%(%s%I$,La$C$F$-$^$7$?$,!"0MA3$H$O0c$&$h$&$KF0:n$9(B
-$B$k$h$&$K$J$j$^$7$?!#A4$F$N%a%C%;!<%8%P%C%U%!$O(B @code{nndraft} $B%0%k!<%W$N(B
-$B5-;v$G$b$"$j!"$=$l$O<+F0E*$K:n@.$5$l$^$9!#(B
+@code{nndraft} $B%P%C%/%(%s%I$,La$C$F$-$^$7$?!#$G$b!"0MA3$H$O0c$&F0:n$r$7(B
+$B$^$9!#$9$Y$F$N%a%C%;!<%8%P%C%U%!!<$O!":#$G$O<+F0E*$K:n@.$5$l(B
+$B$k(B @code{nndraft} $B%0%k!<%W$N5-;v$G$b$"$j$^$9!#(B
 
 @item
-@code{gnus-alter-header-function} $B$,%X%C%@!<$NCM$rJQ$($k$?$a$K;H$o$l$k$h(B
-$B$&$K$J$j$^$7$?!#(B
+@code{gnus-alter-header-function} $B$r!"%X%C%@!<$NCM$rJQ$($k$?$a$K;H$&$3$H(B
+$B$,$G$-$k$h$&$K$J$j$^$7$?!#(B
 
 @item
 @code{gnus-summary-goto-article} $B$,(B Message-ID $B$rO$r>C5n$9$k$?$a$N?7$7$$%a%C%;!<%8L?(B
-$BNa$,$"$j$^$9(B: @kbd{C-c C-v}$B!#(B
+$B%a%C%;!<%8$NK\J8$K$*$$$F!";XDj$7$?%j!<%8%g%s0J30$N%F%-%9%H$r>C5n$9$k$?$a(B
+$B$N?7$7$$%a%C%;!<%8L?Na$,$"$j$^$9(B: @kbd{C-c C-v}$B!#(B
 
 @item
-@kbd{C-u C-c C-c} $B$K$h$C$F(B @code{nnvirtual} $B%0%k!<%W$r@8@.$7$F$$$k%0%k!<(B
+@kbd{C-u C-c C-c} $B$K$h$C$F(B @code{nnvirtual} $B%0%k!<%W$r9=@.$7$F$$$k%0%k!<(B
 $B%W$KEj9F$G$-$k$h$&$K$J$j$^$7$?!#(B
 
 @item
@@ -24935,24 +25874,25 @@ Gnus $B$r%*%U%i%$%s%K%e!<%9%j!<%@!<$H$7$F;H$&?75!G=$,2C$($i$l$^$7$?!#2a>j(B
 $B$9!#(B
 
 @item
-@code{gnus-article-edit-mode} $B$N(B @code{C-u C-c C-c} $B$O5-;v%P%C%U%!$N:F%O(B
-$B%$%i%$%H$r6X;_$9$k$h$&$K$J$j$^$7$?!#(B
+@code{gnus-article-edit-mode} $B$K$*$1$k(B @code{C-u C-c C-c} $BL?Na$O!"5-;v%P%C(B
+$B%U%!!<$N:F%O%$%i%$%H$rM^@)$9$k$h$&$K$J$j$^$7$?!#(B
 
 @item
-@code{gnus-boring-article-headers} $B$K?7$7$$MWAG$,$"$j$^(B
-$B$9(B---@code{long-to}$B!#(B
+@code{gnus-boring-article-headers} $B$K!"(B@code{long-to} $B$H$$$&?7$7$$MWAG$,(B
+$B$"$j$^$9!#(B
 
 @item
 @kbd{M-i} $B%7%s%\%k@\F,0z?tL?Na$,$"$j$^$9!#>\:Y(B
 $B$O(B @ref{Symbolic Prefixes} $B$r8+$F2<$5$$!#(B
 
 @item
-$B35N,%P%C%U%!$N(B @kbd{L} $B$H(B @kbd{I} $B$O(B @file{all.SCORE} $B%U%!%$%k$K%9%3%"K!(B
-$BB'$r2C$($k$?$a$K%7%s%\%k@\F,0z?t(B @kbd{a} $B$rj(B
 @kbd{/ T}---$B8=:_$N%9%l%C%I$r@)8B$K4^$a$k$?$a$N?7$7$$L?Na$G$9!#(B
 
 @item
-@kbd{M-RET} $B$O0zMQJ8$r;_$a$k$?$a$N?7$7$$%a%C%;!<%8L?Na$G$9!#(B
+@kbd{M-RET} $B$O!"0zMQJ8$NESCf$K3d$C$FF~$k$?$a$N?7$7$$%a%C%;!<%8L?Na$G$9!#(B
 
 @item
-@samp{\\1} $BI=8=$,(B @code{nnmail-split-methods} $B$GM-8z$K$J$j$^$7$?!#(B
+@samp{\\1} $B$N$h$&$JI=8=$,(B @code{nnmail-split-methods} $B$GM-8z$K$J$j$^$7$?!#(B
 
 @item
 $B4X?t(B @code{custom-face-lookup} $B$,$5$J$1$l$P$J$j$^$;$s!#(B
 
 @item
-$BEj9FC$7$O8=:_$NA*BrJ}K!$r;H$&$h$&$K$J$j$^$7$?!#%7%s%\%k@\F,(B
-$B<-(B @kbd{a} $B$OIaDL$NEj9FJ}K!$r6/@)$7$^$9!#(B
+$BEj9F$N%-%c%s%;%k$K!"8=:_$NA*BrJ}K!$r;H$&$h$&$K$J$j$^$7$?!#%7%s%\%k@\F,0z(B
+$B?t(B @kbd{a} $B$G!"IaDL$NEj9FJ}K!$r6/@)$9$k$3$H$,$G$-$^$9!#(B
 
 @item
-M******** sm*rtq**t*s $B$rE,@Z$JJ8>O$KK]0F$9$k?7$7$$L?Na$,$"$j$^$9(B---
-@kbd{W d}$B!#(B
+$B%^"#"#"#%="#"#(B sm*rtq**t*s $B$rE,@Z$J%F%-%9%H$KK]0F$9$k?7$7$$L?Na$,$"$j$^(B
+$B$9(B---@kbd{W d}$B!#(B
 
 @item
-@code{nntp} $B$N$h$j4JC1$J%G%P%C%0$N$?$a$K!"(B
-@code{nntp-record-commands} $B$r(B @code{nil} $B$G$J$$CM$K@_Dj$9$k;v$,$G$-$^$9!#(B
+@code{nntp} $B$N%G%P%C%0$r3Z$K$9$k$?$a$K!"(B
+@code{nntp-record-commands} $B$r(B @code{nil} $B$G$O$J$$CM$K@_Dj$9$k$3$H$,$G$-(B
+$B$^$9!#(B
 
 @item
-@code{nntp} $B$O(B @file{~/.authinfo} $B$r;H$&$h$&$K$J$j!"$3$l(B
-$B$O(B @file{.netrc} $B$N$h$&$J%U%!%$%k$G!"$I$3$G$I$N$h$&(B
-$B$K(B @sc{authinfo} $B$r(B @acronym{NNTP} $B%5!<%P!<$KAw$k$+$r@)8f$9$k$?$a$N$b$N(B
-$B$G$9!#(B
+@code{nntp} $B$O(B @file{~/.authinfo} $B$r;H$&$h$&$K$J$j$^$7$?!#$3$l(B
+$B$O(B @file{.netrc} $B$N$h$&$J%U%!%$%k$G!"$I$3$N(B @acronym{NNTP} $B%5!<%P!<$K$O(B
+$B$I$N$h$&$K(B @sc{authinfo} $B$rAw$k$+$r@)8f$9$k$?$a$N$b$N$G$9!#(B
 
 @item
-$B35N,%P%C%U%!$N%0%k!<%W%Q%i%a!<%?$rJT=8$9$k$?$a$NL?Na$,2C$($i$l$^$7$?!#(B
+$B35N,%P%C%U%!!<$N%0%k!<%W%Q%i%a!<%?!<$rJT=8$9$k$?$a$NL?Na$,2C$($i$l$^$7$?!#(B
 
 @item
-$B%a!<%k$,$I$3$KJ,3d$5$l$?$+$NMzNr$r;HMQ2DG=$K$J$j$^$7$?!#(B
+$B%a!<%k$,$I$3$KJ,3d$5$l$?$+$NMzNr$rMxMQ$G$-$k$h$&$K$J$j$^$7$?!#(B
 
 @item
-$B?7$7$$5-;vF|IUL?Na$,2C$($i$l$^$7$?(B---@code{article-date-iso8601}$B!#(B
+$B5-;v$NF|IU$rI=<($9$k$?$a$N?7$7$$L?Na$,2C$($i$l$^$7(B
+$B$?(B---@code{article-date-iso8601}$B!#(B
 
 @item
-@code{gnus-score-thread-simplify} $B$r@_Dj$9$k;v$K$h$j%9%l%C%I$r:n@.$7$F$$(B
-$B$k$H$-$OI=Bj$,C1=c2=$5$l$k$h$&$K$J$j$^$7$?!#(B
+@code{gnus-score-thread-simplify} $B$r@_Dj$9$k$3$H$K$h$C$F!"%9%l%C%I$r:n@.(B
+$B$9$k$H$-$NI=Bj$rC1=c2=$G$-$k$h$&$K$J$j$^$7$?!#(B
 
 @item
 $B%a%C%;!<%8$G0zMQ$r$9$k$?$a$N?7$7$$4X?t$,2C$($i$l$^$7$?(B---
@@ -25010,22 +25951,23 @@ M******** sm*rtq**t*s $B$rE,@Z$JJ8>O$KK]0F$9$k?7$7$$L?Na$,$"$j$^$9(B---
 @code{article-strip-all-blank-lines}---$B?7$7$$5-;vL?Na$G$9!#(B
 
 @item
-$B5-;v$N=*$o$j$^$G$r@Z$k?7$7$$%a%C%;!<%8L?Na$,2C$($i$l$^$7$?!#(B
+$B5-;v$N=*$o$j$^$G$r@Z$j.8BE,1~%9%3%"$r(B
-$B;XDj$9$k;v$,$G$-$^$9!#(B
+$BJQ?t(B @code{gnus-adaptive-word-minimum} $B$r;H$&$3$H$K$h$C$F!":G>.8BEY$NE,(B
+$B1~%9%3%"$r;XDj$9$k$3$H$,$G$-$^$9!#(B
 
 @item
-$BL?Na(B @code{gnus-start-date-timer} $B$K$h$j(B ``$B2a<:F|IU(B'' $B5-;v%X%C%@!<$,7QB3(B
-$BE*$K99?7$5$l$k$h$&$K$J$j$^$7$?!#(B
+@code{gnus-start-date-timer} $BL?Na$K$h$C$F!V5-;v$,Ej9F$5$l$?$H$-$+$i$N7P(B
+$B2a;~4V!W%X%C%@!<$,7QB3E*$K99?7$5$l$k$h$&$K$J$j$^$7$?!#(B
 
 @item
-$B%&%'%V(B listserv $B%"!<%+%$%V$,(B @code{nnlistserv} $B%P%C%/%(%s%I$K$h$jFI$`;v(B
-$B$,$G$-$k$h$&$K$J$j$^$7$?!#(B
+$B%&%'%V$GDs6!$5$l$F$$$k%a!<%j%s%0%j%9%H$N%"!<%+%$%V$r!"(B
+@code{nnlistserv} $B%P%C%/%(%s%I$K$h$C$FFI$`$3$H$,$G$-$k$h$&$K$J$j$^$7$?!#(B
 
 @item
-$B8E$$(B dejanews $B%"!<%+%$%V$,(B @code{nnweb} $B$+$iFI$`;v$,$G$-$k$h$&$K$J$j$^$7(B
+$B8E$$(B dejanews $B%"!<%+%$%V$r(B @code{nnweb} $B$GFI$`$3$H$,$G$-$k$h$&$K$J$j$^$7(B
 $B$?!#(B
 @end itemize
 
@@ -25035,13 +25977,11 @@ M******** sm*rtq**t*s $B$rE,@Z$JJ8>O$KK]0F$9$k?7$7$$L?Na$,$"$j$^$9(B---
 Gnus 5.8 $B$N?7$7$$5!G=(B:
 
 @itemize @bullet
-
 @item
 $B%a!<%k$r\:Y$K$D$$$F$O%^%K%e%"%k$r(B
-$B8+$F2<$5$$!#FC$K!"(Bprocmail $B$Gl=j$r7hDj$9$k$?$a$N4X?t(B
+$B$G$"$C$F$b$h$/$J$j$^$7$?!#(B
 
 @item
-Summary $B%P%C%U%!$H(B @acronym{NOV} $B%U%!%$%k$K4^$a$kDI2C$N%X%C%@!<$r!"%f!<(B
-$B%6$,7h$a$k$3$H$,$G$-$k$h$&$K$J$j$^$7$?!#(B
+$B35N,%P%C%U%!!<$H(B @acronym{NOV} $B%U%!%$%k$K4^$a$kDI2C$N%X%C%@!<$r!"MxMQ$5$l$^$7$?!#8=:_$OHyL/$K0c$&$d$jJ}$GF0:n(B
+$B$7$^$9!#(B
 
 @item
 $B?7$7$$%&%'%V$K4p$E$$$?%P%C%/%(%s%I$,DI2C$5$l$^$7$?!#(B@code{nnslashdot},
-@code{nnwarchive} $B$*$h$S(B @code{nnultimate} $B$G$9!#(Bnnweb $B$O:F$S2~:n$5$l!"(B
-$B>o$KJQ2=$9$k9=@.$rB3$1$^$9!#(B
+@code{nnwarchive} $B$*$h$S(B @code{nnultimate} $B$G$9!#(Bnnweb $B$O>o$KJQ2=$9$k9=(B
+$B@.$r$H$jB3$1$k$?$a$K!":F$S:n$jD>$5$l$^$7$?!#(B
 
 @item
-Gnus $B$O(B @code{nnimap} $B$K$h$C$F(B @acronym{IMAP} $B%a!<%k$rFI$`$3$H$,$G$-$^$9!#(B
+Gnus $B$O(B @code{nnimap} $B$K$h$C$F(B @acronym{IMAP} $B$N%a!<%k$rFI$`$3$H$,$G$-$^(B
+$B$9!#(B
 @end itemize
 
 @node Oort Gnus
@@ -25107,9 +26050,8 @@ T-gnus $B$O(B @acronym{SEMI} $B$d(B @acronym{FLIM} $B$KMj$C$F$$$^$9!#$7$?$,
 $B$5$$!#(B
 
 @itemize @bullet
-
 @item
-$BNN0h$,3h@-2=$5$l$F$$$k>l9g!"(B
+$BNN0h$,3h@-2=$5$l$F$$$k>l9g$K!"(B
 @kbd{F} $B%-!<(B (@code{gnus-article-followup-with-original}) $B$*$h(B
 $B$S(B @kbd{R} $B%-!<(B (@code{gnus-article-reply-with-original}) $B$O!"$=$NNN0h$K(B
 $B$"$k%F%-%9%H$@$1$r(B yank $B$7$^$9!#(B
@@ -25135,34 +26077,36 @@ Oort ($B$3$N%j%j!<%9$K@hN)$D0BDj$G$O$J$$(B Gnus $B$N;^(B) $B$r;H$C$F$_$?$b$
 $BDjHG$KLa$7$F$7$^$C$?$J$i$P!"$3$NHG$K%0%l!<%I%"%C%W$9$k$H$-$KCm0U$7$F2<$5(B
 $B$$!#FC$K!"$*$=$i$/$9$Y$F(B
 $B$N(B @file{.marks} (nnml) $B$H(B @file{.mrk} (nnfolder) $B%U%!%$%k$r>C5n$9$kI,MW(B
-$B$,$"$k$G$7$g$&!#$3$NHG(B ($B$N(B Gnus) $B$,%U%i%0$r3JG<$9(B
+$B$,$"$k$G$7$g$&!#$=$NL\E*$O!"$3$NHG(B ($B$N(B Gnus) $B$,%U%i%0$r3JG<$9(B
 $B$k(B @file{.marks}/@file{.mrk} $B%U%!%$%k$G$O$J$/$F(B @file{.newsrc.eld} $B$+$i(B
-$B%U%i%0$,FI$^$l$k$h$&$K$J$C$F$$$?$+$i$G$9!#8e=R$N9`L\$G!"0u(B (marks) $B$K4X(B
+$B%U%i%0$,FI$^$l$k$h$&$K$9$k$?$a$G$9(B ($BLuCm(B: $B8@$$49$($k$H!"8E$$MM<0(B
+$B$N(B @file{.marks}/@file{.mrk} $B%U%!%$%k$r?7$7$$(B Gnus $B$,FI$s$G$O$$$1$J$$$H(B
+$B$$$&$3$H$G$9!#$=$l$i$O?7$?$K:n@.$5$l$^$9(B)$B!#8e=R$N9`L\$G!"0u(B (marks) $B$K4X(B
 $B$9$k$h$jB?$/$N>pJs$rFI$s$G2<$5$$!#%0%l!<%I$r2<$2$F$b0lHL$K$O=u$1$K$J$i$J(B
 $B$$$3$H$KCm0U$7$F2<$5$$!#(B
 
 @item
-$B5-;v$N%\%?%s(B
+$B5-;v$N%\%?%s!#(B
 
 URL$B!"%a!<%k%"%I%l%9!"(BMessage-ID$B!"(BInfo $B$X$N%j%s%/!"(Bman $B%Z!<%8$H(B Emacs $B$^(B
-$B$?$O(B Gnus $B$K4XO"$7$?;29MJ88%$N$?$a$N!"$h$jB?$/$N%\%?%s!#(B@xref{Article
-Buttons}. $B$9$Y$F$N5-;v$N%\%?%s$N8+1I$($r@)8f$9$k$?$a(B
+$B$?$O(B Gnus $B$K4XO"$7$?;29MJ88%$N$?$a$N!"$h$jB?$/$N%\%?%s$,DI2C$5$l$^$7$?!#(B
+@xref{Article Buttons}. $B$9$Y$F$N5-;v$N%\%?%s$N8+1I$($r@)8f$9$k$?$a(B
 $B$K(B @code{gnus-button-@var{*}-level} $BJQ?t$r;H$&$3$H$,$G$-$^$9!#(B
 @xref{Article Button Levels}.
 
 @item
-Dired $B$NE}9g(B
+Dired $B$NE}9g!#(B
 
-@code{gnus-dired-minor-mode} (@ref{Other modes} $B;2>H(B) $B$O!"(Bdired $B$N%P%C%U%!(B
-$B$G%-!<@_Dj(B -- $BE:IU%U%!%$%k$NAw?.!"(Bmailcap $B$NE,@Z$J9`L\$r;H$C$F%U%!%$%k$r(B
-$B3+$/!"$=$l$K(B mailcap $B$N9`L\$r;H$C$F%U%!%$%k$r0u:~$9$k(B -- $B$r9T$J$$$^$9!#(B
+@code{gnus-dired-minor-mode} (@ref{Other modes} $B;2>H(B) $B$O(B dired $B$N%P%C%U%!!<(B
+$B$G!"E:IU%U%!%$%k$rAw?.$9$k!"(Bmailcap $B$NE,@Z$J9`L\$r;H$C$F%U%!%$%k$r3+$/!"(B
+$B$=$l$K(B mailcap $B$N9`L\$r;H$C$F%U%!%$%k$r0u:~$9$k$?$a$N%-!<$r3d$jEv$F$^$9!#(B
 
 @item
 Gnus $B$O(B RSS $B$N%K%e!<%9G[Aw$r!"%K%e!<%9%0%k!<%W$H$7$FI=<($7$^$9!#(B
 @xref{RSS}.
 
 @item
-$BC10l$N(B yenc $B$G%(%s%3!<%I$5$l$?E:IU%Q!<%H$,%G%3!<%I$G$-$^$9!#(B
+$BC10l$N(B yenc $B$G%(%s%3!<%I$5$l$?E:IU%Q!<%H$r%G%3!<%I$9$k$3$H$,$G$-$^$9!#(B
 
 @item
 Picons
@@ -25170,8 +26114,8 @@ Picons
 Picon $B$N%3!<%I$,!"(BGNU Emacs $B$GF0:n$5$;$k$?$a$K:F$5$l$F$$$^$9!#(B
 
-Picon $B$O!"%f!<%6!O$H%3%s%H%m!<%k%a%C%;!<%8$NO$H%3%s%H%m!<%k%a%C%;!<%8$NO$rO$r%X%C%@!<(B (X-PGP-Sig) $B$r!"(B@kbd{W p} $B$GG'>Z$9$k$3$H$,$G$-$^$9!#(B
+$B=pL>$5$l$?5-;v$N%X%C%@!<(B (X-PGP-Sig) $B$r!"(B@kbd{W p} $B$GG'>Z$9$k$3$H$,$G$-(B
+$B$^$9!#(B
 
 @item
-$B35N,%P%C%U%!$O(B fringe $B$NCf$NLp0u$G8=:_$N5-;v$r<($7$^$9!#$3$l$rL58z$K$9$k(B
-$B$K$O(B @code{(setq gnus-summary-display-arrow nil)} $B$r;H$C$F2<$5$$!#(B
+$B35N,%P%C%U%!!<$O(B fringe $B$NCf$NLp0u$G8=:_$N5-;v$r<($7$^$9!#$3$l$rL58z$K$9(B
+$B$k$K$O(B @code{(setq gnus-summary-display-arrow nil)} $B$r;H$C$F2<$5$$!#(B
 
 @item
-$B%K%e!<%9$K%a!<%k$GJV?.$7$h$&$H$7$?$i7Y9p(B
+$B%K%e!<%9$K%a!<%k$GJV?.$7$h$&$H$7$?$i7Y9p$7$^$9!#(B
 
 $B4V0c$C$F%K%e!<%9$K%a!<%k$GJV?.$7$h$&$H$7$F$7$^$&$3$H$,!"$7$g$C$A$e$&$"$j(B
 $B$^$;$s$+(B?  $B$=$s$J$"$J$?$K?7%*%W%7%g(B
@@ -25216,7 +26161,7 @@ Message $B%P%C%U%!$K$*$1$k(B @kbd{C-c C-j} $B$G!"%a%C%;!<%8$NAw?.$rCY$i$;$k$3
 
 @item
 $B?7$7$$%*%W%7%g%s(B @code{gnus-summary-display-while-building} $B$r(B
-$BHs(B-@code{nil} $B$K$9$k$H!"35N,%P%C%U%!$,:n$i$l$F$$$/MM;R$,I=<($5$l$^$9!#(B
+$BHs(B-@code{nil} $B$K$9$k$H!"35N,%P%C%U%!!<$,:n$i$l$F$$$/MM;R$,I=<($5$l$^$9!#(B
 
 @item
 $B?7$7$$(B @code{recent} $B0u(B @samp{.} $B$G!"?75,$KFO$$$?%a%C%;!<%8$r(B ($BL$FI$@$1(B
@@ -25241,27 +26186,27 @@ List}.
 
 @item
 Sendmail $B$r;H$&$H$-$N%(%s%Y%m!<%WAw?.$N%5%]!<%H(B
+$BHs(B-@acronym{ASCII} $B%I%a%$%sL>$N%5%]!<%H!#(B
 
 Message $B$O(B From:, To: $B$*$h$S(B Cc: $B$K$"$kHs(B-@acronym{ASCII} $B%I%a%$%sL>$r%5(B
-$B%]!<%H$7!"%a%C%;!<%8$NAw?.$r;n$_$k$H$-$K%(%s%3!<%I$9$k$+$I$&$+$r?R$M$^$9!#(B
-@code{message-use-idna} $BJQ?t$G$3$l$r@)8f$7$^$9!#(BGnus $B$b$^$?!"%a%C%;!<%8(B
-$B$r8+$k$H$-$K(B From:, To: $B$*$h$S(B Cc: $B$K$"$kHs(B-@acronym{ASCII} $B%I%a%$%sL>$r(B
-$B%G%3!<%I$7$^$9!#$3$l$r@)8f$9$k$N$O(B @code{gnus-use-idna} $BJQ?t$G$9!#(B
+$B%]!<%H$7!"%a%C%;!<%8$NAw?.$r$7$h$&$H$7$?$H$-$K%(%s%3!<%I$9$k$+$I$&$+$r?R(B
+$B$M$^$9!#(B@code{message-use-idna} $BJQ?t$G$3$l$r@)8f$7$^$9!#(BGnus $B$b$^$?!"%a%C(B
+$B%;!<%8$r8+$k$H$-$K(B From:, To: $B$*$h$S(B Cc: $B$K$"$kHs(B-@acronym{ASCII} $B%I%a%$(B
+$B%sL>$r%G%3!<%I$7$^$9!#$3$l$r@)8f$9$k$N$O(B @code{gnus-use-idna} $BJQ?t$G$9!#(B
 
 @item
-$B%^%$%/%m%=%U%H0zMQMM<0$N$h$jNI$$/$7$@$1$"$k?75,$JFbMF$KB3$$$F(B
+$B$F$C$Z$s$K>/$7$@$1$"$k?75,$JFbMF$K!"D9$/$F4"$j9~$^$l$F$$$J$$0zMQ$,B3$$$F(B
 $B$$$k$?$/$5$s$N5-;v$rFI$`>l9g$K!"$3$l$OFC$KLr$KN)$A$^$9!#(B
 
 @item
-$B%]%$%s%H$N0LCV7h$a$N$?$a$N%U%)!<%^%C%H$N;EMM(B (format spec) $B$G$"(B
-$B$k(B @code{%C} $B$O!"(B@code{%*} $B$KJQ99$5$l$^$7$?!#(B
+$B%]%$%s%H$N0LCV7h$a$N$?$a$N=qK!;EMM(B (format spec) $B$G$"$k(B @code{%C} $B$O!"(B
+@code{%*} $B$KJQ99$5$l$^$7$?!#(B
 
 @item
-$B?7$7$$JQ?t(B @code{gnus-parameters} $B$,!"%0%k!<%W%Q%i%a!<%?$r@_Dj$9$k$?$a$K(B
-$B;H$&$3$H$,$G$-$^$9!#(B
+$B?7$7$$JQ?t(B @code{gnus-parameters} $B$r!"%0%k!<%W%Q%i%a!<%?!<$r@_Dj$9$k$?$a(B
+$B$K;H$&$3$H$,$G$-$^$9!#(B
 
-$B$3$l$O=i4|$K$O!"%Q%i%a!<%?$r(B @file{~/.newsrc.eld} $B$K3JG<$9$k(B @kbd{G p}
+$B$3$l$O=i4|$K$O!"%Q%i%a!<%?!<$r(B @file{~/.newsrc.eld} $B$K3JG<$9$k(B @kbd{G p}
 ($B$^$?$O(B @kbd{G c}) $B$G$7$+9T$J$&$3$H$,$G$-$^$;$s$G$7$?$,!"$3$NJQ?t$K$h$C(B
 $B$F%+%9%?%^%$%:$N0RNO$r4.G=$9$k$3$H$,$G$-$^$9!#$^$?!"$=$NJQ?t(B
-$B$O(B @file{~/.newsrc.eld} $B$G$O$J$/$F(B @file{~/.emacs} $B$G@_Dj$9$k$N$G!"%P%C(B
+$B$O(B @file{~/.newsrc.eld} $B$G$O$J$/$F(B @file{~/.gnus.el} $B$G@_Dj$9$k$N$G!"%P%C(B
 $B%/%"%C%W$,4JC1$K$J$j$^$9!#$=$NJQ?t$O!"%0%k!<%WL>$K9gCW$9$k@55,I=8=$r!"0J(B
-$B2<$N$h$&$JN.57$G%0%k!<%W%Q%i%a!<%?$K3d$jEv$F$^$9(B:
+$B2<$N$h$&$JN.57$G%0%k!<%W%Q%i%a!<%?!<$K3d$jEv$F$^$9(B:
 @lisp
 (setq gnus-parameters
       '(("mail\\..*"
@@ -25335,18 +26280,18 @@ Message $B$O(B From:, To: $B$*$h$S(B Cc: $B$K$"$kHs(B-@acronym{ASCII} $B%
 $B$&$K$J$j$^$7$?!#(B
 
 $B$3$l$rF/$+$J$$$h$&$K$9$k$K$O!"(B@code{(setq gnus-treat-display-smileys
-nil)} $B$r(B @file{~/.emacs} $B$KCV$$$F2<$5$$!#(B
+nil)} $B$r(B @file{~/.gnus.el} $B$KCV$$$F2<$5$$!#(B
 
 @item
 Gnus $B$O:#$G$O(B Sender: $B%X%C%@!<$r<+F0$G$O@8@.$7$^$;$s!#(B
 
-$B=i4|$N$3$m!"$=$l$O%f!<%6!<$,@_Dj$G$-$k(B email $B%"%I%l%9$,!"(BGnus $B$,A[Dj$7$?(B
-$B%f!<%6!<$N%G%#%U%)%k%H$N%"%I%l%9$H0c$C$F$$$?>l9g$K@8@.$5$l$^$7$?!#:#F|$G(B
-$B$O$=$NA[Dj%"%k%4%j%:%`$,@5$7$$$3$H$O$^$l$G!"(BSender: $B%X%C%@!<$NM#0l$N(B ($B5D(B
-$BO@$NE*$K$J$k(B) $BMQES$O!"%K%e!<%9$r(B cancel/supersede $B$9$k;q3J$,$"$k$+$I$&$+(B
-$B$r8!::$9$k$3$H(B ($B$3$l$OBe$o$j$K!"B>$N9`$G=R$Y$i$l$k(B Cancel Locks $B$K$h$C$F(B
-$B2r7h$5$l$?(B) $B$J$N$G!"$=$N%X%C%@!<$N@8@.$O%G%#%U%)%k%H$GM^@)$5$l$F$$$^$9!#(B
-$BJQ?t(B @code{message-required-headers}$B!"(B
+$B=i4|$N$3$m!"$=$l$OMxMQl9g$K8B$C$F@8@.$5$l$^$7$?!#:#F|(B
+$B$G$O$=$NA[Dj%"%k%4%j%:%`$,@5$7$$$3$H$O$^$l$G!"(BSender: $B%X%C%@!<$NM#0l(B
+$B$N(B ($B5DO@$NE*$K$J$k(B) $BMQES$O!"%K%e!<%9$r(B cancel/supersede $B$9$k;q3J$,$"$k$+(B
+$B$I$&$+$r8!::$9$k$3$H(B ($B$3$l$OBe$o$j$K!"B>$N>O$G=R$Y$i$l$k(B Cancel Locks $B$K(B
+$B$h$C$F2r7h$5$l$^$7$?(B) $B$J$N$G!"$=$N%X%C%@!<$N@8@.$O%G%#%U%)%k%H$GM^@)$5$l(B
+$B$F$$$^$9!#JQ?t(B @code{message-required-headers}$B!"(B
 @code{message-required-news-headers} $B$*$h(B
 $B$S(B @code{message-required-mail-headers} $B$r;2>H$7$F2<$5$$!#(B
 
@@ -25354,9 +26299,8 @@ Gnus $B$O:#$G$O(B Sender: $B%X%C%@!<$r<+F0$G$O@8@.$7$^$;$s!#(B
 $B%5!<%I%Q!<%F%#!<$K$h$k(B @file{message-utils.el} $B$N5!G=(B
 $B$,(B @file{message.el} $B$K2C$($i$l$^$7$?!#(B
 
-Message $B$OI=Bj(B (subject) $B$N9T$+$i(B @samp{(was: )} $B$r:o=|$9$k(B
-$B$+$I$&$+$r?R$M$k$h$&$K$J$j$^$7(B
-$B$?(B (@code{message-subject-trailing-was-query} $B;2>H(B)$B!#(B
+Message $B$OI=Bj$N9T$+$i(B @samp{(was: )} $B$r:o=|$9$k$+$I$&$+$r(B
+$B?R$M$k$h$&$K$J$j$^$7$?(B (@code{message-subject-trailing-was-query} $B;2>H(B)$B!#(B
 @kbd{C-c M-m} $B$H(B @kbd{C-c M-f} $B$OA^F~$5$l$?%F%-%9%H$r<($90u$rA^F~$7$^$9!#(B
 @kbd{C-c C-f a} $B$O(B X-No-Archive: $B%X%C%@!<$rIU$12C$($^$9!#(B@kbd{C-c C-f
 x} $B$O!"E,@Z$J%X%C%@!<$H!"%/%m%9%]%9%H$H%U%)%m!<@h$K$D$$$F$NCm0U=q$-$rK\(B
@@ -25364,8 +26308,8 @@ x} $B$O!"E,@Z$J%X%C%@!<$H!"%/%m%9%]%9%H$H%U%)%m!<@h$K$D$$$F$NCm0U=q$-$rK\(B
 
 @item
 $B:#$d(B @code{message-generate-headers-first} $B$,(B @code{nil} $B$@$C$?$i!"%a%C(B
-$B%;!<%8$N:n@.$r;O$a$k$H$-$K(B References $B$H(B X-Draft-Headers $B$O@8@.$5$l$^$;(B
-$B$s!#(B
+$B%;!<%8$N:n@.$r;O$a$k$H$-$K(B References $B$H(B X-Draft-From $B%X%C%@!<$O@8@.$5$l(B
+$B$^$;$s!#(B
 
 @item
 $B2~NI$5$l$?(B spam $BBP935!G=!#(B
@@ -25373,7 +26317,7 @@ x} $B$O!"E,@Z$J%X%C%@!<$H!"%/%m%9%]%9%H$H%U%)%m!<@h$K$D$$$F$NCm0U=q$-$rK\(B
 Gnus $B$OHs>o$KJQ2=$KIY$s$@%W%m%0%i%`$H_I2a$N5,B'$r;H$C$F!"%a!<%k$d%K%e!<(B
 $B%9$NK[N.$+$i(B spam $B$rH4$-(B
 $B8e$K8F$P$l$k(B) $B$+$i(B @code{nnimap-fixup-unread-after-getting-new-news} $B$r(B
-$B8F$V$3$H$K$h$C$F@.$7?k$2$i$l$^$9!#$3$l$i$NJQ?t$r%G%#%U%)%k%H$+$iJQ$($F$$(B
-$B$k>l9g$O!":F$S(B @code{nnimap-fixup-unread-after-getting-new-news} $B$rDI2C(B
-$B$9$kI,MW$,$"$k$+$b$7$l$^$;$s!#8+@Q$j$KK~B-$7$F$$$F!"?7$7$$%a!<%k$r.8BEY$N(B) $B;~4V$r@aLs$7$?$$$N$G$"$l$P!"$=$N4X?t$r30$7(B
-$B$F2<$5$$!#(B
+$B8F$V$3$H$K$h$C$F@.$7?k$2$i$l$^$9!#$3$l$i$NJQ?t$r%G%#%U%)%k%H$G$O$J$$CM$K(B
+$BJQ$($F$$$k>l9g$O!"=E$M(B
+$B$F(B @code{nnimap-fixup-unread-after-getting-new-news} $B$rDI2C$9$kI,MW$,$"(B
+$B$k$+$b$7$l$^$;$s!#8+@Q$j$KK~B-$7$F$$$F!"?7$7$$%a!<%k$r$NJQ$JJ8;z$r4^$`%0%k!<%W$r07$($k$h$&$K$9$k$?$a$K!"%0%k!<%W(B
 $B$O(B Gcc: header $B$KCV$+$l$kA0$K0zMQId$G0O$^$l$^$9!#$3$l$O!"6uGr$r4^$`%0%k!<(B
 $B%W$,;H$($k$h$&$K$9$k$?$a$K!"$b$O$d(B @code{gnus-message-archive-group} $B$N(B
 $B$h$&$JJQ?t$K0zMQJ8;z$r4^$a$k$Y$-$G$O$J$$$3$H$r0UL#$7$^$9!#$5$i$K!"J8;z(B
 $BNs(B @samp{nnml:foo, nnml:bar} ($BFs$D$N%0%k!<%W$K(B Gcc $B$r3JG<$9$k$3$H$r<((B
-$B$9(B) $B$r;H$C$F$$$k$J$i$P!"%j%9%H(B @code{("nnml:foo" "nnml:bar")} $B$rJV$9$h$&(B
-$B$KJQ99$7$J$1$l$P$J$j$^$;$s!#$5$b$J$$$H!"(BGcc: $B9T$O4V0c$C$?0O$^$lJ}$r$5$l(B
-$B$F$7$^$&$G$7$g$&!#=i4|$N$3$m$KJ8;zNs(B @samp{nnml:foo, nnml:bar} $B$rJV$9$h(B
-$B$&$K$7$?$3$H$,4V0c$$$@$C$?$3$H$KCeL\$7$F2<$5$$!#$=$l$OD>@\A^F~$5$l$?$N$G!"(B
-$B$^$C$?$/LdBj$r@8$8$^$;$s$G$7$?!#(B
+$B$9(B) $B$r;H$C$F$$$k$J$i$P!"(B@code{("nnml:foo" "nnml:bar")} $B$H$$$&%j%9%H$rJV(B
+$B$9$h$&$KJQ99$7$J$1$l$P$J$j$^$;$s!#$5$b$J$$$H!"(BGcc: $B9T$O4V0c$C$?0O$^$lJ}(B
+$B$r$5$l$F$7$^$&$G$7$g$&!#=i4|$N$3$m$KJ8;zNs(B @samp{nnml:foo, nnml:bar} $B$r(B
+$BJV$9$h$&$K$7$?$3$H$,4V0c$$$@$C$?$3$H$KCeL\$7$F2<$5$$!#$=$l$OD>@\A^F~$5$l(B
+$B$?$N$G!"$^$C$?$/LdBj$r@8$8$^$;$s$G$7$?!#(B
 
 @item
 @file{~/News/overview/} $B$OITMW!#(B
 
-$B0J2<$NJQ99$N7k2L!":#8e$O(B @file{~/News/overview/} $B%G%#%l%/%H%j$OMW$j$^$;(B
-$B$s!#$9$Y$F$N3,AX$r0BA4$K:o=|$9$k$3$H$,$G$-$^$9!#(B
+$B0J2<$NJQ99$N7k2L!"$b$O$d(B @file{~/News/overview/} $B%G%#%l%/%H%j!<$OMW$j$^(B
+$B$;$s!#$9$Y$F$N3,AX$r0BA4$K:o=|$9$k$3$H$,$G$-$^$9!#(B
 
 @item
 @code{gnus-agent}
 
-Gnus $B%(!<%8%'%s%H$OBg5,LO$J99?7$r7P$F!":#$d%G%#%U%)%k%H$G3h@-2=$5$l$^$9!#(B
+Gnus $B%(!<%8%'%s%H$OBg5,LO$J99?7$r7P$F!":#$d%G%#%U%)%k%H$GM-8z$K$J$j$^$9!#(B
 $B$=$7(B
 $B$F(B @code{gnus-select-method} $B$H(B @code{gnus-secondary-select-method} $B$G;X(B
 $BDj$5$l$k$9$Y$F$N(B nntp $B$H(B nnimap $B$N%5!<%P!<$,!"%G%#%U%)%k%H$G%(!<%8%'%s%H(B
 $B2=$5$l$^$9!#=i4|$K$*$$$F$O(B @code{gnus-select-method} $B$N%5!<%P!<$@$1$,%G%#(B
-$B%U%)%k%H$G%(!<%8%'%s%H2=$5$l!"%(!<%8%'%s%H$O%G%#%U%)%k%H$GIT3h@-2=$5$l$F(B
-$B$$$^$7$?!#%(!<%8%'%s%H$,3h@-2=$5$l$k$H!"2DG=$J$i$P%P%C%/%(%s%I$KBe$o$C$F(B
-$B%(!<%8%'%s%H$N%-%c%C%7%e$+$i%X%C%@!<$,uBV$G$N$_9T$J$o$l$F$$$^$7$?!#%5!<%P!<%P%C%U%!(B
-$B$G(B @kbd{J a} $B$H(B @kbd{J r} $B$r;H$&$3$H$K$h$C$F!"%5!<%P!<$NEPO?$H:o=|$r9T$J(B
-$B$&$3$H$,$G$-$^$9!#%0%k!<%W%P%C%U%!$+$i(B @kbd{J u} $B$+(B @kbd{J s} $B$r;H$C$FL?(B
-$BNa$7$J$$8B$j!"(BGnus $B$O5-;v$r%(!<%8%'%s%H$N%-%c%C%7%e$K%@%&%s%m!<%I$7$^$;(B
-$B$s!#(B@code{(setq gnus-agent nil)} $B$G$b$C$F!"%(!<%8%'%s%H$,IT3h@-2=$5$l$F(B
-$B$$$?@N$N?6$kIq$$$KLa$9$3$H$,$G$-$^$9!#:#8e(B
-$B$O(B @file{~/.gnus.el} $B$K(B @code{(gnus-agentize)} $B$rCV$$$F$*$/I,MW$,L5$$$3(B
+$B%U%)%k%H$G%(!<%8%'%s%H2=$5$l!"%(!<%8%'%s%H$O%G%#%U%)%k%H$G$OM-8z$K$5$l$^(B
+$B$;$s$G$7$?!#%(!<%8%'%s%H$,M-8z$K$5$l$k$H!":#$G$O2DG=$J$i$P%P%C%/%(%s%I$K(B
+$BBe$o$C$F%(!<%8%'%s%H$N%-%c%C%7%e$+$i%X%C%@!<$,uBV$G$N$_9T$J$o$l$F$$$^$7$?!#%5!<%P!<%P%C(B
+$B%U%!!<$G(B @kbd{J a} $B$H(B @kbd{J r} $B$r;H$&$3$H$K$h$C$F!"%5!<%P!<$NEPO?$H:o=|(B
+$B$r9T$J$&$3$H$,$G$-$^$9!#%0%k!<%W%P%C%U%!!<$+$i(B @kbd{J u} $B$+(B @kbd{J s} $B$r(B
+$B;H$C$FL?Na$7$J$$8B$j!"(BGnus $B$O5-;v$r%(!<%8%'%s%H$N%-%c%C%7%e$K%@%&%s%m!<(B
+$B%I$7$^$;$s!#(B@code{(setq gnus-agent nil)} $B$r@_Dj$9$k$3$H$K$h$C$F!"%(!<%8%'(B
+$B%s%H$,M-8z$K$5$l$F$$$J$+$C$?@N$N?6$kIq$$$KLa$9$3$H$,$G$-$^$9!#$b$O(B
+$B$d(B @file{~/.gnus.el} $B$K(B @code{(gnus-agentize)} $B$rCV$$$F$*$/I,MW$,L5$$$3(B
 $B$H$KCm0U$7$F2<$5$$!#(B
 
 @item
@@ -25448,7 +26392,7 @@ Gnus $B%(!<%8%'%s%H$OBg5,LO$J99?7$r7P$F!":#$d%G%#%U%)%k%H$G3h@-2=$5$l$^$9!#(B
 
 $B%G%#%U%)%k%HCM$,(B @samp{%U%R%z%I%(%[%4L: %-23,23f%]%) %s\n} $B$KJQ$o$j$^$7(B
 $B$?!#$5$i$K!"A0$+(B @acronym{NNTP} $B%0%k!<%W$KEj9F$7$?%0%k!<%WL>$G(B
-$B%f!<%6L>$rCV$-49$($k$?$a$K!"(B@code{gnus-extra-headers}$B!"(B
+$BMxMQ$rCV$-49$($k$?$a$K!"(B@code{gnus-extra-headers}$B!"(B
 @code{nnmail-extra-headers} $B$*$h$S(B @code{gnus-ignored-from-addresses} $B$N(B
 $B%G%U%)%k%HCM$,JQ$o$j$^$7$?!#(B
 
@@ -25458,14 +26402,16 @@ Gnus $B%(!<%8%'%s%H$OBg5,LO$J99?7$r7P$F!":#$d%G%#%U%)%k%H$G3h@-2=$5$l$^$9!#(B
 $B$$$+$l$?(B Outlook (Express) $B$N5-;v$r=9$/$J$/$9$k$?$a$N!"(BRaymond Scholz
 @email{rscholz@@zonix.de} $B$K$h$C$F?7@_$5$l$?%U%!%$%k$G$9!#(B
 
+@c FIXME: `gnus-load' $B$K$D$$$F8@5Z$7$F$$$k(B README $B$,!"(BCVS $B$K$O4^$^$l$F$$(B
+@c $B$^$;$s!#;d$?$A$O$3$N9`L\$N$?$a$N$h$jNI$$>l=j$r8+$D$1$k$Y$-$G$9!#(B
 @item
 @code{(require 'gnus-load)}
 
 $BC1FH$GG[I[$5$l$F$$$k(B Gnus $B$r;H$&>l9g$K$O!"(B
-@code{load-path} $B$K(B Gnus $B$N(B lisp $B%G%#%l%/%H%j$rDI2C$7$F$+$i!"(B
+@code{load-path} $B$K(B Gnus $B$N(B lisp $B%G%#%l%/%H%j!<$rDI2C$7$F$+$i!"(B
 @file{~/.emacs} $B$K(B @code{(require 'gnus-load)} $B$r2C$($k$N$,NI$$$G$9!#(B
 
-$B%U%!%$%k(B @file{gnus-load.el} $B$O!"$=$N$&$A$N$$$/$D$+$O(B Emacsen $B$NG[I[$KF~$C(B
+@file{gnus-load.el} $B%U%!%$%k$O!"$=$N$&$A$N$$$/$D$+$O(B Emacsen $B$NG[I[$KF~$C(B
 $B$F$$$J$$$+$b$7$l$J$$<+F0FI$_9~$_(B (autoload) $B%3%^%s%I!"4X?t$*$h$SJQ?t$r4^(B
 $B$s$G$$$^$9!#(B
 
@@ -25478,22 +26424,22 @@ Gnus $B%(!<%8%'%s%H$OBg5,LO$J99?7$r7P$F!":#$d%G%#%U%)%k%H$G3h@-2=$5$l$^$9!#(B
 @code{message-insinuate-rmail}
 
 @code{(message-insinuate-rmail)} $B$H(B @code{(setq mail-user-agent
-'gnus-user-agent)} $B$r(B @file{.emacs} $B$K2C$($k$3$H$G!"(B
+'gnus-user-agent)} $B$r(B @file{~/.emacs} $B$K2C$($k$3$H$K$h$C$F!"(B
 @code{message-mode} $B$G%a%C%;!<%8$N:n@.!"JV?.$*$h$SE>Aw$r9T$J$&$h$&(B
-$B$K(B Rmail $B$r@bF@$9$k$3$H$,$G$-$^$9!#$=$3$G$O(B @acronym{MML} $B$N0RNO$r4.G=$G(B
-$B$-$^$9!#(B
+$B$K(B Rmail $B$r@bF@$9$k$3$H$,$G$-$^$9!#$=$3$G$O(B @acronym{MML} $B$N0RNO$r4.G=$9(B
+$B$k$3$H$,$G$-$^$9!#(B
 
 @item
 @code{message-minibuffer-local-map}
 
-$B2<$N9T$G!"%a%C%;!<%8$r:FAw$9$k$H$-$K(B BBDB $B$,;H$($^$9(B:
+$B$3$N2<$N9T$O!"%a%C%;!<%8$r:FAw$9$k$H$-$K(B BBDB $B$r;H$($k$h$&$K$7$^$9(B:
 @lisp
 (define-key message-minibuffer-local-map [(tab)]
   'bbdb-complete-name)
 @end lisp
 
 @item
-$BE:IU%U%!%$%k(B (attachments) $B$N@Z$jN%$7(B (externalizing) $B$H>C5n!#(B
+$BE:IU%U%!%$%k$N@Z$jN%$7(B (externalizing) $B$H>C5n!#(B
 
 @code{gnus-gcc-externalize-attachments} $B$^$?(B
 $B$O(B @code{message-fcc-externalize-attachments} $B$,Hs(B-@code{nil} $B$K$J$C$F$$(B
@@ -25517,11 +26463,14 @@ Gnus $B%(!<%8%'%s%H$OBg5,LO$J99?7$r7P$F!":#$d%G%#%U%)%k%H$G3h@-2=$5$l$^$9!#(B
 @code{gnus-posting-styles}
 
 $B$3$N$h$&$J9gCW$NMM<0$,2C$o$j$^$7$?!#(B
+
 @lisp
 ((header "to" "larsi.*org")
  (Organization "Somewhere, Inc."))
 @end lisp
+
 $B2<5-$N$h$&$J8E$$MM<0$O;~BeCY$l$K$J$j$^$7$?$,!"$^$@l9g$K!"$b$7$+$9$k$H(B
-$B$=$l$iFs$D$N%X%C%@!<$r2C$($kI,MW$,$"$j$^$9!#(B
+$B$=$l$iFs$D$N%X%C%@!<$b2C$($kI,MW$,$"$j$^$9!#(B
 
 @item
-Gnus $B$O:9$79~$^$l$F$$$k(B (@dfn{plugged}) $B$H$-$K!"%(!<%8%'%s%H$+(B
-$B$i(B @acronym{NOV} $B$H5-;v$rFI$_9~$_$^$9!#(B
+Gnus $B$O(B plugged $B$N$H$-$K!"%(!<%8%'%s%H$K(B @acronym{NOV} $B$H5-;v$rFI$_9~$_(B
+$B$^$9!#(B
 
-$B:9$79~$^$l$F$$$k$H$-$K5-;v$rFI$`>l9g$K!"$=$N5-;v$,$9$G$K%(!<%8%'%s%H$K$"(B
-$B$k$J$i$P!"$b$&0lEY%@%&%s%m!<%I$9$k$3$H$O$"$j$^$;$s!#(B@code{(setq
+Plugged $B$N$H$-$K5-;v$rFI$`>l9g$K!"$=$N5-;v$,$9$G$K%(!<%8%'%s%H$K$"$k$J$i(B
+$B$P!"$b$&0lEY%@%&%s%m!<%I$9$k$3$H$O$"$j$^$;$s!#(B@code{(setq
 gnus-agent-cache nil)} $B$O5l<0$NF0:n$KLa$7$^$9!#(B
 
 @item
-Gnus $B$O(B ``format=flowed'' (RFC 2646) $B%Q%i%a!<%?$r%5%]!<%H$7$^$9!#%a%C%;!<(B
+Gnus $B$O!H(Bformat=flowed$B!I(B(RFC 2646) $B%Q%i%a!<%?!<$r%5%]!<%H$7$^$9!#%a%C%;!<(B
 $B%8$r:n@.$9$k$H$-$K!"$=$l$O(B @code{use-hard-newlines} $B$G3h@-2=$5$l$^$9!#(B
 format=flowed $B$N%G%3!<%I$O0JA0$+$i$G$-$^$7$?$,!"=i4|$NHG$G$O@bL@$NJ8=q$,(B
 $B$"$j$^$;$s$G$7$?!#(B
 
 @item
+@code{mm-fill-flowed} $B%*%W%7%g%s$G!H(Bformat=flowed$B!I%a%C%;!<%8$rN.F0%F%-%9(B
+$B%H$H$7$F=hM}$9$k$3$H$r$d$a$5$;$k$3$H$,$G$-$^$9!#$^$?!"(BPGP $B=pL>$,Kd$a9~$^(B
+$B$l$?%a%C%;!<%8$rAw?.$9$k$H$-!"N.F0%F%-%9%H$N=hM}$O9T$J$o$l$^$;$s!#(B(Gnus
+5.10.7 $B$N?75!G=(B)
+
+@item
 Gnus $B$O(B RFC 2298 $B$N3+Iu3NG'MW5a$N@8@.$r%5%]!<%H$7$^$9!#(B
 
-$B$3$l$O%a%C%;!<%8%b!<%I$N(B @kbd{C-c M-n} $B%-!<$G5/F0$5$l$^$9!#(B
+$B$3$l$O%a%C%;!<%8%b!<%I$N(B @kbd{C-c M-n} $B%-!<$G8F$S=P$5$l$^$9!#(B
 
 @item
 Gnus $B$O(B Maildir $B%0%k!<%W$r%5%]!<%H$7$^$9!#(B
@@ -25562,16 +26517,17 @@ Gnus $B$O?7%P%C%/%(%s%I$G$"$k(B @file{nnmaildir.el} $B$r4^$s$G$$$^$9!#(B
 @item
 $B0u:~$N@-G=$,8~>e$7$^$7$?!#(B
 
-Gnus $B$O$=$l<+?H$,!"35N,$H5-;v%P%C%U%!$K$*$1$k(B @kbd{O P} $B$G(B Muttprint $B$r(B
-$B%5%]!<%H$7$^$9!#$5$i$K(B @acronym{MIME} $B%\%?%s>e$G(B @kbd{p} $B$r;H$&$3$H$K$h$C(B
-$B$F!"8D!9$N(B @acronym{MIME} $B%Q!<%H$N$=$l$>$l$r0u:~$9$k$3$H$,$G$-$^$9!#(B
+Gnus $B$O$=$l<+?H$,!"35N,$H5-;v%P%C%U%!!<$K$*$1(B
+$B$k(B @kbd{O P} $B$G(B Muttprint $B$r%5%]!<%H$7$^$9!#$5$i$K(B @acronym{MIME} $B%\%?%s(B
+$B>e$G(B @kbd{p} $B$r;H$&$3$H$K$h$C$F!"8D!9$N(B @acronym{MIME} $B%Q!<%H$N$=$l$>$l(B
+$B$r0u:~$9$k$3$H$,$G$-$^$9!#(B
 
 @item
 Message $B$O(B Importance: $B%X%C%@!<(B (RFC 2156) $B$r%5%]!<%H$9$k$h$&$K$J$j$^$7(B
 $B$?!#(B
 
-$B%a%C%;!<%8%P%C%U%!$G(B @kbd{C-c C-f C-i} $B$+(B @kbd{C-c C-u} $B$r;H$&$H!"2DG=$J(B
-$BCM$,=[4D$7$^$9!#(B
+$B%a%C%;!<%8%P%C%U%!!<$G(B @kbd{C-c C-f C-i} $B$+(B @kbd{C-c C-u} $B$r;H$&$H!"2DG=(B
+$B$JCM$,=[4D$7$^$9!#(B
 
 @item
 Gnus $B$O%K%e!<%9$N(B Cancel Locks $B$r%5%]!<%H$7$^$9!#(B
@@ -25581,7 +26537,7 @@ Gnus $B$O%K%e!<%9$N(B Cancel Locks $B$r%5%]!<%H$7$^$9!#(B
 $B%k$HCV$-49$($N$H$-(B)$B!#:G=i$K5-;v$rEj9F$9$k$H$-$K!"(BGnus $B$O%i%s%@%`$J%Q%9%o!<(B
 $B%IJ8;zNs$r@8@.$7!"%+%9%?%`$N5!9=$r;H$C$F(B @file{~/.emacs} $B$K%;!<%V$7$^$9!#(B
 $B$=$NJQ?t$O(B @code{canlock-password} $B$H8F$P$l$^$9$,!"5!L)$r5$$K$9$k%G!<%?(B
-$B$G$O$"$j$^$;$s!#%&%'%V>e$G(B canlock $B$r8x3+$7$F$b!"0JA0$+$iH`=w$,$G$-$J$+$C(B
+$B$G$O$"$j$^$;$s!#%&%'%V>e$G(B canlock $B$r8x3+$7$F$b!"0JA0$+$iH`=w$K$G$-$J$+$C(B
 $B$?2?$+$r!"C/$+$,$G$-$k$h$&$K$9$k$b$N$G$O$"$j$^$;$s!#(B
 @code{message-insert-canlock} $B$r%+%9%?%^%$%:$9$k$3$H$K$h$C$F!"?6$kIq$$$r(B
 $BJQ99$9$k$,$G$-$^$9!#(B
@@ -25589,22 +26545,21 @@ Gnus $B$O%K%e!<%9$N(B Cancel Locks $B$r%5%]!<%H$7$^$9!#(B
 @item
 Gnus $B$O(B Sieve $B$r;H$C$?%5!<%P!H$7$F2<$5$$!#(B
+$B%k(B (@pxref{Top, ,Top, sieve, Emacs Sieve}) $B$r;2>H$7$F2<$5$$!#(B
 
 @item
-$B3HD%$5$l$?%U%)!<%^%C%H$N;EMM(B (format specs)$B!#(B
+$B3HD%$5$l$?=qK!;EMM(B (format specs)$B!#(B
 
-$B%U%)!<%^%C%H$N;E(B
-$BMM(B @samp{%&user-date;} $B$,(B @code{gnus-summary-line-format-alist} $B$KDI2C$5(B
-$B$l$^$7$?!#$=$l$K!"%f!<%6Dj5A$K$h$k3HD%$5$l$?%U%)!<%^%C%H$N;EMM$b%5%]!<%H(B
-$B$5$l$F$$$^$9!#3HD%$5$l$?%U%)!<%^%C%H$N;EMM$O(B @samp{%u&foo;} $B$N$h$&$J$b$N(B
-$B$G!"4X?t(B @code{gnus-user-format-function-@var{foo}} $B$r5/F0$7$^$9!#(B
-@samp{&} $B$,%(%9%1!<%WJ8;z$K;H$o$l$F$$$k$N$G!"8E$$%f!<%6Dj5A%U%)!<%^%C%H(B
-$B$G$"$k(B @samp{%u&} $B$O:#$d%5%]!<%H$5$l$F$$$^$;$s!#(B
+$B=qK!;EMM(B @samp{%&user-date;} $B$,(B @code{gnus-summary-line-format-alist} $B$K(B
+$BDI2C$5$l$^$7$?!#$=$l$K!"MxMQ$5$l$^$7$?!#(B
@@ -25613,12 +26568,12 @@ Sieve $B$N5,B'$O%0%k!<%W%Q%i%a!<%?$H$7$F2C$($k$3$H$,$G$-!"%0%k!<%W%P%C%U%!(B
 $B$?(B ($BLuCm(B: $B0JA0$O(B)$B!#?7$7$$4X?t$OB>$N5-;v$r_I2a$7$F=|5n$7$^$9!#(B
 
 @item
-$B$$$/$D$+$N%3%^%s%I$O(B @kbd{C-u} $B@\F,<-$G9gCW$NH]Dj$r07$&$3$H$,$G$-$^$9!#(B
+$B$$$/$D$+$N@)8BL?Na$O(B @kbd{C-u} $B@\F,0z?t$G9gCW$NH]Dj$r07$&$3$H$,$G$-$^$9!#(B
 
-@kbd{C-u} $B$r(B subject$B!"(Bauthor $B$^$?$O(B extra $B%X%C%@!<$r$3$N=g$K;H$&(B -- $B$9$J(B
-$B$o$A(B @kbd{/ s}$B!"(B@kbd{/ a} $B$*$h(B
-$B$S(B @kbd{/ x} (@code{gnus-summary-limit-to-@{subject,author,extra@}})
--- $B$H!"7k2L$H$7$F$=$NI=8=$K9gCW$7$J$$$9$Y$F$N5-;v$,I=<($5$l$^$9!#(B
+@kbd{C-u} $B$r(B subject$B!"(Bauthor $B$^$?$O(B extra $B%X%C%@!$O!"%G%#%U%)%k%H$G(B UTF-8 $B$G$"$k$b$N$H$7$Fl$J$I$NAH?%Fb$G!"(B(@file{~/.newsrc.eld} $B%U%!%$%k$r6&M-$9$k(B
-$B$3$HL5$7$K(B) $B%f!<%64V$G5-;v$H0u$r6&M-$9$k$3$H$r$b2DG=$K$7$^$9!#$3$l$O!"(B
+$B$3$HL5$7$K(B) $BMxMQA0$r;}$D(B nnfolder $BMQ(B) $B$K3JG<$9$k$3$H$K$h$C$FF0:n$7$^$9!#(B
@@ -25645,22 +26600,24 @@ Gnus $B$O(B @file{~/.newsrc.eld} $B$K$"$k>pJs$NBe$o$j$K!"<+F0E*(B
 $B5!G=$rM^@)$9$k$?$a$K;H$&$3$H$,$G$-$^$9!#(B
 
 @item
-$B%0%k!<%W$H35N,%P%C%U%!$N%a%K%e!<9`L\$NL>A0(B ``Misc'' $B$O(B ``Gnus'' $B$K2~L>$5(B
-$B$l$^$7$?!#(B
+$B%0%k!<%W$H35N,%P%C%U%!!<$N%a%K%e!<%P!<9`L\$NL>A0!H(BMisc$B!I$O!H(BGnus$B!I$K2~L>(B
+$B$5$l$^$7$?!#(B
 
 @item
-Message mode $B$G(B ``@acronym{MML}'' $B$HL>IU$1$i$l$?%a%K%e!<9`L\$O!"(B
-``Attachments'' $B$K2~L>$5$l$^$7$?!#$3$N%a%K%e!<$O!"=pL>$H0E9f(B
-$B2=(B (@pxref{Security, Security,, message-ja, Message Manual}) $B$N$h$&$J!"(B
-$BJ]0B$K4XO"$7$?$b$N$b4^$s$G$$$k$3$H$KCeL\$7$F2<$5$$!#(B
+Message mode $B$G!H(B@acronym{MML}$B!I$HL>IU$1$i$l$?%a%K%e!<9`L\$O(B
+$B!H(BAttachments$B!I$K2~L>$5$l$^$7$?!#$3$N%a%K%e!<$O!"=pL>$H0E9f(B
+$B2=(B (@pxref{Security, ,$B%;%-%e%j%F%#!<(B, message-ja, The Message
+Manual}) $B$N$h$&$J!"%;%-%e%j%F%#!<$K4XO"$7$?$b$N$b4^$s$G$$$k$3$H$KCeL\$7(B
+$B$F2<$5$$!#(B
 
 @item
-@code{gnus-group-charset-alist} $B$H(B @code{gnus-group-ignored-charsets-alist}$B!#(B
+@code{gnus-group-charset-alist} $B$H(B @code{gnus-group-ignored-charsets-alist}
 
 $B$3$l$i$NJQ?t$K@_Dj$5$l$?@55,I=8=$O!"40A4$J(B (full) $B%0%k!<%WL>$HHf3S$5$l$^(B
 $B$9!#(BGnus 5.8 $B$G$O$,Hf3S$NBP>]$G$7$?!#$7$?$,$C$F!"(B
-$B$3$l$i$NJQ?t$r%+%9%?%^%$%:$7$F$$$k%f!<%6$O!"@55,I=8=$rJQ99$7$J$1$l$P$J$j(B
+$B$3$l$i$NJQ?t$r%+%9%?%^%$%:$7$F$$$kMxMQ" euc-kr) -> ("\\(^\\|:\\)han\\>" euc-kr)
 @end lisp
@@ -25670,9 +26627,9 @@ Gnus $B$O(B @acronym{PGP} (RFC 1991/2440)$B!"(B@acronym{PGP/MIME} (RFC
 2015/3156) $B$*$h$S(B @acronym{S/MIME} (RFC 2630-2633) $B$r%5%]!<%H$7$^$9!#(B
 
 $B$3$l$K$O(B @acronym{S/MIME} $B$H(B OpenPGP $B$,l9g$O(B @acronym{MML} $B$rI=<((B
 $B$9$k(B ($B$9$J$o$A(B @acronym{MIME} $B$KJQ49$9$k(B) $B$3$H$G$9!#JQ49$,%G%#%8%?%k=pL>(B
@@ -25714,14 +26671,18 @@ No Gnus $B$N?7$7$$5!G=(B:
 $B$3$N%^%K%e%"%k$O(B TeXinfo $B%U%!%$%k$+$i:n@.$5$l!"$=$l$+(B
 $B$i(B @code{texi2dvi}
 @iflatex
-$B$b$7$/$O!"(BLars $B$5$s$N:n$i$l$?(B Texinfo to \LaTeX $BJQ49$rDL$j!"$=$l$+$i!"(B
+$B$b$7$/$O!"(BLars $B$5$s$,:n$C$?(B Texinfo to \LaTeX\ $BJQ49$rDL$j!"$=$l$+$i!"(B
 @code{latex} $B$H(B @code{dvips}
 @end iflatex
-$B$r/$7(B
-$B$@$H$$$&$3$H$G$9!#(Bgnus $B$N40A4$KA4$F$N$3$H$,@bL@$5$l$F$$$^$9$,!"C5$7$F$$(B
-$B$k>l=j$G$O$J$$$H$$$&$3$H$,$h$/$"$j$^$9!#$3$l$O%j%U%!%l%s%9%^%K%e%"%k$G$"(B
-$B$j!"(Bgnus $B$r;O$a$k$?$a$Nl=j$G$O$J$$$H$$$&$3$H$,$h$/$"$j$^$9!#$3$l$O%j%U%!%l%s(B
+$B%9%^%K%e%"%k$G$"$C$F!"(Bgnus $B$r;O$a$k$?$a$NP$o$l$k$G$7$g$&!#$"$J$?$NCN$i$J$$$H$3$m$G!#(B
+$B$3$l$O!"$"$J$?$,$=$l$rFI$`$?$a$K;H$&$3$H$K$J$C$F$$$k$b$N!"$D$^$j!"$=$l$H(B
+$B$$$&$N$,%K%e!<%9$G$9!#%K%e!<%9$O0lHLE*$K$O6a$/$N(B @acronym{NNTP} $B%5!<%P!<(B
+$B$+$iP$&$G$7$g$&!#$"$J$?$NCN(B
+$B$i$J$$$H$3$m$G!#(B
 
 @item $B%a!<%k(B (mail)
 @cindex mail
-$B$"$J$?$K8D?ME*$KG[Aw$5$l$k$b$NA4$F$,%a!<%k$G$9!#$$$/$D$+$N%K%e!<%9(B/$B%a!<(B
-$B%k%j!<%@!<(B (gnus $B$N$h$&$J(B) $B$O%a!<%k$H%K%e!<%9$N0c$$$r$\$d$1$5$;$^$9$,!"(B
-$B$=$3$K$O0c$$$OB8:_$7$^$9!#%a!<%k$O;dE*$G$9!#%K%e!<%9$O8xE*$G$9!#%a!<%k$r(B
-$BAw?.$9$k;v$OEj9F$G$O$J$/!"JV?.$O%U%)%m!<%"%C%W$G$O$"$j$^$;$s!#(B
+$B$"$J$?$K8D?ME*$KG[Aw$5$l$k$9$Y$F$N$b$N$,%a!<%k$G$9!#$$$/$D$+$N%K%e!<%9(B/
+$B%a!<%k%j!<%@!<(B (gnus $B$N$h$&$J(B) $B$O%a!<%k$H%K%e!<%9$N6hJL$r[#Kf$K$7$^$9$,!"(B
+$B0c$$$,$"$j$^$9!#%a!<%k$O;dE*$G$9!#%K%e!<%9$O8xE*$G$9!#%a!<%k$rAw?.$9$k$3(B
+$B$H$OEj9F$G$O$J$/!"JV?.$O%U%)%m!<%"%C%W$G$O$"$j$^$;$s!#(B
 
 @item $BJV?.(B (reply)
 @cindex reply
-$B$"$J$?$,FI$s$G$$$k$b$N$r=q$$$??M$K%a!<%k$rAw$k;v$G$9!#(B
+$B$"$J$?$,FI$s$G$$$k$b$N$r=q$$$??M$K%a!<%k$rAw$k$3$H$G$9!#(B
 
 @item $B%U%)%m!<%"%C%W(B (follow up)
 @cindex follow up
-$B$"$J$?$,FI$s$G$$$k5-;v$K1~Ez$7$F8=:_$N%K%e!<%9%0%k!<%W$K5-;v$rEj9F$9$k;v(B
-$B$G$9!#(B
+$B$"$J$?$,FI$s$G$$$k5-;v$K1~Ez$7$F!"8=:_$N%K%e!<%9%0%k!<%W$K5-;v$rEj9F$9$k(B
+$B$3$H$G$9!#(B
 
 @item $B%P%C%/%(%s%I(B (back end)
 @cindex back end
@@ -25816,43 +26776,44 @@ gnus $B$O%a!<%k$H%K%e!<%9$,$[$H$s$IF1$8$@$H$_$J$7$^$9!#K\Ev$K!#0c$$$Ol(B
+$BLL$G$H$-$I$-;H$o$l$^$9!#$=$7$FF1$8$3$H$r;X$9$3$H$,$G$-$k!VA*BrJ}K!!W(B
+(select method) $B$H$$$&MQ8l$,$"$j$^$9!#$+$h$&$K(B gnus $B$NMQ8l$O$H$F$b:.Mp$7(B
+$B$F$$$^$9!#(B
 
 @item $B4pK\(B (native)
 @cindex native
-Gnus $B$O$$$D$b0l$D$NJ}K!(B ($B$H%P%C%/%(%s%I(B) $B$r%K%e!<%9$rF@$k$?$a$N(B @dfn{$B4p(B
-$BK\(B} $B$b$7$/$O=i4|@_Dj$H$7$F;H$$$^$9!#(B
+gnus $B$O$$$D$b0l$D$NJ}K!(B ($B$H%P%C%/%(%s%I(B) $B$r!"%K%e!<%9$rF@$k$?$a$N!V4pK\!W(B
+$B$b$7$/$O%G%#%U%)%k%H$NuBV$K$9$k$3$H$b$G$-$^$9!#$3$l$i$O%K%e!<(B
-$B%9$ruBV$K$9$k$3$H$b$G$-$^$9!#$3(B
+$B$l$i$O%K%e!<%9$reIt$G!"G'>Z>pJs(B ($BEy(B) $B$,F~$l$i$l$F$$$k$H$3$m$G$9!#(B
+@cindex head
+$B%a%C%;!<%8$N:G>eIt$G!"4IM}>pJs(B ($BEy(B) $B$,F~$l$i$l$F$$$k$H$3$m$G$9!#(B
 
-@item $BK\BN(B (body)
+@item $BK\J8(B (body)
 @cindex body
-$B5-;v$N;D$j$NItJ,$G$9!#%X%C%I$G$J$$$b$N$O$9$Y$FK\BN$G$9!#(B
+$B5-;v$N;D$j$NItJ,$G$9!#%X%C%I$KL5$$$b$N$O$9$Y$FK\J8$G$9!#(B
 
 @item $B%X%C%@!<(B (header)
 @cindex header
-$B5-;v$N%X%C%I$+$i$N9T$G$9!#(B
+$B5-;v$N%X%C%I$N9T$G$9!#(B
 
 @item $B%X%C%@!<72(B (headers)
 @cindex headers
@@ -25884,24 +26846,23 @@ Gnus $B$O$$$D$b0l$D$NJ}K!(B ($B$H%P%C%/%(%s%I(B) $B$r%K%e!<%9$rF@$k$?$a$N(
 
 @item @acronym{NOV}
 @cindex @acronym{NOV}
-Gnus $B$,%0%k!<%W$KF~$k$H!"%0%k!<%W$NA4$F$NL$FI5-;v$N%X%C%@!<$r%P%C%/%(%s(B
-$B%I$K5a$a$^$9!#$[$H$s$I$N%5!<%P!<$O(B News OverView $BMM<0$,;HMQ2DG=$G!"$=$l(B
-$B$OIaDL$N(B @sc{head} $BMM<0$h$j$b$C$H$l$N%0%k!<%W$O2?$i$+$N(B @dfn{$B%l%Y%k(B} $B$+B>$N$b$N(B (1-9) $B$G9XFI$5$l$F(B
-$B$$$^$9!#Dc$$%l%Y%k$N$b$N$O9b$$%l%Y%k$N$b$N$h$j(B ``$B$h$j(B'' $B9XFI$5$l$F$$$^$9!#(B
-$B%s%S(B}; 9 $B$O(B @dfn{$B@Z$i$l$?(B} $B$H8+$J$5$l$^$9!#%0%k!<%W$r%j(B
-$B%9%H$7$?$j!"?7$7$$%0%k!<%W$rAv::$7$?$j$9$kL?Na$O$9$Y$F?tCM@\F,0z?t(B
-$B$r(B @dfn{$BF0:n%l%Y%k(B} $B$H$7$F;H$$$^$9!#(B
+$B$=$l$>$l$N%0%k!<%W$O2?$i$+$N!V%l%Y%k!W(B(1-9) $B$G9XFI$5$l$F$$$^$9!#Dc$$%l%Y(B
+$B%k$N$b$N$O9b$$%l%Y%k$N$b$N$h$j!V$h$j!W9XFI$5$l$F$$$^$9!#%s%S!W(B; 9 $B$O(B
+$B!V@Z$i$l$?!W(B(killed) $B$H8+$J$5$l$^$9!#%0%k!<%W$N0lMw$rI=<($7$?$j!"?7$7$$(B
+$B5-;v$rAv::$9$kL?Na$O!"$9$Y$F?tCM@\F,0z?t$r!VF0:n%l%Y%k!W$H$7$F;H$$$^$9!#(B
 
 @item $B@Z$i$l$?%0%k!<%W(B (killed groups)
 @cindex killed groups
-$B@Z$i$l$?%0%k!<%W$N>pJs$OC_@Q$5$l$?$j99?7$5$l$?$j$7$^$;$s$N$G!"@Z$i$l$?%0(B
-$B%k!<%W$r9XFI$5$l$?%0%k!<%W$h$j4JC1$K07$($k$h$&$K$J$j$^$9!#(B
+$B@Z$i$l$?%0%k!<%W$N>pJs$OJ]B8$5$l$?$j99?7$5$l$?$j$7$J$$$N$G!"@Z$i$l$?%0%k!<(B
+$B%W$r07$&$N$O9XFI$5$l$F$$$k%0%k!<%W$h$j$b4JC1$G$9!#(B
 
 @item $B%>%s%S%0%k!<%W(B (zombie groups)
 @cindex zombie groups
@@ -25909,157 +26870,157 @@ Gnus $B$,%0%k!<%W$KF~$k$H!"%0%k!<%W$NA4$F$NL$FI5-;v$N%X%C%@!<$r%P%C%/%(%s(B
 
 @item $B%"%/%F%#%V%U%!%$%k(B (active file)
 @cindex active file
-$B%K%e!<%9%5!<%P!<$O$I$N5-;v$r1?$s$G$$$k$+!"$I$N%0%k!<%W$,B8:_$9$k$+$r5-O?(B
-$B$7$F$*$+$J$1$l$P$J$j$^$;$s!#A4$F$N$3$N>pJs$O8=>u%U%!%$%k$KC_@Q$5$l!"$=$l(B
-$B$O$"$J$?$,A[A|$9$k$h$&$KHf3SE*Bg$-$$$G$9!#(B
+$B%K%e!<%9%5!<%P!<$O!"$I$N5-;v$r;}$C$F$$$k$+$H$I$N%0%k!<%W$,B8:_$9$k$+$r5-(B
+$BO?$7$F$*$+$J$1$l$P$J$j$^$;$s!#%"%/%F%#%V%U%!%$%k$K3JG<$5$l$k$9$Y$F$N$3$N(B
+$B>pJs$O!"$"$J$?$,?dB,$9$k$h$&$KHf3SE*Bg$-$$$G$9!#(B
 
 @item $B56%0%k!<%W(B (bogus groups)
 @cindex bogus groups
-$B%U%!%$%k(B @file{.newsrc} $B$KB8:_$9$k%0%k!<%W$G$9$,!"%5!<%P!<$KCN$i$l$F$$$J(B
-$B$$%0%k!<%W(B ($B$9$J$o$A!"$=$l$O%"%/%F%#%V%U%!%$%k$K$"$j$^$;$s(B) $B$O(B @emph{$B56(B
-$B%0%k!<%W(B} $B$G$9!#$3$l$O!"$*$=$i$/(B ($B$9$G$K(B) $B$=$N%0%k!<%W$OB8:_$7$F$$$J$$$N(B
-$B$G$7$g$&!#(B
+@file{.newsrc} $B%U%!%$%k$KB8:_$9$k$1$l$I$b%5!<%P!<$,CN$i$J$$%0%k!<%W(B ($B$9(B
+$B$J$o$A!"$=$l$O%"%/%F%#%V%U%!%$%k$K$"$j$^$;$s(B) $B$O(B @emph{$B56%0%k!<%W(B} $B$G$9!#(B
+$B$*$=$i$/$=$N%0%k!<%W$O(B ($B$b$O$d(B) $BB8:_$7$F$$$J$$$N$G$7$g$&!#(B
 
-@item $B3hF02=(B (activating)
+@item $B3h@-2=(B (activating)
 @cindex activating groups
-$B%5!<%P!<$K%0%k!<%W$N>pJs$r?R$M!"L$FI5-;v$N?t$r1i;;$9$k9T0Y$O(B @dfn{$B%0%k!<(B
-$B%W$r3hF02=$9$k(B} $B$H8F$P$l$F$$$^$9!#Hs3hF0%0%k!<%W$O%0%k!<%W%P%C%U%!(B
-$B$K(B @samp{*} $B$H$H$b$K0lMwI=<($5$l$^$9!#(B
+$B%5!<%P!<$K%0%k!<%W$N>pJs$r?R$M$FL$FI5-;v$N?t$r1i;;$9$k9T0Y$O!V%0%k!<%W$r(B
+$B3h@-2=(B (activate) $B$9$k!W$H8F$P$l$F$$$^$9!#3h@-2=$5$l$F$$$J$$%0%k!<%W$O!"(B
+$B%0%k!<%W%P%C%U%!!<$K(B @samp{*} $B$H$H$b$K0lMwI=<($5$l$^$9!#(B
 
 @item $B%9%W!<%k(B (spool)
 @cindex spool
-$B%K%e!<%9%5!<%P!<$O!"$"$k$d$jJ}!"$^$?$OB>$NN.57$G5-;v$r%m!<%+%k$KJ]B8$7$^(B
-$B$9!#$"$k8E$$N.57$NJ]B8J}K!$O!"5-;vKh$K$?$C$?0l$D$N%U%!%$%k$r;}$D$3$H$G$9!#(B
-$B$=$l$OEAE}E*$J%9%W!<%k(B (traditional spool) $B$H8F$P$l$^$9!#(B
+$B%K%e!<%9%5!<%P!<$O2?$i$+$N$d$jJ}$G5-;v$r%m!<%+%k$KJ]B8$7$^$9!#$"$k8E$$N.(B
+$B57$NJ]B8J}K!$O!"C1$K5-;vKh$K0l$D$N%U%!%$%k$r;}$D$3$H$G$9!#$=$l$OEAE}E*$J(B
+$B%9%W!<%k(B (traditional spool) $B$H8F$P$l$^$9!#(B
 
 @item $B%5!<%P!<(B (server)
 @cindex server
-$B@\B3$7$F!"%K%e!<%9(B ($B$b$7$/$O%a!<%k(B) $B$re$N%5!<%P!<@_Dj$r;XDj$9$k9=B$$G$9!#(B
+$B%P%C%/%(%s%I$H!"%5!<%P!<$*$h$S2>A[%5!<%P!<$N@_Dj$r;XDj$9$k9=B$$G$9!#(B
 
-@item $B;ve$N%5!<%P!<(B (virtual server)
+@item $B2>A[%5!<%P!<(B (virtual server)
 @cindex virtual server
-$BL?L>$5$l$?A*BrJ}K!$G$9!#A*BrJ}K!$O(B ($BJ*M}E*(B) $B%5!<%P!<$K@\B3$9$k$?$a$KI,MW(B
-$B$JJ}K!$rDj5A$9$k$?$a!"J*;v$rA4BN$H$7$Fe$N%5!<%P!<$K$J$j$^(B
-$B$9!#(B
+$BL>A0$,IU$1$i$l$F$$$F!"$=$NL>A0$G;XDj$9$k$3$H$,$G$-$kA*BrJ}K!$G$9!#A*BrJ}(B
+$BK!$O(B ($BJ*M}E*$J(B) $B%5!<%P!<$K4X$9$k$9$Y$F$rDj5A$9$k$N$G!"$b$N$4$H$rA4BN$H$7(B
+$B$FB*$($k$N$O2>A[%5!<%P!<$K$J$j$^$9!#(B
 
 @item $B@vBu(B (washing)
 @cindex washing
-$B%P%C%U%!$r;}$C$F$-$F!"2?$i$+$N/$J$+$l(B) $B85$N$b$N$h$j$b$h$j$-$l$$$G4n$P$7$$$b$N$K$J$k$G$7$g$&!#(B
+$B%P%C%U%!!<$r;}$C$F$-$F!"2?$i$+$NC$(5n$j$^$9!#(B
+$B$?$$$F$$$N%0%k!<%W$O$I$N5-;v$rFI$s$@$+$N%G!<%?$rJ]B8$7$^$9!#!V0l;~!W%0%k!<(B
+$B%W$O%G!<%?$,N/$a$i$l$J$$%0%k!<%W$G$9(B---$B%0%k!<%W$r=P$k$H!"$=$l$OE76u$N$+(B
+$B$J$?$K>C$(5n$j$^$9!#(B
 
 @item $B8GDj%0%k!<%W(B (solid groups)
 @cindex solid groups
-$B$3$l$O0l;~%0%k!<%W$NH?BP$G$9!#%0%k!<%W%P%C%U%!$K5s$2$i$l$F$$$kA4$F$N%0%k!<(B
-$B%W$O8GDj%0%k!<%W$G$9!#(B
+$B$3$l$O0l;~%0%k!<%W$NH?BP$G$9!#%0%k!<%W%P%C%U%!!<$K0lMwI=<($5$l$F$$$k$9$Y(B
+$B$F$N%0%k!<%W$O8GDj%0%k!<%W$G$9!#(B
 
 @item $B$^$P$i5-;v(B (sparse articles)
 @cindex sparse articles
-@code{gnus-build-sparse-threads} $B$N5!G=$r;HMQ$7$F$$$k$H$-$O!"35N,%P%C%U%!(B
-$B$K5-;v$NF~$l>l=j$,I=<($5$l$^$9!#(B
+@code{gnus-build-sparse-threads} $B$,M-8z$K$5$l$F$$$k$H$-$K!"$=$l$i$O35N,(B
+$B%P%C%U%!!<$KI=<($5$l$k(B ($BB8:_$7$J$$(B) $B5-;v$N$?$a$N>l=j8e$K$=$N5-;v$X$N1~Ez$rCV$/$3$H$G$9(B---$B3,AXE*N.57$G!#(B
+$B1~Ez$N5-;v$r!"$=$l$,1~Ez$7$?855-;v$ND>8e$KCV$/$3$H$G$9(B---$B3,AXE*$JN.57$G!#(B
 
 @item $B:,(B (root)
 @cindex root
 @cindex thread root
-$B%9%l%C%I$N:G=i$N5-;v$,:,$G$9!#$=$l$O%9%l%C%I$NA4$F$N5-;v$NAD@h$G$9!#(B
+$B%9%l%C%I$N:G=i$N5-;v$,:,$G$9!#$=$l$O%9%l%C%I$N$9$Y$F$N5-;v$NAD@h$G$9!#(B
 
 @item $B?F(B (parent)
 @cindex parent
-$B1~Ez$N$"$k5-;v$G$9!#(B
+$B1~Ez$,F@$i$l$?5-;v$G$9!#(B
 
 @item $B;R(B (child)
 @cindex child
-$B0c$C$?5-;v(B---$B$=$N?F(B $B$K1~Ez$9$k5-;v$G$9!#(B
+$B$=$l$H$OJL$N5-;v!"$9$J$o$A?F$K1~Ez$9$k5-;v$G$9!#(B
 
-@item $B=8G[(B (digest)
+@item $B$^$H$aAw$j(B (digest)
 @cindex digest
-$BJ#?t$N%a%C%;!<%8$r0l$D$N%U%!%$%k$K=8$a$?$b$N$G$9!#$b$C$H$bIaDL$N=8G[MM<0(B
-$B$O(B RFC1153 $B$G;XDj$5$l$F$$$^$9!#(B
+$BJ#?t$N%a%C%;!<%8$r0l$D$N%U%!%$%k$K=8$a$?$b$N$G$9!#:G$b0lHLE*$J$^$H$aAw$j(B
+$B$NMM<0$O!"(BRFC1153 $B$G5,Dj$5$l$F$$$^$9!#(B
 
 @item $BJ,3d(B (splitting)
 @cindex splitting, terminolgy
 @cindex mail sorting
 @cindex mail filtering (splitting)
-$B$"$k5,B'$K$h$C$F%a!<%k$rJ,N`$9$k9T0Y$G$9!#$H$-$I$-4V0c$C$F%a!<%k$N_I(B
-$B2a(B (mail filtering) $B$H8F$P$l$^$9!#(B
+$B$"$k5,B'$K$h$C$F%a!<%k$r6hJ,$1$9$k9T0Y$G$9!#$H$-$I$-4V0c$C$F%a!<%k$N_I(B
+$B2a(B (filtering) $B$H8F$P$l$^$9!#(B
 @end table
 
 @page
 @node Customization
 @section $B%+%9%?%^%$%:(B
-@cindex gerenal customization
+@cindex gereral customization
 
-$BA4$F$NJQ?t$O$3$N%^%K%e%"%k$N$I$3$+JL$N$H$3$m$GE,@Z$K@bL@$5$l$F$$$^$9!#$3(B
-$B$NItJ,$OHs>o$KNI$/$"$k>u67$G$I$N$h$&$K(B gnus $B$r%+%9%?%^%$%:$9$l$PNI$$$+$N(B
-$BAm9gE,;X<(@h$rM?$($k$?$a$K9M0F$5$l$F$$$^$9!#(B
+$B$9$Y$F$NJQ?t$O!"$3$N%^%K%e%"%k$N$I$3$+B>$N$H$3$m$GE,@Z$K@bL@$5$l$F$$$^$9!#(B
+$B$3$N>O$O!"Hs>o$KNI$/$"$k>u67$G$I$N$h$&$K(B gnus $B$r%+%9%?%^%$%:$9$l$PNI$$$+(B
+$B$rD4$Y$k$?$a$N!"Am9gE*$J0FFb$K$J$k$h$&$K:n$i$l$F$$$^$9!#(B
 
 @menu
-* Slow/Expensive Connection::   $B%m!<%+%k$N(B Emacs $B$rN)$A>e$2$F!"B>$N$H$3$m$+$i%K%e!<%9$rF@$k;v$,$G$-$k(B
-* Slow Terminal Connection::    $B1s3V(B Emacs $B$ro$K:Y$$@~$N8~$3$&$N%^%7(B
-$B%s$+$i%K%e!<%9$ro$K:Y$$$R$b$N8~$3$&$N%^%7%s$+(B
+$B$i%K%e!<%9$ro$KBg(B
-$B$-$/$J$C$F$$$^$9!#$=$l$K2C$($F!"(Bgnus $B$,FMA3$H$K$+$/8=>u%U%!%$%k$ro$KBg$-$$$G$9!#(B
+$B$5$i$K!"(Bgnus $B$,IT0U$K%"%/%F%#%V%U%!%$%k$r$H$K$+$/l9g$O!"EE@~$rEA$C$FAw$i$l$F$$(B
+$B$k%G!<%?$NAmNL$r(B ($B2DG=$J8B$j(B) $B8:$i$7$?$/$J$k$G$7$g$&!#(B
 
 @table @code
 @item gnus-auto-center-summary
-Gnus $B$,>o$K35N,%P%C%U%!$rCf?4:F@_Dj$r$9$k$3$H$r6X;_$9$k$?$a$K$3$l(B
-$B$r(B @code{nil} $B$K@_Dj$7$F2<$5$$!#$3$l$,(B @code{vertical} $B$G$"$k$H!"?bD>J}(B
-$B8~$N(B (vertical) $BCf?4:F@_Dj$N$_$r$7$^$9!#(B@code{nil} $B$G(B
-$B$b(B @code{vertical} $B$G$bL5$1$l$P!"?eJ?J}8~$H?bD>J}8~$NN>J}$NCf?4:F@_Dj$r(B
-$B9T$$$^$9!#(B
+gnus $B$,35N,%P%C%U%!!<$r%j%;%s%?!<$9$k(B ($BLuCm(B: $B8=:_$N5-;v$,??$sCf$KI=<($5(B
+$B$l$k$h$&$K$9$k(B) $B$9$k$?$a$K!"$3$l$r(B @code{nil} $B$K@_Dj$7$F2<$5$$!#$3$l(B
+$B$,(B @code{vertical} $B$@$C$?$i!"?bD>J}8~$N%j%;%s%?!<$@$1$r$7$^$9!#(B
+@code{nil} $B$G$b(B @code{vertical} $B$G$bL5$1$l$P!"?eJ?J}8~$H?bD>J}8~$NN>J}$G(B
+$B%j%;%s%?!<$r9T$J$$$^$9!#(B
 
 @item gnus-visible-headers
-$B5-;v$K4^$^$l$k%X%C%@!<$r:G>.8B$K8:$i$7$^$9!#.8B$K8:$i$7$^$9!#o$K35N,%P%C%U%!$rCf?4:F@_Dj$r$9$k$3$H$r6X;_$9$k$?$a$K$3$l(B
 @end lisp
 
 @item gnus-use-full-window
-$B$3$l$r(B @code{nil} $B$K@_Dj$9$k;v$G!"A4$F$N%&%#%s%I%&$r>.$5$/$9$k;v$,$G$-$^(B
-$B$9!#$3$l$OAm$8$F$=$s$J$K8:$i$7$^$;$s!#$3$l$O!"5-;v$r$I$C$A$K$7$mFI$_$?$/(B
-$B$J$$$H$$$&;v$r7hDj$9$kA0$K!">/$7$NItJ,$7$+8+$kI,MW$,L5$$$H$$$&;v$G$9!#(B
+$B$3$l$r(B @code{nil} $B$K@_Dj$9$k$3$H$K$h$C$F!"$9$Y$F$N%&%#%s%I%&$r>.$5$/$9$k(B
+$B$3$H$,$G$-$^$9!#$3$l$OAm$8$F$=$s$J$K8:$i$7$^$;$s$,!"$3$N5-;v$O2?$,2?$G$b(B
+$BFI$_$?$/$J$+$C$?$s$@$H7h?4$9$kA0$K!"$=$l$r>/$7$7$+8+$J$$$G:Q$_$^$9!#(B
 
 @item gnus-thread-hide-subtree
-$B$3$l$,(B @code{nil} $B$G$J$1$l$P!"A4$F$N35N,%P%C%U%!$N%9%l%C%I$O=i$a$K1#$5$l(B
-$B$^$9!#(B
+$B$3$l$r(B @code{nil} $B$G$O$J$$CM$K$7$F$*$/$H!"$9$Y$F$N35N,%P%C%U%!!<$N%9%l%C(B
+$B%I(B ($B$N?F0J30(B) $B$O!"=i$a$O1#$5$l$F$$$k$h$&$K$J$j$^$9!#(B
 
 @item gnus-updated-mode-lines
-$B$3$l$,(B @code{nil} $B$G$"$k$H!"(Bgnus $B$O%P%C%U%!$N%b!<%I9T$K>pJs$rF~$l$^$;$s(B
-$B$N$G!";~4V$r@aLs$G$-$k$G$7$g$&!#(B
+$B$3$l$r(B @code{nil} $B$K$9$k$H!"(Bgnus $B$O%P%C%U%!!<$N%b!<%I9T$K>pJs$rI=<($7$J(B
+$B$$$N$G!"$$$/$i$+;~4V$r@aLs$G$-$k$G$7$g$&!#(B
 @end table
 
 @node Little Disk Space
-@subsection $B>/$7$N%G%#%9%/MFNL(B
+@subsection $B>/$J$$%G%#%9%/MFNL(B
 @cindex disk space
 
-$B5/F0%U%!%$%k$OHf3SE*Bg$-$/$J$k$N$G!"6u$-MFNL$,>/$J$/$J$C$F$-$F$$$k$H$-$O(B
-$B$=$NBg$-$5$r>/$7>.$5$/$9$kI,MW$,$"$k$G$7$g$&!#(B
+$B5/F0%U%!%$%k$O$d$dBg$-$/$J$jF@$k$N$G!"6u$-MFNL$,>/$J$/$J$C$F$-$F$$$k$H$-(B
+$B$O!"$=$N%5%$%:$r>/$7>.$5$/$9$kI,MW$,$"$k$G$7$g$&!#(B
 
 @table @code
 @item gnus-save-newsrc-file
-$B$3$l$,(B @code{nil} $B$G$"$k$H!"(Bgnus $B$O7h$7$F(B @file{.newsrc} $B$rJ]B8$7$^$;(B
-$B$s(B---$B$=$l$O(B @file{.newsrc.eld} $B$N$_$rJ]B8$7$^$9!#$3$l$O!"(Bgnus $B$NB>$N%K%e!<(B
-$B%9%j!<%@!<$r;H$($J$$$H$$$&;v$G$9!#$3$NJQ?t$O=i4|@_Dj$G(B @code{t} $B$G$9!#(B
+$B$3$l$r(B @code{nil} $B$K$9$k$H!"(Bgnus $B$O7h$7$F(B @file{.newsrc} $B$rJ]B8$7$^$;(B
+$B$s(B---@file{.newsrc.eld} $B$@$1$rJ]B8$7$^$9!#$3$l$O(B gnus $B0J30$N%K%e!<%9%j!<(B
+$B%@!<$,;H$($J$/$J$k$3$H$r0UL#$7$^$9!#$3$NJQ?t$O%G%#%U%)%k%H$G(B @code{t} $B$G(B
+$B$9!#(B
 
 @item gnus-read-newsrc-file
 $B$3$l$,(B @code{nil} $B$G$"$l$P!"(Bgnus $B$O(B @file{.newsrc} $B$r7h$7$FFI$_$^$;(B
-$B$s(B ---@file{.newsrc.eld} $B$@$1$rFI$_$^$9!#$3$l$O!"(Bgnus $B0J30$N%K%e!<%9%j!<(B
-$B%@!<$r;H$($J$/$J$k!"$H$$$&$3$H$G$9!#$3$NJQ?t$O=i4|@_Dj$G$O(B @code{t} $B$G$9!#(B
+$B$s(B---@file{.newsrc.eld} $B$@$1$rFI$_$^$9!#$3$l$O(B gnus $B0J30$N%K%e!<%9%j!<%@!<(B
+$B$,;H$($J$/$J$k$3$H$r0UL#$7$^$9!#$3$NJQ?t$O%G%#%U%)%k%H$G$O(B @code{t} $B$G$9!#(B
 
 @item gnus-save-killed-list
 $B$3$l$,(B @code{nil} $B$G$"$k$H!"(Bgnus $B$O;`$s$@%0%k!<%W$N%j%9%H$rJ]B8$7$^$;$s!#(B
 $B$3$NJQ?t$r(B @code{nil} $B$K@_Dj$7$?$H$-$O!"(B
 @code{gnus-check-new-newsgroups} $B$r(B @code{ask-server} $B$K!"(B
 @code{gnus-check-bogus-newsgroups} $B$r(B @code{nil} $B$K@_Dj$9$k$Y$-$G$7$g$&!#(B
-$B$3$NJQ?t$O=i4|@_Dj$G(B @code{t} $B$G$9!#(B
+$B$3$NJQ?t$O%G%#%U%)%k%H$G(B @code{t} $B$G$9!#(B
 @end table
 
 @node Slow Machine
-@subsection $BCY$$5!3#(B
+@subsection $BCY$$%^%7%s(B
 @cindex slow machine
 
-$B$b$7CY$$5!3#$r;}$C$F$$$k$+!"$b$7$/$OC1$KK\Ev$KG&BQNO$,$J$$;~$O!"(Bgnus $B$N(B
-$B/$7$"$j$^$9!#(B
+$BCY$$%^%7%s$r;}$C$F$$$k$+!"$^$?$OK\Ev$OC1$KG&BQNO$,L5$$$@$1$G$b!"(Bgnus $B$r(B
+$BB.$/Av$i$;$k$?$a$K$G$-$k$3$H$,>/$7$"$j$^$9!#(B
 
 $B5/F0$rB.$/$9$k$?$a$K(B @code{gnus-check-new-newsgroups} $B$*$h(B
 $B$S(B @code{gnus-check-bogus-newsgroups} $B$r(B @code{nil} $B$K@_Dj$7$F2<$5$$!#35(B
-$BN,%P%C%U%!$KF~$k;v$HH4$1$k;v$rB.$/$9$k$?$a(B
-$B$K(B @code{gnus-show-threads} $B$H(B @code{gnus-use-cross-reference}$B!"$=$l(B
+$BN,%P%C%U%!!<$KF~$k$3$H$HH4$1$k$3$H$rB.$/$9$k$?$a(B
+$B$K!"(B@code{gnus-show-threads} $B$H(B @code{gnus-use-cross-reference}$B!"$=$l(B
 $B$K(B @code{gnus-nov-is-evil} $B$r(B @code{nil} $B$K@_Dj$7$F2<$5$$!#(B
 
 @page
@@ -26124,68 +27086,65 @@ Gnus $B$,>o$K35N,%P%C%U%!$rCf?4:F@_Dj$r$9$k$3$H$r6X;_$9$k$?$a$K$3$l(B
 @section $BLdBj2r7h(B
 @cindex troubleshooting
 
-Gnus $B$OH"$+$i=P$7$F$9$0$K(B @emph{$BHs>o$K(B} $B$h$/F0:n$7$^$9(B---$B2?$bLdBj$N5/$3(B
-$B$k$3$H$OA[A|$G$-$^$;$s!"K\Ev$K!#(B
+gnus $B$OH"$+$i=P$7$F$9$0$K(B @emph{$BHs>o$K(B} $B$h$/F0:n$7$^$9(B---$B$I$s$JLdBj$,5/(B
+$B$-$k$3$H$bA[A|$G$-$^$;$s!"K\Ev$K!#(B
 
 $B%*%C%[%s!#(B
 
 @enumerate
-
 @item
-$B$"$J$?$N%3%s%T%e!<%?$N%9%$%C%A$,F~$C$F$$$k;v$r3N$+$a$F2<$5$$!#(B
+$B%3%s%T%e!<%?!<$NEE8;$,F~$C$F$$$k$3$H$r3N$+$a$F2<$5$$!#(B
 
 @item
-$BK\Ev$K8=9T$N(B gnus $BHG$rFI$_9~$s$G$$$k;v$r3NG'$7$F2<$5$$!#:#$^(B
-$B$G(B @sc{gnus} $B$rl9g$O!"8E$$(B @file{.el} $B%U%!%$%k$,;6$i$+$C$F$$$^$9!#$=$l$i$r(B
-$B>C$7$F2<$5$$!#(B
+@kbd{M-x gnus-version} $B$r;n$7$F2<$5$$!#$b(B
+$B$7(B @samp{T-gnus 6.17.4 (based on No Gnus v0.4; for SEMI 1.14, FLIM
+1.14)} $B$H$$$&$b$N$,=P$F$-$?$J$i!"@5$7$$%U%!%$%k$,FI$_9~$^$l$F$$$^$9!#$=(B
+$B$&$J$i$J$$$N$O8E$$(B @file{.el} $B%U%!%$%k$,;6$i$+$C$F$$$k$;$$$G$7$g$&!#$=$l(B
+$B$i$r>C$7$F2<$5$$!#(B
 
 @item
-@acronym{FAQ} $B$H(B how-to $B$rFI$`$?$a$K%X%k%W%0%k!<%W(B ($B%0%k!<%W%P%C%U%!(B
+@acronym{FAQ} $B$HF~Lg=q$rFI$`$?$a$K!"%X%k%W%0%k!<%W(B ($B%0%k!<%W%P%C%U%!!<(B
 $B$G(B @kbd{G h}) $B$rFI$s$G2<$5$$!#(B
 
 @item
 @vindex max-lisp-eval-depth
-Gnus $B$OB?$/$NB?$/$N:F5"9=B$$GF0:n$7!"2?$i$+$N6KC<$J(B ($B$=$7$FHs>o$K$^$l(B
-$B$J(B) $B;vNc$G$O!"(Bgnus $B$O:F5"$r(B ``$B$"$^$j$K?<$/(B'' $B9_$j$9$.$F!"(BEmacs $B$,$"$J$?(B
-$B$K%S!<%W2;$rLD$i$9;v$,$"$j$^$9!#$b$7$3$l$,5/$3$C$?$J$i!"(B
-@code{max-lisp-eval-depth} $B$r(B 500 $B$+$=$l$/$i$$$NCM$K@_Dj$7$F2<$5$$!#(B
+gnus $B$OB?$/$N:F5"9=B$$GF0:n$7$F$$$k$N$G!"2?$+6KC<$J(B ($B$=$7$FHs>o$K4u(B
+$B$J(B) $B>l9g$K$O!"(Bgnus $B$O:F5"$r!V$"$^$j$K?<$/!W9_$j$9$.$F$7$^$$!"(BEmacs $B$,$"(B
+$B$J$?$K%S!<%W2;$rLD$i$9$3$H$,$"$j$^$9!#$b$7$3$l$,5/$3$C$?$J$i!"(B
+@code{max-lisp-eval-depth} $B$r(B 500 $B$+$=$3$$$i$NCM$K@_Dj$7$F2<$5$$!#(B
 @end enumerate
 
-$B$b$7B>$NA4$F$,<:GT$7$?$J$i!"%P%0$H$7$FLdBj$rJs9p$7$F2<$5$$!#(B
+$B$b$7B>$N$9$Y$F$,<:GT$7$?$J$i!"%P%0$H$7$FLdBj$rJs9p$7$F2<$5$$!#(B
 
 @cindex bugs
 @cindex reporting bugs
-
 @kindex M-x gnus-bug
 @findex gnus-bug
-$B$b$7(B gnus $B$N%P%0$r8+$D$1$?$J$i!"L?Na(B @kbd{M-x gnus-bug} $B$K$h$C$F$=$l$rJs(B
-$B9p$9$k;v$,$G$-$^$9!#(B
-@kbd{M-x set-variable RET debug-on-error RET t RET} $B$H$7$F!"$=$l$+$i;d$K(B
-$B%P%C%/%H%l!<%9$rAw$C$F2<$5$$!#;d$O%P%0$r=$@5$7$h$&$H$7$^$9$,!"$"$J$?$,%P(B
-$B%0$r:F8=$5$;$kJ}K!$r@53N$K=q$$$F$/$l$?$H$-$N$_!"$=$l$r=$@5$9$k;v$,$G$-$^(B
-$B$9!#(B
+$B$b$7(B gnus $B$N%P%0$r8+$D$1$?$J$i!"(B@kbd{M-x gnus-bug} $BL?Na$GJs9p$9$k$3$H$,(B
+$B$G$-$^$9!#(B@kbd{M-x set-variable RET debug-on-error RET t RET} $B$H%?%$%W$7(B
+$B$F!";d$K%P%C%/%H%l!<%9$rAw$C$F2<$5$$!#;d$O%P%0$r=$@5$7$h$&$H$7$^$9$,!"$"(B
+$B$J$?$,%P%0$r:F8=$5$;$kJ}K!$r@53N$K=q$$$F$/$l$J$$$H!"$=$l$r=$@5$9$k$3$H$,(B
+$B$G$-$^$;$s!#(B
 
 $B%P%0Js9p$G$O!">\:Y$9$.$k$3$H$O7h$7$F$"$j$^$;$s!#%P%0Js9p$r$9$k$H$-$O!"$$(B
-$B$D$b(B @kbd{M-x gnus-bug} $BL?Na$r;H$C$F2<$5$$!#$=$l$r;H$&$?$S$K(B 10Kb $B$N%a!<(B
-$B%k$,$G$-$F$7$^$C$F$b!"$=$7$F$"$J$?$N4D6-$r0JA0;d$K(B 500 $B2sAw$C$?$H$7$F$b(B
-$B$G$9!#(B
-
-$B;d$O!"5-21$H$$$&o$K!"A4$F$r@bL@$7$9$.$F(B
-$B2<$5$$!#$=$l$O2f!9A4$F$K$H$C$F$b$C$H4JC1$K$J$j$^$9(B---$B$b$7;d$,I,MW$JA4$F(B
-$B$N>pJs$rF@$i$l$J$+$C$?$i!";d$O$"$J$?$K%a!<%k$rAw$C$F$5$i$J$k>pJs$r5a$a!"(B
-$B$=$N7k2LA4$F$,$h$jB?$/$N;~4V$rLL$7$F$$$kLdBj$,Hs>o$K;k3PE*$G!"$=$l$r>el(B
+$B$D$b(B @kbd{M-x gnus-bug} $BL?Na$r;H$C$F2<$5$$!#$=$l$r;H$&$?$S$K(B 10KB $B$N%a!<(B
+$B%k$,$G$-$F$7$^$C$F$b!"$=$7$F$"$J$?$N4D6-$N$3$H$r0JA0;d$K(B 500 $B2sAw$C$?$3(B
+$B$H$,$"$C$?$H$7$F$b$G$9!#(B
+
+$B;d$,$I$s$J$?$0$$$N5-21$b;}$C$F$$$J$$$3$H$r!"3P$($F$*$/$3$H$b=EMW$G$9!#$b(B
+$B$7$"$J$?$,%P%0Js9p$rAw$k$H!";d$OJVEz$rAw$j$^$9!#$=$N8e$G!"$"$J$?$,!V$$$d!"(B
+$B$=$&$8$c$J$$(B! $B$3$N$&$9$N$m$a$C(B!$B!W$H$@$1Aw$jJV$7$F$-$F$b!";d$O$"$J$?$,2?(B
+$B$K$D$$$F;d$rIn?+$7$F$$$k$+$,$o$+$j$^$;$s!#>o$K!"$9$Y$F$r@bL@$72a$.$F2<$5(B
+$B$$!#$=$l$O;d$?$A$9$Y$F$K$H$C$F!"$b$C$H$d$j0W$/$J$j$^$9(B---$B$b$7;d$,I,MW$J(B
+$B$9$Y$F$N>pJs$rF@$i$l$J$+$C$?$i!";d$O$"$J$?$K%a!<%k$rAw$C$F$5$i$J$k>pJs$r(B
+$B5a$a!"$=$N7k2L$9$Y$F$,$h$jB?$/$N;~4V$rHq$d$9$3$H$K$J$j$^$9!#(B
+
+$B$b$7$"$J$?$ND>LL$7$F$$$kLdBj$,Hs>o$K;k3PE*$G!"$=$l$r$&$^$/@bL@$G$-$J$$>l(B
 $B9g$O!"(BEmacs $B$N%&%#%s%I%&$r%U%!%$%k$K%3%T!<$7$F(B ($BNc$($P!"(B@kbd{xwd} $B$G(B)$B!"(B
 $B$=$l$r$I$3$+o$K$^$l(
 @cindex edebug
 $BLdBj$rJs9p$9$kA0$K$b$C$H%G%P%C%0$7$?$1$l$P!"$"$J$?<+?H$GLdBj$r2r7h$7$F%Q%C(B
 $B%A$rAw$k$?$a$K(B edebug $B$r;H$&$3$H$,$G$-$k$G$7$g$&!#(BLisp $B%3!<%I$N%G%P%C%0(B
-$B$K$D$$$F$O(B Elisp $B%^%K%e%"%k(B (@pxref{Debugging, , Debugging Lisp
-Programs, elisp, The GNU Emacs Lisp Reference Manual}) $B$K=q$+$l$F$$$^$9!#(B
-edebug $B$r;O$a$k$K$O!"$b$7(B @kbd{c} $B$r2!$7$?$H$-$K$"$kJQ$J?6Iq$$$,H/8+$5$l(B
-$B$k$J$i$P!"Bh0lJb$O(B @kbd{C-h k c} $B$r%?%$%W$7!"%I%-%e%a%s%F!<%7%g%s!&%P%C(B
-$B%U%!!H(B
-$B$9$k$3$H$G$9!#$=$7$F$=$N4X?tL>$N>l=j$G(B @kbd{M-x edebug-defun RET} $B$r%?%$(B
-$B%W$7$F(B gnus $B$KLa$j!"$=$N%3!<%I$r5/F0$9$k$?$a$K(B @kbd{c} $B$r2!$7$^$9!#(B
+$B$K$D$$$F$O(B ELisp $B%^%K%e%"%k(B (@pxref{Debugging, ,Debugging Lisp Programs,
+elisp, The GNU Emacs Lisp Reference Manual}) $B$K=q$+$l$F$$$^$9!#(Bedebug $B$r(B
+$B;O$a$k$K$O!"$b$7(B @kbd{c} $B$r2!$7$?$H$-$K$"$kJQ$J?6Iq$$$,H/8+$5$l$k$J$i$P!"(B
+$BBh0lJb$O(B @kbd{C-h k c} $B$r%?%$%W$7!"%I%-%e%a%s%F!<%7%g%s!&%P%C%U%!!H$9$k$3$H$G(B
+$B$9!#$=$7$F$=$N4X?tL>$N>l=j$G(B @kbd{M-x edebug-defun RET} $B$r%?%$%W$7(B
+$B$F(B gnus $B$KLa$j!"$=$N%3!<%I$r8F$S=P$9$?$a$K(B @kbd{c} $B$r2!$7$G2<$5$$!#(B
 Lisp $B%P%C%U%!!<$G$O!"(B@kbd{SPC} $B$G%7%s%0%k%9%F%C%WF0:n!"(B@kbd{M-:} $B$G<0$r(B
 $BI>2A!"(B@kbd{C-h v} $B$GJQ?t$r8!::!"(B@kbd{q} $B$Gl9g$K$O(B @kbd{M-x
 toggle-debug-on-quit} $B$r;H$C$F!"CY$/$J$C$?$H$-$K(B @kbd{C-g} $B$r2!$7!"$7$+(B
 $B$k8e$K%P%C%/%H%l!<%9$r2r@O$7$F2<$5$$(B ($B$=$NeEy$J$N>l=j$G40A4$KJ8=q2=$5$l$F$$$k$O$:$G$9$,!"$=(B
-$B$l$r;O$a$k$?$a$KI,MW$J/!9=q$$$F$*$-$^$7$g$&!#Bh0l$K!"%W%m%U%!%$%k(B
-$B$7$F$_$?$$(B gnus $B$NItJ,$r7WB,$9$k$?$a$N@_Dj$r!"Nc$($P(B @kbd{M-x
-elp-instrument-package RET gnus} $B$d(B @kbd{M-x elp-instrument-package RET
-message} $B$G9T$J$C$F2<$5$$!#$=$7$F!"CY$$F0:n$r9T$J$o$;$F$+$i(B @kbd{M-x
-elp-results} $B$r2!$7$^$7$g$&!#$9$k$H!"$I$NF0:n$,;~4V$r?)$C$F$$$k$+$r8+$F!"(B
-$B8e$G$=$l$i$r%G%P%C%0$9$k$3$H$,$G$-$^$9!#F0:nA4BN$,!"%W%m%U%!%$%i!<$N=PNO(B
-$B$NCf$G:G$bCY$$4X?t$GHq$d$5$l$?;~4V$h$j$O$k$+$KD9$/$+$+$k$N$O!"$?$V(B
-$B$s(B gnus $B$N4V0c$C$F$$$kItJ,$r%W%m%U%!%$%k$7$?$;$$$G$7$g$&!#%W%m%U%!%$%k$N(B
-$BE}7W$r%j%;%C%H$9$k$K$O(B @kbd{M-x elp-reset-all} $B$r;H$C$F2<$5$$!#(B@kbd{M-x
-elp-restore-all} $B$O%W%m%U%!%$%k$9$kF0:n$reEy$J$d$jJ}$O(B elisp $B%W%m%U%!%$%i!<(B ($BLuCm(B: $B%W%m%0%i%`$N(B
+$B$N>l=j$G40A4$KJ8=q2=$5$l$F$$$k$O$:$G$9$,!"$=$l$r;O$a$k$?$a$KI,MW$J/!9=q$$$F$*$-$^$7$g$&!#Bh0l$K!"%W%m%U%!%$%k$7$F$_$?$$(B gnus $B$NItJ,$r7WB,(B
+$B$9$k$?$a$N@_Dj$r!"Nc$($P(B @kbd{M-x elp-instrument-package RET
+gnus} $B$d(B @kbd{M-x elp-instrument-package RET message} $B$G9T$J$C$F2<$5$$!#(B
+$B$=$7$F!"CY$$F0:n$r9T$J$o$;$F$+$i(B @kbd{M-x elp-results} $B$r2!$7$^$7$g$&!#(B
+$B$9$k$H!"$I$NF0:n$,;~4V$r?)$C$F$$$k$+$r8+$F!"$=$l$i$r$5$i$K$^$?%G%P%C%0$9(B
+$B$k$3$H$,$G$-$^$9!#F0:nA4BN$,!"%W%m%U%!%$%i!<$N=PNO$NCf$G:G$bCY$$4X?t$GHq(B
+$B$d$5$l$?;~4V$h$j$O$k$+$KD9$/$+$+$k$N$O!"$?$V$s(B gnus $B$N4V0c$C$F$$$kItJ,$r(B
+$B%W%m%U%!%$%k$7$?$;$$$G$7$g$&!#%W%m%U%!%$%k$NE}7W$r%j%;%C%H$9$k$K(B
+$B$O(B @kbd{M-x elp-reset-all} $B$r;H$C$F2<$5$$!#(B@kbd{M-x elp-restore-all} $B$O(B
+$B%W%m%U%!%$%k$9$kF0:n$rH%,%$%I(B
+@section Gnus $B%j%U%!%l%s%9%,%$%I(B
 
-$B;d$N4j$$$O!"B>$NC/$+$,(B gnus $B$G$G$-$k2?$+8-$$$b$N$r9M$(=P$7!"$=$N>e$=$N8-(B
-$B$$$b$N$r=q$$$F$/$l$k$H$$$&$3$H$G$9!#$3$l$rMF0W$K$9$k$?$a$K$O!"(Bgnus $B$NFb(B
-$BItF0:n$r5-=R$9$k$N$,NI$$J}K!$@$m$&$H;d$O;W$$$^$7$?!#$"$H!"$=$s$J$KFbIt$8$c(B
-$B$J$$F0:n$r$$$/$D$+$H!";d$,:#$d$C$F$k$3$H$H!#(B
+$BC/$+$,(B gnus $B$G$G$-$k2?$+?h$J$b$N$KCN7C$rF/$+$;$F!"$=$N?h$J$b$N$r=q$$$F$b(B
+$B$/$l$k$3$H$,;d$N4j$$$G$9!#$=$l$rB%?J$9$k$?$a$K$O!"(Bgnus $B$NFbItF0:n$r@bL@(B
+$B$9$k$N$,NI$$$@$m$&$H;W$$$^$7$?!#$=$l$K!"$5$[$IFbIt$G$O$J$$F0:n$r$$$/$D$+(B
+$B$H!";d$,:#$d$C$F$$$k$3$H$b!#(B
 
-$B%W%m%0%i%`$NFbIt9=B$$,JQ99$5$l$k$3$H$O$J$$!"$J$I$H;W$C$F$O$$$1$^$;$s$,!"(B
-gnus $B$H$=$N%P%C%/%(%s%I4V$N%$%s%?!<%U%'!<%9(B ($B$3$l$O40A4$K5-=R$5$l$F$$(B
-$B$k(B) $B$d!"%9%3%"%U%!%$%k$N7A<0(B ($B$3$l$bF1MM(B)$B!"%G!<%?9=B$(B ($B$3$l$OB>$h$jJQ99(B
-$B$5$l$d$9$$$b$N$b$"$k(B)$B!"A`:nMQ$N0lHL%a%=%C%I!"$J$I$r(B ($B:YIt$K$o$?$C$F(B) $BDj(B
-$B5A$7$F$$$-$^$9!#(B
+$B%W%m%0%i%`$NFbIt$N;EMM$,JQ99$5$l$k$3$H$O$J$$!"$J$I$H;W$C$F$O$$$1$^$;$s$,!"(B
+gnus $B$H$=$N%P%C%/%(%s%I$N4V$N%$%s%?!<%U%'!<%9(B ($B$3$l$O40A4$K5-=R$5$l$F$$(B
+$B$^$9(B) $B$d!"%9%3%"%U%!%$%k$N7A<0(B ($BF1$8$/(B)$B!"%G!<%?9=B$(B ($B$3$l$OB>$N$b$N$[$I(B
+$B$K$OJQ99$5$l$J$$$G$7$g$&(B)$B!"$=$l$K0lHLE*$JA`:n$N%a%=%C%I$r!"(B($B:YIt$K$o$?$C(B
+$B$F(B) $BDj5A$7$F$$$-$^$9!#(B
 
 @menu
-* Gnus Utility Functions::      $B;HMQ$G$-$k6&DL$N4X?t$HJQ?t(B
-* Back End Interface::          Gnus $B$O$I$&$d$C$F%5!<%P!<$HDL?.$9$k$N$+(B
-* Score File Syntax::           $B%9%3%"%U%!%$%k5,3J$N(B BNF $BDj5A(B
-* Headers::                     Gnus $B$O%X%C%@!<$rFbItE*$K$I$N$h$&$K3JG<$9$k$+(B
+* Gnus Utility Functions::      $B6&DL$N4X?t$HJQ?t(B
+* Back End Interface::          gnus $B$O$I$&$d$C$F%5!<%P!<$HDL?.$9$k$N$+(B
+* Score File Syntax::           $B%9%3%"%U%!%$%kI8=`$N(B BNF $BDj5A(B
+* Headers::                     gnus $B$O%X%C%@!<$rFbItE*$K$I$N$h$&$K3JG<$9$k$+(B
 * Ranges::                      $B$?$/$5$s$N?t$r3JG<$9$kJXMx$J7A<0(B
-* Group Info::                  $B%0%k!<%W>pJs7A<0(B
-* Extended Interactive::        $B5-9f@\F,<-$J$I(B
-* Emacs/XEmacs Code::           Gnus $B$OA4$F$N6aBe(B Emacsen $B$GF0:n$9$k(B
-* Various File Formats::        Gnus $B$N;HMQ$9$k%U%!%$%k$N7A<0(B
+* Group Info::                  $B%0%k!<%W>pJs$N7A<0(B
+* Extended Interactive::        $B%7%s%\%k@\F,0z?t$J$I(B
+* Emacs/XEmacs Code::           gnus $B$O$9$Y$F$N:G?7$N(B Emacsen $B$GF0:n$9$k(B
+* Various File Formats::        gnus $B$,;HMQ$9$k%U%!%$%k$N7A<0(B
 @end menu
 
 @node Gnus Utility Functions
-@subsection Gnus $B$NM-MQ$J4X?t(B
-@cindex Gnus utility functions
+@subsection gnus $B$NM-MQ$J4X?t(B
+@cindex gnus utility functions
 @cindex utility functions
 @cindex functions
 @cindex internal variables
 
-$B%U%C%/$J$I$+$i.$5$J4X?t$r=q$/$H$-$O!"(Bgnus $B$NFbIt4X?t(B
-$B$dJQ?t$K%"%/%;%9$9$k$3$H$O@dBPI,MW$G$9!#0J2<$,:G$b$h$/;H$o$l$k$b(B
-$B$N$N0lMw$G$9!#(B
+$B%U%C%/$J$I$+$i.$5$J4X?t$r=q$/$H$-$O!"(Bgnus $B$NFbIt4X?t$dJQ?t$K(B
+$B%"%/%;%9$9$k$3$H$,@dBP$KI,MW$G$9!#0J2<$,:G$b$h$/;H$o$l$k$b$N$N0lMw$G$9!#(B
 
 @table @code
 @item gnus-newsgroup-name
 @vindex gnus-newsgroup-name
-$B$3$NJQ?t$O8=:_$N%K%e!<%9%0%k!<%W$NL>A0$rJ];}$7$F$$$^$9!#(B
+$B$3$NJQ?t$O8=:_$N%K%e!<%9%0%k!<%W$NL>A0$r;}$C$F$$$^$9!#(B
 
 @item gnus-find-method-for-group
 @findex gnus-find-method-for-group
@@ -26288,52 +27248,52 @@ gnus $B$H$=$N%P%C%/%(%s%I4V$N%$%s%?!<%U%'!<%9(B ($B$3$l$O40A4$K5-=R$5$l$F$$(
 
 @item gnus-group-real-name
 @findex gnus-group-real-name
-$B@55,$N(B ($B@\F,<-IU$-$N(B) gnus $B%0%k!<%WL>$rA0(B
-$B$rJV$7$^$9!#(B
+$B@55,$N(B ($B@\F,8lIU$-$N(B) gnus $B%0%k!<%WL>$rA0$rJV(B
+$B$7$^$9!#(B
 
 @item gnus-group-prefixed-name
 @findex gnus-group-prefixed-name
-$B@\F,<-L5$7$N%0%k!<%WL>$HA*BrJ}K!$r$rJV$7$^$9!#(B
+$B@\F,8l$,L5$$%0%k!<%WL>$HA*BrJ}K!$r$rJV$7$^$9!#(B
 
 @item gnus-get-info
 @findex gnus-get-info
-@var{group} $B$N%0%k!<%W>pJs0lMw$rJV$7$^$9!#(B
+@var{group} $B$N%0%k!<%W>pJs$N%j%9%H$rJV$7$^$9!#(B
 
 @item gnus-group-unread
 @findex gnus-group-unread
-@var{group} $B$NL$FI5-;v$N?t$+!"$b$7$/$O$=$l$,J,$+$i$J$$>l9g$O(B @code{t} $B$G(B
-$B$9!#(B
+@var{group} $B$NL$FI5-;v$N?t$+!"$=$l$,J,$+$i$J$$>l9g$O(B @code{t} $B$rJV$7$^$9!#(B
 
 @item gnus-active
 @findex gnus-active
-@var{group} $B$N3hF0EPO?$G$9!#(B
+@var{group} $B$K4X$9$k%"%/%F%#%V%U%!%$%k$N9`L\$rJV$7$^$9!#(B
 
 @item gnus-set-active
 @findex gnus-set-active
-@var{group} $B$K3hF0EPO?$r@_Dj$7$^$9!#(B
+@var{group} $B$K4X$9$k%"%/%F%#%V%U%!%$%k$N9`L\$r@_Dj$7$^$9!#(B
 
 @item gnus-add-current-to-buffer-list
 @findex gnus-add-current-to-buffer-list
-Gnus $B=*N;;~$K>C5n$9$k%P%C%U%!$N0lMw$K8=:_$N%P%C%U%!$rDI2C$7$^$9!#(B
-
-@item gnus-continuum-version
-@findex gnus-continuum-version
-$B0z?t$H$7$F(B gnus $B$N%P!<%8%g%sJ8;zNs$r.?tE@?t$rJV$7(B
-$B$^$9!#8E$$%P!<%8%g%s$OI,$:?7$7$$%P!<%8%g%s$h$j$b>.$5$$?t$K$J$j$^(B
-$B$9!#(B
+gnus $B$r=*N;$9$k$H$-$K>C5n$9$k%P%C%U%!!<$N%j%9%H$K!"8=:_$N%P%C%U%!!<$rDI(B
+$B2C$7$^$9!#(B
+@c
+@c @item gnus-continuum-version
+@c @findex gnus-continuum-version
+@c Takes a Gnus version string as a parameter and returns a floating point
+@c number.  Earlier versions will always get a lower number than later
+@c versions.
 
 @item gnus-group-read-only-p
 @findex gnus-group-read-only-p
-@var{group} $B$,FI$_=P$7@lMQ$G$"$k$+$I$&$+$r<($7$^$9!#(B
+@var{group} $B$,FI$_=P$7@lMQ$+$I$&$+$r<($7$^$9!#(B
 
 @item gnus-news-group-p
 @findex gnus-news-group-p
-@var{group} $B$,%K%e!<%9%P%C%/%(%s%I$G$"$k$+$I$&$+$r<($7$^$9!#(B
+@var{group} $B$,%K%e!<%9%P%C%/%(%s%I$+$I$&$+$r<($7$^$9!#(B
 
 @item gnus-ephemeral-group-p
 @findex gnus-ephemeral-group-p
-@var{group} $B$,C;4|%0%k!<%W$G$"$k$+$I$&$+$r<($7$^$9!#(B
+@var{group} $B$,0l;~%K%e!<%9%0%k!<%W$+$I$&$+$r<($7$^$9!#(B
 
 @item gnus-server-to-method
 @findex gnus-server-to-method
@@ -26341,37 +27301,39 @@ Gnus $B=*N;;~$K>C5n$9$k%P%C%U%!$N0lMw$K8=:_$N%P%C%U%!$rDI2C$7$^$9!#(B
 
 @item gnus-server-equal
 @findex gnus-server-equal
-$BFs$D$N2>A[%5!<%P!<$,F10l$N$b$N$G$"$k$+$I$&$+$r<($7$^$9!#(B
+$BFs$D$N2>A[%5!<%P!<$,F10l$+$I$&$+$r<($7$^$9!#(B
 
 @item gnus-group-native-p
 @findex gnus-group-native-p
-@var{group} $B$,4pK\%0%k!<%W$G$"$k$+$I$&$+$r<($7$^$9!#(B
+@var{group} $B$,4pK\%0%k!<%W$+$I$&$+$r<($7$^$9!#(B
 
 @item gnus-group-secondary-p
 @findex gnus-group-secondary-p
-@var{group} $B$,FsC5n$9$k%P%C%U%!$N0lMw$K8=:_$N%P%C%U%!$rDI2C$7$^$9!#(B
 
 @item gnus-read-method
 @findex gnus-read-method
-$BMxMQA[%0%k!<%W$K$D$$$F$O2?$K$b(B
-$BCN$j$^$;$s!#$?$@2>A[%5!<%P!<(B @dfn{virtual servers} $B$HBPOC$9$kJ}K!$rCN$C(B
-$B$F$$$k$@$1$G$9!#2>A[%5!<%P!<$O%P%C%/%(%s%I(B @dfn{back end} $B$H$$$/$D$+$N%P%C(B
+gnus $B$O(B @acronym{NNTP} $B$d%9%W!<%k!"%a!<%k!"2>A[%0%k!<%W$K$D$$$F$O2?$bCN(B
+$B$j$^$;$s!#$?$@2>A[%5!<%P!<(B @dfn{virtual servers} $B$HBPOC$9$kJ}K!$rCN$C$F(B
+$B$$$k$@$1$G$9!#2>A[%5!<%P!<$O%P%C%/%(%s%I(B @dfn{back end} $B$H$$$/$D$+$N%P%C(B
 $B%/%(%s%IJQ?t(B @dfn{back end variables} $B$+$i$J$j$^$9!#A0pJs$rMW5a$9$k$H(B
-$B$-$O!"DL>o4X?t$N0z?t$H$7$F2>A[%5!<%P!$r4^$a$^$9!#(B($B$b$7$J$1$l$P!"%P%C(B
-$B%/%(%s%I$O(B ``$B8=:_$N(B'' $B2>A[%5!<%P!<$r;HMQ$7$^$9!#(B) $BNc$($P!"(B
-@code{nntp-request-list} $B$O$=$NM#0l$N(B ($B>JN,2DG=$J(B) $B0z?t$H$7$F2>A[%5!<%P!<(B
-$B$rA[%5!<%P!<$,3+$+$l$F$$$J$1$l$P!"$3$N4X?t$O<:GT$7$^(B
-$B$9!#(B
+gnus $B$,%P%C%/%(%s%I(B---$BNc$($P(B @code{nntp}---$B$K2?$+$N>pJs$rMW5a$9$k$H$-!"(B
+$BDL>o$O4X?t$N0z?t$H$7$F2>A[%5!<%P!$r4^$a$^$9!#(B($BL5$$>l9g$O!"%P%C%/%(%s(B
+$B%I$O!V8=:_$N!W2>A[%5!<%P!<$r;H$&$Y$-$G$9!#(B) $BNc$((B
+$B$P(B @code{nntp-request-list} $B$O!"$=$NM#0l$N(B ($B>JN,2DG=$J(B) $B0z?t$H$7$F2>A[%5!<(B
+$B%P!<$r;H$$$^$9!#$b$7$3$N2>A[%5!<%P!<$H$N@\B3$,3+$+$l$F$$$J$$$H!"$3$N4X?t(B
+$B$NA[%5!<%P!$O!"J*M}E*$J%5!<%P!$H$O2?$N4X78$bL5$$$3$H$KCm0U$7$F$/$@(B
-$B$5$$!#$3$NNc$r8+$F$/$@$5$$!#(B
+$B2>A[%5!<%P!$O!"J*M}E*$J%5!<%P!$H$O2?$N4X78$bL5$$$3$H$KCm0U$7$F2<$5(B
+$B$$!#Nc$r5s$2$^$7$g$&(B:
 
 @lisp
 (nntp "odd-one"
@@ -26409,48 +27371,48 @@ Gnus $B$,%P%C%/%(%s%I(B --- $BNc$($P(B @code{nntp} --- $B$K2?$+$N>pJs$rMW5a
       (nntp-port-number 4324))
 @end lisp
 
-$B$3$3$G!"J*M}%5!<%P!$O(B @samp{ifi.uio.no} $B$G$"$k$N$KBP$7!"2>A[%5!<%P!<(B
+$B$3$3$GJ*M}%5!<%P!$O(B @samp{ifi.uio.no} $B$G$"$k$N$KBP$7$F!"2>A[%5!<%P!<(B
 $BL>$O(B @samp{odd-one} $B$G$9!#(B
 
-$B%P%C%/%(%s%I$OJ#?t$N2>A[%5!<%P!<$r@Z$jBX$(2DG=$G$J$1$l$P$J$j$^$;$s!#I8=`(B
-$B$N%P%C%/%(%s%I$O$3$l$r!"2>A[%5!<%P!<4D6-$rI,MW$J$H$-$Ko$K3NG'$9$kG$0U4X?t(B @dfn{optional functions} $B$G$9!#(B
-
-$B$3$l$i$N4X?t$OA4$F!"JV5Q%G!<%?(B
-$B$r(B @code{nntp-server-buffer} (@samp{*nntpd*}) $B%P%C%U%!!<$KJV$9$3$H$,5a$a(B
-$B$i$l$^$9!#$3$l$O$A$g$C$HIT1?$JL>A0IU$1$G$9$,!"$3$l$G2fK}$7$J$1$l$P$J$j$^(B
-$B$;$s!#;d$,7k2L$N%G!<%?(B @dfn{resulting data} $B$H8@$C$?$H$-$O!"$=$N%P%C%U%!!<(B
-$B$NCf$N%G!<%?$r;X$7$F$$$^$9!#JV5QCM(B @dfn{return value} $B$H8@$C$?$H$-$O!"4X(B
-$B?t8F$S=P$7$K$h$C$FJV$5$l$k4X?t$NCM$N$3$H$r8@$C$F$$$^$9!#4X?t$,<:GT$7$?$H(B
-$B$-$OJV5QCM$H$7$F(B@code{nil} $B$rJV$5$J$/$F$O$$$1$^$;$s!#(B
-
-$B%P%C%/%(%s%I$K$O%5!<%P!<7A<0(B @dfn{server-forming} $B$N%P%C%/%(%s%I$G$"$k$H(B
-$B8F$P$l$k$b$N$,$"$j!"$^$?$=$&8F$P$l$J$$$b$N$b$"$j$^$9!#8epJs$rG[Aw$9$k$b$N(B
+$B%P%C%/%(%s%I$OJ#?t$N2>A[%5!<%P!<$r@Z$jBX$($k$3$H$,$G$-$J$1$l$P$J$j$^$;$s!#(B
+$BI8=`$N%P%C%/%(%s%I$O!"I,MW$J$H$-$K2>A[%5!<%P!<$N4D6-$ro$K(B gnus $B$,3NG'$9$kG$0U4X?t(B @dfn{optional functions} $B$G$9!#(B
+
+$B$3$l$i$9$Y$F$N4X?t$O!"$=$NLa$jCM$N%G!<%?$r(B @code{nntp-server-buffer}
+(@samp{*nntpd*}) $B%P%C%U%!!<$KJV$9$3$H$,5a$a$i$l$^$9!#$3$l$O$A$g$C$HIT1?(B
+$B$JL>A0IU$1$G$9$,!"$3$l$G2fK}$7$J$1$l$P$J$j$^$;$s!#;d$,7k2L$N%G!<(B
+$B%?(B @dfn{resulting data} $B$H8@$C$?$H$-$O!"$=$N%P%C%U%!!<$NCf$N%G!<%?$r;X$7(B
+$B$F$$$^$9!#La$jCM(B @dfn{return value} $B$H8@$C$?$H$-$O!"4X?t8F$S=P$7$K$h$C$F(B
+$BJV$5$l$k4X?t$NCM$N$3$H$r8@$C$F$$$^$9!#4X?t$,<:GT$7$?$H$-$O!"La$jCM$H$7(B
+$B$F(B @code{nil} $B$rJV$5$J$/$F$O$$$1$^$;$s!#(B
+
+$B%P%C%/%(%s%I$K$O%5!<%P!<7?(B @dfn{server-forming} $B$N%P%C%/%(%s%I$H8F$P$l$k(B
+$B$b$N$,$"$j!"$^$?$=$&8F$P$l$J$$$b$N$b$"$j$^$9!#8epJs$rG[Aw$9$k$b$N(B
 $B$G!"$=$l0J>e$N$b$N$G$O$"$j$^$;$s!#(B
 
-Gnus $B$O%0%k!<%WL>$H5-;vHV9f$K$h$C$F$=$l$>$l$N%a%C%;!<%8$rFCDj$7$^$9!#$=(B
-$B$l$i5-;vHV9f$K4X$9$k$A$g$C$H$7$?@bL@$r$9$k$3$H$OM-1W$+$b$7$l$^$;$s!#$^$:(B
-$BBh0l$K!"$=$N?t;z$O@5$N@0?t$G$9!#BhFs$K!"(BGnus $B$r:.Mp$5$;$k$3$H$J$/8E$$5-(B
-$B;vHV9f$r8e$G(B ``$B:F;HMQ(B'' $B$9$k$3$H$OIaDL$O$G$-$^$;$s!#$=$l$O!"$b$7$"$k%0%k!<(B
-$B%W$,$+$D$F(B 42 $BHV$N5-;v$r;}$C$F$$$?$H$7$?$i!"$=$NHV9f$GB>$N5-;v$r;}$D$3$H(B
-$B$O$G$-$J$$$+!"$^$?$O(B Gnus $B$,:.Mp$7$F$7$^$&$+$b$7$l$J$$$H$$$&$3$H$G$9!#(B
-@footnote{See the function @code{nnchoke-request-update-info},
-@ref{Optional Back End Functions}$B!#(B} $BBh;0$K!"5-;vHV9f$O$=$N%0%k!<%W$G$N(B
-$BE~Ce=g$K$J$C$F$$$J$1$l$P$J$i$J$$$3$H$G$9!#$H$O8@$(%a%C%;!<%8$NF|IU$bE~Ce(B
-$B=g$G$"$kI,MW$O$"$j$^$;$s$,!#(B
+gnus $B$O%0%k!<%WL>$H5-;vHV9f$K$h$C$F!"$=$l$>$l$N%a%C%;!<%8$rFCDj$7$^$9!#(B
+$B$=$l$i5-;vHV9f$K4X$9$k$A$g$C$H$7$?@bL@$r$9$k$3$H$OM-1W$+$b$7$l$^$;$s!#$^(B
+$B$:Bh0l$K!"$=$N?tCM$O@5$N@0?t$G$9!#BhFs$K(B gnus $B$r:.Mp$5$;$k$3$H$J$/8E$$5-(B
+$B;vHV9f$r!"8e$G!V:F;HMQ!W$9$k$3$H$OIaDL$O$G$-$^$;$s!#$9$J$o$A!"$b$7$"$k%0(B
+$B%k!<%W$K$+$D$F(B 42 $BHV$N5-;v$,$"$C$?$H$7$?$i!"JL$N5-;v$,$=$NHV9f$r;}$D$3$H(B
+$B$,$G$-$J$$$+!"$^$?$O(B gnus $B$,7c$7$/:.Mp$7$F$7$^$&$H$$$&$3$H$G$9!#(B
+@footnote{@code{nnchoke-request-update-info} $B4X?t$N@bL@$r8+$F2<$5$$!#(B
+@xref{Optional Back End Functions}.} $BBh;0$K!"5-;vHV9f$O$=$N%0%k!<%W$G$N(B
+$BE~Ce=g$K$J$C$F$$$J$1$l$P$J$i$J$$$3$H$G$9!#%a%C%;!<%8$NF|IU$b!"I,$:E~Ce=g(B
+$B$K$J$C$F$$$k$o$1$G$O$"$j$^$;$s$,!#(B
 
 $B$9$G$KA0$N@a$G!"5-;vHV9f$O0l2s;H$o$l$?$@$1$GLrL\$r=*$o$i$J$1$l$P$J$i$J(B
-$B$$(B ``$B87$7$$(B'' $B@)8B$K$D$$$F@bL@$7$^$7$?!#$7$+$7!"5-;vHV9f$NJB$S$KH4$1$,$"(B
-$B$k$H(B Gnus $B$O$H$F$b:.Mp$7$F$7$^$&$N$G!"(B@emph{$BDL$7(B} $BHV9f$rIU$1$k$3$H$,M-MQ(B
-$B$J$N$+$b$7$l$^$;$s!#$?$@$7(B ``$B:F;HMQIT2D(B'' $B$N@)8B$,$"$k$N$G!"$$$D$G$bHV9f(B
-$B$NH4$1$r2sHr$G$-$k$H$O8B$j$^$;$s!#$^$?!"2DG=$J8B$j5-;vHV9f$r(B 1 $B$+$i;O$a(B
-$B$k$3$H$O!"HV9f$r;H$$@Z$C$F$7$^$&$3$H$rHr$1$k$?$a$KLrN)$A$^$9!#(B
+$B$$!V87$7$$!W@)8B$K$D$$$F@bL@$7$^$7$?!#$7$+$7!"5-;vHV9f$NJB$S$KH4$1$,$"$k(B
+$B$H(B gnus $B$O$H$F$b:.Mp$7$F$7$^$&$N$G!"O"B3$7$?(B @emph{$BDL$7(B} $BHV9f$rIU$1$k$3(B
+$B$H$,M-MQ$J$N$+$b$7$l$^$;$s!#$?$@$7!V:F;HMQIT2D!W$N@)8B$,$"$k$N$G!"40A4$K(B
+$BHV9f$NH4$1$r2sHr$G$-$k$H$O8B$j$^$;$s!#$^$?!"2DG=$J8B$j5-;vHV9f$r(B 1 $B$+$i(B
+$B;O$a$k$3$H$O!"HV9f$r;H$$@Z$C$F$7$^$&$3$H$rHr$1$k$?$a$KLrN)$A$^$9!#(B
 
 $B47Nc$H$7$F!"%P%C%/%(%s%I$O(B @code{nn$B$J$s$?$i(B} $B$HL>IU$1$i$l$^$9$,!"(B
 gnus $B$K$O(B @file{nnheader.el}$B!"(B@file{nnmail.el} $B$*$h$S(B @file{nnoo.el} $B$N(B
@@ -26463,12 +27425,12 @@ gnus $B$K$O(B @file{nnheader.el}$B!"(B@file{nnmail.el} $B$*$h$S(B @file{nn
 @cindex @code{nnchoke}
 
 @menu
-* Required Back End Functions::  $BJ,$J%X%C(B
-$B%@!<(B'' $B$ro!"(B@code{articles} $B$NCf$N:G>.HV9f(B
-$B$N5-;v$h$j$b>.$5$$5-;v$+$i(B ($B>/$J$/$H$b(B) @var{fetch-old} $B8D$NM>J,$J%X%C%@!<(B
-$B$r$&(B
-$B$3$H$rHQ$o$7$$$H;W$C$?>l9g$K$O!"$3$N%Q%i%a!<%?$NB8:_$OL5;k$5$l$k$3$H$b$"(B
-$B$j$^$9!#$3$NCM$,(B @code{nil} $B$G$b?t;z$G$b$J$1$l$P!":GBg8B$N(B
+$BJ}%5%]!<%H$9$k$3$H$KEX$a$k$Y$-$G$9!#(B
 
-$B$3$l$,(B HEAD $B$NNc$G$9!#(B
+$B7k2L$N%G!<%?$O(B HEADs $B$+(B @acronym{NOV} $B9T$N$$$:$l$+$G$"$k$Y$-$G!"La$jCM$O(B
+$B$3$l$rH?1G$7$?(B @code{headers} $B$+(B @code{nov} $B$N$I$A$i$+$G$J$1$l$P$J$j$^$;(B
+$B$s!#$3$l$O:#8e!"(BHEADs $B$H(B @acronym{NOV} $B9T$,:.:_$9$k(B @code{various} $B$K3H(B
+$BD%$5$l$k$+$b$7$l$^$;$s$,!"8=:_$N(B gnus $B$G$O%5%]!<%H$5$l$F$$$^$;$s!#(B
+
+@var{fetch-old} $B$,(B @code{nil} $B$G$O$J$+$C$?$i!"$"$k0UL#$G$N!VM>J,$J%X%C(B
+$B%@!o!"(B@code{articles} $B$NCf$N:G>.HV9f$N(B
+$B5-;v$h$j$b>.$5$$HV9f$r;}$C$F$$$k(B ($B:GBg$G(B) @var{fetch-old} $B8D$N5-;v$H!"(B
+@code{articles} $B$NCf$G7gHV$K$J$C$F$$$k5-;v$N!"M>J,$J%X%C%@!<$r$&$3$H$rHQ$o$7$$$H;W$C$?>l9g$K$O!"$3$N%Q%i(B
+$B%a!<%?!<$NB8:_$OL5;k$5$l$k$3$H$b$"$j$^$9!#$3$NCM$,(B @code{nil} $B$G$b?tCM$G(B
+$B$b$J$+$C$?$i!":GBg8B$N eol
 @cindex BNF
 ($B$3$3$G;H$C$?(B BNF $B$NHG$O(B RFC822 $B$G;H$o$l$F$$$k$b$N$G$9!#(B)
 
-$B$b$7JV5QCM$,(B @code{nov} $B$G$"$l$P!"%G!<%?%P%C%U%!!<$K(B
-$B$O(B @dfn{network overview database} $B9T$,4^$^$l$F$J$/$F$O$J$j$^$;$s!#(B
-$B$3$l$O4pK\E*$K$OJ#?t$NMs$r%?%V$G6h@Z$C$?$b$N$G$9!#(B
+$BLa$jCM$,(B @code{nov} $B$@$C$?>l9g$O!"%G!<%?%P%C%U%!!<$K(B
+$B$O(B @dfn{network overview database} $B9T$,4^$^$l$F$$$J$1$l$P$J$j$^$;$s!#$3(B
+$B$l$O4pK\E*$K$OJ#?t$NMs$r%?%V$G6h@Z$C$?$b$N$G$9!#(B
 
 @example
 nov-buffer = *nov-line
@@ -26539,94 +27502,94 @@ nov-line   = field 7*8[  field ] eol
 field      = 
 @end example
 
-$B$3$l$i$NMs$K$I$N$h$&$J$b$N$,4^$^$l$k$+$r$h$j>\$7$/8+$?$1$l$P!"(B
-@ref{Headers} $B$r;2>H$7$F$/$@$5$$!#(B
+$B$3$l$i$NMs$K2?$,4^$^$l$k$Y$-$+$r$-$A$s$HD4$Y$?$$$N$J$i$P!"(B
+@ref{Headers} $B$r;2>H$7$F2<$5$$!#(B
 
 @item (nnchoke-open-server SERVER &optional DEFINITIONS)
 
-$B$3$3$G$N(B @var{server} $B$O2>A[%5!<%P!$G$9!#(B@var{definitions} $B$O(B
-$B$3$N2>A[%5!<%P!<$rDj5A$9$k(B @code{(VARIABLE VALUE)} $BAH$N%j%9%H$G(B
-$B$9!#(B
+$B$3$3$G$N(B @var{server} $B$O2>A[%5!<%P!$G$9!#(B@var{definitions} $B$O$3$N2>A[(B
+$B%5!<%P!<$rDj5A$9$k(B @code{(VARIABLE VALUE)} $B$NAH$N%j%9%H$G$9!#(B
 
-$B$b$7%5!<%P!<$r3+$/$3$H$,$G$-$J$1$l$P!"%(%i!<$O%7%0%J%k$G$ODLCN$5(B
-$B$l$^$;$s!#$=$7$F%P%C%/%(%s%I$O!"$=$l0J8e$N$3$N%5!<%P!<$X$N@\B3MW(B
-$B5a$r5qH]$9$k$3$H$b$G$-$^$9!#l9g$G$b!"%(%i!<$r%7%0%J%k$7$F=hM}$rCfCG$7$F$O(B
+$B$$$1$^$;$s!#%P%C%/%(%s%I$O!"$3$l0J8e$5$i$K$3$N%5!<%P!<$K@\B3$7$h$&$H$9$k(B
+$B;n$_$r!"5qH]$9$k$3$H$rA*$V$3$H$,$G$-$^$9!#l9g$K$O!"$3$N4X?t$O(B @code{nil} $B$G$O$J(B
+$B$$CM$rJV$5$J$1$l$P$J$j$^$;$s!#$3$N$H$-!"JV$5$l$k7k2L$N%G!<%?$O$"$j$^$;$s!#(B
 
 @item (nnchoke-close-server &optional SERVER)
 
-@var{server} $B$X$N@\B3$rJD$8!"$3$l$K4XO"$9$k$9$Y$F$N;q8;$r3+J|$7(B
-$B$^$9!#$b$72?$i$+$NM}M3$G%5!<%P!<$rJD$8$k$3$H$,$G$-$J$1$l$P!"(B
-@code{nil} $B$rJV5Q$7$^$9!#(B
+@var{server} $B$H$N@\B3$rJD$8$F!"$3$l$K4XO"$9$k$9$Y$F$N%j%=!<%9$r3+J|$7$^(B
+$B$9!#$b$72?$i$+$NM}M3$G%5!<%P!<$rJD$8$k$3$H$,$G$-$J$$>l9g$O!"(B
+@code{nil} $B$rJV$7$^$9!#(B
 
 $BJV$5$l$k7k2L$N%G!<%?$O$"$j$^$;$s!#(B
 
 @item (nnchoke-request-close)
 
-$BA4$F$N%5!<%P!<$N@\B3$rJD$8!"%P%C%/%(%s%I$,J]M-$7$F$$$kA4$F$N;q8;(B
-$B$r3+J|$7$^$9!#$3$N%P%C%/%(%s%I$K$h$C$F:n@.$5$l$?%P%C%U%!$OA4$F:o(B
-$B=|$5$l$^$9!#(B(@code{nntp-server-buffer} $B$O:o=|$5$l$^$;$s$,!#(B) $B$3(B
-$B$N4X?t$ODL>o!"(Bgnus $B$,=*N;$9$k$H$-$K$N$_8F$S=P$5$l$^$9!#(B
+$B$9$Y$F$N%5!<%P!<$H$N@\B3$rJD$8$F!"%P%C%/%(%s%I$,J]M-$7$F$$$?$9$Y$F$N%j%=!<(B
+$B%9$r3+J|$7$^$9!#$3$N%P%C%/%(%s%I$K$h$C$F:n$i$l$?$9$Y$F$N%P%C%U%!!<$r:o=|(B
+$B$7$J$1$l$P$J$j$^$;$s!#(B($B$b$C$H$b(B @code{nntp-server-buffer} $B$O:o=|$5$l$^$;(B
+$B$s$,!#(B) $BIaDL$3$N4X?t$O(B gnus $B$,=*N;$9$k$H$-$K$N$_8F$S=P$5$l$^$9!#(B
 
 $BJV$5$l$k7k2L$N%G!<%?$O$"$j$^$;$s!#(B
 
 @item (nnchoke-server-opened &optional SERVER)
 
-$B$b$7(B @var{server} $B$,8=:_$N2>A[%5!<%P!<$G!"$=$NJ*M}%5!<%P!<$X$N@\(B
-$BB3$,@8$-$F$$$l$P!"$3$N4X?t$O(B @code{nil} $B0J30$NCM$rJV$7$^$9!#$3$N(B
-$B4X?t$O$I$s$J>l9g$G$b!"@\B3$,<:$o$l$?%5!<%P!<$X$N:F@\B3$r9T$J$&$3(B
-$B$H$O$"$j$^$;$s!#(B
+@var{server} $B$,8=:_$N2>A[%5!<%P!<$G!"$+$D$=$NJ*M}%5!<%P!<$X$N@\B3$,@8$-(B
+$B$F$$$k>l9g!"$3$N4X?t$O(B @code{nil} $B$G$O$J$$CM$rJV$5$J$1$l$P$J$j$^$;$s!#$I(B
+$B$s$J>u67$G$b!"$3$N4X?t$O@\B3$,<:$o$l$?%5!<%P!<$X$N:F@\B3$r;n$_$F$O$$$1$^(B
+$B$;$s!#(B
 
 $BJV$5$l$k7k2L$N%G!<%?$O$"$j$^$;$s!#(B
 
 @item (nnchoke-status-message &optional SERVER)
 
-$B$3$N4X?t$O(B @var{server} $B$+$i$N:G8e$N%(%i!<%a%C%;!<%8$rJV5Q$7$^$9!#(B
+$B$3$N4X?t$O(B @var{server} $B$+$i$N:G8e$N%(%i!<%a%C%;!<%8$rJV$7$^$9!#(B
 
 $BJV$5$l$k7k2L$N%G!<%?$O$"$j$^$;$s!#(B
 
 @item (nnchoke-request-article ARTICLE &optional GROUP SERVER TO-BUFFER)
 
-$B$3$N4X?t$N7k2L$N%G!<%?$O!"(B@var{article} $B$G;XDj$5$l$?5-;v$G$9!#$3$N;XDj(B
-$B$O(B @code{Message-ID} $B$+HV9f$N$$$:$l$+$G$9!#(B@code{Message-ID} $B$K$h$k5-;v(B
-$B$No$N%G!<%?%P%C(B
-$B%U%!$NBe$o$j$K!"$3$N%P%C%U%!$KJV$5$l$^$9!#$3$l$K$h$jB?NL$N%G!<%?$r$"$k%P%C(B
-$B%U%!$+$iJL$N%P%C%U%!$K%3%T!<$9$k$3$H$rHr$1$k$3$H$,$G$-!"$=$7$F(B gnus $B$ODL(B
-$B>o!"5-;v%P%C%U%!$KD>@\5-;v$rA^F~$9$k$h$&$KMW5a$7$F$$$^$9!#(B
+@var{to-buffer} $B$,(B @code{nil} $B$G$O$J$+$C$?$i!"7k2L$N%G!<%?$ODL>o$N%G!<%?(B
+$B%P%C%U%!!<$NBe$o$j$K!"$3$N%P%C%U%!!<$KJV$5$J$1$l$P$J$j$^$;$s!#(Bgnus $B$O@\5-;v$rA^F~$9$k$h$&$KMW5a$7$^$9$,!"$3$l$K$h$C$F!"(B
+$BB?NL$N%G!<%?$r$"$k%P%C%U%!!<$+$iJL$N%P%C%U%!!<$K%3%T!<$9$k$N$rHr$1$k$3$H(B
+$B$,2DG=$K$J$j$^$9!#(B
 
-$B$b$72DG=$G$"$k$N$J$i!"$3$N4X?t$O!"(B@code{car}$B$,$G!"(B@code{cdr} $B$,5-;vHV9f$G$"$k(B cons $B%;%k$rJV$9$Y$-$G$9!#$3$l$K$h(B
-$B$j(B @code{Message-ID} $B$K$h$C$F5-;v$rl9g$K$O!"5-(B
-$B;v$N/$7$G$b2DG=$J$i!"$3$N4X?t$O(B cons $B%;%k$rJV$9$Y$-$G$9!#$=(B
+$B$N(B @code{car} $B$O$G!"(B@code{cdr} $B$O5-;v$NHV9f(B
+$B$G$9!#$3$l$K$h$C$F!"(B@code{Message-ID} $B$G5-;v$rl9g$O!"5-;v$NuBV$G!"$3$l$O(B 211 $B$G$J$/$F$O$J$j$^$;$s!#uBV$G!"$3$l$O(B 211 $B$G$J$/$F$O$J$j$^$;$s!#.$N5-;vHV9f!":GBg$N5-;vHV9f!"$=$7$F:G8e$,%0%k!<%WL>$G(B
-$B$9!#5-;v$NAm?t$O!":GBg!&:G>.5-;vHV9f$+$iC1=c$K9M$($i$l$k?t$h$j$b>.$5$$$3(B
-$B$H$,$"$k$3$H$KCm0U$7$F$/$@$5$$!#$$$/$D$+$N5-;v$OC$5$l$F$$$k$+$b$7$l(B
-$B$^$;$s!#(BGnus $B$OAm?t$OC1$K.5-;vHV9f$O(B 1$B!":GBg(B
-$B$O(B 0 $B$H$7$FJs9p$5$l$J$1$l$P$J$j$^$;$s!#(B
+$B$9!#$7$+$7!"$$$/$D$+$N5-;v$O%-%c%s%;%k$5$l$F$$$k$+$b$7$l$J$$$N$G!"5-;v$N(B
+$BAm?t$O!"5-;v$N:GBg!&:G>.HV9f$+$iC1=c$K9M$($i$l$k?t$h$j$b>.$5$$$+$b$7$l$J(B
+$B$$$3$H$KCm0U$7$F2<$5$$!#(Bgnus $B$OAm?t$rC1$K.5-;vHV9f$O(B 1$B!"(B
+$B:GBg$O(B 0 $B$H$7$FJs9p$7$J$1$l$P$J$j$^$;$s!#(B
 
 @example
 group-status = [ error / info ] eol
@@ -26636,26 +27599,26 @@ info         = "211 " 3* [  " " ] 
 
 @item (nnchoke-close-group GROUP &optional SERVER)
 
-@var{group} $B$rJD$8!"$=$l$K@\B3$5$l$F$$$kA4$F$N;q8;$r3+J|$7$^$9!#$3$l$O$[(B
-$B$H$s$I$N%P%C%/%(%s%I$G$O2?$b$9$k$3$H$,$J$$$G$7$g$&!#(B
+@var{group} $B$rJD$8$F!"$=$l$K4XO"$9$k$9$Y$F$N%j%=!<%9$r3+J|$7$^$9!#$[$H$s(B
+$B$I$N%P%C%/%(%s%I$O2?$b$9$k$3$H$,L5$$$G$7$g$&!#(B
 
 $BJV$5$l$k7k2L$N%G!<%?$O$"$j$^$;$s!#(B
 
 @item (nnchoke-request-list &optional SERVER)
 
-@var{server} $B>e$GMxMQ2DG=$JA4$F$N%0%k!<%W$N0lMw$rJV$7$^$9!#$3$l(B
-$B$O(B @emph{$BA4It(B} $B$H$$$&0UL#$G$9!#(B
+@var{server} $B>e$GMxMQ2DG=$J$9$Y$F$N%0%k!<%W$N%j%9%H$rJV$7$^$9!#K\Ev(B
+$B$K(B @emph{$BA4It(B} $B$H$$$&0UL#$G$9!#(B
 
-$B$3$l$,!"$?$C$?Fs$D$7$+%0%k!<%W$r;}$C$F$$$J$$%5!<%P!<$+$i$NNc$G$9!#(B
+$B$3$l$O!"$?$C$?Fs$D$7$+%0%k!<%W$r;}$C$F$$$J$$%5!<%P!<$N>l9g$NNc$G$9(B:
 
 @example
 ifi.test 0000002200 0000002000 y
 ifi.discussion 3324 3300 n
 @end example
 
-$B3F9T$K$O%0%k!<%WL>$,$"$j!"$=$7$F$=$N%0%k!<%WFb$N:GBg$N5-;vHV9f!":G>.$N5-(B
-$B;vHV9f!"$=$7$F:G8e$K%U%i%0$G$9!#$b$7$=$N%0%k!<%W$K5-;v$,L5$1$l$P!":G>.5-(B
-$B;vHV9f$O(B 1$B!":GBg$O(B 0 $B$H$7$FJs9p$5$l$J$1$l$P$J$j$^$;$s!#(B
+$B3F9T$K$O%0%k!<%WL>!"$=$N%0%k!<%WFb$N:GBg$N5-;vHV9f!":G>.$N5-;vHV9f!"$=$7(B
+$B$F:G8e$K%U%i%0$,$"$j$^$9!#$b$7$=$N%0%k!<%W$K5-;v$,L5$+$C$?$i!":G>.5-;vHV(B
+$B9f$O(B 1$B!":GBg$O(B 0 $B$H$7$FJs9p$7$J$1$l$P$J$j$^$;$s!#(B
 
 @example
 active-file = *active-line
@@ -26664,18 +27627,18 @@ name        = 
 flags       = "n" / "y" / "m" / "x" / "j" / "=" name
 @end example
 
-$B%U%i%0$O!"$=$N%0%k!<%W$,FI$_=P$7@lMQ(B (@samp{n}) $B$G$"$k$+!";J2q$N%0%k!<%W$NJL(B
-$BL>(B (@samp{=other-group}) $B$G$"$k$+!">e5-$N$I$l$G$b$J$$(B (@samp{y}) $B$+!"$H(B
-$B$$$&$3$H$r<($7$F$$$^$9!#(B
+$B%U%i%0$O!"$=$N%0%k!<%W$,FI$_=P$7@lMQ(B (@samp{n}) $B$+!";J2q$N%0%k!<%W$NJL(B
+$BL>(B (@samp{=other-group}) $B$J$N$+!"$=$l$i$N$I$l$G$b$J$$(B (@samp{y}) $B$N$+$r(B
+$B<($7$^$9!#(B
 
 @item (nnchoke-request-post &optional SERVER)
 
-$B$3$N4X?t$O!"8=:_$N%P%C%U%!$rEj9F$7$^$9!#$3$l$OEj9F$,@.8y$7$?$+$I$&$+$rJV(B
-$B5Q$7$F$b9=$$$^$;$s$,!"I,?\$G$O$"$j$^$;$s!#Nc$($P!"Ej9F$,HsF14|$K9T$o$l$k(B
-$B$N$G$"$l$P!"$3$N4X?t$,=*N;$7$?;~E@$G$OEj9F$OIaDL40N;$7$F$$$^$;$s!#$=$N>l(B
-$B9g$3$N4X?t$O!"Ej9F$r40N;$5$;$k$3$H$,$G$-$J$$$H$-!"$=$l$r$O$C$-$j$HMxMQl9g$O!"$3$N4X?t$,=*N;$7$?;~E@$G$O!"Ej9F$OIaDL40N;$7$F$$$^$;$s!#(B
+$B$=$N>l9g$3$N4X?t$O!"Ej9F$r40N;$5$;$k$3$H$,$G$-$J$$$H$-$K!"$=$l$r$O$C$-$j(B
+$B$HMxMQpJs(B (@pxref{Group Info}) $B$,JQ992U=j$H$7$F%P%C%/%(%s%I$KEO(B
-$B$5$l$^$9!#$3$l$O%P%C%/%(%s%I$,(B ($B2>A[%0%k!<%W$d(B imap $B%0%k!<%W$N>l9g$N$h$&(B
-$B$K(B) $BK\Ev$KA4$F$N>pJs$r;}$C$F$$$k>l9g$KJXMx$K$J$j$^$9!#$3$N4X?t$O!"$=$NMW(B
-$B5a$KE,9g$5$;$k>pJs$rGK2uE*$KCV$-49$(!"(B@code{nil} $B$G$O$J$$CM$rJV$5$J$1$l(B
-$B$P$J$j$^$;$s(B ($BNc30E*$K!"(B@code{nntp-request-update-info} $B$O%M%C%H%o!<%/;q(B
-$B8;$rO2Hq$7$J$$$h$&$K!">o$K(B @code{nil} $B$rJV$7$^$9(B)$B!#(B
+gnus $B$N%0%k!<%W>pJs(B (@pxref{Group Info}) $B$,!"%P%C%/%(%s%I$N$=$l$r2~JQ$9(B
+$B$k$?$a$KEO$5$l$^$9!#$3$l$O%P%C%/%(%s%I$,(B ($B2>A[%0%k!<%W$d(B imap $B%0%k!<%W$N(B
+$B>l9g$N$h$&$K(B)$B!"K\Ev$K$9$Y$F$N>pJs$r;}$C$F$$$k>l9g$KLr$KN)$A$^$9!#$3$N4X(B
+$B?t$O!"$=$NMW5a$KE,9g$5$;$k>pJs$rGK2uE*$KCV$-49$($F!"(B@code{nil} $B$G$O$J$$(B
+$BCM$rJV$5$J$1$l$P$J$j$^$;$s(B ($BNc30E*$K(B @code{nntp-request-update-info} $B$O!"(B
+$B%M%C%H%o!<%/;q8;$rO2Hq$7$J$$$h$&$K>o$K(B @code{nil} $B$rJV$7$^$9(B)$B!#(B
 
-$B$3$N4X?t$+$iJV$5$l$k7k2L$N%G!<%?$O$"$j$^$;$s!#(B
+$B$3$N4X?t$,JV$97k2L$N%G!<%?$O$"$j$^$;$s!#(B
 
 @item (nnchoke-request-type GROUP &optional ARTICLE)
 
-$BMxMQJ}$H$b(B @code{nil} $B$G$"$k(B
-$B$+$b$7$l$^$;$s!#(B
+$B%a!<%k$G$"$l$P(B @code{mail} $B$r!"$=$Nl9g(B
+$B$O(B @code{unknown} $B$rJV$5$J$1$l$P$J$j$^$;$s!#(B(@var{article} $B0z?t$O!"%a!<(B
+$B%k%0%k!<%W$H%K%e!<%9%0%k!<%W$,$4$A$c$^$<$K$J$C$F$$$k$+$b$7$l$J(B
+$B$$(B @code{nnvirtual} $B$K$*$$$FI,MW$G$9!#(B) @var{group} $B$H(B @var{article} $B$O(B
+$BN>J}$H$b(B @code{nil} $B$G$"$k$+$b$7$l$^$;$s!#(B
 
-$B$3$N4X?t$+$iJV$5$l$k7k2L$N%G!<%?$O$"$j$^$;$s!#(B
+$B$3$N4X?t$,JV$97k2L$N%G!<%?$O$"$j$^$;$s!#(B
 
 @item (nnchoke-request-set-mark GROUP ACTION &optional SERVER)
 
-$B5-;v$N0u$r@_Dj(B/$B>C5n(B/$BDI2C$7$^$9!#IaDL$O(B gnus $B$O5-;v$N0u(B ($B4{FI!"2D;k!";~8B(B
-$B>C5n$J$I(B) $B$rFbIt$G07$$!"(B@file{~/.newsrc.eld} $B$KJ]B8$7$^$9!#$7$+$7!"%P%C(B
-$B%/%(%s%I$K$O(B (@acronym{IMAP} $B$N$h$&$K(B) $B5-;v$NA4$F$N>pJs$r%5!<%P!<$K<}$a(B
-$B$k$N$G!"(Bgnus $B$O0u$N>pJs$r%5!<%P!<$KEAC#$7$J$1$l$P$J$i$J$$$b$N$,$"$j$^$9!#(B
+$B5-;v$N0u$r@_Dj(B/$B>C5n(B/$BDI2C$7$^$9!#DL>o(B gnus $B$O5-;v$N0u(B ($B4{FI!"2D;k!"4|8B@Z(B
+$B$l>C5n$J$I(B) $B$rFbIt$G07$$!"(B@file{~/.newsrc.eld} $B$KJ]B8$7$^$9!#$7$+$7!"$$(B
+$B$/$D$+$N%5!<%P!<(B ($BNc$($P(B @acronym{IMAP}) $B$O5-;v$N$9$Y$F$N>pJs$r%5!<%P!<(B
+$B$G;}$C$F$$$k$N$G!"(Bgnus $B$,0u$N>pJs$r%5!<%P!<$KEAHB$5$;$kI,MW$,$"$j$^$9!#(B
 
-@var{action} $B$O$3$N$h$&$JMM<0$N0u@_Dj$NMW5a$N%j%9%H$G$9(B:
+@var{action} $B$O0u$r@_Dj$9$kMW5a$N%j%9%H$G!"0J2<$NMM<0$r;}$A$^$9(B:
 
 @example
 (RANGE ACTION MARK)
 @end example
 
 @var{range} $B$O0u$rIU$1$?$$5-;v$NHO0O$G$9!#(B@var{action} $B$O(B @code{add} $B$^(B
-$B$?$O(B @code{del} $B$G!"0u$rDI2C$7$?$j>C$7$^$9(B ($B8@5Z$5$l$F$$$J$$$9$Y$F$N0u$O(B
-$BJ]B8$7$^$9(B)$B!"0u$N>C5n(B ($B8@5Z$5$l$F$$$J$$0u$OJ]B8$7$^$9(B) $B$G$9!#(B
-@var{mark} $B$O0u$N%j%9%H$G$9!#$=$l$>$l$N0u$O%7%s%\%k$G$9!#8=:_;H$o$l$F$$(B
-$B$k0u$O(B @code{read}, @code{tick}, @code{reply}, @code{expire},
-@code{killed}, @code{dormant}, @code{save}, @code{download},
-@code{unsend}, @code{forward} $B$*$h$S(B @code{recent} $B$G$9$,!"$b$72DG=$J$i!"(B
-$B$"$J$?$N%P%C%/%(%s%I$O$3$l$i$K@)8B$r$9$k$Y$-$G$O$"$j$^$;$s!#(B
+$B$?$O(B @code{del} $B$G!"0u$rDI2C$7$?$j>C$9$?$a$K;H$o$l$^$9(B ($B8@5Z$5$l$F$$$J$$(B
+$B$9$Y$F$N0u$OJ]B8$7$^$9(B)$B!#(B@var{mark} $B$O0u$N%j%9%H$G$9!#$=$l$>$l$N0u$O%7%s(B
+$B%\%k$G$9!#8=:_;H$o$l$F$$$k0u$O(B @code{read}, @code{tick}, @code{reply},
+@code{expire}, @code{killed}, @code{dormant}, @code{save},
+@code{download}, @code{unsend}, @code{forward} $B$*$h$S(B @code{recent} $B$G$9(B
+$B$,!"$"$J$?$N%P%C%/%(%s%I$O!"2DG=$J$i$3$l$i$r@)8B$r$9$k$Y$-$G$O$"$j$^$;$s!#(B
 
-$BL7=b$9$kF0:n$,;XDj$5$l$?$H$-!"%j%9%H$N:G8e$NF0:n$,8zNO$r;}$D$b$N$K$J$j$^(B
-$B$9!#$9$J$o$A!"F0:n$K5-;v(B 1 $B$K(B @code{$B2D;k(B} $B0u$rDI2C$9$kMW5a$,$"$j!"%j%9%H(B
-$B$N8e$GF1$85-;v$+$i0u$r>C5n$9$k$3$H$rMW5a$7$F$$$l$P!"0u$OC5n$5$l$k(B
-$B$Y$-$G$9!#(B
+$BL7=b$9$kF0:n$,;XDj$5$l$?>l9g$O!"%j%9%H$N:G8e$NF0:n$,8zNO$r;}$D$b$N$K$J$k(B
+$B$Y$-$G$9!#$9$J$o$A!"(B@var{action} $B$,5-;v(B 1 $B$K(B @code{$B2D;k(B} $B0u$rDI2C$9$kMW(B
+$B5a$r4^$s$G$$$F!"%j%9%H$N$*$7$^$$$NJ}$G!"F1$85-;v$+$i0u$r>C5n$9$k$3$H$rMW(B
+$B5a$7$F$$$?$J$i$P!"0u$OC5n$5$l$k$Y$-$G$9!#(B
 
-$BF0:n%j%9%H$NNc$G$9(B:
+@var{action} $B%j%9%H$NNc$G$9(B:
 
 @example
 (((5 12 30) 'del '(tick))
@@ -26761,42 +27723,41 @@ Gnus $B%0%k!<%W>pJs(B (@pxref{Group Info}) $B$,JQ992U=j$H$7$F%P%C%/%(%s%I$KEO
  ((92 94) 'del '(read)))
 @end example
 
-$B4X?t$O0u$r@_Dj$G$-$J$+$C$?5-;v$NHO0O$rJV$9$Y$-$G$9(B ($B8=:_$OA4$/;H$o$l$F$$(B
-$B$^$;$s(B)$B!#(B
+$B4X?t$O0u$r@_Dj$G$-$J$+$C$?5-;v$NHO0O$rJV$5$J$1$l$P$J$j$^$;$s(B ($B8=:_$O$I$s(B
+$B$JL\E*$N$?$a$K$b;H$o$l$F$$$^$;$s(B)$B!#(B
 
-$B$3$N4X?t$+$i$O7k2L$N%G!<%?$O$"$j$^$;$s!#(B
+$B$3$N4X?t$,JV$97k2L$N%G!<%?$O$"$j$^$;$s!#(B
 
 @item (nnchoke-request-update-mark GROUP ARTICLE MARK)
 
-$B$b$7MxMQ$N%4%_$rJV$7$F$O$$$1$^$;$s!#(B
+$B%P%C%/%(%s%I$,7y$&0u$rMxMQl9g$K$O!"85$N(B @var{mark} $B$rJV$5$J$1$l$P$J$j$^(B
+$B$;$s!#(B@code{nil} $B$d$=$NB>$N%4%_$rJV$7$F$O$$$1$^$;$s!#(B
 
 $B;d$,CN$C$F$$$k$3$l$N$3$l$NMxMQK!$O!"(B@code{nnvirtual} $B$,9T$J$C$F$$$k$3$H(B
-$B$@$1$G$9(B --- $B$b$79=@.%0%k!<%W$,<+F04|8B@Z$l>C5n2DG=$G$"$l$P!"$3$N2>A[%0(B
-$B%k!<%W$G4{FI$N0u$rIU$1$k$H!"7k2L$H$7$F$=$N5-;v$K4|8B@Z$l>C5n$N0u$,IU$1$i(B
-$B$l$^$9!#(B
+$B$@$1$G$9(B---$B$=$N2>A[%0%k!<%W$G4{FI$N0u$rIU$1$k$H!"$b$79=@.MWAG$N%0%k!<%W(B
+$B$,<+F04|8B@Z$l>C5n2DG=$J$i$P!"7k2L$H$7$F$=$N5-;v$K4|8B@Z$l>C5n$N0u$,IU$1(B
+$B$i$l$^$9!#(B
 
-$B$3$N4X?t$+$iJV$5$l$k7k2L$N%G!<%?$O$"$j$^$;$s!#(B
+$B$3$N4X?t$,JV$97k2L$N%G!<%?$O$"$j$^$;$s!#(B
 
 @item (nnchoke-request-scan &optional GROUP SERVER)
 
-$B$3$N4X?t$O!"%P%C%/%(%s%I$,E~Ce5-;v$r3NG'$9$kMW5a$r9T$J$&$H$-$K$$$D$G(B
-$B$b(B (gnus $B$+$=$l0J30$K$h$C$F(B)$B!"$"$l$d$3$l$d$H8F$S=P$5$l$k$3$H$,$"$j$^$9!#(B
-$B%a!<%k%P%C%/%(%s%I$O$3$N4X?t$,5/F0$5$l$?$H$-!"E57?E*$K$O%9%W!<%k%U%!%$%k(B
-$B$rFI$`$+(B @acronym{POP} $B%5!<%P!<$KLd$$9g$o$;$K$$$-$^$9!#(B@var{group} $B$OFC(B
-$B$K5$$KN1$a$kI,MW$O$"$j$^$;$s(B --- $B$b$7%P%C%/%(%s%I$,!"0l$D$@$1$N%0%k!<%W(B
-$B$rAv::$9$k$N$OBgJQ$9$.$k$HH=CG$7$?>l9g$K$O!"A4%0%k!<%W$NA4Av::$r9T$J$C$F(B
-$B$b9=$$$^$;$s!#$G$9$,!"$N2?$+$K$h$C$F(B) $B9T$J$&(B
+$B$H$-$O$$$D$G$b!"$"$l$d$3$l$d$H$3$N4X?t$,8F$S=P$5$l$k$G$7$g$&!#$3$N4X?t$,(B
+$B5/F0$5$l$k$H!"0lHL$K%a!<%k%P%C%/%(%s%I$O%9%W!<%k%U%!%$%k$rFI$`(B
+$B$+(B @acronym{POP} $B%5!<%P!<$KLd$$9g$o$;$^$9!#(B@var{group} $B$KN10U$9$kI,MW$O(B
+$B$"$j$^$;$s(B---$B%P%C%/%(%s%I$,!"0l$D$N%0%k!<%W$@$1$rAv::$9$k$N$,BgJQ$9$.$k(B
+$B$HH=CG$7$?>l9g$K$O!"$9$Y$F$N%0%k!<%W$rAm$,$,$j$GAv::$7$F$b9=$$$^$;$s!#$G(B
+$B$9$,!"$=$NJ}$, description eol
@@ -26806,8 +27767,8 @@ description      = 
 
 @item (nnchoke-request-list-newsgroups &optional SERVER)
 
-$B$3$N4X?t$K$h$C$FJV$5$l$k7k2L$N%G!<%?$O!"%5!<%P!<>e$GMxMQ$G$-$k%0(B
-$B%k!<%WA4$F$N@bL@$G$9!#(B
+$B$3$N4X?t$,JV$97k2L$N%G!<%?$O!"%5!<%P!<>e$GMxMQ$G$-$k$9$Y$F$N%0%k!<%W$N@b(B
+$BL@$G$J$1$l$P$J$j$^$;$s!#(B
 
 @example
 description-buffer = *description-line
@@ -26815,107 +27776,115 @@ description-buffer = *description-line
 
 @item (nnchoke-request-newgroups DATE &optional SERVER)
 
-$B$3$N4X?t$+$iJV$5$l$k7k2L$N%G!<%?$O!"(B@samp{date} $B0J9_$K:n@.$5$l$?A4$F$N%0(B
-$B%k!<%W$G$9!#(B@samp{date} $B$ODL>o$N?M4V$,FI$a$kF|IU$N7A<0(B ($B$9$J$o$A!"%a!<%k(B
-$B$d%K%e!<%9$N%X%C%@!<$G;H$o$l$k7A<0$G!"%G%#%U%)%k%H$G$O4X(B
-$B?t(B @code{message-make-date} $B$+$iJV$5$l$?$b$N(B) $B$G$9!#%G!<%?$O(B active $B%P%C(B
-$B%U%!$N7A<0$G$J$1$l$P$J$j$^$;$s!#(B
-
-$B$3$N4X?t$,(B ``$BB?$9$.$k(B'' $B%0%k!<%W$rJV$7$F$b%*!<%1%$$G$9!#$$$/$D$+$N%P%C%/(B
-$B%(%s%I$O?7$7$$%0%k!<%W$r8+$D$1$k$h$j$b!"3Z$r$7$FA4$F$N%0%k!<%W$N%j%9%H$r(B
-$BJV$9$+$b$7$l$^$;$s!#$7$+$7%P%C%/%(%s%I$,JV$9B?$/$N%0%k!<%W$KBP$7$F$3(B
-$B$l(B ($BLuCm(B: $B?7$7$$%0%k!<%W$H$7$F07$&$3$H(B) $B$r$7$F$O$$$1$^$;$s!#IaDL!"%f!<%6!<(B
-$B<+?H$,:n$C$?%0%k!<%W$J$i$PB?$9$.$k$3$H$O$J$$$G$7$g$&!#$G$9$+(B
-$B$i(B @code{nnml} $B$H$=$l$KN`$9$k$b$N$O$?$V$s?4G[$"$j$^$;$s!#$7$+(B
-$B$7(B @code{nntp} $B$N$h$&$J%P%C%/%(%s%I$G$O%0%k!<%W$O%5!<%P!<$K$h$C$F:n$i$l(B
-$B$F$$$^$9$+$i!"B?$/$N%0%k!<%W$,JV$C$F$/$k$3$H$,$"$j$($^$9!#(B
+$B$3$N4X?t$+$iJV$5$l$k7k2L$N%G!<%?$O!"(B@samp{date} $B0J9_$K:n@.$5$l$?$9$Y$F$N(B
+$B%0%k!<%W$G$J$1$l$P$J$j$^$;$s!#(B@samp{date} $B$O?M4V$,FI$a$kIaDL$NF|IU$N7A(B
+$B<0(B ($B$9$J$o$A!"%a!<%k$d%K%e!<%9$N%X%C%@!<$G;H$o$l$k7A<0$G!"%G%#%U%)%k%H$O(B
+$B4X?t(B @code{message-make-date} $B$,JV$9$b$N(B) $B$G$9!#%G!<%?$O(B active $B%P%C%U%!!<(B
+$B$N7A<0$G$J$1$l$P$J$j$^$;$s!#(B
+
+$B$3$N4X?t$,!VB?$9$.$k!W%0%k!<%W$rJV$9$N$O%*%C%1!<$G$9!#$$$/$D$+$N%P%C%/%((B
+$B%s%I$G$O!"?7$7$$%0%k!<%W$@$1$G$O$J$/$F!"$9$Y$F$N%0%k!<%W$N%j%9%H$rJV$9J}(B
+$B$,0B>e$,$j$K:Q$`$3$H$r8+=P$9$+$b$7$l$^$;$s!#$7$+$7!"$?$/$5$s$N%0%k!<%W$,(B
+$B$"$k%P%C%/%(%s%I$G!"$3$l$r$7$F$O$$$1$^$;$s!#IaDL!"MxMQA0$N6u$N%0%k!<%W$r:n@.$7$^$9!#(B
+$B$3$N4X?t$O(B @var{group} $B$H$$$&L>A0$N6u$N%0%k!<%W$r:n@.$7$J$1$l$P$J$j$^$;(B
+$B$s!#(B
 
-$BJV$5$l$k7k2L$N%G!<%?$O$"$j$^$;$s!#(B
+$BJV$5$l$k%G!<%?$O$"$j$^$;$s!#(B
 
 @item (nnchoke-request-expire-articles ARTICLES &optional GROUP SERVER FORCE)
 
-$B$3$N4X?t$O!"(B@var{articles} $B$NHO0O$NA4$F$N5-;v$KBP$7$F4|8B@Z$l>C5n=hM}$r(B
-$B9T$J$$$^$9!#(B(@var{articles} $B$O8=:_$O5-;vHV9f$NC1=c$J%j%9%H$G$9!#(B) $B$3$N(B
-$B4X?t$G>C5n$5$l$kA0$N!"5-;v$,$I$l$@$18E$$5-;v$G$"$k$+$N7hDj$O%P%C%/%(%s%I(B
-$B$KG$$5$l$F$$$^$9!#(B@var{force} $B$,(B @code{nil} $B0J30$G$"$l$P!"$=$l$,$I$s$J$K(B
-$B?7$7$$$b$N$G$"$C$F$b!"A4$F$N(B@var{articles} $B$,>C5n$5$l$^$9!#(B
+$B$3$N4X?t$O!"(B@var{articles} $B$NHO0O$N$9$Y$F$N5-;v$KBP$7$F4|8B@Z$l>C5n$N=h(B
+$BM}$r9T$J$$$^$9(B ($B8=:_(B @var{articles} $B$O5-;vHV9f$NC1=c$J%j%9%H$G$9(B)$B!#5-;v(B
+$B$,$I$l$@$18E$$$+$r!"$3$N4X?t$G>C5n$5$l$kA0$KH=Dj$9$k$3$H$O!"%P%C%/%(%s%I(B
+$B$KG$$5$l$F$$$^$9!#(B@var{force} $B$,(B @code{nil} $B$G$O$J$$CM$@$C$?$i!"$=$l$i$,(B
+$B$I$s$J$K?7$7$/$F$b!"$9$Y$F$N(B @var{articles} $B$r>C5n$7$J$1$l$P$J$j$^$;$s!#(B
 
 $B$3$N4X?t$O:o=|$7$J$+$C$?!"$"$k$$$O:o=|$9$k$3$H$,$G$-$J$+$C$?5-;v$N%j%9%H(B
-$B$rJV$7$^$9!#(B
+$B$rJV$5$J$1$l$P$J$j$^$;$s!#(B
 
 $BJV$5$l$k7k2L$N%G!<%?$O$"$j$^$;$s!#(B
 
 @item (nnchoke-request-move-article ARTICLE GROUP SERVER ACCEPT-FORM &optional LAST)
 
-$B$3$N4X?t$O(B @var{article} ($BHV9f(B) $B$r!"(B@var{group} $B$+(B
-$B$i(B @var{accept-form} $B$r8F$S=P$7$F0\F0$7$^$9!#(B
+$B$3$N4X?t$O(B @var{group} $B$K$"$k5-;v(B @var{article} ($BHV9f(B) $B$r!"(B
+@var{accept-form} $B$r8F$S=P$9$3$H$K$h$C$F0\F0$7$J$1$l$P$J$j$^$;$s!#(B
 
-$B$3$N4X?t$O!"LdBj$N5-;v$r0\F0$5$;$k$?$a$N=`Hw$H$7$F!"5-;v$KIU2C$5$l$?%X%C(B
-$B%@!<9T$rA4$F:o=|$7!"0lHL$K5-;v$r!V$-$l$$$5$C$Q$j!W$K$7$^$9!#$=$7$F(B ``$B$-(B
-$B$l$$$J(B'' $B5-;v$N$"$k%P%C%U%!!<$G(B @var{accept-form} $B$r(B @code{eval} $B$7$^$9!#(B
-$B$3$l$OK\Ev$KJ#@=$r9T$J$$$^$9!#$b$7(B @code{eval} $B$,(B @code{nil} $B0J30$NCM$r(B
-$BJV$7$?$i!"$=$N5-;v$O:o=|$5$l$^$;$s!#(B
+$B$3$N4X?t$O!"Ev$N5-;v$r0\F0$5$;$k$?$a$N=`Hw$H$7$F!"$=$l$,5-;v$KIU2C$7$?$I(B
+$B$s$J%X%C%@!<9T$r$b:o=|$7$F!"5-;v$rBgBN$K$*$$$F!V$-$l$$!W$K$7$F$*$/I,MW$,(B
+$B$"$j$^$9!#$=$7$F!V$-$l$$!W$J5-;v$,$"$k%P%C%U%!!<$G!"(B
+@var{accept-form} $B$r(B @code{eval} $B$7$J$1$l$P$J$j$^$;$s(B $B!#$3$l$O8e$K$5$i$KMW5a$,H/9T$5$l$k8+9~(B
-$B$_$,9b$$!"$H$$$&0UL#$K$J$j!"$3$l$K$h$C$F:GE,2=$,$$$/$i$+$G$-$k$h$&$K$J$j(B
-$B$^$9!#(B
+$B$b$7(B @var{last} $B$,(B @code{nil} $B$@$C$?$i!"$=$l$O$3$ND>8e$K$5$i$KMW5a$,H/9T(B
+$B$5$l$k8+9~$_$,9b$$$3$H$r0UL#$7!"$3$l$K$h$C$F$$$/$i$+:GE,2=$,$G$-$k$h$&$K(B
+$B$J$j$^$9(B ($BLuCm(B: $BNc$($P(B @code{nil} $B$@$C$?$i%5!<%P!<$H$N@\B3$rJD$8$J$$$G$*(B
+$B$/$H$+(B)$B!#(B
 
-$B$3$N4X?t$O!"%0%k!<%WL>$,(B @code{car} $B$G!"$=$N5-;v$N0\F0@h$N5-;vHV9f$,(B
-@code{cdr} $B$G$"$k(B cons $B%;%k$rJV$7$^$9!#(B
+$B$3$N4X?t$O!"0\F0@h$N%0%k!<%WL>$,(B @code{car} $B$G!"0\F0@h$N5-;vHV9f(B
+$B$,(B @code{cdr} $B$G$"$k(B cons $B%;%k$rJV$5$J$1$l$P$J$j$^$;$s!#(B
 
-$B$=$N%0%k!<%W$O!"%P%C%/%(%s%I$,$=$N%0%k!<%W$X$N5-;v$N<}G<$rMW5a$9$kA0$KB8(B
-$B:_$7$J$1$l$^$J$j$^$;$s!#(B
+$BJV$5$l$k%G!<%?$O$"$j$^$;$s!#(B
 
-$BJV$5$l$k7k2L$N%G!<%?$O$"$j$^$;$s!#(B
+$BLuCm(B: $B0\F0@h$N%0%k!<%W$O(B @var{accept-form} $B$NCf$G;XDj$7$^$9!#$=$3$G;H$o(B
+$B$l$k$N$,!"$A$K(B
-$B9T$o$l$k$H$$$&0UL#$G$9!#(B
+$B$3$N4X?t$O!"8=:_$N%P%C%U%!!<$NCf?H$r(B @var{group} $B$KA^F~$7$^$9!#(B
+@var{last} $B$,(B @code{nil} $B$@$C$?$i!"$3$N4X?t$X$N$5$i$J$k8F$S=P$7$,D>$A$K(B
+$B9T$J$o$l$k$@$m$&$H$$$&0UL#$G$9!#(B
 
-$B$3$N4X?t$O%0%k!<%WL>$,(B @code{car} $B$G!"$=$N5-;v$N0\F0@h$N5-;vHV9f$,(B
-@code{cdr} $B$G$"$k(B cons $B%;%k$rJV$7$^$9!#(B
+$B$3$N4X?t$O%0%k!<%WL>$,(B @code{car} $B$G!"0\F0@h$N5-;vHV9f$,(B @code{cdr} $B$G$"(B
+$B$k(B cons $B%;%k$rJV$5$J$1$l$P$J$j$^$;$s!#(B
 
-$BJV$5$l$k7k2L$N%G!<%?$O$"$j$^$;$s!#(B
+$B$=$N%0%k!<%W$O!"5-;v$rC5n$7$^$9!#$b$7(B @var{force} $B$,$"$l$P!"$=$N%0(B
-$B%k!<%WFb$NA4$F$N5-;v$rK\Ev$K>C5n$7!"$=$7$F$=$N%0%k!<%W<+?H$r>C5n$7$^$9!#(B
-($B$b$7(B ``$B%0%k!<%W<+?H(B'' $B$H$$$&$b$N$,$"$l$P!#(B)
+$B$3$N4X?t$O(B @var{group} $B$r>C5n$7$J$1$l$P$J$j$^$;$s!#$b$7(B @var{force} $B$,@_(B
+$BDj$5$l$F$$$?$i!"$=$N%0%k!<%WFb$N$9$Y$F$N5-;v$rK\Ev$K>C5n$7$F!"$=$7$F$=$N(B
+$B%0%k!<%W<+?H$r>C5n$7$J$1$l$P$J$j$^$;$s!#(B($B$b$7!V%0%k!<%W<+?H!W$H$$$&$b$N(B
+$B$,$"$l$P!#(B)
 
-$BJV$5$l$k7k2L$N%G!<%?$O$"$j$^$;$s!#(B
+$BJV$5$l$k%G!<%?$O$"$j$^$;$s!#(B
 
 @item (nnchoke-request-rename-group GROUP NEW-NAME &optional SERVER)
 
-$B$3$N4X?t$O(B @var{group} $B$+$i(B @var{new-name} $B$KL>A0$rJQ99$7$^$9!#(B
-@var{group} $BFb$K$"$k5-;v$OA4$F(B @var{new-name} $B$K0\F0$7$^$9!#(B
+$B$3$N4X?t$O%0%k!<%WL>$r(B @var{group} $B$+$i(B @var{new-name} $B$KJQ99$7$J$1$l$P(B
+$B$J$j$^$;$s!#(B@var{group} $BFb$K$"$k$9$Y$F$N5-;v$O!"(B@var{new-name} $B$K0\F0$7(B
+$B$J$1$l$P$J$j$^$;$s!#(B
 
-$BJV$5$l$k7k2L$N%G!<%?$O$"$j$^$;$s!#(B
+$BJV$5$l$k%G!<%?$O$"$j$^$;$s!#(B
 @end table
 
 @node Error Messaging
-@subsubsection $B%(%i!<%a%C%;!<%8I=<((B
+@subsubsection $B%(%i!<%a%C%;!<%8$NH/9T(B
 
 @findex nnheader-report
 @findex nnheader-get-report
-$B%P%C%/%(%s%I$O%(%i!<>u67$rJs9p$9$k$N$K(B @code{nnheader-report} $B$r;H$o$J$/(B
-$B$F$O$J$j$^$;$s(B --- $BMW5a$r$N%7%s%\%k$G!";D$j$O!"J#?t$N0z?t(B
-$B$,$"$l$P(B @code{format} $B$X$N0z?t$H$7$F2ro$K(B@code{nil} $B$rJV$5$J$/$F$O$J$j$^$;$s!#(B
+$B%P%C%/%(%s%I$O%(%i!<$N>u67$NJs9p$K(B @code{nnheader-report} $B$r;H$o$J$1$l$P(B
+$B$J$j$^$;$s(B---$BMW5a$r$N%7%s%\%k$G!";D$j$O!"J#?t$N0z?t$,$"$l(B
+$B$P(B @code{format} $B$X$N0z?t$H$7$F2ro$K(B @code{nil} $B$rJV$5$J$1$l$P$J$j$^$;$s!#(B
 
 @lisp
 (nnheader-report 'nnchoke "You did something totally bogus")
@@ -26924,57 +27893,57 @@ description-buffer = *description-line
 @end lisp
 
 $B0lJ}(B gnus $B$O!"%5!<%P!<$+$i(B @code{nil} $B$rJV$5$l$?$H$-(B
-$B$K(B @code{nnheader-get-report} $B$r8F$S=P$7!"$=$7$F$3$N4X?t$,LdBj$N%P%C%/%((B
-$B%s%I$KBP$7$F:G8e$KJs9p$5$l$?%a%C%;!<%8$rJV$7$^$9!#$3$N4X?t$O0l$D$N0z(B
-$B?t(B --- $B%5!<%P!<$N%7%s%\%k$re$N5-;v$rJT(B
-$B=8$9$k$3$H$,$G$-$^$9!#(B@code{nnmh} $B$O(B @code{nnml} $B$K$H$F$b;w$F$$$^$9$,!"(B
-$B$3$l$O%"%/%F%#%V%U%!%$%k$r;H$o$:!"35MW%G!<%?%Y!<%9$bJ];}$7$^$;$s!#(B
-@code{nndir} $B$O(B @code{nnml} $B$K$H$F$b;w$F$$$^$9$,!"$3$l$K(B
-$B$O(B ``$B%0%k!<%W(B'' $B$N35G0$O$J$/!"5-;v$N=$@5$O$G$-$^$;$s!#(B
+$BB?$/$N%P%C%/%(%s%I$O$h$/;wDL$C$F$$$^$9!#(B@code{nnml} $B$O(B @code{nnspool} $B$H(B
+$B1;Fs$D$G$9$,!"%5!<%P!<>e$N5-;v$rJT=8$9$k$3$H$,$G$-$^$9!#(B@code{nnmh} $B$O$^(B
+$B$k$G(B @code{nnml} $B$N$h$&$G$9$,!"%"%/%F%#%V%U%!%$%k$r;H$o$J$$$7!"35MW%G!<(B
+$B%?%Y!<%9$bJ];}$7$^$;$s!#(B@code{nndir} $B$O(B @code{nnml} $B$K$H$F$b;w$F$$$^$9$,!"(B
+$B$3$l$K$O!V%0%k!<%W!W$N35G0$OL5$/!"5-;v$NJT=8$O$G$-$^$;$s!#(B
 
-$B?7$7$$%P%C%/%(%s%I$r=q$/$H$-$KB>$N%P%C%/%(%s%I$+$i4X?t$r(B ``$B7Q>5(B'' $B$9$k$3(B
-$B$H$,2DG=$G$"$C$F$[$7$$!"$H;W$&$N$OM}$KE,$C$F$$$^$9!#$=$7$F$^$5$K!"$"$J$?(B
-$B$,$=$&$7$?$1$l$P!"$=$l$,$G$-$k$N$G$9!#(B($B$"$J$?$,$=$&$7$?$/$J$1$l$P$7$J$/(B
-$B$F$bNI$$$G$9$h!"$b$A$m$s!#(B)
+$B?7$7$$%P%C%/%(%s%I$r=q$/$H$-$KB>$N%P%C%/%(%s%I$+$i4X?t$r!V7Q>5!W$G$-$?$i(B
+$B$J$"!"$H;W$&$N$OM}$KE,$C$F$$$^$9!#$=$7$F$^$5$K!"$"$J$?$,$=$&$7$?$1$l$P!"(B
+$B$=$l$,$G$-$k$N$G$9!#(B($B$"$J$?$,$=$&$7$?$/$J$1$l$P$7$J$/$F$bNI$$$G$9$h!"$b(B
+$B$A$m$s!#(B)
 
-$BA4$F$N%P%C%/%(%s%I$O8x3+JQ?t$H8x3+4X?t$r!"(B@code{nnoo} $B$H8F$P$l$k%Q%C%1!<(B
+$B$9$Y$F$N%P%C%/%(%s%I$O!"8x6&JQ?t$H8x6&4X?t$r(B @code{nnoo} $B$H$$$&%Q%C%1!<(B
 $B%8$r;H$C$F@k8@$7$^$9!#(B
 
 $BB>$N%P%C%/%(%s%I$+$i4X?t$r7Q>5$9$k$K$O(B ($B$=$7$F8=:_$N%P%C%/%(%s%I$+$iB>$N(B
 $B%P%C%/%(%s%I$K4X?t$r7Q>5$G$-$k$h$&$K$9$k$K$O(B)$B!"0J2<$N%^%/%m$r;HMQ$7$J$1(B
-$B$l$P$J$j$^$;$s!#(B
+$B$l$P$J$j$^$;$s(B:
 
 @table @code
 @item nnoo-declare
 $B$3$N%^%/%m$O!":G=i$N0z?t$r!"$=$N8e$KB3$/0z?t$N;R6!$G$"$k$3$H$r@k8@$7$^$9!#(B
-$BNc$($P!"(B
+$BNc$($P(B:
 
 @lisp
 (nnoo-declare nndir
   nnml nnmh)
 @end lisp
 
-$B$3$l$G(B @code{nndir}$B$O!"(B@code{nnml} $B$H(B @code{nnmh} $B$NN>J}$+$i4X?t$r7Q>5$7(B
-$B$h$&$H$7$F$$$k$3$H$r@k8@$7$^$9!#(B
+$B$3$3$G(B @code{nndir} $B$O!"(B@code{nnml} $B$H(B @code{nnmh} $B$NN>J}$+$i4X?t$r7Q>5(B
+$B$9$k$D$b$j$G$"$k$3$H$r@k8@$7$F$$$^$9!#(B
 
 @item defvoo
-$B$3$N%^%/%m$O(B @code{defvar} $B$HF15A$G$9$,!"$=$NJQ?t$r8x3+%5!<%P!uBV;X8~7?$NJQ?t$O(B @code{defvar} $B$G$O$J(B
+$B$3$N%^%/%m$O(B @code{defvar} $B$HEy2A$G$9$,!"$=$NJQ?t$r8x6&%5!<%P!uBV;V8~7?$NJQ?t$O!"(B@code{defvar} $B$G$O$J(B
 $B$/(B @code{defvoo} $B$K$h$C$F@k8@$9$k$Y$-$G$9!#(B
 
-$BDL>o$N(B @code{defvar} $B0z?t$K2C$($F!"$3$N%^%/%m$O?F%P%C%/%(%s%I$NJQ?t$N%j(B
-$B%9%H$ro$N(B @code{defvar} $B$N0z?t$K2C$($F!"$3$N%^%/%m$O?F%P%C%/%(%s%I$K$*$1$k(B
+$BJQ?t$N%j%9%H$ro$N(B @code{defun} $B=hM}$K2C$($F!"$3$N%^%/%m$O$=$N4X?t$r8x3+$7$F$$$k$b$N$H(B
-$B$7$FEPO?$7!"B>$N%P%C%/%(%s%I$,$=$l$r7Q>5$G$-$k$h$&$K$7$^$9!#(B
+$B>o$N(B @code{defun} $B$N=hM}$K2C$($F!"$3$N%^%/%m$OB>$N%P%C%/%(%s%I$,$=$l$r7Q(B
+$B>5$G$-$k$h$&$K!"$=$N4X?t$,8x6&J*$K$J$C$F$$$k$b$N$H$7$FEPO?$7$^$9!#(B
 
 @item nnoo-map-functions
-$B$3$N%^%/%m$O8=:_$N%P%C%/%(%s%I$N4X?t$+$i?F%P%C%/%(%s%I$N4X?t$X$NCV$-49$((B
-$B$r9T$J$($k$h$&$K$7$^$9!#(B
+$B$3$N%^%/%m$O!"8=:_$N%P%C%/%(%s%I$N4X?t$+$i?F%P%C%/%(%s%I$N4X?t$X$N!"CV$-(B
+$B49$($,$G$-$k$h$&$K$7$^$9!#(B
 
 @lisp
 (nnoo-map-functions nndir
@@ -27009,14 +27978,15 @@ description-buffer = *description-line
   (nnmh-request-article 0 nndir-current-group 0 0))
 @end lisp
 
-$B$3$l$O(B @code{nndir-retrieve-headers} $B$,8F$S=P$5$l$?$H$-!"0lHVL\!";0HVL\!"(B
-$B;MHVL\$N0z?t$,(B @code{nnml-retrieve-headers} $B$KEO$5$l!"0lJ}!"FsHVL\$N0z?t(B
-$B$O(B @code{nndir-current-group} $B$NCM$H$7$F@_Dj$5$l$k!"$H$$$&0UL#$G$9!#(B
+$B$3$l$O(B @code{nndir-retrieve-headers} $B$,8F$S=P$5$l$?$H$-$K!"0lHVL\!";0HV(B
+$BL\!"$*$h$S;MHVL\$N0z?t$,(B @code{nnml-retrieve-headers} $B$KEO$5$l!"0lJ}!"Fs(B
+$BHVL\$N0z?t$O(B @code{nndir-current-group} $B$NCM$H$7$F@_Dj$5$l$k$H$$$&0UL#$G(B
+$B$9!#(B
 
 @item nnoo-import
-$B$3$N%^%/%m$OB>$N%P%C%/%(%s%I$+$i4X?t$r$N%P%C%/%(%s%I$+$i4X?t$rM"F~$7$^$9!#$3$l$OC1$K$^$@Dj5A$5$l(B
+$B$F$$$J$$4X?t$rDj5A$9$k$@$1$J$N$G!"%=!<%9%U%!%$%k$N:G8e$K=q$+$J$1$l$P$J$j(B
+$B$^$;$s!#(B
 
 @lisp
 (nnoo-import nndir
@@ -27027,14 +27997,15 @@ description-buffer = *description-line
 @end lisp
 
 $B$3$l$O!"(B@code{nndir-request-list} $B$X$N8F$S=P$7$OC1(B
-$B$K(B @code{nnmh-request-list} $B$K0z$-EO$5$l!"0lJ}!"(B@code{nnml} $B$N8x3+4X?t$G(B
-$B$^$@(B @code{nndir} $B$GDj5A$5$l$F$$$J$$$b$N$r$3$3$GDj5A$7$^$9!#(B
+$B$K(B @code{nnmh-request-list} $B$K0z$-EO$5$l$J$1$l$P$J$i$:!"0l(B
+$BJ}(B @code{nnml} $B$N8x6&4X?t$G$^$@(B @code{nndir} $B$GDj5A$5$l$F$$$J$$$b$N$r$3(B
+$B$3$GDj5A$9$k$H$$$&$3$H$G$9!#(B
 @end table
 
 $B0J2<$O(B @code{nndir} $B%P%C%/%(%s%I$N$A$g$C$HC;=L$7$?HG$G$9!#(B
 
 @lisp
-;;; @r{nndir.el --- single directory newsgroup access for Gnus}
+;;; @r{nndir.el --- $BC10l$N%G%#%l%/%H%j!<$r%K%e!<%9%0%k!<%W$K$9$k(B}
 ;; @r{Copyright (C) 1995,96 Free Software Foundation, Inc.}
 
 ;;; @r{Code:}
@@ -27049,11 +28020,11 @@ description-buffer = *description-line
   nnml nnmh)
 
 (defvoo nndir-directory nil
-  "Where nndir will look for groups."
+  "nndir $B$,%0%k!<%W$rC5$9>l=j!#(B"
   nnml-current-directory nnmh-current-directory)
 
 (defvoo nndir-nov-is-evil nil
-  "*Non-nil means that nndir will never retrieve NOV headers."
+  "*$B$3$l$,(B nil $B$G$J$+$C$?$i(B NOV $B%X%C%@!<$r(B
-$BA0$HE,Ev$J?t$NG=NO(B @dfn{abilities} $B$G$9!#(B
+@code{gnus-declare-backend} $B$OFs$D$N0z?t$rA0(B
+$B$HG$0U$N?t$NG=NO(B @dfn{abilities} $B$G$9!#(B
 
 $B$3$l$,Nc$G$9!#(B
 
@@ -27117,40 +28088,41 @@ description-buffer = *description-line
 (gnus-declare-backend "nnchoke" 'mail 'respool 'address)
 @end lisp
 
-$B$=$7$F>e5-$N9T$O(B @file{nnchoke.el} $B%U%!%$%k$KF~$l$^$9!#(B
+$B$=$7$F>e5-$N9T$,(B @file{nnchoke.el} $B%U%!%$%k$KF~$j$^$9!#(B
 
-$BG=NO$K$O0J2<$N$b$N$,$"$j$^$9!#(B
+$BG=NO$K$O0J2<$N$b$N$,$"$j$^$9(B:
 
 @table @code
 @item mail
-$B$3$l$O%a!<%kIw%P%C%/%(%s%I$G$9(B --- $B%U%)%m!<%"%C%W$O(B ($B$?$$$F$$$O(B) $B%a!<%k(B
-$B$GAw$i$l$^$9!#(B
+$B$3$l$O%a!<%kIw%P%C%/%(%s%I$G$9(B---$B%U%)%m!<%"%C%W$O(B ($B$?$$$F$$$O(B) $B%a!<%k$G(B
+$BAw$i$l$k$O$:$G$9!#(B
 @item post
-$B$3$l$O%K%e!<%9Iw%P%C%/%(%s%I$G$9(B --- $B%U%)%m!<%"%C%W$O(B ($B$?$$$F$$$O(B) $B%K%e!<(B
-$B%9$GAw$i$l$^$9!#(B
+$B$3$l$O%K%e!<%9Iw%P%C%/%(%s%I$G$9(B---$B%U%)%m!<%"%C%W$O(B ($B$?$$$F$$$O(B) $B%K%e!<(B
+$B%9$GAw$i$l$k$O$:$G$9!#(B
 @item post-mail
 $B$3$N%P%C%/%(%s%I$O%a!<%k$H%K%e!<%9$NN>J}$r%5%]!<%H$7$^$9!#(B
 @item none
-$B$3$l$O%K%e!<%9$G$b%a!<%k$G$b$J$$%P%C%/%(%s%I$G$9(B --- $BA4$/0c$C$?2?$+$G$9!#(B
+$B$3$l$O%K%e!<%9$G$b%a!<%k$G$b$J$$%P%C%/%(%s%I$G$9(B---$B$^$C$?$/0c$C$?2?$+$G(B
+$B$9!#(B
 @item respool
-$B$3$l$O:F%9%W!<%k$r%5%]!<%H$7$^$9(B --- $B$H$$$&$h$j$O!"$=$N85$N5-;v$H%0%k!<(B
-$B%W$r=$@5$9$k$3$H$,$G$-$^$9!#(B
+$B$3$l$O:F%9%W!<%k$r%5%]!<%H$7$^$9(B---$B$H$$$&$+!"$=$N85$N5-;v$H%0%k!<%W$r=q(B
+$B$-49$($k$3$H$,$G$-$^$9!#(B
 @item address
-$B2>A[%5!<%P!$NCf$K%5!<%P!<$NL>A0$,4^$^$k$H$$$&$3$H$G$9!#$3$l$O$[$H$s$I(B
-$BA4It$N%P%C%/%(%s%I$GI,MW$K$J$j$^$9!#(B
+$B%5!<%P!<$NL>A0$,2>A[%5!<%P!$K4^$^$l$F$$$J$1$l$P$J$j$^$;$s!#$3$l$O$[$H(B
+$B$s$IA4It$N%P%C%/%(%s%I$KEv$F$O$^$j$^$9!#(B
 @item prompt-address
-$B%0%k!<%W%P%C%U%!$G(B @kbd{B} $B$J$I$G$3$NL?Na$r$N%P%C%/%(%s%I$KBP$7$F0l@~$r2h$7$F$$$kE@$O!"$[(B
-$B$H$s$I$N%a!<%k%P%C%/%(%s%I$O(B @file{nnmail.el} $B$NCf$N6&DL4X?t$K6/$/0MB8$7(B
-$B$F$$$k$H$$$&E@$G$9!#Nc$($P!"(B@code{nnml-request-scan} $B$NDj5A$O$3$N$h$&$K(B
-$B$J$j$^$9!#(B
+$B%a!<%k%P%C%/%(%s%I$,$=$NB>$N%P%C%/%(%s%I$KBP$7$F0l@~$r2h$7$F$$$k$N$O!"$[(B
+$B$H$s$I$N%a!<%k%P%C%/%(%s%I$,(B @file{nnmail.el} $B$GDj5A$5$l$F$$$k6&DL$N4X?t(B
+$B$K6/$/0MB8$7$F$$$k$H$$$&E@$G$9!#Nc$($P$3$l$O(B @code{nnml-request-scan} $B$N(B
+$BDj5A$G$9(B:
 
 @lisp
 (deffoo nnml-request-scan (&optional group server)
@@ -27159,37 +28131,37 @@ description-buffer = *description-line
 @end lisp
 
 $BC1$K(B @code{nnmail-get-new-mail} $B$K$$$/$D$+0z?t$rM?$($F8F$S=P$9$@$1$G!"(B
-@code{nnmail} $B$,%a!<%k$N0\F0$dJ,N%$rA4$F$NLLE]$r8+$F$/$l$^$9!#(B
+@code{nnmail} $B$,%a!<%k$N0\F0$dJ,3d$N$9$Y$F$NLLE]$r8+$F$/$l$^$9!#(B
 
 $B$3$N4X?t$O;M$D$N0z?t$rl=j$G$9!#(B
 
 @item group
-$B$3$N>JN,2DG=$J0z?t$O!"J,N%$,0l$D$N%0%k!<%W$KBP$7$F$N$_$G$9!#(B
+$B$3$N0z?t$O>JN,2DG=$G$9!#J,3d$,0l$D$N%0%k!<%W$@$1$KBP$7$F9T$J$o$l$k>l9g$O!"(B
+$B$3$N0z?t$G%0%k!<%WL>$r;XDj$7$J$1$l$J$P$j$^$;$s!#(B
 @end table
 
-@code{nnmail-get-new-mail} $B$O3F5-;v$rJ]B8$9$k$?$a(B
+@code{nnmail-get-new-mail} $B$O!"$=$l$>$l$N5-;v$rJ]B8$9$k$?$a(B
 $B$K(B @var{back-end}@code{-save-mail} $B$r8F$S=P$7$^$9!#(B
-@var{back-end}@code{-active-number} $B$O$3$N5-;v$K3d$jEv$F$i$l$?5-;vHV9f$r(B
-$BD4$Y$k$?$a$K8F$S=P$5$l$^$9!#(B
+@var{back-end}@code{-active-number} $B$O!"$3$N5-;v$K3d$jEv$F$i$l$?5-;vHV9f(B
+$B$rD4$Y$k$?$a$K8F$S=P$5$l$^$9!#(B
 
-$B$3$N4X?t$Oo$K=@Fp$J$h$&$K0U?^$5$l$F$$$^(B
-$B$9!#$=$l$K$O(B Emacs Lisp $B$N%j%9%H$HF1$8FI$_9~$_9=J8$JMM$J$b$N$,$=$N;XDj$K(B
-$B9g$&$@$m$&$H$$$&;v$,7hDj$5$l$^$7$?!#(B
+$B%9%3%"%U%!%$%k$O4JC1$KJ,@O$G$-$k$@$1$G$J$/!"6K$a$F=@Fp$JBP1~$,$G$-$k$h$&(B
+$B$K$J$C$F$$$^$9!#$=$l$K$O(B Emacs Lisp $B$N%j%9%H$H$7$FFI$_9~$`$3$H$,$G$-$k$h(B
+$B$&$J9=J8$,$U$5$o$7$$$@$m$&$HH=CG$5$l$^$7$?!#(B
 
 $B$3$l$ONI$/$"$k%9%3%"%U%!%$%k$G$9(B:
 
@@ -27260,76 +28232,73 @@ eval            = "eval" space 
    
 space           = *[ " " /  /  ]
 @end example
 
-$B%9%3%"%U%!%$%k$NG'<1IT2DG=$JMWAG$OL5;k$5$l$k$Y$-$G$9$,!"o$KIiC4$N$+$1$i$l$9$.$?8l$G$9!#(B
-``$B%X%C%@!<(B'' $B$O(B RFC1036 $B$G$O5-;v$NF,$N9T$N;v(B ($BNc$($P!"(B@code{From}) $B$rOC(B
-$B$9$N$KMQ$$$i$l$F$$$^$9!#$=$l$OB?$/$N?M$+(B
-$B$i(B ``$B%X%C%I(B''---``$B%X%C%@!<$HK\BN(B'' $B$NF15A8l$H$7$F;H$o$l$F$$$^$9!#(B($B$3$l(B
-$B$O!";d$N0U8+$G$OHr$1$i$l$k$Y$-$G$9!#(B) $B$=$7$F!"(Bgnus $B$OFbIt$G(B
-$B$O(B ``$B%X%C%@!<(B'' $B$H8F$VMM<0$r;H$C$F$*$j!";d$O$3$3$G$=$l$K$D$$$F@bL@$7$^$9!#(B
-$B$3$l$O6e$D$NMWAG$+$i$J$k%Y%/%H%k$G!"4pK\E*$K!"$=$l$>$l$N%X%C(B
-$B%@!<(B ($B$"DK(B) $B$,0l$D$N6u$->l=j$r@j$a$F$$$^$9!#(B
-
-$B$3$l$i$N6u$->l=j$O!"=gHV$K(B: @code{number}, @code{subject}, @code{from},
-@code{date}, @code{id}, @code{chars}, @code{lines}, @code{xref},
-@code{extra} $B$G$9!#$3$l$i$N6u$->l=j$K?($C$F@_Dj$9$k%^%/%m$,$"$j$^(B
-$B$9(B --- $B$=$l$i$OA4$F!"$=$l$>(B
-$B$l(B @code{mail-header-} $B$H(B @code{mail-header-set-} $B$$$&M=A[$5$l$kL>A0$r;}$C(B
-$B$F$$$^$9!#(B
+gnus $B$O5-;v$N%X%C%@!<$rN/$a$F$*$/$?$a$K!"FbItE*$K$O(B @acronym{NOV} $B$N5,3J(B
+$B$r2x$7$2$J$d$jJ}$GF'=1$9$kMM<0$r;H$C$F$$$^$9!#(B@acronym{NOV} $B$N;EMM$r8+$?(B
+$B:n$l$N%X%C%@!<(B ($B$"DK$C(B) $B$,0l$D$N>l=j$r@j$a$^$9!#(B
 
-@code{extra} $B$N>l=j$O%X%C%@!<(B/$BCM$NBP$NO"A[%j%9%H$G$"$k0J30$O$3$l$i$NA4$F(B
-$B$N>l=j$OJ8;zNs$G$9(B (@pxref{To From Newsgroups})$B!#(B
+$B$3$l$i$N>l=j$O!"=gHV$K(B @code{number}, @code{subject}, @code{from},
+@code{date}, @code{id}, @code{chars}, @code{lines}, @code{xref}, $B$*$h(B
+$B$S(B @code{extra} $B$G$9!#$3$l$i$N>l=j$rFI$_=P$7$?$j@_Dj$9$k%^%/%m$,$"$j$^(B
+$B$9(B---$B$=$l$i$O$9$Y$F!"$=$l$>(B
+$B$l(B @code{mail-header-} $B$H(B @code{mail-header-set-} $B$$$&M=A[$7$d$9$$L>A0$r(B
+$B;}$C$F$$$^$9!#(B
+
+@code{extra} $B$N$?$a$N>l=j$,%X%C%@!<$HCM$NBP$NO"A[%j%9%H$G$"$k$3$H$r=|$$(B
+$B$F!"$3$l$i$9$Y$F$N>l=j$K$OJ8;zNs$,F~$j$^$9(B (@pxref{To From Newsgroups})$B!#(B
 
 @node Ranges
 @subsection $BHO0O(B
 
-@sc{gnus} $B$O;d$K$OHs>o$KLr$KN)$D$H;W$o$l$k35G0$rF3F~$7$^$7$?$N$G!";d$O$=(B
-$B$l$r$?$/$5$s;H$$!"$+$J$jG0F~$j$K:n$j>e$2$F$-$^$7$?!#(B
+@sc{gnus} $B$OHs>o$KM-MQ$J35G0$rF3F~$7$F$/$l$^$7$?!#;d$O$=$l$r$?$/$5$s;H$$!"(B
+$B$+$J$jF~G0$K;E>e$2$^$7$?!#(B
 
-$BZ$5$l$k(B $B$b(B
-$B$N(B (object) (@emph{$BMpK=$J(B} $BNc$r5s$2$k$H!"5-;v$,$=$&$G(B
-$B$9(B) $B$r(B ``$B4^$^$l$F$$$k(B'' $B$H$7$F8+$J$7$?$$$H$-$O!"IaDL$NO"B3E*9T0Y$O$"$^$j(B
-$BLr$KN)$A$^$;$s!#(B($BD9$5(B 200,000 $B$NO"B3J*$O>/$7B)$,D9$9$.$^$9!#(B)
+$B@_Ld$OC1=c$G$9(B: $B2?$+HV9f$G8F$V$3$H$,$G$-$kBgNL$N$b$N(B (@emph{$BAF;($J(B} $BNc$H(B
+$B$7$F$O!"Nc$($P5-;v(B) $B$r;}$C$F$$$F!"$=$l$i$,!V4^$^$l$F$$$k!W$3$H$rI=8=$7$?(B
+$B$$$H$7$^$7$g$&!#$=$l$i$r=gHV$KJB$Y$k$N$O!"$"$^$jJXMx$G$O$"$j$^$;$s!#(B
+(20,000 $B8D$r=gHV$KJB$Y$?$b$N$O!"$A$g$C$HD9$?$i$7$$$G$9$h$M!#(B)
 
-$B$3$l$N2r7h:v$O/$7/(B
+$B$7 /  ]
 $B$H(B
 
 @example
-((1 . 5) (7. 8) (10 . 12))
+((1 . 5) (7 . 8) (10 . 12))
 @end example
 
-$B$OEy2A$G$9!#e$NMW5a$O2<9_$7$F$$$J$$(B
-$B$H$$$&;v$O3P$($F$*$/I,MW$,$"$j$^$9!#(B($BG$0U$N2s?t$NF1$8?t;z$N7+$jJV$7$O5v(B
-$B$5$l$F$$$^$9$,!"HO0O$N07$$$+$i$O>C$(5n$k798~$,$"$j$^$9!#(B)
+$B$3$l$OHO0O$N(B BNF $BDj5A$G$9!#$b$A$m$s!"?tCM$NJB$S$,2<$j=g$G$"$C$F$O$J$i$J(B
+$B$$$3$H$r3P$($F$*$+$J$1$l$P$J$j$^$;$s!#(B($BF1$8?tCM$rG$0U$N2s?t$K$o$?$C$F7+(B
+$B$jJV$9$3$H$,$G$-$^$9$,!"HO0O$N07$$$K$*$$$F>C$(5n$k798~$,$"$j$^$9!#(B)
 
 @example
 range           = simple-range / normal-range
@@ -27367,21 +28336,21 @@ contents        = "" / simple-range *[ " " contents ] /
                   number *[ " " contents ]
 @end example
 
-Gnus $B$O8=:_$N$H$3$m4{FI5-;v$H5-;v$N0u$N>pJs$rIU$1$F$*$/$?$a$KHO0O$r;H$C(B
-$B$F$$$^$9!#;d$O(B $B$5$J$$$G@$$NCf$r40A4$KHO0O$K4p$E$$$?$b$N$K$9$k(B
-$B$?$a$K$b$&>/$79M$($kI,MW$,$"$k$+$i$G$9!#(B)
+$B8=:_(B gnus $B$O4{FI5-;v$H5-;v$N0u$r0];}$9$k$?$a$KHO0O$r;H$C$F$$$^$9!#Ev6I$,(B
+$B;d$K$=$l$r$5$;$?$,$C$F$$$k$N$J$i!";d$O?t$NHO0O$NA`:n$r(B C $B$G$5$:$K!"@$$NCf$r40A4$KHO0O$K4p$E$$$?$b$N$K$9$k$?$a$K$O2?$,I,MW$+$r!";d(B
+$B$O$b$C$H9M$($J$1$l$P$J$i$J$$$+$i$G$9!#(B)
 
 @node Group Info
 @subsection $B%0%k!<%W>pJs(B
 
-Gnus $B$O%0%k!<%W$NA4$F$N1JB3>pJs$r(B @dfn{group info} $B%j%9%H$KJ]B8$7$^$9!#(B
-$B$3$N%j%9%H$ND9$5$O(B 3 $B$+$i(B 6 ($B$b$7$/$O$b$C$H(B) $B$NMWAG$GE0DlE*$K%0%k!<%W$r(B
-$B5-=R$7$^$9!#(B
+gnus $B$O%0%k!<%W$N$9$Y$F$N1JB3E*$J>pJs$r(B @dfn{group info} $B%j%9%H$K3JG<$7(B
+$B$^$9!#$3$N%j%9%H$O(B 3 $B$+$i(B 6 ($B$^$?$O$=$l0J>e(B) $B$ND9$5$NMWAG$G!"E0DlE*$K%0(B
+$B%k!<%W$r5-=R$7$^$9!#(B
 
 $B$3$3$K$"$k$N$O%0%k!<%W>pJs(B (group info) $B$NFs$D$NNc$G$9!#0l$D$OHs>o$KC1=c(B
-$B$J%0%k!<%W$G!"Fs$D$a$O$b$C$HJ#;($J$b$N$G$9(B:
+$B$J%0%k!<%W$G$9$,!"Fs$DL\$O$b$C$HJ#;($J$b$N$G$9(B:
 
 @example
 ("no.group" 5 ((1 . 54324)))
@@ -27392,18 +28361,17 @@ Gnus $B$O%0%k!<%W$NA4$F$N1JB3>pJs$r(B @dfn{group info} $B%j%9%H$KJ]B8$7$^$9!#
                 ((auto-expire . t) (to-address . "ding@@gnus.org")))
 @end example
 
-$B:G=i$NMWAG$O(B @dfn{$B%0%k!<%WL>(B} $B$G$9(B---$B$I$N$h$&$K$7$m!"(Bgnus $B$,$=$l$K$h$C$F(B
-$B%0%k!<%W$rCN$C$F$$$k$b$N$G$9!#FsHVL\$NMWAG$O(B @dfn{$B9XFIEY(B} $B$G!"IaDL$O>.$5(B
-$B$J@0?t$G$9!#(B($B$=$l$O(B @dfn{$B3,5i(B} $B$K$J$k;v$b$G$-$^$9!#$=$l$O!"%3%s%9%;%k$G!"(B
-@code{car} $B$,%l%Y%k$G!"(B@code{cdr} $B$,%9%3%"$G$9!#(B) $B;0HVL\$NMWAG$O4{FI5-;v(B
-$B$NHO0O$N%j%9%H$G$9!#;MHVL\$NMWAG$O$$$m$$$m$Je$N%5!<%P!<$G$9(B)$B!#O;HVL\$NMWAG$O(B @dfn{$B%0%k!<%W%Q%i%a!<%?(B} $B$N%j%9%H(B
-$B$G!"$3$NItJ,$O$=$N$?$a$K$"$j$^$9!#(B
+$B:G=i$NMWAG$O!V%0%k!<%WL>!W(B---$B$H$K$+$/(B gnus $B$,CN$C$F$$$k%0%k!<%W$G$9!#Fs(B
+$BHVL\$NMWAG$O!V9XFIEY!W$G!"IaDL$O>.$5$J@0?t$G$9!#(B($B$=$l$O!V3,5i!W(B(rank) $B$K(B
+$B$J$k$3$H$b$G$-$^$9!#(B@code{car} $B$,%l%Y%k$G(B @code{cdr} $B$,%9%3%"$N%3%s%9%;(B
+$B%k$G$9!#(B) $B;0HVL\$NMWAG$O4{FI5-;v$NHO0O$N%j%9%H$G$9!#;MHVL\$NMWAG$O$$$m$$(B
+$B$m$JA[%5!<%P!<$G$9(B)$B!#O;HVL\$NMWAG$O!V%0%k!<%W%Q%i%a!<(B
+$B%?!O$O$=$N$?$a$K$"$j$^$9(B ($BLuCm(B: $B$[$s$H$&$K(B?)$B!#(B
 
-$B:G8e$N;0$D$NMWAG$O$I$l$G$b!"I,MW$,L5$1$l$PB8:_$7$J$$;v$b$"$j$^$9!#o$KBgItJ,$O:G=i$N;0$D$NMWAG$@$1$r;}$A!"$=$l$O$?$/$5$s$N%3%s(B
-$B%9%;%k$r@aLs$9$k;v$,$G$-$^$9!#(B
+$B:G8e$N;0$D$NMWAG$O$I$l$G$b!"I,MW$,L5$1$l$PB8:_$7$J$$$3$H$b$"$j$^$9!#o$KBgItJ,$O:G=i$N;0$D$NMWAG$@$1$r;}$A!"$=$l$O(B ($B:G8e$N;0MWAG(B
+$B$,>JN,$G$-$k$3$H$O(B) $BHs>o$KB?$/$N%3%s%9%;%k$r@aLs$7$^$9!#(B
 
 $B$3$l$O%0%k!<%W>pJsMM<0$N(B BNF $BDj5A$G$9(B:
 
@@ -27423,12 +28391,12 @@ method        = "("  *elisp-forms ")"
 parameters    = "(" *elisp-forms ")"
 @end example
 
-$B} $B$,(B @samp{range} $B$N>e$K9=@.$5$l$F$$$k$b$N(B
-$B$G$9$,!"5?;w(B BNF $B$G$=$l$r8=$9$N$OITL{2w$J$b$N$G$9!#(B
+$B} $B$G$9$,!"5?;w(B BNF $B$G$=$l$r8=$9$N$O(B
+$BFq$7$$$N$G$9!#(B
 
-$B$b$7(B gnus $B>pJs$r;}$C$F$$$F!"MWAG$rD4$Y$?$$$N$H$-$O!"(Bgnus $B$O$=$l$i$NMWAG(B
-$B$rpJs$NMWAG72$K%"%/%;%9$7$F!"$=$l$i$NCM$rpJs$N%j%9%H$G$9!#@_Dj4X?t$OFs$D(B
-$B$N0z?t$rpJs%j%9%H$H?7$7$$CM$G$9!#(B
+$BpJs$N%j%9%H$G$9!#@_(B
+$BDj$9$k$?$a$N4X?t$OFs$D$N0z?t$rpJs$N%j%9%H$H?7$7$$CM$G$9!#(B
 
-$B%0%k!<%W>pJs$N:G8e$N;0$D$NMWAG$O6/@)E*$J$b$N$G$O$"$j$^$;$s$N$G!"MWAG$r@_(B
-$BDj$9$kA0$K%0%k!<%W>pJs$r3HD%$9$kI,MW$,$"$k$+$bCN$l$^$;$s!#$b$7$3$l$,I,MW(B
-$B$J>l9g$O!"$3$l$,<+F0E*$K5/$3$k$?$a$K(B @code{nil} $B$G$J$$;0HVL\$N0z?t$r;0$D(B
-$B$N:G=*@_Dj4X?t$KM?$($k$@$1$G$9!#(B
+$B%0%k!<%W>pJs$N:G8e$N;0$D$NMWAG$OI,?\$G$O$J$$$N$G!"MWAG$r@_Dj$9$kA0$K%0%k!<(B
+$B%W>pJs$r3HD%$9$kI,MW$,$"$k$G$7$g$&!#$=$l$,I,MW$J>l9g!":G8e$N;0$D$N@_Dj$9(B
+$B$k$?$a$N4X?t$NBh;00z?t$K(B @code{nil} $B$G$O$J$$CM$r;XDj$9$l$P!"<+F0E*$K3HD%(B
+$B$5$;$k$3$H$,$G$-$^$9!#(B($BLuCm(B: $BNc$($P;0$D$NMWAG$7$+$J$$>pJs$K;M$DL\$NMWAG(B
+$B$r2C$($k=hM}$rBh;00z?t$r;H$o$:$K9T$J$&$H!"(B@code{(setcar (nthcdr 3 INFO)
+VALUE)} $B$H$$$&%3!<%I$,/$73HD%$7$F$$$^$9(B (@pxref{Symbolic Prefixes})$B!#$3$l$O$=$N;H$$(B
-$BJ}$NNc$G$9(B:
+gnus $B$O(B Emacs $BI8=`$N(B @code{interactive} $B$N;EMM$r!"%7%s%\%k@\F,0z?t$r4JC1(B
+$B$K;H$&$3$H$,$G$-$k$h$&$K$9$k$?$a$K!">/$73HD%$7$F$$$^(B
+$B$9(B (@pxref{Symbolic Prefixes})$B!#$3$l$O$=$N;H$$J}$NNc$G$9(B:
 
 @lisp
 (defun gnus-summary-increase-score (&optional score symp)
@@ -27504,32 +28474,34 @@ Gnus $B$O(B Emacs $B$NI8=`$N(B @code{interactive} $B;XDj$r%7%s%\%k@\F,<-$r4
   )
 @end lisp
 
-$B:G>e$NJ}K!$O(B @code{gnus-interactive} $B$r<0(B @code{interactive} $B$rJV$9%^%/(B
-$B%m$H$7$Fe$N$b$N$O(B @code{interactive} $B$N<0$rJV$9%^%/%m$H$7(B
+$B$F(B @code{gnus-interactive} $B$r/$72C$($^$9!#(B
+$B$3$N4X?t$O(B ($B$[$H$s$I(B) $B$9$Y$F$N(B @code{interactive} $B$N;XDj$r/$72C$($k$3$H$K$7$^$9!#(B
 
 @table @samp
 @item y
 @vindex gnus-current-prefix-symbol
-$B8=:_$N@\F,0z?t%7%s%\%k(B---$BJQ?t(B @code{gnus-current-prefix-symbol} $B$G$9!#(B
+$B8=:_$N%7%s%\%k@\F,0z?t(B---$BJQ?t(B @code{gnus-current-prefix-symbol} $B$G$9!#(B
 
 @item Y
 @vindex gnus-current-prefix-symbols
-$B8=:_$N@\F,0z?t%7%s%\%k$N%j%9%H$G$9(B---$BJQ(B
+$B8=:_$N%7%s%\%k@\F,0z?t$N%j%9%H(B---$BJQ(B
 $B?t(B @code{gnus-current-prefix-symbol} $B$G$9!#(B
 
 @item A
-$B8=:_$N5-;vHV9f$G$9(B---$B4X?t(B @code{gnus-summary-article-number} $B$G$9!#(B
+$B8=:_$N5-;vHV9f(B---$B4X?t(B @code{gnus-summary-article-number} $B$G$9!#(B
 
 @item H
-$B8=:_$N5-;v%X%C%@!<$G$9(B---$B4X?t(B @code{gnus-summary-article-header} $B$G$9!#(B
+$B8=:_$N5-;v%X%C%@!<(B ---$B4X?t(B @code{gnus-summary-article-header} $B$G$9!#(B
 
 @item g
-$B8=:_$N%0%k!<%WL>$G$9(B---$B4X?t(B @code{gnus-group-group-name} $B$G$9!#(B
+$B8=:_$N%0%k!<%WL>(B---$B4X?t(B @code{gnus-group-group-name} $B$G$9!#(B
 @end table
 
 @node Emacs/XEmacs Code
@@ -27537,24 +28509,28 @@ Gnus $B$O(B Emacs $B$NI8=`$N(B @code{interactive} $B;XDj$r%7%s%\%k@\F,<-$r4
 @cindex XEmacs
 @cindex Emacsen
 
-Gnus $B$O(B Emacs, XEmacs $B$H(B Mule $B$GF0:n$7$^$9$N$G!"$=$N$&$A$N0l$D$ro$KLr$KN)$A$^$9!#(B
-
-$B;d$O7QB3E*$K(B Emacs $B$N4X?t$N3&LL(B (interface) $B$r;H$C$F$-$^$7$?$,!"4X?t$K(B
-$B$O(B gnus $B$NJLL>4X?t(B (alias) $B$r;H$C$F$-$^$7$?!#Nc$r=P$7$^$7$g$&(B: Emacs $B$O(B
-$B4X?t(B @code{run-at-time} $B$rDj5A$7$F$$$^$9$,!"(BXEmacs $B$O4X(B
-$B?t(B @code{start-itimer} $B$rDj5A$7$F$$$^$9!#$=$3$G;d(B
-$B$O(B @code{gnus-run-at-time} $B$H8F$P$l$k4X?t$rDj5A$7!"$=$l(B
-$B$O(B Emacs $B$N(B @code{run-at-time} $B$HF1$80z?t$r4X?t(B (alias) $B$K$J$C$F$$$^(B
-$B$9!#$7$+$7!"(BXEmacs $B$G4X?t(B (alias) $B$H(B
-$B$J$C$F$$$^$9(B:
+gnus $B$O(B Emacs, XEmacs $B$H(B Mule $B$GF0:n$9$k$N$G!"$=$N$&$A$N0l$D$rH$7$F2<$5$$!#(B)
+
+$B$3$l$O!"(Bgnus $B$O(B Emacs $B$G>/$7$N7Y9p$bL5$/%P%$%H%3%s%Q%$%k$G$-$k$N$KBP$7$F!"(B
+XEmacs $B$O%P%$%H%3%s%Q%$%k$r$7$F$$$k4V$K%.%,%P%$%H$/$i$$$N7Y9p$r=P$9$H$$(B
+$B$&$3$H$G$b$"$j$^$9(B ($BLuCm(B: $B8=:_$O$=$s$J$3$H$O$"$j$^$;$s(B)$B!#;d$O:3:Y$J<:GT(B
+$B$r8+$D$1=P$9$3$H$KLrN)$F$k$?$a$K%P%$%H%3%s%Q%$%k$N7Y9p$r;H$C$F$$$k$N$G!"(B
+$B$=$l$O$H$F$b=u$1$K$J$j$^$9!#(B
+
+$B$5$i$K!";d$O(B (aliases) $B$r;H$C$F$-$^$7$?!#Nc$r=P(B
+$B$7$^$7$g$&(B: Emacs $B$,4X?t(B @code{run-at-time} $B$rDj5A$7$F$$$k0lJ}$G!"(B
+XEmacs $B$O4X?t(B @code{start-itimer} $B$rDj5A$7$F$$$^$9!#$=$3$G!";d(B
+$B$O(B Emacs $B$N(B @code{run-at-time} $B$HF1$80z?t$r$K$J$C$F(B
+$B$$$^$9!#$7$+$7(B XEmacs $B$G$H$J$C$F$$$^$9(B ($BLuCm(B: $B8=:_$3$&$$$&$b$N$O$"$j$^$;$s(B):
 
 @lisp
 (defun gnus-xmas-run-at-time (time repeat function &rest args)
@@ -27565,33 +28541,33 @@ XEmacs $B$O%P%$%H%3%s%Q%$%k$r$7$F$$$k4V$K%.%,%P%$%H$/$i$$$N7Y9p$r=P$9$H8@(B
    time repeat))
 @end lisp
 
-$B$3$Nl9g$O!";d$OBe$o$j$K$=$l$r;H$$$^(B
-$B$9!#Nc$($P!"(B@code{gnus-region-active-p} $B$O(B XEmacs $B$G(B
+XEmacs $B$N4X?t$N%$%s%?!<%U%'!<%9$NJ}$,L@$i$+$K$-$l$$$J>l9g$O!";d$OBe$o$j(B
+$B$K$=$l$r;H$$$^$9!#Nc$($P!"(B@code{gnus-region-active-p} $B$O(B XEmacs $B$G(B
 $B$O(B @code{region-active-p} $B$NJLL>$G$"$k$N$KBP$7$F!"(BEmacs $B$G$O4X?t$G$9!#(B
 
-$B$b$A$m$s!";d$O(B XEmacs $B$r;d$N4pK\%W%i%C%H%U%)!<%`$KA*$s$G!"4X?t$N3d$jEv$F(B
-$B$r5U$K$9$k;v$b$G$-$^$7$?!#$G$b!";d$O$=$&$7$^$;$s$G$7$?!#(B
-XEmacs $B$G(B gnus $B$r/$7$G(B
-$B$7$g$&!#(B
+$B$b$A$m$s(B XEmacs $B$r;d$N4pK\%W%i%C%H%U%)!<%`$KA*$s$G!"4X?t$N3d$jEv$F$r5U$K(B
+$B$9$k$3$H$b$G$-$^$7$?$,!";d$O$=$&$7$^$;$s$G$7$?!#(BXEmacs $B$G(B gnus $B$rpJs(B
-* Newsgroups File Format::      $B%0%k!<%W$N5-=R(B
+* Active File Format::          $B;HMQ2DG=$J5-;v$H%0%k!<%W$N>pJs(B
+* Newsgroups File Format::      $B%0%k!<%W$N@bL@(B
 @end menu
 
 @node Active File Format
-@subsubsection $B%"%/%F%$%V%U%!%$%kMM<0(B
+@subsubsection $B%"%/%F%$%V%U%!%$%k$NMM<0(B
 
-$B%"%/%F%#%V%U%!%$%k$OEv$N%5!<%P!<$NA4$F$N;HMQ2DG=$J%0%k!<%W$N0lMw$r5s$2$^(B
-$B$9!#$=$l$O$=$l$>$l$N%0%k!<%W$N:GDc$H:G9b$N5-;vHV9f$N0lMw$b$"$j$^$9!#(B
+$B%"%/%F%#%V%U%!%$%k$O!"BP>]$K$J$C$F$$$k%5!<%P!<$N$9$Y$F$N;HMQ2DG=$J%0%k!<(B
+$B%W$NL\O?$rJ];}$7$^$9!#$=$3$K$O!"$=$l$>$l$N%0%k!<%W$N:G9b$H:GDc$N5-;vHV9f(B
+$B$NL\O?$b$"$j$^$9!#(B
 
 $B$3$l$OIaDL$N%"%/%F%#%V%U%!%$%k$+$i$NH4?h$G$9(B:
 
@@ -27603,7 +28579,7 @@ comp.binaries.ibm.pc 5097 5089 y
 no.general 1000 900 y
 @end example
 
-$B$3$l$O$3$N%U%!%$%k$N5?;w(B BNF $BDj5A$G$9!#(B
+$B$3$l$O$3$N%U%!%$%k$N5?;w(B BNF $BDj5A$G$9(B:
 
 @example
 active      = *group-line
@@ -27615,18 +28591,18 @@ low-number  = 
 flag        = "y" / "n" / "m" / "j" / "x" / "=" group
 @end example
 
-$B$3$N%U%!%$%k$N40A4$J5-=R$rF@$k$?$a$K$O!"(B@samp{innd} $B$N%^%K%e%"%kJG!"FC(B
+$B$3$N%U%!%$%k$N40A4$J@bL@$O!"(B@samp{innd} $B$N%^%K%e%"%k%Z!<%8!"FC(B
 $B$K(B @samp{active(5)} $B$r8+$F2<$5$$!#(B
 
 @node Newsgroups File Format
-@subsubsection $B%K%e!<%9%0%k!<%W%U%!%$%kMM<0(B
+@subsubsection $B%K%e!<%9%0%k!<%W%U%!%$%k$NMM<0(B
 
-$B%K%e!<%9%0%k!<%W%U%!%$%k$O%0%k!<%W$r$=$N5-=R$H6&$K0lMw$r5s$2$^$9!#%5!<%P!<(B
-$B$K$"$kA4$F$N%0%k!<%W$,0lMw$K$5$l$J$1$l$P$J$i$J$$$N$G$O$J$/!"$^$?!"%U%!%$(B
-$B%k$NA4$F$N%0%k!<%W$,%5!<%P!<$KB8:_$7$J$1$l$P$J$i$J$$$N$G$O$"$j$^$;$s!#$3(B
-$B$N%U%!%$%k$O=c?h$KMxMQpJs$N$?$a$K$"$j$^$9!#(B
+$B%K%e!<%9%0%k!<%W%U%!%$%k$O!"%0%k!<%W$NL\O?$r$=$l$i$N@bL@$H$H$b$KJ];}$7$^(B
+$B$9!#%5!<%P!<$K$"$k$9$Y$F$N%0%k!<%W$,$"$kI,MW$OL5$$$7!"$=$N%U%!%$%k$K$"$k(B
+$B$9$Y$F$N%0%k!<%W$,%5!<%P!<$KB8:_$7$J$1$l$P$J$i$J$$$3$H$b$"$j$^$;$s!#$3$N(B
+$B%U%!%$%k$O=c?h$KMxMQpJs$N$?$a$K$"$j$^$9!#(B
 
-$BMM<0$OHs>o$K4JC1$G$9(B: $B%0%k!<%WL>!"%?%V!"$=$7$F5-=R$G$9!#$3$l$ODj5A$G$9(B:
+$BMM<0$O$H$F$bC1=c$G$9(B: $B%0%k!<%WL>!"%?%V!"$=$7$F@bL@$G$9!#$3$l$,Dj5A$G$9(B:
 
 @example
 newsgroups    = *line
@@ -27640,14 +28616,14 @@ description   = 
 @node Emacs for Heathens
 @section $B0[65EL$X$N(B Emacs
 
-$B?.$8$k$+$I$&$+$OCN$j$^$;$s$,!"(Bgnus $B$r;H$&?M$NCf$K$O(B Gnus Love Boat $B$G$N(B
-$BN9$KEk>h$9$kA0$K$"$^$j(B Emacs $B$r;H$C$?;v$,L5$$$H$$$&?M$,$$$^$9!#$b$7$"$J(B
-$B$?$,(B ``@kbd{C-M-a}'' $B$d(B ``$B%j!<%8%g%s$r@Z$k(B''$B!"$=$7(B
-$B$F(B ``@code{gnus-flargblossen} $B$rO"A[%j%9%H$K@_Dj$7$F$/$@$5$$!#$=$N%-!<$O(B
-$B%0%k!<%WL>$K9gCW$9$k$?$a$K;H$o$l$k@55,I=8=$G$9(B'' $B$,>/$7$N0UL#$+A4$/0UL#(B
-$B$NL5$$KbK!$N8@MU$G$"$kIT9,$J?M$G$"$l$P!"$3$NIUO?$O$"$J$?$N$?$a$K$"$j$^$9!#(B
-$B$b$7$"$J$?$,4{$K(B Emacs $B$K?F$7$s$G$$$k$N$G$"$l$P!"$3$l$rL5;k$7$Fh$9$kA0$K$"$^(B
+$B$j(B Emacs $B$r;H$C$?$3$H$,L5$$$H$$$&(B gnus $B$NMxMQ$K9gCW$9$k$?$a$K;H$o$l$k@55,I=8=$G$9!#!W$H$$$C$?$3$H$,!"$"$J$?$K$H$C(B
+$B$F>/$7$+$^$C$?$/0UL#$NL5$$KbK!$N8@MU$J$i$P!"$3$NIUO?$O$"$J$?$N$?$a$K$"$j(B
+$B$^$9!#$b$7$"$J$?$,$9$G$K(B Emacs $B$K?F$7$s$G$$$k$N$G$"$l$P!"$3$l$rL5;k$7$F(B
+$B$"$J$?$NG-$r2D0&$,$j$K9T$C$F2<$5$$!#(B
 
 @menu
 * Keystrokes::                  $BJ8>O$rF~NO$7$FL?Na$r
 Q: $B7P83$N$"$k(B Emacs $B$NMxMQo$K$&$k$5$/46$8$i$l$k$G$7$g$&!#;D$j$N?M!9$O!"$=(B
-$B$l$K$h$j$b$?$i$5$l$kCO9v$r0&$7$^$9!#$"$-$i$a$FI~=>$7$F2<$5$$!#(BEmacs $B$OK\(B
-$BEv$O(B ``Escape-Meta-Alt-Control-Shift'' $B$NN,$G!"B>$NI>H=$N0-$$=P(B
-$B=j(B (Emacs $B$N:n.;X$N6a$/$K0LCV$7$F$*$j!"IaDL$OBgJ8;z$d$=$NB>$N$b$rF@(B
-$B$k$?$a$K;H$o$l$^$9!#$"$J$?$O$:$C$H$=$l$r;H$&;v$G$7$g$&!#%3%s%H%m!<%k%-!<(B
-$B$OIaDL$O(B ``CTRL'' $B$d$=$N$h$&$J$b$N$G0u$,IU$$$F$$$^$9!#%a%?%-!<$O!"$*$b$7(B
-$B$m$$;v$K!"$I$N%-!<%\!<%I$G$b$=$N$h$&$K0u$,IU$1$i$l$F$$$^$;$s!#$=$l$OIaDL(B
-$B$O%-!<%\!<%I$N:8/$7J#;($K$J$C$F$$$^$9!#$=$N$h$&$J>l9g$O!"(B``$B%(%9%1!<%W(B'' $B%-!<$r;H$&;v$,(B
-$B$G$-$^$9!#$=$l$O%a%?%-!<$r;}$C$F$$$k$H$-$h$j$b$C$H:n6H$,BgJQ$K$J$j$^$9$N(B
-$B$G!"$=$&$$$&>l9g$O!";d$O%a%?%-!<$N$"$k%-!<%\!<%I$ro$K(B
+$BHQ$o$7$$$b$N$G$9$,!";d$?$A$O$=$NCO9v$r0&$7$^$9!#D|$a$F$=$l$r4E.;X$N6a$/$K$"$C$F!"IaDL$OBgJ8;z$J$I$rBG$D$?$a$K(B
+$B;H$o$l$F$$$^$9!#$"$J$?$O@d$(4V$J$/$=$l$r;H$$$^$9$h$M!#%3%s%H%m!<%k%-!<$K(B
+$B$OIaDL!H(BCTRL$B!I$N$h$&$J0u$,IU$$$F$$$^$9!#%a%?%-!<$O4qL/$J$3$H$K$I$N%-!<%\!<(B
+$B%I$G$b$=$&$$$&0u$,IU$$$F$$$^$;$s!#$=$l$OIaDL$O%-!<%\!<%I$N:8/$d$d$3$7$/$J$C$F$$$^$9!#$=$&$$$&>l9g$K$O!V%(%9%1!<%W!W(B
+$B%-!<$r;H$($P$h$$$G$7$g$&!#$?$@$7%a%?%-!<$r;}$C$F$$$k$H$-$h$j:n6H$,A}$($k(B
+$B$N$G!"%a%?%-!<$N$"$k%-!<%\!<%I$re$2$^$9!#$=$lL5$7$G$O@8$-$F9T$1$J$$$G$7$g$&!#(B
 
 @node Emacs Lisp
 @subsection Emacs Lisp
 
-Emacs $B$O$=$l$,K\Ev$O(B Lisp $B%$%s%?!<%W%j%?!<$G$"$k;v$+$i!"%(%G%#%?!<$N2&MM(B
-$B$G$9!#$"$J$?$,C!$/!"$=$l$>$l$NA4$F$N%-!<$O2?$i$+$N(B Emacs Lisp $B$N%3!<%I$N(B
-$B>.JR$r/$J$/$H$b(B Lisp $B%3!<%I$N=q$-J}$rCN$C$F$$$l$P!#(B) $B$7$+$7!"$=$l$O$3$N%^(B
-$B%K%e%"%k$NHO0O30$J$N$G!"2f!9$OC1$K(B gnus $B$r%+%9%?%^%$%:$9$k$?$a$K%U%!%$(B
-$B%k(B @file{.emacs} $B$GIaDL;H$o$l$k$$$/$D$+$NIaDL$N9=J8$K$D$$$F$@$1OC$r$7$^(B
-$B$9!#(B
+Emacs $B$O%(%G%#%?!<$N2&MM$G$9!#$J$<$J$i!"$=$l$,??$N(B Lisp $B%$%s%?!<%W%j%?!<(B
+$B$@$+$i$G$9!#$"$J$?$,C!$/$9$Y$F$N%-!<$O!"2?$i$+$N(B Emacs Lisp $B%3!<%I$N>.JR(B
+$B$r/$J$/$H$b(B Lisp $B%3!<%I$N=q$-J}$rCN$C(B
+$B$F$$$l$P!#(B) $B$G$b$=$l$O$3$N%^%K%e%"%k$NHOaF$G$O$J$$$N$G!"(Bgnus $B$r%+%9%?%^(B
+$B%$%:$9$k$?$a$K(B @file{~/.gnus.el} $B%U%!%$%k$GIaCJ;H$o$l$k$$$/$D$+$N0lHLE*(B
+$B$J9=J8$N$3$H$@$1$rOC$9$3$H$K$7$^$7$g$&!#(B(@file{~/.emacs} $B%U%!%$%k$r;H$&(B
+$B$3$H$b$G$-$^$9$,!"(Bgnus $B$K4X$9$k@_Dj$K$O(B @file{~/.gnus.el} $B%U%!%$%k$r;H$&(B
+$BJ}$,$O$k$+$KNI$$$G$9!#(B)
 
-$B$b$7JQ?t(B@code{gnus-florgbnize} $B$r;M(B (4) $B$K@_Dj$7$?$$$N$G$"$l$P!"0J2<$N$b(B
-$B$N$r=q$-$^$9(B:
+$B$b$7JQ?t(B @code{gnus-florgbnize} $B$r;M(B (4) $B$K@_Dj$7$?$$$N$G$"$l$P!"0J2<$N(B
+$B$b$N$r=q$-$^$7$g$&(B:
 
 @lisp
 (setq gnus-florgbnize 4)
 @end lisp
 
-$B$3$N4X?t(B @code{setq} ($BK\Ev$O(B ``$BFC2A(B} ($B$=$l$O(B ``$B2A(B} $B$7!"$=$l$O$3$3$G$O4JC1$J(B @code{setq} $BJ8$G$9!#(B
+$B$=$&$$$&$b$N$r(B @file{~/.gnus.el} $B%U%!%$%k$KF~$l$F$*$/$H!"$=$l$i$O2A(B} $B$7$?<0$NJV$jCM$G$9!#(B
+$B$5$"!"$d$C$F$_$^$7$g$&(B---$B$"$J$?$,(B Emacs $B$NA0$K$$$k$N$J$i;n$7$F$_$F2<$5$$!#(B
+@kbd{C-x C-e} $B$r%?%$%W$9$k$H!"%(%3!<%(%j%"(B ($BLuCm(B: $B0lHL$K$O(B Emacs $B$N2hLL(B
+$B$N0lHV2<(B) $B$K(B @samp{4} $B$,8=$o$l$k$N$,8+$($k$G$7$g$&!#$=$l$O$"$J$?(B
+$B$,(B @code{eval} $B$7$?<0$NLa$jCM$G$9!#(B
 
 $B$$$/$D$+$NMn$H$77j(B:
 
-$B$b$7%^%K%e%"%k$,(B ``@code{gnus-read-active-file} $B$r(B @code{some} $B$K@_Dj$7(B
-$B$J$5$$(B'' $B$H8@$C$?$J$i!"$=$l$O(B:
+$B$b$7%^%K%e%"%k$,!V(B@code{gnus-read-active-file} $B$r(B @code{some} $B$K@_Dj$7$J(B
+$B$5$$!W$H8@$C$?$J$i!"$=$l$O(B
 
 @lisp
 (setq gnus-read-active-file 'some)
 @end lisp
 
-$B$H8@$&;v$G$9!#(B
+$B$H$$$&$3$H$G$9!#(B
 
 $B0lJ}!"%^%K%e%"%k(B
-$B$,(B ``@code{gnus-nntp-server} $B$r(B @samp{nntp.ifi.uio.no} $B$K@_Dj$7$J$5(B
-$B$$(B'' $B$H8@$C$?$J$i!"$=$l$O(B:
+$B$,!V(B@code{gnus-nntp-server} $B$r(B @samp{nntp.ifi.uio.no} $B$K@_Dj$7$J$5$$!W$H(B
+$B8@$C$?$J$i!"$=$l$O(B
 
 @lisp
 (setq gnus-nntp-server "nntp.ifi.uio.no")
 @end lisp
 
-$B$H8@$&;v$G$9!#(B
+$B$H$$$&$3$H$G$9!#(B
 
 $B$G$9$+$i!"J8;zNs(B ($B8e
 ;; Keywords: tools
@@ -18,8 +18,8 @@
 
 ;; 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.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -27,16 +27,13 @@
 
 (defvar gnus-news-header-disclaimer
 "GNUS NEWS -- history of user-visible changes.
-Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+   2006 Free Software Foundation, Inc.
 See the end for copying conditions.
 
 Please send Gnus bug reports to bugs\@gnus.org.
 For older news, see Gnus info node \"New Features\".
 
-
-
-* Changes in No Gnus
-
 ")
 
 (defvar gnus-news-trailer
@@ -46,7 +43,8 @@ For older news, see Gnus info node \"New Features\".
 ----------------------------------------------------------------------
 Copyright information:
 
-Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+   2006 Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
@@ -62,7 +60,7 @@ paragraph-separate: \"[ 	]*$\"\nend:\n")
 
 (defvar gnus-news-makeinfo-command "makeinfo")
 
-(defvar gnus-news-fill-column 72)
+(defvar gnus-news-fill-column 80)
 
 (defvar gnus-news-makeinfo-switches
   (concat " --no-headers --paragraph-indent=0"
@@ -99,10 +97,17 @@ paragraph-separate: \"[ 	]*$\"\nend:\n")
       (goto-char (point-min))
       (save-excursion
 	(while (re-search-forward "^   \\* " nil t)
+	  (replace-match "\f\n* ")))
+      (save-excursion
+	(while (re-search-forward "^        \\* " nil t)
 	  (replace-match "** ")))
       (save-excursion
 	(while (re-search-forward "^     " nil t)
 	  (replace-match "")))
+      ;; Avoid `*' from @ref at beginning of line:
+      (save-excursion
+	(while (re-search-forward "^\\*Note" nil t)
+	  (replace-match " \\&")))
       (goto-char (point-min))
       (insert gnus-news-header-disclaimer)
       (goto-char (point-max))
diff --git a/texi/gnus-news.texi b/texi/gnus-news.texi
index 8735904..45c2320 100644
--- a/texi/gnus-news.texi
+++ b/texi/gnus-news.texi
@@ -1,6 +1,6 @@
 @c -*-texinfo-*-
 
-@c Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+@c Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 
 @c    Permission is granted to anyone to make or distribute verbatim copies
 @c    of this document as received, in any medium, provided that the
@@ -18,6 +18,9 @@
 
 @itemize @bullet
 
+@item Installation changes
+
+@itemize @bullet
 @item Upgrading from previous (stable) version if you have used No Gnus.
 
 If you have tried No Gnus (the unstable Gnus branch leading to this
@@ -29,104 +32,189 @@ file, where this release will store flags for nntp.  See a later entry
 for more information about nntp marks.  Note that downgrading isn't
 safe in general.
 
-@item The nntp back end store article marks in @file{~/News/marks}.
+@item Lisp files are now installed in @file{.../site-lisp/gnus/} by default.
+It defaulted to @file{.../site-lisp/} formerly.  In addition to this,
+the new installer issues a warning if other Gnus installations which
+will shadow the latest one are detected.  You can then remove those
+shadows manually or remove them using @code{make
+remove-installed-shadows}.
+@end itemize
 
-The directory can be changed using the (customizable) variable
-@code{nntp-marks-directory}, and marks can be disabled using the
-(back end) variable @code{nntp-marks-is-evil}.  The advantage of this
-is that you can copy @file{~/News/marks} (using rsync, scp or
-whatever) to another Gnus installation, and it will realize what
-articles you have read and marked.  The data in @file{~/News/marks}
-has priority over the same data in @file{~/.newsrc.eld}.
+@item New packages and libraries within Gnus
+
+@itemize @bullet
+
+@item Gnus includes the Emacs Lisp @acronym{SASL} library.
+
+This provides a clean @acronym{API} to @acronym{SASL} mechanisms from
+within Emacs.  The user visible aspects of this, compared to the earlier
+situation, include support for @acronym{DIGEST}-@acronym{MD5} and
+@acronym{NTLM}.   @xref{Top, ,Emacs SASL, sasl, Emacs SASL}.
+
+@item ManageSieve connections uses the @acronym{SASL} library by default.
+
+The primary change this brings is support for @acronym{DIGEST-MD5} and
+@acronym{NTLM}, when the server supports it.
+
+@item Gnus includes a password cache mechanism in password.el.
+
+It is enabled by default (see @code{password-cache}), with a short
+timeout of 16 seconds (see @code{password-cache-expiry}).  If
+@acronym{PGG} is used as the @acronym{PGP} back end, the @acronym{PGP}
+passphrase is managed by this mechanism.  Passwords for ManageSieve
+connections are managed by this mechanism, after querying the user
+about whether to do so.
+@end itemize
+
+@item Changes in summary and article mode
+
+@itemize @bullet
+@item International host names (@acronym{IDNA}) can now be decoded
+inside article bodies using @kbd{W i}
+(@code{gnus-summary-idna-message}).  This requires that GNU Libidn
+(@url{http://www.gnu.org/software/libidn/}) has been installed.
+@c FIXME: Also mention @code{message-use-idna}?
+
+@item Gnus now displays @acronym{DNS} master files sent as text/dns
+using dns-mode.
+
+@item Gnus supports new limiting commands in the Summary buffer:
+@kbd{/ r} (@code{gnus-summary-limit-to-replied}) and @kbd{/ R}
+(@code{gnus-summary-limit-to-recipient}).  @xref{Limiting}.
+
+@item Gnus supports a new sort command in the Summary buffer:
+@kbd{C-c C-s C-t} (@code{gnus-summary-sort-by-recipient}).  @xref{Summary
+Sorting}.
+
+@item @acronym{S/MIME} now features @acronym{LDAP} user certificate searches.
+You need to configure the server in @code{smime-ldap-host-list}.
+
+@item URLs inside Open@acronym{PGP} headers are retrieved and imported
+to your PGP key ring when you click on them.
 
 @item
 Picons can be displayed right from the textual address, see
-@code{gnus-picon-style}.  @ref{Picons}.
+@code{gnus-picon-style}.  @xref{Picons}.
 
-@item
-You can import and export your @acronym{RSS} subscriptions from
-@acronym{OPML} files.  @xref{RSS}.
+@item @acronym{ANSI} @acronym{SGR} control sequences can be transformed
+using @kbd{W A}.
+
+@acronym{ANSI} sequences are used in some Chinese hierarchies for
+highlighting articles (@code{gnus-article-treat-ansi-sequences}).
+
+@item Gnus now MIME decodes articles even when they lack "MIME-Version" header.
+This changes the default of @code{gnus-article-loose-mime}.
+
+@item @code{gnus-decay-scores} can be a regexp matching score files.
+For example, set it to @samp{\\.ADAPT\\'} and only adaptive score files
+will be decayed.  @xref{Score Decays}.
+
+@item Strings prefixing to the @code{To} and @code{Newsgroup} headers in
+summary lines when using @code{gnus-ignored-from-addresses} can be
+customized with @code{gnus-summary-to-prefix} and
+@code{gnus-summary-newsgroup-prefix}.  @xref{To From Newsgroups}.
+
+@item You can replace @acronym{MIME} parts with external bodies.
+See @code{gnus-mime-replace-part} and @code{gnus-article-replace-part}.
+@xref{MIME Commands}, @ref{Using MIME}.
 
 @item
 The option @code{mm-fill-flowed} can be used to disable treatment of
 format=flowed messages.  Also, flowed text is disabled when sending
 inline @acronym{PGP} signed messages.
+@xref{Flowed text, ,Flowed text, emacs-mime, The Emacs MIME Manual}.
 
-@item You can now drag and drop attachments to the Message buffer.
+@end itemize
 
-@item @acronym{ANSI} @acronym{SGR} control sequences can be transformed
-using @kbd{W A}.
+@item Changes in Message mode
 
-@acronym{ANSI} sequences are used in some Chinese hierarchies for
-highlighting articles (@code{gnus-article-treat-ansi-sequences}).
+@itemize @bullet
+@item Gnus now supports the ``hashcash'' client puzzle anti-spam mechanism.
+Use @code{(setq message-generate-hashcash t)} to enable.
+@xref{Hashcash}.
 
-@item International host names (@acronym{IDNA}) can now be decoded
-inside article bodies using @kbd{W i}
-(@code{gnus-summary-idna-message}).  This require that GNU Libidn
-(@url{http://www.gnu.org/software/libidn/}) has been installed.
+@item You can now drag and drop attachments to the Message buffer.
+See @code{mml-dnd-protocol-alist} and @code{mml-dnd-attach-options}.
+@xref{MIME, ,MIME, message, Message Manual}.
 
-@item Gnus includes an Emacs Lisp @acronym{SASL} library.
+@item The option @code{message-yank-empty-prefix} now controls how
+empty lines are prefixed in cited text.  @xref{Insertion Variables,
+,Insertion Variables, message, Message Manual}.
 
-This provide a clean @acronym{API} to @acronym{SASL} mechanisms from
-within Emacs.  The user visible aspects of this, compared to the earlier
-situation, include support for @acronym{DIGEST}-@acronym{MD5} and
-@acronym{NTLM}.
+@item Gnus uses narrowing to hide headers in Message buffers.
+The @code{References} header is hidden by default.  To make all
+headers visible, use @code{(setq message-hidden-headers nil)}.
+@xref{Message Headers, ,Message Headers, message, Message Manual}.
+@end itemize
 
-@item ManageSieve connections uses the @acronym{SASL} library by default.
+@item Changes in back ends
 
-The primary change this brings is support for @acronym{DIGEST-MD5} and
-@acronym{NTLM}, when the server support it.
+@itemize @bullet
+@item The nntp back end stores article marks in @file{~/News/marks}.
 
-@item Gnus include a password cache mechanism in password.el.
+The directory can be changed using the (customizable) variable
+@code{nntp-marks-directory}, and marks can be disabled using the
+(back end) variable @code{nntp-marks-is-evil}.  The advantage of this
+is that you can copy @file{~/News/marks} (using rsync, scp or
+whatever) to another Gnus installation, and it will realize what
+articles you have read and marked.  The data in @file{~/News/marks}
+has priority over the same data in @file{~/.newsrc.eld}.
 
-It is enabled by default (see @code{password-cache}), with a short
-timeout of 16 seconds (see @code{password-cache-expiry}).  If
-@acronym{PGG} is used as the @acronym{PGP} back end, the @acronym{PGP}
-passphrase is managed by this mechanism.  Passwords for ManageSieve
-connections are managed by this mechanism, after quering the user about
-whether to do so.
+@item
+You can import and export your @acronym{RSS} subscriptions from
+@acronym{OPML} files.  @xref{RSS}.
 
 @item @acronym{IMAP} identity (@acronym{RFC} 2971) is supported.
 
-By default, Gnus do not send any information about itself, but you can
+By default, Gnus does not send any information about itself, but you can
 customize it using the variable @code{nnimap-id}.
 
-@item The @file{all.SCORE} file can be edited from the group buffer
-using @kbd{W e}.
+@item The @code{nnrss} back end now supports multilingual text.
+Non-@acronym{ASCII} group names for the @code{nnrss} groups are also
+supported.  @xref{RSS}.
 
-@item Gnus now MIME decode articles even when they lack "MIME-Version" header.
-This changes the default of @code{gnus-article-loose-mime}.
+@item Retrieving mail with @acronym{POP3} is supported over @acronym{SSL}/@acronym{TLS} and with StartTLS.
 
-@item Gnus now view DNS master files sent as text/dns using dns-mode.
+@item The nnml back end allows other compression programs beside @file{gzip}
+for compressed message files.  @xref{Mail Spool}.
+@end itemize
 
-@item Gnus now support the ``hashcash'' client puzzle anti-spam idea.
-See the Gnus manual, section Hashcash, for more information.  Use
-@code{(setq message-generate-hashcash t)} to enable.
+@item Appearance
+@c Maybe it's not worth to separate this from "Miscellaneous"?
 
-@item Gnus supports new limiting commands in the Summary buffer:
-@kbd{/ r} (@code{gnus-summary-limit-to-replied}) and @kbd{/ R}
-(@code{gnus-summary-limit-to-recipient}).  @ref{Limiting}.
+@itemize @bullet
 
-@item Gnus supports a new sort command in the Summary buffer:
-@kbd{C-c C-s C-t} (@code{gnus-summary-sort-by-recipient}).  @ref{Summary
-Sorting}
+@item The tool bar has been updated to use GNOME icons.
+You can also customize the tool bar.  There's no documentation in the
+manual yet, but @kbd{M-x customize-apropos RET -tool-bar$} should get
+you started.  (Only for Emacs, not in XEmacs.)
+@c FIXME: Document this in the manual
 
-@item The @code{nnrss} back end now supports multilingual text.
-Non-@acronym{ASCII} group names for the @code{nnrss} groups are also
-supported.  @xref{RSS}.
+@item The tool bar icons are now (de)activated correctly
+in the group buffer, see the variable @code{gnus-group-update-tool-bar}.
+Its default value depends on your Emacs version.
+@c FIXME: Document this in the manual
 
-@item URLs inside OpenPGP: headers are retrieved and imported to your
-PGP key ring when you click on them.
+@item You can change the location of XEmacs' toolbars in Gnus buffers.
+See @code{gnus-use-toolbar} and @code{message-use-toolbar}.
 
-@item Gnus uses narrowing to hide headers in Message buffers.
-The @code{References} header is hidden by default.  To make all
-headers visible, use @code{(setq message-hidden-headers nil)}.
+@end itemize
 
-@item @code{gnus-decay-scores} can be a regexp matching score files.
-This allows to decay only adaptive score files.  @ref{Score Decays}.
+@item Miscellaneous changes
 
-@item @acronym{S/MIME} now feature @acronym{LDAP} user certificate searches.
-You need to configure the server in @code{smime-ldap-host-list}.
+@itemize @bullet
+@item Having edited the select-method for the foreign server in the
+server buffer is immediately reflected to the subscription of the groups
+which use the server in question.  For instance, if you change
+@code{nntp-via-address} into @samp{bar.example.com} from
+@samp{foo.example.com}, Gnus will connect to the news host by way of the
+intermediate host @samp{bar.example.com} from next time.
+
+@item The @file{all.SCORE} file can be edited from the group buffer
+using @kbd{W e}.
 
 @end itemize
+
+@end itemize
+
 @c gnus-news.texi ends here.
diff --git a/texi/gnus.texi b/texi/gnus.texi
index 569c5de..12abbb7 100644
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -9,13 +9,12 @@
 @documentencoding ISO-8859-1
 
 @copying
-Copyright (c) 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright @copyright{} 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
+under the terms of the GNU Free Documentation License, Version 1.2 or
 any later version published by the Free Software Foundation; with no
 Invariant Sections, with the Front-Cover texts being ``A GNU
 Manual'', and with the Back-Cover Texts as in (a) below.  A copy of the
@@ -52,6 +51,7 @@ license to the document, as described in section 6 of the license.
 \makeindex
 \begin{document}
 
+% Adjust ../Makefile.in if you change the following line:
 \newcommand{\gnusversionname}{T-gnus v6.17}
 \newcommand{\gnuschaptername}{}
 \newcommand{\gnussectionname}{}
@@ -368,6 +368,7 @@ internationalization/localization and multiscript features based on MULE
 API.  So T-gnus does not discriminate various language communities.  Oh,
 if you are a Klingon, please wait Unicode Next Generation.
 
+@c Adjust ../Makefile.in if you change the following line:
 This manual corresponds to T-gnus 6.17.
 
 @end ifinfo
@@ -631,6 +632,7 @@ Select Methods
 * IMAP::                        Using Gnus as a @acronym{IMAP} client.
 * Other Sources::               Reading directories, files, SOUP packets.
 * Combined Groups::             Combining groups into one group.
+* Email Based Diary::           Using mails to manage diary events in Gnus.
 * Gnus Unplugged::              Reading news and mail offline.
 
 Server Buffer
@@ -695,7 +697,7 @@ Browsing the Web
 * Ultimate::                    The Ultimate Bulletin Board systems.
 * Web Archive::                 Reading mailing list archived on web.
 * RSS::                         Reading RDF site summary.
-* Customizing w3::              Doing stuff to Emacs/w3 from Gnus.
+* Customizing W3::              Doing stuff to Emacs/W3 from Gnus.
 
 @acronym{IMAP}
 
@@ -729,6 +731,25 @@ Combined Groups
 * Virtual Groups::              Combining articles from many groups.
 * Kibozed Groups::              Looking through parts of the newsfeed for articles.
 
+Email Based Diary
+
+* The NNDiary Back End::        Basic setup and usage.
+* The Gnus Diary Library::      Utility toolkit on top of nndiary.
+* Sending or Not Sending::      A final note on sending diary messages.
+
+The NNDiary Back End
+
+* Diary Messages::              What makes a message valid for nndiary.
+* Running NNDiary::             NNDiary has two modes of operation.
+* Customizing NNDiary::         Bells and whistles.
+
+The Gnus Diary Library
+
+* Diary Summary Line Format::           A nicer summary buffer line format.
+* Diary Articles Sorting::              A nicer way to sort messages.
+* Diary Headers Generation::            Not doing it manually.
+* Diary Group Parameters::              Not handling them manually.
+
 Gnus Unplugged
 
 * Agent Basics::                How it all is supposed to work.
@@ -738,6 +759,7 @@ Gnus Unplugged
 * Agent as Cache::              The Agent is a big cache too.
 * Agent Expiry::                How to make old articles go away.
 * Agent Regeneration::          How to recover from lost connections and other accidents.
+* Agent and flags::             How the Agent maintains flags.
 * Agent and IMAP::              How to use the Agent with @acronym{IMAP}.
 * Outgoing Messages::           What happens when you post/mail something?
 * Agent Variables::             Customizing is fun.
@@ -835,22 +857,22 @@ Thwarting Email Spam
 
 Filtering Spam Using The Spam ELisp Package
 
-* Spam ELisp Package Sequence of Events::  
-* Spam ELisp Package Filtering of Incoming Mail::  
-* Spam ELisp Package Global Variables::  
-* Spam ELisp Package Configuration Examples::  
-* Blacklists and Whitelists::   
-* BBDB Whitelists::             
-* Gmane Spam Reporting::        
-* Anti-spam Hashcash Payments::  
-* Blackholes::                  
-* Regular Expressions Header Matching::  
-* Bogofilter::                  
-* SpamAssassin back end::        
-* ifile spam filtering::        
-* spam-stat spam filtering::    
-* SpamOracle::                  
-* Extending the Spam ELisp package::  
+* Spam ELisp Package Sequence of Events::
+* Spam ELisp Package Filtering of Incoming Mail::
+* Spam ELisp Package Global Variables::
+* Spam ELisp Package Configuration Examples::
+* Blacklists and Whitelists::
+* BBDB Whitelists::
+* Gmane Spam Reporting::
+* Anti-spam Hashcash Payments::
+* Blackholes::
+* Regular Expressions Header Matching::
+* Bogofilter::
+* SpamAssassin back end::
+* ifile spam filtering::
+* spam-stat spam filtering::
+* SpamOracle::
+* Extending the Spam ELisp package::
 
 Filtering Spam Using Statistics with spam-stat
 
@@ -890,7 +912,7 @@ New Features
 * Quassia Gnus::                Two times two is four, or Gnus 5.6/5.7.
 * Pterodactyl Gnus::            Pentad also starts with P, AKA Gnus 5.8/5.9.
 * Oort Gnus::                   It's big.  It's far out.  Gnus 5.10/5.11.
-* No Gnus::                     Lars, FIXME!
+* No Gnus::                     Very punny.
 
 Customization
 
@@ -1403,7 +1425,7 @@ cache for all groups).
 Most common Unix news readers use a shared startup file called
 @file{.newsrc}.  This file contains all the information about what
 groups are subscribed, and which articles in these groups have been
-read. 
+read.
 
 Things got a bit more complicated with @sc{gnus}.  In addition to
 keeping the @file{.newsrc} file updated, it also used a file called
@@ -1477,16 +1499,18 @@ startup files.  If you want to turn backup creation off, say something like:
 
 @vindex gnus-init-file
 @vindex gnus-site-init-file
-When gnus starts, it will read the @code{gnus-site-init-file}
-(@file{.../site-lisp/gnus} by default) and @code{gnus-init-file}
+When Gnus starts, it will read the @code{gnus-site-init-file}
+(@file{.../site-lisp/gnus-init} by default) and @code{gnus-init-file}
 (@file{~/.gnus} by default) files.  These are normal Emacs Lisp files
 and can be used to avoid cluttering your @file{~/.emacs} and
-@file{site-init} files with gnus stuff.  Gnus will also check for files
+@file{site-init} files with Gnus stuff.  Gnus will also check for files
 with the same names as these, but with @file{.elc} and @file{.el}
 suffixes.  In other words, if you have set @code{gnus-init-file} to
 @file{~/.gnus}, it will look for @file{~/.gnus.elc}, @file{~/.gnus.el},
-and finally @file{~/.gnus} (in this order).
-
+and finally @file{~/.gnus} (in this order).  If Emacs was invoked with
+the @option{-q} or @option{--no-init-file} options (@pxref{Initial
+Options, ,Initial Options, emacs, The Emacs Manual}), Gnus doesn't read
+@code{gnus-init-file}.
 
 
 @node Auto Save
@@ -2771,6 +2795,9 @@ If the group parameter list has the element @code{(visible . t)},
 that group will always be visible in the Group buffer, regardless
 of whether it has any unread articles.
 
+This parameter cannot be set via @code{gnus-parameters}. See
+@code{gnus-permanently-visible-groups} as an alternative.
+
 @item broken-reply-to
 @cindex broken-reply-to
 Elements like @code{(broken-reply-to . t)} signals that @code{Reply-To}
@@ -3038,7 +3065,7 @@ This can also be used as a group-specific hook function.  If you want to
 hear a beep when you enter a group, you could put something like
 @code{(dummy-variable (ding))} in the parameters of that group.
 @code{dummy-variable} will be set to the (meaningless) result of the
-@code{(ding)} form.  
+@code{(ding)} form.
 
 Alternatively, since the VARIABLE becomes local to the group, this
 pattern can be used to temporarily change a hook.  For example, if the
@@ -3062,8 +3089,9 @@ parameters (@pxref{Topic Parameters}).
 
 @vindex gnus-parameters
 Group parameters can be set via the @code{gnus-parameters} variable too.
-But some variables, such as @code{visible}, have no effect.  For
-example:
+But some variables, such as @code{visible}, have no effect (For this
+case see @code{gnus-permanently-visible-groups} as an alternative.).
+For example:
 
 @lisp
 (setq gnus-parameters
@@ -3089,6 +3117,46 @@ example:
 String value of parameters will be subjected to regexp substitution, as
 the @code{to-group} example shows.
 
+@vindex gnus-parameters-case-fold-search
+By default, whether comparing the group name and one of those regexps
+specified in @code{gnus-parameters} is done in a case-sensitive manner
+or a case-insensitive manner depends on the value of
+@code{case-fold-search} at the time when the comparison is done.  The
+value of @code{case-fold-search} is typically @code{t}; it means, for
+example, the element @code{("INBOX\\.FOO" (total-expire . t))} might be
+applied to both the @samp{INBOX.FOO} group and the @samp{INBOX.foo}
+group.  If you want to make those regexps always case-sensitive, set the
+value of the @code{gnus-parameters-case-fold-search} variable to
+@code{nil}.  Otherwise, set it to @code{t} if you want to compare them
+always in a case-insensitive manner.
+
+You can define different sorting to different groups via
+@code{gnus-parameters}.  Here is an example to sort an @acronym{NNTP}
+group by reverse date to see the latest news at the top and an
+@acronym{RSS} group by subject.  In this example, the first group is the
+Debian daily news group @code{gmane.linux.debian.user.news} from
+news.gmane.org.  The @acronym{RSS} group corresponds to the Debian
+weekly news RSS feed
+@url{http://packages.debian.org/unstable/newpkg_main.en.rdf},
+@xref{RSS}.
+
+@lisp
+(setq
+ gnus-parameters
+ '(("nntp.*gmane\\.debian\\.user\\.news"
+    (gnus-show-threads nil)
+    (gnus-article-sort-functions '((not gnus-article-sort-by-date)))
+    (gnus-use-adaptive-scoring nil)
+    (gnus-use-scoring nil))
+   ("nnrss.*debian"
+    (gnus-show-threads nil)
+    (gnus-article-sort-functions 'gnus-article-sort-by-subject)
+    (gnus-use-adaptive-scoring nil)
+    (gnus-use-scoring t)
+    (gnus-score-find-score-files-function 'gnus-score-find-single)
+    (gnus-summary-line-format "%U%R%z%d %I%(%[ %s %]%)\n"))))
+@end lisp
+
 
 @node Listing Groups
 @section Listing Groups
@@ -4014,7 +4082,7 @@ Gnus
      8: comp.binaries.fractals
     13: comp.sources.unix
    452: alt.sex.emacs
-@end group   
+@end group
 @end example
 
 The @samp{Emacs} topic has the topic parameter @code{(score-file
@@ -4053,6 +4121,22 @@ happens.  You just have to be careful if you do stuff like that.
 
 @table @kbd
 
+@item v
+@kindex v (Group)
+@cindex keys, reserved for users (Group)
+The key @kbd{v} is reserved for users.  You can bind it key to some
+function or better use it as a prefix key.  For example:
+
+@lisp
+(define-key gnus-group-mode-map (kbd "v j d")
+  (lambda ()
+    (interactive)
+    (gnus-group-jump-to-group "nndraft:drafts")))
+@end lisp
+
+On keys reserved for users in Emacs and on keybindings in general
+@xref{Keymaps, Keymaps, , emacs, The Emacs Editor}.
+
 @item ^
 @kindex ^ (Group)
 @findex gnus-group-enter-server-mode
@@ -4448,6 +4532,14 @@ group buffer (@pxref{Selecting a Group}).
 
 You can have as many summary buffers open as you wish.
 
+@kindex v (Summary)
+@cindex keys, reserved for users (Summary)
+The key @kbd{v} is reserved for users.  You can bind it key to some
+function or better use it as a prefix key.  For example:
+@lisp
+(define-key gnus-summary-mode-map (kbd "v -") "LrS") ;; lower subthread
+@end lisp
+
 @menu
 * Summary Buffer Format::       Deciding how the summary buffer is to look.
 * Summary Maneuvering::         Moving around the summary buffer.
@@ -4691,6 +4783,8 @@ article has any children.
 The line number.
 @item O
 Download mark.
+@item *
+Desired cursor position (instead of after first colon).
 @item &user-date;
 Age sensitive date format.  Various date format is defined in
 @code{gnus-user-date-format-alist}.
@@ -4764,6 +4858,13 @@ summary line spec returns the @code{To}, @code{Newsreader} or
 @code{From} header, the value of the @code{To} or @code{Newsreader}
 headers are used instead.
 
+To distinguish regular articles from those where the @code{From} field
+has been swapped, a string is prefixed to the @code{To} or
+@code{Newsgroups} header in the summary line.  By default the string is
+@samp{-> } for @code{To} and @samp{=> } for @code{Newsgroups}, you can
+customize these strings with @code{gnus-summary-to-prefix} and
+@code{gnus-summary-newsgroup-prefix}.
+
 @end enumerate
 
 @vindex nnmail-extra-headers
@@ -5121,10 +5222,10 @@ the server and display it in the article buffer.
 
 @item gnus-select-article-hook
 @vindex gnus-select-article-hook
-This hook is called whenever an article is selected.  By default it
-exposes any threads hidden under the selected article.  If you would
-like each article to be saved in the Agent as you read it, putting
-@code{gnus-agent-fetch-selected-article} on this hook will do so.
+This hook is called whenever an article is selected.  The default is
+@code{nil}.  If you would like each article to be saved in the Agent as
+you read it, putting @code{gnus-agent-fetch-selected-article} on this
+hook will do so.
 
 @item gnus-mark-article-hook
 @vindex gnus-mark-article-hook
@@ -5134,8 +5235,8 @@ like each article to be saved in the Agent as you read it, putting
 This hook is called whenever an article is selected.  It is intended to
 be used for marking articles as read.  The default value is
 @code{gnus-summary-mark-read-and-unread-as-read}, and will change the
-mark of almost any article you read to @code{gnus-unread-mark}.  The
-only articles not affected by this function are ticked, dormant, and
+mark of almost any article you read to @code{gnus-read-mark}.  The only
+articles not affected by this function are ticked, dormant, and
 expirable articles.  If you'd instead like to just have unread articles
 marked as read, you can use @code{gnus-summary-mark-unread-as-read}
 instead.  It will leave marks like @code{gnus-low-score-mark},
@@ -6977,10 +7078,11 @@ Matching}).
 
 @findex gnus-thread-sort-by-total-score
 @findex gnus-thread-sort-by-date
+@findex gnus-thread-sort-by-date-reverse
 @findex gnus-thread-sort-by-score
 @findex gnus-thread-sort-by-subject
 @findex gnus-thread-sort-by-author
-@c @findex gnus-thread-sort-by-recipient
+@findex gnus-thread-sort-by-recipient
 @findex gnus-thread-sort-by-number
 @findex gnus-thread-sort-by-random
 @vindex gnus-thread-sort-functions
@@ -6993,8 +7095,10 @@ function, a list of functions, or a list containing functions and
 
 By default, sorting is done on article numbers.  Ready-made sorting
 predicate functions include @code{gnus-thread-sort-by-number},
-@code{gnus-thread-sort-by-author}, @code{gnus-thread-sort-by-subject},
-@code{gnus-thread-sort-by-date}, @code{gnus-thread-sort-by-score},
+@code{gnus-thread-sort-by-author}, @code{gnus-thread-sort-by-recipient},
+@code{gnus-thread-sort-by-subject},
+@code{gnus-thread-sort-by-date}, @code{gnus-thread-sort-by-date-reverse},
+@code{gnus-thread-sort-by-score},
 @code{gnus-thread-sort-by-most-recent-number},
 @code{gnus-thread-sort-by-most-recent-date},
 @code{gnus-thread-sort-by-random} and
@@ -7032,8 +7136,7 @@ say something like:
 
 @lisp
 (setq gnus-thread-sort-functions
-      '((lambda (t1 t2)
-          (not (gnus-thread-sort-by-number t1 t2)))
+      '((not gnus-thread-sort-by-number)
         gnus-thread-sort-by-score))
 @end lisp
 
@@ -7070,6 +7173,8 @@ say something like:
         gnus-article-sort-by-subject))
 @end lisp
 
+You can define group specific sorting via @code{gnus-parameters},
+@xref{Group Parameters}.
 
 
 @node Asynchronous Fetching
@@ -8615,7 +8720,9 @@ Treat @acronym{HTML} (@code{gnus-article-wash-html}).  Note that this is
 usually done automatically by Gnus if the message in question has a
 @code{Content-Type} header that says that the message is @acronym{HTML}.
 
-If a prefix is given, a charset will be asked for.
+If a prefix is given, a charset will be asked for.  If it is a number,
+the charset defined in @code{gnus-summary-show-article-charset-alist}
+(@pxref{Paging the Article}) will be used.
 
 @vindex gnus-article-wash-function
 The default is to use the function specified by
@@ -8627,11 +8734,14 @@ can use include:
 
 @table @code
 @item w3
-Use Emacs/w3.
+Use Emacs/W3.
 
 @item w3m
 Use @uref{http://emacs-w3m.namazu.org/, emacs-w3m}.
 
+@item w3m-standalone
+Use @uref{http://w3m.sourceforge.net/, w3m}.
+
 @item links
 Use @uref{http://links.sf.net/, Links}.
 
@@ -9222,7 +9332,7 @@ Translate the article from one language to another
 @cindex viewing attachments
 
 The following commands all understand the numerical prefix.  For
-instance, @kbd{3 b} means ``view the third @acronym{MIME} part''.
+instance, @kbd{3 K v} means ``view the third @acronym{MIME} part''.
 
 @table @kbd
 @item b
@@ -9235,6 +9345,21 @@ View the @acronym{MIME} part.
 @kindex K o (Summary)
 Save the @acronym{MIME} part.
 
+@item K O
+@kindex K O (Summary)
+Prompt for a file name, then save the @acronym{MIME} part and strip it
+from the article.  The stripped @acronym{MIME} object will be referred
+via the message/external-body @acronym{MIME} type.
+
+@item K r
+@kindex K r (Summary)
+Replace the @acronym{MIME} part with an external body.
+
+@item K d
+@kindex K d (Summary)
+Delete the @acronym{MIME} part and add some information about the
+removed part.
+
 @item K c
 @kindex K c (Summary)
 Copy the @acronym{MIME} part.
@@ -9363,6 +9488,12 @@ To see e.g. security buttons but no other buttons, you could set this
 variable to @code{("multipart/signed")} and leave
 @code{gnus-unbuttonized-mime-types} at the default value.
 
+You could also add @code{"multipart/alternative"} to this list to
+display radio buttons that allow you to choose one of two media types
+those mails include.  See also @code{mm-discouraged-alternatives}
+(@pxref{Display Customization, ,Display Customization, emacs-mime, The
+Emacs MIME Manual}).
+
 @item gnus-inhibit-mime-unbuttonizing
 @vindex gnus-inhibit-mime-unbuttonizing
 If this is non-@code{nil}, then all @acronym{MIME} parts get buttons.  The
@@ -9402,10 +9533,10 @@ Display "multipart/alternative" parts as "multipart/mixed".
 Display "multipart/related" parts as "multipart/mixed".
 
 If displaying "text/html" is discouraged, see
-@code{mm-discouraged-alternatives} in @ref{Display Customization,
-Display Customization, , emacs-mime, Emacs-Mime Manual}.  Images or
-other material inside a "multipart/related" part might be overlooked
-when this variable is @code{nil}.
+@code{mm-discouraged-alternatives}, images or other material inside a
+"multipart/related" part might be overlooked when this variable is
+@code{nil}.  @ref{Display Customization, Display Customization, ,
+emacs-mime, Emacs-Mime Manual}.
 
 @vindex gnus-mime-display-multipart-as-mixed
 @item gnus-mime-display-multipart-as-mixed
@@ -9463,7 +9594,7 @@ newsreaders and mailers that do not understand or use @acronym{MIME}, and
 just send out messages without saying what character sets they use.  To
 help a bit with this, some local news hierarchies have policies that say
 what character set is the default.  For instance, the @samp{fj}
-hierarchy uses @code{iso-2022-jp-2}.
+hierarchy uses @code{iso-2022-jp}.
 
 @vindex gnus-group-charset-alist
 This knowledge is encoded in the @code{gnus-group-charset-alist}
@@ -9686,17 +9817,16 @@ by giving the @kbd{A T} command a numerical prefix.
 @kindex M-^ (Summary)
 @cindex Message-ID
 @cindex fetching by Message-ID
-You can also ask the @acronym{NNTP} server for an arbitrary article, no
-matter what group it belongs to.  @kbd{M-^}
-(@code{gnus-summary-refer-article}) will ask you for a
-@code{Message-ID}, which is one of those long, hard-to-read thingies
-that look something like @samp{<38o6up$6f2@@hymir.ifi.uio.no>}.  You
-have to get it all exactly right.  No fuzzy searches, I'm afraid.
-@end table
+You can also ask Gnus for an arbitrary article, no matter what group it
+belongs to.  @kbd{M-^} (@code{gnus-summary-refer-article}) will ask you
+for a @code{Message-ID}, which is one of those long, hard-to-read
+thingies that look something like @samp{<38o6up$6f2@@hymir.ifi.uio.no>}.
+You have to get it all exactly right.  No fuzzy searches, I'm afraid.
 
-The current select method will be used when fetching by
-@code{Message-ID} from non-news select method, but you can override this
-by giving this command a prefix.
+Gnus looks for the @code{Message-ID} in the headers that have already
+been fetched, but also tries all the select methods specified by
+@code{gnus-refer-article-method} if it is not found.
+@end table
 
 @vindex gnus-refer-article-method
 If the group you are reading is located on a back end that does not
@@ -10471,6 +10601,12 @@ Mark all articles, even the ticked ones, as read and then exit
 Mark all articles as read and go to the next group
 (@code{gnus-summary-catchup-and-goto-next-group}).
 
+@item Z p
+@kindex Z p (Summary)
+@findex gnus-summary-catchup-and-goto-prev-group
+Mark all articles as read and go to the previous group
+(@code{gnus-summary-catchup-and-goto-prev-group}).
+
 @item Z R
 @itemx C-x C-s
 @kindex Z R (Summary)
@@ -10692,8 +10828,8 @@ or newer is recommended.
 
 @end enumerate
 
-More information on how to set things up can be found in the message
-manual (@pxref{Security, ,Security, message, Message Manual}).
+The variables that control security functionality on reading messages
+include:
 
 @table @code
 @item mm-verify-option
@@ -10724,6 +10860,15 @@ deprecated.
 
 @end table
 
+By default the buttons that display security information are not
+shown, because they clutter reading the actual e-mail.  You can type
+@kbd{K b} manually to display the information.  Use the
+@code{gnus-buttonized-mime-types} and
+@code{gnus-unbuttonized-mime-types} variables to control this
+permanently.  @ref{MIME Commands} for further details, and hints on
+how to customize these variables to always display security
+information.
+
 @cindex snarfing keys
 @cindex importing PGP keys
 @cindex PGP key ring import
@@ -10744,6 +10889,10 @@ application/pgp-keys; gpg --import --interactive --verbose; needsterminal
 This happens to also be the default action defined in
 @code{mailcap-mime-data}.
 
+More information on how to set things for sending outgoing signed and
+encrypted messages up can be found in the message manual
+(@pxref{Security, ,Security, message, Message Manual}).
+
 @node Mailing List
 @section Mailing List
 @cindex mailing list
@@ -11016,7 +11165,10 @@ for sensible values.
 @code{head}: Do the treatment on the headers.
 
 @item
-@code{last}: Do this treatment on the last part.
+@code{first}: Do this treatment on the first body part.
+
+@item
+@code{last}: Do this treatment on the last body part.
 
 @item
 An integer: Do this treatment on all body parts that have a length less
@@ -11073,7 +11225,7 @@ possible but those listed are probably sufficient for most people.
 @item gnus-treat-overstrike (t, integer)
 @item gnus-treat-strip-cr (t, integer)
 @item gnus-treat-strip-headers-in-body (t, integer)
-@item gnus-treat-strip-leading-blank-lines (t, integer)
+@item gnus-treat-strip-leading-blank-lines (t, first, integer)
 @item gnus-treat-strip-multiple-blank-lines (t, integer)
 @item gnus-treat-strip-pem (t, last, integer)
 @item gnus-treat-strip-trailing-blank-lines (t, last, integer)
@@ -11168,6 +11320,11 @@ buffer, which means that you don't actually have to have a summary
 buffer displayed while reading.  You can do it all from the article
 buffer.
 
+@kindex v (Article)
+@cindex keys, reserved for users (Article)
+The key @kbd{v} is reserved for users.  You can bind it key to some
+function or better use it as a prefix key.
+
 A few additional keystrokes are available:
 
 @table @kbd
@@ -11403,10 +11560,12 @@ that have none when you do a @kbd{a}.
 
 @item gnus-confirm-mail-reply-to-news
 @vindex gnus-confirm-mail-reply-to-news
-This can also be a function receiving the group name as the only
-parameter which should return non-@code{nil} if a confirmation is
-needed, or a regular expression matching group names, where
-confirmation is should be asked for.
+If non-@code{nil}, Gnus will ask you for a confirmation when you are
+about to reply to news articles by mail.  If it is @code{nil}, nothing
+interferes in what you want to do.  This can also be a function
+receiving the group name as the only parameter which should return
+non-@code{nil} if a confirmation is needed, or a regular expression
+matching group names, where confirmation should be asked for.
 
 If you find yourself never wanting to reply to mail, but occasionally
 press R anyway, this variable might be for you.
@@ -11862,7 +12021,8 @@ So here's a new example:
       '((".*"
          (signature-file "~/.signature")
          (name "User Name")
-         ("X-Home-Page" (getenv "WWW_HOME"))
+         (x-face-file "~/.xface")
+         (x-url (getenv "WWW_HOME"))
          (organization "People's Front Against MWM"))
         ("^rec.humor"
          (signature my-funny-signature-randomizer))
@@ -12132,6 +12292,7 @@ The different methods all have their peculiarities, of course.
 * IMAP::                        Using Gnus as a @acronym{IMAP} client.
 * Other Sources::               Reading directories, files, SOUP packets.
 * Combined Groups::             Combining groups into one group.
+* Email Based Diary::           Using mails to manage diary events in Gnus.
 * Gnus Unplugged::              Reading news and mail offline.
 @end menu
 
@@ -12198,6 +12359,9 @@ Where the news is to be fetched from---the address.
 
 @item s
 The opened/closed/denied status of the server.
+
+@item a
+Whether this server is agentized.
 @end table
 
 @vindex gnus-server-mode-line-format
@@ -12222,6 +12386,12 @@ Also @pxref{Formatting Variables}.
 
 @table @kbd
 
+@item v
+@kindex v (Server)
+@cindex keys, reserved for users (Server)
+The key @kbd{v} is reserved for users.  You can bind it key to some
+function or better use it as a prefix key.
+
 @item a
 @kindex a (Server)
 @findex gnus-server-add-server
@@ -12357,7 +12527,19 @@ configuration to the example above:
       (nntp-via-rlogin-command "ssh")
 @end lisp
 
-See also @code{nntp-via-rlogin-command-switches}.
+See also @code{nntp-via-rlogin-command-switches}.  Here's an example for
+an indirect connection:
+@lisp
+(setq gnus-select-method
+      '(nntp "indirect"
+	     (nntp-address "news.server.example")
+             (nntp-via-user-name "intermediate_user_name")
+             (nntp-via-address "intermediate.host.example")
+             (nntp-via-rlogin-command "ssh")
+             (nntp-end-of-line "\n")
+             (nntp-via-rlogin-command-switches ("-C" "-t" "-e" "none"))
+             (nntp-open-connection-function nntp-open-via-rlogin-and-telnet)))
+@end lisp
 
 If you're behind a firewall, but have direct access to the outside world
 through a wrapper command like "runsocks", you could open a socksified
@@ -12676,35 +12858,6 @@ that says how many seconds the @code{nntp} back end should wait for a
 connection before giving up.  If it is @code{nil}, which is the default,
 no timeouts are done.
 
-@c @item nntp-command-timeout
-@c @vindex nntp-command-timeout
-@c @cindex PPP connections
-@c @cindex dynamic IP addresses
-@c If you're running Gnus on a machine that has a dynamically assigned
-@c address, Gnus may become confused.  If the address of your machine
-@c changes after connecting to the @acronym{NNTP} server, Gnus will simply sit
-@c waiting forever for replies from the server.  To help with this
-@c unfortunate problem, you can set this command to a number.  Gnus will
-@c then, if it sits waiting for a reply from the server longer than that
-@c number of seconds, shut down the connection, start a new one, and resend
-@c the command.  This should hopefully be transparent to the user.  A
-@c likely number is 30 seconds.
-@c
-@c @item nntp-retry-on-break
-@c @vindex nntp-retry-on-break
-@c If this variable is non-@code{nil}, you can also @kbd{C-g} if Gnus
-@c hangs.  This will have much the same effect as the command timeout
-@c described above.
-
-@item nntp-server-hook
-@vindex nntp-server-hook
-This hook is run as the last step when connecting to an @acronym{NNTP}
-server.
-
-@item nntp-buggy-select
-@vindex nntp-buggy-select
-Set this to non-@code{nil} if your select routine is buggy.
-
 @item nntp-nov-is-evil
 @vindex nntp-nov-is-evil
 If the @acronym{NNTP} server does not support @acronym{NOV}, you could set this
@@ -12736,11 +12889,6 @@ that fetching will probably be slower.  If this variable is @code{nil},
 @vindex nntp-prepare-server-hook
 A hook run before attempting to connect to an @acronym{NNTP} server.
 
-@item nntp-warn-about-losing-connection
-@vindex nntp-warn-about-losing-connection
-If this variable is non-@code{nil}, some noise will be made when a
-server closes connection.
-
 @item nntp-record-commands
 @vindex nntp-record-commands
 If non-@code{nil}, @code{nntp} will log all commands it sends to the
@@ -12753,9 +12901,9 @@ that doesn't seem to work.
 It is possible to customize how the connection to the nntp server will
 be opened.  If you specify an @code{nntp-open-connection-function}
 parameter, Gnus will use that function to establish the connection.
-Five pre-made functions are supplied.  These functions can be grouped in
-two categories: direct connection functions (three pre-made), and
-indirect ones (two pre-made).
+Seven pre-made functions are supplied.  These functions can be grouped
+in two categories: direct connection functions (four pre-made), and
+indirect ones (three pre-made).
 
 @item nntp-prepare-post-hook
 @vindex nntp-prepare-post-hook
@@ -12772,14 +12920,6 @@ inhibit Gnus to add a @code{Message-ID} header, you could say:
 Note that not all servers support the recommended ID.  This works for
 INN versions 2.3.0 and later, for instance.
 
-@item nntp-read-timeout
-@vindex nntp-read-timeout
-How long nntp should wait between checking for the end of output.
-Shorter values mean quicker response, but is more CPU intensive.  The
-default is 0.1 seconds.  If you have a slow line to the server (and
-don't like to see Emacs eat your available CPU power), you might set
-this to, say, 1.
-
 @item nntp-list-options
 @vindex nntp-list-options
 List of newsgroup name used for a option of the LIST command to restrict
@@ -12973,7 +13113,7 @@ List of strings to be used as the switches to
 
 @item nntp-open-via-telnet-and-telnet
 @findex nntp-open-via-telnet-and-telnet
-Does essentially also the same, but uses @samp{telnet} instead of
+Does essentially the same, but uses @samp{telnet} instead of
 @samp{rlogin} to connect to the intermediate host.
 
 @code{nntp-open-via-telnet-and-telnet}-specific variables:
@@ -13032,7 +13172,9 @@ Address of the intermediate host to connect to.
 
 The following variables affect the behavior of all, or several of the
 pre-made connection functions.  When not specified, all functions are
-affected.
+affected (the values of the following variables will be used as the
+default if each virtual @code{nntp} server doesn't specify those server
+variables individually).
 
 @table @code
 
@@ -13040,7 +13182,7 @@ affected.
 @vindex nntp-pre-command
 A command wrapper to use when connecting through a non native
 connection function (all except @code{nntp-open-network-stream},
-@code{nntp-open-tls-stream}, and @code{nntp-open-ssl-stream}.  This is
+@code{nntp-open-tls-stream}, and @code{nntp-open-ssl-stream}).  This is
 where you would put a @samp{SOCKS} wrapper for instance.
 
 @item nntp-address
@@ -13419,7 +13561,7 @@ function.
 By default the splitting codes @acronym{MIME} decodes headers so you
 can match on non-@acronym{ASCII} strings.  The
 @code{nnmail-mail-splitting-charset} variable specifies the default
-charset for decoding.  The behaviour can be turned off completely by
+charset for decoding.  The behavior can be turned off completely by
 binding @code{nnmail-mail-splitting-decodes} to @code{nil}, which is
 useful if you want to match articles based on the raw header data.
 
@@ -13978,7 +14120,8 @@ is to say where the incoming files will be stored if the variable
 Prefix for file name for storing incoming mail.  The default is
 @file{Incoming}, in which case files will end up with names like
 @file{Incoming30630D_} or @file{Incoming298602ZD}.  This is really only
-relevant if @code{mail-source-delete-incoming} is @code{nil}.
+relevant if @code{mail-source-delete-incoming} is @code{nil} or a
+number.
 
 @item mail-source-default-file-modes
 @vindex mail-source-default-file-modes
@@ -14158,17 +14301,26 @@ splits.  Here are the possible split syntaxes:
 
 @table @code
 
-@item group 
+@item group
 If the split is a string, that will be taken as a group name.  Normal
 regexp match expansion will be done.  See below for examples.
 
-@item (@var{field} @var{value} [- @var{restrict} [@dots{}] ] @var{split})
-If the split is a list, the first element of which is a string, then
-store the message as specified by @var{split}, if header @var{field}
-(a regexp) contains @var{value} (also a regexp).  If @var{restrict}
-(yet another regexp) matches some string after @var{field} and before
-the end of the matched @var{value}, the @var{split} is ignored.  If
-none of the @var{restrict} clauses match, @var{split} is processed.
+@c Don't fold this line.
+@item (@var{field} @var{value} [- @var{restrict} [@dots{}] ] @var{split} [@var{invert-partial}])
+The split can be a list containing at least three elements.  If the
+first element @var{field} (a regexp matching a header) contains
+@var{value} (also a regexp) then store the message as specified by
+@var{split}.
+
+If @var{restrict} (yet another regexp) matches some string after
+@var{field} and before the end of the matched @var{value}, the
+@var{split} is ignored.  If none of the @var{restrict} clauses match,
+@var{split} is processed.
+
+The last element @var{invert-partial} is optional.  If it is
+non-@code{nil}, the match-partial-words behavior controlled by the
+variable @code{nnmail-split-fancy-match-partial-words} (see below) is
+be inverted.  (New in Gnus 5.10.7)
 
 @item (| @var{split} @dots{})
 If the split is a list, and the first element is @code{|} (vertical
@@ -14223,10 +14375,49 @@ If the split is @code{nil}, it is ignored.
 @end table
 
 In these splits, @var{field} must match a complete field name.
-@var{value} must match a complete word according to the fundamental mode
-syntax table.  You can use @code{.*} in the regexps to match partial
-field names or words.  In other words, all @var{value}'s are wrapped in
-@samp{\<} and @samp{\>} pairs.
+
+Normally, @var{value} in these splits must match a complete @emph{word}
+according to the fundamental mode syntax table.  In other words, all
+@var{value}'s will be implicitly surrounded by @code{\<...\>} markers,
+which are word delimiters.  Therefore, if you use the following split,
+for example,
+
+@example
+(any "joe" "joemail")
+@end example
+
+@noindent
+messages sent from @samp{joedavis@@foo.org} will normally not be filed
+in @samp{joemail}.  If you want to alter this behavior, you can use any
+of the following three ways:
+
+@enumerate
+@item
+@vindex nnmail-split-fancy-match-partial-words
+You can set the @code{nnmail-split-fancy-match-partial-words} variable
+to non-@code{nil} in order to ignore word boundaries and instead the
+match becomes more like a grep.  This variable controls whether partial
+words are matched during fancy splitting.  The default value is
+@code{nil}.
+
+Note that it influences all @var{value}'s in your split rules.
+
+@item
+@var{value} beginning with @code{.*} ignores word boundaries in front of
+a word.  Similarly, if @var{value} ends with @code{.*}, word boundaries
+in the rear of a word will be ignored.  For example, the @var{value}
+@code{"@@example\\.com"} does not match @samp{foo@@example.com} but
+@code{".*@@example\\.com"} does.
+
+@item
+You can set the @var{invert-partial} flag in your split rules of the
+@samp{(@var{field} @var{value} @dots{})} types, aforementioned in this
+section.  If the flag is set, word boundaries on both sides of a word
+are ignored even if @code{nnmail-split-fancy-match-partial-words} is
+@code{nil}.  Contrarily, if the flag is set, word boundaries are not
+ignored even if @code{nnmail-split-fancy-match-partial-words} is
+non-@code{nil}.  (New in Gnus 5.10.7)
+@end enumerate
 
 @vindex nnmail-split-abbrev-alist
 @var{field} and @var{value} can also be Lisp symbols, in that case
@@ -14274,25 +14465,6 @@ groups when users send to an address using different case
 (i.e. mailing-list@@domain vs Mailing-List@@Domain).  The default value
 is @code{t}.
 
-@vindex nnmail-split-fancy-match-partial-words
-@code{nnmail-split-fancy-match-partial-words} controls whether partial
-words are matched during fancy splitting.
-
-Normally, regular expressions given in @code{nnmail-split-fancy} are
-implicitly surrounded by @code{\<...\>} markers, which are word
-delimiters.  If this variable is true, they are not implicitly
-surrounded by anything.
-
-@example
-(any "joe" "joemail")
-@end example
-
-In this example, messages sent from @samp{joedavis@@foo.org} will
-normally not be filed in @samp{joemail}.  With
-@code{nnmail-split-fancy-match-partial-words} set to t, however, the
-match will happen.  In effect, the requirement of a word boundary is
-removed and instead the match becomes more like a grep.
-
 @findex nnmail-split-fancy-with-parent
 @code{nnmail-split-fancy-with-parent} is a function which allows you to
 split followups into the same groups their parents are in.  Sometimes
@@ -15029,7 +15201,7 @@ When the marks file is used (which it is by default), @code{nnml}
 servers have the property that you may backup them using @code{tar} or
 similar, and later be able to restore them into Gnus (by adding the
 proper @code{nnml} server) and have all your marks be preserved.  Marks
-for a group is usually stored in the @code{.marks} file (but see
+for a group are usually stored in the @code{.marks} file (but see
 @code{nnml-marks-file-name}) within each @code{nnml} group's directory.
 Individual @code{nnml} groups are also possible to backup, use @kbd{G m}
 to restore the group (after restoring the backup into the nnml
@@ -15088,7 +15260,18 @@ The name of the @dfn{marks} files.  The default is @file{.marks}.
 @item nnml-use-compressed-files
 @vindex nnml-use-compressed-files
 If non-@code{nil}, @code{nnml} will allow using compressed message
-files.
+files.  This requires @code{auto-compression-mode} to be enabled
+(@pxref{Compressed Files, ,Compressed Files, emacs, The Emacs Manual}).
+If the value of @code{nnml-use-compressed-files} is a string, it is used
+as the file extension specifying the comression program.  You can set it
+to @samp{.bz2} if your Emacs supports it.  A value of @code{t} is
+equivalent to @samp{.gz}.
+
+@item nnml-compressed-files-size-threshold
+@vindex nnml-compressed-files-size-threshold
+Default size threshold for compressed message files.  Message files with
+bodies larger than that many characters will be automatically compressed
+if @code{nnml-use-compressed-files} is non-@code{nil}.
 
 @end table
 
@@ -15273,8 +15456,9 @@ An integer specifying the minimum age, in seconds, of an article
 before it will be expired, or the symbol @code{never} to specify that
 articles should never be expired.  If this parameter is not set,
 @code{nnmaildir} falls back to the usual
-@code{nnmail-expiry-wait}(@code{-function}) variables (overrideable by
-the @code{expiry-wait}(@code{-function}) group parameters.  If you
+@code{nnmail-expiry-wait}(@code{-function}) variables (the
+@code{expiry-wait} group parameter overrides @code{nnmail-expiry-wait}
+and makes @code{nnmail-expiry-wait-function} ineffective).  If you
 wanted a value of 3 days, you could use something like @code{[(* 3 24
 60 60)]}; @code{nnmaildir} will evaluate the form and use the result.
 An article's age is measured starting from the article file's
@@ -15297,8 +15481,8 @@ the parameter belongs to, then the article is not expired at all.  If
 you use the vector form, the first element is evaluated once for each
 article.  So that form can refer to
 @code{nnmaildir-article-file-name}, etc., to decide where to put the
-article.  @emph{If this parameter is not set, @code{nnmaildir} does
-not fall back to the @code{expiry-target} group parameter or the
+article.  @emph{Even if this parameter is not set, @code{nnmaildir}
+does not fall back to the @code{expiry-target} group parameter or the
 @code{nnmail-expiry-target} variable.}
 
 @item read-only
@@ -15419,7 +15603,7 @@ When the marks file is used (which it is by default), @code{nnfolder}
 servers have the property that you may backup them using @code{tar} or
 similar, and later be able to restore them into Gnus (by adding the
 proper @code{nnfolder} server) and have all your marks be preserved.
-Marks for a group is usually stored in a file named as the mbox file
+Marks for a group are usually stored in a file named as the mbox file
 with @code{.mrk} concatenated to it (but see
 @code{nnfolder-marks-file-suffix}) within the @code{nnfolder}
 directory.  Individual @code{nnfolder} groups are also possible to
@@ -15714,10 +15898,11 @@ interfaces to these sources.
 * Ultimate::                    The Ultimate Bulletin Board systems.
 * Web Archive::                 Reading mailing list archived on web.
 * RSS::                         Reading RDF site summary.
-* Customizing w3::              Doing stuff to Emacs/w3 from Gnus.
+* Customizing W3::              Doing stuff to Emacs/W3 from Gnus.
 @end menu
 
-All the web sources require Emacs/w3 and the url library to work.
+All the web sources require Emacs/W3 and the url library or those
+alternatives to work.
 
 The main caveat with all these web sources is that they probably won't
 work for a very long time.  Gleaning information from the @acronym{HTML} data
@@ -15804,8 +15989,9 @@ make money off of advertisements, not to provide services to the
 community.  Since @code{nnweb} washes the ads off all the articles, one
 might think that the providers might be somewhat miffed.  We'll see.
 
-You must have the @code{url} and @code{w3} package installed to be able
-to use @code{nnweb}.
+You must have the @code{url} and @code{W3} package or those alternatives
+(try @code{customize-group} on the @samp{mm-url} variable group)
+installed to be able to use @code{nnweb}.
 
 Virtual server variables:
 
@@ -16025,9 +16211,9 @@ system because @acronym{RSS} uses UTF-8 for encoding non-@acronym{ASCII}
 text by default.  It is also used by default for non-@acronym{ASCII}
 group names.
 
-@kindex G R (Summary)
-Use @kbd{G R} from the summary buffer to subscribe to a feed---you will
-be prompted for the location, the title and the description of the feed.
+@kindex G R (Group)
+Use @kbd{G R} from the group buffer to subscribe to a feed---you will be
+prompted for the location, the title and the description of the feed.
 The title, which allows any characters, will be used for the group name
 and the name of the group data file.  The description can be omitted.
 
@@ -16044,6 +16230,10 @@ the value of @code{default-file-name-coding-system}.  If you are using
 XEmacs and want to use non-@acronym{ASCII} group names, you should set
 the value for the @code{nnmail-pathname-coding-system} variable properly.
 
+The @code{nnrss} back end generates @samp{multipart/alternative}
+@acronym{MIME} articles in which each contains a @samp{text/plain} part
+and a @samp{text/html} part.
+
 @cindex OPML
 You can also use the following commands to import and export your
 subscriptions from a file in @acronym{OPML} format (Outline Processor
@@ -16081,6 +16271,15 @@ If you set @code{nnrss-use-local} to @code{t}, @code{nnrss} will read
 the feeds from local files in @code{nnrss-directory}.  You can use
 the command @code{nnrss-generate-download-script} to generate a
 download script using @command{wget}.
+
+@item nnrss-wash-html-in-text-plain-parts
+Non-@code{nil} means that @code{nnrss} renders text in @samp{text/plain}
+parts as @acronym{HTML}.  The function specified by the
+@code{mm-text-html-renderer} variable (@pxref{Display Customization,
+,Display Customization, emacs-mime, The Emacs MIME Manual}) will be used
+to render text.  If it is @code{nil}, which is the default, text will
+simply be folded.  Leave it @code{nil} if you prefer to see
+@samp{text/html} parts.
 @end table
 
 The following code may be helpful, if you want to show the description in
@@ -16098,6 +16297,7 @@ the summary buffer.
 
 The following code may be useful to open an nnrss url directly from the
 summary buffer.
+
 @lisp
 (require 'browse-url)
 
@@ -16120,18 +16320,44 @@ summary buffer.
 (add-to-list 'nnmail-extra-headers nnrss-url-field)
 @end lisp
 
-@node Customizing w3
-@subsection Customizing w3
-@cindex w3
+Even if you have added @code{"text/html"} to the
+@code{mm-discouraged-alternatives} variable (@pxref{Display
+Customization, ,Display Customization, emacs-mime, The Emacs MIME
+Manual}) since you don't want to see @acronym{HTML} parts, it might be
+more useful especially in @code{nnrss} groups to display
+@samp{text/html} parts.  Here's an example of setting
+@code{mm-discouraged-alternatives} as a group parameter (@pxref{Group
+Parameters}) in order to display @samp{text/html} parts only in
+@code{nnrss} groups:
+
+@lisp
+;; @r{Set the default value of @code{mm-discouraged-alternatives}.}
+(eval-after-load "gnus-sum"
+  '(add-to-list
+    'gnus-newsgroup-variables
+    '(mm-discouraged-alternatives
+      . '("text/html" "image/.*"))))
+
+;; @r{Display @samp{text/html} parts in @code{nnrss} groups.}
+(add-to-list
+ 'gnus-parameters
+ '("\\`nnrss:" (mm-discouraged-alternatives nil)))
+@end lisp
+
+
+@node Customizing W3
+@subsection Customizing W3
+@cindex W3
 @cindex html
 @cindex url
 @cindex Netscape
 
-Gnus uses the url library to fetch web pages and Emacs/w3 to display web
-pages.  Emacs/w3 is documented in its own manual, but there are some
-things that may be more relevant for Gnus users.
+Gnus uses the url library to fetch web pages and Emacs/W3 (or those
+alternatives) to display web pages.  Emacs/W3 is documented in its own
+manual, but there are some things that may be more relevant for Gnus
+users.
 
-For instance, a common question is how to make Emacs/w3 follow links
+For instance, a common question is how to make Emacs/W3 follow links
 using the @code{browse-url} functions (which will call some external web
 browser like Netscape).  Here's one way:
 
@@ -16146,7 +16372,7 @@ browser like Netscape).  Here's one way:
         (w3-fetch-orig url target)))))
 @end lisp
 
-Put that in your @file{.emacs} file, and hitting links in w3-rendered
+Put that in your @file{.emacs} file, and hitting links in W3-rendered
 @acronym{HTML} in the Gnus article buffers will use @code{browse-url} to
 follow the link.
 
@@ -16444,7 +16670,7 @@ RFC 2060 for more information on valid strings.
 A file containing credentials used to log in on servers.  The format is
 (almost) the same as the @code{ftp} @file{~/.netrc} file.  See the
 variable @code{nntp-authinfo-file} for exact syntax; also see
-@ref{NNTP}.  An example of an .authinfo line for an IMAP server, is: 
+@ref{NNTP}.  An example of an .authinfo line for an IMAP server, is:
 
 @example
 machine students.uio.no login larsi password geheimnis port imap
@@ -16644,7 +16870,7 @@ Nnmail equivalent: @code{nnmail-split-fancy}.
 Set to non-@code{nil} to download entire articles during splitting.
 This is generally not required, and will slow things down
 considerably.  You may need it if you want to use an advanced
-splitting function that analyses the body to split the article.
+splitting function that analyzes the body to split the article.
 
 @end table
 
@@ -16739,7 +16965,7 @@ delete them.
 @cindex namespaces
 
 The @acronym{IMAP} protocol has a concept called namespaces, described
-by the following text in the RFC:
+by the following text in the RFC2060:
 
 @display
 5.1.2.  Mailbox Namespace Naming Convention
@@ -16782,7 +17008,7 @@ tool and should be used only if you are sure what the effects are.
 
 @acronym{IMAP} is a complex protocol, more so than @acronym{NNTP} or
 @acronym{POP3}.  Implementation bugs are not unlikely, and we do our
-best to fix them right away.  If you encounter odd behaviour, chances
+best to fix them right away.  If you encounter odd behavior, chances
 are that either the server or Gnus is buggy.
 
 If you are familiar with network protocols in general, you will
@@ -16797,7 +17023,7 @@ to include the protocol dump when reporting IMAP bugs in Gnus.
 @vindex imap-log
 Because the protocol dump, when enabled, generates lots of data, it is
 disabled by default.  You can enable it by setting @code{imap-log} as
-follows: 
+follows:
 
 @lisp
 (setq imap-log t)
@@ -16929,12 +17155,11 @@ as a newsgroup.  Several files types are supported:
 @table @code
 @cindex Babyl
 @cindex Rmail mbox
-
 @item babyl
 The Babyl (Rmail) mail box.
+
 @cindex mbox
 @cindex Unix mbox
-
 @item mbox
 The standard Unix mbox file.
 
@@ -16945,13 +17170,9 @@ The MMDF mail box format.
 @item news
 Several news articles appended into a file.
 
-@item rnews
 @cindex rnews batch files
+@item rnews
 The rnews batch transport format.
-@cindex forwarded messages
-
-@item forward
-Forwarded articles.
 
 @item nsmail
 Netscape mail boxes.
@@ -16968,6 +17189,7 @@ A @acronym{MIME} digest of messages.
 @item lanl-gov-announce
 Announcement messages from LANL Gov Announce.
 
+@cindex forwarded messages
 @item rfc822-forward
 A message forwarded according to RFC822.
 
@@ -17071,34 +17293,48 @@ totally ignored.
 
 @item article-begin
 This setting has to be present in all document type definitions.  It
-says what the beginning of each article looks like.
+says what the beginning of each article looks like.  To do more
+complicated things that cannot be dealt with a simple regexp, you can
+use @code{article-begin-function} instead of this.
 
-@item head-begin-function
-If present, this should be a function that moves point to the head of
-the article.
+@item article-begin-function
+If present, this should be a function that moves point to the beginning
+of each article.  This setting overrides @code{article-begin}.
 
-@item nndoc-head-begin
+@item head-begin
 If present, this should be a regexp that matches the head of the
-article.
+article.  To do more complicated things that cannot be dealt with a
+simple regexp, you can use @code{head-begin-function} instead of this.
 
-@item nndoc-head-end
+@item head-begin-function
+If present, this should be a function that moves point to the head of
+the article.  This setting overrides @code{head-begin}.
+
+@item head-end
 This should match the end of the head of the article.  It defaults to
 @samp{^$}---the empty line.
 
+@item body-begin
+This should match the beginning of the body of the article.  It defaults
+to @samp{^\n}.  To do more complicated things that cannot be dealt with
+a simple regexp, you can use @code{body-begin-function} instead of this.
+
 @item body-begin-function
 If present, this function should move point to the beginning of the body
-of the article.
+of the article.  This setting overrides @code{body-begin}.
 
-@item body-begin
-This should match the beginning of the body of the article.  It defaults
-to @samp{^\n}.
+@item body-end
+If present, this should match the end of the body of the article.  To do
+more complicated things that cannot be dealt with a simple regexp, you
+can use @code{body-end-function} instead of this.
 
 @item body-end-function
 If present, this function should move point to the end of the body of
-the article.
+the article.  This setting overrides @code{body-end}.
 
-@item body-end
-If present, this should match the end of the body of the article.
+@item file-begin
+If present, this should match the beginning of the file.  All text
+before this regexp will be totally ignored.
 
 @item file-end
 If present, this should match the end of the file.  All text after this
@@ -17129,6 +17365,19 @@ understand.  It is called with the article number as a parameter, and is
 expected to generate a nice head for the article in question.  It is
 called when requesting the headers of all articles.
 
+@item generate-article-function
+If present, this function is called to generate an entire article that
+Gnus can understand.  It is called with the article number as a
+parameter when requesting all articles.
+
+@item dissection-function
+If present, this function is called to dissect a document by itself,
+overriding @code{first-article}, @code{article-begin},
+@code{article-begin-function}, @code{head-begin},
+@code{head-begin-function}, @code{head-end}, @code{body-begin},
+@code{body-begin-function}, @code{body-end}, @code{body-end-function},
+@code{file-begin}, and @code{file-end}.
+
 @end table
 
 Let's look at the most complicated example I can come up with---standard
@@ -17598,16 +17847,16 @@ group have to be alive (i.e., subscribed or unsubscribed).  Killed or
 zombie groups can't be component groups for @code{nnvirtual} groups.
 
 @vindex nnvirtual-always-rescan
-If the @code{nnvirtual-always-rescan} is non-@code{nil},
-@code{nnvirtual} will always scan groups for unread articles when
-entering a virtual group.  If this variable is @code{nil} (which is the
-default) and you read articles in a component group after the virtual
-group has been activated, the read articles from the component group
-will show up when you enter the virtual group.  You'll also see this
-effect if you have two virtual groups that have a component group in
-common.  If that's the case, you should set this variable to @code{t}.
-Or you can just tap @code{M-g} on the virtual group every time before
-you enter it---it'll have much the same effect.
+If the @code{nnvirtual-always-rescan} variable is non-@code{nil} (which
+is the default), @code{nnvirtual} will always scan groups for unread
+articles when entering a virtual group.  If this variable is @code{nil}
+and you read articles in a component group after the virtual group has
+been activated, the read articles from the component group will show up
+when you enter the virtual group.  You'll also see this effect if you
+have two virtual groups that have a component group in common.  If
+that's the case, you should set this variable to @code{t}.  Or you can
+just tap @code{M-g} on the virtual group every time before you enter
+it---it'll have much the same effect.
 
 @code{nnvirtual} can have both mail and news groups as component groups.
 When responding to articles in @code{nnvirtual} groups, @code{nnvirtual}
@@ -17677,6 +17926,381 @@ Articles marked as read in the @code{nnkiboze} group will have
 their @acronym{NOV} lines removed from the @acronym{NOV} file.
 
 
+@node Email Based Diary
+@section Email Based Diary
+@cindex diary
+@cindex email based diary
+@cindex calendar
+
+This section describes a special mail back end called @code{nndiary},
+and its companion library @code{gnus-diary}.  It is ``special'' in the
+sense that it is not meant to be one of the standard alternatives for
+reading mail with Gnus.  See @ref{Choosing a Mail Back End} for that.
+Instead, it is used to treat @emph{some} of your mails in a special way,
+namely, as event reminders.
+
+Here is a typical scenario:
+
+@itemize @bullet
+@item
+You've got a date with Andy Mc Dowell or Bruce Willis (select according
+to your sexual preference) in one month.  You don't want to forget it.
+@item
+So you send a ``reminder'' message (actually, a diary one) to yourself.
+@item
+You forget all about it and keep on getting and reading new mail, as usual.
+@item
+From time to time, as you type `g' in the group buffer and as the date
+is getting closer, the message will pop up again to remind you of your
+appointment, just as if it were new and unread.
+@item
+Read your ``new'' messages, this one included, and start dreaming again
+of the night you're gonna have.
+@item
+Once the date is over (you actually fell asleep just after dinner), the
+message will be automatically deleted if it is marked as expirable.
+@end itemize
+
+The Gnus Diary back end has the ability to handle regular appointments
+(that wouldn't ever be deleted) as well as punctual ones, operates as a
+real mail back end and is configurable in many ways.  All of this is
+explained in the sections below.
+
+@menu
+* The NNDiary Back End::        Basic setup and usage.
+* The Gnus Diary Library::      Utility toolkit on top of nndiary.
+* Sending or Not Sending::      A final note on sending diary messages.
+@end menu
+
+
+@node The NNDiary Back End
+@subsection The NNDiary Back End
+@cindex nndiary
+@cindex the nndiary back end
+
+@code{nndiary} is a back end very similar to @code{nnml} (@pxref{Mail
+Spool}).  Actually, it could appear as a mix of @code{nnml} and
+@code{nndraft}.  If you know @code{nnml}, you're already familiar with
+the message storing scheme of @code{nndiary}: one file per message, one
+directory per group.
+
+  Before anything, there is one requirement to be able to run
+@code{nndiary} properly: you @emph{must} use the group timestamp feature
+of Gnus.  This adds a timestamp to each group's parameters.  @ref{Group
+Timestamp} to see how it's done.
+
+@menu
+* Diary Messages::              What makes a message valid for nndiary.
+* Running NNDiary::             NNDiary has two modes of operation.
+* Customizing NNDiary::         Bells and whistles.
+@end menu
+
+@node Diary Messages
+@subsubsection Diary Messages
+@cindex nndiary messages
+@cindex nndiary mails
+
+@code{nndiary} messages are just normal ones, except for the mandatory
+presence of 7 special headers.  These headers are of the form
+@code{X-Diary-}, @code{} being one of
+@code{Minute}, @code{Hour}, @code{Dom}, @code{Month}, @code{Year},
+@code{Time-Zone} and @code{Dow}.  @code{Dom} means ``Day of Month'', and
+@code{dow} means ``Day of Week''.  These headers actually behave like
+crontab specifications and define the event date(s):
+
+@itemize @bullet
+@item
+For all headers except the @code{Time-Zone} one, a header value is
+either a star (meaning all possible values), or a list of fields
+(separated by a comma).
+@item
+A field is either an integer, or a range.
+@item
+A range is two integers separated by a dash.
+@item
+Possible integer values are 0--59 for @code{Minute}, 0--23 for
+@code{Hour}, 1--31 for @code{Dom}, 1--12 for @code{Month}, above 1971
+for @code{Year} and 0--6 for @code{Dow} (0 meaning Sunday).
+@item
+As a special case, a star in either @code{Dom} or @code{Dow} doesn't
+mean ``all possible values'', but ``use only the other field''.  Note
+that if both are star'ed, the use of either one gives the same result.
+@item
+The @code{Time-Zone} header is special in that it can only have one
+value (@code{GMT}, for instance).  A star doesn't mean ``all possible
+values'' (because it makes no sense), but ``the current local time
+zone''.  Most of the time, you'll be using a star here.  However, for a
+list of available time zone values, see the variable
+@code{nndiary-headers}.
+@end itemize
+
+As a concrete example, here are the diary headers to add to your message
+for specifying ``Each Monday and each 1st of month, at 12:00, 20:00,
+21:00, 22:00, 23:00 and 24:00, from 1999 to 2010'' (I'll let you find
+what to do then):
+
+@example
+X-Diary-Minute: 0
+X-Diary-Hour: 12, 20-24
+X-Diary-Dom: 1
+X-Diary-Month: *
+X-Diary-Year: 1999-2010
+X-Diary-Dow: 1
+X-Diary-Time-Zone: *
+@end example
+
+@node Running NNDiary
+@subsubsection Running NNDiary
+@cindex running nndiary
+@cindex nndiary operation modes
+
+@code{nndiary} has two modes of operation: ``traditional'' (the default)
+and ``autonomous''.  In traditional mode, @code{nndiary} does not get new
+mail by itself.  You have to move (@kbd{B m}) or copy (@kbd{B c}) mails
+from your primary mail back end to nndiary groups in order to handle them
+as diary messages.  In autonomous mode, @code{nndiary} retrieves its own
+mail and handles it independently from your primary mail back end.
+
+One should note that Gnus is not inherently designed to allow several
+``master'' mail back ends at the same time.  However, this does make
+sense with @code{nndiary}: you really want to send and receive diary
+messages to your diary groups directly.  So, @code{nndiary} supports
+being sort of a ``second primary mail back end'' (to my knowledge, it is
+the only back end offering this feature).  However, there is a limitation
+(which I hope to fix some day): respooling doesn't work in autonomous
+mode.
+
+In order to use @code{nndiary} in autonomous mode, you have several
+things to do:
+
+@itemize @bullet
+@item
+Allow @code{nndiary} to retrieve new mail by itself.  Put the following
+line in your @file{gnusrc} file:
+
+@lisp
+(setq nndiary-get-new-mail t)
+@end lisp
+@item
+You must arrange for diary messages (those containing @code{X-Diary-*}
+headers) to be split in a private folder @emph{before} Gnus treat them.
+Again, this is needed because Gnus cannot (yet ?) properly handle
+multiple primary mail back ends.  Getting those messages from a separate
+source will compensate this misfeature to some extent.
+
+As an example, here's my procmailrc entry to store diary files in
+@file{~/.nndiary} (the default @code{nndiary} mail source file):
+
+@example
+:0 HD :
+* ^X-Diary
+.nndiary
+@end example
+@end itemize
+
+Once this is done, you might want to customize the following two options
+that affect the diary mail retrieval and splitting processes:
+
+@defvar nndiary-mail-sources
+This is the diary-specific replacement for the standard
+@code{mail-sources} variable.  It obeys the same syntax, and defaults to
+@code{(file :path "~/.nndiary")}.
+@end defvar
+
+@defvar nndiary-split-methods
+This is the diary-specific replacement for the standard
+@code{nnmail-split-methods} variable.  It obeys the same syntax.
+@end defvar
+
+  Finally, you may add a permanent @code{nndiary} virtual server
+(something like @code{(nndiary "diary")} should do) to your
+@code{gnus-secondary-select-methods}.
+
+  Hopefully, almost everything (see the TODO section in
+@file{nndiary.el}) will work as expected when you restart Gnus: in
+autonomous mode, typing @kbd{g} and @kbd{M-g} in the group buffer, will
+also get your new diary mails and split them according to your
+diary-specific rules, @kbd{F} will find your new diary groups etc.
+
+@node Customizing NNDiary
+@subsubsection Customizing NNDiary
+@cindex customizing nndiary
+@cindex nndiary customization
+
+Now that @code{nndiary} is up and running, it's time to customize it.
+The custom group is called @code{nndiary} (no, really ?!).  You should
+browse it to figure out which options you'd like to tweak.  The following
+two variables are probably the only ones you will want to change:
+
+@defvar nndiary-reminders
+This is the list of times when you want to be reminded of your
+appointements (e.g. 3 weeks before, then 2 days before, then 1 hour
+before and that's it).  Remember that ``being reminded'' means that the
+diary message will pop up as brand new and unread again when you get new
+mail.
+@end defvar
+
+@defvar nndiary-week-starts-on-monday
+Rather self-explanatory.  Otherwise, Sunday is assumed (this is the
+default).
+@end defvar
+
+
+@node The Gnus Diary Library
+@subsection The Gnus Diary Library
+@cindex gnus-diary
+@cindex the gnus diary library
+
+Using @code{nndiary} manually (I mean, writing the headers by hand and
+so on) would be rather boring.  Fortunately, there is a library called
+@code{gnus-diary} written on top of @code{nndiary}, that does many
+useful things for you.
+
+  In order to use it, add the following line to your @file{gnusrc} file:
+
+@lisp
+(require 'gnus-diary)
+@end lisp
+
+  Also, you shouldn't use any @code{gnus-user-format-function-[d|D]}
+(@pxref{Summary Buffer Lines}).  @code{gnus-diary} provides both of these
+(sorry if you used them before).
+
+
+@menu
+* Diary Summary Line Format::           A nicer summary buffer line format.
+* Diary Articles Sorting::              A nicer way to sort messages.
+* Diary Headers Generation::            Not doing it manually.
+* Diary Group Parameters::              Not handling them manually.
+@end menu
+
+@node Diary Summary Line Format
+@subsubsection Diary Summary Line Format
+@cindex diary summary buffer line
+@cindex diary summary line format
+
+Displaying diary messages in standard summary line format (usually
+something like @samp{From Joe: Subject}) is pretty useless.  Most of
+the time, you're the one who wrote the message, and you mostly want to
+see the event's date.
+
+  @code{gnus-diary} provides two supplemental user formats to be used in
+summary line formats.  @code{D} corresponds to a formatted time string
+for the next occurrence of the event (e.g. ``Sat, Sep 22 01, 12:00''),
+while @code{d} corresponds to an approximative remaining time until the
+next occurrence of the event (e.g. ``in 6 months, 1 week'').
+
+  For example, here's how Joe's birthday is displayed in my
+@code{nndiary+diary:birthdays} summary buffer (note that the message is
+expirable, but will never be deleted, as it specifies a periodic event):
+
+@example
+   E  Sat, Sep 22 01, 12:00: Joe's birthday (in 6 months, 1 week)
+@end example
+
+In order to get something like the above, you would normally add the
+following line to your diary groups'parameters:
+
+@lisp
+(gnus-summary-line-format "%U%R%z %uD: %(%s%) (%ud)\n")
+@end lisp
+
+However, @code{gnus-diary} does it automatically (@pxref{Diary Group
+Parameters}).  You can however customize the provided summary line format
+with the following user options:
+
+@defvar gnus-diary-summary-line-format
+Defines the summary line format used for diary groups (@pxref{Summary
+Buffer Lines}).  @code{gnus-diary} uses it to automatically update the
+diary groups'parameters.
+@end defvar
+
+@defvar gnus-diary-time-format
+Defines the format to display dates in diary summary buffers.  This is
+used by the @code{D} user format.  See the docstring for details.
+@end defvar
+
+@defvar gnus-diary-delay-format-function
+Defines the format function to use for displaying delays (remaining
+times) in diary summary buffers.  This is used by the @code{d} user
+format.  There are currently built-in functions for English and French;
+you can also define your own.  See the docstring for details.
+@end defvar
+
+@node Diary Articles Sorting
+@subsubsection Diary Articles Sorting
+@cindex diary articles sorting
+@cindex diary summary lines sorting
+@findex gnus-summary-sort-by-schedule
+@findex gnus-thread-sort-by-schedule
+@findex gnus-article-sort-by-schedule
+
+@code{gnus-diary} provides new sorting functions (@pxref{Sorting the
+Summary Buffer} ) called @code{gnus-summary-sort-by-schedule},
+@code{gnus-thread-sort-by-schedule} and
+@code{gnus-article-sort-by-schedule}.  These functions let you organize
+your diary summary buffers from the closest event to the farthest one.
+
+@code{gnus-diary} automatically installs
+@code{gnus-summary-sort-by-schedule} as a menu item in the summary
+buffer's ``sort'' menu, and the two others as the primary (hence
+default) sorting functions in the group parameters (@pxref{Diary Group
+Parameters}).
+
+@node Diary Headers Generation
+@subsubsection Diary Headers Generation
+@cindex diary headers generation
+@findex gnus-diary-check-message
+
+@code{gnus-diary} provides a function called
+@code{gnus-diary-check-message} to help you handle the @code{X-Diary-*}
+headers.  This function ensures that the current message contains all the
+required diary headers, and prompts you for values or corrections if
+needed.
+
+  This function is hooked into the @code{nndiary} back end, so that
+moving or copying an article to a diary group will trigger it
+automatically.  It is also bound to @kbd{C-c D c} in @code{message-mode}
+and @code{article-edit-mode} in order to ease the process of converting
+a usual mail to a diary one.
+
+  This function takes a prefix argument which will force prompting of
+all diary headers, regardless of their presence or validity.  That way,
+you can very easily reschedule an already valid diary message, for
+instance.
+
+@node Diary Group Parameters
+@subsubsection Diary Group Parameters
+@cindex diary group parameters
+
+When you create a new diary group, or visit one, @code{gnus-diary}
+automatically checks your group parameters and if needed, sets the
+summary line format to the diary-specific value, installs the
+diary-specific sorting functions, and also adds the different
+@code{X-Diary-*} headers to the group's posting-style.  It is then easier
+to send a diary message, because if you use @kbd{C-u a} or @kbd{C-u m}
+on a diary group to prepare a message, these headers will be inserted
+automatically (although not filled with proper values yet).
+
+@node Sending or Not Sending
+@subsection Sending or Not Sending
+
+Well, assuming you've read of of the above, here are two final notes on
+mail sending with @code{nndiary}:
+
+@itemize @bullet
+@item
+@code{nndiary} is a @emph{real} mail back end.  You really send real diary
+messsages for real.  This means for instance that you can give
+appointements to anybody (provided they use Gnus and @code{nndiary}) by
+sending the diary message to them as well.
+@item
+However, since @code{nndiary} also has a @code{request-post} method, you
+can also use @kbd{C-u a} instead of @kbd{C-u m} on a diary group and the
+message won't actually be sent; just stored locally in the group. This
+comes in very handy for private appointments.
+@end itemize
+
 @node Gnus Unplugged
 @section Gnus Unplugged
 @cindex offline
@@ -17716,6 +18340,7 @@ Of course, to use it as such, you have to learn a few new commands.
 * Agent as Cache::              The Agent is a big cache too.
 * Agent Expiry::                How to make old articles go away.
 * Agent Regeneration::          How to recover from lost connections and other accidents.
+* Agent and flags::             How the Agent maintains flags.
 * Agent and IMAP::              How to use the Agent with @acronym{IMAP}.
 * Outgoing Messages::           What happens when you post/mail something?
 * Agent Variables::             Customizing is fun.
@@ -17880,9 +18505,6 @@ listed below.
 
 @cindex Agent Parameters
 @table @code
-@item agent-cat-name
-The name of the category.
-
 @item agent-groups
 The list of groups that are in this category.
 
@@ -17890,7 +18512,7 @@ The list of groups that are in this category.
 A predicate which (generally) gives a rough outline of which articles
 are eligible for downloading; and
 
-@item agent-score-file
+@item agent-score
 a score rule which (generally) gives you a finer granularity when
 deciding what articles to download.  (Note that this @dfn{download
 score} is not necessarily related to normal scores.)
@@ -17911,11 +18533,11 @@ an integer that overrides the value of @code{gnus-agent-low-score}.
 @item agent-high-score
 an integer that overrides the value of @code{gnus-agent-high-score}.
 
-@item agent-length-when-short
+@item agent-short-article
 an integer that overrides the value of
 @code{gnus-agent-short-article}.
 
-@item agent-length-when-long
+@item agent-long-article
 an integer that overrides the value of @code{gnus-agent-long-article}.
 
 @item agent-enable-undownloaded-faces
@@ -18427,9 +19049,9 @@ Download all eligible (@pxref{Agent Categories}) articles in this group.
 
 @item J s
 @kindex J s (Agent Summary)
-@findex gnus-agent-fetch-series
+@findex gnus-agent-summary-fetch-series
 Download all processable articles in this group.
-(@code{gnus-agent-fetch-series}).
+(@code{gnus-agent-summary-fetch-series}).
 
 @item J u
 @kindex J u (Agent Summary)
@@ -18514,10 +19136,10 @@ normal faces will be obscured by the undownloaded faces.
 
 If you would like to use the undownloaded faces, you must enable the
 undownloaded faces by setting the @code{agent-enable-undownloaded-faces}
-group parameter to t.  This parameter, like all other agent
-parameters, may be set on an Agent Category (@pxref{Agent
-Categories}), a Group Topic (@pxref{Topic Parameters}), or an
-individual group (@pxref{Group Parameters}).
+group parameter to @code{t}.  This parameter, like all other agent
+parameters, may be set on an Agent Category (@pxref{Agent Categories}),
+a Group Topic (@pxref{Topic Parameters}), or an individual group
+(@pxref{Group Parameters}).
 
 The one problem common to all users using the agent is how quickly it
 can consume disk space.  If you using the agent on many groups, it is
@@ -18622,23 +19244,19 @@ then updates the internal data structures that document which articles
 are stored locally.  An optional argument will mark articles in the
 agent as unread.
 
-@node Agent and IMAP
-@subsection Agent and IMAP
+@node Agent and flags
+@subsection Agent and flags
 
-The Agent works with any Gnus back end, including nnimap.  However,
-since there are some conceptual differences between @acronym{NNTP} and
-@acronym{IMAP}, this section (should) provide you with some information to
-make Gnus Agent work smoother as a @acronym{IMAP} Disconnected Mode client.
+The Agent works with any Gnus back end including those, such as
+nnimap, that store flags (read, ticked, etc) on the server.  Sadly,
+the Agent does not actually know which backends keep their flags in
+the backend server rather than in @file{.newsrc}.  This means that the
+Agent, while unplugged or disconnected, will always record all changes
+to the flags in its own files.
 
-The first thing to keep in mind is that all flags (read, ticked, etc)
-are kept on the @acronym{IMAP} server, rather than in @file{.newsrc} as is the
-case for nntp.  Thus Gnus need to remember flag changes when
-disconnected, and synchronize these flags when you plug back in.
-
-Gnus keeps track of flag changes when reading nnimap groups under the
-Agent.  When you plug back in, Gnus will check if you have any changed
-any flags and ask if you wish to synchronize these with the server.
-The behavior is customizable by @code{gnus-agent-synchronize-flags}.
+When you plug back in, Gnus will then check to see if you have any
+changed any flags and ask if you wish to synchronize these with the
+server.  This behavior is customizable by @code{gnus-agent-synchronize-flags}.
 
 @vindex gnus-agent-synchronize-flags
 If @code{gnus-agent-synchronize-flags} is @code{nil}, the Agent will
@@ -18652,6 +19270,23 @@ re-connect, you can do it manually with the
 @code{gnus-agent-synchronize-flags} command that is bound to @kbd{J Y}
 in the group buffer.
 
+Technical note: the synchronization algorithm does not work by ``pushing''
+all local flags to the server, but rather by incrementally updated the
+server view of flags by changing only those flags that were changed by
+the user.  Thus, if you set one flag on an article, quit the group then
+re-select the group and remove the flag; the flag will be set and
+removed from the server when you ``synchronize''.  The queued flag
+operations can be found in the per-server @code{flags} file in the Agent
+directory.  It's emptied when you synchronize flags.
+
+@node Agent and IMAP
+@subsection Agent and IMAP
+
+The Agent works with any Gnus back end, including nnimap.  However,
+since there are some conceptual differences between @acronym{NNTP} and
+@acronym{IMAP}, this section (should) provide you with some information to
+make Gnus Agent work smoother as a @acronym{IMAP} Disconnected Mode client.
+
 Some things are currently not implemented in the Agent that you'd might
 expect from a disconnected @acronym{IMAP} client, including:
 
@@ -18665,16 +19300,6 @@ Creating/deleting nnimap groups when unplugged.
 
 @end itemize
 
-Technical note: the synchronization algorithm does not work by ``pushing''
-all local flags to the server, but rather incrementally update the
-server view of flags by changing only those flags that were changed by
-the user.  Thus, if you set one flag on an article, quit the group and
-re-select the group and remove the flag; the flag will be set and
-removed from the server when you ``synchronize''.  The queued flag
-operations can be found in the per-server @code{flags} file in the Agent
-directory.  It's emptied when you synchronize flags.
-
-
 @node Outgoing Messages
 @subsection Outgoing Messages
 
@@ -18756,7 +19381,15 @@ online status.
 If @code{gnus-agent-mark-unread-after-downloaded} is non-@code{nil},
 mark articles as unread after downloading.  This is usually a safe
 thing to do as the newly downloaded article has obviously not been
-read.  The default is t.
+read.  The default is @code{t}.
+
+@item gnus-agent-synchronize-flags
+@vindex gnus-agent-synchronize-flags
+If @code{gnus-agent-synchronize-flags} is @code{nil}, the Agent will
+never automatically synchronize flags.  If it is @code{ask}, which is
+the default, the Agent will check if you made any changes and if so
+ask if you wish to synchronize these when you re-connect.  If it has
+any other value, all flags will be synchronized automatically.
 
 @item gnus-agent-consider-all-articles
 @vindex gnus-agent-consider-all-articles
@@ -18907,7 +19540,7 @@ may ask:
 @table @dfn
 @item If I read an article while plugged, do they get entered into the Agent?
 
-@strong{No}.  If you want this behaviour, add
+@strong{No}.  If you want this behavior, add
 @code{gnus-agent-fetch-selected-article} to
 @code{gnus-select-article-hook}.
 
@@ -19952,7 +20585,8 @@ group name, the @var{file-name} will be used as the home score file.
 
 @item
 A function.  If the function returns non-@code{nil}, the result will
-be used as the home score file.
+be used as the home score file.  The function will be called with the
+name of the group as the parameter.
 
 @item
 A string.  Use the string as the home score file.
@@ -20490,8 +21124,19 @@ very interesting:
  1000)
 @end example
 
-The possibilities are endless.
+Suppose you're reading a high volume group and you're only interested
+in replies. The plan is to score down all articles that don't have
+subject that begin with "Re:", "Fw:" or "Fwd:" and then score up all
+parents of articles that have subjects that begin with reply marks.
 
+@example
+((! ("subject" "re:\\|fwd?:" r))
+  -200)
+((1- ("subject" "re:\\|fwd?:" r))
+  200)
+@end example
+
+The possibilities are endless.
 
 @node Advanced Scoring Tips
 @subsection Advanced Scoring Tips
@@ -21012,7 +21657,7 @@ mode-line variables.
 
 Gnus usually moves point to a pre-defined place on each line in most
 buffers.  By default, point move to the first colon character on the
-line.  You can customize this behaviour in three different ways.
+line.  You can customize this behavior in three different ways.
 
 You can move the colon character to somewhere else on the line.
 
@@ -21705,6 +22350,15 @@ There are some variables to customize, of course:
 Set this variable to @code{t} to set the ball rolling.  It is @code{nil}
 by default.
 
+You can also set this variable to a positive number as a group level.
+In that case, Gnus scans NoCeM messages when checking new news if this
+value is not exceeding a group level that you specify as the prefix
+argument to some commands, e.g. @code{gnus},
+@code{gnus-group-get-new-news}, etc.  Otherwise, Gnus does not scan
+NoCeM messages if you specify a group level to those commands.  For
+example, if you use 1 or 2 on the mail groups and the levels on the news
+groups remain the default, 3 is the best choice.
+
 @item gnus-nocem-groups
 @vindex gnus-nocem-groups
 Gnus will look for NoCeM messages in the groups in this list.  The
@@ -21757,27 +22411,25 @@ The specs are applied left-to-right.
 
 @item gnus-nocem-verifyer
 @vindex gnus-nocem-verifyer
-@findex mc-verify
+@findex pgg-verify-region
 This should be a function for verifying that the NoCeM issuer is who she
-says she is.  The default is @code{mc-verify}, which is a Mailcrypt
-function.  If this is too slow and you don't care for verification
-(which may be dangerous), you can set this variable to @code{nil}.
-
-If you want signed NoCeM messages to be verified and unsigned messages
-not to be verified (but used anyway), you could do something like:
+says she is.  The default is the function using @code{pgg-verify-region}
+shown below:
 
 @lisp
-(setq gnus-nocem-verifyer 'my-gnus-mc-verify)
-
-(defun my-gnus-mc-verify ()
-  (not (eq 'forged
-           (ignore-errors
-             (if (mc-verify)
-                 t
-               'forged)))))
+(lambda ()
+  (pgg-verify-region (point-min) (point-max)))
 @end lisp
 
-This might be dangerous, though.
+It returns non-@code{nil} if the verification is successful, otherwise
+(including the case the NoCeM message was not signed) returns
+@code{nil}.  If this is too slow and you don't care for verification
+(which may be dangerous), you can set this variable to @code{nil}.
+
+Formerly the default was @code{mc-verify}, which is a Mailcrypt
+function.  While you can still use it, you can change it into the
+default function running with GnuPG if you are willing to add the
+@acronym{PGP} public keys to GnuPG's keyring.
 
 @item gnus-nocem-directory
 @vindex gnus-nocem-directory
@@ -21967,10 +22619,20 @@ readers.
 @end iftex
 @c @anchor{X-Face}
 
-Decoding an @code{X-Face} header either requires an Emacs that has
+Viewing an @code{X-Face} header either requires an Emacs that has
 @samp{compface} support (which most XEmacs versions has), or that you
-have @samp{compface} installed on your system.  If either is true,
-Gnus will default to displaying @code{X-Face} headers.
+have suitable conversion or display programs installed.  If your Emacs
+has image support the default action is to display the face before the
+@code{From} header.  If there's no native @code{X-Face} support, Gnus
+will try to convert the @code{X-Face} header using external programs
+from the @code{pbmplus} package and friends.  For XEmacs it's faster if
+XEmacs has been compiled with @code{X-Face} support.  The default action
+under Emacs without image support is to fork off the @code{display}
+program.
+
+On a GNU/Linux system, the @code{display} program is from the
+ImageMagick package.  For external conversion programs look for packages
+with names like @code{netpbm}, @code{libgr-progs} and @code{compface}.
 
 The variable that controls this is the
 @code{gnus-article-x-face-command} variable.  If this variable is a
@@ -21979,21 +22641,6 @@ function, this function will be called with the face as the argument.
 If the @code{gnus-article-x-face-too-ugly} (which is a regexp) matches
 the @code{From} header, the face will not be shown.
 
-The default action under Emacs 20 is to fork off the @code{display}
-program@footnote{@code{display} is from the ImageMagick package.  For
-the @code{uncompface} and @code{icontopbm} programs look for a package
-like @code{compface} or @code{faces-xface} on a GNU/Linux system.}  to
-view the face.
-
-Under XEmacs or Emacs 21+ with suitable image support, the default
-action is to display the face before the @code{From} header.  (It's
-nicer if XEmacs has been compiled with @code{X-Face} support---that
-will make display somewhat faster.  If there's no native @code{X-Face}
-support, Gnus will try to convert the @code{X-Face} header using
-external programs from the @code{pbmplus} package and
-friends.@footnote{On a GNU/Linux system look for packages with names
-like @code{netpbm}, @code{libgr-progs} and @code{compface}.})
-
 (Note: @code{x-face} is used in the variable/function names, not
 @code{xface}).
 
@@ -22034,8 +22681,12 @@ on the @code{xface} image type in XEmacs if it is built with the
 @samp{libcompface} library.
 @end table
 
-Gnus provides a few convenience functions and variables to allow
-easier insertion of X-Face headers in outgoing messages.
+If you use posting styles, you can use an @code{x-face-file} entry in
+@code{gnus-posting-styles}, @xref{Posting Styles}.  If you don't, Gnus
+provides a few convenience functions and variables to allow easier
+insertion of X-Face headers in outgoing messages.  You also need the
+above mentioned ImageMagick, netpbm or other image conversion packages
+(depending the values of the variables below) for these functions.
 
 @findex gnus-random-x-face
 @vindex gnus-convert-pbm-to-x-face-command
@@ -22082,7 +22733,7 @@ Using the last function would be something like this:
 @subsection Face
 @cindex face
 
-@c #### FIXME: faces and x-faces'implementations should really be harmonized.
+@c #### FIXME: faces and x-faces' implementations should really be harmonized.
 
 @code{Face} headers are essentially a funkier version of @code{X-Face}
 ones. They describe a 48x48 pixel colored image that's supposed to
@@ -22097,6 +22748,13 @@ specifications.
 The @code{gnus-face-properties-alist} variable affects the appearance of
 displayed Face images.  @xref{X-Face}.
 
+Viewing an @code{Face} header requires an Emacs that is able to display
+PNG images.
+@c Maybe add this:
+@c (if (featurep 'xemacs)
+@c     (featurep 'png)
+@c   (image-type-available-p 'png))
+
 Gnus provides a few convenience functions and variables to allow
 easier insertion of Face headers in outgoing messages.
 
@@ -22263,18 +22921,6 @@ This is where Gnus will look for pictures.  Gnus will normally
 auto-detect this directory, but you may set it manually if you have an
 unusual directory structure.
 
-@item gnus-xmas-logo-color-alist
-@vindex gnus-xmas-logo-color-alist
-This is an alist where the key is a type symbol and the values are the
-foreground and background color of the splash page glyph.
-
-@item gnus-xmas-logo-color-style
-@vindex gnus-xmas-logo-color-style
-This is the key used to look up the color in the alist described above.
-Valid values include @code{flame}, @code{pine}, @code{moss},
-@code{irish}, @code{sky}, @code{tin}, @code{velvet}, @code{grape},
-@code{labia}, @code{berry}, @code{neutral}, and @code{september}.
-
 @item gnus-xmas-modeline-glyph
 @vindex gnus-xmas-modeline-glyph
 A glyph displayed in all Gnus mode lines.  It is a tiny gnu head by
@@ -22288,9 +22934,19 @@ default.
 
 @item gnus-use-toolbar
 @vindex gnus-use-toolbar
-If @code{nil}, don't display toolbars.  If non-@code{nil}, it should be
-one of @code{default-toolbar}, @code{top-toolbar}, @code{bottom-toolbar},
-@code{right-toolbar}, or @code{left-toolbar}.
+This variable specifies the position to display the toolbar.  If
+@code{nil}, don't display toolbars.  If it is non-@code{nil}, it should
+be one of the symbols @code{default}, @code{top}, @code{bottom},
+@code{right}, and @code{left}.  @code{default} means to use the default
+toolbar, the rest mean to display the toolbar on the place which those
+names show.  The default is @code{default}.
+
+@item gnus-toolbar-thickness
+@vindex gnus-toolbar-thickness
+Cons of the height and the width specifying the thickness of a toolbar.
+The height is used for the toolbar displayed on the top or the bottom,
+the width is used for the toolbar displayed on the right or the left.
+The default is that of the default toolbar.
 
 @item gnus-group-toolbar
 @vindex gnus-group-toolbar
@@ -22403,7 +23059,7 @@ messages per day from @samp{random-address@@vmadmin.com}, you block
 @samp{vmadmin.com}.  If you get 200 messages about @samp{VIAGRA}, you
 discard all messages with @samp{VIAGRA} in the message.  If you get
 lots of spam from Bulgaria, for example, you try to filter all mail
-from Bulgarian IPs.  
+from Bulgarian IPs.
 
 This, unfortunately, is a great way to discard legitimate e-mail.  The
 risks of blocking a whole country (Bulgaria, Norway, Nigeria, China,
@@ -22752,24 +23408,24 @@ variables.  Try @code{customize-group} on the @samp{spam} variable
 group.
 
 @menu
-* Spam ELisp Package Sequence of Events::  
-* Spam ELisp Package Filtering of Incoming Mail::  
-* Spam ELisp Package Global Variables::  
-* Spam ELisp Package Sorting and Score Display in Summary Buffer::  
-* Spam ELisp Package Configuration Examples::  
-* Blacklists and Whitelists::   
-* BBDB Whitelists::             
-* Gmane Spam Reporting::        
-* Anti-spam Hashcash Payments::  
-* Blackholes::                  
-* Regular Expressions Header Matching::  
-* Bogofilter::                  
-* SpamAssassin back end::        
-* ifile spam filtering::        
-* spam-stat spam filtering::    
-* SpamOracle::                  
-* Extending the Spam ELisp package::  
-@end menu 
+* Spam ELisp Package Sequence of Events::
+* Spam ELisp Package Filtering of Incoming Mail::
+* Spam ELisp Package Global Variables::
+* Spam ELisp Package Sorting and Score Display in Summary Buffer::
+* Spam ELisp Package Configuration Examples::
+* Blacklists and Whitelists::
+* BBDB Whitelists::
+* Gmane Spam Reporting::
+* Anti-spam Hashcash Payments::
+* Blackholes::
+* Regular Expressions Header Matching::
+* Bogofilter::
+* SpamAssassin back end::
+* ifile spam filtering::
+* spam-stat spam filtering::
+* SpamOracle::
+* Extending the Spam ELisp package::
+@end menu
 
 @node Spam ELisp Package Sequence of Events
 @subsubsection Spam ELisp Package Sequence of Events
@@ -23183,7 +23839,7 @@ Now just set your summary line format to use @code{%uS}.  Here's an
 example that formats the spam score in a 5-character field:
 
 @lisp
-(setq gnus-summary-line-format 
+(setq gnus-summary-line-format
  "%U%R %10&user-date; $%5uS %6k  %B %(%4L: %*%-25,25a%) %s \n")
 @end lisp
 
@@ -23273,7 +23929,7 @@ From Ted Zlatanov .
  ;; @r{any ham goes to my @samp{nnimap+mail.lifelogs.com:mail} folder, but}
  ;; @r{also to my @samp{nnimap+mail.lifelogs.com:trainham} folder for training}
 
- (ham-process-destination "nnimap+mail.lifelogs.com:mail" 
+ (ham-process-destination "nnimap+mail.lifelogs.com:mail"
                           "nnimap+mail.lifelogs.com:trainham")
  ;; @r{in this group, only @samp{!} marks are ham}
  (ham-marks
@@ -23314,7 +23970,7 @@ does most of the job for me:
     (spam-contents gnus-group-spam-classification-ham))
 @end lisp
 
-@itemize 
+@itemize
 
 @item @b{The Spam folder:}
 
@@ -23407,11 +24063,11 @@ customizing the group parameters or the
 added to a group's @code{spam-process} parameter, the senders of
 spam-marked articles will be added to the blacklist.
 
-@emph{WARNING} 
+@emph{WARNING}
 
 Instead of the obsolete
 @code{gnus-group-spam-exit-processor-blacklist}, it is recommended
-that you use @code{'(spam spam-use-blacklist)}.  Everything will work
+that you use @code{(spam spam-use-blacklist)}.  Everything will work
 the same way, we promise.
 
 @end defvar
@@ -23425,11 +24081,11 @@ added to a group's @code{spam-process} parameter, the senders of
 ham-marked articles in @emph{ham} groups will be added to the
 whitelist.
 
-@emph{WARNING} 
+@emph{WARNING}
 
 Instead of the obsolete
 @code{gnus-group-ham-exit-processor-whitelist}, it is recommended
-that you use @code{'(ham spam-use-whitelist)}.  Everything will work
+that you use @code{(ham spam-use-whitelist)}.  Everything will work
 the same way, we promise.
 
 @end defvar
@@ -23496,11 +24152,11 @@ added to a group's @code{spam-process} parameter, the senders of
 ham-marked articles in @emph{ham} groups will be added to the
 BBDB.
 
-@emph{WARNING} 
+@emph{WARNING}
 
 Instead of the obsolete
 @code{gnus-group-ham-exit-processor-BBDB}, it is recommended
-that you use @code{'(ham spam-use-BBDB)}.  Everything will work
+that you use @code{(ham spam-use-BBDB)}.  Everything will work
 the same way, we promise.
 
 @end defvar
@@ -23523,11 +24179,11 @@ HTTP request.
 
 Gmane can be found at @uref{http://gmane.org}.
 
-@emph{WARNING} 
+@emph{WARNING}
 
 Instead of the obsolete
 @code{gnus-group-spam-exit-processor-report-gmane}, it is recommended
-that you use @code{'(spam spam-use-gmane)}.  Everything will work the
+that you use @code{(spam spam-use-gmane)}.  Everything will work the
 same way, we promise.
 
 @end defvar
@@ -23538,8 +24194,15 @@ This variable is @code{t} by default.  Set it to @code{nil} if you are
 running your own news server, for instance, and the local article
 numbers don't correspond to the Gmane article numbers.  When
 @code{spam-report-gmane-use-article-number} is @code{nil},
-@code{spam-report.el} will use the @code{X-Report-Spam} header that
-Gmane provides.
+@code{spam-report.el} will fetch the number from the article headers.
+
+@end defvar
+
+@defvar spam-report-user-mail-address
+
+Mail address exposed in the User-Agent spam reports to Gmane.  It allows
+the Gmane administrators to contact you in case of misreports.  The
+default is @code{user-mail-address}.
 
 @end defvar
 
@@ -23690,11 +24353,11 @@ customizing the group parameters or the
 added to a group's @code{spam-process} parameter, spam-marked articles
 will be added to the Bogofilter spam database.
 
-@emph{WARNING} 
+@emph{WARNING}
 
 Instead of the obsolete
 @code{gnus-group-spam-exit-processor-bogofilter}, it is recommended
-that you use @code{'(spam spam-use-bogofilter)}.  Everything will work
+that you use @code{(spam spam-use-bogofilter)}.  Everything will work
 the same way, we promise.
 @end defvar
 
@@ -23706,11 +24369,11 @@ added to a group's @code{spam-process} parameter, the ham-marked
 articles in @emph{ham} groups will be added to the Bogofilter database
 of non-spam messages.
 
-@emph{WARNING} 
+@emph{WARNING}
 
 Instead of the obsolete
 @code{gnus-group-ham-exit-processor-bogofilter}, it is recommended
-that you use @code{'(ham spam-use-bogofilter)}.  Everything will work
+that you use @code{(ham spam-use-bogofilter)}.  Everything will work
 the same way, we promise.
 @end defvar
 
@@ -23846,11 +24509,11 @@ customizing the group parameters or the
 added to a group's @code{spam-process} parameter, the spam-marked
 articles will be added to the spam-stat database of spam messages.
 
-@emph{WARNING} 
+@emph{WARNING}
 
 Instead of the obsolete
 @code{gnus-group-spam-exit-processor-stat}, it is recommended
-that you use @code{'(spam spam-use-stat)}.  Everything will work
+that you use @code{(spam spam-use-stat)}.  Everything will work
 the same way, we promise.
 @end defvar
 
@@ -23862,11 +24525,11 @@ added to a group's @code{spam-process} parameter, the ham-marked
 articles in @emph{ham} groups will be added to the spam-stat database
 of non-spam messages.
 
-@emph{WARNING} 
+@emph{WARNING}
 
 Instead of the obsolete
 @code{gnus-group-ham-exit-processor-stat}, it is recommended
-that you use @code{'(ham spam-use-stat)}.  Everything will work
+that you use @code{(ham spam-use-stat)}.  Everything will work
 the same way, we promise.
 @end defvar
 
@@ -23954,11 +24617,11 @@ customizing the group parameter or the
 to a group's @code{spam-process} parameter, spam-marked articles will be
 sent to SpamOracle as spam samples.
 
-@emph{WARNING} 
+@emph{WARNING}
 
 Instead of the obsolete
 @code{gnus-group-spam-exit-processor-spamoracle}, it is recommended
-that you use @code{'(spam spam-use-spamoracle)}.  Everything will work
+that you use @code{(spam spam-use-spamoracle)}.  Everything will work
 the same way, we promise.
 @end defvar
 
@@ -23970,11 +24633,11 @@ to a group's @code{spam-process} parameter, the ham-marked articles in
 @emph{ham} groups will be sent to the SpamOracle as samples of ham
 messages.
 
-@emph{WARNING} 
+@emph{WARNING}
 
 Instead of the obsolete
 @code{gnus-group-ham-exit-processor-spamoracle}, it is recommended
-that you use @code{'(ham spam-use-spamoracle)}.  Everything will work
+that you use @code{(ham spam-use-spamoracle)}.  Everything will work
 the same way, we promise.
 @end defvar
 
@@ -24042,8 +24705,8 @@ Note you don't have to provide a spam or a ham processor.  Only
 provide them if Blackbox supports spam or ham processing.
 
 Also, ham and spam processors are being phased out as single
-variables.  Instead the form @code{'(spam spam-use-blackbox)} or 
-@code{'(ham spam-use-blackbox)} is favored.  For now, spam/ham
+variables.  Instead the form @code{(spam spam-use-blackbox)} or
+@code{(ham spam-use-blackbox)} is favored.  For now, spam/ham
 processor variables are still around but they won't be for long.
 
 @lisp
@@ -24487,7 +25150,7 @@ to the Gnus back ends instead of Gnus proper.
 @item nnheader-max-head-length
 @vindex nnheader-max-head-length
 When the back ends read straight heads of articles, they all try to read
-as little as possible.  This variable (default 4096) specifies
+as little as possible.  This variable (default 8192) specifies
 the absolute max length the back ends will try to read before giving up
 on finding a separator line between the head and the body.  If this
 variable is @code{nil}, there is no upper read bound.  If it is
@@ -24604,7 +25267,7 @@ XEmacs is distributed as a collection of packages.  You should install
 whatever packages the Gnus XEmacs package requires.  The current
 requirements are @samp{gnus}, @samp{mail-lib}, @samp{xemacs-base},
 @samp{eterm}, @samp{sh-script}, @samp{net-utils}, @samp{os-utils},
-@samp{dired}, @samp{mh-e}, @samp{sieve}, @samp{ps-print}, @samp{w3},
+@samp{dired}, @samp{mh-e}, @samp{sieve}, @samp{ps-print}, @samp{W3},
 @samp{pgg}, @samp{mailcrypt}, @samp{ecrypto}, and @samp{sasl}.
 
 
@@ -24668,20 +25331,23 @@ On July 28th 1996 work on Red Gnus was begun, and it was released on
 January 25th 1997 (after 84 releases) as ``Gnus 5.4'' (67 releases).
 
 On September 13th 1997, Quassia Gnus was started and lasted 37 releases.
-If was released as ``Gnus 5.6'' on March 8th 1998 (46 releases).
+It was released as ``Gnus 5.6'' on March 8th 1998 (46 releases).
 
 Gnus 5.6 begat Pterodactyl Gnus on August 29th 1998 and was released as
 ``Gnus 5.8'' (after 99 releases and a CVS repository) on December 3rd
 1999.
 
-On the 26th of October 2000, Oort Gnus was begun.
+On the 26th of October 2000, Oort Gnus was begun and was released as
+Gnus 5.10 on May 1st 2003 (24 releases).
+
+On the January 4th 2004, No Gnus was begun.
 
 If you happen upon a version of Gnus that has a prefixed name --
 ``(ding) Gnus'', ``September Gnus'', ``Red Gnus'', ``Quassia Gnus'',
-``Pterodactyl Gnus'', ``Oort Gnus'' -- don't panic.  Don't let it know
-that you're frightened.  Back away.  Slowly.  Whatever you do, don't
-run.  Walk away, calmly, until you're out of its reach.  Find a proper
-released version of Gnus and snuggle up to that instead.
+``Pterodactyl Gnus'', ``Oort Gnus'', ``No Gnus'' -- don't panic.
+Don't let it know that you're frightened.  Back away.  Slowly.  Whatever
+you do, don't run.  Walk away, calmly, until you're out of its reach.
+Find a proper released version of Gnus and snuggle up to that instead.
 
 
 @node Other Gnus Versions
@@ -24859,7 +25525,7 @@ decryption).
 
 @item PGP/MIME - RFC 2015/3156
 RFC 2015 (superseded by 3156 which references RFC 2440 instead of RFC
-1991) describes the @acronym{MIME}-wrapping around the RF 1991/2440 format.
+1991) describes the @acronym{MIME}-wrapping around the RFC 1991/2440 format.
 Gnus supports both encoding and decoding.
 
 @item S/MIME - RFC 2633
@@ -25291,7 +25957,7 @@ actually are people who are using Gnus.  Who'd'a thunk it!
 * Quassia Gnus::                Two times two is four, or Gnus 5.6/5.7.
 * Pterodactyl Gnus::            Pentad also starts with P, AKA Gnus 5.8/5.9.
 * Oort Gnus::                   It's big.  It's far out.  Gnus 5.10/5.11.
-* No Gnus::                     Lars, FIXME!
+* No Gnus::                     Very punny.
 @end menu
 
 These lists are, of course, just @emph{short} overviews of the
@@ -26211,7 +26877,7 @@ The new variable @code{gnus-parameters} can be used to set group parameters.
 Earlier this was done only via @kbd{G p} (or @kbd{G c}), which stored
 the parameters in @file{~/.newsrc.eld}, but via this variable you can
 enjoy the powers of customize, and simplified backups since you set the
-variable in @file{~/.emacs} instead of @file{~/.newsrc.eld}.  The
+variable in @file{~/.gnus.el} instead of @file{~/.newsrc.eld}.  The
 variable maps regular expressions matching group names to group
 parameters, a'la:
 @lisp
@@ -26226,7 +26892,7 @@ parameters, a'la:
 @item
 Smileys (@samp{:-)}, @samp{;-)} etc) are now iconized for Emacs too.
 
-Put @code{(setq gnus-treat-display-smileys nil)} in @file{~/.emacs} to
+Put @code{(setq gnus-treat-display-smileys nil)} in @file{~/.gnus.el} to
 disable it.
 
 @item
@@ -26253,8 +26919,8 @@ appropriate headers and a note in the body for cross-postings and
 followups (see the variables @code{message-cross-post-@var{*}}).
 
 @item
-References and X-Draft-Headers are no longer generated when you start
-composing messages and @code{message-generate-headers-first} is
+References and X-Draft-From headers are no longer generated when you
+start composing messages and @code{message-generate-headers-first} is
 @code{nil}.
 
 @item
@@ -26327,7 +26993,7 @@ unplugged state.  You can enroll or remove servers with @kbd{J a} and
 @kbd{J r} in the server buffer.  Gnus will not download articles into
 the Agent cache, unless you instruct it to do so, though, by using
 @kbd{J u} or @kbd{J s} from the Group buffer.  You revert to the old
-behaviour of having the Agent disabled with @code{(setq gnus-agent
+behavior of having the Agent disabled with @code{(setq gnus-agent
 nil)}.  Note that putting @code{(gnus-agentize)} in @file{~/.gnus.el}
 is not needed any more.
 
@@ -26347,6 +27013,8 @@ groups.
 A new file from Raymond Scholz @email{rscholz@@zonix.de} for deuglifying
 broken Outlook (Express) articles.
 
+@c FIXME: `gnus-load' is mentioned in README, which is not included in
+@c CVS.  We should find a better place for this item.
 @item
 @code{(require 'gnus-load)}
 
@@ -26435,6 +27103,11 @@ Decoding format=flowed was present but not documented in earlier
 versions.
 
 @item
+The option @code{mm-fill-flowed} can be used to disable treatment of
+``format=flowed'' messages.  Also, flowed text is disabled when sending
+inline PGP signed messages.  (New in Gnus 5.10.7)
+
+@item
 Gnus supports the generation of RFC 2298 Disposition Notification requests.
 
 This is invoked with the @kbd{C-c M-n} key binding from message mode.
@@ -26467,7 +27140,7 @@ you post a message, and saves it in your @file{~/.emacs} using the Custom
 system.  While the variable is called @code{canlock-password}, it is not
 security sensitive data.  Publishing your canlock string on the web
 will not allow anyone to be able to anything she could not already do.
-The behaviour can be changed by customizing @code{message-insert-canlock}.
+The behavior can be changed by customizing @code{message-insert-canlock}.
 
 @item
 Gnus supports server-side mail filtering using Sieve.
@@ -26495,7 +27168,8 @@ It was aliased to @kbd{Y c}
 (@code{gnus-summary-insert-cached-articles}).  The new function filters
 out other articles.
 
-@item Some limiting commands accept a @kbd{C-u} prefix to negate the match.
+@item
+Some limiting commands accept a @kbd{C-u} prefix to negate the match.
 
 If @kbd{C-u} is used on subject, author or extra headers, i.e., @kbd{/
 s}, @kbd{/ a}, and @kbd{/ x}
@@ -26567,7 +27241,7 @@ This change was made to avoid conflict with the standard binding of
 @item
 The default for @code{message-forward-show-mml} changed to symbol @code{best}.
 
-The behaviour for the @code{best} value is to show @acronym{MML} (i.e.,
+The behavior for the @code{best} value is to show @acronym{MML} (i.e.,
 convert to @acronym{MIME}) when appropriate.  @acronym{MML} will not be
 used when forwarding signed or encrypted messages, as the conversion
 invalidate the digital signature.
@@ -26955,7 +27629,7 @@ minimum.  You can, in fact, make do without them altogether---most of the
 useful data is in the summary buffer, anyway.  Set this variable to
 @samp{^NEVVVVER} or @samp{From:}, or whatever you feel you need.
 
-Set this hook to all the available hiding commands:
+Use the following to enable all the available hiding features:
 @lisp
 (setq gnus-treat-hide-headers 'head
       gnus-treat-hide-signature t
@@ -27102,7 +27776,7 @@ in order to solve the problem yourself and send a patch, you can use
 edebug.  Debugging Lisp code is documented in the Elisp manual
 (@pxref{Debugging, , Debugging Lisp Programs, elisp, The GNU Emacs
 Lisp Reference Manual}).  To get you started with edebug, consider if
-you discover some weird behaviour when pressing @kbd{c}, the first
+you discover some weird behavior when pressing @kbd{c}, the first
 step is to do @kbd{C-h k c} and click on the hyperlink (Emacs only) in
 the documentation buffer that leads you to the function definition,
 then press @kbd{M-x edebug-defun RET} with point inside that function,
@@ -28686,8 +29360,10 @@ interpreted.)  If you decide that you don't like the way Gnus does
 certain things, it's trivial to have it do something a different way.
 (Well, at least if you know how to write Lisp code.)  However, that's
 beyond the scope of this manual, so we are simply going to talk about
-some common constructs that you normally use in your @file{.emacs} file
-to customize Gnus.
+some common constructs that you normally use in your @file{~/.gnus.el}
+file to customize Gnus.  (You can also use the @file{~/.emacs} file, but
+in order to set things of Gnus up, it is much better to use the
+@file{~/.gnus.el} file, @xref{Startup Files}.)
 
 If you want to set the variable @code{gnus-florgbnize} to four (4), you
 write the following:
@@ -28698,12 +29374,12 @@ write the following:
 
 This function (really ``special form'') @code{setq} is the one that can
 set a variable to some value.  This is really all you need to know.  Now
-you can go and fill your @file{.emacs} file with lots of these to change
-how Gnus works.
+you can go and fill your @file{~/.gnus.el} file with lots of these to
+change how Gnus works.
 
-If you have put that thing in your @file{.emacs} file, it will be read
-and @code{eval}ed (which is lisp-ese for ``run'') the next time you
-start Emacs.  If you want to change the variable right away, simply say
+If you have put that thing in your @file{~/.gnus.el} file, it will be
+read and @code{eval}ed (which is Lisp-ese for ``run'') the next time you
+start Gnus.  If you want to change the variable right away, simply say
 @kbd{C-x C-e} after the closing parenthesis.  That will @code{eval} the
 previous ``form'', which is a simple @code{setq} statement here.
 
diff --git a/texi/gnusref-ja.tex b/texi/gnusref-ja.tex
index 23c0947..e463f53 100644
--- a/texi/gnusref-ja.tex
+++ b/texi/gnusref-ja.tex
@@ -31,7 +31,8 @@
 
 \def\CopyRight{
 \begin{center}
-Copyright \copyright\ 1995 Free Software Foundation, Inc.\\*
+Copyright \copyright\ 1995, 2002, 2003, 2004,
+2005 Free Software Foundation, Inc.\\*
 Copyright \copyright\ 1995-97 \author.\\*
 Created from the Gnus manual Copyright \copyright\ 1994-97 Lars Magne
 Ingebrigtsen.\\*
diff --git a/texi/infohack.el b/texi/infohack.el
index df90dfe..f991593 100644
--- a/texi/infohack.el
+++ b/texi/infohack.el
@@ -18,8 +18,8 @@
 
 ;; 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.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
diff --git a/texi/message-ja.texi b/texi/message-ja.texi
index 8e7fa9c..037373c 100644
--- a/texi/message-ja.texi
+++ b/texi/message-ja.texi
@@ -1,4 +1,4 @@
-\input texinfo
+\input texinfo                  @c -*-texinfo-*-
 
 @setfilename message-ja
 @settitle T-gnus 6.17 Message Manual
@@ -11,12 +11,12 @@ This file documents Message, the Emacs message composition mode.
 $B$3$N%U%!%$%k$O(B Emacs $B$N%a%C%;!<%8:n@.%b!<%I$G$"$k(B Message $B$K4X$9$k@bL@J8(B
 $B=q$G$9!#(B
 
-Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright @copyright{} 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+2004, 2005, 2006 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
+under the terms of the GNU Free Documentation License, Version 1.2 or
 any later version published by the Free Software Foundation; with no
 Invariant Sections, with the Front-Cover texts being ``A GNU
 Manual'', and with the Back-Cover Texts as in (a) below.  A copy of the
@@ -24,10 +24,10 @@ license is included in the section entitled ``GNU Free Documentation
 License''.
 
 $B$3$NJ8=q$r!"%U%j!<%=%U%H%&%'%":bCDH/9T$N(B GNU $B%U%j!r7o$N2<$GJ#@=!"G[I[!"$"$k$$$OJQ99$9(B
-$B$k$3$H$r5v2D$7$^$9!#JQ99IT2DItJ,$O;XDj$7$^$;$s!#!V(BA GNU Manual$B!W$OI=I=;f(B
+$BBh(B 1.2 $BHG$^$?$O$=$l0J9_$NHG$,Dj$a$k>r7o$N2<$GJ#@=!"G[I[!"$"$k$$$OJQ99$9(B
+$B$k$3$H$r5v2D$7$^$9!#JQ99IT2DItJ,$O;XDj$7$^$;$s!#!H(BA GNU Manual$B!I$OI=I=;f(B
 $B%F%-%9%H!"0J2<$N(B (a) $B$ON"I=;f%F%-%9%H$G$9!#$3$NMxMQ5vBz7@Ls=q$NJ#O$K4^$^$l$F$$$^(B
+$B!H(BEmacs manual$B!I$N!V(BGNU $B%U%j!O$K4^$^$l$F$$$^(B
 $B$9!#(B
 
 (a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
@@ -46,7 +46,7 @@ license to the document, as described in section 6 of the license.
 
 $B$3$NJ8=q$O!V(BGNU $B%U%j!O$K5-=R$5$l$F$$$k$h$&$K!"J8=q$K7@Ls=q$NJ#J}(B) $B$O%a%C%;!<%8%b!<(B
-$B%I%P%C%U%!$G9T$o$l$^$9!#(B
+gnus $B$N$9$Y$F$N%a%C%;!<%8$N:n@.(B ($B%a!<%k$H%K%e!<%9$NN>J}(B) $B$O!"%a%C%;!<%8(B
+$B%b!<%I$N%P%C%U%!!<$G9T$J$$$^$9!#(B
 
 @menu
-* Interface::         $B%a%C%;!<%8%P%C%U%!$r@_Dj$9$k(B
-* Commands::          $B%a%C%;!<%8%b!<%I%P%C%U%!$GAw!"C$7(B---$B$=$N%W%m%0%i%`(B ($B$b$7$/$O?M(B) $B$O%a%C%;!<%8$,$"$k%P%C(B
-$B%U%!$K%]%$%s%H$rF~$l$FI,MW$JL?Na$r8F$S=P$9$@$1$GNI$$$Y$-$G$9!#$=$&$9$k(B
-$B$H(B @code{Message} $B$O?7$7$$(B @code{message} $B%b!<%I%P%C%U%!$rE,@Z$J%X%C%@!<(B
-$B$rF~$l$F:n$j=P$7!"MxMQAw!"C$7$r$7$?$$$H$-(B---$B$=$N%W%m%0%i%`(B ($B$^$?$O?M(B) $B$O$A$g$&$I$=(B
+$B$N%a%C%;!<%8$,$"$k%P%C%U%!!<$K%]%$%s%H$rCV$$$F!"I,MW$JL?Na$r8F$S=P$9$O$:(B
+$B$G$9!#$9$k$H(B @code{Message} $B$O!"E,@Z$J%X%C%@!<$GK~$?$7$??7$7(B
+$B$$(B @code{message} $B%b!<%I$N%P%C%U%!!<$r=P8=$5$;$F$/$l$k$N$G!"MxMQC$9(B
-* Superseding::          $B%a%C%;!<%8$NBeBX(B
-* Forwarding::           $B%a%C%;!<%8$r%K%e!<%9$b$7$/$O%a!<%k$GE>Aw$9$k(B
+* Canceling News::       $B%K%e!<%95-;v$rC$9(B
+* Superseding::          $B%a%C%;!<%8$rCV$-49$($k(B
+* Forwarding::           $B%a%C%;!<%8$r%K%e!<%9$^$?$O%a!<%k$GE>Aw$9$k(B
 * Resending::            $B%a!<%k%a%C%;!<%8$r:FAw$9$k(B
-* Bouncing::             $B%a!<%k%a%C%;!<%8$N<:GT$r:FAw$9$k(B
+* Bouncing::             $BCF$+$l$?%a!<%k%a%C%;!<%8$r:FAw$9$k(B
 * Mailing Lists::        $B%a!<%j%s%0%j%9%H$K%a!<%k$rAw$k(B
 @end menu
 
@@ -118,37 +120,37 @@ Gnus $B$NA4$F$N%a%C%;!<%8$N:n@.(B ($B%a!<%k$H%K%e!<%9$NN>J}(B) $B$O%a%C%;!<
 @section $B?7$7$$%a!<%k%a%C%;!<%8(B
 
 @findex message-mail
-@code{message-mail} $BL?Na$O?7$7$$%P%C%U%!$r:n$jI=<($7$^$9!#(B
+@code{message-mail} $BL?Na$O!"?7$7$$%a%C%;!<%8%P%C%U%!!<$r=P8=$5$;$^$9!#(B
 
-2$B$D$NA*Br<+M3$J0z?t$,JN,2DG=$J0z?t$,JN,2DG=$J0z?t$rl9g!"(BTo $B%X%C(B
-$B%@!<$,$=$&$J$k$Y$-$@$HH=CG$5$l$l$P(B @code{((To . "Whom"))} $B$rJV$7$^$9!#$b(B
-$B$7$=$&$G$J$1$l$P!"$=$l$O(B @code{nil} $B$rJV$9$@$1$G!"$=$&$9$l$P(B To $B%X%C%@!<(B
-$B$r7hDj$9$kIaDL$NJ}K!$,;H$o$l$k$G$7$g$&!#(B
+$B$4Mw$N$h$&$K!"$3$N4X?t$O%j%9%H$rJV$5$J$1$l$P$J$j$^$;$s!#$3$N>l9g!"(BTo $B%X%C(B
+$B%@!<$,$=$&$J$k$Y$-$@$HH=CG$9$l$P(B @code{((To . "Whom"))} $B$rJV$7$^$9!#$=$&(B
+$B$G$J$1$l$PC1$K(B @code{nil} $B$rJV$9$@$1$G!"(BTo $B%X%C%@!<$r7hDj$9$kI8=`$NJ}K!(B
+$B$,;H$o$l$k$G$7$g$&!#(B
 
-$B%j%9%H$N$=$l$>$l$NMWAG$O(B cons $B%;%k$G!"(B@sc{car} $B$O%X%C%@!<$NL>(B
-$BA0(B ($BNc(B @code{Cc})$B!"(B@sc{cdr} $B$O%X%C%@!<$N(B
-$BCM(B ($BNc(B @samp{larsi@@ifi.uio.no}) $B$G$9!#$3$l$i$9$Y$F$N%X%C%@!<$O=P$F9T$/(B
+$B%j%9%H$N$=$l$>$l$NMWAG$O(B cons $B%;%k$G$9!#(B@sc{car} $B$O%X%C%@!<$NL>A0(B ($BNc$((B
+$B$P(B @code{Cc}) $B$G!"(B@sc{cdr} $B$O%X%C%@!<$NCM(B ($BNc$((B
+$B$P(B @samp{larsi@@ifi.uio.no}) $B$G$9!#$3$l$i$9$Y$F$N%X%C%@!<$O!"Aw=P$5$l$k(B
 $B%a!<%k$N%X%C%@!<$KA^F~$5$l$^$9!#(B
 
 @node Wide Reply
-@section $B9-$/JVEz(B
+@section $B9-$$JVEz(B
 
 @findex message-wide-reply
-@code{message-wide-reply} $B$O8=:_$N%P%C%U%!$N%a%C%;!<%8$X$N9-$$JVEz$N%a%C(B
-$B%;!<%8%P%C%U%!$r:n$C$FI=<($7$^$9!#(B@dfn{$B9-$$JVEz(B} $B$O(B @code{To}$B!"(B
-@code{From}$B!"(B($B$b$7$/$O(B @code{Reply-to}) $B$H(B @code{Cc} $B%X%C%@!<$K5s$2$i$l(B
-$B$F$$$kA4$F$N?M!9$KFO$/JVEz$G$9!#(B
+@code{message-wide-reply} $B$O!"8=:_$N%P%C%U%!!<$K$"$k%a%C%;!<%8$X$N9-$$JV(B
+$BEz$N%a%C%;!<%8%P%C%U%!!<$r=P8=$5$;$^$9!#!V9-$$JVEz!W$H$O(B @code{To}$B!"(B
+@code{From} ($B$^$?$O(B @code{Reply-to}) $B$*$h$S(B @code{Cc} $B%X%C%@!<$K5s$2$i$l(B
+$B$F$$$k$9$Y$F$N?M$?$A$KFO$/JVEz$G$9!#(B
 
 @vindex message-wide-reply-to-function
-Message $B$OJVEz$,2?=h$K9T$/$+$r7hDj$9$k$?$a$KIaDL$NJ}K!$r;H$$$^$9$,!"(B
-@code{message-wide-reply} $B$rO.$k;v$G!"?6$kIq$$$r$"$J$?$NMW5a$K9g$&$h$&$K(B
-$BJQ99$9$k;v$,$G$-$^$9!#$=$l$O(B @code{message-reply-to-function} $B$HF1$8$h$&(B
-$B$K;H$o$l$^$9(B (@pxref{Reply})$B!#(B
+Message $B$OJVEz$,$I$3$K9T$/$+$r7hDj$9$k$?$a$KI8=`$NJ}K!$r;H$$$^$9$,!"(B
+@code{message-wide-reply-to-function} $B$r$$$8$/$k$3$H$K$h$C$F!"?6$kIq$$$r(B
+$B$"$J$?$NI,MW$K9g$&$h$&$KJQ99$9$k$3$H$,$G$-$^$9!#$=$l(B
+$B$O(B @code{message-reply-to-function} $B$HF1$8$d$jJ}$G;H$o$l$^(B
+$B$9(B (@pxref{Reply})$B!#(B
 
 @vindex message-dont-reply-to-names
-$B@55,I=8=(B @code{rmail-dont-reply-to-names} $B$K9gCW$9$k%"%I%l%9$O(B @code{Cc}
-$B%X%C%@!<$+$iC$9(B
 
 @findex message-cancel-news
-$BL?Na(B @code{message-cancel-news} $B$O8=:_$N%P%C%U%!$N5-;v$rC$7$^$9!#(B
+@code{message-cancel-news} $BL?Na$O!"8=:_$N%P%C%U%!!<$K$"$k5-;v$rC$7(B
+$B$^$9!#(B
 
 @vindex message-cancel-message
 @code{message-cancel-message} $B$NCM$,C$75-;v$NK\J8$KA^F~$5$l$^$9!#%G%#(B
@@ -230,12 +240,12 @@ Message $B$O%U%)%m!<%"%C%W$,$I$3$K9T$/$+$rIaDL$NJ}K!$r;H$C$F7hDj$7$^$9$,!"(B
 @vindex message-insert-canlock
 @cindex canlock
 Message $B$,%K%e!<%95-;v$r%]%9%H$9$k$H$-!"%G%#%U%)%k%H(B
-$B$G(B @code{Cancel-Lock} $B%X%C%@!<$rA^F~$7$^$9!#$3$l$O0E9f2=$5$l$?%X%C%@!<$G!"(B
-$B$"$J$?<+?H$,=q$$$?%a!<%C%;!<%8$r$"$J$?$@$1$,C$9$3$H$,$G$-$k$3$H$rJ](B
-$B>Z$9$k!"$9$0$l$b$N$G$9!#7gE@$O!"(B@file{.emacs} $B%U%!%$%k(B (gnus $B$,HkL)(B
-$B$N(B cancel lock $B%Q%9%o!<%I(B ($B:G=i$N$3$N5!G=$r;H$&$H$-$K<+F0E*$K@8@.$5$l(B
-$B$k(B) $B$r3JG<$9$k>l=j(B) $B$r$J$/$7$F$7$^$&$H!"%a%C%;!<%8$rC$9$3$H$,$G$-$J(B
-$B$$$G$"$m$&$3$H$G$9!#<+J,$G%Q%9%o!<%I$r4IM}$7$?$$$J$i$P!"0J2<$N$h$&$J$b$N(B
+$B$G(B @code{Cancel-Lock} $B%X%C%@!<$rA^F~$7$^$9!#$3$l$O$"$J$?<+?H$,=q$$$?%a!<%C(B
+$B%;!<%8$r$"$J$?$@$1$,C$9$3$H$,$G$-$k$3$H$rJ]>Z$9$k0E9f2=$5$l$?%X%C%@!<(B
+$B$G!"$9$0$l$b$N$G$9!#7gE@$O!"(B@file{.emacs} $B%U%!%$%k(B (gnus $B$,HkL)$N(B cancel
+lock $B%Q%9%o!<%I(B ($B:G=i$N$3$N5!G=$r;H$&$H$-$K<+F0E*$K@8@.$5$l$^$9(B) $B$r3JG<(B
+$B$9$k>l=j(B) $B$r$J$/$7$F$7$^$&$H!"%a%C%;!<%8$NC$7$,$G$-$J$/$J$C$F$7$^$&(B
+$B$3$H$G$9!#<+J,$G%Q%9%o!<%I$r4IM}$7$?$$$J$i$P!"0J2<$N$h$&$J$b$N(B
 $B$r(B @file{~/.gnus.el} $B%U%!%$%k$KF~$l$F2<$5$$(B:
 
 @lisp
@@ -250,25 +260,28 @@ Message $B$,%K%e!<%95-;v$r%]%9%H$9$k$H$-!"%G%#%U%)%k%H(B
 $B$;$s$,!">-Mh$OJQ$o$k$3$H$,4|BT$5$l$^$9!#(B
 
 @node Superseding
-@section $BBeBX(B
+@section $B%K%e!<%95-;v$NCV$-49$((B
 
 @findex message-supersede
-$BL?Na(B @code{message-supersede} $B$O8=:_$N%P%C%U%!$N%a%C%;!<%8$rBeBX$9$k%a%C(B
-$B%;!<%8%P%C%U%!$r:n$jI=<($7$^$9!#(B
+@code{message-supersede} $BL?Na$O!"8=:_$N%P%C%U%!!<$K$"$k%a%C%;!<%8$rCV$-(B
+$B49$($k$?$a$N%a%C%;!<%8%P%C%U%!!<$r=P8=$5$;$^$9!#(B
 
-@vindex message-ignored-supersede-headers
+@vindex message-ignored-supersedes-headers
 @code{message-ignored-supersedes-headers} $B$K9gCW$9$k%X%C%@!<$O?7$7$$%a%C(B
-$B%;!<%8%P%C%U%!$r:n$j>e$2$kA0$KAw(B
 
 @findex message-forward
-$BL?Na(B @code{message-forward} $B$O8=:_$N%P%C%U%!$N%a%C%;!<%8$rE>Aw$9$k$?$a$N(B
-$B%a%C%;!<%8%P%C%U%!$r:n$jI=<($7$^$9!#$b$7@\F,0z?t$rM?$($i$l$k$H!"E>Aw$O(B
-$B%K%e!<%9$r;H$$$^$9!#(B
+@code{message-forward} $BL?Na$O!"8=:_$N%P%C%U%!!<$K$"$k%a%C%;!<%8$rE>Aw$9(B
+$B$k$?$a$N%a%C%;!<%8%P%C%U%!!<$r=P8=$5$;$^$9!#@\F,0z?t$,M?$($i$l$k$H!"%K%e!<(B
+$B%9$r;H$C$FE>Aw$7$^$9!#(B
 
 @table @code
 @item message-forward-ignored-headers
@@ -276,40 +289,36 @@ Message $B$,%K%e!<%95-;v$r%]%9%H$9$k$H$-!"%G%#%U%)%k%H(B
 $B$3$N@55,I=8=$K9gCW$9$k$9$Y$F$N%X%C%@!<$,!"E>Aw$5$l$k%a%C%;!<%8$+$i:o=|$5(B
 $B$l$^$9!#(B
 
-@ignore
 @item message-make-forward-subject-function
 @vindex message-make-forward-subject-function
-A list of functions that are called to generate a subject header for
-forwarded messages.  The subject generated by the previous function is
-passed into each successive function.
+$BE>Aw$5$l$k%a%C%;!<%8$N!"I=Bj%X%C%@!<$r:n$k$?$a$K8F$P$l$k4X?t$N%j%9%H$G$9!#(B
+$BA0$N4X?t$G:n$i$l$?I=Bj$O!"B3$/$=$l$>$l$N4X?t$KEO$5$l$^$9!#(B
 
-The provided functions are:
+$BDs6!$5$l$F$$$k4X?t$OAw$5$l$?$3$H$r<($9:/(B
+$B@W(B (@samp{Fwd:}, @samp{Re:}, @samp{(fwd)} $B$N$h$&$J$b$N(B) $B$r!"?7$7$$I=Bj$r(B
+$BAH$_N)$F$kA0$K$O$.Aw$5$l$k%a%C%;!<%8(B
+$B$O(B @acronym{MIME} RFC822 $B%Q!<%H$H$7$FKd$a9~$^$l$^$9!#(B@code{nil} $B$@$C$?>l(B
+$B9g$O!"0JA0$K(B @acronym{MIME} $B$KBP1~$7$F$$$J$+$C$?(B Gnus $B$,$7$?$h$&$K!"E>Aw(B
+$B$5$l$k%a%C%;!<%8$N%3%T!<$,!"$?$@C1$K?7$7$$%a%C%;!<%8$KKd$a9~$^$l$^$9!#(B
 
-@end ignore
 @item message-forward-before-signature
 @vindex message-forward-before-signature
 $BHs(B-@code{nil} $B$@$C$?$i=pL>$NA0$K!"$=$l0J30$@$C$?$i8e$K!"E>Aw$9$k%a%C%;!<(B
@@ -320,57 +329,57 @@ non @acronym{MIME}-savvy versions of Gnus would do.
 @section $B:FAw(B
 
 @findex message-resend
-$BL?Na(B @code{message-resend} $B$OMxMQpJs$rpJs$re$2$kA0$Kl9g$NNc$rFs$D(B:
+$B%a!<%j%s%0%j%9%H$KEj9F$9$k:]$K!"$=$NEj9F$KBP$9$k%U%)%m!<%"%C%W5-;v$r;XDj(B
+$B$7$?>l=j$KD>@\Aw$C$F$b$i$$$?$$$3$H$,$"$j$^$9!#(BMail-Followup-To (MFT) $B$O(B
+$B$^$5$K$3$l$r2DG=$K$9$k$?$a$K:n$i$l$^$7$?!#$3$l$,Lr$KN)$D>l9g$NNc$r;0$D(B:
 
 @itemize @bullet
 @item
-$B%a!<%j%s%0%j%9%H$KEj9F$9$k?M$O!"JV;v$rEj9Fl9g$,3:Ev$7$^$9!#(B
+$B%a!<%j%s%0%j%9%H$KEj9F$9$k?M$O!"Ej9F$7$??M$G$O$J$/!"%a!<%j%s%0%j%9%H$@$1(B
+$B$KJVEz$rAw$k$Y$-$G$"$k$3$H$r!"(BMFT $B$r;H$C$FI=8=$9$k$3$H$,$G$-$^$9!#$3$l$O!"(B
+$BEj9Fl9g$,3:Ev$7$^$9!#(B
 
 @item
-$B%a!<%j%s%0%j%9%H$KEj9F$9$k?M$O!"JV;v$r%a!<%j%s%0%j%9%H$HEj9Fl9g$,3:Ev$7$^$9!#(B
+$B%a!<%j%s%0%j%9%H$KEj9F$9$k?M$O!"%a!<%j%s%0%j%9%H$@$1$G$J$/Ej9F$7$??M$K$b(B
+$BJVEz$rAw$k$Y$-$G$"$k$3$H$r!"(BMFT $B$r;H$C$FI=8=$9$k$3$H$,$G$-$^$9!#$3$l$O!"(B
+$BEj9Fl9g$,3:Ev$7$^$9!#(B
 
 @item
-$B%a%C%;!<%8$,$$$/$D$+$N%a!<%j%s%0%j%9%H$KEj9F$5$l$F$$$k>l9g$K!"$=$l0J9_$N(B
-$B5DO@$r0l$D$N%a!<%j%s%0%j%9%H$@$1$G9T$J$&$3$H$r;XDj$9$k$?$a$K$b(B MFT $B$O;H(B
-$B$o$l$^$9!#5DO@$,$$$/$D$+$N%a!<%j%s%0%j%9%H$G9T$J$o$l$F$7$^$&$H$P$i$P$i$K(B
-$B$J$j$d$9$$$7!"%U%)%m!<$9$k$N$,Fq$7$/$J$C$F$7$^$$$^$9$+$i!#(B
+$B%a%C%;!<%8$,J#?t$N%a!<%j%s%0%j%9%H$KEj9F$5$l$F$$$k>l9g$K!"$=$l0J9_$N5DO@(B
+$B$r0l$D$N%a!<%j%s%0%j%9%H$@$1$G9T$J$&$3$H$r;XDj$9$k$?$a$K$b(B MFT $B$r;H$&$3(B
+$B$H$,$G$-$^$9!#5DO@$,$$$/$D$+$N%a!<%j%s%0%j%9%H$G9T$J$o$l$F$7$^$&$H$P$i$P(B
+$B$i$K$J$j$d$9$$$7!"%U%)%m!<$9$k$N$,Fq$7$/$J$C$F$7$^$$$^$9$+$i!#(B
 @end itemize
 
-gnus $B$OB>$N?M$N%a%C%;!<%8$K$"$k(B MFT $B%X%C%@!<$rB:=E$7(B ($B$9$J$o$A!"$@$l$+JL(B
-$B$N?M$NEj9F$K%U%)%m!<%"%C%W$9$k$H$-(B)$B!"$^$?!"30$K=P$F$$$/%a%C%;!<%8$N$?$a(B
-$B$K!"F;M}$K$+$J$C$?(B MFT $B%X%C%@!<$r:n@.$9$k$3$H$N%5%]!<%H$bDs6!$7$^$9!#(B
-
+gnus $B$OB>$N?M$N%a%C%;!<%8$K$"$k(B MFT $B%X%C%@!<$rB:=E$7$^$9(B ($B$9$J$o$A!"$@$l(B
+$B$+JL$N?M$NEj9F$K%U%)%m!<%"%C%W$9$k$H$-(B)$B!#$^$?!"30$K=P$F9T$/%a%C%;!<%8$N(B
+$B$?$a$N!"F;M}$K$+$J$C$?(B MFT $B%X%C%@!<$r:n@.$9$k$3$H$N%5%]!<%H$bDs6!$7$^$9!#(B
+@c
 @c @menu
 @c * Honoring an MFT post::        What to do when one already exists
 @c * Composing with a MFT header:: Creating one from scratch.
@@ -379,10 +388,10 @@ gnus $B$OB>$N?M$N%a%C%;!<%8$K$"$k(B MFT $B%X%C%@!<$rB:=E$7(B ($B$9$J$o$A!"$
 @c @node Composing with a MFT header
 @subsection  $B@5$7$$(B MFT $B%X%C%@!<$r<+F0E*$K:n$k(B
 
-$BEj9F$9$k5-;v$KBP$7$F(B gnus $B$,<+F0E*$K(B MFT $B%X%C%@!<$r:n$C$F$/$l$k$h$&$K$9(B
-$B$k$?$a$K9T$J$&$3$H$NBh0lJb$O!"$"$J$?$,9XFI$7$F$$$k%a!<%j%s%0%j%9%H$N%"%I(B
-$B%l%9$N%j%9%H$r(B gnus $B$KM?$($k$3$H$G$9!#0l$D0J>e$NJ}K!$G$3$l$r9T$J$&$3$H$,(B
-$B$G$-$^$9!#0J2<$NJQ?t$,e$NJ}K!$G$3$l$r9T$J$&$3$H$,$G$-$^$9!#0J2<$NJQ?t$,$N?M$N%a%C%;!<%8$K$"$k(B MFT $B%X%C%@!<$rB:=E$7(B ($B$9$J$o$A!"$
 @vindex message-subscribed-address-functions
 @item message-subscribed-address-functions
 $B$3$l$O(B MFT $B%X%C%@!<$NCM$r7h$a$k$?$a$K(B ($B0lEY$K0l2s(B!!) $B8F$P$l$k4X?t$N%j%9(B
-$B%H$G$"$k$3$H$,$G$-$^$9!#$=$l$i$N4X?t$K$O0z?t$,L5$$$3$H$rCi9p$7$F$*$-$^$9!#(B
-$B%G%#%U%)%k%HCM$O(B @code{nil} $B$G$9!#(B
+$B%H$G$9!#$=$l$i$N4X?t$K$O0z?t$,L5$$$3$H$rCi9p$7$F$*$-$^$7$g$&!#%G%#%U%)%k(B
+$B%HCM$O(B @code{nil} $B$G$9!#(B
 
-gnus $B$K$O$3$NJQ?t$N9%E,$J8uJd$G$"$k$H$3$m$N!"$"$i$+$8$aDj5A$5$l$F$$$k4X(B
-$B?t$,$"$j$^$9!#4X?t(B @code{gnus-find-subscribed-addresses} $B$O!"(B
-@code{subscribed} (@pxref{Group Parameters, ,Group Parameters, gnus, The
-Gnus Manual}) $B%0%k!<%W%Q%i%a!<%?$,Hs(B-@code{nil} $B$K@_Dj$5$l$F$$$k%0%k!<%W(B
-$B$KBP1~$9$k%"%I%l%9$N%j%9%H$rJV$7$^$9!#$3$s$J$U$&$K$7$^$7$g$&!#(B
+gnus $B$G$O$3$NJQ?t$N$?$a$KDj5A$5$l$?!"NI$$4X?t$N8uJd$,$"$j$^$9!#4X(B
+$B?t(B @code{gnus-find-subscribed-addresses} $B$O!"(B@code{subscribed} $B%0%k!<%W(B
+$B%Q%i%a!<%?!<(B (@pxref{Group Parameters, ,$B%0%k!<%W%Q%i%a!<%?!<(B, gnus-ja,
+The Gnus Manual}) $B$,Hs(B-@code{nil} $B$K@_Dj$5$l$F$$$k%0%k!<%W$KBP1~$9$k%"%I(B
+$B%l%9$N%j%9%H$rJV$7$^$9!#$3$s$J$U$&$K;H$C$F2<$5$$!#(B
 
 @lisp
 (setq message-subscribed-address-functions
@@ -425,27 +434,26 @@ Gnus Manual}) $B%0%k!<%W%Q%i%a!<%?$,Hs(B-@code{nil} $B$K@_Dj$5$l$F$$$k%0%k!<%
 
 @vindex message-subscribed-address-file
 @item message-subscribed-address-file
-$B$"$J$?$O$b$7$+$7$?$i?l68$J?M(B ($B86E5(B: one organised human freak) $B$G!"9XFI(B
+$B$"$J$?$O$b$7$+$7$?$i?l68$J?M(B ($B86E5(B: one organized human freak) $B$G!"9XFI(B
 $B$7$F$$$k$9$Y$F$N%a!<%j%s%0%j%9%H$N%"%I%l%9$N%j%9%H$rJL%U%!%$%k$G;}$C$F$$(B
 $B$k$+$b$7$l$^$;$s(B! $B$=$&$J$i$P!"C1$K$3$NJQ?t$r$=$N%U%!%$%kL>$K$9$k$3$H$K$h$C(B
-$B$F!"?M@8$ONI$-$b$N$K$J$k$G$7$g$&!#(B
+$B$F!"?M@8$OA1$-$b$N$K$J$k$G$7$g$&!#(B
 @end table
 
-$B>e5-0J30$K0l$D0J>e$NJQ?t$r;H$&$3$H$,$G$-$^$9!#$9$Y$F$=$l$i$NCM$O2?$i$+$N(B
-$BJ}K!$G!V2C$($i$l$k!W$3$H$GF0:n$7$^$9(B :-)
+$B>e5-$NJ#?t$NJQ?t$r;H$&$3$H$,$G$-$^$9!#$=$l$i$NCM$O$9$Y$F!V2C$($i$l!W$^(B
+$B$9!#2?$i$+$N;H$($kJ}K!$G!#(B:-)
 
 $B$5$"MQ0U$,$G$-$^$7$?!#$$$D$b$N$h$&$K%a%C%;!<%8$N:n@.$r;O$a$^$7$g$&!#$=$7(B
 $B$F$$$D$bDL$j$KAw?.$7$^$7$g$&!#%a%C%;!<%8$,Aw=P$5$l$kD>A0(B
 $B$K(B gnus $B$N(B MFT $B$r:n$k;E3]$1$,F0:n$7$F!"%a%C%;!<%8$,$9$G$K(B MFT $B%U%#!<%k%I(B
-$B$r;}$C$F$$$k$+$I$&$+$rD4$Y$^$9!#$b$7$=$l$,0l$D$J$i!"$=$l$OJ|$C$F$*$+$l$^(B
-$B$9(B ($B$?$@$7$=$N>l9g$K$=$l$,6u$C$]$@$C$?$i!"$=$N%U%#!<%k%I$O:o=|$5$l<+F0@8(B
-$B@.$5$l$?$b$N$GCV$-49$($i$l$k$3$H$b$"$j$^$;$s!#$3$l$O8D!9$N%a%C%;!<%8$K$D(B
-$B$$$F(B MFT $B$N@8@.$r6X;_$5$;$k4pK\$G$9(B)$B!#L5$+$C$?>l9g$Ol9g$K$O(B MFT $B$,$=$N(B
-$BB>$N%X%C%@!<$KIU$12C$($i$l!"$=$NCM$O(B To: $B$H(B Cc: $B$K$"$k$9$Y$F$N%"%I%l%9$K(B
-$B@_Dj$5$l$^$9!#(B
+$B$r;}$C$F$$$k$+$I$&$+$rD4$Y$^$9!#$b$7$=$l$,$"$k$J$i!"$=$l$OJ|$C$F$*$+$l$^(B
+$B$9(B ($B$=$N>l9g$K$=$l$,6u$C$]$@$C$?$i!"$=$N%U%#!<%k%I$,:o=|$5$l$F<+F0@8@.$5(B
+$B$l$?$b$N$GCV$-49$($i$l$k$3$H$O$"$j$^$;$s!#$3$l$O8D!9$N%a%C%;!<%8$K$D$$(B
+$B$F(B MFT $B$N@8@.$r6X;_$5$;$k4pK\$G$9(B)$B!#L5$+$C$?>l9g$Ol9g$K$O(B MFT $B$,%X%C%@!<(B
+$B$KIU$12C$($i$l!"$=$NCM$O(B To: $B$H(B Cc: $B$K$"$k$9$Y$F$N%"%I%l%9$K@_Dj$5$l$^$9!#(B
 
 @kindex C-c C-f C-a
 @findex message-generate-unsubscribed-mail-followup-to
@@ -453,16 +461,15 @@ Gnus Manual}) $B%0%k!<%W%Q%i%a!<%?$,Hs(B-@code{nil} $B$K@_Dj$5$l$F$$$k%0%k!<%
 @findex message-goto-mail-followup-to
 $B$&!<$`!#$=$&$9$k$H$"$J$?$O!V9XFI$7$F$$$J$$%a!<%j%s%0%j%9%H$K%a!<%k$rAw?.(B
 $B$9$k$H$-$O$I$&$J$k$N(B?  $B;d$OM>J,$N%3%T!<$,M_$7$$$3$H$r(B MFT $B$G8@$$$?$$!W$H(B
-$B?R$M$^$9$M(B ($B$?$V$sB>$N?M$O(B MFT $B$,L5$+$C$?>l9g$HF1MM$K=hM}$7$F$7$^$&$@$m(B
-$B$&$1$l$I!"C/$+$N(B to-address $B%0%k!<%W%Q%i%a!<%?$r>e=q$-$9$k$?$a$K!"L@<(E*(B
-$B$J(B MFT $B$r;H$&$3$H$,$G$-$k$N$G$9(B)$B!#4X(B
-$B?t(B @code{message-generate-unsubscribed-mail-followup-to} $B$,Lr$KN)$D$3$H(B
-$B$,$"$k$G$7$g$&!#$3$l$O%G%#%U%)%k%H$G(B @kbd{C-c C-f C-a} $B$K3d$jEv$F$i$l$F(B
-$B$$$^$9!#$I$s$J>l9g$G$b!"$"$J$?$O<+J,$,A*$s$@(B MFT $B$rA^F~$9$k$3$H$,$G$-$^(B
-$B$9(B; $B$=$l$r;O$a$k$N(B
-$B$K(B @kbd{C-c C-f C-m} (@code{message-goto-mail-followup-to}) $B$,=u$1$F$/$l(B
-$B$k$G$7$g$&!#(B
-
+$B?R$M$^$9$M(B ($B$3$l$O(B MFT $B$,L5$$>l9g$HF1MM$K=hM}$5$l$k$G$7$g$&!#$7$+$7!"(B
+to-address $B$G@_Dj$5$l$?B>$NC/$+$h$jM%@h$5$;$k$?$a$K!"L@<(E*$J(B MFT $B$r;H$&(B
+$B$3$H$,$G$-$^$9(B)$B!#4X(B
+$B?t(B @code{message-generate-unsubscribed-mail-followup-to} $B$,Lr$KN)$D$+$b(B
+$B$7$l$^$;$s!#$3$l$O%G%#%U%)%k%H$G(B @kbd{C-c C-f C-a} $B$K3d$jEv$F$i$l$F$$$^(B
+$B$9!#$I$s$J>l9g$G$b!"$"$J$?$O<+J,$,A*$s$@(B MFT $B$rA^F~$9$k$3$H$,$G$-$^(B
+$B$9(B; $B$=$l$r;O$a$k$N$K(B @kbd{C-c C-f C-m}
+(@code{message-goto-mail-followup-to}) $B$,=u$1$F$/$l$k$G$7$g$&!#(B
+@c
 @c @node Honoring an MFT post
 @subsection MFT $BEj9F$NB:=E(B
 
@@ -481,56 +488,57 @@ Gnus Manual}) $B%0%k!<%W%Q%i%a!<%?$,Hs(B-@code{nil} $B$K@_Dj$5$l$F$$$k%0%k!<%
 $B>o$K(B MFT $B$rB:=E$7$^$;$s(B ($B40`z$KL5;k(B)$B!#(B
 
 @item ask
-$B$I$&$9$k$+?R$M$^$9!#(B
+$B$I$&$9$k$+$r?R$M$^$9!#(B
 @end table
 
 MFT $B$rB:=E$9$k$3$H$ONI$$%M%A%1%C%H(B (netiquette) $B$G$"$k$H9M$($i$l$F$$$^$9!#(B
-$B$=$l$O!"$I$3$K%U%)%m!<%"%C%W$9$kI,MW$,$"$k$+$r!"%a%C%;!<%8$rEj9F$7$??M$O(B
-$B$"$J$?$h$j$h$/CN$C$F$$$k!"$H;W$o$l$k$+$i$G$9!#(B
+$B$I$3$K%U%)%m!<%"%C%W$9$kI,MW$,$"$k$+$r!"%a%C%;!<%8$rEj9F$7$??M$O$"$J$?$h(B
+$B$j$h$/CN$C$F$$$k$O$:$G$9$+$i!#(B
 
 @node Commands
 @chapter $BL?Na(B
 
 @menu
-* Buffer Entry::        $B%a%C%;!<%8%P%C%U%!$KF~$C$?8e$NL?Na(B
+* Buffer Entry::        $B%a%C%;!<%8%P%C%U%!!<$KF~$C$?8e$NL?Na(B
 * Header Commands::     $B%X%C%@!<$K0\F0$^$?$O%X%C%@!<$rJQ99$9$k$?$a$NL?Na(B
-* Movement::            $B%a%C%;!<%8%P%C%U%!$rF0$-2s$k(B
-* Insertion::           $B%a%C%;!<%8%P%C%U%!$KJ*;v$rA^F~$9$k(B
+* Movement::            $B%a%C%;!<%8%P%C%U%!!<$NCf$rF0$-2s$k(B
+* Insertion::           $B%a%C%;!<%8%P%C%U%!!<$K$$$m$s$J$b$N$rA^F~$9$k(B
 @c * MIME::                @acronym{MIME} considerations.
 * IDNA::                $BHs(B-@acronym{ASCII} $B%I%a%$%sL>$K4X$9$k9M;!(B
 @c * Security::            Signing and encrypting messages.
-* Various Commands::    $B$$$m$$$m$J;v(B
+* Various Commands::    $B$$$m$$$m$J$3$H(B
 * Sending::             $B$r;H$&$+(B
+* Mail Aliases::        $B%a!<%k$NJLL>$N;H$$J}(B
 * Spelling::            Emacs $B$K%9%Z%k%A%'%C%/$5$;$k(B
 @end menu
 
 @node Buffer Entry
-@section $B%P%C%U%!$KF~$k(B
+@section $B%P%C%U%!!<$KF~$k(B
 @cindex undo
 @kindex C-_
 
-$B2?$+B>$N%a%C%;!<%8$KJVEz$9$k$H$-!"$?$$$F$$$O%a%C%;!<%8%P%C%U%!$G=q$->e$2(B
-$B$^$9$h$M!#(BMessage $B$OB?$/$N0zMQJ8$r07$$!"=pL>$N:o=|$dJ8>O$N@07A$r$7$?$j!"(B
-$B$"$k$$$O$"$J$?$,;H$C$F$$$k@_Dj$K0MB8$7$F$$$^$9!#(BMessage $B$OIaDL$O$&$^$/F0(B
-$B:n$7$^$9$,!"$H$-$I$-4V0c$($b$7$^$9!#$=$l$i$N4V0c$$$r%f!<%6$,@5$9$3$H$,$G(B
-$B$-$k$h$&$K!"(BMessage $B$O$=$l$>$lo(B @kbd{C-_}) $B$r2!$;$P!"L$JT=8$N%a%C%;!<(B
-$B%8$KLa$9$3$H$,$G$-$^$9!#(B
+$B2?$+B>$N%a%C%;!<%8$K1~Ez$9$k$H$-$O!"$?$$$F$$%a%C%;!<%8%P%C%U%!!<$G=q$->e(B
+$B$2$^$9$h$M!#(BMessage $B$OB?$/$N0zMQJ8$r07$C$?$j!"=pL>$r:o=|$7$?$j!"J8>O$N@0(B
+$B7A$r$7$?$j!"$"$k$$$O$"$J$?$,;H$C$F$$$k@_Dj$K0MB8$9$k$$$m$s$J$3$H$r$7$^$9!#(B
+Message $B$OIaDL$O$&$^$/F0:n$7$^$9$,!"$H$-$I$-4V0c$($b$7$^$9!#$=$l$i$N4V0c(B
+$B$$$rMxMQ$7(B) $B$N6-3&$r@_Dj$7$^$9!#$=$l$K$h$C$F!"$[$s$N(B
+$B2?2s$+%"%s%I%%!&%-!<(B ($BDL>o(B @kbd{C-_}) $B$r2!$;$P!"L$JT=8$N%a%C%;!<%8$KLa$9(B
+$B$3$H$,$G$-$^$9!#(B
 
 @node Header Commands
 @section $B%X%C%@!]$K$J$C$F$$$k%X%C%@!<$K0\F0$7$^$9!#B8:_$7$J$1$l$PA^F~$5$l(B
+$B$^$9!#(B
 
 @table @kbd
-
 @item C-c ?
 @kindex C-c ?
 @findex describe-mode
-$B%a%C%;!<%8%b!<%I$N5-=R$G$9!#(B
+$B%a%C%;!<%8%b!<%I$N@bL@$rI=<($7$^$9!#(B
 
 @item C-c C-r C-t
 @kindex C-c C-f C-t
@@ -541,7 +549,7 @@ MFT $B$rB:=E$9$k$3$H$ONI$$%M%A%1%C%H(B (netiquette) $B$G$"$k$H9M$($i$l$F$$$^$
 @kindex C-c C-f C-o
 @findex message-goto-from
 @code{From} $B%X%C%@!<$K9T$-$^$9(B (@code{message-goto-from})$B!#(B($B%-!<%P%$%s%I(B
-$BCf$N(B ``o'' $B$OAO:nl9g$O!"(BRFC 1376 $B$K=`$8$?;0$D$N(B
+@samp{high} $B$H$$$&CM$r;}$D(B @samp{Importance:} $B%X%C%@!<$rA^F~$7$^$9!#$3$N(B
+$B%X%C%@!<$Ol9g$O!"(BRFC 1376 $B$K=`$8$?;0$D$N(B
 $BCM(B @samp{low}$B!"(B@samp{normal} $B$*$h$S(B @samp{high} $B$r=[4D$5$;$^$9!#(B
 
 @item C-c C-f C-a
@@ -606,13 +614,13 @@ MFT $B$rB:=E$9$k$3$H$ONI$$%M%A%1%C%H(B (netiquette) $B$G$"$k$H9M$($i$l$F$$$^$
 @findex message-generate-unsubscribed-mail-followup-to
 $B9VFI$7$F$$$J$$%a!<%j%s%0%j%9%H$KEj9F$9$k>l9g$K8+9g$C(B
 $B$?(B @samp{Mail-Followup-To:} $B%X%C%@!<$rA^F~$7$^$9!#9VFI$7$F$$$J$$%a!<%j%s(B
-$B%0%j%9%H$KK\5-;v$rEj9F$9$k$H$-$O!"(B@samp{Mail-Followup-To:} $B$rl9g$O!"(B
+$B>JN,2DG=$J0z?t(B @code{include-cc} $B$,(B @code{nil} $B$G$O$J$$>l9g$O!"(B
 @samp{Cc:} $B%X%C%@!<$K$"$k%"%I%l%9$b(B @samp{Mail-Followup-To:} $B%X%C%@!<$K(B
 $BCV$+$l$^$9!#(B
 @end table
@@ -620,7 +628,6 @@ MFT $B$rB:=E$9$k$3$H$ONI$$%M%A%1%C%H(B (netiquette) $B$G$"$k$H9M$($i$l$F$$$^$
 @subsection $B%X%C%@!<$rJQ99$9$k$?$a$NL?Na(B
 
 @table @kbd
-
 @item C-c C-o
 @kindex C-c C-o
 @findex message-sort-headers
@@ -638,8 +645,8 @@ MFT $B$rB:=E$9$k$3$H$ONI$$%M%A%1%C%H(B (netiquette) $B$G$"$k$H9M$($i$l$F$$$^$
 @item C-c C-n
 @kindex C-c C-n
 @findex message-insert-newsgroups
-$BJVEz$7$F$$$k5-;v$N(B @code{Followup-To} $B$b$7$/$O!"(B@code{Nesgroups} $B%X%C%@!<(B
-$B$rH?1G$7$?(B @code{Newsgroups} $B%X%C%@!<$rA^F~$7$^(B
+$BJVEz$7$h$&$H$9$k5-;v$N(B @code{Followup-To} $B$b$7$/$O!"(B@code{Nesgroups} $B%X%C(B
+$B%@!<$rH?1G$7$?(B @code{Newsgroups} $B%X%C%@!<$rA^F~$7$^(B
 $B$9(B (@code{message-insert-newsgroups})$B!#(B
 
 @item C-c C-l
@@ -653,57 +660,61 @@ MFT $B$rB:=E$9$k$3$H$ONI$$%M%A%1%C%H(B (netiquette) $B$G$"$k$H9M$($i$l$F$$$^$
 @kindex C-c M-n
 @findex message-insert-disposition-notification-to
 $B3+Iu3NG'MW5a$rA^F~$7$^$9!#(B
-(@code{message-insert-disposition-notification-to})$B!#$3$l$O!"$b$7C5n$7$F$+$i!#(B
+@samp{high} $B$H$$$&CM$r;}$D(B @samp{Importance} $B%X%C%@!<$r(B ($BI,MW$J$i$9$G$K(B
+$BB8:_$9$k$b$N$r>C5n$7$F$+$i(B) $BA^F~$7$^$9!#(B
 
 @item M-x message-insert-importance-low
 @kindex M-x message-insert-importance-low
 @findex message-insert-importance-low
 @cindex Importance
-$BCM(B @samp{low} $B$r;}$D(B @samp{Importance} $B%X%C%@!<$rA^F~$7$^$9!#I,MW$J(B
-$B$i(B ($B$9$G$K$"$k(B) $B%X%C%@!<$r>C5n$7$F$+$i!#(B
+@samp{low} $B$H$$$&CM$r;}$D(B @samp{Importance} $B%X%C%@!<$r(B ($BI,MW$J$i$9$G$KB8(B
+$B:_$9$k$b$N$r>C5n$7$F$+$i(B) $BA^F~$7$^$9!#(B
 
 @item C-c C-f s
 @kindex C-c C-f s
 @findex message-change-subject
 @cindex Subject
 $B8=:_$N(B @samp{Subject} $B%X%C%@!<$rJQ99$7$^$9!#?7$7$$(B @samp{Subject} $B$r?R$M(B
-$B$F(B @samp{(was: <$B8E$$BjL>(B>)} $B$rDI2C$7$^$9!#8E$$BjL>$OJV?.$9$k$H$-$K:o=|$9(B
-$B$k$3$H$,$G$-$^$9!#(B@code{message-subject-trailing-was-query}
-(@pxref{Message Headers}) $B$r8+$F2<$5$$!#(B
+$B$F(B @samp{(was: <$B8E$$I=Bj(B>)} $B$rDI2C$7$^$9!#$=$&$$$&5-;v$r]%0%k!<%W$H$H$b$K(B @samp{FollowUp-To} $B%X%C%@!<$r(B
+$B@_Dj$7!"$=$NBP>]%0%k!<%W$,(B @samp{Newsgroups} $B%X%C%@!<$KB8:_$7$J$+$C$?$i(B
+$B$=$3$KDI2C$7!"$+$DK\J8$KCm0U=q$-$rF~$l$^$9!#(B
+@code{message-cross-post-default} $B$,(B @code{nil} $B$K$J$C$F$$$k$+!"$^$?$O$3(B
+$B$NL?Na$,@\F,0zIU$-$G8F$P$l$k$H!"(B@samp{Follow-Up} $B%X%C%@!<$,@_Dj$5$l$k$@(B
+$B$1$G!"(B@samp{Newsgroups} $B%X%C%@!<$X$NDI2C$O9T$J$o$l$^$;$s!#Cm0U=q$-$rF~$l(B
+$B$k4X?t$O(B @code{message-cross-post-note-function} $BJQ?t$G@)8f$5$l$^$9!#(B
 
 @item C-c C-f t
 @kindex C-c C-f t
 @findex message-reduce-to-to-cc
 @samp{To} $B%X%C%@!<$NFbMF$r(B @samp{Cc} $B$+(B @samp{Bcc} $B%X%C%@!<$NFbMF$GCV$-(B
-$B49$($^$9!#(B
+$B49$($^$9!#(B(@samp{Cc} $B%X%C%@!<$,L5$$>l9g$K8B$C$F!"Be$o$j$K(B @samp{Bcc} $B%X%C(B
+$B%@!<$,;H$o$l$^$9!#(B)
 
 @item C-c C-f w
 @kindex C-c C-f w
 @findex message-insert-wide-reply
-$B9-$$JVEz$r$7$?$h$&$K(B @samp{To} $B$H(B @samp{Cc} $B%X%C%@!<$rA^F~$7$^$9!#(B
+$B=i$a$O$=$N%a%C%;!<%8$,9-$$JVEz$N$?$a$K:n$i$l$?$b$N$G$J$+$C$?>l9g$G$b!"9-(B
+$B$$JVEz$r$7$F$$$k$h$&$K(B @samp{To} $B$H(B @samp{Cc} $B%X%C%@!<$rA^F~$7$^$9!#(B
 
 @item C-c C-f a
 @kindex C-c C-f a
@@ -713,9 +724,9 @@ MFT $B$rB:=E$9$k$3$H$ONI$$%M%A%1%C%H(B (netiquette) $B$G$"$k$H9M$($i$l$F$$$^$
 @cindex X-No-Archive
 @samp{X-No-Archive: Yes} $B$r%X%C%@!<$KA^F~$7$F!"K\J8$KCm0U=q$-$rF~$l$^$9!#(B
 $B%X%C%@!<$HCm0U=q$-(B
-$B$O(B @code{message-archive-header} $B$H(B @code{message-archive-note} $B$G%+%9%?(B
-$B%^%$%:$9$k$3$H$,$G$-$^$9!#@\F,0z?tIU$-$G8F$P$l$k$H!"A^F~$9$k%F%-%9%H$rMW(B
-$B5a$7$^$9!#K\J8$KCm0U=q$-$rF~$l$?$/$J$$>l9g$O!"(B
+$B$O(B @code{message-archive-header} $B$H(B @code{message-archive-note} $B$r;H$C$F(B
+$B%+%9%?%^%$%:$9$k$3$H$,$G$-$^$9!#@\F,0z?tIU$-$G8F$P$l$k$H!"A^F~$9$k%F%-%9(B
+$B%H$rMW5a$7$^$9!#K\J8$KCm0U=q$-$rF~$l$?$/$J$$>l9g$O!"(B
 @code{message-archive-note} $B$r(B @code{nil} $B$K$7$F2<$5$$!#(B
 @end table
 
@@ -726,7 +737,7 @@ MFT $B$rB:=E$9$k$3$H$ONI$$%M%A%1%C%H(B (netiquette) $B$G$"$k$H9M$($i$l$F$$$^$
 @item C-c C-b
 @kindex C-c C-b
 @findex message-goto-body
-$B%a%C%;!<%8$NK\BN$N@hF,$K0\F0$7$^$9(B (@code{message-goto-body})$B!#(B
+$B%a%C%;!<%8$NK\J8$N@hF,$K0\F0$7$^$9(B (@code{message-goto-body})$B!#(B
 
 @item C-c C-i
 @kindex C-c C-i
@@ -737,44 +748,42 @@ MFT $B$rB:=E$9$k$3$H$ONI$$%M%A%1%C%H(B (netiquette) $B$G$"$k$H9M$($i$l$F$$$^$
 @kindex C-a
 @findex message-beginning-of-line
 @vindex message-beginning-of-line
-$B%X%C%@!<$NCM$N$H$3$m$K$$$k$H$-$O9T$N@hF,$K0\F0$7!"$=$&$G$J$$$H$-$O%X%C%@!<(B
-$B$NCM$N@hF,$K0\F0$7$^$9!#(B($B%X%C%@!<$NCM$O%X%C%@!$H%3%m%s$N8e$KMh$^(B
-$B$9!#(B) $B$3$NF0:n$OJQ?t(B @code{message-beginning-of-line} $B$r%H%0%k$9$k$3$H$K(B
-$B$h$C$FL58z$K$9$k$3$H$,$G$-$^$9!#(B
+$B%X%C%@!<$NCM$N@hF,$K$$$k$H$-$O9T$N@hF,$K0\F0$7!"$=$&$G$J$$$H$-$O%X%C%@!<(B
+$B$NCM$N@hF,$K0\F0$7$^$9!#(B($B%X%C%@!<$NCM$H$$$&$N$O!"%X%C%@!$*$h$S%3%m%s(B
+$B$N8e$K$"$k$b$N$G$9!#(B) $B$3$NF0:n$OJQ?t(B @code{message-beginning-of-line} $B$r(B
+$B%H%0%k@Z$jBX$($9$k$3$H$K$h$C$FL58z$K$9$k$3$H$,$G$-$^$9!#(B
 @end table
 
 @node Insertion
 @section $BA^F~(B
 
 @table @kbd
-
 @item C-c C-y
 @kindex C-c C-y
 @findex message-yank-original
-$B%P%C%U%!(B @code{gnus-article-copy} $B$K$"$k%a%C%;!<%8$r%a%C%;!<%8%P%C%U%!$K(B
-$BE=$jIU$1$^$9!#IaDL$O(B @code{gnus-article-copy} $B$OJVEz$7$h$&$H$7$F$$$k%a%C(B
-$B%;!<%8$G$9(B (@code{messsage-yank-original})$B!#(B
+$BJVEz$7$h$&$H$7$F$$$k%a%C%;!<%8$r%a%C%;!<%8%P%C%U%!!<$K(B yank $B$7$^(B
+$B$9(B (@code{messsage-yank-original})$B!#(B
 
 @item C-c C-M-y
 @kindex C-c C-M-y
 @findex message-yank-buffer
-$B%P%C%U%!L>$r?R$M$F!"$=$N%P%C%U%!$NFbMF$r%a%C%;!<%8%P%C%U%!$KE=$jIU$1$^(B
-$B$9(B (@code{message-yank-buffer})$B!#(B
+$B%P%C%U%!!$r?R$M$F!"$=$N%P%C%U%!!<$NFbMF$r%a%C%;!<%8%P%C%U%!!<(B
+$B$K(B yank $B$7$^$9(B (@code{message-yank-buffer})$B!#(B
 
 @item C-c C-q
 @kindex C-c C-q
 @findex message-fill-yanked-message
-$BE=$jIU$1$i$l$?%a%C%;!<%8$r@^$jJV$7$^(B
-$B$9(B (@code{message-fill-yanked-message})$B!#7Y9p(B: $B$b$7!"0zMQ$N=,47$,JQ$G$"(B
-$B$k$J$i!"E=$jIU$1$i$l$?J8>O$r$R$I$/$0$A$c$0$A$c$K$7$F$7$^$&$+$b$7$l$^$;$s!#(B
-$B$=$l$,0BA4$G$"$k$HCN$k$H!"$9$0$K?M?4CO$D$/$G$7$g$&$,!#$H$K$+$/!"(B
-@kbd{C-x u} (@code{undo}) $B$,;HMQ2DG=$G!"Bg>fIW$G$"$k$H8@$&;v$r3P$($F$*$$(B
-$B$F2<$5$$!#(B
+Yank $B$5$l$?%a%C%;!<%8$r@^$jJV$7$F<*$rB7$($^(B
+$B$9(B (@code{message-fill-yanked-message})$B!#7Y9p(B: $B$b$7JQ$J$d$jJ}$G0zMQ$5$l(B
+$B$F$$$k$H!"(Byank $B$5$l$?J8>O$r$R$I$/$0$A$c$0$A$c$K$7$F$7$^$&$+$b$7$l$^$;$s!#(B
+$B$b$C$H$b!"$I$s$J$b$N$,0BA4$+$O!"$9$0$K$o$+$k$G$7$g$&$1$l$I!#$H$K$+$/!"2?(B
+$B$,5/$-$F$b(B @kbd{C-x u} (@code{undo}) $B$,;H$($k$N$@$+$iLdBjL5$$$3$H$@$1$O!"(B
+$B3P$($F$*$$$F2<$5$$!#(B
 
 @item C-c C-w
 @kindex C-c C-w
 @findex message-insert-signature
-$B%P%C%U%!$N:G8e$K=pL>$rA^F~$7$^$9(B (@code{message-insert-signature})$B!#(B
+$B%P%C%U%!!<$N:G8e$K=pL>$rA^F~$7$^$9(B (@code{message-insert-signature})$B!#(B
 
 @item C-c M-h
 @kindex C-c M-h
@@ -784,16 +793,18 @@ MFT $B$rB:=E$9$k$3$H$ONI$$%M%A%1%C%H(B (netiquette) $B$G$"$k$H9M$($i$l$F$$$^$
 @item C-c M-m
 @kindex C-c M-m
 @findex message-mark-inserted-region
-$B8=:_$N5-;v$N$$$/$D$+$NNN0h$r!"$=$l$i$r0O$`$?$a$N%?%0$G0u$rIU$1$^$9!#(B
+$B8=:_$N5-;v$N$"$kNN0h$r!"$=$l$i$r0O$`$?$a$N%?%0$G0u$rIU$1$^$9!#(B
 @code{message-mark-insert-begin} $B$H(B @code{message-mark-insert-end} $B$r8+(B
-$B$F2<$5$$!#(B
+$B$F2<$5$$!#@\F,0z?t$rIU$1$F;H$&$H!"(Bslrn $B$U$&$N(B verbatim ($BJ8>O$r0l8@0l6g$=(B
+$B$N$^$^I=$9(B) $B5-9f$NBP(B (@samp{#v+} $B$H(B @samp{#v-}) $B$r;H$$$^$9!#(B
 
 @item C-c M-f
 @kindex C-c M-f
 @findex message-mark-insert-file
-$B8=:_$N5-;v$K!"%?%0$G0O$^$l$?%U%!%$%k$rA^F~$7$^$9!#(B
+$B8=:_$N5-;v$K%U%!%$%k$rA^F~$7$F!"$=$NNN0h$r0O$`$?$a$N%?%0$G0u$rIU$1$^$9!#(B
 @code{message-mark-insert-begin} $B$H(B @code{message-mark-insert-end} $B$r8+(B
-$B$F2<$5$$!#(B
+$B$F2<$5$$!#@\F,0z?t$rIU$1$F;H$&$H!"(Bslrn $B$U$&$N(B verbatim ($BJ8>O$r0l8@0l6g$=(B
+$B$N$^$^I=$9(B) $B5-9f$NBP(B (@samp{#v+} $B$H(B @samp{#v-}) $B$r;H$$$^$9!#(B
 @end table
 
 @c FIXTGNUS We should provide MIME manual.
@@ -811,10 +822,21 @@ automatically add the @code{Content-Type} and
 @code{Content-Transfer-Encoding} headers.
 
 The most typical thing users want to use the multipart things in
-@acronym{MIME} for is to add ``attachments'' to mail they send out.  This can
-be done with the @kbd{C-c C-a} command, which will prompt for a file
-name and a @acronym{MIME} type.  If your Emacs supports drag
-and drop, you can also drop the file in the Message buffer.
+@acronym{MIME} for is to add ``attachments'' to mail they send out.
+This can be done with the @kbd{C-c C-a} command, which will prompt for
+a file name and a @acronym{MIME} type.
+
+@vindex mml-dnd-protocol-alist
+@vindex mml-dnd-attach-options
+If your Emacs supports drag and drop, you can also drop the file in the
+Message buffer.  The variable @code{mml-dnd-protocol-alist} specifies
+what kind of action is done when you drop a file into the Message
+buffer.  The variable @code{mml-dnd-attach-options} controls which
+@acronym{MIME} options you want to specify when dropping a file.  If it
+is a list, valid members are @code{type}, @code{description} and
+@code{disposition}.  @code{disposition} implies @code{type}.  If it is
+@code{nil}, don't ask for options.  If it is @code{t}, ask the user
+whether or not to specify options.
 
 You can also create arbitrarily complex multiparts using the @acronym{MML}
 language (@pxref{Composing, , Composing, emacs-mime, The Emacs MIME
@@ -827,24 +849,25 @@ Manual}).
 @cindex internationalized domain names
 @cindex non-ascii domain names
 
-Message $B$O(B @acronym{IDNA} $B$K=`5r$7$?Aw?.%(!<%8%'%s%H$G$9!#%f!<%6(B
+Message $B$O(B @acronym{IDNA} $B$K=`5r$7$?Aw?.%(!<%8%'%s%H$G$9!#MxMQ$r<+F0E*$K%(%s%3!<%I$7$^$9!#(B
 
-$B$b$C$H(B @acronym{IDNA} $B$,M-L>$K$J$k$^$G$O!"(B
-$B$r(B @acronym{IDNA} $B%(%s%3!<%I$9$Y$->l9g$G$b(B Message $B$O3NG'$r5a$a$^$9!#8=(B
-$B:_$G$O%I%a%$%sL>$KHs(B-@acronym{ASCII} $BJ8;z$r4^$`$3$H$,$G$-$k$3$H$K%f!<%6(B
-$B$N4v?M$+$O5$$E$$$F$$$J$$$+$b$7$l$J$$$N$G!"H`$i$,6vA3$K(B
+$B$b$C$H(B @acronym{IDNA} $B$,M-L>$K$J$k$^$G$O!"(BMessage $B$O(B
+$B$r(B @acronym{IDNA} $B%(%s%3!<%I$9$Y$-$+$I$&$+$N3NG'$r5a$a$k$3$H$K$J$C$F$$$^(B
+$B$9!#:#$N$H$3$m$O!"MxMQ$KHs(B-@acronym{ASCII} $BJ8;z$r(B
+$B4^$`$3$H$,$G$-$k$3$H$K5$$E$$$F$$$J$$$+$b$7$l$J$$$N$G!"H`$i$,6vA3$K(B
 $BHs(B-@acronym{ASCII} $B%I%a%$%sL>$r%?%$%W$7$F$7$^$C$?$H$-$N$?$a$K0BA4%M%C%H(B
 $B$rD%$C$F$$$k$o$1$G$9!#(B
 
 @vindex message-use-idna
 $BJQ?t(B @code{message-use-idna} $B$O(B @acronym{IDNA} $B$r;H$&$+$I$&$+$r@)8f$7$^(B
 $B$9!#$3$NJQ?t$,(B @code{nil} $B$@$C$?$i(B @acronym{IDNA} $B%(%s%3!<%I$O9T$J$o$l$^(B
-$B$;$s!#%7%s%\%k(B @code{ask} $B$K@_Dj$5$l$F$$$k(B ($B%G%#%U%)%k%H(B) $B$H%f!<%6$O3NG'(B
-$B$r5a$a$i$l$^$9!#$=$7$F(B @code{t} $B$K@_Dj$5$l$F$$$k$H!"<+F0E*(B
-$B$K(B @acronym{IDNA} $B%(%s%3!<%I$,9T$J$o$l$^$9!#(B
+$B$;$s!#%7%s%\%k(B @code{ask} $B$K@_Dj$5$l$F$$$k$HMxMQ(B rot13) $B$7$^(B
-$B$9(B (@code{message-caesar-buffer-body})$B!#$b$7HO0O8BDj$,$5(B
-$B$;$k$+$r;XDj$7$^$9!#=i4|CM$O(B 13 $B$G$9!#(B
+$B8=:_$N%a%C%;!<%8$r%+%(%5%kJQ49(B ($BJLL>(B rot13) $B$7$^(B
+$B$9(B (@code{message-caesar-buffer-body})$B!#$"$kHO0O$K%P%C%U%!!<$,69$a$i$l$F(B
+$B$$$?>l9g$O!"%P%C%U%!!<$N8+$($kItJ,$@$1$rJQ49$7$^$9!#?tCM@\F,0z?t$OJ8Cf$N(B
+$B%"%k%U%!%Y%C%H$r2?J8;zJ,2sE>$5$;$k$+$r;XDj$7$^$9!#%G%#%U%)%k%H$O(B 13 $B$G$9!#(B
 
 @item C-c C-e
 @kindex C-c C-e
 @findex message-elide-region
 @vindex message-elide-ellipsis
-$B%]%$%s%H$H%^!<%/$N4V$NJ8$r>J$-$^$9(B (@code{message-elide-region})$B!#J8>O$O(B
-$B@Z$i$l$F(B (killed) $BJQ?t(B @code{message-elide-ellipsis} $B$NCM$GCV$-49$($i$l(B
-$B$^$9!#%G%#%U%)%k%H$N>JN,Id9f$H$7$F;H$o$l$kCM$O(B (@samp{[...]}) $B$G$9!#(B
+$B%]%$%s%H$H%^!<%/$N4V$NJ8$r>JN,$7$^$9(B (@code{message-elide-region})$B!#J8>O(B
+$B$O(B kill $B$5$l$F!"JQ?t(B @code{message-elide-ellipsis} $B$NCM$GCV$-49$($i$l$^(B
+$B$9!#%G%#%U%)%k%H$N>JN,Id9f$H$7$F;H$o$l$kCM$O(B (@samp{[...]}) $B$G$9!#(B
 
 @item C-c M-k
 @kindex C-c M-k
 @findex message-kill-address
-$B8=:_0LCV$N%"%I%l%9$r:o=|$7$^$9!#(B
+$B8=:_0LCV$N%"%I%l%9$r:o=|$7$^$9(B ($BLuCm(B: $B$3$NL?Na$O:nC$7$?$$%"%I%l%9$N@hF,$K%]%$(B
+$B%s%H$rCV$$$F;H$C$F2<$5$$!#(B)
 
 @item C-c C-z
-@kindex C-c C-x
+@kindex C-c C-z
 @findex message-kill-to-signature
-$B=pL>$^$G$+!"$=$l$,L5$1$l$P5-;v$N:G8e$^$G$NA4$F$NJ8$r@Z$j$^(B
+$B8=:_0LCV$+$i=pL>$^$G!"$^$?$O$=$l$,L5$1$l$P5-;v$N:G8e$^$G$NJ8$r(B kill $B$7$^(B
 $B$9(B (@code{message-kill-to-signature})$B!#(B
 
 @item C-c C-v
 @kindex C-c C-v
 @findex message-delete-not-region
-$B%a%C%;!<%8$NK\BN$N%j!<%8%g%s$N30$NA4$F$NJ8$r>C5n$7$^(B
+$B%a%C%;!<%8$NK\J8$K$*$$$F!"NN0h$,@_Dj$5$l$?>l=j0J30$N$9$Y$F$NJ8$r>C5n$7$^(B
 $B$9(B (@code{message-delete-not-region})$B!#(B
 
 @item M-RET
 @kindex M-RET
 @findex message-newline-and-reformat
-4$B$D$N?7$7$$9T$rA^F~$7!"$b$7%]%$%s%H$,0zMQJ8$N4V$K$"$k$J$i$P!":F@07A$7$^(B
-$B$9!#(B
+$B;MK\$N6u9T$rA^F~$7$^$9!#$=$7$F!"$b$7%]%$%s%H$,0zMQJ8$NCf4V$K$"$C$?$N$J$i(B
+$B$P!"0zMQJ8$r@07A$7D>$7$^$9!#(B
 
-$B$3$l$ONc$G$9(B:
+$BNc$G$9(B:
 
 @example
 > $B$3$l$O2?$+$N0zMQJ8$G$9!#(B $B$=$7$F!"$3$3$K$O$b$C$H0zMQJ8$,$"$j$^$9!#(B
 @end example
 
-$B$b$7!"%]%$%s%H$,(B @samp{$B$=$7$F(B} $B$NA0$K$"$j!"(B@kbd{M-RET} $B$r2!$7$?$J$i!"0J(B
-$B2<$N$h$&$J$b$N$rF@$^$9(B:
+$B%]%$%s%H$,!V$=$7$F!W$NA0$K$"$k$H$-$K(B @kbd{M-RET} $B$r2!$9$H!"0J2<$N$h$&$K(B
+$B$J$j$^$9(B:
 
 @example
 > $B$3$l$O2?$+$N0zMQJ8$G$9!#(B
@@ -1124,22 +1148,22 @@ information about the problem.)
 > $B$=$7$F!"$3$3$K$O$b$C$H0zMQJ8$,$"$j$^$9!#(B
 @end example
 
-@samp{*} $B$O%]%$%s%H$,CV$+$l$F$$$k>l=j$G$9!#(B
+@samp{*} $B$O%]%$%s%H$,CV$+$l$k>l=j$G$9!#(B
 
 @item C-c M-r
 @kindex C-c M-r
 @findex message-rename-buffer
-$B%P%C%U%!$NL>A0$rJQ99$7$^$9(B (@code{message-rename-buffer})$B!#@\F,0z?t$rM?(B
-$B$($i$l$l$P!"?7$7$$%P%C%U%!L>$NF~NO$rB%?J$7$^$9!#(B
+$B%P%C%U%!!<$NL>A0$rJQ99$7$^$9(B (@code{message-rename-buffer})$B!#@\F,0z?t$,(B
+$BM?$($i$l$k$H!"?7$7$$%P%C%U%!!$NF~NO$rMW5a$7$^$9!#(B
 
 @item TAB
 @kindex TAB
 @findex message-tab
 @vindex message-tab-body-function
-@code{message-tab-body-function} $B$K@_Dj$5$l$F$$$k4X?t$re$KB8:_$9$k(B
+$B%P%C%U%!!<$N%j%9%H$N:G8e$NMWAG$K$9$k4X?t$G!"0lHL$K=EMWEY$,Dc$/$J$C$?%P%C(B
+$B%U%!!<$KBP$7$Fl9g$O(B @kbd{C-x C-b} $B$r;H$C$F2<(B
+$B$5$$!#$?$@$7%P%C%U%!!<$NL>A0$,(B @samp{*sent ... *} $B$KJQ$o$C$F$$$k$O$:$G$9!#(B
+@end quotation
+
 @item C-c C-s
 @kindex C-c C-s
 @findex message-send
@@ -1159,17 +1190,19 @@ information about the problem.)
 
 @item C-c C-d
 @kindex C-c C-d
-@findex message-dong-send
-$B%a%C%;!<%8%P%C%U%!$rKd$a$F=*N;$7$^$9(B (@code{message-dont-send})$B!#(B
+@findex message-dont-send
+$B%a%C%;!<%8%P%C%U%!!<$r(B @code{bury-buffer} $B$7$F(B ($BAw?.$;$:$K(B) $B=*N;$7$^(B
+$B$9(B (@code{message-dont-send})$B!#(B
 
 @item C-c C-k
 @kindex C-c C-k
 @findex message-kill-buffer
 @vindex message-kill-buffer-and-remove-file
-$B%a%C%;!<%8%P%C%U%!$r@Z$C$F=*N;$7$^$9(B (@code{message-kill-buffer})$B!#$=$N(B
-$B%U%l!<%`$,%a%C%;!<%8@lMQ$K:n$i$l$?$b$N$@$C$?>l9g$O!"%U%l!<%`$r:o=|$7$^$9!#(B
+$B%a%C%;!<%8%P%C%U%!!<$r(B kill $B$7$F(B ($BAw?.$;$:$K(B) $B=*N;$7$^(B
+$B$9(B (@code{message-kill-buffer})$B!#$=$N%U%l!<%`$,%a%C%;!<%8@lMQ$K:n$i$l$?(B
+$B$b$N$@$C$?>l9g$O!"%U%l!<%`$r:o=|$7$^$9!#(B
 @code{message-kill-buffer-and-remove-file} $B$,Hs(B-@code{nil} $B$G!"$+$D%P%C(B
-$B%/%"%C%W%U%!%$%k$,$G$-$F$$$?$i!"%f!<%6$K3NG'$7$F$+$i$=$l$b:o=|$7$^$9!#(B
+$B%/%"%C%W%U%!%$%k$,$G$-$F$$$?$i!"MxMQ(B
+@section $B%a!<%k$NJLL>(B
 @cindex mail aliases
 @cindex aliases
 
 @vindex message-mail-alias-type
-$BJQ?t(B @code{message-mail-alias-type} $B$O$I$N$h$&$J7?$N%a!<%kJLL>(B (mail
-alias) $B?-D%$r;H$&$+$r@)8f$7$^$9!#8=:_$G$O!"0l$D$NMM<0$@$1$,;HMQ2DG=$G(B
-$B$9(B---Message $B$O%a!<%kJLL>$r07$&$?$a$K(B @code{mailabbrev} $B$r;H$$$^$9!#$b$7(B
-$B$3$NJQ?t$,(B @code{nil} $B$G$"$k$J$i!"%a!<%kJLL>?-D%$O(B (mail alias) $B$N?-D%$r;H$&$+$r@)8f$7$^$9!#:#$N$H$3$m0l$D$NMM<0$7$+;H$((B
+$B$^$;$s(B---Message $B$O%a!<%k$NJLL>$r07$&$?$a$K(B @code{mailabbrev} $B$r;H$$$^$9!#(B
+$B$b$7$3$NJQ?t$,(B @code{nil} $B$K$J$C$F$$$k$H!"%a!<%k$NJLL>$N?-D%$O9T$J$o$l$^(B
+$B$;$s!#(B
 
 @code{Mailabbrev} $B$O(B @file{/etc/mailrc} $B$H(B @file{~/.mailrc} $B%U%!%$%k$r2r(B
-$B@O$9$k;v$K$h$jF0:n$7$^$9!#%U%!%$%k$O"
 alias ding "ding@@ifi.uio.no (ding mailing list)"
 @end example
 
-$B$3$N$h$&$J9T$r(B @file{~/.mailrc} $B%U%!%$%k$KDI2C$7$?8e$G!"(B
-@code{To} $B$d(B @code{Cc} ($BEy$J$I(B) $B$N%X%C%@!<$G(B @samp{lmi} $B$H=q$$$F!"(B
-@kbd{SPC} $B$r2!$9$@$1$GJLL>$r?-D%$7$^$9!#(B
+$B$3$N$h$&$J9T$r(B @file{~/.mailrc} $B%U%!%$%k$KDI2C$7$F$*$1$P!"(B
+@code{To} $B$d(B @code{Cc} ($B$J$I(B) $B$N%X%C%@!<$G(B @samp{lmi} $B$H=q$$(B
+$B$F(B @kbd{SPC} $B$r2!$9$@$1$G!"$=$NJLL>$r?-D%$7$F$/$l$k$O$:$G$9!#(B
 
-$B%a%C%;!<%8$rAw$k$H$-$K$O?-D%$O9T$o$l$^$;$s(B---$BA4$F$N?-D%$OL@<(E*$K9T$o$l(B
-$B$J$/$F$O$J$j$^$;$s!#(B
+$B%a%C%;!<%8$rAw$k$H$-$K$O?-D%$O9T$J$o$l$^$;$s(B---$B$9$Y$F$N?-D%$OL@<(E*(B
+$B$K(B ($BLuCm(B: $B$N%a!<%kJQ?t(B
-* News Headers::                $B%K%e!<%9%X%C%@!<$r%+%9%?%^%$%:$9$k(B
+* News Headers::                $B%K%e!<%9$N%X%C%@!<$r%+%9%?%^%$%:$9$k(B
 * News Variables::              $BB>$N%K%e!<%9JQ?t(B
-* Insertion Variables::         $BA^F~$N$5$lJ}$r%+%9%?%^%$%:$9$k(B
+* Insertion Variables::         $B$I$&A^F~$9$k$+$r%+%9%?%^%$%:$9$k(B
 * Various Message Variables::   $BB>$N%a%C%;!<%8JQ?t(B
-* Sending Variables::           $BAw?.$9$k$?$a$NJQ?t(B
-* Message Buffers::             Message $B$,$=$N%P%C%U%!$NL>A0$rIU$1$kJ}K!(B
-* Message Actions::             $B=*N;$9$k$H$-$KA0$rIU$1$kJ}K!(B
+* Message Actions::             $B=*N;$9$k$H$-$Ko$K@Q6KE*$G$9!#$=$l$Oo$K@Q6KE*$G$9!#$=$l$OC$5$l$?$j:n$jD>$5$l$?$j$7$^$9!#$3$l$K(B
-$B$OJQ?t(B @code{message-deletable-headers} ($B8e=R(B) $B$,4X78$7$^$9!#(B
+$BJQ?t(B @code{message-deletable-headers} ($B8e=R(B) $B$N@_Dj$K$h$C$F$O!"$$$/$D$+(B
+$B$N%X%C%@!<$,Aw?.$9$kA0$K>C$5$l$F:n$jD>$5$l$k$3$H$KCm0U$7$F2<$5$$!#(B
 
 @item message-draft-headers
 @vindex message-draft-headers
-Message $B$,(B gnus $B>e$GAv$C$F$$$k>l9g!"%a%C%;!<%8%P%C%U%!$O%I%i%U%H%0%k!<%W(B
-$B$H4XO"IU$1$i$l$F$$$^$9!#(B@code{message-draft-headers} $B$O!"$=$N%I%i%U%H%0(B
-$B%k!<%W$K%I%i%U%H$,5-O?$5$l$k$H$-$K!"$I$N%X%C%@!<$,:n@.$5$l$k$Y$-$+$r;X<((B
-$B$7$^$9!#(B
+Message $B$,(B gnus $B>e$GAv$C$F$$$k>l9g!"%a%C%;!<%8%P%C%U%!!<$O%I%i%U%H%0%k!<(B
+$B%W$H4XO"IU$1$i$l$F$$$^$9!#(B@code{message-draft-headers} $B$O!"$=$N%I%i%U%H(B
+$B%0%k!<%W$K%I%i%U%H$,5-O?$5$l$k$H$-$K!"$I$N%X%C%@!<$,:n@.$5$l$k$Y$-$+$r;X(B
+$B<($7$^$9!#(B
 
 @item message-from-style
 @vindex message-from-style
-@code{From} $B%X%C%@!<$,$I$N$h$&$K8+$($k$+$r;XDj$7$^$9!#0J2<$N#4$D$NCM$,;H(B
-$B$($^$9(B:
+@code{From} $B%X%C%@!<$r$I$&$$$&8+1I$($K$9$k$+$r;XDj$7$^$9!#0J2<$N;M$D$NCM(B
+$B$,;H$($^$9(B:
 
 @table @code
 @item nil
@@ -1320,42 +1357,45 @@ Message $B$,(B gnus $B>e$GAv$C$F$$$k>l9g!"%a%C%;!<%8%P%C%U%!$O%I%i%U%H%0%k!<%
 @samp{Elvis Parsley }.
 
 @item default
-$B$=$l$,0zMQId9f$rMW5a$7$J$1$l$P(B @code{angles} $B$N$h$&$K8+$(!"$b$70zMQId9f(B
-$B$,MW5a$5$l$k>l9g$O(B @code{parens} $B$N$h$&$K8+$($^$9!#(B@code{parens} $B$,0zMQ(B
-$BId9f$rMW5a$7$?$H$7$F$b!"$H$K$+$/(B @code{angles} $B$r;H$$$^$9!#(B
+$B0zMQId$G0O$`I,MW$,$"$k>l9g(B (*) $B$O(B @code{parens} $B$HF1MM$N8+1I$($K$7$^$9!#(B
+$B$=$&$G$J$1$l$P(B @code{angles} $B$N>l9g$HF1$8$h$&$J8+1I$($K$7$^$9!#(B
+@code{parens} $B$N7A<0$r;H$C$F$b$J$*0zMQId$G0O$^$J$1$l$P$J$i$J$$>l(B
+$B9g(B (*) $B$O!"M-L5$r8@$o$:$K(B @code{angles} $B$N7A<0$r;H$$$^$9!#(B
+
+$BLuCm(B*: $B%U%k%M!<%`$NItJ,$,FCl9g(B
 @end table
 
 @item message-deletable-headers
 @vindex message-deletable-headers
-$B$3$N%j%9%H$K$"$k!"0JA0$K(B Message $B$K$h$j:n@.$5$l$?%X%C%@!<$OEj9F$9$kA0$K(B
-$B:o=|$5$l$^$9!#5-;v$rEj9F$9$k$H$7$^$7$g$&!#$=$l$+$i!"$o$s$Q$/K7$N%0%k!<%W$K:F$SEj9F$9$k;v$K7hDj$7$?$N$G!"(B
-@code{*post-buf*} $B%P%C%U%!$KLa$j!"(B@code{Newsgroups} $B9T$rJT=8$7!":F$SAw$j(B
-$B=P$7$?$H$7$^$9!#=i4|@_Dj$G$O!"$3$NJQ?t$OA0$K:n@.$5$l$?8E(B
-$B$$(B @code{Message-ID} $B$,uBV$,$O$S$3$j!"(B
+$BG-$,FsK\$NB-$GJb$-;O$a$F@$3&$r;YG[$9$k$G$7$g$&!#EA$(J9$/$H$3$m$K$h$l$P!#(B
 
 @item message-default-headers
 @vindex message-default-headers
-$B$3$NJ8;zNs$OA4$F$N%a%C%;!<%8%P%C%U%!$N%X%C%@!<$N:G8e$KA^F~$5$l$^$9!#(B
+$B$3$NJ8;zNs$O$9$Y$F$N%a%C%;!<%8%P%C%U%!!<$N%X%C%@!<$N:G8e$KA^F~$5$l$^$9!#(B
 
 @item message-subject-re-regexp
 @vindex message-subject-re-regexp
 @cindex Aw
 @cindex Sv
 @cindex Re
-$B%a%C%;!<%8$X$N1~Ez$O(B @samp{Re: } $B$G;O$^$j$^$9!#$3$l$O1Q8l(B
-$B$N(B ``response'' $B$NN,$G$O(B @emph{$B$"$j$^$;$s(B} $B$,!"%i%F%s8l$G!"(B``$B$=$l$K1~Ez(B
-$B$7$F(B'' (in response to) $B$H8@$&0UL#$G$9!#$$$/$D$+$NL53X$NGOl9g$O$3$NJQ?t$r$3$l$i$N@\F,8l$K9g$&$h$&$J@55,I=8=$K@_Dj$9$k$G$7$g$&!#(B
-$B;d<+?H$O!"$=$N$h$&$J5,3J$K=>$o$J$$%a!<%k$O$?$@l9g$K$O!"$3$NJQ?t$r$=$l$i$N@\F,8l$K9gCW$9$k@5(B
+$B5,I=8=$K@_Dj$9$k$3$H$,$G$-$^$9!#;d$G$9$+(B?  $B;d$O5,3J$K=>$o$J$$%a!<%k$O$?(B
+$B$@e$GAv$C$F$$$k>l9g!"%a%C%;!<%8%P%C%U%!$O%I%i%U%H%0%k!<%
 @vindex message-subject-trailing-was-query
 @vindex message-subject-trailing-was-ask-regexp
 @vindex message-subject-trailing-was-regexp
-$BBjL>$N9T$KB3$1$k(B @samp{(was: <$B8E$$BjL>(B>)} $B$r$I$&$9$k$+$r@)8f$7$^$9!#(B
-@code{nil} $B$@$C$?$iBjL>$r$=$N$^$^$K$7$F$*$-$^$9!#(B@code{ask} $B$H$$$&%7%s%\(B
-$B%k$@$C$?$i!"$I$&$9$k$+$r%f!<%6$K?R$M$^$9!#BjL>(B
+$BI=Bj$N9T$K$V$i2<$,$C$F$$$k(B @samp{(was: <$B8E$$I=Bj(B>)} $B$r$I$&$9$k$+$r@)8f$7(B
+$B$^$9!#(B@code{nil} $B$@$C$?$iI=Bj$r$=$N$^$^$K$7$F$*$-$^$9!#(B@code{ask} $B$H$$$&(B
+$B%7%s%\%k$@$C$?$i!"$I$&$9$k$+$rMxMQl9g$@$1$G$9(B
 $B$,!#(B@code{message-subject-trailing-was-query} $B$,(B @code{t} $B$@$C$?$i!">o$K(B
-$B$V$i2<$,$C$?8E$$BjL>$r$O$.l9g(B
+$B$V$i2<$,$C$?8E$$I=Bj$r$O$.l9g(B
 $B$O(B @code{message-subject-trailing-was-regexp} $B$,;H$o$l$^$9!#(B
 
 @item message-alternative-emails
 @vindex message-alternative-emails
-$BBe$o$j$N%a!<%k%"%I%l%9$K9gCW$9$k@55,I=8=$G$9!#:G=i$K%^%C%A$7$?(B ($BBh0l5A$G(B
-$B$O$J$$(B) $B%"%I%l%9$,(B @code{From} $B%U%#!<%k%I$G;H$o$l$^$9!#(B
-($BLuCm(B: To $B$+(B Cc $B$K$"$k%"%I%l%9$G!":G=i$K$3$N@55,I=8=$K9gCW$7!"(B
-$B$+$D(B @code{user-mail-address} $B$H$O0c$&$b$N$,!"(B@code{From} $B%U%#!<%k%I$N%a!<(B
-$B%k%"%I%l%9$H$7$F;H$o$l$^$9!#(B)
+$B$"$J$?$NBhFs!"Bh;0$N%a!<%k%"%I%l%9$K9gCW$9$k@55,I=8=$G$9!#85$N5-;v$N(B To$B!"(B
+Cc $B$^$?$O(B From $B%X%C%@!<$K$"$C$F!"$3$NJQ?t$K9gCW$9$k:G=i$N%"%I%l%9$,!"%G%#(B
+$B%U%)%k%H$N(B From $B$NCM$rCV$-49$($F!"=P$F9T$/%a%C%;!<%8$N(B From $BMs$H$7$F;H$o(B
+$B$l$^$9!#(B
+
+$BNc$($P$"$J$?$,(B john@@home.net $B$*$h$S(B john.doe@@work.com $B$H$$$&BhFs$NEE;R(B
+$B%a!<%k%"%I%l%9$r;}$C$F$$$F!"$=$l$i$K08$F$FAw$i$l$F$-$?%a%C%;!<%8$KJV?.$9(B
+$B$k$H$-$K!"$=$l$i$r(B From $BMs$G;H$$$?$1$l$P!"$3$NJQ?t$rl9g$K!"2?$r$9$k$+$r@_(B
-$BDj$7$^$9!#(B@code{always} $B$@$C$?$i$H$K$+$/Aw?.$7!"(B@code{never} $B$@$C$?$iAw(B
-$B?.$7$^$;$s!#(B@code{ask} ($B$=$l$,%G%#%U%)%k%H(B) $B$@$C$?$i!"$I$&$9$k$+?R$M$i$l(B
-$B$^$9!#(B
+@code{Gcc} $B$H(B @code{Fcc} $B0J30$Kl9g(B ($BLuCm(B: To, Cc,
+Newsgroups $B$J$I$,6u$@$C$?>l9g(B) $B$K!"2?$r$9$k$+$r@_Dj$7$^$9!#(B
+@code{always} $B$@$C$?$iAw?.$G$-$^$9$,!"(B@code{never} $B$@$C$?$iAw?.$G$-$^$;(B
+$B$s!#(B@code{ask} ($B$=$l$,%G%#%U%)%k%H(B) $B$@$C$?$i!"$I$&$9$k$+$r?R$M$i$l$^$9!#(B
 
 @item message-hidden-headers
 @vindex message-hidden-headers
 $B@55,I=8=!"@55,I=8=$N%j%9%H!"$^$?$O:G=i$NMWAG$,(B @code{not} $B$G;D$j$,@55,I=(B
-$B8=$G$"$k%j%9%H!#%a%C%;!<%8$N:n@.Cf$K$I$N%X%C%@!<$r1#$7$?$^$^$K$7$F$*$/$+(B
-$B$r7h$a$^$9!#(B
+$B8=$G$"$k%j%9%H$G$9!#%a%C%;!<%8$r:n@.$7$F$$$k$H$-$K!"$I$N%X%C%@!<$r1#$7$?(B
+$B$^$^$K$7$F$*$/$+$r7h$a$^$9!#(B
 
 @lisp
 (setq message-hidden-headers
       '(not "From" "Subject" "To" "Cc" "Newsgroups"))
 @end lisp
 
-$B%X%C%@!<$O(B narrowing $B$r;H$C$F1#$5$l$^$9!#$=$l$i$r%P%C%U%!$GO*=P$5$;$k$?(B
-$B$a$K(B @kbd{M-x widen} $B$r;H$&$3$H$,$G$-$^$9!#(B
+$B$=$l$i$N%X%C%@!<$O!"$=$l$i0J30$NItJ,$K%P%C%U%!!<$r69$a$k$3(B
+$B$H(B (narrowing) $B$K$h$C$F1#$5$l$^$9!#(B@kbd{M-x widen} $B$r;H$&$3$H$K$h$C$F!"(B
+$B$=$l$i$,8+$($k$h$&$K$9$k$3$H$,$G$-$^$9!#(B
 
 @item message-header-synonyms
 @vindex message-header-synonyms
-$B%X%C%@!$N%j%9%H$N%j%9%H$G$9!#Nc$($P$3$N%j%9%H(B
+$B$,(B @code{Cc} $B$H(B @code{To} $B$rMWAG$K;}$D%j%9%H$r4^$s$G$$$k$H!"%a%C%;!<%8$,(B
 $B$9$G$Kl9g!"(B
 @code{message-carefully-insert-headers} $B$O(B @code{To} $B%X%C%@!<$rA^F~$7$^(B
 $B$;$s!#(B
@@ -1434,25 +1487,27 @@ Message $B$,(B gnus $B>e$GAv$C$F$$$k>l9g!"%a%C%;!<%8%P%C%U%!$O%I%i%U%H%0%k!<%
 @table @code
 @item message-required-mail-headers
 @vindex message-required-mail-headers
-$B$3$NJQ?t$N9=J8$rCN$j$?$1$l$P!"(B@xref{News Headers} $B$r;2>H$7$F2<$5$$!#$=$l(B
-$B$N=i4|CM$O(B @code{(From Date Subject (optional . In-Reply-To) Message-ID
-Lines (optional . User-Agent))} $B$G$9!#(B
+$B$3$NJQ?t$N9=J8$K$D$$$F$O(B @ref{News Headers} $B$r;2>H$7$F2<$5$$!#%G%#%U%)%k(B
+$B%H$O(B @code{(From Subject Date (optional . In-Reply-To) Message-ID
+(optional . User-Agent))} $B$G$9!#(B
 
 @item message-ignored-mail-headers
 @vindex message-ignored-mail-headers
-$B%a!<%k$r=P$9A0$K$K(B @code{message-send-mail-with-mh},
 @code{message-send-mail-with-qmail}, @code{message-send-mail-with-smtp},
@@ -1477,46 +1532,60 @@ Lines (optional . User-Agent))} $B$G$9!#(B
 
 @item message-mh-deletable-headers
 @vindex message-mh-deletable-headers
-$B$[$H$s$I$NHG$N(B MH $B$O$3$NJQ?t$N%X%C%@!<$r4^$`%a%C%;!<%8$r?)$o$5$l$k$N$r7y(B
-$B$$$^$9!#$3$NJQ?t$,(B @code{nil} $B$G$J$$$J$i(B ($B$3$l$,=i4|@_Dj$G$9$,(B)$B!"$3$l$i(B
-$B$N%X%C%@!<$O(B MH $B$r;H$C$F%a%C%;!<%8$rAw$C$F$$$k$H$-$K$Ol=j$G$9!#(B
 
 @item message-qmail-inject-args
 @vindex message-qmail-inject-args
 qmail-inject $B%W%m%0%i%`$KEO$90z?t$G$9!#$3$l$OJ8;zNs$N%j%9%H$G!"$=$l$>$l(B
-$B$N0z?t$O0l$D$NJ8;zNs$G$J$1$l$P$J$j$^$;$s!#$3$l$O4X?t$G$bNI$$$G$9!#(B
+$B$N0z?t$O0l$D$NJ8;zNs$G$J$1$l$P$J$j$^$;$s!#$3$l$O4X?t$G$b9=$$$^$;$s!#(B
+
+$BNc$($P!"%a!<%k$,CF$+$l$F$7$^$C$?>l9g$N@5$7$$La$j@h$r;XDj$7$?$j!"%a!<%j%s(B
+$B%0%j%9%H$N%5!<%P!<$N%"%I%l%9$N;EMM5,Dj$KBP=h$9$k$?$a$K!H(Benvelope sender$B!I(B
+$B$N%"%I%l%9$r@_Dj$7$?$$>l9g$O!"$3$NJQ?t(B
+$B$r(B @code{'("-f" "you@@some.where")} $B$K$9$l$PNI$$$G$7$g$&!#(B
 
-$BNc$($P!"@5$7$$>l=j$KD7$MJV$7$?$j!"%a!<%j%s%0%j%9%H$N47=,$K=>$&$?$a(B
-$B$K(B envelope sender $B$N%"%I%l%9$r@_Dj$7$?$$>l9g$O!"$3$NJQ?t(B
-$B$r(B @code{'("-f" "you@@some.where")} $B$K@_Dj$9$l$PNI$$$G$7$g$&!#(B
+$BLuCm(B:$B!H(Benvelope sender$B!I$O%a!<%k$rAw?.$9$k$H$-$K(B MTA $B$KEO$9??$NAw?.l9g$O!"(B
-$BHs(B-@code{nil} $B$K@_Dj$7$F2<$5$$!#(B(SunOS 4 $B$G(B sendmail $B$,%j%b!<%H%b!<%I$G(B
+$B%7%9%F%`$N%a%$%i!<$,%X%C%@!<$HK\J8$r0l=o$K$7$F$7$^$&>l9g$O(B @code{nil} $B$G(B
+$B$O$J$$CM$K@_Dj$7$F2<$5$$!#(B(SunOS 4 $B$K$*$$$F(B sendmail $B$,%j%b!<%H%b!<%I$G(B
 $BF0:n$9$k>l9g$,3:Ev$7$^$9!#(B) $BCM$O!">c32$,$l(B
 @section $B%K%e!<%9%X%C%@!<(B
 
 @vindex message-required-news-headers
-@code{message-required-news-headers} $B$O%X%C%@!<%7%s%\%k$N%j%9%H$G$9!#$3(B
-$B$l$i$N%X%C%@!<$O<+F0E*$K:n@.$5$l$k$+!"$b$7$/$O$=$l$,IT2DG=$G$"$l$P!"F~NO(B
-$B$rB%?J$7$^$9!#0J2<$N%7%s%\%k$,;H$($^$9(B:
+@code{message-required-news-headers} $B$O%X%C%@!<$N%7%s%\%k$N%j%9%H$G$9!#(B
+$B$3$l$i$N%X%C%@!<$O<+F0E*$K:n@.$5$l$k$+!"$b$7$/$O$=$l$,IT2DG=$G$"$l$P(B ($BLu(B
+$BCm(B: $BCM$,<+F0$GDj$^$i$J$1$l$P(B)$B!"MxMQl9g$OF~NO$rB%?J$5$l$^$9!#(B
+$B$3$NI,?\$N%X%C%@!<$O!"$^$@B8:_$7$J$$>l9g$OF~NO$r5a$a$i$l$^$9!#(B
 
 @item Newsgroups
 @cindex Newsgroups
-$B$3$NI,MW$J%X%C%@!<$O$I$N%K%e!<%9%0%k!<%W$K5-;v$,Ej9F$5$l$k;v$K$J$k$+$r;X(B
-$BDj$7$^$9!#$b$7$^$@B8:_$7$F$$$J$$$J$i!"F~NO$rB%?J$5$l$^$9!#(B
+$B$3$NI,?\$N%X%C%@!<$O!"5-;v$rEj9F$9$k%K%e!<%9%0%k!<%W$r;XDj$7$^$9!#$^$@B8(B
+$B:_$7$J$$>l9g$OF~NO$r5a$a$i$l$^$9!#(B
 
 @item Organization
 @cindex organization
 @vindex message-user-organization
 @vindex message-user-organization-file
-$B$3$NA*BrG$0U$J%X%C%@!<$OJQ?t(B @code{message-user-organization} $B$K0MB8$7$F(B
-$B:n@.$5$l$^$9!#$b$7$3$NJQ?t$,(B @code{t} $B$G$"$l$P!"(B
-@code{message-user-organization-file} $B$,;H$o$l$^$9!#$3$NJQ?t$OJ8;zNs$G$"(B
-$B$k;v$b$G$-(B ($B$=$N>l9g$O$=$NJ8;zNs$,;H$o$l$^$9(B)$B!"4X?t$G$"$k;v$b$G$-$^(B
-$B$9(B ($B$=$N4X?t$O0z?tL5$7$G8F$P$l!";H$o$l$kJ8;zNs$rJV$9I,MW$,$"$j$^$9(B)$B!#(B
+$B$3$N$"$C$F$bL5$/$F$bNI$$%X%C%@!<$O!"(B@code{message-user-organization} $BJQ(B
+$B?t$K1~$8$?CM$,:n$i$l$^$9!#$3$NJQ?t$,(B @code{t} $B$@$C$?(B
+$B$i(B @code{message-user-organization-file} $B$,;H$o$l$^$9!#$3$NJQ?t$OJ8;zNs(B
+$B$G$bNI$$$7(B ($B$=$N>l9g$O$=$NJ8;zNs$,;H$o$l$^$9(B)$B!"4X?t$G$"$C$F$b9=$$$^$;(B
+$B$s(B ($B$=$N4X?t$O0z?tL5$7$G8F$P$l!"J8;zNs$rJV$5$J$1$l$P$J$j$^$;$s(B)$B!#(B
 
 @item Lines
 @cindex Lines
-$B$3$NA*BrG$0U$J%X%C%@!<$O(B Message $B$K$h$j7W;;$5$l$^$9!#(B
+$B$3$N$"$C$F$bL5$/$F$bNI$$%X%C%@!<$O(B Message $B$,7W;;$7$F:n$j$^$9!#(B
 
 @item Message-ID
 @cindex Message-ID
@@ -1574,63 +1643,73 @@ qmail-inject $B%W%m%0%i%`$KEO$90z?t$G$9!#$3$l$OJ8;zNs$N%j%9%H$G!"$=$l$>$l(B
 @findex system-name
 @cindex Sun
 @cindex i-did-not-set--mail-host-address--so-tickle-me
-$B$3$NI,MW$J%X%C%@!<$O(B Message $B$K$h$j:n@.$5$l$^$9!#F|IU!";~9o!"%f!<%6(B
-$BL>(B ($B%m!<%+%k%Q!<%H(B) $B$*$h$S%I%a%$%s%Q!<%H$K4p$E$$$?%f%K!<%/$J(B ID $B$,:n@.$5(B
-$B$l$^$9!#%I%a%$%s%Q!<%H$K$D$$$F$O!"M-8z$J(B FQDN ($B40A4$K>r7o$rK~$?$7$?%I%a(B
-$B%$%sL>(B) $B$i$7$$$b$N$,8+$D$+$i$J$$>l9g!"(B
-message $B$O(B @code{message-user-fqdn}, @code{system-name},
-@code{mail-host-address} $B$*$h$S(B @code{message-user-mail-address} ($B$9$J$o(B
+$B$3$NI,?\$N%X%C%@!<$O(B Message $B$K$h$C$F:n@.$5$l$^$9!#F|IU!";~9o!"(B ($B%m!<%+(B
+$B%kIt$N$?$a$N(B) $BMxMQ!"$*$h$S%I%a%$%sIt$K4p$E$$$?%f%K!<%/$J(B ID $B$G$9!#%I(B
+$B%a%$%sIt$K$D$$$F$O!"M-8z$J(B FQDN ($B40A4$K>r7o$rK~$?$7$?%I%a%$%sL>(B) $B$i$7$$(B
+$B$b$N$,8+$D$+$i$J$$>l9g!"(Bmessage $B$O(B @code{message-user-fqdn},
+@code{system-name}, @code{mail-host-address} $B$*$h(B
+$B$S(B @code{message-user-mail-address} ($B$9$J$o(B
 $B$A(B @code{user-mail-address}) $B$r(B ($B$3$N=g$G(B) $BC5$7$^$9!#(B
 
 @item User-Agent
 @cindex User-Agent
-$B$3$NA*Br<+M3$J%X%C%@!<$O%m!<%+%kJQ?t(B @code{message-newsreader} $B$K$7$?$,$C(B
-$B$F:n$i$l$^$9!#(B
+$B$3$N$"$C$F$bL5$/$F$bNI$$%X%C%@!<$O!"%m!<%+%kJQ(B
+$B?t(B @code{message-newsreader} $B$K=>$C$F:n$i$l$^$9!#(B
 
 @item In-Reply-To
-$B$3$NA*Br<+M3$J%X%C%@!<$OJVEz$7$F$$$k5-;v$N(B @code{Date} $B$H(B @code{From} $B%X%C(B
-$B%@!<$r;H$C$F:n$i$l$^$9!#(B
+$B$3$N$"$C$F$bL5$/$F$bNI$$%X%C%@!<$O!"JVEz$7$h$&$H$7$F$$$k5-;v(B
+$B$N(B @code{Date} $B$H(B @code{From} $B%X%C%@!<$r85$K:n$i$l$^$9!#(B
 
 @item Expires
 @cindex Expires
 @vindex message-expires
-$B$3$NHs>o$KA*Br<+M3$J%X%C%@!<$OJQ?t(B @code{message-expires} $B$K$7$?$,$C$FA^(B
-$BF~$5$l$^$9!#$3$l$O<+J,$,2?$r$7$F$$$k$+$rCN$i$J$$8B$j!";HMQ$OA4$/4+$a$i$l(B
-$B$^$;$s!#(B
+$B$3$N$"$m$&$,L5$+$m$&$,K\Ev$K$I$&$G$bNI$$%X%C%@!<$O!"(B
+@code{message-expires} $BJQ?t$K=>$C$FA^F~$5$l$^$9!#$3$l$r;H$&$3$H$O6/$/Hs(B
+$BFq$5$l$F$$$k$N$G!"<+J,$,2?$r$7$F$$$k$+$r$o$+$C$F$$$J$$$J$i!";H$&$Y$-$G$O(B
+$B$"$j$^$;$s!#(B
 
 @item Distribution
 @cindex Distribution
 @vindex message-distribution-function
-$B$3$NA*Br<+M3$J%X%C%@!<$OJQ?t(B @code{message-distribution-function} $B$K$7$?(B
-$B$,$C$F:n$i$l$^$9!#$=$l$OHs?d>)$G!"Hs>o$K8m2r$5$l$?%X%C%@!<$G$9!#(B
+$B$3$N$"$C$F$bL5$/$F$bNI$$%X%C%@!<$O!"(B
+@code{message-distribution-function} $BJQ?t$,;XDj$9$k4X?t$,:n$j$^$9!#$3$l(B
+$B$r;H$&$3$H$OHsFq$5$l$F$$$F!"Hs>o$K8m2r$5$l$?%X%C%@!<$G$9!#(B
+
+$BLuCm(B: @code{message-distribution-function} $B$N%G%#%U%)%k%HCM(B
+$B$O(B @code{nil} $B$J$N$G!"$=$N$^$^$G$O$3$l$r;XDj$7$F(B
+$B$b(B @samp{Distribution:} $B%X%C%@!<$OA^F~$5$l$^$;$s!#(B@kbd{C-c C-f C-d} $BL?Na(B
+$B$r;H$C$F!"o$KA*Br<+M3$J%X%C%@!<$O$*$=$i$/7h$7$F;H$o$l$F$O$J$i$J$$$G$7$g$&!#(B
-$B$7$+$7$$$/$D$+$N(B @emph{$B$H$F$b(B} $B8E$$%5!<%P!<$O$3$N%X%C%@!<$,B8:_$9$k;v$r(B
-$BMW5a$7$^$9!#(B@code{message-user-path} $B$,$3$N(B @code{Path} $B%X%C%@!<$,$I$N$h(B
-$B$&$K8+$($k$+$r$5$i$K@)8f$7$^$9!#$b$7$=$l$,(B @code{nil} $B$G$"$l$P!"%5!<%P!<(B
-$BL>$r(B leaf $B@a$H$7$F;H$$$^$9!#$b$7$=$l$,J8;zNs$G$"$l$P!"$=$NJ8;zNs$r;H$$$^(B
-$B$9!#$b$7$=$l$,J8;zNs$G$b(B @code{nil} $B$G$b$J$1$l$P!"MxMQA0$@$1$r;H$$(B
-$B$^$9!#$7$+$7!"2?$i$+$N7A$G$3$NJQ?t$rO.$i$J$1$l$P$J$i$J$$I,MW@-$OHs>o$K>/(B
-$B$J$$$G$7$g$&!#(B
+$B$3$N$"$m$&$,L5$+$m$&$,K\Ev$K$I$&$G$bNI$$%X%C%@!<$O!"$*$=$i$/7h$7$F(B ($BMxMQ(B
+$B$rCA0$@$1$r;H$$$^$9!#$7$+$7!"$3$N(B
+$BJQ?t$r$$$8$/$i$J$1$l$P$J$i$J$/$J$k5!2q$OHs>o$K>/$J$$$G$7$g$&!#(B
 @end table
 
 @findex yow
 @cindex Mime-Version
-$B2C$($F(B cons $B$r%j%9%H$KF~$l$k;v$,$G$-$^$9!#$3$N(B cons $B$N(B @sc{car} $B$O%7%s%\(B
-$B%k$G$"$k$Y$-$G$9!#$3$N%7%s%\%kL>$O%X%C%@!$G!"(B@sc{cdr} $B$O$3$N%X%C%@!<(B
-$B$NCM$H$7$F$=$N$^$^F~$l$i$l$k$3$H$K$J$kJ8;zNs$+!"8F$P$l$k4X?t$N$I$A$i$+$G(B
-$B$"$k;v$,$G$-$^$9!#Nc$($P!"$b$7(B @code{Mime-Version: 1.0} $B$rA^F~$7$?$$$J$i!"(B
-@code{(Mime-Version . "1.0")} $B$r%j%9%H$KF~$l$k$Y$-$G$7$g$&!#$b$7$*$b$7$m(B
-$B$$0zMQ$rA^F~$7$?$$$J$i!"(B@code{(X-Yow . yow)} $B$N$h$&$J$b$N$r%j%9%H$KF~$l(B
-$B$k;v$,$G$-$k$G$7$g$&!#4X?t(B @code{yow} $B$O$=$N8e$G0z?tL5$7$G8F$P$l$^$9!#(B
-
-$B$b$7%j%9%H$,(B cons $B$N(B @sc{car} $B$,(B @code{optional} $B$G$"$k(B cons $B$r4^$s$G$$(B
-$B$k$J$i!"$3$N(B cons $B$N(B @sc{cdr} $B$O(B @code{nil} $B$G$J$$$H$-$@$1A^F~$5$l$^$9!#(B
-
-$B$3$N%j%9%H$+$i$"$k9`L\$r>C$7$?$$$J$i$P!"0J2<$N(B Lisp $B$N@Z$lC<$,Lr$KN)$D$G(B
+$B2C$($F!"$3$N%j%9%H$K(B cons $B$rF~$l$k$3$H$,$G$-$^$9!#$3(B
+$B$N(B cons $B$N(B @sc{car} $B$O%7%s%\%k$G$J$1$l$P$J$j$^$;$s!#$3$N%7%s%\%k$NL>A0$O(B
+$B%X%C%@!$G$9!#$^$?(B @sc{cdr} $B$O!"$3$N%X%C%@!<$NCM$H$7$F$=$N$^$^F~$l$i$l(B
+$B$kJ8;zNs$+4X?t$N$I$A$i$+$G$9!#Nc$($P(B @code{Mime-Version: 1.0} $B$rA^F~$7$?(B
+$B$$>l9g$O!"%j%9%H$K(B @code{(Mime-Version . "1.0")} $B$rF~$l$J$1$l$P$J$j$^$;(B
+$B$s!#$b$73j7N$J0zMQJ8$rA^F~$7$?$$$N$J$i!"(B@code{(X-Yow . yow)} $B$N$h$&$J$b(B
+$B$N$r%j%9%H$KF~$l$k$3$H$,$G$-$k$G$7$g$&!#$=$&$9$k$H!"4X?t(B @code{yow} $B$,0z(B
+$B?tL5$7$G8F$P$l$^$9!#(B
+
+@sc{car} $B$,(B @code{optional} $B$G$"$k(B cons $B$r%j%9%H$,4^$s$G$$$k>l9g$O!"$=(B
+$B$N(B cons $B$N(B @sc{cdr} $B$,(B @code{nil} $B$G$J$$$H$-$@$1(B ($B$=$N(B @sc{cdr} $B$,(B) $BA^F~(B
+$B$5$l$^$9!#(B
+
+$B$3$N%j%9%H$+$i$"$k9`L\$r>C$7$?$$$H$-$O!"0J2<$N(B Lisp $B$N@Z$lC<$,Lr$KN)$D$G(B
 $B$7$g$&!#B>$NMWAG$r:o=|$7$?$$$H$-$O$=$l$K9g$o$;$F2<$5$$!#(B
 
 @lisp
@@ -1641,90 +1720,104 @@ message $B$O(B @code{message-user-fqdn}, @code{system-name},
 $B=P$F9T$/%K%e!<%95-;v$r%+%9%?%^%$%:$9$k$?$a$NB>$NJQ?t(B:
 
 @table @code
-
 @item message-syntax-checks
 @vindex message-syntax-checks
-@code{nil} $B$G$J$1$l$P!"(BMessage $B$OEj9F$NA0$K!"%X%C%@!<$HB>$N$b$N$N9gK!@-(B
-$B$rD4$Y$^$9!#$3$N%j%9%H$KMWAG$rIU$12C$($?$j$N8!::$r6X;_$9$k$K$O!"$3$N%j%9%H$K(B
+
+@lisp
+(signature . disabled)
+@end lisp
+
+$B$r2C$($F2<$5$$!#(B
+
+$BM-8z$J8!::$O0J2<$NDL$j$G$9(B ($BLuCm(B: $B$3$l$i$N8!::$O%a!<%k$G$b9T$J$o$l$^$9(B):
 
 @table @code
 @item subject-cmsg
-$BL?Na$N$?$a$NI=Bj$rD4$Y$^$9!#(B
+$B%K%e!<%9$N%3%s%H%m!<%k%a%C%;!<%8$N$h$&$JI=Bj$,$"$k$+$I$&$+$rD4$Y$^$9!#(B
+($BLuCm(B: $BI=Bj$,(B @samp{cmsg} $B$G;O$^$k$b$N$G!"%K%e!<%9$N4IM}?M$@$1$,;H$$$^$9!#(B
+$B0lHL$NMxMQC$7(B (cancel) $B$r9T$J$&$H$-$K$b;H$$$^$9$,!"(B
+$B$=$N>l9g$O!"$3$N8!::$rDL$i$:$K!"$=$l@lMQ$NOHAH$_$GfIW$+$I$&$+D4$Y$^$9!#(B
+@code{Message-ID} $B$,$^$H$b$+$I$&$+$rD4$Y$^$9!#(B
 @item from
-@code{From} $B%X%C%@!<$,$h$/8+$($k$+$I$&$+$rD4$Y$^$9!#(B
+@code{From} $B%X%C%@!<$,$^$H$b$+$I$&$+$rD4$Y$^$9!#(B
 @item long-lines
-$B$"$^$j$KD9$$9T$rD4$Y$^$9!#(B
+$BD9$9$.$k9T$rD4$Y$^$9!#(B
 @item control-chars
 $B;H$C$F$O$$$1$J$$J8;z$rD4$Y$^$9!#(B
 @item size
-$B2a>j$JBg$-$5$rD4$Y$^$9!#(B
+$B%5%$%:$,Bg$-$9$.$J$$$+$I$&$+$rD4$Y$^$9!#(B
 @item new-text
-$B%a%C%;!<%8$K?7$7$$J8$,$"$k$+$I$&$+$rD4$Y$^$9!#(B
+$B%a%C%;!<%8$K?7$7$$J8$,$"$k$+$I$&$+(B ($BLuCm(B: $B0zMQ$P$+$j$G$J$$$+$I$&$+(B) $B$rD4(B
+$B$Y$^$9!#(B
 @item signature
 $B=pL>$ND9$5$rD4$Y$^$9!#(B
 @item approved
 @cindex approved
-$B5-;v$,(B @code{Approved} $B%X%C%@!<$r;}$C$F$$$k$+$I$&$+$rD4$Y$^$9!#$=$l$O;J(B
-$B2q(B
-$B$,L5$$$+$rD4$Y$^$9!#(B
+@code{Newsgroups} $B$H(B @code{Followup-to} $B%X%C%@!<$G!"F1$8%0%k!<%WL>$,7+$j(B
+$BJV$7;H$o$l$F$$$k$+$I$&$+$rD4$Y$^$9!#(B
 @item shorten-followup-to
-$BEj9F$9$k%0%k!<%W$N?t$r(B @code{Followup-to} $B%X%C%@!<$rIU$12C$($k;v$G>/$J$/(B
-$B$9$k$+$rD4$Y$^$9!#(B
+$BEj9F$9$k%0%k!<%W$N?t$r(B @code{Followup-to} $B%X%C%@!<$rIU$12C$($k$3$H(B
+$B$K$h$C$F>/$J$/$9$k$+$I$&$+$rD4$Y$^$9(B ($BLuCm(B: $BJ#?t$N%K%e!<%9%0%k!<(B
+$B%W$KEj9F$9$k5-;v$K(B @code{Followup-to} $B%X%C%@!<$,L5$$>l9g$KH/F0$5$l!"(B
+@code{Followup-to} $B%X%C%@!<$K5-F~$9$kCM$NF~NO$rMW5a$7$^$9(B)$B!#(B
 @end table
 
-$B$3$l$iA4$F$N>uBV$O=i4|@_Dj$G$OD4$Y$i$l$^$9!#(B
+$B%G%#%U%)%k%H$G$O!"$3$l$i$9$Y$F$N>r7o$,D4$Y$i$l$^$9!#(B
 
 @item message-ignored-news-headers
 @vindex message-ignored-news-headers
-$BEj9F$9$kA0$K\:Y$O(B gnus $B%^%K%e%"%k$r8+$F2<$5$$(B) $B$G$9!#(B
+$B$G$-$"$,$C$?%K%e!<%9%a%C%;!<%8$rEj9F$9$k$?$a$K;H$o$l$k(B Gnus $B$N!VA*BrJ}K!!W(B
+($B>\:Y$O(B Gnus $B%^%K%e%"%k$r8+$F2<$5$$(B) $B$G$9!#(B
 @end table
 
 @node Insertion Variables
@@ -1732,18 +1825,18 @@ message $B$O(B @code{message-user-fqdn}, @code{system-name},
 
 @table @code
 @item message-ignored-cited-headers
-$B$3$N@55,I=8=$K9gCW$9$kA4$F$N%X%C%@!<$OE=$jIU$1$i$l$?%a%C%;!<%8$+$i writes:
 @end example
 
-$B$3$N4X?t$,8F$P$l$?$H$-!"%]%$%s%H$O%a%C%;!<%8$NK\BN$N@hF,$K$"$k$G$7$g$&!#(B
+$B$3$N4X?t$,8F$P$l$?$H$-!"%]%$%s%H$O%a%C%;!<%8$NK\J8$N@hF,$KCV$+$l$k$G$7$g(B
+$B$&!#(B
 
 $B$J$*(B gnus $B$K$O!"(B`writes:' $B$N>e$G%/%j%C%/$9$k$H0zMQ$5$l$?%F%-%9%H$r1#$95!(B
 $BG=$,$"$j$^$9!#$b$7$"$J$?$,EY$r1[$7$F0zMQ9T$rJQ99$7$F$7$^$&$H!"$=$l$rFI$`(B
 $B?M$?$A$bH`$i$N(B gnus $B$rBP1~$5$;$J$1$l$P$J$i$J$/$J$k$G$7$g$&!#JQ(B
 $B?t(B @code{gnus-cite-attribution-suffix} $B$r;2>H$7$F2<$5$$!#>\:Y(B
-$B$O(B @xref{Article Highlighting, , $B5-;v$N%O%$%i%$%H(B, gnus-ja, The Gnus
+$B$O(B @xref{Article Highlighting, ,$B5-;v$N%O%$%i%$%H(B, gnus-ja, The Gnus
 Manual}, $B$K$"$j$^$9!#(B
 
 @item message-yank-prefix
 @vindex message-yank-prefix
 @cindex yanking
 @cindex quoting
-$B5-;v$KJVEz$+%U%)%m!<%"%C%W$r$9$k$H$-$O!"IaDL$O$"$J$?$,1~Ez$7$F$$$k?M$N$b(B
-$B$N$K0zMQId$rIU$1$?$$$G$7$g$&!#0zMQJ8$NA^F~$O(B @dfn{$BE=$jIU$1(B} $B$K$h$C$F$J$5(B
-$B$l(B ($B$9$G$K0zMQId$,IU$$$F$$$k$b$N$H6u9T$OBP>]30!"(B
-@code{message-yank-cited-prefix} $B$r;2>H$N$3$H(B)$B!"$=$l$>$l$NE=$jIU$1$i$l$?(B
-$B9T$O$=$NA0$K(B @code{message-yank-prefix} $B$rIU$1$i$l$^$9!#=i4|CM(B
-$B$O(B @samp{> } $B$G$9!#(B
+$B5-;v$KJVEz$+%U%)%m!<%"%C%W$r$9$k$H$-$O!"IaDL$O$"$J$?$,1~Ez$7$h$&$H$7$F$$(B
+$B$k?M$r0zMQ$7$?$$$G$7$g$&!#0zMQJ8$NA^F~$O!H(Byank$B!I$9$k$3$H$K$h$C$F9T$J$o$l!"(B
+$B$=$l$>$l$N(B yank $B$5$l$?9T$NA0$K(B @code{message-yank-prefix} $B$,IU$1$i$l$^(B
+$B$9(B ($B$9$G$K0zMQId(B @code{message-yank-cited-prefix} $B$,IU$$$F$$$k9T$H!"(B
+@code{message-yank-empty-prefix} $B$,IU$1$i$l$?6u9T$OBP>]30$G$9(B)$B!#%G%#%U%)(B
+$B%k%H$O(B @samp{> } $B$G$9!#(B
 
 @item message-yank-cited-prefix
 @vindex message-yank-cited-prefix
 @cindex yanking
 @cindex cited
 @cindex quoting
-$B5-;v$+$i0zMQ$5$l$?%F%-%9%H$,$9$G$K0zMQ$5$l$?$b$N$@$C$?$j6u$@$C$?>l9g!"$=(B
-$B$l$>$l$N9T$K$O$3$NJQ?t$NCM$,A0CV$5$l$^$9!#=i4|CM$O(B @samp{>} $B$G$9!#(B
+$B$9$G$K0zMQ$5$l$?%F%-%9%H$r4^$`5-;v$+$i(B yank $B$9$k$H$-!"$=$l$>$l$N9T$K$O$3(B
+$B$NJQ?t$NCM$,A0CV$5$l$^$9!#%G%#%U%)%k%H$O(B @samp{>} $B$G$9!#(B
+@code{message-yank-prefix} $B$b;2>H$7$F2<$5$$!#(B
+
+@item message-yank-empty-prefix
+@vindex message-yank-empty-prefix
+@cindex yanking
+@cindex quoting
+$B5-;v$+$i%F%-%9%H$r0zMQ$9$k$H$-!"$=$l$>$l$N6u9T$K$3$NJQ?t$NCM$,A0CV$5$l$^(B
+$B$9!#%G%#%U%)%k%H$O(B @samp{>} $B$G$9!#$3$NJQ?t$r6uJ8;z$K@_Dj$9$k$3$H$K$h$C$F!"(B
+$B0zMQ$5$l$?%F%-%9%H$r<+F0E*$KCJMnJ,$1$9$k$3$H$,$G$-$^$9!#(B
 @code{message-yank-prefix} $B$b;2>H$7$F2<$5$$!#(B
 
 @item message-yank-add-new-references
 @vindex message-yank-add-new-references
 @cindex yanking
-$B%3%^%s%I(B @code{message-yank-original} $B$rBPOCE*$K;H$C$?$H$-$K!"$3$NCM(B
-$B$,(B @code{nil} $B$G$J$+$C$?$i!"(BReferences $B%U%#!<%k%I$K(B ID $B$,DI2C$5$l$^$9!#(B
-$B$b$7CM$,%7%s%\%k(B @code{message-id-only} $B$@$C$?$i(B Message-ID $B%U%#!<%k%I(B
+@code{message-yank-original} $BL?Na$rBPOCE*$K;H$C$?$H$-$K!"$3$NCM(B
+$B$,(B @code{nil} $B$G$J$+$C$?$i!"(BReferences $B%X%C%@!<$K(B ID $B$,DI2C$5$l$^$9!#$b(B
+$B$7CM$,(B @code{message-id-only} $B$H$$$&%7%s%\%k$@$C$?$i!"(BMessage-ID $B%X%C%@!<(B
 $B$N(B ID $B$@$1$,;H$o$l$^$9$,!"$=$&$G$J$1$l$P(B References$B!"(BIn-Reply-To $B$*$h(B
-$B$S(B Message-ID $B%U%#!<%k%I$+$iCj=P$5$l$?(B ID $B$,;H$o$l$^$9!#(B
+$B$S(B Message-ID $B%X%C%@!<$+$iCj=P$5$l$?(B ID $B$,;H$o$l$^$9!#(B
 
 @item message-list-references-add-position
 @vindex message-list-references-add-position
 @cindex yanking
-$B%3%^%s%I(B @code{message-yank-original} $B$rBPOCE*$K;H$C$?$H$-$K!"$3$NCM$,(B
-$B@5$N@0?t$@$C$?$i!"$9$G$K$"$k(B References $B%U%#!<%k%I$N:G8e$+$i$=$N8D?t(B
-$B$N(B ID $B$@$1N%$l$?>l=j$K?7$7$$(B ID $B$,A^F~$5$l$^$9!#$=$l0J30$N>l9g$O:G8e$KA^(B
-$BF~$5$l$^$9!#(B
+@code{message-yank-original} $BL?Na$rBPOCE*$K;H$C$?$H$-$K!"$3$NCM$,@5$N@0(B
+$B?t$@$C$?$i!"$9$G$K$"$k(B References $B%X%C%@!<$N:G8e$+$i$=$N8D?t$N(B ID $B$@$1N%(B
+$B$l$?>l=j$K?7$7$$(B ID $B$,A^F~$5$l$^$9!#$=$l0J30$N>l9g$O:G8e$KA^F~$5$l$^$9!#(B
 
 @item message-indentation-spaces
 @vindex message-indentation-spaces
-$BE=$jIU$1$i$l$?%a%C%;!<%8$r;z2<$2$9$k$?$a$N6uGr$N?t$G$9!#(B
+Yank $B$5$l$?%a%C%;!<%8$r;z2<$2$9$k$?$a$N6uGr$N?t$G$9!#(B
 
 @item message-cite-function
 @vindex message-cite-function
@@ -1807,65 +1909,67 @@ Manual}, $B$K$"$j$^$9!#(B
 @findex sc-cite-original
 @findex message-cite-original-without-signature
 @cindex Supercite
-$BK\5-;v$r0zMQ$9$k$?$a$N4X?t$G$9!#=i4|CM$O(B @code{message-cite-original} $B$G!"(B
-$B$3$l$OC1=c$K$b$H$N%a%C%;!<%8$rA^F~$7!"$=$l$>$l$N9T$NF,$K(B @samp{> } $B$r$/$C(B
-$B$D$1$^$9!#(B@code{message-cite-original-without-signature} $B$OF1MM$N;v$r$7(B
-$B$^$9$,!"=pL>$O>J$-$^$9!#(BSupercite $B$r;H$&$?$a$K!"$=$l(B
-$B$r(B @code{sc-cite-original} $B$K@_Dj$9$k;v$b$G$-$^$9!#(B
+$B855-;v$r0zMQ$9$k$?$a$N4X?t$G$9!#%G%#%U%)%k%H(B
+$B$O(B @code{message-cite-original} $B$G!"$3$l$OC1=c$K85$N%a%C%;!<%8$rA^F~$7$F!"(B
+$B$=$l$>$l$N9T$NF,$K(B @samp{> } $B$r$/$CIU$1$^$9!#(B
+@code{message-cite-original-without-signature} $B$OF1MM$N$3$H$r$7$^$9$,!"(B
+$B=pL>$r>J$-$^$9!#(BSupercite $B$r;H$&$?$a$K!"$3$NJQ?t(B
+$B$r(B @code{sc-cite-original} $B$K@_Dj$9$k$3$H$b$G$-$^$9!#(B
 
 @item message-suspend-font-lock-when-citing
 @vindex message-suspend-font-lock-when-citing
-@code{nil} $B$G$J$1$l$P!"K\5-;v$r0zMQ$7$F$$$k4V(B font-lock $B$NF0:n$r;_$a$^$9!#(B
+@code{nil} $B$G$J$1$l$P!"855-;v$r0zMQ$7$F$$$k4V(B font-lock $B$NF0:n$r;_$a$^$9!#(B
 $B$$$/$D$+$N!"(BEmacs $B$,2K$J$H$-$KCY$l$FF0:n$9$k(B font-lock $B$N$?$a$N%D!<(B
 $B%k(B ($B$^$?$O(B Emacs $B<+?H(B) $B$K$O%P%0$,$"$j!"$=$l$i$O$7$P$7$P(B font-lock $B$NF0:n(B
-$B$r9T$J$&BP>]$H$J$k%P%C%U%!$rl$7$N$.$NBP:v(B
-$B$G$O$"$k$N$G$9$,!"$3$N%*%W%7%g%s$rHs(B-@code{nil} $B$K$9$k$3$H$K$h$C$F!"$"$J(B
-$B$?$OITL{2w$J%(%i!<$r2sHr$G$-$k$+$b$7$l$^$;$s!#(B
+$B$r9T$J$&BP>]$H$J$k%P%C%U%!!<$rl$7$N$.(B
+$B$NBP:v$G$O$"$k$N$G$9$,!"$3$N%*%W%7%g%s$rHs(B-@code{nil} $B$K$9$k$3$H$K$h$C$F!"(B
+$B$"$J$?$OITL{2w$J%(%i!<$r2sHr$G$-$k$+$b$7$l$^$;$s!#(B
 
 @item message-indent-citation-function
 @vindex message-indent-citation-function
-$B$A$g$&$I%a!<%k%P%C%U%!$KA^F~$5$l$?0zMQJ8$r=$@5$9$k$?$a$N4X?t$G$9!#$3$l$O(B
-$B4X?t$N%j%9%H$G$"$k;v$b$G$-$^$9!#$=$l$>$l$N4X?t(B
-$B$O(B @code{(point)} $B$H(B @code{(mark t)} $B$N4V$G0zMQ$rH/8+$9$k;v$,$G$-$^$9!#(B
-$B$=$7$F!"$=$l$>$l$N4X?t$O0zMQJ8$,=$@5$5$l$k$H!"$=$N<~$j$K%]%$%s%H$H%^!<%/(B
-$B$r;D$5$J$1$l$P$J$j$^$;$s!#(B
+$B%a!<%k%P%C%U%!!<$KA^F~$5$l$?0zMQJ8$r=$@5$9$k$?$a$N4X?t$G$9!#$3$l$O4X?t$N(B
+$B%j%9%H$G$"$k$3$H$b$G$-$^$9!#$=$l$>$l$N4X?t(B
+$B$O(B @code{(point)} $B$H(B @code{(mark t)} $B$N4V$G0zMQ$r8+$D$1$k$3$H$,$G$-$^$9!#(B
+$B$=$7$F$=$l$>$l$N4X?t$O!"=$@5$5$l$?0zMQJ8$N<~$j(B ($B$N=$@5A0$HF1Ey$N>l=j(B) $B$K(B
+$B%]%$%s%H$H%^!<%/$,CV$+$l$?$^$^$K$J$C$F$$$k$h$&$K$7$J$1$l$P$J$j$^$;$s!#(B
 
 @item message-mark-insert-begin
 @vindex message-mark-insert-begin
-$B$$$/$D$+$NA^F~$5$l$?%F%-%9%H$N;O$^$j$K0u$rIU$1$k$?$a$NJ8;zNs$G$9!#(B
+$BA^F~$5$l$?2?$i$+$N%F%-%9%H$N;O$^$j$K!"0u$rIU$1$k$?$a$NJ8;zNs$G$9!#(B
 
 @item message-mark-insert-end
 @vindex message-mark-insert-end
-$B$$$/$D$+$NA^F~$5$l$?%F%-%9%H$N=*$j$K0u$rIU$1$k$?$a$NJ8;zNs$G$9!#(B
+$BA^F~$5$l$?2?$i$+$N%F%-%9%H$N=*$j$K!"0u$rIU$1$k$?$a$NJ8;zNs$G$9!#(B
 
 @item message-signature
 @vindex message-signature
-$B%a%C%;!<%8%P%C%U%!$N:G8e$KA^F~$5$l$kJ8;zNs$G$9!#$b$7(B @code{t} ($B$3$l$,=i(B
-$B4|@_Dj$G$9(B) $B$G$"$l$P!"%U%!%$%k(B @code{message-signature-file} $B$,Be$o$j$K(B
-$BA^F~$5$l$^$9!#$b$74X?t$G$"$l$P!"4X?t$N7k2L$,Be$o$j$K;H$o$l$^$9!#$b$7<0$G(B
-$B$"$l$P!"<0$N7k2L$,JQ$o$j$K;H$o$l$^$9!#$3$NJQ?t$,(B @code{nil} $B$G$"$l$P!"=p(B
-$BL>$OA4$/A^F~$5$l$^$;$s!#(B
+$B%a%C%;!<%8%P%C%U%!!<$N:G8e$KA^F~$5$l$kJ8;zNs$G$9!#$b$7(B @code{t} ($B$3$l$,(B
+$B%G%#%U%)%k%H$G$9(B) $B$G$"$l$P!"%U%!%$%k(B @code{message-signature-file} $B$,Be(B
+$B$o$j$KA^F~$5$l$^$9!#$b$74X?t$G$"$l$P!"4X?t$N7k2L$,Be$o$j$K;H$o$l$^$9!#$b(B
+$B$7<0$G$"$l$P!"<0$N7k2L$,JQ$o$j$K;H$o$l$^$9!#$3$NJQ?t$,(B @code{nil} $B$@$C$?(B
+$B$i!"=pL>$O$^$C$?$/A^F~$5$l$^$;$s!#(B
 
 @item message-signature-file
 @vindex message-signature-file
-$B%P%C%U%!$N:G8e$KA^F~$5$l$k=pL>$NF~$C$F$$$k%U%!%$%k$G$9!#=i4|CM(B
+$B%P%C%U%!!<$N:G8e$KA^F~$5$l$k!"=pL>$NF~$C$F$$$k%U%!%$%k$G$9!#%G%#%U%)%k%H(B
 $B$O(B @file{~/.signature} $B$G$9!#(B
 
 @item message-signature-insert-empty-line
 @vindex message-signature-insert-empty-line
-@code{t} ($B%G%#%U%)%k%H(B) $B$@$C$?$i!"=pL>$HK\BN$rJ,N%$9$k5-9f$NA0$K6u9T$,A^(B
-$BF~$5$l$^$9!#(B
+@code{t} ($B%G%#%U%)%k%HCM(B) $B$@$C$?$i!"=pL>$HK\J8$rJ,N%$9$k5-9f$NA0$K6u9T$,(B
+$BA^F~$5$l$^$9!#(B
 @end table
 
-RFC1036bis $B$O!"=pL>$O$=$NA0$K(B @samp{-- } $B$N(B3$BJ8;z$@$1$N9T$,$"$k$Y$-$G$"$k(B
-$B$H8@$C$F$$$k;v$KCm0U$7$F2<$5$$!#$3$l$O$rG'<1$7$F!"=h(B
-$BM}$r$9$k;v$r4JC1$K$9$k$?$a$G$9!#$G$9$+$i!"$"$J$?$NH~$7$$%G%6%$%s$r$=$l$,!"(B
-$B$"$N!"40A4$KGK2u$7$F$$$k$H46$8$F$b$=$l$i$NJ8;z$r$O$=$NA0$K(B @samp{-- } $B$N;0J8;z$@$1$N9T$,$"$k$Y$-$G$"(B
+$B$k$H8@$C$F$$$k$3$H$KCm0U$7$F2<$5$$!#$3$l$O$rG'<1$7$F!"(B
+$B=hM}$r$9$k$3$H$r4JC1$K$9$k$?$a$G$9!#$G$9$+$i!"$=$N!"$"$J$?$NH~$7$$%G%6%$(B
+$B%s$r!"$=$l$,BfL5$7$K$7$F$$$k$H46$8$F$b!"$=$l$i$NJ8;z$r$O(B4$B9T$h$jB?$/$J$k$Y$-$G$OL5$$$H8@$&;v$bCm0U$7$F2<$5$$!#(B
-@acronym{ASCII} $B$N3($rF~$l$k;v$O!"3'$K$"$J$?$,GO$O;M9T$h$jB?$/$J$k$Y$-$G$OL5$$$H8@$&$3$H$bCm0U$7$F2<$5$$!#(B
+@acronym{ASCII} $B$N3($rF~$l$k$3$H$O!"3'$K$"$J$?$,GO$HK\BN$rJ,N%$9$k5-9f$K9gCW$9$k@55,I=8=$G$9!#=i4|CM(B
+$B=pL>$HK\J8$rJ,N%$9$k5-9f$K9gCW$9$k@55,I=8=$G$9!#%G%#%U%)%k%H(B
 $B$O(B @samp{^-- *$} $B$G$9!#(B
 
 @item mail-header-separator
 @vindex mail-header-separator
-$B%X%C%@!<$rK\BN$+$iJ,$1$k$N$K;H$o$l$kJ8;zNs$G$9!#=i4|CM$O(B @samp{--text
-follows this line--} $B$G$9!#(B
+$B%X%C%@!<$rK\J8$+$iJ,$1$k$?$a$K;H$o$l$kJ8;zNs$G$9!#%G%#%U%)%k%H(B
+$B$O(B @samp{--text follows this line--} $B$G$9!#(B
 
 @item message-directory
 @vindex message-directory
-$BB?$/$N%a!<%k$N$b$N$+$i;H$o$l$k%G%#%l%/%H%j!<$G$9!#=i4|CM(B
-$B$O(B @file{~/Mail/} $B$G$9!#(B
+$B%a!<%k$K4X78$9$kB?$/$N=hM}$G;H$o$l$k%G%#%l%/%H%j!<$G$9!#%G%#%U%)%k%H(B
+$B$O(B @file{~/Mail/} $B$G$9!#%a!<%k$K4X$9$kB>$N%U%!%$%kL>$d%G%#%l%/%H%j!$r(B
+$B;XDj$9$kJQ?t$NCM$O!"$3$N(B @code{message-directory} $B$NCM$r4pE@$K$7$FGI@8$7(B
+$B$^$9!#(B
 
 @item message-auto-save-directory
 @vindex message-auto-save-directory
-gnus $B$,F0:n$7$F$$$J$$$H$-$K(B Message $B$,%P%C%U%!$r<+F0J]B8$9$k%G%#%l%/%H%j(B
-$B$G$9!#(B@code{nil} $B$@$C$?$i(B Message $B$O<+F0J]B8$r9T$J$$$^$;$s!#%G%#%U%)%k%H(B
-$B$O(B @file{~/Mail/drafts/} $B$G$9!#(B
+gnus $B$,F0:n$7$F$$$J$$$H$-$K(B Message $B$,%P%C%U%!!<$r<+F0J]B8$9$k%G%#%l%/%H(B
+$B%j!<$G$9!#(B@code{nil} $B$@$C$?$i(B Message $B$O<+F0J]B8$r9T$J$$$^$;$s!#%G%#%U%)(B
+$B%k%H$O(B @file{~/Mail/drafts/} $B$G$9!#(B
 
 @item message-signature-setup-hook
 @vindex message-signature-setup-hook
-$B%a%C%;!<%8%P%C%U%!$r=i4|2=$9$k$H$-$K$,A^F~$5$l$kA0$K$,A^F~$5$l$F$$$J$$$H$-$KO$,A^(B
-$BF~$5$l$kA0$KO$,A^F~(B
+$B$5$l$F$$$J$$$H$-$Kl9g$O%X%C%@!<$r2C$($^$;$s!#(B
+$B$3$N4X?t$O!"$=$N%X%C%@!<$,$9$G$KB8:_$7$F$$$k>l9g$O%X%C%@!<$r2C$($^$;$s!#(B
 
 @item message-send-mail-hook
 @vindex message-send-mail-hook
 $B%a!<%k%a%C%;!<%8$rAw$kA0$Ko$KCY$$;~(B
-$B4|(B - $B%a%C%;!<%8$,%a!<%k$H$7$FA0(B -- $B$KA0(B---$B$Ko$KCY$$(B
-$B;~4|(B - $B%a%C%;!<%8$,%K%e!<%9$H$7$FA0(B -- $B$KA0(B---$B$KC$9$H$-$KC$7(B (cancel) $B$r9T$J$&$H$-$K$l$NMWAG$O$l$NMWAG$O(B
+$BN$r;XDj$9$k%7%s%\%k$G$9!#(B
 
 @item predicate
-$B%a%C%;!<%8$O(B @var{type} $B$N%a%C%;!<%8$G$"$k$+$I$&$+$r7hDj$9$k$?$a$K0z?tL5(B
-$B$7$G8F$P$l$k4X?t$G$9!#(B
+$B$=$N%a%C%;!<%8$,(B @var{type} $B$N7?$N%a%C%;!<%8$G$"$k$+$I$&$+$rH=Dj$9$k$?$a(B
+$B$K!"0z?tL5$7$G8F$P$l$k4X?t$G$9!#4X?t$O$=$N%a%C%;!<%8$,$"$k%P%C%U%!!<$G8F(B
+$B$S=P$5$l$^$9!#(B
 
 @item function
-@var{predicate} $B$,(B @code{nil} $B$G$J$$CM$r5"$7$?$H$-$K8F$P$l$k4X?t$G$9!#(B
-@var{function} $B$O0l$D$N0z?t(B---$B@\F,<-(B---$B$H6&$K8F$P$l$^$9!#(B
+@var{predicate} $B$,(B @code{nil} $B$G$O$J$$CM$rJV$7$?$H$-$K8F$P$l$k4X?t$G$9!#(B
+@var{function} $B$O0l$D$N0z?t(B---$B@\F,0z?t(B ($BLuCm(B: @kbd{C-c C-c} $BL?Na$K@hN)$C(B
+$B$FM?$($i$l$?@\F,0z?t(B)---$B$H6&$K8F$P$l$^$9!#(B
 @end table
 
+$B%G%#%U%)%k%H$Ol(B
+$B9g$K(B @code{nil} $B$G$O$J$$CM$rJV$7!"(B@code{message-send-via-news} $B4X?t(B
+$B$O(B @code{message-send-news-function} $BJQ?t(B (@pxref{News Variables}) $B$K@_(B
+$BDj$5$l$?4X?t$r8F$S=P$7$F!"$=$N%a%C%;!<%8$rAw?.$7$^$9!#(B
+@code{message-mail-p} $B4X?t$O$=$N%a%C%;!<%8$,%a!<%k$N$h$&$K8+$($k>l9g(B
+$B$K(B @code{nil} $B$G$O$J$$CM$rJV$7!"(B@code{message-send-via-mail} $B4X?t(B
+$B$O(B @code{message-send-mail-function} $BJQ?t(B (@pxref{Mail Variables}) $B$K@_(B
+$BDj$5$l$?4X?t$r8F$S=P$7$F!"$=$N%a%C%;!<%8$rAw?.$7$^$9!#(B
+
+@code{message-send-method-alist} $B$N3FMWAG$O@hF,$+$i=g$K$9$Y$F;n$5$l$k$N(B
+$B$G!"Nc$($PM-8z$J(B @samp{Newsgroups:} $B%X%C%@!<$H(B @samp{To:} $B%X%C%@!<$NN>J}(B
+$B$r;}$C$F$$$k%a%C%;!<%8$O!"$^$:%K%e!<%9$H$7$FAw?.$5$l$?8e$K%a!<%k$H$7$F$b(B
+$BAw?.$5$l$^$9!#(B
 @end table
 
 @node Sending Variables
 @section $BAw$k$?$a$NJQ?t(B
 
 @table @code
-
 @item message-fcc-handler-function
 @vindex message-fcc-handler-function
-$B=P$F$$$/5-;v$rJ]B8$9$k$?$a$K8F$P$l$k4X?t$G$9!#$3$N4X?t$O5-;v$rC_@Q$9$k$?(B
-$B$a$N%U%!%$%kL>$H6&$K8F$P$l$^$9!#=i4|@_Dj$N4X?t$O(B @code{message-output}
-$B$G!"$=$l$O(B Unix mailbox $BMM<0$GJ]B8$7$^$9!#(B
+$B=P$F9T$/5-;v$rJ]B8$9$k$?$a$K8F$P$l$k4X?t$G$9!#$3$N4X?t$O5-;v$r3JG<$9$k$?(B
+$B$a$N%U%!%$%kL>$H6&$K8F$P$l$^$9!#%G%#%U%)%k%H$N4X?t$O(B Unix mailbox $BMM<0$G(B
+$BJ]B8$9$k(B @code{message-output} $B$G$9!#(B
 
 @item message-courtesy-message
 @vindex messsage-courtesy-messsage
-$BJ#9g%a%C%;!<%8$rAw$k$H$-$O!"$3$NJ8;zNs$O%a!<%k$GAw$i$l$?J#@=$NJ}$N:G=i$K(B
-$BA^F~$5$l$^$9!#$b$7$=$NJ8;zNs$,=qK!;EMM;XDj(B @samp{%s} $B$r4^$s$G$$$l$P!"5-(B
-$B;v$,Ej9F$5$l$?%K%e!<%9%0%k!<%W$,$=$3$KA^F~$5$l$^$9!#$b$7$3$NJQ?t(B
-$B$,(B @code{nil} $B$G$"$l$P!"$=$N$h$&$J?F@Z%a%C%;!<%8$O2C$($i$l$^$;$s!#=i4|CM(B
-$B$O(B @samp{"The following message is a courtesy copy of an article\nthat has
-been posted to %s as well.\n\n"} $B$G$9!#(B
-
+$BJ#9g%a%C%;!<%8(B ($BLuCm(B: $B%K%e!<%9$H%a!<%k$NN>J}$GAw?.$9$k%a%C%;!<%8(B) $B$rAw$k(B
+$B$H$-$K!"$3$NJ8;zNs$,%a!<%k$GAw$i$l$kJ#@=$NJ}$NK\J8$N@hF,$KA^F~$5$l$^$9!#(B
+$B$b$7$=$NJ8;zNs$,(B @samp{%s} $B=qK!;EMM$r4^$s$G$$$?$i!"5-;v$,Ej9F$5$l$?%K%e!<(B
+$B%9%0%k!<%W$,$=$3$KA^F~$5$l$^$9!#$3$NJQ?t$,(B @code{nil} $B$@$C$?$i!"$=$N$h$&(B
+$B$J?F@Z%a%C%;!<%8$O2C$($i$l$^$;$s!#%G%#%U%)%k%HCM$O(B @samp{"The following
+message is a courtesy copy of an article\nthat has been posted to %s as
+well.\n\n"} $B$G$9!#(B
+@c
 @c @item message-fcc-externalize-attachments
 @c @vindex message-fcc-externalize-attachments
 @c If @code{nil}, attach files as normal parts in Fcc copies; if it is
@@ -2045,53 +2178,54 @@ been posted to %s as well.\n\n"} $B$G$9!#(B
 
 @item message-interactive
 @vindex message-interactive
-$BHs(B-@code{nil} $B$G!"%a%C%;!<%8$rAw?.$9$k$H$-$K%(%i!<$,=P$k$N$rBT$C$F$rI=<((B
-$B$7$^$9!#(B@code{nil} $B$@$C$?$i!"%a%$%i!<$K%(%i!<$NJs9p$r%a!<%k$G9T$J$o$;$^(B
-$B$9!#(B
+@code{nil} $B$G$J$+$C$?$i!"%a%C%;!<%8$rAw?.$9$k$H$-$K%(%i!<$,=P$k$N$rBT$C(B
+$B$FI=<($7$^$9!#(B@code{nil} $B$@$C$?$i!"%(%i!<$NJs9p$r%a!<%k$G9T$J$$$^$9!#(B
 @end table
 
 @node Message Buffers
-@section $B%a%C%;!<%8%P%C%U%!(B
+@section $B%a%C%;!<%8%P%C%U%!!<(B
 
-Message $B$O$"$J$?$,%a%C%;!<%8%P%C%U%!$rMW5a$7$?$H$-$K!"B>$KL5$$M#0l$N%P%C(B
-$B%U%!L>$G?7$7$$%P%C%U%!$r$D$/$j$^$9!#%a%C%;!<%8$rAw$C$?$H$-$K!"%P%C%U%!$O(B
-$BIaDL$O:o=|$5$l$^$;$s!#$=$NL>A0$OJQ99$5$l$F!"FCDj$N?t$N8E$$%a%C%;!<%8%P%C(B
-$B%U%!$O@8$-$?$^$^$K$J$j$^$9!#(B
+Message $B$O$"$J$?$,%a%C%;!<%8%P%C%U%!!<$rMW5a$7$?$H$-$K!"%f%K!<%/$J(B ($BM#0l(B
+$BL5Fs$N(B) $B%P%C%U%!!$G?7$7$$%P%C%U%!!<$r:n$j$^$9!#%a%C%;!<%8$rAw$C$?$H$-(B
+$B$K!"%P%C%U%!!<$OIaDL$O:o=|$5$l$^$;$s!#$=$NL>A0$OJQ99$5$l$F!"FCDj$N?t$N8E(B
+$B$$%a%C%;!<%8%P%C%U%!!<$,;D$5$l$^$9!#(B
 
 @table @code
 @item message-generate-new-buffers
 @vindex message-generate-new-buffers
-@code{nil} $B$G$J$1$l$P!"?7$7$$%P%C%U%!$r:n@.$7$^$9!#=i4|CM$O(B @code{t} $B$G(B
-$B$9!#$b$7$3$l$,4X?t$J$i!"$=$N4X?t$r(B3$B$D$N0z?t$H6&$K8F$S$^$9(B: $B7?!"Aw$j@h%"(B
-$B%I%l%9!"%0%k!<%WL>(B $B$G$9!#(B ($B$3$l$i$N$I$l$G$b(B @code{nil} $B$G$"$k$+$b$7$l$^(B
-$B$;$s!#(B) $B4X?t$O?7$7$$%P%C%U%!L>$rJV$9$Y$-$G$9!#(B
+@code{nil} $B$G$J$1$l$P!"?7$7$$%P%C%U%!!<$r:n@.$7$^$9!#%G%#%U%)%k%H(B
+$B$O(B @code{t} $B$G$9!#$b$7$3$l$,4X?t$@$C$?$i!"$=$N4X?t$r;0$D$N0z?t(B---$B$=$N7?!"(B
+$BAw$j@h$N%"%I%l%9!"%0%k!<%WL>(B---$B$H6&$K8F$S$^$9!#(B($B$3$l$i$N$I$l$G$b(B
+$B$,(B @code{nil} $B$+$b$7$l$^$;$s!#(B) $B$=$N4X?t$O?7$7$$%P%C%U%!!$rJV$5$J$1$l(B
+$B$P$J$j$^$;$s!#(B
 
 @item message-use-multi-frames
 @vindex message-use-multi-frames
-@code{nil} $B$G$J$1$l$P!"?7$7$$%U%l!<%`$r:n@.$7$^$9!#=i4|CM$O(B @code{nil}
-$B$G$9!#(B
+@code{nil} $B$G$J$1$l$P!"?7$7$$%U%l!<%`$r:n@.$7$^$9!#%G%#%U%)%k%H(B
+$B$O(B @code{nil} $B$G$9!#(B
 
 @item message-delete-frame-on-exit
 @vindex messgae-delete-frame-on-exit
-$BJQ?t(B @code{message-delete-frame-on-exit} $B$O%a%C%;!<%8$rAw?.$7$?$H$-$H!"(B
-$B%P%C%U%!$r@Z$C$?$H$-$K%U%l!<%`$r>C5n$9$k$+$r7hDj$7$^$9!#(B@code{nil} $B$G$"(B
-$B$l$P!"(B($B$3$l$,=i4|@_Dj$G$9$,(B) $B%U%l!<%`$r>C5n$7$^$;$s!#(B@code{ask} $B$G$"$l$P!"(B
-$B>C5n$9$k$+$I$&$+$rMxMQo$K>C5n$7$^$9!#(B
+@code{message-delete-frame-on-exit} $BJQ?t$O!"%a%C%;!<%8$rAw?.$7$?$H$-$H%P%C(B
+$B%U%!!<$r(B kill $B$7$?$H$-$K%U%l!<%`$r>C5n$9$k$+$I$&$+$r7hDj$7$^$9!#(B
+@code{nil} $B$@$C$?$i(B ($B$3$l$,%G%#%U%)%k%H$G$9$,(B) $B%U%l!<%`$r>C5n$7$^$;$s!#(B
+@code{ask} $B$G$"$l$P!">C5n$9$k$+$I$&$+$rMxMQo$K>C5n$7$^$9!#(B
 
 @item message-max-buffers
 @vindex message-max-buffers
-$B$3$NJQ?t$O$I$N$/$i$$8E$$%a%C%;!<%8%P%C%U%!$rJ]$C$F$*$/$+$r;XDj$7$^$9!#$3(B
-$B$l$h$jB?$$%a%C%;!<%8%P%C%U%!$,$"$l$P!"0lHV8E$$%P%C%U%!$,:o=|$5$l$^$9!#=i(B
-$B4|CM$O(B10$B$G$9!#$3$NJQ?t$,(B @code{nil} $B$G$"$k$H!"8E$$%a%C%;!<%8%P%C%U%!$O:o(B
-$B=|$5$l$^$;$s!#(B
+$B$3$NJQ?t$O$I$N$/$i$$8E$$%a%C%;!<%8%P%C%U%!!<$r;D$7$F$*$/$+$r;XDj$7$^$9!#(B
+$B$3$l$h$jB?$$%a%C%;!<%8%P%C%U%!!<$,$"$l$P!"0lHV8E$$%P%C%U%!!<$,:o=|$5$l$^(B
+$B$9!#%G%#%U%)%k%H$O(B 10 $B$G$9!#$3$NJQ?t$,(B @code{nil} $B$@$C$?$i!"8E$$%a%C%;!<(B
+$B%8%P%C%U%!!<$O:o=|$5$l$^$;$s!#(B
 
 @item message-send-rename-function
 @vindex message-send-rename-function
-$B%a%C%;!<%8$rAw$C$?8e$G!"%P%C%U%!$NL>A0$O!"Nc$($P!"(B@samp{*reply to Lars*}
-$B$+$i(B @samp{*sent reply to Lars*} $B$KJQ99$5$l$^$9!#$b$7$3$l$r9%$^$J$$$J$i!"(B
-$B$3$NJQ?t$r$"$J$?$N9%$-$JJ}K!$G%P%C%U%!$NL>A0$rJQ99$9$k4X?t$K@_Dj$7$F2<$5(B
-$B$$!#$=$b$=$b%P%C%U%!L>$rJQ99$9$k;v$r9%$^$J$$$N$G$"$l$P!"A0$O!"Nc$((B
+$B$P(B @samp{*reply to Lars*} $B$+$i(B @samp{*sent reply to Lars*} $B$KJQ99$5$l$^(B
+$B$9!#$b$7$3$l$,9%$-$G$O$J$$$N$J$i$P!"$3$NJQ?t$r$"$J$?$N9%$-$JJ}K!$G%P%C(B
+$B%U%!!<$NL>A0$rJQ99$9$k4X?t$K@_Dj$7$F2<$5$$!#$=$b$=$b%P%C%U%!!$rJQ99$9(B
+$B$k$3$H$r9%$^$J$$$N$G$"$l$P!"$KL5$$M#0l$N%P%C(B
 
 @item message-kill-buffer-on-exit
 @vindex message-kill-buffer-on-exit
-@code{nil} $B$G$J$1$l$P!"=*N;;~$K$9$0$K%P%C%U%!$r:o=|$7$^$9!#(B
+@code{nil} $B$G$J$1$l$P!"=*N;;~$K$9$0$K%P%C%U%!!<$r:o=|$7$^$9!#(B
 
 @item message-kill-buffer-query-function
 @vindex message-kill-buffer-query-function
 @findex message-kill-buffer
 @findex message-mimic-kill-buffer
-$B%3%^%s(B
-$B%I(B @code{message-kill-buffer} $B$d(B @code{message-mimic-kill-buffer} $B$G!"%P%C(B
-$B%U%!$r:o=|$9$k$+$I$&$+$r%f!<%6$K?R$M$k$H$-$K;H$&4X?t$N;XDj$G$9!#%G%#%U%)(B
-$B%k%H$O(B @code{yes-or-no-p} $B$G$9$,!"(B
+@code{message-kill-buffer} $BL?Na$d(B @code{message-mimic-kill-buffer} $B$G!"(B
+$B%P%C%U%!!<$r:o=|$9$k$+$I$&$+$rMxMQr7o$K%P%C%U%!$r:o=|$7$^$9!#(B
+@code{t} $B$K$9$k$HL5>r7o$K%P%C%U%!!<$r:o=|$7$^$9!#(B
 
 @item message-kill-buffer-and-remove-file
 @vindex message-kill-buffer-and-remove-file
 @findex message-kill-buffer
 @findex message-mimic-kill-buffer
-$BHs(B-@code{nil} $B$@$C$?$i!"%P%C%U%!$r:o=|$7$?8e$G$b$7%P%C%/%"%C%W%U%!%$%k$,(B
-$B$"$C$?$i!"%f!<%6$K3NG'$7$F$+$i$=$l$b:o=|$7$^$9!#(B@code{nil} $B$G$O%U%!%$%k(B
-$B$r:o=|$7$^$;$s!#%G%#%U%)%k%H$O(B @code{t} $B$G$9!#$?$@$7!"%3%^%s(B
-$B%I(B @code{message-mimic-kill-buffer} $B$O$3$l$,(B @code{nil} $B$G$"$k$b$N$H$7$F(B
-$BF0:n$7$^$9!#(B
+$BHs(B-@code{nil} $B$@$C$?$i!"%P%C%U%!!<$r:o=|$7$?8e$G$b$7%P%C%/%"%C%W%U%!%$%k(B
+$B$,$"$C$?$i!"MxMQ$N2D(B
-$BG=@-$K$O(B @kbd{C-c C-s} $B$,$"$j!"$3$l$O%a%C%;!<%8$rAw$k$@$1$G$"$j!"(B
-@kbd{C-c C-d} $B$O%a%C%;!<%8$NJT=8$r@h$K1d$P$7$F%a%C%;!<%8%P%C%U%!$rKd$a!"(B
-@kbd{C-c C-k} $B$O%a%C%;!<%8%P%C%U%!$r:o=|$7$^$9!#$3$l$i$NF0:n$O$=$l$>$l$=(B
-$B$l$H4XO"IU$1$i$l$?%j%9%H$r;}$C$F$$$F!"$=$l$O$N2DG=@-$H$7$F$O(B @kbd{C-c C-s} $B$,$"$j$^$9!#$3$l$O%a%C%;!<%8$rAw$k$@$1(B
+$B$G$9!#(B@kbd{C-c C-d} $B$O%a%C%;!<%8$r8e$GJT=8$9$k$3$H$K$7$F!"%a%C%;!<%8%P%C(B
+$B%U%!!<$r(B @code{bury-buffer} $B$7$^$9(B ($BLuCm(B: $B$=$l$r(B Emacs $B>e$KB8:_$9$k%P%C(B
+$B%U%!!<$N%j%9%H$N:G8e$NMWAG$K$7$F1#$7$^$9(B)$B!#$=$7$F(B @kbd{C-c C-k} $B$O%a%C%;!<(B
+$B%8%P%C%U%!!<$r:o=|$7$^$9!#$3$l$i$N$=$l$>$l$NF0:n$O!"$=$l$i$H4XO"IU$1$i$l(B
+$B$?@A$1Ii$$;E;v$r4^$s$G$$$k%j%9%H$r;}$C$F$$$^$9!#$=$N%j%9%H(B
+$B$O(B @code{message-send-actions}, @code{message-exit-actions},
+@code{message-postpone-actions} $B$*$h$S(B @code{message-kill-actions} $B$G$9!#(B
+
+Message $B$O$3$l$i$N%j%9%H$rA`:n$9$k$?$a$K(B @code{message-add-action} $B4X?t(B
+$B$rMQ0U$7$F$$$^$9!#Bh0l0z?t$O2C$($i$l$k@A$1Ii$$;E;v$G!";D$j$N0z?t$O$I$N%j(B
+$B%9%H$K$3$N@A$1Ii$$;E;v$r2C$($k$+$r;XDj$7$^$9!#$3$l$O(B gnus $B$+$i;H$&Nc$G$9(B:
 
 @lisp
   (message-add-action
@@ -2154,44 +2289,50 @@ Message $B$O$3$l$i$N%j%9%H$H:nMQ$9$k4X?t$rDs6!$7$F$$$^$9(B:
    'exit 'postpone 'kill)
 @end lisp
 
-$B$3$l$O!"%a%C%;!<%8%P%C%U%!$,:o=|!"1d4|!"=*N;$5$l$?$H$-$K(B gnus $B$N%&%#%s(B
-$B%I%&@_Dj$rI|3h$5$;$^$9!#(B
+$B$3$l$O%a%C%;!<%8%P%C%U%!!<$,:o=|(B (kill)$B!"1d4|(B (postpone)$B!"=*N;(B (kill) $B$5(B
+$B$l$?$H$-$K!"(Bgnus $B$N%&%#%s%I%&G[CV$rI|3h$5$;$k$?$a$N$b$N$G$9!#(B
+
+$BBh0l0z?t$KM?$($k!V@A$1Ii$$;E;v!W$O2A(B) $B$5$l$k<0$G$9!#(B
 
-@dfn{$BF0:n(B} $B$O2A(B} $B$5$l$k<0$G$9!#(B
+$BLuCm(B: $B$?$V$se!"$=$l<+?H$NJQ?t$7$+;H$$$^$;$s(B---$B8E$$(B @code{mail-} $B$NJQ(B
-$B?t$O9MN8$5$l$^$;$s!#(BMessage $B$K$3$l$i$NJQ?t$r7W;;$KF~$l$5$;$?$$$N$G$"$l$P!"(B
-$B0J2<$N$b$N$r(B @file{.emacs} $B%U%!%$%k$KF~$l$k;v$,$G$-$^$9(B:
+Message $B$O;ve$=$l<+?H$NJQ?t$7$+;H$o$:(B (*)$B!"8E$$(B @code{mail-} $BJQ?t$O9M(B
+$BN8$KF~$l$^$;$s!#$3$l$i$NJQ?t$r(B Message $B$,9M$($KF~$l$k$h$&$K$5$;$?$$$N$G(B
+$B$"$l$P!"0J2<$N$b$N$r(B @file{.emacs} $B%U%!%$%k$KF~$l$l$PNI$$$G$7$g$&(B:
 
 @lisp
 (require 'messcompat)
 @end lisp
 
-$B$3$l$OB?$/$N(B Message $BJQ?t$rBP1~$9$k%a!<%kJQ?t$+$i=i4|2=$7$^$9!#(B
+$B$3$l$OB?$/$N(B Message $BJQ?t$r!"$=$l$i$KBP1~$9$k(B @code{mail-} $BJQ?t$NCM$K4p(B
+$B$E$$$F=i4|2=$7$^$9!#(B
+
+$BLuCm(B*: $Be!"$=$l<+?H$NJQ?t$7$+;H$$$^$;$s(B---$B8E$$(B @code{mail-} 
 @end table
 
 @item wide reply
-@dfn{$B9-$$JVEz(B} (wide reply) $B$O1~Ez$7$h$&$H$7$F$$$k%a%C%;!<%8$K=q$+$l$F$$(B
-$B$?(B @emph{$BA4$F$N(B} $Bl9g$O$=$l$,Be$o$j(B
-$B$K;H$o$l$^$9(B)$B!#(B
+(@code{Reply-To} $B$,L5$$8B$j$3$l$,;H$o$l$^$9$,!"$"$k>l9g$OBe$o$j$K$=$l$,(B
+$B;H$o$l$^$9(B)$B!#(B
 
 @item Cc
 
 @item To
 @end table
 
-@code{Mail-Copies-To} $B%X%C%@!<$,B8:_$7$F$$$k$H!"$=$l$b%a!<%k%\%C%/%9$N%j(B
-$B%9%H$K2C$($i$l$k$G$7$g$&!#$3$N%X%C%@!<$,(B @samp{never} $B$G$"$l$P!"$=$l(B
-$B$O(B @code{From} ($B$b$7$/$O(B @code{Reply-To}) $B%a!<%k%\%C%/%9$,M^@)$5$l$k$H8@(B
-$B$&;v$G$9!#(B
+@code{Mail-Copies-To} $B%X%C%@!<$,B8:_$7$F$$$?$J$i$P!"$=$l$b08@h$N%j%9%H$K(B
+$B2C$($i$l$^$9!#$3$N%X%C%@!<$,(B @samp{never} $B$@$C$?$i!"(B@code{From} ($B$^$?(B
+$B$O(B @code{Reply-To}) $B$N%a!<%k%"%I%l%9$r=|30$7$J$1$l$P$J$i$J$$$H$$$&$3$H$G(B
+$B$9!#(B
 
 @item followup
-@dfn{$B%U%)%m!<%"%C%W(B} (followup) $B$O%K%e!<%9$K$h$k1~Ez$G$9!#0J2<$N%X%C(B
-$B%@!<(B ($BM%@h=g0L$N9b$$$b$N$+$i5s$2$i$l$F$$$^$9(B) $B$,2?=h$K1~Ez$,Aw$i$l$k$+$r(B
-$B7hDj$7$^$9(B:
+$B!V%U%)%m!<%"%C%W!W(B(followup) $B$O%K%e!<%9$GAw$k1~Ez$G$9!#0J2<$N%X%C(B
+$B%@!<(B ($BM%@h=g0L$,9b$$=g$KJB$s$G$$$^$9(B) $B$G!"$I$3$K1~Ez$rAw$k$+$r7hDj$7$^$9(B:
 
 @table @code
-
 @item Followup-To
 
 @item Newsgroups
 @end table
 
-$B$b$7(B @code{Mail-Copies-To} $B%X%C%@!<$,B8:_$9$k$H!"$=$l$,(B @samp{never} $B$G(B
-$B$J$1$l$P!"?7$7$$(B @code{Cc} $B%X%C%@!<$N4p$H$7$F;H$o$l$^$9!#(B
+$B$b$7(B @code{Mail-Copies-To} $B%X%C%@!<$,$"$C$?$J$i$P!"$=$l(B
+$B$,(B @samp{never} $B$G$J$$8B$j!"?7$7$$(B @code{Cc} $B%X%C%@!<$N4p$H$7$F;H$o$l$^(B
+$B$9!#(B
 @end table
 
 @node Index
diff --git a/texi/message.texi b/texi/message.texi
index aabc72f..fb3de3c 100644
--- a/texi/message.texi
+++ b/texi/message.texi
@@ -8,12 +8,12 @@
 @copying
 This file documents Message, the Emacs message composition mode.
 
-Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 
-Free Software Foundation, Inc.
+Copyright @copyright{} 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+2004, 2005, 2006 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
+under the terms of the GNU Free Documentation License, Version 1.2 or
 any later version published by the Free Software Foundation; with no
 Invariant Sections, with the Front-Cover texts being ``A GNU
 Manual'', and with the Back-Cover Texts as in (a) below.  A copy of the
@@ -67,9 +67,10 @@ Message mode buffers.
 * Key Index::         List of Message mode keys.
 @end menu
 
-This manual corresponds to T-gnus 6.17 Message.  Message is distributed
-with the Gnus distribution bearing the same version number as this
-manual.
+@c Adjust ../Makefile.in if you change the following lines:
+Message is distributed with Gnus.  The Gnus distribution
+@c
+corresponding to this manual is T-gnus 6.17.
 
 
 @node Interface
@@ -249,7 +250,10 @@ supersede the message in the current buffer.
 Headers matching the @code{message-ignored-supersedes-headers} are
 removed before popping up the new message buffer.  The default is@*
 @samp{^Path:\\|^Date\\|^NNTP-Posting-Host:\\|^Xref:\\|^Lines:\\|@*
-^Received:\\|^X-From-Line:\\|Return-Path:\\|^Supersedes:}.
+^Received:\\|^X-From-Line:\\|^X-Trace:\\|^X-Complaints-To:\\|@*
+Return-Path:\\|^Supersedes:\\|^NNTP-Posting-Date:\\|^X-Trace:\\|@*
+^X-Complaints-To:\\|^Cancel-Lock:\\|^Cancel-Key:\\|^X-Hashcash:\\|@*
+^X-Payment:\\|^Approved:}.
 
 
 
@@ -330,7 +334,7 @@ undeliverable.
 @vindex message-ignored-bounced-headers
 Headers that match the @code{message-ignored-bounced-headers} regexp
 will be removed before popping up the buffer.  The default is
-@samp{^\\(Received\\|Return-Path\\):}.
+@samp{^\\(Received\\|Return-Path\\|Delivered-To\\):}.
 
 
 @node Mailing Lists
@@ -339,7 +343,7 @@ will be removed before popping up the buffer.  The default is
 @cindex Mail-Followup-To
 Sometimes while posting to mailing lists, the poster needs to direct
 followups to the post to specific places.  The Mail-Followup-To (MFT)
-was created to enable just this.  Two example scenarios where this is
+was created to enable just this.  Three example scenarios where this is
 useful:
 
 @itemize @bullet
@@ -419,7 +423,7 @@ This is how you would do it.
 
 @vindex message-subscribed-address-file
 @item message-subscribed-address-file
-You might be one organised human freak and have a list of addresses of
+You might be one organized human freak and have a list of addresses of
 all subscribed mailing lists in a separate file!  Then you can just
 set this variable to the name of the file and life would be good.
 
@@ -681,26 +685,30 @@ stripped on replying, see @code{message-subject-trailing-was-query}
 @kindex C-c C-f x
 @findex message-cross-post-followup-to
 @vindex message-cross-post-default
+@vindex message-cross-post-note-function
 @cindex X-Post
 @cindex cross-post
-Ask for an additional @samp{Newsgroups} and @samp{FollowUp-To} for a
-cross-post.  @code{message-cross-post-followup-to} mangles
-@samp{FollowUp-To} and @samp{Newsgroups} header to point to group.
-If @code{message-cross-post-default} is @code{nil} or if called with a
-prefix-argument @samp{Follow-Up} is set, but the message is not
-cross-posted.
+Set up the @samp{FollowUp-To} header with a target newsgroup for a
+cross-post, add that target newsgroup to the @samp{Newsgroups} header if
+it is not a member of @samp{Newsgroups}, and insert a note in the body.
+If @code{message-cross-post-default} is @code{nil} or if this command is
+called with a prefix-argument, only the @samp{FollowUp-To} header will
+be set but the the target newsgroup will not be added to the
+@samp{Newsgroups} header.  The function to insert a note is controlled
+by the @code{message-cross-post-note-function} variable.
 
 @item C-c C-f t
 @kindex C-c C-f t
 @findex message-reduce-to-to-cc
 Replace contents of @samp{To} header with contents of @samp{Cc} or
-@samp{Bcc} header.
+@samp{Bcc} header.  (Iff @samp{Cc} header is not present, @samp{Bcc}
+header will be used instead.)
 
 @item C-c C-f w
 @kindex C-c C-f w
 @findex message-insert-wide-reply
 Insert @samp{To} and @samp{Cc} headers as if you were doing a wide
-reply.
+reply even if the message was not made for a wide reply first.
 
 @item C-c C-f a
 @kindex C-c C-f a
@@ -739,7 +747,7 @@ Move to the signature of the message (@code{message-goto-signature}).
 @vindex message-beginning-of-line
 If at beginning of header value, go to beginning of line, else go to
 beginning of header value.  (The header value comes after the header
-name and the colon.)  This behaviour can be disabled by toggling
+name and the colon.)  This behavior can be disabled by toggling
 the variable @code{message-beginning-of-line}.
 
 @end table
@@ -786,14 +794,18 @@ Insert the message headers (@code{message-insert-headers}).
 @item C-c M-m
 @kindex C-c M-m
 @findex message-mark-inserted-region
-Mark some region in the current article with enclosing tags.
-See @code{message-mark-insert-begin} and @code{message-mark-insert-end}.
+Mark some region in the current article with enclosing tags.  See
+@code{message-mark-insert-begin} and @code{message-mark-insert-end}.
+When called with a prefix argument, use slrn style verbatim marks
+(@samp{#v+} and @samp{#v-}).
 
 @item C-c M-f
 @kindex C-c M-f
 @findex message-mark-insert-file
 Insert a file in the current article with enclosing tags.
 See @code{message-mark-insert-begin} and @code{message-mark-insert-end}.
+When called with a prefix argument, use slrn style verbatim marks
+(@samp{#v+} and @samp{#v-}).
 
 @end table
 
@@ -813,8 +825,19 @@ automatically add the @code{Content-Type} and
 The most typical thing users want to use the multipart things in
 @acronym{MIME} for is to add ``attachments'' to mail they send out.
 This can be done with the @kbd{C-c C-a} command, which will prompt for
-a file name and a @acronym{MIME} type.  If your Emacs supports drag
-and drop, you can also drop the file in the Message buffer.
+a file name and a @acronym{MIME} type.
+
+@vindex mml-dnd-protocol-alist
+@vindex mml-dnd-attach-options
+If your Emacs supports drag and drop, you can also drop the file in the
+Message buffer.  The variable @code{mml-dnd-protocol-alist} specifies
+what kind of action is done when you drop a file into the Message
+buffer.  The variable @code{mml-dnd-attach-options} controls which
+@acronym{MIME} options you want to specify when dropping a file.  If it
+is a list, valid members are @code{type}, @code{description} and
+@code{disposition}.  @code{disposition} implies @code{type}.  If it is
+@code{nil}, don't ask for options.  If it is @code{t}, ask the user
+whether or not to specify options.
 
 You can also create arbitrarily complex multiparts using the @acronym{MML}
 language (@pxref{Composing, , Composing, emacs-mime, The Emacs MIME
@@ -841,13 +864,14 @@ typed a non-@acronym{ASCII} domain name.
 The @code{message-use-idna} variable control whether @acronym{IDNA} is
 used.  If the variable is @code{nil} no @acronym{IDNA} encoding will
 ever happen, if it is set to the symbol @code{ask} the user will be
-queried (the default), and if set to @code{t} @acronym{IDNA} encoding
-happens automatically.
+queried, and if set to @code{t} (which is the default if @acronym{IDNA}
+is fully available) @acronym{IDNA} encoding happens automatically.
 
 @findex message-idna-to-ascii-rhs
 If you want to experiment with the @acronym{IDNA} encoding, you can
 invoke @kbd{M-x message-idna-to-ascii-rhs RET} in the message buffer
-to have the non-@acronym{ASCII} domain names encoded while you edit the message.
+to have the non-@acronym{ASCII} domain names encoded while you edit
+the message.
 
 Note that you must have @uref{http://www.gnu.org/software/libidn/, GNU
 Libidn} installed in order to use this functionality.
@@ -1087,7 +1111,7 @@ The text is killed and replaced with the contents of the variable
 Kill the address under point.
 
 @item C-c C-z
-@kindex C-c C-x
+@kindex C-c C-z
 @findex message-kill-to-signature
 Kill all the text up to the signature, or if that's missing, up to the
 end of the message (@code{message-kill-to-signature}).
@@ -1131,9 +1155,9 @@ prompt for a new buffer name.
 @kindex TAB
 @findex message-tab
 @vindex message-tab-body-function
-If non-@code{nil} execute the function specified in
-@code{message-tab-body-function}.  Otherwise use the function bound to
-@kbd{TAB} in @code{text-mode-map} or @code{global-map}.
+If @code{message-tab-body-function} is non-@code{nil}, execute the
+function it specifies.  Otherwise use the function bound to @kbd{TAB} in
+@code{text-mode-map} or @code{global-map}.
 
 @end table
 
@@ -1393,14 +1417,29 @@ Controls what to do with trailing @samp{(was: )} in subject
 lines.  If @code{nil}, leave the subject unchanged.  If it is the symbol
 @code{ask}, query the user what do do.  In this case, the subject is
 matched against @code{message-subject-trailing-was-ask-regexp}.  If
-@code{message-subject-trailing-was-query} is t, always strip the
+@code{message-subject-trailing-was-query} is @code{t}, always strip the
 trailing old subject.  In this case,
 @code{message-subject-trailing-was-regexp} is used.
 
 @item message-alternative-emails
 @vindex message-alternative-emails
-A regexp to match the alternative email addresses.  The first matched
-address (not primary one) is used in the @code{From} field.
+Regexp matching alternative email addresses.  The first address in the
+To, Cc or From headers of the original article matching this variable is
+used as the From field of outgoing messages, replacing the default From
+value.
+
+For example, if you have two secondary email addresses john@@home.net
+and john.doe@@work.com and want to use them in the From field when
+composing a reply to a message addressed to one of them, you could set
+this variable like this:
+
+@lisp
+(setq message-alternative-emails
+      (regexp-opt '("john@@home.net" "john.doe@@work.com")))
+@end lisp
+
+This variable has precedence over posting styles and anything that runs
+off @code{message-setup-hook}.
 
 @item message-allow-no-recipients
 @vindex message-allow-no-recipients
@@ -1440,13 +1479,14 @@ header when the message is already @code{Cc}ed to the recipient.
 @item message-required-mail-headers
 @vindex message-required-mail-headers
 @xref{News Headers}, for the syntax of this variable.  It is
-@code{(From Date Subject (optional . In-Reply-To) Message-ID Lines
+@code{(From Subject Date (optional . In-Reply-To) Message-ID
 (optional . User-Agent))} by default.
 
 @item message-ignored-mail-headers
 @vindex message-ignored-mail-headers
-Regexp of headers to be removed before mailing.  The default is
-@samp{^[GF]cc:\\|^Resent-Fcc:\\|^Xref:\\|^X-Draft-From:}.
+Regexp of headers to be removed before mailing.  The default is@*
+@samp{^[GF]cc:\\|^Resent-Fcc:\\|^Xref:\\|^X-Draft-From:\\|@*
+^X-Gnus-Agent-Meta-Information:}.
 
 @item message-default-mail-headers
 @vindex message-default-mail-headers
@@ -1723,7 +1763,8 @@ All these conditions are checked by default.
 @item message-ignored-news-headers
 @vindex message-ignored-news-headers
 Regexp of headers to be removed before posting.  The default is@*
-@samp{^NNTP-Posting-Host:\\|^Xref:\\|^[BGF]cc:\\|^Resent-Fcc:\\|^X-Draft-From:}.
+@samp{^NNTP-Posting-Host:\\|^Xref:\\|^[BGF]cc:\\|^Resent-Fcc:\\|@*
+^X-Draft-From:\\|^X-Gnus-Agent-Meta-Information:}.
 
 @item message-default-news-headers
 @vindex message-default-news-headers
@@ -1789,21 +1830,29 @@ Article Highlighting, gnus, The Gnus Manual}, for details.
 @cindex yanking
 @cindex quoting
 When you are replying to or following up an article, you normally want
-to quote the person you are answering.  Inserting quoted text is done
-by @dfn{yanking}, and each line you yank will have
-@code{message-yank-prefix} prepended to it (except for quoted and
-empty lines which uses @code{message-yank-cited-prefix}).  The default
-is @samp{> }.
+to quote the person you are answering.  Inserting quoted text is done by
+@dfn{yanking}, and each line you yank will have
+@code{message-yank-prefix} prepended to it (except for quoted lines
+which use @code{message-yank-cited-prefix} and empty lines which use
+@code{message-yank-empty-prefix}).  The default is @samp{> }.
 
 @item message-yank-cited-prefix
 @vindex message-yank-cited-prefix
 @cindex yanking
 @cindex cited
 @cindex quoting
-When yanking text from an article which contains no text or already
-cited text, each line will be prefixed with the contents of this
-variable.  The default is @samp{>}.  See also
-@code{message-yank-prefix}.
+When yanking text from an article which contains already cited text,
+each line will be prefixed with the contents of this variable.  The
+default is @samp{>}.  See also @code{message-yank-prefix}.
+
+@item message-yank-empty-prefix
+@vindex message-yank-empty-prefix
+@cindex yanking
+@cindex quoting
+When yanking text from an article, each empty line will be prefixed with
+the contents of this variable.  The default is @samp{>}.  You can set
+this variable to an empty string to split the cited text into paragraphs
+automatically.  See also @code{message-yank-prefix}.
 
 @item message-yank-add-new-references
 @vindex message-yank-add-new-references
@@ -1901,12 +1950,13 @@ say.
 @item message-default-charset
 @vindex message-default-charset
 @cindex charset
-Symbol naming a @acronym{MIME} charset.  Non-@acronym{ASCII}
-characters in messages are assumed to be encoded using this charset.
-The default is @code{nil}, which means ask the user.  (This variable
-is used only on non-@sc{mule} Emacsen.  @xref{Charset Translation, ,
-Charset Translation, emacs-mime, Emacs MIME Manual}, for details on
-the @sc{mule}-to-@acronym{MIME} translation process.
+Symbol naming a @acronym{MIME} charset.  Non-@acronym{ASCII} characters
+in messages are assumed to be encoded using this charset.  The default
+is @code{iso-8859-1} on non-@sc{mule} Emacsen; otherwise @code{nil},
+which means ask the user.  (This variable is used only on non-@sc{mule}
+Emacsen.)  @xref{Charset Translation, , Charset Translation, emacs-mime,
+Emacs MIME Manual}, for details on the @sc{mule}-to-@acronym{MIME}
+translation process.
 
 @item message-signature-separator
 @vindex message-signature-separator
@@ -2014,8 +2064,11 @@ message composition doesn't break too bad.
 
 @item message-send-method-alist
 @vindex message-send-method-alist
-
-Alist of ways to send outgoing messages.  Each element has the form
+@findex message-mail-p
+@findex message-news-p
+@findex message-send-via-mail
+@findex message-send-via-news
+Alist of ways to send outgoing messages.  Each element has the form:
 
 @lisp
 (@var{type} @var{predicate} @var{function})
@@ -2027,19 +2080,32 @@ A symbol that names the method.
 
 @item predicate
 A function called without any parameters to determine whether the
-message is a message of type @var{type}.
+message is a message of type @var{type}.  The function will be called in
+the buffer where the message is.
 
 @item function
 A function to be called if @var{predicate} returns non-@code{nil}.
 @var{function} is called with one parameter---the prefix.
 @end table
 
+The default is:
+
 @lisp
 ((news message-news-p message-send-via-news)
  (mail message-mail-p message-send-via-mail))
 @end lisp
 
-
+The @code{message-news-p} function returns non-@code{nil} if the message
+looks like news, and the @code{message-send-via-news} function sends the
+message according to the @code{message-send-news-function} variable
+(@pxref{News Variables}).  The @code{message-mail-p} function returns
+non-@code{nil} if the message looks like mail, and the
+@code{message-send-via-mail} function sends the message according to the
+@code{message-send-mail-function} variable (@pxref{Mail Variables}).
+
+All the elements in this alist will be tried in order, so a message
+containing both a valid @samp{Newsgroups} header and a valid @samp{To}
+header, for example, will be sent as news, and then as mail.
 @end table
 
 
diff --git a/texi/ps/Makefile.in b/texi/ps/Makefile.in
index 644ad50..c11e474 100644
--- a/texi/ps/Makefile.in
+++ b/texi/ps/Makefile.in
@@ -136,7 +136,7 @@ pdf: $(PDFFILES)
 .ps.pdf:
 	epstopdf $<
 
-.SUFFIXES: .pdf .ps .eps .xbm .xpm .png .tif .gif 
+.SUFFIXES: .pdf .ps .eps .xbm .xpm .png .tif .gif
 
 clean:
 	rm -f $(PSFILES)
@@ -145,6 +145,7 @@ clean:
 veryclean: clean
 
 distclean: clean
+	rm -f Makefile
 
 install:
 
diff --git a/texi/ptexinfmt.el b/texi/ptexinfmt.el
index a210678..36843c1 100644
--- a/texi/ptexinfmt.el
+++ b/texi/ptexinfmt.el
@@ -24,8 +24,8 @@
 
 ;; 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.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -51,6 +51,7 @@
 ;;  @definfoenclose
 ;;  @deftypeivar
 ;;  @deftypeop
+;;  @allowcodebreaks
 
 ;;; Code:
 
@@ -197,6 +198,7 @@ DOCSTRING will be printed if ASSERTION is nil and
 (put 'setcontentsaftertitlepage 'texinfo-format 'texinfo-discard-line)
 (put 'setshortcontentsaftertitlepage 'texinfo-format 'texinfo-discard-line)
 (put 'novalidate 'texinfo-format 'texinfo-discard-line-with-args)
+(put 'frenchspacing 'texinfo-format 'texinfo-discard-line-with-args)
 
 ;; head & foot
 (put 'headings 'texinfo-format 'texinfo-discard-line-with-args)
@@ -214,6 +216,9 @@ DOCSTRING will be printed if ASSERTION is nil and
 ;; @slanted{} (makeinfo 4.8 or later)
 (put 'slanted 'texinfo-format 'texinfo-format-noop)
 
+;; @sansserif{} (makeinfo 4.8 or later)
+(put 'sansserif 'texinfo-format 'texinfo-format-noop)
+
 ;; @tie{} (makeinfo 4.3 or later)
 (put 'tie 'texinfo-format 'texinfo-format-tie)
 (ptexinfmt-defun-if-void texinfo-format-tie ()
@@ -405,6 +410,12 @@ For example, @verb\{|@|\} results in @ and
   (insert "(R)"))
 
 ;;; Accents and Special characters
+;; @euro{}	==>	Euro
+(put 'euro 'texinfo-format 'texinfo-format-euro)
+(ptexinfmt-defun-if-void texinfo-format-euro ()
+  (texinfo-parse-arg-discard)
+  (insert "Euro "))
+
 ;; @pounds{}	==>	#	Pounds Sterling
 (put 'pounds 'texinfo-format 'texinfo-format-pounds)
 (ptexinfmt-defun-if-void texinfo-format-pounds ()
@@ -415,7 +426,7 @@ For example, @verb\{|@|\} results in @ and
 (put 'ordf 'texinfo-format 'texinfo-format-ordf)
 (ptexinfmt-defun-if-void texinfo-format-ordf ()
   (texinfo-parse-arg-discard)
-  (insert "o"))
+  (insert "a"))
 
 ;; @ordm{}	==>	o	Spanish masculine
 (put 'ordm 'texinfo-format 'texinfo-format-ordm)
diff --git a/texi/sieve.texi b/texi/sieve.texi
index 4ea0463..95a51f4 100644
--- a/texi/sieve.texi
+++ b/texi/sieve.texi
@@ -7,13 +7,14 @@
 @synindex pg cp
 
 @copying
-This file documents the Emacs Sieve package.
+This file documents the Emacs Sieve package, for server-side mail filtering.
 
-Copyright (C) 2001 Free Software Foundation, Inc.
+Copyright @copyright{} 2001, 2002, 2003, 2004, 2005, 2006 Free
+Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
+under the terms of the GNU Free Documentation License, Version 1.2 or
 any later version published by the Free Software Foundation; with no
 Invariant Sections, with the Front-Cover texts being ``A GNU
 Manual'', and with the Back-Cover Texts as in (a) below.  A copy of the
diff --git a/texi/xml2texi.scm b/texi/xml2texi.scm
index b2a6161..0eb2d24 100644
--- a/texi/xml2texi.scm
+++ b/texi/xml2texi.scm
@@ -18,8 +18,8 @@
 
 ;; 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.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 ;; 
diff --git a/texi/xml2texi.sh b/texi/xml2texi.sh
index 779de36..ad6b1b1 100644
--- a/texi/xml2texi.sh
+++ b/texi/xml2texi.sh
@@ -21,8 +21,8 @@ exec mzscheme -mr $0 ${1+"$@"}
 ;; 
 ;;  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.
+;;  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;;  Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 ;;
diff --git a/todo b/todo
index 92ff87e..9c6123a 100644
--- a/todo
+++ b/todo
@@ -1,6 +1,55 @@
 ;; Also know as the "wish list".  Some are done. For the others, no
 ;; promise when to be implemented.
 
+* Go through the todo list and remove items already done.
+
+* Use a new custom type (`define-widget') for posting-style in `gnus-cus.el'
+  (G c) and for `gnus-posting-styles'.  Maybe some allowed types are still
+  missing.
+
+* Add proper doc strings to functions and variables explained in the manual
+  (info "(gnus)Gnus Utility Functions")
+
+* Add Message-IDs or URLs refering to relevant discussions on lists and
+  newsgroups.
+
+* Use nicer tool bar icons from GNOME
+
+  Done for Emacs (The GNOME icons won't fit into standard XEmacs icons,
+  IMHO. -- rsteib) in group, summary and message mode.
+
+  Some modes might also deserve improved tool bars:
+  
+  - gnus-draft-mode
+  
+  - mml-preview buffer:
+  
+    . zap most buttons; except print, customize (?) and help
+  
+    . "exit" should just kill the buffer
+  
+  - gnus-server-mode: Add some commands from the Connections and Server
+    menu.
+  
+  - gnus-browse-mode (could borrow some icons from gnus-group-mode)
+  
+  (See http://article.gmane.org/gmane.emacs.gnus.general/62147).
+
+* Maybe Gnus should support the LIST SUBSCRIPTIONS, see RFC 2980.
+
+* Merge `message-extra-wide-headers' and ` message-header-synonyms'?
+
+* Maybe texi/emacs-mime.texi could be divided into user-visible stuff and
+  reference manual for the MIME library.
+
+  Related: Bill Wohler's article on mh-e-user.
+  http://thread.gmane.org/29067.1138078896@olgas.newt.com
+
+* Fix `change servers' command, see David Kastrup's message.
+  http://thread.gmane.org/x54qewqxz4.fsf@lola.goethe.zz
+
+* texi/gnus-coding.texi should be fixed.
+
 * gnus-topic-kill-region
   From Colin Marquardt 
   
@@ -34,10 +83,6 @@
   
   Implement NOV caching with Gnus Agent.
 
-* Multiple charsets for topic names.
-  
-  [Done]
-
 * Allow specification of server in Newsgroups header
   
   [Kai wrote]
@@ -51,23 +96,10 @@
 
   Thanks for Micha Wiedenmann for this suggestion.
 
-* Understand mail-user-agent. Maybe gnus-mail-user-agent.
-  
-  [Done]
-
-* Emphasis delimiters show when `W W c'.
-
-  [Fixed]
-
 * Parsing of the common list confirmation requests so that Gnus can
    prepare the response with a single command.  Including LISTSERV
    periodic ping messages and the like.
 
-* Parsing of the various List-* headers to enable automatic commands
-   like "send help message," "send unsubscribe message," and the like.
-
-   [done, see gnus-ml.el]
-
 * Parsing of the subscription notice to stash away details like what
    address you're subscribed to the list under (and automatically send
    mail to the list using that address, when you send mail inside the list
@@ -89,11 +121,6 @@
   Most likely using jka-compr. (It has been suggested that this do
   work but I think it should be verified for all backends.)
 
-* Support for RFC2015, PGP-MIME. Probably has to involve the people in
-  the Mailcrypt project.
-
-  [done]
-
 * Agent (Can someone write some subtopics here? I don't use it myself
   so I don't know what is lacking.)
 
@@ -106,9 +133,6 @@
    posted on gnu.emacs.gnus does this.
    Also, gnus-article-encrypt `K E' encrypts the article body.]
 
-* The stuff on "Newest Features" in the manual should be implemented
-  and the node updated (it maybe is?).
-
 * Splitting .newsrc.eld so the history is in one file and the
   configuration is in another. To help those that reads at two
   locations (e.g. work and home) and want to have the same
@@ -159,6 +183,9 @@
     you want to instantiate, and what mail should land in each?
     [/viz./ problem of nnmail-split-methods interface.]
 
+  [Probably `assistant.el' will provide this.  But it's development is
+  stalled.]
+
 * Full integration of nnir into Gnus.  Generic hooks for adding new
   external nnir sources.  I use a couple experimental, in-house tools
   (JPRC is a research lab, occupied with document analysis and machine
@@ -206,11 +233,6 @@
 * A possibility to add notes to messages. If thouse could include links
   to other (stored) messages this would be very practical.
 
-* A nnfolder like backend with .overview files.
-  This would not only speed up things, but also allow nnir to work on it.
-
-  [done]
-
 * Allow article editing in groups which do not support it, but
   emulating it via deleting the old article and entering the new one
   into the group.  This would be very useful to support `T ^' (say) in
@@ -223,8 +245,6 @@
   cached-but-unticked ones.)  This would become even more important
   when we allow labels.
 
-* Go through the todo list and remove items already done.
-
 * Create new data type `article identifier' and use that instead of
   article numbers.  A first implementation could offer something like
   (num . 4711) but this could be extended.  This would be useful for
@@ -242,17 +262,6 @@
   thread should always be hidden (as in `T h') by default, while most
   other threads are not hidden by default.  Hm.
 
-* New backend between nnfolder and nnml: have more than one article
-  per file, but more than one file per group.  With .overview files.
-
-  [done. nnfolder has .overview.  Backward- and forward-compatible
-   between 1.0 and 2.0. (setq nnfolder-nov-is-evil t) disables the
-   feature]
-
-* .overview files for nnfolder?
-  
-  [done]
-
 * New backend nnbabylfolder.  There is also nnbabyl which is like
   nnmbox but uses babyl format, but there is no babyl format
   equivalent of nnfolder.
@@ -383,13 +392,9 @@ the same in the group buffer and on the SPC prompt.
 
 *  nndir doesn't read gzipped files.
 
-*  FAQ doesn't have an up node?
-
 *  when moving mail from a procmail spool to the crash-box, the
  crash-box is only appropriate to one specific group.
 
-*  `t' `t' makes X-Faces disappear.
-
 *  nnmh-be-safe means that crossposted articles will be marked as
  unread.
 
@@ -435,8 +440,6 @@ exceeding lisp nesting on huge groups.
 
 *  move nnmail-split-history out to the backends.
 
-*  nnweb doesn't work properly.
-
 *  using a virtual server name as `gnus-select-method' doesn't work?
 
 *  when killing/yanking a group from one topic to another in a
@@ -550,8 +553,6 @@ exceeding lisp nesting on huge groups.
 *  stop using invisible text properties and start using overlays
  instead
 
-*  C-c C-f C-e to add an Expires header.
-
 *  go from one group to the next; everything is expunged; go to the
  next group instead of going to the group buffer.
 
@@ -617,11 +618,6 @@ exceeding lisp nesting on huge groups.
 *  support ProleText:
  
 
-*  when browsing a foreign server, the groups that are already
- subscribed should be listed as such and not as "K".
-
- [done]
-
 *  generate font names dynamically.
 
 *  score file mode auto-alist.
@@ -668,8 +664,12 @@ exceeding lisp nesting on huge groups.
 *  `gnus-summary-find-matching' should accept pseudo-"headers" like
  "body", "head" and "all"
 
-*  When buttifying  things, all white space (including
- newlines) should be ignored.
+* When buttifying  things, all white space (including newlines) should
+ be ignored.
+
+ [Done]
+
+ But not for cited URLs.
 
 *  Process-marking all groups in a topic should process-mark groups
  in subtopics as well.
@@ -690,10 +690,6 @@ exceeding lisp nesting on huge groups.
 
 *  nnmbox should support a newsgroups file for descriptions.
 
-*  allow fetching mail from several pop servers.
-
-  [done]
-
 *  Be able to specify whether the saving commands save the original
  or the formatted article.
 
@@ -707,14 +703,14 @@ exceeding lisp nesting on huge groups.
 
 *  more limiting functions - date, etc.
 
+   We have `gnus-summary-limit-to-age'.  What's missing?  Maybe enter a date?
+
 *  be able to limit on a random header; on body; using reverse
  matches.
 
 *  a group parameter (`absofucking-total-expiry') that will make
  Gnus expire even unread articles.
 
-*  a command to print the article buffer as postscript.
-
 *  variable to disable password fetching when opening by
  nntp-open-telnet.
 
@@ -1168,6 +1164,8 @@ exceeding lisp nesting on huge groups.
  then you could run the relevant function to complete the
  information in the header
 
+ [Done using `message-completion-alist'?]
+
 *  cache the newsgroups file locally to avoid reloading it all the
  time.
 
@@ -1175,6 +1173,8 @@ exceeding lisp nesting on huge groups.
 
 *  nnweb should allow fetching by Message-ID from servers.
 
+ [Done?]
+
 *  point in the article buffer doesn't always go to the beginning of
  the buffer when selecting new articles.
 
@@ -1217,6 +1217,8 @@ exceeding lisp nesting on huge groups.
  default server if it fails on the current server?  (controlled by a
  user variable, (nil, t, 'ask)).
 
+ [Done by `gnus-refer-article-method'?]
+
 *  make it possible to cancel articles using the select method for
  the current group.
 
@@ -1250,29 +1252,6 @@ exceeding lisp nesting on huge groups.
 *  a function for selecting a particular group which will contain
  the articles listed in a list of article numbers/id's.
 
-*  a battery of character translation functions to translate common
- Mac, MS (etc) characters into ISO 8859-1.
-
-      (defun article-fix-m$word ()
-	"Fix M$Word smartquotes in an article."
-	(interactive)
-	(save-excursion
-	  (let ((buffer-read-only nil))
-	    (goto-char (point-min))
-	    (while (search-forward "\221" nil t)
-	      (replace-match "`" t t))
-	    (goto-char (point-min))
-	    (while (search-forward "\222" nil t)
-	      (replace-match "'" t t))
-	    (goto-char (point-min))
-	    (while (search-forward "\223" nil t)
-	      (replace-match "\"" t t))
-	    (goto-char (point-min))
-	    (while (search-forward "\224" nil t)
-	      (replace-match "\"" t t)))))
-
-  [done]
-
 *       (add-hook 'gnus-exit-query-functions
       '(lambda ()
 	 (if (and (file-exists-p nnmail-spool-file)
@@ -1419,10 +1398,6 @@ exceeding lisp nesting on huge groups.
 
 * The jingle is only played on the second invocation of Gnus.
 
-* Bouncing articles should do MIME.
-
-  [done]
-
 * Crossposted articles should "inherit" the % or  mark from the other
  groups it has been crossposted to, or something.  (Agent.)
 
@@ -1509,10 +1484,6 @@ exceeding lisp nesting on huge groups.
 
 	(body "whatever.text")
 
-* Be able to run `J u' from summary buffers.
-
-  [Done]
-
 * Solve the halting problem.