From e047f448837314fb158e0571813e79fbac677cc7 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sun, 28 Oct 2007 02:41:00 +0000 Subject: 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". --- lisp/cus-edit.el | 5 ----- 1 file changed, 5 deletions(-) (limited to 'lisp/cus-edit.el') diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el index 63753af76df..19098367d8f 100644 --- a/lisp/cus-edit.el +++ b/lisp/cus-edit.el @@ -374,11 +374,6 @@ :prefix "custom-" :group 'customize) -(defgroup abbrev-mode nil - "Word abbreviations mode." - :link '(custom-manual "(emacs)Abbrevs") - :group 'abbrev) - (defgroup alloc nil "Storage allocation and gc for GNU Emacs Lisp interpreter." :tag "Storage Allocation" -- cgit v1.2.3 From a7f58f4be274cdabd21419392c1a6ba54661cd2c Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Sun, 28 Oct 2007 17:39:49 +0000 Subject: * cus-edit.el (custom-browse-insert-prefix): * emulation/edt.el (edt-x-emacs19-p): Use featurep 'xemacs. --- lisp/ChangeLog | 5 +++++ lisp/cus-edit.el | 2 +- lisp/emulation/edt.el | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) (limited to 'lisp/cus-edit.el') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 30bdbefd98e..f8c4831ae60 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2007-10-28 Dan Nicolaescu + + * cus-edit.el (custom-browse-insert-prefix): + * emulation/edt.el (edt-x-emacs19-p): Use featurep 'xemacs. + 2007-10-28 Juanma Barranquero * server.el (server-process-filter): Fix typo in docstring. diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el index 19098367d8f..5e398d46ccf 100644 --- a/lisp/cus-edit.el +++ b/lisp/cus-edit.el @@ -1713,7 +1713,7 @@ item in another window.\n\n")) (defun custom-browse-insert-prefix (prefix) "Insert PREFIX. On XEmacs convert it to line graphics." ;; Fixme: do graphics. - (if nil ; (string-match "XEmacs" emacs-version) + (if nil ; (featurep 'xemacs) (progn (insert "*") (while (not (string-equal prefix "")) diff --git a/lisp/emulation/edt.el b/lisp/emulation/edt.el index bff1a583586..3ea7ebb5b12 100644 --- a/lisp/emulation/edt.el +++ b/lisp/emulation/edt.el @@ -325,7 +325,7 @@ This means that an edt-user.el file was found in the user's `load-path'.") "Non-nil if we are running GNU Emacs or XEmacs version 19, or higher.") (defconst edt-x-emacs19-p - (and edt-emacs19-p (string-match "XEmacs" emacs-version)) + (and edt-emacs19-p (featurep 'xemacs)) "Non-nil if we are running XEmacs version 19, or higher.") (defconst edt-gnu-emacs19-p (and edt-emacs19-p (not edt-x-emacs19-p)) -- cgit v1.2.3