aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2012-01-12 13:33:25 -0800
committerPaul Eggert2012-01-12 13:33:25 -0800
commit5944709e7724ac3a685596944c71c27caeea7e22 (patch)
tree2939522b5969af6fc89c7599ccb2678eabcd657e
parente7a8cb8f8212d717147d561a78f6322e951b14e3 (diff)
downloademacs-5944709e7724ac3a685596944c71c27caeea7e22.tar.gz
emacs-5944709e7724ac3a685596944c71c27caeea7e22.zip
* xdisp.c (rows_from_pos_range): Add parens as per gcc -Wparentheses.
-rw-r--r--src/ChangeLog4
-rw-r--r--src/xdisp.c6
2 files changed, 7 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 4fbfa52df3a..28910c5a556 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12012-01-12 Paul Eggert <eggert@cs.ucla.edu>
2
3 * xdisp.c (rows_from_pos_range): Add parens as per gcc -Wparentheses.
4
12012-01-11 Eli Zaretskii <eliz@gnu.org> 52012-01-11 Eli Zaretskii <eliz@gnu.org>
2 6
3 * xdisp.c (rows_from_pos_range): Handle the case where the 7 * xdisp.c (rows_from_pos_range): Handle the case where the
diff --git a/src/xdisp.c b/src/xdisp.c
index dc046886039..c90184f4a4c 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -25932,14 +25932,14 @@ rows_from_pos_range (struct window *w,
25932 while (g < e) 25932 while (g < e)
25933 { 25933 {
25934 if (((BUFFERP (g->object) || INTEGERP (g->object)) 25934 if (((BUFFERP (g->object) || INTEGERP (g->object))
25935 && (start_charpos <= g->charpos && g->charpos < end_charpos 25935 && ((start_charpos <= g->charpos && g->charpos < end_charpos)
25936 /* If the buffer position of the first glyph in 25936 /* If the buffer position of the first glyph in
25937 the row is equal to END_CHARPOS, it means 25937 the row is equal to END_CHARPOS, it means
25938 the last character to be highlighted is the 25938 the last character to be highlighted is the
25939 newline of ROW, and we must consider NEXT as 25939 newline of ROW, and we must consider NEXT as
25940 END, not END+1. */ 25940 END, not END+1. */
25941 || ((!next->reversed_p && g == s 25941 || (((!next->reversed_p && g == s)
25942 || next->reversed_p && g == e - 1) 25942 || (next->reversed_p && g == e - 1))
25943 && (g->charpos == end_charpos 25943 && (g->charpos == end_charpos
25944 /* Special case for when NEXT is an 25944 /* Special case for when NEXT is an
25945 empty line at ZV. */ 25945 empty line at ZV. */