Subject: bug#11415: 24.1.50; Dbus hangs indefinitely during batch mode & daemon startup

From: Paul Eggert <[email-masked]>
Date: Mon, 14 May 2012 08:30:36 -0700

That patch had a minor issue with it, discovered by configuring with
"./configure --enable-gcc-warnings", in that it sometimes resulted
in a local variable that was never used.  I installed the following
further patch to work around this.  These days there's no point to
making such variables 'register' so I removed the 'register' while
I was at it.

=== modified file 'src/ChangeLog'
--- src/ChangeLog	2012-05-14 15:11:10 +0000
+++ src/ChangeLog	2012-05-14 15:22:29 +0000
@@ -1,5 +1,7 @@
 2012-05-14  Paul Eggert  <[email-masked]>
 
+	* keyboard.c (kbd_buffer_get_event) [!HAVE_DBUS]: Omit unused local.
+
 	* unexaix.c: Port to more-recent AIX compilers.
 	(report_error, report_error_1, make_hdr, copy_sym)
 	(mark_x, adjust_lnnoptrs, unrelocate_symbols):

=== modified file 'src/keyboard.c'
--- src/keyboard.c	2012-05-14 07:05:03 +0000
+++ src/keyboard.c	2012-05-14 15:22:29 +0000
@@ -3786,7 +3786,6 @@
                       int *used_mouse_menu,
                       struct timeval *end_time)
 {
-  register int c;
   Lisp_Object obj;
 
 #ifdef subprocesses
@@ -3809,7 +3808,7 @@
 	 detaching from the terminal.  */
       || (IS_DAEMON && daemon_pipe[1] >= 0))
     {
-      c = getchar ();
+      int c = getchar ();
       XSETINT (obj, c);
       *kbp = current_kboard;
       return obj;