Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 274-284)

   - Update from CVS
   - Update etc/MORE.STUFF.
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 101)

   - Update from CVS

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

11 files changed, 142 insertions, 60 deletions

diff --git a/src/.arch-inventory b/src/.arch-inventory
index a98d4c9932f..fe99529135f 100644
--- a/src/.arch-inventory
+++ b/src/.arch-inventory
@@ -2,7 +2,7 @@
 source ^\.(gdbinit|dbxinit)$
 
 # Auto-generated files, which ignore
-precious ^(config\.stamp|config\.h|epaths\.h)$
+precious ^(config\.stamp|config\.h|epaths\.h|buildobj\.lst)$
 
 backup ^(stamp-oldxmenu|prefix-args|temacs|emacs|emacs-[0-9.]*)$
 
diff --git a/src/ChangeLog b/src/ChangeLog
index d7e8293ad27..61fca56c357 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,54 @@
+2006-05-16  Kim F. Storm  <storm@cua.dk>
+
+        * xterm.c (handle_one_xevent): Check that f is not NULL before
+        calling x_kill_gs_process.
+
+2006-05-14  Richard Stallman  <rms@gnu.org>
+
+        * textprop.c (Fnext_single_char_property_change)
+        (Fprevious_single_char_property_change): Don't allow returning
+        value beyond LIMIT in any cases.
+        (Fnext_char_property_change, Fprevious_char_property_change): Doc fix.
+
+        * intervals.c (get_local_map): Abort if POSITION outside BEGV, ZV.
+
+2006-05-14  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * xterm.c (handle_one_xevent): Check that f is not NULL before
+        calling _XEditResCheckMessages.
+
+2006-05-14  Kim F. Storm  <storm@cua.dk>
+
+        * xterm.c (handle_one_xevent): Fix crash in 2006-03-24 change.
+
+2006-05-13  Eli Zaretskii  <eliz@gnu.org>
+
+        * frame.c (x_set_border_width): Fix error message to say "frame",
+        not "window".
+
+        * Makefile.in (SOME_MACHINE_LISP): Add fringe.elc.
+
+2006-05-12  Chong Yidong  <cyd@stupidchicken.com>
+
+        * intervals.c (set_point_both): Fix mixup before before and after
+        in variable names.
+
+        * editfns.c (Fline_beginning_position): Inhibit point-motion hooks
+        while setting point temporarily.
+
+2006-05-11  Richard Stallman  <rms@gnu.org>
+
+        * lread.c (readevalloop): Abort if START non-nil for non-buffer input.
+
+2006-05-11  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (redisplay_tool_bar): Handle large tool-bar-border values.
+
+2006-05-11  Kenichi Handa  <handa@m17n.org>
+
+        * fileio.c (Finsert_file_contents): Fix for the case of IO error
+        while handling replace operation.
+
 2006-05-10  Kenichi Handa  <handa@m17n.org>
 
         * xfaces.c (realize_default_face) [HAVE_X_WINDOWS]: If the font
diff --git a/src/Makefile.in b/src/Makefile.in
index 16a85dfe191..48debcab31d 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -900,8 +900,8 @@ SOME_MACHINE_LISP = ${dotdot}/lisp/mouse.elc \
   ${dotdot}/lisp/w32-fns.elc ${dotdot}/lisp/dos-w32.elc \
   ${dotdot}/lisp/disp-table.elc ${dotdot}/lisp/dos-vars.elc \
   ${dotdot}/lisp/tooltip.elc ${dotdot}/lisp/image.elc \
-  ${dotdot}/lisp/dnd.elc ${dotdot}/lisp/mwheel.elc \
-  ${dotdot}/lisp/tool-bar.elc \
+  ${dotdot}/lisp/fringe.elc ${dotdot}/lisp/dnd.elc \
+  ${dotdot}/lisp/mwheel.elc ${dotdot}/lisp/tool-bar.elc \
   ${dotdot}/lisp/x-dnd.elc \
   ${dotdot}/lisp/international/ccl.elc \
   ${dotdot}/lisp/international/codepage.elc \
diff --git a/src/editfns.c b/src/editfns.c
index 4f8b349b749..4578af6973c 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -821,6 +821,8 @@ This function does not move point.  */)
      Lisp_Object n;
 {
   int orig, orig_byte, end;
+  int count = SPECPDL_INDEX ();
+  specbind (Qinhibit_point_motion_hooks, Qt);
 
   if (NILP (n))
     XSETFASTINT (n, 1);
@@ -834,6 +836,8 @@ This function does not move point.  */)
 
   SET_PT_BOTH (orig, orig_byte);
 
+  unbind_to (count, Qnil);
+
   /* Return END constrained to the current input field.  */
   return Fconstrain_to_field (make_number (end), make_number (orig),
                               XINT (n) != 1 ? Qt : Qnil,
diff --git a/src/fileio.c b/src/fileio.c
index 066668d107f..84b32f8dda9 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -4293,13 +4293,8 @@ actually used.  */)
          if we couldn't read the file.  */
 
       if (how_much < 0)
-        {
-          if (how_much == -1)
-            error ("IO error reading %s: %s",
-                   SDATA (orig_filename), emacs_strerror (errno));
-          else if (how_much == -2)
-            error ("maximum buffer size exceeded");
-        }
+        error ("IO error reading %s: %s",
+               SDATA (orig_filename), emacs_strerror (errno));
 
       if (unprocessed > 0)
         {
diff --git a/src/frame.c b/src/frame.c
index 3efd04bf110..371441c7cca 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -3142,7 +3142,7 @@ x_set_border_width (f, arg, oldval)
 
 #ifndef MAC_OS
   if (FRAME_X_WINDOW (f) != 0)
-    error ("Cannot change the border width of a window");
+    error ("Cannot change the border width of a frame");
 #endif /* MAC_TODO */
 
   f->border_width = XINT (arg);
diff --git a/src/intervals.c b/src/intervals.c
index 77971ace2a7..21e60c96d3f 100644
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -2196,36 +2196,38 @@ set_point_both (buffer, charpos, bytepos)
       Lisp_Object leave_after, leave_before, enter_after, enter_before;
 
       if (fromprev)
-        leave_after = textget (fromprev->plist, Qpoint_left);
+        leave_before = textget (fromprev->plist, Qpoint_left);
       else
-        leave_after = Qnil;
+        leave_before = Qnil;
+
       if (from)
-        leave_before = textget (from->plist, Qpoint_left);
+        leave_after = textget (from->plist, Qpoint_left);
       else
-        leave_before = Qnil;
+        leave_after = Qnil;
 
       if (toprev)
-        enter_after = textget (toprev->plist, Qpoint_entered);
+        enter_before = textget (toprev->plist, Qpoint_entered);
       else
-        enter_after = Qnil;
+        enter_before = Qnil;
+
       if (to)
-        enter_before = textget (to->plist, Qpoint_entered);
+        enter_after = textget (to->plist, Qpoint_entered);
       else
-        enter_before = Qnil;
+        enter_after = Qnil;
 
       if (! EQ (leave_before, enter_before) && !NILP (leave_before))
-        call2 (leave_before, make_number (old_position),
-               make_number (charpos));
+        call2 (leave_before, make_number (old_position),
+               make_number (charpos));
       if (! EQ (leave_after, enter_after) && !NILP (leave_after))
-        call2 (leave_after, make_number (old_position),
-               make_number (charpos));
+        call2 (leave_after, make_number (old_position),
+               make_number (charpos));
 
       if (! EQ (enter_before, leave_before) && !NILP (enter_before))
-        call2 (enter_before, make_number (old_position),
-               make_number (charpos));
+        call2 (enter_before, make_number (old_position),
+               make_number (charpos));
       if (! EQ (enter_after, leave_after) && !NILP (enter_after))
-        call2 (enter_after, make_number (old_position),
-               make_number (charpos));
+        call2 (enter_after, make_number (old_position),
+               make_number (charpos));
     }
 }
 
@@ -2339,7 +2341,9 @@ get_property_and_range (pos, prop, val, start, end, object)
 /* Return the proper local keymap TYPE for position POSITION in
    BUFFER; TYPE should be one of `keymap' or `local-map'.  Use the map
    specified by the PROP property, if any.  Otherwise, if TYPE is
-   `local-map' use BUFFER's local map.  */
+   `local-map' use BUFFER's local map.
+
+   POSITION must be in the accessible part of BUFFER.  */
 
 Lisp_Object
 get_local_map (position, buffer, type)
@@ -2351,7 +2355,7 @@ get_local_map (position, buffer, type)
   int old_begv, old_zv, old_begv_byte, old_zv_byte;
 
   /* Perhaps we should just change `position' to the limit.  */
-  if (position > BUF_Z (buffer) || position < BUF_BEG (buffer))
+  if (position > BUF_ZV (buffer) || position < BUF_BEGV (buffer))
     abort ();
 
   /* Ignore narrowing, so that a local map continues to be valid even if
diff --git a/src/lread.c b/src/lread.c
index e2f9d81d059..b6161ebedaa 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1534,7 +1534,9 @@ end_of_file_error ()
 /* UNIBYTE specifies how to set load_convert_to_unibyte
    for this invocation.
    READFUN, if non-nil, is used instead of `read'.
-   START, END is region in current buffer (from eval-region).  */
+
+   START, END specify region to read in current buffer (from eval-region).
+   If the input is not from a buffer, they must be nil.  */
 
 static void
 readevalloop (readcharfun, stream, sourcename, evalfun,
@@ -1570,6 +1572,10 @@ readevalloop (readcharfun, stream, sourcename, evalfun,
   else if (MARKERP (readcharfun))
     b = XMARKER (readcharfun)->buffer;
 
+  /* We assume START is nil when input is not from a buffer.  */
+  if (! NILP (start) && !b)
+    abort ();
+
   specbind (Qstandard_input, readcharfun); /* GCPROs readcharfun.  */
   specbind (Qcurrent_load_list, Qnil);
   record_unwind_protect (readevalloop_1, load_convert_to_unibyte ? Qt : Qnil);
diff --git a/src/textprop.c b/src/textprop.c
index e2f9c531735..87fa6742919 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -717,10 +717,11 @@ DEFUN ("next-char-property-change", Fnext_char_property_change,
 This scans characters forward in the current buffer from POSITION till
 it finds a change in some text property, or the beginning or end of an
 overlay, and returns the position of that.
-If none is found, the function returns (point-max).
+If none is found up to (point-max), the function returns (point-max).
 
 If the optional second argument LIMIT is non-nil, don't search
-past position LIMIT; return LIMIT if nothing is found before LIMIT.  */)
+past position LIMIT; return LIMIT if nothing is found before LIMIT.
+LIMIT is a no-op if it is greater than (point-max).  */)
      (position, limit)
      Lisp_Object position, limit;
 {
@@ -742,10 +743,11 @@ DEFUN ("previous-char-property-change", Fprevious_char_property_change,
 Scans characters backward in the current buffer from POSITION till it
 finds a change in some text property, or the beginning or end of an
 overlay, and returns the position of that.
-If none is found, the function returns (point-max).
+If none is found since (point-min), the function returns (point-min).
 
 If the optional second argument LIMIT is non-nil, don't search
-past position LIMIT; return LIMIT if nothing is found before LIMIT.  */)
+past position LIMIT; return LIMIT if nothing is found before LIMIT.
+LIMIT is a no-op if it is less than (point-min).  */)
      (position, limit)
      Lisp_Object position, limit;
 {
@@ -771,6 +773,9 @@ If the optional third argument OBJECT is a buffer (or nil, which means
 the current buffer), POSITION is a buffer position (integer or marker).
 If OBJECT is a string, POSITION is a 0-based index into it.
 
+In a string, scan runs to the end of the string.
+In a buffer, it runs to (point-max), and the value cannot exceed that.
+
 The property values are compared with `eq'.
 If the property is constant all the way to the end of OBJECT, return the
 last valid position in OBJECT.
@@ -812,22 +817,30 @@ past position LIMIT; return LIMIT if nothing is found before LIMIT.  */)
       initial_value = Fget_char_property (position, prop, object);
 
       if (NILP (limit))
-        XSETFASTINT (limit, BUF_ZV (current_buffer));
+        XSETFASTINT (limit, ZV);
       else
         CHECK_NUMBER_COERCE_MARKER (limit);
 
-      for (;;)
+      if (XFASTINT (position) >= XFASTINT (limit))
         {
-          position = Fnext_char_property_change (position, limit);
-          if (XFASTINT (position) >= XFASTINT (limit)) {
-            position = limit;
-            break;
-          }
-
-          value = Fget_char_property (position, prop, object);
-          if (!EQ (value, initial_value))
-            break;
+          position = limit;
+          if (XFASTINT (position) > ZV)
+            XSETFASTINT (position, ZV);
         }
+      else
+        while (1)
+          {
+            position = Fnext_char_property_change (position, limit);
+            if (XFASTINT (position) >= XFASTINT (limit))
+              {
+                position = limit;
+                break;
+              }
+
+            value = Fget_char_property (position, prop, object);
+            if (!EQ (value, initial_value))
+              break;
+          }
 
       unbind_to (count, Qnil);
     }
@@ -845,6 +858,9 @@ If the optional third argument OBJECT is a buffer (or nil, which means
 the current buffer), POSITION is a buffer position (integer or marker).
 If OBJECT is a string, POSITION is a 0-based index into it.
 
+In a string, scan runs to the start of the string.
+In a buffer, it runs to (point-min), and the value cannot be less than that.
+
 The property values are compared with `eq'.
 If the property is constant all the way to the start of OBJECT, return the
 first valid position in OBJECT.
@@ -883,19 +899,23 @@ back past position LIMIT; return LIMIT if nothing is found before LIMIT.  */)
       CHECK_NUMBER_COERCE_MARKER (position);
 
       if (NILP (limit))
-        XSETFASTINT (limit, BUF_BEGV (current_buffer));
+        XSETFASTINT (limit, BEGV);
       else
         CHECK_NUMBER_COERCE_MARKER (limit);
 
       if (XFASTINT (position) <= XFASTINT (limit))
-        position = limit;
+        {
+          position = limit;
+          if (XFASTINT (position) < BEGV)
+            XSETFASTINT (position, BEGV);
+        }
       else
         {
-          Lisp_Object initial_value =
-            Fget_char_property (make_number (XFASTINT (position) - 1),
-                                prop, object);
+          Lisp_Object initial_value
+            = Fget_char_property (make_number (XFASTINT (position) - 1),
+                                  prop, object);
 
-          for (;;)
+          while (1)
             {
               position = Fprevious_char_property_change (position, limit);
 
@@ -906,9 +926,9 @@ back past position LIMIT; return LIMIT if nothing is found before LIMIT.  */)
                 }
               else
                 {
-                  Lisp_Object value =
-                    Fget_char_property (make_number (XFASTINT (position) - 1),
-                                        prop, object);
+                  Lisp_Object value
+                    = Fget_char_property (make_number (XFASTINT (position) - 1),
+                                          prop, object);
 
                   if (!EQ (value, initial_value))
                     break;
diff --git a/src/xdisp.c b/src/xdisp.c
index b1404d9c593..0ee3b19d638 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -9829,7 +9829,7 @@ redisplay_tool_bar (f)
         border = 0;
 
       rows = f->n_tool_bar_rows;
-      height = (it.last_visible_y - border) / rows;
+      height = max (1, (it.last_visible_y - border) / rows);
       extra = it.last_visible_y - border - height * rows;
 
       while (it.current_y < it.last_visible_y)
diff --git a/src/xterm.c b/src/xterm.c
index b1f9e76080f..d58839db09f 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -5885,8 +5885,9 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
             == dpyinfo->Xatom_editres)
           {
             f = x_any_window_to_frame (dpyinfo, event.xclient.window);
-            _XEditResCheckMessages (f->output_data.x->widget, NULL,
-                                    &event, NULL);
+            if (f)
+              _XEditResCheckMessages (f->output_data.x->widget, NULL,
+                                      &event, NULL);
             goto done;
           }
 #endif /* HACK_EDITRES */
@@ -5902,6 +5903,8 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
                images, only, which should have 1 page.  */
             Pixmap pixmap = (Pixmap) event.xclient.data.l[1];
             f = x_window_to_frame (dpyinfo, event.xclient.window);
+            if (!f)
+              goto OTHER;
             x_kill_gs_process (pixmap, f);
             expose_frame (f, 0, 0, 0, 0);
             goto done;
@@ -5920,10 +5923,8 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
 #endif /* USE_TOOLKIT_SCROLL_BARS */
 
         f = x_any_window_to_frame (dpyinfo, event.xclient.window);
-
         if (!f)
           goto OTHER;
-
         if (x_handle_dnd_message (f, &event.xclient, dpyinfo, &inev.ie))
           *finish = X_EVENT_DROP;
       }
@@ -6166,7 +6167,8 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
       f = x_any_window_to_frame (dpyinfo, event.xkey.window);
 
       if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight)
-          && !EQ (f->tool_bar_window, dpyinfo->mouse_face_window))
+          && (f == 0
+              || !EQ (f->tool_bar_window, dpyinfo->mouse_face_window)))
         {
           clear_mouse_face (dpyinfo);
           dpyinfo->mouse_face_hidden = 1;