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

diff --git a/src/ChangeLog b/src/ChangeLog
index 8483bdc6216fd5cb4992cb0ee4e4ffd9ff6ced4a..5592e5b164efefc59860a1b01314b3438393d9af 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,6 +3,8 @@
        * xdisp.c (mouse_face_from_string_pos): Fix off-by-one error in
        computing the end column of mouse-highlight that comes from
        display or overlay strings.  (Bug#15437)
+       (note_mouse_highlight): Adapt calculation of last argument to
+       mouse_face_from_string_pos to the above change.
 
        * conf_post.h (__has_builtin): Define to zero, if undefined, on
        all platforms, not just for clang.

diff --git a/src/xdisp.c b/src/xdisp.c
index 0575c7b32826895e6b10a0ed71794edd12cb5d9b..a3173c8fc060903e63da879a91f7cd49b050baa7 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -28267,7 +28267,7 @@ note_mouse_highlight (struct frame *f, int x, int y)
              if (NILP (s))
                s = make_number (0);
              if (NILP (e))
-               e = make_number (SCHARS (object) - 1);
+               e = make_number (SCHARS (object));
              mouse_face_from_string_pos (w, hlinfo, object,
                                          XINT (s), XINT (e));
              hlinfo->mouse_face_past_end = 0;