[Emacs-diffs] /srv/bzr/emacs/trunk r102262: * src/nsfont.m: Include termchar for new mouse-highlight.

[Jan D.]

------------------------------------------------------------
revno: 102262
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sat 2010-11-06 10:33:22 +0100
message:
  * src/nsfont.m: Include termchar for new mouse-highlight.
modified:
  lisp/emacs-lisp/cl-loaddefs.el
  src/ChangeLog
  src/nsfont.m

=== modified file 'lisp/emacs-lisp/cl-loaddefs.el'
--- a/lisp/emacs-lisp/cl-loaddefs.el    2010-09-04 19:44:39 +0000
+++ b/lisp/emacs-lisp/cl-loaddefs.el    2010-11-06 09:33:22 +0000
@@ -282,7 +282,7 @@
 ;;;;;;  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" "\

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-11-06 08:28:31 +0000
+++ b/src/ChangeLog     2010-11-06 09:33:22 +0000
@@ -1,3 +1,7 @@
+2010-11-06  Jan Djärv  <address@hidden>
+
+       * nsfont.m: Include termchar for new mouse-highlight.
+
 2010-11-05  Eli Zaretskii  <address@hidden>
 
        Unify mouse-highlight code for all GUI and TTY sessions.

=== modified file 'src/nsfont.m'
--- a/src/nsfont.m      2010-11-04 18:10:50 +0000
+++ b/src/nsfont.m      2010-11-06 09:33:22 +0000
@@ -37,6 +37,7 @@
 #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 @@
       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;