1992-05-30 23:54:21 +00:00
|
|
|
|
;;; abbrev.el --- abbrev mode commands for Emacs
|
1991-08-27 03:29:52 +00:00
|
|
|
|
|
2006-12-05 06:15:26 +00:00
|
|
|
|
;; Copyright (C) 1985, 1986, 1987, 1992, 2001, 2002, 2003, 2004,
|
2009-01-05 03:18:22 +00:00
|
|
|
|
;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
|
1991-08-27 03:29:52 +00:00
|
|
|
|
|
2001-08-06 10:12:17 +00:00
|
|
|
|
;; Maintainer: FSF
|
1998-05-26 09:23:23 +00:00
|
|
|
|
;; Keywords: abbrev convenience
|
1993-03-18 21:29:42 +00:00
|
|
|
|
|
1991-08-27 03:29:52 +00:00
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
|
2008-05-06 08:06:51 +00:00
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
1991-08-27 03:29:52 +00:00
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 08:06:51 +00:00
|
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
;; (at your option) any later version.
|
1991-08-27 03:29:52 +00:00
|
|
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2008-05-06 08:06:51 +00:00
|
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
1991-08-27 03:29:52 +00:00
|
|
|
|
|
1993-03-22 03:27:18 +00:00
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
|
|
|
;; This facility is documented in the Emacs Manual.
|
|
|
|
|
|
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".
2007-10-28 02:41:00 +00:00
|
|
|
|
;; Todo:
|
|
|
|
|
|
|
|
|
|
;; - Make abbrev-file-name obey user-emacs-directory.
|
|
|
|
|
;; - Cleanup name space.
|
|
|
|
|
|
1992-07-16 21:47:34 +00:00
|
|
|
|
;;; Code:
|
1991-08-27 03:29:52 +00:00
|
|
|
|
|
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".
2007-10-28 02:41:00 +00:00
|
|
|
|
(eval-when-compile (require 'cl))
|
|
|
|
|
|
|
|
|
|
(defgroup abbrev-mode nil
|
|
|
|
|
"Word abbreviations mode."
|
|
|
|
|
:link '(custom-manual "(emacs)Abbrevs")
|
|
|
|
|
:group 'abbrev)
|
|
|
|
|
|
2002-01-05 19:02:27 +00:00
|
|
|
|
(defcustom only-global-abbrevs nil
|
2004-08-01 03:56:05 +00:00
|
|
|
|
"Non-nil means user plans to use global abbrevs only.
|
1997-08-11 23:54:58 +00:00
|
|
|
|
This makes the commands that normally define mode-specific abbrevs
|
|
|
|
|
define global abbrevs instead."
|
|
|
|
|
:type 'boolean
|
1998-05-26 09:23:23 +00:00
|
|
|
|
:group 'abbrev-mode
|
|
|
|
|
:group 'convenience)
|
1991-08-27 03:29:52 +00:00
|
|
|
|
|
2008-04-01 08:36:57 +00:00
|
|
|
|
(define-minor-mode abbrev-mode
|
2004-06-13 21:55:49 +00:00
|
|
|
|
"Toggle Abbrev mode in the current buffer.
|
2007-08-08 07:40:09 +00:00
|
|
|
|
With optional argument ARG, turn abbrev mode on if ARG is
|
|
|
|
|
positive, otherwise turn it off. In Abbrev mode, inserting an
|
2008-04-01 08:36:57 +00:00
|
|
|
|
abbreviation causes it to expand and be replaced by its expansion.")
|
1997-08-11 23:54:58 +00:00
|
|
|
|
|
|
|
|
|
(defcustom abbrev-mode nil
|
2004-06-13 21:55:49 +00:00
|
|
|
|
"Enable or disable Abbrev mode.
|
1999-04-08 16:26:38 +00:00
|
|
|
|
Non-nil means automatically expand abbrevs as they are inserted.
|
|
|
|
|
|
2004-06-13 21:55:49 +00:00
|
|
|
|
Setting this variable with `setq' changes it for the current buffer.
|
1999-04-08 16:26:38 +00:00
|
|
|
|
Changing it with \\[customize] sets the default value.
|
2004-06-13 21:55:49 +00:00
|
|
|
|
Interactively, use the command `abbrev-mode'
|
|
|
|
|
to enable or disable Abbrev mode in the current buffer."
|
1997-08-11 23:54:58 +00:00
|
|
|
|
:type 'boolean
|
|
|
|
|
:group 'abbrev-mode)
|
2008-03-14 17:42:18 +00:00
|
|
|
|
(put 'abbrev-mode 'safe-local-variable 'booleanp)
|
1997-08-11 23:54:58 +00:00
|
|
|
|
|
1991-08-27 03:29:52 +00:00
|
|
|
|
|
2004-08-01 03:56:05 +00:00
|
|
|
|
(defvar edit-abbrevs-map
|
|
|
|
|
(let ((map (make-sparse-keymap)))
|
|
|
|
|
(define-key map "\C-x\C-s" 'edit-abbrevs-redefine)
|
|
|
|
|
(define-key map "\C-c\C-c" 'edit-abbrevs-redefine)
|
|
|
|
|
map)
|
2004-06-13 21:55:49 +00:00
|
|
|
|
"Keymap used in `edit-abbrevs'.")
|
1991-08-27 03:29:52 +00:00
|
|
|
|
|
|
|
|
|
(defun kill-all-abbrevs ()
|
|
|
|
|
"Undefine all defined abbrevs."
|
|
|
|
|
(interactive)
|
2007-11-18 19:32:53 +00:00
|
|
|
|
(dolist (tablesym abbrev-table-name-list)
|
|
|
|
|
(clear-abbrev-table (symbol-value tablesym))))
|
1991-08-27 03:29:52 +00:00
|
|
|
|
|
2002-09-12 03:19:25 +00:00
|
|
|
|
(defun copy-abbrev-table (table)
|
|
|
|
|
"Make a new abbrev-table with the same abbrevs as TABLE."
|
|
|
|
|
(let ((new-table (make-abbrev-table)))
|
|
|
|
|
(mapatoms
|
|
|
|
|
(lambda (symbol)
|
|
|
|
|
(define-abbrev new-table
|
|
|
|
|
(symbol-name symbol)
|
|
|
|
|
(symbol-value symbol)
|
|
|
|
|
(symbol-function symbol)))
|
|
|
|
|
table)
|
|
|
|
|
new-table))
|
|
|
|
|
|
1991-08-27 03:29:52 +00:00
|
|
|
|
(defun insert-abbrevs ()
|
|
|
|
|
"Insert after point a description of all defined abbrevs.
|
|
|
|
|
Mark is set after the inserted text."
|
|
|
|
|
(interactive)
|
|
|
|
|
(push-mark
|
|
|
|
|
(save-excursion
|
2007-11-18 19:32:53 +00:00
|
|
|
|
(dolist (tablesym abbrev-table-name-list)
|
|
|
|
|
(insert-abbrev-table-description tablesym t))
|
2005-04-23 12:34:05 +00:00
|
|
|
|
(point))))
|
1991-08-27 03:29:52 +00:00
|
|
|
|
|
2000-08-28 16:07:10 +00:00
|
|
|
|
(defun list-abbrevs (&optional local)
|
|
|
|
|
"Display a list of defined abbrevs.
|
|
|
|
|
If LOCAL is non-nil, interactively when invoked with a
|
|
|
|
|
prefix arg, display only local, i.e. mode-specific, abbrevs.
|
|
|
|
|
Otherwise display all abbrevs."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(display-buffer (prepare-abbrev-list-buffer local)))
|
|
|
|
|
|
|
|
|
|
(defun abbrev-table-name (table)
|
|
|
|
|
"Value is the name of abbrev table TABLE."
|
|
|
|
|
(let ((tables abbrev-table-name-list)
|
|
|
|
|
found)
|
|
|
|
|
(while (and (not found) tables)
|
|
|
|
|
(when (eq (symbol-value (car tables)) table)
|
|
|
|
|
(setq found (car tables)))
|
|
|
|
|
(setq tables (cdr tables)))
|
|
|
|
|
found))
|
2002-01-05 19:02:27 +00:00
|
|
|
|
|
2000-08-28 16:07:10 +00:00
|
|
|
|
(defun prepare-abbrev-list-buffer (&optional local)
|
2007-11-18 19:32:53 +00:00
|
|
|
|
(with-current-buffer (get-buffer-create "*Abbrevs*")
|
|
|
|
|
(erase-buffer)
|
|
|
|
|
(if local
|
|
|
|
|
(insert-abbrev-table-description
|
|
|
|
|
(abbrev-table-name local-abbrev-table) t)
|
|
|
|
|
(dolist (table abbrev-table-name-list)
|
|
|
|
|
(insert-abbrev-table-description table t)))
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(set-buffer-modified-p nil)
|
|
|
|
|
(edit-abbrevs-mode)
|
|
|
|
|
(current-buffer)))
|
1991-08-27 03:29:52 +00:00
|
|
|
|
|
|
|
|
|
(defun edit-abbrevs-mode ()
|
|
|
|
|
"Major mode for editing the list of abbrev definitions.
|
|
|
|
|
\\{edit-abbrevs-map}"
|
|
|
|
|
(interactive)
|
2005-06-13 11:56:12 +00:00
|
|
|
|
(kill-all-local-variables)
|
1991-08-27 03:29:52 +00:00
|
|
|
|
(setq major-mode 'edit-abbrevs-mode)
|
|
|
|
|
(setq mode-name "Edit-Abbrevs")
|
2005-06-13 11:56:12 +00:00
|
|
|
|
(use-local-map edit-abbrevs-map)
|
|
|
|
|
(run-mode-hooks 'edit-abbrevs-mode-hook))
|
1991-08-27 03:29:52 +00:00
|
|
|
|
|
|
|
|
|
(defun edit-abbrevs ()
|
|
|
|
|
"Alter abbrev definitions by editing a list of them.
|
|
|
|
|
Selects a buffer containing a list of abbrev definitions.
|
|
|
|
|
You can edit them and type \\<edit-abbrevs-map>\\[edit-abbrevs-redefine] to redefine abbrevs
|
|
|
|
|
according to your editing.
|
|
|
|
|
Buffer contains a header line for each abbrev table,
|
|
|
|
|
which is the abbrev table name in parentheses.
|
|
|
|
|
This is followed by one line per abbrev in that table:
|
|
|
|
|
NAME USECOUNT EXPANSION HOOK
|
|
|
|
|
where NAME and EXPANSION are strings with quotes,
|
|
|
|
|
USECOUNT is an integer, and HOOK is any valid function
|
|
|
|
|
or may be omitted (it is usually omitted)."
|
|
|
|
|
(interactive)
|
|
|
|
|
(switch-to-buffer (prepare-abbrev-list-buffer)))
|
|
|
|
|
|
|
|
|
|
(defun edit-abbrevs-redefine ()
|
|
|
|
|
"Redefine abbrevs according to current buffer contents."
|
|
|
|
|
(interactive)
|
2006-04-18 21:16:13 +00:00
|
|
|
|
(save-restriction
|
|
|
|
|
(widen)
|
|
|
|
|
(define-abbrevs t)
|
|
|
|
|
(set-buffer-modified-p nil)))
|
1991-08-27 03:29:52 +00:00
|
|
|
|
|
|
|
|
|
(defun define-abbrevs (&optional arg)
|
|
|
|
|
"Define abbrevs according to current visible buffer contents.
|
|
|
|
|
See documentation of `edit-abbrevs' for info on the format of the
|
|
|
|
|
text you must have in the buffer.
|
|
|
|
|
With argument, eliminate all abbrev definitions except
|
|
|
|
|
the ones defined from the buffer now."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(if arg (kill-all-abbrevs))
|
|
|
|
|
(save-excursion
|
2005-04-23 12:34:05 +00:00
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(while (and (not (eobp)) (re-search-forward "^(" nil t))
|
|
|
|
|
(let* ((buf (current-buffer))
|
|
|
|
|
(table (read buf))
|
|
|
|
|
abbrevs name hook exp count sys)
|
|
|
|
|
(forward-line 1)
|
|
|
|
|
(while (progn (forward-line 1)
|
|
|
|
|
(not (eolp)))
|
|
|
|
|
(setq name (read buf) count (read buf))
|
|
|
|
|
(if (equal count '(sys))
|
|
|
|
|
(setq sys t count (read buf)))
|
|
|
|
|
(setq exp (read buf))
|
|
|
|
|
(skip-chars-backward " \t\n\f")
|
|
|
|
|
(setq hook (if (not (eolp)) (read buf)))
|
|
|
|
|
(skip-chars-backward " \t\n\f")
|
|
|
|
|
(setq abbrevs (cons (list name exp hook count sys) abbrevs)))
|
|
|
|
|
(define-abbrev-table table abbrevs)))))
|
1991-08-27 03:29:52 +00:00
|
|
|
|
|
|
|
|
|
(defun read-abbrev-file (&optional file quietly)
|
|
|
|
|
"Read abbrev definitions from file written with `write-abbrev-file'.
|
|
|
|
|
Optional argument FILE is the name of the file to read;
|
|
|
|
|
it defaults to the value of `abbrev-file-name'.
|
2001-11-11 01:49:05 +00:00
|
|
|
|
Optional second argument QUIETLY non-nil means don't display a message."
|
2006-04-18 21:16:13 +00:00
|
|
|
|
(interactive
|
|
|
|
|
(list
|
|
|
|
|
(read-file-name (format "Read abbrev file (default %s): "
|
|
|
|
|
abbrev-file-name)
|
|
|
|
|
nil abbrev-file-name t)))
|
2006-04-18 22:04:27 +00:00
|
|
|
|
(load (or file abbrev-file-name) nil quietly)
|
2001-11-11 01:49:05 +00:00
|
|
|
|
(setq abbrevs-changed nil))
|
1991-08-27 03:29:52 +00:00
|
|
|
|
|
|
|
|
|
(defun quietly-read-abbrev-file (&optional file)
|
2004-08-01 03:56:05 +00:00
|
|
|
|
"Read abbrev definitions from file written with `write-abbrev-file'.
|
1991-08-27 03:29:52 +00:00
|
|
|
|
Optional argument FILE is the name of the file to read;
|
|
|
|
|
it defaults to the value of `abbrev-file-name'.
|
2001-11-11 01:49:05 +00:00
|
|
|
|
Does not display any message."
|
2005-04-23 12:34:05 +00:00
|
|
|
|
;(interactive "fRead abbrev file: ")
|
1991-08-27 03:29:52 +00:00
|
|
|
|
(read-abbrev-file file t))
|
|
|
|
|
|
2004-02-24 03:25:33 +00:00
|
|
|
|
(defun write-abbrev-file (&optional file)
|
|
|
|
|
"Write all user-level abbrev definitions to a file of Lisp code.
|
|
|
|
|
This does not include system abbrevs; it includes only the abbrev tables
|
|
|
|
|
listed in listed in `abbrev-table-name-list'.
|
1991-08-27 03:29:52 +00:00
|
|
|
|
The file written can be loaded in another session to define the same abbrevs.
|
2004-02-24 03:25:33 +00:00
|
|
|
|
The argument FILE is the file name to write. If omitted or nil, the file
|
|
|
|
|
specified in `abbrev-file-name' is used."
|
1991-08-27 03:29:52 +00:00
|
|
|
|
(interactive
|
|
|
|
|
(list
|
|
|
|
|
(read-file-name "Write abbrev file: "
|
|
|
|
|
(file-name-directory (expand-file-name abbrev-file-name))
|
|
|
|
|
abbrev-file-name)))
|
|
|
|
|
(or (and file (> (length file) 0))
|
|
|
|
|
(setq file abbrev-file-name))
|
2003-01-23 20:37:49 +00:00
|
|
|
|
(let ((coding-system-for-write 'emacs-mule))
|
|
|
|
|
(with-temp-file file
|
|
|
|
|
(insert ";;-*-coding: emacs-mule;-*-\n")
|
2005-04-23 12:34:05 +00:00
|
|
|
|
(dolist (table
|
|
|
|
|
;; We sort the table in order to ease the automatic
|
|
|
|
|
;; merging of different versions of the user's abbrevs
|
|
|
|
|
;; file. This is useful, for example, for when the
|
|
|
|
|
;; user keeps their home directory in a revision
|
|
|
|
|
;; control system, and is therefore keeping multiple
|
|
|
|
|
;; slightly-differing copies loosely synchronized.
|
|
|
|
|
(sort (copy-sequence abbrev-table-name-list)
|
|
|
|
|
(lambda (s1 s2)
|
|
|
|
|
(string< (symbol-name s1)
|
|
|
|
|
(symbol-name s2)))))
|
2003-01-23 20:37:49 +00:00
|
|
|
|
(insert-abbrev-table-description table nil)))))
|
1991-08-27 03:29:52 +00:00
|
|
|
|
|
|
|
|
|
(defun add-mode-abbrev (arg)
|
|
|
|
|
"Define mode-specific abbrev for last word(s) before point.
|
|
|
|
|
Argument is how many words before point form the expansion;
|
|
|
|
|
or zero means the region is the expansion.
|
|
|
|
|
A negative argument means to undefine the specified abbrev.
|
|
|
|
|
Reads the abbreviation in the minibuffer.
|
|
|
|
|
|
|
|
|
|
Don't use this function in a Lisp program; use `define-abbrev' instead."
|
|
|
|
|
(interactive "p")
|
|
|
|
|
(add-abbrev
|
|
|
|
|
(if only-global-abbrevs
|
2003-02-04 11:26:42 +00:00
|
|
|
|
global-abbrev-table
|
1991-08-27 03:29:52 +00:00
|
|
|
|
(or local-abbrev-table
|
|
|
|
|
(error "No per-mode abbrev table")))
|
|
|
|
|
"Mode" arg))
|
|
|
|
|
|
|
|
|
|
(defun add-global-abbrev (arg)
|
|
|
|
|
"Define global (all modes) abbrev for last word(s) before point.
|
|
|
|
|
The prefix argument specifies the number of words before point that form the
|
|
|
|
|
expansion; or zero means the region is the expansion.
|
|
|
|
|
A negative argument means to undefine the specified abbrev.
|
|
|
|
|
This command uses the minibuffer to read the abbreviation.
|
|
|
|
|
|
|
|
|
|
Don't use this function in a Lisp program; use `define-abbrev' instead."
|
|
|
|
|
(interactive "p")
|
|
|
|
|
(add-abbrev global-abbrev-table "Global" arg))
|
|
|
|
|
|
|
|
|
|
(defun add-abbrev (table type arg)
|
|
|
|
|
(let ((exp (and (>= arg 0)
|
1999-10-18 21:28:04 +00:00
|
|
|
|
(buffer-substring-no-properties
|
1991-08-27 03:29:52 +00:00
|
|
|
|
(point)
|
|
|
|
|
(if (= arg 0) (mark)
|
|
|
|
|
(save-excursion (forward-word (- arg)) (point))))))
|
|
|
|
|
name)
|
|
|
|
|
(setq name
|
|
|
|
|
(read-string (format (if exp "%s abbrev for \"%s\": "
|
|
|
|
|
"Undefine %s abbrev: ")
|
|
|
|
|
type exp)))
|
1994-09-29 19:07:45 +00:00
|
|
|
|
(set-text-properties 0 (length name) nil name)
|
1991-08-27 03:29:52 +00:00
|
|
|
|
(if (or (null exp)
|
|
|
|
|
(not (abbrev-expansion name table))
|
|
|
|
|
(y-or-n-p (format "%s expands to \"%s\"; redefine? "
|
|
|
|
|
name (abbrev-expansion name table))))
|
|
|
|
|
(define-abbrev table (downcase name) exp))))
|
2002-01-05 19:02:27 +00:00
|
|
|
|
|
2005-07-20 10:59:36 +00:00
|
|
|
|
(defun inverse-add-mode-abbrev (n)
|
1991-08-27 03:29:52 +00:00
|
|
|
|
"Define last word before point as a mode-specific abbrev.
|
|
|
|
|
With prefix argument N, defines the Nth word before point.
|
|
|
|
|
This command uses the minibuffer to read the expansion.
|
|
|
|
|
Expands the abbreviation after defining it."
|
|
|
|
|
(interactive "p")
|
|
|
|
|
(inverse-add-abbrev
|
|
|
|
|
(if only-global-abbrevs
|
2002-01-05 19:02:27 +00:00
|
|
|
|
global-abbrev-table
|
1991-08-27 03:29:52 +00:00
|
|
|
|
(or local-abbrev-table
|
|
|
|
|
(error "No per-mode abbrev table")))
|
2005-07-20 10:59:36 +00:00
|
|
|
|
"Mode" n))
|
1991-08-27 03:29:52 +00:00
|
|
|
|
|
2005-07-20 10:59:36 +00:00
|
|
|
|
(defun inverse-add-global-abbrev (n)
|
1991-08-27 03:29:52 +00:00
|
|
|
|
"Define last word before point as a global (mode-independent) abbrev.
|
|
|
|
|
With prefix argument N, defines the Nth word before point.
|
|
|
|
|
This command uses the minibuffer to read the expansion.
|
|
|
|
|
Expands the abbreviation after defining it."
|
|
|
|
|
(interactive "p")
|
2005-07-20 10:59:36 +00:00
|
|
|
|
(inverse-add-abbrev global-abbrev-table "Global" n))
|
1991-08-27 03:29:52 +00:00
|
|
|
|
|
|
|
|
|
(defun inverse-add-abbrev (table type arg)
|
2000-03-17 22:32:39 +00:00
|
|
|
|
(let (name exp start end)
|
1991-08-27 03:29:52 +00:00
|
|
|
|
(save-excursion
|
2000-03-17 22:32:39 +00:00
|
|
|
|
(forward-word (1+ (- arg)))
|
|
|
|
|
(setq end (point))
|
|
|
|
|
(backward-word 1)
|
|
|
|
|
(setq start (point)
|
|
|
|
|
name (buffer-substring-no-properties start end)))
|
|
|
|
|
|
|
|
|
|
(setq exp (read-string (format "%s expansion for \"%s\": " type name)
|
|
|
|
|
nil nil nil t))
|
|
|
|
|
(when (or (not (abbrev-expansion name table))
|
|
|
|
|
(y-or-n-p (format "%s expands to \"%s\"; redefine? "
|
|
|
|
|
name (abbrev-expansion name table))))
|
|
|
|
|
(define-abbrev table (downcase name) exp)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(goto-char end)
|
|
|
|
|
(expand-abbrev)))))
|
1991-08-27 03:29:52 +00:00
|
|
|
|
|
|
|
|
|
(defun abbrev-prefix-mark (&optional arg)
|
|
|
|
|
"Mark current point as the beginning of an abbrev.
|
|
|
|
|
Abbrev to be expanded starts here rather than at beginning of word.
|
|
|
|
|
This way, you can expand an abbrev with a prefix: insert the prefix,
|
2004-02-24 03:25:33 +00:00
|
|
|
|
use this command, then insert the abbrev. This command inserts a
|
|
|
|
|
temporary hyphen after the prefix \(until the intended abbrev
|
|
|
|
|
expansion occurs).
|
|
|
|
|
If the prefix is itself an abbrev, this command expands it, unless
|
|
|
|
|
ARG is non-nil. Interactively, ARG is the prefix argument."
|
1991-08-27 03:29:52 +00:00
|
|
|
|
(interactive "P")
|
|
|
|
|
(or arg (expand-abbrev))
|
|
|
|
|
(setq abbrev-start-location (point-marker)
|
|
|
|
|
abbrev-start-location-buffer (current-buffer))
|
|
|
|
|
(insert "-"))
|
|
|
|
|
|
|
|
|
|
(defun expand-region-abbrevs (start end &optional noquery)
|
|
|
|
|
"For abbrev occurrence in the region, offer to expand it.
|
2005-07-20 10:59:36 +00:00
|
|
|
|
The user is asked to type `y' or `n' for each occurrence.
|
|
|
|
|
A prefix argument means don't query; expand all abbrevs."
|
1991-08-27 03:29:52 +00:00
|
|
|
|
(interactive "r\nP")
|
|
|
|
|
(save-excursion
|
|
|
|
|
(goto-char start)
|
|
|
|
|
(let ((lim (- (point-max) end))
|
|
|
|
|
pnt string)
|
|
|
|
|
(while (and (not (eobp))
|
|
|
|
|
(progn (forward-word 1)
|
|
|
|
|
(<= (setq pnt (point)) (- (point-max) lim))))
|
|
|
|
|
(if (abbrev-expansion
|
|
|
|
|
(setq string
|
1999-10-18 21:28:04 +00:00
|
|
|
|
(buffer-substring-no-properties
|
1991-08-27 03:29:52 +00:00
|
|
|
|
(save-excursion (forward-word -1) (point))
|
|
|
|
|
pnt)))
|
|
|
|
|
(if (or noquery (y-or-n-p (format "Expand `%s'? " string)))
|
|
|
|
|
(expand-abbrev)))))))
|
1992-05-30 23:54:21 +00:00
|
|
|
|
|
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".
2007-10-28 02:41:00 +00:00
|
|
|
|
;;; Abbrev properties.
|
|
|
|
|
|
|
|
|
|
(defun abbrev-table-get (table prop)
|
|
|
|
|
"Get the PROP property of abbrev table TABLE."
|
|
|
|
|
(let ((sym (intern-soft "" table)))
|
|
|
|
|
(if sym (get sym prop))))
|
|
|
|
|
|
|
|
|
|
(defun abbrev-table-put (table prop val)
|
|
|
|
|
"Set the PROP property of abbrev table TABLE to VAL."
|
|
|
|
|
(let ((sym (intern "" table)))
|
|
|
|
|
(set sym nil) ; Make sure it won't be confused for an abbrev.
|
|
|
|
|
(put sym prop val)))
|
|
|
|
|
|
2007-10-30 01:39:19 +00:00
|
|
|
|
(defalias 'abbrev-get 'get
|
|
|
|
|
"Get the property PROP of abbrev ABBREV
|
|
|
|
|
|
|
|
|
|
\(fn ABBREV PROP)")
|
|
|
|
|
|
|
|
|
|
(defalias 'abbrev-put 'put
|
|
|
|
|
"Set the property PROP of abbrev ABREV to value VAL.
|
|
|
|
|
See `define-abbrev' for the effect of some special properties.
|
|
|
|
|
|
|
|
|
|
\(fn ABBREV PROP VAL)")
|
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".
2007-10-28 02:41:00 +00:00
|
|
|
|
|
|
|
|
|
(defmacro abbrev-with-wrapper-hook (var &rest body)
|
|
|
|
|
"Run BODY wrapped with the VAR hook.
|
|
|
|
|
VAR is a special hook: its functions are called with one argument which
|
|
|
|
|
is the \"original\" code (the BODY), so the hook function can wrap the
|
|
|
|
|
original function, can call it several times, or even not call it at all.
|
|
|
|
|
VAR is normally a symbol (a variable) in which case it is treated like a hook,
|
|
|
|
|
with a buffer-local and a global part. But it can also be an arbitrary expression.
|
|
|
|
|
This is similar to an `around' advice."
|
|
|
|
|
(declare (indent 1) (debug t))
|
|
|
|
|
;; We need those two gensyms because CL's lexical scoping is not available
|
|
|
|
|
;; for function arguments :-(
|
|
|
|
|
(let ((funs (make-symbol "funs"))
|
|
|
|
|
(global (make-symbol "global")))
|
|
|
|
|
;; Since the hook is a wrapper, the loop has to be done via
|
|
|
|
|
;; recursion: a given hook function will call its parameter in order to
|
|
|
|
|
;; continue looping.
|
|
|
|
|
`(labels ((runrestofhook (,funs ,global)
|
|
|
|
|
;; `funs' holds the functions left on the hook and `global'
|
|
|
|
|
;; holds the functions left on the global part of the hook
|
|
|
|
|
;; (in case the hook is local).
|
|
|
|
|
(lexical-let ((funs ,funs)
|
|
|
|
|
(global ,global))
|
|
|
|
|
(if (consp funs)
|
|
|
|
|
(if (eq t (car funs))
|
|
|
|
|
(runrestofhook (append global (cdr funs)) nil)
|
|
|
|
|
(funcall (car funs)
|
|
|
|
|
(lambda () (runrestofhook (cdr funs) global))))
|
|
|
|
|
;; Once there are no more functions on the hook, run
|
|
|
|
|
;; the original body.
|
|
|
|
|
,@body))))
|
|
|
|
|
(runrestofhook ,var
|
|
|
|
|
;; The global part of the hook, if any.
|
|
|
|
|
,(if (symbolp var)
|
|
|
|
|
`(if (local-variable-p ',var)
|
|
|
|
|
(default-value ',var)))))))
|
2007-11-04 23:01:15 +00:00
|
|
|
|
|
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".
2007-10-28 02:41:00 +00:00
|
|
|
|
|
|
|
|
|
;;; Code that used to be implemented in src/abbrev.c
|
|
|
|
|
|
|
|
|
|
(defvar abbrev-table-name-list '(fundamental-mode-abbrev-table
|
|
|
|
|
global-abbrev-table)
|
|
|
|
|
"List of symbols whose values are abbrev tables.")
|
|
|
|
|
|
|
|
|
|
(defun make-abbrev-table (&optional props)
|
|
|
|
|
"Create a new, empty abbrev table object.
|
2008-04-17 17:40:52 +00:00
|
|
|
|
PROPS is a list of properties."
|
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".
2007-10-28 02:41:00 +00:00
|
|
|
|
;; The value 59 is an arbitrary prime number.
|
|
|
|
|
(let ((table (make-vector 59 0)))
|
|
|
|
|
;; Each abbrev-table has a `modiff' counter which can be used to detect
|
|
|
|
|
;; when an abbreviation was added. An example of use would be to
|
|
|
|
|
;; construct :regexp dynamically as the union of all abbrev names, so
|
|
|
|
|
;; `modiff' can let us detect that an abbrev was added and hence :regexp
|
|
|
|
|
;; needs to be refreshed.
|
|
|
|
|
;; The presence of `modiff' entry is also used as a tag indicating this
|
|
|
|
|
;; vector is really an abbrev-table.
|
|
|
|
|
(abbrev-table-put table :abbrev-table-modiff 0)
|
|
|
|
|
(while (consp props)
|
|
|
|
|
(abbrev-table-put table (pop props) (pop props)))
|
|
|
|
|
table))
|
|
|
|
|
|
|
|
|
|
(defun abbrev-table-p (object)
|
|
|
|
|
(and (vectorp object)
|
|
|
|
|
(numberp (abbrev-table-get object :abbrev-table-modiff))))
|
|
|
|
|
|
|
|
|
|
(defvar global-abbrev-table (make-abbrev-table)
|
|
|
|
|
"The abbrev table whose abbrevs affect all buffers.
|
|
|
|
|
Each buffer may also have a local abbrev table.
|
|
|
|
|
If it does, the local table overrides the global one
|
|
|
|
|
for any particular abbrev defined in both.")
|
|
|
|
|
|
|
|
|
|
(defvar abbrev-minor-mode-table-alist nil
|
|
|
|
|
"Alist of abbrev tables to use for minor modes.
|
|
|
|
|
Each element looks like (VARIABLE . ABBREV-TABLE);
|
|
|
|
|
ABBREV-TABLE is active whenever VARIABLE's value is non-nil.")
|
|
|
|
|
|
|
|
|
|
(defvar fundamental-mode-abbrev-table
|
|
|
|
|
(let ((table (make-abbrev-table)))
|
|
|
|
|
;; Set local-abbrev-table's default to be fundamental-mode-abbrev-table.
|
|
|
|
|
(setq-default local-abbrev-table table)
|
|
|
|
|
table)
|
|
|
|
|
"The abbrev table of mode-specific abbrevs for Fundamental Mode.")
|
|
|
|
|
|
|
|
|
|
(defvar abbrevs-changed nil
|
|
|
|
|
"Set non-nil by defining or altering any word abbrevs.
|
|
|
|
|
This causes `save-some-buffers' to offer to save the abbrevs.")
|
|
|
|
|
|
|
|
|
|
(defcustom abbrev-all-caps nil
|
|
|
|
|
"Non-nil means expand multi-word abbrevs all caps if abbrev was so."
|
|
|
|
|
:type 'boolean
|
|
|
|
|
:group 'abbrev-mode)
|
|
|
|
|
|
|
|
|
|
(defvar abbrev-start-location nil
|
|
|
|
|
"Buffer position for `expand-abbrev' to use as the start of the abbrev.
|
|
|
|
|
When nil, use the word before point as the abbrev.
|
|
|
|
|
Calling `expand-abbrev' sets this to nil.")
|
|
|
|
|
|
|
|
|
|
(defvar abbrev-start-location-buffer nil
|
|
|
|
|
"Buffer that `abbrev-start-location' has been set for.
|
|
|
|
|
Trying to expand an abbrev in any other buffer clears `abbrev-start-location'.")
|
|
|
|
|
|
|
|
|
|
(defvar last-abbrev nil
|
|
|
|
|
"The abbrev-symbol of the last abbrev expanded. See `abbrev-symbol'.")
|
|
|
|
|
|
|
|
|
|
(defvar last-abbrev-text nil
|
|
|
|
|
"The exact text of the last abbrev expanded.
|
|
|
|
|
nil if the abbrev has already been unexpanded.")
|
|
|
|
|
|
|
|
|
|
(defvar last-abbrev-location 0
|
|
|
|
|
"The location of the start of the last abbrev expanded.")
|
|
|
|
|
|
|
|
|
|
;; (defvar local-abbrev-table fundamental-mode-abbrev-table
|
|
|
|
|
;; "Local (mode-specific) abbrev table of current buffer.")
|
|
|
|
|
;; (make-variable-buffer-local 'local-abbrev-table)
|
|
|
|
|
|
|
|
|
|
(defcustom pre-abbrev-expand-hook nil
|
|
|
|
|
"Function or functions to be called before abbrev expansion is done.
|
|
|
|
|
This is the first thing that `expand-abbrev' does, and so this may change
|
|
|
|
|
the current abbrev table before abbrev lookup happens."
|
|
|
|
|
:type 'hook
|
|
|
|
|
:group 'abbrev-mode)
|
|
|
|
|
(make-obsolete-variable 'pre-abbrev-expand-hook 'abbrev-expand-functions "23.1")
|
|
|
|
|
|
|
|
|
|
(defun clear-abbrev-table (table)
|
|
|
|
|
"Undefine all abbrevs in abbrev table TABLE, leaving it empty."
|
|
|
|
|
(setq abbrevs-changed t)
|
2007-11-18 19:32:53 +00:00
|
|
|
|
(let* ((sym (intern-soft "" table)))
|
|
|
|
|
(dotimes (i (length table))
|
|
|
|
|
(aset table i 0))
|
|
|
|
|
;; Preserve the table's properties.
|
|
|
|
|
(assert sym)
|
2008-01-14 20:17:52 +00:00
|
|
|
|
(let ((newsym (intern "" table)))
|
|
|
|
|
(set newsym nil) ; Make sure it won't be confused for an abbrev.
|
|
|
|
|
(setplist newsym (symbol-plist sym)))
|
2007-11-18 19:32:53 +00:00
|
|
|
|
(abbrev-table-put table :abbrev-table-modiff
|
|
|
|
|
(1+ (abbrev-table-get table :abbrev-table-modiff)))))
|
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".
2007-10-28 02:41:00 +00:00
|
|
|
|
|
|
|
|
|
(defun define-abbrev (table name expansion &optional hook &rest props)
|
|
|
|
|
"Define an abbrev in TABLE named NAME, to expand to EXPANSION and call HOOK.
|
|
|
|
|
NAME must be a string, and should be lower-case.
|
|
|
|
|
EXPANSION should usually be a string.
|
|
|
|
|
To undefine an abbrev, define it with EXPANSION = nil.
|
|
|
|
|
If HOOK is non-nil, it should be a function of no arguments;
|
|
|
|
|
it is called after EXPANSION is inserted.
|
2008-10-17 21:25:58 +00:00
|
|
|
|
If EXPANSION is not a string (and not nil), the abbrev is a
|
|
|
|
|
special one, which does not expand in the usual way but only
|
|
|
|
|
runs HOOK.
|
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".
2007-10-28 02:41:00 +00:00
|
|
|
|
|
|
|
|
|
PROPS is a property list. The following properties are special:
|
2008-04-17 17:40:52 +00:00
|
|
|
|
- `:count': the value for the abbrev's usage-count, which is incremented each
|
|
|
|
|
time the abbrev is used (the default is zero).
|
2007-10-30 01:39:19 +00:00
|
|
|
|
- `:system': if non-nil, says that this is a \"system\" abbreviation
|
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".
2007-10-28 02:41:00 +00:00
|
|
|
|
which should not be saved in the user's abbreviation file.
|
2007-10-30 01:39:19 +00:00
|
|
|
|
Unless `:system' is `force', a system abbreviation will not
|
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".
2007-10-28 02:41:00 +00:00
|
|
|
|
overwrite a non-system abbreviation of the same name.
|
|
|
|
|
- `:case-fixed': non-nil means that abbreviations are looked up without
|
|
|
|
|
case-folding, and the expansion is not capitalized/upcased.
|
2008-04-26 02:33:08 +00:00
|
|
|
|
- `:enable-function': a function of no argument which returns non-nil if the
|
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".
2007-10-28 02:41:00 +00:00
|
|
|
|
abbrev should be used for a particular call of `expand-abbrev'.
|
|
|
|
|
|
|
|
|
|
An obsolete but still supported calling form is:
|
|
|
|
|
|
2007-10-30 01:39:19 +00:00
|
|
|
|
\(define-abbrev TABLE NAME EXPANSION &optional HOOK COUNT SYSTEM)."
|
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".
2007-10-28 02:41:00 +00:00
|
|
|
|
(when (and (consp props) (or (null (car props)) (numberp (car props))))
|
|
|
|
|
;; Old-style calling convention.
|
2007-10-30 01:39:19 +00:00
|
|
|
|
(setq props (list* :count (car props)
|
|
|
|
|
(if (cadr props) (list :system (cadr props))))))
|
|
|
|
|
(unless (plist-get props :count)
|
|
|
|
|
(setq props (plist-put props :count 0)))
|
|
|
|
|
(let ((system-flag (plist-get props :system))
|
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".
2007-10-28 02:41:00 +00:00
|
|
|
|
(sym (intern name table)))
|
|
|
|
|
;; Don't override a prior user-defined abbrev with a system abbrev,
|
|
|
|
|
;; unless system-flag is `force'.
|
|
|
|
|
(unless (and (not (memq system-flag '(nil force)))
|
|
|
|
|
(boundp sym) (symbol-value sym)
|
2007-10-30 01:39:19 +00:00
|
|
|
|
(not (abbrev-get sym :system)))
|
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".
2007-10-28 02:41:00 +00:00
|
|
|
|
(unless (or system-flag
|
|
|
|
|
(and (boundp sym) (fboundp sym)
|
|
|
|
|
;; load-file-name
|
|
|
|
|
(equal (symbol-value sym) expansion)
|
|
|
|
|
(equal (symbol-function sym) hook)))
|
|
|
|
|
(setq abbrevs-changed t))
|
|
|
|
|
(set sym expansion)
|
|
|
|
|
(fset sym hook)
|
2007-10-30 01:39:19 +00:00
|
|
|
|
(setplist sym
|
|
|
|
|
;; Don't store the `force' value of `system-flag' into
|
|
|
|
|
;; the :system property.
|
|
|
|
|
(if (eq 'force system-flag) (plist-put props :system t) props))
|
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".
2007-10-28 02:41:00 +00:00
|
|
|
|
(abbrev-table-put table :abbrev-table-modiff
|
|
|
|
|
(1+ (abbrev-table-get table :abbrev-table-modiff))))
|
|
|
|
|
name))
|
|
|
|
|
|
|
|
|
|
(defun abbrev--check-chars (abbrev global)
|
|
|
|
|
"Check if the characters in ABBREV have word syntax in either the
|
|
|
|
|
current (if global is nil) or standard syntax table."
|
|
|
|
|
(with-syntax-table
|
|
|
|
|
(cond ((null global) (standard-syntax-table))
|
|
|
|
|
;; ((syntax-table-p global) global)
|
|
|
|
|
(t (syntax-table)))
|
|
|
|
|
(when (string-match "\\W" abbrev)
|
|
|
|
|
(let ((badchars ())
|
|
|
|
|
(pos 0))
|
|
|
|
|
(while (string-match "\\W" abbrev pos)
|
|
|
|
|
(pushnew (aref abbrev (match-beginning 0)) badchars)
|
|
|
|
|
(setq pos (1+ pos)))
|
|
|
|
|
(error "Some abbrev characters (%s) are not word constituents %s"
|
|
|
|
|
(apply 'string (nreverse badchars))
|
|
|
|
|
(if global "in the standard syntax" "in this mode"))))))
|
|
|
|
|
|
|
|
|
|
(defun define-global-abbrev (abbrev expansion)
|
|
|
|
|
"Define ABBREV as a global abbreviation for EXPANSION.
|
|
|
|
|
The characters in ABBREV must all be word constituents in the standard
|
|
|
|
|
syntax table."
|
|
|
|
|
(interactive "sDefine global abbrev: \nsExpansion for %s: ")
|
|
|
|
|
(abbrev--check-chars abbrev 'global)
|
|
|
|
|
(define-abbrev global-abbrev-table (downcase abbrev) expansion))
|
|
|
|
|
|
|
|
|
|
(defun define-mode-abbrev (abbrev expansion)
|
|
|
|
|
"Define ABBREV as a mode-specific abbreviation for EXPANSION.
|
|
|
|
|
The characters in ABBREV must all be word-constituents in the current mode."
|
|
|
|
|
(interactive "sDefine mode abbrev: \nsExpansion for %s: ")
|
|
|
|
|
(unless local-abbrev-table
|
|
|
|
|
(error "Major mode has no abbrev table"))
|
|
|
|
|
(abbrev--check-chars abbrev nil)
|
|
|
|
|
(define-abbrev local-abbrev-table (downcase abbrev) expansion))
|
|
|
|
|
|
|
|
|
|
(defun abbrev--active-tables (&optional tables)
|
|
|
|
|
"Return the list of abbrev tables currently active.
|
|
|
|
|
TABLES if non-nil overrides the usual rules. It can hold
|
|
|
|
|
either a single abbrev table or a list of abbrev tables."
|
|
|
|
|
;; We could just remove the `tables' arg and let callers use
|
|
|
|
|
;; (or table (abbrev--active-tables)) but then they'd have to be careful
|
|
|
|
|
;; to treat the distinction between a single table and a list of tables.
|
|
|
|
|
(cond
|
|
|
|
|
((consp tables) tables)
|
|
|
|
|
((vectorp tables) (list tables))
|
|
|
|
|
(t
|
|
|
|
|
(let ((tables (if (listp local-abbrev-table)
|
|
|
|
|
(append local-abbrev-table
|
|
|
|
|
(list global-abbrev-table))
|
|
|
|
|
(list local-abbrev-table global-abbrev-table))))
|
|
|
|
|
;; Add the minor-mode abbrev tables.
|
|
|
|
|
(dolist (x abbrev-minor-mode-table-alist)
|
|
|
|
|
(when (and (symbolp (car x)) (boundp (car x)) (symbol-value (car x)))
|
|
|
|
|
(setq tables
|
|
|
|
|
(if (listp (cdr x))
|
|
|
|
|
(append (cdr x) tables) (cons (cdr x) tables)))))
|
|
|
|
|
tables))))
|
2007-11-04 23:01:15 +00:00
|
|
|
|
|
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".
2007-10-28 02:41:00 +00:00
|
|
|
|
|
|
|
|
|
(defun abbrev-symbol (abbrev &optional table)
|
|
|
|
|
"Return the symbol representing abbrev named ABBREV.
|
|
|
|
|
This symbol's name is ABBREV, but it is not the canonical symbol of that name;
|
|
|
|
|
it is interned in an abbrev-table rather than the normal obarray.
|
|
|
|
|
The value is nil if that abbrev is not defined.
|
|
|
|
|
Optional second arg TABLE is abbrev table to look it up in.
|
|
|
|
|
The default is to try buffer's mode-specific abbrev table, then global table."
|
|
|
|
|
(let ((tables (abbrev--active-tables table))
|
|
|
|
|
sym)
|
|
|
|
|
(while (and tables (not (symbol-value sym)))
|
2007-10-31 15:47:02 +00:00
|
|
|
|
(let* ((table (pop tables))
|
|
|
|
|
(case-fold (not (abbrev-table-get table :case-fixed))))
|
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".
2007-10-28 02:41:00 +00:00
|
|
|
|
(setq tables (append (abbrev-table-get table :parents) tables))
|
|
|
|
|
;; In case the table doesn't set :case-fixed but some of the
|
|
|
|
|
;; abbrevs do, we have to be careful.
|
|
|
|
|
(setq sym
|
|
|
|
|
;; First try without case-folding.
|
|
|
|
|
(or (intern-soft abbrev table)
|
|
|
|
|
(when case-fold
|
|
|
|
|
;; We didn't find any abbrev, try case-folding.
|
|
|
|
|
(let ((sym (intern-soft (downcase abbrev) table)))
|
|
|
|
|
;; Only use it if it doesn't require :case-fixed.
|
|
|
|
|
(and sym (not (abbrev-get sym :case-fixed))
|
|
|
|
|
sym)))))))
|
|
|
|
|
(if (symbol-value sym)
|
|
|
|
|
sym)))
|
2007-11-04 23:01:15 +00:00
|
|
|
|
|
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".
2007-10-28 02:41:00 +00:00
|
|
|
|
|
|
|
|
|
(defun abbrev-expansion (abbrev &optional table)
|
|
|
|
|
"Return the string that ABBREV expands into in the current buffer.
|
|
|
|
|
Optionally specify an abbrev table as second arg;
|
|
|
|
|
then ABBREV is looked up in that table only."
|
|
|
|
|
(symbol-value (abbrev-symbol abbrev table)))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(defun abbrev--before-point ()
|
|
|
|
|
"Try and find an abbrev before point. Return it if found, nil otherwise."
|
|
|
|
|
(unless (eq abbrev-start-location-buffer (current-buffer))
|
|
|
|
|
(setq abbrev-start-location nil))
|
|
|
|
|
|
|
|
|
|
(let ((tables (abbrev--active-tables))
|
|
|
|
|
(pos (point))
|
|
|
|
|
start end name res)
|
|
|
|
|
|
|
|
|
|
(if abbrev-start-location
|
|
|
|
|
(progn
|
|
|
|
|
(setq start abbrev-start-location)
|
|
|
|
|
(setq abbrev-start-location nil)
|
|
|
|
|
;; Remove the hyphen inserted by `abbrev-prefix-mark'.
|
|
|
|
|
(if (and (< start (point-max))
|
|
|
|
|
(eq (char-after start) ?-))
|
|
|
|
|
(delete-region start (1+ start)))
|
|
|
|
|
(skip-syntax-backward " ")
|
|
|
|
|
(setq end (point))
|
2007-10-31 15:47:02 +00:00
|
|
|
|
(when (> end start)
|
|
|
|
|
(setq name (buffer-substring start end))
|
|
|
|
|
(goto-char pos) ; Restore point.
|
|
|
|
|
(list (abbrev-symbol name tables) name start end)))
|
2007-11-04 23:01:15 +00:00
|
|
|
|
|
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".
2007-10-28 02:41:00 +00:00
|
|
|
|
(while (and tables (not (car res)))
|
|
|
|
|
(let* ((table (pop tables))
|
|
|
|
|
(enable-fun (abbrev-table-get table :enable-function)))
|
|
|
|
|
(setq tables (append (abbrev-table-get table :parents) tables))
|
|
|
|
|
(setq res
|
|
|
|
|
(and (or (not enable-fun) (funcall enable-fun))
|
|
|
|
|
(looking-back (or (abbrev-table-get table :regexp)
|
|
|
|
|
"\\<\\(\\w+\\)\\W*")
|
|
|
|
|
(line-beginning-position))
|
|
|
|
|
(setq start (match-beginning 1))
|
|
|
|
|
(setq end (match-end 1))
|
2007-10-30 01:39:19 +00:00
|
|
|
|
(setq name (buffer-substring start end))
|
|
|
|
|
(let ((abbrev (abbrev-symbol name table)))
|
|
|
|
|
(when abbrev
|
|
|
|
|
(setq enable-fun (abbrev-get abbrev :enable-function))
|
|
|
|
|
(and (or (not enable-fun) (funcall enable-fun))
|
|
|
|
|
;; This will also look it up in parent tables.
|
|
|
|
|
;; This is not on purpose, but it seems harmless.
|
|
|
|
|
(list abbrev name start end))))))
|
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".
2007-10-28 02:41:00 +00:00
|
|
|
|
;; Restore point.
|
|
|
|
|
(goto-char pos)))
|
|
|
|
|
res)))
|
|
|
|
|
|
2008-04-17 19:54:00 +00:00
|
|
|
|
(defun abbrev-insert (abbrev &optional name wordstart wordend)
|
|
|
|
|
"Insert abbrev ABBREV at point.
|
|
|
|
|
If non-nil, NAME is the name by which this abbrev was found.
|
|
|
|
|
If non-nil, WORDSTART is the place where to insert the abbrev.
|
|
|
|
|
If non-nil, WORDEND the abbrev replaces the previous text between
|
|
|
|
|
WORDSTART and WORDEND.
|
|
|
|
|
Return ABBREV if the expansion should be considered as having taken place."
|
|
|
|
|
(unless name (setq name (symbol-name abbrev)))
|
|
|
|
|
(unless wordstart (setq wordstart (point)))
|
|
|
|
|
(unless wordend (setq wordend wordstart))
|
|
|
|
|
;; Increment use count.
|
|
|
|
|
(abbrev-put abbrev :count (1+ (abbrev-get abbrev :count)))
|
|
|
|
|
(let ((value abbrev))
|
|
|
|
|
;; If this abbrev has an expansion, delete the abbrev
|
|
|
|
|
;; and insert the expansion.
|
|
|
|
|
(when (stringp (symbol-value abbrev))
|
|
|
|
|
(goto-char wordstart)
|
|
|
|
|
;; Insert at beginning so that markers at the end (e.g. point)
|
|
|
|
|
;; are preserved.
|
|
|
|
|
(insert (symbol-value abbrev))
|
|
|
|
|
(delete-char (- wordend wordstart))
|
|
|
|
|
(let ((case-fold-search nil))
|
|
|
|
|
;; If the abbrev's name is different from the buffer text (the
|
|
|
|
|
;; only difference should be capitalization), then we may want
|
|
|
|
|
;; to adjust the capitalization of the expansion.
|
|
|
|
|
(when (and (not (equal name (symbol-name abbrev)))
|
|
|
|
|
(string-match "[[:upper:]]" name))
|
|
|
|
|
(if (not (string-match "[[:lower:]]" name))
|
|
|
|
|
;; Abbrev was all caps. If expansion is multiple words,
|
|
|
|
|
;; normally capitalize each word.
|
|
|
|
|
(if (and (not abbrev-all-caps)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(> (progn (backward-word 1) (point))
|
|
|
|
|
(progn (goto-char wordstart)
|
|
|
|
|
(forward-word 1) (point)))))
|
|
|
|
|
(upcase-initials-region wordstart (point))
|
|
|
|
|
(upcase-region wordstart (point)))
|
|
|
|
|
;; Abbrev included some caps. Cap first initial of expansion.
|
|
|
|
|
(let ((end (point)))
|
|
|
|
|
;; Find the initial.
|
|
|
|
|
(goto-char wordstart)
|
|
|
|
|
(skip-syntax-forward "^w" (1- end))
|
|
|
|
|
;; Change just that.
|
|
|
|
|
(upcase-initials-region (point) (1+ (point)))
|
|
|
|
|
(goto-char end))))))
|
|
|
|
|
;; Now point is at the end of the expansion and the beginning is
|
|
|
|
|
;; in last-abbrev-location.
|
|
|
|
|
(when (symbol-function abbrev)
|
|
|
|
|
(let* ((hook (symbol-function abbrev))
|
|
|
|
|
(expanded
|
|
|
|
|
;; If the abbrev has a hook function, run it.
|
|
|
|
|
(funcall hook)))
|
|
|
|
|
;; In addition, if the hook function is a symbol with
|
|
|
|
|
;; a non-nil `no-self-insert' property, let the value it
|
|
|
|
|
;; returned specify whether we consider that an expansion took
|
|
|
|
|
;; place. If it returns nil, no expansion has been done.
|
|
|
|
|
(if (and (symbolp hook)
|
|
|
|
|
(null expanded)
|
|
|
|
|
(get hook 'no-self-insert))
|
|
|
|
|
(setq value nil))))
|
|
|
|
|
value))
|
|
|
|
|
|
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".
2007-10-28 02:41:00 +00:00
|
|
|
|
(defvar abbrev-expand-functions nil
|
|
|
|
|
"Wrapper hook around `expand-abbrev'.
|
|
|
|
|
The functions on this special hook are called with one argument:
|
|
|
|
|
a function that performs the abbrev expansion. It should return
|
|
|
|
|
the abbrev symbol if expansion took place.")
|
|
|
|
|
|
|
|
|
|
(defun expand-abbrev ()
|
|
|
|
|
"Expand the abbrev before point, if there is an abbrev there.
|
|
|
|
|
Effective when explicitly called even when `abbrev-mode' is nil.
|
|
|
|
|
Returns the abbrev symbol, if expansion took place."
|
|
|
|
|
(interactive)
|
|
|
|
|
(run-hooks 'pre-abbrev-expand-hook)
|
|
|
|
|
(abbrev-with-wrapper-hook abbrev-expand-functions
|
|
|
|
|
(destructuring-bind (&optional sym name wordstart wordend)
|
|
|
|
|
(abbrev--before-point)
|
|
|
|
|
(when sym
|
|
|
|
|
(let ((value sym))
|
|
|
|
|
(unless (or ;; executing-kbd-macro
|
|
|
|
|
noninteractive
|
|
|
|
|
(window-minibuffer-p (selected-window)))
|
|
|
|
|
;; Add an undo boundary, in case we are doing this for
|
|
|
|
|
;; a self-inserting command which has avoided making one so far.
|
|
|
|
|
(undo-boundary))
|
|
|
|
|
;; Now sym is the abbrev symbol.
|
|
|
|
|
(setq last-abbrev-text name)
|
|
|
|
|
(setq last-abbrev sym)
|
|
|
|
|
(setq last-abbrev-location wordstart)
|
|
|
|
|
;; If this abbrev has an expansion, delete the abbrev
|
|
|
|
|
;; and insert the expansion.
|
2008-04-17 19:54:00 +00:00
|
|
|
|
(abbrev-insert sym name wordstart wordend))))))
|
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".
2007-10-28 02:41:00 +00:00
|
|
|
|
|
|
|
|
|
(defun unexpand-abbrev ()
|
|
|
|
|
"Undo the expansion of the last abbrev that expanded.
|
|
|
|
|
This differs from ordinary undo in that other editing done since then
|
|
|
|
|
is not undone."
|
|
|
|
|
(interactive)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(unless (or (< last-abbrev-location (point-min))
|
|
|
|
|
(> last-abbrev-location (point-max)))
|
|
|
|
|
(goto-char last-abbrev-location)
|
|
|
|
|
(when (stringp last-abbrev-text)
|
|
|
|
|
;; This isn't correct if last-abbrev's hook was used
|
|
|
|
|
;; to do the expansion.
|
|
|
|
|
(let ((val (symbol-value last-abbrev)))
|
|
|
|
|
(unless (stringp val)
|
2008-06-05 05:06:58 +00:00
|
|
|
|
(error "Value of abbrev-symbol must be a string"))
|
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".
2007-10-28 02:41:00 +00:00
|
|
|
|
;; Don't inherit properties here; just copy from old contents.
|
|
|
|
|
(insert last-abbrev-text)
|
2008-06-05 05:06:58 +00:00
|
|
|
|
;; Delete after inserting, to better preserve markers.
|
|
|
|
|
(delete-region (point) (+ (point) (length val)))
|
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".
2007-10-28 02:41:00 +00:00
|
|
|
|
(setq last-abbrev-text nil))))))
|
|
|
|
|
|
|
|
|
|
(defun abbrev--write (sym)
|
|
|
|
|
"Write the abbrev in a `read'able form.
|
|
|
|
|
Only writes the non-system abbrevs.
|
|
|
|
|
Presumes that `standard-output' points to `current-buffer'."
|
2007-10-30 01:39:19 +00:00
|
|
|
|
(unless (or (null (symbol-value sym)) (abbrev-get sym :system))
|
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".
2007-10-28 02:41:00 +00:00
|
|
|
|
(insert " (")
|
2007-11-16 18:27:07 +00:00
|
|
|
|
(prin1 (symbol-name sym))
|
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".
2007-10-28 02:41:00 +00:00
|
|
|
|
(insert " ")
|
|
|
|
|
(prin1 (symbol-value sym))
|
|
|
|
|
(insert " ")
|
|
|
|
|
(prin1 (symbol-function sym))
|
|
|
|
|
(insert " ")
|
2007-10-30 01:39:19 +00:00
|
|
|
|
(prin1 (abbrev-get sym :count))
|
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".
2007-10-28 02:41:00 +00:00
|
|
|
|
(insert ")\n")))
|
|
|
|
|
|
|
|
|
|
(defun abbrev--describe (sym)
|
|
|
|
|
(when (symbol-value sym)
|
|
|
|
|
(prin1 (symbol-name sym))
|
2007-10-30 01:39:19 +00:00
|
|
|
|
(if (null (abbrev-get sym :system))
|
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".
2007-10-28 02:41:00 +00:00
|
|
|
|
(indent-to 15 1)
|
|
|
|
|
(insert " (sys)")
|
|
|
|
|
(indent-to 20 1))
|
2007-10-30 01:39:19 +00:00
|
|
|
|
(prin1 (abbrev-get sym :count))
|
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".
2007-10-28 02:41:00 +00:00
|
|
|
|
(indent-to 20 1)
|
|
|
|
|
(prin1 (symbol-value sym))
|
|
|
|
|
(when (symbol-function sym)
|
|
|
|
|
(indent-to 45 1)
|
|
|
|
|
(prin1 (symbol-function sym)))
|
|
|
|
|
(terpri)))
|
|
|
|
|
|
|
|
|
|
(defun insert-abbrev-table-description (name &optional readable)
|
|
|
|
|
"Insert before point a full description of abbrev table named NAME.
|
|
|
|
|
NAME is a symbol whose value is an abbrev table.
|
|
|
|
|
If optional 2nd arg READABLE is non-nil, a human-readable description
|
|
|
|
|
is inserted. Otherwise the description is an expression,
|
|
|
|
|
a call to `define-abbrev-table', which would
|
|
|
|
|
define the abbrev table NAME exactly as it is currently defined.
|
|
|
|
|
|
|
|
|
|
Abbrevs marked as \"system abbrevs\" are omitted."
|
|
|
|
|
(let ((table (symbol-value name))
|
|
|
|
|
(symbols ()))
|
|
|
|
|
(mapatoms (lambda (sym) (if (symbol-value sym) (push sym symbols))) table)
|
|
|
|
|
(setq symbols (sort symbols 'string-lessp))
|
|
|
|
|
(let ((standard-output (current-buffer)))
|
|
|
|
|
(if readable
|
|
|
|
|
(progn
|
|
|
|
|
(insert "(")
|
|
|
|
|
(prin1 name)
|
|
|
|
|
(insert ")\n\n")
|
|
|
|
|
(mapc 'abbrev--describe symbols)
|
|
|
|
|
(insert "\n\n"))
|
|
|
|
|
(insert "(define-abbrev-table '")
|
|
|
|
|
(prin1 name)
|
|
|
|
|
(insert " '(")
|
|
|
|
|
(mapc 'abbrev--write symbols)
|
|
|
|
|
(insert " ))\n\n"))
|
|
|
|
|
nil)))
|
|
|
|
|
|
2008-04-17 15:38:39 +00:00
|
|
|
|
(put 'define-abbrev-table 'doc-string-elt 3)
|
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".
2007-10-28 02:41:00 +00:00
|
|
|
|
(defun define-abbrev-table (tablename definitions
|
|
|
|
|
&optional docstring &rest props)
|
|
|
|
|
"Define TABLENAME (a symbol) as an abbrev table name.
|
|
|
|
|
Define abbrevs in it according to DEFINITIONS, which is a list of elements
|
2008-04-17 17:40:52 +00:00
|
|
|
|
of the form (ABBREVNAME EXPANSION ...) that are passed to `define-abbrev'.
|
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".
2007-10-28 02:41:00 +00:00
|
|
|
|
PROPS is a property list to apply to the table.
|
|
|
|
|
Properties with special meaning:
|
|
|
|
|
- `:parents' contains a list of abbrev tables from which this table inherits
|
|
|
|
|
abbreviations.
|
|
|
|
|
- `:case-fixed' non-nil means that abbreviations are looked up without
|
|
|
|
|
case-folding, and the expansion is not capitalized/upcased.
|
2007-11-04 23:01:15 +00:00
|
|
|
|
- `:regexp' describes the form of abbrevs. It defaults to \\=\\<\\(\\w+\\)\\W* which
|
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".
2007-10-28 02:41:00 +00:00
|
|
|
|
means that an abbrev can only be a single word. The submatch 1 is treated
|
|
|
|
|
as the potential name of an abbrev.
|
|
|
|
|
- `:enable-function' can be set to a function of no argument which returns
|
2008-05-08 03:35:38 +00:00
|
|
|
|
non-nil if and only if the abbrevs in this table should be used for this
|
|
|
|
|
instance of `expand-abbrev'."
|
2007-11-09 16:07:18 +00:00
|
|
|
|
;; We used to manually add the docstring, but we also want to record this
|
|
|
|
|
;; location as the definition of the variable (in load-history), so we may
|
|
|
|
|
;; as well just use `defvar'.
|
|
|
|
|
(eval `(defvar ,tablename nil ,@(if (stringp docstring) (list docstring))))
|
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".
2007-10-28 02:41:00 +00:00
|
|
|
|
(let ((table (if (boundp tablename) (symbol-value tablename))))
|
|
|
|
|
(unless table
|
2008-04-26 01:59:04 +00:00
|
|
|
|
(setq table (make-abbrev-table))
|
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".
2007-10-28 02:41:00 +00:00
|
|
|
|
(set tablename table)
|
|
|
|
|
(push tablename abbrev-table-name-list))
|
2008-04-26 01:59:04 +00:00
|
|
|
|
;; We used to just pass them to `make-abbrev-table', but that fails
|
|
|
|
|
;; if the table was pre-existing as is the case if it was created by
|
|
|
|
|
;; loading the user's abbrev file.
|
|
|
|
|
(while (consp props)
|
|
|
|
|
(abbrev-table-put table (pop props) (pop props)))
|
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".
2007-10-28 02:41:00 +00:00
|
|
|
|
(dolist (elt definitions)
|
|
|
|
|
(apply 'define-abbrev table elt))))
|
|
|
|
|
|
2008-04-17 19:54:00 +00:00
|
|
|
|
(defun abbrev-table-menu (table &optional prompt sortfun)
|
|
|
|
|
"Return a menu that shows all abbrevs in TABLE.
|
|
|
|
|
Selecting an entry runs `abbrev-insert'.
|
|
|
|
|
PROMPT is the prompt to use for the keymap.
|
|
|
|
|
SORTFUN is passed to `sort' to change the default ordering."
|
|
|
|
|
(unless sortfun (setq sortfun 'string-lessp))
|
|
|
|
|
(let ((entries ()))
|
|
|
|
|
(mapatoms (lambda (abbrev)
|
|
|
|
|
(when (symbol-value abbrev)
|
|
|
|
|
(let ((name (symbol-name abbrev)))
|
|
|
|
|
(push `(,(intern name) menu-item ,name
|
|
|
|
|
(lambda () (interactive)
|
|
|
|
|
(abbrev-insert ',abbrev)))
|
|
|
|
|
entries))))
|
|
|
|
|
table)
|
|
|
|
|
(nconc (make-sparse-keymap prompt)
|
|
|
|
|
(sort entries (lambda (x y)
|
|
|
|
|
(funcall sortfun (nth 2 x) (nth 2 y)))))))
|
|
|
|
|
|
2007-03-09 22:02:50 +00:00
|
|
|
|
(provide 'abbrev)
|
|
|
|
|
|
2006-04-26 05:16:01 +00:00
|
|
|
|
;; arch-tag: dbd6f3ae-dfe3-40ba-b00f-f9e3ff960df5
|
1992-05-30 23:54:21 +00:00
|
|
|
|
;;; abbrev.el ends here
|