Mercurial > emacs
diff src/term.c @ 102744:d69c45eb83b1
* keyboard.c (tty_read_avail_input): Don't treat a -1 return from
Gpm_GetEvent as an error that justifies closing the filedescriptor.
* term.c (close_gpm): Get the filedescriptor as a (new) parameter.
(Fgpm_mouse_stop): Pass that new parameter.
* termhooks.h (close_gpm): Adjust prototype.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Fri, 27 Mar 2009 16:14:23 +0000 |
parents | 05ec76bd8aa4 |
children | 1f0beb33697b |
line wrap: on
line diff
--- a/src/term.c Fri Mar 27 15:58:16 2009 +0000 +++ b/src/term.c Fri Mar 27 16:14:23 2009 +0000 @@ -3150,10 +3150,10 @@ } void -close_gpm () +close_gpm (int fd) { - if (gpm_fd >= 0) - delete_gpm_wait_descriptor (gpm_fd); + if (fd >= 0) + delete_gpm_wait_descriptor (fd); while (Gpm_Close()); /* close all the stack */ gpm_tty = NULL; } @@ -3171,7 +3171,7 @@ if (!tty || gpm_tty != tty) return Qnil; /* Not activated on this terminal, nothing to do. */ - close_gpm (); + close_gpm (gpm_fd); return Qnil; } #endif /* HAVE_GPM */