aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorJan Djärv2013-06-08 20:13:24 +0200
committerJan Djärv2013-06-08 20:13:24 +0200
commitb33f93eea9ddf94aaa4c48b9c057a58b8fa2b6c9 (patch)
tree7fec26bb221a967dd3dbe6834dc32e950fba8465 /ChangeLog
parent1698f87abddff63b6c8662276334936e249d80a2 (diff)
downloademacs-b33f93eea9ddf94aaa4c48b9c057a58b8fa2b6c9.tar.gz
emacs-b33f93eea9ddf94aaa4c48b9c057a58b8fa2b6c9.zip
Fix compilation issues for GNUStep and GLIB conflicts.
* configure.ac (HAVE_GLIB): Only set XGSELOBJ if HAVE_NS = no. (with_file_notification): Don't set to gfile if with_ns = yes. * src/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. * src/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. * src/xgselect.c: Remove unneeded include xterm.h
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 35238bda964..04ad375f55e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
12013-06-08 Jan Djärv <jan.h.d@swipnet.se>
2
3 * configure.ac (HAVE_GLIB): Only set XGSELOBJ if HAVE_NS = no.
4 (with_file_notification): Don't set to gfile if with_ns = yes.
5
12013-06-07 Richard Copley <rcopley@gmail.com> (tiny change) 62013-06-07 Richard Copley <rcopley@gmail.com> (tiny change)
2 7
3 * Makefile.in (msys_to_w32): Modify to support d:\foo file names. 8 * Makefile.in (msys_to_w32): Modify to support d:\foo file names.