aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman2004-12-28 17:55:12 +0000
committerRichard M. Stallman2004-12-28 17:55:12 +0000
commit93fdf45f6514ddd7643583ed35b191d2776f1553 (patch)
tree52af075d3a5a79dd85687e08f40369247db444d0 /src
parent75ed162dcb46cf56c86d99a3d64670ea625a0314 (diff)
downloademacs-93fdf45f6514ddd7643583ed35b191d2776f1553.tar.gz
emacs-93fdf45f6514ddd7643583ed35b191d2776f1553.zip
(back_to_previous_visible_line_start):
Don't call handle_display_prop.
Diffstat (limited to 'src')
-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 @@
12004-12-28 Richard M. Stallman <rms@gnu.org>
2
3 * xdisp.c (back_to_previous_visible_line_start):
4 Don't call handle_display_prop.
5
12004-12-28 Dan Nicolaescu <dann@ics.uci.edu> 62004-12-28 Dan Nicolaescu <dann@ics.uci.edu>
2 7
3 * coding.c (decode_coding_XXX, decode_composition_emacs_mule) 8 * 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)
4598 visible_p = 0; 4598 visible_p = 0;
4599 } 4599 }
4600 4600
4601#if 0
4602 /* Commenting this out fixes the bug described in
4603 http://www.math.ku.dk/~larsh/emacs/emacs-loops-on-large-images/test-case.txt. */
4601 if (visible_p) 4604 if (visible_p)
4602 { 4605 {
4603 struct it it2 = *it; 4606 struct it it2 = *it;
@@ -4605,6 +4608,7 @@ back_to_previous_visible_line_start (it)
4605 if (handle_display_prop (&it2) == HANDLED_RETURN) 4608 if (handle_display_prop (&it2) == HANDLED_RETURN)
4606 visible_p = 0; 4609 visible_p = 0;
4607 } 4610 }
4611#endif
4608 4612
4609 /* Back one more newline if the current one is invisible. */ 4613 /* Back one more newline if the current one is invisible. */
4610 if (!visible_p) 4614 if (!visible_p)