2 files changed, 4 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index d555e74c219..a2848ead2cc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2011-04-16  Paul Eggert  <eggert@cs.ucla.edu>
 
+        * keyboard.c (read_char): Make a var volatile so longjmp won't clobber
+        it.
+
         * emacs.c (MAX_HEAP_BSS_DIFF, my_edata): Move to where they're used,
         so that we aren't warned about unused symbols.
 
diff --git a/src/keyboard.c b/src/keyboard.c
index b2efadc8510..c601649ebca 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -2259,7 +2259,7 @@ read_char (int commandflag, int nmaps, Lisp_Object *maps, Lisp_Object prev_event
   volatile Lisp_Object also_record;
   volatile int reread;
   struct gcpro gcpro1, gcpro2;
-  int polling_stopped_here = 0;
+  int volatile polling_stopped_here = 0;
   struct kboard *orig_kboard = current_kboard;
 
   also_record = Qnil;