# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1090705031 0
# Node ID 588fc06a48aebcc94322eb0ead0ffa9a2e42a71b
# Parent  6ed4179ba08b4be54254e042203788e5d256455d
(Fexpand_abbrev): Run Qpre_abbrev_expand_hook
only when a real abbrev is present.

diff -r 6ed4179ba08b -r 588fc06a48ae src/abbrev.c
--- a/src/abbrev.c	Sat Jul 24 21:35:56 2004 +0000
+++ b/src/abbrev.c	Sat Jul 24 21:37:11 2004 +0000
@@ -248,8 +248,6 @@
 
   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 @@
   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