/* Primitives for word-abbrev mode.
- Copyright (C) 1985, 1986, 1993, 1996, 1998, 2001
- Free Software Foundation, Inc.
+ Copyright (C) 1985, 1986, 1993, 1996, 1998, 2001, 2002, 2003, 2004,
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
/* Character address of start of last abbrev expanded */
-int last_abbrev_point;
+EMACS_INT last_abbrev_point;
/* Hook to run before expanding any abbrev. */
Lisp_Object Vpre_abbrev_expand_hook, Qpre_abbrev_expand_hook;
+
+Lisp_Object Qsystem_type, Qcount;
\f
DEFUN ("make-abbrev-table", Fmake_abbrev_table, Smake_abbrev_table, 0, 0, 0,
doc: /* Create a new, empty abbrev table object. */)
()
{
+ /* The value 59 is arbitrary chosen prime number. */
return Fmake_vector (make_number (59), make_number (0));
}
{
int i, size;
- CHECK_VECTOR (table, 0);
+ CHECK_VECTOR (table);
size = XVECTOR (table)->size;
abbrevs_changed = 1;
for (i = 0; i < size; i++)
return Qnil;
}
\f
-DEFUN ("define-abbrev", Fdefine_abbrev, Sdefine_abbrev, 3, 5, 0,
+DEFUN ("define-abbrev", Fdefine_abbrev, Sdefine_abbrev, 3, 6, 0,
doc: /* Define an abbrev in TABLE named NAME, to expand to EXPANSION and call HOOK.
NAME must be a string.
EXPANSION should usually be a string.
it is called after EXPANSION is inserted.
If EXPANSION is not a string, the abbrev is a special one,
which does not expand in the usual way but only runs HOOK.
-COUNT, if specified, initializes the abbrev's usage-count
-which is incremented each time the abbrev is used. */)
- (table, name, expansion, hook, count)
- Lisp_Object table, name, expansion, hook, count;
+
+COUNT, if specified, gives the initial value for the abbrev's
+usage-count, which is incremented each time the abbrev is used.
+\(The default is zero.)
+
+SYSTEM-FLAG, if non-nil, says that this is a "system" abbreviation
+which should not be saved in the user's abbreviation file. */)
+ (table, name, expansion, hook, count, system_flag)
+ Lisp_Object table, name, expansion, hook, count, system_flag;
{
Lisp_Object sym, oexp, ohook, tem;
- CHECK_VECTOR (table, 0);
- CHECK_STRING (name, 1);
+ CHECK_VECTOR (table);
+ CHECK_STRING (name);
if (NILP (count))
count = make_number (0);
else
- CHECK_NUMBER (count, 0);
+ CHECK_NUMBER (count);
sym = Fintern (name, table);
&& (tem = Fstring_equal (oexp, expansion), !NILP (tem))))
&&
(EQ (ohook, hook)
- || (tem = Fequal (ohook, hook), !NILP (tem)))))
+ || (tem = Fequal (ohook, hook), !NILP (tem))))
+ && NILP (system_flag))
abbrevs_changed = 1;
Fset (sym, expansion);
Ffset (sym, hook);
- Fsetplist (sym, count);
+
+ if (! NILP (system_flag))
+ Fsetplist (sym, list4 (Qcount, count, Qsystem_type, system_flag));
+ else
+ Fsetplist (sym, count);
return name;
}
Lisp_Object abbrev, expansion;
{
Fdefine_abbrev (Vglobal_abbrev_table, Fdowncase (abbrev),
- expansion, Qnil, make_number (0));
+ expansion, Qnil, make_number (0), Qnil);
return abbrev;
}
error ("Major mode has no abbrev table");
Fdefine_abbrev (current_buffer->abbrev_table, Fdowncase (abbrev),
- expansion, Qnil, make_number (0));
+ expansion, Qnil, make_number (0), Qnil);
return abbrev;
}
Lisp_Object abbrev, table;
{
Lisp_Object sym;
- CHECK_STRING (abbrev, 0);
+ CHECK_STRING (abbrev);
if (!NILP (table))
sym = Fintern_soft (abbrev, table);
else
{
register char *buffer, *p;
int wordstart, wordend;
- register int wordstart_byte, wordend_byte, idx;
+ register int wordstart_byte, wordend_byte, idx, idx_byte;
int whitecnt;
int uccount = 0, lccount = 0;
register Lisp_Object sym;
Lisp_Object expansion, hook, tem;
Lisp_Object value;
+ int multibyte = ! NILP (current_buffer->enable_multibyte_characters);
value = Qnil;
- if (!NILP (Vrun_hooks))
- call1 (Vrun_hooks, Qpre_abbrev_expand_hook);
+ Frun_hooks (1, &Qpre_abbrev_expand_hook);
wordstart = 0;
if (!(BUFFERP (Vabbrev_start_location_buffer)
if (!NILP (Vabbrev_start_location))
{
tem = Vabbrev_start_location;
- CHECK_NUMBER_COERCE_MARKER (tem, 0);
+ CHECK_NUMBER_COERCE_MARKER (tem);
wordstart = XINT (tem);
Vabbrev_start_location = Qnil;
if (wordstart < BEGV || wordstart > ZV)
p = buffer = (char *) alloca (wordend_byte - wordstart_byte);
- for (idx = wordstart_byte; idx < wordend_byte; idx++)
+ for (idx = wordstart, idx_byte = wordstart_byte; idx < wordend; )
{
- /* ??? This loop needs to go by characters! */
- register int c = FETCH_BYTE (idx);
+ register int c;
+
+ if (multibyte)
+ {
+ FETCH_CHAR_ADVANCE (c, idx, idx_byte);
+ }
+ else
+ {
+ c = FETCH_BYTE (idx_byte);
+ idx++, idx_byte++;
+ }
+
if (UPPERCASEP (c))
c = DOWNCASE (c), uccount++;
else if (! NOCASEP (c))
lccount++;
- *p++ = c;
+ if (multibyte)
+ p += CHAR_STRING (c, p);
+ else
+ *p++ = c;
}
if (VECTORP (current_buffer->abbrev_table))
sym = oblookup (current_buffer->abbrev_table, buffer,
- wordend - wordstart, wordend_byte - wordstart_byte);
+ wordend - wordstart, p - buffer);
else
XSETFASTINT (sym, 0);
+
if (INTEGERP (sym) || NILP (SYMBOL_VALUE (sym)))
sym = oblookup (Vglobal_abbrev_table, buffer,
- wordend - wordstart, wordend_byte - wordstart_byte);
+ wordend - wordstart, p - buffer);
if (INTEGERP (sym) || NILP (SYMBOL_VALUE (sym)))
return value;
value = sym;
last_abbrev_point = wordstart;
+ /* Increment use count. */
if (INTEGERP (XSYMBOL (sym)->plist))
XSETINT (XSYMBOL (sym)->plist,
- XINT (XSYMBOL (sym)->plist) + 1); /* Increment use count */
+ XINT (XSYMBOL (sym)->plist) + 1);
+ else if (INTEGERP (tem = Fget (sym, Qcount)))
+ Fput (sym, Qcount, make_number (XINT (tem) + 1));
/* If this abbrev has an expansion, delete the abbrev
and insert the expansion. */
{
SET_PT (wordstart);
- del_range_both (wordstart, wordstart_byte, wordend, wordend_byte, 1);
+ insert_from_string (expansion, 0, 0, SCHARS (expansion),
+ SBYTES (expansion), 1);
+ del_range_both (PT, PT_BYTE,
+ wordend + (PT - wordstart),
+ wordend_byte + (PT_BYTE - wordstart_byte),
+ 1);
- insert_from_string (expansion, 0, 0, XSTRING (expansion)->size,
- STRING_BYTES (XSTRING (expansion)), 1);
SET_PT (PT + whitecnt);
if (uccount && !lccount)
/* If the abbrev has a hook function, run it. */
expanded = call0 (hook);
- /* In addition, if the hook function is a symbol with a a
- non-nil `no-self-insert' property, let the value it returned
+ /* In addition, if the hook function is a symbol with
+ a non-nil `no-self-insert' property, let the value it returned
specify whether we consider that an expansion took place. If
it returns nil, no expansion has been done. */
val = SYMBOL_VALUE (Vlast_abbrev);
if (!STRINGP (val))
- error ("value of abbrev-symbol must be a string");
+ error ("Value of `abbrev-symbol' must be a string");
zv_before = ZV;
- del_range_byte (PT_BYTE, PT_BYTE + STRING_BYTES (XSTRING (val)), 1);
+ del_range_byte (PT_BYTE, PT_BYTE + SBYTES (val), 1);
/* Don't inherit properties here; just copy from old contents. */
insert_from_string (Vlast_abbrev_text, 0, 0,
- XSTRING (Vlast_abbrev_text)->size,
- STRING_BYTES (XSTRING (Vlast_abbrev_text)), 0);
+ SCHARS (Vlast_abbrev_text),
+ SBYTES (Vlast_abbrev_text), 0);
Vlast_abbrev_text = Qnil;
/* Total number of characters deleted. */
adjust = ZV - zv_before;
write_abbrev (sym, stream)
Lisp_Object sym, stream;
{
- Lisp_Object name;
- if (NILP (SYMBOL_VALUE (sym)))
+ Lisp_Object name, count, system_flag;
+
+ if (INTEGERP (XSYMBOL (sym)->plist))
+ {
+ count = XSYMBOL (sym)->plist;
+ system_flag = Qnil;
+ }
+ else
+ {
+ count = Fget (sym, Qcount);
+ system_flag = Fget (sym, Qsystem_type);
+ }
+
+ if (NILP (SYMBOL_VALUE (sym)) || ! NILP (system_flag))
return;
+
insert (" (", 5);
- XSETSTRING (name, XSYMBOL (sym)->name);
+ name = SYMBOL_NAME (sym);
Fprin1 (name, stream);
insert (" ", 1);
Fprin1 (SYMBOL_VALUE (sym), stream);
insert (" ", 1);
Fprin1 (XSYMBOL (sym)->function, stream);
insert (" ", 1);
- Fprin1 (XSYMBOL (sym)->plist, stream);
+ Fprin1 (count, stream);
insert (")\n", 2);
}
describe_abbrev (sym, stream)
Lisp_Object sym, stream;
{
- Lisp_Object one;
+ Lisp_Object one, count, system_flag;
+
+ if (INTEGERP (XSYMBOL (sym)->plist))
+ {
+ count = XSYMBOL (sym)->plist;
+ system_flag = Qnil;
+ }
+ else
+ {
+ count = Fget (sym, Qcount);
+ system_flag = Fget (sym, Qsystem_type);
+ }
if (NILP (SYMBOL_VALUE (sym)))
return;
+
one = make_number (1);
Fprin1 (Fsymbol_name (sym), stream);
- Findent_to (make_number (15), one);
- Fprin1 (XSYMBOL (sym)->plist, stream);
+
+ if (!NILP (system_flag))
+ {
+ insert_string (" (sys)");
+ Findent_to (make_number (20), one);
+ }
+ else
+ Findent_to (make_number (15), one);
+
+ Fprin1 (count, stream);
Findent_to (make_number (20), one);
Fprin1 (SYMBOL_VALUE (sym), stream);
if (!NILP (XSYMBOL (sym)->function))
Fterpri (stream);
}
+static void
+record_symbol (sym, list)
+ Lisp_Object sym, list;
+{
+ XSETCDR (list, Fcons (sym, XCDR (list)));
+}
+
DEFUN ("insert-abbrev-table-description", Finsert_abbrev_table_description,
Sinsert_abbrev_table_description, 1, 2, 0,
doc: /* Insert before point a full description of abbrev table named NAME.
If optional 2nd arg READABLE is non-nil, a human-readable description
is inserted. Otherwise the description is an expression,
a call to `define-abbrev-table', which would
-define the abbrev table NAME exactly as it is currently defined. */)
+define the abbrev table NAME exactly as it is currently defined.
+
+Abbrevs marked as "system abbrevs" are normally omitted. However, if
+READABLE is non-nil, they are listed. */)
(name, readable)
Lisp_Object name, readable;
{
Lisp_Object table;
+ Lisp_Object symbols;
Lisp_Object stream;
- CHECK_SYMBOL (name, 0);
+ CHECK_SYMBOL (name);
table = Fsymbol_value (name);
- CHECK_VECTOR (table, 0);
+ CHECK_VECTOR (table);
XSETBUFFER (stream, current_buffer);
+ symbols = Fcons (Qnil, Qnil);
+ map_obarray (table, record_symbol, symbols);
+ symbols = XCDR (symbols);
+ symbols = Fsort (symbols, Qstring_lessp);
+
if (!NILP (readable))
{
insert_string ("(");
Fprin1 (name, stream);
insert_string (")\n\n");
- map_obarray (table, describe_abbrev, stream);
+ while (! NILP (symbols))
+ {
+ describe_abbrev (XCAR (symbols), stream);
+ symbols = XCDR (symbols);
+ }
+
insert_string ("\n\n");
}
else
insert_string ("(define-abbrev-table '");
Fprin1 (name, stream);
insert_string (" '(\n");
- map_obarray (table, write_abbrev, stream);
+ while (! NILP (symbols))
+ {
+ write_abbrev (XCAR (symbols), stream);
+ symbols = XCDR (symbols);
+ }
insert_string (" ))\n\n");
}
2, 2, 0,
doc: /* Define TABLENAME (a symbol) as an abbrev table name.
Define abbrevs in it according to DEFINITIONS, which is a list of elements
-of the form (ABBREVNAME EXPANSION HOOK USECOUNT). */)
+of the form (ABBREVNAME EXPANSION HOOK USECOUNT SYSTEMFLAG).
+\(If the list is shorter than that, omitted elements default to nil). */)
(tablename, definitions)
Lisp_Object tablename, definitions;
{
Lisp_Object name, exp, hook, count;
- Lisp_Object table, elt;
+ Lisp_Object table, elt, sys;
- CHECK_SYMBOL (tablename, 0);
+ CHECK_SYMBOL (tablename);
table = Fboundp (tablename);
if (NILP (table) || (table = Fsymbol_value (tablename), NILP (table)))
{
Fset (tablename, table);
Vabbrev_table_name_list = Fcons (tablename, Vabbrev_table_name_list);
}
- CHECK_VECTOR (table, 0);
+ CHECK_VECTOR (table);
- for (; !NILP (definitions); definitions = Fcdr (definitions))
+ for (; CONSP (definitions); definitions = XCDR (definitions))
{
- elt = Fcar (definitions);
+ elt = XCAR (definitions);
name = Fcar (elt); elt = Fcdr (elt);
exp = Fcar (elt); elt = Fcdr (elt);
hook = Fcar (elt); elt = Fcdr (elt);
- count = Fcar (elt);
- Fdefine_abbrev (table, name, exp, hook, count);
+ count = Fcar (elt); elt = Fcdr (elt);
+ sys = Fcar (elt);
+ Fdefine_abbrev (table, name, exp, hook, count, sys);
}
return Qnil;
}
void
syms_of_abbrev ()
{
+ Qsystem_type = intern ("system-type");
+ staticpro (&Qsystem_type);
+
+ Qcount = intern ("count");
+ staticpro (&Qcount);
+
DEFVAR_LISP ("abbrev-table-name-list", &Vabbrev_table_name_list,
doc: /* List of symbols whose values are abbrev tables. */);
Vabbrev_table_name_list = Fcons (intern ("fundamental-mode-abbrev-table"),
DEFVAR_LISP ("abbrev-start-location", &Vabbrev_start_location,
doc: /* Buffer position for `expand-abbrev' to use as the start of the abbrev.
-nil means use the word before point as the abbrev.
+When nil, use the word before point as the abbrev.
Calling `expand-abbrev' sets this to nil. */);
Vabbrev_start_location = Qnil;
defsubr (&Sinsert_abbrev_table_description);
defsubr (&Sdefine_abbrev_table);
}
+
+/* arch-tag: b721db69-f633-44a8-a361-c275acbdad7d
+ (do not change this comment) */