Mercurial > emacs
annotate src/abbrev.c @ 11521:d580a6f682b5
shell-font-lock-keywords efficiency fix.
author | Simon Marshall <simon@gnu.org> |
---|---|
date | Mon, 24 Apr 1995 11:51:28 +0000 |
parents | 9d8bb1074fd8 |
children | ac21a7106ffd |
rev | line source |
---|---|
146 | 1 /* Primitives for word-abbrev mode. |
2961 | 2 Copyright (C) 1985, 1986, 1993 Free Software Foundation, Inc. |
146 | 3 |
4 This file is part of GNU Emacs. | |
5 | |
6 GNU Emacs is free software; you can redistribute it and/or modify | |
7 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
|
8 the Free Software Foundation; either version 2, or (at your option) |
146 | 9 any later version. |
10 | |
11 GNU Emacs is distributed in the hope that it will be useful, | |
12 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
14 GNU General Public License for more details. | |
15 | |
16 You should have received a copy of the GNU General Public License | |
17 along with GNU Emacs; see the file COPYING. If not, write to | |
18 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ | |
19 | |
20 | |
4696
1fc792473491
Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents:
2961
diff
changeset
|
21 #include <config.h> |
146 | 22 #include <stdio.h> |
23 #include "lisp.h" | |
24 #include "commands.h" | |
25 #include "buffer.h" | |
26 #include "window.h" | |
9054
ddb22c22a80d
(Fexpand_abbrev): Instead of Fcapitalize_region,
Richard M. Stallman <rms@gnu.org>
parents:
4717
diff
changeset
|
27 #include "syntax.h" |
146 | 28 |
29 /* An abbrev table is an obarray. | |
30 Each defined abbrev is represented by a symbol in that obarray | |
31 whose print name is the abbreviation. | |
32 The symbol's value is a string which is the expansion. | |
33 If its function definition is non-nil, it is called | |
34 after the expansion is done. | |
35 The plist slot of the abbrev symbol is its usage count. */ | |
36 | |
37 /* List of all abbrev-table name symbols: | |
38 symbols whose values are abbrev tables. */ | |
39 | |
40 Lisp_Object Vabbrev_table_name_list; | |
41 | |
42 /* The table of global abbrevs. These are in effect | |
43 in any buffer in which abbrev mode is turned on. */ | |
44 | |
45 Lisp_Object Vglobal_abbrev_table; | |
46 | |
47 /* The local abbrev table used by default (in Fundamental Mode buffers) */ | |
48 | |
49 Lisp_Object Vfundamental_mode_abbrev_table; | |
50 | |
51 /* Set nonzero when an abbrev definition is changed */ | |
52 | |
53 int abbrevs_changed; | |
54 | |
55 int abbrev_all_caps; | |
56 | |
57 /* Non-nil => use this location as the start of abbrev to expand | |
58 (rather than taking the word before point as the abbrev) */ | |
59 | |
60 Lisp_Object Vabbrev_start_location; | |
61 | |
62 /* Buffer that Vabbrev_start_location applies to */ | |
63 Lisp_Object Vabbrev_start_location_buffer; | |
64 | |
65 /* The symbol representing the abbrev most recently expanded */ | |
66 | |
67 Lisp_Object Vlast_abbrev; | |
68 | |
69 /* A string for the actual text of the abbrev most recently expanded. | |
70 This has more info than Vlast_abbrev since case is significant. */ | |
71 | |
72 Lisp_Object Vlast_abbrev_text; | |
73 | |
74 /* Character address of start of last abbrev expanded */ | |
75 | |
76 int last_abbrev_point; | |
77 | |
458
8f18e7e89008
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
397
diff
changeset
|
78 /* Hook to run before expanding any abbrev. */ |
8f18e7e89008
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
397
diff
changeset
|
79 |
8f18e7e89008
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
397
diff
changeset
|
80 Lisp_Object Vpre_abbrev_expand_hook, Qpre_abbrev_expand_hook; |
146 | 81 |
82 DEFUN ("make-abbrev-table", Fmake_abbrev_table, Smake_abbrev_table, 0, 0, 0, | |
83 "Create a new, empty abbrev table object.") | |
84 () | |
85 { | |
86 return Fmake_vector (make_number (59), make_number (0)); | |
87 } | |
88 | |
89 DEFUN ("clear-abbrev-table", Fclear_abbrev_table, Sclear_abbrev_table, 1, 1, 0, | |
90 "Undefine all abbrevs in abbrev table TABLE, leaving it empty.") | |
91 (table) | |
92 Lisp_Object table; | |
93 { | |
94 int i, size; | |
95 | |
96 CHECK_VECTOR (table, 0); | |
97 size = XVECTOR (table)->size; | |
98 abbrevs_changed = 1; | |
99 for (i = 0; i < size; i++) | |
100 XVECTOR (table)->contents[i] = make_number (0); | |
101 return Qnil; | |
102 } | |
103 | |
104 DEFUN ("define-abbrev", Fdefine_abbrev, Sdefine_abbrev, 3, 5, 0, | |
105 "Define an abbrev in TABLE named NAME, to expand to EXPANSION and call HOOK.\n\ | |
106 NAME and EXPANSION are strings.\n\ | |
107 To undefine an abbrev, define it with EXPANSION = nil.\n\ | |
108 If HOOK is non-nil, it should be a function of no arguments;\n\ | |
109 it is called after EXPANSION is inserted.") | |
110 (table, name, expansion, hook, count) | |
111 Lisp_Object table, name, expansion, hook, count; | |
112 { | |
113 Lisp_Object sym, oexp, ohook, tem; | |
114 CHECK_VECTOR (table, 0); | |
115 CHECK_STRING (name, 1); | |
484 | 116 if (!NILP (expansion)) |
146 | 117 CHECK_STRING (expansion, 2); |
484 | 118 if (NILP (count)) |
146 | 119 count = make_number (0); |
120 else | |
121 CHECK_NUMBER (count, 0); | |
122 | |
123 sym = Fintern (name, table); | |
124 | |
125 oexp = XSYMBOL (sym)->value; | |
126 ohook = XSYMBOL (sym)->function; | |
127 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
|
128 || (STRINGP (oexp) && STRINGP (expansion) |
484 | 129 && (tem = Fstring_equal (oexp, expansion), !NILP (tem)))) |
146 | 130 && |
131 (EQ (ohook, hook) | |
484 | 132 || (tem = Fequal (ohook, hook), !NILP (tem))))) |
146 | 133 abbrevs_changed = 1; |
134 | |
135 Fset (sym, expansion); | |
136 Ffset (sym, hook); | |
137 Fsetplist (sym, count); | |
138 | |
139 return name; | |
140 } | |
141 | |
142 DEFUN ("define-global-abbrev", Fdefine_global_abbrev, Sdefine_global_abbrev, 2, 2, | |
143 "sDefine global abbrev: \nsExpansion for %s: ", | |
144 "Define ABBREV as a global abbreviation for EXPANSION.") | |
145 (name, expansion) | |
146 Lisp_Object name, expansion; | |
147 { | |
148 Fdefine_abbrev (Vglobal_abbrev_table, Fdowncase (name), | |
149 expansion, Qnil, make_number (0)); | |
150 return name; | |
151 } | |
152 | |
153 DEFUN ("define-mode-abbrev", Fdefine_mode_abbrev, Sdefine_mode_abbrev, 2, 2, | |
154 "sDefine mode abbrev: \nsExpansion for %s: ", | |
155 "Define ABBREV as a mode-specific abbreviation for EXPANSION.") | |
156 (name, expansion) | |
157 Lisp_Object name, expansion; | |
158 { | |
484 | 159 if (NILP (current_buffer->abbrev_table)) |
146 | 160 error ("Major mode has no abbrev table"); |
161 | |
162 Fdefine_abbrev (current_buffer->abbrev_table, Fdowncase (name), | |
163 expansion, Qnil, make_number (0)); | |
164 return name; | |
165 } | |
166 | |
167 DEFUN ("abbrev-symbol", Fabbrev_symbol, Sabbrev_symbol, 1, 2, 0, | |
168 "Return the symbol representing abbrev named ABBREV.\n\ | |
169 This symbol's name is ABBREV, but it is not the canonical symbol of that name;\n\ | |
170 it is interned in an abbrev-table rather than the normal obarray.\n\ | |
171 The value is nil if that abbrev is not defined.\n\ | |
172 Optional second arg TABLE is abbrev table to look it up in.\n\ | |
173 The default is to try buffer's mode-specific abbrev table, then global table.") | |
174 (abbrev, table) | |
175 Lisp_Object abbrev, table; | |
176 { | |
177 Lisp_Object sym; | |
178 CHECK_STRING (abbrev, 0); | |
484 | 179 if (!NILP (table)) |
146 | 180 sym = Fintern_soft (abbrev, table); |
181 else | |
182 { | |
183 sym = Qnil; | |
484 | 184 if (!NILP (current_buffer->abbrev_table)) |
146 | 185 sym = Fintern_soft (abbrev, current_buffer->abbrev_table); |
484 | 186 if (NILP (XSYMBOL (sym)->value)) |
146 | 187 sym = Qnil; |
484 | 188 if (NILP (sym)) |
146 | 189 sym = Fintern_soft (abbrev, Vglobal_abbrev_table); |
190 } | |
484 | 191 if (NILP (XSYMBOL (sym)->value)) return Qnil; |
146 | 192 return sym; |
193 } | |
194 | |
195 DEFUN ("abbrev-expansion", Fabbrev_expansion, Sabbrev_expansion, 1, 2, 0, | |
196 "Return the string that ABBREV expands into in the current buffer.\n\ | |
197 Optionally specify an abbrev table as second arg;\n\ | |
198 then ABBREV is looked up in that table only.") | |
199 (abbrev, table) | |
200 Lisp_Object abbrev, table; | |
201 { | |
202 Lisp_Object sym; | |
203 sym = Fabbrev_symbol (abbrev, table); | |
484 | 204 if (NILP (sym)) return sym; |
146 | 205 return Fsymbol_value (sym); |
206 } | |
207 | |
208 /* Expand the word before point, if it is an abbrev. | |
209 Returns 1 if an expansion is done. */ | |
210 | |
211 DEFUN ("expand-abbrev", Fexpand_abbrev, Sexpand_abbrev, 0, 0, "", | |
212 "Expand the abbrev before point, if there is an abbrev there.\n\ | |
213 Effective when explicitly called even when `abbrev-mode' is nil.\n\ | |
214 Returns t if expansion took place.") | |
215 () | |
216 { | |
217 register char *buffer, *p; | |
218 register int wordstart, wordend, idx; | |
219 int whitecnt; | |
220 int uccount = 0, lccount = 0; | |
221 register Lisp_Object sym; | |
222 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
|
223 int oldmodiff = MODIFF; |
22f807391bec
(Fexpand_abbrev): If pre-expand hook changes the buffer,
Richard M. Stallman <rms@gnu.org>
parents:
988
diff
changeset
|
224 Lisp_Object value; |
146 | 225 |
484 | 226 if (!NILP (Vrun_hooks)) |
458
8f18e7e89008
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
397
diff
changeset
|
227 call1 (Vrun_hooks, Qpre_abbrev_expand_hook); |
1023
d31e1e0844aa
* abbrev.c (syms_of_abbrev): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
1021
diff
changeset
|
228 /* If the hook changes the buffer, treat that as having "done an |
d31e1e0844aa
* abbrev.c (syms_of_abbrev): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
1021
diff
changeset
|
229 expansion". */ |
1021
22f807391bec
(Fexpand_abbrev): If pre-expand hook changes the buffer,
Richard M. Stallman <rms@gnu.org>
parents:
988
diff
changeset
|
230 value = (MODIFF != oldmodiff ? Qt : Qnil); |
458
8f18e7e89008
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
397
diff
changeset
|
231 |
11503
9d8bb1074fd8
(Fexpand_abbrev): Add some error checking.
Karl Heuer <kwzh@gnu.org>
parents:
9294
diff
changeset
|
232 wordstart = 0; |
9d8bb1074fd8
(Fexpand_abbrev): Add some error checking.
Karl Heuer <kwzh@gnu.org>
parents:
9294
diff
changeset
|
233 if (!(BUFFERP (Vabbrev_start_location_buffer) && |
9d8bb1074fd8
(Fexpand_abbrev): Add some error checking.
Karl Heuer <kwzh@gnu.org>
parents:
9294
diff
changeset
|
234 XBUFFER (Vabbrev_start_location_buffer) == current_buffer)) |
146 | 235 Vabbrev_start_location = Qnil; |
484 | 236 if (!NILP (Vabbrev_start_location)) |
146 | 237 { |
238 tem = Vabbrev_start_location; | |
239 CHECK_NUMBER_COERCE_MARKER (tem, 0); | |
240 wordstart = XINT (tem); | |
241 Vabbrev_start_location = Qnil; | |
11503
9d8bb1074fd8
(Fexpand_abbrev): Add some error checking.
Karl Heuer <kwzh@gnu.org>
parents:
9294
diff
changeset
|
242 if (wordstart < BEGV || wordstart > ZV) |
9d8bb1074fd8
(Fexpand_abbrev): Add some error checking.
Karl Heuer <kwzh@gnu.org>
parents:
9294
diff
changeset
|
243 wordstart = 0; |
9d8bb1074fd8
(Fexpand_abbrev): Add some error checking.
Karl Heuer <kwzh@gnu.org>
parents:
9294
diff
changeset
|
244 if (wordstart && wordstart != ZV && FETCH_CHAR (wordstart) == '-') |
146 | 245 del_range (wordstart, wordstart + 1); |
246 } | |
11503
9d8bb1074fd8
(Fexpand_abbrev): Add some error checking.
Karl Heuer <kwzh@gnu.org>
parents:
9294
diff
changeset
|
247 if (!wordstart) |
146 | 248 wordstart = scan_words (point, -1); |
249 | |
250 if (!wordstart) | |
1021
22f807391bec
(Fexpand_abbrev): If pre-expand hook changes the buffer,
Richard M. Stallman <rms@gnu.org>
parents:
988
diff
changeset
|
251 return value; |
146 | 252 |
253 wordend = scan_words (wordstart, 1); | |
254 if (!wordend) | |
1021
22f807391bec
(Fexpand_abbrev): If pre-expand hook changes the buffer,
Richard M. Stallman <rms@gnu.org>
parents:
988
diff
changeset
|
255 return value; |
146 | 256 |
257 if (wordend > point) | |
258 wordend = point; | |
259 whitecnt = point - wordend; | |
260 if (wordend <= wordstart) | |
1021
22f807391bec
(Fexpand_abbrev): If pre-expand hook changes the buffer,
Richard M. Stallman <rms@gnu.org>
parents:
988
diff
changeset
|
261 return value; |
146 | 262 |
263 p = buffer = (char *) alloca (wordend - wordstart); | |
264 | |
1944
687179cefbe0
* abbrev.c (Fexpand_abbrev): Only copy the text we're going to
Jim Blandy <jimb@redhat.com>
parents:
1499
diff
changeset
|
265 for (idx = wordstart; idx < wordend; idx++) |
146 | 266 { |
267 register int c = FETCH_CHAR (idx); | |
268 if (UPPERCASEP (c)) | |
269 c = DOWNCASE (c), uccount++; | |
270 else if (! NOCASEP (c)) | |
271 lccount++; | |
272 *p++ = c; | |
273 } | |
274 | |
9140
3e7833a8e16f
(Fdefine_abbrev, Fexpand_abbrev, Funexpand_abbrev): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9054
diff
changeset
|
275 if (VECTORP (current_buffer->abbrev_table)) |
146 | 276 sym = oblookup (current_buffer->abbrev_table, buffer, p - buffer); |
277 else | |
9294
4d083b72b3b1
(Fexpand_abbrev): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9260
diff
changeset
|
278 XSETFASTINT (sym, 0); |
9140
3e7833a8e16f
(Fdefine_abbrev, Fexpand_abbrev, Funexpand_abbrev): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9054
diff
changeset
|
279 if (INTEGERP (sym) || NILP (XSYMBOL (sym)->value)) |
146 | 280 sym = oblookup (Vglobal_abbrev_table, buffer, p - buffer); |
9140
3e7833a8e16f
(Fdefine_abbrev, Fexpand_abbrev, Funexpand_abbrev): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9054
diff
changeset
|
281 if (INTEGERP (sym) || NILP (XSYMBOL (sym)->value)) |
1021
22f807391bec
(Fexpand_abbrev): If pre-expand hook changes the buffer,
Richard M. Stallman <rms@gnu.org>
parents:
988
diff
changeset
|
282 return value; |
146 | 283 |
284 if (INTERACTIVE && !EQ (minibuf_window, selected_window)) | |
285 { | |
286 SET_PT (wordend); | |
287 Fundo_boundary (); | |
288 } | |
289 SET_PT (wordstart); | |
290 Vlast_abbrev_text | |
291 = Fbuffer_substring (make_number (wordstart), make_number (wordend)); | |
292 del_range (wordstart, wordend); | |
293 | |
294 /* Now sym is the abbrev symbol. */ | |
295 Vlast_abbrev = sym; | |
296 last_abbrev_point = wordstart; | |
297 | |
9140
3e7833a8e16f
(Fdefine_abbrev, Fexpand_abbrev, Funexpand_abbrev): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9054
diff
changeset
|
298 if (INTEGERP (XSYMBOL (sym)->plist)) |
146 | 299 XSETINT (XSYMBOL (sym)->plist, |
300 XINT (XSYMBOL (sym)->plist) + 1); /* Increment use count */ | |
301 | |
302 expansion = XSYMBOL (sym)->value; | |
4717
5297e155e1d2
(Funexpand_abbrev, Fexpand_abbrev): Pass new arg to insert_from_string.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
303 insert_from_string (expansion, 0, XSTRING (expansion)->size, 1); |
146 | 304 SET_PT (point + whitecnt); |
305 | |
306 if (uccount && !lccount) | |
307 { | |
308 /* Abbrev was all caps */ | |
309 /* If expansion is multiple words, normally capitalize each word */ | |
310 /* This used to be if (!... && ... >= ...) Fcapitalize; else Fupcase | |
311 but Megatest 68000 compiler can't handle that */ | |
312 if (!abbrev_all_caps) | |
313 if (scan_words (point, -1) > scan_words (wordstart, 1)) | |
314 { | |
315 upcase_initials_region (make_number (wordstart), | |
316 make_number (point)); | |
317 goto caped; | |
318 } | |
319 /* If expansion is one word, or if user says so, upcase it all. */ | |
320 Fupcase_region (make_number (wordstart), make_number (point)); | |
321 caped: ; | |
322 } | |
323 else if (uccount) | |
324 { | |
325 /* Abbrev included some caps. Cap first initial of expansion */ | |
9054
ddb22c22a80d
(Fexpand_abbrev): Instead of Fcapitalize_region,
Richard M. Stallman <rms@gnu.org>
parents:
4717
diff
changeset
|
326 int pos = wordstart; |
397 | 327 |
9054
ddb22c22a80d
(Fexpand_abbrev): Instead of Fcapitalize_region,
Richard M. Stallman <rms@gnu.org>
parents:
4717
diff
changeset
|
328 /* Find the initial. */ |
ddb22c22a80d
(Fexpand_abbrev): Instead of Fcapitalize_region,
Richard M. Stallman <rms@gnu.org>
parents:
4717
diff
changeset
|
329 while (pos < point |
ddb22c22a80d
(Fexpand_abbrev): Instead of Fcapitalize_region,
Richard M. Stallman <rms@gnu.org>
parents:
4717
diff
changeset
|
330 && SYNTAX (*BUF_CHAR_ADDRESS (current_buffer, pos)) != Sword) |
ddb22c22a80d
(Fexpand_abbrev): Instead of Fcapitalize_region,
Richard M. Stallman <rms@gnu.org>
parents:
4717
diff
changeset
|
331 pos++; |
397 | 332 |
9054
ddb22c22a80d
(Fexpand_abbrev): Instead of Fcapitalize_region,
Richard M. Stallman <rms@gnu.org>
parents:
4717
diff
changeset
|
333 /* Change just that. */ |
ddb22c22a80d
(Fexpand_abbrev): Instead of Fcapitalize_region,
Richard M. Stallman <rms@gnu.org>
parents:
4717
diff
changeset
|
334 Fupcase_initials_region (make_number (pos), make_number (pos + 1)); |
146 | 335 } |
336 | |
337 hook = XSYMBOL (sym)->function; | |
484 | 338 if (!NILP (hook)) |
146 | 339 call0 (hook); |
340 | |
341 return Qt; | |
342 } | |
343 | |
344 DEFUN ("unexpand-abbrev", Funexpand_abbrev, Sunexpand_abbrev, 0, 0, "", | |
345 "Undo the expansion of the last abbrev that expanded.\n\ | |
346 This differs from ordinary undo in that other editing done since then\n\ | |
347 is not undone.") | |
348 () | |
349 { | |
350 int opoint = point; | |
351 int adjust = 0; | |
352 if (last_abbrev_point < BEGV | |
353 || last_abbrev_point > ZV) | |
354 return Qnil; | |
355 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
|
356 if (STRINGP (Vlast_abbrev_text)) |
146 | 357 { |
358 /* This isn't correct if Vlast_abbrev->function was used | |
359 to do the expansion */ | |
360 Lisp_Object val; | |
1499
94aa6a66e921
* abbrev.c (Funexpand_abbrev): Just assign the last abbrev's value
Jim Blandy <jimb@redhat.com>
parents:
1023
diff
changeset
|
361 val = XSYMBOL (Vlast_abbrev)->value; |
9140
3e7833a8e16f
(Fdefine_abbrev, Fexpand_abbrev, Funexpand_abbrev): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9054
diff
changeset
|
362 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
|
363 error ("value of abbrev-symbol must be a string"); |
146 | 364 adjust = XSTRING (val)->size; |
365 del_range (point, point + adjust); | |
4717
5297e155e1d2
(Funexpand_abbrev, Fexpand_abbrev): Pass new arg to insert_from_string.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
366 /* Don't inherit properties here; just copy from old contents. */ |
146 | 367 insert_from_string (Vlast_abbrev_text, 0, |
4717
5297e155e1d2
(Funexpand_abbrev, Fexpand_abbrev): Pass new arg to insert_from_string.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
368 XSTRING (Vlast_abbrev_text)->size, 0); |
146 | 369 adjust -= XSTRING (Vlast_abbrev_text)->size; |
370 Vlast_abbrev_text = Qnil; | |
371 } | |
372 SET_PT (last_abbrev_point < opoint ? opoint - adjust : opoint); | |
373 return Qnil; | |
374 } | |
375 | |
376 static | |
377 write_abbrev (sym, stream) | |
378 Lisp_Object sym, stream; | |
379 { | |
380 Lisp_Object name; | |
484 | 381 if (NILP (XSYMBOL (sym)->value)) |
146 | 382 return; |
383 insert (" (", 5); | |
9260
945ddb4e9e24
(write_abbrev, Finsert_abbrev_table_description): Use new accessor macros
Karl Heuer <kwzh@gnu.org>
parents:
9140
diff
changeset
|
384 XSETSTRING (name, XSYMBOL (sym)->name); |
146 | 385 Fprin1 (name, stream); |
386 insert (" ", 1); | |
387 Fprin1 (XSYMBOL (sym)->value, stream); | |
388 insert (" ", 1); | |
389 Fprin1 (XSYMBOL (sym)->function, stream); | |
390 insert (" ", 1); | |
391 Fprin1 (XSYMBOL (sym)->plist, stream); | |
392 insert (")\n", 2); | |
393 } | |
394 | |
395 static | |
396 describe_abbrev (sym, stream) | |
397 Lisp_Object sym, stream; | |
398 { | |
399 Lisp_Object one; | |
400 | |
484 | 401 if (NILP (XSYMBOL (sym)->value)) |
146 | 402 return; |
403 one = make_number (1); | |
404 Fprin1 (Fsymbol_name (sym), stream); | |
405 Findent_to (make_number (15), one); | |
406 Fprin1 (XSYMBOL (sym)->plist, stream); | |
407 Findent_to (make_number (20), one); | |
408 Fprin1 (XSYMBOL (sym)->value, stream); | |
484 | 409 if (!NILP (XSYMBOL (sym)->function)) |
146 | 410 { |
411 Findent_to (make_number (45), one); | |
412 Fprin1 (XSYMBOL (sym)->function, stream); | |
413 } | |
414 Fterpri (stream); | |
415 } | |
416 | |
417 DEFUN ("insert-abbrev-table-description", | |
418 Finsert_abbrev_table_description, Sinsert_abbrev_table_description, | |
419 1, 2, 0, | |
420 "Insert before point a full description of abbrev table named NAME.\n\ | |
421 NAME is a symbol whose value is an abbrev table.\n\ | |
422 If optional 2nd arg HUMAN is non-nil, a human-readable description is inserted.\n\ | |
423 Otherwise the description is an expression,\n\ | |
424 a call to `define-abbrev-table', which would\n\ | |
425 define the abbrev table NAME exactly as it is currently defined.") | |
426 (name, readable) | |
427 Lisp_Object name, readable; | |
428 { | |
429 Lisp_Object table; | |
430 Lisp_Object stream; | |
431 | |
432 CHECK_SYMBOL (name, 0); | |
433 table = Fsymbol_value (name); | |
434 CHECK_VECTOR (table, 0); | |
435 | |
9260
945ddb4e9e24
(write_abbrev, Finsert_abbrev_table_description): Use new accessor macros
Karl Heuer <kwzh@gnu.org>
parents:
9140
diff
changeset
|
436 XSETBUFFER (stream, current_buffer); |
146 | 437 |
484 | 438 if (!NILP (readable)) |
146 | 439 { |
440 insert_string ("("); | |
441 Fprin1 (name, stream); | |
442 insert_string (")\n\n"); | |
443 map_obarray (table, describe_abbrev, stream); | |
444 insert_string ("\n\n"); | |
445 } | |
446 else | |
447 { | |
448 insert_string ("(define-abbrev-table '"); | |
449 Fprin1 (name, stream); | |
450 insert_string (" '(\n"); | |
451 map_obarray (table, write_abbrev, stream); | |
452 insert_string (" ))\n\n"); | |
453 } | |
454 | |
455 return Qnil; | |
456 } | |
457 | |
458 DEFUN ("define-abbrev-table", Fdefine_abbrev_table, Sdefine_abbrev_table, | |
459 2, 2, 0, | |
460 "Define TABNAME (a symbol) as an abbrev table name.\n\ | |
461 Define abbrevs in it according to DEFINITIONS, which is a list of elements\n\ | |
462 of the form (ABBREVNAME EXPANSION HOOK USECOUNT).") | |
463 (tabname, defns) | |
464 Lisp_Object tabname, defns; | |
465 { | |
466 Lisp_Object name, exp, hook, count; | |
467 Lisp_Object table, elt; | |
468 | |
469 CHECK_SYMBOL (tabname, 0); | |
470 table = Fboundp (tabname); | |
484 | 471 if (NILP (table) || (table = Fsymbol_value (tabname), NILP (table))) |
146 | 472 { |
473 table = Fmake_abbrev_table (); | |
474 Fset (tabname, table); | |
475 Vabbrev_table_name_list = | |
476 Fcons (tabname, Vabbrev_table_name_list); | |
477 } | |
478 CHECK_VECTOR (table, 0); | |
479 | |
484 | 480 for (;!NILP (defns); defns = Fcdr (defns)) |
146 | 481 { |
482 elt = Fcar (defns); | |
988
341171b49f96
* abbrev.c (Fdefine_abbrev_table): Fiddled with formatting.
Jim Blandy <jimb@redhat.com>
parents:
484
diff
changeset
|
483 name = Fcar (elt); elt = Fcdr (elt); |
341171b49f96
* abbrev.c (Fdefine_abbrev_table): Fiddled with formatting.
Jim Blandy <jimb@redhat.com>
parents:
484
diff
changeset
|
484 exp = Fcar (elt); elt = Fcdr (elt); |
341171b49f96
* abbrev.c (Fdefine_abbrev_table): Fiddled with formatting.
Jim Blandy <jimb@redhat.com>
parents:
484
diff
changeset
|
485 hook = Fcar (elt); elt = Fcdr (elt); |
146 | 486 count = Fcar (elt); |
487 Fdefine_abbrev (table, name, exp, hook, count); | |
488 } | |
489 return Qnil; | |
490 } | |
491 | |
492 syms_of_abbrev () | |
493 { | |
494 DEFVAR_LISP ("abbrev-table-name-list", &Vabbrev_table_name_list, | |
495 "List of symbols whose values are abbrev tables."); | |
496 Vabbrev_table_name_list = Fcons (intern ("fundamental-mode-abbrev-table"), | |
497 Fcons (intern ("global-abbrev-table"), | |
498 Qnil)); | |
499 | |
500 DEFVAR_LISP ("global-abbrev-table", &Vglobal_abbrev_table, | |
501 "The abbrev table whose abbrevs affect all buffers.\n\ | |
502 Each buffer may also have a local abbrev table.\n\ | |
503 If it does, the local table overrides the global one\n\ | |
504 for any particular abbrev defined in both."); | |
505 Vglobal_abbrev_table = Fmake_abbrev_table (); | |
506 | |
507 DEFVAR_LISP ("fundamental-mode-abbrev-table", &Vfundamental_mode_abbrev_table, | |
508 "The abbrev table of mode-specific abbrevs for Fundamental Mode."); | |
509 Vfundamental_mode_abbrev_table = Fmake_abbrev_table (); | |
510 current_buffer->abbrev_table = Vfundamental_mode_abbrev_table; | |
511 | |
512 DEFVAR_LISP ("last-abbrev", &Vlast_abbrev, | |
513 "The abbrev-symbol of the last abbrev expanded. See `abbrev-symbol'."); | |
514 | |
515 DEFVAR_LISP ("last-abbrev-text", &Vlast_abbrev_text, | |
516 "The exact text of the last abbrev expanded.\n\ | |
517 nil if the abbrev has already been unexpanded."); | |
518 | |
519 DEFVAR_INT ("last-abbrev-location", &last_abbrev_point, | |
520 "The location of the start of the last abbrev expanded."); | |
521 | |
522 Vlast_abbrev = Qnil; | |
523 Vlast_abbrev_text = Qnil; | |
524 last_abbrev_point = 0; | |
525 | |
526 DEFVAR_LISP ("abbrev-start-location", &Vabbrev_start_location, | |
527 "Buffer position for `expand-abbrev' to use as the start of the abbrev.\n\ | |
528 nil means use the word before point as the abbrev.\n\ | |
529 Calling `expand-abbrev' sets this to nil."); | |
530 Vabbrev_start_location = Qnil; | |
531 | |
532 DEFVAR_LISP ("abbrev-start-location-buffer", &Vabbrev_start_location_buffer, | |
533 "Buffer that `abbrev-start-location' has been set for.\n\ | |
534 Trying to expand an abbrev in any other buffer clears `abbrev-start-location'."); | |
535 Vabbrev_start_location_buffer = Qnil; | |
536 | |
1023
d31e1e0844aa
* abbrev.c (syms_of_abbrev): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
1021
diff
changeset
|
537 DEFVAR_PER_BUFFER ("local-abbrev-table", ¤t_buffer->abbrev_table, Qnil, |
146 | 538 "Local (mode-specific) abbrev table of current buffer."); |
539 | |
540 DEFVAR_BOOL ("abbrevs-changed", &abbrevs_changed, | |
541 "Set non-nil by defining or altering any word abbrevs.\n\ | |
542 This causes `save-some-buffers' to offer to save the abbrevs."); | |
543 abbrevs_changed = 0; | |
544 | |
545 DEFVAR_BOOL ("abbrev-all-caps", &abbrev_all_caps, | |
546 "*Set non-nil means expand multi-word abbrevs all caps if abbrev was so."); | |
547 abbrev_all_caps = 0; | |
548 | |
458
8f18e7e89008
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
397
diff
changeset
|
549 DEFVAR_LISP ("pre-abbrev-expand-hook", &Vpre_abbrev_expand_hook, |
8f18e7e89008
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
397
diff
changeset
|
550 "Function or functions to be called before abbrev expansion is done.\n\ |
8f18e7e89008
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
397
diff
changeset
|
551 This is the first thing that `expand-abbrev' does, and so this may change\n\ |
8f18e7e89008
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
397
diff
changeset
|
552 the current abbrev table before abbrev lookup happens."); |
8f18e7e89008
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
397
diff
changeset
|
553 Vpre_abbrev_expand_hook = Qnil; |
8f18e7e89008
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
397
diff
changeset
|
554 Qpre_abbrev_expand_hook = intern ("pre-abbrev-expand-hook"); |
8f18e7e89008
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
397
diff
changeset
|
555 staticpro (&Qpre_abbrev_expand_hook); |
8f18e7e89008
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
397
diff
changeset
|
556 |
146 | 557 defsubr (&Smake_abbrev_table); |
558 defsubr (&Sclear_abbrev_table); | |
559 defsubr (&Sdefine_abbrev); | |
560 defsubr (&Sdefine_global_abbrev); | |
561 defsubr (&Sdefine_mode_abbrev); | |
562 defsubr (&Sabbrev_expansion); | |
563 defsubr (&Sabbrev_symbol); | |
564 defsubr (&Sexpand_abbrev); | |
565 defsubr (&Sunexpand_abbrev); | |
566 defsubr (&Sinsert_abbrev_table_description); | |
567 defsubr (&Sdefine_abbrev_table); | |
568 } |