[elpa] externals/debbugs aeed946 011/311: * debbugs-gnu.el (debbugs-send-control-message): Prompt for version number for

[Stefan Monnier]

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

    * debbugs-gnu.el (debbugs-send-control-message): Prompt for version number 
for
    "close" and "done" control messages.
---
 ChangeLog      |  2 ++
 debbugs-gnu.el | 15 ++++++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index adab150..6bca779 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
        * debbugs-gnu.el (debbugs-emacs): Propertize with 'help-echo.
        (debbugs-mode-map): Define key "q".
+       (debbugs-send-control-message): Prompt for version number for
+       "close" and "done" control messages.
 
 2011-07-02  Michael Albinus  <michael.albinus@gmx.de>
 
diff --git a/debbugs-gnu.el b/debbugs-gnu.el
index dcad5ce..034cdee 100644
--- a/debbugs-gnu.el
+++ b/debbugs-gnu.el
@@ -203,20 +203,29 @@ fixed, and then closed."
         (id
          (if (string-match "bug#\\([0-9]+\\)" subject)
              (string-to-number (match-string 1 subject))
-           (error "No bug number present"))))
+           (error "No bug number present")))
+        (version
+         (when (member message '("close" "done"))
+           (read-string
+            "Version: "
+            (if (string-match "^\\(\\([.0-9]+\\)*\\)\\.[0-9]+$" emacs-version)
+                (match-string 1 emacs-version)
+              emacs-version)))))
     (with-temp-buffer
       (insert "To: control@debbugs.gnu.org\n"
              "From: " (message-make-from) "\n"
              (format "Subject: control message for bug #%d\n" id)
              "\n"
              (cond
-              ((member message '("unarchive" "reopen" "close"))
+              ((member message '("unarchive" "reopen"))
                (format "%s %d\n" message id))
               ((member message '("merge" "forcemerge"))
                (format "%s %d %s\n" message id
                        (read-string "Merge with bug #: ")))
+              ((equal message "close")
+               (format "close %d %s\n" id version))
               ((equal message "done")
-               (format "tags %d fixed\nclose %d\n" id id))
+               (format "tags %d fixed\nclose %d %s\n" id id version))
               ((member message '("important" "normal" "minor" "wishlist"))
                (format "severity %d %s\n" id message))
               (t