From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Tue, 4 Oct 2005 09:21:09 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.0.90~6831
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=66533b25807362ca49147e35c76546709698d5f0;p=emacs.git

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

diff --git a/ChangeLog b/ChangeLog
index 42bdbc02971..1a81cd1d6be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-04  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* configure.in: Prefer Carbon if --enable-carbon-app or
+	--with-carbon is explicitly specified even when X11 is detected.
+	* configure: Regenerate.
+
 2005-09-15  Ulf Jasper  <ulf.jasper@web.de>
 
 	* Makefile.in (install-arch-indep, uninstall):
diff --git a/src/ChangeLog b/src/ChangeLog
index 85f6062407e..8d768815a0c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-04  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* macterm.c (mac_invert_rectangle): New function.
+	(XTflash): Use it.
+
 2005-10-04  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* regex.h (re_char): Don't expose it in the interface.