merge from trunk

2 files changed, 4 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 74af248575a..6a3b7cf9cee 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2013-08-13  Dmitry Antipov  <dmantipov@yandex.ru>
 
+        * keyboard.c (Fdiscard_input): Do not increment update_mode_lines.
+
+2013-08-13  Dmitry Antipov  <dmantipov@yandex.ru>
+
         * font.c (clear_font_cache): New function, stripped from...
         (Fclear_font_cache): ...here, which now uses the function
         above.  Adjust comment.
diff --git a/src/keyboard.c b/src/keyboard.c
index 30707e5b3db..1aa25669b5b 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -10150,8 +10150,6 @@ Also end any kbd macro being defined.  */)
       end_kbd_macro ();
     }
 
-  update_mode_lines++;
-
   Vunread_command_events = Qnil;
 
   discard_tty_input ();