(Fprimitive_undo): Bind inhibit-read-only to t if

[bpt/emacs.git] / src / abbrev.c

diff --git a/src/abbrev.c b/src/abbrev.c
index f5586f5..f30986d 100644 (file)
--- a/src/abbrev.c
+++ b/src/abbrev.c
@@ -367,11 +367,14 @@ Returns the abbrev symbol, if expansion took place.")
     {
       Lisp_Object expanded, prop;
 
-      /* If expanding an abbrev which has only a hook, and the hook
-        has a non-nil `no-self-insert' property, let the return value
-        of the hook specify whether an expansion took place.  If it
-        returns nil, no expansion has been done.  */
+      /* 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
+        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")),
@@ -552,6 +555,7 @@ for any particular abbrev defined in both.");
     "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,
     "The abbrev-symbol of the last abbrev expanded.  See `abbrev-symbol'.");