[Emacs-diffs] /srv/bzr/emacs/trunk r106285: Fix bug #9955 with mouse-highlight that starts at beginning of window.

[Eli Zaretskii]

------------------------------------------------------------
revno: 106285
fixes bug(s): http://debbugs.gnu.org/9955
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Fri 2011-11-04 22:01:06 +0200
message:
  Fix bug #9955 with mouse-highlight that starts at beginning of window.
  
   src/xdisp.c (note_mouse_highlight): If either of
   previous/next-single-property-change returns nil, treat that as
   the beginning or the end of the buffer.
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-11-04 18:18:05 +0000
+++ b/src/ChangeLog     2011-11-04 20:01:06 +0000
@@ -1,6 +1,12 @@
+2011-11-04  Eli Zaretskii  <address@hidden>
+
+       * xdisp.c (note_mouse_highlight): If either of
+       previous/next-single-property-change returns nil, treat that as
+       the beginning or the end of the buffer.  (Bug#9955)
+
 2011-11-04  Jan Djärv  <address@hidden>
 
-       * gtkutil.c (xg_make_tool_item): Add callbacks of one of wimage or
+       * gtkutil.c (xg_make_tool_item): Add callbacks if one of wimage or
        label is not null (Bug#9951).
        (xg_tool_item_stale_p): Handle the fact that wimage and/or wlbl
        may be NULL.

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2011-11-03 22:11:40 +0000
+++ b/src/xdisp.c       2011-11-04 20:01:06 +0000
@@ -27152,8 +27152,12 @@
                    }
 
                  mouse_face_from_buffer_pos (window, hlinfo, pos,
-                                             XFASTINT (before),
-                                             XFASTINT (after),
+                                             NILP (before)
+                                             ? 1
+                                             : XFASTINT (before),
+                                             NILP (after)
+                                             ? BUF_Z (XBUFFER (buffer))
+                                             : XFASTINT (after),
                                              before_string, after_string,
                                              disp_string);
                  cursor = No_Cursor;