aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2012-05-14 08:22:29 -0700
committerPaul Eggert2012-05-14 08:22:29 -0700
commit078c97cbfff4348646b4158fb9a160d88150daa9 (patch)
tree4ff992e2c1099b045e6fef24b619390453dcb821 /src
parentdc44c39ad51012e645016408c7eec5adfbdeb5f4 (diff)
downloademacs-078c97cbfff4348646b4158fb9a160d88150daa9.tar.gz
emacs-078c97cbfff4348646b4158fb9a160d88150daa9.zip
* keyboard.c (kbd_buffer_get_event) [!HAVE_DBUS]: Omit unused local.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/keyboard.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 33e5e27dc39..0f4f0fcc08e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12012-05-14 Paul Eggert <eggert@cs.ucla.edu> 12012-05-14 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * keyboard.c (kbd_buffer_get_event) [!HAVE_DBUS]: Omit unused local.
4
3 * unexaix.c: Port to more-recent AIX compilers. 5 * unexaix.c: Port to more-recent AIX compilers.
4 (report_error, report_error_1, make_hdr, copy_sym) 6 (report_error, report_error_1, make_hdr, copy_sym)
5 (mark_x, adjust_lnnoptrs, unrelocate_symbols): 7 (mark_x, adjust_lnnoptrs, unrelocate_symbols):
diff --git a/src/keyboard.c b/src/keyboard.c
index 289dc300835..56858acd6aa 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -3786,7 +3786,6 @@ kbd_buffer_get_event (KBOARD **kbp,
3786 int *used_mouse_menu, 3786 int *used_mouse_menu,
3787 struct timeval *end_time) 3787 struct timeval *end_time)
3788{ 3788{
3789 register int c;
3790 Lisp_Object obj; 3789 Lisp_Object obj;
3791 3790
3792#ifdef subprocesses 3791#ifdef subprocesses
@@ -3809,7 +3808,7 @@ kbd_buffer_get_event (KBOARD **kbp,
3809 detaching from the terminal. */ 3808 detaching from the terminal. */
3810 || (IS_DAEMON && daemon_pipe[1] >= 0)) 3809 || (IS_DAEMON && daemon_pipe[1] >= 0))
3811 { 3810 {
3812 c = getchar (); 3811 int c = getchar ();
3813 XSETINT (obj, c); 3812 XSETINT (obj, c);
3814 *kbp = current_kboard; 3813 *kbp = current_kboard;
3815 return obj; 3814 return obj;