emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] emacs-26 625cee5: Start emacs-26 release branch


From: Eli Zaretskii
Subject: [Emacs-diffs] emacs-26 625cee5: Start emacs-26 release branch
Date: Sat, 16 Sep 2017 08:35:30 -0400 (EDT)

branch: emacs-26
commit 625cee531623feddbe3174fad52c7db96ec60bb3
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Start emacs-26 release branch
    
    * configure.ac:
    * nt/README.W32:
    * README:
    * msdos/sed2v2.inp: Increment Emacs version to 26.0.60.
    
    * lisp/cus-edit.el (customize-changed-options-previous-release):
    Update value to "25.3".
---
 README           | 2 +-
 configure.ac     | 2 +-
 lisp/cus-edit.el | 2 +-
 msdos/sed2v2.inp | 2 +-
 nt/README.W32    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README b/README
index c3cf78f..46cff58 100644
--- a/README
+++ b/README
@@ -2,7 +2,7 @@ Copyright (C) 2001-2017 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
-This directory tree holds version 26.0.50 of GNU Emacs, the extensible,
+This directory tree holds version 26.0.60 of GNU Emacs, the extensible,
 customizable, self-documenting real-time display editor.
 
 The file INSTALL in this directory says how to build and install GNU
diff --git a/configure.ac b/configure.ac
index c884716..6452038 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ dnl  along with GNU Emacs.  If not, see 
<https://www.gnu.org/licenses/>.
 
 AC_PREREQ(2.65)
 dnl Note this is parsed by (at least) make-dist and lisp/cedet/ede/emacs.el.
-AC_INIT(GNU Emacs, 26.0.50, address@hidden)
+AC_INIT(GNU Emacs, 26.0.60, address@hidden)
 
 dnl Set emacs_config_options to the options of 'configure', quoted for the 
shell,
 dnl and then quoted again for a C string.  Separate options with spaces.
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 1e13e95..6b67555 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -1159,7 +1159,7 @@ Show the buffer in another window, but don't select it."
     (unless (eq symbol basevar)
       (message "`%s' is an alias for `%s'" symbol basevar))))
 
-(defvar customize-changed-options-previous-release "24.5"
+(defvar customize-changed-options-previous-release "25.3"
   "Version for `customize-changed-options' to refer back to by default.")
 
 ;; Packages will update this variable, so make it available.
diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp
index ba1bb4e..be68571 100644
--- a/msdos/sed2v2.inp
+++ b/msdos/sed2v2.inp
@@ -66,7 +66,7 @@
 /^#undef PACKAGE_TARNAME/s/^.*$/#define PACKAGE_TARNAME ""/
 /^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION VERSION/
 /^#undef PENDING_OUTPUT_COUNT/s/^.*$/#define PENDING_OUTPUT_COUNT(FILE) 
((FILE)->_ptr - (FILE)->_base)/
-/^#undef VERSION/s/^.*$/#define VERSION "26.0.50"/
+/^#undef VERSION/s/^.*$/#define VERSION "26.0.60"/
 /^#undef SYSTEM_TYPE/s/^.*$/#define SYSTEM_TYPE "ms-dos"/
 /^#undef HAVE_DECL_GETENV/s/^.*$/#define HAVE_DECL_GETENV 1/
 /^#undef SYS_SIGLIST_DECLARED/s/^.*$/#define SYS_SIGLIST_DECLARED 1/
diff --git a/nt/README.W32 b/nt/README.W32
index a670687..bec0b66 100644
--- a/nt/README.W32
+++ b/nt/README.W32
@@ -1,7 +1,7 @@
 Copyright (C) 2001-2017 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
-               Emacs version 25.1.50 for MS-Windows
+               Emacs version 26.0.60 for MS-Windows
 
   This README file describes how to set up and run a precompiled
   distribution of the latest version of GNU Emacs for MS-Windows.  You



reply via email to

[Prev in Thread] Current Thread [Next in Thread]