[vim] 01/03: Document behavior of defaults.vim in NEWS and /etc/vim/vimrc

[James McCoy]

This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch debian/sid
in repository vim.

commit 54d783b931daab0b232d583a996492511b8425b6
Author: James McCoy <jamessan at debian.org>
Date:   Tue Oct 4 20:51:20 2016 -0400

    Document behavior of defaults.vim in NEWS and /etc/vim/vimrc
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/NEWS          | 16 ++++++++++++++++
 debian/changelog     |  2 ++
 debian/runtime/vimrc |  7 +++++++
 3 files changed, 25 insertions(+)

diff --git a/debian/NEWS b/debian/NEWS
index 33bf8ed..d4d4886 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,19 @@
+vim (2:8.0.0003-2) unstable; urgency=medium
+
+  Vim now ships with a defaults.vim file which, when the user has no vimrc,
+  enables some options that have historically been disabled by default.  This
+  is described in more detail at ":help defaults.vim".
+
+  Since defaults.vim is loaded when the user's vimrc would typically be
+  loaded, it will override any settings in /etc/vim/vimrc(.local).  In order
+  to disable the loading of defaults.vim, add
+
+    let g:skip_defaults_vim = 1
+
+  to /etc/vim/vimrc(.local).
+
+ -- James McCoy <jamessan at debian.org>  Tue, 04 Oct 2016 20:28:02 -0400
+
 vim (2:7.3.154+hg~74503f6ee649-1) unstable; urgency=low
 
   The vim-lesstif package has been removed in favor of the new vim-athena
diff --git a/debian/changelog b/debian/changelog
index b80c7b1..9966875 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ vim (2:8.0.0003-2) UNRELEASED; urgency=medium
 
   * syntax/debsources: Recognize https URLs.  Thanks to Joe Stein for the
     patch!
+  * Add information about defaults.vim to NEWS.Debian and /etc/vim/vimrc.
+    (Closes: #837761)
 
  -- James McCoy <jamessan at debian.org>  Tue, 27 Sep 2016 22:02:22 -0400
 
diff --git a/debian/runtime/vimrc b/debian/runtime/vimrc
index f23b693..b40c898 100644
--- a/debian/runtime/vimrc
+++ b/debian/runtime/vimrc
@@ -9,6 +9,13 @@
 " properly set to work with the Vim-related packages available in Debian.
 runtime! debian.vim
 
+" Vim will load $VIMRUNTIME/defaults.vim if the user does not have a vimrc.
+" This happens after /etc/vim/vimrc(.local) are loaded, so it will override
+" any settings in these files.
+" If you don't want that to happen, uncomment the below line to prevent
+" defaults.vim from being loaded.
+" let g:skip_defaults_vim = 1
+
 " Uncomment the next line to make Vim more Vi-compatible
 " NOTE: debian.vim sets 'nocompatible'.  Setting 'compatible' changes numerous
 " options, so any other options should be set AFTER setting 'compatible'.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vim/vim.git