aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2014-10-12 07:56:58 -0700
committerPaul Eggert2014-10-12 07:56:58 -0700
commitb73d3f58344e01f44d11f4305e19af0e29f97796 (patch)
tree3d2a9080cd414b761c1711596ddf172d3bf98b14 /src
parent9a265587d2f8ee034b8d00c4bcde070367fb0ad1 (diff)
downloademacs-b73d3f58344e01f44d11f4305e19af0e29f97796.tar.gz
emacs-b73d3f58344e01f44d11f4305e19af0e29f97796.zip
Update doc to say Mac OS X 10.6 or later now required.
* doc/emacs/macos.texi (Mac OS / GNUstep, Mac / GNUstep Basics) (Mac / GNUstep Customization): * nextstep/README: Mac OS X 10.6 or later now required.
Diffstat (limited to 'src')
-rw-r--r--src/macfont.m8
-rw-r--r--src/nsterm.m6
2 files changed, 7 insertions, 7 deletions
diff --git a/src/macfont.m b/src/macfont.m
index e2f47b3e5f1..366d087f8c2 100644
--- a/src/macfont.m
+++ b/src/macfont.m
@@ -40,7 +40,7 @@ Original author: YAMAMOTO Mitsuharu
40 40
41static struct font_driver macfont_driver; 41static struct font_driver macfont_driver;
42 42
43/* Core Text, for Mac OS X 10.5 and later. */ 43/* Core Text, for Mac OS X. */
44static Lisp_Object Qmac_ct; 44static Lisp_Object Qmac_ct;
45 45
46static double mac_ctfont_get_advance_width_for_glyph (CTFontRef, CGGlyph); 46static double mac_ctfont_get_advance_width_for_glyph (CTFontRef, CGGlyph);
@@ -2706,7 +2706,7 @@ macfont_draw (struct glyph_string *s, int from, int to, int x, int y,
2706 s->width, FONT_HEIGHT (s->font)); 2706 s->width, FONT_HEIGHT (s->font));
2707 else 2707 else
2708 background_rect = CGRectNull; 2708 background_rect = CGRectNull;
2709 2709
2710 text_position = CGPointMake (x, -y); 2710 text_position = CGPointMake (x, -y);
2711 glyphs = xmalloc (sizeof (CGGlyph) * len); 2711 glyphs = xmalloc (sizeof (CGGlyph) * len);
2712 { 2712 {
@@ -2735,7 +2735,7 @@ macfont_draw (struct glyph_string *s, int from, int to, int x, int y,
2735 2735
2736 if (!CGRectIsNull (background_rect)) 2736 if (!CGRectIsNull (background_rect))
2737 { 2737 {
2738 if (s->hl == DRAW_MOUSE_FACE) 2738 if (s->hl == DRAW_MOUSE_FACE)
2739 { 2739 {
2740 face = FACE_FROM_ID (s->f, MOUSE_HL_INFO (s->f)->mouse_face_face_id); 2740 face = FACE_FROM_ID (s->f, MOUSE_HL_INFO (s->f)->mouse_face_face_id);
2741 if (!face) 2741 if (!face)
@@ -2744,7 +2744,7 @@ macfont_draw (struct glyph_string *s, int from, int to, int x, int y,
2744 CG_SET_FILL_COLOR_WITH_FACE_BACKGROUND (context, face, f); 2744 CG_SET_FILL_COLOR_WITH_FACE_BACKGROUND (context, face, f);
2745 CGContextFillRects (context, &background_rect, 1); 2745 CGContextFillRects (context, &background_rect, 1);
2746 } 2746 }
2747 2747
2748 if (macfont_info->cgfont) 2748 if (macfont_info->cgfont)
2749 { 2749 {
2750 CGAffineTransform atfm; 2750 CGAffineTransform atfm;
diff --git a/src/nsterm.m b/src/nsterm.m
index 19d246d526a..3ae4146dc20 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -3445,7 +3445,7 @@ check_native_fs ()
3445} 3445}
3446#endif 3446#endif
3447 3447
3448/* GNUstep and OSX <= 10.4 does not have cancelTracking. */ 3448/* GNUstep does not have cancelTracking. */
3449#ifdef NS_IMPL_COCOA 3449#ifdef NS_IMPL_COCOA
3450/* Check if menu open should be canceled or continued as normal. */ 3450/* Check if menu open should be canceled or continued as normal. */
3451void 3451void
@@ -4518,7 +4518,7 @@ ns_term_shutdown (int sig)
4518#define NSAppKitVersionNumber10_8 1187 4518#define NSAppKitVersionNumber10_8 1187
4519#endif 4519#endif
4520 4520
4521 if (NSAppKitVersionNumber <= NSAppKitVersionNumber10_8) 4521 if (NSAppKitVersionNumber <= NSAppKitVersionNumber10_8)
4522 { 4522 {
4523 [super run]; 4523 [super run];
4524 return; 4524 return;
@@ -7065,7 +7065,7 @@ if (cols > 0 && rows > 0)
7065#endif 7065#endif
7066#endif 7066#endif
7067 7067
7068 for (i = 0; i < nr_screens; ++i) 7068 for (i = 0; i < nr_screens; ++i)
7069 { 7069 {
7070 NSScreen *s = [screens objectAtIndex: i]; 7070 NSScreen *s = [screens objectAtIndex: i];
7071 NSRect scrrect = [s frame]; 7071 NSRect scrrect = [s frame];