[elpa] externals/debbugs 42bc369 153/311: debbugs code cleanup

[Stefan Monnier]

branch: externals/debbugs
commit 42bc3694473144dd8f658ff27d79dbf0864c40bd
Author: Michael Albinus <michael.albinus@gmx.de>
Commit: Michael Albinus <michael.albinus@gmx.de>

    debbugs code cleanup
    
    * packages/debbugs/debbugs-gnu.el (debbugs-gnu-archived): Move down.
    (debbugs-read-emacs-bug-with-gnus): New defun, extracted from
    `debbugs-gnu-select-report'.
    (debbugs-gnu-select-report): Use it.
    
    * packages/debbugs/debbugs-ug.texi (Tabulated Lists): Reorganize table.
---
 debbugs-gnu.el  |  58 +++++----
 debbugs-ug.info | 357 ++++++++++++++++++++++++++++++--------------------------
 debbugs-ug.texi |  36 +++---
 3 files changed, 244 insertions(+), 207 deletions(-)

diff --git a/debbugs-gnu.el b/debbugs-gnu.el
index 12310d2..58455e3 100644
--- a/debbugs-gnu.el
+++ b/debbugs-gnu.el
@@ -103,6 +103,7 @@
 ;;   "s": Toggle bug sorting for age or for state
 ;;   "x": Toggle suppressing of bugs
 ;;   "/": Display only bugs matching a string
+;;   "R": Display only bugs blocking the current release
 ;;   "w": Display all the currently selected bug reports
 
 ;; When you visit the related bug messages in Gnus, you could also
@@ -240,9 +241,6 @@ suppressed bugs is toggled by 
`debbugs-gnu-toggle-suppress'."
   :type '(alist :key-type symbol :value-type regexp)
   :version "24.1")
 
-(defface debbugs-gnu-archived '((t (:inverse-video t)))
-  "Face for archived bug reports.")
-
 (defcustom debbugs-gnu-mail-backend 'gnus
   "*The email backend to use for reading bug report email exchange.
 If this is 'gnus, the default, use Gnus.
@@ -252,6 +250,9 @@ If this is 'rmail, use Rmail instead."
                 (const :tag "Use Rmail" 'rmail))
   :version "25.1")
 
+(defface debbugs-gnu-archived '((t (:inverse-video t)))
+  "Face for archived bug reports.")
+
 (defface debbugs-gnu-new '((t (:foreground "red")))
   "Face for new reports that nobody has answered.")
 
@@ -1137,6 +1138,27 @@ MERGED is the list of bugs merged with this one."
     (define-key rmail-mode-map "C" 'debbugs-gnu-send-control-message)
     (rmail-show-message 1)))
 
+(defvar gnus-suppress-duplicates)
+(defvar gnus-save-duplicate-list)
+
+(defun debbugs-read-emacs-bug-with-gnus (id status merged)
+  "Read email exchange for debbugs bug ID.
+STATUS is the bug's status list.
+MERGED is the list of bugs merged with this one."
+  (require 'gnus-dup)
+  (setq gnus-suppress-duplicates t
+       gnus-save-duplicate-list t)
+  ;; Use Gnus.
+  (gnus-read-ephemeral-emacs-bug-group
+   (cons id (if (listp merged) merged (list merged)))
+   (cons (current-buffer)
+        (current-window-configuration)))
+  (with-current-buffer (window-buffer (selected-window))
+    (set (make-local-variable 'debbugs-gnu-bug-number) id)
+    (set (make-local-variable 'debbugs-gnu-subject)
+        (format "Re: bug#%d: %s" id (cdr (assq 'subject status))))
+    (debbugs-gnu-summary-mode 1)))
+
 (defun debbugs-gnu-select-report ()
   "Select the report on the current line."
   (interactive)
@@ -1144,27 +1166,15 @@ MERGED is the list of bugs merged with this one."
   (let* ((status (debbugs-gnu-current-status))
         (id (cdr (assq 'id status)))
         (merged (cdr (assq 'mergedwith status))))
-    (if (not id)
-       (message "No bug report on the current line")
-      (if (eq debbugs-gnu-mail-backend 'rmail)
-         (debbugs-read-emacs-bug-with-rmail id status (if (listp merged)
-                                                          merged
-                                                        (list merged)))
-       (require 'gnus-dup)
-       (setq gnus-suppress-duplicates t
-             gnus-save-duplicate-list t)
-       ;; Use Gnus.
-       (gnus-read-ephemeral-emacs-bug-group
-        (cons id (if (listp merged)
-                     merged
-                   (list merged)))
-        (cons (current-buffer)
-              (current-window-configuration)))
-       (with-current-buffer (window-buffer (selected-window))
-         (set (make-local-variable 'debbugs-gnu-bug-number) id)
-         (set (make-local-variable 'debbugs-gnu-subject)
-              (format "Re: bug#%d: %s" id (cdr (assq 'subject status))))
-         (debbugs-gnu-summary-mode 1))))))
+    (setq merged (if (listp merged) merged (list merged)))
+    (cond
+     ((not id)
+      (message "No bug report on the current line"))
+     ((eq debbugs-gnu-mail-backend 'rmail)
+      (debbugs-read-emacs-bug-with-rmail id status merged))
+     ((eq debbugs-gnu-mail-backend 'gnus)
+      (debbugs-read-emacs-bug-with-gnus id status merged))
+     (t (error "No valid mail backend specified")))))
 
 (defvar debbugs-gnu-summary-mode-map
   (let ((map (make-sparse-keymap)))
diff --git a/debbugs-ug.info b/debbugs-ug.info
index 227ea28..8bcbdfe 100644
--- a/debbugs-ug.info
+++ b/debbugs-ug.info
@@ -7,14 +7,15 @@ Copyright (C) 2015 Free Software Foundation, Inc.
      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, with the Front-Cover, or
-     Back-Cover Texts.  A copy of the license is included in the section
-     entitled "GNU Free Documentation License" in the Emacs manual.
+     Back-Cover Texts.  A copy of the license is included in the
+     section entitled "GNU Free Documentation License" in the Emacs
+     manual.
 
      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.
+     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.
 
      All Emacs Lisp code contained in this document may be used,
      distributed, and modified without restriction.
@@ -29,21 +30,21 @@ File: debbugs-ug.info,  Node: Top,  Next: Retrieving Bugs,  
Up: (dir)
 Debbugs User Guide
 ******************
 
-Debbugs is a bugtracking system (BTS) that was initially written for the
-Debian project but currently used also by the GNU project.  The main
-distinctive feature of Debbugs is that it's mostly email-based.  All
-actions on bug reports: opening, closing, changing the status,
+Debbugs is a bugtracking system (BTS) that was initially written for
+the Debian project but currently used also by the GNU project.  The
+main distinctive feature of Debbugs is that it's mostly email-based.
+All actions on bug reports: opening, closing, changing the status,
 commenting, forwarding are performed via email by sending specially
 composed letters to the particular mail addresses.  However, searching
 the bug reports, querying bug report status and viewing comments have
 been web-based for a long time.  To overcome this inconvenience the
 Debbugs/SOAP service was introduced.
 
-   Based on the Debbugs/SOAP service, frontends are written which offer
-handling of bugs inside Emacs.  These frontends are restricted to the
-GNU Debbugs server.  Bugs are presented either as tabulated list
-('debbugs-gnu') or as 'org-mode' TODO list ('debbugs-org', *note Org
-Mode: (org)Top.).  As backend they use the 'debbugs' Emacs library
+   Based on the Debbugs/SOAP service, frontends are written which
+offer handling of bugs inside Emacs.  These frontends are restricted
+to the GNU Debbugs server.  Bugs are presented either as tabulated
+list ('debbugs-gnu') or as 'org-mode' TODO list ('debbugs-org', *note
+Org Mode: (org)Top.).  As backend they use the 'debbugs' Emacs library
 (*note Debbugs Programmer's Manual: (debbugs)Top.).
 
 * Menu:
@@ -64,9 +65,10 @@ File: debbugs-ug.info,  Node: Retrieving Bugs,  Next: 
Searching Bugs,  Prev: Top
 *****************
 
 Bugs are retrieved by the 'debbugs-gnu' or 'debbugs-org' commands.  In
-their simple version, they retrieve just bugs for the '"emacs"' package
-on the GNU Debbugs server, filtered by bug severities.  Further
-filtering is possible when the commands are called with a prefix.
+their simple version, they retrieve just bugs for the '"emacs"'
+package on the GNU Debbugs server, filtered by bug severities.
+Further filtering is possible when the commands are called with a
+prefix.
 
    When the bug numbers to be retrieved are known, the commands
 'debbugs-gnu-bugs' or 'debbugs-org-bugs' are applicable.
@@ -77,25 +79,25 @@ filtering is possible when the commands are called with a 
prefix.
           suppress tags
 
      These commands retrieve bug reports from the GNU Debbugs server.
-     'debbugs-gnu' returns a tabulated list, and 'debbugs-org' returns a
-     list of TODO items in 'org-mode'.  If there were more than
+     'debbugs-gnu' returns a tabulated list, and 'debbugs-org' returns
+     a list of TODO items in 'org-mode'.  If there were more than
      'debbugs-gnu-default-hits-per-page' bug results from the query,
      there are widgets ('debbugs-gnu') or links ('debbugs-org') in the
      result buffer for retrieving the other results.
 
-     SEVERITIES is a list of strings which filter for the severities of
-     the bugs to be retrieved.  Valid severities are '"serious"',
-     '"important"', '"normal"', '"minor"' and '"wishlist"' (see also the
-     constant 'debbugs-gnu-all-severities').  If the list is empty,
-     there is no filtering with respect to severities.  The keyword
-     '"tagged"', which is also possible, is not a severity in the GNU
-     Debbugs server but allows to restrict the result to bugs with a
-     given user tag.
+     SEVERITIES is a list of strings which filter for the severities
+     of the bugs to be retrieved.  Valid severities are '"serious"',
+     '"important"', '"normal"', '"minor"' and '"wishlist"' (see also
+     the constant 'debbugs-gnu-all-severities').  If the list is
+     empty, there is no filtering with respect to severities.  The
+     keyword '"tagged"', which is also possible, is not a severity in
+     the GNU Debbugs server but allows to restrict the result to bugs
+     with a given user tag.
 
      PACKAGES, also a list of strings, point to the defined software
      packages on the GNU Debbugs server which shall be taken into
-     account.  The existing package names are compiled into the constant
-     'debbugs-gnu-all-packages'.
+     account.  The existing package names are compiled into the
+     constant 'debbugs-gnu-all-packages'.
 
      ARCHIVEDP, if non-'nil', extends the result also on archived bugs
      on the GNU Debbugs server.
@@ -103,25 +105,27 @@ filtering is possible when the commands are called with a 
prefix.
      SUPPRESS shall also distinct between 'nil' and non-'nil'.  When
      non-'nil', closed bugs are suppressed from the results.
 
-     When SEVERITIES contains the severity '"tagged"', TAGS is consulted
-     in order to restrict the result on bugs which are tagged with one
-     of the strings of the list TAGS.  This list can also be empty; in
-     this case locally tagged bugs are included into the results.
+     When SEVERITIES contains the severity '"tagged"', TAGS is
+     consulted in order to restrict the result on bugs which are
+     tagged with one of the strings of the list TAGS.  This list can
+     also be empty; in this case locally tagged bugs are included into
+     the results.
 
-     Called interactively, the commands require just the SEVERITIES and
-     the TAGS (if SEVERITIES includes '"tagged"').  In order to provide
-     the other arguments interactively, the commands must be called with
-     a prefix, like 'C-u M-x debbugs-gnu'.  In the minibuffer, lists
-     must be entered comma-separated.
+     Called interactively, the commands require just the SEVERITIES
+     and the TAGS (if SEVERITIES includes '"tagged"').  In order to
+     provide the other arguments interactively, the commands must be
+     called with a prefix, like 'C-u M-x debbugs-gnu'.  In the
+     minibuffer, lists must be entered comma-separated.
 
      Default values for interactive use could be configured in the
      customer options 'debbugs-gnu-default-severities' and
      'debbugs-gnu-default-packages'.
 
-     When the result would exceed more than 500 bugs, the user is asked
-     how many bugs to retrieve at once.  This value can be configured in
-     the customer option 'debbugs-gnu-default-hits-per-page'.  However,
-     it is not recommended to exceeds the default value.
+     When the result would exceed more than 500 bugs, the user is
+     asked how many bugs to retrieve at once.  This value can be
+     configured in the customer option
+     'debbugs-gnu-default-hits-per-page'.  However, it is not
+     recommended to exceeds the default value.
 
      *note Layout:: for the presentation of the results.
 
@@ -129,8 +133,8 @@ filtering is possible when the commands are called with a 
prefix.
  -- Command: debbugs-org-bugs &rest bugs
 
      The commands 'debbugs-gnu-bugs' and 'debbugs-org-bugs' show bugs
-     specified by their bug number.  Interactively, the bug numbers must
-     be entered as comma-separated list.
+     specified by their bug number.  Interactively, the bug numbers
+     must be entered as comma-separated list.
 
      *note Layout:: for the presentation of the results.
 
@@ -140,8 +144,8 @@ File: debbugs-ug.info,  Node: Searching Bugs,  Next: 
Layout,  Prev: Retrieving B
 2 Searching in the Debbugs Database.
 ************************************
 
-The GNU Debbugs server allows full text search in the database.  It uses
-a HyperEstraier based search engine
+The GNU Debbugs server allows full text search in the database.  It
+uses a HyperEstraier based search engine
 (http://fallabs.com/hyperestraier/uguide-en.html#searchcond)(1).
 
  -- Command: debbugs-gnu-search
@@ -149,22 +153,22 @@ a HyperEstraier based search engine
 
      These both commands are completely interactive.  They ask for a
      '"search phrase"' for the full text search.  It is just a string
-     which contains the words to be searched for, combined by operators
-     like AND, ANDNOT and OR. If there is no operator between the words,
-     AND is used by default.
+     which contains the words to be searched for, combined by
+     operators like AND, ANDNOT and OR. If there is no operator
+     between the words, AND is used by default.
 
-     Wild card searches are also supported.  It can be used for forward
-     match search and backward match search.  For example, "[BW] euro"
-     matches words which begin with "euro".  "[EW] shere" matches words
-     which end with "sphere".  Moreover, regular expressions are also
-     supported.  For example, "[RX] ^inter.*al$" matches words which
-     begin with "inter" and end with "al".(2)
+     Wild card searches are also supported.  It can be used for
+     forward match search and backward match search.  For example,
+     "[BW] euro" matches words which begin with "euro".  "[EW] shere"
+     matches words which end with "sphere".  Moreover, regular
+     expressions are also supported.  For example, "[RX] ^inter.*al$"
+     matches words which begin with "inter" and end with "al".(2)
 
      While the words to be searched for are case insensitive, the
      operators must be specified case sensitive.
 
-     While the search for the phrase is performed only in the bodies of
-     the messages belonging to a bug report, it is also possible to
+     While the search for the phrase is performed only in the bodies
+     of the messages belonging to a bug report, it is also possible to
      discriminate the search to further bug attributes.  The commands
      ask for such key-value pairs, until an empty key is returned.
      Possible attributes are
@@ -174,8 +178,8 @@ a HyperEstraier based search engine
           Bugs::.
 
      'package'
-          A comma-separated list of defined software packages on the GNU
-          Debbugs server, *Note Retrieving Bugs::.
+          A comma-separated list of defined software packages on the
+          GNU Debbugs server, *Note Retrieving Bugs::.
 
      'tags'
           A comma-separated list of defined user tags.
@@ -195,9 +199,9 @@ a HyperEstraier based search engine
           "forwarded" and "open".
 
      It is also possible to apply these commands with an empty search
-     phrase.  In this case, the GNU Debbugs server is searched only for
-     bugs which fulfill the given attributes.  The attributes to be
-     applied are the same as already described, plus
+     phrase.  In this case, the GNU Debbugs server is searched only
+     for bugs which fulfill the given attributes.  The attributes to
+     be applied are the same as already described, plus
 
      'archive'
           Whether archived bugs shall be searched (no value to be
@@ -208,14 +212,15 @@ a HyperEstraier based search engine
           set.
 
      'tag'
-          An arbitrary string the bug is annotated with.  Usually, this
-          is the same as the status mentioned above.
+          An arbitrary string the bug is annotated with.  Usually,
+          this is the same as the status mentioned above.
 
      'owner'
      'maint'
      'correspondent'
           The email address of the bug's owner, maintainer, or
-          correspondent (somebody who has participated in bug messages).
+          correspondent (somebody who has participated in bug
+          messages).
 
      'log_modified'
      'last_modified'
@@ -241,10 +246,10 @@ a HyperEstraier based search engine
           The summary of the bug report.
 
      Not all of these attributes could be queried on the GNU Debbugs
-     server via the Debbugs/SOAP backend.  In this case, the results of
-     a query are discriminated on the client side, which is indicated by
-     the string "(client-side filter)" in the minibuffer after the
-     attribute name.
+     server via the Debbugs/SOAP backend.  In this case, the results
+     of a query are discriminated on the client side, which is
+     indicated by the string "(client-side filter)" in the minibuffer
+     after the attribute name.
 
    ---------- Footnotes ----------
 
@@ -261,8 +266,9 @@ File: debbugs-ug.info,  Node: Layout,  Next: Minor Mode,  
Prev: Searching Bugs,
 ********
 
 The commands described in the previous chapters generate (a) report
-buffer(s) applicable for navigation.  'debbugs-gnu-*' return a tabulated
-list, and 'debbugs-org-*' return a list of TODO items in 'org-mode'.
+buffer(s) applicable for navigation.  'debbugs-gnu-*' return a
+tabulated list, and 'debbugs-org-*' return a list of TODO items in
+'org-mode'.
 
 * Menu:
 
@@ -277,21 +283,21 @@ File: debbugs-ug.info,  Node: Tabulated Lists,  Next: 
TODO Items,  Up: Layout
 ===================
 
 A tabulated list of bug reports consist of four columns for every bug
-entry: 'Id' (the bug number), 'State' (some bug attributes), 'Submitter'
-(the name of the bug submitter), and 'Title' (the bug subject).  Per
-default the bugs are sorted by 'Id'; this could be changed by clicking
-in the headline.
+entry: 'Id' (the bug number), 'State' (some bug attributes),
+'Submitter' (the name of the bug submitter), and 'Title' (the bug
+subject).  Per default the bugs are sorted by 'Id'; this could be
+changed by clicking in the headline.
 
    Per bug retrieval only up to 500
 ('debbugs-gnu-default-hits-per-page') bugs are retrieved and presented
-in a buffer.  If there shall be presented more bugs, widgets are placed
-on the top and bottom of the buffer for navigation to further report
-buffers.
+in a buffer.  If there shall be presented more bugs, widgets are
+placed on the top and bottom of the buffer for navigation to further
+report buffers.
 
    Different foreground colours present further information on the bug
-report.  If the bug number uses a red colour ('debbugs-gnu-tagged'), the
-bug has been tagged locally.  The same face is used to mark bugs in the
-submitter or title column, when the bug has been reported / is
+report.  If the bug number uses a red colour ('debbugs-gnu-tagged'),
+the bug has been tagged locally.  The same face is used to mark bugs
+in the submitter or title column, when the bug has been reported / is
 maintained by the user.
 
    The bug state could appear in different colours: red
@@ -305,38 +311,51 @@ shown with inverse face ('debbugs-gnu-archived').
    The bug report buffers have enabled the minor 'debbugs-gnu-mode'.
 This enables the following key strokes:
 
-'<RET>'       'debbugs-gnu-select-report'
-'<mouse-1>'   Show the email messages that discuss the bug.
-'<mouse-2>'   
-              
-'d'           'debbugs-gnu-display-status'
-              Show all bug attributes.
-              
-'g'           'debbugs-gnu-rescan'
-              Reload all bugs from the GNU Debbugs server.
-              
-'B'           'debbugs-gnu-show-blocking-reports'
-'b'           'debbugs-gnu-show-blocked-by-reports'
-              Show all bug reports which are blocking / blocked by this bug.
-              
-'s'           'debbugs-gnu-toggle-sort'
-              Toggle sorting order of bugs.
-              
-'t'           'debbugs-gnu-toggle-tag'
-              Toggle local tag of bugs.
-              
-'x'           'debbugs-gnu-toggle-suppress'
-              Toggle showing of closed bugs.
-              
-'C'           'debbugs-gnu-send-control-message'
-              Send a control message for this bug, *note Control Messages::.
-              
-
-   The user option 'debbugs-gnu-mail-backend' controls the presentation
-of email messages produced by typing '<RET>' or by clicking the mouse on
-a bug: if its value is 'gnus', the default, a GNUS ephemeral group for
-that bug will be shown; if its value is 'rmail', the command will
-present an Rmail folder instead.
+'<RET>'        'debbugs-gnu-select-report'
+'<mouse-1>'    Show the email messages that discuss the bug.
+'<mouse-2>'    
+               
+'d'            'debbugs-gnu-display-status'
+               Show all bug attributes.
+               
+'/'            'debbugs-gnu-narrow-to-status'
+               Narrow the list of bugs to the bugs that match the
+               given regex in 'State', 'Submitter' or 'Title'.
+               
+'R'            'debbugs-gnu-show-all-blocking-reports'
+               Narrow the list of bug reports to the ones that are
+               blocking the current release.
+               
+'w'            'debbugs-gnu-widen'
+               Restore the full list again after narrowing.
+               
+'g'            'debbugs-gnu-rescan'
+               Reload all bugs from the GNU Debbugs server.
+               
+'B'            'debbugs-gnu-show-blocking-reports'
+'b'            'debbugs-gnu-show-blocked-by-reports'
+               Show all bug reports which are blocking / blocked by
+               this bug.
+               
+'s'            'debbugs-gnu-toggle-sort'
+               Toggle sorting order of bugs.
+               
+'t'            'debbugs-gnu-toggle-tag'
+               Toggle local tag of bugs.
+               
+'x'            'debbugs-gnu-toggle-suppress'
+               Toggle showing of closed bugs.
+               
+'C'            'debbugs-gnu-send-control-message'
+               Send a control message for this bug,
+               *note Control Messages::.
+               
+
+   The user option 'debbugs-gnu-mail-backend' controls the
+presentation of email messages produced by typing '<RET>' or by
+clicking the mouse on a bug: if its value is 'gnus', the default, a
+GNUS ephemeral group for that bug will be shown; if its value is
+'rmail', the command will present an Rmail folder instead.
 
 
 File: debbugs-ug.info,  Node: TODO Items,  Next: Control Messages,  Prev: 
Tabulated Lists,  Up: Layout
@@ -350,8 +369,8 @@ navigation in 'org-mode'.
 
    Per bug retrieval only up to 500
 ('debbugs-gnu-default-hits-per-page') bugs are retrieved and presented
-in a buffer.  At the end of the buffer there is a link, which allows to
-append the next 500 bugs to the list.
+in a buffer.  At the end of the buffer there is a link, which allows
+to append the next 500 bugs to the list.
 
    Bug severities are mapped onto org severities, see
 'debbugs-org-severity-priority'.
@@ -385,11 +404,11 @@ Debbugs control messages are sent by email to the GNU 
Debbugs control
 server.  Their format is described in
 <http://debbugs.gnu.org/server-control.html>.
 
-   A control message can be initiated in the tabulated list of bugs, in
-the list of org TODO items, or in the GNUS ephemeral group or Rmail
+   A control message can be initiated in the tabulated list of bugs,
+in the list of org TODO items, or in the GNUS ephemeral group or Rmail
 folder opened for the messages belonging to a given bug.  Control
-messages can be sent to unarchived bugs only, in case a bug is archived
-the control message 'unarchive' must be sent first.
+messages can be sent to unarchived bugs only, in case a bug is
+archived the control message 'unarchive' must be sent first.
 
    In the minibuffer, the following control messages can be requested
 (assuming that 12345 is the bug the control message is intended for).
@@ -490,13 +509,14 @@ hyperlinks are implemented as minor modes 
'bug-reference-mode' and
 
    This package adds a new minor mode 'debbugs-browse-mode' on top of
 them.  Instead of using the default built-in Emacs browser for a given
-bug reference, it opens a corresponding bug report buffer.  The customer
-option 'debbugs-browse-function' controls, whether 'debbugs-gnu-bugs' or
-'debbugs-org-bugs' is called.
+bug reference, it opens a corresponding bug report buffer.  The
+customer option 'debbugs-browse-function' controls, whether
+'debbugs-gnu-bugs' or 'debbugs-org-bugs' is called.
 
-   This minor mode is applicable for all URLs, not only bug references.
-Any URL with the format <http://debbugs.gnu.org/12345> will be shown in
-a bug report buffer, when 'debbugs-browse-mode' is enabled.
+   This minor mode is applicable for all URLs, not only bug
+references.  Any URL with the format <http://debbugs.gnu.org/12345>
+will be shown in a bug report buffer, when 'debbugs-browse-mode' is
+enabled.
 
 
 File: debbugs-ug.info,  Node: Command Index,  Next: Variable Index,  Prev: 
Minor Mode,  Up: Top
@@ -507,13 +527,13 @@ Command Index
 [index]
 * Menu:
 
-* debbugs-browse-mode:                   Minor Mode.           (line 12)
-* debbugs-gnu:                           Retrieving Bugs.      (line 14)
-* debbugs-gnu-bugs:                      Retrieving Bugs.      (line 68)
-* debbugs-gnu-search:                    Searching Bugs.       (line 10)
-* debbugs-org:                           Retrieving Bugs.      (line 16)
-* debbugs-org-bugs:                      Retrieving Bugs.      (line 69)
-* debbugs-org-search:                    Searching Bugs.       (line 11)
+* debbugs-browse-mode:                   Minor Mode.         (line 12)
+* debbugs-gnu:                           Retrieving Bugs.    (line 15)
+* debbugs-gnu-bugs:                      Retrieving Bugs.    (line 71)
+* debbugs-gnu-search:                    Searching Bugs.     (line 10)
+* debbugs-org:                           Retrieving Bugs.    (line 17)
+* debbugs-org-bugs:                      Retrieving Bugs.    (line 72)
+* debbugs-org-search:                    Searching Bugs.     (line 11)
 
 
 File: debbugs-ug.info,  Node: Variable Index,  Next: Key Index,  Prev: Command 
Index,  Up: Top
@@ -524,13 +544,13 @@ Variable Index
 [index]
 * Menu:
 
-* debbugs-browse-function:               Minor Mode.           (line 12)
-* debbugs-gnu-all-packages:              Retrieving Bugs.      (line 35)
-* debbugs-gnu-all-severities:            Retrieving Bugs.      (line 26)
-* debbugs-gnu-default-hits-per-page:     Retrieving Bugs.      (line 61)
-* debbugs-gnu-default-packages:          Retrieving Bugs.      (line 57)
-* debbugs-gnu-default-severities:        Retrieving Bugs.      (line 57)
-* debbugs-gnu-mail-backend:              Tabulated Lists.      (line 62)
+* debbugs-browse-function:               Minor Mode.         (line 12)
+* debbugs-gnu-all-packages:              Retrieving Bugs.    (line 36)
+* debbugs-gnu-all-severities:            Retrieving Bugs.    (line 27)
+* debbugs-gnu-default-hits-per-page:     Retrieving Bugs.    (line 63)
+* debbugs-gnu-default-packages:          Retrieving Bugs.    (line 59)
+* debbugs-gnu-default-severities:        Retrieving Bugs.    (line 59)
+* debbugs-gnu-mail-backend:              Tabulated Lists.    (line 75)
 
 
 File: debbugs-ug.info,  Node: Key Index,  Prev: Variable Index,  Up: Top
@@ -541,37 +561,40 @@ Key Index
 [index]
 * Menu:
 
-* 'B':                                   Tabulated Lists.      (line 45)
-* 'b':                                   Tabulated Lists.      (line 46)
-* 'C':                                   Tabulated Lists.      (line 58)
-* 'C-c # C':                             TODO Items.           (line 30)
-* 'C-c # d':                             TODO Items.           (line 24)
-* 'C-c # t':                             TODO Items.           (line 27)
-* 'd':                                   Tabulated Lists.      (line 39)
-* 'g':                                   Tabulated Lists.      (line 42)
-* '<mouse-1>':                           Tabulated Lists.      (line 35)
-* '<mouse-2>':                           Tabulated Lists.      (line 37)
-* '<RET>':                               Tabulated Lists.      (line 35)
-* 's':                                   Tabulated Lists.      (line 49)
-* 't':                                   Tabulated Lists.      (line 52)
-* '<TAB>':                               TODO Items.           (line 21)
-* 'x':                                   Tabulated Lists.      (line 55)
+* '/':                                   Tabulated Lists.    (line 42)
+* 'B':                                   Tabulated Lists.    (line 56)
+* 'b':                                   Tabulated Lists.    (line 57)
+* 'C':                                   Tabulated Lists.    (line 70)
+* 'C-c # C':                             TODO Items.         (line 30)
+* 'C-c # d':                             TODO Items.         (line 24)
+* 'C-c # t':                             TODO Items.         (line 27)
+* 'd':                                   Tabulated Lists.    (line 39)
+* 'g':                                   Tabulated Lists.    (line 53)
+* '<mouse-1>':                           Tabulated Lists.    (line 36)
+* '<mouse-2>':                           Tabulated Lists.    (line 37)
+* 'R':                                   Tabulated Lists.    (line 46)
+* '<RET>':                               Tabulated Lists.    (line 35)
+* 's':                                   Tabulated Lists.    (line 61)
+* 't':                                   Tabulated Lists.    (line 64)
+* '<TAB>':                               TODO Items.         (line 21)
+* 'w':                                   Tabulated Lists.    (line 50)
+* 'x':                                   Tabulated Lists.    (line 67)
 
 
 
 Tag Table:
-Node: Top1087
-Node: Retrieving Bugs2625
-Node: Searching Bugs6147
-Ref: Searching Bugs-Footnote-110016
-Ref: Searching Bugs-Footnote-210104
-Node: Layout10195
-Node: Tabulated Lists10670
-Node: TODO Items13493
-Node: Control Messages14758
-Node: Minor Mode17069
-Node: Command Index18007
-Node: Variable Index18668
-Node: Key Index19330
+Node: Top1092
+Node: Retrieving Bugs2629
+Node: Searching Bugs6160
+Ref: Searching Bugs-Footnote-110039
+Ref: Searching Bugs-Footnote-210127
+Node: Layout10218
+Node: Tabulated Lists10693
+Node: TODO Items14057
+Node: Control Messages15322
+Node: Minor Mode17633
+Node: Command Index18572
+Node: Variable Index19219
+Node: Key Index19867
 
 End Tag Table
diff --git a/debbugs-ug.texi b/debbugs-ug.texi
index f885125..e766e52 100644
--- a/debbugs-ug.texi
+++ b/debbugs-ug.texi
@@ -37,6 +37,7 @@ and modified without restriction.
 
 @contents
 
+
 @node Top
 @top Debbugs User Guide
 
@@ -69,6 +70,7 @@ Programmer's Manual, debbugs}).
 * Key Index::                   Keyboard strokes on bug report buffers.
 @end menu
 
+
 @node Retrieving Bugs
 @chapter Retrieving Bugs
 
@@ -283,6 +285,7 @@ in @code{org-mode}.
 * Control Messages::            Control Messages.
 @end menu
 
+
 @node Tabulated Lists
 @section Tabulated Lists
 
@@ -316,13 +319,13 @@ is closed).  Archived bugs are shown with inverse face
 The bug report buffers have enabled the minor
 @code{debbugs-gnu-mode}.  This enables the following key strokes:
 
-@multitable {@kbd{@key{mouse-2}}} {Some very very very long long text Some 
very very very long long text Some very very very long long text}
+@multitable @columnfractions .20 .80
 
 @item
 @kindex @kbd{@key{RET}}
-@kbd{@key{RET}}
+@kbd{@key{RET}} @*
 @kindex @kbd{@key{mouse-1}}
-@kbd{@key{mouse-1}}
+@kbd{@key{mouse-1}} @*
 @kindex @kbd{@key{mouse-2}}
 @kbd{@key{mouse-2}} @tab
 @code{debbugs-gnu-select-report} @*
@@ -337,23 +340,24 @@ Show all bug attributes.
 @item
 @kindex @kbd{/}
 @kbd{/} @tab
-@code{debbugs-gnu-narrow-to-status}
-Narrow the list of bugs to the bugs that match the given regex.
+@code{debbugs-gnu-narrow-to-status} @*
+Narrow the list of bugs to the bugs that match the given regex in
+@code{State}, @code{Submitter} or @code{Title}.
+
+@item
+@kindex @kbd{R}
+@kbd{R} @tab
+@code{debbugs-gnu-show-all-blocking-reports} @*
+Narrow the list of bug reports to the ones that are blocking the
+current release.
 
 @item
 @kindex @kbd{w}
 @kbd{w} @tab
-@code{debbugs-gnu-widen}
+@code{debbugs-gnu-widen} @*
 Restore the full list again after narrowing.
 
 @item
-@kindex @kbd{R}
-@kbd{R} @tab
-@code{debbugs-gnu-show-all-blocking-reports}
-Narrow the list of reports to the ones that are blocking the current
-release.
-
-@item
 @kindex @kbd{g}
 @kbd{g} @tab
 @code{debbugs-gnu-rescan} @*
@@ -361,11 +365,10 @@ Reload all bugs from the GNU Debbugs server.
 
 @item
 @kindex @kbd{B}
-@kbd{B} @tab
-@code{debbugs-gnu-show-blocking-reports}
-@item
+@kbd{B} @*
 @kindex @kbd{b}
 @kbd{b} @tab
+@code{debbugs-gnu-show-blocking-reports} @*
 @code{debbugs-gnu-show-blocked-by-reports} @*
 Show all bug reports which are blocking / blocked by this bug.
 
@@ -403,6 +406,7 @@ default, a GNUS ephemeral group for that bug will be shown; 
if its
 value is @code{rmail}, the command will present an Rmail folder
 instead.
 
+
 @node TODO Items
 @section TODO Items