Mercurial > emacs

comparison src/emacs.c @ 109891:373abedd1f02

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge from upstream
author joakim@verona.se
date Fri, 20 Aug 2010 22:00:00 +0200
parents 297362357192
children 5f187a091415
comparison
equal deleted inserted replaced
109888:fd080c6fcd86 109891:373abedd1f02
89 #undef setpgrp 89 #undef setpgrp
90 #define setpgrp setpgid 90 #define setpgrp setpgid
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! */
94 static const char emacs_copyright[] = "Copyright (C) 2010 Free Software Foundation, Inc."; 96 static const char emacs_copyright[] = "Copyright (C) 2010 Free Software Foundation, Inc.";
95 static const char emacs_version[] = "24.0.50"; 97 static const char emacs_version[] = "24.0.50";
96 98
97 /* Make these values available in GDB, which doesn't see macros. */ 99 /* Make these values available in GDB, which doesn't see macros. */
98 100