* loadup.el: Load mac-win on a Mac. Avoid loading both x-win and
mac-win. * term/mac-win.el: (mac-initialize-window-system): New function. Move global setup here. * s/darwin.h (SYSTEM_PURESIZE_EXTRA): Define here. (SYSTEM_PURESIZE_EXTRA): Only define on Carbon. * emacsclient.c (decode_options): Don't use a tty on mac carbon.
This commit is contained in:
parent
80ca7302d8
commit
caf49fb043
9 changed files with 105 additions and 93 deletions
|
@ -458,7 +458,7 @@ decode_options (argc, argv)
|
|||
|
||||
if (!tty && display)
|
||||
window_system = 1;
|
||||
#ifndef WINDOWSNT
|
||||
#if !defined (WINDOWSNT) && !defined (HAVE_CARBON)
|
||||
else
|
||||
tty = 1;
|
||||
#endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue