Mercurial > emacs
comparison src/image.c @ 85710:beb909dfc54d
Rewrite abbrev.c in Elisp.
* image.c (Qcount): Don't declare as extern.
(syms_of_image): Initialize and staticpro `Qcount'.
* puresize.h (BASE_PURESIZE): Increase for the new abbrev.el functions.
* emacs.c (main): Don't call syms_of_abbrev.
* Makefile.in (obj): Remove abbrev.o.
(abbrev.o): Remove.
* abbrev.c: Remove.
Rewrite abbrev.c in Elisp.
* abbrev.el (abbrev-mode): Move custom group from cus-edit.el.
(abbrev-table-get, abbrev-table-put, abbrev-get)
(abbrev-put, make-abbrev-table, abbrev-table-p, clear-abbrev-table)
(define-abbrev, abbrev--check-chars, define-global-abbrev)
(define-mode-abbrev, abbrev--active-tables, abbrev-symbol)
(abbrev-expansion, abbrev--before-point, expand-abbrev)
(unexpand-abbrev, abbrev--write, abbrev--describe)
(insert-abbrev-table-description, define-abbrev-table):
New funs, largely transcribed from abbrev.c.
(abbrev-with-wrapper-hook): New macro.
(abbrev-table-name-list, global-abbrev-table)
(abbrev-minor-mode-table-alist, fundamental-mode-abbrev-table)
(abbrevs-changed, abbrev-all-caps, abbrev-start-location)
(abbrev-start-location-buffer, last-abbrev, last-abbrev-text)
(last-abbrev-location, pre-abbrev-expand-hook, abbrev-expand-function):
New vars, largely transcribed from abbrev.c.
* cus-edit.el (abbrev-mode): Remove. Move to abbrev.el.
* cus-start.el: Remove abbrev-all-caps and pre-abbrev-expand-hook.
* loadup.el: Load "abbrev.el" before "lisp-mode.el".
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Sun, 28 Oct 2007 02:41:00 +0000 |
parents | 8004c957b946 |
children | ec0ef12211d9 880960b70474 |
comparison
equal
deleted
inserted
replaced
85709:2dabdbde81e8 | 85710:beb909dfc54d |
---|---|
731 Lisp_Object Qxbm; | 731 Lisp_Object Qxbm; |
732 | 732 |
733 /* Keywords. */ | 733 /* Keywords. */ |
734 | 734 |
735 extern Lisp_Object QCwidth, QCheight, QCforeground, QCbackground, QCfile; | 735 extern Lisp_Object QCwidth, QCheight, QCforeground, QCbackground, QCfile; |
736 extern Lisp_Object QCdata, QCtype, Qcount; | 736 extern Lisp_Object QCdata, QCtype; |
737 extern Lisp_Object Qcenter; | 737 extern Lisp_Object Qcenter; |
738 Lisp_Object QCascent, QCmargin, QCrelief; | 738 Lisp_Object QCascent, QCmargin, QCrelief, Qcount; |
739 Lisp_Object QCconversion, QCcolor_symbols, QCheuristic_mask; | 739 Lisp_Object QCconversion, QCcolor_symbols, QCheuristic_mask; |
740 Lisp_Object QCindex, QCmatrix, QCcolor_adjustment, QCmask; | 740 Lisp_Object QCindex, QCmatrix, QCcolor_adjustment, QCmask; |
741 | 741 |
742 /* Other symbols. */ | 742 /* Other symbols. */ |
743 | 743 |
9087 ADD_IMAGE_TYPE (Qxbm); | 9087 ADD_IMAGE_TYPE (Qxbm); |
9088 | 9088 |
9089 define_image_type (&xbm_type, 1); | 9089 define_image_type (&xbm_type, 1); |
9090 define_image_type (&pbm_type, 1); | 9090 define_image_type (&pbm_type, 1); |
9091 | 9091 |
9092 Qcount = intern ("count"); | |
9093 staticpro (&Qcount); | |
9094 | |
9092 QCascent = intern (":ascent"); | 9095 QCascent = intern (":ascent"); |
9093 staticpro (&QCascent); | 9096 staticpro (&QCascent); |
9094 QCmargin = intern (":margin"); | 9097 QCmargin = intern (":margin"); |
9095 staticpro (&QCmargin); | 9098 staticpro (&QCmargin); |
9096 QCrelief = intern (":relief"); | 9099 QCrelief = intern (":relief"); |