Mercurial > emacs
annotate lisp/abbrev.el @ 87697:e0467846347e
2008-01-10 Tassilo Horn <tassilo@member.fsf.org>
* doc-view.el (doc-view-buffer-file-name): New variable.
(doc-view-convert-current-doc, doc-view-search)
(doc-view-current-cache-dir, doc-view-initiate-display)
(doc-view-mode): Use it.
(doc-view-bookmark-make-cell): Use variable buffer-file-name
instead of function.
author | Tassilo Horn <tassilo@member.fsf.org> |
---|---|
date | Thu, 10 Jan 2008 15:08:10 +0000 |
parents | 107ccd98fa12 |
children | 2957493cf354 606f2d163a64 |
rev | line source |
---|---|
662
8a533acedb77
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
411
diff
changeset
|
1 ;;; abbrev.el --- abbrev mode commands for Emacs |
411 | 2 |
74439 | 3 ;; Copyright (C) 1985, 1986, 1987, 1992, 2001, 2002, 2003, 2004, |
79721 | 4 ;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
807
diff
changeset
|
5 |
38697
a19197c6442f
Keyword added and FSF specified as Maintainer.
Pavel Janík <Pavel@Janik.cz>
parents:
33961
diff
changeset
|
6 ;; Maintainer: FSF |
22250
a77d473867b8
*** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents:
19307
diff
changeset
|
7 ;; Keywords: abbrev convenience |
2247
2c7997f249eb
Add or correct keywords
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
1329
diff
changeset
|
8 |
411 | 9 ;; This file is part of GNU Emacs. |
10 | |
11 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
12 ;; it under the terms of the GNU General Public License as published by | |
78236
9355f9b7bbff
Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents:
76421
diff
changeset
|
13 ;; the Free Software Foundation; either version 3, or (at your option) |
411 | 14 ;; any later version. |
15 | |
16 ;; GNU Emacs is distributed in the hope that it will be useful, | |
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
19 ;; GNU General Public License for more details. | |
20 | |
21 ;; You should have received a copy of the GNU General Public License | |
14169 | 22 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
64091 | 23 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
24 ;; Boston, MA 02110-1301, USA. | |
411 | 25 |
2307
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2247
diff
changeset
|
26 ;;; Commentary: |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2247
diff
changeset
|
27 |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2247
diff
changeset
|
28 ;; This facility is documented in the Emacs Manual. |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2247
diff
changeset
|
29 |
85710
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
30 ;; Todo: |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
31 |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
32 ;; - Make abbrev-file-name obey user-emacs-directory. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
33 ;; - Cleanup name space. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
34 |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
732
diff
changeset
|
35 ;;; Code: |
411 | 36 |
85710
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
37 (eval-when-compile (require 'cl)) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
38 |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
39 (defgroup abbrev-mode nil |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
40 "Word abbreviations mode." |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
41 :link '(custom-manual "(emacs)Abbrevs") |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
42 :group 'abbrev) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
43 |
42560
099200f97432
Remove unnecessary whitespaces.
Pavel Janík <Pavel@Janik.cz>
parents:
41142
diff
changeset
|
44 (defcustom only-global-abbrevs nil |
56576
ceca427e7f83
(only-global-abbrevs): Doc fix.
John Paul Wallington <jpw@pobox.com>
parents:
56078
diff
changeset
|
45 "Non-nil means user plans to use global abbrevs only. |
19307 | 46 This makes the commands that normally define mode-specific abbrevs |
47 define global abbrevs instead." | |
48 :type 'boolean | |
22250
a77d473867b8
*** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents:
19307
diff
changeset
|
49 :group 'abbrev-mode |
a77d473867b8
*** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents:
19307
diff
changeset
|
50 :group 'convenience) |
411 | 51 |
28822
1c03ffa9c07d
(abbrev-mode): Make ARG optional.
Gerd Moellmann <gerd@gnu.org>
parents:
28186
diff
changeset
|
52 (defun abbrev-mode (&optional arg) |
56078
bd7bc33213fd
(abbrev-mode, edit-abbrevs-map): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
54134
diff
changeset
|
53 "Toggle Abbrev mode in the current buffer. |
78492
7c8949dbfa0d
Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents:
78236
diff
changeset
|
54 With optional argument ARG, turn abbrev mode on if ARG is |
7c8949dbfa0d
Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents:
78236
diff
changeset
|
55 positive, otherwise turn it off. In Abbrev mode, inserting an |
7c8949dbfa0d
Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents:
78236
diff
changeset
|
56 abbreviation causes it to expand and be replaced by its expansion." |
411 | 57 (interactive "P") |
58 (setq abbrev-mode | |
59 (if (null arg) (not abbrev-mode) | |
60 (> (prefix-numeric-value arg) 0))) | |
11558
03792bb111ab
(abbrev-mode): Use force-mode-line-update.
Karl Heuer <kwzh@gnu.org>
parents:
9180
diff
changeset
|
61 (force-mode-line-update)) |
19307 | 62 |
63 (defcustom abbrev-mode nil | |
56078
bd7bc33213fd
(abbrev-mode, edit-abbrevs-map): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
54134
diff
changeset
|
64 "Enable or disable Abbrev mode. |
24596
5f4d21e85cf6
(abbrev-mode): Customizing sets the default value.
Richard M. Stallman <rms@gnu.org>
parents:
24550
diff
changeset
|
65 Non-nil means automatically expand abbrevs as they are inserted. |
5f4d21e85cf6
(abbrev-mode): Customizing sets the default value.
Richard M. Stallman <rms@gnu.org>
parents:
24550
diff
changeset
|
66 |
56078
bd7bc33213fd
(abbrev-mode, edit-abbrevs-map): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
54134
diff
changeset
|
67 Setting this variable with `setq' changes it for the current buffer. |
24596
5f4d21e85cf6
(abbrev-mode): Customizing sets the default value.
Richard M. Stallman <rms@gnu.org>
parents:
24550
diff
changeset
|
68 Changing it with \\[customize] sets the default value. |
56078
bd7bc33213fd
(abbrev-mode, edit-abbrevs-map): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
54134
diff
changeset
|
69 Interactively, use the command `abbrev-mode' |
bd7bc33213fd
(abbrev-mode, edit-abbrevs-map): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
54134
diff
changeset
|
70 to enable or disable Abbrev mode in the current buffer." |
19307 | 71 :type 'boolean |
72 :group 'abbrev-mode) | |
70268
8fb69c1e87e8
(abbrev-mode): Tighten the safety predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70216
diff
changeset
|
73 ;;;###autoload(put 'abbrev-mode 'safe-local-variable 'booleanp) |
19307 | 74 |
411 | 75 |
56576
ceca427e7f83
(only-global-abbrevs): Doc fix.
John Paul Wallington <jpw@pobox.com>
parents:
56078
diff
changeset
|
76 (defvar edit-abbrevs-map |
ceca427e7f83
(only-global-abbrevs): Doc fix.
John Paul Wallington <jpw@pobox.com>
parents:
56078
diff
changeset
|
77 (let ((map (make-sparse-keymap))) |
ceca427e7f83
(only-global-abbrevs): Doc fix.
John Paul Wallington <jpw@pobox.com>
parents:
56078
diff
changeset
|
78 (define-key map "\C-x\C-s" 'edit-abbrevs-redefine) |
ceca427e7f83
(only-global-abbrevs): Doc fix.
John Paul Wallington <jpw@pobox.com>
parents:
56078
diff
changeset
|
79 (define-key map "\C-c\C-c" 'edit-abbrevs-redefine) |
ceca427e7f83
(only-global-abbrevs): Doc fix.
John Paul Wallington <jpw@pobox.com>
parents:
56078
diff
changeset
|
80 map) |
56078
bd7bc33213fd
(abbrev-mode, edit-abbrevs-map): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
54134
diff
changeset
|
81 "Keymap used in `edit-abbrevs'.") |
411 | 82 |
83 (defun kill-all-abbrevs () | |
84 "Undefine all defined abbrevs." | |
85 (interactive) | |
86216
93c3f233e481
(kill-all-abbrevs, insert-abbrevs, prepare-abbrev-list-buffer): Use dolist.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86158
diff
changeset
|
86 (dolist (tablesym abbrev-table-name-list) |
93c3f233e481
(kill-all-abbrevs, insert-abbrevs, prepare-abbrev-list-buffer): Use dolist.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86158
diff
changeset
|
87 (clear-abbrev-table (symbol-value tablesym)))) |
411 | 88 |
47424
472a93499802
(copy-abbrev-table): New function.
Richard M. Stallman <rms@gnu.org>
parents:
42560
diff
changeset
|
89 (defun copy-abbrev-table (table) |
472a93499802
(copy-abbrev-table): New function.
Richard M. Stallman <rms@gnu.org>
parents:
42560
diff
changeset
|
90 "Make a new abbrev-table with the same abbrevs as TABLE." |
472a93499802
(copy-abbrev-table): New function.
Richard M. Stallman <rms@gnu.org>
parents:
42560
diff
changeset
|
91 (let ((new-table (make-abbrev-table))) |
472a93499802
(copy-abbrev-table): New function.
Richard M. Stallman <rms@gnu.org>
parents:
42560
diff
changeset
|
92 (mapatoms |
472a93499802
(copy-abbrev-table): New function.
Richard M. Stallman <rms@gnu.org>
parents:
42560
diff
changeset
|
93 (lambda (symbol) |
472a93499802
(copy-abbrev-table): New function.
Richard M. Stallman <rms@gnu.org>
parents:
42560
diff
changeset
|
94 (define-abbrev new-table |
472a93499802
(copy-abbrev-table): New function.
Richard M. Stallman <rms@gnu.org>
parents:
42560
diff
changeset
|
95 (symbol-name symbol) |
472a93499802
(copy-abbrev-table): New function.
Richard M. Stallman <rms@gnu.org>
parents:
42560
diff
changeset
|
96 (symbol-value symbol) |
472a93499802
(copy-abbrev-table): New function.
Richard M. Stallman <rms@gnu.org>
parents:
42560
diff
changeset
|
97 (symbol-function symbol))) |
472a93499802
(copy-abbrev-table): New function.
Richard M. Stallman <rms@gnu.org>
parents:
42560
diff
changeset
|
98 table) |
472a93499802
(copy-abbrev-table): New function.
Richard M. Stallman <rms@gnu.org>
parents:
42560
diff
changeset
|
99 new-table)) |
472a93499802
(copy-abbrev-table): New function.
Richard M. Stallman <rms@gnu.org>
parents:
42560
diff
changeset
|
100 |
411 | 101 (defun insert-abbrevs () |
102 "Insert after point a description of all defined abbrevs. | |
103 Mark is set after the inserted text." | |
104 (interactive) | |
105 (push-mark | |
106 (save-excursion | |
86216
93c3f233e481
(kill-all-abbrevs, insert-abbrevs, prepare-abbrev-list-buffer): Use dolist.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86158
diff
changeset
|
107 (dolist (tablesym abbrev-table-name-list) |
93c3f233e481
(kill-all-abbrevs, insert-abbrevs, prepare-abbrev-list-buffer): Use dolist.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86158
diff
changeset
|
108 (insert-abbrev-table-description tablesym t)) |
61744
f585c8c92ae1
(write-abbrev-file): Write table entries in alphabetical order
Eli Zaretskii <eliz@gnu.org>
parents:
61448
diff
changeset
|
109 (point)))) |
411 | 110 |
31230
200fc9dc31f4
(list-abbrevs): Add optional parameter LOCAL.
Gerd Moellmann <gerd@gnu.org>
parents:
28822
diff
changeset
|
111 (defun list-abbrevs (&optional local) |
200fc9dc31f4
(list-abbrevs): Add optional parameter LOCAL.
Gerd Moellmann <gerd@gnu.org>
parents:
28822
diff
changeset
|
112 "Display a list of defined abbrevs. |
200fc9dc31f4
(list-abbrevs): Add optional parameter LOCAL.
Gerd Moellmann <gerd@gnu.org>
parents:
28822
diff
changeset
|
113 If LOCAL is non-nil, interactively when invoked with a |
200fc9dc31f4
(list-abbrevs): Add optional parameter LOCAL.
Gerd Moellmann <gerd@gnu.org>
parents:
28822
diff
changeset
|
114 prefix arg, display only local, i.e. mode-specific, abbrevs. |
200fc9dc31f4
(list-abbrevs): Add optional parameter LOCAL.
Gerd Moellmann <gerd@gnu.org>
parents:
28822
diff
changeset
|
115 Otherwise display all abbrevs." |
200fc9dc31f4
(list-abbrevs): Add optional parameter LOCAL.
Gerd Moellmann <gerd@gnu.org>
parents:
28822
diff
changeset
|
116 (interactive "P") |
200fc9dc31f4
(list-abbrevs): Add optional parameter LOCAL.
Gerd Moellmann <gerd@gnu.org>
parents:
28822
diff
changeset
|
117 (display-buffer (prepare-abbrev-list-buffer local))) |
411 | 118 |
31230
200fc9dc31f4
(list-abbrevs): Add optional parameter LOCAL.
Gerd Moellmann <gerd@gnu.org>
parents:
28822
diff
changeset
|
119 (defun abbrev-table-name (table) |
200fc9dc31f4
(list-abbrevs): Add optional parameter LOCAL.
Gerd Moellmann <gerd@gnu.org>
parents:
28822
diff
changeset
|
120 "Value is the name of abbrev table TABLE." |
200fc9dc31f4
(list-abbrevs): Add optional parameter LOCAL.
Gerd Moellmann <gerd@gnu.org>
parents:
28822
diff
changeset
|
121 (let ((tables abbrev-table-name-list) |
200fc9dc31f4
(list-abbrevs): Add optional parameter LOCAL.
Gerd Moellmann <gerd@gnu.org>
parents:
28822
diff
changeset
|
122 found) |
200fc9dc31f4
(list-abbrevs): Add optional parameter LOCAL.
Gerd Moellmann <gerd@gnu.org>
parents:
28822
diff
changeset
|
123 (while (and (not found) tables) |
200fc9dc31f4
(list-abbrevs): Add optional parameter LOCAL.
Gerd Moellmann <gerd@gnu.org>
parents:
28822
diff
changeset
|
124 (when (eq (symbol-value (car tables)) table) |
200fc9dc31f4
(list-abbrevs): Add optional parameter LOCAL.
Gerd Moellmann <gerd@gnu.org>
parents:
28822
diff
changeset
|
125 (setq found (car tables))) |
200fc9dc31f4
(list-abbrevs): Add optional parameter LOCAL.
Gerd Moellmann <gerd@gnu.org>
parents:
28822
diff
changeset
|
126 (setq tables (cdr tables))) |
200fc9dc31f4
(list-abbrevs): Add optional parameter LOCAL.
Gerd Moellmann <gerd@gnu.org>
parents:
28822
diff
changeset
|
127 found)) |
42560
099200f97432
Remove unnecessary whitespaces.
Pavel Janík <Pavel@Janik.cz>
parents:
41142
diff
changeset
|
128 |
31230
200fc9dc31f4
(list-abbrevs): Add optional parameter LOCAL.
Gerd Moellmann <gerd@gnu.org>
parents:
28822
diff
changeset
|
129 (defun prepare-abbrev-list-buffer (&optional local) |
86216
93c3f233e481
(kill-all-abbrevs, insert-abbrevs, prepare-abbrev-list-buffer): Use dolist.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86158
diff
changeset
|
130 (with-current-buffer (get-buffer-create "*Abbrevs*") |
93c3f233e481
(kill-all-abbrevs, insert-abbrevs, prepare-abbrev-list-buffer): Use dolist.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86158
diff
changeset
|
131 (erase-buffer) |
93c3f233e481
(kill-all-abbrevs, insert-abbrevs, prepare-abbrev-list-buffer): Use dolist.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86158
diff
changeset
|
132 (if local |
93c3f233e481
(kill-all-abbrevs, insert-abbrevs, prepare-abbrev-list-buffer): Use dolist.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86158
diff
changeset
|
133 (insert-abbrev-table-description |
93c3f233e481
(kill-all-abbrevs, insert-abbrevs, prepare-abbrev-list-buffer): Use dolist.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86158
diff
changeset
|
134 (abbrev-table-name local-abbrev-table) t) |
93c3f233e481
(kill-all-abbrevs, insert-abbrevs, prepare-abbrev-list-buffer): Use dolist.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86158
diff
changeset
|
135 (dolist (table abbrev-table-name-list) |
93c3f233e481
(kill-all-abbrevs, insert-abbrevs, prepare-abbrev-list-buffer): Use dolist.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86158
diff
changeset
|
136 (insert-abbrev-table-description table t))) |
93c3f233e481
(kill-all-abbrevs, insert-abbrevs, prepare-abbrev-list-buffer): Use dolist.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86158
diff
changeset
|
137 (goto-char (point-min)) |
93c3f233e481
(kill-all-abbrevs, insert-abbrevs, prepare-abbrev-list-buffer): Use dolist.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86158
diff
changeset
|
138 (set-buffer-modified-p nil) |
93c3f233e481
(kill-all-abbrevs, insert-abbrevs, prepare-abbrev-list-buffer): Use dolist.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86158
diff
changeset
|
139 (edit-abbrevs-mode) |
93c3f233e481
(kill-all-abbrevs, insert-abbrevs, prepare-abbrev-list-buffer): Use dolist.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86158
diff
changeset
|
140 (current-buffer))) |
411 | 141 |
142 (defun edit-abbrevs-mode () | |
143 "Major mode for editing the list of abbrev definitions. | |
144 \\{edit-abbrevs-map}" | |
145 (interactive) | |
63371
6d35491e8a34
(edit-abbrevs-mode): Use kill-all-local-variables and run-mode-hooks.
Lute Kamstra <lute@gnu.org>
parents:
61744
diff
changeset
|
146 (kill-all-local-variables) |
411 | 147 (setq major-mode 'edit-abbrevs-mode) |
148 (setq mode-name "Edit-Abbrevs") | |
63371
6d35491e8a34
(edit-abbrevs-mode): Use kill-all-local-variables and run-mode-hooks.
Lute Kamstra <lute@gnu.org>
parents:
61744
diff
changeset
|
149 (use-local-map edit-abbrevs-map) |
6d35491e8a34
(edit-abbrevs-mode): Use kill-all-local-variables and run-mode-hooks.
Lute Kamstra <lute@gnu.org>
parents:
61744
diff
changeset
|
150 (run-mode-hooks 'edit-abbrevs-mode-hook)) |
411 | 151 |
152 (defun edit-abbrevs () | |
153 "Alter abbrev definitions by editing a list of them. | |
154 Selects a buffer containing a list of abbrev definitions. | |
155 You can edit them and type \\<edit-abbrevs-map>\\[edit-abbrevs-redefine] to redefine abbrevs | |
156 according to your editing. | |
157 Buffer contains a header line for each abbrev table, | |
158 which is the abbrev table name in parentheses. | |
159 This is followed by one line per abbrev in that table: | |
160 NAME USECOUNT EXPANSION HOOK | |
161 where NAME and EXPANSION are strings with quotes, | |
162 USECOUNT is an integer, and HOOK is any valid function | |
163 or may be omitted (it is usually omitted)." | |
164 (interactive) | |
165 (switch-to-buffer (prepare-abbrev-list-buffer))) | |
166 | |
167 (defun edit-abbrevs-redefine () | |
168 "Redefine abbrevs according to current buffer contents." | |
169 (interactive) | |
70091
4427f1e01f3e
(edit-abbrevs-redefine): Temporarily widen.
Richard M. Stallman <rms@gnu.org>
parents:
69818
diff
changeset
|
170 (save-restriction |
4427f1e01f3e
(edit-abbrevs-redefine): Temporarily widen.
Richard M. Stallman <rms@gnu.org>
parents:
69818
diff
changeset
|
171 (widen) |
4427f1e01f3e
(edit-abbrevs-redefine): Temporarily widen.
Richard M. Stallman <rms@gnu.org>
parents:
69818
diff
changeset
|
172 (define-abbrevs t) |
4427f1e01f3e
(edit-abbrevs-redefine): Temporarily widen.
Richard M. Stallman <rms@gnu.org>
parents:
69818
diff
changeset
|
173 (set-buffer-modified-p nil))) |
411 | 174 |
175 (defun define-abbrevs (&optional arg) | |
176 "Define abbrevs according to current visible buffer contents. | |
177 See documentation of `edit-abbrevs' for info on the format of the | |
178 text you must have in the buffer. | |
179 With argument, eliminate all abbrev definitions except | |
180 the ones defined from the buffer now." | |
181 (interactive "P") | |
182 (if arg (kill-all-abbrevs)) | |
183 (save-excursion | |
61744
f585c8c92ae1
(write-abbrev-file): Write table entries in alphabetical order
Eli Zaretskii <eliz@gnu.org>
parents:
61448
diff
changeset
|
184 (goto-char (point-min)) |
f585c8c92ae1
(write-abbrev-file): Write table entries in alphabetical order
Eli Zaretskii <eliz@gnu.org>
parents:
61448
diff
changeset
|
185 (while (and (not (eobp)) (re-search-forward "^(" nil t)) |
f585c8c92ae1
(write-abbrev-file): Write table entries in alphabetical order
Eli Zaretskii <eliz@gnu.org>
parents:
61448
diff
changeset
|
186 (let* ((buf (current-buffer)) |
f585c8c92ae1
(write-abbrev-file): Write table entries in alphabetical order
Eli Zaretskii <eliz@gnu.org>
parents:
61448
diff
changeset
|
187 (table (read buf)) |
f585c8c92ae1
(write-abbrev-file): Write table entries in alphabetical order
Eli Zaretskii <eliz@gnu.org>
parents:
61448
diff
changeset
|
188 abbrevs name hook exp count sys) |
f585c8c92ae1
(write-abbrev-file): Write table entries in alphabetical order
Eli Zaretskii <eliz@gnu.org>
parents:
61448
diff
changeset
|
189 (forward-line 1) |
f585c8c92ae1
(write-abbrev-file): Write table entries in alphabetical order
Eli Zaretskii <eliz@gnu.org>
parents:
61448
diff
changeset
|
190 (while (progn (forward-line 1) |
f585c8c92ae1
(write-abbrev-file): Write table entries in alphabetical order
Eli Zaretskii <eliz@gnu.org>
parents:
61448
diff
changeset
|
191 (not (eolp))) |
f585c8c92ae1
(write-abbrev-file): Write table entries in alphabetical order
Eli Zaretskii <eliz@gnu.org>
parents:
61448
diff
changeset
|
192 (setq name (read buf) count (read buf)) |
f585c8c92ae1
(write-abbrev-file): Write table entries in alphabetical order
Eli Zaretskii <eliz@gnu.org>
parents:
61448
diff
changeset
|
193 (if (equal count '(sys)) |
f585c8c92ae1
(write-abbrev-file): Write table entries in alphabetical order
Eli Zaretskii <eliz@gnu.org>
parents:
61448
diff
changeset
|
194 (setq sys t count (read buf))) |
f585c8c92ae1
(write-abbrev-file): Write table entries in alphabetical order
Eli Zaretskii <eliz@gnu.org>
parents:
61448
diff
changeset
|
195 (setq exp (read buf)) |
f585c8c92ae1
(write-abbrev-file): Write table entries in alphabetical order
Eli Zaretskii <eliz@gnu.org>
parents:
61448
diff
changeset
|
196 (skip-chars-backward " \t\n\f") |
f585c8c92ae1
(write-abbrev-file): Write table entries in alphabetical order
Eli Zaretskii <eliz@gnu.org>
parents:
61448
diff
changeset
|
197 (setq hook (if (not (eolp)) (read buf))) |
f585c8c92ae1
(write-abbrev-file): Write table entries in alphabetical order
Eli Zaretskii <eliz@gnu.org>
parents:
61448
diff
changeset
|
198 (skip-chars-backward " \t\n\f") |
f585c8c92ae1
(write-abbrev-file): Write table entries in alphabetical order
Eli Zaretskii <eliz@gnu.org>
parents:
61448
diff
changeset
|
199 (setq abbrevs (cons (list name exp hook count sys) abbrevs))) |
f585c8c92ae1
(write-abbrev-file): Write table entries in alphabetical order
Eli Zaretskii <eliz@gnu.org>
parents:
61448
diff
changeset
|
200 (define-abbrev-table table abbrevs))))) |
411 | 201 |
202 (defun read-abbrev-file (&optional file quietly) | |
203 "Read abbrev definitions from file written with `write-abbrev-file'. | |
204 Optional argument FILE is the name of the file to read; | |
205 it defaults to the value of `abbrev-file-name'. | |
40904
0f074a905ca2
(read-abbrev-file): Don't set save-abbrevs.
Richard M. Stallman <rms@gnu.org>
parents:
38697
diff
changeset
|
206 Optional second argument QUIETLY non-nil means don't display a message." |
70091
4427f1e01f3e
(edit-abbrevs-redefine): Temporarily widen.
Richard M. Stallman <rms@gnu.org>
parents:
69818
diff
changeset
|
207 (interactive |
4427f1e01f3e
(edit-abbrevs-redefine): Temporarily widen.
Richard M. Stallman <rms@gnu.org>
parents:
69818
diff
changeset
|
208 (list |
4427f1e01f3e
(edit-abbrevs-redefine): Temporarily widen.
Richard M. Stallman <rms@gnu.org>
parents:
69818
diff
changeset
|
209 (read-file-name (format "Read abbrev file (default %s): " |
4427f1e01f3e
(edit-abbrevs-redefine): Temporarily widen.
Richard M. Stallman <rms@gnu.org>
parents:
69818
diff
changeset
|
210 abbrev-file-name) |
4427f1e01f3e
(edit-abbrevs-redefine): Temporarily widen.
Richard M. Stallman <rms@gnu.org>
parents:
69818
diff
changeset
|
211 nil abbrev-file-name t))) |
70102
2ae2af972533
(read-abbrev-file): Use abbrev-file-name if optional
Reiner Steib <Reiner.Steib@gmx.de>
parents:
70091
diff
changeset
|
212 (load (or file abbrev-file-name) nil quietly) |
40904
0f074a905ca2
(read-abbrev-file): Don't set save-abbrevs.
Richard M. Stallman <rms@gnu.org>
parents:
38697
diff
changeset
|
213 (setq abbrevs-changed nil)) |
411 | 214 |
215 (defun quietly-read-abbrev-file (&optional file) | |
56576
ceca427e7f83
(only-global-abbrevs): Doc fix.
John Paul Wallington <jpw@pobox.com>
parents:
56078
diff
changeset
|
216 "Read abbrev definitions from file written with `write-abbrev-file'. |
411 | 217 Optional argument FILE is the name of the file to read; |
218 it defaults to the value of `abbrev-file-name'. | |
40904
0f074a905ca2
(read-abbrev-file): Don't set save-abbrevs.
Richard M. Stallman <rms@gnu.org>
parents:
38697
diff
changeset
|
219 Does not display any message." |
61744
f585c8c92ae1
(write-abbrev-file): Write table entries in alphabetical order
Eli Zaretskii <eliz@gnu.org>
parents:
61448
diff
changeset
|
220 ;(interactive "fRead abbrev file: ") |
411 | 221 (read-abbrev-file file t)) |
222 | |
54134
16aaa8fe949d
(write-abbrev-file): Make argument optional. Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
223 (defun write-abbrev-file (&optional file) |
16aaa8fe949d
(write-abbrev-file): Make argument optional. Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
224 "Write all user-level abbrev definitions to a file of Lisp code. |
16aaa8fe949d
(write-abbrev-file): Make argument optional. Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
225 This does not include system abbrevs; it includes only the abbrev tables |
16aaa8fe949d
(write-abbrev-file): Make argument optional. Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
226 listed in listed in `abbrev-table-name-list'. |
411 | 227 The file written can be loaded in another session to define the same abbrevs. |
54134
16aaa8fe949d
(write-abbrev-file): Make argument optional. Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
228 The argument FILE is the file name to write. If omitted or nil, the file |
16aaa8fe949d
(write-abbrev-file): Make argument optional. Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
229 specified in `abbrev-file-name' is used." |
411 | 230 (interactive |
231 (list | |
232 (read-file-name "Write abbrev file: " | |
233 (file-name-directory (expand-file-name abbrev-file-name)) | |
234 abbrev-file-name))) | |
235 (or (and file (> (length file) 0)) | |
236 (setq file abbrev-file-name)) | |
49405
7c5f68b0dbd3
(write-abbrev-file): Simplify, and put a coding cookie
Dave Love <fx@gnu.org>
parents:
47654
diff
changeset
|
237 (let ((coding-system-for-write 'emacs-mule)) |
7c5f68b0dbd3
(write-abbrev-file): Simplify, and put a coding cookie
Dave Love <fx@gnu.org>
parents:
47654
diff
changeset
|
238 (with-temp-file file |
7c5f68b0dbd3
(write-abbrev-file): Simplify, and put a coding cookie
Dave Love <fx@gnu.org>
parents:
47654
diff
changeset
|
239 (insert ";;-*-coding: emacs-mule;-*-\n") |
61744
f585c8c92ae1
(write-abbrev-file): Write table entries in alphabetical order
Eli Zaretskii <eliz@gnu.org>
parents:
61448
diff
changeset
|
240 (dolist (table |
f585c8c92ae1
(write-abbrev-file): Write table entries in alphabetical order
Eli Zaretskii <eliz@gnu.org>
parents:
61448
diff
changeset
|
241 ;; We sort the table in order to ease the automatic |
f585c8c92ae1
(write-abbrev-file): Write table entries in alphabetical order
Eli Zaretskii <eliz@gnu.org>
parents:
61448
diff
changeset
|
242 ;; merging of different versions of the user's abbrevs |
f585c8c92ae1
(write-abbrev-file): Write table entries in alphabetical order
Eli Zaretskii <eliz@gnu.org>
parents:
61448
diff
changeset
|
243 ;; file. This is useful, for example, for when the |
f585c8c92ae1
(write-abbrev-file): Write table entries in alphabetical order
Eli Zaretskii <eliz@gnu.org>
parents:
61448
diff
changeset
|
244 ;; user keeps their home directory in a revision |
f585c8c92ae1
(write-abbrev-file): Write table entries in alphabetical order
Eli Zaretskii <eliz@gnu.org>
parents:
61448
diff
changeset
|
245 ;; control system, and is therefore keeping multiple |
f585c8c92ae1
(write-abbrev-file): Write table entries in alphabetical order
Eli Zaretskii <eliz@gnu.org>
parents:
61448
diff
changeset
|
246 ;; slightly-differing copies loosely synchronized. |
f585c8c92ae1
(write-abbrev-file): Write table entries in alphabetical order
Eli Zaretskii <eliz@gnu.org>
parents:
61448
diff
changeset
|
247 (sort (copy-sequence abbrev-table-name-list) |
f585c8c92ae1
(write-abbrev-file): Write table entries in alphabetical order
Eli Zaretskii <eliz@gnu.org>
parents:
61448
diff
changeset
|
248 (lambda (s1 s2) |
f585c8c92ae1
(write-abbrev-file): Write table entries in alphabetical order
Eli Zaretskii <eliz@gnu.org>
parents:
61448
diff
changeset
|
249 (string< (symbol-name s1) |
f585c8c92ae1
(write-abbrev-file): Write table entries in alphabetical order
Eli Zaretskii <eliz@gnu.org>
parents:
61448
diff
changeset
|
250 (symbol-name s2))))) |
49405
7c5f68b0dbd3
(write-abbrev-file): Simplify, and put a coding cookie
Dave Love <fx@gnu.org>
parents:
47654
diff
changeset
|
251 (insert-abbrev-table-description table nil))))) |
411 | 252 |
253 (defun add-mode-abbrev (arg) | |
254 "Define mode-specific abbrev for last word(s) before point. | |
255 Argument is how many words before point form the expansion; | |
256 or zero means the region is the expansion. | |
257 A negative argument means to undefine the specified abbrev. | |
258 Reads the abbreviation in the minibuffer. | |
259 | |
260 Don't use this function in a Lisp program; use `define-abbrev' instead." | |
261 (interactive "p") | |
262 (add-abbrev | |
263 (if only-global-abbrevs | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49405
diff
changeset
|
264 global-abbrev-table |
411 | 265 (or local-abbrev-table |
266 (error "No per-mode abbrev table"))) | |
267 "Mode" arg)) | |
268 | |
269 (defun add-global-abbrev (arg) | |
270 "Define global (all modes) abbrev for last word(s) before point. | |
271 The prefix argument specifies the number of words before point that form the | |
272 expansion; or zero means the region is the expansion. | |
273 A negative argument means to undefine the specified abbrev. | |
274 This command uses the minibuffer to read the abbreviation. | |
275 | |
276 Don't use this function in a Lisp program; use `define-abbrev' instead." | |
277 (interactive "p") | |
278 (add-abbrev global-abbrev-table "Global" arg)) | |
279 | |
280 (defun add-abbrev (table type arg) | |
281 (let ((exp (and (>= arg 0) | |
26079
bc18b027a049
(add-abbrev, inverse-add-abbrev, expand-region-abbrevs): Remove
Dave Love <fx@gnu.org>
parents:
24596
diff
changeset
|
282 (buffer-substring-no-properties |
411 | 283 (point) |
284 (if (= arg 0) (mark) | |
285 (save-excursion (forward-word (- arg)) (point)))))) | |
286 name) | |
287 (setq name | |
288 (read-string (format (if exp "%s abbrev for \"%s\": " | |
289 "Undefine %s abbrev: ") | |
290 type exp))) | |
9180
569ed1f55710
(add-abbrev, inverse-add-abbrev):
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
291 (set-text-properties 0 (length name) nil name) |
411 | 292 (if (or (null exp) |
293 (not (abbrev-expansion name table)) | |
294 (y-or-n-p (format "%s expands to \"%s\"; redefine? " | |
295 name (abbrev-expansion name table)))) | |
296 (define-abbrev table (downcase name) exp)))) | |
42560
099200f97432
Remove unnecessary whitespaces.
Pavel Janík <Pavel@Janik.cz>
parents:
41142
diff
changeset
|
297 |
64525
83ccf4fe94c3
(expand-region-abbrevs): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64091
diff
changeset
|
298 (defun inverse-add-mode-abbrev (n) |
411 | 299 "Define last word before point as a mode-specific abbrev. |
300 With prefix argument N, defines the Nth word before point. | |
301 This command uses the minibuffer to read the expansion. | |
302 Expands the abbreviation after defining it." | |
303 (interactive "p") | |
304 (inverse-add-abbrev | |
305 (if only-global-abbrevs | |
42560
099200f97432
Remove unnecessary whitespaces.
Pavel Janík <Pavel@Janik.cz>
parents:
41142
diff
changeset
|
306 global-abbrev-table |
411 | 307 (or local-abbrev-table |
308 (error "No per-mode abbrev table"))) | |
64525
83ccf4fe94c3
(expand-region-abbrevs): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64091
diff
changeset
|
309 "Mode" n)) |
411 | 310 |
64525
83ccf4fe94c3
(expand-region-abbrevs): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64091
diff
changeset
|
311 (defun inverse-add-global-abbrev (n) |
411 | 312 "Define last word before point as a global (mode-independent) abbrev. |
313 With prefix argument N, defines the Nth word before point. | |
314 This command uses the minibuffer to read the expansion. | |
315 Expands the abbreviation after defining it." | |
316 (interactive "p") | |
64525
83ccf4fe94c3
(expand-region-abbrevs): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64091
diff
changeset
|
317 (inverse-add-abbrev global-abbrev-table "Global" n)) |
411 | 318 |
319 (defun inverse-add-abbrev (table type arg) | |
28186
a552a942b327
(inverse-add-abbrev): Identify word by first moving
Gerd Moellmann <gerd@gnu.org>
parents:
26079
diff
changeset
|
320 (let (name exp start end) |
411 | 321 (save-excursion |
28186
a552a942b327
(inverse-add-abbrev): Identify word by first moving
Gerd Moellmann <gerd@gnu.org>
parents:
26079
diff
changeset
|
322 (forward-word (1+ (- arg))) |
a552a942b327
(inverse-add-abbrev): Identify word by first moving
Gerd Moellmann <gerd@gnu.org>
parents:
26079
diff
changeset
|
323 (setq end (point)) |
a552a942b327
(inverse-add-abbrev): Identify word by first moving
Gerd Moellmann <gerd@gnu.org>
parents:
26079
diff
changeset
|
324 (backward-word 1) |
a552a942b327
(inverse-add-abbrev): Identify word by first moving
Gerd Moellmann <gerd@gnu.org>
parents:
26079
diff
changeset
|
325 (setq start (point) |
a552a942b327
(inverse-add-abbrev): Identify word by first moving
Gerd Moellmann <gerd@gnu.org>
parents:
26079
diff
changeset
|
326 name (buffer-substring-no-properties start end))) |
a552a942b327
(inverse-add-abbrev): Identify word by first moving
Gerd Moellmann <gerd@gnu.org>
parents:
26079
diff
changeset
|
327 |
a552a942b327
(inverse-add-abbrev): Identify word by first moving
Gerd Moellmann <gerd@gnu.org>
parents:
26079
diff
changeset
|
328 (setq exp (read-string (format "%s expansion for \"%s\": " type name) |
a552a942b327
(inverse-add-abbrev): Identify word by first moving
Gerd Moellmann <gerd@gnu.org>
parents:
26079
diff
changeset
|
329 nil nil nil t)) |
a552a942b327
(inverse-add-abbrev): Identify word by first moving
Gerd Moellmann <gerd@gnu.org>
parents:
26079
diff
changeset
|
330 (when (or (not (abbrev-expansion name table)) |
a552a942b327
(inverse-add-abbrev): Identify word by first moving
Gerd Moellmann <gerd@gnu.org>
parents:
26079
diff
changeset
|
331 (y-or-n-p (format "%s expands to \"%s\"; redefine? " |
a552a942b327
(inverse-add-abbrev): Identify word by first moving
Gerd Moellmann <gerd@gnu.org>
parents:
26079
diff
changeset
|
332 name (abbrev-expansion name table)))) |
a552a942b327
(inverse-add-abbrev): Identify word by first moving
Gerd Moellmann <gerd@gnu.org>
parents:
26079
diff
changeset
|
333 (define-abbrev table (downcase name) exp) |
a552a942b327
(inverse-add-abbrev): Identify word by first moving
Gerd Moellmann <gerd@gnu.org>
parents:
26079
diff
changeset
|
334 (save-excursion |
a552a942b327
(inverse-add-abbrev): Identify word by first moving
Gerd Moellmann <gerd@gnu.org>
parents:
26079
diff
changeset
|
335 (goto-char end) |
a552a942b327
(inverse-add-abbrev): Identify word by first moving
Gerd Moellmann <gerd@gnu.org>
parents:
26079
diff
changeset
|
336 (expand-abbrev))))) |
411 | 337 |
338 (defun abbrev-prefix-mark (&optional arg) | |
339 "Mark current point as the beginning of an abbrev. | |
340 Abbrev to be expanded starts here rather than at beginning of word. | |
341 This way, you can expand an abbrev with a prefix: insert the prefix, | |
54134
16aaa8fe949d
(write-abbrev-file): Make argument optional. Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
342 use this command, then insert the abbrev. This command inserts a |
16aaa8fe949d
(write-abbrev-file): Make argument optional. Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
343 temporary hyphen after the prefix \(until the intended abbrev |
16aaa8fe949d
(write-abbrev-file): Make argument optional. Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
344 expansion occurs). |
16aaa8fe949d
(write-abbrev-file): Make argument optional. Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
345 If the prefix is itself an abbrev, this command expands it, unless |
16aaa8fe949d
(write-abbrev-file): Make argument optional. Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
346 ARG is non-nil. Interactively, ARG is the prefix argument." |
411 | 347 (interactive "P") |
348 (or arg (expand-abbrev)) | |
349 (setq abbrev-start-location (point-marker) | |
350 abbrev-start-location-buffer (current-buffer)) | |
351 (insert "-")) | |
352 | |
353 (defun expand-region-abbrevs (start end &optional noquery) | |
354 "For abbrev occurrence in the region, offer to expand it. | |
64525
83ccf4fe94c3
(expand-region-abbrevs): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64091
diff
changeset
|
355 The user is asked to type `y' or `n' for each occurrence. |
83ccf4fe94c3
(expand-region-abbrevs): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64091
diff
changeset
|
356 A prefix argument means don't query; expand all abbrevs." |
411 | 357 (interactive "r\nP") |
358 (save-excursion | |
359 (goto-char start) | |
360 (let ((lim (- (point-max) end)) | |
361 pnt string) | |
362 (while (and (not (eobp)) | |
363 (progn (forward-word 1) | |
364 (<= (setq pnt (point)) (- (point-max) lim)))) | |
365 (if (abbrev-expansion | |
366 (setq string | |
26079
bc18b027a049
(add-abbrev, inverse-add-abbrev, expand-region-abbrevs): Remove
Dave Love <fx@gnu.org>
parents:
24596
diff
changeset
|
367 (buffer-substring-no-properties |
411 | 368 (save-excursion (forward-word -1) (point)) |
369 pnt))) | |
370 (if (or noquery (y-or-n-p (format "Expand `%s'? " string))) | |
371 (expand-abbrev))))))) | |
662
8a533acedb77
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
411
diff
changeset
|
372 |
85710
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
373 ;;; Abbrev properties. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
374 |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
375 (defun abbrev-table-get (table prop) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
376 "Get the PROP property of abbrev table TABLE." |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
377 (let ((sym (intern-soft "" table))) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
378 (if sym (get sym prop)))) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
379 |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
380 (defun abbrev-table-put (table prop val) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
381 "Set the PROP property of abbrev table TABLE to VAL." |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
382 (let ((sym (intern "" table))) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
383 (set sym nil) ; Make sure it won't be confused for an abbrev. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
384 (put sym prop val))) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
385 |
85773
13ae285f009a
Rename `count' and `system-flag' to :count and :system. Update all users.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85710
diff
changeset
|
386 (defalias 'abbrev-get 'get |
13ae285f009a
Rename `count' and `system-flag' to :count and :system. Update all users.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85710
diff
changeset
|
387 "Get the property PROP of abbrev ABBREV |
13ae285f009a
Rename `count' and `system-flag' to :count and :system. Update all users.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85710
diff
changeset
|
388 |
13ae285f009a
Rename `count' and `system-flag' to :count and :system. Update all users.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85710
diff
changeset
|
389 \(fn ABBREV PROP)") |
85710
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
390 |
85773
13ae285f009a
Rename `count' and `system-flag' to :count and :system. Update all users.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85710
diff
changeset
|
391 (defalias 'abbrev-put 'put |
13ae285f009a
Rename `count' and `system-flag' to :count and :system. Update all users.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85710
diff
changeset
|
392 "Set the property PROP of abbrev ABREV to value VAL. |
13ae285f009a
Rename `count' and `system-flag' to :count and :system. Update all users.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85710
diff
changeset
|
393 See `define-abbrev' for the effect of some special properties. |
13ae285f009a
Rename `count' and `system-flag' to :count and :system. Update all users.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85710
diff
changeset
|
394 |
13ae285f009a
Rename `count' and `system-flag' to :count and :system. Update all users.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85710
diff
changeset
|
395 \(fn ABBREV PROP VAL)") |
85710
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
396 |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
397 (defmacro abbrev-with-wrapper-hook (var &rest body) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
398 "Run BODY wrapped with the VAR hook. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
399 VAR is a special hook: its functions are called with one argument which |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
400 is the \"original\" code (the BODY), so the hook function can wrap the |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
401 original function, can call it several times, or even not call it at all. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
402 VAR is normally a symbol (a variable) in which case it is treated like a hook, |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
403 with a buffer-local and a global part. But it can also be an arbitrary expression. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
404 This is similar to an `around' advice." |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
405 (declare (indent 1) (debug t)) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
406 ;; We need those two gensyms because CL's lexical scoping is not available |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
407 ;; for function arguments :-( |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
408 (let ((funs (make-symbol "funs")) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
409 (global (make-symbol "global"))) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
410 ;; Since the hook is a wrapper, the loop has to be done via |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
411 ;; recursion: a given hook function will call its parameter in order to |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
412 ;; continue looping. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
413 `(labels ((runrestofhook (,funs ,global) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
414 ;; `funs' holds the functions left on the hook and `global' |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
415 ;; holds the functions left on the global part of the hook |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
416 ;; (in case the hook is local). |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
417 (lexical-let ((funs ,funs) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
418 (global ,global)) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
419 (if (consp funs) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
420 (if (eq t (car funs)) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
421 (runrestofhook (append global (cdr funs)) nil) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
422 (funcall (car funs) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
423 (lambda () (runrestofhook (cdr funs) global)))) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
424 ;; Once there are no more functions on the hook, run |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
425 ;; the original body. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
426 ,@body)))) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
427 (runrestofhook ,var |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
428 ;; The global part of the hook, if any. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
429 ,(if (symbolp var) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
430 `(if (local-variable-p ',var) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
431 (default-value ',var))))))) |
85923
a6bcf6e8ed42
(define-abbrev-table): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
85920
diff
changeset
|
432 |
85710
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
433 |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
434 ;;; Code that used to be implemented in src/abbrev.c |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
435 |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
436 (defvar abbrev-table-name-list '(fundamental-mode-abbrev-table |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
437 global-abbrev-table) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
438 "List of symbols whose values are abbrev tables.") |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
439 |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
440 (defun make-abbrev-table (&optional props) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
441 "Create a new, empty abbrev table object. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
442 PROPS is a " |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
443 ;; The value 59 is an arbitrary prime number. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
444 (let ((table (make-vector 59 0))) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
445 ;; Each abbrev-table has a `modiff' counter which can be used to detect |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
446 ;; when an abbreviation was added. An example of use would be to |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
447 ;; construct :regexp dynamically as the union of all abbrev names, so |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
448 ;; `modiff' can let us detect that an abbrev was added and hence :regexp |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
449 ;; needs to be refreshed. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
450 ;; The presence of `modiff' entry is also used as a tag indicating this |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
451 ;; vector is really an abbrev-table. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
452 (abbrev-table-put table :abbrev-table-modiff 0) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
453 (while (consp props) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
454 (abbrev-table-put table (pop props) (pop props))) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
455 table)) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
456 |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
457 (defun abbrev-table-p (object) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
458 (and (vectorp object) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
459 (numberp (abbrev-table-get object :abbrev-table-modiff)))) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
460 |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
461 (defvar global-abbrev-table (make-abbrev-table) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
462 "The abbrev table whose abbrevs affect all buffers. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
463 Each buffer may also have a local abbrev table. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
464 If it does, the local table overrides the global one |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
465 for any particular abbrev defined in both.") |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
466 |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
467 (defvar abbrev-minor-mode-table-alist nil |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
468 "Alist of abbrev tables to use for minor modes. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
469 Each element looks like (VARIABLE . ABBREV-TABLE); |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
470 ABBREV-TABLE is active whenever VARIABLE's value is non-nil.") |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
471 |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
472 (defvar fundamental-mode-abbrev-table |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
473 (let ((table (make-abbrev-table))) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
474 ;; Set local-abbrev-table's default to be fundamental-mode-abbrev-table. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
475 (setq-default local-abbrev-table table) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
476 table) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
477 "The abbrev table of mode-specific abbrevs for Fundamental Mode.") |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
478 |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
479 (defvar abbrevs-changed nil |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
480 "Set non-nil by defining or altering any word abbrevs. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
481 This causes `save-some-buffers' to offer to save the abbrevs.") |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
482 |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
483 (defcustom abbrev-all-caps nil |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
484 "Non-nil means expand multi-word abbrevs all caps if abbrev was so." |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
485 :type 'boolean |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
486 :group 'abbrev-mode) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
487 |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
488 (defvar abbrev-start-location nil |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
489 "Buffer position for `expand-abbrev' to use as the start of the abbrev. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
490 When nil, use the word before point as the abbrev. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
491 Calling `expand-abbrev' sets this to nil.") |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
492 |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
493 (defvar abbrev-start-location-buffer nil |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
494 "Buffer that `abbrev-start-location' has been set for. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
495 Trying to expand an abbrev in any other buffer clears `abbrev-start-location'.") |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
496 |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
497 (defvar last-abbrev nil |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
498 "The abbrev-symbol of the last abbrev expanded. See `abbrev-symbol'.") |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
499 |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
500 (defvar last-abbrev-text nil |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
501 "The exact text of the last abbrev expanded. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
502 nil if the abbrev has already been unexpanded.") |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
503 |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
504 (defvar last-abbrev-location 0 |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
505 "The location of the start of the last abbrev expanded.") |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
506 |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
507 ;; (defvar local-abbrev-table fundamental-mode-abbrev-table |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
508 ;; "Local (mode-specific) abbrev table of current buffer.") |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
509 ;; (make-variable-buffer-local 'local-abbrev-table) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
510 |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
511 (defcustom pre-abbrev-expand-hook nil |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
512 "Function or functions to be called before abbrev expansion is done. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
513 This is the first thing that `expand-abbrev' does, and so this may change |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
514 the current abbrev table before abbrev lookup happens." |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
515 :type 'hook |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
516 :group 'abbrev-mode) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
517 (make-obsolete-variable 'pre-abbrev-expand-hook 'abbrev-expand-functions "23.1") |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
518 |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
519 (defun clear-abbrev-table (table) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
520 "Undefine all abbrevs in abbrev table TABLE, leaving it empty." |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
521 (setq abbrevs-changed t) |
86216
93c3f233e481
(kill-all-abbrevs, insert-abbrevs, prepare-abbrev-list-buffer): Use dolist.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86158
diff
changeset
|
522 (let* ((sym (intern-soft "" table))) |
93c3f233e481
(kill-all-abbrevs, insert-abbrevs, prepare-abbrev-list-buffer): Use dolist.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86158
diff
changeset
|
523 (dotimes (i (length table)) |
93c3f233e481
(kill-all-abbrevs, insert-abbrevs, prepare-abbrev-list-buffer): Use dolist.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86158
diff
changeset
|
524 (aset table i 0)) |
93c3f233e481
(kill-all-abbrevs, insert-abbrevs, prepare-abbrev-list-buffer): Use dolist.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86158
diff
changeset
|
525 ;; Preserve the table's properties. |
93c3f233e481
(kill-all-abbrevs, insert-abbrevs, prepare-abbrev-list-buffer): Use dolist.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86158
diff
changeset
|
526 (assert sym) |
93c3f233e481
(kill-all-abbrevs, insert-abbrevs, prepare-abbrev-list-buffer): Use dolist.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86158
diff
changeset
|
527 (intern sym table) |
93c3f233e481
(kill-all-abbrevs, insert-abbrevs, prepare-abbrev-list-buffer): Use dolist.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86158
diff
changeset
|
528 (abbrev-table-put table :abbrev-table-modiff |
93c3f233e481
(kill-all-abbrevs, insert-abbrevs, prepare-abbrev-list-buffer): Use dolist.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86158
diff
changeset
|
529 (1+ (abbrev-table-get table :abbrev-table-modiff))))) |
85710
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
530 |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
531 (defun define-abbrev (table name expansion &optional hook &rest props) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
532 "Define an abbrev in TABLE named NAME, to expand to EXPANSION and call HOOK. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
533 NAME must be a string, and should be lower-case. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
534 EXPANSION should usually be a string. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
535 To undefine an abbrev, define it with EXPANSION = nil. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
536 If HOOK is non-nil, it should be a function of no arguments; |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
537 it is called after EXPANSION is inserted. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
538 If EXPANSION is not a string, the abbrev is a special one, |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
539 which does not expand in the usual way but only runs HOOK. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
540 |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
541 PROPS is a property list. The following properties are special: |
85773
13ae285f009a
Rename `count' and `system-flag' to :count and :system. Update all users.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85710
diff
changeset
|
542 - `:count': the value for the abbrev's usage-count, which is incremented each time |
85710
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
543 the abbrev is used (the default is zero). |
85773
13ae285f009a
Rename `count' and `system-flag' to :count and :system. Update all users.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85710
diff
changeset
|
544 - `:system': if non-nil, says that this is a \"system\" abbreviation |
85710
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
545 which should not be saved in the user's abbreviation file. |
85773
13ae285f009a
Rename `count' and `system-flag' to :count and :system. Update all users.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85710
diff
changeset
|
546 Unless `:system' is `force', a system abbreviation will not |
85710
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
547 overwrite a non-system abbreviation of the same name. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
548 - `:case-fixed': non-nil means that abbreviations are looked up without |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
549 case-folding, and the expansion is not capitalized/upcased. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
550 - `:enable-function': a function of no argument which returns non-nil iff the |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
551 abbrev should be used for a particular call of `expand-abbrev'. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
552 |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
553 An obsolete but still supported calling form is: |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
554 |
85773
13ae285f009a
Rename `count' and `system-flag' to :count and :system. Update all users.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85710
diff
changeset
|
555 \(define-abbrev TABLE NAME EXPANSION &optional HOOK COUNT SYSTEM)." |
85710
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
556 (when (and (consp props) (or (null (car props)) (numberp (car props)))) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
557 ;; Old-style calling convention. |
85773
13ae285f009a
Rename `count' and `system-flag' to :count and :system. Update all users.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85710
diff
changeset
|
558 (setq props (list* :count (car props) |
13ae285f009a
Rename `count' and `system-flag' to :count and :system. Update all users.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85710
diff
changeset
|
559 (if (cadr props) (list :system (cadr props)))))) |
13ae285f009a
Rename `count' and `system-flag' to :count and :system. Update all users.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85710
diff
changeset
|
560 (unless (plist-get props :count) |
13ae285f009a
Rename `count' and `system-flag' to :count and :system. Update all users.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85710
diff
changeset
|
561 (setq props (plist-put props :count 0))) |
13ae285f009a
Rename `count' and `system-flag' to :count and :system. Update all users.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85710
diff
changeset
|
562 (let ((system-flag (plist-get props :system)) |
85710
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
563 (sym (intern name table))) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
564 ;; Don't override a prior user-defined abbrev with a system abbrev, |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
565 ;; unless system-flag is `force'. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
566 (unless (and (not (memq system-flag '(nil force))) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
567 (boundp sym) (symbol-value sym) |
85773
13ae285f009a
Rename `count' and `system-flag' to :count and :system. Update all users.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85710
diff
changeset
|
568 (not (abbrev-get sym :system))) |
85710
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
569 (unless (or system-flag |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
570 (and (boundp sym) (fboundp sym) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
571 ;; load-file-name |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
572 (equal (symbol-value sym) expansion) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
573 (equal (symbol-function sym) hook))) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
574 (setq abbrevs-changed t)) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
575 (set sym expansion) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
576 (fset sym hook) |
85773
13ae285f009a
Rename `count' and `system-flag' to :count and :system. Update all users.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85710
diff
changeset
|
577 (setplist sym |
13ae285f009a
Rename `count' and `system-flag' to :count and :system. Update all users.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85710
diff
changeset
|
578 ;; Don't store the `force' value of `system-flag' into |
13ae285f009a
Rename `count' and `system-flag' to :count and :system. Update all users.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85710
diff
changeset
|
579 ;; the :system property. |
13ae285f009a
Rename `count' and `system-flag' to :count and :system. Update all users.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85710
diff
changeset
|
580 (if (eq 'force system-flag) (plist-put props :system t) props)) |
85710
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
581 (abbrev-table-put table :abbrev-table-modiff |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
582 (1+ (abbrev-table-get table :abbrev-table-modiff)))) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
583 name)) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
584 |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
585 (defun abbrev--check-chars (abbrev global) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
586 "Check if the characters in ABBREV have word syntax in either the |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
587 current (if global is nil) or standard syntax table." |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
588 (with-syntax-table |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
589 (cond ((null global) (standard-syntax-table)) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
590 ;; ((syntax-table-p global) global) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
591 (t (syntax-table))) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
592 (when (string-match "\\W" abbrev) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
593 (let ((badchars ()) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
594 (pos 0)) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
595 (while (string-match "\\W" abbrev pos) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
596 (pushnew (aref abbrev (match-beginning 0)) badchars) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
597 (setq pos (1+ pos))) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
598 (error "Some abbrev characters (%s) are not word constituents %s" |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
599 (apply 'string (nreverse badchars)) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
600 (if global "in the standard syntax" "in this mode")))))) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
601 |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
602 (defun define-global-abbrev (abbrev expansion) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
603 "Define ABBREV as a global abbreviation for EXPANSION. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
604 The characters in ABBREV must all be word constituents in the standard |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
605 syntax table." |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
606 (interactive "sDefine global abbrev: \nsExpansion for %s: ") |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
607 (abbrev--check-chars abbrev 'global) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
608 (define-abbrev global-abbrev-table (downcase abbrev) expansion)) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
609 |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
610 (defun define-mode-abbrev (abbrev expansion) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
611 "Define ABBREV as a mode-specific abbreviation for EXPANSION. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
612 The characters in ABBREV must all be word-constituents in the current mode." |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
613 (interactive "sDefine mode abbrev: \nsExpansion for %s: ") |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
614 (unless local-abbrev-table |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
615 (error "Major mode has no abbrev table")) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
616 (abbrev--check-chars abbrev nil) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
617 (define-abbrev local-abbrev-table (downcase abbrev) expansion)) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
618 |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
619 (defun abbrev--active-tables (&optional tables) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
620 "Return the list of abbrev tables currently active. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
621 TABLES if non-nil overrides the usual rules. It can hold |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
622 either a single abbrev table or a list of abbrev tables." |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
623 ;; We could just remove the `tables' arg and let callers use |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
624 ;; (or table (abbrev--active-tables)) but then they'd have to be careful |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
625 ;; to treat the distinction between a single table and a list of tables. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
626 (cond |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
627 ((consp tables) tables) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
628 ((vectorp tables) (list tables)) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
629 (t |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
630 (let ((tables (if (listp local-abbrev-table) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
631 (append local-abbrev-table |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
632 (list global-abbrev-table)) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
633 (list local-abbrev-table global-abbrev-table)))) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
634 ;; Add the minor-mode abbrev tables. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
635 (dolist (x abbrev-minor-mode-table-alist) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
636 (when (and (symbolp (car x)) (boundp (car x)) (symbol-value (car x))) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
637 (setq tables |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
638 (if (listp (cdr x)) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
639 (append (cdr x) tables) (cons (cdr x) tables))))) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
640 tables)))) |
85923
a6bcf6e8ed42
(define-abbrev-table): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
85920
diff
changeset
|
641 |
85710
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
642 |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
643 (defun abbrev-symbol (abbrev &optional table) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
644 "Return the symbol representing abbrev named ABBREV. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
645 This symbol's name is ABBREV, but it is not the canonical symbol of that name; |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
646 it is interned in an abbrev-table rather than the normal obarray. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
647 The value is nil if that abbrev is not defined. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
648 Optional second arg TABLE is abbrev table to look it up in. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
649 The default is to try buffer's mode-specific abbrev table, then global table." |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
650 (let ((tables (abbrev--active-tables table)) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
651 sym) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
652 (while (and tables (not (symbol-value sym))) |
85837
07865f189760
(abbrev-symbol): Correct let->let*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85773
diff
changeset
|
653 (let* ((table (pop tables)) |
07865f189760
(abbrev-symbol): Correct let->let*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85773
diff
changeset
|
654 (case-fold (not (abbrev-table-get table :case-fixed)))) |
85710
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
655 (setq tables (append (abbrev-table-get table :parents) tables)) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
656 ;; In case the table doesn't set :case-fixed but some of the |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
657 ;; abbrevs do, we have to be careful. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
658 (setq sym |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
659 ;; First try without case-folding. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
660 (or (intern-soft abbrev table) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
661 (when case-fold |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
662 ;; We didn't find any abbrev, try case-folding. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
663 (let ((sym (intern-soft (downcase abbrev) table))) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
664 ;; Only use it if it doesn't require :case-fixed. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
665 (and sym (not (abbrev-get sym :case-fixed)) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
666 sym))))))) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
667 (if (symbol-value sym) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
668 sym))) |
85923
a6bcf6e8ed42
(define-abbrev-table): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
85920
diff
changeset
|
669 |
85710
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
670 |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
671 (defun abbrev-expansion (abbrev &optional table) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
672 "Return the string that ABBREV expands into in the current buffer. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
673 Optionally specify an abbrev table as second arg; |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
674 then ABBREV is looked up in that table only." |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
675 (symbol-value (abbrev-symbol abbrev table))) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
676 |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
677 |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
678 (defun abbrev--before-point () |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
679 "Try and find an abbrev before point. Return it if found, nil otherwise." |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
680 (unless (eq abbrev-start-location-buffer (current-buffer)) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
681 (setq abbrev-start-location nil)) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
682 |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
683 (let ((tables (abbrev--active-tables)) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
684 (pos (point)) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
685 start end name res) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
686 |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
687 (if abbrev-start-location |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
688 (progn |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
689 (setq start abbrev-start-location) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
690 (setq abbrev-start-location nil) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
691 ;; Remove the hyphen inserted by `abbrev-prefix-mark'. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
692 (if (and (< start (point-max)) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
693 (eq (char-after start) ?-)) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
694 (delete-region start (1+ start))) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
695 (skip-syntax-backward " ") |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
696 (setq end (point)) |
85837
07865f189760
(abbrev-symbol): Correct let->let*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85773
diff
changeset
|
697 (when (> end start) |
07865f189760
(abbrev-symbol): Correct let->let*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85773
diff
changeset
|
698 (setq name (buffer-substring start end)) |
07865f189760
(abbrev-symbol): Correct let->let*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85773
diff
changeset
|
699 (goto-char pos) ; Restore point. |
07865f189760
(abbrev-symbol): Correct let->let*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85773
diff
changeset
|
700 (list (abbrev-symbol name tables) name start end))) |
85923
a6bcf6e8ed42
(define-abbrev-table): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
85920
diff
changeset
|
701 |
85710
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
702 (while (and tables (not (car res))) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
703 (let* ((table (pop tables)) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
704 (enable-fun (abbrev-table-get table :enable-function))) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
705 (setq tables (append (abbrev-table-get table :parents) tables)) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
706 (setq res |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
707 (and (or (not enable-fun) (funcall enable-fun)) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
708 (looking-back (or (abbrev-table-get table :regexp) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
709 "\\<\\(\\w+\\)\\W*") |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
710 (line-beginning-position)) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
711 (setq start (match-beginning 1)) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
712 (setq end (match-end 1)) |
85773
13ae285f009a
Rename `count' and `system-flag' to :count and :system. Update all users.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85710
diff
changeset
|
713 (setq name (buffer-substring start end)) |
13ae285f009a
Rename `count' and `system-flag' to :count and :system. Update all users.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85710
diff
changeset
|
714 (let ((abbrev (abbrev-symbol name table))) |
13ae285f009a
Rename `count' and `system-flag' to :count and :system. Update all users.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85710
diff
changeset
|
715 (when abbrev |
13ae285f009a
Rename `count' and `system-flag' to :count and :system. Update all users.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85710
diff
changeset
|
716 (setq enable-fun (abbrev-get abbrev :enable-function)) |
13ae285f009a
Rename `count' and `system-flag' to :count and :system. Update all users.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85710
diff
changeset
|
717 (and (or (not enable-fun) (funcall enable-fun)) |
13ae285f009a
Rename `count' and `system-flag' to :count and :system. Update all users.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85710
diff
changeset
|
718 ;; This will also look it up in parent tables. |
13ae285f009a
Rename `count' and `system-flag' to :count and :system. Update all users.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85710
diff
changeset
|
719 ;; This is not on purpose, but it seems harmless. |
13ae285f009a
Rename `count' and `system-flag' to :count and :system. Update all users.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85710
diff
changeset
|
720 (list abbrev name start end)))))) |
85710
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
721 ;; Restore point. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
722 (goto-char pos))) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
723 res))) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
724 |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
725 (defvar abbrev-expand-functions nil |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
726 "Wrapper hook around `expand-abbrev'. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
727 The functions on this special hook are called with one argument: |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
728 a function that performs the abbrev expansion. It should return |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
729 the abbrev symbol if expansion took place.") |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
730 |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
731 (defun expand-abbrev () |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
732 "Expand the abbrev before point, if there is an abbrev there. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
733 Effective when explicitly called even when `abbrev-mode' is nil. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
734 Returns the abbrev symbol, if expansion took place." |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
735 (interactive) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
736 (run-hooks 'pre-abbrev-expand-hook) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
737 (abbrev-with-wrapper-hook abbrev-expand-functions |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
738 (destructuring-bind (&optional sym name wordstart wordend) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
739 (abbrev--before-point) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
740 (when sym |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
741 (let ((value sym)) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
742 (unless (or ;; executing-kbd-macro |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
743 noninteractive |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
744 (window-minibuffer-p (selected-window))) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
745 ;; Add an undo boundary, in case we are doing this for |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
746 ;; a self-inserting command which has avoided making one so far. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
747 (undo-boundary)) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
748 ;; Now sym is the abbrev symbol. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
749 (setq last-abbrev-text name) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
750 (setq last-abbrev sym) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
751 (setq last-abbrev-location wordstart) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
752 ;; Increment use count. |
85773
13ae285f009a
Rename `count' and `system-flag' to :count and :system. Update all users.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85710
diff
changeset
|
753 (abbrev-put sym :count (1+ (abbrev-get sym :count))) |
85710
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
754 ;; If this abbrev has an expansion, delete the abbrev |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
755 ;; and insert the expansion. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
756 (when (stringp (symbol-value sym)) |
85920
e5cfe61bd903
(expand-abbrev): Move point back to expansion's end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85837
diff
changeset
|
757 (goto-char wordstart) |
e5cfe61bd903
(expand-abbrev): Move point back to expansion's end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85837
diff
changeset
|
758 ;; Insert at beginning so that markers at the end (e.g. point) |
e5cfe61bd903
(expand-abbrev): Move point back to expansion's end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85837
diff
changeset
|
759 ;; are preserved. |
85710
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
760 (insert (symbol-value sym)) |
85920
e5cfe61bd903
(expand-abbrev): Move point back to expansion's end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85837
diff
changeset
|
761 (delete-char (- wordend wordstart)) |
85710
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
762 (let ((case-fold-search nil)) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
763 ;; If the abbrev's name is different from the buffer text (the |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
764 ;; only difference should be capitalization), then we may want |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
765 ;; to adjust the capitalization of the expansion. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
766 (when (and (not (equal name (symbol-name sym))) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
767 (string-match "[[:upper:]]" name)) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
768 (if (not (string-match "[[:lower:]]" name)) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
769 ;; Abbrev was all caps. If expansion is multiple words, |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
770 ;; normally capitalize each word. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
771 (if (and (not abbrev-all-caps) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
772 (save-excursion |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
773 (> (progn (backward-word 1) (point)) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
774 (progn (goto-char wordstart) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
775 (forward-word 1) (point))))) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
776 (upcase-initials-region wordstart (point)) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
777 (upcase-region wordstart (point))) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
778 ;; Abbrev included some caps. Cap first initial of expansion. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
779 (let ((end (point))) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
780 ;; Find the initial. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
781 (goto-char wordstart) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
782 (skip-syntax-forward "^w" (1- end)) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
783 ;; Change just that. |
85920
e5cfe61bd903
(expand-abbrev): Move point back to expansion's end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85837
diff
changeset
|
784 (upcase-initials-region (point) (1+ (point))) |
e5cfe61bd903
(expand-abbrev): Move point back to expansion's end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85837
diff
changeset
|
785 (goto-char end)))))) |
e5cfe61bd903
(expand-abbrev): Move point back to expansion's end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85837
diff
changeset
|
786 ;; Now point is at the end of the expansion and the beginning is |
e5cfe61bd903
(expand-abbrev): Move point back to expansion's end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85837
diff
changeset
|
787 ;; in last-abbrev-location. |
85710
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
788 (when (symbol-function sym) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
789 (let* ((hook (symbol-function sym)) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
790 (expanded |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
791 ;; If the abbrev has a hook function, run it. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
792 (funcall hook))) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
793 ;; In addition, if the hook function is a symbol with |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
794 ;; a non-nil `no-self-insert' property, let the value it |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
795 ;; returned specify whether we consider that an expansion took |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
796 ;; place. If it returns nil, no expansion has been done. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
797 (if (and (symbolp hook) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
798 (null expanded) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
799 (get hook 'no-self-insert)) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
800 (setq value nil)))) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
801 value))))) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
802 |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
803 (defun unexpand-abbrev () |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
804 "Undo the expansion of the last abbrev that expanded. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
805 This differs from ordinary undo in that other editing done since then |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
806 is not undone." |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
807 (interactive) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
808 (save-excursion |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
809 (unless (or (< last-abbrev-location (point-min)) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
810 (> last-abbrev-location (point-max))) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
811 (goto-char last-abbrev-location) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
812 (when (stringp last-abbrev-text) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
813 ;; This isn't correct if last-abbrev's hook was used |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
814 ;; to do the expansion. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
815 (let ((val (symbol-value last-abbrev))) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
816 (unless (stringp val) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
817 (error "value of abbrev-symbol must be a string")) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
818 (delete-region (point) (+ (point) (length val))) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
819 ;; Don't inherit properties here; just copy from old contents. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
820 (insert last-abbrev-text) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
821 (setq last-abbrev-text nil)))))) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
822 |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
823 (defun abbrev--write (sym) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
824 "Write the abbrev in a `read'able form. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
825 Only writes the non-system abbrevs. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
826 Presumes that `standard-output' points to `current-buffer'." |
85773
13ae285f009a
Rename `count' and `system-flag' to :count and :system. Update all users.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85710
diff
changeset
|
827 (unless (or (null (symbol-value sym)) (abbrev-get sym :system)) |
85710
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
828 (insert " (") |
86158
61154518604b
(abbrev--write): Fix error in transcription from C.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85991
diff
changeset
|
829 (prin1 (symbol-name sym)) |
85710
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
830 (insert " ") |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
831 (prin1 (symbol-value sym)) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
832 (insert " ") |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
833 (prin1 (symbol-function sym)) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
834 (insert " ") |
85773
13ae285f009a
Rename `count' and `system-flag' to :count and :system. Update all users.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85710
diff
changeset
|
835 (prin1 (abbrev-get sym :count)) |
85710
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
836 (insert ")\n"))) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
837 |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
838 (defun abbrev--describe (sym) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
839 (when (symbol-value sym) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
840 (prin1 (symbol-name sym)) |
85773
13ae285f009a
Rename `count' and `system-flag' to :count and :system. Update all users.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85710
diff
changeset
|
841 (if (null (abbrev-get sym :system)) |
85710
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
842 (indent-to 15 1) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
843 (insert " (sys)") |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
844 (indent-to 20 1)) |
85773
13ae285f009a
Rename `count' and `system-flag' to :count and :system. Update all users.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85710
diff
changeset
|
845 (prin1 (abbrev-get sym :count)) |
85710
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
846 (indent-to 20 1) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
847 (prin1 (symbol-value sym)) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
848 (when (symbol-function sym) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
849 (indent-to 45 1) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
850 (prin1 (symbol-function sym))) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
851 (terpri))) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
852 |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
853 (defun insert-abbrev-table-description (name &optional readable) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
854 "Insert before point a full description of abbrev table named NAME. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
855 NAME is a symbol whose value is an abbrev table. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
856 If optional 2nd arg READABLE is non-nil, a human-readable description |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
857 is inserted. Otherwise the description is an expression, |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
858 a call to `define-abbrev-table', which would |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
859 define the abbrev table NAME exactly as it is currently defined. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
860 |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
861 Abbrevs marked as \"system abbrevs\" are omitted." |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
862 (let ((table (symbol-value name)) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
863 (symbols ())) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
864 (mapatoms (lambda (sym) (if (symbol-value sym) (push sym symbols))) table) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
865 (setq symbols (sort symbols 'string-lessp)) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
866 (let ((standard-output (current-buffer))) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
867 (if readable |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
868 (progn |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
869 (insert "(") |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
870 (prin1 name) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
871 (insert ")\n\n") |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
872 (mapc 'abbrev--describe symbols) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
873 (insert "\n\n")) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
874 (insert "(define-abbrev-table '") |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
875 (prin1 name) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
876 (insert " '(") |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
877 (mapc 'abbrev--write symbols) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
878 (insert " ))\n\n")) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
879 nil))) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
880 |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
881 (defun define-abbrev-table (tablename definitions |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
882 &optional docstring &rest props) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
883 "Define TABLENAME (a symbol) as an abbrev table name. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
884 Define abbrevs in it according to DEFINITIONS, which is a list of elements |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
885 of the form (ABBREVNAME EXPANSION HOOK USECOUNT SYSTEMFLAG). |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
886 \(If the list is shorter than that, omitted elements default to nil). |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
887 PROPS is a property list to apply to the table. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
888 Properties with special meaning: |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
889 - `:parents' contains a list of abbrev tables from which this table inherits |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
890 abbreviations. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
891 - `:case-fixed' non-nil means that abbreviations are looked up without |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
892 case-folding, and the expansion is not capitalized/upcased. |
85923
a6bcf6e8ed42
(define-abbrev-table): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
85920
diff
changeset
|
893 - `:regexp' describes the form of abbrevs. It defaults to \\=\\<\\(\\w+\\)\\W* which |
85710
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
894 means that an abbrev can only be a single word. The submatch 1 is treated |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
895 as the potential name of an abbrev. |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
896 - `:enable-function' can be set to a function of no argument which returns |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
897 non-nil iff the abbrevs in this table should be used for this instance |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
898 of `expand-abbrev'." |
85991
dd802e6c104e
(define-abbrev-table): Record the variable definition.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85925
diff
changeset
|
899 ;; We used to manually add the docstring, but we also want to record this |
dd802e6c104e
(define-abbrev-table): Record the variable definition.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85925
diff
changeset
|
900 ;; location as the definition of the variable (in load-history), so we may |
dd802e6c104e
(define-abbrev-table): Record the variable definition.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85925
diff
changeset
|
901 ;; as well just use `defvar'. |
dd802e6c104e
(define-abbrev-table): Record the variable definition.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85925
diff
changeset
|
902 (eval `(defvar ,tablename nil ,@(if (stringp docstring) (list docstring)))) |
85710
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
903 (let ((table (if (boundp tablename) (symbol-value tablename)))) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
904 (unless table |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
905 (setq table (make-abbrev-table props)) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
906 (set tablename table) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
907 (push tablename abbrev-table-name-list)) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
908 (dolist (elt definitions) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
909 (apply 'define-abbrev table elt)))) |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
910 |
76421
1a0fcbc9da8c
(abbrev): Add `provide'.
Richard M. Stallman <rms@gnu.org>
parents:
75347
diff
changeset
|
911 (provide 'abbrev) |
1a0fcbc9da8c
(abbrev): Add `provide'.
Richard M. Stallman <rms@gnu.org>
parents:
75347
diff
changeset
|
912 |
70216
0bf240af6e61
(abbrev-mode): Tighten up a bit the safety predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70102
diff
changeset
|
913 ;; arch-tag: dbd6f3ae-dfe3-40ba-b00f-f9e3ff960df5 |
662
8a533acedb77
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
411
diff
changeset
|
914 ;;; abbrev.el ends here |