aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2010-08-20 22:49:20 +0300
committerEli Zaretskii2010-08-20 22:49:20 +0300
commitff2de6d2bb239c5fdcfaba2c8efd5c62610e3b7d (patch)
tree50fddf4dc9cc34e4f78357a545fcb3a9677c05d7 /src
parentc30b8a12a4a57bfe070dd68b014d7d425bab8ed9 (diff)
parent491a154635caf0bf90fd1c4ad35f02d43eac98ee (diff)
downloademacs-ff2de6d2bb239c5fdcfaba2c8efd5c62610e3b7d.tar.gz
emacs-ff2de6d2bb239c5fdcfaba2c8efd5c62610e3b7d.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/emacs.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index d6b1c2347a2..85d4da73803 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
12010-08-20 Eli Zaretskii <eliz@gnu.org> 12010-08-20 Eli Zaretskii <eliz@gnu.org>
2 2
3 * emacs.c <emacs_version>: Add a comment regarding
4 msdos/mainmake.v2's dependency on the syntax of this declaration.
5
62010-08-20 Eli Zaretskii <eliz@gnu.org>
7
3 * dispnew.c (buffer_posn_from_coords): Fix calculation of buffer 8 * dispnew.c (buffer_posn_from_coords): Fix calculation of buffer
4 position for R2L lines by mirroring the pixel position wrt the 9 position for R2L lines by mirroring the pixel position wrt the
5 text are box. Improve commentary. 10 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/>. */
91#endif 91#endif
92#endif 92#endif
93 93
94/* If you change the following line, remember to update
95 msdos/mainmake.v2 which gleans the Emacs version from it! */
94static const char emacs_copyright[] = "Copyright (C) 2010 Free Software Foundation, Inc."; 96static const char emacs_copyright[] = "Copyright (C) 2010 Free Software Foundation, Inc.";
95static const char emacs_version[] = "24.0.50"; 97static const char emacs_version[] = "24.0.50";
96 98