annotate src/abbrev.c @ 44600:42f01619b785

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