To: vim_dev@googlegroups.com
Subject: Patch 8.0.1546
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.0.1546
Problem:    Using feedkeys() in a terminal window may trigger mappings.
            (Charles Sheridan)
Solution:   Avoid triggering a mapping when peeking for a key.
Files:      src/getchar.c, src/terminal.c


*** ../vim-8.0.1545/src/getchar.c	2018-02-09 12:13:28.602611990 +0100
--- src/getchar.c	2018-02-27 16:19:57.445006300 +0100
***************
*** 1854,1860 ****
      return vgetorpeek(FALSE);
  }
  
! #if defined(FEAT_TERMRESPONSE) || defined(PROTO)
  /*
   * Like vpeekc(), but don't allow mapping.  Do allow checking for terminal
   * codes.
--- 1854,1860 ----
      return vgetorpeek(FALSE);
  }
  
! #if defined(FEAT_TERMRESPONSE) || defined(FEAT_TERMINAL) || defined(PROTO)
  /*
   * Like vpeekc(), but don't allow mapping.  Do allow checking for terminal
   * codes.
*** ../vim-8.0.1545/src/terminal.c	2018-02-25 21:39:41.693475616 +0100
--- src/terminal.c	2018-02-27 16:21:43.964319964 +0100
***************
*** 1306,1315 ****
  }
  
  /*
!  * Get a key from the user without mapping.
   * Note: while waiting a terminal may be closed and freed if the channel is
   * closed and ++close was used.
-  * Uses terminal mode mappings.
   */
      static int
  term_vgetc()
--- 1306,1314 ----
  }
  
  /*
!  * Get a key from the user with terminal mode mappings.
   * Note: while waiting a terminal may be closed and freed if the channel is
   * closed and ++close was used.
   */
      static int
  term_vgetc()
***************
*** 1633,1639 ****
      position_cursor(curwin, &curbuf->b_term->tl_cursor_pos);
      may_set_cursor_props(curbuf->b_term);
  
!     while (blocking || vpeekc() != NUL)
      {
  	/* TODO: skip screen update when handling a sequence of keys. */
  	/* Repeat redrawing in case a message is received while redrawing. */
--- 1632,1638 ----
      position_cursor(curwin, &curbuf->b_term->tl_cursor_pos);
      may_set_cursor_props(curbuf->b_term);
  
!     while (blocking || vpeekc_nomap() != NUL)
      {
  	/* TODO: skip screen update when handling a sequence of keys. */
  	/* Repeat redrawing in case a message is received while redrawing. */
*** ../vim-8.0.1545/src/version.c	2018-02-27 14:54:49.586935253 +0100
--- src/version.c	2018-02-27 16:27:42.166005278 +0100
***************
*** 780,781 ****
--- 780,783 ----
  {   /* Add new patch number below this line */
+ /**/
+     1546,
  /**/

-- 
BEDEVERE: Stand by for attack!!
   [CUT TO enormous army forming up.  Trebuchets, rows of PIKEMEN, siege
   towers, pennants flying, shouts of "Stand by for attack!"  Traditional
   army build-up shots.  The shouts echo across the ranks of the army.
   We see various groups reacting, and stirring themselves in readiness.]
ARTHUR:   Who are they?
BEDEVERE: Oh, just some friends!
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///