[SCM] Vim packaging branch, debian, updated. upstream/7.1.ds-307-g3ea27e6

[James Vega]

The following commit has been merged in the debian branch:
commit 3ea27e67fe38e13fbe4589d47549c4616c2af544
Author: James Vega <jamessan at debian.org>
Date:   Wed Mar 26 23:23:30 2008 -0400

    Update README.Debian and FAQ to reflect the deviation from upstream's 'modeline' default. (#472522)
    Thanks to Daniel Hahler for the patch.

diff --git a/debian/FAQ b/debian/FAQ
index 00ec26d..bf70b7e 100644
--- a/debian/FAQ
+++ b/debian/FAQ
@@ -4257,8 +4257,9 @@ bottom of the file:
 
 This will set the 'shiftwidth' option to 4, when editing that C file.
 For this to work, the 'modeline' option should be set. By default, the
-'modeline' option is set. The 'modelines' settings specifies the number of
-lines that will be checked for the Vim set commands.
+'modeline' option is not set, for security reasons, in Debian. The
+'modelines' settings specifies the number of lines that will be checked for
+the Vim set commands.
 
 For more information, read
 
diff --git a/debian/README.Debian b/debian/README.Debian
index 705bca0..016fc4c 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -46,3 +46,13 @@ a vim-mzscheme variant is not being built.  The reasons stated are as follows:
   3) The MzScheme ABI changes with every upstream version.
 
  -- James Vega <jamessan at debian.org> Mon, 10  Apr  2006  09:48:25  -0400
+
+Modeline support disabled by default
+------------------------------------
+
+Modelines have historically been a source of security/resource vulnerabilities
+and are therefore disabled by default in /usr/share/vim/vimcurrent/debian.vim.
+
+You can enable them in ~/.vimrc or /etc/vim/vimrc with "set modeline".
+
+ -- Daniel Hahler <ubuntu at thequod.de> Mon, 24 Mar 2008 17:10:42 +0100

-- 
Vim packaging