From 80417b95f4367986efcf91dbe3113d37fe25d981 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Dj=C3=A4rv?= Date: Sat, 6 Nov 2010 10:33:22 +0100 Subject: [PATCH] * src/nsfont.m: Include termchar for new mouse-highlight. --- lisp/emacs-lisp/cl-loaddefs.el | 2 +- src/ChangeLog | 4 ++++ src/nsfont.m | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lisp/emacs-lisp/cl-loaddefs.el b/lisp/emacs-lisp/cl-loaddefs.el index db2ae88b8b7..4bda6ceb759 100644 --- 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 09afa259f83..142cfeb57d7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2010-11-06 Jan Djärv + + * nsfont.m: Include termchar for new mouse-highlight. + 2010-11-05 Eli Zaretskii Unify mouse-highlight code for all GUI and TTY sessions. diff --git a/src/nsfont.m b/src/nsfont.m index 63b94a1b67a..b3898758869 100644 --- 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; -- 2.39.5