branch: externals/debbugs
commit 94e859e133dde39ce4e1799914a44b411ccdf132
Author: Glenn Morris <[email protected]>
Commit: Glenn Morris <[email protected]>
debbugs: Handle Emacs with separate build number
* packages/debbugs/debbugs.el: Bump version to 0.13.
* packages/debbugs/debbugs-gnu.el (debbugs-gnu-send-control-message):
Handle emacs-version without build number.
---
debbugs-gnu.el | 16 +++++++++++-----
debbugs.el | 4 ++--
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/debbugs-gnu.el b/debbugs-gnu.el
index 42f2cb0..a948ca1 100644
--- a/debbugs-gnu.el
+++ b/debbugs-gnu.el
@@ -1,6 +1,6 @@
;;; debbugs-gnu.el --- interface for the GNU bug tracker -*-
lexical-binding:t -*-
-;; Copyright (C) 2011-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2017 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <[email protected]>
;; Michael Albinus <[email protected]>
@@ -1501,14 +1501,20 @@ removed instead."
"Version: "
(cond
;; Emacs development versions.
- ((string-match
- "^\\([0-9]+\\)\\.\\([0-9]+\\)\\.\\([0-9]+\\)\\." emacs-version)
+ ((if (boundp 'emacs-build-number)
+ (string-match
+ "^\\([0-9]+\\)\\.\\([0-9]+\\)\\.\\([0-9]+\\)" emacs-version)
+ (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)
+ ((if (boundp 'emacs-build-number)
+ (string-match
+ "^\\([0-9]+\\)\\.\\([0-9]+\\)$" emacs-version)
+ (string-match
+ "^\\([0-9]+\\)\\.\\([0-9]+\\)\\.\\([0-9]+\\)$" emacs-version))
(format "%s.%s"
(match-string 1 emacs-version)
(match-string 2 emacs-version)))
diff --git a/debbugs.el b/debbugs.el
index ff85c35..a5b7148 100644
--- a/debbugs.el
+++ b/debbugs.el
@@ -1,11 +1,11 @@
;;; debbugs.el --- SOAP library to access debbugs servers -*-
lexical-binding:t -*-
-;; Copyright (C) 2011-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2017 Free Software Foundation, Inc.
;; Author: Michael Albinus <[email protected]>
;; Keywords: comm, hypermedia
;; Package: debbugs
-;; Version: 0.12
+;; Version: 0.13
;; Package-Requires: ((soap-client "3.1.1") (cl-lib "0.5"))
;; This file is not part of GNU Emacs.
