summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>2004-07-24 21:37:11 +0000
committerRichard M. Stallman <rms@gnu.org>2004-07-24 21:37:11 +0000
commitf70de7583e9312348f59b51fb1c7a826178eea52 (patch)
tree63342396f2fce4b39ceefd36fd2faffe7ae46691 /src
parent2da347886f2b22ab497a39b3f07cc14664f2bc5d (diff)
downloademacs-f70de7583e9312348f59b51fb1c7a826178eea52.tar.gz
emacs-f70de7583e9312348f59b51fb1c7a826178eea52.tar.bz2
emacs-f70de7583e9312348f59b51fb1c7a826178eea52.zip
(Fexpand_abbrev): Run Qpre_abbrev_expand_hook
only when a real abbrev is present.
Diffstat (limited to 'src')
-rw-r--r--src/abbrev.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/abbrev.c b/src/abbrev.c
index ac132f20023..37ab640ee43 100644
--- a/src/abbrev.c
+++ b/src/abbrev.c
@@ -248,8 +248,6 @@ Returns the abbrev symbol, if expansion took place. */)
value = Qnil;
- Frun_hooks (1, &Qpre_abbrev_expand_hook);
-
wordstart = 0;
if (!(BUFFERP (Vabbrev_start_location_buffer)
&& XBUFFER (Vabbrev_start_location_buffer) == current_buffer))
@@ -326,6 +324,8 @@ Returns the abbrev symbol, if expansion took place. */)
if (INTEGERP (sym) || NILP (SYMBOL_VALUE (sym)))
return value;
+ Frun_hooks (1, &Qpre_abbrev_expand_hook);
+
if (INTERACTIVE && !EQ (minibuf_window, selected_window))
{
/* Add an undo boundary, in case we are doing this for