Mercurial > emacs
changeset 111414:d291fc8615a3
* src/nsfont.m: Include termchar for new mouse-highlight.
| author | Jan D. <jan.h.d@swipnet.se> |
|---|---|
| date | Sat, 06 Nov 2010 10:33:22 +0100 |
| parents | d53ee71e7e89 |
| children | c16170026954 |
| files | lisp/emacs-lisp/cl-loaddefs.el src/ChangeLog src/nsfont.m |
| diffstat | 3 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/emacs-lisp/cl-loaddefs.el Sat Nov 06 10:28:31 2010 +0200 +++ b/lisp/emacs-lisp/cl-loaddefs.el Sat Nov 06 10:33:22 2010 +0100 @@ -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" "\
--- a/src/ChangeLog Sat Nov 06 10:28:31 2010 +0200 +++ b/src/ChangeLog Sat Nov 06 10:33:22 2010 +0100 @@ -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.
--- a/src/nsfont.m Sat Nov 06 10:28:31 2010 +0200 +++ b/src/nsfont.m Sat Nov 06 10:33:22 2010 +0100 @@ -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;