From: Richard M. Stallman <rms@gnu.org>
Date: Sat, 24 Jul 2004 21:37:11 +0000 (+0000)
Subject: (Fexpand_abbrev): Run Qpre_abbrev_expand_hook
X-Git-Tag: ttn-vms-21-2-B4~5405
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f70de7583e9312348f59b51fb1c7a826178eea52;p=emacs.git

(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 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