Minor runtime file updates.

5 files changed, 17 insertions, 2 deletions

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 8b613b7550..3862b91740 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -5442,7 +5442,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	and left-to-right strings so that both sets are displayed properly
 	in different windows).  Also see |rileft.txt|.
 
-			*'rightleftcmd'* *'rlc'* *'norightleftcmd'* *'norlc'*
+			*'rightleftcmd'* *'rlc'*
 'rightleftcmd' 'rlc'	string	(default "search")
 			local to window
 			{not in Vi}
diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt
index 3bc86b556b..564be8e189 100644
--- a/runtime/doc/quickref.txt
+++ b/runtime/doc/quickref.txt
@@ -639,6 +639,7 @@ Short explanation of each option:		*option-list*
 'clipboard'	  'cb'	    use the clipboard as the unnamed register
 'cmdheight'	  'ch'	    number of lines to use for the command-line
 'cmdwinheight'	  'cwh'     height of the command-line window
+'colorcolumn'	  'cc'	    columns to highlight
 'columns'	  'co'	    number of columns in the display
 'comments'	  'com'     patterns that can start a comment line
 'commentstring'   'cms'     template for comments; used for fold marker
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 098a431f66..928582d5e8 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -91,6 +91,8 @@ Jumplist doesn't work properly in Insert mode? (Jean Johner, 2010 Mar 20)
 Problem with transparent cmdline.  Also: Terminal title is wrong with
 non-ASCII character. (Lily White, 2010 Mar 7)
 
+Patch for horizontal mouse wheel. (Bjorn Winckler, 2010 Jul 18)
+
 iconv() doesn't fail on an illegal character, as documented. (Yongwei Wu, 2009
 Nov 15, example Nov 26)  Add argument to specify whether iconv() should fail
 or replace with a character and continue?
diff --git a/runtime/optwin.vim b/runtime/optwin.vim
index 01654c56ff..79894611bc 100644
--- a/runtime/optwin.vim
+++ b/runtime/optwin.vim
@@ -407,6 +407,9 @@ if has("syntax")
   call append("$", "cursorline\thighlight the screen line of the cursor")
   call append("$", "\t(local to window)")
   call <SID>BinOptionL("cul")
+  call append("$", "colorcolumn\tcolumns to highlight")
+  call append("$", "\t(local to window)")
+  call <SID>OptionL("cc")
   call append("$", "spell\thighlight spelling mistakes")
   call append("$", "\t(local to window)")
   call <SID>BinOptionL("spell")
diff --git a/runtime/spell/sv/main.aap b/runtime/spell/sv/main.aap
index 1d9b428d25..536a0452ff 100644
--- a/runtime/spell/sv/main.aap
+++ b/runtime/spell/sv/main.aap
@@ -21,7 +21,7 @@ $SPELLDIR/sv.utf-8.spl : $FILES
         :sys env LANG=sv_SE.UTF-8
 		$VIM -u NONE -e -c "mkspell! $SPELLDIR/sv sv_SE" -c q
 
-../README_sv.txt : LICENSE_sv_SE.txt
+../README_sv.txt : README_sv.txt
         :copy $source $target
 
 #
@@ -41,6 +41,9 @@ sv_SE.aff sv_SE.dic: {buildcheck=}
         :copy dictionaries/sv_SE.aff sv_SE.aff
         :copy dictionaries/sv_SE.dic sv_SE.dic
         :delete {r} dictionaries dictionaries.xcu description.xml
+        :delete {f} README_sv.txt
+        :sys $VIM README_sv.txt -u NONE -N -e -c "0read LICENSE_en_US.txt" -c "read LICENSE_sv_SE.txt" -c "set ff=unix" -c write -c q
+        :delete LICENSE_en_US.txt LICENSE_sv_SE.txt
         @if not os.path.exists('sv_SE.orig.aff'):
             :copy sv_SE.aff sv_SE.orig.aff
         @if not os.path.exists('sv_SE.orig.dic'):
@@ -48,6 +51,12 @@ sv_SE.aff sv_SE.dic: {buildcheck=}
         @if os.path.exists('sv_SE.diff'):
             :sys patch <sv_SE.diff
 
+# Delete all the generated files, start from scratch
+clean:
+        :delete {f} sv_SE.aff sv_SE.dic
+        :delete {f} sv_SE.aff.orig sv_SE.dic.orig
+        :delete {f} sv_SE.orig.aff sv_SE.orig.dic
+        :delete {f} README_sv.txt
 
 # Generate diff files, so that others can get the OpenOffice files and apply
 # the diffs to get the Vim versions.