Patch 7.4.2319
Problem:    No way for a system wide vimrc to stop loading defaults.vim.
            (Christian Hesse)
Solution:   Bail out of defaults.vim if skip_defaults_vim was set.
Files:      runtime/defaults.vim


*** ../vim-7.4.2318/runtime/defaults.vim        2016-08-28 14:39:40.752099018 
+0200
--- runtime/defaults.vim        2016-09-02 22:57:51.938009294 +0200
***************
*** 1,7 ****
  " The default vimrc file.
  "
  " Maintainer: Bram Moolenaar <b...@vim.org>
! " Last change:        2016 Aug 28
  "
  " This is loaded if no vimrc file was found.
  " Except when Vim is run with "-u NONE" or "-C".
--- 1,7 ----
  " The default vimrc file.
  "
  " Maintainer: Bram Moolenaar <b...@vim.org>
! " Last change:        2016 Sep 02
  "
  " This is loaded if no vimrc file was found.
  " Except when Vim is run with "-u NONE" or "-C".
***************
*** 13,18 ****
--- 13,24 ----
    finish
  endif
  
+ " Bail out if something that ran earlier, e.g. a system wide vimrc, does not
+ " want Vim to use these default values.
+ if exists('skip_defaults_vim')
+   finish
+ endif
+ 
  " Use Vim settings, rather than Vi settings (much better!).
  " This must be first, because it changes other options as a side effect.
  set nocompatible
***************
*** 31,37 ****
  " Show @@@ in the last line if it is truncated.
  set display=truncate
  
! " Show a few lines of context around the cursor.
  set scrolloff=5
  
  " Do incremental searching when it's possible to timeout.
--- 37,44 ----
  " Show @@@ in the last line if it is truncated.
  set display=truncate
  
! " Show a few lines of context around the cursor.  Note that this makes the
! " text scroll if you mouse-click near the start or end of the window.
  set scrolloff=5
  
  " Do incremental searching when it's possible to timeout.
*** ../vim-7.4.2318/src/version.c       2016-09-03 20:04:29.926646353 +0200
--- src/version.c       2016-09-03 20:07:29.925165948 +0200
***************
*** 765,766 ****
--- 765,768 ----
  {   /* Add new patch number below this line */
+ /**/
+     2319,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
157. You fum through a magazine, you first check to see if it has a web
     address.

 /// Bram Moolenaar -- b...@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    ///

-- 
-- 
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php

--- 
You received this message because you are subscribed to the Google Groups 
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to vim_dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Raspunde prin e-mail lui