Mercurial > emacs
changeset 109889:297362357192
Fix version string in top-level MSDOS Makefile.
msods/mainmake.v2 (version): Update due to change in emacs.c.
src/emacs.c <emacs_version>: Add a comment regarding msdos/mainmake.v2's
dependency on the syntax of this declaration.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Fri, 20 Aug 2010 22:45:24 +0300 |
| parents | 8186d147fb99 |
| children | c15a51661b50 |
| files | msdos/ChangeLog msdos/mainmake.v2 src/ChangeLog src/emacs.c |
| diffstat | 4 files changed, 12 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/msdos/ChangeLog Fri Aug 13 13:29:48 2010 +0300 +++ b/msdos/ChangeLog Fri Aug 20 22:45:24 2010 +0300 @@ -1,3 +1,7 @@ +2010-08-15 Eli Zaretskii <eliz@gnu.org> + + * mainmake.v2 (version): Update due to change in emacs.c. + 2010-08-05 Eli Zaretskii <eliz@gnu.org> * sed1v2.inp (UNEXEC_OBJ): Edit to unexcoff.o, due to renaming of
--- a/msdos/mainmake.v2 Fri Aug 13 13:29:48 2010 +0300 +++ b/msdos/mainmake.v2 Fri Aug 20 22:45:24 2010 +0300 @@ -65,7 +65,7 @@ top_srcdir := $(subst \,/,$(shell cd)) # Find out which version of Emacs this is. -version := ${shell sed -n -e '/^const char emacs_version/s/^[^"]*\("[^"]*"\).*/\1/p' src/emacs.c} +version := ${shell sed -n -e '/^static const char emacs_version/s/^[^"]*\("[^"]*"\).*/\1/p' src/emacs.c} # Q: Do we need to bootstrap? # A: Only if we find admin/admin.el, i.e. we are building out of
--- a/src/ChangeLog Fri Aug 13 13:29:48 2010 +0300 +++ b/src/ChangeLog Fri Aug 20 22:45:24 2010 +0300 @@ -1,3 +1,8 @@ +2010-08-15 Eli Zaretskii <eliz@gnu.org> + + * emacs.c <emacs_version>: Add a comment regarding + msdos/mainmake.v2's dependency on the syntax of this declaration. + 2010-08-13 Eli Zaretskii <eliz@gnu.org> * unexcoff.c: Remove the parts used when "emacs" is not defined.
--- a/src/emacs.c Fri Aug 13 13:29:48 2010 +0300 +++ b/src/emacs.c Fri Aug 20 22:45:24 2010 +0300 @@ -91,6 +91,8 @@ #endif #endif +/* If you change the following line, remember to update + msdos/mainmake.v2 which gleans the Emacs version from it! */ static const char emacs_copyright[] = "Copyright (C) 2010 Free Software Foundation, Inc."; static const char emacs_version[] = "24.0.50";