# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1142078709 0
# Node ID 1827706c5dd55fe14c8fc8d77fd03105e9a20ddd
# Parent  0adb2f38bc3d83c7c76dd96c3159e85810a4d40d
*** empty log message ***

diff -r 0adb2f38bc3d -r 1827706c5dd5 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Mar 11 12:04:41 2006 +0000
+++ b/lisp/ChangeLog	Sat Mar 11 12:05:09 2006 +0000
@@ -1,3 +1,12 @@
+2006-03-11  Eli Zaretskii  <eliz@gnu.org>
+
+	* international/mule.el (auto-coding-alist): Add .odt
+	(OpenOffice's open document) files.
+
+	* files.el (auto-mode-alist): Add .odt (OpenOffice's open
+	document) files.  Mention in the doc string the need to sync with
+	auto-coding-alist.
+
 2006-03-10  Chong Yidong  <cyd@stupidchicken.com>
 
 	* files.el (hack-local-variables-confirm): Don't prompt for ! if
diff -r 0adb2f38bc3d -r 1827706c5dd5 src/ChangeLog
--- a/src/ChangeLog	Sat Mar 11 12:04:41 2006 +0000
+++ b/src/ChangeLog	Sat Mar 11 12:05:09 2006 +0000
@@ -1,5 +1,8 @@
 2006-03-11  Eli Zaretskii  <eliz@gnu.org>
 
+	* xterm.c (x_draw_hollow_cursor): Subtract 1 from the last
+	argument of XDrawRectangle.
+
 	* xdisp.c (get_phys_cursor_geometry): Don't decrease height by 1.
 
 	* macterm.c (mac_draw_rectangle): Don't add 1 to width and height.