comparison src/abbrev.c @ 5320:31be2a3d121d

Move Qcount, Q_default, Q_test to general-slots.h; add SYMBOL_KEYWORD_GENERAL() 2010-12-30 Aidan Kehoe <kehoea@parhasard.net> * elhash.c (syms_of_elhash): * chartab.c (syms_of_chartab): * abbrev.c (syms_of_abbrev): * general-slots.h: Move Qcount, Q_default, Q_test to general-slots.h, they're about to be used by other files. Rename Q_default to Q_default_, for the sake of the PARSE_KEYWORDS macro (given that default is a reserved identifier in C). Add SYMBOL_KEYWORD_GENERAL(), analogous to SYMBOL_GENERAL() to make this easier.
author Aidan Kehoe <kehoea@parhasard.net>
date Thu, 30 Dec 2010 00:50:10 +0000
parents c096d8051f89
children 94bbd4792049 6506fcb40fcf
comparison
equal deleted inserted replaced
5319:ed5d4f081fa9 5320:31be2a3d121d
73 Fixnum last_abbrev_location; 73 Fixnum last_abbrev_location;
74 74
75 /* Hook to run before expanding any abbrev. */ 75 /* Hook to run before expanding any abbrev. */
76 Lisp_Object Vpre_abbrev_expand_hook, Qpre_abbrev_expand_hook; 76 Lisp_Object Vpre_abbrev_expand_hook, Qpre_abbrev_expand_hook;
77 77
78 Lisp_Object Qsystem_type, Qcount; 78 Lisp_Object Qsystem_type;
79 79
80 struct abbrev_match_mapper_closure 80 struct abbrev_match_mapper_closure
81 { 81 {
82 struct buffer *buf; 82 struct buffer *buf;
83 Lisp_Object chartab; 83 Lisp_Object chartab;
556 } 556 }
557 557
558 void 558 void
559 syms_of_abbrev (void) 559 syms_of_abbrev (void)
560 { 560 {
561 DEFSYMBOL(Qcount);
562 Qcount = intern ("count");
563 staticpro (&Qcount);
564 DEFSYMBOL(Qsystem_type); 561 DEFSYMBOL(Qsystem_type);
565 Qsystem_type = intern ("system-type"); 562 Qsystem_type = intern ("system-type");
566 DEFSYMBOL (Qpre_abbrev_expand_hook); 563 DEFSYMBOL (Qpre_abbrev_expand_hook);
567 DEFSUBR (Fexpand_abbrev); 564 DEFSUBR (Fexpand_abbrev);
568 DEFSUBR (Finsert_abbrev_table_description); 565 DEFSUBR (Finsert_abbrev_table_description);