Mercurial > emacs

comparison src/xdisp.c @ 26570:133c30f0647c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't duplicate Qheight, Qwidth definitions done elsewhere.
author Dave Love <fx@gnu.org>
date Wed, 24 Nov 1999 14:06:26 +0000
parents 2360d692254c
children e45f9a84fca0
comparison
equal deleted inserted replaced
26569:d5f7eaff00db 26570:133c30f0647c
246 246
247 Lisp_Object Vinhibit_redisplay, Qinhibit_redisplay; 247 Lisp_Object Vinhibit_redisplay, Qinhibit_redisplay;
248 248
249 /* Names of text properties relevant for redisplay. */ 249 /* Names of text properties relevant for redisplay. */
250 250
251 Lisp_Object Qdisplay, Qrelative_width, Qwidth, Qalign_to; 251 Lisp_Object Qdisplay, Qrelative_width, Qalign_to;
252 extern Lisp_Object Qface, Qinvisible, Qimage; 252 extern Lisp_Object Qface, Qinvisible, Qimage, Qwidth;
253 253
254 /* Symbols used in text property values. */ 254 /* Symbols used in text property values. */
255 255
256 Lisp_Object Qspace, QCalign_to, QCrelative_width, QCrelative_height; 256 Lisp_Object Qspace, QCalign_to, QCrelative_width, QCrelative_height;
257 Lisp_Object Qleft_margin, Qright_margin, Qspace_width, Qheight, Qraise; 257 Lisp_Object Qleft_margin, Qright_margin, Qspace_width, Qraise;
258 Lisp_Object Qmargin; 258 Lisp_Object Qmargin;
259 extern Lisp_Object Qheight;
259 260
260 /* Non-nil means highlight trailing whitespace. */ 261 /* Non-nil means highlight trailing whitespace. */
261 262
262 Lisp_Object Vshow_trailing_whitespace; 263 Lisp_Object Vshow_trailing_whitespace;
263 264
12660 12661
12661 Qdisplay = intern ("display"); 12662 Qdisplay = intern ("display");
12662 staticpro (&Qdisplay); 12663 staticpro (&Qdisplay);
12663 Qspace_width = intern ("space-width"); 12664 Qspace_width = intern ("space-width");
12664 staticpro (&Qspace_width); 12665 staticpro (&Qspace_width);
12665 Qheight = intern ("height");
12666 staticpro (&Qheight);
12667 Qraise = intern ("raise"); 12666 Qraise = intern ("raise");
12668 staticpro (&Qraise); 12667 staticpro (&Qraise);
12669 Qspace = intern ("space"); 12668 Qspace = intern ("space");
12670 staticpro (&Qspace); 12669 staticpro (&Qspace);
12671 Qmargin = intern ("margin"); 12670 Qmargin = intern ("margin");
12676 staticpro (&Qright_margin); 12675 staticpro (&Qright_margin);
12677 Qalign_to = intern ("align-to"); 12676 Qalign_to = intern ("align-to");
12678 staticpro (&Qalign_to); 12677 staticpro (&Qalign_to);
12679 QCalign_to = intern (":align-to"); 12678 QCalign_to = intern (":align-to");
12680 staticpro (&QCalign_to); 12679 staticpro (&QCalign_to);
12681 Qwidth = intern ("width");
12682 staticpro (&Qwidth);
12683 Qrelative_width = intern ("relative-width"); 12680 Qrelative_width = intern ("relative-width");
12684 staticpro (&Qrelative_width); 12681 staticpro (&Qrelative_width);
12685 QCrelative_width = intern (":relative-width"); 12682 QCrelative_width = intern (":relative-width");
12686 staticpro (&QCrelative_width); 12683 staticpro (&QCrelative_width);
12687 QCrelative_height = intern (":relative-height"); 12684 QCrelative_height = intern (":relative-height");