Merge from gnus--devo--0

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1244

doc/misc/ChangeLog

@@ -63,9 +63,42 @@
 	* woman.texi:
 	Update Back-Cover Text as per maintain.info.
 
+2008-06-15  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* gnus-faq.texi: Generate.  Change node names to "FAQ N-M".
+
+	* Makefile.in (gnus-faq-clean): Don't remove gnus-faq.texi.
+	(gnus-faq.xml): Update repository host.
+
+	* xml2texi.scm (boilerplate): Update copyright years.
+	(format-q-level): Change node names to "FAQ N-M", since period in
+	"[N.M]" is invalid, see "(texinfo)Node Line Requirements".
+
+	* gnus-faq.texi: Generate from gnus-faq.xml (sourceforge.net).
+
+2008-06-15  Frank Schmitt  <ich@frank-schmitt.net>
+
+	* gnus-faq.texi ([5.12]): Add entry about message-kill-buffer-on-exit.
+	Fix a typo.
+
+2008-06-15  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* gnus.texi (Mail Source Customization): Correct values of
+	 `mail-source-delete-incoming'.  Reported by Tassilo Horn.
+	(Oort Gnus): Fix version comment for mml-dnd-protocol-alist.
+
+2008-06-14  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* gnus.texi (nnmairix): Eliminate wrong use of `path', cf. the GNU
+	coding standards.
+
+2008-06-14  David Engster  <dengste@eml.cc>
+
+	* gnus.texi (nnmairix): Markup fixes.
+
 2008-06-05  Reiner Steib  <Reiner.Steib@gmx.de>
 
-	* gnus.texi (nnmairix): Markup and othe minor fixes.
+	* gnus.texi (nnmairix): Markup and other minor fixes.
 
 2008-06-05  David Engster  <dengste@eml.cc>
 

doc/misc/gnus.texi

@@ -4398,9 +4398,9 @@ bound to mairix searches and are automatically updated.
 * nnmairix caveats::            Some more stuff you might want to know
 @end menu
-@c FIXME: The markup in this section needs improvement.  E.g. add
-@c @sample{...}, maybe remove some @strong{...}, convert ` - ' to `---`,
-@c ...
+@c FIXME: The markup in this section might need improvement.
+@c E.g. adding @samp, @var, @file, @command, etc.
+@c Cf. (info "(texinfo)Indicating")
 @node About mairix
 @subsubsection About mairix
@@ -4436,16 +4436,15 @@ but much faster.
 @node nnmairix requirements
 @subsubsection nnmairix requirements
-Mairix searches local mail - that means, mairix absolutely must have
+Mairix searches local mail---that means, mairix absolutely must have
 direct access to your mail folders.  If your mail resides on another
 server (e.g. an @acronym{IMAP} server) and you happen to have shell
 access, @code{nnmairix} supports running mairix remotely, e.g. via ssh.
 Additionally, @code{nnmairix} only supports the following Gnus back
-ends: @code{nnml}, @code{nnmaildir}, and @code{nnimap}.  You
-@strong{must} use one of these back ends for using
-@code{nnmairix}.  Other back ends, like @code{nnmbox}, @code{nnfolder} or
-@code{nnmh}, won't work.
+ends: @code{nnml}, @code{nnmaildir}, and @code{nnimap}.  You must use
+one of these back ends for using @code{nnmairix}.  Other back ends, like
+@code{nnmbox}, @code{nnfolder} or @code{nnmh}, won't work.
 If you absolutely must use mbox and still want to use @code{nnmairix},
 you can set up a local @acronym{IMAP} server, which you then access via
@@ -4473,7 +4472,7 @@ automatically update themselves by calling mairix.
 You might ask why you need @code{nnmairix} at all, since mairix already
 creates the group, populates it with links to the mails so that you can
 then access it with Gnus, right? Well, this @emph{might} work, but often
-does not - at least not without problems.  Most probably you will get
+does not---at least not without problems.  Most probably you will get
 strange article counts, and sometimes you might see mails which Gnus
 claims have already been canceled and are inaccessible.  This is due to
 the fact that Gnus isn't really amused when things are happening behind
@@ -4482,7 +4481,7 @@ use mairix with an @acronym{IMAP} server (I had Dovecot complaining
 about corrupt index files when mairix changed the contents of the search
 group).  Using @code{nnmairix} should circumvent these problems.
-@code{nnmairix} is not really a mail back end - it's actually more like a
+@code{nnmairix} is not really a mail back end---it's actually more like a
 wrapper, sitting between a ``real'' mail back end where mairix stores the
 searches and the Gnus front end.  You can choose between three different
 mail back ends for the mairix folders: @code{nnml}, @code{nnmaildir} or
@@ -4495,7 +4494,7 @@ if you're uncomfortable with @code{nnmairix} creating new mail groups
 alongside your other mail, you can also create e.g. a new
 @code{nnmaildir} server exclusively for mairix.  However, a special case
 exists if you want to use mairix remotely on an IMAP server with
-@code{nnimap} - here the mairix folders and your other mail must be on
+@code{nnimap}---here the mairix folders and your other mail must be on
 the same @code{nnimap} back end.
 @node Setting up mairix
@@ -4511,12 +4510,11 @@ Setting up mairix is easy: simply create a @file{.mairixrc} file with
 base=~/Maildir
 @end example
-This is the base folder for your mails.  All the following paths are
-relative to this base folder.  If you want to use @code{nnmairix} with
-@code{nnimap}, this base path has to point to the mail path where the
-@acronym{IMAP} server stores the mail folders!
-@c FIXME: Add typical examples?
+This is the base folder for your mails.  All the following directories
+are relative to this base folder.  If you want to use @code{nnmairix}
+with @code{nnimap}, this base directory has to point to the mail
+directory where the @acronym{IMAP} server stores the mail folders!
 @example
 maildir= ... your maildir folders which should be indexed ...
 mh= ... your nnml/mh folders which should be indexed ...
@@ -4524,7 +4522,7 @@ mbox = ... your mbox files which should be indexed ...
 @end example
 Specify all your maildir/nnml folders and mbox files (relative to the
-base path!) you want to index with mairix.  See the man-page for
+base directory!) you want to index with mairix.  See the man-page for
 mairixrc for details.
 @example
@@ -4536,7 +4534,6 @@ This should make sure that you don't accidentally index the mairix
 search results.  You can change the prefix of these folders with the
 variable @code{nnmairix-group-prefix}.
-@c FIXME: Add typical examples?
 @example
 mformat= ... 'maildir' or 'mh' ...
 database= ... location of database file ...
@@ -4546,8 +4543,38 @@ The @code{format} setting specifies the output format for the mairix
 search folder.  Set this to @code{mh} if you want to access search results
 with @code{nnml}.  Otherwise choose @code{maildir}.
-See the man pages for mairix and mairixrc for further options.  Now
-simply call @code{mairix} to create the index for the first time.
+To summarize, here is my shortened @file{.mairixrc} file as an example:
+
+@example
+base=~/Maildir
+maildir=.personal:.work:.logcheck:.sent
+mh=../Mail/nnml/*...
+mbox=../mboxmail/mailarchive_year*
+mformat=maildir
+omit=zz_mairix-*
+database=~/.mairixdatabase
+@end example
+
+In this case, the base directory is @file{~/Maildir}, where all my Maildir
+folders are stored.  As you can see, the folders are separated by
+colons.  If you wonder why every folder begins with a dot: this is
+because I use Dovecot as @acronym{IMAP} server, which again uses
+@code{Maildir++} folders.  For testing nnmairix, I also have some
+@code{nnml} mail, which is saved in @file{~/Mail/nnml}.  Since this has
+to be specified relative to the @code{base} directory, the @code{../Mail}
+notation is needed.  Note that the line ends in @code{*...}, which means
+to recursively scan all files under this directory.  Without the three
+dots, the wildcard @code{*} will not work recursively.  I also have some
+old mbox files with archived mail lying around in @file{~/mboxmail}.
+The other lines should be obvious.
+
+See the man page for @code{mairixrc} for details and further options,
+especially regarding wildcard usage, which may be a little different
+than you are used to.
+
+Now simply call @code{mairix} to create the index for the first time.
+Note that this may take a few minutes, but every following index will do
+the updates incrementally and hence is very fast.
 @node Configuring nnmairix
 @subsubsection Configuring nnmairix
@@ -4560,7 +4587,7 @@ server.  You will have to specify the following:
 @itemize @bullet
 @item
-The @strong{name} of the @code{nnmairix} server - choose whatever you
+The @strong{name} of the @code{nnmairix} server---choose whatever you
 want.
 @item
@@ -4743,7 +4770,7 @@ originally came from and displays the article in this group, so that
 e.g. replying to this article the correct posting styles/group
 parameters are applied (@code{nnmairix-goto-original-article}).  This
 function will use the registry if available, but can also parse the
-article file path as a fallback method.
+article file name as a fallback method.
 @item $ u
 @kindex $ u (Summary)
@@ -4781,11 +4808,11 @@ implies that you will usually read your mails in the @code{nnmairix}
 groups instead of your ``real'' mail groups.
 There is one problem, though: say you got a new mail from
-@samp{david@@foobar.com} - it will now show up in two groups, the
+@samp{david@@foobar.com}; it will now show up in two groups, the
 ``real'' group (your INBOX, for example) and in the @code{nnmairix}
 search group (provided you have updated the mairix database). Now you
 enter the @code{nnmairix} group and read the mail. The mail will be
-marked as read, but only in the @code{nnmairix} group - in the ``real''
+marked as read, but only in the @code{nnmairix} group---in the ``real''
 mail group it will be still shown as unread.
 You could now catch up the mail group (@pxref{Group Data}), but this is
@@ -4832,11 +4859,11 @@ the safe side, choose roughly the amount of mails you index with mairix.
 @vindex nnmairix-only-use-registry
 If you don't want to use the registry or the registry hasn't seen the
-original article yet, @code{nnmairix} will use an additional mairix search
-for determining the file path of the article. This, of course, is way
-slower than the registry - if you set hundreds or even thousands of
-marks this way, it might take some time. You can avoid this situation
-by setting @code{nnmairix-only-use-registry} to t.
+original article yet, @code{nnmairix} will use an additional mairix
+search for determining the file name of the article. This, of course, is
+way slower than the registry---if you set hundreds or even thousands of
+marks this way, it might take some time. You can avoid this situation by
+setting @code{nnmairix-only-use-registry} to t.
 Maybe you also want to propagate marks the other way round, i.e. if you
 tick an article in a "real" mail group, you'd like to have the same
@@ -4898,7 +4925,7 @@ Hit @kbd{G b g}, enter group name (e.g. @samp{important}), use
 Now activate marks propagation for this group by using @kbd{G b p}. Then
 activate the always-unread feature by using @kbd{G b r} twice.
-So far so good - but how do you remove the tick marks in the @code{nnmairix}
+So far so good---but how do you remove the tick marks in the @code{nnmairix}
 group?  There are two options: You may simply use
 @code{nnmairix-remove-tick-mark-original-article} (bound to @kbd{$ u}) to remove
 tick marks from the original article. The other possibility is to set
@@ -4920,7 +4947,7 @@ As described before, all @code{nnmairix} groups are in fact stored on
 the mail back end in the form @samp{zz_mairix-<NAME>-<NUMBER>}. You can
 see them when you enter the back end server in the server buffer. You
 should not subscribe these groups! Unfortunately, these groups will
-usually get @strong{auto-subscribed} when you use @code{nnmaildir} or
+usually get @emph{auto-subscribed} when you use @code{nnmaildir} or
 @code{nnml}, i.e. you will suddenly see groups of the form
 @samp{zz_mairix*} pop up in your group buffer. If this happens to you,
 simply kill these groups with C-k.  For avoiding this, turn off
@@ -4947,13 +4974,13 @@ If you use the Gnus agent (@pxref{Gnus Unplugged}): don't agentize
 @item
 If you use the Gnus registry: don't use the registry with
 @code{nnmairix} groups (put them in
-@code{gnus-registry-unfollowed-groups}).  Be @strong{extra careful} if
-you use @code{gnus-registry-split-fancy-with-parent} - mails which are
+@code{gnus-registry-unfollowed-groups}).  Be @emph{extra careful} if
+you use @code{gnus-registry-split-fancy-with-parent}; mails which are
 split into @code{nnmairix} groups are usually gone for good as soon as
 you check the group for new mail (yes, it has happened to me...).
 @item
-Therefore: @strong{Never ever} put ``real'' mails into @code{nnmairix}
+Therefore: @emph{Never ever} put ``real'' mails into @code{nnmairix}
 groups (you shouldn't be able to, anyway).
 @item
@@ -4962,7 +4989,7 @@ mairix does only support us-ascii characters.
 @item
 @code{nnmairix} uses a rather brute force method to force Gnus to
 completely reread the group on the mail back end after mairix was
-called - it simply deletes and re-creates the group on the mail
+called---it simply deletes and re-creates the group on the mail
 back end. So far, this has worked for me without any problems, and I
 don't see how @code{nnmairix} could delete other mail groups than its
 own, but anyway: you really should have a backup of your mail
@@ -4986,7 +5013,7 @@ save any ``real'' mail in folders of the form
 @code{nnmairix-group-prefix}.
 @item
-The following only applies if you @strong{don't} use the mentioned patch
+The following only applies if you @emph{don't} use the mentioned patch
 for mairix (@pxref{Propagating marks}):
 A problem can occur when using @code{nnmairix} with maildir folders and
@@ -15382,8 +15409,8 @@ files.  If a positive number, delete files older than number of days
 (the deletion will only happen when receiving new mail).  You may also
 set @code{mail-source-delete-incoming} to @code{nil} and call
 @code{mail-source-delete-old-incoming} from a hook or interactively.
-@code{mail-source-delete-incoming} defaults to @code{2} in alpha Gnusae
-and @code{10} in released Gnusae.  @xref{Gnus Development}.
+@code{mail-source-delete-incoming} defaults to @code{10} in alpha Gnusae
+and @code{2} in released Gnusae.  @xref{Gnus Development}.
 @item mail-source-delete-old-incoming-confirm
 @vindex mail-source-delete-old-incoming-confirm
@@ -28604,7 +28631,7 @@ controls this.
 @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}.
-@c New in 5.10.9 / 5.11 (Emacs 21.1)
+@c New in 5.10.9 / 5.11 (Emacs 22.1)
 @item @code{auto-fill-mode} is enabled by default in Message mode.
 See @code{message-fill-column}.  @xref{Various Message Variables, ,

lisp/gnus/ChangeLog

+2008-06-16  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* dgnushack.el: Autoload get-display-table and put-display-table for
+	XEmacs 21.5.
+
+	* lpath.el: Fbind get-display-table and put-display-table for XEmacs
+	21.4 and SXEmacs.
+
+2008-06-15  David Engster  <dengste@eml.cc>
+
+	* nnimap.el (nnimap-request-delete-group): Unselect group if necessary.
+
+2008-06-14  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* gnus-util.el (gnus-put-display-table, gnus-get-display-table): New
+	macros that expand to an `aset'/`aref' call under Emacs, and to a
+	runtime choice under XEmacs.
+
+	* gnus-sum.el (gnus-summary-set-display-table): Use
+	`gnus-put-display-table', `gnus-get-display-table',
+	`gnus-set-display-table' for the display table, instead of `aset'.
+
+	* gnus-xmas.el (gnus-xmas-summary-set-display-table): Use
+	`gnus-put-display-table', `gnus-get-display-table',
+	`gnus-set-display-table' for the display table.
+
+2008-06-14  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* nnmairix.el: Add autoloads.
+
+2008-06-14  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* nnmairix.el (nnmairix-delete-recreate-group)
+	(nnmairix-update-and-clear-marks): Fix error messages.
+
+2008-06-14  David Engster  <dengste@eml.cc>
+
+	* nnmairix.el: Upgrade to version 0.6.
+	(nnmairix-group-toggle-propmarks-this-group)
+	(nnmairix-group-toggle-readmarks-this-group)
+	(nnmairix-group-delete-recreate-this-group)
+	(nnmairix-group-toggle-allowfast-this-group, nnmairix-propagate-marks)
+	(nnmairix-remove-tick-mark-original-article): New commands.
+	(nnmairix-mairix-search-options, nnmairix-propagate-marks-upon-close)
+	(nnmairix-propagate-marks-to-nnmairix-groups)
+	(nnmairix-only-use-registry, nnmairix-allowfast-default)
+	(nnmairix-marks-cache, nnmairix-version-output): New variables.
+	(nnmairix-request-set-mark, nnmairix-request-update-info): New back end
+	functions needed for marks propagation and manipulation of read marks.
+	(nnmairix-update-groups): New function.
+	(nnmairix-get-groups-from-server, nnmairix-delete-recreate-group)
+	(nnmairix-determine-original-group-from-registry)
+	(nnmairix-determine-original-group-from-path)
+	(nnmairix-get-group-from-file-path, nnmairix-map-range)
+	(nnmairix-check-mairix-version, nnmairix-group-toggle-parameter): New
+	helper functions.
+	(nnmairix-group-mode-hook, nnmairix-summary-mode-hook): Inserted new
+	keystrokes for new commands.
+	(nnmairix-delete-and-create-on-change): Doc string cleanup.
+	(nnmairix-request-group): Check allow-fast group parameter.
+	(nnmairix-request-create-group): Set allow-fast group parameter if
+	nnmairix-allowfast-default is set.
+	(nnmairix-close-group): Propagate marks upon closing if needed.
+	(nnmairix-group-toggle-threads-this-group): Use new.
+	nnmairix-group-toggle-parameter helper function.
+	(nnmairix-search): Better check for empty search result.
+	(nnmairix-goto-original-article): Use new helper functions for
+	determining original article.
+	(nnmairix-show-original-article): Make sure message-id is in brackets.
+	(nnmairix-call-mairix-binary): Change variable name.
+	(nnmairix-update-and-clear-marks): Use nnmairix-delete-recreate-group
+	helper function.
+	(nnmairix-widget-toggle-activate): Fix doc string.
+
 2008-06-11  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* nnir.el: Require edmacro when compiling with XEmacs.

lisp/gnus/gnus-sum.el

@@ -3420,13 +3420,13 @@ display only a single character."
 	(i 32))
     ;; Nix out all the control chars...
     (while (>= (setq i (1- i)) 0)
-      (aset table i [??]))
+      (gnus-put-display-table i [??] table))
    ;; ... but not newline and cr, of course.  (cr is necessary for the
     ;; selective display).
-    (aset table ?\n nil)
-    (aset table ?\r nil)
+    (gnus-put-display-table ?\n nil table)
+    (gnus-put-display-table ?\r nil table)
     ;; We keep TAB as well.
-    (aset table ?\t nil)
+    (gnus-put-display-table ?\t nil table)
     ;; 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))
@@ -3434,8 +3434,8 @@ display only a single character."
 	       256)))
       (while (>= (setq i (1- i)) 127)
 	;; Only modify if the entry is nil.
-	(unless (aref table i)
-	  (aset table i [??]))))
+	(unless (gnus-get-display-table i table)
+	  (gnus-put-display-table i [??] table))))
     (setq buffer-display-table table)))
 
 (defun gnus-summary-set-article-display-arrow (pos)

lisp/gnus/gnus-util.el

@@ -1801,6 +1801,27 @@ is allowed once again.  (Immediately, if `inhibit-quit' is nil.)"
 (defalias 'gnus-read-shell-command
   (if (fboundp 'read-shell-command) 'read-shell-command 'read-string))
 
+(defmacro gnus-put-display-table (range value display-table)
+  "Set the value for char RANGE to VALUE in DISPLAY-TABLE.  "
+  (if (featurep 'xemacs)
+      (progn
+        `(if (fboundp 'put-display-table)
+          (put-display-table ,range ,value ,display-table)
+          (if (sequencep ,display-table)
+              (aset ,display-table ,range ,value)
+            (put-char-table ,range ,value ,display-table))))
+    `(aset ,display-table ,range ,value)))
+
+(defmacro gnus-get-display-table (character display-table)
+  "Find value for CHARACTER in DISPLAY-TABLE.  "
+  (if (featurep 'xemacs)
+      `(if (fboundp 'get-display-table)
+          (get-display-table ,character ,display-table)
+          (if (sequencep ,display-table)
+              (aref ,display-table ,character)
+            (get-char-table ,character ,display-table)))
+    `(aref ,display-table ,character)))
+
 (provide 'gnus-util)
 
 ;; arch-tag: f94991af-d32b-4c97-8c26-ca12a934de49

lisp/gnus/nnimap.el

@@ -1608,6 +1608,8 @@ function is generally only called when Gnus is shutting down."
 
 (deffoo nnimap-request-delete-group (group force &optional server)
   (when (nnimap-possibly-change-server server)
+    (when (string= group (imap-current-mailbox nnimap-server-buffer))
+      (imap-mailbox-unselect nnimap-server-buffer))
     (with-current-buffer nnimap-server-buffer
       (if force
 	  (or (null (imap-mailbox-status group 'uidvalidity))