From 7dcd777e1461002059399219ba77e891533a65bb Mon Sep 17 00:00:00 2001
From: Tassilo Horn <tassilo@member.fsf.org>
Date: Sat, 20 Nov 2010 18:32:57 +0100
Subject: [PATCH] * mail/emacsbug.el (report-emacs-bug-query-existing-bugs)
 (report-emacs-bug-parse-query-results)
 (report-emacs-bug-create-existing-bugs-buffer): Pass through keywords used
 for querying the bug database to show them in the existing bugs buffer.

---
 lisp/ChangeLog        |  8 ++++++++
 lisp/mail/emacsbug.el | 12 +++++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0594cca0b8d..302d5e3b982 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2010-11-20  Tassilo Horn  <tassilo@member.fsf.org>
+
+	* mail/emacsbug.el (report-emacs-bug-query-existing-bugs)
+	(report-emacs-bug-parse-query-results)
+	(report-emacs-bug-create-existing-bugs-buffer): Pass through
+	keywords used for querying the bug database to show them in the
+	existing bugs buffer.
+
 2010-11-20  Jan Djärv  <jan.h.d@swipnet.se>
 
 	* tool-bar.el (tool-bar-setup): Add some :vert-only keywords.
diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index 73e26a3a53d..1a8be7fc5a8 100644
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -380,7 +380,7 @@ and send the mail again%s."
 
 ;; Querying the bug database
 
-(defun report-emacs-bug-create-existing-bugs-buffer (bugs)
+(defun report-emacs-bug-create-existing-bugs-buffer (bugs keywords)
   (switch-to-buffer (get-buffer-create "*Existing Emacs Bugs*"))
   (setq buffer-read-only t)
   (let ((inhibit-read-only t))
@@ -388,7 +388,9 @@ and send the mail again%s."
     (make-local-variable 'bug-alist)
     (setq bug-alist bugs)
     (make-local-variable 'bug-choice-widget)
-    (widget-insert (propertize "Already known bugs:\n\n" 'face 'bold))
+    (widget-insert (propertize (concat "Already known bugs ("
+				       keywords "):\n\n")
+			       'face 'bold))
     (if bugs
 	(setq bug-choice-widget
 	      (apply 'widget-create 'radio-button-choice
@@ -430,7 +432,7 @@ and send the mail again%s."
   (widget-setup)
   (goto-char (point-min)))
 
-(defun report-emacs-bug-parse-query-results (status)
+(defun report-emacs-bug-parse-query-results (status keywords)
   (goto-char (point-min))
   (let (buglist)
     (while (re-search-forward "<a href=\"bugreport\\.cgi\\?bug=\\([[:digit:]]+\\)\">\\([^<]+\\)</a>" nil t)
@@ -444,7 +446,7 @@ and send the mail again%s."
 		 ;; then the subject and number
 		 subject (string-to-number number))
 		buglist))))
-    (report-emacs-bug-create-existing-bugs-buffer (nreverse buglist))))
+    (report-emacs-bug-create-existing-bugs-buffer (nreverse buglist) keywords)))
 
 (defun report-emacs-bug-query-existing-bugs (keywords)
   "Query for KEYWORDS at `report-emacs-bug-tracker-url', and return the result.
@@ -454,7 +456,7 @@ The result is an alist with items of the form (URL SUBJECT NO)."
 			"pkgreport.cgi?include=subject%3A"
 			(replace-regexp-in-string "[[:space:]]+" "+" keywords)
 			";package=emacs")
-		'report-emacs-bug-parse-query-results))
+		'report-emacs-bug-parse-query-results (list keywords)))
 
 (provide 'emacsbug)
 
-- 
2.39.5