* debbugs.el (debbugs-send-control-message): Add more control messages.

diff --git a/packages/debbugs/ChangeLog b/packages/debbugs/ChangeLog
index aac28709bfde82e0bfc542af726ef0608e4ed696..c80686d691fa8eecd5c1739a75c9f7d35429c6d1 100644 (file)
--- a/packages/debbugs/ChangeLog
+++ b/packages/debbugs/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * debbugs.el (debbugs-send-control-message): Add more control
+       messages.
+
 2011-07-02  Michael Albinus  <michael.albinus@gmx.de>
 
        * debbugs.el (debbugs-emacs): Let-bind `debbugs-port' to "gnu.org".

diff --git a/packages/debbugs/debbugs.el b/packages/debbugs/debbugs.el
index 38e4befb9a2631cbb4b959463d94cb6c7138ed2c..ca05188e084628682a576e8648e2155dcc79cd65 100644 (file)
--- a/packages/debbugs/debbugs.el
+++ b/packages/debbugs/debbugs.el
@@ -532,7 +532,9 @@ fixed, and then closed."
    (list (completing-read
          "Control message: "
          '("important" "normal" "minor" "wishlist"
-           "close" "done"
+           "done"
+           "unarchive" "reopen" "close"
+           "merge" "forcemerge"
            "patch" "wontfix" "moreinfo" "unreproducible" "fixed" "notabug")
          nil t)))
   (let* ((subject (mail-header-subject (gnus-summary-article-header)))
@@ -546,8 +548,11 @@ fixed, and then closed."
              (format "Subject: control message for bug #%d\n" id)
              "\n"
              (cond
-              ((equal message "close")
-               (format "close %d\n" id))
+              ((member message '("unarchive" "reopen" "close"))
+               (format "%s %d\n" message id))
+              ((member message '("merge" "forcemerge"))
+               (format "%s %d %s\n" message id
+                       (read-string "Merge with bug #: ")))
               ((equal message "done")
                (format "tags %d fixed\nclose %d\n" id id))
               ((member message '("important" "normal" "minor" "wishlist"))