diff options
author | Miles Bader <miles@gnu.org> | 2008-01-08 20:46:54 +0000 |
---|---|---|
committer | Miles Bader <miles@gnu.org> | 2008-01-08 20:46:54 +0000 |
commit | e67e170b6917d18f16d423c75a3775879125c12e (patch) | |
tree | 5b1f02ed33ed7f52f57de0e0e60b1a5dcfbcb832 /src/frame.c | |
parent | de1c4de46757b4aa564a9467a5e82695dd7e343a (diff) | |
parent | 40a5a66ed15491886722ffbe0b2a31bec6388062 (diff) | |
download | emacs-e67e170b6917d18f16d423c75a3775879125c12e.tar.gz |
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-987
Diffstat (limited to 'src/frame.c')
-rw-r--r-- | src/frame.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/frame.c b/src/frame.c index b06b541d60c..9b921624bf7 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. @@ -687,7 +687,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) |