all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Glenn Morris <rgm@gnu.org>
To: Noam Postavsky <npostavs@users.sourceforge.net>
Cc: 25590@debbugs.gnu.org
Subject: bug#25590: Remove build number from emacs-version variable
Date: Tue, 07 Feb 2017 01:23:41 -0500	[thread overview]
Message-ID: <pashnq7c42.fsf@fencepost.gnu.org> (raw)
In-Reply-To: <oh37fqbom0.fsf@fencepost.gnu.org> (Glenn Morris's message of "Mon, 06 Feb 2017 23:40:07 -0500")


I forgot to include the elpa piece.

--- i/packages/debbugs/debbugs-gnu.el
+++ w/packages/debbugs/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 <larsi@gnus.org>
 ;;         Michael Albinus <michael.albinus@gmx.org>
@@ -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)))





      reply	other threads:[~2017-02-07  6:23 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-31 17:55 bug#25590: Remove build number from emacs-version variable Glenn Morris
2017-02-04 10:15 ` Eli Zaretskii
2017-02-05 23:45   ` Glenn Morris
2017-02-06 15:32     ` Eli Zaretskii
2017-02-06 18:34       ` Noam Postavsky
2017-02-06 19:38         ` Eli Zaretskii
2017-02-06 20:24           ` Noam Postavsky
2017-02-07  4:40         ` Glenn Morris
2017-02-07  6:23           ` Glenn Morris [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=pashnq7c42.fsf@fencepost.gnu.org \
    --to=rgm@gnu.org \
    --cc=25590@debbugs.gnu.org \
    --cc=npostavs@users.sourceforge.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.