From e57640c004967183938e399399f3b3f13a6d99b0 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Thu, 26 Dec 1996 20:54:22 +0000 Subject: (internal_self_insert): If the abbrev has no expansion, just a hook, inhibit the insertion of the character. --- src/cmds.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/cmds.c b/src/cmds.c index 8ca407a2abd..2e6464bf0ce 100644 --- a/src/cmds.c +++ b/src/cmds.c @@ -320,10 +320,20 @@ internal_self_insert (c1, noautofill) && PT > BEGV && SYNTAX (FETCH_CHAR (PT - 1)) == Sword) { int modiff = MODIFF; - Fexpand_abbrev (); - /* We can't trust the value of Fexpand_abbrev, - but if Fexpand_abbrev changed the buffer, - assume it expanded something. */ + Lisp_Object sym; + + sym = Fexpand_abbrev (); + + /* If we expanded an abbrev which has only a hook, + return right away--don't really self-insert. */ + if (! NILP (sym) && ! NILP (XSYMBOL (sym)->function)) + { + Lisp_Object prop; + prop = Fget (sym, intern ("no-self-insert")); + if (! NILP (prop)) + return Qnil; + } + if (MODIFF != modiff) hairy = 2; } -- cgit v1.2.1