diff options
| author | Adrian Robert | 2009-02-01 16:32:26 +0000 |
|---|---|---|
| committer | Adrian Robert | 2009-02-01 16:32:26 +0000 |
| commit | 8ad093db016b77a82e7cf7a78e52e812b82442ff (patch) | |
| tree | 17917ba71544e4776c0fb6b02361d8771a212301 /src/blockinput.h | |
| parent | 8d5b8982069c803ab1546d290fe28332612bfc9e (diff) | |
| download | emacs-8ad093db016b77a82e7cf7a78e52e812b82442ff.tar.gz emacs-8ad093db016b77a82e7cf7a78e52e812b82442ff.zip | |
* nsterm.m (ns_read_socket): Copy 2009-01-29 and 2009-01-30
XT,w32read_socket changes to ns_read_socket.
* keyboard.c (handle_interrupt): Don't call
quit_throw_to_read_char() under NS.
* blockinput.h: Remove NS-specific code.
Diffstat (limited to 'src/blockinput.h')
| -rw-r--r-- | src/blockinput.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/blockinput.h b/src/blockinput.h index 2eed268f8e5..4b1270110d6 100644 --- a/src/blockinput.h +++ b/src/blockinput.h | |||
| @@ -59,15 +59,6 @@ extern int interrupt_input_pending; | |||
| 59 | 59 | ||
| 60 | extern int pending_atimers; | 60 | extern int pending_atimers; |
| 61 | 61 | ||
| 62 | #if defined (HAVE_NS) && !defined (COCOA_EXPERIMENTAL_CTRL_G) | ||
| 63 | /* NS does not use interrupt-driven input processing (yet), so this is | ||
| 64 | unneeded and moreover was causing problems. */ | ||
| 65 | #define BLOCK_INPUT | ||
| 66 | #define UNBLOCK_INPUT | ||
| 67 | #define TOTALLY_UNBLOCK_INPUT | ||
| 68 | #define UNBLOCK_INPUT_TO(LEVEL) | ||
| 69 | |||
| 70 | #else | ||
| 71 | 62 | ||
| 72 | /* Begin critical section. */ | 63 | /* Begin critical section. */ |
| 73 | #define BLOCK_INPUT (interrupt_input_blocked++) | 64 | #define BLOCK_INPUT (interrupt_input_blocked++) |
| @@ -125,8 +116,6 @@ extern int pending_atimers; | |||
| 125 | } \ | 116 | } \ |
| 126 | while (0) | 117 | while (0) |
| 127 | 118 | ||
| 128 | #endif /* defined HAVE_NS && !defined COCOA_EXPERIMENTAL_CTRL_G */ | ||
| 129 | |||
| 130 | #define UNBLOCK_INPUT_RESIGNAL UNBLOCK_INPUT | 119 | #define UNBLOCK_INPUT_RESIGNAL UNBLOCK_INPUT |
| 131 | 120 | ||
| 132 | /* In critical section ? */ | 121 | /* In critical section ? */ |