From 21812e2b96e100bdd94e402b73cefdba7b20b82e Mon Sep 17 00:00:00 2001
From: Michael Albinus <michael.albinus@gmx.de>
Date: Wed, 15 Jun 2016 11:00:10 +0200
Subject: [PATCH] Various changes in debbugs-gnu

* packages/debbugs/debbugs-gnu.el (debbugs-gnu-emacs-current-release):
New defcustom.
(debbugs-gnu-blocking-reports): New defconst, derived from
`debbugs-gnu-blocking-report'.
(debbugs-gnu-show-all-blocking-reports): Use them.
---
 packages/debbugs/debbugs-gnu.el | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/packages/debbugs/debbugs-gnu.el b/packages/debbugs/debbugs-gnu.el
index ce694cbb6..a84083f9d 100644
--- a/packages/debbugs/debbugs-gnu.el
+++ b/packages/debbugs/debbugs-gnu.el
@@ -187,9 +187,6 @@
   :group 'debbugs
   :version "24.1")
 
-(defvar debbugs-gnu-blocking-report 19759
-  "The ID of the current release report used to track blocking bug reports.")
-
 (defcustom debbugs-gnu-default-severities '("serious" "important" "normal")
   "*The list severities bugs are searched for.
 \"tagged\" is not a severity but marks locally tagged bugs."
@@ -325,6 +322,22 @@ a date, value is the cons cell \(BEFORE . AFTER\).")
 The specification which bugs shall be suppressed is taken from
   `debbugs-gnu-default-suppress-bugs'.")
 
+(defcustom debbugs-gnu-emacs-current-release "25.1"
+  "The current Emacs relase developped for."
+  :group 'debbugs-gnu
+  :type '(set (const "24.5")
+	      (const "25.1")
+	      (const "25.2"))
+  :version "25.1")
+
+(defconst debbugs-gnu-blocking-reports
+  '(("24.5" . 19758)
+    ("25.1" . 19759)
+    ("25.2" . 21966))
+  "The IDs of the Emacs report used to track blocking bug reports.
+It is a list of cons cells, each one containing the Emacs
+version (a string) and the bug report number (a number).")
+
 (defun debbugs-gnu-calendar-read (prompt acceptable &optional initial-contents)
   "Return a string read from the minibuffer.
 Derived from `calendar-read'."
@@ -1046,9 +1059,16 @@ The following commands are available:
 (defun debbugs-gnu-show-all-blocking-reports ()
   "Narrow the display to just the reports that are blocking a release."
   (interactive)
-  (let ((blockers (cdr (assq 'blockedby
-			     (car (debbugs-get-status
-				   debbugs-gnu-blocking-report)))))
+  (let ((blockers
+	 (cdr
+	  (assq
+	   'blockedby
+	   (car
+	    (debbugs-get-status
+	     (cdr
+	      (assoc
+	       debbugs-gnu-emacs-current-release
+	       debbugs-gnu-blocking-reports)))))))
 	(id (debbugs-gnu-current-id t))
 	(inhibit-read-only t)
 	status)
-- 
2.39.2