# HG changeset patch
# User Karl Heuer <kwzh@gnu.org>
# Date 794196529 0
# Node ID 70de58691fd2ce7ce55a4e9f314fd1e30932fe9d
# Parent  529e05d692213a0f50160ff483c893c8f54554e0
(cmd_error): Allow current_perdisplay to be null.

diff -r 529e05d69221 -r 70de58691fd2 src/keyboard.c
--- a/src/keyboard.c	Fri Mar 03 01:51:09 1995 +0000
+++ b/src/keyboard.c	Fri Mar 03 02:08:49 1995 +0000
@@ -768,15 +768,19 @@
   Vstandard_output = Qt;
   Vstandard_input = Qt;
   Vexecuting_macro = Qnil;
-  clear_prefix_arg ();
-  cancel_echoing ();
+  if (current_perdisplay)
+    {
+      clear_prefix_arg ();
+      cancel_echoing ();
+    }
   cmd_error_internal (data, 0);
 
   Vquit_flag = Qnil;
 
   Vinhibit_quit = Qnil;
 #ifdef MULTI_PERDISPLAY
-  unlock_display ();
+  if (current_perdisplay)
+    unlock_display ();
 #endif
 
   return make_number (0);