jkunstle / rpms / vim

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