aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Blandy1993-06-19 20:26:11 +0000
committerJim Blandy1993-06-19 20:26:11 +0000
commitd0068e2530aa770ccba9ee952047e101aadfca73 (patch)
tree46bad5cd8bf96c54f2fe7cef3555bf0c5ee73248
parentc142ab2d38d91af83c8351fc702f8d3fea1ba59d (diff)
downloademacs-d0068e2530aa770ccba9ee952047e101aadfca73.tar.gz
emacs-d0068e2530aa770ccba9ee952047e101aadfca73.zip
* emacs.c (Fkill_emacs): Pass third argument to shut_down_emacs.
* lisp.h (shut_down_emacs): Doc fix.
-rw-r--r--src/emacs.c2
-rw-r--r--src/lisp.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/emacs.c b/src/emacs.c
index 96040e17a86..2e6527e4e7e 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -649,7 +649,7 @@ all of which are called before Emacs is actually killed.")
649 stop_vms_input (); 649 stop_vms_input ();
650 #endif */ 650 #endif */
651 651
652 shut_down_emacs (0, 0); 652 shut_down_emacs (0, 0, STRINGP (arg) ? arg : Qnil);
653 653
654 exit ((XTYPE (arg) == Lisp_Int) ? XINT (arg) 654 exit ((XTYPE (arg) == Lisp_Int) ? XINT (arg)
655#ifdef VMS 655#ifdef VMS
diff --git a/src/lisp.h b/src/lisp.h
index 4157ee1de49..f860ab3c88a 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -1257,7 +1257,7 @@ extern Lisp_Object Frubber_band_rectangle ();
1257/* defined in emacs.c */ 1257/* defined in emacs.c */
1258extern Lisp_Object decode_env_path (); 1258extern Lisp_Object decode_env_path ();
1259extern Lisp_Object Vinvocation_name; 1259extern Lisp_Object Vinvocation_name;
1260void shut_down_emacs ( /* int signal, int no_x */ ); 1260void shut_down_emacs ( /* int signal, int no_x, Lisp_Object stuff */ );
1261/* Nonzero means don't do interactive redisplay and don't change tty modes */ 1261/* Nonzero means don't do interactive redisplay and don't change tty modes */
1262extern int noninteractive; 1262extern int noninteractive;
1263/* Nonzero means don't do use window-system-specific display code */ 1263/* Nonzero means don't do use window-system-specific display code */