# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1157204992 0
# Node ID de0011d21a6af23e887d3e7c18bb187c25620c18
# Parent  231eb88f2558802ca94f5048551f560f274c1e45
*** empty log message ***

diff -r 231eb88f2558 -r de0011d21a6a lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Sep 02 13:49:05 2006 +0000
+++ b/lisp/ChangeLog	Sat Sep 02 13:49:52 2006 +0000
@@ -1,3 +1,10 @@
+2006-09-02  Martin Rudalics  <rudalics@gmx.at>
+
+	* cus-start.el (hscroll-margin, hscroll-step)
+	(mode-line-in-non-selected-windows, mouse-autoselect-window)
+	(x-use-underline-position-properties): Change version to "22.1"
+	since they will appear there for the first time.
+
 2006-09-01  Chong Yidong  <cyd@stupidchicken.com>
 
 	* imenu.el (imenu-update-menubar): Use buffer-chars-modified-tick.
diff -r 231eb88f2558 -r de0011d21a6a src/ChangeLog
--- a/src/ChangeLog	Sat Sep 02 13:49:05 2006 +0000
+++ b/src/ChangeLog	Sat Sep 02 13:49:52 2006 +0000
@@ -1,3 +1,11 @@
+2006-09-02  Jindrich Makovicka  <makovick@gmail.com>  (tiny change)
+
+	* fns.c (concat) [__GNUC__]: Declare with
+	`__attribute__((noinline))'.
+
+	* eval.c (apply1, call2) [__GNUC__]: Declare with
+	`__attribute__((noinline))'.
+
 2006-09-02  Stuart D. Herring  <herring@lanl.gov>
 
 	* minibuf.c (Finternal_complete_buffer): New function.