From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 23 Sep 2013 09:28:57 +0000 (+0300)
Subject: Fix last commit.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1469
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b519df23900222df5637cbd23eba45e4bd540856;p=emacs.git

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 8483bdc6216..5592e5b164e 100644
--- 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 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)
 	      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;