# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1120033244 0
# Node ID a7d45b7cc6d5b3ddcfdbbe1dbf7de476854e2c70
# Parent  0e0d1ff0b641a67ec4037214f2027b381b38795e
*** empty log message ***

diff -r 0e0d1ff0b641 -r a7d45b7cc6d5 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Jun 29 08:19:17 2005 +0000
+++ b/lisp/ChangeLog	Wed Jun 29 08:20:44 2005 +0000
@@ -1,5 +1,7 @@
 2005-06-29  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* font-lock.el (save-buffer-state): Use `declare'.
+
 	* progmodes/cperl-mode.el (cperl-find-pods-heres): Don't gratuitously
 	reset the syntax-table to cperl-mode-syntax-table.
 	(cperl-mode): Make _ into word-syntax during font-locking so "print" in
diff -r 0e0d1ff0b641 -r a7d45b7cc6d5 src/ChangeLog
--- a/src/ChangeLog	Wed Jun 29 08:19:17 2005 +0000
+++ b/src/ChangeLog	Wed Jun 29 08:20:44 2005 +0000
@@ -65,17 +65,16 @@
 	* xdisp.c (syms_of_xdisp) <nobreak-char-display>: Doc fix.
 	(syms_of_xdisp) <void-text-area-pointer>: Doc fix.
 
-	* fileio.c (Frename_file)[!DOS_NT]: Don't call chown on
-	MSDOS/Windows.
+	* fileio.c (Frename_file)[!DOS_NT]: Don't call chown on MSDOS/Windows.
 
 2005-06-23  Richard M. Stallman  <rms@gnu.org>
 
 	* xdisp.c (get_next_display_element): Finish reversing the tests of
 	Vnobreak_char_display.
 
-	* xdisp.c (Vnobreak_char_display): Renamed from Vshow_nonbreak_escape.
+	* xdisp.c (Vnobreak_char_display): Rename from Vshow_nonbreak_escape.
 	All uses changed.
-	(Qnobreak_space): Renamed from Qno_break_space.  All uses changed.
+	(Qnobreak_space): Rename from Qno_break_space.  All uses changed.
 	(syms_of_xdisp): Define nobreak-char-display and nobreak-space.
 
 	* fileio.c (Frename_file): Preserve owner and group, if possible,
@@ -371,8 +370,7 @@
 
 2005-06-06  Eli Zaretskii  <eliz@gnu.org>
 
-	* w32heap.h (OFFSET_TO_RVA, RVA_TO_OFFSET, RVA_TO_PTR):
-	Remove macros.
+	* w32heap.h (OFFSET_TO_RVA, RVA_TO_OFFSET, RVA_TO_PTR): Remove macros.
 
 	* unexw32.c (RVA_TO_PTR): Move here from w32heap.h.