*** empty log message ***

diff --git a/etc/NEWS b/etc/NEWS
index 496d626b3ced3662313e2dc10ed88aeabc7f8576..4e522b8ddf43dfbccf9b2c8a8ba8d92794f22b25 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -440,6 +440,13 @@ There is a new command M-x replace-rectangle.
 query-replace-regexp, but takes a Lisp expression which is evaluated
 after each match to get the replacement text.
 
+** M-x query-replace recognizes a new command `E' that let's you
+edit the replacement string.
+
+** The new command mail-abbrev-complete-alias, bound to `M-TAB', let's
+you complete mail aliases in the text, analogous to
+lisp-complete-symbol.
+
 ** Emacs now resizes mini-windows if appropriate.
 
 If a message is longer than one line, or mini-buffer contents are

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0815164052631b50f8dd141587b086997cf33891..87ed239db4446feabbd71b6249ebd28e8e75c6a8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,22 @@
 2000-05-03  Gerd Moellmann  <gerd@gnu.org>
 
+       * replace.el (query-replace-map): Add binding for `E'.
+       (query-replace-help): Extend help text.
+       (perform-replace): Allow editing the replacement string.
+
+       * make-mode.el (makefile-mode-abbrev-table): New variable.
+       (makefile-mode): Set local abbrev table to
+       makefile-mode-abbrev-table.
+       (makefile-font-lock-keywords): Fontify includes and conditionals.
+       
        * subr.el (add-minor-mode): Handle AFTER for keymaps. Don't
        set TOGGLE's value.
 
+       * mailabbrev.el (mail-abbrev-insert-alias): Renamed from
+       mail-interactive-insert-alias.
+       (mail-abbrev-complete-alias): New command.
+       (mail-mode-map): Bind it to `M-TAB'.
+       
 2000-05-03  Kenichi Handa  <handa@etl.go.jp>
 
        * language/lao-util.el (lao-compose-region): New function.

diff --git a/src/ChangeLog b/src/ChangeLog
index 4e2d144afb4bb3ef58a9229fc6f74f3a22a2b6af..8aea17f5c144de9f2e824fa9b22e266d65308777 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
 2000-05-03  Gerd Moellmann  <gerd@gnu.org>
 
+       * xdisp.c (handle_single_display_prop): If display property value
+       is invalid, or something not supported on the frame, restore
+       iterator's position to what it was initially.  Make sure to return
+       0 for invalid and unsupported property values.
+
        * xterm.c (x_produce_glyphs) <composite chars>: Handle case
        that x_per_char_metric returns null.