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