From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 11 Mar 2006 12:05:09 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.0.90~3704
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7325e71441117761c91bd75c18d2cda79c330bc8;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 96aae2ec1c4..d05b8b83d0d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/src/ChangeLog b/src/ChangeLog
index 2ed0b9b133c..99e8ab7cb44 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.