aboutsummaryrefslogtreecommitdiffstats
path: root/src/frame.c
diff options
context:
space:
mode:
authorMiles Bader <[email protected]>2008-01-09 01:21:15 +0000
committerMiles Bader <[email protected]>2008-01-09 01:21:15 +0000
commit430d2ee2919b2d4693780f2474ba40148442d206 (patch)
treeea4b697cc7403cfffa9f4dcad08c61345a1d31b0 /src/frame.c
parentbcab78b72bd640d41c7b4268e05e9f3f9e2c69c1 (diff)
parent59ce725a3b68cbc324f01bc8dc5f9e07286431d1 (diff)
Merge from emacs--devo--0
Revision: [email protected]/emacs--unicode--0--patch-312
Diffstat (limited to 'src/frame.c')
-rw-r--r--src/frame.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/frame.c b/src/frame.c
index c576214254..0a3a910934 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -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 @@ affects all frames on the same terminal device. */)
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)