[elpa] externals/debbugs abc7751 069/311: * debbugs-gnu.el (debbugs-gnu-search): Let-bind

[Stefan Monnier]

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

    * debbugs-gnu.el (debbugs-gnu-search): Let-bind
    `debbugs-gnu-current-query'.
    (debbugs-gnu): Add attribute :query to the widgets.
    (debbugs-gnu-print-entry): Get query from `debbugs-gnu-current-widget'.
    (debbugs-gnu-guess-current-id): Rename from `debbugs-guess-current-id'.
    (debbugs-gnu-send-control-message): Use it.
---
 ChangeLog      |  9 +++++++++
 debbugs-gnu.el | 18 ++++++++++--------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 01171f1..f14c70b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-07-21  Michael Albinus  <michael.albinus@gmx.de>
+
+       * debbugs-gnu.el (debbugs-gnu-search): Let-bind
+       `debbugs-gnu-current-query'.
+       (debbugs-gnu): Add attribute :query to the widgets.
+       (debbugs-gnu-print-entry): Get query from `debbugs-gnu-current-widget'.
+       (debbugs-gnu-guess-current-id): Rename from `debbugs-guess-current-id'.
+       (debbugs-gnu-send-control-message): Use it.
+
 2011-07-20  Michael Albinus  <michael.albinus@gmx.de>
 
        * debbugs-gnu.el (debbugs-gnu-get-bugs): If
diff --git a/debbugs-gnu.el b/debbugs-gnu.el
index a7f3daa..8370088 100644
--- a/debbugs-gnu.el
+++ b/debbugs-gnu.el
@@ -224,10 +224,10 @@ expression matchin the corresponding value, a string."
            (add-to-list 'query (cons (intern key) val))
          (setq continue nil)))
       query)))
-  (setq debbugs-gnu-current-query query)
-  (if (called-interactively-p 'interactive)
-      (call-interactively 'debbugs-gnu)
-    (debbugs-gnu severities packages archivedp suppress)))
+  (let ((debbugs-gnu-current-query query))
+    (if (called-interactively-p 'interactive)
+       (call-interactively 'debbugs-gnu)
+      (debbugs-gnu severities packages archivedp suppress))))
 
 (defun debbugs-gnu (severities &optional packages archivedp suppress)
   "List all outstanding Emacs bugs."
@@ -299,6 +299,7 @@ expression matchin the corresponding value, a string."
              :suppress suppress
              :buffer-name (format "*Emacs Bugs*<%d>" i)
              :bug-ids curr-ids
+             :query debbugs-gnu-current-query
              :help-echo (format "%d-%d" (car ids) (car (last curr-ids)))
              :format " %[%v%]"
              (number-to-string i))
@@ -311,7 +312,8 @@ expression matchin the corresponding value, a string."
        'const
        :suppress suppress
        :buffer-name "*Emacs Bugs*"
-       :bug-ids ids)))))
+       :bug-ids ids
+       :query debbugs-gnu-current-query)))))
 
 (defun debbugs-gnu-get-bugs ()
   "Retrieve bugs numbers from debbugs.gnu.org according search criteria."
@@ -481,7 +483,7 @@ Used instead of `tabulated-list-print-entry'."
                          (throw :suppress t))))))
           ;; Filter search list.
           (not (catch :suppress
-                 (dolist (check debbugs-gnu-current-query)
+                 (dolist (check (widget-get debbugs-gnu-current-widget :query))
                    (when (not
                           (string-match
                            (cdr check)
@@ -744,7 +746,7 @@ The following commands are available:
               ;; `message-simplify-subject'.  So we cannot use m-s-s.
               (setq subject ,debbugs-gnu-subject))))))))
 
-(defun debbugs-guess-current-id ()
+(defun debbugs-gnu-guess-current-id ()
   "Guess the ID based on \"#23\"."
   (save-excursion
     (beginning-of-line)
@@ -777,7 +779,7 @@ removed instead."
          nil t)
         current-prefix-arg))
   (let* ((id (or debbugs-gnu-bug-number        ; Set on group entry.
-                (debbugs-guess-current-id)
+                (debbugs-gnu-guess-current-id)
                 (debbugs-gnu-current-id)))
         (version
          (when (member message '("close" "done"))