Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-50

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 185-187)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 71-72)

   - Update from CVS

1 files changed, 27 insertions, 7 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 34b99a65a1c..2c048043058 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,24 @@
+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
@@ -13,8 +34,7 @@
         (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.
+        the argument is invalid.  Also, check for out-of-range time stamps.
 
 2006-03-24  Kim F. Storm  <storm@cua.dk>
 
@@ -54,8 +74,8 @@
 
 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>
@@ -896,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.
@@ -1826,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.