[Emacs-diffs] trunk r114440: Fix last commit.

[Eli Zaretskii]

------------------------------------------------------------
revno: 114440
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/15437
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Mon 2013-09-23 12:28:57 +0300
message:
  Fix last commit.
  
   src/xdisp.c (note_mouse_highlight): Adapt calculation of last argument to
   mouse_face_from_string_pos to the previous change.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/xdisp.c                    xdisp.c-20091113204419-o5vbwnq5f7feedwu-240

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-09-23 09:18:38 +0000
+++ b/src/ChangeLog     2013-09-23 09:28:57 +0000
@@ -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.

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2013-09-23 09:18:38 +0000
+++ b/src/xdisp.c       2013-09-23 09:28:57 +0000
@@ -28267,7 +28267,7 @@
              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;