Mercurial > hg > xemacs-beta

comparison src/redisplay.c @ 5470:0af042a0c116

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with trunk.
author Mats Lidell <matsl@xemacs.org>
date Mon, 07 Feb 2011 21:22:17 +0100
parents 308d34e9f07d 39304a35b6b3
children 58e320bde005
comparison
equal deleted inserted replaced
5469:2a8a04f73c15 5470:0af042a0c116
6684 Vpost_redisplay_actions = XCDR (Vpost_redisplay_actions); 6684 Vpost_redisplay_actions = XCDR (Vpost_redisplay_actions);
6685 } 6685 }
6686 unbind_to (depth); 6686 unbind_to (depth);
6687 } 6687 }
6688 6688
6689 static int the_ritual_suicide_has_been_cancelled = 0;
6690
6691 void
6692 redisplay_cancel_ritual_suicide(void)
6693 {
6694 the_ritual_suicide_has_been_cancelled = 1;
6695 }
6696
6689 #ifdef ERROR_CHECK_TRAPPING_PROBLEMS 6697 #ifdef ERROR_CHECK_TRAPPING_PROBLEMS
6690 6698
6691 static Lisp_Object 6699 static Lisp_Object
6692 commit_ritual_suicide (Lisp_Object UNUSED (ceci_nest_pas_une_pipe)) 6700 commit_ritual_suicide (Lisp_Object UNUSED (ceci_nest_pas_une_pipe))
6693 { 6701 {
6694 assert (!in_display); 6702 if (!the_ritual_suicide_has_been_cancelled)
6703 {
6704 assert (!in_display);
6705 }
6706 else
6707 the_ritual_suicide_has_been_cancelled = 0;
6695 return Qnil; 6708 return Qnil;
6696 } 6709 }
6697 6710
6698 #endif 6711 #endif
6699 6712