Updated runtime files.
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 8be5ee4..bf33b48 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt* For Vim version 7.4. Last change: 2016 Jul 01
+*eval.txt* For Vim version 7.4. Last change: 2016 Jul 02
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -796,13 +796,16 @@
recursively. Ignoring case means case is ignored when comparing item values.
*E694*
-A |Funcref| can only be compared with a |Funcref| and only "equal" and "not
-equal" can be used. Case is never ignored. Whether arguments or a Dictionary
-are bound (with a partial) is ignored. This is so that when a function is
-made a member of a Dictionary it is still considered to be the same function.
-To compare partials to see if they bind the same argument and Dictionary
-values use string(): >
- echo string(Partial1) == string(Partial2)
+A |Funcref| can only be compared with a |Funcref| and only "equal", "not
+equal", "is" and "isnot" can be used. Case is never ignored. Whether
+arguments or a Dictionary are bound (with a partial) matters. The
+Dictionaries must also be equal (or the same, in case of "is") and the
+arguments must be equal (or the same).
+
+To compare Funcrefs to see if they refer to the same function, ignoring bound
+Dictionary and arguments, use |get()| to get the function name: >
+ if get(Part1, 'name') == get(Part2, 'name')
+ " Part1 and Part2 refer to the same function
When using "is" or "isnot" with a |List| or a |Dictionary| this checks if the
expressions are referring to the same |List| or |Dictionary| instance. A copy
diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt
index 3f61e28..e17f8ff 100644
--- a/runtime/doc/indent.txt
+++ b/runtime/doc/indent.txt
@@ -813,7 +813,7 @@
global variables:
*php-comment* *PHP_autoformatcomment*
-To not enable auto-formating of comments by default (if you want to use your
+To not enable auto-formatting of comments by default (if you want to use your
own 'formatoptions'): >
:let g:PHP_autoformatcomment = 0
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 87123d3..98017ec 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt* For Vim version 7.4. Last change: 2016 Jun 19
+*options.txt* For Vim version 7.4. Last change: 2016 Jul 01
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1427,8 +1427,8 @@
Only non-printable keys are allowed.
The key can be specified as a single character, but it is difficult to
type. The preferred way is to use the <> notation. Examples: >
- :set cedit=<C-Y>
- :set cedit=<Esc>
+ :exe "set cedit=\<C-Y>"
+ :exe "set cedit=\<Esc>"
< |Nvi| also has this option, but it only uses the first character.
See |cmdwin|.
diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt
index 9b5803c..61b8656 100644
--- a/runtime/doc/quickfix.txt
+++ b/runtime/doc/quickfix.txt
@@ -1,4 +1,4 @@
-*quickfix.txt* For Vim version 7.4. Last change: 2016 Jul 01
+*quickfix.txt* For Vim version 7.4. Last change: 2016 Jul 02
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -35,11 +35,13 @@
use the positions in a script with the |getqflist()| function. Thus you can
do a lot more than the edit/compile/fix cycle!
-If you are using Manx's Aztec C compiler on the Amiga look here for how to use
-it with Vim: |quickfix-manx|. If you are using another compiler you should
-save the error messages in a file and start Vim with "vim -q filename". An
-easy way to do this is with the |:make| command (see below). The
-'errorformat' option should be set to match the error messages from your
+If you have the error messages in a file you can start Vim with: >
+ vim -q filename
+
+From inside Vim an easy way to run a command and handle the output is with the
+|:make| command (see below).
+
+The 'errorformat' option should be set to match the error messages from your
compiler (see |errorformat| below).
*location-list* *E776*
@@ -49,8 +51,8 @@
one window. The location list is independent of the quickfix list.
When a window with a location list is split, the new window gets a copy of the
-location list. When there are no references to a location list, the location
-list is destroyed.
+location list. When there are no longer any references to a location list,
+the location list is destroyed.
The following quickfix commands can be used. The location list commands are
similar to the quickfix commands, replacing the 'c' prefix in the quickfix
diff --git a/runtime/doc/tags b/runtime/doc/tags
index 0c0bcdb..a35bb7a 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -1260,6 +1260,7 @@
+mzscheme various.txt /*+mzscheme*
+mzscheme/dyn various.txt /*+mzscheme\/dyn*
+netbeans_intg various.txt /*+netbeans_intg*
++num64 various.txt /*+num64*
+ole various.txt /*+ole*
+packages various.txt /*+packages*
+path_extra various.txt /*+path_extra*
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index cf1f062..07c4f05 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt* For Vim version 7.4. Last change: 2016 Jun 25
+*todo.txt* For Vim version 7.4. Last change: 2016 Jul 02
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -34,8 +34,6 @@
*known-bugs*
-------------------- Known bugs and current work -----------------------
-:clist! +10 list next 10 errors
-
Further implement 'barline' in viminfo:
- Use timestamp for more items: locations, marks.
@@ -43,6 +41,7 @@
clear the next list, not the current one. Ramel Eshed, Jun 8.
+channel:
+- Should write_buf_line() change NL to NUL characters?
- GUI cursor blinking interrupted when the job output goes to a buffer that is
in a window. (Ramel Eshed, 2016 Jun 9)
- GUI cursor blinking interrupted when there is a status line. (Ramel Eshed,
@@ -64,8 +63,7 @@
Quickfix improvements for background building and grepping:
Patch from Yegappan, 2016 Jun 17.
Need to reset values when starting a new list.
-- Move 'efm' parsing to a separate function. If 'efm' is the same as last
- time re-use the fmt_first list.
+- If 'efm' is the same as last time re-use the fmt_first list.
- Do not clear "dir_stack", "directory" and "file_stack", "currfile" when
using ":addexpr".
Move multiline, multiignore, multiscan outside of the function.
@@ -126,19 +124,34 @@
- Search for /\%d0\+ causes error E363 in a file with consecutive NUL
characters. (Christian Brabandt, 2016 Jun 7)
-Patch to fix problem with GUI termcode. (Kazunobu Kuriyama, 2016 Jun 15)
-
json_encode(): should convert to utf-8. (Nikolai Pavlov, 2016 Jan 23)
What if there is an invalid character?
Should json_encode()/json_decode() restrict recursiveness?
Or avoid recursiveness.
+Patch to support 64 bit ints for Number. (Ken Takata, 2016 Jan 21)
+Update 2016 Apr 24.
+Update 2016 Jun 14, includes some tests.
+
+Patch to support expression argument to sort() instead of a function name.
+Yasuhiro Matsumoto, 2013 May 31.
+Or should we add a more general mechanism, like a lambda() function?
+Patch by Yasuhiro Matsumoto, 2014 Sep 16, update 2016 Apr 17.
+Correction for test, Ken Takata, 2016 May 27.
+Merged patch: Ken Takata, 2016 Jun 15.
+
Once .exe with updated installer is available: Add remark to download page
about /S and /D options (Ken Takata, 2016 Apr 13)
Cursor positioned in the wrong place when editing src/testdir/test_viml.vim.
+Javascript indent wrong after /* in single quoted string:
+ var SRC = 'src/*.js';
+ function log(tag) {
+ a = b;
+ }
+
Use ADDR_OTHER instead of ADDR_LINES for many more commands.
Add tests for using number larger than number of lines in buffer.
@@ -150,13 +163,6 @@
'completeopt' noinsert breaks redo register (Shougo, 2016 Jun 18, #874)
Patch to fix this: #875
-Patch to support expression argument to sort() instead of a function name.
-Yasuhiro Matsumoto, 2013 May 31.
-Or should we add a more general mechanism, like a lambda() function?
-Patch by Yasuhiro Matsumoto, 2014 Sep 16, update 2016 Apr 17.
-Correction for test, Ken Takata, 2016 May 27.
-Merged patch: Ken Takata, 2016 Jun 15.
-
Problem with whitespace in errorformat. (Gerd Wachsmuth, 2016 May 15, #807)
":caddexpr" should keep state, so that directory changes can be respected.
@@ -165,7 +171,7 @@
adding iterms. And keep them in qf_list_T.
Patch to add filtering of the quickfix list. (Yegappan Lakshmanan, 2016 Mar
-13, last version) Update May 22, #830.
+13, last version) Update June 26, #830.
When 'autochdir' is set, writing new file does not change the current dir.
(Dan Church, issue #777)
@@ -182,6 +188,12 @@
Cannot delete a file with square brackets with delete(). (#696)
+No autocommand for when changing directory. Patch from allen haim, 2016 Jun
+27, #888
+
+Should make ":@r" handle line continuation. (Cesar Romani, 2016 Jun 26)
+Also for ":@.".
+
Patch to add TabNew, TabNewEntered and TabClosed autocommand events.
(Felipe Morales, 2015 Feb 1)
@@ -211,6 +223,9 @@
Patch for Python: #622. (Roland Puntaier, 2016 Feb 2)
What does it change?
+When generating the Unicode tables with runtime/tools/unicode.vim the
+emoji_width table has only one entry.
+
It's possible to add ",," to 'wildignore', an empty entry. Causes problems.
Reject the value? #710.
@@ -219,18 +234,6 @@
Update mentioned by Christian, 2016 Apr 25.
Update from Ken Takata, 2016 Apr 26.
-Win32: patch to use 64 bit stat() if possible. (Ken Takata, 2014 May 12)
-More tests May 14. Update May 29. Update Aug 10.
-Now part of large file patches. (Ken Takata, 2016 Feb 1)
-Win64: Seek error in swap file for a very big file (3 Gbyte). Check storing
-pointer in long and seek offset in 64 bit var.
-Patches from Ken Takata might help (2014 Apr 17)
-Update 2016 Mar 28. Can include all parts into one dist patch.
-
-Patch to support 64 bit ints for Number. (Ken Takata, 2016 Jan 21)
-Update 2016 Apr 24.
-Update 2016 Jun 14, includes some tests.
-
Patch to improve cscope. (Adrian Kocis, #843)
Patch for groovy multi-line comment highlighting. (Justin M. Keyes, 2016 May
@@ -584,7 +587,7 @@
Patch to make closed folds line up. (Charles Campbell, 2014 Sep 12)
Remark from Roland Eggner: does it cause crashes? (2014 Dec 12)
Updated patch by Roland Eggner, Dec 16
-Updated patch from Charles, 2016 Jan 4.
+Updated patch from Charles, 2016 Jul 2
Patch to open folds for 'incsearch'. (Christian Brabandt, 2015 Jan 6)
@@ -1161,7 +1164,7 @@
"0g@$" puts '] on last byte of multi-byte. (ZyX, 2011 Jan 22)
-Patch to addd TextDeletePost and TextYankPost events. (Philippe Vaucher, 2011
+Patch to add TextDeletePost and TextYankPost events. (Philippe Vaucher, 2011
May 24) Update May 26.
Patch for :tabrecently. (Hirokazu Yoshida, 2012 Jan 30)
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 9927571..266d195 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1,7 +1,7 @@
" Vim support file to detect file types
"
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2016 Apr 29
+" Last Change: 2016 Jun 26
" Listen very carefully, I will say this only once
if exists("did_load_filetypes")
@@ -1019,7 +1019,7 @@
au BufNewFile,BufRead *.jov,*.j73,*.jovial setf jovial
" JSON
-au BufNewFile,BufRead *.json,*.jsonp setf json
+au BufNewFile,BufRead *.json,*.jsonp,*.webmanifest setf json
" Kixtart
au BufNewFile,BufRead *.kix setf kix
diff --git a/runtime/ftplugin/python.vim b/runtime/ftplugin/python.vim
index 9e2c5a7..df5dab8 100644
--- a/runtime/ftplugin/python.vim
+++ b/runtime/ftplugin/python.vim
@@ -2,7 +2,7 @@
" Language: python
" Maintainer: James Sully <sullyj3@gmail.com>
" Previous Maintainer: Johannes Zellner <johannes@zellner.org>
-" Last Change: Fri, 10 June 2016
+" Last Change: Wed, 29 June 2016
" https://github.com/sullyj3/vim-ftplugin-python
if exists("b:did_ftplugin") | finish | endif
@@ -22,28 +22,38 @@
set wildignore+=*.pyc
-nnoremap <silent> <buffer> ]] :call <SID>Python_jump('/^\(class\\|def\)\>')<cr>
-nnoremap <silent> <buffer> [[ :call <SID>Python_jump('?^\(class\\|def\)\>')<cr>
-nnoremap <silent> <buffer> ]m :call <SID>Python_jump('/^\s*\(class\\|def\)\>')<cr>
-nnoremap <silent> <buffer> [m :call <SID>Python_jump('?^\s*\(class\\|def\)\>')<cr>
+nnoremap <silent> <buffer> ]] :call <SID>Python_jump('n', '\v%$\|^(class\|def)>', 'W')<cr>
+nnoremap <silent> <buffer> [[ :call <SID>Python_jump('n', '\v^(class\|def)>', 'Wb')<cr>
+nnoremap <silent> <buffer> ]m :call <SID>Python_jump('n', '\v%$\|^\s*(class\|def)>', 'W')<cr>
+nnoremap <silent> <buffer> [m :call <SID>Python_jump('n', '\v^\s*(class\|def)>', 'Wb')<cr>
+
+xnoremap <silent> <buffer> ]] :call <SID>Python_jump('x', '\v%$\|^(class\|def)>', 'W')<cr>
+xnoremap <silent> <buffer> [[ :call <SID>Python_jump('x', '\v^(class\|def)>', 'Wb')<cr>
+xnoremap <silent> <buffer> ]m :call <SID>Python_jump('x', '\v%$\|^\s*(class\|def)>', 'W')<cr>
+xnoremap <silent> <buffer> [m :call <SID>Python_jump('x', '\v^\s*(class\|def)>', 'Wb')<cr>
if !exists('*<SID>Python_jump')
- fun! <SID>Python_jump(motion) range
+ fun! <SID>Python_jump(mode, motion, flags) range
+ if a:mode == 'x'
+ normal! gv
+ endif
+
+ normal! 0
+
let cnt = v:count1
- let save = @/ " save last search pattern
mark '
while cnt > 0
- silent! exe a:motion
- let cnt = cnt - 1
+ call search(a:motion, a:flags)
+ let cnt = cnt - 1
endwhile
- call histdel('/', -1)
- let @/ = save " restore last search pattern
+
+ normal! ^
endfun
endif
if has("browsefilter") && !exists("b:browsefilter")
let b:browsefilter = "Python Files (*.py)\t*.py\n" .
- \ "All Files (*.*)\t*.*\n"
+ \ "All Files (*.*)\t*.*\n"
endif
" As suggested by PEP8.
diff --git a/runtime/indent/sh.vim b/runtime/indent/sh.vim
index d05bb37..aca110f 100644
--- a/runtime/indent/sh.vim
+++ b/runtime/indent/sh.vim
@@ -3,9 +3,15 @@
" Maintainer: Christian Brabandt <cb@256bit.org>
" Previous Maintainer: Peter Aronoff <telemachus@arpinum.org>
" Original Author: Nikolai Weibull <now@bitwi.se>
-" Latest Revision: 2016-02-15
+" Latest Revision: 2016-06-27
" License: Vim (see :h license)
" Repository: https://github.com/chrisbra/vim-sh-indent
+" Changelog:
+" 20160627: - detect heredocs correctly
+" 20160213: - detect function definition correctly
+" 20160202: - use shiftwidth() function
+" 20151215: - set b:undo_indent variable
+" 20150728: - add foreach detection for zsh
if exists("b:did_indent")
finish
@@ -102,6 +108,8 @@
endif
elseif s:is_case_break(line)
let ind -= s:indent_value('case-breaks')
+ elseif s:is_here_doc(line)
+ let ind = 0
endif
return ind
@@ -160,6 +168,14 @@
return a:line =~ '^\s*;[;&]'
endfunction
+function! s:is_here_doc(line)
+ if a:line =~ '^\w\+$'
+ let here_pat = '<<-\?'. s:escape(a:line). '\$'
+ return search(here_pat, 'bnW') > 0
+ endif
+ return 0
+endfunction
+
function! s:is_case_ended(line)
return s:is_case_break(a:line) || a:line =~ ';[;&]\s*\%(#.*\)\=$'
endfunction
@@ -172,5 +188,9 @@
endif
endfunction
+function! s:escape(pattern)
+ return '\V'. escape(a:pattern, '\\')
+endfunction
+
let &cpo = s:cpo_save
unlet s:cpo_save
diff --git a/runtime/indent/vim.vim b/runtime/indent/vim.vim
index 7ec7df8..8ebfa12 100644
--- a/runtime/indent/vim.vim
+++ b/runtime/indent/vim.vim
@@ -1,7 +1,7 @@
" Vim indent file
" Language: Vim script
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2016 Apr 19
+" Last Change: 2016 Jun 27
" Only load this indent file when no other was loaded.
if exists("b:did_indent")
@@ -60,7 +60,7 @@
else
let ind = ind + shiftwidth() * 3
endif
- elseif prev_text =~ '^\s*aug\%[roup]' && prev_text !~ '^\s*aug\%[roup]\s*!\=\s\+[eE][nN][dD]'
+ elseif prev_text =~ '^\s*aug\%[roup]\s\+' && prev_text !~ '^\s*aug\%[roup]\s\+[eE][nN][dD]\>'
let ind = ind + shiftwidth()
else
" A line starting with :au does not increment/decrement indent.
@@ -89,7 +89,7 @@
" Subtract a 'shiftwidth' on a :endif, :endwhile, :catch, :finally, :endtry,
" :endfun, :else and :augroup END.
- if cur_text =~ '^\s*\(ene\@!\|cat\|fina\|el\|aug\%[roup]\s*!\=\s\+[eE][nN][dD]\)'
+ if cur_text =~ '^\s*\(ene\@!\|cat\|fina\|el\|aug\%[roup]\s\+[eE][nN][dD]\)'
let ind = ind - shiftwidth()
endif
diff --git a/runtime/syntax/tex.vim b/runtime/syntax/tex.vim
index 6557421..e560573 100644
--- a/runtime/syntax/tex.vim
+++ b/runtime/syntax/tex.vim
@@ -92,7 +92,6 @@
else
let s:tex_subscripts= g:tex_subscripts
endif
-echomsg "s:tex_subscripts=".s:tex_subscripts
" Determine whether or not to use "*.sty" mode {{{1
" The user may override the normal determination by setting
diff --git a/runtime/tutor/tutor.eo b/runtime/tutor/tutor.eo
index c075ec7..b2e8980 100644
--- a/runtime/tutor/tutor.eo
+++ b/runtime/tutor/tutor.eo
@@ -160,7 +160,7 @@
4. Konservu la dosieron kun þanøoj kaj eliru el Vim per: :wq <Enenklavo>
- 5. Se vi eliris la instruilon vimtutor en paþo 1, restartigu la intruilon
+ 5. Se vi eliris el la instruilo vimtutor en paþo 1, restartigu la instruilon
vimtutor kaj moviøu suben al la sekvanta resumo.
6. Post kiam vi legis la suprajn paþojn, kaj komprenis ilin: faru ilin.
@@ -229,7 +229,7 @@
3. Movu la kursoron æe la fino de la øusta linio (POST la unua . ).
- 4. Tajpu d$ por forivþi øis la fino de la linio.
+ 4. Tajpu d$ por foriviþi øis la fino de la linio.
---> Iu tajpis la finon de æi tiu linio dufoje. fino de æi tiu linio dufoje.
@@ -670,7 +670,7 @@
3. Premu la : signon. Æe la fino de la ekrano :'<,'> aperos.
4. Tajpu w TESTO , kie TESTO estas dosiernomo, kiu ankoraý ne ekzistas.
- Kontrolu, ke vi vidas :'<,'>w TESTO antaý premi <Enenklavo>.
+ Kontrolu, ke vi vidas :'<,'>w TESTO antaý ol premi <Enenklavo>.
5. Vim konservos la apartigitajn liniojn al la dosiero TESTO. Uzu :dir
aý :!ls por vidigi øin. Ne forviþu øin. Ni uzos øin en la sekvanta
@@ -688,7 +688,7 @@
** Por enmeti la enhavon de dosiero, tajpu :r DOSIERNOMON **
- 1. Movu la kursoron ¼us super æi tiu linio.
+ 1. Movu la kursoron tuj super æi tiu linio.
RIMARKO: Post plenumo de paþo 2, vi vidos tekston el la leciono 5.3. Tiam
moviøu SUBEN por vidi tiun lecionon denove.
@@ -741,7 +741,7 @@
2. Tajpu la minusklan literon o por malfermi linion SUB la kursoro kaj
eniri la Enmetan reøimon.
- 3. Nun tajpu tekston kaj premu <ESK> por eliri la Enmetan reøimon.
+ 3. Nun tajpu tekston kaj premu <ESK> por eliri el la Enmeta reøimo.
---> Post tajpo de o la kursoro moviøas al la malfermata linio en
Enmeta reøimo.
@@ -765,7 +765,7 @@
3. Tajpu a (minuskle) por aldoni tekston POST la kursoro.
4. Kompletigu la vorton same kiel la linio sub øi. Premu <ESK> por
- eliri la Enmetan reøimon.
+ eliri el la Enmeta reøimo.
5. Uzu e por moviøi al la sekvanta nekompleta vorto kaj ripetu
paþojn 3 kaj 4.
@@ -789,7 +789,7 @@
2. Nun premu R kaj tajpu la nombron sub øi en la dua linio, por ke øi
anstataýigu la xxx .
- 3. Premu <ESK> por foriri la Anstataýigan reøimon. Rimarku, ke la cetera
+ 3. Premu <ESK> por foriri el la Anstataýiga reøimo. Rimarku, ke la cetera
parto de la linio restas neþanøata.
4. Ripetu la paþojn por anstataýigi la restantajn xxx.
@@ -810,7 +810,7 @@
1. Iru al la linio markita per ---> sube kaj poziciu la kursoron post "a)".
- 2. Komencu la Viduman reøimon per v kaj movu la kursoron ¼us antaý "unua".
+ 2. Komencu la Viduman reøimon per v kaj movu la kursoron tuj antaý "unua".
3. Tajpu y por kopii la emfazitan tekston.
@@ -986,6 +986,6 @@
Esperantigita fare de Dominique Pellé, 2008-04-01
Retpoþto: dominique.pelle@gmail.com
- Lasta þanøo: 2011-11-27
+ Lasta þanøo: 2016-07-02
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/runtime/tutor/tutor.eo.utf-8 b/runtime/tutor/tutor.eo.utf-8
index 44d7b29..0f08a56 100644
--- a/runtime/tutor/tutor.eo.utf-8
+++ b/runtime/tutor/tutor.eo.utf-8
@@ -160,7 +160,7 @@
4. Konservu la dosieron kun ŝanĝoj kaj eliru el Vim per: :wq <Enenklavo>
- 5. Se vi eliris la instruilon vimtutor en paŝo 1, restartigu la intruilon
+ 5. Se vi eliris el la instruilo vimtutor en paŝo 1, restartigu la instruilon
vimtutor kaj moviĝu suben al la sekvanta resumo.
6. Post kiam vi legis la suprajn paŝojn, kaj komprenis ilin: faru ilin.
@@ -229,7 +229,7 @@
3. Movu la kursoron ĉe la fino de la ĝusta linio (POST la unua . ).
- 4. Tajpu d$ por forivŝi ĝis la fino de la linio.
+ 4. Tajpu d$ por foriviŝi ĝis la fino de la linio.
---> Iu tajpis la finon de ĉi tiu linio dufoje. fino de ĉi tiu linio dufoje.
@@ -670,7 +670,7 @@
3. Premu la : signon. Ĉe la fino de la ekrano :'<,'> aperos.
4. Tajpu w TESTO , kie TESTO estas dosiernomo, kiu ankoraŭ ne ekzistas.
- Kontrolu, ke vi vidas :'<,'>w TESTO antaŭ premi <Enenklavo>.
+ Kontrolu, ke vi vidas :'<,'>w TESTO antaŭ ol premi <Enenklavo>.
5. Vim konservos la apartigitajn liniojn al la dosiero TESTO. Uzu :dir
aŭ :!ls por vidigi ĝin. Ne forviŝu ĝin. Ni uzos ĝin en la sekvanta
@@ -688,7 +688,7 @@
** Por enmeti la enhavon de dosiero, tajpu :r DOSIERNOMON **
- 1. Movu la kursoron ĵus super ĉi tiu linio.
+ 1. Movu la kursoron tuj super ĉi tiu linio.
RIMARKO: Post plenumo de paŝo 2, vi vidos tekston el la leciono 5.3. Tiam
moviĝu SUBEN por vidi tiun lecionon denove.
@@ -741,7 +741,7 @@
2. Tajpu la minusklan literon o por malfermi linion SUB la kursoro kaj
eniri la Enmetan reĝimon.
- 3. Nun tajpu tekston kaj premu <ESK> por eliri la Enmetan reĝimon.
+ 3. Nun tajpu tekston kaj premu <ESK> por eliri el la Enmeta reĝimo.
---> Post tajpo de o la kursoro moviĝas al la malfermata linio en
Enmeta reĝimo.
@@ -765,7 +765,7 @@
3. Tajpu a (minuskle) por aldoni tekston POST la kursoro.
4. Kompletigu la vorton same kiel la linio sub ĝi. Premu <ESK> por
- eliri la Enmetan reĝimon.
+ eliri el la Enmeta reĝimo.
5. Uzu e por moviĝi al la sekvanta nekompleta vorto kaj ripetu
paŝojn 3 kaj 4.
@@ -789,7 +789,7 @@
2. Nun premu R kaj tajpu la nombron sub ĝi en la dua linio, por ke ĝi
anstataŭigu la xxx .
- 3. Premu <ESK> por foriri la Anstataŭigan reĝimon. Rimarku, ke la cetera
+ 3. Premu <ESK> por foriri el la Anstataŭiga reĝimo. Rimarku, ke la cetera
parto de la linio restas neŝanĝata.
4. Ripetu la paŝojn por anstataŭigi la restantajn xxx.
@@ -810,7 +810,7 @@
1. Iru al la linio markita per ---> sube kaj poziciu la kursoron post "a)".
- 2. Komencu la Viduman reĝimon per v kaj movu la kursoron ĵus antaŭ "unua".
+ 2. Komencu la Viduman reĝimon per v kaj movu la kursoron tuj antaŭ "unua".
3. Tajpu y por kopii la emfazitan tekston.
@@ -986,6 +986,6 @@
Esperantigita fare de Dominique Pellé, 2008-04-01
Retpoŝto: dominique.pelle@gmail.com
- Lasta ŝanĝo: 2011-11-27
+ Lasta ŝanĝo: 2016-07-02
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/runtime/tutor/tutor.fr b/runtime/tutor/tutor.fr
index e35d491..e5a6c45 100644
--- a/runtime/tutor/tutor.fr
+++ b/runtime/tutor/tutor.fr
@@ -190,7 +190,7 @@
5. Pour insérer ou ajouter du texte tapez :
i tapez le texte à insérer avant le curseur <Échap>
- A tapez le texte à ajouter après le curseur <Échap>
+ A tapez le texte à ajouter en fin de ligne <Échap>
NOTE : Appuyer <Échap> vous place en mode Normal ou annule une commande
partiellement tapée dont vous ne voulez plus.
@@ -1034,5 +1034,5 @@
Dernières mises à jour par Dominique Pellé.
E-mail : dominique.pelle@gmail.com
- Last Change : 2014 Aug 18
+ Last Change : 2016 Jul 02
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/runtime/tutor/tutor.fr.utf-8 b/runtime/tutor/tutor.fr.utf-8
index ac01cfa..9c44db1 100644
--- a/runtime/tutor/tutor.fr.utf-8
+++ b/runtime/tutor/tutor.fr.utf-8
@@ -190,7 +190,7 @@
5. Pour insérer ou ajouter du texte tapez :
i tapez le texte à insérer avant le curseur <Échap>
- A tapez le texte à ajouter après le curseur <Échap>
+ A tapez le texte à ajouter en fin de ligne <Échap>
NOTE : Appuyer <Échap> vous place en mode Normal ou annule une commande
partiellement tapée dont vous ne voulez plus.
@@ -1034,5 +1034,5 @@
Dernières mises à jour par Dominique Pellé.
E-mail : dominique.pelle@gmail.com
- Last Change : 2014 Aug 18
+ Last Change : 2016 Jul 02
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~