Merged from

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-73
   Merge from erc--emacs--0

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

 * emacs@sv.gnu.org/emacs--devo--0--patch-75
   Make ERC comply with the new copyright year guidelines.

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

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

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

 * emacs@sv.gnu.org/emacs--devo--0--patch-79
   (rcirc-format-response-string): Fix small bugs

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

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

 * emacs@sv.gnu.org/emacs--devo--0--patch-82
   Fix compiler error in erc-dcc.el.

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

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

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

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

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

 * emacs@sv.gnu.org/emacs--devo--0--patch-88
   Merge from erc--emacs--0

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

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

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

1 files changed, 46 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 8c1fffe9911..18dcc803efa 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,49 @@
+2006-02-15  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * frame.c (x_get_arg): Clear out PARAM in ALIST also on Mac.
+
+        * macfns.c (x_set_menu_bar_lines): Menu bar is always shown on Mac.
+
+        * macmenu.c (set_frame_menubar): Don't call DrawMenuBar.
+
+2006-02-14  Richard M. Stallman  <rms@gnu.org>
+
+        * frame.c (x_get_arg): Clear out all occurrences of PARAM in ALIST.
+
+        * m/ibms390x.h: New file.
+
+2006-02-14  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * gtkutil.c (xg_tool_bar_detach_callback): Set show-arrow to the
+        value of x-gtk-whole-detached-tool-bar.
+        (xg_tool_bar_attach_callback): Set show-arrow to TRUE.
+
+        * xfns.c (syms_of_xfns): New variable: x-gtk-whole-detached-tool-bar.
+
+2006-02-14  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * xterm.c (x_x_to_emacs_modifiers): Make non-static.
+
+        * xterm.h: Declare x_x_to_emacs_modifiers.
+
+        * gtkutil.c (xg_tool_bar_button_cb): New function.
+        (xg_tool_bar_callback): Call x_x_to_emacs_modifiers to
+        store modifiers in event.
+        (update_frame_tool_bar): Connect button-release-event to
+        xg_tool_bar_button_cb.
+
+2006-02-13  Richard M. Stallman  <rms@gnu.org>
+
+        * .gdbinit (xwindow): Update the code to show the window box.
+
+2006-02-13  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * xterm.c (note_mouse_movement): Check for NULL FRAME_X_OUTPUT (frame).
+
+2006-02-12  Richard M. Stallman  <rms@gnu.org>
+
+        * cmds.c (internal_self_insert): Handle weird auto-fill-function.
+
 2006-02-11  Eli Zaretskii  <eliz@gnu.org>
 
         * keyboard.c (Venable_disabled_menus_and_buttons): New variable.