diff options
| -rw-r--r-- | runtime/doc/eval.txt | 13 | ||||
| -rw-r--r-- | runtime/doc/motion.txt | 11 | ||||
| -rw-r--r-- | runtime/doc/starting.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/usr_09.txt | 7 | ||||
| -rw-r--r-- | src/nvim/po/sr.po | 17 |
5 files changed, 28 insertions, 22 deletions
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index a3becfa53c..2743f24a78 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -4476,6 +4476,9 @@ gettabwinvar({tabnr}, {winnr}, {varname} [, {def}]) *gettabwinvar()* :let list_is_on = gettabwinvar(1, 2, '&list') :echo "myvar = " . gettabwinvar(3, 1, 'myvar') < + To obtain all window-local variables use: > + gettabwinvar({tabnr}, {winnr}, '&') + *getwinposx()* getwinposx() The result is a Number, which is the X coordinate in pixels of the left hand side of the GUI Vim window. The result will be @@ -4501,22 +4504,19 @@ getwininfo([{winid}]) *getwininfo()* Each List item is a Dictionary with the following entries: bufnr number of buffer in the window height window height (excluding winbar) - winbar 1 if the window has a toolbar, 0 - otherwise loclist 1 if showing a location list quickfix 1 if quickfix or location list window tabnr tab page number variables a reference to the dictionary with window-local variables width window width + winbar 1 if the window has a toolbar, 0 + otherwise wincol leftmost screen column of the window winid |window-ID| winnr window number winrow topmost screen column of the window - To obtain all window-local variables use: > - gettabwinvar({tabnr}, {winnr}, '&') - getwinvar({winnr}, {varname} [, {def}]) *getwinvar()* Like |gettabwinvar()| for the current tabpage. Examples: > @@ -10713,7 +10713,7 @@ The sandbox is also used for the |:sandbox| command. These items are not allowed in the sandbox: - changing the buffer text - - defining or changing mapping, autocommands, functions, user commands + - defining or changing mapping, autocommands, user commands - setting certain options (see |option-summary|) - setting certain v: variables (see |v:var|) *E794* - executing a shell command @@ -10735,6 +10735,7 @@ location. Insecure in this context are: - sourcing a .nvimrc or .exrc in the current directory - while executing in the sandbox - value coming from a modeline +- executing a function that was defined in the sandbox Note that when in the sandbox and saving an option value and restoring it, the option will still be marked as it was set in the sandbox. diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt index 92af525ecf..8649f7cab4 100644 --- a/runtime/doc/motion.txt +++ b/runtime/doc/motion.txt @@ -986,12 +986,13 @@ These commands are not marks themselves, but jump to a mark: ============================================================================== 8. Jumps *jump-motions* -A "jump" is one of the following commands: "'", "`", "G", "/", "?", "n", -"N", "%", "(", ")", "[[", "]]", "{", "}", ":s", ":tag", "L", "M", "H" and -the commands that start editing a new file. If you make the cursor "jump" -with one of these commands, the position of the cursor before the jump is +A "jump" is a command that normally moves the cursor several lines away. If +you make the cursor "jump" the position of the cursor before the jump is remembered. You can return to that position with the "''" and "``" command, -unless the line containing that position was changed or deleted. +unless the line containing that position was changed or deleted. The +following commands are "jump" commands: "'", "`", "G", "/", "?", "n", "N", +"%", "(", ")", "[[", "]]", "{", "}", ":s", ":tag", "L", "M", "H" and the +commands that start editing a new file. *CTRL-O* CTRL-O Go to [count] Older cursor position in jump list diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt index aebb0ef6ec..1da2441929 100644 --- a/runtime/doc/starting.txt +++ b/runtime/doc/starting.txt @@ -1101,6 +1101,8 @@ SHADA FILE NAME *shada-file-name* - The "-i" Vim argument can be used to set another file name, |-i|. When the file name given is "NONE" (all uppercase), no ShaDa file is ever read or written. Also not for the commands below! +- The 'viminfofile' option can be used like the "-i" argument. In fact, the + value form the "-i" argument is stored in the 'viminfofile' option. - For the commands below, another file name can be given, overriding the default and the name given with 'shada' or "-i" (unless it's NONE). diff --git a/runtime/doc/usr_09.txt b/runtime/doc/usr_09.txt index f53076a2ec..9359ce02c1 100644 --- a/runtime/doc/usr_09.txt +++ b/runtime/doc/usr_09.txt @@ -5,9 +5,10 @@ Using the GUI -Vim works in an ordinary terminal. GVim can do the same things and a few -more. The GUI offers menus, a toolbar, scrollbars and other items. This -chapter is about these extra things that the GUI offers. +Vim works in an ordinary terminal, while gVim has a Graphical User Interface +(GUI). It can do the same things and a few more. The GUI offers menus, a +toolbar, scrollbars and other items. This chapter is about these extra things +that the GUI offers. |09.1| Parts of the GUI |09.2| Using the mouse diff --git a/src/nvim/po/sr.po b/src/nvim/po/sr.po index b4433efe36..88c5d18866 100644 --- a/src/nvim/po/sr.po +++ b/src/nvim/po/sr.po @@ -1,4 +1,4 @@ -# Serbian Cyrillic Translation for Vim +# Serbian Cyrillic translation for Vim # # Do ":help uganda" in Vim to read copying and usage conditions. # Do ":help credits" in Vim to see a list of people who contributed. @@ -13,7 +13,8 @@ msgstr "" "POT-Creation-Date: 2018-05-15 11:55+0400\n" "PO-Revision-Date: 2018-05-15 10:50+0400\n" "Last-Translator: Ivan Pešić <ivan.pesic@gmail.com>\n" -"Language-Team: Serbian <LL@li.org>\n" +"Language-Team: Serbian\n" +"Language: sr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -2027,7 +2028,7 @@ msgid "" "--- Autocommands ---" msgstr "" "\n" -"--- Ауто-Команде ---" +"--- Аутокоманде ---" #, c-format msgid "E680: <buffer=%d>: invalid buffer number " @@ -2040,11 +2041,11 @@ msgid "No matching autocommands" msgstr "Нема подударајућих аутокоманди" msgid "E218: autocommand nesting too deep" -msgstr "E218: Угњшждавање аутокоманде је сувише дубоко" +msgstr "E218: Угњеждавање аутокоманде је сувише дубоко" #, c-format msgid "%s Autocommands for \"%s\"" -msgstr "%s Ауто команде за \"%s\"" +msgstr "%s Аутокоманде за \"%s\"" #, c-format msgid "Executing %s" @@ -2962,7 +2963,7 @@ msgid "" msgstr "" "\n" "\n" -"употреба:" +"Употреба:" msgid " vim [arguments] " msgstr " vim [аргументи] " @@ -4765,7 +4766,7 @@ msgid "E66: \\z( not allowed here" msgstr "E66: \\z( овде није дозвољено" msgid "E67: \\z1 - \\z9 not allowed here" -msgstr "E67: \\z1 и остали онвде нису дозвољени" +msgstr "E67: \\z1 - \\z9 овде нису дозвољени" #, c-format msgid "E69: Missing ] after %s%%[" @@ -4891,7 +4892,7 @@ msgid "E873: (NFA regexp) proper termination error" msgstr "E873: (NFA regexp) грешка правилне терминације" msgid "E874: (NFA) Could not pop the stack!" -msgstr "E874: (NFA) Скидање са стека није успело !" +msgstr "E874: (NFA) Скидање са стека није успело!" msgid "" "E875: (NFA regexp) (While converting from postfix to NFA), too many states " |