Changes committed gnus/texi (4 files)

Modified: ChangeLog emacs-mime.texi gnus-news.texi gnus.texi

* gnus.texi (Expiring Mail): Mention
gnus-mark-copied-or-moved-articles-as-expirable.
(Various Various): Mention gnus-safe-html-newsgroups.

* gnus-news.texi: Mention
gnus-mark-copied-or-moved-articles-as-expirable.

* emacs-mime.texi (Display Customization): Add xref to
gnus-safe-html-newsgroups.


Index: ChangeLog
diff -u gnus/texi/ChangeLog:7.448 gnus/texi/ChangeLog:7.449
--- ChangeLog:7.448	Fri Jul 17 12:16:48 2009
+++ ChangeLog	Wed Aug 12 10:27:57 2009
@@ -1,3 +1,15 @@
+2009-08-12  Katsumi Yamaoka  <[email protected]>
+
+	* gnus.texi (Expiring Mail): Mention
+	gnus-mark-copied-or-moved-articles-as-expirable.
+	(Various Various): Mention gnus-safe-html-newsgroups.
+
+	* gnus-news.texi: Mention
+	gnus-mark-copied-or-moved-articles-as-expirable.
+
+	* emacs-mime.texi (Display Customization): Add xref to
+	gnus-safe-html-newsgroups.
+
 2009-07-16  Glenn Morris  <[email protected]>
 
 	* gnus-refcard.tex: Condense a few sentences in order to
Index: emacs-mime.texi
diff -u gnus/texi/emacs-mime.texi:7.42 gnus/texi/emacs-mime.texi:7.43
--- emacs-mime.texi:7.42	Fri Feb 27 00:35:58 2009
+++ emacs-mime.texi	Wed Aug 12 10:27:57 2009
@@ -418,7 +418,9 @@
 A regular expression that matches safe URL names, i.e. URLs that are
 unlikely to leak personal information when rendering @acronym{HTML}
 email (the default value is @samp{\\`cid:}).  If @code{nil} consider
-all URLs safe.
+all URLs safe.  In Gnus, this will be overridden according to the value
+of the variable @code{gnus-safe-html-newsgroups}, @xref{Various
+Various, ,Various Various, gnus, Gnus Manual}.
 
 @item mm-inline-text-html-with-w3m-keymap
 @vindex mm-inline-text-html-with-w3m-keymap
Index: gnus-news.texi
diff -u gnus/texi/gnus-news.texi:7.70 gnus/texi/gnus-news.texi:7.71
--- gnus-news.texi:7.70	Wed Feb  4 19:48:48 2009
+++ gnus-news.texi	Wed Aug 12 10:27:57 2009
@@ -311,6 +311,15 @@
 @item The @file{all.SCORE} file can be edited from the group buffer
 using @kbd{W e}.
 
+@item You can set @code{gnus-mark-copied-or-moved-articles-as-expirable}
+to a non-@code{nil} value so that articles that have been read may be
+marked as expirable automatically when copying or moving them to a group
+that has auto-expire turned on.  The default is @code{nil} and copying
+and moving of articles behave as before; i.e., the expirable marks will
+be unchanged except that the marks will be removed when copying or
+moving articles to a group that has not turned auto-expire on.
+@xref{Expiring Mail}.
+
 @end itemize
 
 @end itemize
Index: gnus.texi
diff -u gnus/texi/gnus.texi:7.320 gnus/texi/gnus.texi:7.321
--- gnus.texi:7.320	Tue Jun  9 00:47:52 2009
+++ gnus.texi	Wed Aug 12 10:27:57 2009
@@ -16299,6 +16299,23 @@
 commands will not mark an article as expirable, even if the group has
 auto-expire turned on.
 
+@vindex gnus-mark-copied-or-moved-articles-as-expirable
+The expirable marks of articles will be removed when copying or moving
+them to a group in which auto-expire is not turned on.  This is for
+preventing articles from being expired unintentionally.  On the other
+hand, to a group that has turned auto-expire on, the expirable marks of
+articles that are copied or moved will not be changed by default.  I.e.,
+when copying or moving to such a group, articles that were expirable
+will be left expirable and ones that were not expirable will not be
+marked as expirable.  So, even though in auto-expire groups, some
+articles will never get expired (unless you read them again).  If you
+don't side with that behavior that unexpirable articles may be mixed
+into auto-expire groups, you can set
+@code{gnus-mark-copied-or-moved-articles-as-expirable} to a
+non-@code{nil} value.  In that case, articles that have been read will
+be marked as expirable automatically when being copied or moved to a
+group that has auto-expire turned on.  The default value is @code{nil}.
+
 
 @node Washing Mail
 @subsection Washing Mail
@@ -26926,6 +26943,15 @@
 
 @acronym{IMAP} users might want to allow @samp{/} in group names though.
 
+@item gnus-safe-html-newsgroups
+@vindex gnus-safe-html-newsgroups
+Groups in which links in html articles are considered all safe.  The
+value may be a regexp matching those groups, a list of group names, or
+@code{nil}.  This overrides @code{mm-w3m-safe-url-regexp}.  The default
+value is @code{"\\`nnrss[+:]"}.  This is effective only when emacs-w3m
+renders html articles, i.e., in the case @code{mm-text-html-renderer} is
+set to @code{w3m}.  @xref{Display Customization, ,Display Customization,
+emacs-mime, The Emacs MIME Manual}.
 
 @end table