diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2010-08-20 22:49:20 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2010-08-20 22:49:20 +0300 |
| commit | ff2de6d2bb239c5fdcfaba2c8efd5c62610e3b7d (patch) | |
| tree | 50fddf4dc9cc34e4f78357a545fcb3a9677c05d7 | |
| parent | c30b8a12a4a57bfe070dd68b014d7d425bab8ed9 (diff) | |
| parent | 491a154635caf0bf90fd1c4ad35f02d43eac98ee (diff) | |
Fix version string in top-level MSDOS Makefile.
msdos/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.
| -rw-r--r-- | msdos/ChangeLog | 4 | ||||
| -rw-r--r-- | msdos/mainmake.v2 | 2 | ||||
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/emacs.c | 2 |
4 files changed, 12 insertions, 1 deletions
diff --git a/msdos/ChangeLog b/msdos/ChangeLog index 7df89880410..7227b8b8b51 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -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 diff --git a/msdos/mainmake.v2 b/msdos/mainmake.v2 index 4bb13e367ed..79bd827d8c6 100644 --- a/msdos/mainmake.v2 +++ b/msdos/mainmake.v2 @@ -65,7 +65,7 @@ MAKESHELL=/xyzzy/command 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 diff --git a/src/ChangeLog b/src/ChangeLog index d6b1c2347a2..85d4da73803 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,10 @@ 2010-08-20 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-20 Eli Zaretskii <eliz@gnu.org> + * dispnew.c (buffer_posn_from_coords): Fix calculation of buffer position for R2L lines by mirroring the pixel position wrt the text are box. Improve commentary. diff --git a/src/emacs.c b/src/emacs.c index 026a210af50..67a99d674e7 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -91,6 +91,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #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"; |