diff options
| author | Eli Zaretskii | 2013-09-23 12:28:57 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2013-09-23 12:28:57 +0300 |
| commit | b519df23900222df5637cbd23eba45e4bd540856 (patch) | |
| tree | fb43239194dd24eb0bae1da14d486e673295a308 /src | |
| parent | f03eddbff64da3a9304b2c654b6f46b58f318787 (diff) | |
| download | emacs-b519df23900222df5637cbd23eba45e4bd540856.tar.gz emacs-b519df23900222df5637cbd23eba45e4bd540856.zip | |
Fix last commit.
src/xdisp.c (note_mouse_highlight): Adapt calculation of last argument to
mouse_face_from_string_pos to the previous change.
Fixes: debbugs:15437
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/xdisp.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 8483bdc6216..5592e5b164e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -3,6 +3,8 @@ | |||
| 3 | * xdisp.c (mouse_face_from_string_pos): Fix off-by-one error in | 3 | * xdisp.c (mouse_face_from_string_pos): Fix off-by-one error in |
| 4 | computing the end column of mouse-highlight that comes from | 4 | computing the end column of mouse-highlight that comes from |
| 5 | display or overlay strings. (Bug#15437) | 5 | display or overlay strings. (Bug#15437) |
| 6 | (note_mouse_highlight): Adapt calculation of last argument to | ||
| 7 | mouse_face_from_string_pos to the above change. | ||
| 6 | 8 | ||
| 7 | * conf_post.h (__has_builtin): Define to zero, if undefined, on | 9 | * conf_post.h (__has_builtin): Define to zero, if undefined, on |
| 8 | all platforms, not just for clang. | 10 | all platforms, not just for clang. |
diff --git a/src/xdisp.c b/src/xdisp.c index 0575c7b3282..a3173c8fc06 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -28267,7 +28267,7 @@ note_mouse_highlight (struct frame *f, int x, int y) | |||
| 28267 | if (NILP (s)) | 28267 | if (NILP (s)) |
| 28268 | s = make_number (0); | 28268 | s = make_number (0); |
| 28269 | if (NILP (e)) | 28269 | if (NILP (e)) |
| 28270 | e = make_number (SCHARS (object) - 1); | 28270 | e = make_number (SCHARS (object)); |
| 28271 | mouse_face_from_string_pos (w, hlinfo, object, | 28271 | mouse_face_from_string_pos (w, hlinfo, object, |
| 28272 | XINT (s), XINT (e)); | 28272 | XINT (s), XINT (e)); |
| 28273 | hlinfo->mouse_face_past_end = 0; | 28273 | hlinfo->mouse_face_past_end = 0; |