diff options
| author | Eli Zaretskii | 2011-07-22 20:42:43 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2011-07-22 20:42:43 +0300 |
| commit | b2d0c91afda345844c6e4b647b1b0fd6faac6875 (patch) | |
| tree | 8347429550e923b3af42f5d63cbbde380d86dad0 | |
| parent | a9901f61c7bb3e602645baec7b705c44f3c87929 (diff) | |
| download | emacs-b2d0c91afda345844c6e4b647b1b0fd6faac6875.tar.gz emacs-b2d0c91afda345844c6e4b647b1b0fd6faac6875.zip | |
Fix bug #9149 with mouse highlight of empty lines.
src/xdisp.c (rows_from_pos_range): Don't ignore glyphs whose object
is an integer, which is important for empty lines.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/xdisp.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 65cd07df0ae..0b06e5bf2c0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-07-22 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * xdisp.c (rows_from_pos_range): Don't ignore glyphs whose object | ||
| 4 | is an integer, which is important for empty lines. (Bug#9149) | ||
| 5 | |||
| 1 | 2011-07-22 Chong Yidong <cyd@stupidchicken.com> | 6 | 2011-07-22 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 7 | ||
| 3 | * frame.c (Fmodify_frame_parameters): In tty case, update the | 8 | * frame.c (Fmodify_frame_parameters): In tty case, update the |
diff --git a/src/xdisp.c b/src/xdisp.c index 72a246ca0c3..905a7ecbf8f 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -25029,7 +25029,7 @@ rows_from_pos_range (struct window *w, | |||
| 25029 | 25029 | ||
| 25030 | while (g < e) | 25030 | while (g < e) |
| 25031 | { | 25031 | { |
| 25032 | if (BUFFERP (g->object) | 25032 | if ((BUFFERP (g->object) || INTEGERP (g->object)) |
| 25033 | && start_charpos <= g->charpos && g->charpos < end_charpos) | 25033 | && start_charpos <= g->charpos && g->charpos < end_charpos) |
| 25034 | *start = row; | 25034 | *start = row; |
| 25035 | g++; | 25035 | g++; |
| @@ -25079,7 +25079,7 @@ rows_from_pos_range (struct window *w, | |||
| 25079 | 25079 | ||
| 25080 | while (g < e) | 25080 | while (g < e) |
| 25081 | { | 25081 | { |
| 25082 | if (BUFFERP (g->object) | 25082 | if ((BUFFERP (g->object) || INTEGERP (g->object)) |
| 25083 | && start_charpos <= g->charpos && g->charpos < end_charpos) | 25083 | && start_charpos <= g->charpos && g->charpos < end_charpos) |
| 25084 | break; | 25084 | break; |
| 25085 | g++; | 25085 | g++; |