Mercurial > emacs
diff src/xsmfns.c @ 109428:5ba21f4a3d62
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Thu, 08 Jul 2010 22:47:34 +0000 |
| parents | 8cfee7d2955f |
| children | 228a5fa4eda0 |
line wrap: on
line diff
--- a/src/xsmfns.c Wed Jul 07 22:09:05 2010 +0000 +++ b/src/xsmfns.c Thu Jul 08 22:47:34 2010 +0000 @@ -154,7 +154,7 @@ /* Check if smc_interact_CB was called and we shall generate a SAVE_SESSION_EVENT. */ if (emacs_event.kind != NO_EVENT) - bcopy (&emacs_event, bufp, sizeof (struct input_event)); + memcpy (bufp, &emacs_event, sizeof (struct input_event)); return emacs_event.kind != NO_EVENT ? 1 : 0; } @@ -519,8 +519,7 @@ is told to abort the window system shutdown. Do not call this function yourself. */) - (event) - Lisp_Object event; + (Lisp_Object event) { /* Check doing_interact so that we don't do anything if someone called this at the wrong time. */