diff options
| author | Michael Albinus | 2010-10-08 14:41:49 +0200 |
|---|---|---|
| committer | Michael Albinus | 2010-10-08 14:41:49 +0200 |
| commit | 8b1c619f0b9e4018c51495952eb9e798caafe254 (patch) | |
| tree | 65b6a0057539b39af10676d6ef0543e4514d8e92 /src | |
| parent | d2abc29aeba15149bc12219c5e43d6a98ff4acdb (diff) | |
| download | emacs-8b1c619f0b9e4018c51495952eb9e798caafe254.tar.gz emacs-8b1c619f0b9e4018c51495952eb9e798caafe254.zip | |
* keyboard.c: Revert last change; it was not intended to be
synchronized with the trunk.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/keyboard.c | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 0bde3bb19fe..151e0daa29d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-10-08 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * keyboard.c: Revert last change; it was not intended to be | ||
| 4 | synchronized with the trunk. | ||
| 5 | |||
| 1 | 2010-10-08 Kenichi Handa <handa@m17n.org> | 6 | 2010-10-08 Kenichi Handa <handa@m17n.org> |
| 2 | 7 | ||
| 3 | * coding.c (complement_process_encoding_system): Fix previous change. | 8 | * coding.c (complement_process_encoding_system): Fix previous change. |
diff --git a/src/keyboard.c b/src/keyboard.c index b284244ac81..9af26cd427d 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -3952,11 +3952,6 @@ kbd_buffer_get_event (KBOARD **kbp, | |||
| 3952 | /* One way or another, wait until input is available; then, if | 3952 | /* One way or another, wait until input is available; then, if |
| 3953 | interrupt handlers have not read it, read it now. */ | 3953 | interrupt handlers have not read it, read it now. */ |
| 3954 | 3954 | ||
| 3955 | #ifdef HAVE_DBUS | ||
| 3956 | /* Read D-Bus messages. */ | ||
| 3957 | xd_read_queued_messages (); | ||
| 3958 | #endif /* HAVE_DBUS */ | ||
| 3959 | |||
| 3960 | /* Note SIGIO has been undef'd if FIONREAD is missing. */ | 3955 | /* Note SIGIO has been undef'd if FIONREAD is missing. */ |
| 3961 | #ifdef SIGIO | 3956 | #ifdef SIGIO |
| 3962 | gobble_input (0); | 3957 | gobble_input (0); |