Merged from [email protected]

Patches applied:

 * [email protected]/emacs--devo--0--patch-128
   Update from CVS

 * [email protected]/emacs--devo--0--patch-129
   Update from CVS

 * [email protected]/emacs--devo--0--patch-130
   Update from CVS

 * [email protected]/emacs--devo--0--patch-131
   Update from CVS

 * [email protected]/emacs--devo--0--patch-132
   Update from CVS

 * [email protected]/emacs--devo--0--patch-133
   Update from CVS

 * [email protected]/emacs--devo--0--patch-134
   Merge from gnus--rel--5.10

 * [email protected]/emacs--devo--0--patch-135
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-43
   Munge arch explicit ids in etc/images to match Emacs

 * [email protected]/gnus--rel--5.10--patch-44
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-45
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-46
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-47
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-48
   Update from CVS

git-archimport-id: [email protected]/emacs--multi-tty--0--patch-524

1 files changed, 36 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 79db6d09d0..11fe6f910e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,39 @@
+2006-03-02  Kim F. Storm  <[email protected]>
+
+	* frame.h (struct frame): New member n_tool_bar_rows.
+
+	* xdisp.c: Minimize the unpleasent visual impact of the requirement
+	that non-toolkit tool-bars must occupy an integral number of screen
+	lines, by distributing the rows evenly over the tool-bar screen	area.
+	(Vtool_bar_border): New variable.
+	(syms_of_xdisp): DEFVAR_LISP it.
+	(display_tool_bar_line): Add HEIGHT arg for desired row height.  Make
+	tool-bar row the desired height.  Use default face for border below
+	tool-bar.
+	(tool_bar_lines_needed): Add N_ROWS arg.  Use it to return number of
+	actual tool-bar rows.
+	(redisplay_tool_bar): Calculate f->n_tool_bar_rows initially.
+	Adjust the height of the tool-bar rows to fill tool-bar screen area.
+	(redisplay_tool_bar): Calculate f->n_tool_bar_rows when tool-bar area
+	is resized.
+
+2006-03-01  Luc Teirlinck  <[email protected]>
+
+	* search.c (Fregexp_quote): Do not precede a literal `]' with two
+	backslashes to try to make clear that it has a literal meaning; it
+	does not do that.  (It could close a character alternative
+	containing a backslash.)
+
+2006-02-28  Chong Yidong  <[email protected]>
+
+	* xselect.c (x_catch_errors_unwind): New function.
+	(x_reply_selection_request): Put x_uncatch_errors in an unwind.
+	(Fx_get_atom_name): Call x_uncatch_errors earlier.
+
+	* window.c (Qscroll_up, Qscroll_down): New syms.
+	(window_scroll_pixel_based): Make preserve_y static to avoid
+	getting point stuck when scrolling 1 line.
+
 2006-02-26  Chong Yidong  <[email protected]>
 
 	* xterm.h, xterm.c (x_uncatch_errors): Delete unneccessary