[Emacs-diffs] /srv/bzr/emacs/trunk r112870: Improve the fix for bug #14558.

[Eli Zaretskii]

------------------------------------------------------------
revno: 112870
fixes bug: http://debbugs.gnu.org/14558
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Thu 2013-06-06 19:35:31 +0300
message:
  Improve the fix for bug #14558.
  
   src/xdisp.c (note_mouse_highlight): When mouse-highlight is off,
   still need to set the mouse pointer shape and activate help-echo.
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-06-06 07:04:35 +0000
+++ b/src/ChangeLog     2013-06-06 16:35:31 +0000
@@ -1,3 +1,9 @@
+2013-06-06  Eli Zaretskii  <address@hidden>
+
+       * xdisp.c (note_mouse_highlight): When mouse-highlight is off,
+       still need to set the mouse pointer shape and activate help-echo.
+       (Bug#14558)
+
 2013-06-06  Paul Eggert  <address@hidden>
 
        A few porting etc. fixes for the new file monitor code.

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2013-06-05 20:45:34 +0000
+++ b/src/xdisp.c       2013-06-06 16:35:31 +0000
@@ -27554,8 +27554,10 @@
 
 /* EXPORT:
    Take proper action when the mouse has moved to position X, Y on
-   frame F as regards highlighting characters that have mouse-face
-   properties.  Also de-highlighting chars where the mouse was before.
+   frame F with regards to highlighting portions of display that have
+   mouse-face properties.  Also de-highlight portions of display where
+   the mouse was before, set the mouse pointer shape as appropriate
+   for the mouse coordinates, and activate help echo (tooltips).
    X and Y can be negative or out of range.  */
 
 void
@@ -27665,8 +27667,7 @@
 
 #ifdef HAVE_WINDOW_SYSTEM
       /* Look for :pointer property on image.  */
-      if (!NILP (Vmouse_highlight)
-         && glyph != NULL && glyph->type == IMAGE_GLYPH)
+      if (glyph != NULL && glyph->type == IMAGE_GLYPH)
        {
          struct image *img = IMAGE_FROM_ID (f, glyph->u.img_id);
          if (img != NULL && IMAGEP (img->spec))
@@ -27709,8 +27710,7 @@
 #endif /* HAVE_WINDOW_SYSTEM */
 
       /* Clear mouse face if X/Y not over text.  */
-      if (NILP (Vmouse_highlight)
-         || glyph == NULL
+      if (glyph == NULL
          || area != TEXT_AREA
          || !MATRIX_ROW_DISPLAYS_TEXT_P (MATRIX_ROW (w->current_matrix, vpos))
          /* Glyph's OBJECT is an integer for glyphs inserted by the
@@ -27773,6 +27773,12 @@
       else
        noverlays = 0;
 
+      if (NILP (Vmouse_highlight))
+       {
+         clear_mouse_face (hlinfo);
+         goto check_help_echo;
+       }
+
       same_region = coords_in_mouse_face_p (w, hpos, vpos);
 
       if (same_region)