[elpa] externals/debbugs caf94fe 012/311: * debbugs-gnu.el (debbugs-emacs): Change default hits to 500.

[Stefan Monnier]

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

    * debbugs-gnu.el (debbugs-emacs): Change default hits to 500.
    (debbugs-send-control-message): Compute version number more precisely.
---
 debbugs-gnu.el | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/debbugs-gnu.el b/debbugs-gnu.el
index 034cdee..2dec10f 100644
--- a/debbugs-gnu.el
+++ b/debbugs-gnu.el
@@ -60,7 +60,7 @@
   (let ((debbugs-port "gnu.org")
        (buffer-read-only nil)
        (ids nil)
-       (default 400))
+       (default 500))
     (dolist (severity severities)
       (setq ids (nconc ids
                       (debbugs-get-bugs :package (or package "emacs")
@@ -208,9 +208,20 @@ fixed, and then closed."
          (when (member message '("close" "done"))
            (read-string
             "Version: "
-            (if (string-match "^\\(\\([.0-9]+\\)*\\)\\.[0-9]+$" emacs-version)
-                (match-string 1 emacs-version)
-              emacs-version)))))
+            (cond
+             ;; Emacs development versions.
+             ((string-match
+               "^\\([0-9]+\\)\\.\\([0-9]+\\)\\.\\([0-9]+\\)\\." emacs-version)
+              (format "%s.%d"
+                      (match-string 1 emacs-version)
+                      (1+ (string-to-number (match-string 2 emacs-version)))))
+             ;; Emacs release versions.
+             ((string-match
+               "^\\([0-9]+\\)\\.\\([0-9]+\\)\\.\\([0-9]+\\)$" emacs-version)
+              (format "%s.%s"
+                      (match-string 1 emacs-version)
+                      (match-string 2 emacs-version)))
+             (t emacs-version))))))
     (with-temp-buffer
       (insert "To: control@debbugs.gnu.org\n"
              "From: " (message-make-from) "\n"