aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichael Albinus2012-05-14 09:05:03 +0200
committerMichael Albinus2012-05-14 09:05:03 +0200
commit9d0a235ab25062a5a0c66a292cfc54366bb75f74 (patch)
tree0056118178560ed92e5a2ec3244aa528bcddc7ec /src
parent2d21d7f6764a7885aac8ac91a4b64a8fa0e0a084 (diff)
downloademacs-9d0a235ab25062a5a0c66a292cfc54366bb75f74.tar.gz
emacs-9d0a235ab25062a5a0c66a292cfc54366bb75f74.zip
* keyboard.c (kbd_buffer_get_event): Read special events also in
batch mode. (Bug#11415)
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/keyboard.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index c5083cd6e46..8b29c10c38d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12012-05-14 Michael Albinus <michael.albinus@gmx.de>
2
3 * keyboard.c (kbd_buffer_get_event): Read special events also in
4 batch mode. (Bug#11415)
5
12012-05-12 Glenn Morris <rgm@gnu.org> 62012-05-12 Glenn Morris <rgm@gnu.org>
2 7
3 * ns.mk: Update for ns_appbindir no longer having trailing "/". 8 * ns.mk: Update for ns_appbindir no longer having trailing "/".
diff --git a/src/keyboard.c b/src/keyboard.c
index fcd5c0e6837..289dc300835 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -3803,6 +3803,7 @@ kbd_buffer_get_event (KBOARD **kbp,
3803 } 3803 }
3804#endif /* subprocesses */ 3804#endif /* subprocesses */
3805 3805
3806#ifndef HAVE_DBUS /* We want to read D-Bus events in batch mode. */
3806 if (noninteractive 3807 if (noninteractive
3807 /* In case we are running as a daemon, only do this before 3808 /* In case we are running as a daemon, only do this before
3808 detaching from the terminal. */ 3809 detaching from the terminal. */
@@ -3813,6 +3814,7 @@ kbd_buffer_get_event (KBOARD **kbp,
3813 *kbp = current_kboard; 3814 *kbp = current_kboard;
3814 return obj; 3815 return obj;
3815 } 3816 }
3817#endif /* ! HAVE_DBUS */
3816 3818
3817 /* Wait until there is input available. */ 3819 /* Wait until there is input available. */
3818 for (;;) 3820 for (;;)