[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r108316: Improve test for when xg_sel
From: |
Ken Brown |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r108316: Improve test for when xg_select should just invoke select (bug#9754). |
Date: |
Sat, 19 May 2012 17:46:43 -0400 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 108316
committer: Ken Brown <address@hidden>
branch nick: trunk
timestamp: Sat 2012-05-19 17:46:43 -0400
message:
Improve test for when xg_select should just invoke select (bug#9754).
* src/xfns.c (x_in_use): Remove `static' qualifier.
* src/xterm.h (x_in_use): Declare.
* src/xgselect.c: Include xterm.h.
(xg_select): Test `x_in_use' instead of `inhibit_window_system'
and `display_arg'.
modified:
src/ChangeLog
src/xfns.c
src/xgselect.c
src/xterm.h
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-05-19 18:04:49 +0000
+++ b/src/ChangeLog 2012-05-19 21:46:43 +0000
@@ -1,3 +1,11 @@
+2012-05-19 Ken Brown <address@hidden>
+
+ * xfns.c (x_in_use): Remove `static' qualifier.
+ * xterm.h (x_in_use): Declare.
+ * xgselect.c: Include xterm.h.
+ (xg_select): Test `x_in_use' instead of `inhibit_window_system'
+ and `display_arg' (bug#9754).
+
2012-05-19 Paul Eggert <address@hidden>
* s/ms-w32.h (HAVE_GETDOMAINNAME): Remove; not needed.
=== modified file 'src/xfns.c'
--- a/src/xfns.c 2012-05-02 10:20:35 +0000
+++ b/src/xfns.c 2012-05-19 21:46:43 +0000
@@ -136,7 +136,7 @@
/* Nonzero if using X. */
-static int x_in_use;
+int x_in_use;
static Lisp_Object Qnone;
static Lisp_Object Qsuppress_icon;
=== modified file 'src/xgselect.c'
--- a/src/xgselect.c 2012-05-16 02:22:53 +0000
+++ b/src/xgselect.c 2012-05-19 21:46:43 +0000
@@ -27,6 +27,7 @@
#include <glib.h>
#include <errno.h>
#include <setjmp.h>
+#include "xterm.h"
static GPollFD *gfds;
static ptrdiff_t gfds_size;
@@ -43,7 +44,7 @@
int n_gfds = 0, our_tmo = 0, retval = 0, our_fds = 0;
int i, nfds, fds_lim, tmo_in_millisec;
- if (inhibit_window_system || !display_arg)
+ if (!x_in_use)
return select (max_fds, rfds, wfds, efds, timeout);
if (rfds) memcpy (&all_rfds, rfds, sizeof (all_rfds));
=== modified file 'src/xterm.h'
--- a/src/xterm.h 2012-01-19 07:21:25 +0000
+++ b/src/xterm.h 2012-05-19 21:46:43 +0000
@@ -1038,6 +1038,7 @@
extern struct x_display_info * check_x_display_info (Lisp_Object);
extern Lisp_Object x_get_focus_frame (struct frame *);
+extern int x_in_use;
#ifdef USE_GTK
extern int xg_set_icon (struct frame *, Lisp_Object);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r108316: Improve test for when xg_select should just invoke select (bug#9754).,
Ken Brown <=