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

5 files changed, 33 insertions, 25 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.
diff --git a/src/keyboard.c b/src/keyboard.c
index 3f49d612b1d..2729ae878a9 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -7581,7 +7581,7 @@ Lisp_Object QCimage;
 /* Function prototypes.  */
 
 static void init_tool_bar_items P_ ((Lisp_Object));
-static void process_tool_bar_item P_ ((Lisp_Object, Lisp_Object));
+static void process_tool_bar_item P_ ((Lisp_Object, Lisp_Object, Lisp_Object, void*));
 static int parse_tool_bar_item P_ ((Lisp_Object, Lisp_Object));
 static void append_tool_bar_item P_ ((void));
 
@@ -7659,17 +7659,7 @@ tool_bar_items (reuse, nitems)
 
         keymap = get_keymap (access_keymap (maps[i], Qtool_bar, 1, 0, 1), 0, 1);
         if (CONSP (keymap))
-          {
-            Lisp_Object tail;
-
-            /* KEYMAP is a list `(keymap (KEY . BINDING) ...)'.  */
-            for (tail = keymap; CONSP (tail); tail = XCDR (tail))
-              {
-                Lisp_Object keydef = XCAR (tail);
-                if (CONSP (keydef))
-                  process_tool_bar_item (XCAR (keydef), XCDR (keydef));
-              }
-          }
+          map_keymap (keymap, process_tool_bar_item, Qnil, NULL, 1);
       }
 
   Vinhibit_quit = oquit;
@@ -7681,8 +7671,9 @@ tool_bar_items (reuse, nitems)
 /* Process the definition of KEY which is DEF.  */
 
 static void
-process_tool_bar_item (key, def)
-     Lisp_Object key, def;
+process_tool_bar_item (key, def, data, args)
+     Lisp_Object key, def, data;
+     void *args;
 {
   int i;
   extern Lisp_Object Qundefined;
diff --git a/src/xdisp.c b/src/xdisp.c
index a89a11db300..43673bb6197 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -23975,7 +23975,7 @@ before automatic hscrolling will horizontally scroll the window.  */);
 
   DEFVAR_LISP ("hscroll-step", &Vhscroll_step,
     doc: /* *How many columns to scroll the window when point gets too close to the edge.
-When point is less than `automatic-hscroll-margin' columns from the window
+When point is less than `hscroll-margin' columns from the window
 edge, automatic hscrolling will scroll the window by the amount of columns
 determined by this variable.  If its value is a positive integer, scroll that
 many columns.  If it's a positive floating-point number, it specifies the
diff --git a/src/xfns.c b/src/xfns.c
index 60516d5a624..f52207f01c7 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -817,7 +817,6 @@ xg_set_icon (f, file)
       UNBLOCK_INPUT;
     }
 
-  UNGCPRO;
   return result;
 }
 
diff --git a/src/xterm.c b/src/xterm.c
index c406268c606..b1f9e76080f 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -10441,8 +10441,6 @@ x_term_init (display_name, xrm_option, resource_name)
 
           if (! NILP (abs_file) && !NILP (Ffile_readable_p (abs_file)))
             gtk_rc_parse (SDATA (abs_file));
-
-          UNGCPRO;
         }
 
         XSetErrorHandler (x_error_handler);