Fixed compatible mode in most runtime files.
diff --git a/runtime/ftplugin/abaqus.vim b/runtime/ftplugin/abaqus.vim
index cbebcbf..b263d0c 100644
--- a/runtime/ftplugin/abaqus.vim
+++ b/runtime/ftplugin/abaqus.vim
@@ -1,7 +1,7 @@
" Vim filetype plugin file
" Language: Abaqus finite element input file (www.abaqus.com)
" Maintainer: Carl Osterwisch <osterwischc@asme.org>
-" Last Change: 2012 Mar 11
+" Last Change: 2012 Apr 30
" Only do this when not done yet for this buffer
if exists("b:did_ftplugin") | finish | endif
@@ -51,7 +51,7 @@
\ "Abaqus Results (*.dat)\t*.dat\n" .
\ "Abaqus Messages (*.pre *.msg *.sta)\t*.pre;*.msg;*.sta\n" .
\ "All Files (*.*)\t*.*\n"
- let b:undo_ftplugin .= "|unlet b:browsefilter"
+ let b:undo_ftplugin .= "|unlet! b:browsefilter"
endif
" Define patterns for the matchit plugin
@@ -62,7 +62,7 @@
\ '\*assembly:\*end\s*assembly,' .
\ '\*instance:\*end\s*instance,' .
\ '\*step:\*end\s*step'
- let b:undo_ftplugin .= "|unlet b:match_ignorecase b:match_words"
+ let b:undo_ftplugin .= "|unlet! b:match_ignorecase b:match_words"
endif
" Define keys used to move [count] keywords backward or forward.
@@ -85,6 +85,13 @@
let b:undo_ftplugin .= "|unmap <buffer> [[|unmap <buffer> ]]"
\ . "|unmap <buffer> <LocalLeader><LocalLeader>"
+" Undo must be done in nocompatible mode for <LocalLeader>.
+let b:undo_ftplugin = "let s:cpo_save = &cpoptions|"
+ \ . "set cpoptions&vim|"
+ \ . b:undo_ftplugin
+ \ . "|let &cpoptions = s:cpo_save"
+ \ . "|unlet s:cpo_save"
+
" Restore saved compatibility options
let &cpoptions = s:cpo_save
unlet s:cpo_save
diff --git a/runtime/ftplugin/php.vim b/runtime/ftplugin/php.vim
index 93de5b9..a2f8b4d 100644
--- a/runtime/ftplugin/php.vim
+++ b/runtime/ftplugin/php.vim
@@ -8,8 +8,8 @@
" Make sure the continuation lines below do not cause problems in
" compatibility mode.
-let s:save_cpo = &cpo
-set cpo-=C
+let s:keepcpo= &cpo
+set cpo&vim
" Define some defaults in case the included ftplugins don't set them.
let s:undo_ftplugin = ""
@@ -79,5 +79,5 @@
\ s:undo_ftplugin
" Restore the saved compatibility options.
-let &cpo = s:save_cpo
-unlet s:save_cpo
+let &cpo = s:keepcpo
+unlet s:keepcpo
diff --git a/runtime/ftplugin/python.vim b/runtime/ftplugin/python.vim
index e7c6d6b..2b091a1 100644
--- a/runtime/ftplugin/python.vim
+++ b/runtime/ftplugin/python.vim
@@ -5,6 +5,8 @@
if exists("b:did_ftplugin") | finish | endif
let b:did_ftplugin = 1
+let s:keepcpo= &cpo
+set cpo&vim
setlocal cinkeys-=0#
setlocal indentkeys-=0#
@@ -41,3 +43,6 @@
let b:browsefilter = "Python Files (*.py)\t*.py\n" .
\ "All Files (*.*)\t*.*\n"
endif
+
+let &cpo = s:keepcpo
+unlet s:keepcpo