summaryrefslogtreecommitdiff
path: root/src/cmds.c
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1997-01-02 02:30:33 +0000
committerRichard M. Stallman <rms@gnu.org>1997-01-02 02:30:33 +0000
commit9317a902a2ad8ae248469e2e7e44c1613f5365d5 (patch)
treeea06ef4a0754f6efa06b6f97ba5baf7f130533ec /src/cmds.c
parent05a455e217bb596a88470a6c637a226e4a149383 (diff)
downloademacs-9317a902a2ad8ae248469e2e7e44c1613f5365d5.tar.gz
(internal_self_insert): Check the property
on the hook, not on the abbrev symbol.
Diffstat (limited to 'src/cmds.c')
-rw-r--r--src/cmds.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/cmds.c b/src/cmds.c
index 2e6464bf0ce..db05b38460e 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -325,11 +325,13 @@ internal_self_insert (c1, noautofill)
sym = Fexpand_abbrev ();
/* If we expanded an abbrev which has only 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))
+ if (! NILP (sym) && ! NILP (XSYMBOL (sym)->function)
+ && SYMBOLP (XSYMBOL (sym)->function))
{
Lisp_Object prop;
- prop = Fget (sym, intern ("no-self-insert"));
+ prop = Fget (XSYMBOL (sym)->function, intern ("no-self-insert"));
if (! NILP (prop))
return Qnil;
}