Blame SOURCES/7.4.065

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