Update runtime files.

diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index b901f21024b602a68e022f01dadf3d939dd6cf81..c6358e4eb9f249071dd39023d06731b7fe7b5963 100644 (file)
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -1,4 +1,4 @@
-*autocmd.txt*   For Vim version 8.0.  Last change: 2016 Sep 27
+*autocmd.txt*   For Vim version 8.0.  Last change: 2017 Jan 14
 
 
                  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -33,7 +33,7 @@ files matching *.c.  You can also use autocommands to implement advanced
 features, such as editing compressed files (see |gzip-example|).  The usual
 place to put autocommands is in your .vimrc or .exrc file.
 
-                                               *E203* *E204* *E143* *E855*
+                                       *E203* *E204* *E143* *E855* *E937*
 WARNING: Using autocommands is very powerful, and may lead to unexpected side
 effects.  Be careful not to destroy your text.
 - It's a good idea to do some testing on an expendable copy of a file first.

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index a53b5d23db79faf9e217cab378d2015fe7d00a89..ec4030e2bba775377f49ab314a4afc60c8c613ca 100644 (file)
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt*     For Vim version 8.0.  Last change: 2017 Jan 08
+*eval.txt*     For Vim version 8.0.  Last change: 2017 Jan 14
 
 
                  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -5256,6 +5256,7 @@ json_decode({string})                                     *json_decode()*
                - A trailing comma in an array and object is ignored.
                - More floating point numbers are recognized, e.g. "1." for
                  "1.0".
+               However, a duplicate key in an object is not allowed. *E938*
                The result must be a valid Vim type:
                - An empty object member name is not allowed.
                - Duplicate object member names are not allowed.
@@ -7249,7 +7250,7 @@ strcharpart({src}, {start}[, {len}])                      *strcharpart()*
                Like |strpart()| but using character index and length instead
                of byte index and length.
                When a character index is used where a character does not
-               exist it is assumed to be one byte.  For example: >
+               exist it is assumed to be one character.  For example: >
                        strcharpart('abc', -1, 2)
 <              results in 'a'.
 

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 88dca60b7727d140ce82ea8a7f16be5ada92c898..a9a0cc4835a70e691a33c131060bc43d13cd81b8 100644 (file)
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*  For Vim version 8.0.  Last change: 2017 Jan 02
+*options.txt*  For Vim version 8.0.  Last change: 2017 Jan 15
 
 
                  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -5144,7 +5144,7 @@ A jump table for the options with a short description can be found at |Q_op|.
                        {not in Vi}             *E21*
        When off the buffer contents cannot be changed.  The 'fileformat' and
        'fileencoding' options also can't be changed.
-       Can be reset with the |-M| command line argument.
+       Can be reset on startup with the |-M| command line argument.
 
                                *'modified'* *'mod'* *'nomodified'* *'nomod'*
 'modified' 'mod'       boolean (default off)
@@ -5809,6 +5809,7 @@ A jump table for the options with a short description can be found at |Q_op|.
        buffer, unless the 'Z' flag is in 'cpoptions'.
        {not in Vi:}  When using the ":view" command the 'readonly' option is
        set for the newly edited buffer.
+       See 'modifiable' for disallowing changes to the buffer.
 
                                                *'redrawtime'* *'rdt'*
 'redrawtime' 'rdt'     number  (default 2000)

diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index 49b1407b07cc1ab16e337549a208cda08465945f..eb1fdc89518c95343c8c76249c7ad0bf6d3065b7 100644 (file)
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -1,4 +1,4 @@
-*starting.txt*  For Vim version 8.0.  Last change: 2016 Nov 24
+*starting.txt*  For Vim version 8.0.  Last change: 2017 Jan 15
 
 
                  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -230,6 +230,7 @@ a slash.  Thus "-R" means recovery and "-/R" readonly.
                the executable "view" has the same effect as the -R argument.
                The 'updatecount' option will be set to 10000, meaning that
                the swap file will not be updated automatically very often.
+               See |-M| for disallowing modifications.
 
                                                        *-m*
 -m             Modifications not allowed to be written.  The 'write' option
@@ -1219,7 +1220,7 @@ There are several ways to exit Vim:
 - Use `:cquit`.  Also when there are changes.
 
 When using `:cquit` or when there was an error message Vim exits with exit
-code 1.  Errors can be avoided by using `:silent!`.
+code 1.  Errors can be avoided by using `:silent!` or with `:catch`.
 
 ==============================================================================
 8. Saving settings                                     *save-settings*

diff --git a/runtime/doc/tags b/runtime/doc/tags
index 0031975068e9d48d5df6111ea48728ae8a9b4f98..8bd61e5205516c00825d3487895c33db55905782 100644 (file)
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -4488,6 +4488,8 @@ E933      eval.txt        /*E933*
 E934   sign.txt        /*E934*
 E935   eval.txt        /*E935*
 E936   autocmd.txt     /*E936*
+E937   autocmd.txt     /*E937*
+E938   eval.txt        /*E938*
 E94    windows.txt     /*E94*
 E95    message.txt     /*E95*
 E96    diff.txt        /*E96*

diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 772d107f7c9443825e3e2405df6eda5c2f4a52ea..d324607c73118cd5e35c2fc6428bea6afc9f0eea 100644 (file)
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 8.0.  Last change: 2017 Jan 09
+*todo.txt*      For Vim version 8.0.  Last change: 2017 Jan 16
 
 
                  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -35,6 +35,8 @@ entered there will not be repeated below, unless there is extra information.
                                                        *known-bugs*
 -------------------- Known bugs and current work -----------------------
 
+get_syn_options() does not respect skip in else part. (Zyx)
+
 +channel:
 - Try out background make plugin: 
   https://github.com/AndrewVos/vim-make-background
@@ -120,28 +122,10 @@ What if there is an invalid character?
 
 Include rust files. (Klabnik, #1356)
 
-More float tests.  (Dominique, #1364)
-
-Patch to avoid ubsan warning for integer overflow. (Dominique, 2016 Dec 26)
-
-Bug: Json with same key should not give internal error. (Lcd, 2016 Oct 26)
-Make dict_add give a duplicate key error.
-
-Patch to make str2nr and str2float work with signed values.
-(Lemonbody, 2016 Dec 18, #1332)
-
-Should json_encode()/json_decode() restrict recursiveness?
-Or avoid recursiveness.
-
-Patch to fix UBSan error.  Is this actually needed?
-(Yegappan, 2016 Dec 18)
-
 Allow using json with empty key?  Dict already has it.
 
 Json string with trailing \u should be an error. (Lcd)
 
-Patch to reset ex_exitvalue after catch. (Christian Brabandt, 2016 Oct 23)
-
 Patch to deal with changed configure events in GTK 3. (Jan Alexander Steffens,
 2016 Oct 23 #1193)
 Remarks from nuko8, 2016 Nov 2.
@@ -159,6 +143,9 @@ Patch for :pyx, run python commands depending on the supported version.
 Patch to avoid warnings for overflow. (Mike Williams, 2016 Dec 16)
 Update Dec 19.
 
+When an item in the quickfix list has a file name that does not exist, behave
+like the item was not a match for :cnext.
+
 Wrong diff highlighting with three files. (2016 Oct 20, #1186)
 Also get E749 on exit.
 Another example in #1309
@@ -219,9 +206,6 @@ Or point to nightly builds: https://github.com/vim/vim-win32-installer/releases
 Problem passing non-UTF-8 strings to Python 3. (Björn Linse, 2016 Sep 11,
 #1053)  With patch, does it work?
 
-Patch to make finding duplicate tags much faster, using a hashtab. (James
-McCoy, 2016 Sept 14, #1046)  Should work now.  Updated Nov 12.
->
 Use ADDR_OTHER instead of ADDR_LINES for many more commands.
 Add tests for using number larger than number of lines in buffer.
 
@@ -251,6 +235,9 @@ Patch to make it possible to extend a list with itself.
 
 Patch to add Zstandard compressed file support. (Nick Terrell, 2016 Oct 24)
 
+Patch to add new regexp classes :ident:, :keyword:, :fname:.
+(ichizok, 2016 Jan 12, #1373)
+
 Patch to add trim() function. (Bukn, 2016 Nov 25, #1280)
 
 Patch to add MODIFIED_BY to MSVC build file. (Chen Lei, 2016 Nov 24, #1275)
@@ -475,6 +462,9 @@ Should use /usr/local/share/applications or /usr/share/applications.
 Or use $XDG_DATA_DIRS.
 Also need to run update-desktop-database (Kuriyama Kazunobu, 2015 Nov 4)
 
+Test object i{ and it do not behave the same. #1379
+Do not include the linebreak at the start?
+
 Patch to have text objects defined by arbitrary single characters. (Daniel
 Thau, 2013 Nov 20, 2014 Jan 29, 2014 Jan 31)
 Added tests (James McCoy, 2016 Aug 3).  Still needs more work.
@@ -972,11 +962,6 @@ highlighted as the cursor line.  (Alessandro Ivaldi, 2013 Jun 4)
 
 Two highlighting bugs. (ZyX, 2013 Aug 18)
 
-Patch to add the bufferlist() function. (Yegappan Lakshmanan, 2013 May 5)
-May 17: with winlist() and tabpagelist().
-May 19: with local variables.
-May 28: with options
-
 Patch to support 'u' in interactive substitute. (Christian Brabandt, 2012 Sep
 28)  With tests: Oct 9.
 
@@ -1219,8 +1204,6 @@ right type.
 string() can't parse back "inf" and "nan".  Fix documentation or fix code?
 (ZyX, 2010 Aug 23)
 
-Make 'formatprg' global-local. (Sung Pae)
-
 When doing "redir => s:foo" in a script and then "redir END" somewhere else
 (e.g. in a function) it can't find s:foo.
 When a script contains "redir => s:foo" but doesn't end redirection, a

diff --git a/runtime/doc/version8.txt b/runtime/doc/version8.txt
index 9cf047bb7a4e0fdabb1a2d95d070b3babfa09e83..4b0275597cd4c9fa4b5fbe552df251e93a600ce8 100644 (file)
--- a/runtime/doc/version8.txt
+++ b/runtime/doc/version8.txt
@@ -1,4 +1,4 @@
-*version8.txt*  For Vim version 8.0.  Last change: 2016 Dec 10
+*version8.txt*  For Vim version 8.0.  Last change: 2017 Jan 15
 
 
                  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -230,6 +230,7 @@ Ex commands: ~
 Ex command modifiers: ~
 
 |:keeppatterns|                following command keeps search pattern history
+|<mods>|               supply command modifiers to user defined commands
 
 
 New and extended functions: ~

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 9c9c808b47818f8857de6f6484a7ca1b7a245be6..dba6784e1ae4481166ea4dbf53a6bcb0ff174f8a 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -676,8 +676,14 @@ au BufNewFile,BufRead *.dtd                        setf dtd
 " DTS/DSTI (device tree files)
 au BufNewFile,BufRead *.dts,*.dtsi             setf dts
 
-" EDIF (*.edf,*.edif,*.edn,*.edo)
-au BufNewFile,BufRead *.ed\(f\|if\|n\|o\)      setf edif
+" EDIF (*.edf,*.edif,*.edn,*.edo) or edn
+au BufNewFile,BufRead *.ed\(f\|if\|o\)         setf edif
+au BufNewFile,BufRead *.edn
+       \ if getline(1) =~ '^\s*(\s*edif\>' |
+       \   setf edif |
+       \ else |
+       \   setf clojure |
+       \ endif
 
 " EditorConfig (close enough to dosini)
 au BufNewFile,BufRead .editorconfig            setf dosini

diff --git a/runtime/syntax/css.vim b/runtime/syntax/css.vim
index 3dc3f5c2d6de7c26c622cc2738a924b9f449a758..23db7b10e899bbe3b5e61f5c8c338779f07230bc 100644 (file)
--- a/runtime/syntax/css.vim
+++ b/runtime/syntax/css.vim
@@ -6,7 +6,8 @@
 "               Nikolai Weibull (Add CSS2 support)
 " Maintainer:   Jules Wang      <w.jq0722@gmail.com>
 " URL:          https://github.com/JulesWang/css.vim
-" Last Change:  2015 Apr.17
+" Last Change:  2017 Jan 14
+"              cssClassName updated by Ryuichi Hayashida Jan 2016
 
 " quit when a syntax file was already loaded
 if !exists("main_syntax")
@@ -56,7 +57,7 @@ syn match cssSelectorOp2 "[~|^$*]\?=" contained
 syn region cssAttributeSelector matchgroup=cssSelectorOp start="\[" end="]" contains=cssUnicodeEscape,cssSelectorOp2,cssStringQ,cssStringQQ
 
 " .class and #id
-syn match cssClassName "\.[A-Za-z][A-Za-z0-9_-]\+" contains=cssClassNameDot
+syn match cssClassName "\.-\=[A-Za-z_][A-Za-z0-9_-]*" contains=cssClassNameDot
 syn match cssClassNameDot contained '\.'
 
 try

diff --git a/runtime/syntax/debchangelog.vim b/runtime/syntax/debchangelog.vim
index a10e4ad342f5c14c726d4c38b016b7a9faffdeba..eb02aaf4af50e6d3289db9ef6e9c7271ae656ee1 100644 (file)
--- a/runtime/syntax/debchangelog.vim
+++ b/runtime/syntax/debchangelog.vim
@@ -3,7 +3,7 @@
 " Maintainer:  Debian Vim Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>
 " Former Maintainers: Gerfried Fuchs <alfie@ist.org>
 "                     Wichert Akkerman <wakkerma@debian.org>
-" Last Change: 2016 Aug 30
+" Last Change: 2016 Nov 12
 " URL: https://anonscm.debian.org/cgit/pkg-vim/vim.git/plain/runtime/syntax/debchangelog.vim
 
 " Standard syntax initialization
@@ -21,7 +21,7 @@ let binNMU='binary-only=yes'
 syn match debchangelogName     contained "^[[:alnum:]][[:alnum:].+-]\+ "
 exe 'syn match debchangelogFirstKV     contained "; \('.urgency.'\|'.binNMU.'\)"'
 exe 'syn match debchangelogOtherKV     contained ", \('.urgency.'\|'.binNMU.'\)"'
-syn match debchangelogTarget   contained "\v %(frozen|unstable|sid|%(testing|%(old)=stable)%(-proposed-updates|-security)=|experimental|squeeze-%(backports%(-sloppy)=|volatile|lts|security)|wheezy-%(backports%(-sloppy)=|security)|jessie%(-backports|-security)=|stretch|%(devel|precise|trusty|vivid|wily|xenial|yakkety)%(-%(security|proposed|updates|backports|commercial|partner))=)+"
+syn match debchangelogTarget   contained "\v %(frozen|unstable|sid|%(testing|%(old)=stable)%(-proposed-updates|-security)=|experimental|squeeze-%(backports%(-sloppy)=|volatile|lts|security)|wheezy-%(backports%(-sloppy)=|security)|jessie%(-backports|-security)=|stretch|%(devel|precise|trusty|vivid|wily|xenial|yakkety|zesty)%(-%(security|proposed|updates|backports|commercial|partner))=)+"
 syn match debchangelogVersion  contained "(.\{-})"
 syn match debchangelogCloses   contained "closes:\_s*\(bug\)\=#\=\_s\=\d\+\(,\_s*\(bug\)\=#\=\_s\=\d\+\)*"
 syn match debchangelogLP       contained "\clp:\s\+#\d\+\(,\s*#\d\+\)*"

diff --git a/runtime/syntax/debcontrol.vim b/runtime/syntax/debcontrol.vim
index b52c496c957b6859828c2c62c077cf210a7298c0..b1bc9f8bfe2d2a7f65abce6ff347498a87d3a362 100644 (file)
--- a/runtime/syntax/debcontrol.vim
+++ b/runtime/syntax/debcontrol.vim
@@ -38,7 +38,7 @@ unlet s:kernels s:archs s:pairs
 syn match debcontrolMultiArch contained "\%(no\|foreign\|allowed\|same\)"
 syn match debcontrolName contained "[a-z0-9][a-z0-9+.-]\+"
 syn match debcontrolPriority contained "\(extra\|important\|optional\|required\|standard\)"
-syn match debcontrolSection contained "\v((contrib|non-free|non-US/main|non-US/contrib|non-US/non-free|restricted|universe|multiverse)/)?(admin|cli-mono|comm|database|debian-installer|debug|devel|doc|editors|education|electronics|embedded|fonts|games|gnome|gnustep|gnu-r|graphics|hamradio|haskell|httpd|interpreters|introspection|java|kde|kernel|libs|libdevel|lisp|localization|mail|math|metapackages|misc|net|news|ocaml|oldlibs|otherosfs|perl|php|python|ruby|science|shells|sound|text|tex|utils|vcs|video|web|x11|xfce|zope)"
+syn match debcontrolSection contained "\v((contrib|non-free|non-US/main|non-US/contrib|non-US/non-free|restricted|universe|multiverse)/)?(admin|cli-mono|comm|database|debian-installer|debug|devel|doc|editors|education|electronics|embedded|fonts|games|gnome|gnustep|gnu-r|graphics|hamradio|haskell|httpd|interpreters|introspection|java|javascript|kde|kernel|libs|libdevel|lisp|localization|mail|math|metapackages|misc|net|news|ocaml|oldlibs|otherosfs|perl|php|python|ruby|rust|science|shells|sound|text|tex|utils|vcs|video|web|x11|xfce|zope)"
 syn match debcontrolPackageType contained "u\?deb"
 syn match debcontrolVariable contained "\${.\{-}}"
 syn match debcontrolDmUpload contained "\cyes"

diff --git a/runtime/syntax/debsources.vim b/runtime/syntax/debsources.vim
index 27779449715fdad7a6b9f1fa53c1cd14de0c2253..390c43035ec22c091ffb8cacdba9614cb8726355 100644 (file)
--- a/runtime/syntax/debsources.vim
+++ b/runtime/syntax/debsources.vim
@@ -2,7 +2,7 @@
 " Language:     Debian sources.list
 " Maintainer:   Debian Vim Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>
 " Former Maintainer: Matthijs Mohlmann <matthijs@cacholong.nl>
-" Last Change: 2016 Sep 27
+" Last Change: 2016 Nov 12
 " URL: https://anonscm.debian.org/cgit/pkg-vim/vim.git/plain/runtime/syntax/debsources.vim
 
 " Standard syntax initialization
@@ -25,7 +25,7 @@ let s:supported = [
       \ 'oldstable', 'stable', 'testing', 'unstable', 'experimental',
       \ 'squeeze', 'wheezy', 'jessie', 'stretch', 'sid', 'rc-buggy',
       \
-      \ 'precise', 'trusty', 'xenial', 'yakkety', 'devel'
+      \ 'precise', 'trusty', 'xenial', 'yakkety', 'zesty', 'devel'
       \ ]
 let s:unsupported = [
       \ 'buzz', 'rex', 'bo', 'hamm', 'slink', 'potato',

diff --git a/runtime/tutor/tutor.fr b/runtime/tutor/tutor.fr
index ef2d847dca8dd3e00c1d07b33c152ff2c0c68528..cdfdcd665b5f67c51d5dc65db678776405df4fa7 100644 (file)
--- a/runtime/tutor/tutor.fr
+++ b/runtime/tutor/tutor.fr
@@ -123,7 +123,7 @@ NOTE : En avan
                      Leçon 1.5 : ÉDITION DE TEXTE - AJOUTER
 
 
-                    ** Appuyez  A  pour ajouter du text. **
+                    ** Appuyez  A  pour ajouter du texte. **
 
   1. Déplacez le curseur sur la première ligne ci-dessous marquée --->.
      Peu importe sur quel caractère se trouve le curseur sur cette ligne.
@@ -574,7 +574,7 @@ NOTE : Quand la recherche atteint la fin du fichier, elle reprend au d
 
   2. Puis tapez le caractère  % .
 
-  3. Le curseur se déplacera sur la parenthèse out crochet correspondant.
+  3. Le curseur se déplacera sur la parenthèse ou crochet correspondant.
 
   4. Tapez  %  pour replacer le curseur sur la parenthèse ou crochet
      correspondant.
@@ -854,17 +854,17 @@ NOTE : Le mode Remplacement est comme le mode Insertion, mais tous les
   5. Tapez  p  pour coller le texte. Puis tapez :  un second <Échap> .
 
   6. Utilisez le mode Visuel pour sélectionner "élément", copiez-le avec  y  ,
-     déplacez-vous à la fin de la ligne suivant avec  j$  et collez le texte
+     déplacez-vous à la fin de la ligne suivante avec  j$  et collez le texte
      à cet endroit avec  p .
 
 --->  a) ceci est le premier élément.
       b)
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-                       Leçon 6.4 : RÉGLAGE DES OPTIONS
+                       Leçon 6.5 : RÉGLAGE DES OPTIONS
 
 
-    ** Réglons une option afin que la recherche et la substitution ignore la
+    ** Réglons une option afin que la recherche et la substitution ignorent la
        casse des caractères. **
 
   1. Recherchez 'ignore' en tapant :   /ignore <Entrée>
@@ -1034,5 +1034,5 @@ NOTE : Le compl
   Dernières mises à jour par Dominique Pellé.
 
   E-mail :      dominique.pelle@gmail.com
-  Last Change : 2016 Nov 08
+  Last Change : 2017 Jan 16
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

diff --git a/runtime/tutor/tutor.fr.utf-8 b/runtime/tutor/tutor.fr.utf-8
index 4e42fd3cb940baf40a1726099d85c415d4d783dc..0ec32879c66c520c050566ef27721251003c99cc 100644 (file)
--- a/runtime/tutor/tutor.fr.utf-8
+++ b/runtime/tutor/tutor.fr.utf-8
@@ -123,7 +123,7 @@ NOTE : En avançant dans ce cours, n'essayez pas de mémoriser, apprenez par
                      Leçon 1.5 : ÉDITION DE TEXTE - AJOUTER
 
 
-                    ** Appuyez  A  pour ajouter du text. **
+                    ** Appuyez  A  pour ajouter du texte. **
 
   1. Déplacez le curseur sur la première ligne ci-dessous marquée --->.
      Peu importe sur quel caractère se trouve le curseur sur cette ligne.
@@ -574,7 +574,7 @@ NOTE : Quand la recherche atteint la fin du fichier, elle reprend au début
 
   2. Puis tapez le caractère  % .
 
-  3. Le curseur se déplacera sur la parenthèse out crochet correspondant.
+  3. Le curseur se déplacera sur la parenthèse ou crochet correspondant.
 
   4. Tapez  %  pour replacer le curseur sur la parenthèse ou crochet
      correspondant.
@@ -854,17 +854,17 @@ NOTE : Le mode Remplacement est comme le mode Insertion, mais tous les
   5. Tapez  p  pour coller le texte. Puis tapez :  un second <Échap> .
 
   6. Utilisez le mode Visuel pour sélectionner "élément", copiez-le avec  y  ,
-     déplacez-vous à la fin de la ligne suivant avec  j$  et collez le texte
+     déplacez-vous à la fin de la ligne suivante avec  j$  et collez le texte
      à cet endroit avec  p .
 
 --->  a) ceci est le premier élément.
       b)
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-                       Leçon 6.4 : RÉGLAGE DES OPTIONS
+                       Leçon 6.5 : RÉGLAGE DES OPTIONS
 
 
-    ** Réglons une option afin que la recherche et la substitution ignore la
+    ** Réglons une option afin que la recherche et la substitution ignorent la
        casse des caractères. **
 
   1. Recherchez 'ignore' en tapant :   /ignore <Entrée>
@@ -1034,5 +1034,5 @@ NOTE : Le complètement fonctionne pour de nombreuses commandes. Essayez
   Dernières mises à jour par Dominique Pellé.
 
   E-mail :      dominique.pelle@gmail.com
-  Last Change : 2016 Nov 08
+  Last Change : 2017 Jan 16
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

diff --git a/src/po/eo.po b/src/po/eo.po
index c8915271cdea3fa427517085c7b471d99cc57602..3fb300c63f2e9b058225de26b87d163f345ce2fd 100644 (file)
--- a/src/po/eo.po
+++ b/src/po/eo.po
@@ -5,7 +5,7 @@
 #
 # UNUA TRADUKISTO Dominique PELLE   <dominique.pelle ĉe gmail.com>
 # PROVLEGANTO(J)  Felipe CASTRO     <fefcas ĉe gmail.com>
-#                 Antono MECHELYNCK <antoine.mechelynck ĉe skynet.be>
+#                 Antono MECHELYNCK <antoine.mechelynck ĉe gmail.com>
 #                 Yves NEVELSTEEN
 #
 # Uzitaj vortaroj kaj fakvortaroj:
@@ -23,8 +23,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim(Esperanto)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-26 20:54+0200\n"
-"PO-Revision-Date: 2016-08-26 20:30+0200\n"
+"POT-Creation-Date: 2017-01-16 00:30+0100\n"
+"PO-Revision-Date: 2017-01-16 01:14+0100\n"
 "Last-Translator: Dominique PELLÉ <dominique.pelle@gmail.com>\n"
 "Language-Team: \n"
 "Language: eo\n"
@@ -66,6 +66,9 @@ msgstr "E83: Ne eblas disponigi bufron, nun uzas alian..."
 msgid "E931: Buffer cannot be registered"
 msgstr "E931: Bufro ne povas esti registrita"
 
+msgid "E937: Attempt to delete a buffer that is in use"
+msgstr "E937: Provo de forviŝo de bufro, kiu estas uzanta"
+
 msgid "E515: No buffers were unloaded"
 msgstr "E515: Neniu bufro estis malŝargita"
 
@@ -269,7 +272,7 @@ msgid "E918: buffer must be loaded: %s"
 msgstr "E918: bufro devas esti ŝargita: %s"
 
 msgid "E821: File is encrypted with unknown method"
-msgstr "E821: Dosiero estas ĉifrata per nekonata metodo"
+msgstr "E821: Dosiero estas ĉifrita per nekonata metodo"
 
 msgid "Warning: Using a weak encryption method; see :help 'cm'"
 msgstr "Averto: uzo de malfortika ĉifrada metodo; vidu :help 'cm'"
@@ -1963,6 +1966,9 @@ msgstr "E462: Ne eblis prepari por reŝargi \"%s\""
 msgid "E321: Could not reload \"%s\""
 msgstr "E321: Ne eblis reŝargi \"%s\""
 
+msgid "--Deleted--"
+msgstr "--Forviŝita--"
+
 #, c-format
 msgid "auto-removing autocommand: %s <buffer=%d>"
 msgstr "aŭto-forviŝas aŭtokomandon: %s <bufro=%d>"
@@ -1972,12 +1978,12 @@ msgstr "aŭto-forviŝas aŭtokomandon: %s <bufro=%d>"
 msgid "E367: No such group: \"%s\""
 msgstr "E367: Ne ekzistas tia grupo: \"%s\""
 
+msgid "E936: Cannot delete the current group"
+msgstr "E936: Ne eblas forviŝi la aktualan grupon"
+
 msgid "W19: Deleting augroup that is still in use"
 msgstr "W19: Forviŝo de augroup kiu estas ankoraŭ uzata"
 
-msgid "--Deleted--"
-msgstr "--Forviŝita--"
-
 #, c-format
 msgid "E215: Illegal character after *: %s"
 msgstr "E215: Nevalida signo post *: %s"
@@ -2834,6 +2840,10 @@ msgid "E251: VIM instance registry property is badly formed.  Deleted!"
 msgstr ""
 "E251: Ecoj de registro de apero de VIM estas nevalide formata. Forviŝita!"
 
+#, c-format
+msgid "E938: Duplicate key in JSON: \"%s\""
+msgstr "E938: Ripetita ŝlosilo en JSON: \"%s\""
+
 #, c-format
 msgid "E696: Missing comma in List: %s"
 msgstr "E696: Mankas komo en Listo: %s"
@@ -3058,6 +3068,10 @@ msgid "--not-a-term\t\tSkip warning for input/output not being a terminal"
 msgstr ""
 "--not-a-term\t\tPreterpasi averton por enigo/eligo, kiu ne estas terminalo"
 
+msgid "--ttyfail\t\tExit if input or output is not a terminal"
+msgstr ""
+"--ttyfail\t\tEliri se le eniro aŭ eliro ne estas terminalo"
+
 msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
 msgstr "-u <vimrc>\t\tUzi <vimrc> anstataŭ iun ajn .vimrc"
 
@@ -4454,9 +4468,6 @@ msgstr "ERARO DE ENIGO/ELIGO"
 msgid "Message"
 msgstr "Mesaĝo"
 
-msgid "'columns' is not 80, cannot execute external commands"
-msgstr "'columns' ne estas 80, ne eblas plenumi eksterajn komandojn"
-
 msgid "E237: Printer selection failed"
 msgstr "E237: Elekto de presilo malsukcesis"
 
@@ -5998,14 +6009,6 @@ msgstr "E133: \":return\" ekster funkcio"
 msgid "E107: Missing parentheses: %s"
 msgstr "E107: Mankas krampoj: %s"
 
-#. Only MS VC 4.1 and earlier can do Win32s
-msgid ""
-"\n"
-"MS-Windows 16/32-bit GUI version"
-msgstr ""
-"\n"
-"Grafika versio MS-Vindozo 16/32-bitoj"
-
 msgid ""
 "\n"
 "MS-Windows 64-bit GUI version"
@@ -6305,13 +6308,6 @@ msgstr "tajpu  :help register<Enenklavo>  por pliaj informoj   "
 msgid "menu  Help->Sponsor/Register  for information    "
 msgstr "menuo Helpo->Subteni/Registri     por pliaj informoj   "
 
-msgid "WARNING: Windows 95/98/ME detected"
-msgstr "AVERTO: Trovis Vindozon 95/98/ME"
-
-# DP: atentu al la spacetoj: ĉiuj ĉenoj devas havi la saman longon
-msgid "type  :help windows95<Enter>  for info on this"
-msgstr "tajpu  :help windows95<Enenklavo> por pliaj informoj   "
-
 msgid "Already only one window"
 msgstr "Jam nur unu fenestro"
 
@@ -6465,6 +6461,10 @@ msgstr "E236: La tiparo \"%s\" ne estas egallarĝa"
 msgid "E473: Internal error"
 msgstr "E473: Interna eraro"
 
+#, c-format
+msgid "E685: Internal error: %s"
+msgstr "E685: Interna eraro: %s"
+
 msgid "Interrupted"
 msgstr "Interrompita"
 
@@ -6745,10 +6745,6 @@ msgstr "E463: Regiono estas gardita, ne eblas ŝanĝi"
 msgid "E744: NetBeans does not allow changes in read-only files"
 msgstr "E744: NetBeans ne permesas ŝanĝojn en nurlegeblaj dosieroj"
 
-#, c-format
-msgid "E685: Internal error: %s"
-msgstr "E685: Interna eraro: %s"
-
 msgid "E363: pattern uses more memory than 'maxmempattern'"
 msgstr "E363: ŝablono uzas pli da memoro ol 'maxmempattern'"
 

diff --git a/src/po/fr.po b/src/po/fr.po
index 171a907a5135465b740256643d9999dde1f00317..05b2fa0e6660b7214e6363b92f0ddf3326b8f6c9 100644 (file)
--- a/src/po/fr.po
+++ b/src/po/fr.po
@@ -6,7 +6,7 @@
 #  FIRST AUTHOR  DindinX         <David.Odin@bigfoot.com>     2000.
 # SECOND AUTHOR  Adrien Beau     <version.francaise@free.fr>  2002, 2003.
 #  THIRD AUTHOR  David Blanchet  <david.blanchet@free.fr>     2006, 2008.
-# FOURTH AUTHOR  Dominique Pellé <dominique.pelle@gmail.com>  2008, 2016.
+# FOURTH AUTHOR  Dominique Pellé <dominique.pelle@gmail.com>  2008, 2017.
 #
 # Latest translation available at:
 #   http://dominique.pelle.free.fr/vim-fr.php
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim(Français)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-26 20:54+0200\n"
-"PO-Revision-Date: 2016-08-26 20:34+0200\n"
+"POT-Creation-Date: 2017-01-16 00:30+0100\n"
+"PO-Revision-Date: 2017-01-16 00:51+0100\n"
 "Last-Translator: Dominique Pellé <dominique.pelle@gmail.com>\n"
 "Language-Team: \n"
 "Language: fr\n"
@@ -63,6 +63,9 @@ msgstr ""
 msgid "E931: Buffer cannot be registered"
 msgstr "E931: Le tampon ne peut pas être enregistré"
 
+msgid "E937: Attempt to delete a buffer that is in use"
+msgstr "E937: Tentative de suppression d'un tampon en cours d'utilisation"
+
 msgid "E515: No buffers were unloaded"
 msgstr "E515: Aucun tampon n'a été déchargé"
 
@@ -242,7 +245,7 @@ msgid "E898: socket() in channel_open()"
 msgstr "E898: socket() dans channel_open()"
 
 msgid "E903: received command with non-string argument"
-msgstr "E903: commande reçue avec une argument qui n'est pas une chaîne"
+msgstr "E903: commande reçue avec un argument qui n'est pas une chaîne"
 
 msgid "E904: last argument for expr/call must be a number"
 msgstr "E904: le dernier argument de expr/call doit être un nombre"
@@ -2150,6 +2153,9 @@ msgstr "E462: Impossible de pr
 msgid "E321: Could not reload \"%s\""
 msgstr "E321: Impossible de recharger \"%s\""
 
+msgid "--Deleted--"
+msgstr "--Effacé--"
+
 #, c-format
 msgid "auto-removing autocommand: %s <buffer=%d>"
 msgstr "Autocommandes marquées pour auto-suppression : %s <tampon=%d>"
@@ -2159,12 +2165,12 @@ msgstr "Autocommandes marqu
 msgid "E367: No such group: \"%s\""
 msgstr "E367: Aucun groupe \"%s\""
 
+msgid "E936: Cannot delete the current group"
+msgstr "E936: Impossible de supprimer le groupe courant"
+
 msgid "W19: Deleting augroup that is still in use"
 msgstr "W19: Effacement d'augroup toujours en usage"
 
-msgid "--Deleted--"
-msgstr "--Effacé--"
-
 #, c-format
 msgid "E215: Illegal character after *: %s"
 msgstr "E215: Caractère non valide après * : %s"
@@ -2854,7 +2860,7 @@ msgid "invalid expression"
 msgstr "expression invalide"
 
 msgid "expressions disabled at compile time"
-msgstr "expressions désactivée lors de la compilation"
+msgstr "expressions désactivées lors de la compilation"
 
 msgid "hidden option"
 msgstr "option cachée"
@@ -3041,6 +3047,10 @@ msgstr "E573: Id utilis
 msgid "E251: VIM instance registry property is badly formed.  Deleted!"
 msgstr "E251: Entrée registre de l'instance de Vim mal formatée. Suppression !"
 
+#, c-format
+msgid "E938: Duplicate key in JSON: \"%s\""
+msgstr "E938: Clé dupliquée dans le document JSON : \"%s\""
+
 #, c-format
 msgid "E696: Missing comma in List: %s"
 msgstr "E696: Il manque une virgule dans la Liste %s"
@@ -3269,6 +3279,10 @@ msgid "--not-a-term\t\tSkip warning for input/output not being a terminal"
 msgstr ""
 "--no-a-term\t\tAucun avertissement si l'entrée/sortie n'est pas un terminal"
 
+msgid "--ttyfail\t\tExit if input or output is not a terminal"
+msgstr ""
+"--ttyfail\t\tQuitte si l'entrée ou la sortie ne sont pas un terminal"
+
 msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
 msgstr "-u <vimrc>\tUtiliser <vimrc> au lieu du vimrc habituel"
 
@@ -4682,9 +4696,6 @@ msgstr "ERREUR d'E/S"
 msgid "Message"
 msgstr "Message"
 
-msgid "'columns' is not 80, cannot execute external commands"
-msgstr "'columns' ne vaut pas 80, impossible d'exécuter des commandes externes"
-
 msgid "E237: Printer selection failed"
 msgstr "E237: La sélection de l'imprimante a échoué"
 
@@ -5625,7 +5636,7 @@ msgstr ""
 #. This should have been checked when generating the .spl
 #. * file.
 msgid "E783: duplicate char in MAP entry"
-msgstr "E783: caractères dupliqué dans l'entrée MAP"
+msgstr "E783: caractère dupliqué dans l'entrée MAP"
 
 msgid "No Syntax items defined for this buffer"
 msgstr "Aucun élément de syntaxe défini pour ce tampon"
@@ -6264,14 +6275,6 @@ msgstr "E133: :return en dehors d'une fonction"
 msgid "E107: Missing parentheses: %s"
 msgstr "E107: Parenthèses manquantes : %s"
 
-#. Only MS VC 4.1 and earlier can do Win32s
-msgid ""
-"\n"
-"MS-Windows 16/32-bit GUI version"
-msgstr ""
-"\n"
-"Version graphique MS-Windows 16/32 bits"
-
 msgid ""
 "\n"
 "MS-Windows 64-bit GUI version"
@@ -6561,12 +6564,6 @@ msgstr "tapez  :help register<Entr
 msgid "menu  Help->Sponsor/Register  for information    "
 msgstr "menu  Aide->Sponsor/Enregistrement pour plus d'info"
 
-msgid "WARNING: Windows 95/98/ME detected"
-msgstr "ALERTE: Windows 95/98/ME détecté"
-
-msgid "type  :help windows95<Enter>  for info on this"
-msgstr "tapez  :help windows95<Entrée>  pour plus d'information"
-
 msgid "Already only one window"
 msgstr "Il n'y a déjà plus qu'une fenêtre"
 
@@ -6727,6 +6724,10 @@ msgstr "E236: La police \"%s\" n'a pas une chasse (largeur) fixe"
 msgid "E473: Internal error"
 msgstr "E473: Erreur interne"
 
+#, c-format
+msgid "E685: Internal error: %s"
+msgstr "E685: Erreur interne : %s"
+
 msgid "Interrupted"
 msgstr "Interrompu"
 
@@ -7011,10 +7012,6 @@ msgid "E744: NetBeans does not allow changes in read-only files"
 msgstr ""
 "E744: NetBeans n'autorise pas la modification des fichiers en lecture seule"
 
-#, c-format
-msgid "E685: Internal error: %s"
-msgstr "E685: Erreur interne : %s"
-
 msgid "E363: pattern uses more memory than 'maxmempattern'"
 msgstr "E363: le motif utilise plus de mémoire que 'maxmempattern'"