auto upstream

4 files changed, 34 insertions, 6 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 05d69382855..9d8540075de 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,19 @@
+2013-02-10  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (move_it_vertically_backward, move_it_by_lines): When
+        text lines are longer than window's screen lines, don't move back
+        too far.  This speeds up some redisplay operations.  (Bug#13675)
+
+2013-02-10  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * syntax.c (scan_sexps_forward): Fix byte position calculation
+        Bug#13664 (a.k.a Bug#13667) introduced with 2013-02-08 change.
+
+2013-02-10  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * fileio.c (Fexpand_file_name): Omit confusing pointer comparison
+        that was not needed.
+
 2013-02-09  Paul Eggert  <eggert@cs.ucla.edu>
 
         Minor hashing refactoring.
diff --git a/src/fileio.c b/src/fileio.c
index 1b293e3a971..ddf23867104 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1348,8 +1348,8 @@ filesystem tree, not (expand-file-name ".."  dirname).  */)
 #ifdef WINDOWSNT
             char *prev_o = o;
 #endif
-            while (o != target && (--o) && !IS_DIRECTORY_SEP (*o))
-              ;
+            while (o != target && (--o, !IS_DIRECTORY_SEP (*o)))
+              continue;
 #ifdef WINDOWSNT
             /* Don't go below server level in UNC filenames.  */
             if (o == target + 1 && IS_DIRECTORY_SEP (*o)
diff --git a/src/syntax.c b/src/syntax.c
index 42500b0cb76..390d732944d 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -3278,6 +3278,7 @@ do { prev_from = from;				\
 
  stop:   /* Here if stopping before start of sexp. */
   from = prev_from;    /* We have just fetched the char that starts it; */
+  from_byte = prev_from_byte;
   goto done; /* but return the position before it. */
 
  endquoted:
diff --git a/src/xdisp.c b/src/xdisp.c
index 83a58aee32d..5b2eb1e84c8 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -9046,6 +9046,9 @@ move_it_vertically_backward (struct it *it, int dy)
   struct it it2, it3;
   void *it2data = NULL, *it3data = NULL;
   ptrdiff_t start_pos;
+  int nchars_per_row
+    = (it->last_visible_x - it->first_visible_x) / FRAME_COLUMN_WIDTH (it->f);
+  ptrdiff_t pos_limit;
 
  move_further_back:
   eassert (dy >= 0);
@@ -9054,9 +9057,12 @@ move_it_vertically_backward (struct it *it, int dy)
 
   /* Estimate how many newlines we must move back.  */
   nlines = max (1, dy / FRAME_LINE_HEIGHT (it->f));
+  pos_limit = max (start_pos - nlines * nchars_per_row, BEGV);
 
-  /* Set the iterator's position that many lines back.  */
-  while (nlines-- && IT_CHARPOS (*it) > BEGV)
+  /* Set the iterator's position that many lines back.  But don't go
+     back more than NLINES full screen lines -- this wins a day with
+     buffers which have very long lines.  */
+  while (nlines-- && IT_CHARPOS (*it) > pos_limit)
     back_to_previous_visible_line_start (it);
 
   /* Reseat the iterator here.  When moving backward, we don't want
@@ -9287,6 +9293,9 @@ move_it_by_lines (struct it *it, ptrdiff_t dvpos)
       struct it it2;
       void *it2data = NULL;
       ptrdiff_t start_charpos, i;
+      int nchars_per_row
+        = (it->last_visible_x - it->first_visible_x) / FRAME_COLUMN_WIDTH (it->f);
+      ptrdiff_t pos_limit;
 
       /* Start at the beginning of the screen line containing IT's
          position.  This may actually move vertically backwards,
@@ -9295,9 +9304,11 @@ move_it_by_lines (struct it *it, ptrdiff_t dvpos)
       move_it_vertically_backward (it, 0);
       dvpos -= it->vpos;
 
-      /* Go back -DVPOS visible lines and reseat the iterator there.  */
+      /* Go back -DVPOS buffer lines, but no farther than -DVPOS full
+         screen lines, and reseat the iterator there.  */
       start_charpos = IT_CHARPOS (*it);
-      for (i = -dvpos; i > 0 && IT_CHARPOS (*it) > BEGV; --i)
+      pos_limit = max (start_charpos + dvpos * nchars_per_row, BEGV);
+      for (i = -dvpos; i > 0 && IT_CHARPOS (*it) > pos_limit; --i)
         back_to_previous_visible_line_start (it);
       reseat (it, it->current.pos, 1);