# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 769239579 0
# Node ID c4d128d26fc9fa937499b03b4b4702a061dbae87
# Parent  ad2451b94c280979c2056657fdb8fd2fe23f3ac9
(syms_of_emacs): EMACS_CONFIGURATION renamed from CONFIGURATION.

(shut_down_emacs): Don't call intern.

diff -r ad2451b94c28 -r c4d128d26fc9 src/emacs.c
--- a/src/emacs.c	Wed May 18 01:16:16 1994 +0000
+++ b/src/emacs.c	Wed May 18 05:39:39 1994 +0000
@@ -850,7 +850,11 @@
 #endif
 
 #ifdef HAVE_X_WINDOWS
-  if (!noninteractive && EQ (Vwindow_system, intern ("x")) && ! no_x)
+  /* It's not safe to call intern here.  Maybe we are crashing.  */
+  if (!noninteractive && SYMBOLP (Vwindow_system)
+      && XSYMBOL (Vwindow_system)->name->size == 1
+      && XSYMBOL (Vwindow_system)->name->data[0] == 'x'
+      && ! no_x)
     Fx_close_current_connection ();
 #endif /* HAVE_X_WINDOWS */
 
@@ -1008,7 +1012,7 @@
 
   DEFVAR_LISP ("system-configuration", &Vsystem_configuration,
     "Value is string indicating configuration Emacs was built for.");
-  Vsystem_configuration = build_string (CONFIGURATION);
+  Vsystem_configuration = build_string (EMACS_CONFIGURATION);
 
   DEFVAR_BOOL ("noninteractive", &noninteractive1,
     "Non-nil means Emacs is running without interactive terminal.");