(Fexpand_abbrev): Run Qpre_abbrev_expand_hook

only when a real abbrev is present.

diff --git a/src/abbrev.c b/src/abbrev.c
index ac132f20023f1a482215a9590229ff6d64f1e9b3..37ab640ee43da07bd8d7157c43c3c8085a84bd1e 100644 (file)
--- 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