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 | 59ce725a3b68cbc324f01bc8dc5f9e07286431d1 (patch) | |
| tree | c17b8f002edf6892e273ff53214b1b23c880e69f /src/frame.c | |
| parent | 0664ff722152f34c2e87e9e644bbab401530b9d4 (diff) | |
| parent | bf515869577b12abd42777fb0647259920c862fc (diff) | |
| download | emacs-59ce725a3b68cbc324f01bc8dc5f9e07286431d1.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) |