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