Rewrite abbrev.c in Elisp.

* image.c (Qcount): Don't declare as extern.
(syms_of_image): Initialize and staticpro `Qcount'.
* puresize.h (BASE_PURESIZE): Increase for the new abbrev.el functions.
* emacs.c (main): Don't call syms_of_abbrev.
* Makefile.in (obj): Remove abbrev.o.
(abbrev.o): Remove.
* abbrev.c: Remove.

Rewrite abbrev.c in Elisp.
* abbrev.el (abbrev-mode): Move custom group from cus-edit.el.
(abbrev-table-get, abbrev-table-put, abbrev-get)
(abbrev-put, make-abbrev-table, abbrev-table-p, clear-abbrev-table)
(define-abbrev, abbrev--check-chars, define-global-abbrev)
(define-mode-abbrev, abbrev--active-tables, abbrev-symbol)
(abbrev-expansion, abbrev--before-point, expand-abbrev)
(unexpand-abbrev, abbrev--write, abbrev--describe)
(insert-abbrev-table-description, define-abbrev-table):
New funs, largely transcribed from abbrev.c.
(abbrev-with-wrapper-hook): New macro.
(abbrev-table-name-list, global-abbrev-table)
(abbrev-minor-mode-table-alist, fundamental-mode-abbrev-table)
(abbrevs-changed, abbrev-all-caps, abbrev-start-location)
(abbrev-start-location-buffer, last-abbrev, last-abbrev-text)
(last-abbrev-location, pre-abbrev-expand-hook, abbrev-expand-function):
New vars, largely transcribed from abbrev.c.
* cus-edit.el (abbrev-mode): Remove.  Move to abbrev.el.
* cus-start.el: Remove abbrev-all-caps and pre-abbrev-expand-hook.
* loadup.el: Load "abbrev.el" before "lisp-mode.el".

6 files changed, 19 insertions, 811 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 36e6ca3b00d..d4f70731562 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2007-10-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        Rewrite abbrev.c in Elisp.
+        * image.c (Qcount): Don't declare as extern.
+        (syms_of_image): Initialize and staticpro `Qcount'.
+        * puresize.h (BASE_PURESIZE): Increase for the new abbrev.el functions.
+        * emacs.c (main): Don't call syms_of_abbrev.
+        * Makefile.in (obj): Remove abbrev.o.
+        (abbrev.o): Remove.
+        * abbrev.c: Remove.
+
 2007-10-26  Martin Rudalics  <rudalics@gmx.at>
 
         * window.c (window_min_size_2): Don't count header-line.
diff --git a/src/Makefile.in b/src/Makefile.in
index 7119f94c8d2..56e8a7c49a5 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -603,7 +603,7 @@ obj=    dispnew.o frame.o scroll.o xdisp.o $(XMENU_OBJ) window.o \
         cmds.o casetab.o casefiddle.o indent.o search.o regex.o undo.o \
         alloc.o data.o doc.o editfns.o callint.o \
         eval.o floatfns.o fns.o print.o lread.o \
-        abbrev.o syntax.o UNEXEC bytecode.o \
+        syntax.o UNEXEC bytecode.o \
         process.o callproc.o \
         region-cache.o sound.o atimer.o \
         doprnt.o strftime.o intervals.o textprop.o composite.o md5.o \
@@ -1094,8 +1094,6 @@ stamp-oldxmenu:
    it is so often changed in ways that do not require any recompilation
    and so rarely changed in ways that do require any.  */
 
-abbrev.o: abbrev.c buffer.h window.h dispextern.h commands.h charset.h \
-        syntax.h $(config_h)
 buffer.o: buffer.c buffer.h region-cache.h commands.h window.h \
    dispextern.h $(INTERVAL_SRC) blockinput.h atimer.h systime.h charset.h \
    $(config_h)
@@ -1279,7 +1277,7 @@ composite.o: composite.c buffer.h  charset.h $(INTERVAL_SRC) $(config_h)
 sunfns.o: sunfns.c buffer.h window.h dispextern.h termhooks.h $(config_h)
 
 #ifdef HAVE_CARBON
-abbrev.o buffer.o callint.o cmds.o dispnew.o editfns.o fileio.o frame.o \
+buffer.o callint.o cmds.o dispnew.o editfns.o fileio.o frame.o \
   fontset.o indent.o insdel.o keyboard.o macros.o minibuf.o msdos.o process.o \
   scroll.o sysdep.o term.o terminal.o widget.o window.o xdisp.o xfaces.o xfns.o xmenu.o \
   xterm.o xselect.o sound.o: macgui.h
diff --git a/src/abbrev.c b/src/abbrev.c
deleted file mode 100644
index 403afdb99a7..00000000000
--- a/src/abbrev.c
+++ /dev/null
@@ -1,803 +0,0 @@
-/* Primitives for word-abbrev mode.
-   Copyright (C) 1985, 1986, 1993, 1996, 1998, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-
-
-#include <config.h>
-#include <stdio.h>
-
-#include "lisp.h"
-#include "commands.h"
-#include "buffer.h"
-#include "window.h"
-#include "charset.h"
-#include "syntax.h"
-
-/* An abbrev table is an obarray.
- Each defined abbrev is represented by a symbol in that obarray
- whose print name is the abbreviation.
- The symbol's value is a string which is the expansion.
- If its function definition is non-nil, it is called
-  after the expansion is done.
- The plist slot of the abbrev symbol is its usage count. */
-
-/* List of all abbrev-table name symbols:
- symbols whose values are abbrev tables.  */
-
-Lisp_Object Vabbrev_table_name_list;
-
-/* The table of global abbrevs.  These are in effect
- in any buffer in which abbrev mode is turned on. */
-
-Lisp_Object Vglobal_abbrev_table;
-
-/* The local abbrev table used by default (in Fundamental Mode buffers) */
-
-Lisp_Object Vfundamental_mode_abbrev_table;
-
-/* Set nonzero when an abbrev definition is changed */
-
-int abbrevs_changed;
-
-int abbrev_all_caps;
-
-/* Non-nil => use this location as the start of abbrev to expand
- (rather than taking the word before point as the abbrev) */
-
-Lisp_Object Vabbrev_start_location;
-
-/* Buffer that Vabbrev_start_location applies to */
-Lisp_Object Vabbrev_start_location_buffer;
-
-/* The symbol representing the abbrev most recently expanded */
-
-Lisp_Object Vlast_abbrev;
-
-/* A string for the actual text of the abbrev most recently expanded.
-   This has more info than Vlast_abbrev since case is significant.  */
-
-Lisp_Object Vlast_abbrev_text;
-
-/* Character address of start of last abbrev expanded */
-
-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, Qforce;
-
-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));
-}
-
-DEFUN ("clear-abbrev-table", Fclear_abbrev_table, Sclear_abbrev_table, 1, 1, 0,
-       doc: /* Undefine all abbrevs in abbrev table TABLE, leaving it empty.  */)
-     (table)
-     Lisp_Object table;
-{
-  int i, size;
-
-  CHECK_VECTOR (table);
-  size = XVECTOR (table)->size;
-  abbrevs_changed = 1;
-  for (i = 0; i < size; i++)
-    XVECTOR (table)->contents[i] = make_number (0);
-  return Qnil;
-}
-
-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, and should be lower-case.
-EXPANSION should usually be a string.
-To undefine an abbrev, define it with EXPANSION = nil.
-If HOOK is non-nil, it should be a function of no arguments;
-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, 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.
-Unless SYSTEM-FLAG is `force', a system abbreviation will not
-overwrite a non-system abbreviation of the same name.  */)
-     (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);
-  CHECK_STRING (name);
-
-  /* If defining a system abbrev, do not overwrite a non-system abbrev
-     of the same name, unless 'force is used. */
-  if (!NILP (system_flag) && !EQ (system_flag, Qforce))
-    {
-      sym = Fintern_soft (name, table);
-
-      if (!NILP (SYMBOL_VALUE (sym)) &&
-          NILP (Fplist_get (XSYMBOL (sym)->plist, Qsystem_type))) return Qnil;
-    }
-
-  if (NILP (count))
-    count = make_number (0);
-  else
-    CHECK_NUMBER (count);
-
-  sym = Fintern (name, table);
-
-  oexp = SYMBOL_VALUE (sym);
-  ohook = XSYMBOL (sym)->function;
-  if (!((EQ (oexp, expansion)
-         || (STRINGP (oexp) && STRINGP (expansion)
-             && (tem = Fstring_equal (oexp, expansion), !NILP (tem))))
-        &&
-        (EQ (ohook, hook)
-         || (tem = Fequal (ohook, hook), !NILP (tem))))
-      && NILP (system_flag))
-    abbrevs_changed = 1;
-
-  Fset (sym, expansion);
-  Ffset (sym, hook);
-
-  if (! NILP (system_flag))
-    Fsetplist (sym, list4 (Qcount, count, Qsystem_type, system_flag));
-  else
-    Fsetplist (sym, count);
-
-  return name;
-}
-
-/* Check if the characters in ABBREV have word syntax in either the
- * current (if global == 0) or standard syntax table. */
-static void
-abbrev_check_chars (abbrev, global)
-     Lisp_Object abbrev;
-     int global;
-{
-  int i, i_byte, len, nbad = 0;
-  int j, found, nuniq = 0;
-  char *badchars, *baduniq;
-
-  CHECK_STRING (abbrev);
-  len = SCHARS (abbrev);
-
-  badchars = (char *) alloca (len + 1);
-
-  for (i = 0, i_byte = 0; i < len; )
-    {
-      int c;
-
-      FETCH_STRING_CHAR_ADVANCE (c, abbrev, i, i_byte);
-
-      if (global)
-        {
-          /* Copied from SYNTAX in syntax.h, except using FOLLOW_PARENT. */
-          Lisp_Object syntax_temp
-            = SYNTAX_ENTRY_FOLLOW_PARENT (Vstandard_syntax_table, c);
-          if ( (CONSP (syntax_temp)
-                ? (enum syntaxcode) (XINT (XCAR (syntax_temp)) & 0xff)
-                : Swhitespace) != Sword ) badchars[nbad++] = c;
-        }
-      else if (SYNTAX (c) != Sword)
-        badchars[nbad++] = c;
-    }
-
-  if (nbad == 0) return;
-
-  baduniq = (char *) alloca (nbad + 1);
-
-  for (i = 0; i < nbad; i++)
-    {
-      found = 0;
-
-      for (j = 0; j < nuniq; j++)
-        {
-          if (badchars[i] == baduniq[j])
-            {
-              found = 1;
-              break;
-            }
-        }
-
-      if (found) continue ;
-
-      baduniq[nuniq++] = badchars[i];
-    }
-
-  baduniq[nuniq] = '\0';
-
-  error ("Some abbrev characters (%s) are not word constituents %s",
-         baduniq, global ? "in the standard syntax" : "in this mode" );
-}
-
-DEFUN ("define-global-abbrev", Fdefine_global_abbrev, Sdefine_global_abbrev, 2, 2,
-       "sDefine global abbrev: \nsExpansion for %s: ",
-       doc: /* Define ABBREV as a global abbreviation for EXPANSION.
-The characters in ABBREV must all be word constituents in the standard
-syntax table.  */)
-     (abbrev, expansion)
-     Lisp_Object abbrev, expansion;
-{
-  abbrev_check_chars (abbrev, 1);
-
-  Fdefine_abbrev (Vglobal_abbrev_table, Fdowncase (abbrev),
-                  expansion, Qnil, make_number (0), Qnil);
-  return abbrev;
-}
-
-DEFUN ("define-mode-abbrev", Fdefine_mode_abbrev, Sdefine_mode_abbrev, 2, 2,
-       "sDefine mode abbrev: \nsExpansion for %s: ",
-       doc: /* Define ABBREV as a mode-specific abbreviation for EXPANSION.
-The characters in ABBREV must all be word-constituents in the current mode.  */)
-     (abbrev, expansion)
-     Lisp_Object abbrev, expansion;
-{
-  if (NILP (current_buffer->abbrev_table))
-    error ("Major mode has no abbrev table");
-
-  abbrev_check_chars (abbrev, 0);
-
-  Fdefine_abbrev (current_buffer->abbrev_table, Fdowncase (abbrev),
-                  expansion, Qnil, make_number (0), Qnil);
-  return abbrev;
-}
-
-DEFUN ("abbrev-symbol", Fabbrev_symbol, Sabbrev_symbol, 1, 2, 0,
-       doc: /* Return the symbol representing abbrev named ABBREV.
-This symbol's name is ABBREV, but it is not the canonical symbol of that name;
-it is interned in an abbrev-table rather than the normal obarray.
-The value is nil if that abbrev is not defined.
-Optional second arg TABLE is abbrev table to look it up in.
-The default is to try buffer's mode-specific abbrev table, then global table.  */)
-     (abbrev, table)
-     Lisp_Object abbrev, table;
-{
-  Lisp_Object sym;
-  CHECK_STRING (abbrev);
-  if (!NILP (table))
-    sym = Fintern_soft (abbrev, table);
-  else
-    {
-      sym = Qnil;
-      if (!NILP (current_buffer->abbrev_table))
-        sym = Fintern_soft (abbrev, current_buffer->abbrev_table);
-      if (NILP (SYMBOL_VALUE (sym)))
-        sym = Qnil;
-      if (NILP (sym))
-        sym = Fintern_soft (abbrev, Vglobal_abbrev_table);
-    }
-  if (NILP (SYMBOL_VALUE (sym)))
-    return Qnil;
-  return sym;
-}
-
-DEFUN ("abbrev-expansion", Fabbrev_expansion, Sabbrev_expansion, 1, 2, 0,
-       doc: /* Return the string that ABBREV expands into in the current buffer.
-Optionally specify an abbrev table as second arg;
-then ABBREV is looked up in that table only.  */)
-     (abbrev, table)
-     Lisp_Object abbrev, table;
-{
-  Lisp_Object sym;
-  sym = Fabbrev_symbol (abbrev, table);
-  if (NILP (sym)) return sym;
-  return Fsymbol_value (sym);
-}
-
-/* Expand the word before point, if it is an abbrev.
-  Returns 1 if an expansion is done. */
-
-DEFUN ("expand-abbrev", Fexpand_abbrev, Sexpand_abbrev, 0, 0, "",
-       doc: /* Expand the abbrev before point, if there is an abbrev there.
-Effective when explicitly called even when `abbrev-mode' is nil.
-Returns the abbrev symbol, if expansion took place.  */)
-     ()
-{
-  register char *buffer, *p;
-  int wordstart, wordend;
-  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;
-
-  Frun_hooks (1, &Qpre_abbrev_expand_hook);
-
-  wordstart = 0;
-  if (!(BUFFERP (Vabbrev_start_location_buffer)
-        && XBUFFER (Vabbrev_start_location_buffer) == current_buffer))
-    Vabbrev_start_location = Qnil;
-  if (!NILP (Vabbrev_start_location))
-    {
-      tem = Vabbrev_start_location;
-      CHECK_NUMBER_COERCE_MARKER (tem);
-      wordstart = XINT (tem);
-      Vabbrev_start_location = Qnil;
-      if (wordstart < BEGV || wordstart > ZV)
-        wordstart = 0;
-      if (wordstart && wordstart != ZV)
-        {
-          wordstart_byte = CHAR_TO_BYTE (wordstart);
-          if (FETCH_BYTE (wordstart_byte) == '-')
-            del_range (wordstart, wordstart + 1);
-        }
-    }
-  if (!wordstart)
-    wordstart = scan_words (PT, -1);
-
-  if (!wordstart)
-    return value;
-
-  wordstart_byte = CHAR_TO_BYTE (wordstart);
-  wordend = scan_words (wordstart, 1);
-  if (!wordend)
-    return value;
-
-  if (wordend > PT)
-    wordend = PT;
-
-  wordend_byte = CHAR_TO_BYTE (wordend);
-  whitecnt = PT - wordend;
-  if (wordend <= wordstart)
-    return value;
-
-  p = buffer = (char *) alloca (wordend_byte - wordstart_byte);
-
-  for (idx = wordstart, idx_byte = wordstart_byte; idx < wordend; )
-    {
-      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++;
-      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, p - buffer);
-  else
-    XSETFASTINT (sym, 0);
-
-  if (INTEGERP (sym) || NILP (SYMBOL_VALUE (sym)))
-    sym = oblookup (Vglobal_abbrev_table, buffer,
-                    wordend - wordstart, p - buffer);
-  if (INTEGERP (sym) || NILP (SYMBOL_VALUE (sym)))
-    return value;
-
-  if (INTERACTIVE && !EQ (minibuf_window, selected_window))
-    {
-      /* Add an undo boundary, in case we are doing this for
-         a self-inserting command which has avoided making one so far.  */
-      SET_PT (wordend);
-      Fundo_boundary ();
-    }
-
-  Vlast_abbrev_text
-    = Fbuffer_substring (make_number (wordstart), make_number (wordend));
-
-  /* Now sym is the abbrev symbol.  */
-  Vlast_abbrev = sym;
-  value = sym;
-  last_abbrev_point = wordstart;
-
-  /* Increment use count.  */
-  if (INTEGERP (XSYMBOL (sym)->plist))
-    XSETINT (XSYMBOL (sym)->plist,
-             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.  */
-  expansion = SYMBOL_VALUE (sym);
-  if (STRINGP (expansion))
-    {
-      SET_PT (wordstart);
-
-      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);
-
-      SET_PT (PT + whitecnt);
-
-      if (uccount && !lccount)
-        {
-          /* Abbrev was all caps */
-          /* If expansion is multiple words, normally capitalize each word */
-          /* This used to be if (!... && ... >= ...) Fcapitalize; else Fupcase
-             but Megatest 68000 compiler can't handle that */
-          if (!abbrev_all_caps)
-            if (scan_words (PT, -1) > scan_words (wordstart, 1))
-              {
-                Fupcase_initials_region (make_number (wordstart),
-                                         make_number (PT));
-                goto caped;
-              }
-          /* If expansion is one word, or if user says so, upcase it all. */
-          Fupcase_region (make_number (wordstart), make_number (PT));
-        caped: ;
-        }
-      else if (uccount)
-        {
-          /* Abbrev included some caps.  Cap first initial of expansion */
-          int pos = wordstart_byte;
-
-          /* Find the initial.  */
-          while (pos < PT_BYTE
-                 && SYNTAX (*BUF_BYTE_ADDRESS (current_buffer, pos)) != Sword)
-            pos++;
-
-          /* Change just that.  */
-          pos = BYTE_TO_CHAR (pos);
-          Fupcase_initials_region (make_number (pos), make_number (pos + 1));
-        }
-    }
-
-  hook = XSYMBOL (sym)->function;
-  if (!NILP (hook))
-    {
-      Lisp_Object expanded, prop;
-
-      /* If the abbrev has a hook function, run it.  */
-      expanded = call0 (hook);
-
-      /* 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.  */
-
-      if (SYMBOLP (hook)
-          && NILP (expanded)
-          && (prop = Fget (hook, intern ("no-self-insert")),
-              !NILP (prop)))
-        value = Qnil;
-    }
-
-  return value;
-}
-
-DEFUN ("unexpand-abbrev", Funexpand_abbrev, Sunexpand_abbrev, 0, 0, "",
-       doc: /* Undo the expansion of the last abbrev that expanded.
-This differs from ordinary undo in that other editing done since then
-is not undone.  */)
-     ()
-{
-  int opoint = PT;
-  int adjust = 0;
-  if (last_abbrev_point < BEGV
-      || last_abbrev_point > ZV)
-    return Qnil;
-  SET_PT (last_abbrev_point);
-  if (STRINGP (Vlast_abbrev_text))
-    {
-      /* This isn't correct if Vlast_abbrev->function was used
-         to do the expansion */
-      Lisp_Object val;
-      int zv_before;
-
-      val = SYMBOL_VALUE (Vlast_abbrev);
-      if (!STRINGP (val))
-        error ("Value of `abbrev-symbol' must be a string");
-      zv_before = ZV;
-      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,
-                          SCHARS (Vlast_abbrev_text),
-                          SBYTES (Vlast_abbrev_text), 0);
-      Vlast_abbrev_text = Qnil;
-      /* Total number of characters deleted.  */
-      adjust = ZV - zv_before;
-    }
-  SET_PT (last_abbrev_point < opoint ? opoint + adjust : opoint);
-  return Qnil;
-}
-
-static void
-write_abbrev (sym, stream)
-     Lisp_Object sym, stream;
-{
-  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);
-  name = SYMBOL_NAME (sym);
-  Fprin1 (name, stream);
-  insert (" ", 1);
-  Fprin1 (SYMBOL_VALUE (sym), stream);
-  insert (" ", 1);
-  Fprin1 (XSYMBOL (sym)->function, stream);
-  insert (" ", 1);
-  Fprin1 (count, stream);
-  insert (")\n", 2);
-}
-
-static void
-describe_abbrev (sym, stream)
-     Lisp_Object sym, stream;
-{
-  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);
-
-  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))
-    {
-      Findent_to (make_number (45), one);
-      Fprin1 (XSYMBOL (sym)->function, 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.
-NAME is a symbol whose value is an abbrev table.
-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.
-
-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);
-  table = Fsymbol_value (name);
-  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");
-      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");
-      while (! NILP (symbols))
-        {
-          write_abbrev (XCAR (symbols), stream);
-          symbols = XCDR (symbols);
-        }
-      insert_string ("    ))\n\n");
-    }
-
-  return Qnil;
-}
-
-DEFUN ("define-abbrev-table", Fdefine_abbrev_table, Sdefine_abbrev_table,
-       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 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, sys;
-
-  CHECK_SYMBOL (tablename);
-  table = Fboundp (tablename);
-  if (NILP (table) || (table = Fsymbol_value (tablename), NILP (table)))
-    {
-      table = Fmake_abbrev_table ();
-      Fset (tablename, table);
-      Vabbrev_table_name_list = Fcons (tablename, Vabbrev_table_name_list);
-    }
-  CHECK_VECTOR (table);
-
-  for (; CONSP (definitions); definitions = XCDR (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);       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);
-
-  Qforce = intern ("force");
-  staticpro (&Qforce);
-
-  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"),
-                                   Fcons (intern ("global-abbrev-table"),
-                                          Qnil));
-
-  DEFVAR_LISP ("global-abbrev-table", &Vglobal_abbrev_table,
-               doc: /* The abbrev table whose abbrevs affect all buffers.
-Each buffer may also have a local abbrev table.
-If it does, the local table overrides the global one
-for any particular abbrev defined in both.  */);
-  Vglobal_abbrev_table = Fmake_abbrev_table ();
-
-  DEFVAR_LISP ("fundamental-mode-abbrev-table", &Vfundamental_mode_abbrev_table,
-               doc: /* The abbrev table of mode-specific abbrevs for Fundamental Mode.  */);
-  Vfundamental_mode_abbrev_table = Fmake_abbrev_table ();
-  current_buffer->abbrev_table = Vfundamental_mode_abbrev_table;
-  buffer_defaults.abbrev_table = Vfundamental_mode_abbrev_table;
-
-  DEFVAR_LISP ("last-abbrev", &Vlast_abbrev,
-               doc: /* The abbrev-symbol of the last abbrev expanded.  See `abbrev-symbol'.  */);
-
-  DEFVAR_LISP ("last-abbrev-text", &Vlast_abbrev_text,
-               doc: /* The exact text of the last abbrev expanded.
-A value of nil means the abbrev has already been unexpanded.  */);
-
-  DEFVAR_INT ("last-abbrev-location", &last_abbrev_point,
-              doc: /* The location of the start of the last abbrev expanded.  */);
-
-  Vlast_abbrev = Qnil;
-  Vlast_abbrev_text = Qnil;
-  last_abbrev_point = 0;
-
-  DEFVAR_LISP ("abbrev-start-location", &Vabbrev_start_location,
-               doc: /* Buffer position for `expand-abbrev' to use as the start of the abbrev.
-When nil, use the word before point as the abbrev.
-Calling `expand-abbrev' sets this to nil.  */);
-  Vabbrev_start_location = Qnil;
-
-  DEFVAR_LISP ("abbrev-start-location-buffer", &Vabbrev_start_location_buffer,
-               doc: /* Buffer that `abbrev-start-location' has been set for.
-Trying to expand an abbrev in any other buffer clears `abbrev-start-location'.  */);
-  Vabbrev_start_location_buffer = Qnil;
-
-  DEFVAR_BOOL ("abbrevs-changed", &abbrevs_changed,
-               doc: /* Set non-nil by defining or altering any word abbrevs.
-This causes `save-some-buffers' to offer to save the abbrevs.  */);
-  abbrevs_changed = 0;
-
-  DEFVAR_BOOL ("abbrev-all-caps", &abbrev_all_caps,
-               doc: /* *Set non-nil means expand multi-word abbrevs all caps if abbrev was so.  */);
-  abbrev_all_caps = 0;
-
-  DEFVAR_LISP ("pre-abbrev-expand-hook", &Vpre_abbrev_expand_hook,
-               doc: /* Function or functions to be called before abbrev expansion is done.
-This is the first thing that `expand-abbrev' does, and so this may change
-the current abbrev table before abbrev lookup happens.  */);
-  Vpre_abbrev_expand_hook = Qnil;
-  Qpre_abbrev_expand_hook = intern ("pre-abbrev-expand-hook");
-  staticpro (&Qpre_abbrev_expand_hook);
-
-  defsubr (&Smake_abbrev_table);
-  defsubr (&Sclear_abbrev_table);
-  defsubr (&Sdefine_abbrev);
-  defsubr (&Sdefine_global_abbrev);
-  defsubr (&Sdefine_mode_abbrev);
-  defsubr (&Sabbrev_expansion);
-  defsubr (&Sabbrev_symbol);
-  defsubr (&Sexpand_abbrev);
-  defsubr (&Sunexpand_abbrev);
-  defsubr (&Sinsert_abbrev_table_description);
-  defsubr (&Sdefine_abbrev_table);
-}
-
-/* arch-tag: b721db69-f633-44a8-a361-c275acbdad7d
-   (do not change this comment) */
diff --git a/src/emacs.c b/src/emacs.c
index 9fbb0b32707..2d47114e16d 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1543,7 +1543,6 @@ main (argc, argv
       syms_of_fns ();
       syms_of_floatfns ();
 
-      syms_of_abbrev ();
       syms_of_buffer ();
       syms_of_bytecode ();
       syms_of_callint ();
diff --git a/src/image.c b/src/image.c
index 33d5e1a9b2d..91be3f4b57e 100644
--- a/src/image.c
+++ b/src/image.c
@@ -733,9 +733,9 @@ Lisp_Object Qxbm;
 /* Keywords.  */
 
 extern Lisp_Object QCwidth, QCheight, QCforeground, QCbackground, QCfile;
-extern Lisp_Object QCdata, QCtype, Qcount;
+extern Lisp_Object QCdata, QCtype;
 extern Lisp_Object Qcenter;
-Lisp_Object QCascent, QCmargin, QCrelief;
+Lisp_Object QCascent, QCmargin, QCrelief, Qcount;
 Lisp_Object QCconversion, QCcolor_symbols, QCheuristic_mask;
 Lisp_Object QCindex, QCmatrix, QCcolor_adjustment, QCmask;
 
@@ -9089,6 +9089,9 @@ non-numeric, there is no explicit limit on the size of images.  */);
   define_image_type (&xbm_type, 1);
   define_image_type (&pbm_type, 1);
 
+  Qcount = intern ("count");
+  staticpro (&Qcount);
+
   QCascent = intern (":ascent");
   staticpro (&QCascent);
   QCmargin = intern (":margin");
diff --git a/src/puresize.h b/src/puresize.h
index f5b675055b8..bf4971a0b5f 100644
--- a/src/puresize.h
+++ b/src/puresize.h
@@ -43,7 +43,7 @@ Boston, MA 02110-1301, USA.  */
 #endif
 
 #ifndef BASE_PURESIZE
-#define BASE_PURESIZE (1170000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA)
+#define BASE_PURESIZE (1180000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA)
 #endif
 
 /* Increase BASE_PURESIZE by a ratio depending on the machine's word size.  */