--- /dev/null
+Index: vim/runtime/syntax/dosini.vim
+===================================================================
+--- vim/runtime/syntax/dosini.vim.orig
++++ vim/runtime/syntax/dosini.vim
+@@ -17,7 +17,7 @@
+
+ syn match dosiniLabel "^.\{-}="
+ syn region dosiniHeader start="\[" end="\]"
+-syn match dosiniComment "^;.*$"
++syn match dosiniComment "^[;#].*$"
+
+ " Define the default highlighting.
+ " For version 5.7 and earlier: only when not done already
--- /dev/null
+Index: vim/runtime/syntax/mysql.vim
+===================================================================
+--- vim/runtime/syntax/mysql.vim.orig
++++ vim/runtime/syntax/mysql.vim
+@@ -67,7 +67,7 @@
+ " Comments (c-style, mysql-style and modified sql-style)
+ syn region mysqlComment start="/\*" end="\*/"
+ syn match mysqlComment "#.*"
+-syn match mysqlComment "-- .*"
++syn match mysqlComment "--\_s.*"
+ syn sync ccomment mysqlComment
+
+ " Column types
--- /dev/null
+Index: vim/runtime/ftplugin/perl.vim
+===================================================================
+--- vim/runtime/ftplugin/perl.vim.orig
++++ vim/runtime/ftplugin/perl.vim
+@@ -39,6 +39,9 @@
+ set isfname+=:
+ "setlocal iskeyword=48-57,_,A-Z,a-z,:
+
++" Debian patch: use perldoc for keyword lookup
++setlocal keywordprg=perldoc\ -f
++
+ " Set this once, globally.
+ if !exists("perlpath")
+ if executable("perl")
--- /dev/null
+Index: vim/runtime/ftplugin/python.vim
+===================================================================
+--- vim/runtime/ftplugin/python.vim.orig
++++ vim/runtime/ftplugin/python.vim
+@@ -14,6 +14,9 @@
+ setlocal comments-=:%
+ setlocal commentstring=#%s
+
++" Debian patch: use pydoc for keyword lookup
++setlocal keywordprg=pydoc
++
+ setlocal omnifunc=pythoncomplete#Complete
+
+ set wildignore+=*.pyc
--- /dev/null
+Index: vim/runtime/ftplugin/ruby.vim
+===================================================================
+--- vim/runtime/ftplugin/ruby.vim.orig
++++ vim/runtime/ftplugin/ruby.vim
+@@ -20,6 +20,10 @@
+ let s:cpo_save = &cpo
+ set cpo&vim
+
++" Debian patch: use ri for keyword lookup
++setlocal keywordprg=ri
++setlocal iskeyword+=?,!
++
+ " Matchit support
+ if exists("loaded_matchit") && !exists("b:match_words")
+ let b:match_ignorecase = 0