# HG changeset patch # User Gerd Moellmann # Date 936828754 0 # Node ID 766b6a577f1581c2b67ce287eec8494ee97a56e2 # Parent 422a19bbd5163dce68d104aa5bebe20cc9f17578 (Qwhen): Replaces QCwhen. (syms_of_xdisp): Initialized it instead of QCwhen. (handle_single_display_prop): Use it instead of QCwhen. diff -r 422a19bbd516 -r 766b6a577f15 src/xdisp.c --- a/src/xdisp.c Wed Sep 08 22:07:02 1999 +0000 +++ b/src/xdisp.c Wed Sep 08 22:12:34 1999 +0000 @@ -219,7 +219,7 @@ Lisp_Object Qwindow_scroll_functions, Vwindow_scroll_functions; Lisp_Object Qredisplay_end_trigger_functions; Lisp_Object Qinhibit_point_motion_hooks; -Lisp_Object QCeval, QCwhen; +Lisp_Object QCeval, Qwhen; Lisp_Object Qfontified; /* Functions called to fontify regions of text. */ @@ -2297,10 +2297,10 @@ Lisp_Object form; - /* If PROP is a list of the form `(:when FORM . VALUE)', FORM is + /* If PROP is a list of the form `(when FORM . VALUE)', FORM is evaluated. If the result is nil, VALUE is ignored. */ form = Qt; - if (CONSP (prop) && EQ (XCAR (prop), QCwhen)) + if (CONSP (prop) && EQ (XCAR (prop), Qwhen)) { prop = XCDR (prop); if (!CONSP (prop)) @@ -12555,8 +12555,8 @@ staticpro (&QCrelative_height); QCeval = intern (":eval"); staticpro (&QCeval); - QCwhen = intern (":when"); - staticpro (&QCwhen); + Qwhen = intern ("when"); + staticpro (&Qwhen); Qfontified = intern ("fontified"); staticpro (&Qfontified); Qfontification_functions = intern ("fontification-functions");