aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim F. Storm <[email protected]>2004-02-27 23:49:32 +0000
committerKim F. Storm <[email protected]>2004-02-27 23:49:32 +0000
commita6950dfa24a3b24e8d9a8c39f0456d21339c4cb4 (patch)
treebddd055ba25fd8072aed0f659f7bdb0a0d1bfa7d
parent004b1d3853dbb7ef5c5b2e3b5d011718e602c33a (diff)
(x_session_check_input): Remove numchars arg.
-rw-r--r--src/xsmfns.c20
1 files changed, 6 insertions, 14 deletions
diff --git a/src/xsmfns.c b/src/xsmfns.c
index 091d21327a..e486e5c6e3 100644
--- a/src/xsmfns.c
+++ b/src/xsmfns.c
@@ -106,13 +106,10 @@ Lisp_Object Vx_session_previous_id;
/* Handle any messages from the session manager. If no connection is
open to a session manager, just return 0.
- Otherwise returns the number of events stored in buffer BUFP,
- which can hold up to *NUMCHARS characters. At most one event is
- stored, a SAVE_SESSION_EVENT. */
+ Otherwise returns 1 if SAVE_SESSION_EVENT is stored in buffer BUFP. */
int
-x_session_check_input (bufp, numchars)
+x_session_check_input (bufp)
struct input_event *bufp;
- int *numchars;
{
SELECT_TYPE read_fds;
EMACS_TIME tmout;
@@ -146,16 +143,11 @@ x_session_check_input (bufp, numchars)
/* Check if smc_interact_CB was called and we shall generate a
SAVE_SESSION_EVENT. */
- if (*numchars > 0 && emacs_event.kind != NO_EVENT)
- {
- bcopy (&emacs_event, bufp, sizeof (struct input_event));
- bufp++;
- (*numchars)--;
-
- return 1;
- }
+ if (emacs_event.kind == NO_EVENT)
+ return 0;
- return 0;
+ bcopy (&emacs_event, bufp, sizeof (struct input_event));
+ return 1;
}
/* Return non-zero if we have a connection to a session manager.*/