mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-01 23:48:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #5428 'vim-patch: 0c1ff16, 939a1ab, 8067a64'.

Browse Source
This commit is contained in:
Justin M. Keyes
2016-10-08 17:07:20 +02:00
parent 31f6334aa8 7bc86b2bbc
commit 1984072822
14 changed files with 288 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/nvim/po/eo.po
View File

@@ -23,8 +23,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Vim(Esperanto)\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-02-13 23:42+0100\n"
"PO-Revision-Date: 2016-02-13 23:45+0100\n"
"POT-Creation-Date: 2016-03-29 23:03+0200\n"
"PO-Revision-Date: 2016-03-29 23:05+0200\n"
"Last-Translator: Dominique PELLÉ <dominique.pelle@gmail.com>\n"
"Language-Team: \n"
"Language: eo\n"
@@ -1346,7 +1346,6 @@ msgstr "E670: Miksaĵo de kodoprezento de helpa dosiero en lingvo: %s"
msgid "E154: Duplicate tag \"%s\" in file %s/%s"
msgstr "E154: Ripetita etikedo \"%s\" en dosiero %s/%s"
#: ../ex_cmds.c:5687
#, c-format
msgid "E160: Unknown sign command: %s"
msgstr "E160: Nekonata simbola komando: %s"
@@ -1482,8 +1481,8 @@ msgstr "Serĉado de \"%s\""
#: ../ex_cmds2.c:2307
#, c-format
msgid "not found in 'runtimepath': \"%s\""
msgstr "ne trovita en 'runtimepath': \"%s\""
msgid "not found in '%s': \"%s\""
msgstr "ne trovita en '%s: \"%s\""
#: ../ex_cmds2.c:2472
#, c-format
@@ -6686,6 +6685,12 @@ msgstr "E446: Neniu dosiernomo sub la kursoro"
#~ msgid "E232: Cannot create BalloonEval with both message and callback"
#~ msgstr "E232: Ne eblas krei BalloonEval kun ambaŭ mesaĝo kaj reagfunkcio"
msgid "Yes"
msgstr "Jes"
msgid "No"
msgstr "Ne"
# todo '_' is for hotkey, i guess?
#~ msgid "Input _Methods"
#~ msgstr "Enigaj _metodoj"

12
src/nvim/po/fr.po
View File

@@ -645,7 +645,7 @@ msgstr "E708: [:] ne peut
#: ../eval.c:2439
msgid "E709: [:] requires a List value"
msgstr "E709: [:] requiert une Liste"
msgstr "E709: [:] n?cessite une Liste"
#: ../eval.c:2674
msgid "E710: List value has more items than target"
@@ -1639,8 +1639,8 @@ msgstr "Recherche de \"%s\""
#: ../ex_cmds2.c:2307
#, c-format
msgid "not found in 'runtimepath': \"%s\""
msgstr "introuvable dans 'runtimepath' : \"%s\""
msgid "not found in '%s': \"%s\""
msgstr "introuvable dans '%s' : \"%s\""
#: ../ex_cmds2.c:2472
#, c-format
@@ -6877,6 +6877,12 @@ msgstr "E446: Aucun nom de fichier sous le curseur"
#~ msgid "E232: Cannot create BalloonEval with both message and callback"
#~ msgstr "E232: Impossible de cr<63>er un BalloonEval avec message ET callback"
msgid "Yes"
msgstr "Oui"
msgid "No"
msgstr "Non"
# todo '_' is for hotkey, i guess?
#~ msgid "Input _Methods"
#~ msgstr "_M<5F>thodes de saisie"

1
src/nvim/testdir/test_alot.vim
View File

@@ -3,6 +3,7 @@
source test_assign.vim
source test_cursor_func.vim
source test_ex_undo.vim
source test_feedkeys.vim
source test_cmdline.vim
source test_menu.vim

19
src/nvim/testdir/test_ex_undo.vim Normal file
View File

@@ -0,0 +1,19 @@
" Tests for :undo
func Test_ex_undo()
new ex-undo
setlocal ul=10
exe "normal ione\n\<Esc>"
setlocal ul=10
exe "normal itwo\n\<Esc>"
setlocal ul=10
exe "normal ithree\n\<Esc>"
call assert_equal(4, line('$'))
undo
call assert_equal(3, line('$'))
undo 1
call assert_equal(2, line('$'))
undo 0
call assert_equal(1, line('$'))
quit!
endfunc