From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.bugs Subject: bug#25590: Remove build number from emacs-version variable Date: Tue, 07 Feb 2017 01:23:41 -0500 Message-ID: References: <1svasvru4x.fsf@fencepost.gnu.org> <83r33e8doa.fsf@gnu.org> <83k29372t6.fsf@gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1486448808 32676 195.159.176.226 (7 Feb 2017 06:26:48 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 7 Feb 2017 06:26:48 +0000 (UTC) User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) Cc: 25590@debbugs.gnu.org To: Noam Postavsky Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Feb 07 07:26:44 2017 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cazEh-0008Hl-BH for geb-bug-gnu-emacs@m.gmane.org; Tue, 07 Feb 2017 07:26:43 +0100 Original-Received: from localhost ([::1]:52259 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cazEm-0005Zi-CR for geb-bug-gnu-emacs@m.gmane.org; Tue, 07 Feb 2017 01:26:48 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37788) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cazD8-0004Ix-3k for bug-gnu-emacs@gnu.org; Tue, 07 Feb 2017 01:25:08 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cazD3-0007qS-TL for bug-gnu-emacs@gnu.org; Tue, 07 Feb 2017 01:25:06 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:60048) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cazD3-0007q8-Qp for bug-gnu-emacs@gnu.org; Tue, 07 Feb 2017 01:25:01 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cazD3-0004AA-LJ for bug-gnu-emacs@gnu.org; Tue, 07 Feb 2017 01:25:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Glenn Morris Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 07 Feb 2017 06:25:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 25590 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 25590-submit@debbugs.gnu.org id=B25590.148644865315941 (code B ref 25590); Tue, 07 Feb 2017 06:25:01 +0000 Original-Received: (at 25590) by debbugs.gnu.org; 7 Feb 2017 06:24:13 +0000 Original-Received: from localhost ([127.0.0.1]:58247 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cazCD-000490-KC for submit@debbugs.gnu.org; Tue, 07 Feb 2017 01:24:13 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:46638) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cazC8-00048T-TJ for 25590@debbugs.gnu.org; Tue, 07 Feb 2017 01:24:08 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cazBz-0007Vj-OR for 25590@debbugs.gnu.org; Tue, 07 Feb 2017 01:23:59 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:33104) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cazBo-0007Pu-AS; Tue, 07 Feb 2017 01:23:44 -0500 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.82) (envelope-from ) id 1cazBm-0000vh-7e; Tue, 07 Feb 2017 01:23:42 -0500 X-Spook: ETA Environmental terrorist Arnett Foot and Mouth halcon X-Ran: NPh;_-2lkAu6!A6M#tmuC}UVzxnCS.oO03UQ}Ave5A^2S3M+6J}$A (Glenn Morris's message of "Mon, 06 Feb 2017 23:40:07 -0500") X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:129057 Archived-At: 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 ;; Michael Albinus @@ -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)))