*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c50a784..584688e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+1999-12-30  Gerd Moellmann  <gerd@gnu.org>
+
+       * expand.el (expand-abbrev-hook): Return t if expansion was
+       done, nil otherwise.
+
 1999-12-29  Richard M. Stallman  <rms@caffeine.ai.mit.edu>
 
        * tar-mode.el (tar-mode-map): Bind q to quit-window, not tar-quit.

diff --git a/src/ChangeLog b/src/ChangeLog
index 14be443..413db76 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
 1999-12-30  Gerd Moellmann  <gerd@gnu.org>
 
+       * abbrev.c (Fexpand_abbrev): If expanding an abbrev which has only
+       a hook, and the hook has a non-nil `no-self-insert' property, let
+       the return value of the hook specify whether an expansion took
+       place.  If it returns nil, no expansion has been performed.
+
        * xterm.c (x_make_frame_visible): Wait for frame becoming visible
        differently.