Mercurial > hg > xemacs-beta

comparison src/redisplay.c @ 5348:39304a35b6b3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't commit suicide when an X device dies. 2011-01-30 Michael Sperber <mike@xemacs.org> * redisplay.h: * redisplay.c: (redisplay_cancel_ritual_suicide): * eval.c (throw_or_bomb_out_unsafe): * device-x.c (x_IO_error_handler): Don't commit suicide when an X device dies.
author Mike Sperber <sperber@deinprogramm.de>
date Sun, 30 Jan 2011 12:20:19 +0100
parents bc3ede8f29a8
children 0af042a0c116
comparison
equal deleted inserted replaced
5347:fd441b85d760 5348:39304a35b6b3
6686 Vpost_redisplay_actions = XCDR (Vpost_redisplay_actions); 6686 Vpost_redisplay_actions = XCDR (Vpost_redisplay_actions);
6687 } 6687 }
6688 unbind_to (depth); 6688 unbind_to (depth);
6689 } 6689 }
6690 6690
6691 static int the_ritual_suicide_has_been_cancelled = 0;
6692
6693 void
6694 redisplay_cancel_ritual_suicide(void)
6695 {
6696 the_ritual_suicide_has_been_cancelled = 1;
6697 }
6698
6691 #ifdef ERROR_CHECK_TRAPPING_PROBLEMS 6699 #ifdef ERROR_CHECK_TRAPPING_PROBLEMS
6692 6700
6693 static Lisp_Object 6701 static Lisp_Object
6694 commit_ritual_suicide (Lisp_Object UNUSED (ceci_nest_pas_une_pipe)) 6702 commit_ritual_suicide (Lisp_Object UNUSED (ceci_nest_pas_une_pipe))
6695 { 6703 {
6696 assert (!in_display); 6704 if (!the_ritual_suicide_has_been_cancelled)
6705 {
6706 assert (!in_display);
6707 }
6708 else
6709 the_ritual_suicide_has_been_cancelled = 0;
6697 return Qnil; 6710 return Qnil;
6698 } 6711 }
6699 6712
6700 #endif 6713 #endif
6701 6714