lkundrak / rpms / vim

Forked from rpms/vim 4 years ago
Clone
daeac36
To: vim_dev@googlegroups.com
daeac36
Subject: Patch 7.4.284
daeac36
Fcc: outbox
daeac36
From: Bram Moolenaar <Bram@moolenaar.net>
daeac36
Mime-Version: 1.0
daeac36
Content-Type: text/plain; charset=UTF-8
daeac36
Content-Transfer-Encoding: 8bit
daeac36
------------
daeac36
daeac36
Patch 7.4.284
daeac36
Problem:    Setting 'langmap' in the modeline can cause trouble.  E.g. mapping
daeac36
	    ":" breaks many commands. (Jens-Wolfhard Schicke-Uffmann)
daeac36
Solution:   Disallow setting 'langmap' from the modeline.
daeac36
Files:	    src/option.c
daeac36
daeac36
daeac36
*** ../vim-7.4.283/src/option.c	2014-05-07 15:10:17.661108310 +0200
daeac36
--- src/option.c	2014-05-13 12:11:39.677552445 +0200
daeac36
***************
daeac36
*** 1652,1658 ****
daeac36
  #endif
daeac36
  #endif
daeac36
  				(char_u *)0L} SCRIPTID_INIT},
daeac36
!     {"langmap",     "lmap", P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
daeac36
  #ifdef FEAT_LANGMAP
daeac36
  			    (char_u *)&p_langmap, PV_NONE,
daeac36
  			    {(char_u *)"",	/* unmatched } */
daeac36
--- 1652,1658 ----
daeac36
  #endif
daeac36
  #endif
daeac36
  				(char_u *)0L} SCRIPTID_INIT},
daeac36
!     {"langmap",     "lmap", P_STRING|P_VI_DEF|P_COMMA|P_NODUP|P_SECURE,
daeac36
  #ifdef FEAT_LANGMAP
daeac36
  			    (char_u *)&p_langmap, PV_NONE,
daeac36
  			    {(char_u *)"",	/* unmatched } */
daeac36
*** ../vim-7.4.283/src/version.c	2014-05-09 20:33:01.102790466 +0200
daeac36
--- src/version.c	2014-05-13 12:12:21.273552809 +0200
daeac36
***************
daeac36
*** 736,737 ****
daeac36
--- 736,739 ----
daeac36
  {   /* Add new patch number below this line */
daeac36
+ /**/
daeac36
+     284,
daeac36
  /**/
daeac36
daeac36
-- 
daeac36
We are the Borg of GNU GPL.  We will assimilate your source code.
daeac36
Resistance is futile.
daeac36
daeac36
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
daeac36
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
daeac36
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
daeac36
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///