From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 29 Jul 2006 11:20:42 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.0.90~1191
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cfb37af8b15a302aacf7be22daa5980f00fe93d6;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9312730c06f..fbaff43682b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2006-07-29  Lennart Borgman  <lennart.borgman.073@student.lu.se>
+
+	* window.el (bw-get-tree): Don't integerp subtree if it's nil.
+
 2006-07-28  Richard Stallman  <rms@gnu.org>
 
 	* bindings.el (mode-line-frame-identification)
diff --git a/src/ChangeLog b/src/ChangeLog
index 7b7c1747aad..9f293bc1025 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2006-07-29  Eli Zaretskii  <eliz@gnu.org>
 
+	* coding.c (Ffind_operation_coding_system): Revert the change from
+	2006-05-29.
+
 	* alloc.c [WINDOWSNT]: Include fcntl.h, to fix last change.
 
 2006-07-28  Richard Stallman  <rms@gnu.org>