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

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 4-14)

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

 * gnus--rel--5.10  (base, patch 1-7)

   - tag of miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-187
   - Update from CVS
   - Merge from emacs--devo--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10  (patch 187)

   - Update from CVS

14 files changed, 268 insertions, 99 deletions

diff --git a/src/.gdbinit b/src/.gdbinit
index 6573b86f5da..7c04aae8a78 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -789,18 +789,21 @@ set args -geometry 80x40+0+0
 
 # People get bothered when they see messages about non-existent functions...
 xgetptr Vsystem_type
-set $tem = (struct Lisp_Symbol *) $ptr
-xgetptr $tem->xname
-set $tem = (struct Lisp_String *) $ptr
-set $tem = (char *) $tem->data
-
-# Don't let abort actually run, as it will make stdio stop working and
-# therefore the `pr' command above as well.
-if $tem[0] == 'w' && $tem[1] == 'i' && $tem[2] == 'n' && $tem[3] == 'd'
-  # The windows-nt build replaces abort with its own function.
-  break w32_abort
-else
-  break abort
+# $ptr is NULL in temacs
+if ($ptr != 0)
+  set $tem = (struct Lisp_Symbol *) $ptr
+  xgetptr $tem->xname
+  set $tem = (struct Lisp_String *) $ptr
+  set $tem = (char *) $tem->data
+
+  # Don't let abort actually run, as it will make stdio stop working and
+  # therefore the `pr' command above as well.
+  if $tem[0] == 'w' && $tem[1] == 'i' && $tem[2] == 'n' && $tem[3] == 'd'
+    # The windows-nt build replaces abort with its own function.
+    break w32_abort
+  else
+    break abort
+  end
 end
 
 # x_error_quitter is defined only on X.  But window-system is set up
diff --git a/src/ChangeLog b/src/ChangeLog
index 607492c5608..0a77c8fff3b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,91 @@
+2006-01-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * regex.c (IMMEDIATE_QUIT_CHECK): Use it with SYNC_INPUT as well.
+        (re_match_2_internal) <on_failure_jump, on_failure_jump_smart>:
+        Don't check for quit, since any loop will go through fail or jump.
+
+2006-01-24  Chong Yidong  <cyd@stupidchicken.com>
+
+        * alloc.c (allocate_string_data): Update next_free immediately, to
+        reduce risk of memory clobberage.
+
+2006-01-24  L$,1 q(Brentey K,Aa(Broly  <lorentey@elte.hu>
+
+        * xdisp.c (handle_invisible_prop): Set it->position to fix cursor
+        display when point moves across an ellipsis.  If there are
+        adjacent invisible texts, don't lose the second one's ellipsis.
+        (x_produce_glyphs): Doc fix.
+
+2006-01-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * xterm.c (x_catch_errors_unwind): Yet another int/Lisp_Object mixup.
+
+2006-01-23  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (handle_single_display_spec): Fix handling of space
+        property on char from string: set *position rather than
+        it->current.pos.
+        (produce_stretch_glyph): Reduce width of stretch glyphs so they
+        don't get wider than the window (unless truncate-lines is on).
+
+2006-01-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * xterm.c: Avoid allocating Lisp data from a signal handler.
+        (x_error_message): New var to replace x_error_message_string.
+        (x_error_catcher, x_catch_errors, x_catch_errors_unwind)
+        (x_check_errors, x_had_errors_p, x_clear_errors, x_error_handler)
+        (syms_of_xterm): Use it instead of x_error_message_string.
+
+        * alloc.c (lisp_align_free): Add an assertion.
+        (make_interval, allocate_string, make_float, Fcons, Fmake_symbol)
+        (allocate_misc): If ENABLE_CHECKING is on, check we're not called from
+        a signal handler.
+
+2006-01-21  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * dired.c (syms_of_dired) <completion-ignored-extensions>: Doc fix.
+
+2006-01-21  Romain Francoise  <romain@orebokech.com>
+
+        * xdisp.c (get_window_cursor_type): Fix last change.
+        Update copyright year.
+
+2006-01-20  Eli Zaretskii  <eliz@gnu.org>
+
+        * lread.c (Fload): Don't leak the file descriptor returned by
+        openp if we are going to signal an error.
+
+        * w32.c (sys_close): If FD is outside [0..MAXDESC) limits, pass it
+        directly to _close.
+        (sys_dup): Protect against new_fd larger than fd_info[] can handle.
+        (sys_read): If FD is outside [0..MAXDESC) limits, pass it directly
+        to _read.
+        (sys_write): If FD is outside [0..MAXDESC) limits, pass it
+        directly to _write.
+
+        * .gdbinit: Don't dereference Vsystem_type's Lisp_Symbol pointer
+        if it is NULL.
+
+2006-01-20  Kenichi Handa  <handa@m17n.org>
+
+        * puresize.h (BASE_PURESIZE): Increment to 1190000.
+
+2006-01-19  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xdisp.c (get_window_cursor_type): Use cursor type specified by
+        the selected buffer for the echo area too.
+
+2006-01-19  Richard M. Stallman  <rms@gnu.org>
+
+        * keymap.c (Fmap_keymap): Doc fix.
+
+        * s/irix6-5.h (GC_SETJMP_WORKS, GC_MARK_STACK): New definitions.
+
+        * keyboard.c (echo_char): Don't omit the space between first two
+        echoed chars.
+
+        * minibuf.c (read_minibuf): Fix previous change.
+
 2006-01-19  Kenichi Handa  <handa@m17n.org>
 
         * xterm.c (handle_one_xevent): Handle keysyms 0x1000000..0x10000FF.
@@ -571,7 +659,7 @@
         * w32fns.c (w32_abort) [__GNUC__]: Add instructions for attaching
         GDB to the abort dialog.
 
-2005-12-09  Kyotaro HORIGUCHI <horiguti@meadowy.org>  (tiny change)
+2005-12-09  Kyotaro HORIGUCHI  <horiguti@meadowy.org>  (tiny change)
 
         * indent.c (Fvertical_motion): Force move if starting on
         stretch glyph.
@@ -825,7 +913,7 @@
 
         * s/darwin.h (LIBS_CARBON) [!HAVE_CARBON]: Remove `-framework Carbon'.
 
-2005-11-11  David Reitter <david.reitter@gmail.com>
+2005-11-11  David Reitter  <david.reitter@gmail.com>
 
         * macterm.c (syms_of_macterm): Remove macCtrlKey, macShiftKey,
         macMetaKey, macAltKey. Introduce Qctrl, Qmeta,
@@ -857,7 +945,7 @@
         ignore_overlay_strings_at_pos_p if dpvec came from an overlay
         string, so we skip those overlay strings at current pos.
 
-2005-11-10  Lars Hansen <larsh@soem.dk>
+2005-11-10  Lars Hansen  <larsh@soem.dk>
 
         * fileio.c (file-regular-p): Doc fix.
 
@@ -968,7 +1056,7 @@
 
         * xdisp.c (display_line): Restore it->current_x and call
         extend_face_to_end_of_line when last glyph doesn't fit on line.
-        (set_glyph_string_background_width): Remove specific tests  here
+        (set_glyph_string_background_width): Remove specific tests here
         to see if face background should extend to end of line.  Simplify.
 
 2005-10-30  Richard M. Stallman  <rms@gnu.org>
@@ -1570,7 +1658,7 @@
 
         * dispextern.h (fatal): Delete prototype.
 
-        * systime.h: (make_time): Prototype moved from ...
+        * systime.h (make_time): Prototype moved from ...
         * editfns.c (make_time): ... here.
 
         * editfns.c: Move systime.h include after lisp.h.
@@ -1804,9 +1892,9 @@
         get_current_dir_name.
         (get_current_dir_name): Remove prototype.
 
-        * xsmfns.c: (get_current_dir_name): Remove prototype.
+        * xsmfns.c (get_current_dir_name): Remove prototype.
 
-        * lisp.h: (get_current_dir_name) [!HAVE_GET_CURRENT_DIR_NAME]:
+        * lisp.h (get_current_dir_name) [!HAVE_GET_CURRENT_DIR_NAME]:
         Add prototype.
 
         * sysdep.c [WINDOWSNT]: Add prototype for getwd.
@@ -2497,7 +2585,7 @@
 
         * window.c (window_scroll_pixel_based, window_scroll_line_based):
         Handle `scroll-preserve-screen-position' non-nil, non-t specially.
-        (syms_of_window): <scroll-preserve-screen-position>: Doc fix.
+        (syms_of_window) <scroll-preserve-screen-position>: Doc fix.
 
 2005-07-02  Juri Linkov  <juri@jurta.org>
 
@@ -7120,7 +7208,7 @@
 
         * config.in: Rebuild.
 
-        * Makefile.in: Run setarch i386 ./temacs if exec-shield  is present.
+        * Makefile.in: Run setarch i386 ./temacs if exec-shield is present.
 
 2004-09-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
@@ -7700,7 +7788,7 @@
 
         * buffer.c (Fswitch_to_buffer, Fpop_to_buffer): Doc fixes.
 
-        * window.c (Fwindow_buffer, Fother_window,  Fget_lru_window)
+        * window.c (Fwindow_buffer, Fother_window, Fget_lru_window)
         (Fget_largest_window, Fget_buffer_window, Fdelete_windows_on)
         (Freplace_buffer_in_windows, Fset_window_buffer)
         (Fselect-window, Fdisplay-buffer, Fsplit_window): Doc fixes.
@@ -9353,7 +9441,7 @@
         (parse_image_spec, image_spec_value, Fimage_size, Fimage_mask_p)
         (make_image, free_image, prepare_image_for_display, image_ascent)
         (four_corners_best, image_background, image_background_transparent)
-        (x_clear_image_1,  x_clear_image, x_alloc_image_color)
+        (x_clear_image_1, x_clear_image, x_alloc_image_color)
         (make_image_cache, free_image_cache, clear_image_cache)
         (Fclear_image_cache, postprocess_image, lookup_image, cache_image)
         (forall_images_in_image_cache, x_create_x_image_and_pixmap)
@@ -9391,7 +9479,7 @@
         (parse_image_spec, image_spec_value, Fimage_size, Fimage_mask_p)
         (make_image, free_image, prepare_image_for_display, image_ascent)
         (four_corners_best, image_background, image_background_transparent)
-        (x_clear_image_1,  x_clear_image, x_alloc_image_color)
+        (x_clear_image_1, x_clear_image, x_alloc_image_color)
         (make_image_cache, free_image_cache, clear_image_cache)
         (Fclear_image_cache, postprocess_image, lookup_image, cache_image)
         (forall_images_in_image_cache, x_create_x_image_and_pixmap)
@@ -9423,7 +9511,7 @@
         (parse_image_spec, image_spec_value, Fimage_size, Fimage_mask_p)
         (make_image, free_image, prepare_image_for_display, image_ascent)
         (four_corners_best, image_background, image_background_transparent)
-        (x_clear_image_1,  x_clear_image, x_alloc_image_color)
+        (x_clear_image_1, x_clear_image, x_alloc_image_color)
         (make_image_cache, free_image_cache, clear_image_cache)
         (Fclear_image_cache, postprocess_image, lookup_image, cache_image)
         (forall_images_in_image_cache, x_create_x_image_and_pixmap)
@@ -9453,7 +9541,7 @@
         (parse_image_spec, image_spec_value, Fimage_size, Fimage_mask_p)
         (make_image, free_image, prepare_image_for_display, image_ascent)
         (four_corners_best, image_background, image_background_transparent)
-        (x_clear_image_1,  x_clear_image, x_alloc_image_color)
+        (x_clear_image_1, x_clear_image, x_alloc_image_color)
         (make_image_cache, free_image_cache, clear_image_cache)
         (Fclear_image_cache, postprocess_image, lookup_image, cache_image)
         (forall_images_in_image_cache, x_create_x_image_and_pixmap)
@@ -10228,7 +10316,7 @@
         (Fx_change_window_property): Add declaration of parameters type and
         format.  Remove unused variable cons.
 
-        * xselect.c: Include stdio,h.
+        * xselect.c: Include stdio.h.
 
 2004-02-05  Kenichi Handa  <handa@m17n.org>
 
@@ -11861,7 +11949,7 @@
 
 2003-07-13  Terje Rosten  <terjeros@phys.ntnu.no>
 
-        * xterm.c (x_bitmap_icon,x_wm_set_icon_pixmap): Modify to add mask,
+        * xterm.c (x_bitmap_icon, x_wm_set_icon_pixmap): Modify to add mask,
         and use the Gtk+ function gtk_window_icon_from_file if available.
 
         * xfns.c (x_bitmap_mask, x_create_bitmap_mask): New functions to
@@ -16440,7 +16528,7 @@
 2002-09-08  Kim F. Storm  <storm@cua.dk>
 
         * macros.c (executing_macro_index): Change type to EMACS_INT.
-        (syms_of_macros): DEFVAR_INT it  (needed by kmacro).
+        (syms_of_macros): DEFVAR_INT it (needed by kmacro).
 
         * macros.h (executing_macro_index): Change type to EMACS_INT.
 
@@ -18928,10 +19016,10 @@
         Intern and staticpro QCtype and Qdatagram.
         (syms_of_process) [!subprocess]: Intern and staticpro QCtype.
 
-        * xfns.c: (QCtype): Remove duplicate declaration and
+        * xfns.c (QCtype): Remove duplicate declaration and
         initialization (is now declared in process.c).
 
-        * w32fns.c: (QCtype): Remove duplicate declaration and
+        * w32fns.c (QCtype): Remove duplicate declaration and
         initialization (is now declared in process.c).
 
 2002-03-21  Richard M. Stallman  <rms@gnu.org>
@@ -19046,7 +19134,7 @@
         Doc fix: Member kill_without_query is inverse of query-on-exit flag.
 
         * process.c (Qlocal, QCname, QCbuffer, QChost, QCservice, QCfamily)
-        (QClocal, QCremote, QCserver, QCdatagram, QCnowait, QCnoquery,QCstop)
+        (QClocal, QCremote, QCserver, QCdatagram, QCnowait, QCnoquery, QCstop)
         (QCcoding, QCoptions, QCfilter, QCsentinel, QClog, QCfeature):
         New variables.
         (NETCONN1_P): New macro.
@@ -19376,7 +19464,7 @@
 
 2002-02-28  Kim F. Storm  <storm@cua.dk>
 
-        * window.c: (minibuf_selected_window): Renamed from
+        * window.c (minibuf_selected_window): Renamed from
         Vminibuf_selected_window.  Users changed.
         (syms_of_window): Staticpro it.
 
@@ -19386,14 +19474,14 @@
         which is similar to Vminibuf_scroll_window, but which is only set
         on entry to the minibuffer (from a non-minibuffer window):
 
-        * window.c: (Vminibuf_selected_window): New variable.
+        * window.c (Vminibuf_selected_window): New variable.
         (struct save_window_data): New member minibuf_selected_window.
         (Fset_window_configuration): Restore Vminibuf_selected_window.
         (Fcurrent_window_configuration): Save Vminibuf_selected_window.
         Set minibuf_scroll_window member to nil if minibuf_level is 0.
         (compare_window_configurations): Compare minibuf_selected_window.
 
-        * window.h: (Vminibuf_selected_window): Declare extern.
+        * window.h (Vminibuf_selected_window): Declare extern.
 
         * minibuf.c (read_minibuf): Set Vminibuf_selected_window on first
         entry to minibuffer or on entry from a non-minibuffer window.
@@ -19519,7 +19607,7 @@
 
 2002-02-22  Eli Zaretskii  <eliz@is.elta.co.il>
 
-        Support for ICCCM  Extended Segments in X selections:
+        Support for ICCCM Extended Segments in X selections:
 
         * xselect.c <Qcompound_text_no_extensions>: New variable.
         (syms_of_xselect): Intern and staticpro it.
@@ -19673,7 +19761,7 @@
 
 2002-02-13  Kim F. Storm  <storm@cua.dk>
 
-        * window.c: (Vmode_line_in_non_selected_windows): Removed.
+        * window.c (Vmode_line_in_non_selected_windows): Removed.
         (mode_line_in_non_selected_windows): New variable.
         (syms_of_window): DEFVAR_BOOL it.
 
@@ -19704,7 +19792,7 @@
 
 2002-02-11  Kim F. Storm  <storm@cua.dk>
 
-        * window.c: (Vmode_line_in_non_selected_windows): New variable.
+        * window.c (Vmode_line_in_non_selected_windows): New variable.
         (syms_of_window): DEFVAR_LISP it.
 
         * dispextern.h (CURRENT_MODE_LINE_FACE_ID_3): New macro.
diff --git a/src/alloc.c b/src/alloc.c
index 1ef8f97b040..48065382480 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -1,6 +1,6 @@
 /* Storage allocation and gc for GNU Emacs Lisp interpreter.
    Copyright (C) 1985, 1986, 1988, 1993, 1994, 1995, 1997, 1998, 1999,
-      2000, 2001, 2002, 2003, 2004, 2005  Free Software Foundation, Inc.
+      2000, 2001, 2002, 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -1105,6 +1105,9 @@ lisp_align_free (block)
         }
       eassert ((aligned & 1) == aligned);
       eassert (i == (aligned ? ABLOCKS_SIZE : ABLOCKS_SIZE - 1));
+#ifdef HAVE_POSIX_MEMALIGN
+      eassert ((unsigned long)ABLOCKS_BASE (abase) % BLOCK_ALIGN == 0);
+#endif
       free (ABLOCKS_BASE (abase));
     }
   UNBLOCK_INPUT;
@@ -1419,6 +1422,8 @@ make_interval ()
 {
   INTERVAL val;
 
+  eassert (!handling_signal);
+
   if (interval_free_list)
     {
       val = interval_free_list;
@@ -1837,6 +1842,8 @@ allocate_string ()
 {
   struct Lisp_String *s;
 
+  eassert (!handling_signal);
+
   /* If the free-list is empty, allocate a new string_block, and
      add all the Lisp_Strings in it to the free-list.  */
   if (string_free_list == NULL)
@@ -1971,6 +1978,8 @@ allocate_string_data (s, nchars, nbytes)
   old_nbytes = GC_STRING_BYTES (s);
 
   data = b->next_free;
+  b->next_free = (struct sdata *) ((char *) data + needed + GC_STRING_EXTRA);
+
   data->string = s;
   s->data = SDATA_DATA (data);
 #ifdef GC_CHECK_STRING_BYTES
@@ -1983,7 +1992,6 @@ allocate_string_data (s, nchars, nbytes)
   bcopy (string_overrun_cookie, (char *) data + needed,
          GC_STRING_OVERRUN_COOKIE_SIZE);
 #endif
-  b->next_free = (struct sdata *) ((char *) data + needed + GC_STRING_EXTRA);
 
   /* If S had already data assigned, mark that as free by setting its
      string back-pointer to null, and recording the size of the data
@@ -2552,6 +2560,8 @@ make_float (float_value)
 {
   register Lisp_Object val;
 
+  eassert (!handling_signal);
+
   if (float_free_list)
     {
       /* We use the data field for chaining the free list
@@ -2671,6 +2681,8 @@ DEFUN ("cons", Fcons, Scons, 2, 2, 0,
 {
   register Lisp_Object val;
 
+  eassert (!handling_signal);
+
   if (cons_free_list)
     {
       /* We use the cdr for chaining the free list
@@ -2852,6 +2864,9 @@ allocate_vectorlike (len, type)
   UNBLOCK_INPUT;
 #endif
 
+  /* This gets triggered by code which I haven't bothered to fix.  --Stef  */
+  /* eassert (!handling_signal); */
+
   nbytes = sizeof *p + (len - 1) * sizeof p->contents[0];
   p = (struct Lisp_Vector *) lisp_malloc (nbytes, type);
 
@@ -3102,6 +3117,8 @@ Its value and function definition are void, and its property list is nil.  */)
 
   CHECK_STRING (name);
 
+  eassert (!handling_signal);
+
   if (symbol_free_list)
     {
       XSETSYMBOL (val, symbol_free_list);
@@ -3182,6 +3199,8 @@ allocate_misc ()
 {
   Lisp_Object val;
 
+  eassert (!handling_signal);
+
   if (marker_free_list)
     {
       XSETMISC (val, marker_free_list);
diff --git a/src/dired.c b/src/dired.c
index eca05cde0db..650600b278e 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -1037,11 +1037,11 @@ syms_of_dired ()
 #endif /* VMS */
 
   DEFVAR_LISP ("completion-ignored-extensions", &Vcompletion_ignored_extensions,
-               doc: /* *Completion ignores filenames ending in any string in this list.
-Directories are ignored if they match any string in this list which
-ends in a slash.
-This variable does not affect lists of possible completions,
-but does affect the commands that actually do completions.  */);
+               doc: /* Completion ignores file names ending in any string in this list.
+It does not ignore them if all possible completions end in one of
+these strings or when displaying a list of completions.
+It ignores directory names if they match any string in this list which
+ends in a slash.  */);
   Vcompletion_ignored_extensions = Qnil;
 }
 
diff --git a/src/keyboard.c b/src/keyboard.c
index 07a0deaf828..8434dbe1d7a 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -790,6 +790,8 @@ echo_char (c)
           else
             echo_string = concat2 (echo_string, build_string (" "));
         }
+      else if (STRINGP (echo_string))
+        echo_string = concat2 (echo_string, build_string (" "));
 
       current_kboard->echo_string
         = concat2 (echo_string, make_string (buffer, ptr - buffer));
@@ -820,16 +822,16 @@ echo_dash ()
   /* Do nothing if we have already put a dash at the end.  */
   if (SCHARS (current_kboard->echo_string) > 1)
     {
-          Lisp_Object last_char, prev_char, idx;
+      Lisp_Object last_char, prev_char, idx;
 
-          idx = make_number (SCHARS (current_kboard->echo_string) - 2);
-          prev_char = Faref (current_kboard->echo_string, idx);
+      idx = make_number (SCHARS (current_kboard->echo_string) - 2);
+      prev_char = Faref (current_kboard->echo_string, idx);
 
-          idx = make_number (SCHARS (current_kboard->echo_string) - 1);
-          last_char = Faref (current_kboard->echo_string, idx);
+      idx = make_number (SCHARS (current_kboard->echo_string) - 1);
+      last_char = Faref (current_kboard->echo_string, idx);
 
-          if (XINT (last_char) == '-' && XINT (prev_char) != ' ')
-            return;
+      if (XINT (last_char) == '-' && XINT (prev_char) != ' ')
+        return;
     }
 
   /* Put a dash at the end of the buffer temporarily,
diff --git a/src/keymap.c b/src/keymap.c
index 07bf957cdca..31f80a2593a 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -718,8 +718,10 @@ map_keymap_call (key, val, fun, dummy)
 }
 
 DEFUN ("map-keymap", Fmap_keymap, Smap_keymap, 2, 3, 0,
-       doc: /* Call FUNCTION for every binding in KEYMAP.
-FUNCTION is called with two arguments: the event and its binding.
+       doc: /* Call FUNCTION once for each binding in KEYMAP.
+FUNCTION is called with two arguments: the event that is bound, and
+the definition it is bound to.
+
 If KEYMAP has a parent, the parent's bindings are included as well.
 This works recursively: if the parent has itself a parent, then the
 grandparent's bindings are also included and so on.
diff --git a/src/lread.c b/src/lread.c
index 7a4437350b1..c035b529ce2 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -982,8 +982,12 @@ Return t if file exists.  */)
       if (!NILP (Fequal (found, XCAR (tem))))
         count++;
     if (count > 3)
-      Fsignal (Qerror, Fcons (build_string ("Recursive load"),
-                              Fcons (found, Vloads_in_progress)));
+      {
+        if (fd >= 0)
+          emacs_close (fd);
+        Fsignal (Qerror, Fcons (build_string ("Recursive load"),
+                                Fcons (found, Vloads_in_progress)));
+      }
     record_unwind_protect (record_load_unwind, Vloads_in_progress);
     Vloads_in_progress = Fcons (found, Vloads_in_progress);
   }
diff --git a/src/minibuf.c b/src/minibuf.c
index 9c7542ad090..79b3041c3b2 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -653,7 +653,8 @@ read_minibuf (map, initial, prompt, backup_n, expflag,
       Lisp_Object root_window = Fframe_root_window (frame);
       Lisp_Object mini_window = XWINDOW (root_window)->next;
 
-      if (! NILP (mini_window) && !NILP (Fwindow_minibuffer_p (mini_window)))
+      if (! NILP (mini_window) && ! EQ (mini_window, minibuf_window)
+          && !NILP (Fwindow_minibuffer_p (mini_window)))
         Fset_window_buffer (mini_window, empty_minibuf, Qnil);
     }
 
diff --git a/src/puresize.h b/src/puresize.h
index f82c705265b..e46ca103d7d 100644
--- a/src/puresize.h
+++ b/src/puresize.h
@@ -42,7 +42,7 @@ Boston, MA 02110-1301, USA.  */
 #endif
 
 #ifndef BASE_PURESIZE
-#define BASE_PURESIZE (1180000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA)
+#define BASE_PURESIZE (1190000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA)
 #endif
 
 /* Increase BASE_PURESIZE by a ratio depending on the machine's word size.  */
diff --git a/src/regex.c b/src/regex.c
index 412fd1d524d..3548ad3c048 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -3,7 +3,7 @@
    internationalization features.)
 
    Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-                 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+                 2002, 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -1899,8 +1899,9 @@ typedef struct
 /* The next available element.  */
 #define COMPILE_STACK_TOP (compile_stack.stack[compile_stack.avail])
 
-/* Explicit quit checking is only used on NTemacs.  */
-#if defined WINDOWSNT && defined emacs && defined QUIT
+/* Explicit quit checking is only used on NTemacs and whenever we
+   use polling to process input events.  */
+#if defined emacs && (defined WINDOWSNT || defined SYNC_INPUT) && defined QUIT
 extern int immediate_quit;
 # define IMMEDIATE_QUIT_CHECK                   \
     do {                                        \
@@ -5770,7 +5771,6 @@ re_match_2_internal (bufp, string1, size1, string2, size2, pos, regs, stop)
            the repetition text and either the following jump or
            pop_failure_jump back to this on_failure_jump.  */
         case on_failure_jump:
-          IMMEDIATE_QUIT_CHECK;
           EXTRACT_NUMBER_AND_INCR (mcnt, p);
           DEBUG_PRINT3 ("EXECUTING on_failure_jump %d (to %p):\n",
                         mcnt, p + mcnt);
@@ -5786,7 +5786,6 @@ re_match_2_internal (bufp, string1, size1, string2, size2, pos, regs, stop)
            then we can use a non-backtracking loop based on
            on_failure_keep_string_jump instead of on_failure_jump.  */
         case on_failure_jump_smart:
-          IMMEDIATE_QUIT_CHECK;
           EXTRACT_NUMBER_AND_INCR (mcnt, p);
           DEBUG_PRINT3 ("EXECUTING on_failure_jump_smart %d (to %p).\n",
                         mcnt, p + mcnt);
diff --git a/src/s/irix6-5.h b/src/s/irix6-5.h
index c1cc42a8c0e..9df3e0a2ef6 100644
--- a/src/s/irix6-5.h
+++ b/src/s/irix6-5.h
@@ -33,5 +33,9 @@
 
 #undef TIOCSIGSEND              /* defined in usg5-4.h */
 
+/* Tested on Irix 6.5.  SCM worked on earlier versions.  */
+#define GC_SETJMP_WORKS 1
+#define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
+
 /* arch-tag: d7ad9ec2-54ad-4b2f-adf2-0070c5c63e83
    (do not change this comment) */
diff --git a/src/w32.c b/src/w32.c
index 9a51233527d..9860a6cc353 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -3426,13 +3426,13 @@ sys_close (int fd)
 {
   int rc;
 
-  if (fd < 0 || fd >= MAXDESC)
+  if (fd < 0)
     {
       errno = EBADF;
       return -1;
     }
 
-  if (fd_info[fd].cp)
+  if (fd < MAXDESC && fd_info[fd].cp)
     {
       child_process * cp = fd_info[fd].cp;
 
@@ -3474,7 +3474,7 @@ sys_close (int fd)
      because socket handles are fully fledged kernel handles. */
   rc = _close (fd);
 
-  if (rc == 0)
+  if (rc == 0 && fd < MAXDESC)
     fd_info[fd].flags = 0;
 
   return rc;
@@ -3486,7 +3486,7 @@ sys_dup (int fd)
   int new_fd;
 
   new_fd = _dup (fd);
-  if (new_fd >= 0)
+  if (new_fd >= 0 && new_fd < MAXDESC)
     {
       /* duplicate our internal info as well */
       fd_info[new_fd] = fd_info[fd];
@@ -3641,13 +3641,13 @@ sys_read (int fd, char * buffer, unsigned int count)
   DWORD waiting;
   char * orig_buffer = buffer;
 
-  if (fd < 0 || fd >= MAXDESC)
+  if (fd < 0)
     {
       errno = EBADF;
       return -1;
     }
 
-  if (fd_info[fd].flags & (FILE_PIPE | FILE_SOCKET))
+  if (fd < MAXDESC && fd_info[fd].flags & (FILE_PIPE | FILE_SOCKET))
     {
       child_process *cp = fd_info[fd].cp;
 
@@ -3785,13 +3785,13 @@ sys_write (int fd, const void * buffer, unsigned int count)
 {
   int nchars;
 
-  if (fd < 0 || fd >= MAXDESC)
+  if (fd < 0)
     {
       errno = EBADF;
       return -1;
     }
 
-  if (fd_info[fd].flags & (FILE_PIPE | FILE_SOCKET))
+  if (fd < MAXDESC && fd_info[fd].flags & (FILE_PIPE | FILE_SOCKET))
     {
       if ((fd_info[fd].flags & FILE_WRITE) == 0)
         {
@@ -3833,7 +3833,7 @@ sys_write (int fd, const void * buffer, unsigned int count)
     }
 
 #ifdef HAVE_SOCKETS
-  if (fd_info[fd].flags & FILE_SOCKET)
+  if (fd < MAXDESC && fd_info[fd].flags & FILE_SOCKET)
     {
       unsigned long nblock = 0;
       if (winsock_lib == NULL) abort ();
diff --git a/src/xdisp.c b/src/xdisp.c
index 3af661108d8..8b1b6f59cf2 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1,7 +1,7 @@
 /* Display generation from window structure and buffer text.
    Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995,
                  1997, 1998, 1999, 2000, 2001, 2002, 2003,
-                 2004, 2005 Free Software Foundation, Inc.
+                 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -3617,6 +3617,11 @@ handle_invisible_prop (it)
                  skip starting with next_stop.  */
               if (invis_p)
                 IT_CHARPOS (*it) = next_stop;
+
+              /* If there are adjacent invisible texts, don't lose the
+                 second one's ellipsis. */
+              if (invis_p == 2)
+                display_ellipsis_p = 1;
             }
           while (invis_p);
 
@@ -3637,7 +3642,23 @@ handle_invisible_prop (it)
               it->stack[it->sp - 1].display_ellipsis_p = display_ellipsis_p;
             }
           else if (display_ellipsis_p)
-            setup_for_ellipsis (it, 0);
+            {
+              /* Make sure that the glyphs of the ellipsis will get
+                 correct `charpos' values.  If we would not update
+                 it->position here, the glyphs would belong to the
+                 last visible character _before_ the invisible
+                 text, which confuses `set_cursor_from_row'.
+
+                 We use the last invisible position instead of the
+                 first because this way the cursor is always drawn on
+                 the first "." of the ellipsis, whenever PT is inside
+                 the invisible text.  Otherwise the cursor would be
+                 placed _after_ the ellipsis when the point is after the
+                 first invisible character.  */
+              it->position.charpos = IT_CHARPOS (*it) - 1;
+              it->position.bytepos = CHAR_TO_BYTE (it->position.charpos);
+              setup_for_ellipsis (it, 0);
+            }
         }
     }
 
@@ -4151,7 +4172,7 @@ handle_single_display_spec (it, spec, object, position,
         {
           it->method = GET_FROM_STRETCH;
           it->object = value;
-          it->current.pos = it->position = start_pos;
+          *position = it->position = start_pos;
         }
 #ifdef HAVE_WINDOW_SYSTEM
       else
@@ -19772,6 +19793,10 @@ produce_stretch_glyph (it)
   else
     ascent = (height * FONT_BASE (font)) / FONT_HEIGHT (font);
 
+  if (width > 0 && !it->truncate_lines_p
+      && it->current_x + width > it->last_visible_x)
+    width = it->last_visible_x - it->current_x - 1;
+
   if (width > 0 && height > 0 && it->glyph_row)
     {
       Lisp_Object object = it->stack[it->sp - 1].string;
@@ -19912,8 +19937,8 @@ calc_line_height_property (it, val, font, boff, override)
 
 /* RIF:
    Produce glyphs/get display metrics for the display element IT is
-   loaded with.  See the description of struct display_iterator in
-   dispextern.h for an overview of struct display_iterator.  */
+   loaded with.  See the description of struct it in dispextern.h
+   for an overview of struct it.  */
 
 void
 x_produce_glyphs (it)
@@ -20913,8 +20938,13 @@ get_window_cursor_type (w, glyph, width, active_cursor)
     {
       if (w == XWINDOW (echo_area_window))
         {
-          *width = FRAME_CURSOR_WIDTH (f);
-          return FRAME_DESIRED_CURSOR (f);
+          if (EQ (b->cursor_type, Qt) || NILP (b->cursor_type))
+            {
+              *width = FRAME_CURSOR_WIDTH (f);
+              return FRAME_DESIRED_CURSOR (f);
+            }
+          else
+            return get_specified_cursor_type (b->cursor_type, width);
         }
 
       *active_cursor = 0;
diff --git a/src/xterm.c b/src/xterm.c
index f52ff6133fe..0d1ea7636f2 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -1,6 +1,6 @@
 /* X Communication module for terminals which understand the X protocol.
    Copyright (C) 1989, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-                 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+                 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -7438,7 +7438,12 @@ x_text_icon (f, icon_name)
 /* If non-nil, this should be a string.
    It means catch X errors  and store the error message in this string.  */
 
-static Lisp_Object x_error_message_string;
+struct x_error_message_stack {
+  char string[X_ERROR_MESSAGE_SIZE];
+  Display *dpy;
+  struct x_error_message_stack *prev;
+};
+static struct x_error_message_stack *x_error_message;
 
 /* An X error handler which stores the error message in
    x_error_message_string.  This is called from x_error_handler if
@@ -7450,7 +7455,7 @@ x_error_catcher (display, error)
      XErrorEvent *error;
 {
   XGetErrorText (display, error->error_code,
-                 SDATA (x_error_message_string),
+                 x_error_message->string,
                  X_ERROR_MESSAGE_SIZE);
 }
 
@@ -7475,16 +7480,23 @@ x_catch_errors (dpy)
      Display *dpy;
 {
   int count = SPECPDL_INDEX ();
+  struct x_error_message_stack *data = malloc (sizeof (*data));
+  Lisp_Object dummy;
+#ifdef ENABLE_CHECKING
+  dummy = make_number ((EMACS_INT)dpy + (EMACS_INT)x_error_message);
+#else
+  dummy = Qnil;
+#endif
 
   /* Make sure any errors from previous requests have been dealt with.  */
   XSync (dpy, False);
 
-  record_unwind_protect (x_catch_errors_unwind,
-                         Fcons (make_save_value (dpy, 0),
-                                x_error_message_string));
+  data->dpy = dpy;
+  data->string[0] = 0;
+  data->prev = x_error_message;
+  x_error_message = data;
 
-  x_error_message_string = make_uninit_string (X_ERROR_MESSAGE_SIZE);
-  SSET (x_error_message_string, 0, 0);
+  record_unwind_protect (x_catch_errors_unwind, dummy);
 
   return count;
 }
@@ -7492,11 +7504,11 @@ x_catch_errors (dpy)
 /* Unbind the binding that we made to check for X errors.  */
 
 static Lisp_Object
-x_catch_errors_unwind (old_val)
-     Lisp_Object old_val;
+x_catch_errors_unwind (dummy)
+     Lisp_Object dummy;
 {
-  Lisp_Object first = XCAR (old_val);
-  Display *dpy = XSAVE_VALUE (first)->pointer;
+  Display *dpy = x_error_message->dpy;
+  struct x_error_message_stack *tmp;
 
   /* The display may have been closed before this function is called.
      Check if it is still open before calling XSync.  */
@@ -7507,7 +7519,13 @@ x_catch_errors_unwind (old_val)
       UNBLOCK_INPUT;
     }
 
-  x_error_message_string = XCDR (old_val);
+  tmp = x_error_message;
+  x_error_message = x_error_message->prev;
+  free (tmp);
+
+  eassert (EQ (dummy,
+               make_number ((EMACS_INT)dpy + (EMACS_INT)x_error_message)));
+
   return Qnil;
 }
 
@@ -7523,8 +7541,8 @@ x_check_errors (dpy, format)
   /* Make sure to catch any errors incurred so far.  */
   XSync (dpy, False);
 
-  if (SREF (x_error_message_string, 0))
-    error (format, SDATA (x_error_message_string));
+  if (x_error_message->string[0])
+    error (format, x_error_message->string);
 }
 
 /* Nonzero if we had any X protocol errors
@@ -7537,7 +7555,7 @@ x_had_errors_p (dpy)
   /* Make sure to catch any errors incurred so far.  */
   XSync (dpy, False);
 
-  return SREF (x_error_message_string, 0) != 0;
+  return x_error_message->string[0] != 0;
 }
 
 /* Forget about any errors we have had, since we did x_catch_errors on DPY.  */
@@ -7546,7 +7564,7 @@ void
 x_clear_errors (dpy)
      Display *dpy;
 {
-  SSET (x_error_message_string, 0, 0);
+  x_error_message->string[0] = 0;
 }
 
 /* Stop catching X protocol errors and let them make Emacs die.
@@ -7728,7 +7746,7 @@ x_error_handler (display, error)
      Display *display;
      XErrorEvent *error;
 {
-  if (! NILP (x_error_message_string))
+  if (x_error_message)
     x_error_catcher (display, error);
   else
     x_error_quitter (display, error);
@@ -10970,8 +10988,7 @@ x_initialize ()
 void
 syms_of_xterm ()
 {
-  staticpro (&x_error_message_string);
-  x_error_message_string = Qnil;
+  x_error_message = NULL;
 
   staticpro (&x_display_name_list);
   x_display_name_list = Qnil;