* src/nsfont.m: Include termchar for new mouse-highlight.

diff --git a/lisp/emacs-lisp/cl-loaddefs.el b/lisp/emacs-lisp/cl-loaddefs.el
index db2ae88b8b73abf22a39f2712c4a1da07b77f0e4..4bda6ceb759c7943f07fbefca4dc4a891ff34cd1 100644 (file)
--- a/lisp/emacs-lisp/cl-loaddefs.el
+++ b/lisp/emacs-lisp/cl-loaddefs.el
@@ -282,7 +282,7 @@ Not documented
 ;;;;;;  do-all-symbols do-symbols dotimes dolist do* do loop return-from
 ;;;;;;  return block etypecase typecase ecase case load-time-value
 ;;;;;;  eval-when destructuring-bind function* defmacro* defun* gentemp
-;;;;;;  gensym) "cl-macs" "cl-macs.el" "c10b5cbebb5267291ef15c782c0271a6")
+;;;;;;  gensym) "cl-macs" "cl-macs.el" "82f8370745a60dc26536a0237cba893f")
 ;;; Generated autoloads from cl-macs.el
 
 (autoload 'gensym "cl-macs" "\

diff --git a/src/ChangeLog b/src/ChangeLog
index 09afa259f8313e29a45e563970a4e0be8da33db2..142cfeb57d7da8942b2b81507308cba9c1ea6652 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2010-11-06  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * nsfont.m: Include termchar for new mouse-highlight.
+
 2010-11-05  Eli Zaretskii  <eliz@gnu.org>
 
        Unify mouse-highlight code for all GUI and TTY sessions.

diff --git a/src/nsfont.m b/src/nsfont.m
index 63b94a1b67adfcc3ccae9c31ab8dd5ab6d0616bf..b38987588694c4847b36be00fb151faaab45a536 100644 (file)
--- a/src/nsfont.m
+++ b/src/nsfont.m
@@ -37,6 +37,7 @@ Author: Adrian Robert (arobert@cogsci.ucsd.edu)
 #include "frame.h"
 #include "character.h"
 #include "font.h"
+#include "termchar.h"
 
 /* TODO: Drop once we can assume gnustep-gui 0.17.1. */
 #ifdef NS_IMPL_GNUSTEP
@@ -1040,8 +1041,7 @@ nsfont_draw (struct glyph_string *s, int from, int to, int x, int y,
       face = s->face;
       break;
     case NS_DUMPGLYPH_MOUSEFACE:
-      face = FACE_FROM_ID (s->f,
-                           FRAME_NS_DISPLAY_INFO (s->f)->mouse_face_face_id);
+      face = FACE_FROM_ID (s->f, MOUSE_HL_INFO (s->f)->mouse_face_face_id);
       if (!face)
         face = FACE_FROM_ID (s->f, MOUSE_FACE_ID);
       break;