[Emacs-diffs] /srv/bzr/emacs/trunk r110375: * keyboard.c (read_char): Remove unnecessary 'volatile's and label.

[Paul Eggert]

------------------------------------------------------------
revno: 110375
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Fri 2012-10-05 17:52:17 -0700
message:
  * keyboard.c (read_char): Remove unnecessary 'volatile's and label.
modified:
  src/ChangeLog
  src/keyboard.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-10-05 11:19:58 +0000
+++ b/src/ChangeLog     2012-10-06 00:52:17 +0000
@@ -1,3 +1,7 @@
+2012-10-06  Paul Eggert  <address@hidden>
+
+       * keyboard.c (read_char): Remove unnecessary 'volatile's and label.
+
 2012-10-05  Eli Zaretskii  <address@hidden>
 
        * w32proc.c (stop_timer_thread): Fix declaration of 'err'.

=== modified file 'src/keyboard.c'
--- a/src/keyboard.c    2012-10-04 05:52:49 +0000
+++ b/src/keyboard.c    2012-10-06 00:52:17 +0000
@@ -2283,11 +2283,10 @@
           Lisp_Object prev_event,
           int *used_mouse_menu, EMACS_TIME *end_time)
 {
-  volatile Lisp_Object c;
+  Lisp_Object c;
   ptrdiff_t jmpcount;
   sys_jmp_buf local_getcjmp;
   sys_jmp_buf save_jump;
-  volatile int key_already_recorded = 0;
   Lisp_Object tem, save;
   volatile Lisp_Object previous_echo_area_message;
   volatile Lisp_Object also_record;
@@ -2519,10 +2518,7 @@
         return c;               /* wrong_kboard_jmpbuf */
 
       if (! NILP (c))
-       {
-         key_already_recorded = 1;
-         goto non_reread_1;
-       }
+       goto exit;
     }
 
   /* Make a longjmp point for quits to use, but don't alter getcjmp just yet.
@@ -2850,12 +2846,10 @@
       goto wrong_kboard;
     }
 
- non_reread_1:
-
   /* Buffer switch events are only for internal wakeups
      so don't show them to the user.
      Also, don't record a key if we already did.  */
-  if (BUFFERP (c) || key_already_recorded)
+  if (BUFFERP (c))
     goto exit;
 
   /* Process special events within read_char