# HG changeset patch # User Miles Bader # Date 1106956339 0 # Node ID 472e5513512f0ef13cb8232c2d81b3bc44de1608 # Parent 61d237d8450818f3a1c541a235f0f65b7d942eef Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-58 Merge from gnus--rel--5.10 Patches applied: * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-7 Merge from emacs--cvs-trunk--0 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-8 - miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-11 Update from CVS 2005-01-28 Katsumi Yamaoka * lisp/gnus/gnus-art.el (gnus-article-setup-buffer): Kill and re-create the article buffer when editing of the article is discarded. (gnus-article-prepare): Revert. 2005-01-28 Katsumi Yamaoka * lisp/gnus/gnus-art.el (gnus-article-prepare): Remove message-strip-forbidden-properties from the local hook. 2005-01-24 Katsumi Yamaoka * lisp/gnus/mml.el (mml-generate-mime-1): Convert string into unibyte when inserting " *mml*" buffer's contents into a unibyte temp buffer. 2005-01-28 Lars Magne Ingebrigtsen * man/gnus.texi: Some edits based on comments from David Abrahams. 2005-01-24 Katsumi Yamaoka * man/gnus.texi (RSS): Fix the keystroke. diff -r 61d237d84508 -r 472e5513512f lisp/gnus/ChangeLog --- a/lisp/gnus/ChangeLog Fri Jan 28 21:48:48 2005 +0000 +++ b/lisp/gnus/ChangeLog Fri Jan 28 23:52:19 2005 +0000 @@ -3,6 +3,22 @@ * message.el (message-beginning-of-line): Change the behavior when invoked between BOL and : so that it first moves backward. +2005-01-28 Katsumi Yamaoka + + * gnus-art.el (gnus-article-setup-buffer): Kill and re-create the + article buffer when editing of the article is discarded. + (gnus-article-prepare): Revert. + +2005-01-28 Katsumi Yamaoka + + * gnus-art.el (gnus-article-prepare): Remove + message-strip-forbidden-properties from the local hook. + +2005-01-24 Katsumi Yamaoka + + * mml.el (mml-generate-mime-1): Convert string into unibyte when + inserting " *mml*" buffer's contents into a unibyte temp buffer. + 2005-01-20 Katsumi Yamaoka * mm-decode.el (mm-insert-part): Switch the multibyteness of data diff -r 61d237d84508 -r 472e5513512f lisp/gnus/gnus-art.el --- a/lisp/gnus/gnus-art.el Fri Jan 28 21:48:48 2005 +0000 +++ b/lisp/gnus/gnus-art.el Fri Jan 28 23:52:19 2005 +0000 @@ -1,5 +1,5 @@ ;;; gnus-art.el --- article mode commands for Gnus -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 ;; Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen @@ -3743,14 +3743,19 @@ (mm-enable-multibyte) (setq major-mode 'gnus-original-article-mode) (make-local-variable 'gnus-original-article)) - (if (get-buffer name) + (if (and (get-buffer name) + (with-current-buffer name + (if gnus-article-edit-mode + (if (y-or-n-p "Article mode edit in progress; discard? ") + (progn + (set-buffer-modified-p nil) + (gnus-kill-buffer name) + (message "") + nil) + (error "Action aborted")) + t))) (save-excursion (set-buffer name) - (when (and gnus-article-edit-mode - (buffer-modified-p) - (not - (y-or-n-p "Article mode edit in progress; discard? "))) - (error "Action aborted")) (set (make-local-variable 'gnus-article-edit-mode) nil) (when gnus-article-mime-handles (mm-destroy-parts gnus-article-mime-handles) diff -r 61d237d84508 -r 472e5513512f lisp/gnus/mml.el --- a/lisp/gnus/mml.el Fri Jan 28 21:48:48 2005 +0000 +++ b/lisp/gnus/mml.el Fri Jan 28 23:52:19 2005 +0000 @@ -1,5 +1,5 @@ ;;; mml.el --- A package for parsing and validating MML documents -;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 ;; Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen @@ -472,7 +472,9 @@ (mm-with-unibyte-buffer (cond ((cdr (assq 'buffer cont)) - (insert-buffer-substring (cdr (assq 'buffer cont)))) + (insert (with-current-buffer (cdr (assq 'buffer cont)) + (mm-with-unibyte-current-buffer + (buffer-string))))) ((and (setq filename (cdr (assq 'filename cont))) (not (equal (cdr (assq 'nofile cont)) "yes"))) (let ((coding-system-for-read mm-binary-coding-system)) diff -r 61d237d84508 -r 472e5513512f man/ChangeLog --- a/man/ChangeLog Fri Jan 28 21:48:48 2005 +0000 +++ b/man/ChangeLog Fri Jan 28 23:52:19 2005 +0000 @@ -1,3 +1,11 @@ +2005-01-28 Lars Magne Ingebrigtsen + + * gnus.texi: Some edits based on comments from David Abrahams. + +2005-01-24 Katsumi Yamaoka + + * gnus.texi (RSS): Fix the keystroke. + 2005-01-26 Lute Kamstra * cmdargs.texi (Initial Options): Add a cross reference to `Init diff -r 61d237d84508 -r 472e5513512f man/gnus.texi --- a/man/gnus.texi Fri Jan 28 21:48:48 2005 +0000 +++ b/man/gnus.texi Fri Jan 28 23:52:19 2005 +0000 @@ -391,25 +391,25 @@ @end iftex @menu -* Starting Up:: Finding news can be a pain. -* Group Buffer:: Selecting, subscribing and killing groups. -* Summary Buffer:: Reading, saving and posting articles. -* Article Buffer:: Displaying and handling articles. -* Composing Messages:: Information on sending mail and news. -* Select Methods:: Gnus reads all messages from various select methods. -* Scoring:: Assigning values to articles. -* Various:: General purpose settings. -* The End:: Farewell and goodbye. -* Appendices:: Terminology, Emacs intro, @acronym{FAQ}, History, Internals. -* Index:: Variable, function and concept index. -* Key Index:: Key Index. +* Starting Up:: Finding news can be a pain. +* Group Buffer:: Selecting, subscribing and killing groups. +* Summary Buffer:: Reading, saving and posting articles. +* Article Buffer:: Displaying and handling articles. +* Composing Messages:: Information on sending mail and news. +* Select Methods:: Gnus reads all messages from various select methods. +* Scoring:: Assigning values to articles. +* Various:: General purpose settings. +* The End:: Farewell and goodbye. +* Appendices:: Terminology, Emacs intro, @acronym{FAQ}, History, Internals. +* Index:: Variable, function and concept index. +* Key Index:: Key Index. Other related manuals -* Message:(message). Composing messages. -* Emacs-MIME:(emacs-mime). Composing messages; @acronym{MIME}-specific parts. -* Sieve:(sieve). Managing Sieve scripts in Emacs. -* PGG:(pgg). @acronym{PGP/MIME} with Gnus. +* Message:(message). Composing messages. +* Emacs-MIME:(emacs-mime). Composing messages; @acronym{MIME}-specific parts. +* Sieve:(sieve). Managing Sieve scripts in Emacs. +* PGG:(pgg). @acronym{PGP/MIME} with Gnus. @detailmenu --- The Detailed Node Listing --- @@ -951,17 +951,16 @@ terminology section (@pxref{Terminology}). @menu -* Finding the News:: Choosing a method for getting news. -* The First Time:: What does Gnus do the first time you start it? -* The Server is Down:: How can I read my mail then? -* Slave Gnusae:: You can have more than one Gnus active at a time. -* Fetching a Group:: Starting Gnus just to read a group. -* New Groups:: What is Gnus supposed to do with new groups? -* Changing Servers:: You may want to move from one server to another. -* Startup Files:: Those pesky startup files---@file{.newsrc}. -* Auto Save:: Recovering from a crash. -* The Active File:: Reading the active file over a slow line Takes Time. -* Startup Variables:: Other variables you might change. +* Finding the News:: Choosing a method for getting news. +* The First Time:: What does Gnus do the first time you start it? +* The Server is Down:: How can I read my mail then? +* Slave Gnusae:: You can have more than one Gnus active at a time. +* New Groups:: What is Gnus supposed to do with new groups? +* Changing Servers:: You may want to move from one server to another. +* Startup Files:: Those pesky startup files---@file{.newsrc}. +* Auto Save:: Recovering from a crash. +* The Active File:: Reading the active file over a slow line Takes Time. +* Startup Variables:: Other variables you might change. @end menu @@ -992,7 +991,8 @@ If you can use a local spool, you probably should, as it will almost certainly be much faster. But do not use the local spool if your -server is running Leafnode; in this case, use @code{(nntp "localhost")}. +server is running Leafnode (which is a simple, standalone private news +server); in this case, use @code{(nntp "localhost")}. @vindex gnus-nntpserver-file @cindex NNTPSERVER @@ -1051,8 +1051,8 @@ @section The First Time @cindex first time usage -If no startup files exist, Gnus will try to determine what groups should -be subscribed by default. +If no startup files exist (@pxref{Startup Files}), Gnus will try to +determine what groups should be subscribed by default. @vindex gnus-default-subscribed-newsgroups If the variable @code{gnus-default-subscribed-newsgroups} is set, Gnus @@ -1139,16 +1139,6 @@ incorporated into the slave. If you answer ``no'', the slave may see some messages as unread that have been read in the master. -@node Fetching a Group -@section Fetching a Group -@cindex fetching a group - -@findex gnus-fetch-group -It is sometimes convenient to be able to just say ``I want to read this -group and I don't care whether Gnus has been started or not''. This is -perhaps more useful for people who write code than for users, but the -command @code{gnus-fetch-group} provides this functionality in any case. -It takes the group name as a parameter. @node New Groups @@ -1400,8 +1390,10 @@ @cindex .newsrc.el @cindex .newsrc.eld -Now, you all know about the @file{.newsrc} file. All subscription -information is traditionally stored in this file. +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. Things got a bit more complicated with @sc{gnus}. In addition to keeping the @file{.newsrc} file updated, it also used a file called @@ -1426,8 +1418,10 @@ However, this will make it impossible to use other newsreaders than Gnus. But hey, who would want to, right? Similarly, setting @code{gnus-read-newsrc-file} to @code{nil} makes Gnus ignore the -@file{.newsrc} file and any @file{.newsrc-SERVER} files, which is -convenient if you have a tendency to use Netscape once in a while. +@file{.newsrc} file and any @file{.newsrc-SERVER} files, which can be +convenient if you use a different news reader occasionally, and you +want to read a different subset of the available groups with that +news reader. @vindex gnus-save-killed-list If @code{gnus-save-killed-list} (default @code{t}) is @code{nil}, Gnus @@ -15884,7 +15878,7 @@ will be prompted for the location of the feed. An easy way to get started with @code{nnrss} is to say something like -the following in the group buffer: @kbd{B nnrss RET y}, then +the following in the group buffer: @kbd{B nnrss RET RET y}, then subscribe to groups. The following @code{nnrss} variables can be altered: @@ -20607,6 +20601,7 @@ * Undo:: Some actions can be undone. * Predicate Specifiers:: Specifying predicates. * Moderation:: What to do if you're a moderator. +* Fetching a Group:: Starting Gnus just to read a group. * Image Enhancements:: Modern versions of Emacs/XEmacs can display images. * Fuzzy Matching:: What's the big fuzz? * Thwarting Email Spam:: A how-to on avoiding unsolicited commercial email. @@ -21878,6 +21873,18 @@ @end lisp +@node Fetching a Group +@section Fetching a Group +@cindex fetching a group + +@findex gnus-fetch-group +It is sometimes convenient to be able to just say ``I want to read this +group and I don't care whether Gnus has been started or not''. This is +perhaps more useful for people who write code than for users, but the +command @code{gnus-fetch-group} provides this functionality in any case. +It takes the group name as a parameter. + + @node Image Enhancements @section Image Enhancements @@ -26575,6 +26582,12 @@ number of unread articles is called @dfn{activating the group}. Un-activated groups are listed with @samp{*} in the group buffer. +@item spool +@cindex spool +News servers store their articles locally in one fashion or other. +One old-fashioned storage method is to have just one file per +article. That's called a ``traditional spool''. + @item server @cindex server A machine one can connect to and get news (or mail) from.