summaryrefslogtreecommitdiff
path: root/src/nsterm.m
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2012-09-19 18:37:07 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2012-09-19 18:37:07 -0700
commitf75beb4787372df3dcc50cbb07407f45ff04bf04 (patch)
tree19a41069b797bb16623d630b35343525f6172f01 /src/nsterm.m
parentb019b76a181d6af0c73559b73f9735b91bc71d21 (diff)
downloademacs-f75beb4787372df3dcc50cbb07407f45ff04bf04.tar.gz
Omit unused arg EXPECTED from socket hooks.
* keyboard.c (gobble_input, read_avail_input, tty_read_avail_input): * nsterm.m (ns_term_init): * termhooks.h (struct terminal.read_socket_hook): * w32inevt.c (w32_console_read_socket): * w32term.c (w32_read_socket): * xterm.c (XTread_socket): Omit unused arg EXPECTED. All callers changed. (store_user_signal_events): Return void, not int, since callers no longer care about the return value. All uses changed.
Diffstat (limited to 'src/nsterm.m')
-rw-r--r--src/nsterm.m5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/nsterm.m b/src/nsterm.m
index 0b26508dbd0..aa869e3ff44 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -3336,8 +3336,7 @@ ns_send_appdefined (int value)
}
static int
-ns_read_socket (struct terminal *terminal, int expected,
- struct input_event *hold_quit)
+ns_read_socket (struct terminal *terminal, struct input_event *hold_quit)
/* --------------------------------------------------------------------------
External (hook): Post an event to ourself and keep reading events until
we read it back again. In effect process all events which were waiting.
@@ -4204,7 +4203,7 @@ ns_term_init (Lisp_Object display_name)
NSColorPboardType,
NSFontPboardType, nil] retain];
-
+
[NSApp run];
ns_do_open_file = YES;
return dpyinfo;