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

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 123-134)

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

 * gnus--rel--5.10  (patch 40-48)

   - Merge from emacs--devo--0
   - Update from CVS
   - Munge arch explicit ids in etc/images to match Emacs

13 files changed, 320 insertions, 90 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 4176e2f29c8..6edf4d43587 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,8 +1,87 @@
+2006-03-02  Kim F. Storm  <storm@cua.dk>
+
+        * frame.h (struct frame): New member n_tool_bar_rows.
+
+        * xdisp.c: Minimize the unpleasent visual impact of the requirement
+        that non-toolkit tool-bars must occupy an integral number of screen
+        lines, by distributing the rows evenly over the tool-bar screen area.
+        (Vtool_bar_border): New variable.
+        (syms_of_xdisp): DEFVAR_LISP it.
+        (display_tool_bar_line): Add HEIGHT arg for desired row height.  Make
+        tool-bar row the desired height.  Use default face for border below
+        tool-bar.
+        (tool_bar_lines_needed): Add N_ROWS arg.  Use it to return number of
+        actual tool-bar rows.
+        (redisplay_tool_bar): Calculate f->n_tool_bar_rows initially.
+        Adjust the height of the tool-bar rows to fill tool-bar screen area.
+        (redisplay_tool_bar): Calculate f->n_tool_bar_rows when tool-bar area
+        is resized.
+
+2006-03-01  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * search.c (Fregexp_quote): Do not precede a literal `]' with two
+        backslashes to try to make clear that it has a literal meaning; it
+        does not do that.  (It could close a character alternative
+        containing a backslash.)
+
+2006-02-28  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xselect.c (x_catch_errors_unwind): New function.
+        (x_reply_selection_request): Put x_uncatch_errors in an unwind.
+        (Fx_get_atom_name): Call x_uncatch_errors earlier.
+
+        * window.c (Qscroll_up, Qscroll_down): New syms.
+        (window_scroll_pixel_based): Make preserve_y static to avoid
+        getting point stuck when scrolling 1 line.
+
+2006-02-26  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xterm.h, xterm.c (x_uncatch_errors): Delete unneccessary
+        argument.
+
+        * xterm.c: (x_load_font, x_term_init, XTmouse_position)
+        (handle_one_xevent, x_connection_closed, x_list_fonts): No arg for
+        x_uncatch_errors.
+
+        * xselect.c (x_own_selection, x_decline_selection_request)
+        (x_reply_selection_request, x_get_foreign_selection)
+        (Fx_get_atom_name, Fx_send_client_event): Likewise.
+
+        * xfns.c (x_real_positions, x_set_mouse_color, Fx_focus_frame):
+        Likewise.
+
+2006-02-26  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * lread.c: Declare Vload_file_rep_suffixes instead of
+        deleted variable default_suffixes.
+        (Fget_load_suffixes): New function.
+        (Fload): Use Fget_load_suffixes and Vload_file_rep_suffixes.
+        No longer use deleted variable default_suffixes.  Update docstring.
+        (syms_of_lread): defsubr Sget_load_suffixes.
+        Expand `load-suffixes' docstring.
+        Delete default_suffixes and DEFVAR_LISP the new variable
+        `load-file-rep-suffixes'.
+
+        * w32.c (check_windows_init_file): Use Fget_load_suffixes instead
+        of Vload_suffixes.
+
+        * lisp.h: EXFUN Fget_load_suffixes.
+        Extern Vload_file_rep_suffixes.
+
+        * eval.c (specpdl_ptr): Remove volatile qualifier for consistency
+        with lisp.h.
+
+2006-02-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * lisp.h (struct specbinding, specpdl_ptr): Remove the volatile
+        qualifier which was trying to avoid the bug that was fixed by
+        yesterday's changes to xterm.c.
+
 2006-02-25  Chong Yidong  <cyd@stupidchicken.com>
 
         * xterm.h (x_catch_errors) Return value changed to void.
-        (x_uncatch_errors): Unused count argument deleted.
-        
+        (x_uncatch_errors): Delete unused count argument.
+
         * xterm.c (x_catch_errors): Don't use record_unwind_protect, since
         it can be called in a signal handler.
         (x_catch_errors_unwind): Function deleted.
diff --git a/src/eval.c b/src/eval.c
index 06d53c907b4..a84948981f4 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -117,7 +117,7 @@ struct specbinding *specpdl;
 
 /* Pointer to first unused element in specpdl.  */
 
-volatile struct specbinding *specpdl_ptr;
+struct specbinding *specpdl_ptr;
 
 /* Maximum size allowed for specpdl allocation */
 
diff --git a/src/frame.h b/src/frame.h
index 51530ee2dbf..a77e49ace73 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -222,6 +222,7 @@ struct frame
   /* Margin at the top of the frame.  Used to display the tool-bar.  */
   int tool_bar_lines;
 
+  int n_tool_bar_rows;
   int n_tool_bar_items;
 
   /* A buffer for decode_mode_line. */
diff --git a/src/lisp.h b/src/lisp.h
index 9cec643a078..d13400b8050 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -1754,13 +1754,13 @@ typedef Lisp_Object (*specbinding_func) P_ ((Lisp_Object));
 
 struct specbinding
   {
-    volatile Lisp_Object symbol, old_value;
-    volatile specbinding_func func;
+    Lisp_Object symbol, old_value;
+    specbinding_func func;
     Lisp_Object unused;         /* Dividing by 16 is faster than by 12 */
   };
 
 extern struct specbinding *specpdl;
-extern volatile struct specbinding *specpdl_ptr;
+extern struct specbinding *specpdl_ptr;
 extern int specpdl_size;
 
 extern EMACS_INT max_specpdl_size;
@@ -2638,6 +2638,7 @@ EXFUN (Fread_from_string, 3);
 EXFUN (Fintern, 2);
 EXFUN (Fintern_soft, 2);
 EXFUN (Fload, 5);
+EXFUN (Fget_load_suffixes, 0);
 EXFUN (Fget_file_char, 0);
 EXFUN (Fread_char, 2);
 EXFUN (Fread_event, 2);
@@ -2649,7 +2650,7 @@ extern Lisp_Object oblookup P_ ((Lisp_Object, const char *, int, int));
 #define LOADHIST_ATTACH(x) \
  if (initialized) Vcurrent_load_list = Fcons (x, Vcurrent_load_list)
 extern Lisp_Object Vcurrent_load_list;
-extern Lisp_Object Vload_history, Vload_suffixes;
+extern Lisp_Object Vload_history, Vload_suffixes, Vload_file_rep_suffixes;
 extern int openp P_ ((Lisp_Object, Lisp_Object, Lisp_Object,
                       Lisp_Object *, Lisp_Object));
 extern int isfloat_string P_ ((char *));
diff --git a/src/lread.c b/src/lread.c
index ef45f4663ea..e2f9d81d059 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -106,7 +106,7 @@ int load_in_progress;
 Lisp_Object Vsource_directory;
 
 /* Search path and suffixes for files to be loaded. */
-Lisp_Object Vload_path, Vload_suffixes, default_suffixes;
+Lisp_Object Vload_path, Vload_suffixes, Vload_file_rep_suffixes;
 
 /* File name of user's init file.  */
 Lisp_Object Vuser_init_file;
@@ -832,28 +832,64 @@ load_error_handler (data)
   return Qnil;
 }
 
+DEFUN ("get-load-suffixes", Fget_load_suffixes, Sget_load_suffixes, 0, 0, 0,
+       doc: /* Return the suffixes that `load' should try if a suffix is \
+required.
+This uses the variables `load-suffixes' and `load-file-rep-suffixes'.  */)
+     ()
+{
+  Lisp_Object lst = Qnil, suffixes = Vload_suffixes, suffix, ext;
+  while (CONSP (suffixes))
+    {
+      Lisp_Object exts = Vload_file_rep_suffixes;
+      suffix = XCAR (suffixes);
+      suffixes = XCDR (suffixes);
+      while (CONSP (exts))
+        {
+          ext = XCAR (exts);
+          exts = XCDR (exts);
+          lst = Fcons (concat2 (suffix, ext), lst);
+        }
+    }
+  return Fnreverse (lst);
+}
+
 DEFUN ("load", Fload, Sload, 1, 5, 0,
        doc: /* Execute a file of Lisp code named FILE.
 First try FILE with `.elc' appended, then try with `.el',
- then try FILE unmodified (the exact suffixes are determined by
-`load-suffixes').  Environment variable references in FILE
- are replaced with their values by calling `substitute-in-file-name'.
+then try FILE unmodified (the exact suffixes in the exact order are
+determined by  `load-suffixes').  Environment variable references in
+FILE are replaced with their values by calling `substitute-in-file-name'.
 This function searches the directories in `load-path'.
+
 If optional second arg NOERROR is non-nil,
- report no error if FILE doesn't exist.
+report no error if FILE doesn't exist.
 Print messages at start and end of loading unless
- optional third arg NOMESSAGE is non-nil.
+optional third arg NOMESSAGE is non-nil.
 If optional fourth arg NOSUFFIX is non-nil, don't try adding
- suffixes `.elc' or `.el' to the specified name FILE.
+suffixes `.elc' or `.el' to the specified name FILE.
 If optional fifth arg MUST-SUFFIX is non-nil, insist on
- the suffix `.elc' or `.el'; don't accept just FILE unless
- it ends in one of those suffixes or includes a directory name.
+the suffix `.elc' or `.el'; don't accept just FILE unless
+it ends in one of those suffixes or includes a directory name.
+
+If this function fails to find a file, it may look for different
+representations of that file before trying another file.
+It does so by adding the non-empty suffixes in `load-file-rep-suffixes'
+to the file name.  Emacs uses this feature mainly to find compressed
+versions of files when Auto Compression mode is enabled.
+
+The exact suffixes that this function tries out, in the exact order,
+are given by the value of the variable `load-file-rep-suffixes' if
+NOSUFFIX is non-nil and by the return value of the function
+`get-load-suffixes' if MUST-SUFFIX is non-nil.  If both NOSUFFIX and
+MUST-SUFFIX are nil, this function first tries out the latter suffixes
+and then the former.
 
 Loading a file records its definitions, and its `provide' and
 `require' calls, in an element of `load-history' whose
 car is the file name loaded.  See `load-history'.
 
-Return t if file exists.  */)
+Return t if the file exists and loads successfully.  */)
      (file, noerror, nomessage, nosuffix, must_suffix)
      Lisp_Object file, noerror, nomessage, nosuffix, must_suffix;
 {
@@ -930,9 +966,9 @@ Return t if file exists.  */)
 
       fd = openp (Vload_path, file,
                   (!NILP (nosuffix) ? Qnil
-                   : !NILP (must_suffix) ? Vload_suffixes
-                   : Fappend (2, (tmp[0] = Vload_suffixes,
-                                  tmp[1] = default_suffixes,
+                   : !NILP (must_suffix) ? Fget_load_suffixes ()
+                   : Fappend (2, (tmp[0] = Fget_load_suffixes (),
+                                  tmp[1] = Vload_file_rep_suffixes,
                                   tmp))),
                   &found, Qnil);
       UNGCPRO;
@@ -1303,7 +1339,7 @@ openp (path, str, suffixes, storeptr, predicate)
         fn = (char *) alloca (fn_size = 100 + want_size);
 
       /* Loop over suffixes.  */
-      for (tail = NILP (suffixes) ? default_suffixes : suffixes;
+      for (tail = NILP (suffixes) ? Fcons (build_string (""), Qnil) : suffixes;
            CONSP (tail); tail = XCDR (tail))
         {
           int lsuffix = SBYTES (XCAR (tail));
@@ -3979,6 +4015,7 @@ syms_of_lread ()
   defsubr (&Sintern);
   defsubr (&Sintern_soft);
   defsubr (&Sunintern);
+  defsubr (&Sget_load_suffixes);
   defsubr (&Sload);
   defsubr (&Seval_buffer);
   defsubr (&Seval_region);
@@ -4040,13 +4077,27 @@ Initialized based on EMACSLOADPATH environment variable, if any,
 otherwise to default specified by file `epaths.h' when Emacs was built.  */);
 
   DEFVAR_LISP ("load-suffixes", &Vload_suffixes,
-               doc: /* *List of suffixes to try for files to load.
-This list should not include the empty string.  */);
+               doc: /* List of suffixes for (compiled or source) Emacs Lisp files.
+This list should not include the empty string.
+`load' and related functions try to append these suffixes, in order,
+to the specified file name if a Lisp suffix is allowed or required.  */);
   Vload_suffixes = Fcons (build_string (".elc"),
                           Fcons (build_string (".el"), Qnil));
+  DEFVAR_LISP ("load-file-rep-suffixes", &Vload_file_rep_suffixes,
+               doc: /* List of suffixes that indicate representations of \
+the same file.
+This list should normally start with the empty string.
+
+Enabling Auto Compression mode appends the suffixes in
+`jka-compr-load-suffixes' to this list and disabling Auto Compression
+mode removes them again.  `load' and related functions use this list to
+determine whether they should look for compressed versions of a file
+and, if so, which suffixes they should try to append to the file name
+in order to do so.  However, if you want to customize which suffixes
+the loading functions recognize as compression suffixes, you should
+customize `jka-compr-load-suffixes' rather than the present variable.  */);
   /* We don't use empty_string because it's not initialized yet.  */
-  default_suffixes = Fcons (build_string (""), Qnil);
-  staticpro (&default_suffixes);
+  Vload_file_rep_suffixes = Fcons (build_string (""), Qnil);
 
   DEFVAR_BOOL ("load-in-progress", &load_in_progress,
                doc: /* Non-nil iff inside of `load'.  */);
diff --git a/src/search.c b/src/search.c
index 239957e1552..dfde3280240 100644
--- a/src/search.c
+++ b/src/search.c
@@ -3042,7 +3042,7 @@ DEFUN ("regexp-quote", Fregexp_quote, Sregexp_quote, 1, 1, 0,
 
   for (; in != end; in++)
     {
-      if (*in == '[' || *in == ']'
+      if (*in == '['
           || *in == '*' || *in == '.' || *in == '\\'
           || *in == '?' || *in == '+'
           || *in == '^' || *in == '$')
diff --git a/src/w32.c b/src/w32.c
index 799a3f6ad9b..71799befdbb 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -3888,7 +3888,7 @@ check_windows_init_file ()
       objs[1] = decode_env_path (0, (getenv ("EMACSLOADPATH")));
       full_load_path = Fappend (2, objs);
       init_file = build_string ("term/w32-win");
-      fd = openp (full_load_path, init_file, Vload_suffixes, NULL, Qnil);
+      fd = openp (full_load_path, init_file, Fget_load_suffixes (), NULL, Qnil);
       if (fd < 0)
         {
           Lisp_Object load_path_print = Fprin1_to_string (full_load_path, Qnil);
diff --git a/src/window.c b/src/window.c
index e4c8d0612cb..3e94885a810 100644
--- a/src/window.c
+++ b/src/window.c
@@ -50,6 +50,7 @@ Boston, MA 02110-1301, USA.  */
 
 
 Lisp_Object Qwindowp, Qwindow_live_p, Qwindow_configuration_p;
+Lisp_Object Qscroll_up, Qscroll_down;
 Lisp_Object Qwindow_size_fixed;
 extern Lisp_Object Qleft_margin, Qright_margin;
 
@@ -4721,9 +4722,9 @@ window_scroll_pixel_based (window, n, whole, noerror)
   struct text_pos start;
   Lisp_Object tem;
   int this_scroll_margin;
-  int preserve_y;
   /* True if we fiddled the window vscroll field without really scrolling.   */
   int vscrolled = 0;
+  static int preserve_y = -1;
 
   SET_TEXT_POS_FROM_MARKER (start, w->start);
 
@@ -4787,9 +4788,18 @@ window_scroll_pixel_based (window, n, whole, noerror)
      point in the same window line as it is now, so get that line.  */
   if (!NILP (Vscroll_preserve_screen_position))
     {
-      start_display (&it, w, start);
-      move_it_to (&it, PT, -1, -1, -1, MOVE_TO_POS);
-      preserve_y = it.current_y;
+      /* We preserve the goal pixel coordinate across consecutive
+         calls to scroll-up or scroll-down.  This avoids the
+         possibility of point becoming "stuck" on a tall line when
+         scrolling by one line.  */
+      if (preserve_y < 0
+          || (current_kboard->Vlast_command != Qscroll_up
+              && current_kboard->Vlast_command != Qscroll_down))
+        {
+          start_display (&it, w, start);
+          move_it_to (&it, PT, -1, -1, -1, MOVE_TO_POS);
+          preserve_y = it.current_y;
+        }
     }
   else
     preserve_y = -1;
@@ -4926,10 +4936,9 @@ window_scroll_pixel_based (window, n, whole, noerror)
         {
           /* If we have a header line, take account of it.
              This is necessary because we set it.current_y to 0, above.  */
-          if (WINDOW_WANTS_HEADER_LINE_P (w))
-            preserve_y -= CURRENT_HEADER_LINE_HEIGHT (w);
-
-          move_it_to (&it, -1, -1, preserve_y, -1, MOVE_TO_Y);
+          move_it_to (&it, -1, -1,
+                      preserve_y - (WINDOW_WANTS_HEADER_LINE_P (w) ? 1 : 0 ),
+                      -1, MOVE_TO_Y);
           SET_PT_BOTH (IT_CHARPOS (it), IT_BYTEPOS (it));
         }
       else
@@ -4983,15 +4992,9 @@ window_scroll_pixel_based (window, n, whole, noerror)
         {
           SET_TEXT_POS_FROM_MARKER (start, w->start);
           start_display (&it, w, start);
-#if 0  /* It's wrong to subtract this here
-          because we called start_display again
-          and did not alter it.current_y this time.  */
-
-          /* If we have a header line, take account of it.  */
-          if (WINDOW_WANTS_HEADER_LINE_P (w))
-            preserve_y -= CURRENT_HEADER_LINE_HEIGHT (w);
-#endif
-
+          /* It would be wrong to subtract CURRENT_HEADER_LINE_HEIGHT
+             here because we called start_display again and did not
+             alter it.current_y this time.  */
           move_it_to (&it, -1, -1, preserve_y, -1, MOVE_TO_Y);
           SET_PT_BOTH (IT_CHARPOS (it), IT_BYTEPOS (it));
         }
@@ -6988,6 +6991,12 @@ init_window ()
 void
 syms_of_window ()
 {
+  Qscroll_up = intern ("scroll-up");
+  staticpro (&Qscroll_up);
+
+  Qscroll_down = intern ("scroll-down");
+  staticpro (&Qscroll_down);
+
   Qwindow_size_fixed = intern ("window-size-fixed");
   staticpro (&Qwindow_size_fixed);
   Fset (Qwindow_size_fixed, Qnil);
diff --git a/src/xdisp.c b/src/xdisp.c
index 8c19b0976c8..7cdaf4f746c 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -270,6 +270,12 @@ int auto_raise_tool_bar_buttons_p;
 
 int make_cursor_line_fully_visible_p;
 
+/* Margin below tool bar in pixels.  0 or nil means no margin.
+   If value is `internal-border-width' or `border-width',
+   the corresponding frame parameter is used.  */
+
+Lisp_Object Vtool_bar_border;
+
 /* Margin around tool bar buttons in pixels.  */
 
 Lisp_Object Vtool_bar_button_margin;
@@ -855,7 +861,7 @@ static void store_mode_line_noprop_char P_ ((char));
 static int store_mode_line_noprop P_ ((const unsigned char *, int, int));
 static void x_consider_frame_title P_ ((Lisp_Object));
 static void handle_stop P_ ((struct it *));
-static int tool_bar_lines_needed P_ ((struct frame *));
+static int tool_bar_lines_needed P_ ((struct frame *, int *));
 static int single_display_spec_intangible_p P_ ((Lisp_Object));
 static void ensure_echo_area_buffers P_ ((void));
 static Lisp_Object unwind_with_echo_area_buffer P_ ((Lisp_Object));
@@ -966,7 +972,7 @@ static int in_ellipses_for_invisible_text_p P_ ((struct display_pos *,
 static void update_tool_bar P_ ((struct frame *, int));
 static void build_desired_tool_bar_string P_ ((struct frame *f));
 static int redisplay_tool_bar P_ ((struct frame *));
-static void display_tool_bar_line P_ ((struct it *));
+static void display_tool_bar_line P_ ((struct it *, int));
 static void notice_overwritten_cursor P_ ((struct window *,
                                            enum glyph_row_area,
                                            int, int, int, int));
@@ -9530,11 +9536,17 @@ build_desired_tool_bar_string (f)
 }
 
 
-/* Display one line of the tool-bar of frame IT->f.  */
+/* Display one line of the tool-bar of frame IT->f.
+
+   HEIGHT specifies the desired height of the tool-bar line.
+   If the actual height of the glyph row is less than HEIGHT, the
+   row's height is increased to HEIGHT, and the icons are centered
+   vertically in the new height.  */
 
 static void
-display_tool_bar_line (it)
+display_tool_bar_line (it, height)
      struct it *it;
+     int height;
 {
   struct glyph_row *row = it->glyph_row;
   int max_x = it->last_visible_x;
@@ -9590,11 +9602,22 @@ display_tool_bar_line (it)
  out:;
 
   row->displays_text_p = row->used[TEXT_AREA] != 0;
+  /* Use default face for the border below the tool bar.  */
+  if (!row->displays_text_p)
+    it->face_id = DEFAULT_FACE_ID;
   extend_face_to_end_of_line (it);
   last = row->glyphs[TEXT_AREA] + row->used[TEXT_AREA] - 1;
   last->right_box_line_p = 1;
   if (last == row->glyphs[TEXT_AREA])
     last->left_box_line_p = 1;
+
+  /* Make line the desired height and center it vertically.  */
+  if ((height -= it->max_ascent + it->max_descent) > 0)
+    {
+      it->max_ascent += height / 2;
+      it->max_descent += (height + 1) / 2;
+    }
+
   compute_line_metrics (it);
 
   /* If line is empty, make it occupy the rest of the tool-bar.  */
@@ -9618,11 +9641,13 @@ display_tool_bar_line (it)
 
 
 /* Value is the number of screen lines needed to make all tool-bar
-   items of frame F visible.  */
+   items of frame F visible.  The number of actual rows needed is
+   returned in *N_ROWS if non-NULL.  */
 
 static int
-tool_bar_lines_needed (f)
+tool_bar_lines_needed (f, n_rows)
      struct frame *f;
+     int *n_rows;
 {
   struct window *w = XWINDOW (f->tool_bar_window);
   struct it it;
@@ -9638,9 +9663,12 @@ tool_bar_lines_needed (f)
     {
       it.glyph_row = w->desired_matrix->rows;
       clear_glyph_row (it.glyph_row);
-      display_tool_bar_line (&it);
+      display_tool_bar_line (&it, 0);
     }
 
+  if (n_rows)
+    *n_rows = it.vpos;
+
   return (it.current_y + FRAME_LINE_HEIGHT (f) - 1) / FRAME_LINE_HEIGHT (f);
 }
 
@@ -9669,7 +9697,7 @@ DEFUN ("tool-bar-lines-needed", Ftool_bar_lines_needed, Stool_bar_lines_needed,
       if (f->n_tool_bar_items)
         {
           build_desired_tool_bar_string (f);
-          nlines = tool_bar_lines_needed (f);
+          nlines = tool_bar_lines_needed (f, NULL);
         }
     }
 
@@ -9714,9 +9742,50 @@ redisplay_tool_bar (f)
   build_desired_tool_bar_string (f);
   reseat_to_string (&it, NULL, f->desired_tool_bar_string, 0, 0, 0, -1);
 
+  if (f->n_tool_bar_rows == 0)
+    {
+      (void)tool_bar_lines_needed (f, &f->n_tool_bar_rows);
+      if (f->n_tool_bar_rows == 0)
+        f->n_tool_bar_rows = -1;
+    }
+
   /* Display as many lines as needed to display all tool-bar items.  */
-  while (it.current_y < it.last_visible_y)
-    display_tool_bar_line (&it);
+
+  if (f->n_tool_bar_rows > 0)
+    {
+      int border, rows, height, extra;
+
+      if (INTEGERP (Vtool_bar_border))
+        border = XINT (Vtool_bar_border);
+      else if (EQ (Vtool_bar_border, Qinternal_border_width))
+        border = FRAME_INTERNAL_BORDER_WIDTH (f);
+      else if (EQ (Vtool_bar_border, Qborder_width))
+        border = f->border_width;
+      else
+        border = 0;
+      if (border < 0)
+        border = 0;
+
+      rows = f->n_tool_bar_rows;
+      height = (it.last_visible_y - border) / rows;
+      extra = it.last_visible_y - border - height * rows;
+
+      while (it.current_y < it.last_visible_y)
+        {
+          int h = 0;
+          if (extra > 0 && rows-- > 0)
+            {
+              h = (extra + rows - 1) / rows;
+              extra -= h;
+            }
+          display_tool_bar_line (&it, height + h);
+        }
+    }
+  else
+    {
+      while (it.current_y < it.last_visible_y)
+        display_tool_bar_line (&it, 0);
+    }
 
   /* It doesn't make much sense to try scrolling in the tool-bar
      window, so don't do it.  */
@@ -9749,7 +9818,7 @@ redisplay_tool_bar (f)
       /* Resize windows as needed by changing the `tool-bar-lines'
          frame parameter.  */
       if (change_height_p
-          && (nlines = tool_bar_lines_needed (f),
+          && (nlines = tool_bar_lines_needed (f, &f->n_tool_bar_rows),
               nlines != WINDOW_TOTAL_LINES (w)))
         {
           extern Lisp_Object Qtool_bar_lines;
@@ -23817,6 +23886,14 @@ otherwise.  */);
     doc: /* *Non-nil means to scroll (recenter) cursor line if it is not fully visible.  */);
   make_cursor_line_fully_visible_p = 1;
 
+  DEFVAR_LISP ("tool-bar-border", &Vtool_bar_border,
+    doc: /* *Border below tool-bar in pixels.
+If an integer, use it as the height of the border.
+If it is one of `internal-border-width' or `border-width', use the
+value of the corresponding frame parameter.
+Otherwise, no border is added below the tool-bar.  */);
+  Vtool_bar_border = Qinternal_border_width;
+
   DEFVAR_LISP ("tool-bar-button-margin", &Vtool_bar_button_margin,
     doc: /* *Margin around tool-bar buttons in pixels.
 If an integer, use that for both horizontal and vertical margins.
diff --git a/src/xfns.c b/src/xfns.c
index 2ad80fb95fa..bf4b29a005f 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -667,7 +667,7 @@ x_real_positions (f, xptr, yptr)
       had_errors = x_had_errors_p (FRAME_X_DISPLAY (f));
     }
 
-  x_uncatch_errors (FRAME_X_DISPLAY (f));
+  x_uncatch_errors ();
 
   UNBLOCK_INPUT;
 
@@ -1022,7 +1022,7 @@ x_set_mouse_color (f, arg, oldval)
 
   /* Check and report errors with the above calls.  */
   x_check_errors (dpy, "can't set cursor shape: %s");
-  x_uncatch_errors (dpy);
+  x_uncatch_errors ();
 
   {
     XColor fore_color, back_color;
@@ -3427,7 +3427,7 @@ FRAME nil means use the selected frame.  */)
   x_catch_errors (dpy);
   XSetInputFocus (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
                   RevertToParent, CurrentTime);
-  x_uncatch_errors (dpy);
+  x_uncatch_errors ();
   UNBLOCK_INPUT;
 
   return Qnil;
diff --git a/src/xselect.c b/src/xselect.c
index 6efa625543e..30739c74331 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -55,6 +55,7 @@ static void x_decline_selection_request P_ ((struct input_event *));
 static Lisp_Object x_selection_request_lisp_error P_ ((Lisp_Object));
 static Lisp_Object queue_selection_requests_unwind P_ ((Lisp_Object));
 static Lisp_Object some_frame_on_display P_ ((struct x_display_info *));
+static Lisp_Object x_catch_errors_unwind P_ ((Lisp_Object));
 static void x_reply_selection_request P_ ((struct input_event *, int,
                                            unsigned char *, int, Atom));
 static int waiting_for_other_props_on_window P_ ((Display *, Window));
@@ -410,7 +411,7 @@ x_own_selection (selection_name, selection_value)
   x_catch_errors (display);
   XSetSelectionOwner (display, selection_atom, selecting_window, time);
   x_check_errors (display, "Can't set selection: %s");
-  x_uncatch_errors (display);
+  x_uncatch_errors ();
   UNBLOCK_INPUT;
 
   /* Now update the local cache */
@@ -586,7 +587,7 @@ x_decline_selection_request (event)
   x_catch_errors (reply.display);
   XSendEvent (reply.display, reply.requestor, False, 0L, (XEvent *) &reply);
   XFlush (reply.display);
-  x_uncatch_errors (reply.display);
+  x_uncatch_errors ();
   UNBLOCK_INPUT;
 }
 
@@ -611,6 +612,15 @@ x_selection_request_lisp_error (ignore)
     x_decline_selection_request (x_selection_current_request);
   return Qnil;
 }
+
+static Lisp_Object
+x_catch_errors_unwind (dummy)
+     Lisp_Object dummy;
+{
+  BLOCK_INPUT;
+  x_uncatch_errors ();
+  UNBLOCK_INPUT;
+}
 
 
 /* This stuff is so that INCR selections are reentrant (that is, so we can
@@ -703,8 +713,11 @@ x_reply_selection_request (event, format, data, size, type)
   if (reply.property == None)
     reply.property = reply.target;
 
-  /* #### XChangeProperty can generate BadAlloc, and we must handle it! */
   BLOCK_INPUT;
+  /* The protected block contains wait_for_property_change, which can
+     run random lisp code (process handlers) or signal.  Therefore, we
+     put the x_uncatch_errors call in an unwind.  */
+  record_unwind_protect (x_catch_errors_unwind, Qnil);
   x_catch_errors (display);
 
 #ifdef TRACE_SELECTION
@@ -858,9 +871,8 @@ x_reply_selection_request (event, format, data, size, type)
      UNBLOCK to enter the event loop and get possible errors delivered,
      and then BLOCK again because x_uncatch_errors requires it.  */
   BLOCK_INPUT;
-
+  /* This calls x_uncatch_errors.  */
   unbind_to (count, Qnil);
-  x_uncatch_errors (display);
   UNBLOCK_INPUT;
 }
 
@@ -1370,7 +1382,7 @@ x_get_foreign_selection (selection_symbol, target_type, time_stamp)
   Atom selection_atom = symbol_to_x_atom (dpyinfo, display, selection_symbol);
   Atom type_atom;
   int secs, usecs;
-  int count;
+  int count = SPECPDL_INDEX ();
   Lisp_Object frame;
 
   if (CONSP (target_type))
@@ -1392,6 +1404,10 @@ x_get_foreign_selection (selection_symbol, target_type, time_stamp)
 
   BLOCK_INPUT;
 
+  /* The protected block contains wait_reading_process_output, which
+     can run random lisp code (process handlers) or signal.
+     Therefore, we put the x_uncatch_errors call in an unwind.  */
+  record_unwind_protect (x_catch_errors_unwind, Qnil);
   x_catch_errors (display);
 
   TRACE2 ("Get selection %s, type %s",
@@ -1409,8 +1425,6 @@ x_get_foreign_selection (selection_symbol, target_type, time_stamp)
 
   frame = some_frame_on_display (dpyinfo);
 
-  count = SPECPDL_INDEX ();
-
   /* If the display no longer has frames, we can't expect
      to get many more selection requests from it, so don't
      bother trying to queue them.  */
@@ -1432,9 +1446,10 @@ x_get_foreign_selection (selection_symbol, target_type, time_stamp)
   TRACE1 ("  Got event = %d", !NILP (XCAR (reading_selection_reply)));
 
   BLOCK_INPUT;
+  if (x_had_errors_p (display))
+    error ("Cannot get selection");
+  /* This calls x_uncatch_errors.  */
   unbind_to (count, Qnil);
-  x_check_errors (display, "Cannot get selection: %s");
-  x_uncatch_errors (display);
   UNBLOCK_INPUT;
 
   if (NILP (XCAR (reading_selection_reply)))
@@ -2655,6 +2670,7 @@ If the value is 0 or the atom is not known, return the empty string.  */)
   Lisp_Object ret = Qnil;
   Display *dpy = FRAME_X_DISPLAY (f);
   Atom atom;
+  int had_errors;
 
   if (INTEGERP (value))
     atom = (Atom) XUINT (value);
@@ -2667,14 +2683,13 @@ If the value is 0 or the atom is not known, return the empty string.  */)
 
   BLOCK_INPUT;
   x_catch_errors (dpy);
-
   name = atom ? XGetAtomName (dpy, atom) : "";
+  had_errors = x_had_errors_p (dpy);
+  x_uncatch_errors ();
 
-  if (! x_had_errors_p (dpy))
+  if (!had_errors)
     ret = make_string (name, strlen (name));
 
-  x_uncatch_errors (dpy);
-
   if (atom && name) XFree (name);
   if (NILP (ret)) ret = make_string ("", 0);
 
@@ -2849,7 +2864,7 @@ are ignored.  */)
     XSendEvent (dpyinfo->display, wdest, propagate, mask, &event);
     XFlush (dpyinfo->display);
   }
-  x_uncatch_errors (dpyinfo->display);
+  x_uncatch_errors ();
   UNBLOCK_INPUT;
 
   return Qnil;
diff --git a/src/xterm.c b/src/xterm.c
index ea12b4eba9f..1f497f1f738 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -326,7 +326,7 @@ void x_delete_display P_ ((struct x_display_info *));
 
 static int x_io_error_quitter P_ ((Display *));
 void x_catch_errors P_ ((Display *));
-void x_uncatch_errors P_ ((Display *));
+void x_uncatch_errors P_ ((void));
 void x_lower_frame P_ ((struct frame *));
 void x_scroll_bar_clear P_ ((struct frame *));
 int x_had_errors_p P_ ((Display *));
@@ -3877,7 +3877,7 @@ XTmouse_position (fp, insist, bar_window, part, x, y, time)
         if (x_had_errors_p (FRAME_X_DISPLAY (*fp)))
           f1 = 0;
 
-        x_uncatch_errors (FRAME_X_DISPLAY (*fp));
+        x_uncatch_errors ();
 
         /* If not, is it one of our scroll bars?  */
         if (! f1)
@@ -5803,7 +5803,7 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
                     /* This is needed to detect the error
                        if there is an error.  */
                     XSync (d, False);
-                    x_uncatch_errors (d);
+                    x_uncatch_errors ();
                   }
                 /* Not certain about handling scroll bars here */
 #endif /* 0 */
@@ -7585,19 +7585,16 @@ x_catch_errors (dpy)
    DPY should be the display that was passed to x_catch_errors.  */
 
 void
-x_uncatch_errors (dpy)
-     Display *dpy;
+x_uncatch_errors ()
 {
   struct x_error_message_stack *tmp;
 
-  eassert (x_error_message && dpy == x_error_message->dpy);
-
   /* The display may have been closed before this function is called.
      Check if it is still open before calling XSync.  */
-  if (x_display_info_for_display (dpy) != 0)
+  if (x_display_info_for_display (x_error_message->dpy) != 0)
     {
       BLOCK_INPUT;
-      XSync (dpy, False);
+      XSync (x_error_message->dpy, False);
       UNBLOCK_INPUT;
     }
 
@@ -7622,7 +7619,7 @@ x_check_errors (dpy, format)
     {
       char string[X_ERROR_MESSAGE_SIZE];
       bcopy (x_error_message->string, string, X_ERROR_MESSAGE_SIZE);
-      x_uncatch_errors (dpy);
+      x_uncatch_errors ();
       error (format, string);
     }
 }
@@ -7782,7 +7779,7 @@ x_connection_closed (dpy, error_message)
   if (dpyinfo)
     x_delete_display (dpyinfo);
 
-  x_uncatch_errors (dpy);
+  x_uncatch_errors ();
 
   if (x_display_list == 0)
     {
@@ -9525,7 +9522,7 @@ x_list_fonts (f, pattern, size, maxnames)
             }
         }
 
-      x_uncatch_errors (dpy);
+      x_uncatch_errors ();
       UNBLOCK_INPUT;
 
       if (names)
@@ -9626,7 +9623,7 @@ x_list_fonts (f, pattern, size, maxnames)
                   thisinfo = NULL;
                   x_clear_errors (dpy);
                 }
-              x_uncatch_errors (dpy);
+              x_uncatch_errors ();
               UNBLOCK_INPUT;
 
               if (thisinfo)
@@ -9829,7 +9826,7 @@ x_load_font (f, fontname, size)
         font = NULL;
         x_clear_errors (FRAME_X_DISPLAY (f));
       }
-    x_uncatch_errors (FRAME_X_DISPLAY (f));
+    x_uncatch_errors ();
     UNBLOCK_INPUT;
     if (!font)
       return NULL;
@@ -10769,7 +10766,7 @@ x_term_init (display_name, xrm_option, resource_name)
       abort ();
     if (x_had_errors_p (dpy) || !XQueryFont (dpy, font))
       XrmPutLineResource (&xrdb, "Emacs.dialog.*.font: 9x15");
-    x_uncatch_errors (dpy);
+    x_uncatch_errors ();
   }
 #endif
 #endif
diff --git a/src/xterm.h b/src/xterm.h
index b92a27979dd..ea79d91564f 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -963,7 +963,7 @@ void x_iconify_frame P_ ((struct frame *));
 void x_wm_set_size_hint P_ ((struct frame *, long, int));
 void x_catch_errors P_ ((Display *));
 int x_had_errors_p P_ ((Display *));
-void x_uncatch_errors P_ ((Display *));
+void x_uncatch_errors P_ ((void));
 void x_check_errors P_ ((Display *, char *));
 int x_text_icon P_ ((struct frame *, char *));
 int x_bitmap_icon P_ ((struct frame *, Lisp_Object));
@@ -980,7 +980,7 @@ extern int x_bitmap_icon P_ ((struct frame *, Lisp_Object));
 extern void x_catch_errors P_ ((Display *));
 extern void x_check_errors P_ ((Display *, char *));
 extern int x_had_errors_p P_ ((Display *));
-extern void x_uncatch_errors P_ ((Display *));
+extern void x_uncatch_errors P_ ((void));
 extern void x_set_window_size P_ ((struct frame *, int, int, int));
 extern void x_set_mouse_position P_ ((struct frame *, int, int));
 extern void x_set_mouse_pixel_position P_ ((struct frame *, int, int));