vim-patch:24a98a0eb772

Update runtime files

https://github.com/vim/vim/commit/24a98a0eb77245adc50facad8b735b20bfd31a7e

7 files changed, 23 insertions, 14 deletions

diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt
index ebf47ae467..af1c8b6615 100644
--- a/runtime/doc/diff.txt
+++ b/runtime/doc/diff.txt
@@ -13,7 +13,7 @@ The basics are explained in section |08.7| of the user manual.
                                       Type |gO| to see the table of contents.
 
 ==============================================================================
-1. Starting diff mode
+1. Starting diff mode					*start-vimdiff*
 
 To start editing in diff mode, run "nvim -d".  This starts Nvim as usual, and
 additionally sets up for viewing the differences between the arguments. >
diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index 196502a08a..9b61fa6527 100644
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -15,7 +15,7 @@ manual.
 1. Key mapping				*key-mapping* *mapping* *macro*
 
 Key mapping is used to change the meaning of typed keys.  The most common use
-is to define a sequence commands for a function key.  Example: >
+is to define a sequence of commands for a function key.  Example: >
 
 	:map <F2> a<C-R>=strftime("%c")<CR><Esc>
 
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 9b89a34768..909562f38c 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -6401,7 +6401,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Save the whole buffer for undo when reloading it.  This applies to the
 	":e!" command and reloading for when the buffer changed outside of
 	Vim. |FileChangedShell|
-	The save only happens when this options is negative or when the number
+	The save only happens when this option is negative or when the number
 	of lines is smaller than the value of this option.
 	Set this option to zero to disable undo for a reload.
 
diff --git a/runtime/doc/windows.txt b/runtime/doc/windows.txt
index 374bf087d5..e83377471c 100644
--- a/runtime/doc/windows.txt
+++ b/runtime/doc/windows.txt
@@ -587,7 +587,8 @@ The minimal height and width of a window is set with 'winminheight' and
 41. :buffers		list of buffers
 
 The meaning of [N] depends on the command:
- [N] is number of buffers to go forward/backward on ?2, ?3, and ?4
+ [N] is the number of buffers to go forward/backward on 2/12/22/32,
+     3/13/23/33, and 4/14/24/34
  [N] is an argument number, defaulting to current argument, for 1 and 21
  [N] is a buffer number, defaulting to current buffer, for 11 and 31
  [N] is a count for 19 and 39
diff --git a/runtime/indent/cmake.vim b/runtime/indent/cmake.vim
index 85a9ec4e98..845bdd7655 100644
--- a/runtime/indent/cmake.vim
+++ b/runtime/indent/cmake.vim
@@ -3,7 +3,7 @@
 " Author:       Andy Cedilnik <andy.cedilnik@kitware.com>
 " Maintainer:   Dimitri Merejkowsky <d.merej@gmail.com>
 " Former Maintainer: Karthik Krishnan <karthik.krishnan@kitware.com>
-" Last Change:  2017 Aug 30
+" Last Change:  2017 Sep 24
 "
 " Licence:      The CMake license applies to this file. See
 "               https://cmake.org/licensing
@@ -14,7 +14,6 @@ if exists("b:did_indent")
 endif
 let b:did_indent = 1
 
-setlocal et
 setlocal indentexpr=CMakeGetIndent(v:lnum)
 setlocal indentkeys+==ENDIF(,ENDFOREACH(,ENDMACRO(,ELSE(,ELSEIF(,ENDWHILE(
 
@@ -67,19 +66,19 @@ fun! CMakeGetIndent(lnum)
     let ind = ind
   else
     if previous_line =~? cmake_indent_begin_regex
-      let ind = ind + &sw
+      let ind = ind + shiftwidth()
     endif
     if previous_line =~? cmake_indent_open_regex
-      let ind = ind + &sw
+      let ind = ind + shiftwidth()
     endif
   endif
 
   " Subtract
   if this_line =~? cmake_indent_end_regex
-    let ind = ind - &sw
+    let ind = ind - shiftwidth()
   endif
   if previous_line =~? cmake_indent_close_regex
-    let ind = ind - &sw
+    let ind = ind - shiftwidth()
   endif
 
   return ind
diff --git a/src/nvim/po/it.po b/src/nvim/po/it.po
index 91a68cf1e6..c95faf1dce 100644
--- a/src/nvim/po/it.po
+++ b/src/nvim/po/it.po
@@ -1417,6 +1417,7 @@ msgstr "E904: l'ultimo argomento per espressione/chiamata dev'essere numerico"
 msgid "E904: third argument for call must be a list"
 msgstr "E904: il terzo argomento della chiamata dev'essere una Lista"
 
+#, c-format
 msgid "E905: received unknown command: %s"
 msgstr "E905: recevuto comando non conosciuto: %s"
 
@@ -1424,6 +1425,7 @@ msgstr "E905: recevuto comando non conosciuto: %s"
 msgid "E630: %s(): write while not connected"
 msgstr "E630: %s(): scrittura in mancanza di connessione"
 
+#, c-format
 msgid "E631: %s(): write failed"
 msgstr "E631: %s(): scrittura non riuscita"
 
@@ -4837,6 +4839,7 @@ msgstr ""
 "\n"
 "Non posso impostare il contesto di sicurezza per "
 
+#, c-format
 msgid "E151: No match: %s"
 msgstr "E151: Nessuna corrispondenza: %s"
 
@@ -5382,6 +5385,12 @@ msgstr "E772: Il file ortografico è per versioni di Vim più recenti"
 msgid "E770: Unsupported section in spell file"
 msgstr "E770: Sezione non supportata nel file ortografico"
 
+msgid "E944: Reverse range in character class"
+msgstr "E944: Intervallo invertito nella classe di caratteri"
+
+msgid "E945: Range too large in character class"
+msgstr "E945: Intervallo troppo ampio nella classe di caratteri"
+
 #, c-format
 msgid "E779: Old .sug file, needs to be updated: %s"
 msgstr "E779: File .sug obsoleto, è necessario aggiornarlo: %s"
diff --git a/src/nvim/po/pt_BR.po b/src/nvim/po/pt_BR.po
index 37942704e7..f8d6ac3011 100644
--- a/src/nvim/po/pt_BR.po
+++ b/src/nvim/po/pt_BR.po
@@ -24,7 +24,7 @@ msgstr "[Ajuda]"
 
 #: ../screen.c:4815 ../buffer.c:3244
 msgid "[Preview]"
-msgstr "[Visualização]"
+msgstr "[Visualização]"
 
 #: ../screen.c:4823 ../fileio.c:1855 ../buffer.c:2496 ../buffer.c:3207
 msgid "[RO]"
@@ -4859,7 +4859,7 @@ msgstr " tipo arquivo\n"
 
 #: ../ex_getln.c:4762
 msgid "'history' option is zero"
-msgstr "opção 'history' vale zero"
+msgstr "opção 'history' vale zero"
 
 #: ../ex_getln.c:5008
 #, c-format
@@ -6203,7 +6203,7 @@ msgstr "--\t\t\tApenas nomes de arquivo depois daqui"
 
 #: ../main.c:2177
 msgid "--literal\t\tDon't expand wildcards"
-msgstr "--literal\t\tNão expandir caracteres-curinga"
+msgstr "--literal\t\tNão expandir caracteres-curinga"
 
 #: ../main.c:2179
 msgid "-v\t\t\tVi mode (like \"vi\")"
@@ -6227,7 +6227,7 @@ msgstr "-d\t\t\tModo diff (como \"vimdiff\")"
 
 #: ../main.c:2184
 msgid "-y\t\t\tEasy mode (like \"evim\", modeless)"
-msgstr "-y\t\t\tModo fácil (como \"evim\", o Vim não modal)"
+msgstr "-y\t\t\tModo fácil (como \"evim\", o Vim não modal)"
 
 #: ../main.c:2185
 msgid "-R\t\t\tReadonly mode (like \"view\")"