Mercurial > emacs
annotate src/abbrev.c @ 40210:01666fd1b210
(desktop-last-buffer): New variable.
(desktop-create-buffer): Set it.
(desktop-read): Bind it and switch to that buffer.
author | Gerd Moellmann <gerd@gnu.org> |
---|---|
date | Tue, 23 Oct 2001 13:52:45 +0000 |
parents | d641fcc16219 |
children | cdfd4d09b79a |
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" | |
23715 | 30 #include "charset.h" |
9054
ddb22c22a80d
(Fexpand_abbrev): Instead of Fcapitalize_region,
Richard M. Stallman <rms@gnu.org>
parents:
4717
diff
changeset
|
31 #include "syntax.h" |
146 | 32 |
33 /* An abbrev table is an obarray. | |
34 Each defined abbrev is represented by a symbol in that obarray | |
35 whose print name is the abbreviation. | |
36 The symbol's value is a string which is the expansion. | |
37 If its function definition is non-nil, it is called | |
38 after the expansion is done. | |
39 The plist slot of the abbrev symbol is its usage count. */ | |
40 | |
41 /* List of all abbrev-table name symbols: | |
42 symbols whose values are abbrev tables. */ | |
43 | |
44 Lisp_Object Vabbrev_table_name_list; | |
45 | |
46 /* The table of global abbrevs. These are in effect | |
47 in any buffer in which abbrev mode is turned on. */ | |
48 | |
49 Lisp_Object Vglobal_abbrev_table; | |
50 | |
51 /* The local abbrev table used by default (in Fundamental Mode buffers) */ | |
52 | |
53 Lisp_Object Vfundamental_mode_abbrev_table; | |
54 | |
55 /* Set nonzero when an abbrev definition is changed */ | |
56 | |
57 int abbrevs_changed; | |
58 | |
59 int abbrev_all_caps; | |
60 | |
61 /* Non-nil => use this location as the start of abbrev to expand | |
62 (rather than taking the word before point as the abbrev) */ | |
63 | |
64 Lisp_Object Vabbrev_start_location; | |
65 | |
66 /* Buffer that Vabbrev_start_location applies to */ | |
67 Lisp_Object Vabbrev_start_location_buffer; | |
68 | |
69 /* The symbol representing the abbrev most recently expanded */ | |
70 | |
71 Lisp_Object Vlast_abbrev; | |
72 | |
73 /* A string for the actual text of the abbrev most recently expanded. | |
74 This has more info than Vlast_abbrev since case is significant. */ | |
75 | |
76 Lisp_Object Vlast_abbrev_text; | |
77 | |
78 /* Character address of start of last abbrev expanded */ | |
79 | |
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; |
146 | 85 |
86 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
|
87 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
|
88 () |
146 | 89 { |
90 return Fmake_vector (make_number (59), make_number (0)); | |
91 } | |
92 | |
93 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
|
94 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
|
95 (table) |
146 | 96 Lisp_Object table; |
97 { | |
98 int i, size; | |
99 | |
100 CHECK_VECTOR (table, 0); | |
101 size = XVECTOR (table)->size; | |
102 abbrevs_changed = 1; | |
103 for (i = 0; i < size; i++) | |
104 XVECTOR (table)->contents[i] = make_number (0); | |
105 return Qnil; | |
106 } | |
107 | |
108 DEFUN ("define-abbrev", Fdefine_abbrev, Sdefine_abbrev, 3, 5, 0, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
109 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
|
110 NAME must be a string. |
d0d7ddac8c5e
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39584
diff
changeset
|
111 EXPANSION should usually be a string. |
d0d7ddac8c5e
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39584
diff
changeset
|
112 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
|
113 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
|
114 it is called after EXPANSION is inserted. |
d0d7ddac8c5e
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39584
diff
changeset
|
115 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
|
116 which does not expand in the usual way but only runs HOOK. |
d0d7ddac8c5e
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39584
diff
changeset
|
117 COUNT, if specified, initializes the abbrev's usage-count |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
118 which is incremented each time the abbrev is used. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
119 (table, name, expansion, hook, count) |
146 | 120 Lisp_Object table, name, expansion, hook, count; |
121 { | |
122 Lisp_Object sym, oexp, ohook, tem; | |
123 CHECK_VECTOR (table, 0); | |
124 CHECK_STRING (name, 1); | |
16565
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
125 |
484 | 126 if (NILP (count)) |
146 | 127 count = make_number (0); |
128 else | |
129 CHECK_NUMBER (count, 0); | |
130 | |
131 sym = Fintern (name, table); | |
132 | |
39584
6145836b795c
Use SYMBOL_VALUE/ SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents:
29742
diff
changeset
|
133 oexp = SYMBOL_VALUE (sym); |
146 | 134 ohook = XSYMBOL (sym)->function; |
135 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
|
136 || (STRINGP (oexp) && STRINGP (expansion) |
484 | 137 && (tem = Fstring_equal (oexp, expansion), !NILP (tem)))) |
146 | 138 && |
139 (EQ (ohook, hook) | |
484 | 140 || (tem = Fequal (ohook, hook), !NILP (tem))))) |
146 | 141 abbrevs_changed = 1; |
142 | |
143 Fset (sym, expansion); | |
144 Ffset (sym, hook); | |
145 Fsetplist (sym, count); | |
146 | |
147 return name; | |
148 } | |
149 | |
150 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
|
151 "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
|
152 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
|
153 (abbrev, expansion) |
14059
1303d585443b
(Fdefine_global_abbrev, Fdefine_mode_abbrev, Fabbrev_symbol,
Erik Naggum <erik@naggum.no>
parents:
12091
diff
changeset
|
154 Lisp_Object abbrev, expansion; |
146 | 155 { |
14059
1303d585443b
(Fdefine_global_abbrev, Fdefine_mode_abbrev, Fabbrev_symbol,
Erik Naggum <erik@naggum.no>
parents:
12091
diff
changeset
|
156 Fdefine_abbrev (Vglobal_abbrev_table, Fdowncase (abbrev), |
146 | 157 expansion, Qnil, make_number (0)); |
14059
1303d585443b
(Fdefine_global_abbrev, Fdefine_mode_abbrev, Fabbrev_symbol,
Erik Naggum <erik@naggum.no>
parents:
12091
diff
changeset
|
158 return abbrev; |
146 | 159 } |
160 | |
161 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
|
162 "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
|
163 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
|
164 (abbrev, expansion) |
14059
1303d585443b
(Fdefine_global_abbrev, Fdefine_mode_abbrev, Fabbrev_symbol,
Erik Naggum <erik@naggum.no>
parents:
12091
diff
changeset
|
165 Lisp_Object abbrev, expansion; |
146 | 166 { |
484 | 167 if (NILP (current_buffer->abbrev_table)) |
146 | 168 error ("Major mode has no abbrev table"); |
169 | |
14059
1303d585443b
(Fdefine_global_abbrev, Fdefine_mode_abbrev, Fabbrev_symbol,
Erik Naggum <erik@naggum.no>
parents:
12091
diff
changeset
|
170 Fdefine_abbrev (current_buffer->abbrev_table, Fdowncase (abbrev), |
146 | 171 expansion, Qnil, make_number (0)); |
14059
1303d585443b
(Fdefine_global_abbrev, Fdefine_mode_abbrev, Fabbrev_symbol,
Erik Naggum <erik@naggum.no>
parents:
12091
diff
changeset
|
172 return abbrev; |
146 | 173 } |
174 | |
175 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
|
176 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
|
177 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
|
178 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
|
179 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
|
180 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
|
181 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
|
182 (abbrev, table) |
146 | 183 Lisp_Object abbrev, table; |
184 { | |
185 Lisp_Object sym; | |
186 CHECK_STRING (abbrev, 0); | |
484 | 187 if (!NILP (table)) |
146 | 188 sym = Fintern_soft (abbrev, table); |
189 else | |
190 { | |
191 sym = Qnil; | |
484 | 192 if (!NILP (current_buffer->abbrev_table)) |
146 | 193 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
|
194 if (NILP (SYMBOL_VALUE (sym))) |
146 | 195 sym = Qnil; |
484 | 196 if (NILP (sym)) |
146 | 197 sym = Fintern_soft (abbrev, Vglobal_abbrev_table); |
198 } | |
39584
6145836b795c
Use SYMBOL_VALUE/ SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents:
29742
diff
changeset
|
199 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
|
200 return Qnil; |
146 | 201 return sym; |
202 } | |
203 | |
204 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
|
205 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
|
206 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
|
207 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
|
208 (abbrev, table) |
146 | 209 Lisp_Object abbrev, table; |
210 { | |
211 Lisp_Object sym; | |
212 sym = Fabbrev_symbol (abbrev, table); | |
484 | 213 if (NILP (sym)) return sym; |
146 | 214 return Fsymbol_value (sym); |
215 } | |
216 | |
217 /* Expand the word before point, if it is an abbrev. | |
218 Returns 1 if an expansion is done. */ | |
219 | |
220 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
|
221 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
|
222 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
|
223 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
|
224 () |
146 | 225 { |
226 register char *buffer, *p; | |
20529
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
227 int wordstart, wordend; |
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
228 register int wordstart_byte, wordend_byte, idx; |
146 | 229 int whitecnt; |
230 int uccount = 0, lccount = 0; | |
231 register Lisp_Object sym; | |
232 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
|
233 Lisp_Object value; |
146 | 234 |
16747
126a42ee62ac
(Fexpand_abbrev): Return the abbrev symbol, or nil if no expansion.
Richard M. Stallman <rms@gnu.org>
parents:
16565
diff
changeset
|
235 value = Qnil; |
126a42ee62ac
(Fexpand_abbrev): Return the abbrev symbol, or nil if no expansion.
Richard M. Stallman <rms@gnu.org>
parents:
16565
diff
changeset
|
236 |
484 | 237 if (!NILP (Vrun_hooks)) |
458
8f18e7e89008
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
397
diff
changeset
|
238 call1 (Vrun_hooks, Qpre_abbrev_expand_hook); |
8f18e7e89008
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
397
diff
changeset
|
239 |
11503
9d8bb1074fd8
(Fexpand_abbrev): Add some error checking.
Karl Heuer <kwzh@gnu.org>
parents:
9294
diff
changeset
|
240 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
|
241 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
|
242 && XBUFFER (Vabbrev_start_location_buffer) == current_buffer)) |
146 | 243 Vabbrev_start_location = Qnil; |
484 | 244 if (!NILP (Vabbrev_start_location)) |
146 | 245 { |
246 tem = Vabbrev_start_location; | |
247 CHECK_NUMBER_COERCE_MARKER (tem, 0); | |
248 wordstart = XINT (tem); | |
249 Vabbrev_start_location = Qnil; | |
11503
9d8bb1074fd8
(Fexpand_abbrev): Add some error checking.
Karl Heuer <kwzh@gnu.org>
parents:
9294
diff
changeset
|
250 if (wordstart < BEGV || wordstart > ZV) |
9d8bb1074fd8
(Fexpand_abbrev): Add some error checking.
Karl Heuer <kwzh@gnu.org>
parents:
9294
diff
changeset
|
251 wordstart = 0; |
20529
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
252 if (wordstart && wordstart != ZV) |
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
253 { |
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
254 wordstart_byte = CHAR_TO_BYTE (wordstart); |
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
255 if (FETCH_BYTE (wordstart_byte) == '-') |
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
256 del_range (wordstart, wordstart + 1); |
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
257 } |
146 | 258 } |
11503
9d8bb1074fd8
(Fexpand_abbrev): Add some error checking.
Karl Heuer <kwzh@gnu.org>
parents:
9294
diff
changeset
|
259 if (!wordstart) |
16039
855c8d8ba0f0
Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
260 wordstart = scan_words (PT, -1); |
146 | 261 |
262 if (!wordstart) | |
1021
22f807391bec
(Fexpand_abbrev): If pre-expand hook changes the buffer,
Richard M. Stallman <rms@gnu.org>
parents:
988
diff
changeset
|
263 return value; |
146 | 264 |
20529
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
265 wordstart_byte = CHAR_TO_BYTE (wordstart); |
146 | 266 wordend = scan_words (wordstart, 1); |
267 if (!wordend) | |
1021
22f807391bec
(Fexpand_abbrev): If pre-expand hook changes the buffer,
Richard M. Stallman <rms@gnu.org>
parents:
988
diff
changeset
|
268 return value; |
146 | 269 |
16039
855c8d8ba0f0
Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
270 if (wordend > PT) |
855c8d8ba0f0
Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
271 wordend = PT; |
20529
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
272 |
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
273 wordend_byte = CHAR_TO_BYTE (wordend); |
16039
855c8d8ba0f0
Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
274 whitecnt = PT - wordend; |
146 | 275 if (wordend <= wordstart) |
1021
22f807391bec
(Fexpand_abbrev): If pre-expand hook changes the buffer,
Richard M. Stallman <rms@gnu.org>
parents:
988
diff
changeset
|
276 return value; |
146 | 277 |
20529
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
278 p = buffer = (char *) alloca (wordend_byte - wordstart_byte); |
146 | 279 |
20529
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
280 for (idx = wordstart_byte; idx < wordend_byte; idx++) |
146 | 281 { |
20529
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
282 /* ??? This loop needs to go by characters! */ |
17059
5246c075a643
Change FETCH_CHAR references to FETCH_BYTE.
Karl Heuer <kwzh@gnu.org>
parents:
16747
diff
changeset
|
283 register int c = FETCH_BYTE (idx); |
146 | 284 if (UPPERCASEP (c)) |
285 c = DOWNCASE (c), uccount++; | |
286 else if (! NOCASEP (c)) | |
287 lccount++; | |
288 *p++ = c; | |
289 } | |
290 | |
9140
3e7833a8e16f
(Fdefine_abbrev, Fexpand_abbrev, Funexpand_abbrev): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9054
diff
changeset
|
291 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
|
292 sym = oblookup (current_buffer->abbrev_table, buffer, |
bf079eb81bd3
(Fexpand_abbrev): Pass both kinds of size to oblookup.
Richard M. Stallman <rms@gnu.org>
parents:
20554
diff
changeset
|
293 wordend - wordstart, wordend_byte - wordstart_byte); |
146 | 294 else |
9294
4d083b72b3b1
(Fexpand_abbrev): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9260
diff
changeset
|
295 XSETFASTINT (sym, 0); |
39584
6145836b795c
Use SYMBOL_VALUE/ SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents:
29742
diff
changeset
|
296 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
|
297 sym = oblookup (Vglobal_abbrev_table, buffer, |
bf079eb81bd3
(Fexpand_abbrev): Pass both kinds of size to oblookup.
Richard M. Stallman <rms@gnu.org>
parents:
20554
diff
changeset
|
298 wordend - wordstart, wordend_byte - wordstart_byte); |
39584
6145836b795c
Use SYMBOL_VALUE/ SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents:
29742
diff
changeset
|
299 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
|
300 return value; |
146 | 301 |
302 if (INTERACTIVE && !EQ (minibuf_window, selected_window)) | |
303 { | |
11554 | 304 /* Add an undo boundary, in case we are doing this for |
305 a self-inserting command which has avoided making one so far. */ | |
146 | 306 SET_PT (wordend); |
307 Fundo_boundary (); | |
308 } | |
16565
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
309 |
146 | 310 Vlast_abbrev_text |
311 = Fbuffer_substring (make_number (wordstart), make_number (wordend)); | |
312 | |
16565
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
313 /* Now sym is the abbrev symbol. */ |
146 | 314 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
|
315 value = sym; |
146 | 316 last_abbrev_point = wordstart; |
317 | |
9140
3e7833a8e16f
(Fdefine_abbrev, Fexpand_abbrev, Funexpand_abbrev): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9054
diff
changeset
|
318 if (INTEGERP (XSYMBOL (sym)->plist)) |
146 | 319 XSETINT (XSYMBOL (sym)->plist, |
320 XINT (XSYMBOL (sym)->plist) + 1); /* Increment use count */ | |
321 | |
16565
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
322 /* 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
|
323 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
|
324 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
|
325 if (STRINGP (expansion)) |
146 | 326 { |
16565
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
327 SET_PT (wordstart); |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
328 |
20981
0ce30e7ba2b8
Reorder args of del_range_both.
Karl Heuer <kwzh@gnu.org>
parents:
20708
diff
changeset
|
329 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
|
330 |
20590
bf079eb81bd3
(Fexpand_abbrev): Pass both kinds of size to oblookup.
Richard M. Stallman <rms@gnu.org>
parents:
20554
diff
changeset
|
331 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
|
332 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
|
333 SET_PT (PT + whitecnt); |
397 | 334 |
16565
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
335 if (uccount && !lccount) |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
336 { |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
337 /* Abbrev was all caps */ |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
338 /* 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
|
339 /* 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
|
340 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
|
341 if (!abbrev_all_caps) |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
342 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
|
343 { |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
344 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
|
345 make_number (PT)); |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
346 goto caped; |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
347 } |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
348 /* 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
|
349 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
|
350 caped: ; |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
351 } |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
352 else if (uccount) |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
353 { |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
354 /* 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
|
355 int pos = wordstart_byte; |
397 | 356 |
16565
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
357 /* Find the initial. */ |
20529
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
358 while (pos < PT_BYTE |
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
359 && SYNTAX (*BUF_BYTE_ADDRESS (current_buffer, pos)) != Sword) |
16565
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
360 pos++; |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
361 |
0bef6ef9964b
(Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents:
16485
diff
changeset
|
362 /* Change just that. */ |
20529
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
363 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
|
364 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
|
365 } |
146 | 366 } |
367 | |
368 hook = XSYMBOL (sym)->function; | |
484 | 369 if (!NILP (hook)) |
27043
b5ce0c450409
(Fexpand_abbrev): If expanding an abbrev which has only
Gerd Moellmann <gerd@gnu.org>
parents:
25766
diff
changeset
|
370 { |
b5ce0c450409
(Fexpand_abbrev): If expanding an abbrev which has only
Gerd Moellmann <gerd@gnu.org>
parents:
25766
diff
changeset
|
371 Lisp_Object expanded, prop; |
b5ce0c450409
(Fexpand_abbrev): If expanding an abbrev which has only
Gerd Moellmann <gerd@gnu.org>
parents:
25766
diff
changeset
|
372 |
27379 | 373 /* 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
|
374 expanded = call0 (hook); |
27379 | 375 |
376 /* In addition, if the hook function is a symbol with a a | |
377 non-nil `no-self-insert' property, let the value it returned | |
378 specify whether we consider that an expansion took place. If | |
379 it returns nil, no expansion has been done. */ | |
380 | |
27043
b5ce0c450409
(Fexpand_abbrev): If expanding an abbrev which has only
Gerd Moellmann <gerd@gnu.org>
parents:
25766
diff
changeset
|
381 if (SYMBOLP (hook) |
b5ce0c450409
(Fexpand_abbrev): If expanding an abbrev which has only
Gerd Moellmann <gerd@gnu.org>
parents:
25766
diff
changeset
|
382 && NILP (expanded) |
b5ce0c450409
(Fexpand_abbrev): If expanding an abbrev which has only
Gerd Moellmann <gerd@gnu.org>
parents:
25766
diff
changeset
|
383 && (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
|
384 !NILP (prop))) |
b5ce0c450409
(Fexpand_abbrev): If expanding an abbrev which has only
Gerd Moellmann <gerd@gnu.org>
parents:
25766
diff
changeset
|
385 value = Qnil; |
b5ce0c450409
(Fexpand_abbrev): If expanding an abbrev which has only
Gerd Moellmann <gerd@gnu.org>
parents:
25766
diff
changeset
|
386 } |
146 | 387 |
16747
126a42ee62ac
(Fexpand_abbrev): Return the abbrev symbol, or nil if no expansion.
Richard M. Stallman <rms@gnu.org>
parents:
16565
diff
changeset
|
388 return value; |
146 | 389 } |
390 | |
391 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
|
392 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
|
393 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
|
394 is not undone. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
395 () |
146 | 396 { |
16039
855c8d8ba0f0
Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
397 int opoint = PT; |
146 | 398 int adjust = 0; |
399 if (last_abbrev_point < BEGV | |
400 || last_abbrev_point > ZV) | |
401 return Qnil; | |
402 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
|
403 if (STRINGP (Vlast_abbrev_text)) |
146 | 404 { |
405 /* This isn't correct if Vlast_abbrev->function was used | |
406 to do the expansion */ | |
407 Lisp_Object val; | |
20529
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
408 int zv_before; |
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
409 |
39584
6145836b795c
Use SYMBOL_VALUE/ SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents:
29742
diff
changeset
|
410 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
|
411 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
|
412 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
|
413 zv_before = ZV; |
21244
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
20981
diff
changeset
|
414 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
|
415 /* 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
|
416 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
|
417 XSTRING (Vlast_abbrev_text)->size, |
21244
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
20981
diff
changeset
|
418 STRING_BYTES (XSTRING (Vlast_abbrev_text)), 0); |
146 | 419 Vlast_abbrev_text = Qnil; |
20529
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
420 /* Total number of characters deleted. */ |
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
421 adjust = ZV - zv_before; |
146 | 422 } |
22909
c8e47ec53eb6
(Funexpand_abbrev): Add ADJUST instead of subtracting.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
423 SET_PT (last_abbrev_point < opoint ? opoint + adjust : opoint); |
146 | 424 return Qnil; |
425 } | |
426 | |
20529
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
427 static void |
146 | 428 write_abbrev (sym, stream) |
429 Lisp_Object sym, stream; | |
430 { | |
431 Lisp_Object name; | |
39584
6145836b795c
Use SYMBOL_VALUE/ SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents:
29742
diff
changeset
|
432 if (NILP (SYMBOL_VALUE (sym))) |
146 | 433 return; |
434 insert (" (", 5); | |
9260
945ddb4e9e24
(write_abbrev, Finsert_abbrev_table_description): Use new accessor macros
Karl Heuer <kwzh@gnu.org>
parents:
9140
diff
changeset
|
435 XSETSTRING (name, XSYMBOL (sym)->name); |
146 | 436 Fprin1 (name, stream); |
437 insert (" ", 1); | |
39584
6145836b795c
Use SYMBOL_VALUE/ SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents:
29742
diff
changeset
|
438 Fprin1 (SYMBOL_VALUE (sym), stream); |
146 | 439 insert (" ", 1); |
440 Fprin1 (XSYMBOL (sym)->function, stream); | |
441 insert (" ", 1); | |
442 Fprin1 (XSYMBOL (sym)->plist, stream); | |
443 insert (")\n", 2); | |
444 } | |
445 | |
20529
4b3fc2cda7fc
(describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
17059
diff
changeset
|
446 static void |
146 | 447 describe_abbrev (sym, stream) |
448 Lisp_Object sym, stream; | |
449 { | |
450 Lisp_Object one; | |
451 | |
39584
6145836b795c
Use SYMBOL_VALUE/ SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents:
29742
diff
changeset
|
452 if (NILP (SYMBOL_VALUE (sym))) |
146 | 453 return; |
454 one = make_number (1); | |
455 Fprin1 (Fsymbol_name (sym), stream); | |
456 Findent_to (make_number (15), one); | |
457 Fprin1 (XSYMBOL (sym)->plist, stream); | |
458 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
|
459 Fprin1 (SYMBOL_VALUE (sym), stream); |
484 | 460 if (!NILP (XSYMBOL (sym)->function)) |
146 | 461 { |
462 Findent_to (make_number (45), one); | |
463 Fprin1 (XSYMBOL (sym)->function, stream); | |
464 } | |
465 Fterpri (stream); | |
466 } | |
467 | |
16485
9b919c5464a4
Reorganize function definitions so etags finds them.
Erik Naggum <erik@naggum.no>
parents:
16039
diff
changeset
|
468 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
|
469 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
|
470 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
|
471 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
|
472 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
|
473 is inserted. Otherwise the description is an expression, |
d0d7ddac8c5e
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39584
diff
changeset
|
474 a call to `define-abbrev-table', which would |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
475 define the abbrev table NAME exactly as it is currently defined. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
476 (name, readable) |
146 | 477 Lisp_Object name, readable; |
478 { | |
479 Lisp_Object table; | |
480 Lisp_Object stream; | |
481 | |
482 CHECK_SYMBOL (name, 0); | |
483 table = Fsymbol_value (name); | |
484 CHECK_VECTOR (table, 0); | |
485 | |
9260
945ddb4e9e24
(write_abbrev, Finsert_abbrev_table_description): Use new accessor macros
Karl Heuer <kwzh@gnu.org>
parents:
9140
diff
changeset
|
486 XSETBUFFER (stream, current_buffer); |
146 | 487 |
484 | 488 if (!NILP (readable)) |
146 | 489 { |
490 insert_string ("("); | |
491 Fprin1 (name, stream); | |
492 insert_string (")\n\n"); | |
493 map_obarray (table, describe_abbrev, stream); | |
494 insert_string ("\n\n"); | |
495 } | |
496 else | |
497 { | |
498 insert_string ("(define-abbrev-table '"); | |
499 Fprin1 (name, stream); | |
500 insert_string (" '(\n"); | |
501 map_obarray (table, write_abbrev, stream); | |
502 insert_string (" ))\n\n"); | |
503 } | |
504 | |
505 return Qnil; | |
506 } | |
507 | |
508 DEFUN ("define-abbrev-table", Fdefine_abbrev_table, Sdefine_abbrev_table, | |
509 2, 2, 0, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
510 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
|
511 Define abbrevs in it according to DEFINITIONS, which is a list of elements |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
512 of the form (ABBREVNAME EXPANSION HOOK USECOUNT). */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
513 (tablename, definitions) |
14098
aa682cae5c89
(Fdefine_abbrev_table): Fix previous change.
Karl Heuer <kwzh@gnu.org>
parents:
14059
diff
changeset
|
514 Lisp_Object tablename, definitions; |
146 | 515 { |
516 Lisp_Object name, exp, hook, count; | |
517 Lisp_Object table, elt; | |
518 | |
14059
1303d585443b
(Fdefine_global_abbrev, Fdefine_mode_abbrev, Fabbrev_symbol,
Erik Naggum <erik@naggum.no>
parents:
12091
diff
changeset
|
519 CHECK_SYMBOL (tablename, 0); |
1303d585443b
(Fdefine_global_abbrev, Fdefine_mode_abbrev, Fabbrev_symbol,
Erik Naggum <erik@naggum.no>
parents:
12091
diff
changeset
|
520 table = Fboundp (tablename); |
1303d585443b
(Fdefine_global_abbrev, Fdefine_mode_abbrev, Fabbrev_symbol,
Erik Naggum <erik@naggum.no>
parents:
12091
diff
changeset
|
521 if (NILP (table) || (table = Fsymbol_value (tablename), NILP (table))) |
146 | 522 { |
523 table = Fmake_abbrev_table (); | |
14059
1303d585443b
(Fdefine_global_abbrev, Fdefine_mode_abbrev, Fabbrev_symbol,
Erik Naggum <erik@naggum.no>
parents:
12091
diff
changeset
|
524 Fset (tablename, table); |
14098
aa682cae5c89
(Fdefine_abbrev_table): Fix previous change.
Karl Heuer <kwzh@gnu.org>
parents:
14059
diff
changeset
|
525 Vabbrev_table_name_list = Fcons (tablename, Vabbrev_table_name_list); |
146 | 526 } |
527 CHECK_VECTOR (table, 0); | |
528 | |
14098
aa682cae5c89
(Fdefine_abbrev_table): Fix previous change.
Karl Heuer <kwzh@gnu.org>
parents:
14059
diff
changeset
|
529 for (; !NILP (definitions); definitions = Fcdr (definitions)) |
146 | 530 { |
14059
1303d585443b
(Fdefine_global_abbrev, Fdefine_mode_abbrev, Fabbrev_symbol,
Erik Naggum <erik@naggum.no>
parents:
12091
diff
changeset
|
531 elt = Fcar (definitions); |
988
341171b49f96
* abbrev.c (Fdefine_abbrev_table): Fiddled with formatting.
Jim Blandy <jimb@redhat.com>
parents:
484
diff
changeset
|
532 name = Fcar (elt); elt = Fcdr (elt); |
341171b49f96
* abbrev.c (Fdefine_abbrev_table): Fiddled with formatting.
Jim Blandy <jimb@redhat.com>
parents:
484
diff
changeset
|
533 exp = Fcar (elt); elt = Fcdr (elt); |
341171b49f96
* abbrev.c (Fdefine_abbrev_table): Fiddled with formatting.
Jim Blandy <jimb@redhat.com>
parents:
484
diff
changeset
|
534 hook = Fcar (elt); elt = Fcdr (elt); |
146 | 535 count = Fcar (elt); |
536 Fdefine_abbrev (table, name, exp, hook, count); | |
537 } | |
538 return Qnil; | |
539 } | |
540 | |
21514 | 541 void |
146 | 542 syms_of_abbrev () |
543 { | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
544 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
|
545 doc: /* List of symbols whose values are abbrev tables. */); |
146 | 546 Vabbrev_table_name_list = Fcons (intern ("fundamental-mode-abbrev-table"), |
547 Fcons (intern ("global-abbrev-table"), | |
548 Qnil)); | |
549 | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
550 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
|
551 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
|
552 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
|
553 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
|
554 for any particular abbrev defined in both. */); |
146 | 555 Vglobal_abbrev_table = Fmake_abbrev_table (); |
556 | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
557 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
|
558 doc: /* The abbrev table of mode-specific abbrevs for Fundamental Mode. */); |
146 | 559 Vfundamental_mode_abbrev_table = Fmake_abbrev_table (); |
560 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
|
561 buffer_defaults.abbrev_table = Vfundamental_mode_abbrev_table; |
146 | 562 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
563 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
|
564 doc: /* The abbrev-symbol of the last abbrev expanded. See `abbrev-symbol'. */); |
146 | 565 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
566 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
|
567 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
|
568 nil if the abbrev has already been unexpanded. */); |
146 | 569 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
570 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
|
571 doc: /* The location of the start of the last abbrev expanded. */); |
146 | 572 |
573 Vlast_abbrev = Qnil; | |
574 Vlast_abbrev_text = Qnil; | |
575 last_abbrev_point = 0; | |
576 | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
577 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
|
578 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
|
579 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
|
580 Calling `expand-abbrev' sets this to nil. */); |
146 | 581 Vabbrev_start_location = Qnil; |
582 | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
583 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
|
584 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
|
585 Trying to expand an abbrev in any other buffer clears `abbrev-start-location'. */); |
146 | 586 Vabbrev_start_location_buffer = Qnil; |
587 | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
588 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
|
589 doc: /* Local (mode-specific) abbrev table of current buffer. */); |
146 | 590 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
591 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
|
592 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
|
593 This causes `save-some-buffers' to offer to save the abbrevs. */); |
146 | 594 abbrevs_changed = 0; |
595 | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
596 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
|
597 doc: /* *Set non-nil means expand multi-word abbrevs all caps if abbrev was so. */); |
146 | 598 abbrev_all_caps = 0; |
599 | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39960
diff
changeset
|
600 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
|
601 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
|
602 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
|
603 the current abbrev table before abbrev lookup happens. */); |
458
8f18e7e89008
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
397
diff
changeset
|
604 Vpre_abbrev_expand_hook = Qnil; |
8f18e7e89008
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
397
diff
changeset
|
605 Qpre_abbrev_expand_hook = intern ("pre-abbrev-expand-hook"); |
8f18e7e89008
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
397
diff
changeset
|
606 staticpro (&Qpre_abbrev_expand_hook); |
8f18e7e89008
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
397
diff
changeset
|
607 |
146 | 608 defsubr (&Smake_abbrev_table); |
609 defsubr (&Sclear_abbrev_table); | |
610 defsubr (&Sdefine_abbrev); | |
611 defsubr (&Sdefine_global_abbrev); | |
612 defsubr (&Sdefine_mode_abbrev); | |
613 defsubr (&Sabbrev_expansion); | |
614 defsubr (&Sabbrev_symbol); | |
615 defsubr (&Sexpand_abbrev); | |
616 defsubr (&Sunexpand_abbrev); | |
617 defsubr (&Sinsert_abbrev_table_description); | |
618 defsubr (&Sdefine_abbrev_table); | |
619 } |