=== modified file 'lisp/htmlfontify.el'
*** lisp/htmlfontify.el	2013-10-30 19:35:14 +0000
--- lisp/htmlfontify.el	2013-11-04 06:58:29 +0000
*************** You may also want to set `hfy-page-heade
*** 2410,2418 ****
      (load file 'NOERROR nil nil) ))
  
  
! ;;;### (autoloads nil "hfy-cmap" "hfy-cmap.el" "df4e418d0d8749ead9d32bb2c7a5bd56")
  ;;; Generated autoloads from hfy-cmap.el
  (push (purecopy '(htmlfontify 0 20)) package--builtin-versions)
  (autoload 'htmlfontify-load-rgb-file "hfy-cmap" "\
  Load an X11 style rgb.txt FILE.
  Search `hfy-rgb-load-path' if FILE is not specified.
--- 2410,2419 ----
      (load file 'NOERROR nil nil) ))
  
  
! ;;;### (autoloads nil "hfy-cmap" "hfy-cmap.el" "9fc09983e774dd0938661615b457fb59")
  ;;; Generated autoloads from hfy-cmap.el
  (push (purecopy '(htmlfontify 0 20)) package--builtin-versions)
+ 
  (autoload 'htmlfontify-load-rgb-file "hfy-cmap" "\
  Load an X11 style rgb.txt FILE.
  Search `hfy-rgb-load-path' if FILE is not specified.

=== modified file 'src/xterm.c'
*** src/xterm.c	2013-10-29 16:08:08 +0000
--- src/xterm.c	2013-11-04 18:20:27 +0000
*************** XTread_socket (struct terminal *terminal
*** 7060,7065 ****
--- 7060,7071 ----
        current_count = -1;
        current_hold_quit = 0;
  
+       // Sometimes gtk_events_pending is true, but gdk_event_handler
+       // receives nothing and does not increase the count.
+       // If we ignore these pending events, then we lock up,
+       // for example with continuos movements of vertical scroll bar.
+       if (!count) count = 1;
+ 
        if (current_finish == X_EVENT_GOTO_OUT)
          break;
      }