From: Gerd Moellmann <gerd@gnu.org>
Date: Thu, 30 Dec 1999 12:27:44 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-21.0.90~5589
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a915c6488f9b55152953453f2505d85409362b1f;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c50a7847db0..584688ee19a 100644
--- 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 14be4433453..413db7655c1 100644
--- 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.