Mercurial > emacs
comparison src/keyboard.c @ 10905:70de58691fd2
(cmd_error): Allow current_perdisplay to be null.
| author | Karl Heuer <kwzh@gnu.org> |
|---|---|
| date | Fri, 03 Mar 1995 02:08:49 +0000 |
| parents | ff1b5efecdb0 |
| children | 1e9ffdb9980c |
comparison
equal
deleted
inserted
replaced
| 10904:529e05d69221 | 10905:70de58691fd2 |
|---|---|
| 766 Lisp_Object data; | 766 Lisp_Object data; |
| 767 { | 767 { |
| 768 Vstandard_output = Qt; | 768 Vstandard_output = Qt; |
| 769 Vstandard_input = Qt; | 769 Vstandard_input = Qt; |
| 770 Vexecuting_macro = Qnil; | 770 Vexecuting_macro = Qnil; |
| 771 clear_prefix_arg (); | 771 if (current_perdisplay) |
| 772 cancel_echoing (); | 772 { |
| 773 clear_prefix_arg (); | |
| 774 cancel_echoing (); | |
| 775 } | |
| 773 cmd_error_internal (data, 0); | 776 cmd_error_internal (data, 0); |
| 774 | 777 |
| 775 Vquit_flag = Qnil; | 778 Vquit_flag = Qnil; |
| 776 | 779 |
| 777 Vinhibit_quit = Qnil; | 780 Vinhibit_quit = Qnil; |
| 778 #ifdef MULTI_PERDISPLAY | 781 #ifdef MULTI_PERDISPLAY |
| 779 unlock_display (); | 782 if (current_perdisplay) |
| 783 unlock_display (); | |
| 780 #endif | 784 #endif |
| 781 | 785 |
| 782 return make_number (0); | 786 return make_number (0); |
| 783 } | 787 } |
| 784 | 788 |