aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman1996-10-31 17:58:56 +0000
committerRichard M. Stallman1996-10-31 17:58:56 +0000
commit380e25b8ff3b90f5e532641c5c3f891eed6e00f0 (patch)
tree00bff249ab5effc67b70f9e241b3d803713efe31 /src
parent85496b8cb5559522c19a4541d6096c58b38559b9 (diff)
downloademacs-380e25b8ff3b90f5e532641c5c3f891eed6e00f0.tar.gz
emacs-380e25b8ff3b90f5e532641c5c3f891eed6e00f0.zip
(main): Clear out *Messages* before init_callproc.
Diffstat (limited to 'src')
-rw-r--r--src/emacs.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/src/emacs.c b/src/emacs.c
index 2bb7ff2038b..c395facaa8b 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -862,6 +862,17 @@ the Bugs section of the Emacs manual or the file BUGS.", argv[0]);
862 862
863 init_callproc_1 (); /* Must precede init_cmdargs and init_sys_modes. */ 863 init_callproc_1 (); /* Must precede init_cmdargs and init_sys_modes. */
864 init_cmdargs (argc, argv, skip_args); /* Must precede init_lread. */ 864 init_cmdargs (argc, argv, skip_args); /* Must precede init_lread. */
865
866 if (initialized)
867 {
868 /* Erase any pre-dump messages in the message log, to avoid confusion */
869 Lisp_Object old_log_max;
870 old_log_max = Vmessage_log_max;
871 XSETFASTINT (Vmessage_log_max, 0);
872 message_dolog ("", 0, 1);
873 Vmessage_log_max = old_log_max;
874 }
875
865 init_callproc (); /* Must follow init_cmdargs but not init_sys_modes. */ 876 init_callproc (); /* Must follow init_cmdargs but not init_sys_modes. */
866 init_lread (); 877 init_lread ();
867 878
@@ -1010,13 +1021,6 @@ the Bugs section of the Emacs manual or the file BUGS.", argv[0]);
1010 1021
1011 if (initialized) 1022 if (initialized)
1012 { 1023 {
1013 /* Erase any pre-dump messages in the message log, to avoid confusion */
1014 Lisp_Object old_log_max;
1015 old_log_max = Vmessage_log_max;
1016 XSETFASTINT (Vmessage_log_max, 0);
1017 message_dolog ("", 0, 1);
1018 Vmessage_log_max = old_log_max;
1019
1020#ifdef HAVE_TZSET 1024#ifdef HAVE_TZSET
1021 { 1025 {
1022 /* If the execution TZ happens to be the same as the dump TZ, 1026 /* If the execution TZ happens to be the same as the dump TZ,