diff options
author | Richard M. Stallman <rms@gnu.org> | 2000-01-21 02:22:56 +0000 |
---|---|---|
committer | Richard M. Stallman <rms@gnu.org> | 2000-01-21 02:22:56 +0000 |
commit | 3e970550ca8132662432040549cf129b09cce71b (patch) | |
tree | 41ac1ea618ff5ec5c137befd78bde319075421c5 /src/abbrev.c | |
parent | dd84ef4bd92e608c42e74e29380bb93c417b03aa (diff) | |
download | emacs-3e970550ca8132662432040549cf129b09cce71b.tar.gz |
Comment change.
Diffstat (limited to 'src/abbrev.c')
-rw-r--r-- | src/abbrev.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/abbrev.c b/src/abbrev.c index f5586f5c4d7..ca97637a23a 100644 --- 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")), |