Mercurial > emacs
comparison lib-src/emacsclient.c @ 83620:ce4352d8bee9
* 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.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Sat, 19 May 2007 23:12:46 +0000 |
| parents | a5651b79b31b |
| children | 3b1222f7b28a |
comparison
equal
deleted
inserted
replaced
| 83619:5da6a46ddbd6 | 83620:ce4352d8bee9 |
|---|---|
| 456 } | 456 } |
| 457 } | 457 } |
| 458 | 458 |
| 459 if (!tty && display) | 459 if (!tty && display) |
| 460 window_system = 1; | 460 window_system = 1; |
| 461 #ifndef WINDOWSNT | 461 #if !defined (WINDOWSNT) && !defined (HAVE_CARBON) |
| 462 else | 462 else |
| 463 tty = 1; | 463 tty = 1; |
| 464 #endif | 464 #endif |
| 465 | 465 |
| 466 /* --no-wait implies --current-frame on ttys when there are file | 466 /* --no-wait implies --current-frame on ttys when there are file |