Mercurial > emacs
changeset 27379:48cb03c9d1d8
Comment change.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Fri, 21 Jan 2000 02:22:56 +0000 |
| parents | af3075bcc264 |
| children | 59243c413664 |
| files | src/abbrev.c src/cmds.c |
| diffstat | 2 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/abbrev.c Fri Jan 21 02:10:26 2000 +0000 +++ b/src/abbrev.c Fri Jan 21 02:22:56 2000 +0000 @@ -367,11 +367,14 @@ { 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")),
--- a/src/cmds.c Fri Jan 21 02:10:26 2000 +0000 +++ b/src/cmds.c Fri Jan 21 02:22:56 2000 +0000 @@ -443,7 +443,7 @@ 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)