From 22f1d0e35eb0e503c2dc7813a973c7e6ca1b7dde Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 27 Feb 2018 14:53:30 +0100 Subject: Updated runtime files. Add Serbian translations and spell checking. --- runtime/doc/editing.txt | 5 +- runtime/doc/eval.txt | 8 +- runtime/doc/options.txt | 26 +- runtime/doc/quickref.txt | 3 +- runtime/doc/repeat.txt | 2 +- runtime/doc/starting.txt | 4 +- runtime/doc/tags | 17 ++ runtime/doc/todo.txt | 272 +++++++++------------ runtime/doc/usr_05.txt | 10 +- runtime/doc/usr_41.txt | 5 +- runtime/doc/various.txt | 3 +- runtime/keymap/oldturkic-orkhon_utf-8.vim | 143 +++++++++++ runtime/keymap/oldturkic-yenisei_utf-8.vim | 115 +++++++++ runtime/lang/menu_sr_rs.ascii.vim | 91 ++++--- runtime/lang/menu_sr_rs.iso_8859-2.vim | 103 +++++--- runtime/lang/menu_sr_rs.iso_8859-5.vim | 103 +++++--- runtime/lang/menu_sr_rs.utf-8.vim | 71 ++++-- runtime/optwin.vim | 4 +- .../pack/dist/opt/termdebug/plugin/termdebug.vim | 13 +- runtime/scripts.vim | 4 - runtime/syntax/css.vim | 211 ++++++++-------- runtime/syntax/dircolors.vim | 8 +- runtime/syntax/vim.vim | 2 +- 23 files changed, 800 insertions(+), 423 deletions(-) create mode 100644 runtime/keymap/oldturkic-orkhon_utf-8.vim create mode 100644 runtime/keymap/oldturkic-yenisei_utf-8.vim (limited to 'runtime') diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt index 4ade4aa7c..dc5045531 100644 --- a/runtime/doc/editing.txt +++ b/runtime/doc/editing.txt @@ -1,4 +1,4 @@ -*editing.txt* For Vim version 8.0. Last change: 2017 Nov 16 +*editing.txt* For Vim version 8.0. Last change: 2018 Feb 19 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1202,7 +1202,8 @@ MULTIPLE WINDOWS AND BUFFERS *window-exit* :wqa[ll]! [++opt] :xa[ll]! Write all changed buffers, even the ones that are readonly, and exit Vim. If there are buffers without a file name or - which cannot be written for another reason, Vim will not quit. + which cannot be written for another reason, or there is a + terminal with a running job, Vim will not quit. {not in Vi} ============================================================================== diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 0461f9c24..578e5d327 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 8.0. Last change: 2018 Feb 24 +*eval.txt* For Vim version 8.0. Last change: 2018 Feb 27 VIM REFERENCE MANUAL by Bram Moolenaar @@ -8196,7 +8196,7 @@ term_dumpload({filename} [, {options}]) term_dumpwrite({buf}, {filename} [, {options}]) Dump the contents of the terminal screen of {buf} in the file {filename}. This uses a format that can be used with - |term_dumpread()| and |term_dumpdiff()|. + |term_dumpload()| and |term_dumpdiff()|. If {filename} already exists an error is given. *E953* Also see |terminal-diff|. @@ -9173,8 +9173,8 @@ ttyout output is a terminal (tty) unix Unix version of Vim. *+unix* unnamedplus Compiled with support for "unnamedplus" in 'clipboard' user_commands User-defined commands. -vcon Win32: Virtual console support is working, can use 256 - and 24 bit colors. +vcon Win32: Virtual console support is working, can use + 'termguicolors'. Also see |+vtp|. vertsplit Compiled with vertically split windows |:vsplit|. vim_starting True while initial source'ing takes place. |startup| *vim_starting* diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index b9f151768..ffc709151 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 8.0. Last change: 2018 Feb 22 +*options.txt* For Vim version 8.0. Last change: 2018 Feb 25 VIM REFERENCE MANUAL by Bram Moolenaar @@ -50,7 +50,7 @@ achieve special effects. These options come in three forms: :se[t] {option}&vi Reset option to its Vi default value. {not in Vi} :se[t] {option}&vim Reset option to its Vim default value. {not in Vi} -:se[t] all& Set all options to their default value. The values of +:se[t] all& Set all options to their default value. The values of these options are not changed: all terminal options, starting with t_ 'columns' @@ -1325,7 +1325,7 @@ A jump table for the options with a short description can be found at |Q_op|. characters. It permits dynamic French paragraph indentation (negative) or emphasizing the line continuation (positive). - sbr Display the 'showbreak' value before applying the + sbr Display the 'showbreak' value before applying the additional indent. The default value for min is 20 and shift is 0. @@ -1808,7 +1808,7 @@ A jump table for the options with a short description can be found at |Q_op|. 'copyindent' + off don't copy indent structure 'cpoptions' & (all flags) Vi-compatible flags 'cscopepathcomp'+ 0 don't show directories in tags list - 'cscoperelative'+ off + 'cscoperelative'+ off don't use basename of path as prefix 'cscopetag' + off don't use cscope for ":tag" 'cscopetagorder'+ 0 see |cscopetagorder| 'cscopeverbose' + off see |cscopeverbose| @@ -3468,7 +3468,7 @@ A jump table for the options with a short description can be found at |Q_op|. when internal formatting is used. Make sure the cursor is kept in the same spot relative to the text then! The |mode()| function will return "i" or "R" in this situation. - + When the expression evaluates to non-zero Vim will fall back to using the internal format mechanism. @@ -5114,8 +5114,8 @@ A jump table for the options with a short description can be found at |Q_op|. global or local to buffer |global-local| {not in Vi} Program to use for the ":make" command. See |:make_makeprg|. - This option may contain '%' and '#' characters (see |:_%| and |:_#|), - which are expanded to the current and alternate file name. Use |::S| + This option may contain '%' and '#' characters (see |:_%| and |:_#|), + which are expanded to the current and alternate file name. Use |::S| to escape file names in case they contain special characters. Environment variables are expanded |:set_env|. See |option-backslash| about including spaces and backslashes. @@ -5966,7 +5966,7 @@ A jump table for the options with a short description can be found at |Q_op|. {not available when compiled without the |+insert_expand| feature} {not in Vi} - Determines the minium width to use for the popup menu for Insert mode + Determines the minimum width to use for the popup menu for Insert mode completion. |ins-completion-menu|. *'pythondll'* @@ -6122,7 +6122,7 @@ A jump table for the options with a short description can be found at |Q_op|. characters are put before the number. See |hl-LineNr| and |hl-CursorLineNr| for the highlighting used for the number. - + The number in front of the cursor line also depends on the value of 'number', see |number_relativenumber| for all combinations of the two options. @@ -7561,6 +7561,7 @@ A jump table for the options with a short description can be found at |Q_op|. Also see |swap-file| and |'swapsync'|. If you want to open a new buffer without creating a swap file for it, use the |:noswapfile| modifier. + See 'directory' for where the swap file is created. This option is used together with 'bufhidden' and 'buftype' to specify special kinds of buffers. See |special-buffers|. @@ -7915,7 +7916,7 @@ A jump table for the options with a short description can be found at |Q_op|. |+termguicolors| feature} When on, uses |highlight-guifg| and |highlight-guibg| attributes in the terminal (thus using 24-bit color). - + Requires a ISO-8613-3 compatible terminal. If setting this option does not work (produces a colorless UI) reading |xterm-true-color| might help. @@ -7923,7 +7924,8 @@ A jump table for the options with a short description can be found at |Q_op|. For Win32 console, Windows 10 version 1703 (Creators Update) or later is required. Use this check to find out: > if has('vcon') -< +< This requires Vim to be built with the |+vtp| feature. + Note that the "cterm" attributes are still used, not the "gui" ones. NOTE: This option is reset when 'compatible' is set. @@ -8010,7 +8012,7 @@ A jump table for the options with a short description can be found at |Q_op|. non-keyword characters (white space is preferred). Maximum line length is 510 bytes. To obtain a file to be used here, check out this ftp site: - [Sorry this link doesn't work anymore, do you know the right one?] + [Sorry this link doesn't work anymore, do you know the right one?] ftp://ftp.ox.ac.uk/pub/wordlists/ First get the README file. To include a comma in a file name precede it with a backslash. Spaces after a comma are ignored, otherwise spaces are included in the file diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt index f97b0335b..29000bf45 100644 --- a/runtime/doc/quickref.txt +++ b/runtime/doc/quickref.txt @@ -1,4 +1,4 @@ -*quickref.txt* For Vim version 8.0. Last change: 2018 Jan 31 +*quickref.txt* For Vim version 8.0. Last change: 2018 Feb 11 VIM REFERENCE MANUAL by Bram Moolenaar @@ -838,6 +838,7 @@ Short explanation of each option: *option-list* 'printoptions' 'popt' controls the format of :hardcopy output 'prompt' 'prompt' enable prompt in Ex mode 'pumheight' 'ph' maximum height of the popup menu +'pumwidth' 'pw' minimum width of the popup menu 'pythondll' name of the Python 2 dynamic library 'pythonhome' name of the Python 2 home directory 'pythonthreedll' name of the Python 3 dynamic library diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt index 2e9746bc6..e1e370c7d 100644 --- a/runtime/doc/repeat.txt +++ b/runtime/doc/repeat.txt @@ -1,4 +1,4 @@ -*repeat.txt* For Vim version 8.0. Last change: 2017 Dec 17 +*repeat.txt* For Vim version 8.0. Last change: 2018 Feb 11 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt index c6e568a70..48af7f208 100644 --- a/runtime/doc/starting.txt +++ b/runtime/doc/starting.txt @@ -1,4 +1,4 @@ -*starting.txt* For Vim version 8.0. Last change: 2018 Feb 09 +*starting.txt* For Vim version 8.0. Last change: 2018 Feb 10 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1010,7 +1010,7 @@ Vi compatible default value ~ When Vim starts, the 'compatible' option is on. This will be used when Vim starts its initializations. But as soon as: - a user vimrc file is found, or -- a vimrc file in the current directoryis found, or +- a vimrc file in the current directory is found, or - the "VIMINIT" environment variable is set, or - the "-N" command line argument is given, or - the "--clean" command line argument is given, or diff --git a/runtime/doc/tags b/runtime/doc/tags index 83dd953cd..017ca31db 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -782,8 +782,10 @@ $VIM_POSIX vi_diff.txt /*$VIM_POSIX* 'prompt' options.txt /*'prompt'* 'pt' options.txt /*'pt'* 'pumheight' options.txt /*'pumheight'* +'pumwidth' options.txt /*'pumwidth'* 'pvh' options.txt /*'pvh'* 'pvw' options.txt /*'pvw'* +'pw' options.txt /*'pw'* 'pythondll' options.txt /*'pythondll'* 'pythonhome' options.txt /*'pythonhome'* 'pythonthreedll' options.txt /*'pythonthreedll'* @@ -1355,6 +1357,7 @@ $VIM_POSIX vi_diff.txt /*$VIM_POSIX* +visual various.txt /*+visual* +visualextra various.txt /*+visualextra* +vreplace various.txt /*+vreplace* ++vtp various.txt /*+vtp* +wildignore various.txt /*+wildignore* +wildmenu various.txt /*+wildmenu* +windows various.txt /*+windows* @@ -4584,6 +4587,8 @@ E95 message.txt /*E95* E950 message.txt /*E950* E951 pattern.txt /*E951* E952 autocmd.txt /*E952* +E953 eval.txt /*E953* +E954 options.txt /*E954* E96 diff.txt /*E96* E97 diff.txt /*E97* E98 diff.txt /*E98* @@ -4827,6 +4832,7 @@ TermResponse autocmd.txt /*TermResponse* Terminal-mode terminal.txt /*Terminal-mode* TextChanged autocmd.txt /*TextChanged* TextChangedI autocmd.txt /*TextChangedI* +TextChangedP autocmd.txt /*TextChangedP* TextYankPost autocmd.txt /*TextYankPost* Transact-SQL ft_sql.txt /*Transact-SQL* U undo.txt /*U* @@ -5087,7 +5093,9 @@ asin() eval.txt /*asin()* asm.vim syntax.txt /*asm.vim* asm68k syntax.txt /*asm68k* asmh8300.vim syntax.txt /*asmh8300.vim* +assert_beeps() eval.txt /*assert_beeps()* assert_equal() eval.txt /*assert_equal()* +assert_equalfile() eval.txt /*assert_equalfile()* assert_exception() eval.txt /*assert_exception()* assert_fails() eval.txt /*assert_fails()* assert_false() eval.txt /*assert_false()* @@ -6562,6 +6570,7 @@ get-ms-debuggers debug.txt /*get-ms-debuggers* getbufinfo() eval.txt /*getbufinfo()* getbufline() eval.txt /*getbufline()* getbufvar() eval.txt /*getbufvar()* +getchangelist() eval.txt /*getchangelist()* getchar() eval.txt /*getchar()* getcharmod() eval.txt /*getcharmod()* getcharsearch() eval.txt /*getcharsearch()* @@ -6577,6 +6586,7 @@ getfperm() eval.txt /*getfperm()* getfsize() eval.txt /*getfsize()* getftime() eval.txt /*getftime()* getftype() eval.txt /*getftype()* +getjumplist() eval.txt /*getjumplist()* getlatestvimscripts-install pi_getscript.txt /*getlatestvimscripts-install* getline() eval.txt /*getline()* getloclist() eval.txt /*getloclist()* @@ -8901,6 +8911,9 @@ term++open terminal.txt /*term++open* term-dependent-settings term.txt /*term-dependent-settings* term-list syntax.txt /*term-list* term.txt term.txt /*term.txt* +term_dumpdiff() eval.txt /*term_dumpdiff()* +term_dumpload() eval.txt /*term_dumpload()* +term_dumpwrite() eval.txt /*term_dumpwrite()* term_getaltscreen() eval.txt /*term_getaltscreen()* term_getattr() eval.txt /*term_getattr()* term_getcursor() eval.txt /*term_getcursor()* @@ -8935,6 +8948,9 @@ terminal terminal.txt /*terminal* terminal-colors os_unix.txt /*terminal-colors* terminal-cursor-style terminal.txt /*terminal-cursor-style* terminal-debug terminal.txt /*terminal-debug* +terminal-diff terminal.txt /*terminal-diff* +terminal-diffscreendump terminal.txt /*terminal-diffscreendump* +terminal-dumptest terminal.txt /*terminal-dumptest* terminal-functions usr_41.txt /*terminal-functions* terminal-info term.txt /*terminal-info* terminal-key-codes term.txt /*terminal-key-codes* @@ -8942,6 +8958,7 @@ terminal-ms-windows terminal.txt /*terminal-ms-windows* terminal-options term.txt /*terminal-options* terminal-output-codes term.txt /*terminal-output-codes* terminal-resizing terminal.txt /*terminal-resizing* +terminal-screendump terminal.txt /*terminal-screendump* terminal-size-color terminal.txt /*terminal-size-color* terminal-special-keys terminal.txt /*terminal-special-keys* terminal-testing terminal.txt /*terminal-testing* diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index 27ee76651..9e704d56d 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 8.0. Last change: 2018 Feb 09 +*todo.txt* For Vim version 8.0. Last change: 2018 Feb 27 VIM REFERENCE MANUAL by Bram Moolenaar @@ -39,121 +39,16 @@ No maintainer for Vietnamese translations. No maintainer for Simplified Chinese translations. Terminal emulator window: +- using feedkeys() does not work? (Charles Sheridan, 2018 Feb 17) - Lots of stuff to implement, see src/terminal.c - Improve debugger interface: - Include all debug features of Agide. - Implement the right-click popup menu for the terminal. Can use the completion popup menu code and mouse dragging. Use it for "set breakpoint", "remove breakpoint", etc. - - get ideas from http://clewn.sf.net - Look into the idevim plugin/script. -- Improve testing: - Make a screenshot of a terminal, store in a file. - Display a stored screenshot, display diff with another one. - Make a test that puts Vim in a specific state, make a screenshot and compare - with the expected screenshot. Set t_Co to 256. - -+channel: -- get_job_options() isn't clear about what causes an error, often just returns - "invalid argument". -- Add a separate timeout for opening a socket. Currently it's fixed at 50 - msec, which is too small for a remote connection. (tverniquet, #2130) -- Try out background make plugin: - https://github.com/AndrewVos/vim-make-background -- Problem with stderr on Windows? (Vincent Rischmann, 2016 Aug 31, #1026) -- Writing raw mode to a buffer should still handle NL characters as line - breaks. (Dmitry Zotikov, 2017 Aug 16) -- When out_cb executes :sleep, the close_cb may be invoked. (Daniel Hahler, - 2016 Dec 11, #1320) -- Implement |job-term| ? -- Channel test fails with Motif. Sometimes kills the X11 server. -- When a message in the queue but there is no callback, drop it after a while? - Add timestamp to queued messages and callbacks with ID, remove after a - minute. Option to set the droptime. -- Add an option to drop text of very long lines? Default to 1 Mbyte. -- Add remark about undo sync, is there a way to force it? -- When starting a job, have an option to open the server socket, so we know - the port, and pass it to the command with --socket-fd {nr}. (Olaf Dabrunz, - Feb 9) How to do this on MS-Windows? -- For connection to server, a "keep open" flag would be useful. Retry - connecting in the main loop with zero timeout. -- job_start(): run job in a newly opened terminal (not a terminal window). - With xterm could use -S{pty}. - Although user could use "xterm -e 'cmd arg'". - -Regexp problems: -- When search pattern has the base character both with and without combining - character, search fails. E.g. "รรีบ" in "การรีบรักใคร". (agguser, #2312) -- [:space:] only matches ASCII spaces. Add [:white:] for all space-like - characters, esp. including 0xa0. Use character class zero. -- Since 7.4.704 the old regex engine fails to match [[:print:]] in 0xf6. - (Manuel Ortega, 2016 Apr 24) - Test fails on Mac. Avoid using isalpha(), isalnum(), etc? Depends on - LC_CTYPE -- The old engine does not find a match for "/\%#=1\(\)\{80}", the new engine - matches everywhere. -- Using win_linetabsize() can still be slow. Cache the result, store col and - vcol. Reset them when moving to another line. -- Very slow with a long line and Ruby highlighting. (John Whitley, 2014 Dec 4) -- Bug with pattern: '\vblock (\d+)\.\n.*\d+%(\1)@ and \?. (Brett Stahlman, 2013 Dec 21) Remark from Marcin - Szamotulski; Remark from Brett 2014 Jan 6 and 7. -- NFA regexp doesn't handle \%\)\@<=.*\%(<\/\(\w\+\)>\)\@=" matching text inside HTML tags. - This problem is probably the same: "\%(^\1.*$\n\)\@<=\(\d\+\).*$". - (guotuofeng, 2015 Jun 22) -- Strange matching with "\(Hello\n\)\@<=A". (Anas Syed, 2015 Feb 12) -- Problem with \v(A)@<=b+\1c. (Issue 334) -- Diff highlighting can be very slow. (Issue 309) -- Using %> for a virtual column has a check based on 'tabsize'. Better would - be to cache the result of win_linetabsize(col), storing both col and vcol, - and use them to decide whether win_linetabsize() needs to be called. Reset - col and vcol when moving to another line. -- this doesn't work: "syntax match ErrorMsg /.\%9l\%>20c\&\%<28c/". Leaving - out the \& works. Seems any column check after \& fails. -- Difference between two engines: ".*\zs\/\@>\/" on text "///" - (Chris Paul, 2016 Nov 13) New engine not greedy enough? - Another one: echom matchstr(" sdfsfsf\n sfdsdfsdf",'[^\n]*') - (2017 May 15, #1252) - -Use vim_clear() in more places, instead of vim_free() and assigning NULL. - -Include a few color schemes, based on popularity: -http://www.vim.org/scripts/script_search_results.php?keywords=&script_type=color+scheme&order_by=rating&direction=descending&search=search -http://vimawesome.com/?q=tag:color-scheme -Use names that indicate their appearance (Christian Brabandt, 2017 Aug 3) -- monokai - Xia Crusoe (2017 Aug 4) -- seoul256 - Christian Brabandt (2017 Aug 3) -- gruvbox - Christian Brabandt (2017 Aug 3) (simplified version from - Lifepillar, 2018 Jan 22, #2573) -- janah - Marco Hinz (2017 Aug 4) -- apprentice - Romain Lafourcade (2017 Aug 6) remarks about help file #1964 -Suggested by Hiroki Kokubun: -- [Iceberg](https://github.com/cocopon/iceberg.vim) (my one) -- [hybrid](https://github.com/w0ng/vim-hybrid) -Include solarized color scheme?, it does not support termguicolors. -- Sanitized version of pablo (Lifepillar, 2017 Nov 21) - -Reproducible: - invalid memory access in regexp with zero-width. - reproduced by Dominique, 2017 Dec 23 - -"silent! try" doesn't restore emsg_silent when an exception is thrown. -(Ben Reilly, 2018 Jan 5, #2531) Possible solution by Christian Brabandt, 2018 -Jan 6. +- Improve screen dump testing: + Add docs for how to properly use the screen dumps for testing, e.g. for + syntax highlighting. Mode message isn't updated on vertical split. (Alexei Averchenko, 2018 Feb 2, #2611) @@ -167,65 +62,38 @@ Compiler warnings (geeknik, 2017 Oct 26): - signed integer overflow in getdecchrs() (#2254) - undefined left shift in get_string_tv() (#2250) -Cursor in wrong screen line with WinBar. (#2362) -Fix by Christian Brabandt (2018 Jan 2) +Patch to fix 'undolevels' in options window. (Yasuhiro Matsumoto, 2018 Feb 14, +#2645) + +Patch to fix fd leak when using jobs. (ichizok, 2018 Feb 16, #2651) + +Popup menu is too wide, causing it not to be aligned. (Linwei, 2018 Feb 22, +#2661) balloon_show() does not work properly in the terminal. (Ben Jackson, 2017 Dec 20, #2481) Also see #2352, want better control over balloon, perhaps set the position. -Patch to support hunspell. (Matej Cepl, Jan 2018, #2500) -Patch to include hunspell support. (Matej Cepl, 2017 Dec 26, #845) -Doesn't work on Windows yet. - Cursor in status line after search. (#2530) Cursor in wrong position when line wraps. (#2540) Alternative manpager.vim. (Enno, 2018 Jan 5, #2529) -Patch for minimum width of completion popup menu. (Christian Brabandt, 2018 -Jan 3, #2314) - -Patch to redraw instead of scroll for terminal window. (Ken Takata, #2010) - -Patch to add "user_data" to completion items. (Ben Jackson, 2018 Feb 1, #2608, -closes #2508) - -Patch to add TextChangedP, text changed while popup menu is visible. (Prabir -Shrestha, 2018 Jan 28, test added by Christian Brabandt) - When using :packadd files under "later" are not used, which is inconsistent with packages under "start". (xtal8, #1994) Column number is wrong whsn using 'linebreak' and 'wrap'. (Keith Smiley, 2018 Jan 15, #2555) -Patch to add getjumplist(). (Yegappan Lakshmanan, 2018 Feb 2, #2609) - -Serbian translations. (Peseic, 2018 Jan 17) - -Patch for problem with restoring screen on Windows. (Nobuhiro Takasaki, 2015 -Sep 10) Update 2018 Jan 4 #2575 -Alternate change by Ken Takata. - Check argument of systemlist(). (Pavlov) -Patch to parse ":line" in tags file and use it for search. (Daniel Hahler, -#2546) - When 'inchsearch' and 'hlsearch' are set /\v highlights everything. Also see #2337 Starting job with cwd option, when the directory does not exist, gives a confusing error message. (Wang Shidong, 2018 Jan 2, #2519) -7 Add a watchpoint in the debug mode: An expression that breaks execution - when evaluating to non-zero. Add the "watchadd expr" command, stop when - the value of the expression changes. ":watchdel" deletes an item, - ":watchlist" lists the items. (Charles Campbell) -Patch by Christian Brabandt, 2016 Jun 10, #859 - 7 Make "ga" show the digraph for a character, if it exists. Patch from Christian Brabandt, 2011 Aug 19. @@ -237,15 +105,16 @@ ch_sendraw() with long string does not try to read inbetween, which may cause a deadlock if the reading side is waiting for the write to finish. (Nate Bosch, 2018 Jan 13, #2548) +Add Makefiles to the runtime/spell directory tree, since nobody uses Aap. +Will have to explain the manual steps (downloading the .aff and .dic files, +applying the diff, etc. + User dictionary ~/.vim/spell/lang.utf-8.add not used for spell checking until a word is re-added to it. (Matej Cepl, 2018 Feb 6) Problem with mouse scroll in tmux. (fcying, #2419) Might be caused by patch 8.0.1309. Removing "held_button = MOUSE_RELEASE;" helps. (2018 Feb 5) -Patch for 24 bit color support in MS-Windows console, using vcon. (Nobuhiro -Takasaki, Ken Takata, 2017 Oct 1, #2060). - Does setting 'cursorline' cause syntax highlighting to slow down? Perhaps is mess up the cache? (Mike Lee Williams, 2018 Jan 27, #2539) @@ -264,9 +133,15 @@ Also see #1689. ml_get error when using a Python. (Yggdroot, 2017 Jun 1, #1737) Lemonboy can reproduce (2017 Jun 5) +crash when removing an element while inside map(). (Nikolai Pavlov, 2018 Feb +17, #2652) + When 'virtualedit' is "all" and 'cursorcolumn' is set, the wrong column may be highlighted. (van-de-bugger, 2018 Jan 23, #2576) +Patch to parse ":line" in tags file and use it for search. (Daniel Hahler, +#2546) Fixes #1057. Missing a test. + Patch to add winlayout() function. (Yegappan Lakshmanan, 2018 Jan 4) No profile information for function that executes ":quit". (Daniel Hahler, @@ -290,9 +165,6 @@ ml_get errors with buggy script. (Dominique, 2017 Apr 30) Error in emsg with buggy script. (Dominique, 2017 Apr 30) -Patch to avoid clearing the intro message on Win32 console. -(Ken Takata, 2017 Nov 14) - Patch to fix encoding in print document name (Yasuhiro Matsumoto, 2017 Dec 20, #2478) @@ -302,9 +174,16 @@ Linse, 2017 Nov 14, #2336) Join truncates xml comment. (Dmitrii Tcyganok, 2017 Dec 24, #2494) Requires 'formatoptions' to include "j". (Gary Johnson, 2017 Dec 24) +Patch to support hunspell. (Matej Cepl, Jan 2018, #2500) Based on older patch +in #846) +Doesn't work on Windows yet. Not ready to included, hard coded paths. + When a timer is running and typing CTRL-R on the command line, it is not redrawn properly. (xtal8, 2017 Oct 23, #2241) +In an optional package the "after" directory is not scanned? +(Renato Fabbri, 2018 Feb 22) + Universal solution to detect if t_RS is working, using cursor position. Koichi Iwamoto, #2126 @@ -365,9 +244,6 @@ Memory leaks in test_channel? (or is it because of fork()) Using uninitialized value in test_crypt. Memory leaks in test_escaped_glob -Patch to clear background when "guibg=NONE" is used and 'termguicolors' is -set. (Nick Jensen, 2017 Nov 13, #2332, based on #981 by Kazunobu Kuriyama) - Patch to make gM move to middle of line. (Yasuhiro Matsumoto, Sep 8, #2070) Cannot copy modeless selection when cursor is inside it. (lkintact, #2300) @@ -415,6 +291,22 @@ Seems to happen when the selection is requested the second time, but before clip_x11_convert_selection_cb() is invoked, thus in X library code. Kazunobu Kuriyama is working on a proper fix. (2017 Jul 25) +Include a few color schemes, based on popularity: +http://www.vim.org/scripts/script_search_results.php?keywords=&script_type=color+scheme&order_by=rating&direction=descending&search=search +http://vimawesome.com/?q=tag:color-scheme +Use names that indicate their appearance (Christian Brabandt, 2017 Aug 3) +- monokai - Xia Crusoe (2017 Aug 4) +- seoul256 - Christian Brabandt (2017 Aug 3) +- gruvbox - Christian Brabandt (2017 Aug 3) (simplified version from + Lifepillar, 2018 Jan 22, #2573) +- janah - Marco Hinz (2017 Aug 4) +- apprentice - Romain Lafourcade (2017 Aug 6) remarks about help file #1964 +Suggested by Hiroki Kokubun: +- [Iceberg](https://github.com/cocopon/iceberg.vim) (my one) +- [hybrid](https://github.com/w0ng/vim-hybrid) +Include solarized color scheme?, it does not support termguicolors. +- Sanitized version of pablo (Lifepillar, 2017 Nov 21) + Problem with three-piece comment. (Michael Lee, 2017 May 11, #1696) Creating a partial with an autoload function is confused about the "self" @@ -705,6 +597,80 @@ no longer support. sort() is not stable when using numeric/float sort (Nikolay Pavlov, 2016 Sep 4#1038) ++channel: +- Add a separate timeout for opening a socket. Currently it's fixed at 50 + msec, which is too small for a remote connection. (tverniquet, #2130) +- Try out background make plugin: + https://github.com/AndrewVos/vim-make-background +- Problem with stderr on Windows? (Vincent Rischmann, 2016 Aug 31, #1026) +- Writing raw mode to a buffer should still handle NL characters as line + breaks. (Dmitry Zotikov, 2017 Aug 16) +- When out_cb executes :sleep, the close_cb may be invoked. (Daniel Hahler, + 2016 Dec 11, #1320) +- Implement |job-term| ? +- Channel test fails with Motif. Sometimes kills the X11 server. +- When a message in the queue but there is no callback, drop it after a while? + Add timestamp to queued messages and callbacks with ID, remove after a + minute. Option to set the droptime. +- Add an option to drop text of very long lines? Default to 1 Mbyte. +- Add remark about undo sync, is there a way to force it? +- When starting a job, have an option to open the server socket, so we know + the port, and pass it to the command with --socket-fd {nr}. (Olaf Dabrunz, + Feb 9) How to do this on MS-Windows? +- For connection to server, a "keep open" flag would be useful. Retry + connecting in the main loop with zero timeout. +- job_start(): run job in a newly opened terminal (not a terminal window). + With xterm could use -S{pty}. + Although user could use "xterm -e 'cmd arg'". + +Regexp problems: +- When search pattern has the base character both with and without combining + character, search fails. E.g. "รรีบ" in "การรีบรักใคร". (agguser, #2312) +- [:space:] only matches ASCII spaces. Add [:white:] for all space-like + characters, esp. including 0xa0. Use character class zero. +- Since 7.4.704 the old regex engine fails to match [[:print:]] in 0xf6. + (Manuel Ortega, 2016 Apr 24) + Test fails on Mac. Avoid using isalpha(), isalnum(), etc? Depends on + LC_CTYPE +- The old engine does not find a match for "/\%#=1\(\)\{80}", the new engine + matches everywhere. +- Using win_linetabsize() can still be slow. Cache the result, store col and + vcol. Reset them when moving to another line. +- Very slow with a long line and Ruby highlighting. (John Whitley, 2014 Dec 4) +- Bug with pattern: '\vblock (\d+)\.\n.*\d+%(\1)@ and \?. (Brett Stahlman, 2013 Dec 21) Remark from Marcin + Szamotulski; Remark from Brett 2014 Jan 6 and 7. +- NFA regexp doesn't handle \%\)\@<=.*\%(<\/\(\w\+\)>\)\@=" matching text inside HTML tags. + This problem is probably the same: "\%(^\1.*$\n\)\@<=\(\d\+\).*$". + (guotuofeng, 2015 Jun 22) +- Strange matching with "\(Hello\n\)\@<=A". (Anas Syed, 2015 Feb 12) +- Problem with \v(A)@<=b+\1c. (Issue 334) +- Diff highlighting can be very slow. (Issue 309) +- Using %> for a virtual column has a check based on 'tabsize'. Better would + be to cache the result of win_linetabsize(col), storing both col and vcol, + and use them to decide whether win_linetabsize() needs to be called. Reset + col and vcol when moving to another line. +- this doesn't work: "syntax match ErrorMsg /.\%9l\%>20c\&\%<28c/". Leaving + out the \& works. Seems any column check after \& fails. +- Difference between two engines: ".*\zs\/\@>\/" on text "///" + (Chris Paul, 2016 Nov 13) New engine not greedy enough? + Another one: echom matchstr(" sdfsfsf\n sfdsdfsdf",'[^\n]*') + (2017 May 15, #1252) + Patch to add "cmdline" completion to getcompletion(). (Shougo, Oct 1, #1140) Feature request: Complete members of a dictionary. (Luc Hermitte, 2017 Jan 4, diff --git a/runtime/doc/usr_05.txt b/runtime/doc/usr_05.txt index 67b33bdaa..ee40463ee 100644 --- a/runtime/doc/usr_05.txt +++ b/runtime/doc/usr_05.txt @@ -1,4 +1,4 @@ -*usr_05.txt* For Vim version 8.0. Last change: 2016 Mar 28 +*usr_05.txt* For Vim version 8.0. Last change: 2018 Feb 20 VIM USER MANUAL - by Bram Moolenaar @@ -48,6 +48,14 @@ For MS-DOS and MS-Windows you can use one of these: $HOME/_vimrc ~ $VIM/_vimrc ~ +If you are creating the vimrc file for the first time, it is recommended to +put this line at the top: > + + source $VIMRUNTIME/defaults.vim + +This initializes Vim for new users (as opposed to traditional Vi users). See +|defaults.vim| for the details. + The vimrc file can contain all the commands that you type after a colon. The most simple ones are for setting options. For example, if you want Vim to always start with the 'incsearch' option on, add this line your vimrc file: > diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt index ccf59d617..f731888e8 100644 --- a/runtime/doc/usr_41.txt +++ b/runtime/doc/usr_41.txt @@ -1,4 +1,4 @@ -*usr_41.txt* For Vim version 8.0. Last change: 2017 Dec 02 +*usr_41.txt* For Vim version 8.0. Last change: 2018 Feb 13 VIM USER MANUAL - by Bram Moolenaar @@ -924,7 +924,8 @@ Testing: *test-functions* assert_false() assert that an expression is false assert_true() assert that an expression is true assert_exception() assert that a command throws an exception - assert_fails() assert that a function call fails + assert_beeps() assert that a command beeps + assert_fails() assert that a command fails assert_report() report a test failure test_alloc_fail() make memory allocation fail test_autochdir() enable 'autochdir' during startup diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt index 232ccda37..213b19862 100644 --- a/runtime/doc/various.txt +++ b/runtime/doc/various.txt @@ -1,4 +1,4 @@ -*various.txt* For Vim version 8.0. Last change: 2017 Nov 18 +*various.txt* For Vim version 8.0. Last change: 2018 Feb 25 VIM REFERENCE MANUAL by Bram Moolenaar @@ -449,6 +449,7 @@ N *+virtualedit* |'virtualedit'| S *+visual* Visual mode |Visual-mode| Always enabled since 7.4.200. N *+visualextra* extra Visual mode commands |blockwise-operators| N *+vreplace* |gR| and |gr| + *+vtp* on MS-Windows console: support for 'termguicolors' N *+wildignore* |'wildignore'| N *+wildmenu* |'wildmenu'| *+windows* more than one window; Always enabled since 8.0.1118. diff --git a/runtime/keymap/oldturkic-orkhon_utf-8.vim b/runtime/keymap/oldturkic-orkhon_utf-8.vim new file mode 100644 index 000000000..e1f0015a2 --- /dev/null +++ b/runtime/keymap/oldturkic-orkhon_utf-8.vim @@ -0,0 +1,143 @@ +" Maintainer: Oliver Corff +" Last Changed: 2018 Feb 12 + +scriptencoding utf-8 + +" oto = Old Turkic, Orkhon +let b:keymap_name = "oto" +highlight lCursor guibg=red guifg=NONE + +" map F8 to toggle keymap (Ctrl-^ not present on keyboard) +noremap :let &iminsert = ! &iminsert +lnoremap +noremap! + +loadkeymap +A 𐰀 10C00 OLD TURKIC LETTER ORKHON A +00 𐰀 10C00 OLD TURKIC LETTER ORKHON A +I 𐰃 10C03 OLD TURKIC LETTER ORKHON I +03 𐰃 10C03 OLD TURKIC LETTER ORKHON I +O 𐰆 10C06 OLD TURKIC LETTER ORKHON O +U 𐰆 10C06 OLD TURKIC LETTER ORKHON O +06 𐰆 10C06 OLD TURKIC LETTER ORKHON O +OE 𐰇 10C07 OLD TURKIC LETTER ORKHON OE +UE 𐰇 10C07 OLD TURKIC LETTER ORKHON OE +07 𐰇 10C07 OLD TURKIC LETTER ORKHON OE +ab 𐰉 10C09 OLD TURKIC LETTER ORKHON AB +b1 𐰉 10C09 OLD TURKIC LETTER ORKHON AB +09 𐰉 10C09 OLD TURKIC LETTER ORKHON AB +aeb 𐰋 10C0B OLD TURKIC LETTER ORKHON AEB +eb 𐰋 10C0B OLD TURKIC LETTER ORKHON AEB +b2 𐰋 10C0B OLD TURKIC LETTER ORKHON AEB +0b 𐰋 10C0B OLD TURKIC LETTER ORKHON AEB +ag 𐰍 10C0D OLD TURKIC LETTER ORKHON AG +g1 𐰍 10C0D OLD TURKIC LETTER ORKHON AG +0d 𐰍 10C0D OLD TURKIC LETTER ORKHON AG +aeg 𐰏 10C0F OLD TURKIC LETTER ORKHON AEG +eg 𐰏 10C0F OLD TURKIC LETTER ORKHON AEG +g2 𐰏 10C0F OLD TURKIC LETTER ORKHON AEG +0f 𐰏 10C0F OLD TURKIC LETTER ORKHON AEG +ad 𐰑 10C11 OLD TURKIC LETTER ORKHON AD +d1 𐰑 10C11 OLD TURKIC LETTER ORKHON AD +11 𐰑 10C11 OLD TURKIC LETTER ORKHON AD +aed 𐰓 10C13 OLD TURKIC LETTER ORKHON AED +ed 𐰓 10C13 OLD TURKIC LETTER ORKHON AED +d2 𐰓 10C13 OLD TURKIC LETTER ORKHON AED +13 𐰓 10C13 OLD TURKIC LETTER ORKHON AED +ez 𐰔 10C14 OLD TURKIC LETTER ORKHON EZ +z 𐰔 10C14 OLD TURKIC LETTER ORKHON EZ +14 𐰔 10C14 OLD TURKIC LETTER ORKHON EZ +ay 𐰖 10C16 OLD TURKIC LETTER ORKHON AY +y1 𐰖 10C16 OLD TURKIC LETTER ORKHON AY +16 𐰖 10C16 OLD TURKIC LETTER ORKHON AY +aey 𐰘 10C18 OLD TURKIC LETTER ORKHON AEY +ey 𐰘 10C18 OLD TURKIC LETTER ORKHON AEY +y2 𐰘 10C18 OLD TURKIC LETTER ORKHON AEY +18 𐰘 10C18 OLD TURKIC LETTER ORKHON AEY +aek 𐰚 10C1A OLD TURKIC LETTER ORKHON AEK +k 𐰚 10C1A OLD TURKIC LETTER ORKHON AEK +1a 𐰚 10C1A OLD TURKIC LETTER ORKHON AEK +oek 𐰜 10C1C OLD TURKIC LETTER ORKHON OEK +q 𐰜 10C1C OLD TURKIC LETTER ORKHON OEK +1c 𐰜 10C1C OLD TURKIC LETTER ORKHON OEK +al 𐰞 10C1E OLD TURKIC LETTER ORKHON AL +l1 𐰞 10C1E OLD TURKIC LETTER ORKHON AL +1e 𐰞 10C1E OLD TURKIC LETTER ORKHON AL +ael 𐰠 10C20 OLD TURKIC LETTER ORKHON AEL +el 𐰠 10C20 OLD TURKIC LETTER ORKHON AEL +l2 𐰠 10C20 OLD TURKIC LETTER ORKHON AEL +20 𐰠 10C20 OLD TURKIC LETTER ORKHON AEL +elt 𐰡 10C21 OLD TURKIC LETTER ORKHON ELT +lt 𐰡 10C21 OLD TURKIC LETTER ORKHON ELT +21 𐰡 10C21 OLD TURKIC LETTER ORKHON ELT +em 𐰢 10C22 OLD TURKIC LETTER ORKHON EM +m 𐰢 10C22 OLD TURKIC LETTER ORKHON EM +22 𐰢 10C22 OLD TURKIC LETTER ORKHON EM +an 𐰣 10C23 OLD TURKIC LETTER ORKHON AN +n1 𐰣 10C23 OLD TURKIC LETTER ORKHON AN +23 𐰣 10C23 OLD TURKIC LETTER ORKHON AN +en 𐰤 10C24 OLD TURKIC LETTER ORKHON AEN +n2 𐰤 10C24 OLD TURKIC LETTER ORKHON AEN +24 𐰤 10C24 OLD TURKIC LETTER ORKHON AEN +ent 𐰦 10C26 OLD TURKIC LETTER ORKHON ENT +nt 𐰦 10C26 OLD TURKIC LETTER ORKHON ENT +26 𐰦 10C26 OLD TURKIC LETTER ORKHON ENT +enc 𐰨 10C28 OLD TURKIC LETTER ORKHON ENC +nc 𐰨 10C28 OLD TURKIC LETTER ORKHON ENC +28 𐰨 10C28 OLD TURKIC LETTER ORKHON ENC +eny 𐰪 10C2A OLD TURKIC LETTER ORKHON ENY +ny 𐰪 10C2A OLD TURKIC LETTER ORKHON ENY +2a 𐰪 10C2A OLD TURKIC LETTER ORKHON ENY +eng 𐰭 10C2D OLD TURKIC LETTER ORKHON ENG +ng 𐰭 10C2D OLD TURKIC LETTER ORKHON ENG +2d 𐰭 10C2D OLD TURKIC LETTER ORKHON ENG +ep 𐰯 10C2F OLD TURKIC LETTER ORKHON EP +p 𐰯 10C2F OLD TURKIC LETTER ORKHON EP +2f 𐰯 10C2F OLD TURKIC LETTER ORKHON EP +op 𐰰 10C30 OLD TURKIC LETTER ORKHON OP +up 𐰰 10C30 OLD TURKIC LETTER ORKHON OP +30 𐰰 10C30 OLD TURKIC LETTER ORKHON OP +ic 𐰱 10C31 OLD TURKIC LETTER ORKHON IC +31 𐰱 10C31 OLD TURKIC LETTER ORKHON IC +ec 𐰲 10C32 OLD TURKIC LETTER ORKHON EC +32 𐰲 10C32 OLD TURKIC LETTER ORKHON EC +aq 𐰴 10C34 OLD TURKIC LETTER ORKHON AQ +34 𐰴 10C34 OLD TURKIC LETTER ORKHON AQ +iq 𐰶 10C36 OLD TURKIC LETTER ORKHON IQ +yq 𐰶 10C36 OLD TURKIC LETTER ORKHON IQ +36 𐰶 10C36 OLD TURKIC LETTER ORKHON IQ +oq 𐰸 10C38 OLD TURKIC LETTER ORKHON OQ +uq 𐰸 10C38 OLD TURKIC LETTER ORKHON OQ +38 𐰸 10C38 OLD TURKIC LETTER ORKHON OQ +ar 𐰺 10C3A OLD TURKIC LETTER ORKHON AR +r1 𐰺 10C3A OLD TURKIC LETTER ORKHON AR +3a 𐰺 10C3A OLD TURKIC LETTER ORKHON AR +aer 𐰼 10C3C OLD TURKIC LETTER ORKHON AER +er 𐰼 10C3C OLD TURKIC LETTER ORKHON AER +r2 𐰼 10C3C OLD TURKIC LETTER ORKHON AER +3c 𐰼 10C3C OLD TURKIC LETTER ORKHON AER +as 𐰽 10C3D OLD TURKIC LETTER ORKHON AS +s1 𐰽 10C3D OLD TURKIC LETTER ORKHON AS +3d 𐰽 10C3D OLD TURKIC LETTER ORKHON AS +aes 𐰾 10C3E OLD TURKIC LETTER ORKHON AES +es 𐰾 10C3E OLD TURKIC LETTER ORKHON AES +s2 𐰾 10C3E OLD TURKIC LETTER ORKHON AES +3e 𐰾 10C3E OLD TURKIC LETTER ORKHON AES +ash 𐰿 10C3F OLD TURKIC LETTER ORKHON ASH +sh1 𐰿 10C3F OLD TURKIC LETTER ORKHON ASH +3f 𐰿 10C3F OLD TURKIC LETTER ORKHON ASH +esh 𐱁 10C41 OLD TURKIC LETTER ORKHON ESH +sh2 𐱁 10C41 OLD TURKIC LETTER ORKHON ESH +41 𐱁 10C41 OLD TURKIC LETTER ORKHON ESH +at 𐱃 10C43 OLD TURKIC LETTER ORKHON AT +t1 𐱃 10C43 OLD TURKIC LETTER ORKHON AT +43 𐱃 10C43 OLD TURKIC LETTER ORKHON AT +aet 𐱅 10C45 OLD TURKIC LETTER ORKHON AET +et 𐱅 10C45 OLD TURKIC LETTER ORKHON AET +t2 𐱅 10C45 OLD TURKIC LETTER ORKHON AET +45 𐱅 10C45 OLD TURKIC LETTER ORKHON AET +ot 𐱇 10C47 OLD TURKIC LETTER ORKHON OT +ut 𐱇 10C47 OLD TURKIC LETTER ORKHON OT +47 𐱇 10C47 OLD TURKIC LETTER ORKHON OT +bash 𐱈 10C48 OLD TURKIC LETTER ORKHON BASH +48 𐱈 10C48 OLD TURKIC LETTER ORKHON BASH diff --git a/runtime/keymap/oldturkic-yenisei_utf-8.vim b/runtime/keymap/oldturkic-yenisei_utf-8.vim new file mode 100644 index 000000000..f939f0a40 --- /dev/null +++ b/runtime/keymap/oldturkic-yenisei_utf-8.vim @@ -0,0 +1,115 @@ +" Maintainer: Oliver Corff +" Last Changed: 2018 Feb 12 + +" All characters are given literally, conversion to another encoding (e.g., +" UTF-8) should work. +scriptencoding utf-8 + +let b:keymap_name = "oto" +highlight lCursor guibg=red guifg=NONE + +" map F8 to toggle keymap (Ctrl-^ not present on keyboard) +noremap :let &iminsert = ! &iminsert +lnoremap +noremap! + +loadkeymap +A 𐰁 10C01 OLD TURKIC LETTER YENISEI A +01 𐰁 10C01 OLD TURKIC LETTER YENISEI A +AE 𐰂 10C02 OLD TURKIC LETTER YENISEI AE +02 𐰂 10C02 OLD TURKIC LETTER YENISEI AE +I 𐰄 10C04 OLD TURKIC LETTER YENISEI I +04 𐰄 10C04 OLD TURKIC LETTER YENISEI I +E 𐰅 10C05 OLD TURKIC LETTER YENISEI E +05 𐰅 10C05 OLD TURKIC LETTER YENISEI E +OE 𐰈 10C08 OLD TURKIC LETTER YENISEI OE +UE 𐰈 10C08 OLD TURKIC LETTER YENISEI OE +08 𐰈 10C08 OLD TURKIC LETTER YENISEI OE +ab 𐰊 10C0A OLD TURKIC LETTER YENISEI AB +b1 𐰊 10C0A OLD TURKIC LETTER YENISEI AB +0a 𐰊 10C0A OLD TURKIC LETTER YENISEI AB +aeb 𐰌 10C0C OLD TURKIC LETTER YENISEI AEB +eb 𐰌 10C0C OLD TURKIC LETTER YENISEI AEB +b2 𐰌 10C0C OLD TURKIC LETTER YENISEI AEB +0c 𐰌 10C0C OLD TURKIC LETTER YENISEI AEB +ag 𐰎 10C0E OLD TURKIC LETTER YENISEI AG +g1 𐰎 10C0E OLD TURKIC LETTER YENISEI AG +0e 𐰎 10C0E OLD TURKIC LETTER YENISEI AG +aeg 𐰐 10C10 OLD TURKIC LETTER YENISEI AEG +eg 𐰐 10C10 OLD TURKIC LETTER YENISEI AEG +g2 𐰐 10C10 OLD TURKIC LETTER YENISEI AEG +10 𐰐 10C10 OLD TURKIC LETTER YENISEI AEG +ad 𐰒 10C12 OLD TURKIC LETTER YENISEI AD +d1 𐰒 10C12 OLD TURKIC LETTER YENISEI AD +12 𐰒 10C12 OLD TURKIC LETTER YENISEI AD +ez 𐰕 10C15 OLD TURKIC LETTER YENISEI EZ +z 𐰕 10C15 OLD TURKIC LETTER YENISEI EZ +15 𐰕 10C15 OLD TURKIC LETTER YENISEI EZ +ay 𐰗 10C17 OLD TURKIC LETTER YENISEI AY +y1 𐰗 10C17 OLD TURKIC LETTER YENISEI AY +17 𐰗 10C17 OLD TURKIC LETTER YENISEI AY +aey 𐰙 10C19 OLD TURKIC LETTER YENISEI AEY +ey 𐰙 10C19 OLD TURKIC LETTER YENISEI AEY +y2 𐰙 10C19 OLD TURKIC LETTER YENISEI AEY +19 𐰙 10C19 OLD TURKIC LETTER YENISEI AEY +aek 𐰛 10C1B OLD TURKIC LETTER YENISEI AEK +ak 𐰛 10C1B OLD TURKIC LETTER YENISEI AEK +k 𐰛 10C1B OLD TURKIC LETTER YENISEI AEK +1b 𐰛 10C1B OLD TURKIC LETTER YENISEI AEK +oek 𐰝 10C1D OLD TURKIC LETTER YENISEI OEK +ök 𐰝 10C1D OLD TURKIC LETTER YENISEI OEK +uek 𐰝 10C1D OLD TURKIC LETTER YENISEI OEK +ük 𐰝 10C1D OLD TURKIC LETTER YENISEI OEK +1d 𐰝 10C1D OLD TURKIC LETTER YENISEI OEK +al 𐰟 10C1F OLD TURKIC LETTER YENISEI AL +l 𐰟 10C1F OLD TURKIC LETTER YENISEI AL +l1 𐰟 10C1F OLD TURKIC LETTER YENISEI AL +1f 𐰟 10C1F OLD TURKIC LETTER YENISEI AL +aen 𐰥 10C25 OLD TURKIC LETTER YENISEI AEN +en 𐰥 10C25 OLD TURKIC LETTER YENISEI AEN +n2 𐰥 10C25 OLD TURKIC LETTER YENISEI AEN +25 𐰥 10C25 OLD TURKIC LETTER YENISEI AEN +ent 𐰧 10C27 OLD TURKIC LETTER YENISEI ENT +nt 𐰧 10C27 OLD TURKIC LETTER YENISEI ENT +27 𐰧 10C27 OLD TURKIC LETTER YENISEI ENT +enc 𐰩 10C29 OLD TURKIC LETTER YENISEI ENC +nc 𐰩 10C29 OLD TURKIC LETTER YENISEI ENC +29 𐰩 10C29 OLD TURKIC LETTER YENISEI ENC +eny 𐰫 10C2B OLD TURKIC LETTER YENISEI ENY +ny 𐰫 10C2B OLD TURKIC LETTER YENISEI ENY +2b 𐰫 10C2B OLD TURKIC LETTER YENISEI ENY +ang 𐰬 10C2C OLD TURKIC LETTER YENISEI ANG +ng 𐰬 10C2C OLD TURKIC LETTER YENISEI ANG +2c 𐰬 10C2C OLD TURKIC LETTER YENISEI ANG +aeng 𐰮 10C2E OLD TURKIC LETTER YENISEI AENG +eng 𐰮 10C2E OLD TURKIC LETTER YENISEI AENG +2e 𐰮 10C2E OLD TURKIC LETTER YENISEI AENG +ec 𐰳 10C33 OLD TURKIC LETTER YENISEI EC +c 𐰳 10C33 OLD TURKIC LETTER YENISEI EC +33 𐰳 10C33 OLD TURKIC LETTER YENISEI EC +aq 𐰵 10C35 OLD TURKIC LETTER YENISEI AQ +q 𐰵 10C35 OLD TURKIC LETTER YENISEI AQ +35 𐰵 10C35 OLD TURKIC LETTER YENISEI AQ +iq 𐰷 10C37 OLD TURKIC LETTER YENISEI IQ +yq 𐰷 10C37 OLD TURKIC LETTER YENISEI IQ +37 𐰷 10C37 OLD TURKIC LETTER YENISEI IQ +oq 𐰹 10C39 OLD TURKIC LETTER YENISEI OQ +uq 𐰹 10C39 OLD TURKIC LETTER YENISEI OQ +39 𐰹 10C39 OLD TURKIC LETTER YENISEI OQ +ar 𐰻 10C3B OLD TURKIC LETTER YENISEI AR +r 𐰻 10C3B OLD TURKIC LETTER YENISEI AR +r1 𐰻 10C3B OLD TURKIC LETTER YENISEI AR +3b 𐰻 10C3B OLD TURKIC LETTER YENISEI AR +ash 𐱀 10C40 OLD TURKIC LETTER YENISEI ASH +sh1 𐱀 10C40 OLD TURKIC LETTER YENISEI ASH +40 𐱀 10C40 OLD TURKIC LETTER YENISEI ASH +esh 𐱂 10C42 OLD TURKIC LETTER YENISEI ESH +sh2 𐱂 10C42 OLD TURKIC LETTER YENISEI ESH +42 𐱂 10C42 OLD TURKIC LETTER YENISEI ESH +at 𐱄 10C44 OLD TURKIC LETTER YENISEI AT +t1 𐱄 10C44 OLD TURKIC LETTER YENISEI AT +44 𐱄 10C44 OLD TURKIC LETTER YENISEI AT +aet 𐱆 10C46 OLD TURKIC LETTER YENISEI AET +et 𐱆 10C46 OLD TURKIC LETTER YENISEI AET +t2 𐱆 10C46 OLD TURKIC LETTER YENISEI AET +46 𐱆 10C46 OLD TURKIC LETTER YENISEI AET diff --git a/runtime/lang/menu_sr_rs.ascii.vim b/runtime/lang/menu_sr_rs.ascii.vim index 8a12dad8e..e5b66449e 100644 --- a/runtime/lang/menu_sr_rs.ascii.vim +++ b/runtime/lang/menu_sr_rs.ascii.vim @@ -1,6 +1,7 @@ " Menu Translations: Serbian " Maintainer: Aleksandar Jelenak -" Last Change: Fri, 30 May 2003 12:15:30 -0400 +" Last Change: Fri, 30 May 2003 10:17:39 Eastern Daylight Time +" Adapted for VIM 8 by: Ivan Pesic on 2017-12-28 12:05+0400 " Quit when menu translations have already been done. if exists("did_menu_trans") @@ -19,6 +20,7 @@ menutrans &Find &Nadji menutrans &Credits &Zasluge menutrans Co&pying P&reuzimanje menutrans O&rphans &Sirocici +menutrans &Sponsor/Register Sponzor/&Registrujte\ se menutrans &Version &Verzija menutrans &About &O\ programu @@ -26,6 +28,7 @@ menutrans &About &O\ programu menutrans &File &Datoteka menutrans &Open\.\.\.:e &Otvori\.\.\.:e menutrans Sp&lit-Open\.\.\.:sp &Podeli-otvori\.\.\.:sp +menutrans Open\ Tab\.\.\.:tabnew Otvori\ karticu\.\.\.:tabnew menutrans &New:enew &Nova:enew menutrans &Close:close &Zatvori:close menutrans &Save:w &Sacuvaj:w @@ -52,24 +55,27 @@ menutrans &Select\ allggVG Izaberi\ sv&eggVG menutrans &Find\.\.\. &Nadji\.\.\. menutrans Find\ and\ Rep&lace\.\.\. Nadji\ i\ &zameni\.\.\. menutrans Settings\ &Window P&rozor\ podesavanja +menutrans Startup\ &Settings Po&desavanja\ pri\ pokretanju menutrans &Global\ Settings Op&sta\ podesavanja menutrans F&ile\ Settings Podesavanja\ za\ da&toteke menutrans &Shiftwidth &Pomeraj menutrans Soft\ &Tabstop &Meka\ tabulacija menutrans Te&xt\ Width\.\.\. &Sirina\ teksta\.\.\. menutrans &File\ Format\.\.\. &Vrsta\ datoteke\.\.\. -menutrans C&olor\ Scheme Bo&je -menutrans &Keymap Pres&likavanje\ tastature +menutrans Show\ C&olor\ Schemes\ in\ Menu Prikazi\ seme\ bo&ja\ u\ meniju +menutrans C&olor\ Scheme \Seme\ bo&ja +menutrans Show\ &Keymaps\ in\ Menu Prikazi\ pres&likavanja\ tastature\ u\ meniju +menutrans &Keymap Pres&likavanja\ tastature menutrans Select\ Fo&nt\.\.\. Izbor\ &fonta\.\.\. " Edit/Global Settings menutrans Toggle\ Pattern\ &Highlight:set\ hls! Naglasi\ &obrazce\ (da/ne):set\ hls! -menutrans Toggle\ &Ignore-case:set\ ic! Zanemari\ \velicinu\ &slova\ (da/ne):set\ ic! -menutrans Toggle\ &Showmatch:set\ sm! Proveri\ pratecu\ &zagradu\ (da/ne):set\ sm! +menutrans Toggle\ &Ignoring\ Case:set\ ic! Zanemari\ velicinu\ &slova\ (da/ne):set\ ic! +menutrans Toggle\ &Showing\ Matched\ Pairs:set\ sm! Proveri\ pratecu\ &zagradu\ (da/ne):set\ sm! menutrans &Context\ lines Vidljivi\ &redovi menutrans &Virtual\ Edit Virtuelno\ &uredjivanje menutrans Toggle\ Insert\ &Mode:set\ im! Rezim\ u&nosa\ (da/ne):set\ im! -menutrans Toggle\ Vi\ C&ompatible:set\ cp! '&Vi'\ saglasno\ (da/ne):set\ cp! +menutrans Toggle\ Vi\ C&ompatibility:set\ cp! '&Vi'\ saglasno\ (da/ne):set\ cp! menutrans Search\ &Path\.\.\. Putanja\ &pretrage\.\.\. menutrans Ta&g\ Files\.\.\. &Datoteke\ oznaka\.\.\. menutrans Toggle\ &Toolbar Linija\ sa\ &alatkama\ (da/ne) @@ -85,28 +91,30 @@ menutrans Block\ and\ Insert Blok\ i\ unos menutrans Always Uvek " Edit/File Settings -menutrans Toggle\ Line\ &Numbering:set\ nu! Redni\ &brojevi\ (da/ne):set\ nu! -menutrans Toggle\ &List\ Mode:set\ list! Rezim\ &liste\ (da/ne):set\ list! -menutrans Toggle\ Line\ &Wrap:set\ wrap! Obavijanje\ &redova\ (da/ne):set\ wrap! -menutrans Toggle\ W&rap\ at\ word:set\ lbr! Prelomi\ &na\ rec\ (da/ne):set\ lbr! -menutrans Toggle\ &expand-tab:set\ et! Razmaci\ umesto\ &tabulacije\ (da/ne):set\ et! -menutrans Toggle\ &auto-indent:set\ ai! Auto-&uvlacenje\ (da/ne):set\ ai! -menutrans Toggle\ &C-indenting:set\ cin! &Ce-uvlacenje\ (da/ne):set\ cin! +menutrans Toggle\ Line\ &Numbering:set\ nu! Prikazi\ &numeraciju\ linija\ (da/ne):set\ nu! +menutrans Toggle\ Relati&ve\ Line\ Numbering:set\ rnu! Prikazi\ Relati&vnu\ numeraciju\ linija\ (da/ne):set\ rnu! +menutrans Toggle\ &List\ Mode:set\ list! Rezim\ &liste\ (da/ne):set\ list! +menutrans Toggle\ Line\ &Wrapping:set\ wrap! Obavijanje\ &redova\ (da/ne):set\ wrap! +menutrans Toggle\ W&rapping\ at\ Word:set\ lbr! Prelomi\ &na\ rec\ (da/ne):set\ lbr! +menutrans Toggle\ Tab\ &Expanding:set\ et! Razmaci\ umesto\ &tabulacije\ (da/ne):set\ et! +menutrans Toggle\ &Auto\ Indenting:set\ ai! Auto-&uvlacenje\ (da/ne):set\ ai! +menutrans Toggle\ &C-Style\ Indenting:set\ cin! &C-uvlacenje\ (da/ne):set\ cin! " Edit/Keymap -menutrans None Nijedan +menutrans None Bez\ preslikavanja " Tools menu menutrans &Tools &Alatke menutrans &Jump\ to\ this\ tagg^] Skoci\ na\ &ovu\ oznakug^] menutrans Jump\ &back^T Skoci\ &natrag^T menutrans Build\ &Tags\ File Izgradi\ &datoteku\ oznaka +menutrans &Spelling Pra&vopis menutrans &Folding &Podvijanje menutrans Create\ &Foldzf S&tvori\ podvijutakzf menutrans &Delete\ Foldzd O&brisi\ podvijutakzd menutrans Delete\ &All\ FoldszD Obrisi\ sve\ po&dvijutkezD menutrans Fold\ column\ &width Sirina\ &reda\ podvijutka -menutrans &Diff &Uporedjivanje +"menutrans &Diff &Uporedjivanje menutrans &Make:make 'mak&e':make menutrans &List\ Errors:cl Spisak\ &gresaka:cl menutrans L&ist\ Messages:cl! Sp&isak\ poruka:cl! @@ -115,32 +123,49 @@ menutrans &Previous\ Error:cp Pre&thodna\ greska:cp menutrans &Older\ List:cold Stari\ spisa&k:cold menutrans N&ewer\ List:cnew No&vi\ spisak:cnew menutrans Error\ &Window Prozor\ sa\ g&reskama -menutrans &Set\ Compiler I&zaberi\ prevodioca +menutrans Se&t\ Compiler I&zaberi\ prevodioca menutrans &Convert\ to\ HEX:%!xxd Pretvori\ u\ &HEKS:%!xxd menutrans Conve&rt\ back:%!xxd\ -r Vr&ati\ u\ prvobitan\ oblik:%!xxd\ -r +menutrans Show\ Compiler\ Se&ttings\ in\ Menu Prikazi\ pode&savanja\ prevodioca\ u\ meniju + +" Tools/Spelling +menutrans &Spell\ Check\ On &Ukljuci\ proveru\ pravopisa +menutrans Spell\ Check\ &Off &Iskljuci\ proveru\ pravopisa +menutrans To\ &Next\ Error]s Idi\ na\ &sledecu\ gresku]s +menutrans To\ &Previous\ Error[s Idi\ na\ &prethodnu\ gresku[s +menutrans Suggest\ &Correctionsz= Predlozi\ isp&ravkez= +menutrans &Repeat\ Correction:spellrepall P&onovi\ ispravku:spellrepall +menutrans Set\ Language\ to\ "en" Postavi\ jezik\ na\ "en" +menutrans Set\ Language\ to\ "en_au" Postavi\ jezik\ na\ "en_au" +menutrans Set\ Language\ to\ "en_ca" Postavi\ jezik\ na\ "en_ca" +menutrans Set\ Language\ to\ "en_gb" Postavi\ jezik\ na\ "en_gb" +menutrans Set\ Language\ to\ "en_nz" Postavi\ jezik\ na\ "en_nz" +menutrans Set\ Language\ to\ "en_us" Postavi\ jezik\ na\ "en_us" +menutrans &Find\ More\ Languages Pronadji\ jos\ jezika " Tools/Folding menutrans &Enable/Disable\ foldszi &Omoguci/prekini\ podvijanjezi -menutrans &View\ Cursor\ Linezv &Pokazi\ red\ sa\ kursoromzv +menutrans &View\ Cursor\ Linezv &Pokazi\ red\ sa\ kursoromzv menutrans Vie&w\ Cursor\ Line\ onlyzMzx Pokazi\ &samo\ red\ sa\ kursoromzMzx menutrans C&lose\ more\ foldszm &Zatvori\ vise\ podvijutakazm menutrans &Close\ all\ foldszM Zatvori\ s&ve\ podvijutkezM menutrans O&pen\ more\ foldszr Otvori\ vis&e\ podvijutakazr menutrans &Open\ all\ foldszR O&tvori\ sve\ podvijutkezR menutrans Fold\ Met&hod &Nacin\ podvijanja +menutrans Fold\ Col&umn\ Width Sirina\ kolone\ ispred\ podvijutaka " Tools/Folding/Fold Method -menutrans M&anual &Rucno -menutrans I&ndent &Uvucenost -menutrans E&xpression &Izraz -menutrans S&yntax &Sintaksa +menutrans M&anual &Rucno +menutrans I&ndent &Uvucenost +menutrans E&xpression &Izraz +menutrans S&yntax &Sintaksa "menutrans &Diff -menutrans Ma&rker &Oznaka +menutrans Ma&rker &Oznaka " Tools/Diff -menutrans &Update &Azuriraj -menutrans &Get\ Block &Prihvati\ izmenu -menutrans &Put\ Block Pre&baci\ izmenu +menutrans &Update &Azuriraj +menutrans &Get\ Block &Prihvati\ blok\ izmena +menutrans &Put\ Block Pre&baci\ blok\ izmena " Tools/Error Window menutrans &Update:cwin &Azuriraj:cwin @@ -188,8 +213,10 @@ menutrans Cu&t &Iseci menutrans &Copy &Kopiraj menutrans &Paste &Ubaci menutrans &Delete I&zbrisi -menutrans Select\ Blockwise Biraj\ &pravougaono +menutrans Select\ Blockwise Biraj\ b&lokovski menutrans Select\ &Word Izaberi\ &rec +menutrans Select\ &Sentence Izaberi\ r&ecenicu +menutrans Select\ Pa&ragraph Izaberi\ ¶graf menutrans Select\ &Line Izaberi\ r&ed menutrans Select\ &Block Izaberi\ &blok menutrans Select\ &All Izaberi\ &sve @@ -235,9 +262,9 @@ endif " Syntax menu menutrans &Syntax &Sintaksa -menutrans &Show\ filetypes\ in\ menu Izbor\ 'filetype'\ iz\ &menija -menutrans Set\ '&syntax'\ only Pode&si\ 'syntax'\ samo -menutrans Set\ '&filetype'\ too Podesi\ 'filetype'\ &takodje +menutrans &Show\ File\ Types\ in\ Menu Prikazi\ tipove\ datoteka\ u\ &meniju +menutrans Set\ '&syntax'\ only Pode&si\ samo\ 'syntax' +menutrans Set\ '&filetype'\ too Podesi\ &takodje\ i\ 'filetype' menutrans &Off &Iskljuceno menutrans &Manual &Rucno menutrans A&utomatic &Automatski @@ -255,9 +282,13 @@ let g:menutrans_tags_dialog = "Unesite imena datoteka sa oznakama\nRazdvojite za let g:menutrans_textwidth_dialog = "Unesite novu sirinu teksta (0 sprecava prelom)" -let g:menutrans_fileformat_dialog = "Izaberite vrstu datoteke" +let g:menutrans_fileformat_dialog = "Izaberite format zapisa datoteke" + +let g:menutrans_fileformat_choices = "&Unix\n&Dos\n&Mac\n&Otkazi" let menutrans_no_file = "[Nema datoteke]" let &cpo = s:keepcpo unlet s:keepcpo + +" vim: tw=0 keymap=serbian diff --git a/runtime/lang/menu_sr_rs.iso_8859-2.vim b/runtime/lang/menu_sr_rs.iso_8859-2.vim index f4b8c68fb..e7e0db58e 100644 --- a/runtime/lang/menu_sr_rs.iso_8859-2.vim +++ b/runtime/lang/menu_sr_rs.iso_8859-2.vim @@ -1,6 +1,7 @@ " Menu Translations: Serbian " Maintainer: Aleksandar Jelenak -" Last Change: Fri, 30 May 2003 12:04:48 -0400 +" Last Change: Fri, 30 May 2003 10:17:39 Eastern Daylight Time +" Adapted for VIM 8 by: Ivan Pei on 2017-12-28 12:05+0400 " Quit when menu translations have already been done. if exists("did_menu_trans") @@ -21,6 +22,7 @@ menutrans &Find &Na menutrans &Credits &Zasluge menutrans Co&pying P&reuzimanje menutrans O&rphans &Siroii +menutrans &Sponsor/Register Sponzor/&Registrujte\ se menutrans &Version &Verzija menutrans &About &O\ programu @@ -28,6 +30,7 @@ menutrans &About &O\ programu menutrans &File &Datoteka menutrans &Open\.\.\.:e &Otvori\.\.\.:e menutrans Sp&lit-Open\.\.\.:sp &Podeli-otvori\.\.\.:sp +menutrans Open\ Tab\.\.\.:tabnew Otvori\ karticu\.\.\.:tabnew menutrans &New:enew &Nova:enew menutrans &Close:close &Zatvori:close menutrans &Save:w &Sauvaj:w @@ -54,24 +57,27 @@ menutrans &Select\ allggVG Izaberi\ sv&eggVG menutrans &Find\.\.\. &Nai\.\.\. menutrans Find\ and\ Rep&lace\.\.\. Nai\ i\ &zameni\.\.\. menutrans Settings\ &Window P&rozor\ podeavanja +menutrans Startup\ &Settings Po&deavanja\ pri\ pokretanju menutrans &Global\ Settings Op&ta\ podeavanja menutrans F&ile\ Settings Podeavanja\ za\ da&toteke menutrans &Shiftwidth &Pomeraj menutrans Soft\ &Tabstop &Meka\ tabulacija menutrans Te&xt\ Width\.\.\. &irina\ teksta\.\.\. menutrans &File\ Format\.\.\. &Vrsta\ datoteke\.\.\. -menutrans C&olor\ Scheme Bo&je -menutrans &Keymap Pres&likavanje\ tastature +menutrans Show\ C&olor\ Schemes\ in\ Menu Prikai\ eme\ bo&ja\ u\ meniju +menutrans C&olor\ Scheme \eme\ bo&ja +menutrans Show\ &Keymaps\ in\ Menu Prikai\ pres&likavanja\ tastature\ u\ meniju +menutrans &Keymap Pres&likavanja\ tastature menutrans Select\ Fo&nt\.\.\. Izbor\ &fonta\.\.\. " Edit/Global Settings menutrans Toggle\ Pattern\ &Highlight:set\ hls! Naglasi\ &obrazce\ (da/ne):set\ hls! -menutrans Toggle\ &Ignore-case:set\ ic! Zanemari\ \veliinu\ &slova\ (da/ne):set\ ic! -menutrans Toggle\ &Showmatch:set\ sm! Proveri\ prateu\ &zagradu\ (da/ne):set\ sm! +menutrans Toggle\ &Ignoring\ Case:set\ ic! Zanemari\ veliinu\ &slova\ (da/ne):set\ ic! +menutrans Toggle\ &Showing\ Matched\ Pairs:set\ sm! Proveri\ prateu\ &zagradu\ (da/ne):set\ sm! menutrans &Context\ lines Vidljivi\ &redovi menutrans &Virtual\ Edit Virtuelno\ &ureivanje -menutrans Toggle\ Insert\ &Mode:set\ im! Reim\ u&nosa\ (da/ne):set\ im! -menutrans Toggle\ Vi\ C&ompatible:set\ cp! '&Vi'\ saglasno\ (da/ne):set\ cp! +menutrans Toggle\ Insert\ &Mode:set\ im! Reim\ u&nosa\ (da/ne):set\ im! +menutrans Toggle\ Vi\ C&ompatibility:set\ cp! '&Vi'\ saglasno\ (da/ne):set\ cp! menutrans Search\ &Path\.\.\. Putanja\ &pretrage\.\.\. menutrans Ta&g\ Files\.\.\. &Datoteke\ oznaka\.\.\. menutrans Toggle\ &Toolbar Linija\ sa\ &alatkama\ (da/ne) @@ -87,28 +93,30 @@ menutrans Block\ and\ Insert Blok\ i\ unos menutrans Always Uvek " Edit/File Settings -menutrans Toggle\ Line\ &Numbering:set\ nu! Redni\ &brojevi\ (da/ne):set\ nu! +menutrans Toggle\ Line\ &Numbering:set\ nu! Prikai\ &numeraciju\ linija\ (da/ne):set\ nu! +menutrans Toggle\ Relati&ve\ Line\ Numbering:set\ rnu! Prikai\ Relati&vnu\ numeraciju\ linija\ (da/ne):set\ rnu! menutrans Toggle\ &List\ Mode:set\ list! Reim\ &liste\ (da/ne):set\ list! -menutrans Toggle\ Line\ &Wrap:set\ wrap! Obavijanje\ &redova\ (da/ne):set\ wrap! -menutrans Toggle\ W&rap\ at\ word:set\ lbr! Prelomi\ &na\ re\ (da/ne):set\ lbr! -menutrans Toggle\ &expand-tab:set\ et! Razmaci\ umesto\ &tabulacije\ (da/ne):set\ et! -menutrans Toggle\ &auto-indent:set\ ai! Auto-&uvlaenje\ (da/ne):set\ ai! -menutrans Toggle\ &C-indenting:set\ cin! &Ce-uvlaenje\ (da/ne):set\ cin! +menutrans Toggle\ Line\ &Wrapping:set\ wrap! Obavijanje\ &redova\ (da/ne):set\ wrap! +menutrans Toggle\ W&rapping\ at\ Word:set\ lbr! Prelomi\ &na\ re\ (da/ne):set\ lbr! +menutrans Toggle\ Tab\ &Expanding:set\ et! Razmaci\ umesto\ &tabulacije\ (da/ne):set\ et! +menutrans Toggle\ &Auto\ Indenting:set\ ai! Auto-&uvlaenje\ (da/ne):set\ ai! +menutrans Toggle\ &C-Style\ Indenting:set\ cin! &C-uvlaenje\ (da/ne):set\ cin! " Edit/Keymap -menutrans None Nijedan +menutrans None Bez\ preslikavanja " Tools menu menutrans &Tools &Alatke menutrans &Jump\ to\ this\ tagg^] Skoi\ na\ &ovu\ oznakug^] menutrans Jump\ &back^T Skoi\ &natrag^T menutrans Build\ &Tags\ File Izgradi\ &datoteku\ oznaka +menutrans &Spelling Pra&vopis menutrans &Folding &Podvijanje menutrans Create\ &Foldzf S&tvori\ podvijutakzf menutrans &Delete\ Foldzd O&brii\ podvijutakzd menutrans Delete\ &All\ FoldszD Obrii\ sve\ po&dvijutkezD menutrans Fold\ column\ &width irina\ &reda\ podvijutka -menutrans &Diff &Uporeivanje +"menutrans &Diff &Uporeivanje menutrans &Make:make 'mak&e':make menutrans &List\ Errors:cl Spisak\ &greaka:cl menutrans L&ist\ Messages:cl! Sp&isak\ poruka:cl! @@ -117,9 +125,25 @@ menutrans &Previous\ Error:cp Pre&thodna\ gre menutrans &Older\ List:cold Stari\ spisa&k:cold menutrans N&ewer\ List:cnew No&vi\ spisak:cnew menutrans Error\ &Window Prozor\ sa\ g&rekama -menutrans &Set\ Compiler I&zaberi\ prevodioca +menutrans Se&t\ Compiler I&zaberi\ prevodioca menutrans &Convert\ to\ HEX:%!xxd Pretvori\ u\ &HEKS:%!xxd menutrans Conve&rt\ back:%!xxd\ -r Vr&ati\ u\ prvobitan\ oblik:%!xxd\ -r +menutrans Show\ Compiler\ Se&ttings\ in\ Menu Prikai\ pode&avanja\ prevodioca\ u\ meniju + +" Tools/Spelling +menutrans &Spell\ Check\ On &Ukljui\ proveru\ pravopisa +menutrans Spell\ Check\ &Off &Iskljui\ proveru\ pravopisa +menutrans To\ &Next\ Error]s Idi\ na\ &sledeu\ greku]s +menutrans To\ &Previous\ Error[s Idi\ na\ &prethodnu\ greku[s +menutrans Suggest\ &Correctionsz= Predloi\ isp&ravkez= +menutrans &Repeat\ Correction:spellrepall P&onovi\ ispravku:spellrepall +menutrans Set\ Language\ to\ "en" Postavi\ jezik\ na\ "en" +menutrans Set\ Language\ to\ "en_au" Postavi\ jezik\ na\ "en_au" +menutrans Set\ Language\ to\ "en_ca" Postavi\ jezik\ na\ "en_ca" +menutrans Set\ Language\ to\ "en_gb" Postavi\ jezik\ na\ "en_gb" +menutrans Set\ Language\ to\ "en_nz" Postavi\ jezik\ na\ "en_nz" +menutrans Set\ Language\ to\ "en_us" Postavi\ jezik\ na\ "en_us" +menutrans &Find\ More\ Languages Pronai\ jo\ jezika " Tools/Folding menutrans &Enable/Disable\ foldszi &Omogui/prekini\ podvijanjezi @@ -130,6 +154,7 @@ menutrans &Close\ all\ foldszM Zatvori\ s&ve\ podvijutkezM menutrans O&pen\ more\ foldszr Otvori\ vi&e\ podvijutakazr menutrans &Open\ all\ foldszR O&tvori\ sve\ podvijutkezR menutrans Fold\ Met&hod &Nain\ podvijanja +menutrans Fold\ Col&umn\ Width irina\ kolone\ ispred\ podvijutaka " Tools/Folding/Fold Method menutrans M&anual &Runo @@ -141,8 +166,8 @@ menutrans Ma&rker &Oznaka " Tools/Diff menutrans &Update &Auriraj -menutrans &Get\ Block &Prihvati\ izmenu -menutrans &Put\ Block Pre&baci\ izmenu +menutrans &Get\ Block &Prihvati\ blok\ izmena +menutrans &Put\ Block Pre&baci\ blok\ izmena " Tools/Error Window menutrans &Update:cwin &Auriraj:cwin @@ -190,8 +215,10 @@ menutrans Cu&t &Iseci menutrans &Copy &Kopiraj menutrans &Paste &Ubaci menutrans &Delete I&zbrii -menutrans Select\ Blockwise Biraj\ &pravougaono +menutrans Select\ Blockwise Biraj\ b&lokovski menutrans Select\ &Word Izaberi\ &re +menutrans Select\ &Sentence Izaberi\ r&eenicu +menutrans Select\ Pa&ragraph Izaberi\ ¶graf menutrans Select\ &Line Izaberi\ r&ed menutrans Select\ &Block Izaberi\ &blok menutrans Select\ &All Izaberi\ &sve @@ -202,20 +229,20 @@ if has("toolbar") delfun Do_toolbar_tmenu endif fun Do_toolbar_tmenu() - tmenu ToolBar.Open Uitaj - tmenu ToolBar.Save Sauvaj + tmenu ToolBar.Open Uitaj + tmenu ToolBar.Save Sauvaj tmenu ToolBar.SaveAll Sauvaj sve tmenu ToolBar.Print tampaj - tmenu ToolBar.Undo Vrati - tmenu ToolBar.Redo Povrati - tmenu ToolBar.Cut Iseci - tmenu ToolBar.Copy Kopiraj + tmenu ToolBar.Undo Vrati + tmenu ToolBar.Redo Povrati + tmenu ToolBar.Cut Iseci + tmenu ToolBar.Copy Kopiraj tmenu ToolBar.Paste Ubaci - tmenu ToolBar.Find Nai + tmenu ToolBar.Find Nai tmenu ToolBar.FindNext Nai sledei tmenu ToolBar.FindPrev Nai prethodni tmenu ToolBar.Replace Zameni - tmenu ToolBar.New Novi + tmenu ToolBar.New Novi tmenu ToolBar.WinSplit Podeli prozor tmenu ToolBar.WinMax Maksimalna visina tmenu ToolBar.WinMin Minimalna visina @@ -226,25 +253,25 @@ if has("toolbar") tmenu ToolBar.LoadSesn Uitaj seansu tmenu ToolBar.SaveSesn Sauvaj seansu tmenu ToolBar.RunScript Izvri spis - tmenu ToolBar.Make 'make' + tmenu ToolBar.Make 'make' tmenu ToolBar.Shell Operativno okruenje tmenu ToolBar.RunCtags Napravi oznake tmenu ToolBar.TagJump Idi na oznaku - tmenu ToolBar.Help Pomo + tmenu ToolBar.Help Pomo tmenu ToolBar.FindHelp Nai objanjenje endfun endif " Syntax menu menutrans &Syntax &Sintaksa -menutrans &Show\ filetypes\ in\ menu Izbor\ 'filetype'\ iz\ &menija -menutrans Set\ '&syntax'\ only Pode&si\ 'syntax'\ samo -menutrans Set\ '&filetype'\ too Podesi\ 'filetype'\ &takoe -menutrans &Off &Iskljueno +menutrans &Show\ File\ Types\ in\ Menu Prikai\ tipove\ datoteka\ u\ &meniju +menutrans Set\ '&syntax'\ only Pode&si\ samo\ 'syntax' +menutrans Set\ '&filetype'\ too Podesi\ &takoe\ i\ 'filetype' +menutrans &Off &Iskljueno menutrans &Manual &Runo -menutrans A&utomatic &Automatski +menutrans A&utomatic &Automatski menutrans on/off\ for\ &This\ file Da/ne\ za\ ovu\ &datoteku -menutrans Co&lor\ test Provera\ &boja +menutrans Co&lor\ test Provera\ &boja menutrans &Highlight\ test Provera\ isti&canja menutrans &Convert\ to\ HTML Pretvori\ &u\ HTML @@ -257,9 +284,13 @@ let g:menutrans_tags_dialog = "Unesite imena datoteka sa oznakama\nRazdvojite za let g:menutrans_textwidth_dialog = "Unesite novu irinu teksta (0 spreava prelom)" -let g:menutrans_fileformat_dialog = "Izaberite vrstu datoteke" +let g:menutrans_fileformat_dialog = "Izaberite format zapisa datoteke" + +let g:menutrans_fileformat_choices = "&Unix\n&Dos\n&Mac\n&Otkai" let menutrans_no_file = "[Nema datoteke]" let &cpo = s:keepcpo unlet s:keepcpo + +" vim: tw=0 keymap=serbian diff --git a/runtime/lang/menu_sr_rs.iso_8859-5.vim b/runtime/lang/menu_sr_rs.iso_8859-5.vim index dd3b43683..f2b1ee37a 100644 --- a/runtime/lang/menu_sr_rs.iso_8859-5.vim +++ b/runtime/lang/menu_sr_rs.iso_8859-5.vim @@ -1,6 +1,7 @@ " Menu Translations: Serbian " Maintainer: Aleksandar Jelenak -" Last Change: Fri, 30 May 2003 12:02:07 -0400 +" Last Change: Fri, 30 May 2003 10:17:39 Eastern Daylight Time +" Adapted for VIM 8 by: on 2017-12-28 12:05+0400 " Quit when menu translations have already been done. if exists("did_menu_trans") @@ -21,6 +22,7 @@ menutrans &Find & menutrans &Credits & menutrans Co&pying & menutrans O&rphans & +menutrans &Sponsor/Register /&\ menutrans &Version & menutrans &About &\ @@ -28,6 +30,7 @@ menutrans &About & menutrans &File & menutrans &Open\.\.\.:e &\.\.\.:e menutrans Sp&lit-Open\.\.\.:sp &-\.\.\.:sp +menutrans Open\ Tab\.\.\.:tabnew \ \.\.\.:tabnew menutrans &New:enew &:enew menutrans &Close:close &:close menutrans &Save:w &:w @@ -54,24 +57,27 @@ menutrans &Select\ allggVG menutrans &Find\.\.\. &\.\.\. menutrans Find\ and\ Rep&lace\.\.\. \ \ &\.\.\. menutrans Settings\ &Window &\ +menutrans Startup\ &Settings &\ \ menutrans &Global\ Settings &\ menutrans F&ile\ Settings \ \ & menutrans &Shiftwidth & menutrans Soft\ &Tabstop &\ menutrans Te&xt\ Width\.\.\. &\ \.\.\. menutrans &File\ Format\.\.\. &\ \.\.\. -menutrans C&olor\ Scheme & -menutrans &Keymap &\ +menutrans Show\ C&olor\ Schemes\ in\ Menu \ \ &\ \ +menutrans C&olor\ Scheme \\ & +menutrans Show\ &Keymaps\ in\ Menu \ &\ \ \ +menutrans &Keymap &\ menutrans Select\ Fo&nt\.\.\. \ &\.\.\. " Edit/Global Settings menutrans Toggle\ Pattern\ &Highlight:set\ hls! \ &\ (/):set\ hls! -menutrans Toggle\ &Ignore-case:set\ ic! \ \\ &\ (/):set\ ic! -menutrans Toggle\ &Showmatch:set\ sm! \ \ &\ (/):set\ sm! +menutrans Toggle\ &Ignoring\ Case:set\ ic! \ \ &\ (/):set\ ic! +menutrans Toggle\ &Showing\ Matched\ Pairs:set\ sm! \ \ &\ (/):set\ sm! menutrans &Context\ lines \ & menutrans &Virtual\ Edit \ & -menutrans Toggle\ Insert\ &Mode:set\ im! \ &\ (/):set\ im! -menutrans Toggle\ Vi\ C&ompatible:set\ cp! '&Vi'\ \ (/):set\ cp! +menutrans Toggle\ Insert\ &Mode:set\ im! \ &\ (/):set\ im! +menutrans Toggle\ Vi\ C&ompatibility:set\ cp! '&Vi'\ \ (/):set\ cp! menutrans Search\ &Path\.\.\. \ &\.\.\. menutrans Ta&g\ Files\.\.\. &\ \.\.\. menutrans Toggle\ &Toolbar \ \ &\ (/) @@ -87,28 +93,30 @@ menutrans Block\ and\ Insert menutrans Always " Edit/File Settings -menutrans Toggle\ Line\ &Numbering:set\ nu! \ &\ (/):set\ nu! +menutrans Toggle\ Line\ &Numbering:set\ nu! \ &\ \ (/):set\ nu! +menutrans Toggle\ Relati&ve\ Line\ Numbering:set\ rnu! \ &\ \ \ (/):set\ rnu! menutrans Toggle\ &List\ Mode:set\ list! \ &\ (/):set\ list! -menutrans Toggle\ Line\ &Wrap:set\ wrap! \ &\ (/):set\ wrap! -menutrans Toggle\ W&rap\ at\ word:set\ lbr! \ &\ \ (/):set\ lbr! -menutrans Toggle\ &expand-tab:set\ et! \ \ &\ (/):set\ et! -menutrans Toggle\ &auto-indent:set\ ai! -&\ (/):set\ ai! -menutrans Toggle\ &C-indenting:set\ cin! &-\ (/):set\ cin! +menutrans Toggle\ Line\ &Wrapping:set\ wrap! \ &\ (/):set\ wrap! +menutrans Toggle\ W&rapping\ at\ Word:set\ lbr! \ &\ \ (/):set\ lbr! +menutrans Toggle\ Tab\ &Expanding:set\ et! \ \ &\ (/):set\ et! +menutrans Toggle\ &Auto\ Indenting:set\ ai! -&\ (/):set\ ai! +menutrans Toggle\ &C-Style\ Indenting:set\ cin! &C-\ (/):set\ cin! " Edit/Keymap -menutrans None +menutrans None \ " Tools menu menutrans &Tools & menutrans &Jump\ to\ this\ tagg^] \ \ &\ g^] menutrans Jump\ &back^T \ &^T menutrans Build\ &Tags\ File \ &\ +menutrans &Spelling & menutrans &Folding & menutrans Create\ &Foldzf &\ zf menutrans &Delete\ Foldzd &\ zd menutrans Delete\ &All\ FoldszD \ \ &zD menutrans Fold\ column\ &width \ &\ -menutrans &Diff & +"menutrans &Diff & menutrans &Make:make 'mak&':make menutrans &List\ Errors:cl \ &:cl menutrans L&ist\ Messages:cl! &\ :cl! @@ -117,9 +125,25 @@ menutrans &Previous\ Error:cp menutrans &Older\ List:cold \ &:cold menutrans N&ewer\ List:cnew &\ :cnew menutrans Error\ &Window \ \ & -menutrans &Set\ Compiler &\ +menutrans Se&t\ Compiler &\ menutrans &Convert\ to\ HEX:%!xxd \ \ &ŵ:%!xxd menutrans Conve&rt\ back:%!xxd\ -r &\ \ \ :%!xxd\ -r +menutrans Show\ Compiler\ Se&ttings\ in\ Menu \ &\ \ \ + +" Tools/Spelling +menutrans &Spell\ Check\ On &\ \ +menutrans Spell\ Check\ &Off &\ \ +menutrans To\ &Next\ Error]s \ \ &\ ]s +menutrans To\ &Previous\ Error[s \ \ &\ [s +menutrans Suggest\ &Correctionsz= \ &z= +menutrans &Repeat\ Correction:spellrepall &\ :spellrepall +menutrans Set\ Language\ to\ "en" \ \ \ "en" +menutrans Set\ Language\ to\ "en_au" \ \ \ "en_au" +menutrans Set\ Language\ to\ "en_ca" \ \ \ "en_ca" +menutrans Set\ Language\ to\ "en_gb" \ \ \ "en_gb" +menutrans Set\ Language\ to\ "en_nz" \ \ \ "en_nz" +menutrans Set\ Language\ to\ "en_us" \ \ \ "en_us" +menutrans &Find\ More\ Languages \ \ " Tools/Folding menutrans &Enable/Disable\ foldszi &/\ zi @@ -130,6 +154,7 @@ menutrans &Close\ all\ foldszM menutrans O&pen\ more\ foldszr \ &\ zr menutrans &Open\ all\ foldszR &\ \ zR menutrans Fold\ Met&hod &\ +menutrans Fold\ Col&umn\ Width \ \ \ " Tools/Folding/Fold Method menutrans M&anual & @@ -141,8 +166,8 @@ menutrans Ma&rker & " Tools/Diff menutrans &Update & -menutrans &Get\ Block &\ -menutrans &Put\ Block &\ +menutrans &Get\ Block &\ \ a +menutrans &Put\ Block &\ \ " Tools/Error Window menutrans &Update:cwin &:cwin @@ -190,8 +215,10 @@ menutrans Cu&t & menutrans &Copy & menutrans &Paste & menutrans &Delete & -menutrans Select\ Blockwise \ & +menutrans Select\ Blockwise \ & menutrans Select\ &Word \ & +menutrans Select\ &Sentence \ & +menutrans Select\ Pa&ragraph \ & menutrans Select\ &Line \ & menutrans Select\ &Block \ & menutrans Select\ &All \ & @@ -202,20 +229,20 @@ if has("toolbar") delfun Do_toolbar_tmenu endif fun Do_toolbar_tmenu() - tmenu ToolBar.Open - tmenu ToolBar.Save + tmenu ToolBar.Open + tmenu ToolBar.Save tmenu ToolBar.SaveAll tmenu ToolBar.Print - tmenu ToolBar.Undo - tmenu ToolBar.Redo - tmenu ToolBar.Cut - tmenu ToolBar.Copy + tmenu ToolBar.Undo + tmenu ToolBar.Redo + tmenu ToolBar.Cut + tmenu ToolBar.Copy tmenu ToolBar.Paste - tmenu ToolBar.Find + tmenu ToolBar.Find tmenu ToolBar.FindNext tmenu ToolBar.FindPrev tmenu ToolBar.Replace - tmenu ToolBar.New + tmenu ToolBar.New tmenu ToolBar.WinSplit tmenu ToolBar.WinMax tmenu ToolBar.WinMin @@ -226,25 +253,25 @@ if has("toolbar") tmenu ToolBar.LoadSesn tmenu ToolBar.SaveSesn tmenu ToolBar.RunScript - tmenu ToolBar.Make 'make' + tmenu ToolBar.Make 'make' tmenu ToolBar.Shell tmenu ToolBar.RunCtags tmenu ToolBar.TagJump - tmenu ToolBar.Help + tmenu ToolBar.Help tmenu ToolBar.FindHelp endfun endif " Syntax menu menutrans &Syntax & -menutrans &Show\ filetypes\ in\ menu \ 'filetype'\ \ & -menutrans Set\ '&syntax'\ only &\ 'syntax'\ -menutrans Set\ '&filetype'\ too \ 'filetype'\ & -menutrans &Off & +menutrans &Show\ File\ Types\ in\ Menu \ \ \ \ & +menutrans Set\ '&syntax'\ only &\ \ 'syntax' +menutrans Set\ '&filetype'\ too \ &\ \ 'filetype' +menutrans &Off & menutrans &Manual & -menutrans A&utomatic & +menutrans A&utomatic & menutrans on/off\ for\ &This\ file /\ \ \ & -menutrans Co&lor\ test \ & +menutrans Co&lor\ test \ & menutrans &Highlight\ test \ & menutrans &Convert\ to\ HTML \ &\ HTML @@ -257,9 +284,13 @@ let g:menutrans_tags_dialog = " let g:menutrans_textwidth_dialog = " (0 )" -let g:menutrans_fileformat_dialog = " " +let g:menutrans_fileformat_dialog = " " + +let g:menutrans_fileformat_choices = "&Unix\n&Dos\n&Mac\n&" let menutrans_no_file = "[ ]" let &cpo = s:keepcpo unlet s:keepcpo + +" vim: tw=0 keymap=serbian diff --git a/runtime/lang/menu_sr_rs.utf-8.vim b/runtime/lang/menu_sr_rs.utf-8.vim index b9e536dac..21cd68499 100644 --- a/runtime/lang/menu_sr_rs.utf-8.vim +++ b/runtime/lang/menu_sr_rs.utf-8.vim @@ -1,6 +1,7 @@ " Menu Translations: Serbian " Maintainer: Aleksandar Jelenak " Last Change: Fri, 30 May 2003 10:17:39 Eastern Daylight Time +" Adapted for VIM 8 by: Иван Пешић on 2017-12-28 12:05+0400 " Quit when menu translations have already been done. if exists("did_menu_trans") @@ -21,6 +22,7 @@ menutrans &Find &Нађи menutrans &Credits &Заслуге menutrans Co&pying П&реузимање menutrans O&rphans &Сирочићи +menutrans &Sponsor/Register Спонзор/&Региструјте\ се menutrans &Version &Верзија menutrans &About &О\ програму @@ -28,6 +30,7 @@ menutrans &About &О\ програму menutrans &File &Датотека menutrans &Open\.\.\.:e &Отвори\.\.\.:e menutrans Sp&lit-Open\.\.\.:sp &Подели-отвори\.\.\.:sp +menutrans Open\ Tab\.\.\.:tabnew Отвори\ картицу\.\.\.:tabnew menutrans &New:enew &Нова:enew menutrans &Close:close &Затвори:close menutrans &Save:w &Сачувај:w @@ -54,24 +57,27 @@ menutrans &Select\ allggVG Изабери\ св&еggVG menutrans &Find\.\.\. &Нађи\.\.\. menutrans Find\ and\ Rep&lace\.\.\. Нађи\ и\ &замени\.\.\. menutrans Settings\ &Window П&розор\ подешавања +menutrans Startup\ &Settings По&дешавања\ при\ покретању menutrans &Global\ Settings Оп&шта\ подешавања menutrans F&ile\ Settings Подешавања\ за\ да&тотеке menutrans &Shiftwidth &Померај menutrans Soft\ &Tabstop &Мека\ табулација menutrans Te&xt\ Width\.\.\. &Ширина\ текста\.\.\. menutrans &File\ Format\.\.\. &Врста\ датотеке\.\.\. -menutrans C&olor\ Scheme Бо&је -menutrans &Keymap Прес&ликавање\ тастатуре +menutrans Show\ C&olor\ Schemes\ in\ Menu Прикажи\ шеме\ бо&ја\ у\ менију +menutrans C&olor\ Scheme \Шеме\ бо&ја +menutrans Show\ &Keymaps\ in\ Menu Прикажи\ прес&ликавања\ тастатуре\ у\ менију +menutrans &Keymap Прес&ликавања\ тастатуре menutrans Select\ Fo&nt\.\.\. Избор\ &фонта\.\.\. " Edit/Global Settings menutrans Toggle\ Pattern\ &Highlight:set\ hls! Нагласи\ &образце\ (да/не):set\ hls! -menutrans Toggle\ &Ignore-case:set\ ic! Занемари\ \величину\ &слова\ (да/не):set\ ic! -menutrans Toggle\ &Showmatch:set\ sm! Провери\ пратећу\ &заграду\ (да/не):set\ sm! +menutrans Toggle\ &Ignoring\ Case:set\ ic! Занемари\ величину\ &слова\ (да/не):set\ ic! +menutrans Toggle\ &Showing\ Matched\ Pairs:set\ sm! Провери\ пратећу\ &заграду\ (да/не):set\ sm! menutrans &Context\ lines Видљиви\ &редови menutrans &Virtual\ Edit Виртуелно\ &уређивање menutrans Toggle\ Insert\ &Mode:set\ im! Режим\ у&носа\ (да/не):set\ im! -menutrans Toggle\ Vi\ C&ompatible:set\ cp! '&Vi'\ сагласно\ (да/не):set\ cp! +menutrans Toggle\ Vi\ C&ompatibility:set\ cp! '&Vi'\ сагласно\ (да/не):set\ cp! menutrans Search\ &Path\.\.\. Путања\ &претраге\.\.\. menutrans Ta&g\ Files\.\.\. &Датотеке\ ознака\.\.\. menutrans Toggle\ &Toolbar Линија\ са\ &алаткама\ (да/не) @@ -87,28 +93,30 @@ menutrans Block\ and\ Insert Блок\ и\ унос menutrans Always Увек " Edit/File Settings -menutrans Toggle\ Line\ &Numbering:set\ nu! Редни\ &бројеви\ (да/не):set\ nu! +menutrans Toggle\ Line\ &Numbering:set\ nu! Прикажи\ &нумерацију\ линија\ (да/не):set\ nu! +menutrans Toggle\ Relati&ve\ Line\ Numbering:set\ rnu! Прикажи\ Релати&вну\ нумерацију\ линија\ (да/не):set\ rnu! menutrans Toggle\ &List\ Mode:set\ list! Режим\ &листе\ (да/не):set\ list! -menutrans Toggle\ Line\ &Wrap:set\ wrap! Обавијање\ &редова\ (да/не):set\ wrap! -menutrans Toggle\ W&rap\ at\ word:set\ lbr! Преломи\ &на\ реч\ (да/не):set\ lbr! -menutrans Toggle\ &expand-tab:set\ et! Размаци\ уместо\ &табулације\ (да/не):set\ et! -menutrans Toggle\ &auto-indent:set\ ai! Ауто-&увлачење\ (да/не):set\ ai! -menutrans Toggle\ &C-indenting:set\ cin! &Це-увлачење\ (да/не):set\ cin! +menutrans Toggle\ Line\ &Wrapping:set\ wrap! Обавијање\ &редова\ (да/не):set\ wrap! +menutrans Toggle\ W&rapping\ at\ Word:set\ lbr! Преломи\ &на\ реч\ (да/не):set\ lbr! +menutrans Toggle\ Tab\ &Expanding:set\ et! Размаци\ уместо\ &табулације\ (да/не):set\ et! +menutrans Toggle\ &Auto\ Indenting:set\ ai! Ауто-&увлачење\ (да/не):set\ ai! +menutrans Toggle\ &C-Style\ Indenting:set\ cin! &C-увлачење\ (да/не):set\ cin! " Edit/Keymap -menutrans None Ниједан +menutrans None Без\ пресликавања " Tools menu menutrans &Tools &Алатке menutrans &Jump\ to\ this\ tagg^] Скочи\ на\ &ову\ ознакуg^] menutrans Jump\ &back^T Скочи\ &натраг^T menutrans Build\ &Tags\ File Изгради\ &датотеку\ ознака +menutrans &Spelling Пра&вопис menutrans &Folding &Подвијање menutrans Create\ &Foldzf С&твори\ подвијутакzf menutrans &Delete\ Foldzd О&бриши\ подвијутакzd menutrans Delete\ &All\ FoldszD Обриши\ све\ по&двијуткеzD menutrans Fold\ column\ &width Ширина\ &реда\ подвијутка -menutrans &Diff &Упоређивање +"menutrans &Diff &Упоређивање menutrans &Make:make 'mak&е':make menutrans &List\ Errors:cl Списак\ &грешака:cl menutrans L&ist\ Messages:cl! Сп&исак\ порука:cl! @@ -117,9 +125,25 @@ menutrans &Previous\ Error:cp Пре&тходна\ грешка:cp menutrans &Older\ List:cold Стари\ списа&к:cold menutrans N&ewer\ List:cnew Но&ви\ списак:cnew menutrans Error\ &Window Прозор\ са\ г&решкама -menutrans &Set\ Compiler И&забери\ преводиоца +menutrans Se&t\ Compiler И&забери\ преводиоца menutrans &Convert\ to\ HEX:%!xxd Претвори\ у\ &ХЕКС:%!xxd menutrans Conve&rt\ back:%!xxd\ -r Вр&ати\ у\ првобитан\ облик:%!xxd\ -r +menutrans Show\ Compiler\ Se&ttings\ in\ Menu Прикажи\ поде&шавања\ преводиоца\ у\ менију + +" Tools/Spelling +menutrans &Spell\ Check\ On &Укључи\ проверу\ правописа +menutrans Spell\ Check\ &Off &Искључи\ проверу\ правописа +menutrans To\ &Next\ Error]s Иди\ на\ &следећу\ грешку]s +menutrans To\ &Previous\ Error[s Иди\ на\ &претходну\ грешку[s +menutrans Suggest\ &Correctionsz= Предложи\ исп&равкеz= +menutrans &Repeat\ Correction:spellrepall П&онови\ исправку:spellrepall +menutrans Set\ Language\ to\ "en" Постави\ језик\ на\ "en" +menutrans Set\ Language\ to\ "en_au" Постави\ језик\ на\ "en_au" +menutrans Set\ Language\ to\ "en_ca" Постави\ језик\ на\ "en_ca" +menutrans Set\ Language\ to\ "en_gb" Постави\ језик\ на\ "en_gb" +menutrans Set\ Language\ to\ "en_nz" Постави\ језик\ на\ "en_nz" +menutrans Set\ Language\ to\ "en_us" Постави\ језик\ на\ "en_us" +menutrans &Find\ More\ Languages Пронађи\ још\ језика " Tools/Folding menutrans &Enable/Disable\ foldszi &Омогући/прекини\ подвијањеzi @@ -130,6 +154,7 @@ menutrans &Close\ all\ foldszM Затвори\ с&ве\ подвијут menutrans O&pen\ more\ foldszr Отвори\ виш&е\ подвијутакаzr menutrans &Open\ all\ foldszR О&твори\ све\ подвијуткеzR menutrans Fold\ Met&hod &Начин\ подвијања +menutrans Fold\ Col&umn\ Width Ширина\ колоне\ испред\ подвијутака " Tools/Folding/Fold Method menutrans M&anual &Ручно @@ -141,8 +166,8 @@ menutrans Ma&rker &Ознака " Tools/Diff menutrans &Update &Ажурирај -menutrans &Get\ Block &Прихвати\ измену -menutrans &Put\ Block Пре&баци\ измену +menutrans &Get\ Block &Прихвати\ блок\ изменa +menutrans &Put\ Block Пре&баци\ блок\ измена " Tools/Error Window menutrans &Update:cwin &Ажурирај:cwin @@ -190,8 +215,10 @@ menutrans Cu&t &Исеци menutrans &Copy &Копирај menutrans &Paste &Убаци menutrans &Delete И&збриши -menutrans Select\ Blockwise Бирај\ &правоугаоно +menutrans Select\ Blockwise Бирај\ б&локовски menutrans Select\ &Word Изабери\ &реч +menutrans Select\ &Sentence Изабери\ р&еченицу +menutrans Select\ Pa&ragraph Изабери\ &параграф menutrans Select\ &Line Изабери\ р&ед menutrans Select\ &Block Изабери\ &блок menutrans Select\ &All Изабери\ &све @@ -237,9 +264,9 @@ endif " Syntax menu menutrans &Syntax &Синтакса -menutrans &Show\ filetypes\ in\ menu Избор\ 'filetype'\ из\ &менија -menutrans Set\ '&syntax'\ only Поде&си\ 'syntax'\ само -menutrans Set\ '&filetype'\ too Подеси\ 'filetype'\ &такође +menutrans &Show\ File\ Types\ in\ Menu Прикажи\ типове\ датотека\ у\ &менију +menutrans Set\ '&syntax'\ only Поде&си\ само\ 'syntax' +menutrans Set\ '&filetype'\ too Подеси\ &такође\ и\ 'filetype' menutrans &Off &Искључено menutrans &Manual &Ручно menutrans A&utomatic &Аутоматски @@ -257,7 +284,9 @@ let g:menutrans_tags_dialog = "Унесите имена датотека са let g:menutrans_textwidth_dialog = "Унесите нову ширину текста (0 спречава прелом)" -let g:menutrans_fileformat_dialog = "Изаберите врсту датотеке" +let g:menutrans_fileformat_dialog = "Изаберите формат записа датотеке" + +let g:menutrans_fileformat_choices = "&Unix\n&Dos\n&Mac\n&Откажи" let menutrans_no_file = "[Нема датотеке]" diff --git a/runtime/optwin.vim b/runtime/optwin.vim index a417295fd..d8f07b7d9 100644 --- a/runtime/optwin.vim +++ b/runtime/optwin.vim @@ -1,7 +1,7 @@ " These commands create the option window. " " Maintainer: Bram Moolenaar -" Last Change: 2017 Nov 21 +" Last Change: 2018 Feb 11 " If there already is an option window, jump to that one. let buf = bufnr('option-window') @@ -802,6 +802,8 @@ if has("insert_expand") call OptionG("cot", &cot) call append("$", "pumheight\tmaximum height of the popup menu") call OptionG("ph", &ph) + call append("$", "pumwidth\tminimum width of the popup menu") + call OptionG("pw", &pw) call append("$", "completefunc\tuser defined function for Insert mode completion") call append("$", "\t(local to buffer)") call OptionL("cfu") diff --git a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim index 0e4e70931..84ac0de42 100644 --- a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim +++ b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim @@ -325,9 +325,11 @@ func s:Evaluate(range, arg) else let expr = expand('') endif + let s:ignoreEvalError = 0 call s:SendEval(expr) endfunc +let s:ignoreEvalError = 0 let s:evalFromBalloonExpr = 0 " Handle the result of data-evaluate-expression @@ -347,6 +349,7 @@ func s:HandleEvaluate(msg) if s:evalexpr[0] != '*' && value =~ '^0x' && value != '0x0' && value !~ '"$' " Looks like a pointer, also display what it points to. + let s:ignoreEvalError = 1 call s:SendEval('*' . s:evalexpr) else let s:evalFromBalloonExpr = 0 @@ -359,19 +362,19 @@ func TermDebugBalloonExpr() if v:beval_winid != s:startwin return endif - call s:SendEval(v:beval_text) let s:evalFromBalloonExpr = 1 let s:evalFromBalloonExprResult = '' + let s:ignoreEvalError = 1 + call s:SendEval(v:beval_text) return '' endfunc " Handle an error. func s:HandleError(msg) - if a:msg =~ 'No symbol .* in current context' - \ || a:msg =~ 'Cannot access memory at address ' - \ || a:msg =~ 'Attempt to use a type name as an expression' - \ || a:msg =~ 'A syntax error in expression,' + if s:ignoreEvalError " Result of s:SendEval() failed, ignore. + let s:ignoreEvalError = 0 + let s:evalFromBalloonExpr = 0 return endif echoerr substitute(a:msg, '.*msg="\(.*\)"', '\1', '') diff --git a/runtime/scripts.vim b/runtime/scripts.vim index e271db89d..ab66c0c0a 100644 --- a/runtime/scripts.vim +++ b/runtime/scripts.vim @@ -104,10 +104,6 @@ if s:line1 =~# "^#!" elseif s:name =~# '^pike\%(\>\|[0-9]\)' set ft=pike - " Pike - elseif s:name =~# '^pike\%(\>\|[0-9]\)' - set ft=pike - " Lua elseif s:name =~# 'lua' set ft=lua diff --git a/runtime/syntax/css.vim b/runtime/syntax/css.vim index 23db7b10e..ecdbc1795 100644 --- a/runtime/syntax/css.vim +++ b/runtime/syntax/css.vim @@ -4,10 +4,10 @@ " Claudio Fleiner (Maintainer) " Yeti (Add full CSS2, HTML4 support) " Nikolai Weibull (Add CSS2 support) -" Maintainer: Jules Wang " URL: https://github.com/JulesWang/css.vim -" Last Change: 2017 Jan 14 -" cssClassName updated by Ryuichi Hayashida Jan 2016 +" Maintainer: Jules Wang +" Last Change: 2018 Feb. 27 +" cssClassName updated by Ryuichi Hayashida Jan 2016 " quit when a syntax file was already loaded if !exists("main_syntax") @@ -69,74 +69,12 @@ endtry " digits syn match cssValueInteger contained "[-+]\=\d\+" contains=cssUnitDecorators syn match cssValueNumber contained "[-+]\=\d\+\(\.\d*\)\=" contains=cssUnitDecorators -syn match cssValueLength contained "[-+]\=\d\+\(\.\d*\)\=\(%\|mm\|cm\|in\|pt\|pc\|em\|ex\|px\|rem\|dpi\|dppx\|dpcm\)\>" contains=cssUnitDecorators +syn match cssValueLength contained "[-+]\=\d\+\(\.\d*\)\=\(mm\|cm\|in\|pt\|pc\|em\|ex\|px\|rem\|dpi\|dppx\|dpcm\)\>" contains=cssUnitDecorators +syn match cssValueLength contained "[-+]\=\d\+\(\.\d*\)\=%" contains=cssUnitDecorators syn match cssValueAngle contained "[-+]\=\d\+\(\.\d*\)\=\(deg\|grad\|rad\)\>" contains=cssUnitDecorators syn match cssValueTime contained "+\=\d\+\(\.\d*\)\=\(ms\|s\)\>" contains=cssUnitDecorators syn match cssValueFrequency contained "+\=\d\+\(\.\d*\)\=\(Hz\|kHz\)\>" contains=cssUnitDecorators - -syn match cssIncludeKeyword /@\(-[a-z]\+-\)\=\(media\|keyframes\|import\|charset\|namespace\|page\)/ contained -" @media -syn region cssInclude start=/@media\>/ end=/\ze{/ skipwhite skipnl contains=cssMediaProp,cssValueLength,cssMediaKeyword,cssValueInteger,cssMediaAttr,cssVendor,cssMediaType,cssIncludeKeyword,cssMediaComma,cssComment nextgroup=cssMediaBlock -syn keyword cssMediaType contained screen print aural braille embossed handheld projection tty tv speech all contained skipwhite skipnl -syn keyword cssMediaKeyword only not and contained -syn region cssMediaBlock transparent matchgroup=cssBraces start='{' end='}' contains=css.*Attr,css.*Prop,cssComment,cssValue.*,cssColor,cssURL,cssImportant,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,cssVendor,cssDefinition,cssTagName,cssClassName,cssIdentifier,cssPseudoClass,cssSelectorOp,cssSelectorOp2,cssAttributeSelector fold -syn match cssMediaComma "," skipwhite skipnl contained - -" Reference: http://www.w3.org/TR/css3-mediaqueries/ -syn keyword cssMediaProp contained width height orientation scan grid -syn match cssMediaProp contained /\(\(max\|min\)-\)\=\(\(device\)-\)\=aspect-ratio/ -syn match cssMediaProp contained /\(\(max\|min\)-\)\=device-pixel-ratio/ -syn match cssMediaProp contained /\(\(max\|min\)-\)\=device-\(height\|width\)/ -syn match cssMediaProp contained /\(\(max\|min\)-\)\=\(height\|width\|resolution\|monochrome\|color\(-index\)\=\)/ -syn keyword cssMediaAttr contained portrait landscape progressive interlace - -" @page -" http://www.w3.org/TR/css3-page/ -syn match cssPage "@page\>[^{]*{\@=" contains=cssPagePseudo,cssIncludeKeyword nextgroup=cssPageWrap transparent skipwhite skipnl -syn match cssPagePseudo /:\(left\|right\|first\|blank\)/ contained skipwhite skipnl -syn region cssPageWrap contained transparent matchgroup=cssBraces start="{" end="}" contains=cssPageMargin,cssPageProp,cssAttrRegion,css.*Prop,cssComment,cssValue.*,cssColor,cssURL,cssImportant,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,cssVendor,cssDefinition,cssHacks -syn match cssPageMargin /@\(\(top\|left\|right\|bottom\)-\(left\|center\|right\|middle\|bottom\)\)\(-corner\)\=/ contained nextgroup=cssDefinition skipwhite skipnl -syn keyword cssPageProp contained content size -" http://www.w3.org/TR/CSS2/page.html#break-inside -syn keyword cssPageProp contained orphans widows - -" @keyframe -" http://www.w3.org/TR/css3-animations/#keyframes -syn match cssKeyFrame "@\(-[a-z]\+-\)\=keyframes\>[^{]*{\@=" nextgroup=cssKeyFrameWrap contains=cssVendor,cssIncludeKeyword skipwhite skipnl transparent -syn region cssKeyFrameWrap contained transparent matchgroup=cssBraces start="{" end="}" contains=cssKeyFrameSelector -syn match cssKeyFrameSelector /\(\d*%\|from\|to\)\=/ contained skipwhite skipnl nextgroup=cssDefinition - -" @import -syn region cssInclude start=/@import\>/ end=/\ze;/ transparent contains=cssStringQ,cssStringQQ,cssUnicodeEscape,cssComment,cssIncludeKeyword,cssURL,cssMediaProp,cssValueLength,cssMediaKeyword,cssValueInteger,cssMediaAttr,cssVendor,cssMediaType -syn region cssInclude start=/@charset\>/ end=/\ze;/ transparent contains=cssStringQ,cssStringQQ,cssUnicodeEscape,cssComment,cssIncludeKeyword -syn region cssInclude start=/@namespace\>/ end=/\ze;/ transparent contains=cssStringQ,cssStringQQ,cssUnicodeEscape,cssComment,cssIncludeKeyword - -" @font-face -" http://www.w3.org/TR/css3-fonts/#at-font-face-rule -syn match cssFontDescriptor "@font-face\>" nextgroup=cssFontDescriptorBlock skipwhite skipnl -syn region cssFontDescriptorBlock contained transparent matchgroup=cssBraces start="{" end="}" contains=cssComment,cssError,cssUnicodeEscape,cssCommonAttr,cssFontDescriptorProp,cssValue.*,cssFontDescriptorFunction,cssFontDescriptorAttr,cssNoise - -syn match cssFontDescriptorProp contained "\" -syn keyword cssFontDescriptorProp contained src -syn match cssFontDescriptorProp contained "\" -syn match cssFontDescriptorProp contained "\" -syn match cssFontDescriptorProp contained "\" - -" src functions -syn region cssFontDescriptorFunction contained matchgroup=cssFunctionName start="\<\(uri\|url\|local\|format\)\s*(" end=")" contains=cssStringQ,cssStringQQ oneline keepend -" font-sytle and font-weight attributes -syn keyword cssFontDescriptorAttr contained normal italic oblique bold -" font-stretch attributes -syn match cssFontDescriptorAttr contained "\<\(\(ultra\|extra\|semi\)-\)\=\(condensed\|expanded\)\>" -" unicode-range attributes -syn match cssFontDescriptorAttr contained "U+[0-9A-Fa-f?]\+" -syn match cssFontDescriptorAttr contained "U+\x\+-\x\+" -" font-feature-settings attributes -syn keyword cssFontDescriptorAttr contained on off - - - " The 16 basic color names syn keyword cssColor contained aqua black blue fuchsia gray green lime maroon navy olive purple red silver teal yellow @@ -162,8 +100,8 @@ syn keyword cssColor contained midnightblue mintcream mistyrose moccasin navajow syn keyword cssColor contained oldlace olivedrab orange orangered orchid syn match cssColor contained /\/ syn keyword cssColor contained papayawhip peachpuff peru pink plum powderblue -syn keyword cssColor contained rosybrown royalblue saddlebrown salmon sandybrown -syn keyword cssColor contained seagreen seashell sienna skyblue slateblue +syn keyword cssColor contained rosybrown royalblue rebeccapurple saddlebrown salmon +syn keyword cssColor contained sandybrown seagreen seashell sienna skyblue slateblue syn keyword cssColor contained slategray slategrey snow springgreen steelblue tan syn keyword cssColor contained thistle tomato turquoise violet wheat syn keyword cssColor contained whitesmoke yellowgreen @@ -180,10 +118,11 @@ syn match cssImportant contained "!\s*important\>" syn match cssColor contained "\" syn match cssColor contained "\" syn match cssColor contained "\" -syn match cssColor contained "#[0-9A-Fa-f]\{3\}\>" contains=cssUnitDecorators -syn match cssColor contained "#[0-9A-Fa-f]\{6\}\>" contains=cssUnitDecorators +syn match cssColor contained "#\x\{3,4\}\>" contains=cssUnitDecorators +syn match cssColor contained "#\x\{6\}\>" contains=cssUnitDecorators +syn match cssColor contained "#\x\{8\}\>" contains=cssUnitDecorators -syn region cssURL contained matchgroup=cssFunctionName start="\" syn match cssBackgroundAttr contained "\" -syn keyword cssBackgroundAttr contained space round " background-size attributes syn keyword cssBackgroundAttr contained cover contain @@ -236,7 +174,7 @@ syn match cssBorderProp contained "\" syn match cssBorderProp contained "\" " border-image attributes -syn keyword cssBorderAttr contained stretch round space fill +syn keyword cssBorderAttr contained stretch round fill " border-style attributes syn keyword cssBorderAttr contained dotted dashed solid double groove ridge inset outset @@ -264,14 +202,18 @@ syn match cssDimensionProp contained "\<\(min\|max\)-\(width\|height\)\>" syn keyword cssDimensionProp contained height syn keyword cssDimensionProp contained width -" shadow and sizing are in other property groups -syn match cssFlexibleBoxProp contained "\" -syn keyword cssFlexibleBoxAttr contained start end baseline -syn keyword cssFlexibleBoxAttr contained reverse -syn keyword cssFlexibleBoxAttr contained single multiple -syn keyword cssFlexibleBoxAttr contained horizontal -syn match cssFlexibleBoxAttr contained "\" "escape vertical-align -syn match cssFlexibleBoxAttr contained "\<\(inline\|block\)-axis\>" +" CSS Flexible Box Layout Module Level 1 +" http://www.w3.org/TR/css3-flexbox/ +" CSS Box Alignment Module Level 3 +" http://www.w3.org/TR/css-align-3/ +syn match cssFlexibleBoxProp contained "\" +syn match cssFlexibleBoxProp contained "\<\(align\|justify\)\(-\(items\|self\|content\)\)\=\>" +syn keyword cssFlexibleBoxProp contained order + +syn match cssFlexibleBoxAttr contained "\<\(row\|column\|wrap\)\(-reverse\)\=\>" +syn keyword cssFlexibleBoxAttr contained nowrap stretch baseline center +syn match cssFlexibleBoxAttr contained "\" +syn match cssFlexibleBoxAttr contained "\" " CSS Fonts Module Level 3 " http://www.w3.org/TR/css-fonts-3/ @@ -279,11 +221,11 @@ syn match cssFontProp contained "\" syn match cssFontAttr contained "\" syn match cssFontAttr contained "\" syn keyword cssFontAttr contained larger smaller syn match cssFontAttr contained "\<\(x\{1,2\}-\)\=\(large\|small\)\>" +syn match cssFontAttr contained "\" " font-family attributes syn match cssFontAttr contained "\<\(sans-\)\=serif\>" syn keyword cssFontAttr contained Antiqua Arial Black Book Charcoal Comic Courier Dingbats Gadget Geneva Georgia Grande Helvetica Impact Linotype Lucida MS Monaco Neue New Palatino Roboto Roman Symbol Tahoma Times Trebuchet Verdana Webdings Wingdings York Zapf @@ -312,12 +254,16 @@ syn match cssMultiColumnProp contained "\" syn match cssMultiColumnProp contained "\" syn keyword cssMultiColumnProp contained columns syn keyword cssMultiColumnAttr contained balance medium -syn keyword cssMultiColumnAttr contained always avoid left right page column -syn match cssMultiColumnAttr contained "\" +syn keyword cssMultiColumnAttr contained always left right page column +syn match cssMultiColumnAttr contained "\" " http://www.w3.org/TR/css3-break/#page-break syn match cssMultiColumnProp contained "\" +" http://www.w3.org/TR/SVG11/interact.html +syn match cssInteractProp contained "\" +syn match cssInteractAttr contained "\<\(visible\)\=\(Painted\|Fill\|Stroke\)\=\>" + " TODO find following items in w3c docs. syn keyword cssGeneratedContentProp contained quotes crop syn match cssGeneratedContentProp contained "\" @@ -325,7 +271,12 @@ syn match cssGeneratedContentProp contained "\" syn match cssGeneratedContentProp contained "\" syn match cssGeneratedContentAttr contained "\<\(no-\)\=\(open\|close\)-quote\>" -syn match cssGridProp contained "\" +" https://www.w3.org/TR/css-grid-1/ +syn match cssGridProp contained "\" +syn match cssGridProp contained "\" +syn match cssGridProp contained "\" +syn match cssGridProp contained "\" +syn match cssGridProp contained "\" syn match cssHyerlinkProp contained "\" @@ -339,14 +290,14 @@ syn keyword cssListAttr contained inside outside syn keyword cssPositioningProp contained bottom clear clip display float left syn keyword cssPositioningProp contained position right top visibility syn match cssPositioningProp contained "\" -syn keyword cssPositioningAttr contained block compact +syn keyword cssPositioningAttr contained block compact grid syn match cssPositioningAttr contained "\" syn keyword cssPositioningAttr contained left right both syn match cssPositioningAttr contained "\" -syn match cssPositioningAttr contained "\" -syn keyword cssPositioningAttr contained static relative absolute fixed +syn match cssPositioningAttr contained "\" +syn keyword cssPositioningAttr contained static relative absolute fixed subgrid -syn keyword cssPrintAttr contained landscape portrait crop cross always avoid +syn keyword cssPrintAttr contained landscape portrait crop cross always syn match cssTableProp contained "\<\(caption-side\|table-layout\|border-collapse\|border-spacing\|empty-cells\)\>" syn keyword cssTableAttr contained fixed collapse separate show hide once always @@ -419,17 +370,20 @@ syn keyword cssUIAttr contained both horizontal vertical syn match cssUIProp contained "\" syn keyword cssUIAttr contained clip ellipsis -" Already highlighted Props: font content +syn match cssUIProp contained "\" +syn keyword cssUIAttr contained pixellated +syn match cssUIAttr contained "\" + "------------------------------------------------ " Webkit/iOS specific attributes -syn match cssUIAttr contained '\(preserve-3d\)' +syn match cssUIAttr contained '\' " IE specific attributes -syn match cssIEUIAttr contained '\(bicubic\)' +syn match cssIEUIAttr contained '\' " Webkit/iOS specific properties -syn match cssUIProp contained '\(tap-highlight-color\|user-select\|touch-callout\)' +syn match cssUIProp contained '\' " IE specific properties -syn match cssIEUIProp contained '\(interpolation-mode\|zoom\|filter\)' +syn match cssIEUIProp contained '\' " Webkit/Firebox specific properties/attributes syn keyword cssUIProp contained appearance @@ -454,11 +408,25 @@ syn keyword cssAuralAttr contained male female child code digits continuous " mobile text syn match cssMobileTextProp contained "\" - +syn keyword cssMediaProp contained width height orientation scan grid +syn match cssMediaProp contained /\(\(max\|min\)-\)\=\(\(device\)-\)\=aspect-ratio/ +syn match cssMediaProp contained /\(\(max\|min\)-\)\=device-pixel-ratio/ +syn match cssMediaProp contained /\(\(max\|min\)-\)\=device-\(height\|width\)/ +syn match cssMediaProp contained /\(\(max\|min\)-\)\=\(height\|width\|resolution\|monochrome\|color\(-index\)\=\)/ +syn keyword cssMediaAttr contained portrait landscape progressive interlace +syn match cssKeyFrameProp /\d*%\|from\|to/ contained nextgroup=cssDefinition +syn match cssPageMarginProp /@\(\(top\|left\|right\|bottom\)-\(left\|center\|right\|middle\|bottom\)\)\(-corner\)\=/ contained nextgroup=cssDefinition +syn keyword cssPageProp contained content size +syn keyword cssPageProp contained orphans widows +syn keyword cssFontDescriptorProp contained src +syn match cssFontDescriptorProp contained "\" +" unicode-range attributes +syn match cssFontDescriptorAttr contained "U+[0-9A-Fa-f?]\+" +syn match cssFontDescriptorAttr contained "U+\x\+-\x\+" syn match cssBraces contained "[{}]" syn match cssError contained "{@<>" -syn region cssDefinition transparent matchgroup=cssBraces start='{' end='}' contains=cssAttrRegion,css.*Prop,cssComment,cssValue.*,cssColor,cssURL,cssImportant,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,cssVendor,cssDefinition,cssHacks,cssNoise fold +syn region cssDefinition transparent matchgroup=cssBraces start='{' end='}' contains=cssTagName,cssAttributeSelector,cssClassName,cssIdentifier,cssAtRule,cssAttrRegion,css.*Prop,cssComment,cssValue.*,cssColor,cssURL,cssImportant,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,cssVendor,cssDefinition,cssHacks,cssNoise fold syn match cssBraceError "}" syn match cssAttrComma "," @@ -477,7 +445,7 @@ syn match cssPseudoClassId contained "\" syn match cssPseudoClassId contained "\<\(input-\)\=placeholder\>" " Misc highlight groups -syntax match cssUnitDecorators /\(#\|-\|%\|mm\|cm\|in\|pt\|pc\|em\|ex\|px\|ch\|rem\|vh\|vw\|vmin\|vmax\|dpi\|dppx\|dpcm\|Hz\|kHz\|s\|ms\|deg\|grad\|rad\)/ contained +syntax match cssUnitDecorators /\(#\|-\|+\|%\|mm\|cm\|in\|pt\|pc\|em\|ex\|px\|ch\|rem\|vh\|vw\|vmin\|vmax\|dpi\|dppx\|dpcm\|Hz\|kHz\|s\|ms\|deg\|grad\|rad\)/ contained syntax match cssNoise contained /\(:\|;\|\/\)/ " Comment @@ -490,7 +458,7 @@ syn region cssStringQQ start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=cssUnicodeEsc syn region cssStringQ start=+'+ skip=+\\\\\|\\'+ end=+'+ contains=cssUnicodeEscape,cssSpecialCharQ " Vendor Prefix -syn match cssVendor contained "\(-\(webkit\|moz\|o\|ms\)-\)" +syn match cssVendor contained "-\(webkit\|moz\|o\|ms\)-" " Various CSS Hack characters " In earlier versions of IE (6 and 7), one can prefix property names @@ -508,6 +476,34 @@ syn region cssAttrRegion start=/:/ end=/\ze\(;\|)\|}\)/ contained contains=css.* " 'transition' has Props after ':'. syn region cssAttrRegion start=/transition\s*:/ end=/\ze\(;\|)\|}\)/ contained contains=css.*Prop,css.*Attr,cssColor,cssImportant,cssValue.*,cssFunction,cssString.*,cssURL,cssComment,cssUnicodeEscape,cssVendor,cssError,cssAttrComma,cssNoise +syn match cssAtKeyword /@\(font-face\|media\|keyframes\|import\|charset\|namespace\|page\|supports\)/ contained + +syn keyword cssAtRuleLogical only not and contained + +" @media +" Reference: http://www.w3.org/TR/css3-mediaqueries/ +syn region cssAtRule start=/@media\>/ end=/\ze{/ skipwhite skipnl matchgroup=cssAtKeyword contains=cssMediaProp,cssValueLength,cssAtRuleLogical,cssValueInteger,cssMediaAttr,cssVendor,cssMediaType,cssComment nextgroup=cssDefinition +syn keyword cssMediaType contained screen print aural braille embossed handheld projection tty tv speech all contained + +" @page +" http://www.w3.org/TR/css3-page/ +syn region cssAtRule start=/@page\>/ end=/\ze{/ skipwhite skipnl matchgroup=cssAtKeyword contains=cssPagePseudo,cssComment nextgroup=cssDefinition +syn match cssPagePseudo /:\(left\|right\|first\|blank\)/ contained skipwhite skipnl +" @keyframe +" http://www.w3.org/TR/css3-animations/#keyframes +syn region cssAtRule start=/@\(-[a-z]\+-\)\=keyframes\>/ end=/\ze{/ skipwhite skipnl matchgroup=cssAtKeyword contains=cssVendor,cssComment nextgroup=cssDefinition + +syn region cssAtRule start=/@import\>/ end=/\ze;/ contains=cssStringQ,cssStringQQ,cssUnicodeEscape,cssComment,cssAtKeyword,cssURL,cssMediaProp,cssValueLength,cssAtRuleLogical,cssValueInteger,cssMediaAttr,cssMediaType +syn region cssAtRule start=/@charset\>/ end=/\ze;/ contains=cssStringQ,cssStringQQ,cssUnicodeEscape,cssComment,cssAtKeyword +syn region cssAtRule start=/@namespace\>/ end=/\ze;/ contains=cssStringQ,cssStringQQ,cssUnicodeEscape,cssComment,cssAtKeyword + +" @font-face +" http://www.w3.org/TR/css3-fonts/#at-font-face-rule +syn match cssAtRule "@font-face\>" nextgroup=cssFontDescriptorBlock +" @supports +" https://www.w3.org/TR/css3-conditional/#at-supports +syn region cssAtRule start=/@supports\>/ end=/\ze{/ skipwhite skipnl contains=cssAtRuleLogical,cssAttrRegion,css.*Prop,cssValue.*,cssVendor,cssAtKeyword,cssComment nextgroup=cssDefinition + if main_syntax == "css" syn sync minlines=10 @@ -537,6 +533,7 @@ hi def link cssFontProp cssProp hi def link cssGeneratedContentProp cssProp hi def link cssGridProp cssProp hi def link cssHyerlinkProp cssProp +hi def link cssInteractProp cssProp hi def link cssLineboxProp cssProp hi def link cssListProp cssProp hi def link cssMarqueeProp cssProp @@ -567,6 +564,7 @@ hi def link cssFontAttr cssAttr hi def link cssGeneratedContentAttr cssAttr hi def link cssGridAttr cssAttr hi def link cssHyerlinkAttr cssAttr +hi def link cssInteractAttr cssAttr hi def link cssLineboxAttr cssAttr hi def link cssListAttr cssAttr hi def link cssMarginAttr cssAttr @@ -603,8 +601,8 @@ hi def link cssFunctionName Function hi def link cssFunctionComma Function hi def link cssColor Constant hi def link cssIdentifier Function -hi def link cssInclude Include -hi def link cssIncludeKeyword atKeyword +hi def link cssAtRule Include +hi def link cssAtKeyword PreProc hi def link cssImportant Special hi def link cssBraces Function hi def link cssBraceError Error @@ -613,20 +611,16 @@ hi def link cssUnicodeEscape Special hi def link cssStringQQ String hi def link cssStringQ String hi def link cssAttributeSelector String -hi def link cssMedia atKeyword hi def link cssMediaType Special hi def link cssMediaComma Normal -hi def link cssMediaKeyword Statement +hi def link cssAtRuleLogical Statement hi def link cssMediaProp cssProp hi def link cssMediaAttr cssAttr -hi def link cssPage atKeyword hi def link cssPagePseudo PreProc -hi def link cssPageMargin atKeyword +hi def link cssPageMarginProp cssAtKeyword hi def link cssPageProp cssProp -hi def link cssKeyFrame atKeyword -hi def link cssKeyFrameSelector Constant +hi def link cssKeyFrameProp Constant hi def link cssFontDescriptor Special -hi def link cssFontDescriptorFunction Constant hi def link cssFontDescriptorProp cssProp hi def link cssFontDescriptorAttr cssAttr hi def link cssUnicodeRange Constant @@ -636,7 +630,6 @@ hi def link cssProp StorageClass hi def link cssAttr Constant hi def link cssUnitDecorators Number hi def link cssNoise Noise -hi def link atKeyword PreProc let b:current_syntax = "css" diff --git a/runtime/syntax/dircolors.vim b/runtime/syntax/dircolors.vim index 1b598c39b..24bc31ff7 100644 --- a/runtime/syntax/dircolors.vim +++ b/runtime/syntax/dircolors.vim @@ -2,7 +2,7 @@ " Language: dircolors(1) input file " Maintainer: Jan Larres " Previous Maintainer: Nikolai Weibull -" Latest Revision: 2013-08-17 +" Latest Revision: 2018-02-19 if exists("b:current_syntax") finish @@ -135,6 +135,12 @@ function! s:preview_color(linenr) abort elseif item >= 40 && item <= 47 " ANSI SGR background color let hi_str .= s:get_hi_str(item - 40, 'bg') + elseif item >= 90 && item <= 97 + " ANSI SGR+8 foreground color (xterm 16-color support) + let hi_str .= s:get_hi_str(item - 82, 'fg') + elseif item >= 100 && item <= 107 + " ANSI SGR+8 background color (xterm 16-color support) + let hi_str .= s:get_hi_str(item - 92, 'bg') elseif item == 38 " Foreground for terminals with 88/256 color support let color = s:get_256color(colors) diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim index 68a8ed129..48b02970e 100644 --- a/runtime/syntax/vim.vim +++ b/runtime/syntax/vim.vim @@ -66,7 +66,7 @@ syn keyword vimErrSetting contained bioskey biosk conskey consk autoprint beauti " AutoCmd Events {{{2 syn case ignore -syn keyword vimAutoEvent contained BufAdd BufCreate BufDelete BufEnter BufFilePost BufFilePre BufHidden BufLeave BufNew BufNewFile BufRead BufReadCmd BufReadPost BufReadPre BufUnload BufWinEnter BufWinLeave BufWipeout BufWrite BufWriteCmd BufWritePost BufWritePre CmdlineEnter CmdlineLeave CmdUndefined CmdwinEnter CmdwinLeave ColorScheme CompleteDone CursorHold CursorHoldI CursorMoved CursorMovedI EncodingChanged FileAppendCmd FileAppendPost FileAppendPre FileChangedRO FileChangedShell FileChangedShellPost FileEncoding FileReadCmd FileReadPost FileReadPre FileType FileWriteCmd FileWritePost FileWritePre FilterReadPost FilterReadPre FilterWritePost FilterWritePre FocusGained FocusLost FuncUndefined GUIEnter GUIFailed InsertChange InsertCharPre InsertEnter InsertLeave MenuPopup OptionSet QuickFixCmdPost QuickFixCmdPre QuitPre RemoteReply SessionLoadPost ShellCmdPost ShellFilterPost SourceCmd SourcePre SpellFileMissing StdinReadPost StdinReadPre SwapExists Syntax TabClosed TabEnter TabLeave TabNew TermChanged TermResponse TextChanged TextChangedI User VimEnter VimLeave VimLeavePre VimResized WinEnter WinLeave WinNew +syn keyword vimAutoEvent contained BufAdd BufCreate BufDelete BufEnter BufFilePost BufFilePre BufHidden BufLeave BufNew BufNewFile BufRead BufReadCmd BufReadPost BufReadPre BufUnload BufWinEnter BufWinLeave BufWipeout BufWrite BufWriteCmd BufWritePost BufWritePre CmdlineEnter CmdlineLeave CmdUndefined CmdwinEnter CmdwinLeave ColorScheme CompleteDone CursorHold CursorHoldI CursorMoved CursorMovedI EncodingChanged FileAppendCmd FileAppendPost FileAppendPre FileChangedRO FileChangedShell FileChangedShellPost FileEncoding FileReadCmd FileReadPost FileReadPre FileType FileWriteCmd FileWritePost FileWritePre FilterReadPost FilterReadPre FilterWritePost FilterWritePre FocusGained FocusLost FuncUndefined GUIEnter GUIFailed InsertChange InsertCharPre InsertEnter InsertLeave MenuPopup OptionSet QuickFixCmdPost QuickFixCmdPre QuitPre RemoteReply SessionLoadPost ShellCmdPost ShellFilterPost SourceCmd SourcePre SpellFileMissing StdinReadPost StdinReadPre SwapExists Syntax TabClosed TabEnter TabLeave TabNew TermChanged TermResponse TextChanged TextChangedI TextChangedP User VimEnter VimLeave VimLeavePre VimResized WinEnter WinLeave WinNew " Highlight commonly used Groupnames {{{2 syn keyword vimGroup contained Comment Constant String Character Number Boolean Float Identifier Function Statement Conditional Repeat Label Operator Keyword Exception PreProc Include Define Macro PreCondit Type StorageClass Structure Typedef Special SpecialChar Tag Delimiter SpecialComment Debug Underlined Ignore Error Todo -- cgit v1.2.3