[Emacs-diffs] /srv/bzr/emacs/trunk r101145: Fix version string in top-level MSDOS Makefile.

[Eli Zaretskii]

------------------------------------------------------------
revno: 101145 [merge]
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Fri 2010-08-20 22:49:20 +0300
message:
  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.
modified:
  msdos/ChangeLog
  msdos/mainmake.v2
  src/ChangeLog
  src/emacs.c

=== modified file 'msdos/ChangeLog'
--- a/msdos/ChangeLog   2010-08-05 17:11:32 +0000
+++ b/msdos/ChangeLog   2010-08-20 19:45:24 +0000
@@ -1,3 +1,7 @@
+2010-08-15  Eli Zaretskii  <address@hidden>
+
+       * mainmake.v2 (version): Update due to change in emacs.c.
+
 2010-08-05  Eli Zaretskii  <address@hidden>
 
        * sed1v2.inp (UNEXEC_OBJ): Edit to unexcoff.o, due to renaming of

=== modified file 'msdos/mainmake.v2'
--- a/msdos/mainmake.v2 2010-06-26 14:36:27 +0000
+++ b/msdos/mainmake.v2 2010-08-20 19:45:24 +0000
@@ -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 

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-08-20 14:19:39 +0000
+++ b/src/ChangeLog     2010-08-20 19:49:20 +0000
@@ -1,5 +1,10 @@
 2010-08-20  Eli Zaretskii  <address@hidden>
 
+       * emacs.c <emacs_version>: Add a comment regarding
+       msdos/mainmake.v2's dependency on the syntax of this declaration.
+
+2010-08-20  Eli Zaretskii  <address@hidden>
+
        * 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.

=== modified file 'src/emacs.c'
--- a/src/emacs.c       2010-08-11 12:34:46 +0000
+++ b/src/emacs.c       2010-08-20 19:45:24 +0000
@@ -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";