3 files changed, 40 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 3e6094bbca0..282d422beb1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2004-07-28  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * eval.c (Fdefvar, Fdefconst): Doc fixes.
+
+2004-07-27  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (move_it_in_display_line_to): Check BUFFER_POS_REACHED_P after
+        we have ensured that the glyph fits on the current line (or returned
+        MOVE_LINE_CONTINUED otherwise).
+
 2004-07-26  Kim F. Storm  <storm@cua.dk>
 
         * xdisp.c (move_it_in_display_line_to): If overflow-newline-into-fringe
diff --git a/src/eval.c b/src/eval.c
index f28105ac987..ee74215b2ee 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -742,6 +742,13 @@ If DOCSTRING starts with *, this variable is identified as a user option.
  This means that M-x set-variable recognizes it.
  See also `user-variable-p'.
 If INITVALUE is missing, SYMBOL's value is not set.
+
+If SYMBOL has a local binding, then this form affects the local
+binding.  This is usually not what you want.  Thus, if you need to
+load a file defining variables, with this form or with `defconst' or
+`defcustom', you should always load that file _outside_ any bindings
+for these variables.  \(`defconst' and `defcustom' behave similarly in
+this respect.)
 usage: (defvar SYMBOL &optional INITVALUE DOCSTRING)  */)
      (args)
      Lisp_Object args;
@@ -784,6 +791,10 @@ Always sets the value of SYMBOL to the result of evalling INITVALUE.
 If SYMBOL is buffer-local, its default value is what is set;
  buffer-local values are not affected.
 DOCSTRING is optional.
+
+If SYMBOL has a local binding, then this form sets the local binding's
+value.  However, you should normally not make local bindings for
+variables defined with this form.
 usage: (defconst SYMBOL INITVALUE [DOCSTRING])  */)
      (args)
      Lisp_Object args;
diff --git a/src/xdisp.c b/src/xdisp.c
index 818e2c1a48a..70854b7d269 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -5645,9 +5645,13 @@ move_it_in_display_line_to (it, to_charpos, to_x, op)
     {
       int x, i, ascent = 0, descent = 0;
 
-      /* Stop when ZV or TO_CHARPOS reached.  */
+      /* Stop when ZV reached.
+         We used to stop here when TO_CHARPOS reached as well, but that is
+         too soon if this glyph does not fit on this line.  So we handle it
+         explicitly below.  */
       if (!get_next_display_element (it)
-          || BUFFER_POS_REACHED_P ())
+          || (it->truncate_lines_p
+              && BUFFER_POS_REACHED_P ()))
         {
           result = MOVE_POS_MATCH_OR_ZV;
           break;
@@ -5707,6 +5711,8 @@ move_it_in_display_line_to (it, to_charpos, to_x, op)
               /* We want to leave anything reaching TO_X to the caller.  */
               if ((op & MOVE_TO_X) && new_x > to_x)
                 {
+                  if (BUFFER_POS_REACHED_P ())
+                    goto buffer_pos_reached;
                   it->current_x = x;
                   result = MOVE_X_REACHED;
                   break;
@@ -5768,6 +5774,8 @@ move_it_in_display_line_to (it, to_charpos, to_x, op)
                   result = MOVE_LINE_CONTINUED;
                   break;
                 }
+              else if (BUFFER_POS_REACHED_P ())
+                goto buffer_pos_reached;
               else if (new_x > it->first_visible_x)
                 {
                   /* Glyph is visible.  Increment number of glyphs that
@@ -5784,6 +5792,15 @@ move_it_in_display_line_to (it, to_charpos, to_x, op)
           if (result != MOVE_UNDEFINED)
             break;
         }
+      else if (BUFFER_POS_REACHED_P ())
+        {
+        buffer_pos_reached:
+          it->current_x = x;
+          it->max_ascent = ascent;
+          it->max_descent = descent;
+          result = MOVE_POS_MATCH_OR_ZV;
+          break;
+        }
       else if ((op & MOVE_TO_X) && it->current_x >= to_x)
         {
           /* Stop when TO_X specified and reached.  This check is