/* 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. */
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));
}
{
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;
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;
{
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;
return;
insert (" (", 5);
- XSETSTRING (name, XSYMBOL (sym)->name);
+ name = SYMBOL_NAME (sym);
Fprin1 (name, stream);
insert (" ", 1);
Fprin1 (SYMBOL_VALUE (sym), stream);
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.
a call to `define-abbrev-table', which would
define the abbrev table NAME exactly as it is currently defined.
-Abbrevs marked as "system abbrevs" are omitted. */)
+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);
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");
}
}
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);
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) */