summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xdisp.c4
2 files changed, 9 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 0e9d8644868..d68b775967d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-28 Richard M. Stallman <rms@gnu.org>
+
+ * xdisp.c (back_to_previous_visible_line_start):
+ Don't call handle_display_prop.
+
2004-12-28 Dan Nicolaescu <dann@ics.uci.edu>
* coding.c (decode_coding_XXX, decode_composition_emacs_mule)
diff --git a/src/xdisp.c b/src/xdisp.c
index d485dc59b57..d2f6b2234c7 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -4598,6 +4598,9 @@ back_to_previous_visible_line_start (it)
visible_p = 0;
}
+#if 0
+ /* Commenting this out fixes the bug described in
+ http://www.math.ku.dk/~larsh/emacs/emacs-loops-on-large-images/test-case.txt. */
if (visible_p)
{
struct it it2 = *it;
@@ -4605,6 +4608,7 @@ back_to_previous_visible_line_start (it)
if (handle_display_prop (&it2) == HANDLED_RETURN)
visible_p = 0;
}
+#endif
/* Back one more newline if the current one is invisible. */
if (!visible_p)