[vim] 05/10: Revert "Document Debian's decision to disable modelines by default"

[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 073f97d524c4d136b79ca80bb0c53d57826f7ddf
Author: James McCoy <jamessan at debian.org>
Date:   Sun Aug 7 15:34:34 2016 -0400

    Revert "Document Debian's decision to disable modelines by default"
    
    This reverts commit 66787b3d527959d2be3789a78b1e24df329f9743 so that it
    can be managed by gbp-pq instead.
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 runtime/doc/options.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index ad895a8..e42116d 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -5086,7 +5086,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 				   *'modeline'* *'ml'* *'nomodeline'* *'noml'*
 'modeline' 'ml'		boolean	(Vim default: on (off for root),
-				 Debian: off, Vi default: off)
+				 Vi default: off)
 			local to buffer
 						*'modelines'* *'mls'*
 'modelines' 'mls'	number	(default 5)

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