Mercurial > emacs

comparison src/nsfont.m @ 111414:d291fc8615a3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* 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 4afa0b625189
children 417b1e4d63cd
comparison
equal deleted inserted replaced
111413:d53ee71e7e89 111414:d291fc8615a3
35 #include "fontset.h" 35 #include "fontset.h"
36 #include "nsterm.h" 36 #include "nsterm.h"
37 #include "frame.h" 37 #include "frame.h"
38 #include "character.h" 38 #include "character.h"
39 #include "font.h" 39 #include "font.h"
40 #include "termchar.h"
40 41
41 /* TODO: Drop once we can assume gnustep-gui 0.17.1. */ 42 /* TODO: Drop once we can assume gnustep-gui 0.17.1. */
42 #ifdef NS_IMPL_GNUSTEP 43 #ifdef NS_IMPL_GNUSTEP
43 #import <AppKit/NSFontDescriptor.h> 44 #import <AppKit/NSFontDescriptor.h>
44 #endif 45 #endif
1038 { 1039 {
1039 case NS_DUMPGLYPH_CURSOR: 1040 case NS_DUMPGLYPH_CURSOR:
1040 face = s->face; 1041 face = s->face;
1041 break; 1042 break;
1042 case NS_DUMPGLYPH_MOUSEFACE: 1043 case NS_DUMPGLYPH_MOUSEFACE:
1043 face = FACE_FROM_ID (s->f, 1044 face = FACE_FROM_ID (s->f, MOUSE_HL_INFO (s->f)->mouse_face_face_id);
1044 FRAME_NS_DISPLAY_INFO (s->f)->mouse_face_face_id);
1045 if (!face) 1045 if (!face)
1046 face = FACE_FROM_ID (s->f, MOUSE_FACE_ID); 1046 face = FACE_FROM_ID (s->f, MOUSE_FACE_ID);
1047 break; 1047 break;
1048 default: 1048 default:
1049 face = s->face; 1049 face = s->face;