aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman2006-04-09 19:56:27 +0000
committerRichard M. Stallman2006-04-09 19:56:27 +0000
commit2a8da5551cef30845096a5ac370233e80af9a1aa (patch)
tree810114811dc5969db70debcdb2af6f522ddb904d /src
parent2af34f255bb23763847da2d90558d658cd3e52eb (diff)
downloademacs-2a8da5551cef30845096a5ac370233e80af9a1aa.tar.gz
emacs-2a8da5551cef30845096a5ac370233e80af9a1aa.zip
Undo previous change.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog9
-rw-r--r--src/lisp.h2
2 files changed, 9 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 80213f252a7..d5e4d20111e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,9 +1,16 @@
12006-04-09 Richard Stallman <rms@gnu.org>
2
3 * lisp.h (Fkill_emacs): Undo previous change.
4
52006-04-08 Richard Stallman <rms@gnu.org>
6
7 * search.c (boyer_moore): Test ch >= 0400, not >.
8
12006-04-09 Dan Nicolaescu <dann@ics.uci.edu> 92006-04-09 Dan Nicolaescu <dann@ics.uci.edu>
2 10
3 * puresize.h (pure_write_error): Mark as NO_RETURN. 11 * puresize.h (pure_write_error): Mark as NO_RETURN.
4 12
5 * lisp.h (args_out_of_range, args_out_of_range_3) 13 * lisp.h (args_out_of_range, args_out_of_range_3)
6 (Fkill_emacs): Likewise.
7 14
82006-04-08 Eli Zaretskii <eliz@gnu.org> 152006-04-08 Eli Zaretskii <eliz@gnu.org>
9 16
diff --git a/src/lisp.h b/src/lisp.h
index 049fb989cc8..5d1b3266a0d 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3032,7 +3032,7 @@ extern void syms_of_frame P_ ((void));
3032extern Lisp_Object decode_env_path P_ ((char *, char *)); 3032extern Lisp_Object decode_env_path P_ ((char *, char *));
3033extern Lisp_Object Vinvocation_name, Vinvocation_directory; 3033extern Lisp_Object Vinvocation_name, Vinvocation_directory;
3034extern Lisp_Object Vinstallation_directory, empty_string; 3034extern Lisp_Object Vinstallation_directory, empty_string;
3035EXFUN (Fkill_emacs, 1) NO_RETURN; 3035EXFUN (Fkill_emacs, 1);
3036#if HAVE_SETLOCALE 3036#if HAVE_SETLOCALE
3037void fixup_locale P_ ((void)); 3037void fixup_locale P_ ((void));
3038void synchronize_system_messages_locale P_ ((void)); 3038void synchronize_system_messages_locale P_ ((void));