diff src/frame.c @ 91327:606f2d163a64

Merge from emacs--devo--0 Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-312
author Miles Bader <miles@gnu.org>
date Wed, 09 Jan 2008 01:21:15 +0000
parents ed6fa90c5c89 107ccd98fa12
children c70e45a7acfd
line wrap: on
line diff
--- a/src/frame.c	Tue Jan 08 05:34:24 2008 +0000
+++ b/src/frame.c	Wed Jan 09 01:21:15 2008 +0000
@@ -1,6 +1,6 @@
 /* Generic frame functions.
    Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003,
-                 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+                 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -698,7 +698,7 @@
     abort ();
 #else /* not MSDOS */
 
-#if 0 /* #ifdef MAC_OS */
+#if 0 /* #ifdef MAC_OS8 */
   /* This can happen for multi-tty when using both terminal frames and
      Carbon frames. */
   if (sf->output_method != output_mac)