diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/process.c | 8 | ||||
| -rw-r--r-- | src/xgselect.c | 1 |
5 files changed, 20 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index 35238bda964..04ad375f55e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-06-08 Jan Djärv <jan.h.d@swipnet.se> + + * configure.ac (HAVE_GLIB): Only set XGSELOBJ if HAVE_NS = no. + (with_file_notification): Don't set to gfile if with_ns = yes. + 2013-06-07 Richard Copley <rcopley@gmail.com> (tiny change) * Makefile.in (msys_to_w32): Modify to support d:\foo file names. diff --git a/configure.ac b/configure.ac index f23a9334a73..9c51d2113a5 100644 --- a/configure.ac +++ b/configure.ac @@ -2317,7 +2317,9 @@ if test "${with_file_notification}" = "yes"; then if test "${opsys}" = "mingw32"; then with_file_notification=w32 else - with_file_notification=gfile + if test "${with_ns}" != yes; then + with_file_notification=gfile + fi fi fi @@ -3627,7 +3629,9 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM( AC_MSG_RESULT([$links_glib]) if test "${links_glib}" = "yes"; then AC_DEFINE(HAVE_GLIB, 1, [Define to 1 if GLib is linked in.]) - XGSELOBJ=xgselect.o + if test "$HAVE_NS" = no;then + XGSELOBJ=xgselect.o + fi fi AC_SUBST(XGSELOBJ) diff --git a/src/ChangeLog b/src/ChangeLog index 7d650885f19..629f90678e6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,10 @@ 2013-06-08 Jan Djärv <jan.h.d@swipnet.se> + * xgselect.c: Remove unneeded include xterm.h + + * process.c (wait_reading_process_output): Check for NS before GLIB. + GLIB may be linked in due to rsvg, but ns_select must be called. + * xgselect.c (xg_select): Remove call to window_system_available and g_main_context_pending at the top, so Gdk events (i.e. file notify) are processed when Emacs is started with -nw. diff --git a/src/process.c b/src/process.c index 6ae02494d36..e51b45bd64f 100644 --- a/src/process.c +++ b/src/process.c @@ -4528,10 +4528,10 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, } #endif -#if defined (HAVE_GLIB) - nfds = xg_select -#elif defined (HAVE_NS) - nfds = ns_select +#if defined (HAVE_NS) + nfds = ns_select +#elif defined (HAVE_GLIB) + nfds = xg_select #else nfds = pselect #endif diff --git a/src/xgselect.c b/src/xgselect.c index e2d14f12e9f..4d90298a9d9 100644 --- a/src/xgselect.c +++ b/src/xgselect.c @@ -25,7 +25,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include <glib.h> #include <errno.h> -#include "xterm.h" #include "frame.h" int |