* debbugs-gnu.el (debbugs-send-control-message): Prompt for version number for

"close" and "done" control messages.

diff --git a/packages/debbugs/ChangeLog b/packages/debbugs/ChangeLog
index adab15046455104c2404adb7135c7ae0ee1e7771..6bca77945247be87ea3f44034973b5943feadc8e 100644 (file)
--- a/packages/debbugs/ChangeLog
+++ b/packages/debbugs/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/packages/debbugs/debbugs-gnu.el b/packages/debbugs/debbugs-gnu.el
index dcad5cefc928834e717ab81187e527ad53139110..034cdee609d46e9230d17146223f5b6c9ecc3bda 100644 (file)
--- a/packages/debbugs/debbugs-gnu.el
+++ b/packages/debbugs/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