Merged from emacs@sv.gnu.org

Patches applied:

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

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

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

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

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

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

 * emacs@sv.gnu.org/emacs--devo--0--patch-179
   Update from erc--emacs--0

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

1 files changed, 79 insertions, 5 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 867306579ab..ba816a9e2f0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,7 +1,81 @@
+2006-03-31  Kenichi Handa  <handa@m17n.org>
+
+        * xfns.c (xg_set_icon): Delete superfluous UNGCPRO.
+
+2006-03-30  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * xdisp.c (syms_of_xdisp): Fix variable name.
+
+2006-03-30  Kenichi Handa  <handa@m17n.org>
+
+        * xterm.c (x_term_init): Delete superfluous UNGCPRO.
+
+2006-03-29  Juanma Barranquero  <lekktu@gmail.com>
+
+        * keyboard.c (process_tool_bar_item): Reorder dummy args.
+
+2006-03-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * keyboard.c (tool_bar_items): Use map_keymap.
+        (process_tool_bar_item): Add dummy args to fit the required interface.
+
+2006-03-25  Eli Zaretskii  <eliz@gnu.org>
+
+        * .gdbinit (pr, pp, pp1, pv, pv1): Force print_output_debug_flag
+        to zero before calling debug_print or safe_debug_print.
+
+        * print.c (print_output_debug_flag): New global variable.
+        (Fexternal_debugging_output) [WINDOWSNT]: Don't call
+        OutputDebugString if print_output_debug_flag is zero.
+
+2006-03-24  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * editfns.c (TM_YEAR_BASE): Move up, so the changes below can use it.
+        (Fdecode_time, Fencode_time): Use TM_YEAR_BASE instead of 1900.
+        (Fdecode_time): Cast tm_year to EMACS_INT.
+        (Fcurrent_time_string): Report an invalid time specification if
+        the argument is invalid.  Also, check for out-of-range time stamps.
+
+2006-03-24  Kim F. Storm  <storm@cua.dk>
+
+        * xterm.c (handle_one_xevent):
+        * w32term.c (w32_read_socket):
+        * macterm.c (XTread_socket): Don't let key-press clear mouse face
+        on in toolbar window if mouse-highlight is an integer.
+
+        * fns.c (sxhash_list): Include last non-nil CDR in hash.
+
+2006-03-24  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macmenu.c (enum mac_menu_kind): New enum.
+        (min_menu_id): New variable.
+        (POPUP_SUBMENU_ID, MIN_POPUP_SUBMENU_ID, MIN_MENU_ID)
+        (MIN_SUBMENU_ID): Remove defines.  All uses are replaced with
+        min_menu_id and enumerators in enum mac_menu_kind.
+        (fill_menu, dispose_menus, install_menu_quit_handler): New arg KIND.
+        All uses changed.  Add range check for menu ID.
+        (fill_menubar): Add range check for menu ID.
+        [HAVE_CANCELMENUTRACKING] (menu_quit_handler): Check error code of
+        GetEventParameter.
+        (set_frame_menubar, mac_menu_show): Call install_menu_quit_handler
+        for each menu kind.
+
+2006-03-22  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c: Undo 2006-03-21 change.
+
+        * term.c: Define aliases for append_glyph and produce_stretch_glyph
+        when `static' is defined to avoid name clash with those in xdisp.c.
+
+        * process.c (Faccept_process_output): Fix to comply with lisp reference.
+        Change arg "timeout" to "seconds" and allow both integer and float value.
+        Change arg "timeout-msec" to "millisec" and interpret" as milliseconds
+        rather than microseconds.  Fix doc string accordingly.
+
 2006-03-21  Ken Raeburn  <raeburn@raeburn.org>
 
-        * xdisp.c (store_next_glyph): Renamed from append_glyph.
-        (generate_stretch_glyph): Renamed from produce_stretch_glyph.
+        * xdisp.c (store_next_glyph): Rename from append_glyph.
+        (generate_stretch_glyph): Rename from produce_stretch_glyph.
         All callers changed accordingly.
 
 2006-03-21  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
@@ -842,8 +916,8 @@
 
         * editfns.c (Fconstrain_to_field): Fix behaviour on field boundaries.
         (find_field): Set before_field to after_field when pos is at BEGV.
-        (Fline_beginning_position, Fline_end_position): Clarify
-        confusing doc string.
+        (Fline_beginning_position, Fline_end_position):
+        Clarify confusing doc string.
 
         * cmds.c (Fbeginning_of_line, Fend_of_line): Clarify confusing doc
         string.
@@ -1772,7 +1846,7 @@
 2005-11-11  David Reitter  <david.reitter@gmail.com>
 
         * macterm.c (syms_of_macterm): Remove macCtrlKey, macShiftKey,
-        macMetaKey, macAltKey. Introduce Qctrl, Qmeta,
+        macMetaKey, macAltKey.  Introduce Qctrl, Qmeta,
         Vmac_control_modifier / mac-control-modifier,
         Vmac_option_modifier / mac-option-modifier,
         Vmac_command_modifier / mac-command-modifier.