Merged from emacs@sv.gnu.org.

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-486
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-487
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-488
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-489
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-156
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-157
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-158
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-159
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-160
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-587

1 files changed, 15 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 4118fc6f2d8..27a229b0f68 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,16 @@
+2006-10-29  Mark Davies  <mark@mcs.vuw.ac.nz> (tiny change)
+
+        * ralloc.c (relinquish): Use a long for excess space counter to
+        handle 64-bit case correctly.
+
+2006-10-29  Jeramey Crawford  <jeramey@jeramey.com>
+
+        * m/amdx86-64.h: Add defines for OpenBSD x86-64.
+
+2006-10-29  Juanma Barranquero  <lekktu@gmail.com>
+
+        * window.c (Fdisplay_buffer): Fix typo in docstring.
+
 2006-10-27  Ben North  <ben@redfrontdoor.org>  (tiny change)
 
         * w32term.c (x_draw_glyph_string_foreground): Set background mode
@@ -431,7 +444,7 @@
         avoid confusing redisplay by placing the cursor outside the visible
         window area.
 
-2006-09-13  YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
+2006-09-13  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * xterm.c (x_initialize): Don't install Xt event timer here.
         (x_timeout_atimer_activated_flag): New var.
@@ -2176,7 +2189,7 @@
         * xdisp.c (display_tool_bar_line): Restore entire tool-bar
         geometry when backtracking in case last image doesn't fit on line.
 
-2006-05-18  MIYOSHI Masanori <miyoshi@meadowy.org>  (tiny change)
+2006-05-18  MIYOSHI Masanori  <miyoshi@meadowy.org>  (tiny change)
 
         * xdisp.c (display_tool_bar_line): Don't adjust tool-bar height by
         more than height of one frame default line.