diff options
| author | Eli Zaretskii | 2015-11-14 10:38:58 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2015-11-14 10:38:58 +0200 |
| commit | 5f7a2a90536557e3dcb3bb64d4bbbd49ea7b3fee (patch) | |
| tree | 7fc06e6c9ddc12ab1a5895a5aefef3cdd2e74338 | |
| parent | ed2e7e20ae0945288c98091f308f5460c3453873 (diff) | |
| download | emacs-5f7a2a90536557e3dcb3bb64d4bbbd49ea7b3fee.tar.gz emacs-5f7a2a90536557e3dcb3bb64d4bbbd49ea7b3fee.zip | |
Increment Emacs version on master branch
* lisp/cus-edit.el (customize-changed-options-previous-release):
Increase previous version to 24.5.
* configure.ac:
* msdos/sed2v2.inp: Bump version to 25.1.50.
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | lisp/cus-edit.el | 2 | ||||
| -rw-r--r-- | msdos/sed2v2.inp | 2 |
4 files changed, 4 insertions, 4 deletions
| @@ -2,7 +2,7 @@ Copyright (C) 2001-2015 Free Software Foundation, Inc. | |||
| 2 | See the end of the file for license conditions. | 2 | See the end of the file for license conditions. |
| 3 | 3 | ||
| 4 | 4 | ||
| 5 | This directory tree holds version 25.0.50 of GNU Emacs, the extensible, | 5 | This directory tree holds version 25.1.50 of GNU Emacs, the extensible, |
| 6 | customizable, self-documenting real-time display editor. | 6 | customizable, self-documenting real-time display editor. |
| 7 | 7 | ||
| 8 | The file INSTALL in this directory says how to build and install GNU | 8 | The file INSTALL in this directory says how to build and install GNU |
diff --git a/configure.ac b/configure.ac index 94ee9b7aa2b..0348c062911 100644 --- a/configure.ac +++ b/configure.ac | |||
| @@ -23,7 +23,7 @@ dnl along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. | |||
| 23 | 23 | ||
| 24 | AC_PREREQ(2.65) | 24 | AC_PREREQ(2.65) |
| 25 | dnl Note this is parsed by (at least) make-dist and lisp/cedet/ede/emacs.el. | 25 | dnl Note this is parsed by (at least) make-dist and lisp/cedet/ede/emacs.el. |
| 26 | AC_INIT(GNU Emacs, 25.0.50, bug-gnu-emacs@gnu.org) | 26 | AC_INIT(GNU Emacs, 25.1.50, bug-gnu-emacs@gnu.org) |
| 27 | 27 | ||
| 28 | dnl Set emacs_config_options to the options of 'configure', quoted for the shell, | 28 | dnl Set emacs_config_options to the options of 'configure', quoted for the shell, |
| 29 | dnl and then quoted again for a C string. Separate options with spaces. | 29 | 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 aa26ac38fc5..22f12bac99f 100644 --- a/lisp/cus-edit.el +++ b/lisp/cus-edit.el | |||
| @@ -1164,7 +1164,7 @@ Show the buffer in another window, but don't select it." | |||
| 1164 | (unless (eq symbol basevar) | 1164 | (unless (eq symbol basevar) |
| 1165 | (message "`%s' is an alias for `%s'" symbol basevar)))) | 1165 | (message "`%s' is an alias for `%s'" symbol basevar)))) |
| 1166 | 1166 | ||
| 1167 | (defvar customize-changed-options-previous-release "24.1" | 1167 | (defvar customize-changed-options-previous-release "24.5" |
| 1168 | "Version for `customize-changed-options' to refer back to by default.") | 1168 | "Version for `customize-changed-options' to refer back to by default.") |
| 1169 | 1169 | ||
| 1170 | ;; Packages will update this variable, so make it available. | 1170 | ;; Packages will update this variable, so make it available. |
diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp index e1609f2f470..c82b27a1ea2 100644 --- a/msdos/sed2v2.inp +++ b/msdos/sed2v2.inp | |||
| @@ -66,7 +66,7 @@ | |||
| 66 | /^#undef PACKAGE_TARNAME/s/^.*$/#define PACKAGE_TARNAME ""/ | 66 | /^#undef PACKAGE_TARNAME/s/^.*$/#define PACKAGE_TARNAME ""/ |
| 67 | /^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION ""/ | 67 | /^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION ""/ |
| 68 | /^#undef PENDING_OUTPUT_COUNT/s/^.*$/#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_ptr - (FILE)->_base)/ | 68 | /^#undef PENDING_OUTPUT_COUNT/s/^.*$/#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_ptr - (FILE)->_base)/ |
| 69 | /^#undef VERSION/s/^.*$/#define VERSION "25.0.50"/ | 69 | /^#undef VERSION/s/^.*$/#define VERSION "25.1.50"/ |
| 70 | /^#undef SYSTEM_TYPE/s/^.*$/#define SYSTEM_TYPE "ms-dos"/ | 70 | /^#undef SYSTEM_TYPE/s/^.*$/#define SYSTEM_TYPE "ms-dos"/ |
| 71 | /^#undef HAVE_DECL_GETENV/s/^.*$/#define HAVE_DECL_GETENV 1/ | 71 | /^#undef HAVE_DECL_GETENV/s/^.*$/#define HAVE_DECL_GETENV 1/ |
| 72 | /^#undef SYS_SIGLIST_DECLARED/s/^.*$/#define SYS_SIGLIST_DECLARED 1/ | 72 | /^#undef SYS_SIGLIST_DECLARED/s/^.*$/#define SYS_SIGLIST_DECLARED 1/ |