4 files changed, 35 insertions, 8 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 09a3ba2d825..bc76f96208a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2005-09-03  Richard M. Stallman  <rms@gnu.org>
+
+        * xdisp.c (redisplay_internal): Make UPDATED as long as needed.
+        (move_it_in_display_line_to): Stop after last char on line even
+        on a windowing terminal, if that's the specified stop position.
+
+        * fns.c (Fsort): Doc fix.
+
+        * editfns.c (Fpropertize): Don't insist that properties be symbols.
+
 2005-09-01  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * dispnew.c (window_to_frame_hpos, update_window):
diff --git a/src/editfns.c b/src/editfns.c
index da4533d2537..a05d2396448 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -3260,10 +3260,7 @@ usage: (propertize STRING &rest PROPERTIES)  */)
   string = Fcopy_sequence (args[0]);
 
   for (i = 1; i < nargs; i += 2)
-    {
-      CHECK_SYMBOL (args[i]);
-      properties = Fcons (args[i], Fcons (args[i + 1], properties));
-    }
+    properties = Fcons (args[i], Fcons (args[i + 1], properties));
 
   Fadd_text_properties (make_number (0),
                         make_number (SCHARS (string)),
diff --git a/src/fns.c b/src/fns.c
index 1e26ec9a392..3c23aef282e 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -1894,7 +1894,7 @@ DEFUN ("sort", Fsort, Ssort, 2, 2, 0,
        doc: /* Sort LIST, stably, comparing elements using PREDICATE.
 Returns the sorted list.  LIST is modified by side effects.
 PREDICATE is called with two elements of LIST, and should return non-nil
-if the first element is "less" than the second.  */)
+if the first element should sort before the second.  */)
      (list, predicate)
      Lisp_Object list, predicate;
 {
diff --git a/src/xdisp.c b/src/xdisp.c
index a32cb70f436..b887c8d702c 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -5999,6 +5999,8 @@ move_it_in_display_line_to (it, to_charpos, to_x, op)
              glyphs have the same width.  */
           int single_glyph_width = it->pixel_width / it->nglyphs;
           int new_x;
+          int x_before_this_char = x;
+          int hpos_before_this_char = it->hpos;
 
           for (i = 0; i < it->nglyphs; ++i, x = new_x)
             {
@@ -6030,8 +6032,22 @@ move_it_in_display_line_to (it, to_charpos, to_x, op)
                     {
                       ++it->hpos;
                       it->current_x = new_x;
+
+                      /* The character's last glyph just barely fits
+                         in this row.  */
                       if (i == it->nglyphs - 1)
                         {
+                          /* If this is the destination position,
+                             return a position *before* it in this row,
+                             now that we know it fits in this row.  */
+                          if (BUFFER_POS_REACHED_P ())
+                            {
+                              it->hpos = hpos_before_this_char;
+                              it->current_x = x_before_this_char;
+                              result = MOVE_POS_MATCH_OR_ZV;
+                              break;
+                            }
+
                           set_iterator_to_next (it, 1);
 #ifdef HAVE_WINDOW_SYSTEM
                           if (IT_OVERFLOW_NEWLINE_INTO_FRINGE (it))
@@ -10600,9 +10616,13 @@ redisplay_internal (preserve_echo_area)
   if (consider_all_windows_p)
     {
       Lisp_Object tail, frame;
-      int i, n = 0, size = 50;
-      struct frame **updated
-        = (struct frame **) alloca (size * sizeof *updated);
+      int i, n = 0, size = 5;
+      struct frame **updated;
+
+      FOR_EACH_FRAME (tail, frame)
+        size++;
+
+      updated = (struct frame **) alloca (size * sizeof *updated);
 
       /* Recompute # windows showing selected buffer.  This will be
          incremented each time such a window is displayed.  */