annotate src/abbrev.c @ 46132:4d83b6d5d27a

(cperl-break-one-line-blocks-when-indent): Fix typo.
author Juanma Barranquero <lekktu@gmail.com>
date Tue, 02 Jul 2002 14:50:00 +0000
parents 6c875925d507
children 40db0673e6f0
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
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
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
5 This file is part of GNU Emacs.
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
6
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
7 GNU Emacs is free software; you can redistribute it and/or modify
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
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
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
10 any later version.
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
11
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
12 GNU Emacs is distributed in the hope that it will be useful,
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
13 but WITHOUT ANY WARRANTY; without even the implied warranty of
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
15 GNU General Public License for more details.
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
16
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
17 You should have received a copy of the GNU General Public License
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
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
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
21
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
22
4696
1fc792473491 Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents: 2961
diff changeset
23 #include <config.h>
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
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
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
26 #include "lisp.h"
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
27 #include "commands.h"
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
28 #include "buffer.h"
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
29 #include "window.h"
23715
c69d612b0819 Include charset.h.
Kenichi Handa <handa@m17n.org>
parents: 22909
diff changeset
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
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
32
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
33 /* An abbrev table is an obarray.
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
34 Each defined abbrev is represented by a symbol in that obarray
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
35 whose print name is the abbreviation.
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
36 The symbol's value is a string which is the expansion.
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
37 If its function definition is non-nil, it is called
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
38 after the expansion is done.
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
39 The plist slot of the abbrev symbol is its usage count. */
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
40
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
41 /* List of all abbrev-table name symbols:
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
42 symbols whose values are abbrev tables. */
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
43
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
44 Lisp_Object Vabbrev_table_name_list;
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
45
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
46 /* The table of global abbrevs. These are in effect
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
47 in any buffer in which abbrev mode is turned on. */
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
48
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
49 Lisp_Object Vglobal_abbrev_table;
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
50
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
51 /* The local abbrev table used by default (in Fundamental Mode buffers) */
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
52
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
53 Lisp_Object Vfundamental_mode_abbrev_table;
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
54
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
55 /* Set nonzero when an abbrev definition is changed */
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
56
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
57 int abbrevs_changed;
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
58
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
59 int abbrev_all_caps;
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
60
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
61 /* Non-nil => use this location as the start of abbrev to expand
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
62 (rather than taking the word before point as the abbrev) */
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
63
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
64 Lisp_Object Vabbrev_start_location;
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
65
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
66 /* Buffer that Vabbrev_start_location applies to */
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
67 Lisp_Object Vabbrev_start_location_buffer;
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
68
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
69 /* The symbol representing the abbrev most recently expanded */
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
70
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
71 Lisp_Object Vlast_abbrev;
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
72
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
73 /* A string for the actual text of the abbrev most recently expanded.
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
74 This has more info than Vlast_abbrev since case is significant. */
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
75
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
76 Lisp_Object Vlast_abbrev_text;
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
77
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
78 /* Character address of start of last abbrev expanded */
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
79
43713
f92c4d87863a Change defvar_int def and vars to use EMACS_INT instead of just int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 43671
diff changeset
80 EMACS_INT last_abbrev_point;
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
81
458
8f18e7e89008 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 397
diff changeset
82 /* Hook to run before expanding any abbrev. */
8f18e7e89008 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 397
diff changeset
83
8f18e7e89008 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 397
diff changeset
84 Lisp_Object Vpre_abbrev_expand_hook, Qpre_abbrev_expand_hook;
42388
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
85
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
86 Lisp_Object Qsystem_type, Qcount;
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
87
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
88 DEFUN ("make-abbrev-table", Fmake_abbrev_table, Smake_abbrev_table, 0, 0, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39960
diff changeset
89 doc: /* Create a new, empty abbrev table object. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39960
diff changeset
90 ()
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
91 {
44739
31151cf0eb43 Add comment of arbitrary chosen constant 59.
Pavel Janík <Pavel@Janik.cz>
parents: 43713
diff changeset
92 /* The value 59 is arbitrary chosen prime number. */
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
93 return Fmake_vector (make_number (59), make_number (0));
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
94 }
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
95
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
96 DEFUN ("clear-abbrev-table", Fclear_abbrev_table, Sclear_abbrev_table, 1, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39960
diff changeset
97 doc: /* Undefine all abbrevs in abbrev table TABLE, leaving it empty. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39960
diff changeset
98 (table)
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
99 Lisp_Object table;
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
100 {
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
101 int i, size;
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
102
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40109
diff changeset
103 CHECK_VECTOR (table);
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
104 size = XVECTOR (table)->size;
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
105 abbrevs_changed = 1;
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
106 for (i = 0; i < size; i++)
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
107 XVECTOR (table)->contents[i] = make_number (0);
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
108 return Qnil;
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
109 }
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
110
42388
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
111 DEFUN ("define-abbrev", Fdefine_abbrev, Sdefine_abbrev, 3, 6, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39960
diff changeset
112 doc: /* Define an abbrev in TABLE named NAME, to expand to EXPANSION and call HOOK.
39960
d0d7ddac8c5e Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39584
diff changeset
113 NAME must be a string.
d0d7ddac8c5e Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39584
diff changeset
114 EXPANSION should usually be a string.
d0d7ddac8c5e Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39584
diff changeset
115 To undefine an abbrev, define it with EXPANSION = nil.
d0d7ddac8c5e Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39584
diff changeset
116 If HOOK is non-nil, it should be a function of no arguments;
d0d7ddac8c5e Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39584
diff changeset
117 it is called after EXPANSION is inserted.
d0d7ddac8c5e Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39584
diff changeset
118 If EXPANSION is not a string, the abbrev is a special one,
d0d7ddac8c5e Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39584
diff changeset
119 which does not expand in the usual way but only runs HOOK.
42388
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
120
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
121 COUNT, if specified, gives the initial value for the abbrev's
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
122 usage-count, which is incremented each time the abbrev is used.
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
123 \(The default is zero.)
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
124
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
125 SYSTEM-FLAG, if non-nil, says that this is a "system" abbreviation
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
126 which should not be saved in the user's abbreviation file. */)
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
127 (table, name, expansion, hook, count, system_flag)
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
128 Lisp_Object table, name, expansion, hook, count, system_flag;
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
129 {
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
130 Lisp_Object sym, oexp, ohook, tem;
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40109
diff changeset
131 CHECK_VECTOR (table);
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40109
diff changeset
132 CHECK_STRING (name);
16565
0bef6ef9964b (Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents: 16485
diff changeset
133
484
3165b2697c78 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 458
diff changeset
134 if (NILP (count))
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
135 count = make_number (0);
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
136 else
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40109
diff changeset
137 CHECK_NUMBER (count);
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
138
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
139 sym = Fintern (name, table);
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
140
39584
6145836b795c Use SYMBOL_VALUE/ SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents: 29742
diff changeset
141 oexp = SYMBOL_VALUE (sym);
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
142 ohook = XSYMBOL (sym)->function;
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
143 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
144 || (STRINGP (oexp) && STRINGP (expansion)
484
3165b2697c78 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 458
diff changeset
145 && (tem = Fstring_equal (oexp, expansion), !NILP (tem))))
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
146 &&
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
147 (EQ (ohook, hook)
42388
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
148 || (tem = Fequal (ohook, hook), !NILP (tem))))
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
149 && NILP (system_flag))
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
150 abbrevs_changed = 1;
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
151
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
152 Fset (sym, expansion);
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
153 Ffset (sym, hook);
42388
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
154
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
155 if (! NILP (system_flag))
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
156 Fsetplist (sym, list4 (Qcount, count, Qsystem_type, system_flag));
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
157 else
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
158 Fsetplist (sym, count);
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
159
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
160 return name;
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
161 }
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
162
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
163 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
164 "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
165 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
166 (abbrev, expansion)
14059
1303d585443b (Fdefine_global_abbrev, Fdefine_mode_abbrev, Fabbrev_symbol,
Erik Naggum <erik@naggum.no>
parents: 12091
diff changeset
167 Lisp_Object abbrev, expansion;
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
168 {
14059
1303d585443b (Fdefine_global_abbrev, Fdefine_mode_abbrev, Fabbrev_symbol,
Erik Naggum <erik@naggum.no>
parents: 12091
diff changeset
169 Fdefine_abbrev (Vglobal_abbrev_table, Fdowncase (abbrev),
42388
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
170 expansion, Qnil, make_number (0), Qnil);
14059
1303d585443b (Fdefine_global_abbrev, Fdefine_mode_abbrev, Fabbrev_symbol,
Erik Naggum <erik@naggum.no>
parents: 12091
diff changeset
171 return abbrev;
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
172 }
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
173
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
174 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
175 "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
176 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
177 (abbrev, expansion)
14059
1303d585443b (Fdefine_global_abbrev, Fdefine_mode_abbrev, Fabbrev_symbol,
Erik Naggum <erik@naggum.no>
parents: 12091
diff changeset
178 Lisp_Object abbrev, expansion;
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
179 {
484
3165b2697c78 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 458
diff changeset
180 if (NILP (current_buffer->abbrev_table))
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
181 error ("Major mode has no abbrev table");
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
182
14059
1303d585443b (Fdefine_global_abbrev, Fdefine_mode_abbrev, Fabbrev_symbol,
Erik Naggum <erik@naggum.no>
parents: 12091
diff changeset
183 Fdefine_abbrev (current_buffer->abbrev_table, Fdowncase (abbrev),
42388
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
184 expansion, Qnil, make_number (0), Qnil);
14059
1303d585443b (Fdefine_global_abbrev, Fdefine_mode_abbrev, Fabbrev_symbol,
Erik Naggum <erik@naggum.no>
parents: 12091
diff changeset
185 return abbrev;
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
186 }
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
187
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
188 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
189 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
190 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
191 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
192 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
193 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
194 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
195 (abbrev, table)
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
196 Lisp_Object abbrev, table;
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
197 {
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
198 Lisp_Object sym;
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40109
diff changeset
199 CHECK_STRING (abbrev);
484
3165b2697c78 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 458
diff changeset
200 if (!NILP (table))
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
201 sym = Fintern_soft (abbrev, table);
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
202 else
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
203 {
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
204 sym = Qnil;
484
3165b2697c78 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 458
diff changeset
205 if (!NILP (current_buffer->abbrev_table))
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
206 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
207 if (NILP (SYMBOL_VALUE (sym)))
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
208 sym = Qnil;
484
3165b2697c78 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 458
diff changeset
209 if (NILP (sym))
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
210 sym = Fintern_soft (abbrev, Vglobal_abbrev_table);
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
211 }
39584
6145836b795c Use SYMBOL_VALUE/ SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents: 29742
diff changeset
212 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
213 return Qnil;
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
214 return sym;
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
215 }
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
216
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
217 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
218 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
219 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
220 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
221 (abbrev, table)
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
222 Lisp_Object abbrev, table;
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
223 {
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
224 Lisp_Object sym;
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
225 sym = Fabbrev_symbol (abbrev, table);
484
3165b2697c78 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 458
diff changeset
226 if (NILP (sym)) return sym;
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
227 return Fsymbol_value (sym);
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
228 }
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
229
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
230 /* Expand the word before point, if it is an abbrev.
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
231 Returns 1 if an expansion is done. */
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
232
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
233 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
234 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
235 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
236 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
237 ()
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
238 {
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
239 register char *buffer, *p;
20529
4b3fc2cda7fc (describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 17059
diff changeset
240 int wordstart, wordend;
4b3fc2cda7fc (describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 17059
diff changeset
241 register int wordstart_byte, wordend_byte, idx;
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
242 int whitecnt;
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
243 int uccount = 0, lccount = 0;
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
244 register Lisp_Object sym;
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
245 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
246 Lisp_Object value;
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
247
16747
126a42ee62ac (Fexpand_abbrev): Return the abbrev symbol, or nil if no expansion.
Richard M. Stallman <rms@gnu.org>
parents: 16565
diff changeset
248 value = Qnil;
126a42ee62ac (Fexpand_abbrev): Return the abbrev symbol, or nil if no expansion.
Richard M. Stallman <rms@gnu.org>
parents: 16565
diff changeset
249
41522
ee8692067cf0 (Fexpand_abbrev): Use Frun_hooks instead of Vrun_hooks.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
250 Frun_hooks (1, &Qpre_abbrev_expand_hook);
458
8f18e7e89008 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 397
diff changeset
251
11503
9d8bb1074fd8 (Fexpand_abbrev): Add some error checking.
Karl Heuer <kwzh@gnu.org>
parents: 9294
diff changeset
252 wordstart = 0;
16747
126a42ee62ac (Fexpand_abbrev): Return the abbrev symbol, or nil if no expansion.
Richard M. Stallman <rms@gnu.org>
parents: 16565
diff changeset
253 if (!(BUFFERP (Vabbrev_start_location_buffer)
126a42ee62ac (Fexpand_abbrev): Return the abbrev symbol, or nil if no expansion.
Richard M. Stallman <rms@gnu.org>
parents: 16565
diff changeset
254 && XBUFFER (Vabbrev_start_location_buffer) == current_buffer))
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
255 Vabbrev_start_location = Qnil;
484
3165b2697c78 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 458
diff changeset
256 if (!NILP (Vabbrev_start_location))
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
257 {
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
258 tem = Vabbrev_start_location;
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40109
diff changeset
259 CHECK_NUMBER_COERCE_MARKER (tem);
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
260 wordstart = XINT (tem);
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
261 Vabbrev_start_location = Qnil;
11503
9d8bb1074fd8 (Fexpand_abbrev): Add some error checking.
Karl Heuer <kwzh@gnu.org>
parents: 9294
diff changeset
262 if (wordstart < BEGV || wordstart > ZV)
9d8bb1074fd8 (Fexpand_abbrev): Add some error checking.
Karl Heuer <kwzh@gnu.org>
parents: 9294
diff changeset
263 wordstart = 0;
20529
4b3fc2cda7fc (describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 17059
diff changeset
264 if (wordstart && wordstart != ZV)
4b3fc2cda7fc (describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 17059
diff changeset
265 {
4b3fc2cda7fc (describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 17059
diff changeset
266 wordstart_byte = CHAR_TO_BYTE (wordstart);
4b3fc2cda7fc (describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 17059
diff changeset
267 if (FETCH_BYTE (wordstart_byte) == '-')
4b3fc2cda7fc (describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 17059
diff changeset
268 del_range (wordstart, wordstart + 1);
4b3fc2cda7fc (describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 17059
diff changeset
269 }
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
270 }
11503
9d8bb1074fd8 (Fexpand_abbrev): Add some error checking.
Karl Heuer <kwzh@gnu.org>
parents: 9294
diff changeset
271 if (!wordstart)
16039
855c8d8ba0f0 Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents: 14186
diff changeset
272 wordstart = scan_words (PT, -1);
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
273
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
274 if (!wordstart)
1021
22f807391bec (Fexpand_abbrev): If pre-expand hook changes the buffer,
Richard M. Stallman <rms@gnu.org>
parents: 988
diff changeset
275 return value;
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
276
20529
4b3fc2cda7fc (describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 17059
diff changeset
277 wordstart_byte = CHAR_TO_BYTE (wordstart);
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
278 wordend = scan_words (wordstart, 1);
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
279 if (!wordend)
1021
22f807391bec (Fexpand_abbrev): If pre-expand hook changes the buffer,
Richard M. Stallman <rms@gnu.org>
parents: 988
diff changeset
280 return value;
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
281
16039
855c8d8ba0f0 Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents: 14186
diff changeset
282 if (wordend > PT)
855c8d8ba0f0 Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents: 14186
diff changeset
283 wordend = PT;
20529
4b3fc2cda7fc (describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 17059
diff changeset
284
4b3fc2cda7fc (describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 17059
diff changeset
285 wordend_byte = CHAR_TO_BYTE (wordend);
16039
855c8d8ba0f0 Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents: 14186
diff changeset
286 whitecnt = PT - wordend;
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
287 if (wordend <= wordstart)
1021
22f807391bec (Fexpand_abbrev): If pre-expand hook changes the buffer,
Richard M. Stallman <rms@gnu.org>
parents: 988
diff changeset
288 return value;
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
289
20529
4b3fc2cda7fc (describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 17059
diff changeset
290 p = buffer = (char *) alloca (wordend_byte - wordstart_byte);
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
291
20529
4b3fc2cda7fc (describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 17059
diff changeset
292 for (idx = wordstart_byte; idx < wordend_byte; idx++)
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
293 {
20529
4b3fc2cda7fc (describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 17059
diff changeset
294 /* ??? 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
295 register int c = FETCH_BYTE (idx);
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
296 if (UPPERCASEP (c))
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
297 c = DOWNCASE (c), uccount++;
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
298 else if (! NOCASEP (c))
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
299 lccount++;
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
300 *p++ = c;
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
301 }
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
302
9140
3e7833a8e16f (Fdefine_abbrev, Fexpand_abbrev, Funexpand_abbrev): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents: 9054
diff changeset
303 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
304 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
305 wordend - wordstart, wordend_byte - wordstart_byte);
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
306 else
9294
4d083b72b3b1 (Fexpand_abbrev): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents: 9260
diff changeset
307 XSETFASTINT (sym, 0);
42388
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
308
39584
6145836b795c Use SYMBOL_VALUE/ SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents: 29742
diff changeset
309 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
310 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
311 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
312 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
313 return value;
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
314
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
315 if (INTERACTIVE && !EQ (minibuf_window, selected_window))
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
316 {
11554
ac21a7106ffd Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 11503
diff changeset
317 /* Add an undo boundary, in case we are doing this for
ac21a7106ffd Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 11503
diff changeset
318 a self-inserting command which has avoided making one so far. */
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
319 SET_PT (wordend);
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
320 Fundo_boundary ();
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
321 }
16565
0bef6ef9964b (Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents: 16485
diff changeset
322
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
323 Vlast_abbrev_text
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
324 = Fbuffer_substring (make_number (wordstart), make_number (wordend));
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
325
16565
0bef6ef9964b (Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents: 16485
diff changeset
326 /* Now sym is the abbrev symbol. */
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
327 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
328 value = sym;
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
329 last_abbrev_point = wordstart;
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
330
42388
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
331 /* Increment use count. */
9140
3e7833a8e16f (Fdefine_abbrev, Fexpand_abbrev, Funexpand_abbrev): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents: 9054
diff changeset
332 if (INTEGERP (XSYMBOL (sym)->plist))
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
333 XSETINT (XSYMBOL (sym)->plist,
42388
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
334 XINT (XSYMBOL (sym)->plist) + 1);
43671
b6abb8a7ea89 (Fexpand_abbrev): Increment plist as use count only if it is an integer.
Richard M. Stallman <rms@gnu.org>
parents: 42410
diff changeset
335 else if (INTEGERP (tem = Fget (sym, Qcount)))
42388
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
336 Fput (sym, Qcount, make_number (XINT (tem) + 1));
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
337
16565
0bef6ef9964b (Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents: 16485
diff changeset
338 /* 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
339 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
340 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
341 if (STRINGP (expansion))
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
342 {
16565
0bef6ef9964b (Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents: 16485
diff changeset
343 SET_PT (wordstart);
0bef6ef9964b (Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents: 16485
diff changeset
344
20981
0ce30e7ba2b8 Reorder args of del_range_both.
Karl Heuer <kwzh@gnu.org>
parents: 20708
diff changeset
345 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
346
20590
bf079eb81bd3 (Fexpand_abbrev): Pass both kinds of size to oblookup.
Richard M. Stallman <rms@gnu.org>
parents: 20554
diff changeset
347 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
348 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
349 SET_PT (PT + whitecnt);
397
a17df2fec87b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 146
diff changeset
350
16565
0bef6ef9964b (Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents: 16485
diff changeset
351 if (uccount && !lccount)
0bef6ef9964b (Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents: 16485
diff changeset
352 {
0bef6ef9964b (Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents: 16485
diff changeset
353 /* Abbrev was all caps */
0bef6ef9964b (Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents: 16485
diff changeset
354 /* 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
355 /* 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
356 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
357 if (!abbrev_all_caps)
0bef6ef9964b (Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents: 16485
diff changeset
358 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
359 {
0bef6ef9964b (Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents: 16485
diff changeset
360 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
361 make_number (PT));
0bef6ef9964b (Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents: 16485
diff changeset
362 goto caped;
0bef6ef9964b (Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents: 16485
diff changeset
363 }
0bef6ef9964b (Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents: 16485
diff changeset
364 /* 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
365 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
366 caped: ;
0bef6ef9964b (Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents: 16485
diff changeset
367 }
0bef6ef9964b (Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents: 16485
diff changeset
368 else if (uccount)
0bef6ef9964b (Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents: 16485
diff changeset
369 {
0bef6ef9964b (Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents: 16485
diff changeset
370 /* 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
371 int pos = wordstart_byte;
397
a17df2fec87b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 146
diff changeset
372
16565
0bef6ef9964b (Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents: 16485
diff changeset
373 /* Find the initial. */
20529
4b3fc2cda7fc (describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 17059
diff changeset
374 while (pos < PT_BYTE
4b3fc2cda7fc (describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 17059
diff changeset
375 && 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
376 pos++;
0bef6ef9964b (Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents: 16485
diff changeset
377
0bef6ef9964b (Fexpand_abbrev): If the abbrev's expansion is nil,
Richard M. Stallman <rms@gnu.org>
parents: 16485
diff changeset
378 /* Change just that. */
20529
4b3fc2cda7fc (describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 17059
diff changeset
379 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
380 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
381 }
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
382 }
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
383
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
384 hook = XSYMBOL (sym)->function;
484
3165b2697c78 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 458
diff changeset
385 if (!NILP (hook))
27043
b5ce0c450409 (Fexpand_abbrev): If expanding an abbrev which has only
Gerd Moellmann <gerd@gnu.org>
parents: 25766
diff changeset
386 {
b5ce0c450409 (Fexpand_abbrev): If expanding an abbrev which has only
Gerd Moellmann <gerd@gnu.org>
parents: 25766
diff changeset
387 Lisp_Object expanded, prop;
b5ce0c450409 (Fexpand_abbrev): If expanding an abbrev which has only
Gerd Moellmann <gerd@gnu.org>
parents: 25766
diff changeset
388
27379
48cb03c9d1d8 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 27043
diff changeset
389 /* 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
390 expanded = call0 (hook);
27379
48cb03c9d1d8 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 27043
diff changeset
391
44851
ceafe18856c7 (abbrev-start-location): Doc fix.
Pavel Janík <Pavel@Janik.cz>
parents: 44739
diff changeset
392 /* In addition, if the hook function is a symbol with
ceafe18856c7 (abbrev-start-location): Doc fix.
Pavel Janík <Pavel@Janik.cz>
parents: 44739
diff changeset
393 a non-nil `no-self-insert' property, let the value it returned
27379
48cb03c9d1d8 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 27043
diff changeset
394 specify whether we consider that an expansion took place. If
48cb03c9d1d8 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 27043
diff changeset
395 it returns nil, no expansion has been done. */
48cb03c9d1d8 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 27043
diff changeset
396
27043
b5ce0c450409 (Fexpand_abbrev): If expanding an abbrev which has only
Gerd Moellmann <gerd@gnu.org>
parents: 25766
diff changeset
397 if (SYMBOLP (hook)
b5ce0c450409 (Fexpand_abbrev): If expanding an abbrev which has only
Gerd Moellmann <gerd@gnu.org>
parents: 25766
diff changeset
398 && NILP (expanded)
b5ce0c450409 (Fexpand_abbrev): If expanding an abbrev which has only
Gerd Moellmann <gerd@gnu.org>
parents: 25766
diff changeset
399 && (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
400 !NILP (prop)))
b5ce0c450409 (Fexpand_abbrev): If expanding an abbrev which has only
Gerd Moellmann <gerd@gnu.org>
parents: 25766
diff changeset
401 value = Qnil;
b5ce0c450409 (Fexpand_abbrev): If expanding an abbrev which has only
Gerd Moellmann <gerd@gnu.org>
parents: 25766
diff changeset
402 }
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
403
16747
126a42ee62ac (Fexpand_abbrev): Return the abbrev symbol, or nil if no expansion.
Richard M. Stallman <rms@gnu.org>
parents: 16565
diff changeset
404 return value;
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
405 }
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
406
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
407 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
408 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
409 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
410 is not undone. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39960
diff changeset
411 ()
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
412 {
16039
855c8d8ba0f0 Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents: 14186
diff changeset
413 int opoint = PT;
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
414 int adjust = 0;
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
415 if (last_abbrev_point < BEGV
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
416 || last_abbrev_point > ZV)
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
417 return Qnil;
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
418 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
419 if (STRINGP (Vlast_abbrev_text))
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
420 {
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
421 /* This isn't correct if Vlast_abbrev->function was used
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
422 to do the expansion */
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
423 Lisp_Object val;
20529
4b3fc2cda7fc (describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 17059
diff changeset
424 int zv_before;
4b3fc2cda7fc (describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 17059
diff changeset
425
39584
6145836b795c Use SYMBOL_VALUE/ SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents: 29742
diff changeset
426 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
427 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
428 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
429 zv_before = ZV;
21244
50929073a0ba Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents: 20981
diff changeset
430 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
431 /* 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
432 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
433 XSTRING (Vlast_abbrev_text)->size,
21244
50929073a0ba Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents: 20981
diff changeset
434 STRING_BYTES (XSTRING (Vlast_abbrev_text)), 0);
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
435 Vlast_abbrev_text = Qnil;
20529
4b3fc2cda7fc (describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 17059
diff changeset
436 /* Total number of characters deleted. */
4b3fc2cda7fc (describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 17059
diff changeset
437 adjust = ZV - zv_before;
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
438 }
22909
c8e47ec53eb6 (Funexpand_abbrev): Add ADJUST instead of subtracting.
Richard M. Stallman <rms@gnu.org>
parents: 21514
diff changeset
439 SET_PT (last_abbrev_point < opoint ? opoint + adjust : opoint);
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
440 return Qnil;
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
441 }
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
442
20529
4b3fc2cda7fc (describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 17059
diff changeset
443 static void
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
444 write_abbrev (sym, stream)
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
445 Lisp_Object sym, stream;
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
446 {
42388
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
447 Lisp_Object name, count, system_flag;
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
448
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
449 if (INTEGERP (XSYMBOL (sym)->plist))
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
450 {
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
451 count = XSYMBOL (sym)->plist;
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
452 system_flag = Qnil;
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
453 }
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
454 else
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
455 {
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
456 count = Fget (sym, Qcount);
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
457 system_flag = Fget (sym, Qsystem_type);
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
458 }
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
459
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
460 if (NILP (SYMBOL_VALUE (sym)) || ! NILP (system_flag))
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
461 return;
42388
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
462
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
463 insert (" (", 5);
45391
6c875925d507 * abbrev.c (write_abbrev): Use SYMBOL_NAME instead of XSYMBOL and
Ken Raeburn <raeburn@raeburn.org>
parents: 44851
diff changeset
464 name = SYMBOL_NAME (sym);
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
465 Fprin1 (name, stream);
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
466 insert (" ", 1);
39584
6145836b795c Use SYMBOL_VALUE/ SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents: 29742
diff changeset
467 Fprin1 (SYMBOL_VALUE (sym), stream);
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
468 insert (" ", 1);
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
469 Fprin1 (XSYMBOL (sym)->function, stream);
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
470 insert (" ", 1);
42388
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
471 Fprin1 (count, stream);
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
472 insert (")\n", 2);
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
473 }
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
474
20529
4b3fc2cda7fc (describe_abbrev): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 17059
diff changeset
475 static void
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
476 describe_abbrev (sym, stream)
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
477 Lisp_Object sym, stream;
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
478 {
42388
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
479 Lisp_Object one, count, system_flag;
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
480
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
481 if (INTEGERP (XSYMBOL (sym)->plist))
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
482 {
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
483 count = XSYMBOL (sym)->plist;
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
484 system_flag = Qnil;
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
485 }
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
486 else
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
487 {
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
488 count = Fget (sym, Qcount);
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
489 system_flag = Fget (sym, Qsystem_type);
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
490 }
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
491
39584
6145836b795c Use SYMBOL_VALUE/ SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents: 29742
diff changeset
492 if (NILP (SYMBOL_VALUE (sym)))
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
493 return;
42388
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
494
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
495 one = make_number (1);
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
496 Fprin1 (Fsymbol_name (sym), stream);
42388
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
497
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
498 if (!NILP (system_flag))
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
499 {
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
500 insert_string (" (sys)");
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
501 Findent_to (make_number (20), one);
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
502 }
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
503 else
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
504 Findent_to (make_number (15), one);
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
505
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
506 Fprin1 (count, stream);
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
507 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
508 Fprin1 (SYMBOL_VALUE (sym), stream);
484
3165b2697c78 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 458
diff changeset
509 if (!NILP (XSYMBOL (sym)->function))
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
510 {
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
511 Findent_to (make_number (45), one);
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
512 Fprin1 (XSYMBOL (sym)->function, stream);
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
513 }
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
514 Fterpri (stream);
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
515 }
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
516
16485
9b919c5464a4 Reorganize function definitions so etags finds them.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
517 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
518 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
519 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
520 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
521 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
522 is inserted. Otherwise the description is an expression,
d0d7ddac8c5e Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39584
diff changeset
523 a call to `define-abbrev-table', which would
42388
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
524 define the abbrev table NAME exactly as it is currently defined.
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
525
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
526 Abbrevs marked as "system abbrevs" are omitted. */)
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39960
diff changeset
527 (name, readable)
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
528 Lisp_Object name, readable;
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
529 {
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
530 Lisp_Object table;
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
531 Lisp_Object stream;
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
532
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40109
diff changeset
533 CHECK_SYMBOL (name);
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
534 table = Fsymbol_value (name);
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40109
diff changeset
535 CHECK_VECTOR (table);
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
536
9260
945ddb4e9e24 (write_abbrev, Finsert_abbrev_table_description): Use new accessor macros
Karl Heuer <kwzh@gnu.org>
parents: 9140
diff changeset
537 XSETBUFFER (stream, current_buffer);
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
538
484
3165b2697c78 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 458
diff changeset
539 if (!NILP (readable))
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
540 {
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
541 insert_string ("(");
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
542 Fprin1 (name, stream);
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
543 insert_string (")\n\n");
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
544 map_obarray (table, describe_abbrev, stream);
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
545 insert_string ("\n\n");
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
546 }
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
547 else
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
548 {
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
549 insert_string ("(define-abbrev-table '");
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
550 Fprin1 (name, stream);
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
551 insert_string (" '(\n");
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
552 map_obarray (table, write_abbrev, stream);
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
553 insert_string (" ))\n\n");
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
554 }
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
555
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
556 return Qnil;
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
557 }
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
558
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
559 DEFUN ("define-abbrev-table", Fdefine_abbrev_table, Sdefine_abbrev_table,
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
560 2, 2, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39960
diff changeset
561 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
562 Define abbrevs in it according to DEFINITIONS, which is a list of elements
42388
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
563 of the form (ABBREVNAME EXPANSION HOOK USECOUNT SYSTEMFLAG).
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
564 \(If the list is shorter than that, omitted elements default to nil). */)
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39960
diff changeset
565 (tablename, definitions)
14098
aa682cae5c89 (Fdefine_abbrev_table): Fix previous change.
Karl Heuer <kwzh@gnu.org>
parents: 14059
diff changeset
566 Lisp_Object tablename, definitions;
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
567 {
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
568 Lisp_Object name, exp, hook, count;
42388
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
569 Lisp_Object table, elt, sys;
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
570
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40109
diff changeset
571 CHECK_SYMBOL (tablename);
14059
1303d585443b (Fdefine_global_abbrev, Fdefine_mode_abbrev, Fabbrev_symbol,
Erik Naggum <erik@naggum.no>
parents: 12091
diff changeset
572 table = Fboundp (tablename);
1303d585443b (Fdefine_global_abbrev, Fdefine_mode_abbrev, Fabbrev_symbol,
Erik Naggum <erik@naggum.no>
parents: 12091
diff changeset
573 if (NILP (table) || (table = Fsymbol_value (tablename), NILP (table)))
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
574 {
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
575 table = Fmake_abbrev_table ();
14059
1303d585443b (Fdefine_global_abbrev, Fdefine_mode_abbrev, Fabbrev_symbol,
Erik Naggum <erik@naggum.no>
parents: 12091
diff changeset
576 Fset (tablename, table);
14098
aa682cae5c89 (Fdefine_abbrev_table): Fix previous change.
Karl Heuer <kwzh@gnu.org>
parents: 14059
diff changeset
577 Vabbrev_table_name_list = Fcons (tablename, Vabbrev_table_name_list);
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
578 }
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40109
diff changeset
579 CHECK_VECTOR (table);
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
580
14098
aa682cae5c89 (Fdefine_abbrev_table): Fix previous change.
Karl Heuer <kwzh@gnu.org>
parents: 14059
diff changeset
581 for (; !NILP (definitions); definitions = Fcdr (definitions))
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
582 {
14059
1303d585443b (Fdefine_global_abbrev, Fdefine_mode_abbrev, Fabbrev_symbol,
Erik Naggum <erik@naggum.no>
parents: 12091
diff changeset
583 elt = Fcar (definitions);
988
341171b49f96 * abbrev.c (Fdefine_abbrev_table): Fiddled with formatting.
Jim Blandy <jimb@redhat.com>
parents: 484
diff changeset
584 name = Fcar (elt); elt = Fcdr (elt);
341171b49f96 * abbrev.c (Fdefine_abbrev_table): Fiddled with formatting.
Jim Blandy <jimb@redhat.com>
parents: 484
diff changeset
585 exp = Fcar (elt); elt = Fcdr (elt);
341171b49f96 * abbrev.c (Fdefine_abbrev_table): Fiddled with formatting.
Jim Blandy <jimb@redhat.com>
parents: 484
diff changeset
586 hook = Fcar (elt); elt = Fcdr (elt);
42388
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
587 count = Fcar (elt); elt = Fcdr (elt);
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
588 sys = Fcar (elt);
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
589 Fdefine_abbrev (table, name, exp, hook, count, sys);
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
590 }
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
591 return Qnil;
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
592 }
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
593
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21244
diff changeset
594 void
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
595 syms_of_abbrev ()
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
596 {
42388
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
597 Qsystem_type = intern ("system-type");
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
598 staticpro (&Qsystem_type);
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
599
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
600 Qcount = intern ("count");
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
601 staticpro (&Qcount);
b46d482b6ed2 Use the plist of an abbrev for multiple params if nec.
Richard M. Stallman <rms@gnu.org>
parents: 41522
diff changeset
602
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39960
diff changeset
603 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
604 doc: /* List of symbols whose values are abbrev tables. */);
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
605 Vabbrev_table_name_list = Fcons (intern ("fundamental-mode-abbrev-table"),
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
606 Fcons (intern ("global-abbrev-table"),
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
607 Qnil));
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
608
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39960
diff changeset
609 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
610 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
611 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
612 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
613 for any particular abbrev defined in both. */);
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
614 Vglobal_abbrev_table = Fmake_abbrev_table ();
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
615
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39960
diff changeset
616 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
617 doc: /* The abbrev table of mode-specific abbrevs for Fundamental Mode. */);
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
618 Vfundamental_mode_abbrev_table = Fmake_abbrev_table ();
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
619 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
620 buffer_defaults.abbrev_table = Vfundamental_mode_abbrev_table;
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
621
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39960
diff changeset
622 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
623 doc: /* The abbrev-symbol of the last abbrev expanded. See `abbrev-symbol'. */);
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
624
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39960
diff changeset
625 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
626 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
627 nil if the abbrev has already been unexpanded. */);
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
628
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39960
diff changeset
629 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
630 doc: /* The location of the start of the last abbrev expanded. */);
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
631
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
632 Vlast_abbrev = Qnil;
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
633 Vlast_abbrev_text = Qnil;
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
634 last_abbrev_point = 0;
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
635
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39960
diff changeset
636 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
637 doc: /* Buffer position for `expand-abbrev' to use as the start of the abbrev.
44851
ceafe18856c7 (abbrev-start-location): Doc fix.
Pavel Janík <Pavel@Janik.cz>
parents: 44739
diff changeset
638 When nil, use the word before point as the abbrev.
39960
d0d7ddac8c5e Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39584
diff changeset
639 Calling `expand-abbrev' sets this to nil. */);
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
640 Vabbrev_start_location = Qnil;
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
641
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39960
diff changeset
642 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
643 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
644 Trying to expand an abbrev in any other buffer clears `abbrev-start-location'. */);
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
645 Vabbrev_start_location_buffer = Qnil;
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
646
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39960
diff changeset
647 DEFVAR_PER_BUFFER ("local-abbrev-table", &current_buffer->abbrev_table, Qnil,
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39960
diff changeset
648 doc: /* Local (mode-specific) abbrev table of current buffer. */);
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
649
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39960
diff changeset
650 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
651 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
652 This causes `save-some-buffers' to offer to save the abbrevs. */);
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
653 abbrevs_changed = 0;
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
654
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39960
diff changeset
655 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
656 doc: /* *Set non-nil means expand multi-word abbrevs all caps if abbrev was so. */);
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
657 abbrev_all_caps = 0;
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
658
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39960
diff changeset
659 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
660 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
661 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
662 the current abbrev table before abbrev lookup happens. */);
458
8f18e7e89008 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 397
diff changeset
663 Vpre_abbrev_expand_hook = Qnil;
8f18e7e89008 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 397
diff changeset
664 Qpre_abbrev_expand_hook = intern ("pre-abbrev-expand-hook");
8f18e7e89008 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 397
diff changeset
665 staticpro (&Qpre_abbrev_expand_hook);
8f18e7e89008 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 397
diff changeset
666
146
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
667 defsubr (&Smake_abbrev_table);
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
668 defsubr (&Sclear_abbrev_table);
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
669 defsubr (&Sdefine_abbrev);
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
670 defsubr (&Sdefine_global_abbrev);
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
671 defsubr (&Sdefine_mode_abbrev);
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
672 defsubr (&Sabbrev_expansion);
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
673 defsubr (&Sabbrev_symbol);
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
674 defsubr (&Sexpand_abbrev);
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
675 defsubr (&Sunexpand_abbrev);
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
676 defsubr (&Sinsert_abbrev_table_description);
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
677 defsubr (&Sdefine_abbrev_table);
db0041ccc1e6 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
678 }