Mercurial > emacs
annotate src/abbrev.c @ 82621:8bdedd5fc7a2
Move refcards from etc/ to etc/refcards/
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Wed, 22 Aug 2007 07:17:41 +0000 |
parents | b98604865ea0 |
children | 1d35aa875508 f55f9811f5d7 |
rev | line source |
---|---|
146 | 1 /* Primitives for word-abbrev mode. |
64770
a0d1312ede66
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64084
diff
changeset
|
2 Copyright (C) 1985, 1986, 1993, 1996, 1998, 2001, 2002, 2003, 2004, |
75348 | 3 2005, 2006, 2007 Free Software Foundation, Inc. |
146 | 4 |
5 This file is part of GNU Emacs. | |
6 | |
7 GNU Emacs is free software; you can redistribute it and/or modify | |
8 it under the terms of the GNU General Public License as published by | |
78260
922696f363b0
Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
9 the Free Software Foundation; either version 3, or (at your option) |
146 | 10 any later version. |
11 | |
12 GNU Emacs is distributed in the hope that it will be useful, | |
13 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
15 GNU General Public License for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
18 along with GNU Emacs; see the file COPYING. If not, write to | |
64084 | 19 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
20 Boston, MA 02110-1301, USA. */ | |
146 | 21 |
22 | |
4696
1fc792473491
Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents:
2961
diff
changeset
|
23 #include <config.h> |
146 | 24 #include <stdio.h> |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
25 |
146 | 26 #include "lisp.h" |
27 #include "commands.h" | |
28 #include "buffer.h" | |
29 #include "window.h" | |
23715 | 30 #include "charset.h" |
9054
ddb22c22a80d
(Fexpand_abbrev): Instead of Fcapitalize_region,
Richard M. Stallman <rms@gnu.org>
parents:
4717
diff
changeset
|
31 #include "syntax.h" |
146 | 32 |
33 /* An abbrev table is an obarray. | |
34 Each defined abbrev is represented by a symbol in that obarray | |
35 whose print name is the abbreviation. | |
36 The symbol's value is a string which is the expansion. | |
37 If its function definition is non-nil, it is called | |
38 after the expansion is done. | |
39 The plist slot of the abbrev symbol is its usage count. */ | |
40 | |
41 /* List of all abbrev-table name symbols: | |
42 symbols whose values are abbrev tables. */ | |
43 | |
44 Lisp_Object Vabbrev_table_name_list; | |
45 | |
46 /* The table of global abbrevs. These are in effect | |
47 in any buffer in which abbrev mode is turned on. */ | |
48 | |
49 Lisp_Object Vglobal_abbrev_table; | |
50 | |
51 /* The local abbrev table used by default (in Fundamental Mode buffers) */ | |
52 | |
53 Lisp_Object Vfundamental_mode_abbrev_table; | |
54 | |
55 /* Set nonzero when an abbrev definition is changed */ | |
56 | |
57 int abbrevs_changed; | |
58 | |
59 int abbrev_all_caps; | |
60 | |
61 /* Non-nil => use this location as the start of abbrev to expand | |
62 (rather than taking the word before point as the abbrev) */ | |
63 | |
64 Lisp_Object Vabbrev_start_location; | |
65 | |
66 /* Buffer that Vabbrev_start_location applies to */ | |
67 Lisp_Object Vabbrev_start_location_buffer; | |
68 | |
69 /* The symbol representing the abbrev most recently expanded */ | |
70 | |
71 Lisp_Object Vlast_abbrev; | |
72 | |
73 /* A string for the actual text of the abbrev most recently expanded. | |
74 This has more info than Vlast_abbrev since case is significant. */ | |
75 | |
76 Lisp_Object Vlast_abbrev_text; | |
77 | |
78 /* Character address of start of last abbrev expanded */ | |
79 | |
43713
f92c4d87863a
Change defvar_int def and vars to use EMACS_INT instead of just int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43671
diff
changeset
|
80 EMACS_INT last_abbrev_point; |
146 | 81 |
458
8f18e7e89008
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
397
diff
changeset
|
82 /* Hook to run before expanding any abbrev. */ |
8f18e7e89008
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
397
diff
changeset
|
83 |
8f18e7e89008
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
397
diff
changeset
|
84 Lisp_Object Vpre_abbrev_expand_hook, Qpre_abbrev_expand_hook; |
42388
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
85 |
74435 | 86 Lisp_Object Qsystem_type, Qcount, Qforce; |
146 | 87 |
88 DEFUN ("make-abbrev-table", Fmake_abbrev_table, Smake_abbrev_table, 0, 0, 0, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
89 doc: /* Create a new, empty abbrev table object. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
90 () |
146 | 91 { |
44739
31151cf0eb43
Add comment of arbitrary chosen constant 59.
Pavel Janík <Pavel@Janik.cz>
parents:
43713
diff
changeset
|
92 /* The value 59 is arbitrary chosen prime number. */ |
146 | 93 return Fmake_vector (make_number (59), make_number (0)); |
94 } | |
95 | |
96 DEFUN ("clear-abbrev-table", Fclear_abbrev_table, Sclear_abbrev_table, 1, 1, 0, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
97 doc: /* Undefine all abbrevs in abbrev table TABLE, leaving it empty. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
98 (table) |
146 | 99 Lisp_Object table; |
100 { | |
101 int i, size; | |
102 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40109
diff
changeset
|
103 CHECK_VECTOR (table); |
146 | 104 size = XVECTOR (table)->size; |
105 abbrevs_changed = 1; | |
106 for (i = 0; i < size; i++) | |
107 XVECTOR (table)->contents[i] = make_number (0); | |
108 return Qnil; | |
109 } | |
74435 | 110 |
42388
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
111 DEFUN ("define-abbrev", Fdefine_abbrev, Sdefine_abbrev, 3, 6, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
112 doc: /* Define an abbrev in TABLE named NAME, to expand to EXPANSION and call HOOK. |
77426
2e139d8d34bc
(Fdefine_abbrev): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
75348
diff
changeset
|
113 NAME must be a string, and should be lower-case. |
39960
d0d7ddac8c5e
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39584
diff
changeset
|
114 EXPANSION should usually be a string. |
d0d7ddac8c5e
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39584
diff
changeset
|
115 To undefine an abbrev, define it with EXPANSION = nil. |
d0d7ddac8c5e
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39584
diff
changeset
|
116 If HOOK is non-nil, it should be a function of no arguments; |
d0d7ddac8c5e
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39584
diff
changeset
|
117 it is called after EXPANSION is inserted. |
d0d7ddac8c5e
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39584
diff
changeset
|
118 If EXPANSION is not a string, the abbrev is a special one, |
d0d7ddac8c5e
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39584
diff
changeset
|
119 which does not expand in the usual way but only runs HOOK. |
42388
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
120 |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
121 COUNT, if specified, gives the initial value for the abbrev's |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
122 usage-count, which is incremented each time the abbrev is used. |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
123 \(The default is zero.) |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
124 |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
125 SYSTEM-FLAG, if non-nil, says that this is a "system" abbreviation |
74435 | 126 which should not be saved in the user's abbreviation file. |
127 Unless SYSTEM-FLAG is `force', a system abbreviation will not | |
128 overwrite a non-system abbreviation of the same name. */) | |
42388
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
129 (table, name, expansion, hook, count, system_flag) |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
130 Lisp_Object table, name, expansion, hook, count, system_flag; |
146 | 131 { |
132 Lisp_Object sym, oexp, ohook, tem; | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40109
diff
changeset
|
133 CHECK_VECTOR (table); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40109
diff
changeset
|
134 CHECK_STRING (name); |
16565
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
135 |
74435 | 136 /* If defining a system abbrev, do not overwrite a non-system abbrev |
137 of the same name, unless 'force is used. */ | |
138 if (!NILP (system_flag) && !EQ (system_flag, Qforce)) | |
139 { | |
140 sym = Fintern_soft (name, table); | |
141 | |
142 if (!NILP (SYMBOL_VALUE (sym)) && | |
143 NILP (Fplist_get (XSYMBOL (sym)->plist, Qsystem_type))) return Qnil; | |
144 } | |
145 | |
484 | 146 if (NILP (count)) |
146 | 147 count = make_number (0); |
148 else | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40109
diff
changeset
|
149 CHECK_NUMBER (count); |
146 | 150 |
151 sym = Fintern (name, table); | |
152 | |
39584
6145836b795c
Use SYMBOL_VALUE/ SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents:
29742
diff
changeset
|
153 oexp = SYMBOL_VALUE (sym); |
146 | 154 ohook = XSYMBOL (sym)->function; |
155 if (!((EQ (oexp, expansion) | |
9140
3e7833a8e16f
(Fdefine_abbrev, Fexpand_abbrev, Funexpand_abbrev): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9054
diff
changeset
|
156 || (STRINGP (oexp) && STRINGP (expansion) |
484 | 157 && (tem = Fstring_equal (oexp, expansion), !NILP (tem)))) |
146 | 158 && |
159 (EQ (ohook, hook) | |
42388
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
160 || (tem = Fequal (ohook, hook), !NILP (tem)))) |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
161 && NILP (system_flag)) |
146 | 162 abbrevs_changed = 1; |
163 | |
164 Fset (sym, expansion); | |
165 Ffset (sym, hook); | |
42388
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
166 |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
167 if (! NILP (system_flag)) |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
168 Fsetplist (sym, list4 (Qcount, count, Qsystem_type, system_flag)); |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
169 else |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
170 Fsetplist (sym, count); |
146 | 171 |
172 return name; | |
173 } | |
174 | |
81928
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
175 /* Check if the characters in ABBREV have word syntax in either the |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
176 * current (if global == 0) or standard syntax table. */ |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
177 static void |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
178 abbrev_check_chars (abbrev, global) |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
179 Lisp_Object abbrev; |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
180 int global; |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
181 { |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
182 int i, i_byte, len, nbad = 0; |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
183 int j, found, nuniq = 0; |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
184 char *badchars, *baduniq; |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
185 |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
186 CHECK_STRING (abbrev); |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
187 len = SCHARS (abbrev); |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
188 |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
189 badchars = (char *) alloca (len + 1); |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
190 |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
191 for (i = 0, i_byte = 0; i < len; ) |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
192 { |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
193 int c; |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
194 |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
195 FETCH_STRING_CHAR_ADVANCE (c, abbrev, i, i_byte); |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
196 |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
197 if (global) |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
198 { |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
199 /* Copied from SYNTAX in syntax.h, except using FOLLOW_PARENT. */ |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
200 Lisp_Object syntax_temp |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
201 = SYNTAX_ENTRY_FOLLOW_PARENT (Vstandard_syntax_table, c); |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
202 if ( (CONSP (syntax_temp) |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
203 ? (enum syntaxcode) (XINT (XCAR (syntax_temp)) & 0xff) |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
204 : Swhitespace) != Sword ) badchars[nbad++] = c; |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
205 } |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
206 else if (SYNTAX (c) != Sword) |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
207 badchars[nbad++] = c; |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
208 } |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
209 |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
210 if (nbad == 0) return; |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
211 |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
212 baduniq = (char *) alloca (nbad + 1); |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
213 |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
214 for (i = 0; i < nbad; i++) |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
215 { |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
216 found = 0; |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
217 |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
218 for (j = 0; j < nuniq; j++) |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
219 { |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
220 if (badchars[i] == baduniq[j]) |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
221 { |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
222 found = 1; |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
223 break; |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
224 } |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
225 } |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
226 |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
227 if (found) continue ; |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
228 |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
229 baduniq[nuniq++] = badchars[i]; |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
230 } |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
231 |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
232 baduniq[nuniq] = '\0'; |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
233 |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
234 error ("Some abbrev characters (%s) are not word constituents %s", |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
235 baduniq, global ? "in the standard syntax" : "in this mode" ); |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
236 } |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
237 |
146 | 238 DEFUN ("define-global-abbrev", Fdefine_global_abbrev, Sdefine_global_abbrev, 2, 2, |
39960
d0d7ddac8c5e
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39584
diff
changeset
|
239 "sDefine global abbrev: \nsExpansion for %s: ", |
81928
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
240 doc: /* Define ABBREV as a global abbreviation for EXPANSION. |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
241 The characters in ABBREV must all be word constituents in the standard |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
242 syntax table. */) |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
243 (abbrev, expansion) |
14059
1303d585443b
(Fdefine_global_abbrev, Fdefine_mode_abbrev, Fabbrev_symbol,
Erik Naggum <erik@naggum.no>
parents:
12091
diff
changeset
|
244 Lisp_Object abbrev, expansion; |
146 | 245 { |
81928
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
246 abbrev_check_chars (abbrev, 1); |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
247 |
14059
1303d585443b
(Fdefine_global_abbrev, Fdefine_mode_abbrev, Fabbrev_symbol,
Erik Naggum <erik@naggum.no>
parents:
12091
diff
changeset
|
248 Fdefine_abbrev (Vglobal_abbrev_table, Fdowncase (abbrev), |
42388
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
249 expansion, Qnil, make_number (0), Qnil); |
14059
1303d585443b
(Fdefine_global_abbrev, Fdefine_mode_abbrev, Fabbrev_symbol,
Erik Naggum <erik@naggum.no>
parents:
12091
diff
changeset
|
250 return abbrev; |
146 | 251 } |
252 | |
253 DEFUN ("define-mode-abbrev", Fdefine_mode_abbrev, Sdefine_mode_abbrev, 2, 2, | |
39960
d0d7ddac8c5e
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39584
diff
changeset
|
254 "sDefine mode abbrev: \nsExpansion for %s: ", |
81928
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
255 doc: /* Define ABBREV as a mode-specific abbreviation for EXPANSION. |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
256 The characters in ABBREV must all be word-constituents in the current mode. */) |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
257 (abbrev, expansion) |
14059
1303d585443b
(Fdefine_global_abbrev, Fdefine_mode_abbrev, Fabbrev_symbol,
Erik Naggum <erik@naggum.no>
parents:
12091
diff
changeset
|
258 Lisp_Object abbrev, expansion; |
146 | 259 { |
484 | 260 if (NILP (current_buffer->abbrev_table)) |
146 | 261 error ("Major mode has no abbrev table"); |
262 | |
81928
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
263 abbrev_check_chars (abbrev, 0); |
a6745196bd94
(abbrev_check_chars): New function.
Glenn Morris <rgm@gnu.org>
parents:
77426
diff
changeset
|
264 |
14059
1303d585443b
(Fdefine_global_abbrev, Fdefine_mode_abbrev, Fabbrev_symbol,
Erik Naggum <erik@naggum.no>
parents:
12091
diff
changeset
|
265 Fdefine_abbrev (current_buffer->abbrev_table, Fdowncase (abbrev), |
42388
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
266 expansion, Qnil, make_number (0), Qnil); |
14059
1303d585443b
(Fdefine_global_abbrev, Fdefine_mode_abbrev, Fabbrev_symbol,
Erik Naggum <erik@naggum.no>
parents:
12091
diff
changeset
|
267 return abbrev; |
146 | 268 } |
269 | |
270 DEFUN ("abbrev-symbol", Fabbrev_symbol, Sabbrev_symbol, 1, 2, 0, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
271 doc: /* Return the symbol representing abbrev named ABBREV. |
39960
d0d7ddac8c5e
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39584
diff
changeset
|
272 This symbol's name is ABBREV, but it is not the canonical symbol of that name; |
d0d7ddac8c5e
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39584
diff
changeset
|
273 it is interned in an abbrev-table rather than the normal obarray. |
d0d7ddac8c5e
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39584
diff
changeset
|
274 The value is nil if that abbrev is not defined. |
d0d7ddac8c5e
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39584
diff
changeset
|
275 Optional second arg TABLE is abbrev table to look it up in. |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
276 The default is to try buffer's mode-specific abbrev table, then global table. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
277 (abbrev, table) |
146 | 278 Lisp_Object abbrev, table; |
279 { | |
280 Lisp_Object sym; | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40109
diff
changeset
|
281 CHECK_STRING (abbrev); |
484 | 282 if (!NILP (table)) |
146 | 283 sym = Fintern_soft (abbrev, table); |
284 else | |
285 { | |
286 sym = Qnil; | |
484 | 287 if (!NILP (current_buffer->abbrev_table)) |
146 | 288 sym = Fintern_soft (abbrev, current_buffer->abbrev_table); |
39584
6145836b795c
Use SYMBOL_VALUE/ SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents:
29742
diff
changeset
|
289 if (NILP (SYMBOL_VALUE (sym))) |
146 | 290 sym = Qnil; |
484 | 291 if (NILP (sym)) |
146 | 292 sym = Fintern_soft (abbrev, Vglobal_abbrev_table); |
293 } | |
39584
6145836b795c
Use SYMBOL_VALUE/ SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents:
29742
diff
changeset
|
294 if (NILP (SYMBOL_VALUE (sym))) |
6145836b795c
Use SYMBOL_VALUE/ SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents:
29742
diff
changeset
|
295 return Qnil; |
146 | 296 return sym; |
297 } | |
298 | |
299 DEFUN ("abbrev-expansion", Fabbrev_expansion, Sabbrev_expansion, 1, 2, 0, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
300 doc: /* Return the string that ABBREV expands into in the current buffer. |
39960
d0d7ddac8c5e
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39584
diff
changeset
|
301 Optionally specify an abbrev table as second arg; |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
302 then ABBREV is looked up in that table only. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
303 (abbrev, table) |
146 | 304 Lisp_Object abbrev, table; |
305 { | |
306 Lisp_Object sym; | |
307 sym = Fabbrev_symbol (abbrev, table); | |
484 | 308 if (NILP (sym)) return sym; |
146 | 309 return Fsymbol_value (sym); |
310 } | |
311 | |
312 /* Expand the word before point, if it is an abbrev. | |
313 Returns 1 if an expansion is done. */ | |
314 | |
315 DEFUN ("expand-abbrev", Fexpand_abbrev, Sexpand_abbrev, 0, 0, "", | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
316 doc: /* Expand the abbrev before point, if there is an abbrev there. |
39960
d0d7ddac8c5e
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39584
diff
changeset
|
317 Effective when explicitly called even when `abbrev-mode' is nil. |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
318 Returns the abbrev symbol, if expansion took place. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
319 () |
146 | 320 { |
321 register char *buffer, *p; | |
20529
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
322 int wordstart, wordend; |
46965
711ccca26771
(Fexpand_abbrev): Fix for the multibyte case.
Kenichi Handa <handa@m17n.org>
parents:
46370
diff
changeset
|
323 register int wordstart_byte, wordend_byte, idx, idx_byte; |
146 | 324 int whitecnt; |
325 int uccount = 0, lccount = 0; | |
326 register Lisp_Object sym; | |
327 Lisp_Object expansion, hook, tem; | |
1021
22f807391bec
(Fexpand_abbrev): If pre-expand hook changes the buffer,
Richard M. Stallman <rms@gnu.org>
parents:
988
diff
changeset
|
328 Lisp_Object value; |
46965
711ccca26771
(Fexpand_abbrev): Fix for the multibyte case.
Kenichi Handa <handa@m17n.org>
parents:
46370
diff
changeset
|
329 int multibyte = ! NILP (current_buffer->enable_multibyte_characters); |
146 | 330 |
16747
126a42ee62ac
(Fexpand_abbrev): Return the abbrev symbol, or nil if no expansion.
Richard M. Stallman <rms@gnu.org>
parents:
16565
diff
changeset
|
331 value = Qnil; |
126a42ee62ac
(Fexpand_abbrev): Return the abbrev symbol, or nil if no expansion.
Richard M. Stallman <rms@gnu.org>
parents:
16565
diff
changeset
|
332 |
56564
c35c8a6e6baa
(Fexpand_abbrev): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
56523
diff
changeset
|
333 Frun_hooks (1, &Qpre_abbrev_expand_hook); |
c35c8a6e6baa
(Fexpand_abbrev): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
56523
diff
changeset
|
334 |
11503
9d8bb1074fd8
(Fexpand_abbrev): Add some error checking.
Karl Heuer <kwzh@gnu.org>
parents:
9294
diff
changeset
|
335 wordstart = 0; |
16747
126a42ee62ac
(Fexpand_abbrev): Return the abbrev symbol, or nil if no expansion.
Richard M. Stallman <rms@gnu.org>
parents:
16565
diff
changeset
|
336 if (!(BUFFERP (Vabbrev_start_location_buffer) |
126a42ee62ac
(Fexpand_abbrev): Return the abbrev symbol, or nil if no expansion.
Richard M. Stallman <rms@gnu.org>
parents:
16565
diff
changeset
|
337 && XBUFFER (Vabbrev_start_location_buffer) == current_buffer)) |
146 | 338 Vabbrev_start_location = Qnil; |
484 | 339 if (!NILP (Vabbrev_start_location)) |
146 | 340 { |
341 tem = Vabbrev_start_location; | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40109
diff
changeset
|
342 CHECK_NUMBER_COERCE_MARKER (tem); |
146 | 343 wordstart = XINT (tem); |
344 Vabbrev_start_location = Qnil; | |
11503
9d8bb1074fd8
(Fexpand_abbrev): Add some error checking.
Karl Heuer <kwzh@gnu.org>
parents:
9294
diff
changeset
|
345 if (wordstart < BEGV || wordstart > ZV) |
9d8bb1074fd8
(Fexpand_abbrev): Add some error checking.
Karl Heuer <kwzh@gnu.org>
parents:
9294
diff
changeset
|
346 wordstart = 0; |
20529
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
347 if (wordstart && wordstart != ZV) |
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
348 { |
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
349 wordstart_byte = CHAR_TO_BYTE (wordstart); |
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
350 if (FETCH_BYTE (wordstart_byte) == '-') |
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
351 del_range (wordstart, wordstart + 1); |
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
352 } |
146 | 353 } |
11503
9d8bb1074fd8
(Fexpand_abbrev): Add some error checking.
Karl Heuer <kwzh@gnu.org>
parents:
9294
diff
changeset
|
354 if (!wordstart) |
16039
855c8d8ba0f0
Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
355 wordstart = scan_words (PT, -1); |
146 | 356 |
357 if (!wordstart) | |
1021
22f807391bec
(Fexpand_abbrev): If pre-expand hook changes the buffer,
Richard M. Stallman <rms@gnu.org>
parents:
988
diff
changeset
|
358 return value; |
146 | 359 |
20529
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
360 wordstart_byte = CHAR_TO_BYTE (wordstart); |
146 | 361 wordend = scan_words (wordstart, 1); |
362 if (!wordend) | |
1021
22f807391bec
(Fexpand_abbrev): If pre-expand hook changes the buffer,
Richard M. Stallman <rms@gnu.org>
parents:
988
diff
changeset
|
363 return value; |
146 | 364 |
16039
855c8d8ba0f0
Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
365 if (wordend > PT) |
855c8d8ba0f0
Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
366 wordend = PT; |
20529
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
367 |
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
368 wordend_byte = CHAR_TO_BYTE (wordend); |
16039
855c8d8ba0f0
Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
369 whitecnt = PT - wordend; |
146 | 370 if (wordend <= wordstart) |
1021
22f807391bec
(Fexpand_abbrev): If pre-expand hook changes the buffer,
Richard M. Stallman <rms@gnu.org>
parents:
988
diff
changeset
|
371 return value; |
146 | 372 |
20529
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
373 p = buffer = (char *) alloca (wordend_byte - wordstart_byte); |
146 | 374 |
46965
711ccca26771
(Fexpand_abbrev): Fix for the multibyte case.
Kenichi Handa <handa@m17n.org>
parents:
46370
diff
changeset
|
375 for (idx = wordstart, idx_byte = wordstart_byte; idx < wordend; ) |
146 | 376 { |
46965
711ccca26771
(Fexpand_abbrev): Fix for the multibyte case.
Kenichi Handa <handa@m17n.org>
parents:
46370
diff
changeset
|
377 register int c; |
711ccca26771
(Fexpand_abbrev): Fix for the multibyte case.
Kenichi Handa <handa@m17n.org>
parents:
46370
diff
changeset
|
378 |
711ccca26771
(Fexpand_abbrev): Fix for the multibyte case.
Kenichi Handa <handa@m17n.org>
parents:
46370
diff
changeset
|
379 if (multibyte) |
711ccca26771
(Fexpand_abbrev): Fix for the multibyte case.
Kenichi Handa <handa@m17n.org>
parents:
46370
diff
changeset
|
380 { |
711ccca26771
(Fexpand_abbrev): Fix for the multibyte case.
Kenichi Handa <handa@m17n.org>
parents:
46370
diff
changeset
|
381 FETCH_CHAR_ADVANCE (c, idx, idx_byte); |
711ccca26771
(Fexpand_abbrev): Fix for the multibyte case.
Kenichi Handa <handa@m17n.org>
parents:
46370
diff
changeset
|
382 } |
711ccca26771
(Fexpand_abbrev): Fix for the multibyte case.
Kenichi Handa <handa@m17n.org>
parents:
46370
diff
changeset
|
383 else |
711ccca26771
(Fexpand_abbrev): Fix for the multibyte case.
Kenichi Handa <handa@m17n.org>
parents:
46370
diff
changeset
|
384 { |
711ccca26771
(Fexpand_abbrev): Fix for the multibyte case.
Kenichi Handa <handa@m17n.org>
parents:
46370
diff
changeset
|
385 c = FETCH_BYTE (idx_byte); |
711ccca26771
(Fexpand_abbrev): Fix for the multibyte case.
Kenichi Handa <handa@m17n.org>
parents:
46370
diff
changeset
|
386 idx++, idx_byte++; |
711ccca26771
(Fexpand_abbrev): Fix for the multibyte case.
Kenichi Handa <handa@m17n.org>
parents:
46370
diff
changeset
|
387 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46965
diff
changeset
|
388 |
146 | 389 if (UPPERCASEP (c)) |
390 c = DOWNCASE (c), uccount++; | |
391 else if (! NOCASEP (c)) | |
392 lccount++; | |
46965
711ccca26771
(Fexpand_abbrev): Fix for the multibyte case.
Kenichi Handa <handa@m17n.org>
parents:
46370
diff
changeset
|
393 if (multibyte) |
711ccca26771
(Fexpand_abbrev): Fix for the multibyte case.
Kenichi Handa <handa@m17n.org>
parents:
46370
diff
changeset
|
394 p += CHAR_STRING (c, p); |
711ccca26771
(Fexpand_abbrev): Fix for the multibyte case.
Kenichi Handa <handa@m17n.org>
parents:
46370
diff
changeset
|
395 else |
711ccca26771
(Fexpand_abbrev): Fix for the multibyte case.
Kenichi Handa <handa@m17n.org>
parents:
46370
diff
changeset
|
396 *p++ = c; |
146 | 397 } |
398 | |
9140
3e7833a8e16f
(Fdefine_abbrev, Fexpand_abbrev, Funexpand_abbrev): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9054
diff
changeset
|
399 if (VECTORP (current_buffer->abbrev_table)) |
20590
bf079eb81bd3
(Fexpand_abbrev): Pass both kinds of size to oblookup.
Richard M. Stallman <rms@gnu.org>
parents:
20554
diff
changeset
|
400 sym = oblookup (current_buffer->abbrev_table, buffer, |
46965
711ccca26771
(Fexpand_abbrev): Fix for the multibyte case.
Kenichi Handa <handa@m17n.org>
parents:
46370
diff
changeset
|
401 wordend - wordstart, p - buffer); |
146 | 402 else |
9294
4d083b72b3b1
(Fexpand_abbrev): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9260
diff
changeset
|
403 XSETFASTINT (sym, 0); |
42388
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
404 |
39584
6145836b795c
Use SYMBOL_VALUE/ SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents:
29742
diff
changeset
|
405 if (INTEGERP (sym) || NILP (SYMBOL_VALUE (sym))) |
20590
bf079eb81bd3
(Fexpand_abbrev): Pass both kinds of size to oblookup.
Richard M. Stallman <rms@gnu.org>
parents:
20554
diff
changeset
|
406 sym = oblookup (Vglobal_abbrev_table, buffer, |
46965
711ccca26771
(Fexpand_abbrev): Fix for the multibyte case.
Kenichi Handa <handa@m17n.org>
parents:
46370
diff
changeset
|
407 wordend - wordstart, p - buffer); |
39584
6145836b795c
Use SYMBOL_VALUE/ SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents:
29742
diff
changeset
|
408 if (INTEGERP (sym) || NILP (SYMBOL_VALUE (sym))) |
1021
22f807391bec
(Fexpand_abbrev): If pre-expand hook changes the buffer,
Richard M. Stallman <rms@gnu.org>
parents:
988
diff
changeset
|
409 return value; |
146 | 410 |
411 if (INTERACTIVE && !EQ (minibuf_window, selected_window)) | |
412 { | |
11554 | 413 /* Add an undo boundary, in case we are doing this for |
414 a self-inserting command which has avoided making one so far. */ | |
146 | 415 SET_PT (wordend); |
416 Fundo_boundary (); | |
417 } | |
16565
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
418 |
146 | 419 Vlast_abbrev_text |
420 = Fbuffer_substring (make_number (wordstart), make_number (wordend)); | |
421 | |
16565
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
422 /* Now sym is the abbrev symbol. */ |
146 | 423 Vlast_abbrev = sym; |
16747
126a42ee62ac
(Fexpand_abbrev): Return the abbrev symbol, or nil if no expansion.
Richard M. Stallman <rms@gnu.org>
parents:
16565
diff
changeset
|
424 value = sym; |
146 | 425 last_abbrev_point = wordstart; |
426 | |
42388
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
427 /* Increment use count. */ |
9140
3e7833a8e16f
(Fdefine_abbrev, Fexpand_abbrev, Funexpand_abbrev): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9054
diff
changeset
|
428 if (INTEGERP (XSYMBOL (sym)->plist)) |
146 | 429 XSETINT (XSYMBOL (sym)->plist, |
42388
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
430 XINT (XSYMBOL (sym)->plist) + 1); |
43671
b6abb8a7ea89
(Fexpand_abbrev): Increment plist as use count only if it is an integer.
Richard M. Stallman <rms@gnu.org>
parents:
42410
diff
changeset
|
431 else if (INTEGERP (tem = Fget (sym, Qcount))) |
42388
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
432 Fput (sym, Qcount, make_number (XINT (tem) + 1)); |
146 | 433 |
16565
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
434 /* If this abbrev has an expansion, delete the abbrev |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
435 and insert the expansion. */ |
39584
6145836b795c
Use SYMBOL_VALUE/ SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents:
29742
diff
changeset
|
436 expansion = SYMBOL_VALUE (sym); |
16565
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
437 if (STRINGP (expansion)) |
146 | 438 { |
16565
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
439 SET_PT (wordstart); |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
440 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
45391
diff
changeset
|
441 insert_from_string (expansion, 0, 0, SCHARS (expansion), |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
45391
diff
changeset
|
442 SBYTES (expansion), 1); |
52373
ddaae63bd193
(Fexpand_abbrev): Insert before deleting.
Richard M. Stallman <rms@gnu.org>
parents:
50625
diff
changeset
|
443 del_range_both (PT, PT_BYTE, |
ddaae63bd193
(Fexpand_abbrev): Insert before deleting.
Richard M. Stallman <rms@gnu.org>
parents:
50625
diff
changeset
|
444 wordend + (PT - wordstart), |
ddaae63bd193
(Fexpand_abbrev): Insert before deleting.
Richard M. Stallman <rms@gnu.org>
parents:
50625
diff
changeset
|
445 wordend_byte + (PT_BYTE - wordstart_byte), |
ddaae63bd193
(Fexpand_abbrev): Insert before deleting.
Richard M. Stallman <rms@gnu.org>
parents:
50625
diff
changeset
|
446 1); |
ddaae63bd193
(Fexpand_abbrev): Insert before deleting.
Richard M. Stallman <rms@gnu.org>
parents:
50625
diff
changeset
|
447 |
16565
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
448 SET_PT (PT + whitecnt); |
397 | 449 |
16565
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
450 if (uccount && !lccount) |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
451 { |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
452 /* Abbrev was all caps */ |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
453 /* If expansion is multiple words, normally capitalize each word */ |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
454 /* This used to be if (!... && ... >= ...) Fcapitalize; else Fupcase |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
455 but Megatest 68000 compiler can't handle that */ |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
456 if (!abbrev_all_caps) |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
457 if (scan_words (PT, -1) > scan_words (wordstart, 1)) |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
458 { |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
459 Fupcase_initials_region (make_number (wordstart), |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
460 make_number (PT)); |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
461 goto caped; |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
462 } |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
463 /* If expansion is one word, or if user says so, upcase it all. */ |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
464 Fupcase_region (make_number (wordstart), make_number (PT)); |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
465 caped: ; |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
466 } |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
467 else if (uccount) |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
468 { |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
469 /* Abbrev included some caps. Cap first initial of expansion */ |
20529
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
470 int pos = wordstart_byte; |
397 | 471 |
16565
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
472 /* Find the initial. */ |
20529
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
473 while (pos < PT_BYTE |
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
474 && SYNTAX (*BUF_BYTE_ADDRESS (current_buffer, pos)) != Sword) |
16565
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
475 pos++; |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
476 |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
477 /* Change just that. */ |
20529
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
478 pos = BYTE_TO_CHAR (pos); |
16565
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
479 Fupcase_initials_region (make_number (pos), make_number (pos + 1)); |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
480 } |
146 | 481 } |
482 | |
483 hook = XSYMBOL (sym)->function; | |
484 | 484 if (!NILP (hook)) |
27043
b5ce0c450409
(Fexpand_abbrev): If expanding an abbrev which has only
Gerd Moellmann <gerd@gnu.org>
parents:
25766
diff
changeset
|
485 { |
b5ce0c450409
(Fexpand_abbrev): If expanding an abbrev which has only
Gerd Moellmann <gerd@gnu.org>
parents:
25766
diff
changeset
|
486 Lisp_Object expanded, prop; |
b5ce0c450409
(Fexpand_abbrev): If expanding an abbrev which has only
Gerd Moellmann <gerd@gnu.org>
parents:
25766
diff
changeset
|
487 |
27379 | 488 /* If the abbrev has a hook function, run it. */ |
27043
b5ce0c450409
(Fexpand_abbrev): If expanding an abbrev which has only
Gerd Moellmann <gerd@gnu.org>
parents:
25766
diff
changeset
|
489 expanded = call0 (hook); |
27379 | 490 |
44851
ceafe18856c7
(abbrev-start-location): Doc fix.
Pavel Janík <Pavel@Janik.cz>
parents:
44739
diff
changeset
|
491 /* In addition, if the hook function is a symbol with |
ceafe18856c7
(abbrev-start-location): Doc fix.
Pavel Janík <Pavel@Janik.cz>
parents:
44739
diff
changeset
|
492 a non-nil `no-self-insert' property, let the value it returned |
27379 | 493 specify whether we consider that an expansion took place. If |
494 it returns nil, no expansion has been done. */ | |
495 | |
27043
b5ce0c450409
(Fexpand_abbrev): If expanding an abbrev which has only
Gerd Moellmann <gerd@gnu.org>
parents:
25766
diff
changeset
|
496 if (SYMBOLP (hook) |
b5ce0c450409
(Fexpand_abbrev): If expanding an abbrev which has only
Gerd Moellmann <gerd@gnu.org>
parents:
25766
diff
changeset
|
497 && NILP (expanded) |
b5ce0c450409
(Fexpand_abbrev): If expanding an abbrev which has only
Gerd Moellmann <gerd@gnu.org>
parents:
25766
diff
changeset
|
498 && (prop = Fget (hook, intern ("no-self-insert")), |
b5ce0c450409
(Fexpand_abbrev): If expanding an abbrev which has only
Gerd Moellmann <gerd@gnu.org>
parents:
25766
diff
changeset
|
499 !NILP (prop))) |
b5ce0c450409
(Fexpand_abbrev): If expanding an abbrev which has only
Gerd Moellmann <gerd@gnu.org>
parents:
25766
diff
changeset
|
500 value = Qnil; |
b5ce0c450409
(Fexpand_abbrev): If expanding an abbrev which has only
Gerd Moellmann <gerd@gnu.org>
parents:
25766
diff
changeset
|
501 } |
146 | 502 |
16747
126a42ee62ac
(Fexpand_abbrev): Return the abbrev symbol, or nil if no expansion.
Richard M. Stallman <rms@gnu.org>
parents:
16565
diff
changeset
|
503 return value; |
146 | 504 } |
505 | |
506 DEFUN ("unexpand-abbrev", Funexpand_abbrev, Sunexpand_abbrev, 0, 0, "", | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
507 doc: /* Undo the expansion of the last abbrev that expanded. |
39960
d0d7ddac8c5e
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39584
diff
changeset
|
508 This differs from ordinary undo in that other editing done since then |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
509 is not undone. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
510 () |
146 | 511 { |
16039
855c8d8ba0f0
Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
512 int opoint = PT; |
146 | 513 int adjust = 0; |
514 if (last_abbrev_point < BEGV | |
515 || last_abbrev_point > ZV) | |
516 return Qnil; | |
517 SET_PT (last_abbrev_point); | |
9140
3e7833a8e16f
(Fdefine_abbrev, Fexpand_abbrev, Funexpand_abbrev): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9054
diff
changeset
|
518 if (STRINGP (Vlast_abbrev_text)) |
146 | 519 { |
520 /* This isn't correct if Vlast_abbrev->function was used | |
521 to do the expansion */ | |
522 Lisp_Object val; | |
20529
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
523 int zv_before; |
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
524 |
39584
6145836b795c
Use SYMBOL_VALUE/ SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents:
29742
diff
changeset
|
525 val = SYMBOL_VALUE (Vlast_abbrev); |
9140
3e7833a8e16f
(Fdefine_abbrev, Fexpand_abbrev, Funexpand_abbrev): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9054
diff
changeset
|
526 if (!STRINGP (val)) |
63693
3b481dca1cd5
(Funexpand_abbrev): Follow error conventions.
Juanma Barranquero <lekktu@gmail.com>
parents:
56564
diff
changeset
|
527 error ("Value of `abbrev-symbol' must be a string"); |
20529
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
528 zv_before = ZV; |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
45391
diff
changeset
|
529 del_range_byte (PT_BYTE, PT_BYTE + SBYTES (val), 1); |
4717
5297e155e1d2
(Funexpand_abbrev, Fexpand_abbrev): Pass new arg to insert_from_string.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
530 /* Don't inherit properties here; just copy from old contents. */ |
20590
bf079eb81bd3
(Fexpand_abbrev): Pass both kinds of size to oblookup.
Richard M. Stallman <rms@gnu.org>
parents:
20554
diff
changeset
|
531 insert_from_string (Vlast_abbrev_text, 0, 0, |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
45391
diff
changeset
|
532 SCHARS (Vlast_abbrev_text), |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
45391
diff
changeset
|
533 SBYTES (Vlast_abbrev_text), 0); |
146 | 534 Vlast_abbrev_text = Qnil; |
20529
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
535 /* Total number of characters deleted. */ |
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
536 adjust = ZV - zv_before; |
146 | 537 } |
22909
c8e47ec53eb6
(Funexpand_abbrev): Add ADJUST instead of subtracting.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
538 SET_PT (last_abbrev_point < opoint ? opoint + adjust : opoint); |
146 | 539 return Qnil; |
540 } | |
541 | |
20529
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
542 static void |
146 | 543 write_abbrev (sym, stream) |
544 Lisp_Object sym, stream; | |
545 { | |
42388
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
546 Lisp_Object name, count, system_flag; |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
547 |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
548 if (INTEGERP (XSYMBOL (sym)->plist)) |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
549 { |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
550 count = XSYMBOL (sym)->plist; |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
551 system_flag = Qnil; |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
552 } |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
553 else |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
554 { |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
555 count = Fget (sym, Qcount); |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
556 system_flag = Fget (sym, Qsystem_type); |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
557 } |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
558 |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
559 if (NILP (SYMBOL_VALUE (sym)) || ! NILP (system_flag)) |
146 | 560 return; |
42388
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
561 |
146 | 562 insert (" (", 5); |
45391
6c875925d507
* abbrev.c (write_abbrev): Use SYMBOL_NAME instead of XSYMBOL and
Ken Raeburn <raeburn@raeburn.org>
parents:
44851
diff
changeset
|
563 name = SYMBOL_NAME (sym); |
146 | 564 Fprin1 (name, stream); |
565 insert (" ", 1); | |
39584
6145836b795c
Use SYMBOL_VALUE/ SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents:
29742
diff
changeset
|
566 Fprin1 (SYMBOL_VALUE (sym), stream); |
146 | 567 insert (" ", 1); |
568 Fprin1 (XSYMBOL (sym)->function, stream); | |
569 insert (" ", 1); | |
42388
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
570 Fprin1 (count, stream); |
146 | 571 insert (")\n", 2); |
572 } | |
573 | |
20529
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
574 static void |
146 | 575 describe_abbrev (sym, stream) |
576 Lisp_Object sym, stream; | |
577 { | |
42388
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
578 Lisp_Object one, count, system_flag; |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
579 |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
580 if (INTEGERP (XSYMBOL (sym)->plist)) |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
581 { |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
582 count = XSYMBOL (sym)->plist; |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
583 system_flag = Qnil; |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
584 } |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
585 else |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
586 { |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
587 count = Fget (sym, Qcount); |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
588 system_flag = Fget (sym, Qsystem_type); |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
589 } |
146 | 590 |
39584
6145836b795c
Use SYMBOL_VALUE/ SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents:
29742
diff
changeset
|
591 if (NILP (SYMBOL_VALUE (sym))) |
146 | 592 return; |
42388
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
593 |
146 | 594 one = make_number (1); |
595 Fprin1 (Fsymbol_name (sym), stream); | |
42388
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
596 |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
597 if (!NILP (system_flag)) |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
598 { |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
599 insert_string (" (sys)"); |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
600 Findent_to (make_number (20), one); |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
601 } |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
602 else |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
603 Findent_to (make_number (15), one); |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
604 |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
605 Fprin1 (count, stream); |
146 | 606 Findent_to (make_number (20), one); |
39584
6145836b795c
Use SYMBOL_VALUE/ SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents:
29742
diff
changeset
|
607 Fprin1 (SYMBOL_VALUE (sym), stream); |
484 | 608 if (!NILP (XSYMBOL (sym)->function)) |
146 | 609 { |
610 Findent_to (make_number (45), one); | |
611 Fprin1 (XSYMBOL (sym)->function, stream); | |
612 } | |
613 Fterpri (stream); | |
614 } | |
615 | |
70082
bf366f314d5b
(Finsert_abbrev_table_description): Sort the abbrevs alphabetically.
Richard M. Stallman <rms@gnu.org>
parents:
68651
diff
changeset
|
616 static void |
bf366f314d5b
(Finsert_abbrev_table_description): Sort the abbrevs alphabetically.
Richard M. Stallman <rms@gnu.org>
parents:
68651
diff
changeset
|
617 record_symbol (sym, list) |
bf366f314d5b
(Finsert_abbrev_table_description): Sort the abbrevs alphabetically.
Richard M. Stallman <rms@gnu.org>
parents:
68651
diff
changeset
|
618 Lisp_Object sym, list; |
bf366f314d5b
(Finsert_abbrev_table_description): Sort the abbrevs alphabetically.
Richard M. Stallman <rms@gnu.org>
parents:
68651
diff
changeset
|
619 { |
bf366f314d5b
(Finsert_abbrev_table_description): Sort the abbrevs alphabetically.
Richard M. Stallman <rms@gnu.org>
parents:
68651
diff
changeset
|
620 XSETCDR (list, Fcons (sym, XCDR (list))); |
bf366f314d5b
(Finsert_abbrev_table_description): Sort the abbrevs alphabetically.
Richard M. Stallman <rms@gnu.org>
parents:
68651
diff
changeset
|
621 } |
bf366f314d5b
(Finsert_abbrev_table_description): Sort the abbrevs alphabetically.
Richard M. Stallman <rms@gnu.org>
parents:
68651
diff
changeset
|
622 |
16485
9b919c5464a4
Reorganize function definitions so etags finds them.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
623 DEFUN ("insert-abbrev-table-description", Finsert_abbrev_table_description, |
40109
d641fcc16219
(Finsert_abbrev_table_description): Reindent.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
624 Sinsert_abbrev_table_description, 1, 2, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
625 doc: /* Insert before point a full description of abbrev table named NAME. |
39960
d0d7ddac8c5e
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39584
diff
changeset
|
626 NAME is a symbol whose value is an abbrev table. |
d0d7ddac8c5e
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39584
diff
changeset
|
627 If optional 2nd arg READABLE is non-nil, a human-readable description |
d0d7ddac8c5e
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39584
diff
changeset
|
628 is inserted. Otherwise the description is an expression, |
d0d7ddac8c5e
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39584
diff
changeset
|
629 a call to `define-abbrev-table', which would |
42388
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
630 define the abbrev table NAME exactly as it is currently defined. |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
631 |
54135
bd296510f5b7
(Finsert_abbrev_table_description): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
632 Abbrevs marked as "system abbrevs" are normally omitted. However, if |
bd296510f5b7
(Finsert_abbrev_table_description): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
633 READABLE is non-nil, they are listed. */) |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
634 (name, readable) |
146 | 635 Lisp_Object name, readable; |
636 { | |
637 Lisp_Object table; | |
70082
bf366f314d5b
(Finsert_abbrev_table_description): Sort the abbrevs alphabetically.
Richard M. Stallman <rms@gnu.org>
parents:
68651
diff
changeset
|
638 Lisp_Object symbols; |
146 | 639 Lisp_Object stream; |
640 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40109
diff
changeset
|
641 CHECK_SYMBOL (name); |
146 | 642 table = Fsymbol_value (name); |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40109
diff
changeset
|
643 CHECK_VECTOR (table); |
146 | 644 |
9260
945ddb4e9e24
(write_abbrev, Finsert_abbrev_table_description): Use new accessor macros
Karl Heuer <kwzh@gnu.org>
parents:
9140
diff
changeset
|
645 XSETBUFFER (stream, current_buffer); |
146 | 646 |
70082
bf366f314d5b
(Finsert_abbrev_table_description): Sort the abbrevs alphabetically.
Richard M. Stallman <rms@gnu.org>
parents:
68651
diff
changeset
|
647 symbols = Fcons (Qnil, Qnil); |
bf366f314d5b
(Finsert_abbrev_table_description): Sort the abbrevs alphabetically.
Richard M. Stallman <rms@gnu.org>
parents:
68651
diff
changeset
|
648 map_obarray (table, record_symbol, symbols); |
bf366f314d5b
(Finsert_abbrev_table_description): Sort the abbrevs alphabetically.
Richard M. Stallman <rms@gnu.org>
parents:
68651
diff
changeset
|
649 symbols = XCDR (symbols); |
bf366f314d5b
(Finsert_abbrev_table_description): Sort the abbrevs alphabetically.
Richard M. Stallman <rms@gnu.org>
parents:
68651
diff
changeset
|
650 symbols = Fsort (symbols, Qstring_lessp); |
bf366f314d5b
(Finsert_abbrev_table_description): Sort the abbrevs alphabetically.
Richard M. Stallman <rms@gnu.org>
parents:
68651
diff
changeset
|
651 |
484 | 652 if (!NILP (readable)) |
146 | 653 { |
654 insert_string ("("); | |
655 Fprin1 (name, stream); | |
656 insert_string (")\n\n"); | |
70082
bf366f314d5b
(Finsert_abbrev_table_description): Sort the abbrevs alphabetically.
Richard M. Stallman <rms@gnu.org>
parents:
68651
diff
changeset
|
657 while (! NILP (symbols)) |
bf366f314d5b
(Finsert_abbrev_table_description): Sort the abbrevs alphabetically.
Richard M. Stallman <rms@gnu.org>
parents:
68651
diff
changeset
|
658 { |
bf366f314d5b
(Finsert_abbrev_table_description): Sort the abbrevs alphabetically.
Richard M. Stallman <rms@gnu.org>
parents:
68651
diff
changeset
|
659 describe_abbrev (XCAR (symbols), stream); |
bf366f314d5b
(Finsert_abbrev_table_description): Sort the abbrevs alphabetically.
Richard M. Stallman <rms@gnu.org>
parents:
68651
diff
changeset
|
660 symbols = XCDR (symbols); |
bf366f314d5b
(Finsert_abbrev_table_description): Sort the abbrevs alphabetically.
Richard M. Stallman <rms@gnu.org>
parents:
68651
diff
changeset
|
661 } |
bf366f314d5b
(Finsert_abbrev_table_description): Sort the abbrevs alphabetically.
Richard M. Stallman <rms@gnu.org>
parents:
68651
diff
changeset
|
662 |
146 | 663 insert_string ("\n\n"); |
664 } | |
665 else | |
666 { | |
667 insert_string ("(define-abbrev-table '"); | |
668 Fprin1 (name, stream); | |
669 insert_string (" '(\n"); | |
70082
bf366f314d5b
(Finsert_abbrev_table_description): Sort the abbrevs alphabetically.
Richard M. Stallman <rms@gnu.org>
parents:
68651
diff
changeset
|
670 while (! NILP (symbols)) |
bf366f314d5b
(Finsert_abbrev_table_description): Sort the abbrevs alphabetically.
Richard M. Stallman <rms@gnu.org>
parents:
68651
diff
changeset
|
671 { |
bf366f314d5b
(Finsert_abbrev_table_description): Sort the abbrevs alphabetically.
Richard M. Stallman <rms@gnu.org>
parents:
68651
diff
changeset
|
672 write_abbrev (XCAR (symbols), stream); |
bf366f314d5b
(Finsert_abbrev_table_description): Sort the abbrevs alphabetically.
Richard M. Stallman <rms@gnu.org>
parents:
68651
diff
changeset
|
673 symbols = XCDR (symbols); |
bf366f314d5b
(Finsert_abbrev_table_description): Sort the abbrevs alphabetically.
Richard M. Stallman <rms@gnu.org>
parents:
68651
diff
changeset
|
674 } |
146 | 675 insert_string (" ))\n\n"); |
676 } | |
677 | |
678 return Qnil; | |
679 } | |
680 | |
681 DEFUN ("define-abbrev-table", Fdefine_abbrev_table, Sdefine_abbrev_table, | |
682 2, 2, 0, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
683 doc: /* Define TABLENAME (a symbol) as an abbrev table name. |
39960
d0d7ddac8c5e
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39584
diff
changeset
|
684 Define abbrevs in it according to DEFINITIONS, which is a list of elements |
42388
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
685 of the form (ABBREVNAME EXPANSION HOOK USECOUNT SYSTEMFLAG). |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
686 \(If the list is shorter than that, omitted elements default to nil). */) |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
687 (tablename, definitions) |
14098
aa682cae5c89
(Fdefine_abbrev_table): Fix previous change.
Karl Heuer <kwzh@gnu.org>
parents:
14059
diff
changeset
|
688 Lisp_Object tablename, definitions; |
146 | 689 { |
690 Lisp_Object name, exp, hook, count; | |
42388
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
691 Lisp_Object table, elt, sys; |
146 | 692 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40109
diff
changeset
|
693 CHECK_SYMBOL (tablename); |
14059
1303d585443b
(Fdefine_global_abbrev, Fdefine_mode_abbrev, Fabbrev_symbol,
Erik Naggum <erik@naggum.no>
parents:
12091
diff
changeset
|
694 table = Fboundp (tablename); |
1303d585443b
(Fdefine_global_abbrev, Fdefine_mode_abbrev, Fabbrev_symbol,
Erik Naggum <erik@naggum.no>
parents:
12091
diff
changeset
|
695 if (NILP (table) || (table = Fsymbol_value (tablename), NILP (table))) |
146 | 696 { |
697 table = Fmake_abbrev_table (); | |
14059
1303d585443b
(Fdefine_global_abbrev, Fdefine_mode_abbrev, Fabbrev_symbol,
Erik Naggum <erik@naggum.no>
parents:
12091
diff
changeset
|
698 Fset (tablename, table); |
14098
aa682cae5c89
(Fdefine_abbrev_table): Fix previous change.
Karl Heuer <kwzh@gnu.org>
parents:
14059
diff
changeset
|
699 Vabbrev_table_name_list = Fcons (tablename, Vabbrev_table_name_list); |
146 | 700 } |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40109
diff
changeset
|
701 CHECK_VECTOR (table); |
146 | 702 |
50625
804e6ed7ce2c
(Fdefine_abbrev_table): Use XCAR, XCDR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49600
diff
changeset
|
703 for (; CONSP (definitions); definitions = XCDR (definitions)) |
146 | 704 { |
50625
804e6ed7ce2c
(Fdefine_abbrev_table): Use XCAR, XCDR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49600
diff
changeset
|
705 elt = XCAR (definitions); |
988
341171b49f96
* abbrev.c (Fdefine_abbrev_table): Fiddled with formatting.
Jim Blandy <jimb@redhat.com>
parents:
484
diff
changeset
|
706 name = Fcar (elt); elt = Fcdr (elt); |
341171b49f96
* abbrev.c (Fdefine_abbrev_table): Fiddled with formatting.
Jim Blandy <jimb@redhat.com>
parents:
484
diff
changeset
|
707 exp = Fcar (elt); elt = Fcdr (elt); |
341171b49f96
* abbrev.c (Fdefine_abbrev_table): Fiddled with formatting.
Jim Blandy <jimb@redhat.com>
parents:
484
diff
changeset
|
708 hook = Fcar (elt); elt = Fcdr (elt); |
42388
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
709 count = Fcar (elt); elt = Fcdr (elt); |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
710 sys = Fcar (elt); |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
711 Fdefine_abbrev (table, name, exp, hook, count, sys); |
146 | 712 } |
713 return Qnil; | |
714 } | |
715 | |
21514 | 716 void |
146 | 717 syms_of_abbrev () |
718 { | |
42388
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
719 Qsystem_type = intern ("system-type"); |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
720 staticpro (&Qsystem_type); |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
721 |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
722 Qcount = intern ("count"); |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
723 staticpro (&Qcount); |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
724 |
74435 | 725 Qforce = intern ("force"); |
726 staticpro (&Qforce); | |
727 | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
728 DEFVAR_LISP ("abbrev-table-name-list", &Vabbrev_table_name_list, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
729 doc: /* List of symbols whose values are abbrev tables. */); |
146 | 730 Vabbrev_table_name_list = Fcons (intern ("fundamental-mode-abbrev-table"), |
731 Fcons (intern ("global-abbrev-table"), | |
732 Qnil)); | |
733 | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
734 DEFVAR_LISP ("global-abbrev-table", &Vglobal_abbrev_table, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
735 doc: /* The abbrev table whose abbrevs affect all buffers. |
39960
d0d7ddac8c5e
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39584
diff
changeset
|
736 Each buffer may also have a local abbrev table. |
d0d7ddac8c5e
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39584
diff
changeset
|
737 If it does, the local table overrides the global one |
d0d7ddac8c5e
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39584
diff
changeset
|
738 for any particular abbrev defined in both. */); |
146 | 739 Vglobal_abbrev_table = Fmake_abbrev_table (); |
740 | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
741 DEFVAR_LISP ("fundamental-mode-abbrev-table", &Vfundamental_mode_abbrev_table, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
742 doc: /* The abbrev table of mode-specific abbrevs for Fundamental Mode. */); |
146 | 743 Vfundamental_mode_abbrev_table = Fmake_abbrev_table (); |
744 current_buffer->abbrev_table = Vfundamental_mode_abbrev_table; | |
29742
47ad175d6357
(syms_of_abbrev): Set buffer_default's abbrev table
Gerd Moellmann <gerd@gnu.org>
parents:
27379
diff
changeset
|
745 buffer_defaults.abbrev_table = Vfundamental_mode_abbrev_table; |
146 | 746 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
747 DEFVAR_LISP ("last-abbrev", &Vlast_abbrev, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
748 doc: /* The abbrev-symbol of the last abbrev expanded. See `abbrev-symbol'. */); |
146 | 749 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
750 DEFVAR_LISP ("last-abbrev-text", &Vlast_abbrev_text, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
751 doc: /* The exact text of the last abbrev expanded. |
74564
923024cc1279
(syms_of_abbrev) <last-abbrev-text>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
74435
diff
changeset
|
752 A value of nil means the abbrev has already been unexpanded. */); |
146 | 753 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
754 DEFVAR_INT ("last-abbrev-location", &last_abbrev_point, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
755 doc: /* The location of the start of the last abbrev expanded. */); |
146 | 756 |
757 Vlast_abbrev = Qnil; | |
758 Vlast_abbrev_text = Qnil; | |
759 last_abbrev_point = 0; | |
760 | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
761 DEFVAR_LISP ("abbrev-start-location", &Vabbrev_start_location, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
762 doc: /* Buffer position for `expand-abbrev' to use as the start of the abbrev. |
44851
ceafe18856c7
(abbrev-start-location): Doc fix.
Pavel Janík <Pavel@Janik.cz>
parents:
44739
diff
changeset
|
763 When nil, use the word before point as the abbrev. |
39960
d0d7ddac8c5e
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39584
diff
changeset
|
764 Calling `expand-abbrev' sets this to nil. */); |
146 | 765 Vabbrev_start_location = Qnil; |
766 | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
767 DEFVAR_LISP ("abbrev-start-location-buffer", &Vabbrev_start_location_buffer, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
768 doc: /* Buffer that `abbrev-start-location' has been set for. |
39960
d0d7ddac8c5e
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39584
diff
changeset
|
769 Trying to expand an abbrev in any other buffer clears `abbrev-start-location'. */); |
146 | 770 Vabbrev_start_location_buffer = Qnil; |
771 | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
772 DEFVAR_PER_BUFFER ("local-abbrev-table", ¤t_buffer->abbrev_table, Qnil, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
773 doc: /* Local (mode-specific) abbrev table of current buffer. */); |
146 | 774 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
775 DEFVAR_BOOL ("abbrevs-changed", &abbrevs_changed, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
776 doc: /* Set non-nil by defining or altering any word abbrevs. |
39960
d0d7ddac8c5e
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39584
diff
changeset
|
777 This causes `save-some-buffers' to offer to save the abbrevs. */); |
146 | 778 abbrevs_changed = 0; |
779 | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
780 DEFVAR_BOOL ("abbrev-all-caps", &abbrev_all_caps, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
781 doc: /* *Set non-nil means expand multi-word abbrevs all caps if abbrev was so. */); |
146 | 782 abbrev_all_caps = 0; |
783 | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
784 DEFVAR_LISP ("pre-abbrev-expand-hook", &Vpre_abbrev_expand_hook, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
785 doc: /* Function or functions to be called before abbrev expansion is done. |
39960
d0d7ddac8c5e
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39584
diff
changeset
|
786 This is the first thing that `expand-abbrev' does, and so this may change |
d0d7ddac8c5e
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39584
diff
changeset
|
787 the current abbrev table before abbrev lookup happens. */); |
458
8f18e7e89008
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
397
diff
changeset
|
788 Vpre_abbrev_expand_hook = Qnil; |
8f18e7e89008
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
397
diff
changeset
|
789 Qpre_abbrev_expand_hook = intern ("pre-abbrev-expand-hook"); |
8f18e7e89008
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
397
diff
changeset
|
790 staticpro (&Qpre_abbrev_expand_hook); |
8f18e7e89008
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
397
diff
changeset
|
791 |
146 | 792 defsubr (&Smake_abbrev_table); |
793 defsubr (&Sclear_abbrev_table); | |
794 defsubr (&Sdefine_abbrev); | |
795 defsubr (&Sdefine_global_abbrev); | |
796 defsubr (&Sdefine_mode_abbrev); | |
797 defsubr (&Sabbrev_expansion); | |
798 defsubr (&Sabbrev_symbol); | |
799 defsubr (&Sexpand_abbrev); | |
800 defsubr (&Sunexpand_abbrev); | |
801 defsubr (&Sinsert_abbrev_table_description); | |
802 defsubr (&Sdefine_abbrev_table); | |
803 } | |
52401 | 804 |
805 /* arch-tag: b721db69-f633-44a8-a361-c275acbdad7d | |
806 (do not change this comment) */ |