# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 954882908 0
# Node ID 3d557619ba03059830555e3fca9f2e1f11b4d77f
# Parent  b5a7eb24964c0ada6e2c019605cdb6e73ab7d871
*** empty log message ***

diff -r b5a7eb24964c -r 3d557619ba03 etc/NEWS
--- a/etc/NEWS	Tue Apr 04 21:07:45 2000 +0000
+++ b/etc/NEWS	Tue Apr 04 21:15:08 2000 +0000
@@ -748,8 +748,19 @@
 
 *** 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 -r b5a7eb24964c -r 3d557619ba03 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Apr 04 21:07:45 2000 +0000
+++ b/lisp/ChangeLog	Tue Apr 04 21:15:08 2000 +0000
@@ -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 -r b5a7eb24964c -r 3d557619ba03 src/ChangeLog
Binary file src/ChangeLog has changed