8b9a1c
To: vim_dev@googlegroups.com
8b9a1c
Subject: Patch 7.4.065
8b9a1c
Fcc: outbox
8b9a1c
From: Bram Moolenaar <Bram@moolenaar.net>
8b9a1c
Mime-Version: 1.0
8b9a1c
Content-Type: text/plain; charset=UTF-8
8b9a1c
Content-Transfer-Encoding: 8bit
8b9a1c
------------
8b9a1c
8b9a1c
Patch 7.4.065
8b9a1c
Problem:    When recording, the character typed at the hit-enter prompt is
8b9a1c
            recorded twice. (Urtica Dioica)
8b9a1c
Solution:   Avoid recording the character twice. (Christian Brabandt)
8b9a1c
Files:      src/message.c
8b9a1c
8b9a1c
8b9a1c
*** ../vim-7.4.064/src/message.c	2013-08-09 20:30:45.000000000 +0200
8b9a1c
--- src/message.c	2013-11-04 01:56:09.000000000 +0100
8b9a1c
***************
8b9a1c
*** 887,892 ****
8b9a1c
--- 887,894 ----
8b9a1c
      int		oldState;
8b9a1c
      int		tmpState;
8b9a1c
      int		had_got_int;
8b9a1c
+     int		save_Recording;
8b9a1c
+     FILE	*save_scriptout;
8b9a1c
  
8b9a1c
      if (redraw == TRUE)
8b9a1c
  	must_redraw = CLEAR;
8b9a1c
***************
8b9a1c
*** 957,967 ****
8b9a1c
--- 959,979 ----
8b9a1c
  	     * typeahead buffer. */
8b9a1c
  	    ++no_mapping;
8b9a1c
  	    ++allow_keys;
8b9a1c
+ 
8b9a1c
+ 	    /* Temporarily disable Recording. If Recording is active, the
8b9a1c
+ 	     * character will be recorded later, since it will be added to the
8b9a1c
+ 	     * typebuf after the loop */
8b9a1c
+ 	    save_Recording = Recording;
8b9a1c
+ 	    save_scriptout = scriptout;
8b9a1c
+ 	    Recording = FALSE;
8b9a1c
+ 	    scriptout = NULL;
8b9a1c
  	    c = safe_vgetc();
8b9a1c
  	    if (had_got_int && !global_busy)
8b9a1c
  		got_int = FALSE;
8b9a1c
  	    --no_mapping;
8b9a1c
  	    --allow_keys;
8b9a1c
+ 	    Recording = save_Recording;
8b9a1c
+ 	    scriptout = save_scriptout;
8b9a1c
  
8b9a1c
  #ifdef FEAT_CLIPBOARD
8b9a1c
  	    /* Strange way to allow copying (yanking) a modeless selection at
8b9a1c
*** ../vim-7.4.064/src/version.c	2013-11-04 01:41:11.000000000 +0100
8b9a1c
--- src/version.c	2013-11-04 01:53:19.000000000 +0100
8b9a1c
***************
8b9a1c
*** 740,741 ****
8b9a1c
--- 740,743 ----
8b9a1c
  {   /* Add new patch number below this line */
8b9a1c
+ /**/
8b9a1c
+     65,
8b9a1c
  /**/
8b9a1c
8b9a1c
-- 
8b9a1c
Zen Microsystems: we're the om in .commmmmmmmm
8b9a1c
8b9a1c
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
8b9a1c
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
8b9a1c
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
8b9a1c
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///