Mercurial > emacs
annotate src/abbrev.c @ 89268:09a99ad41f97
("fontset-default"): Add an entry for `indian-is13194' charset.
author | Kenichi Handa <handa@m17n.org> |
---|---|
date | Wed, 30 Oct 2002 01:20:15 +0000 |
parents | 98dcb14bf34c |
children | 2f877ed80fa6 |
rev | line source |
---|---|
146 | 1 /* Primitives for word-abbrev mode. |
39584
6145836b795c
Use SYMBOL_VALUE/ SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents:
29742
diff
changeset
|
2 Copyright (C) 1985, 1986, 1993, 1996, 1998, 2001 |
6145836b795c
Use SYMBOL_VALUE/ SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents:
29742
diff
changeset
|
3 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 | |
1023
d31e1e0844aa
* abbrev.c (syms_of_abbrev): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
1021
diff
changeset
|
9 the Free Software Foundation; either version 2, 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 | |
14186
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14098
diff
changeset
|
19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14098
diff
changeset
|
20 Boston, MA 02111-1307, 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" | |
88351
aac41b50c875
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
42410
diff
changeset
|
30 #include "character.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 | |
80 int last_abbrev_point; | |
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 |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
86 Lisp_Object Qsystem_type, Qcount; |
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 { |
92 return Fmake_vector (make_number (59), make_number (0)); | |
93 } | |
94 | |
95 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
|
96 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
|
97 (table) |
146 | 98 Lisp_Object table; |
99 { | |
100 int i, size; | |
101 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40109
diff
changeset
|
102 CHECK_VECTOR (table); |
146 | 103 size = XVECTOR (table)->size; |
104 abbrevs_changed = 1; | |
105 for (i = 0; i < size; i++) | |
106 XVECTOR (table)->contents[i] = make_number (0); | |
107 return Qnil; | |
108 } | |
109 | |
42388
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
110 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
|
111 doc: /* Define an abbrev in TABLE named NAME, to expand to EXPANSION and call HOOK. |
39960
d0d7ddac8c5e
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39584
diff
changeset
|
112 NAME must be a string. |
d0d7ddac8c5e
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39584
diff
changeset
|
113 EXPANSION should usually be a string. |
d0d7ddac8c5e
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39584
diff
changeset
|
114 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
|
115 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
|
116 it is called after EXPANSION is inserted. |
d0d7ddac8c5e
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39584
diff
changeset
|
117 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
|
118 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
|
119 |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
120 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
|
121 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
|
122 \(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
|
123 |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
124 SYSTEM-FLAG, if non-nil, says that this is a "system" abbreviation |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
125 which should not be saved in the user's abbreviation file. */) |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
126 (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
|
127 Lisp_Object table, name, expansion, hook, count, system_flag; |
146 | 128 { |
129 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
|
130 CHECK_VECTOR (table); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40109
diff
changeset
|
131 CHECK_STRING (name); |
16565
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
132 |
484 | 133 if (NILP (count)) |
146 | 134 count = make_number (0); |
135 else | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40109
diff
changeset
|
136 CHECK_NUMBER (count); |
146 | 137 |
138 sym = Fintern (name, table); | |
139 | |
39584
6145836b795c
Use SYMBOL_VALUE/ SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents:
29742
diff
changeset
|
140 oexp = SYMBOL_VALUE (sym); |
146 | 141 ohook = XSYMBOL (sym)->function; |
142 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
|
143 || (STRINGP (oexp) && STRINGP (expansion) |
484 | 144 && (tem = Fstring_equal (oexp, expansion), !NILP (tem)))) |
146 | 145 && |
146 (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
|
147 || (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
|
148 && NILP (system_flag)) |
146 | 149 abbrevs_changed = 1; |
150 | |
151 Fset (sym, expansion); | |
152 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
|
153 |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
154 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
|
155 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
|
156 else |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
157 Fsetplist (sym, count); |
146 | 158 |
159 return name; | |
160 } | |
161 | |
162 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
|
163 "sDefine global abbrev: \nsExpansion for %s: ", |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
164 doc: /* Define ABBREV as a global abbreviation for EXPANSION. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
165 (abbrev, expansion) |
14059
1303d585443b
(Fdefine_global_abbrev, Fdefine_mode_abbrev, Fabbrev_symbol,
Erik Naggum <erik@naggum.no>
parents:
12091
diff
changeset
|
166 Lisp_Object abbrev, expansion; |
146 | 167 { |
14059
1303d585443b
(Fdefine_global_abbrev, Fdefine_mode_abbrev, Fabbrev_symbol,
Erik Naggum <erik@naggum.no>
parents:
12091
diff
changeset
|
168 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
|
169 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
|
170 return abbrev; |
146 | 171 } |
172 | |
173 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
|
174 "sDefine mode abbrev: \nsExpansion for %s: ", |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
175 doc: /* Define ABBREV as a mode-specific abbreviation for EXPANSION. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
176 (abbrev, expansion) |
14059
1303d585443b
(Fdefine_global_abbrev, Fdefine_mode_abbrev, Fabbrev_symbol,
Erik Naggum <erik@naggum.no>
parents:
12091
diff
changeset
|
177 Lisp_Object abbrev, expansion; |
146 | 178 { |
484 | 179 if (NILP (current_buffer->abbrev_table)) |
146 | 180 error ("Major mode has no abbrev table"); |
181 | |
14059
1303d585443b
(Fdefine_global_abbrev, Fdefine_mode_abbrev, Fabbrev_symbol,
Erik Naggum <erik@naggum.no>
parents:
12091
diff
changeset
|
182 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
|
183 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
|
184 return abbrev; |
146 | 185 } |
186 | |
187 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
|
188 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
|
189 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
|
190 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
|
191 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
|
192 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
|
193 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
|
194 (abbrev, table) |
146 | 195 Lisp_Object abbrev, table; |
196 { | |
197 Lisp_Object sym; | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40109
diff
changeset
|
198 CHECK_STRING (abbrev); |
484 | 199 if (!NILP (table)) |
146 | 200 sym = Fintern_soft (abbrev, table); |
201 else | |
202 { | |
203 sym = Qnil; | |
484 | 204 if (!NILP (current_buffer->abbrev_table)) |
146 | 205 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
|
206 if (NILP (SYMBOL_VALUE (sym))) |
146 | 207 sym = Qnil; |
484 | 208 if (NILP (sym)) |
146 | 209 sym = Fintern_soft (abbrev, Vglobal_abbrev_table); |
210 } | |
39584
6145836b795c
Use SYMBOL_VALUE/ SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents:
29742
diff
changeset
|
211 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
|
212 return Qnil; |
146 | 213 return sym; |
214 } | |
215 | |
216 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
|
217 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
|
218 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
|
219 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
|
220 (abbrev, table) |
146 | 221 Lisp_Object abbrev, table; |
222 { | |
223 Lisp_Object sym; | |
224 sym = Fabbrev_symbol (abbrev, table); | |
484 | 225 if (NILP (sym)) return sym; |
146 | 226 return Fsymbol_value (sym); |
227 } | |
228 | |
229 /* Expand the word before point, if it is an abbrev. | |
230 Returns 1 if an expansion is done. */ | |
231 | |
232 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
|
233 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
|
234 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
|
235 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
|
236 () |
146 | 237 { |
238 register char *buffer, *p; | |
20529
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
239 int wordstart, wordend; |
89024
b09549c9663c
(Fexpand_abbrev): Fix for the multibyte case.
Kenichi Handa <handa@m17n.org>
parents:
88351
diff
changeset
|
240 register int wordstart_byte, wordend_byte, idx, idx_byte; |
146 | 241 int whitecnt; |
242 int uccount = 0, lccount = 0; | |
243 register Lisp_Object sym; | |
244 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
|
245 Lisp_Object value; |
89024
b09549c9663c
(Fexpand_abbrev): Fix for the multibyte case.
Kenichi Handa <handa@m17n.org>
parents:
88351
diff
changeset
|
246 int multibyte = ! NILP (current_buffer->enable_multibyte_characters); |
146 | 247 |
16747
126a42ee62ac
(Fexpand_abbrev): Return the abbrev symbol, or nil if no expansion.
Richard M. Stallman <rms@gnu.org>
parents:
16565
diff
changeset
|
248 value = Qnil; |
126a42ee62ac
(Fexpand_abbrev): Return the abbrev symbol, or nil if no expansion.
Richard M. Stallman <rms@gnu.org>
parents:
16565
diff
changeset
|
249 |
41522
ee8692067cf0
(Fexpand_abbrev): Use Frun_hooks instead of Vrun_hooks.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
250 Frun_hooks (1, &Qpre_abbrev_expand_hook); |
458
8f18e7e89008
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
397
diff
changeset
|
251 |
11503
9d8bb1074fd8
(Fexpand_abbrev): Add some error checking.
Karl Heuer <kwzh@gnu.org>
parents:
9294
diff
changeset
|
252 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
|
253 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
|
254 && XBUFFER (Vabbrev_start_location_buffer) == current_buffer)) |
146 | 255 Vabbrev_start_location = Qnil; |
484 | 256 if (!NILP (Vabbrev_start_location)) |
146 | 257 { |
258 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
|
259 CHECK_NUMBER_COERCE_MARKER (tem); |
146 | 260 wordstart = XINT (tem); |
261 Vabbrev_start_location = Qnil; | |
11503
9d8bb1074fd8
(Fexpand_abbrev): Add some error checking.
Karl Heuer <kwzh@gnu.org>
parents:
9294
diff
changeset
|
262 if (wordstart < BEGV || wordstart > ZV) |
9d8bb1074fd8
(Fexpand_abbrev): Add some error checking.
Karl Heuer <kwzh@gnu.org>
parents:
9294
diff
changeset
|
263 wordstart = 0; |
20529
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
264 if (wordstart && wordstart != ZV) |
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
265 { |
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
266 wordstart_byte = CHAR_TO_BYTE (wordstart); |
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
267 if (FETCH_BYTE (wordstart_byte) == '-') |
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
268 del_range (wordstart, wordstart + 1); |
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
269 } |
146 | 270 } |
11503
9d8bb1074fd8
(Fexpand_abbrev): Add some error checking.
Karl Heuer <kwzh@gnu.org>
parents:
9294
diff
changeset
|
271 if (!wordstart) |
16039
855c8d8ba0f0
Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
272 wordstart = scan_words (PT, -1); |
146 | 273 |
274 if (!wordstart) | |
1021
22f807391bec
(Fexpand_abbrev): If pre-expand hook changes the buffer,
Richard M. Stallman <rms@gnu.org>
parents:
988
diff
changeset
|
275 return value; |
146 | 276 |
20529
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
277 wordstart_byte = CHAR_TO_BYTE (wordstart); |
146 | 278 wordend = scan_words (wordstart, 1); |
279 if (!wordend) | |
1021
22f807391bec
(Fexpand_abbrev): If pre-expand hook changes the buffer,
Richard M. Stallman <rms@gnu.org>
parents:
988
diff
changeset
|
280 return value; |
146 | 281 |
16039
855c8d8ba0f0
Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
282 if (wordend > PT) |
855c8d8ba0f0
Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
283 wordend = PT; |
20529
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
284 |
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
285 wordend_byte = CHAR_TO_BYTE (wordend); |
16039
855c8d8ba0f0
Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
286 whitecnt = PT - wordend; |
146 | 287 if (wordend <= wordstart) |
1021
22f807391bec
(Fexpand_abbrev): If pre-expand hook changes the buffer,
Richard M. Stallman <rms@gnu.org>
parents:
988
diff
changeset
|
288 return value; |
146 | 289 |
20529
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
290 p = buffer = (char *) alloca (wordend_byte - wordstart_byte); |
146 | 291 |
89024
b09549c9663c
(Fexpand_abbrev): Fix for the multibyte case.
Kenichi Handa <handa@m17n.org>
parents:
88351
diff
changeset
|
292 for (idx = wordstart, idx_byte = wordstart_byte; idx < wordend;) |
146 | 293 { |
89024
b09549c9663c
(Fexpand_abbrev): Fix for the multibyte case.
Kenichi Handa <handa@m17n.org>
parents:
88351
diff
changeset
|
294 register int c; |
b09549c9663c
(Fexpand_abbrev): Fix for the multibyte case.
Kenichi Handa <handa@m17n.org>
parents:
88351
diff
changeset
|
295 |
b09549c9663c
(Fexpand_abbrev): Fix for the multibyte case.
Kenichi Handa <handa@m17n.org>
parents:
88351
diff
changeset
|
296 FETCH_CHAR_ADVANCE (c, idx, idx_byte); |
b09549c9663c
(Fexpand_abbrev): Fix for the multibyte case.
Kenichi Handa <handa@m17n.org>
parents:
88351
diff
changeset
|
297 if (! multibyte) |
89051
98dcb14bf34c
(Fexpand_abbrev): Convert a unibyte character to
Kenichi Handa <handa@m17n.org>
parents:
89024
diff
changeset
|
298 MAKE_CHAR_MULTIBYTE (c); |
89024
b09549c9663c
(Fexpand_abbrev): Fix for the multibyte case.
Kenichi Handa <handa@m17n.org>
parents:
88351
diff
changeset
|
299 |
146 | 300 if (UPPERCASEP (c)) |
301 c = DOWNCASE (c), uccount++; | |
302 else if (! NOCASEP (c)) | |
303 lccount++; | |
89024
b09549c9663c
(Fexpand_abbrev): Fix for the multibyte case.
Kenichi Handa <handa@m17n.org>
parents:
88351
diff
changeset
|
304 if (multibyte) |
b09549c9663c
(Fexpand_abbrev): Fix for the multibyte case.
Kenichi Handa <handa@m17n.org>
parents:
88351
diff
changeset
|
305 CHAR_STRING_ADVANCE (c, p); |
b09549c9663c
(Fexpand_abbrev): Fix for the multibyte case.
Kenichi Handa <handa@m17n.org>
parents:
88351
diff
changeset
|
306 else |
b09549c9663c
(Fexpand_abbrev): Fix for the multibyte case.
Kenichi Handa <handa@m17n.org>
parents:
88351
diff
changeset
|
307 { |
b09549c9663c
(Fexpand_abbrev): Fix for the multibyte case.
Kenichi Handa <handa@m17n.org>
parents:
88351
diff
changeset
|
308 MAKE_CHAR_UNIBYTE (c); |
b09549c9663c
(Fexpand_abbrev): Fix for the multibyte case.
Kenichi Handa <handa@m17n.org>
parents:
88351
diff
changeset
|
309 *p++ = c; |
b09549c9663c
(Fexpand_abbrev): Fix for the multibyte case.
Kenichi Handa <handa@m17n.org>
parents:
88351
diff
changeset
|
310 } |
146 | 311 } |
312 | |
9140
3e7833a8e16f
(Fdefine_abbrev, Fexpand_abbrev, Funexpand_abbrev): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9054
diff
changeset
|
313 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
|
314 sym = oblookup (current_buffer->abbrev_table, buffer, |
89024
b09549c9663c
(Fexpand_abbrev): Fix for the multibyte case.
Kenichi Handa <handa@m17n.org>
parents:
88351
diff
changeset
|
315 wordend - wordstart, p - buffer); |
146 | 316 else |
9294
4d083b72b3b1
(Fexpand_abbrev): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9260
diff
changeset
|
317 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
|
318 |
39584
6145836b795c
Use SYMBOL_VALUE/ SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents:
29742
diff
changeset
|
319 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
|
320 sym = oblookup (Vglobal_abbrev_table, buffer, |
89024
b09549c9663c
(Fexpand_abbrev): Fix for the multibyte case.
Kenichi Handa <handa@m17n.org>
parents:
88351
diff
changeset
|
321 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
|
322 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
|
323 return value; |
146 | 324 |
325 if (INTERACTIVE && !EQ (minibuf_window, selected_window)) | |
326 { | |
11554 | 327 /* Add an undo boundary, in case we are doing this for |
328 a self-inserting command which has avoided making one so far. */ | |
146 | 329 SET_PT (wordend); |
330 Fundo_boundary (); | |
331 } | |
16565
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
332 |
146 | 333 Vlast_abbrev_text |
334 = Fbuffer_substring (make_number (wordstart), make_number (wordend)); | |
335 | |
16565
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
336 /* Now sym is the abbrev symbol. */ |
146 | 337 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
|
338 value = sym; |
146 | 339 last_abbrev_point = wordstart; |
340 | |
42388
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
341 /* Increment use count. */ |
9140
3e7833a8e16f
(Fdefine_abbrev, Fexpand_abbrev, Funexpand_abbrev): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9054
diff
changeset
|
342 if (INTEGERP (XSYMBOL (sym)->plist)) |
146 | 343 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
|
344 XINT (XSYMBOL (sym)->plist) + 1); |
42410
cd63104dd575
* abbrev.c (Fexpand_abbrev): Use NILP instead of implicit zero
Ken Raeburn <raeburn@raeburn.org>
parents:
42388
diff
changeset
|
345 else if (!NILP (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
|
346 Fput (sym, Qcount, make_number (XINT (tem) + 1)); |
146 | 347 |
16565
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
348 /* 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
|
349 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
|
350 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
|
351 if (STRINGP (expansion)) |
146 | 352 { |
16565
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
353 SET_PT (wordstart); |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
354 |
20981
0ce30e7ba2b8
Reorder args of del_range_both.
Karl Heuer <kwzh@gnu.org>
parents:
20708
diff
changeset
|
355 del_range_both (wordstart, wordstart_byte, wordend, wordend_byte, 1); |
16565
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
356 |
20590
bf079eb81bd3
(Fexpand_abbrev): Pass both kinds of size to oblookup.
Richard M. Stallman <rms@gnu.org>
parents:
20554
diff
changeset
|
357 insert_from_string (expansion, 0, 0, XSTRING (expansion)->size, |
21244
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
20981
diff
changeset
|
358 STRING_BYTES (XSTRING (expansion)), 1); |
16565
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
359 SET_PT (PT + whitecnt); |
397 | 360 |
16565
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
361 if (uccount && !lccount) |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
362 { |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
363 /* Abbrev was all caps */ |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
364 /* 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
|
365 /* 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
|
366 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
|
367 if (!abbrev_all_caps) |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
368 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
|
369 { |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
370 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
|
371 make_number (PT)); |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
372 goto caped; |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
373 } |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
374 /* 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
|
375 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
|
376 caped: ; |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
377 } |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
378 else if (uccount) |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
379 { |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
380 /* 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
|
381 int pos = wordstart_byte; |
397 | 382 |
16565
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
383 /* Find the initial. */ |
20529
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
384 while (pos < PT_BYTE |
89051
98dcb14bf34c
(Fexpand_abbrev): Convert a unibyte character to
Kenichi Handa <handa@m17n.org>
parents:
89024
diff
changeset
|
385 && SYNTAX (FETCH_CHAR_AS_MULTIBYTE (pos)) != Sword) |
16565
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
386 pos++; |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
387 |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
388 /* Change just that. */ |
20529
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
389 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
|
390 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
|
391 } |
146 | 392 } |
393 | |
394 hook = XSYMBOL (sym)->function; | |
484 | 395 if (!NILP (hook)) |
27043
b5ce0c450409
(Fexpand_abbrev): If expanding an abbrev which has only
Gerd Moellmann <gerd@gnu.org>
parents:
25766
diff
changeset
|
396 { |
b5ce0c450409
(Fexpand_abbrev): If expanding an abbrev which has only
Gerd Moellmann <gerd@gnu.org>
parents:
25766
diff
changeset
|
397 Lisp_Object expanded, prop; |
b5ce0c450409
(Fexpand_abbrev): If expanding an abbrev which has only
Gerd Moellmann <gerd@gnu.org>
parents:
25766
diff
changeset
|
398 |
27379 | 399 /* 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
|
400 expanded = call0 (hook); |
27379 | 401 |
402 /* In addition, if the hook function is a symbol with a a | |
403 non-nil `no-self-insert' property, let the value it returned | |
404 specify whether we consider that an expansion took place. If | |
405 it returns nil, no expansion has been done. */ | |
406 | |
27043
b5ce0c450409
(Fexpand_abbrev): If expanding an abbrev which has only
Gerd Moellmann <gerd@gnu.org>
parents:
25766
diff
changeset
|
407 if (SYMBOLP (hook) |
b5ce0c450409
(Fexpand_abbrev): If expanding an abbrev which has only
Gerd Moellmann <gerd@gnu.org>
parents:
25766
diff
changeset
|
408 && NILP (expanded) |
b5ce0c450409
(Fexpand_abbrev): If expanding an abbrev which has only
Gerd Moellmann <gerd@gnu.org>
parents:
25766
diff
changeset
|
409 && (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
|
410 !NILP (prop))) |
b5ce0c450409
(Fexpand_abbrev): If expanding an abbrev which has only
Gerd Moellmann <gerd@gnu.org>
parents:
25766
diff
changeset
|
411 value = Qnil; |
b5ce0c450409
(Fexpand_abbrev): If expanding an abbrev which has only
Gerd Moellmann <gerd@gnu.org>
parents:
25766
diff
changeset
|
412 } |
146 | 413 |
16747
126a42ee62ac
(Fexpand_abbrev): Return the abbrev symbol, or nil if no expansion.
Richard M. Stallman <rms@gnu.org>
parents:
16565
diff
changeset
|
414 return value; |
146 | 415 } |
416 | |
417 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
|
418 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
|
419 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
|
420 is not undone. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
421 () |
146 | 422 { |
16039
855c8d8ba0f0
Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
423 int opoint = PT; |
146 | 424 int adjust = 0; |
425 if (last_abbrev_point < BEGV | |
426 || last_abbrev_point > ZV) | |
427 return Qnil; | |
428 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
|
429 if (STRINGP (Vlast_abbrev_text)) |
146 | 430 { |
431 /* This isn't correct if Vlast_abbrev->function was used | |
432 to do the expansion */ | |
433 Lisp_Object val; | |
20529
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
434 int zv_before; |
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
435 |
39584
6145836b795c
Use SYMBOL_VALUE/ SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents:
29742
diff
changeset
|
436 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
|
437 if (!STRINGP (val)) |
1499
94aa6a66e921
* abbrev.c (Funexpand_abbrev): Just assign the last abbrev's value
Jim Blandy <jimb@redhat.com>
parents:
1023
diff
changeset
|
438 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
|
439 zv_before = ZV; |
21244
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
20981
diff
changeset
|
440 del_range_byte (PT_BYTE, PT_BYTE + STRING_BYTES (XSTRING (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
|
441 /* 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
|
442 insert_from_string (Vlast_abbrev_text, 0, 0, |
bf079eb81bd3
(Fexpand_abbrev): Pass both kinds of size to oblookup.
Richard M. Stallman <rms@gnu.org>
parents:
20554
diff
changeset
|
443 XSTRING (Vlast_abbrev_text)->size, |
21244
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
20981
diff
changeset
|
444 STRING_BYTES (XSTRING (Vlast_abbrev_text)), 0); |
146 | 445 Vlast_abbrev_text = Qnil; |
20529
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
446 /* Total number of characters deleted. */ |
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
447 adjust = ZV - zv_before; |
146 | 448 } |
22909
c8e47ec53eb6
(Funexpand_abbrev): Add ADJUST instead of subtracting.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
449 SET_PT (last_abbrev_point < opoint ? opoint + adjust : opoint); |
146 | 450 return Qnil; |
451 } | |
452 | |
20529
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
453 static void |
146 | 454 write_abbrev (sym, stream) |
455 Lisp_Object sym, stream; | |
456 { | |
42388
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
457 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
|
458 |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
459 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
|
460 { |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
461 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
|
462 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
|
463 } |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
464 else |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
465 { |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
466 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
|
467 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
|
468 } |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
469 |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
470 if (NILP (SYMBOL_VALUE (sym)) || ! NILP (system_flag)) |
146 | 471 return; |
42388
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
472 |
146 | 473 insert (" (", 5); |
9260
945ddb4e9e24
(write_abbrev, Finsert_abbrev_table_description): Use new accessor macros
Karl Heuer <kwzh@gnu.org>
parents:
9140
diff
changeset
|
474 XSETSTRING (name, XSYMBOL (sym)->name); |
146 | 475 Fprin1 (name, stream); |
476 insert (" ", 1); | |
39584
6145836b795c
Use SYMBOL_VALUE/ SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents:
29742
diff
changeset
|
477 Fprin1 (SYMBOL_VALUE (sym), stream); |
146 | 478 insert (" ", 1); |
479 Fprin1 (XSYMBOL (sym)->function, stream); | |
480 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
|
481 Fprin1 (count, stream); |
146 | 482 insert (")\n", 2); |
483 } | |
484 | |
20529
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
485 static void |
146 | 486 describe_abbrev (sym, stream) |
487 Lisp_Object sym, stream; | |
488 { | |
42388
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
489 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
|
490 |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
491 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
|
492 { |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
493 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
|
494 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
|
495 } |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
496 else |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
497 { |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
498 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
|
499 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
|
500 } |
146 | 501 |
39584
6145836b795c
Use SYMBOL_VALUE/ SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents:
29742
diff
changeset
|
502 if (NILP (SYMBOL_VALUE (sym))) |
146 | 503 return; |
42388
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
504 |
146 | 505 one = make_number (1); |
506 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
|
507 |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
508 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
|
509 { |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
510 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
|
511 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
|
512 } |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
513 else |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
514 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
|
515 |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
516 Fprin1 (count, stream); |
146 | 517 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
|
518 Fprin1 (SYMBOL_VALUE (sym), stream); |
484 | 519 if (!NILP (XSYMBOL (sym)->function)) |
146 | 520 { |
521 Findent_to (make_number (45), one); | |
522 Fprin1 (XSYMBOL (sym)->function, stream); | |
523 } | |
524 Fterpri (stream); | |
525 } | |
526 | |
16485
9b919c5464a4
Reorganize function definitions so etags finds them.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
527 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
|
528 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
|
529 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
|
530 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
|
531 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
|
532 is inserted. Otherwise the description is an expression, |
d0d7ddac8c5e
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39584
diff
changeset
|
533 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
|
534 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
|
535 |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
536 Abbrevs marked as "system abbrevs" are omitted. */) |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
537 (name, readable) |
146 | 538 Lisp_Object name, readable; |
539 { | |
540 Lisp_Object table; | |
541 Lisp_Object stream; | |
542 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40109
diff
changeset
|
543 CHECK_SYMBOL (name); |
146 | 544 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
|
545 CHECK_VECTOR (table); |
146 | 546 |
9260
945ddb4e9e24
(write_abbrev, Finsert_abbrev_table_description): Use new accessor macros
Karl Heuer <kwzh@gnu.org>
parents:
9140
diff
changeset
|
547 XSETBUFFER (stream, current_buffer); |
146 | 548 |
484 | 549 if (!NILP (readable)) |
146 | 550 { |
551 insert_string ("("); | |
552 Fprin1 (name, stream); | |
553 insert_string (")\n\n"); | |
554 map_obarray (table, describe_abbrev, stream); | |
555 insert_string ("\n\n"); | |
556 } | |
557 else | |
558 { | |
559 insert_string ("(define-abbrev-table '"); | |
560 Fprin1 (name, stream); | |
561 insert_string (" '(\n"); | |
562 map_obarray (table, write_abbrev, stream); | |
563 insert_string (" ))\n\n"); | |
564 } | |
565 | |
566 return Qnil; | |
567 } | |
568 | |
569 DEFUN ("define-abbrev-table", Fdefine_abbrev_table, Sdefine_abbrev_table, | |
570 2, 2, 0, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
571 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
|
572 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
|
573 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
|
574 \(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
|
575 (tablename, definitions) |
14098
aa682cae5c89
(Fdefine_abbrev_table): Fix previous change.
Karl Heuer <kwzh@gnu.org>
parents:
14059
diff
changeset
|
576 Lisp_Object tablename, definitions; |
146 | 577 { |
578 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
|
579 Lisp_Object table, elt, sys; |
146 | 580 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40109
diff
changeset
|
581 CHECK_SYMBOL (tablename); |
14059
1303d585443b
(Fdefine_global_abbrev, Fdefine_mode_abbrev, Fabbrev_symbol,
Erik Naggum <erik@naggum.no>
parents:
12091
diff
changeset
|
582 table = Fboundp (tablename); |
1303d585443b
(Fdefine_global_abbrev, Fdefine_mode_abbrev, Fabbrev_symbol,
Erik Naggum <erik@naggum.no>
parents:
12091
diff
changeset
|
583 if (NILP (table) || (table = Fsymbol_value (tablename), NILP (table))) |
146 | 584 { |
585 table = Fmake_abbrev_table (); | |
14059
1303d585443b
(Fdefine_global_abbrev, Fdefine_mode_abbrev, Fabbrev_symbol,
Erik Naggum <erik@naggum.no>
parents:
12091
diff
changeset
|
586 Fset (tablename, table); |
14098
aa682cae5c89
(Fdefine_abbrev_table): Fix previous change.
Karl Heuer <kwzh@gnu.org>
parents:
14059
diff
changeset
|
587 Vabbrev_table_name_list = Fcons (tablename, Vabbrev_table_name_list); |
146 | 588 } |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40109
diff
changeset
|
589 CHECK_VECTOR (table); |
146 | 590 |
14098
aa682cae5c89
(Fdefine_abbrev_table): Fix previous change.
Karl Heuer <kwzh@gnu.org>
parents:
14059
diff
changeset
|
591 for (; !NILP (definitions); definitions = Fcdr (definitions)) |
146 | 592 { |
14059
1303d585443b
(Fdefine_global_abbrev, Fdefine_mode_abbrev, Fabbrev_symbol,
Erik Naggum <erik@naggum.no>
parents:
12091
diff
changeset
|
593 elt = Fcar (definitions); |
988
341171b49f96
* abbrev.c (Fdefine_abbrev_table): Fiddled with formatting.
Jim Blandy <jimb@redhat.com>
parents:
484
diff
changeset
|
594 name = Fcar (elt); elt = Fcdr (elt); |
341171b49f96
* abbrev.c (Fdefine_abbrev_table): Fiddled with formatting.
Jim Blandy <jimb@redhat.com>
parents:
484
diff
changeset
|
595 exp = Fcar (elt); elt = Fcdr (elt); |
341171b49f96
* abbrev.c (Fdefine_abbrev_table): Fiddled with formatting.
Jim Blandy <jimb@redhat.com>
parents:
484
diff
changeset
|
596 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
|
597 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
|
598 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
|
599 Fdefine_abbrev (table, name, exp, hook, count, sys); |
146 | 600 } |
601 return Qnil; | |
602 } | |
603 | |
21514 | 604 void |
146 | 605 syms_of_abbrev () |
606 { | |
42388
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
607 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
|
608 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
|
609 |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
610 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
|
611 staticpro (&Qcount); |
b46d482b6ed2
Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents:
41522
diff
changeset
|
612 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
613 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
|
614 doc: /* List of symbols whose values are abbrev tables. */); |
146 | 615 Vabbrev_table_name_list = Fcons (intern ("fundamental-mode-abbrev-table"), |
616 Fcons (intern ("global-abbrev-table"), | |
617 Qnil)); | |
618 | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
619 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
|
620 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
|
621 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
|
622 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
|
623 for any particular abbrev defined in both. */); |
146 | 624 Vglobal_abbrev_table = Fmake_abbrev_table (); |
625 | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
626 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
|
627 doc: /* The abbrev table of mode-specific abbrevs for Fundamental Mode. */); |
146 | 628 Vfundamental_mode_abbrev_table = Fmake_abbrev_table (); |
629 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
|
630 buffer_defaults.abbrev_table = Vfundamental_mode_abbrev_table; |
146 | 631 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
632 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
|
633 doc: /* The abbrev-symbol of the last abbrev expanded. See `abbrev-symbol'. */); |
146 | 634 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
635 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
|
636 doc: /* The exact text of the last abbrev expanded. |
39960
d0d7ddac8c5e
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39584
diff
changeset
|
637 nil if the abbrev has already been unexpanded. */); |
146 | 638 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
639 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
|
640 doc: /* The location of the start of the last abbrev expanded. */); |
146 | 641 |
642 Vlast_abbrev = Qnil; | |
643 Vlast_abbrev_text = Qnil; | |
644 last_abbrev_point = 0; | |
645 | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
646 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
|
647 doc: /* Buffer position for `expand-abbrev' to use as the start of the abbrev. |
39960
d0d7ddac8c5e
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39584
diff
changeset
|
648 nil means use the word before point as the abbrev. |
d0d7ddac8c5e
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39584
diff
changeset
|
649 Calling `expand-abbrev' sets this to nil. */); |
146 | 650 Vabbrev_start_location = Qnil; |
651 | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
652 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
|
653 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
|
654 Trying to expand an abbrev in any other buffer clears `abbrev-start-location'. */); |
146 | 655 Vabbrev_start_location_buffer = Qnil; |
656 | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
657 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
|
658 doc: /* Local (mode-specific) abbrev table of current buffer. */); |
146 | 659 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
660 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
|
661 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
|
662 This causes `save-some-buffers' to offer to save the abbrevs. */); |
146 | 663 abbrevs_changed = 0; |
664 | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
665 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
|
666 doc: /* *Set non-nil means expand multi-word abbrevs all caps if abbrev was so. */); |
146 | 667 abbrev_all_caps = 0; |
668 | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
669 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
|
670 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
|
671 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
|
672 the current abbrev table before abbrev lookup happens. */); |
458
8f18e7e89008
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
397
diff
changeset
|
673 Vpre_abbrev_expand_hook = Qnil; |
8f18e7e89008
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
397
diff
changeset
|
674 Qpre_abbrev_expand_hook = intern ("pre-abbrev-expand-hook"); |
8f18e7e89008
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
397
diff
changeset
|
675 staticpro (&Qpre_abbrev_expand_hook); |
8f18e7e89008
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
397
diff
changeset
|
676 |
146 | 677 defsubr (&Smake_abbrev_table); |
678 defsubr (&Sclear_abbrev_table); | |
679 defsubr (&Sdefine_abbrev); | |
680 defsubr (&Sdefine_global_abbrev); | |
681 defsubr (&Sdefine_mode_abbrev); | |
682 defsubr (&Sabbrev_expansion); | |
683 defsubr (&Sabbrev_symbol); | |
684 defsubr (&Sexpand_abbrev); | |
685 defsubr (&Sunexpand_abbrev); | |
686 defsubr (&Sinsert_abbrev_table_description); | |
687 defsubr (&Sdefine_abbrev_table); | |
688 } |