*** empty log message ***

diff --git a/etc/NEWS b/etc/NEWS
index c9e92f2c04c82a581691e140e388d5f83b4205f9..d09f2e6adc3d0f5eb55f99eb6c2efb5b650445ef 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -748,8 +748,19 @@ Provan).
 
 *** Minor improvements to many movement functions in tricky situations.
 
+** Makefile mode changes
+
+*** The mode now uses the abbrev table `makefile-mode-abbrev-table'.
+
+*** Conditionals and include statements are now highlighted when 
+Fontlock mode is active.
+
 ** Isearch changes
 
+** In Isearch mode, M-C-s and M-C-r are now bound like C-s and C-r,
+respectively, i.e. you can repeat a regexp isearch with the same keys
+that started the search.
+
 *** In Isearch mode, mouse-2 in the echo area now yanks the current
 selection into the search string rather than giving an error.
 

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1dfe439d5c85826dd996df3d4fa3253bd62698eb..cdfe28cbd83edc488063e026943912bc48b7fc03 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,29 @@
+2000-04-04  Gerd Moellmann  <gerd@gnu.org>
+
+       * isearch.el (isearch-mode-map): Define M-C-s like C-s and M-C-r
+       like C-r.
+
+       * progmodes/make-mode.el: Some doc fixes.
+       (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.
+       (toplevel): Require `dabbrev' and `add-log' when compiling.
+
+       * replace.el (perform-replace): Don't move forward one char
+       when MATCH-AGAIN is nil, and REGEXP-FLAG is t.  We don't want
+       to do that because it leaves point 1 position after the last
+       replacement, after everything has been replaced.
+
+       * jit-lock.el (with-buffer-unmodified): New macro.
+       (with-buffer-prepared-for-font-lock): Don't preserve buffer's
+       modified state.
+       (jit-lock-function-1): Extracted from jit-lock-function; not
+       preserving buffer's modified state.
+       (jit-lock-function, jit-lock-stealth-fontify): Call
+       jit-lock-function-1.
+
+       * mail/rfc2368.el: Remove supernumerary copyright line.
+
 2000-04-04  Milan Zamazal  <pdm@freesoft.cz>
 
        * glasses.el: Provide facilities for inserting space before left

diff --git a/src/ChangeLog b/src/ChangeLog
index d7c1514eba94c9b069da17a0380800cb4558baf6..19932e9d76c5af2c2cd71e5761d43f52604d0709 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2000-04-04  Gerd Moellmann  <gerd@gnu.org>
 
+       * window.c (compare_window_configurations): Signal an error
+       if parameters C1 or C2 aren't window configurations.
+
        * bytecode.c (Fbyte_code): Add a bunch of BEFORE_POTENTIAL_GC/
        AFTER_POTENTIAL_GC calls around calls to functions that can
        signal an error and thus invoke the debugger.