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.

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index cafe925dec0418c519e203d35464e84238d1d132..b1be1416a770cb1696bb4589018078da363cd2d8 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * macos.texi (Mac OS / GNUstep, Mac / GNUstep Basics)
+       (Mac / GNUstep Customization): Mac OS X 10.6 or later now required.
+
 2014-10-09  Glenn Morris  <rgm@gnu.org>
 
        * package.texi (Package Menu): The package list was changed to not

diff --git a/doc/emacs/macos.texi b/doc/emacs/macos.texi
index 2177ad4e21046c5132d5d886a04892f7a1da5b90..048b49cefc944f8883ba112d1a3f00c462521175 100644 (file)
--- a/doc/emacs/macos.texi
+++ b/doc/emacs/macos.texi
@@ -12,7 +12,7 @@ the GNUstep libraries on GNU/Linux or other operating systems, or on
 Mac OS X with native window system support.  On Mac OS X, Emacs can be
 built either without window system support, with X11, or with the
 Cocoa interface; this section only applies to the Cocoa build.  This
-does not support versions of Mac OS X earlier than 10.4.
+does not support versions of Mac OS X earlier than 10.6.
 
   For various historical and technical reasons, Emacs uses the term
 @samp{Nextstep} internally, instead of ``Cocoa'' or ``Mac OS X''; for
@@ -84,7 +84,7 @@ set, which often causes the subprocesses it launches to behave differently than
 they would when launched from the shell.
 
 For the PATH and MANPATH variables, a system-wide method
-of setting PATH is recommended on Mac OS X 10.5 and later, using the
+of setting PATH is recommended on Mac OS X, using the
 @file{/etc/paths} files and the @file{/etc/paths.d} directory.
 
 @node Mac / GNUstep Customization
@@ -118,7 +118,7 @@ Useful in this context is the listing of all faces obtained by
 @kbd{M-x list-faces-display}.
 
 @cindex Core Text, on Mac OS X
-In Mac OS X 10.5 and later, Emacs uses a Core Text based font backend
+In Mac OS X, Emacs uses a Core Text based font backend
 by default.  If you prefer the older font style, enter the following
 at the command-line before starting Emacs:
 

diff --git a/nextstep/ChangeLog b/nextstep/ChangeLog
index 45a2dbf427c3bbd6bb9dcdf9c29c8ffd473be690..e45326735fad94e93546350ab7e4d3fc8ee506f2 100644 (file)
--- a/nextstep/ChangeLog
+++ b/nextstep/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * README: Mac OS X 10.6 or later now required.
+
 2014-06-25  Glenn Morris  <rgm@gnu.org>
 
        * Makefile.in (${ns_appbindir}): New.

diff --git a/nextstep/README b/nextstep/README
index fdfa15ffd9d8eab98a1f8f53dfa8ae410e825c37..07f0d897e134ec3fdc32c251988edcc4bb7e5ac8 100644 (file)
--- a/nextstep/README
+++ b/nextstep/README
@@ -12,7 +12,7 @@ See the INSTALL file in this directory for compilation instructions.
 
 Requirements
 ------------
-MacOS X 10.4 or later
+Mac OS X 10.6 or later
 
 - or -
 

diff --git a/src/macfont.m b/src/macfont.m
index e2f47b3e5f1aec77ef7c45ea2b7757a19f517534..366d087f8c208f6f5bb3949918624973fa4a7f78 100644 (file)
--- a/src/macfont.m
+++ b/src/macfont.m
@@ -40,7 +40,7 @@ Original author: YAMAMOTO Mitsuharu
 
 static struct font_driver macfont_driver;
 
-/* Core Text, for Mac OS X 10.5 and later.  */
+/* Core Text, for Mac OS X.  */
 static Lisp_Object Qmac_ct;
 
 static 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,
                                   s->width, FONT_HEIGHT (s->font));
   else
     background_rect = CGRectNull;
-  
+
   text_position = CGPointMake (x, -y);
   glyphs = xmalloc (sizeof (CGGlyph) * len);
   {
@@ -2735,7 +2735,7 @@ macfont_draw (struct glyph_string *s, int from, int to, int x, int y,
 
   if (!CGRectIsNull (background_rect))
     {
-      if (s->hl == DRAW_MOUSE_FACE) 
+      if (s->hl == DRAW_MOUSE_FACE)
         {
           face = FACE_FROM_ID (s->f, MOUSE_HL_INFO (s->f)->mouse_face_face_id);
           if (!face)
@@ -2744,7 +2744,7 @@ macfont_draw (struct glyph_string *s, int from, int to, int x, int y,
       CG_SET_FILL_COLOR_WITH_FACE_BACKGROUND (context, face, f);
       CGContextFillRects (context, &background_rect, 1);
     }
-  
+
   if (macfont_info->cgfont)
     {
       CGAffineTransform atfm;

diff --git a/src/nsterm.m b/src/nsterm.m
index 19d246d526a35e09bc4c803b55edf38cfdecdd17..3ae4146dc207a8283fac645b2c6be9e2a21aa19f 100644 (file)
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -3445,7 +3445,7 @@ check_native_fs ()
 }
 #endif
 
-/* GNUstep and OSX <= 10.4 does not have cancelTracking.  */
+/* GNUstep does not have cancelTracking.  */
 #ifdef NS_IMPL_COCOA
 /* Check if menu open should be canceled or continued as normal.  */
 void
@@ -4518,7 +4518,7 @@ ns_term_shutdown (int sig)
 #define NSAppKitVersionNumber10_8 1187
 #endif
 
-  if (NSAppKitVersionNumber <= NSAppKitVersionNumber10_8) 
+  if (NSAppKitVersionNumber <= NSAppKitVersionNumber10_8)
     {
       [super run];
       return;
@@ -7065,7 +7065,7 @@ if (cols > 0 && rows > 0)
 #endif
 #endif
 
-  for (i = 0; i < nr_screens; ++i) 
+  for (i = 0; i < nr_screens; ++i)
     {
       NSScreen *s = [screens objectAtIndex: i];
       NSRect scrrect = [s frame];