Updated runtime file. Fix Italian translations.

runtime/doc/options.txt

-*options.txt*	For Vim version 7.3.  Last change: 2011 Feb 15
+*options.txt*	For Vim version 7.3.  Last change: 2011 Mar 22
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar

runtime/doc/todo.txt

@@ -31,27 +31,15 @@ be worked on, but only if you sponsor Vim development.  See |sponsor|.
 -------------------- Known bugs and current work -----------------------
 
 The :z command doesn't work exactly as it should. (ChangZhuo Chen, 2011 Mar 2)
-
-Crash with ":python help(dir)". (Kearn Holliday, 2011 Mar 19)
-I can reproduce it.  Don't know why it happens.
-
 Compare with how old Vi works and with posix spec.  terminal is 80 x 24,
 'scroll' option set to 11.
 
-Update Bavarian tutor. (Sepp Hell, 2011 Mar 10)
-
-After ":set t_kb=" ":set t_kb" gives an error, should report an empty string.
-Can do ":set t_xy=foo", need to check for valid name.
-
-Menu File/Close should close a tab if it's not the last one and it
-contains only one window (Jean Johner)
-Patch by Ben Schmidt (7 maart)
-
-Patch to update .hgtags (Ben Haskell, 2011 Mar 8)
-Also hints how to add a tag after committing a patch.
+Crash with ":python help(dir)". (Kearn Holliday, 2011 Mar 19)
+I can reproduce it.  Don't know why it happens.
 
-Patch for slow write: undefined symbols with FEAT_CLIENTSERVER.
-Alternative tests.  (Krasilnikov)
+'cursorline' is displayed too short when there are concealed characters and
+'list' is set.  (Dennis Preiser)
+Patch 7.3.116 was the wrong solution.
 
 When opening file from windows explorer, characters inside [] cause
 problems, even though double quotes are used. (Manuel Stol, 2011 Mar 9)

runtime/indent/vim.vim

 " Vim indent file
 " Language:	Vim script
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2005 Jul 06
+" Last Change:	2011 Mar 22
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
@@ -44,10 +44,18 @@ function GetVimIndent()
     else
       let ind = ind + &sw * 3
     endif
-  elseif getline(lnum) =~ '\(^\||\)\s*\(if\|wh\%[ile]\|for\|try\|cat\%[ch]\|fina\%[lly]\|fu\%[nction]\|el\%[seif]\)\>'
-    let ind = ind + &sw
   elseif getline(lnum) =~ '^\s*aug\%[roup]' && getline(lnum) !~ '^\s*aug\%[roup]\s*!\=\s\+END'
     let ind = ind + &sw
+  else
+    let line = getline(lnum)
+    let i = match(line, '\(^\||\)\s*\(if\|wh\%[ile]\|for\|try\|cat\%[ch]\|fina\%[lly]\|fu\%[nction]\|el\%[seif]\)\>')
+    if i >= 0
+      let ind += &sw
+      if strpart(line, i, 1) == '|' && has('syntax_items')
+            \ && synIDattr(synID(lnum, i, 1), "name") =~ '\(Comment\|String\)$' 
+        let ind -= &sw
+      endif
+    endif
   endif
 
   " If the previous line contains an "end" after a pipe, but not in an ":au"

runtime/menu.vim

@@ -2,7 +2,7 @@
 " You can also use this as a start for your own set of menus.
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2009 Feb 26
+" Last Change:	2011 Mar 22
 
 " Note that ":an" (short for ":anoremenu") is often used to make a menu work
 " in all modes and avoid side effects from mappings defined by the user.
@@ -101,7 +101,7 @@ an 10.320 &File.Sp&lit-Open\.\.\.<Tab>:sp	:browse sp<CR>
 an 10.320 &File.Open\ Tab\.\.\.<Tab>:tabnew	:browse tabnew<CR>
 an 10.325 &File.&New<Tab>:enew			:confirm enew<CR>
 an <silent> 10.330 &File.&Close<Tab>:close
-	\ :if winheight(2) < 0 <Bar>
+	\ :if winheight(2) < 0 && tabpagewinnr(2) == 0 <Bar>
 	\   confirm enew <Bar>
 	\ else <Bar>
 	\   confirm close <Bar>

runtime/tutor/Makefile

@@ -6,7 +6,7 @@
 # Similarly for Russian and Korean
 
 all: tutor.utf-8 \
-	tutor.bj \
+	tutor.bar \
 	tutor.ca.utf-8 \
 	tutor.de.utf-8 \
 	tutor.el tutor.el.cp737 \
@@ -28,8 +28,8 @@ all: tutor.utf-8 \
 tutor.utf-8: tutor
 	iconv -f ISO-8859-1 -t UTF-8 tutor > tutor.utf-8
 
-tutor.bj: tutor.bj.utf-8
-	iconv -f UTF-8 -t ISO-8859-1 tutor.bj.utf-8 > tutor.bj
+tutor.bar: tutor.bar.utf-8
+	iconv -f UTF-8 -t ISO-8859-1 tutor.bar.utf-8 > tutor.bar
 
 tutor.ca.utf-8: tutor.ca
 	iconv -f ISO-8859-1 -t UTF-8 tutor.ca > tutor.ca.utf-8

src/po/it.po

@@ -3791,7 +3791,7 @@ msgstr ""
 "\n"
 "(1) Un altro programma pu essere in edit sullo stesso file.\n"
 "    Se  cos, attenzione a non trovarti con due versioni\n"
-"    differenti dello stesso file a cui vengono apportate modifiche.\n"
+"    differenti dello stesso file a cui vengono apportate modifiche."
 
 msgid "  Quit, or continue with caution.\n"
 msgstr "  Esci, o continua con prudenza.\n"