Comment change.

diff --git a/src/abbrev.c b/src/abbrev.c
index f5586f5c4d72d894356ebd0c9cb5df2eaf9a2aa3..ca97637a23affa478becf3468a7a38d5071964d6 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")),

diff --git a/src/cmds.c b/src/cmds.c
index 27d6812d05f4875cf049592451a6e2f1e5fe4ac5..f268865660085431b5dc92c208d2b402463264e5 100644 (file)
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -443,7 +443,7 @@ internal_self_insert (c, noautofill)
 
       sym = Fexpand_abbrev ();
 
-      /* If we expanded an abbrev which has only a hook,
+      /* If we expanded an abbrev which has a hook,
         and the hook has a non-nil `no-self-insert' property,
         return right away--don't really self-insert.  */
       if (! NILP (sym) && ! NILP (XSYMBOL (sym)->function)