aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman2004-07-31 03:37:21 +0000
committerRichard M. Stallman2004-07-31 03:37:21 +0000
commit451eaa2138828c165b29f39fe7066dbb04850cb0 (patch)
tree54446dd1966fea1349f3e11057b5cac68f4436e1 /src
parent4bcce19cc188070e06d7655e47b94f5809413da5 (diff)
downloademacs-451eaa2138828c165b29f39fe7066dbb04850cb0.tar.gz
emacs-451eaa2138828c165b29f39fe7066dbb04850cb0.zip
(Fexpand_abbrev): Undo previous change.
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 37ab640ee43..ac132f20023 100644
--- a/src/abbrev.c
+++ b/src/abbrev.c
@@ -248,6 +248,8 @@ Returns the abbrev symbol, if expansion took place. */)
248 248
249 value = Qnil; 249 value = Qnil;
250 250
251 Frun_hooks (1, &Qpre_abbrev_expand_hook);
252
251 wordstart = 0; 253 wordstart = 0;
252 if (!(BUFFERP (Vabbrev_start_location_buffer) 254 if (!(BUFFERP (Vabbrev_start_location_buffer)
253 && XBUFFER (Vabbrev_start_location_buffer) == current_buffer)) 255 && XBUFFER (Vabbrev_start_location_buffer) == current_buffer))
@@ -324,8 +326,6 @@ Returns the abbrev symbol, if expansion took place. */)
324 if (INTEGERP (sym) || NILP (SYMBOL_VALUE (sym))) 326 if (INTEGERP (sym) || NILP (SYMBOL_VALUE (sym)))
325 return value; 327 return value;
326 328
327 Frun_hooks (1, &Qpre_abbrev_expand_hook);
328
329 if (INTERACTIVE && !EQ (minibuf_window, selected_window)) 329 if (INTERACTIVE && !EQ (minibuf_window, selected_window))
330 { 330 {
331 /* Add an undo boundary, in case we are doing this for 331 /* Add an undo boundary, in case we are doing this for