diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-08-11 18:00:22 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-08-11 18:00:22 +0200 |
| commit | d473c8c101262702ea9eeb14907ee20a786942b2 (patch) | |
| tree | 2837d2cd3d597959693ae8ffc8d0dd686c425f75 | |
| parent | f53c692240851f71b930e80a0b0b5d4cfcc1b4a3 (diff) | |
| download | vim-git-d473c8c101262702ea9eeb14907ee20a786942b2.tar.gz | |
Update runtime files.
67 files changed, 448 insertions, 327 deletions
diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt index 8d1dca2ff..7b5913042 100644 --- a/runtime/doc/autocmd.txt +++ b/runtime/doc/autocmd.txt @@ -661,7 +661,7 @@ DirChanged The working directory has changed in response to the |:cd| or |:lcd| commands, or as a result of the 'autochdir' option. The pattern can be: - "window" to trigger on `:lcd + "window" to trigger on `:lcd` "global" to trigger on `:cd` "auto" to trigger on 'autochdir'. "drop" to trigger on editing a file diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt index 1ad2930d4..1670db634 100644 --- a/runtime/doc/change.txt +++ b/runtime/doc/change.txt @@ -1447,7 +1447,7 @@ to the name of an external program for Vim to use for text formatting. The program. *format-formatexpr* -The 'formatexpr' option can be set to a Vim Script function that performs +The 'formatexpr' option can be set to a Vim script function that performs reformatting of the buffer. This should usually happen in an |ftplugin|, since formatting is highly dependent on the type of file. It makes sense to use an |autoload| script, so the corresponding script is only loaded @@ -1481,7 +1481,7 @@ text. Put it in your autoload directory, e.g. ~/.vim/autoload/format.vim: > You can then enable the formatting by executing: > setlocal formatexpr=format#Format() -> + Note: this function explicitly returns non-zero when called from insert mode (which basically means, text is inserted beyond the 'textwidth' limit). This causes Vim to fall back to reformat the text by using the internal formatter. diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt index 502fb4918..d56aea72a 100644 --- a/runtime/doc/diff.txt +++ b/runtime/doc/diff.txt @@ -384,12 +384,16 @@ Example (this does almost the same as 'diffexpr' being empty): > endif silent execute "!diff -a --binary " . opt . v:fname_in . " " . v:fname_new . \ " > " . v:fname_out + redraw! endfunction The "-a" argument is used to force comparing the files as text, comparing as binaries isn't useful. The "--binary" argument makes the files read in binary mode, so that a CTRL-Z doesn't end the text on DOS. +The `redraw!` command may not be needed, depending on whether executing a +shell command shows something on the display or not. + *E810* *E97* Vim will do a test if the diff output looks alright. If it doesn't, you will get an error message. Possible causes: diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 2c9c11439..53ee2094e 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -2111,7 +2111,7 @@ cursor({list}) Number move cursor to position in {list} debugbreak({pid}) Number interrupt process being debugged deepcopy({expr} [, {noref}]) any make a full copy of {expr} delete({fname} [, {flags}]) Number delete the file or directory {fname} -deletebufline({expr}, {first}[, {last}]) +deletebufline({expr}, {first} [, {last}]) Number delete lines from buffer {expr} did_filetype() Number |TRUE| if FileType autocmd event used diff_filler({lnum}) Number diff filler lines about {lnum} @@ -2477,7 +2477,7 @@ tolower({expr}) String the String {expr} switched to lowercase toupper({expr}) String the String {expr} switched to uppercase tr({src}, {fromstr}, {tostr}) String translate chars of {src} in {fromstr} to chars in {tostr} -trim({text}[, {mask}]) String trim characters in {mask} from {text} +trim({text} [, {mask}]) String trim characters in {mask} from {text} trunc({expr}) Float truncate Float {expr} type({name}) Number type of variable {name} undofile({name}) String undo file name for {name} @@ -3529,7 +3529,7 @@ delete({fname} [, {flags}]) *delete()* To delete a line from the buffer use |:delete| or |deletebufline()|. -deletebufline({expr}, {first}[, {last}]) *deletebufline()* +deletebufline({expr}, {first} [, {last}]) *deletebufline()* Delete lines {first} to {last} (inclusive) from buffer {expr}. If {last} is omitted then delete line {first} only. On success 0 is returned, on failure 1 is returned. @@ -4307,7 +4307,7 @@ getbufinfo([{dict}]) endfor < To get buffer-local options use: > - getbufvar({bufnr}, '&') + getbufvar({bufnr}, '&option_name') < *getbufline()* @@ -8591,9 +8591,8 @@ term_start({cmd}, {options}) *term_start()* |job-options|. However, not all options can be used. These are supported: all timeout options - "stoponexit" - "callback", "out_cb", "err_cb" - "exit_cb", "close_cb" + "stoponexit", "cwd", "env" + "callback", "out_cb", "err_cb", "exit_cb", "close_cb" "in_io", "in_top", "in_bot", "in_name", "in_buf" "out_io", "out_name", "out_buf", "out_modifiable", "out_msg" "err_io", "err_name", "err_buf", "err_modifiable", "err_msg" @@ -8837,7 +8836,7 @@ tr({src}, {fromstr}, {tostr}) *tr()* echo tr("<blob>", "<>", "{}") < returns "{blob}" -trim({text}[, {mask}]) *trim()* +trim({text} [, {mask}]) *trim()* Return {text} as a String where any character in {mask} is removed from the beginning and end of {text}. If {mask} is not given, {mask} is all characters up to 0x20, diff --git a/runtime/doc/ft_rust.txt b/runtime/doc/ft_rust.txt index b94e1f8f7..ff2e0ca56 100644 --- a/runtime/doc/ft_rust.txt +++ b/runtime/doc/ft_rust.txt @@ -236,4 +236,4 @@ It also has a few other mappings: Note: This binding is only available in MacVim. ============================================================================== - vim:tw=78:sw=4:noet:ts=8:ft=help:norl: + vim:tw=78:sw=4:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt index a000482e5..13542de23 100644 --- a/runtime/doc/intro.txt +++ b/runtime/doc/intro.txt @@ -595,9 +595,9 @@ Virtual Replace mode Virtual Replace mode is similar to Replace mode, but If the 'showmode' option is on "-- VREPLACE --" is shown at the bottom of the window. -Insert Normal mode Entered when CTRL-O given in Insert mode. This is - like Normal mode, but after executing one command Vim - returns to Insert mode. +Insert Normal mode Entered when CTRL-O is typed in Insert mode (see + |i_CTRL-O|). This is like Normal mode, but after + executing one command Vim returns to Insert mode. If the 'showmode' option is on "-- (insert) --" is shown at the bottom of the window. diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index eb455fc09..2343d6342 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -4373,7 +4373,7 @@ A jump table for the options with a short description can be found at |Q_op|. methods. Use 'imdisable' to disable XIM then. You can set 'imactivatefunc' and 'imstatusfunc' to handle IME/XIM - via external command if vim is not compiled with the |+xim|, + via external command if Vim is not compiled with the |+xim|, |+multi_byte_ime| or |global-ime|. *'imsearch'* *'ims'* @@ -4480,6 +4480,7 @@ A jump table for the options with a short description can be found at |Q_op|. so far, matches. The matched string is highlighted. If the pattern is invalid or not found, nothing is shown. The screen will be updated often, this is only useful on fast terminals. + Also applies to the `:s`, `:g` and `:v` commands. Note that the match will be shown, but the cursor will return to its original position when no match is found and when pressing <Esc>. You still need to finish the search command with <Enter> to move the @@ -4493,9 +4494,9 @@ A jump table for the options with a short description can be found at |Q_op|. The highlighting can be set with the 'i' flag in 'highlight'. When 'hlsearch' is on, all matched strings are highlighted too while typing a search command. See also: 'hlsearch'. - If you don't want turn 'hlsearch' on, but want to highlight all matches - while searching, you can turn on and off 'hlsearch' with autocmd. - Example: > + If you don't want to turn 'hlsearch' on, but want to highlight all + matches while searching, you can turn on and off 'hlsearch' with + autocmd. Example: > augroup vimrc-incsearch-highlight autocmd! autocmd CmdlineEnter /,\? :set hlsearch @@ -6650,7 +6651,8 @@ A jump table for the options with a short description can be found at |Q_op|. tabpages all tab pages; without this only the current tab page is restored, so that you can make a session for each tab page separately - terminal include terminal windows where the command can be restored + terminal include terminal windows where the command can be + restored unix with Unix end-of-line format (single <NL>), even when on Windows or DOS winpos position of the whole Vim window @@ -6686,7 +6688,7 @@ A jump table for the options with a short description can be found at |Q_op|. Example with escaped space (Vim will do this when initializing the option from $SHELL): > :set shell=/bin/with\\\ space/sh -< The resulting value of 'shell' is "/bin/with\ space/sh", two +< The resulting value of 'shell' is "/bin/with\ space/sh", two backslashes are consumed by `:set`. Under MS-Windows, when the executable ends in ".com" it must be @@ -7512,7 +7514,7 @@ A jump table for the options with a short description can be found at |Q_op|. line is displayed. The current buffer and current window will be set temporarily to that of the window (and buffer) whose statusline is currently being drawn. The expression will evaluate in this context. - The variable "actual_curbuf" is set to the 'bufnr()' number of the + The variable "g:actual_curbuf" is set to the `bufnr()` number of the real current buffer. The 'statusline' option will be evaluated in the |sandbox| if set from diff --git a/runtime/doc/os_qnx.txt b/runtime/doc/os_qnx.txt index 4cbc7ead0..a252b34a2 100644 --- a/runtime/doc/os_qnx.txt +++ b/runtime/doc/os_qnx.txt @@ -135,4 +135,4 @@ Todo: - Replace usage of fork() with spawn() when launching external programs. - vim:tw=78:sw=4:ts=8:noet:ts=8:ft=help:norl: + vim:tw=78:sw=4:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/print.txt b/runtime/doc/print.txt index 07a95031e..2f5a1a96c 100644 --- a/runtime/doc/print.txt +++ b/runtime/doc/print.txt @@ -46,6 +46,8 @@ Note: If you have problems printing with |:hardcopy|, an alternative is to use 'printexpr' through |v:cmdarg|. Otherwise [arguments] is ignored. 'printoptions' can be used to specify paper size, duplex, etc. + Note: If you want PDF, there are tools such as + "ps2pdf" that can convert the PostScript to PDF. :[range]ha[rdcopy][!] >{filename} As above, but write the resulting PostScript in file diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt index 95bcfa06d..1399d8bed 100644 --- a/runtime/doc/quickfix.txt +++ b/runtime/doc/quickfix.txt @@ -46,7 +46,7 @@ compiler (see |errorformat| below). *quickfix-ID* Each quickfix list has a unique identifier called the quickfix ID and this -number will not change within a Vim session. The getqflist() function can be +number will not change within a Vim session. The |getqflist()| function can be used to get the identifier assigned to a list. There is also a quickfix list number which may change whenever more than ten lists are added to a quickfix stack. @@ -68,7 +68,7 @@ the location list is destroyed. Every quickfix and location list has a read-only changedtick variable that tracks the total number of changes made to the list. Every time the quickfix list is modified, this count is incremented. This can be used to perform an -action only when the list has changed. The getqflist() and getloclist() +action only when the list has changed. The |getqflist()| and |getloclist()| functions can be used to query the current value of changedtick. You cannot change the changedtick variable. @@ -602,7 +602,7 @@ present). Examples: > echo getloclist(2, {'winid' : 1}).winid < *getqflist-examples* -The getqflist() and getloclist() functions can be used to get the various +The |getqflist()| and |getloclist()| functions can be used to get the various attributes of a quickfix and location list respectively. Some examples for using these functions are below: > @@ -659,7 +659,7 @@ using these functions are below: :echo getloclist(3, {'winid' : 0}).winid < *setqflist-examples* -The setqflist() and setloclist() functions can be used to set the various +The |setqflist()| and |setloclist()| functions can be used to set the various attributes of a quickfix and location list respectively. Some examples for using these functions are below: > diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt index 3c2d86805..b060c4555 100644 --- a/runtime/doc/starting.txt +++ b/runtime/doc/starting.txt @@ -487,7 +487,8 @@ a slash. Thus "-R" means recovery and "-/R" readonly. When {vimrc} is equal to "DEFAULTS" (all uppercase), this has the same effect as "NONE", but the |defaults.vim| script is - loaded, which will also set 'nocompatible'. + loaded, which will also set 'nocompatible'. Also see + |--clean|. Using the "-u" argument with another argument than DEFAULTS has the side effect that the 'compatible' option will be on by @@ -520,7 +521,7 @@ a slash. Thus "-R" means recovery and "-/R" readonly. 'nocompatible': use Vim defaults - no |gvimrc| script is loaded - no viminfo file is read or written - - the home directory is excluded from 'runtimepath' + *-x* -x Use encryption to read/write files. Will prompt for a key, which is then stored in the 'key' option. All writes will diff --git a/runtime/doc/tabpage.txt b/runtime/doc/tabpage.txt index a80d7c3b4..1d3365c3c 100644 --- a/runtime/doc/tabpage.txt +++ b/runtime/doc/tabpage.txt @@ -241,8 +241,10 @@ REORDERING TAB PAGES: :tabm[ove] [N] *:tabm* *:tabmove* :[N]tabm[ove] Move the current tab page to after tab page N. Use zero to - make the current tab page the first one. Without N the tab - page is made the last one. > + make the current tab page the first one. N is counted before + the move, thus if the second tab is the current one, + `:tabmove 1`` and `:tabmove 2` have no effect. + Without N the tab page is made the last one. > :.tabmove " do nothing :-tabmove " move the tab page to the left :+tabmove " move the tab page to the right diff --git a/runtime/doc/tags b/runtime/doc/tags index 135c3908e..ed262d4b6 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -991,13 +991,17 @@ $VIM_POSIX vi_diff.txt /*$VIM_POSIX* 't_RF' term.txt /*'t_RF'* 't_RI' term.txt /*'t_RI'* 't_RS' term.txt /*'t_RS'* +'t_RT' term.txt /*'t_RT'* 't_RV' term.txt /*'t_RV'* +'t_Ri' term.txt /*'t_Ri'* 't_SC' term.txt /*'t_SC'* 't_SH' term.txt /*'t_SH'* 't_SI' term.txt /*'t_SI'* 't_SR' term.txt /*'t_SR'* +'t_ST' term.txt /*'t_ST'* 't_Sb' term.txt /*'t_Sb'* 't_Sf' term.txt /*'t_Sf'* +'t_Si' term.txt /*'t_Si'* 't_Te' term.txt /*'t_Te'* 't_Ts' term.txt /*'t_Ts'* 't_VS' term.txt /*'t_VS'* @@ -8744,13 +8748,17 @@ t_RC term.txt /*t_RC* t_RF term.txt /*t_RF* t_RI term.txt /*t_RI* t_RS term.txt /*t_RS* +t_RT term.txt /*t_RT* t_RV term.txt /*t_RV* +t_Ri term.txt /*t_Ri* t_SC term.txt /*t_SC* t_SH term.txt /*t_SH* t_SI term.txt /*t_SI* t_SR term.txt /*t_SR* +t_ST term.txt /*t_ST* t_Sb term.txt /*t_Sb* t_Sf term.txt /*t_Sf* +t_Si term.txt /*t_Si* t_Te term.txt /*t_Te* t_Ts term.txt /*t_Ts* t_VS term.txt /*t_VS* diff --git a/runtime/doc/terminal.txt b/runtime/doc/terminal.txt index f9fc0ee5e..7bdef4829 100644 --- a/runtime/doc/terminal.txt +++ b/runtime/doc/terminal.txt @@ -635,7 +635,7 @@ Starting ~ Load the plugin with this command: > packadd termdebug < *:Termdebug* -To start debugging use `:Termdebug` or `:TermdebugCommand`` followed by the +To start debugging use `:Termdebug` or `:TermdebugCommand` followed by the command name, for example: > :Termdebug vim diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index cf81ccb17..4b1739bdb 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -34,12 +34,10 @@ entered there will not be repeated below, unless there is extra information. The #1234 numbers refer to an issue or pull request on github. To see it in a browser use: https://github.com/vim/vim/issues/1234 - +(replace 1234 with the issue/pull number) *known-bugs* -------------------- Known bugs and current work ----------------------- -Graduate FEAT_VREPLACE, it's not much code and a lot of #ifdefs - Prompt buffer: - Add a command line history. - delay next prompt until plugin gives OK? @@ -76,13 +74,40 @@ Terminal emulator window: - When 'encoding' is not utf-8, or the job is using another encoding, setup conversions. +Patch to support ":tag <tagkind> <tagname". (emmrk, 2018 May 7, #2871) + +Patch to parse ":line" in tags file and use it for search. (Daniel Hahler, +#2546) Fixes #1057. Missing a test. + +Problem with quickfix giving E42 when filtering the error list. +(Nobuhiro Takasaki, 2018 Aug 1, #3270) +Patch with test from Yegappan, Aug 2. + +Patch to add variable name after "scope add". (Eddie Lebow, 2018 Feb 7, #2620) +Maybe not needed? + +Patch in issue 3268, fix suggestion window appearing on wrong screen. +Also from Ken Takata, 2018 Aug 2. + +Patch for Lua support. (Kazunobu Kuriyama, 2018 May 26) + +Patch to use NGETTEXT() in many more places. (Sergey Alyoshin, 2018 May 25) +Updated patch May 27. + +Patch to add winlayout() function. (Yegappan Lakshmanan, 2018 Jan 4) + +Patch to fix profiling condition lines. (Ozaki Kiichi,, 2017 Dec 26, #2499) + +Issue #686: apply 'F' in 'shortmess' to more messages. Also #3221. +Patch on #3221 from Christian. Does it work now? + +Patch to include a cfilter plugin to filter quickfix/location lists. +(Yegappan Lakshmanan, 2018 May 12) + Does not build with MinGW out of the box: - _stat64 is not defined, need to use "struct stat" in vim.h - WINVER conflict, should use 0x0600 by default? -Patches for Python: #3162, #3263 (Ozaki Kiichi) - Needs update. - Crash when mixing matchadd and substitute()? (Max Christian Pohle, 2018 May 13, #2910) Can't reproduce? @@ -98,6 +123,12 @@ Include part of #3242? Inlcude Chinese-Taiwan translations. (bystar, #3261) +Completion mixes results from the current buffer with tags and other files. +Happens when typing CTRL-N while still search for results. E.g., type "b_" in +terminal.c and then CTRL-N twice. +Should do current file first and not split it up when more results are found. +(Also #1890) + Using mouse for inputlist() doesn't work after patch 8.0.1756. (Dominique Pelle, 2018 Jul 22, #3239) Also see 8.0.0722. Check both console and GUI. @@ -150,9 +181,18 @@ Memory leak in test_terminal: gethostbyname() is old, use getaddrinfo() if available. (#3227) +Delete the src/main.aap file? + matchaddpos() gets slow with many matches. Proposal by Rick Howe, 2018 Jul 19. +home_replace() uses $HOME instead of "homedir". (Cesar Martins, 2018 Aug 9) + +Adjust windows installer explanation of behavior. (scootergrisen, #3310) + +Set g:actual_curbuf when evaluating 'statusline', not just with an expression. +(Daniel Hahler, 2018 Aug 8, #3299) + Script generated by :mksession does not work well if there are windows with modified buffers change "silent only" into "silent only!" @@ -160,16 +200,6 @@ modified buffers skip "badd fname" if "fname" is already in the buffer list remove remark about unloading buffers from documentation -Patch to make :help work for tags with a ?. (Hirohito Higashi, 2018 May 28) - -Patch to have a stack trace in Ruby. (Masataka Pocke Kuwabara, 2018 Jul 30, -#3267) - -Patch to adjust to DPI setting for GTK. (Roel van de Kraats, 2017 Nov 20, -#2357) - -Patch to fix window size when using VTP. (Nobuhiro Takasaki, #3164) - Compiler warnings (geeknik, 2017 Oct 26): - signed integer overflow in do_sub() (#2249) - signed integer overflow in get_address() (#2248) @@ -179,8 +209,6 @@ Compiler warnings (geeknik, 2017 Oct 26): Win32 console: <F11> and <F12> typed in Insert mode don't result in normal characters. (#3246) -Patch for more quickfix refactoring. (Yegappan Lakshmanan, #2950) - Tests failing for "make testgui" with GTK: - Test_setbufvar_options() - Test_exit_callback_interval() @@ -190,17 +218,6 @@ is cleared, to avoid going back to the list of errors buffer (would have two windows with it). Can we just remove the jump list entries for the quickfix buffer? -Patch to stack and pop the window title and icon. (IWAMOTO Kouichi, 2018 Jun -22, #3059) -8 For xterm need to open a connection to the X server to get the window - title, which can be slow. Can also get the title with "<Esc>[21t", no - need to use X11 calls. This returns "<Esc>]l{title}<Esc>\". -Using title stack probably works better. - -When a function is defined in the sandbox (with :function or as a lambda) -always execute it in the sandbox. (#3182) -Remove "safe" argument from call_vim_function(), it's always FALSE. - Make balloon_show() work outside of 'balloonexpr'? Users expect it to work: #2948. (related to #1512?) On Win32 it stops showing, because showState is already ShS_SHOWING. @@ -222,8 +239,6 @@ used for git temp files. Cursor in wrong position when line wraps. (#2540) -Patch for Lua support. (Kazunobu Kuriyama, 2018 May 26) - Make {skip} argument of searchpair() consistent with other places where we pass an expression to evaluate. Allow passing zero for "never skip". @@ -233,8 +248,6 @@ script or function. Universal solution to detect if t_RS is working, using cursor position. Koichi Iwamoto, #2126 -Patch to fix profiling condition lines. (Ozaki Kiichi,, 2017 Dec 26, #2499) - When using a menu item while the "more" prompt is displayed doesn't work well. E.g. after using help->version. Have a key that ends the "more" prompt and does nothing otherwise? @@ -268,9 +281,6 @@ How to test that it works well for all Vim users? Alternative manpager.vim. (Enno, 2018 Jan 5, #2529) -Patch to use NGETTEXT() in many more places. (Sergey Alyoshin, 2018 May 25) -Updated ptach May 27. - Does setting 'cursorline' cause syntax highlighting to slow down? Perhaps is mess up the cache? (Mike Lee Williams, 2018 Jan 27, #2539) Also: 'foldtext' is evaluated too often. (Daniel Hahler, #2773) @@ -304,18 +314,14 @@ confusing error message. (Wang Shidong, 2018 Jan 2, #2519) Add the debug command line history to viminfo. -Issue #686: apply 'F' in 'shortmess' to more messages. Also #3221. - Avoid that "sign unplace id" does a redraw right away, esp. when there is a sequence of these commands. (Andy Stewart, 2018 Mar 16) ch_sendraw() with long string does not try to read in between, which may cause a deadlock if the reading side is waiting for the write to finish. (Nate Bosch, 2018 Jan 13, #2548) -Perhaps just make chunks of 1024 bytes? - -Patch to include a cfilter plugin to filter quickfix/location lists. -(Yegappan Lakshmanan, 2018 May 12) +Perhaps just make chunks of 1024 bytes? Make the write non-blocking? +Also a problem on MS-Windows: #2828. 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, @@ -335,8 +341,6 @@ With foldmethod=syntax and nofoldenable comment highlighting isn't removed. Using 'wildignore' also applies to literally entered file name. Also with :drop (remote commands). -Patch to support ":tag <tagkind> <tagname". (emmrk, 2018 May 7, #2871) - Inserting a line in a CompleteDone autocommand may confuse undo. (micbou, 2018 Jun 18, #3027) @@ -377,23 +381,21 @@ crash when removing an element while inside map(). (Nikolai Pavlov, 2018 Feb 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. - ":file" does not show anything when 'shortmess' contains 'F'. (#3070) -Patch to add winlayout() function. (Yegappan Lakshmanan, 2018 Jan 4) - No profile information for function that executes ":quit". (Daniel Hahler, 2017 Dec 26, #2501) +A function on a dictionary is not profiled. (ZyX, 2010 Dec 25) + +A function defined locally and lambda's are not easily recognized. +Mention where they were defined somewhere. + Get a "No Name" buffer when 'hidden' is set and opening a new window from the quickfix list. (bfrg, 2018 Jan 22, #2574) CTRL-X on zero gets stuck on 0xfffffffffffffffe. (Hengyang Zhao, #2746) -A function on a dictionary is not profiled. (ZyX, 2010 Dec 25) - Invalid range error when using BufWinLeave for closing terminal. (Gabriel Barta, 2017 Nov 15, #2339) @@ -404,8 +406,8 @@ Olaf Dabrunz is working on this. (10 Jan 2016) 9 Instead invoking an external diff program, use builtin code. One can be found here: http://www.ioplex.com/~miallen/libmba/dl/src/diff.c It's complicated and badly documented. -Alternative: use the xdiff library. Patch from Christian Brabandt, 2018 Mar -20, #2732) +Alternative: use the xdiff library. Unfinished Patch from Christian Brabandt, +2018 Mar 20, #2732) ml_get errors with buggy script. (Dominique, 2017 Apr 30) @@ -450,9 +452,6 @@ always nested. matchit hasn't been maintained for a long time. #955. -Patch to add variable name after "scope add". (Eddie Lebow, 2018 Feb 7, #2620) -Maybe not needed? - Problem with 'delcombine'. (agguser, 2017 Nov 10, #2313) MS-Windows: buffer completion doesn't work when using backslash (or slash) @@ -554,12 +553,6 @@ that optiona? (Bjorn Linse, 2017 Aug 5) Cindent: returning a structure has more indent for the second item. (Sam Pagenkopf, 2017 Sep 14, #2090) -Completion mixes results from the current buffer with tags and other files. -Happens when typing CTRL-N while still search for results. E.g., type "b_" in -terminal.c and then CTRL-N twice. -Should do current file first and not split it up when more results are found. -(Also #1890) - Patch from Christian Brabandt to preserve upper case marks when wiping out a buffer. (2013 Dec 9) Also fixes #2166? @@ -1277,12 +1270,6 @@ Syntax highlighting slow (hangs) in SASS file. (Niek Bosch, 2013 Aug 21) Adding "~" to 'cdpath' doesn't work for completion? (Davido, 2013 Aug 19) -Should be easy to highlight all matches with 'incsearch'. Idea by Itchyny, -2015 Feb 6. - -Wrong scrolling when using incsearch. Patch by Christian Brabandt, 2014 Dec 4. -Is this a good solution? - Patch: Let rare word highlighting overrule good word highlighting. (Jakson A. Aquino, 2010 Jul 30, again 2011 Jul 2) @@ -1300,8 +1287,6 @@ Remark from Roland Eggner: does it cause crashes? (2014 Dec 12) Updated patch by Roland Eggner, Dec 16 Updated patch from Charles, 2016 Jul 2 -Patch to open folds for 'incsearch'. (Christian Brabandt, 2015 Jan 6) - Patch for building a 32bit Vim with 64bit MingW compiler. (Michael Soyka, 2014 Oct 15) @@ -1872,13 +1857,6 @@ Ruby: ":ruby print $buffer.number" returns zero. setpos() does not restore cursor position after :normal. (Tyru, 2010 Aug 11) -7 The 'directory' option supports changing path separators to "%" to make - file names unique, also support this for 'backupdir'. (Mikolaj Machowski) - Patch by Christian Brabandt, 2010 Oct 21. - Is this an update: related to: #179 - https://github.com/chrisbra/vim-mq-patches/blob/master/backupdir - Fixed patch 2017 Jul 1. - With "tw=55 fo+=a" typing space before ) doesn't work well. (Scott Mcdermott, 2010 Oct 24) @@ -1974,9 +1952,6 @@ Patch to support :undo absolute jump to file save number. (Christian Brabandt, Patch to use 'foldnestmax' also for "marker" foldmethod. (Arnaud Lacombe, 2011 Jan 7) -Bug with 'incsearch' going to wrong line. (Wolfram Kresse, 2009 Aug 17) -Only with "vim -u NONE". - Problem with editing file in binary mode. (Ingo Krabbe, 2009 Oct 8) With 'wildmode' set to "longest:full,full" and pressing Tab once the first @@ -3452,8 +3427,6 @@ Macintosh: 'magic' in history. (Margo) 9 optwin.vim: Restoring a mapping for <Space> or <CR> is not correct for ":noremap". Add "mapcmd({string}, {mode})? Use code from ":mkexrc". -9 incsearch is incorrect for "/that/<Return>/this/;//" (last search pattern - isn't updated). 9 term_console is used before it is set (msdos, Amiga). 9 Get out-of-memory for ":g/^/,$s//@/" on 1000 lines, this is not handled correctly. Get many error messages while redrawing the screen, which @@ -5229,16 +5202,22 @@ Mappings and Abbreviations: Incsearch: -- Add a limit to the number of lines that are searched for 'incsearch'? +- Wrong scrolling when using incsearch. Patch by Christian Brabandt, 2014 + Dec 4. Is this a good solution? +- Temporarily open folds to show where the search ends up. Restore the + folds when going to another line. + Patch to open folds for 'incsearch'. (Christian Brabandt, 2015 Jan 6) +- Bug with 'incsearch' going to wrong line. (Wolfram Kresse, 2009 Aug 17) + Only with "vim -u NONE". - When no match is found and the user types more, the screen is redrawn anyway. Could skip that. Esp. if the line wraps and the text is scrolled up every time. -- Temporarily open folds to show where the search ends up. Restore the - folds when going to another line. - When incsearch used and hitting return, no need to search again in many cases, saves a lot of time in big files. (Slootman wants to work on this?) When not using special characters, can continue search from the last match (or not at all, when there was no match). See oldmail/webb/in.872. +9 incsearch is incorrect for "/that/<Return>/this/;//" (last search pattern + isn't updated). Searching: @@ -6152,5 +6131,5 @@ Far future and "big" extensions: are reflected in each Vim immediately. Could work with local files but also over the internet. See http://www.codingmonkeys.de/subethaedit/. -vim:tw=78:sw=4:sts=4:ts=8:ft=help:norl: +vim:tw=78:sw=4:sts=4:ts=8:noet:ft=help:norl: vim: set fo+=n : diff --git a/runtime/doc/uganda.txt b/runtime/doc/uganda.txt index befb9f31d..47ba3b034 100644 --- a/runtime/doc/uganda.txt +++ b/runtime/doc/uganda.txt @@ -285,4 +285,4 @@ Address to send checks to: This address is expected to be valid for a long time. - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/undo.txt b/runtime/doc/undo.txt index d271222d2..2ada2a6f4 100644 --- a/runtime/doc/undo.txt +++ b/runtime/doc/undo.txt @@ -403,4 +403,4 @@ if it is not what you want do 'u.'. This will remove the contents of the first put, and repeat the put command for the second register. Repeat the 'u.' until you got what you want. - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/usr_01.txt b/runtime/doc/usr_01.txt index 040bcd945..f7abd9cf4 100644 --- a/runtime/doc/usr_01.txt +++ b/runtime/doc/usr_01.txt @@ -189,4 +189,4 @@ donate part of the profit to help AIDS victims in Uganda. See |iccf|. Next chapter: |usr_02.txt| The first steps in Vim -Copyright: see |manual-copyright| vim:tw=78:ts=8:ft=help:norl: +Copyright: see |manual-copyright| vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/usr_02.txt b/runtime/doc/usr_02.txt index 2f976ba01..b9e968e25 100644 --- a/runtime/doc/usr_02.txt +++ b/runtime/doc/usr_02.txt @@ -698,4 +698,4 @@ Summary: *help-summary* > Next chapter: |usr_03.txt| Moving around -Copyright: see |manual-copyright| vim:tw=78:ts=8:ft=help:norl: +Copyright: see |manual-copyright| vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/usr_03.txt b/runtime/doc/usr_03.txt index ba51aa203..5c204f03f 100644 --- a/runtime/doc/usr_03.txt +++ b/runtime/doc/usr_03.txt @@ -654,4 +654,4 @@ You will notice a few special marks. These include: Next chapter: |usr_04.txt| Making small changes -Copyright: see |manual-copyright| vim:tw=78:ts=8:ft=help:norl: +Copyright: see |manual-copyright| vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/usr_04.txt b/runtime/doc/usr_04.txt index 1b4f57944..236f190c3 100644 --- a/runtime/doc/usr_04.txt +++ b/runtime/doc/usr_04.txt @@ -511,4 +511,4 @@ else: Next chapter: |usr_05.txt| Set your settings -Copyright: see |manual-copyright| vim:tw=78:ts=8:ft=help:norl: +Copyright: see |manual-copyright| vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/usr_05.txt b/runtime/doc/usr_05.txt index e2424d63b..a77f90b07 100644 --- a/runtime/doc/usr_05.txt +++ b/runtime/doc/usr_05.txt @@ -664,4 +664,4 @@ This does mean there is less room to edit text, thus it's a compromise. Next chapter: |usr_06.txt| Using syntax highlighting -Copyright: see |manual-copyright| vim:tw=78:ts=8:ft=help:norl: +Copyright: see |manual-copyright| vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/usr_06.txt b/runtime/doc/usr_06.txt index e2750aeb6..e52d11087 100644 --- a/runtime/doc/usr_06.txt +++ b/runtime/doc/usr_06.txt @@ -277,4 +277,4 @@ others look at the colored text. Next chapter: |usr_07.txt| Editing more than one file -Copyright: see |manual-copyright| vim:tw=78:ts=8:ft=help:norl: +Copyright: see |manual-copyright| vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/usr_07.txt b/runtime/doc/usr_07.txt index a163006e0..7c30a923e 100644 --- a/runtime/doc/usr_07.txt +++ b/runtime/doc/usr_07.txt @@ -476,4 +476,4 @@ This protects you from accidentally overwriting another file. Next chapter: |usr_08.txt| Splitting windows -Copyright: see |manual-copyright| vim:tw=78:ts=8:ft=help:norl: +Copyright: see |manual-copyright| vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/usr_08.txt b/runtime/doc/usr_08.txt index 525385639..1f8776a1f 100644 --- a/runtime/doc/usr_08.txt +++ b/runtime/doc/usr_08.txt @@ -598,4 +598,4 @@ For more information about tab pages see |tab-page|. Next chapter: |usr_09.txt| Using the GUI -Copyright: see |manual-copyright| vim:tw=78:ts=8:ft=help:norl: +Copyright: see |manual-copyright| vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/usr_09.txt b/runtime/doc/usr_09.txt index 1bc7aff98..a6f068db1 100644 --- a/runtime/doc/usr_09.txt +++ b/runtime/doc/usr_09.txt @@ -287,4 +287,4 @@ You can tune the way Select mode works with the 'selectmode' option. Next chapter: |usr_10.txt| Making big changes -Copyright: see |manual-copyright| vim:tw=78:ts=8:ft=help:norl: +Copyright: see |manual-copyright| vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/usr_10.txt b/runtime/doc/usr_10.txt index 46f76770f..d551d119d 100644 --- a/runtime/doc/usr_10.txt +++ b/runtime/doc/usr_10.txt @@ -821,4 +821,4 @@ has written. To tell Vim to redraw the screen: > Next chapter: |usr_11.txt| Recovering from a crash -Copyright: see |manual-copyright| vim:tw=78:ts=8:ft=help:norl: +Copyright: see |manual-copyright| vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/usr_11.txt b/runtime/doc/usr_11.txt index 13c08f91a..727228ce0 100644 --- a/runtime/doc/usr_11.txt +++ b/runtime/doc/usr_11.txt @@ -304,4 +304,4 @@ For remarks about encryption and the swap file, see |:recover-crypt|. Next chapter: |usr_12.txt| Clever tricks -Copyright: see |manual-copyright| vim:tw=78:ts=8:ft=help:norl: +Copyright: see |manual-copyright| vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/usr_12.txt b/runtime/doc/usr_12.txt index 13401b15e..6da0830b6 100644 --- a/runtime/doc/usr_12.txt +++ b/runtime/doc/usr_12.txt @@ -355,4 +355,4 @@ matches and where they are. Next chapter: |usr_20.txt| Typing command-line commands quickly -Copyright: see |manual-copyright| vim:tw=78:ts=8:ft=help:norl: +Copyright: see |manual-copyright| vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/usr_20.txt b/runtime/doc/usr_20.txt index afeb7133e..53c4b0838 100644 --- a/runtime/doc/usr_20.txt +++ b/runtime/doc/usr_20.txt @@ -381,4 +381,4 @@ there can be only one. Next chapter: |usr_21.txt| Go away and come back -Copyright: see |manual-copyright| vim:tw=78:ts=8:ft=help:norl: +Copyright: see |manual-copyright| vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/usr_21.txt b/runtime/doc/usr_21.txt index 40388eee7..513dad06b 100644 --- a/runtime/doc/usr_21.txt +++ b/runtime/doc/usr_21.txt @@ -496,4 +496,4 @@ For more details see |modeline|. Next chapter: |usr_22.txt| Finding the file to edit -Copyright: see |manual-copyright| vim:tw=78:ts=8:ft=help:norl: +Copyright: see |manual-copyright| vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/usr_22.txt b/runtime/doc/usr_22.txt index 17209976b..06ab02241 100644 --- a/runtime/doc/usr_22.txt +++ b/runtime/doc/usr_22.txt @@ -397,4 +397,4 @@ can't be editing nothing! Next chapter: |usr_23.txt| Editing other files -Copyright: see |manual-copyright| vim:tw=78:ts=8:ft=help:norl: +Copyright: see |manual-copyright| vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/usr_23.txt b/runtime/doc/usr_23.txt index 049ca2068..c09e5b919 100644 --- a/runtime/doc/usr_23.txt +++ b/runtime/doc/usr_23.txt @@ -340,4 +340,4 @@ decompression. You might need to install the programs first. Next chapter: |usr_24.txt| Inserting quickly -Copyright: see |manual-copyright| vim:tw=78:ts=8:ft=help:norl: +Copyright: see |manual-copyright| vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/usr_24.txt b/runtime/doc/usr_24.txt index a5e334445..625e9cb6c 100644 --- a/runtime/doc/usr_24.txt +++ b/runtime/doc/usr_24.txt @@ -603,4 +603,4 @@ This deletes up to the third word into register g. Next chapter: |usr_25.txt| Editing formatted text -Copyright: see |manual-copyright| vim:tw=78:ts=8:ft=help:norl: +Copyright: see |manual-copyright| vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/usr_25.txt b/runtime/doc/usr_25.txt index f5be3e048..7f65a852e 100644 --- a/runtime/doc/usr_25.txt +++ b/runtime/doc/usr_25.txt @@ -579,4 +579,4 @@ The "gR" command uses Virtual Replace mode. This preserves the layout: Next chapter: |usr_26.txt| Repeating -Copyright: see |manual-copyright| vim:tw=78:ts=8:ft=help:norl: +Copyright: see |manual-copyright| vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/usr_26.txt b/runtime/doc/usr_26.txt index f3afe9be9..8cf5aeb37 100644 --- a/runtime/doc/usr_26.txt +++ b/runtime/doc/usr_26.txt @@ -218,4 +218,4 @@ start all over, use the "-W" argument. It overwrites any existing file. Next chapter: |usr_27.txt| Search commands and patterns -Copyright: see |manual-copyright| vim:tw=78:ts=8:ft=help:norl: +Copyright: see |manual-copyright| vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/usr_27.txt b/runtime/doc/usr_27.txt index 7098c070d..2e6ae72f6 100644 --- a/runtime/doc/usr_27.txt +++ b/runtime/doc/usr_27.txt @@ -560,4 +560,4 @@ and "\w" for "[0-9A-Za-z_]". Next chapter: |usr_28.txt| Folding -Copyright: see |manual-copyright| vim:tw=78:ts=8:ft=help:norl: +Copyright: see |manual-copyright| vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/usr_28.txt b/runtime/doc/usr_28.txt index e2565b01f..9e18c5c1e 100644 --- a/runtime/doc/usr_28.txt +++ b/runtime/doc/usr_28.txt @@ -423,4 +423,4 @@ the defined folds. Then you can delete or add folds manually. Next chapter: |usr_29.txt| Moving through programs -Copyright: see |manual-copyright| vim:tw=78:ts=8:ft=help:norl: +Copyright: see |manual-copyright| vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/usr_29.txt b/runtime/doc/usr_29.txt index 996046e5d..a8ad295f8 100644 --- a/runtime/doc/usr_29.txt +++ b/runtime/doc/usr_29.txt @@ -608,4 +608,4 @@ for the identifier. Example (cursor on "idx"): Next chapter: |usr_30.txt| Editing programs -Copyright: see |manual-copyright| vim:tw=78:ts=8:ft=help:norl: +Copyright: see |manual-copyright| vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/usr_30.txt b/runtime/doc/usr_30.txt index fa39dbf70..79fcf7b7f 100644 --- a/runtime/doc/usr_30.txt +++ b/runtime/doc/usr_30.txt @@ -640,4 +640,4 @@ For more details see |format-comments|. Next chapter: |usr_31.txt| Exploiting the GUI -Copyright: see |manual-copyright| vim:tw=78:ts=8:ft=help:norl: +Copyright: see |manual-copyright| vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/usr_31.txt b/runtime/doc/usr_31.txt index 13de489ba..ac561a008 100644 --- a/runtime/doc/usr_31.txt +++ b/runtime/doc/usr_31.txt @@ -269,4 +269,4 @@ another font size, for example. Next chapter: |usr_32.txt| The undo tree -Copyright: see |manual-copyright| vim:tw=78:ts=8:ft=help:norl: +Copyright: see |manual-copyright| vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/usr_32.txt b/runtime/doc/usr_32.txt index 9e48d53ea..7c043a1d0 100644 --- a/runtime/doc/usr_32.txt +++ b/runtime/doc/usr_32.txt @@ -177,4 +177,4 @@ use the |undotree()| function. To see what it returns: > Next chapter: |usr_40.txt| Make new commands -Copyright: see |manual-copyright| vim:tw=78:ts=8:ft=help:norl: +Copyright: see |manual-copyright| vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/usr_40.txt b/runtime/doc/usr_40.txt index 151c4e6ee..572f68462 100644 --- a/runtime/doc/usr_40.txt +++ b/runtime/doc/usr_40.txt @@ -654,4 +654,4 @@ To set it back to the normal behavior, make 'eventignore' empty: > Next chapter: |usr_41.txt| Write a Vim script -Copyright: see |manual-copyright| vim:tw=78:ts=8:ft=help:norl: +Copyright: see |manual-copyright| vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt index f891f441c..cf343632f 100644 --- a/runtime/doc/usr_41.txt +++ b/runtime/doc/usr_41.txt @@ -2592,4 +2592,4 @@ It's good if you add a line to allow automatic updating. See |glvs-plugins|. Next chapter: |usr_42.txt| Add new menus -Copyright: see |manual-copyright| vim:tw=78:ts=8:ft=help:norl: +Copyright: see |manual-copyright| vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/usr_42.txt b/runtime/doc/usr_42.txt index 1e187e949..46483613a 100644 --- a/runtime/doc/usr_42.txt +++ b/runtime/doc/usr_42.txt @@ -362,4 +362,4 @@ is... Next chapter: |usr_43.txt| Using filetypes -Copyright: see |manual-copyright| vim:tw=78:ts=8:ft=help:norl: +Copyright: see |manual-copyright| vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/usr_43.txt b/runtime/doc/usr_43.txt index 331f5b8d4..11647f6ea 100644 --- a/runtime/doc/usr_43.txt +++ b/runtime/doc/usr_43.txt @@ -176,4 +176,4 @@ and sources a script or executes a function to check the contents of the file. Next chapter: |usr_44.txt| Your own syntax highlighted -Copyright: see |manual-copyright| vim:tw=78:ts=8:ft=help:norl: +Copyright: see |manual-copyright| vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/usr_44.txt b/runtime/doc/usr_44.txt index b6f37e2d3..e557ca243 100644 --- a/runtime/doc/usr_44.txt +++ b/runtime/doc/usr_44.txt @@ -716,4 +716,4 @@ up scrolling backwards and CTRL-L. Next chapter: |usr_45.txt| Select your language -Copyright: see |manual-copyright| vim:tw=78:ts=8:ft=help:norl: +Copyright: see |manual-copyright| vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/usr_45.txt b/runtime/doc/usr_45.txt index e7844a8e9..3830eab2f 100644 --- a/runtime/doc/usr_45.txt +++ b/runtime/doc/usr_45.txt @@ -416,4 +416,4 @@ Don't type the spaces. See |i_CTRL-V_digit| for the details. Next chapter: |usr_90.txt| Installing Vim -Copyright: see |manual-copyright| vim:tw=78:ts=8:ft=help:norl: +Copyright: see |manual-copyright| vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/usr_90.txt b/runtime/doc/usr_90.txt index 5ecba6015..a5b429280 100644 --- a/runtime/doc/usr_90.txt +++ b/runtime/doc/usr_90.txt @@ -495,4 +495,4 @@ files that you created. You might want to keep that. Table of contents: |usr_toc.txt| -Copyright: see |manual-copyright| vim:tw=78:ts=8:ft=help:norl: +Copyright: see |manual-copyright| vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/usr_toc.txt b/runtime/doc/usr_toc.txt index 6a6543d1a..9247ba03a 100644 --- a/runtime/doc/usr_toc.txt +++ b/runtime/doc/usr_toc.txt @@ -352,4 +352,4 @@ Before you can use Vim. ============================================================================== -Copyright: see |manual-copyright| vim:tw=78:ts=8:ft=help:norl: +Copyright: see |manual-copyright| vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/version4.txt b/runtime/doc/version4.txt index 3990a4b1b..6758b7aed 100644 --- a/runtime/doc/version4.txt +++ b/runtime/doc/version4.txt @@ -352,4 +352,4 @@ this and accidentally hit CTRL-B, it is very difficult to find out how to undo it. Since hardly anybody uses this feature, it is disabled by default. If you want to use it, define RIGHTLEFT in feature.h before compiling. |'revins'| - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/version5.txt b/runtime/doc/version5.txt index 075e58310..ee23a223d 100644 --- a/runtime/doc/version5.txt +++ b/runtime/doc/version5.txt @@ -7810,4 +7810,4 @@ Solution: Allocate the buffer for the shell command. Files: src/ex_docmd.c - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/version6.txt b/runtime/doc/version6.txt index a4dd5e65f..a2e5474f4 100644 --- a/runtime/doc/version6.txt +++ b/runtime/doc/version6.txt @@ -14527,4 +14527,4 @@ Solution: Don't advance the cursor to include a line break when it's already Files: src/search.c - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt index 8155176ab..ff1a42ca3 100644 --- a/runtime/doc/version7.txt +++ b/runtime/doc/version7.txt @@ -18309,4 +18309,4 @@ Files: src/os_win32.c - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/version8.txt b/runtime/doc/version8.txt index 90784a060..50ebf3374 100644 --- a/runtime/doc/version8.txt +++ b/runtime/doc/version8.txt @@ -25792,4 +25792,4 @@ Solution: Move the todo items to the help file. Files: src/terminal.c - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/vi_diff.txt b/runtime/doc/vi_diff.txt index a395c8877..ddcb09d50 100644 --- a/runtime/doc/vi_diff.txt +++ b/runtime/doc/vi_diff.txt @@ -1021,4 +1021,4 @@ These are remarks about running the POSIX test suite: - ex test 534 fails because .exrc isn't read in silent mode. - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/visual.txt b/runtime/doc/visual.txt index 5e15b3b96..c48c1b526 100644 --- a/runtime/doc/visual.txt +++ b/runtime/doc/visual.txt @@ -538,4 +538,4 @@ g CTRL-H Start Select mode, blockwise. This is like CTRL-V, but starts Select mode instead of Visual mode. Mnemonic: "get Highlighted". - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/windows.txt b/runtime/doc/windows.txt index f7045b864..dea6a18df 100644 --- a/runtime/doc/windows.txt +++ b/runtime/doc/windows.txt @@ -1311,4 +1311,4 @@ unlisted The buffer is not in the buffer list. It is not used for :setlocal nobuflisted < - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/workshop.txt b/runtime/doc/workshop.txt index 8a699a47d..bcdfcf4f1 100644 --- a/runtime/doc/workshop.txt +++ b/runtime/doc/workshop.txt @@ -95,4 +95,4 @@ the directory /usr/local/xpm and untar the file there you can use the uncommented lines in the Makefile without changing them. If you use another xpm directory you will need to change the XPM_DIR in src/Makefile. - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 6ad27220a..98b5c71f2 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -586,7 +586,7 @@ au BufNewFile,BufRead auto.master setf conf au BufNewFile,BufRead *.mas,*.master setf master " Forth -au BufNewFile,BufRead *.fs,*.ft setf forth +au BufNewFile,BufRead *.fs,*.ft,*.fth setf forth " Reva Forth au BufNewFile,BufRead *.frt setf reva @@ -1865,6 +1865,9 @@ au BufNewFile,BufRead */etc/xdg/menus/*.menu setf xml " ATI graphics driver configuration au BufNewFile,BufRead fglrxrc setf xml +" Web Services Description Language (WSDL) +au BufNewFile,BufRead *.wsdl setf xml + " XLIFF (XML Localisation Interchange File Format) is also XML au BufNewFile,BufRead *.xlf setf xml au BufNewFile,BufRead *.xliff setf xml diff --git a/runtime/ftplugin/logtalk.dict b/runtime/ftplugin/logtalk.dict index e3b9e6f2a..3fcdfc6f6 100644 --- a/runtime/ftplugin/logtalk.dict +++ b/runtime/ftplugin/logtalk.dict @@ -1,164 +1,262 @@ -encoding +abolish +abolish_category +abolish_events +abolish_object +abolish_protocol +abs +acos +acyclic_term +after +alias +always_true_or_false_goals +arg +asin +asserta +assertz +atan +atan2 +atom +atomic +atom_chars +atom_chars +atom_codes +atom_codes +atom_concat +atom_concat +atom_length +at_end_of_stream +bagof +before +built_in +call +callable calls +catch category +category_property +ceiling +char_code +char_conversion +clause +clean +close +code_prefix +coinduction +coinductive +compare +complements +complements +complements_object +compound +conforms_to_protocol +context +context_switching_calls +copy_term +cos +create_category +create_logtalk_flag +create_object +create_protocol +current_category +current_char_conversion +current_event +current_input +current_logtalk_flag +current_object +current_op +current_output +current_predicate +current_prolog_flag +current_protocol +debug +define_events +deprecated +discontiguous +div +domain_error +duplicated_directives dynamic +dynamic_declarations +elif +else +encoding +encoding_directive +endif end_category end_object end_protocol -info -initialization -object -protocol -synchronized -threaded -uses -alias -discontiguous -meta_predicate -mode -op -private -protected -public -current_object -current_protocol -current_category -object_property -protocol_property -category_property -create_object -create_protocol -create_category -abolish_object -abolish_protocol -abolish_category -complements -complements_object +engines +ensure_loaded +evaluation_error +events +existence_error +exp +expand_goal +expand_term +export extends +extends_category extends_object extends_protocol -extends_category +fail +false +findall +float +float_fractional_part +float_integer_part +floor +flush_output +forall +forward +functor +get_byte +get_char +get_code +goal_expansion +ground +halt +hook +if +ignore implements implements_protocol imports imports_category +include +info +initialization instantiates instantiates_class -specializes -specializes_class -abolish_events -current_event -define_events -logtalk_load +instantiation_error +integer +keysort +lambda_variables +log logtalk_compile logtalk_library_path -current_logtalk_flag -set_logtalk_flag -threaded_call -threaded_once -threaded_ignore -threaded_exit -threaded_peek -threaded_wait -threaded_notify -self -this -sender -parameter -before -after -phrase -expand_term -goal_expansion -term_expansion -true -fail -call -catch -throw -unify_with_occurs_check -var -atom -integer -float -atomic -compound +logtalk_load +logtalk_load_context +logtalk_make +logtalk_make_target_action +max +meta_non_terminal +meta_predicate +min +missing_directives +mod +mode +modules +multifile +nl nonvar number -arg -copy_term -functor -current_predicate -predicate_property -abolish -assertz -asserta -clause -retract -retractall -bagof -findall -forall -setof -current_input -current_output -set_input -set_output +numbervars +number_chars +number_chars +number_codes +number_codes +object +object_property +once +op open -close -flush_output -stream_property -at_end_of_stream -set_stream_position -get_char -get_code +optimize +parameter +peek_byte peek_char peek_code +permission_error +phrase +portability +predicate_property +private +prolog_compatible_version +prolog_compiler +prolog_dialect +prolog_loader +prolog_version +protected +protocol +protocol_property +public +put_byte put_char put_code -nl -get_byte -peek_byte -put_byte read read_term -write -writeq -write_canonical -atom_chars -atom_codes -atom_concat -number_chars -number_codes -current_op -char_conversion -current_char_conversion -once -repeat -atom_length -atom_concat -sub_atom -atom_chars -atom_codes -char_code -number_chars -number_codes -set_prolog_flag -current_prolog_flag -halt -abs -atan -ceiling -cos -exp -float_fractional_part -float_integer_part -floor -log -mod +redefined_built_ins +reexport +reload rem +repeat +report +representation_error +resource_error +retract +retractall round +scratch_directory +self +sender +setof +set_input +set_logtalk_flag +set_output +set_prolog_flag +set_stream_position sign sin +singleton_variables +sort +source_data +specializes +specializes_class sqrt +stream_property +subsumes_term +sub_atom +suspicious_calls +synchronized +syntax_error +system_error +tabling +tan +term_expansion +term_variables +this +threaded +threaded_call +threaded_engine +threaded_engine_create +threaded_engine_destroy +threaded_engine_fetch +threaded_engine_next +threaded_engine_next_reified +threaded_engine_post +threaded_engine_self +threaded_engine_yield +threaded_exit +threaded_ignore +threaded_notify +threaded_once +threaded_peek +threaded_wait +threads +throw +trivial_goal_fails +true truncate +type_error +undefined_predicates +underscore_variables +unify_with_occurs_check +unknown_entities +unknown_predicates +uses +use_module +var +version +write +writeq +write_canonical +xor diff --git a/runtime/ftplugin/logtalk.vim b/runtime/ftplugin/logtalk.vim index e71307a39..667907ce5 100644 --- a/runtime/ftplugin/logtalk.vim +++ b/runtime/ftplugin/logtalk.vim @@ -1,7 +1,7 @@ " Logtalk filetype plugin file " Language: Logtalk " Maintainer: Paulo Moura <pmoura@logtalk.org> -" Latest Revision: 2007-07-06 +" Latest Revision: 2018-08-03 if exists("b:did_ftplugin") finish @@ -10,9 +10,10 @@ let b:did_ftplugin = 1 let b:undo_ftplugin = "setl ts< sw< fdm< fdc< ai< dict<" -"setlocal ts=4 +setlocal ts=4 setlocal sw=4 setlocal fdm=syntax +setlocal fdn=10 setlocal fdc=2 setlocal autoindent setlocal dict=$VIMRUNTIME/ftplugin/logtalk.dict diff --git a/runtime/ftplugin/vim.vim b/runtime/ftplugin/vim.vim index 03a77894c..a0f0f3a1b 100644 --- a/runtime/ftplugin/vim.vim +++ b/runtime/ftplugin/vim.vim @@ -1,7 +1,7 @@ " Vim filetype plugin " Language: Vim " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2017 Dec 05 +" Last Change: 2018 Aug 07 " Only do this when not done yet for this buffer if exists("b:did_ftplugin") @@ -17,19 +17,19 @@ set cpo-=C if !exists('*VimFtpluginUndo') func VimFtpluginUndo() setl fo< isk< com< tw< commentstring< - if exists(b:did_add_maps) - silent! nunmap <buffer> [[' - silent! vunmap <buffer> [[' - silent! nunmap <buffer> ]]' - silent! vunmap <buffer> ]]' - silent! nunmap <buffer> []' - silent! vunmap <buffer> []' - silent! nunmap <buffer> ][' - silent! vunmap <buffer> ][' - silent! nunmap <buffer> ]"' - silent! vunmap <buffer> ]"' - silent! nunmap <buffer> ["' - silent! vunmap <buffer> ["' + if exists('b:did_add_maps') + silent! nunmap <buffer> [[ + silent! vunmap <buffer> [[ + silent! nunmap <buffer> ]] + silent! vunmap <buffer> ]] + silent! nunmap <buffer> [] + silent! vunmap <buffer> [] + silent! nunmap <buffer> ][ + silent! vunmap <buffer> ][ + silent! nunmap <buffer> ]" + silent! vunmap <buffer> ]" + silent! nunmap <buffer> [" + silent! vunmap <buffer> [" endif unlet! b:match_ignorecase b:match_words b:match_skip b:did_add_maps endfunc diff --git a/runtime/indent/logtalk.vim b/runtime/indent/logtalk.vim index 5b69663e1..8e36f8611 100644 --- a/runtime/indent/logtalk.vim +++ b/runtime/indent/logtalk.vim @@ -1,5 +1,5 @@ " Maintainer: Paulo Moura <pmoura@logtalk.org> -" Revised on: 2008.06.02 +" Revised on: 2018.08.04 " Language: Logtalk " This Logtalk indent file is a modified version of the Prolog @@ -42,6 +42,9 @@ function! GetLogtalkIndent() " Check for clause head on previous line elseif pline =~ ':-\s*\(%.*\)\?$' let ind = ind + shiftwidth() + " Check for grammar rule head on previous line + elseif pline =~ '-->\s*\(%.*\)\?$' + let ind = ind + shiftwidth() " Check for entity closing directive on previous line elseif pline =~ '^\s*:-\send_\(object\|protocol\|category\)\.\(%.*\)\?$' let ind = ind - shiftwidth() diff --git a/runtime/syntax/debcontrol.vim b/runtime/syntax/debcontrol.vim index e630373c7..9085cd01d 100644 --- a/runtime/syntax/debcontrol.vim +++ b/runtime/syntax/debcontrol.vim @@ -3,7 +3,7 @@ " Maintainer: Debian Vim Maintainers " Former Maintainers: Gerfried Fuchs <alfie@ist.org> " Wichert Akkerman <wakkerma@debian.org> -" Last Change: 2018 May 31 +" Last Change: 2018 Aug 11 " URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debcontrol.vim " Standard syntax initialization @@ -30,7 +30,7 @@ let s:kernels = ['linux', 'hurd', 'kfreebsd', 'knetbsd', 'kopensolaris', 'netbsd let s:archs = [ \ 'alpha', 'amd64', 'armeb', 'armel', 'armhf', 'arm64', 'avr32', 'hppa' \, 'i386', 'ia64', 'lpia', 'm32r', 'm68k', 'mipsel', 'mips64el', 'mips' - \, 'powerpcspe', 'powerpc', 'ppc64el', 'ppc64', 's390x', 's390', 'sh3eb' + \, 'powerpcspe', 'powerpc', 'ppc64el', 'ppc64', 'riscv64', 's390x', 's390', 'sh3eb' \, 'sh3', 'sh4eb', 'sh4', 'sh', 'sparc64', 'sparc', 'x32' \ ] let s:pairs = [ diff --git a/runtime/syntax/debsources.vim b/runtime/syntax/debsources.vim index c7960c161..74e8d42d1 100644 --- a/runtime/syntax/debsources.vim +++ b/runtime/syntax/debsources.vim @@ -2,7 +2,7 @@ " Language: Debian sources.list " Maintainer: Debian Vim Maintainers " Former Maintainer: Matthijs Mohlmann <matthijs@cacholong.nl> -" Last Change: 2018 May 03 +" Last Change: 2018 Aug 11 " URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debsources.vim " Standard syntax initialization @@ -25,7 +25,7 @@ let s:supported = [ \ 'oldstable', 'stable', 'testing', 'unstable', 'experimental', \ 'wheezy', 'jessie', 'stretch', 'sid', 'rc-buggy', \ - \ 'trusty', 'xenial', 'artful', 'bionic', 'cosmic', 'devel' + \ 'trusty', 'xenial', 'bionic', 'cosmic', 'devel' \ ] let s:unsupported = [ \ 'buzz', 'rex', 'bo', 'hamm', 'slink', 'potato', @@ -34,7 +34,7 @@ let s:unsupported = [ \ 'warty', 'hoary', 'breezy', 'dapper', 'edgy', 'feisty', \ 'gutsy', 'hardy', 'intrepid', 'jaunty', 'karmic', 'lucid', \ 'maverick', 'natty', 'oneiric', 'precise', 'quantal', 'raring', 'saucy', - \ 'utopic', 'vivid', 'wily', 'yakkety', 'zesty' + \ 'utopic', 'vivid', 'wily', 'yakkety', 'zesty', 'artful' \ ] let &cpo=s:cpo diff --git a/runtime/syntax/logtalk.vim b/runtime/syntax/logtalk.vim index 532f83d3b..a7fe9ce92 100644 --- a/runtime/syntax/logtalk.vim +++ b/runtime/syntax/logtalk.vim @@ -2,7 +2,7 @@ " " Language: Logtalk " Maintainer: Paulo Moura <pmoura@logtalk.org> -" Last Change: February 4, 2012 +" Last Change: August 3, 2018 " quit when a syntax file was already loaded @@ -79,13 +79,13 @@ syn region logtalkDir matchgroup=logtalkDirTag start=":- elif(" matchgroup=log syn match logtalkDirTag ":- else\." syn match logtalkDirTag ":- endif\." syn region logtalkDir matchgroup=logtalkDirTag start=":- alias(" matchgroup=logtalkDirTag end=")\." contains=ALL -syn region logtalkDir matchgroup=logtalkDirTag start=":- calls(" matchgroup=logtalkDirTag end=")\." contains=ALL syn region logtalkDir matchgroup=logtalkDirTag start=":- coinductive(" matchgroup=logtalkDirTag end=")\." contains=ALL syn region logtalkDir matchgroup=logtalkDirTag start=":- encoding(" matchgroup=logtalkDirTag end=")\." contains=ALL syn region logtalkDir matchgroup=logtalkDirTag start=":- initialization(" matchgroup=logtalkDirTag end=")\." contains=ALL syn region logtalkDir matchgroup=logtalkDirTag start=":- info(" matchgroup=logtalkDirTag end=")\." contains=ALL syn region logtalkDir matchgroup=logtalkDirTag start=":- mode(" matchgroup=logtalkDirTag end=")\." contains=logtalkOperator, logtalkAtom syn region logtalkDir matchgroup=logtalkDirTag start=":- dynamic(" matchgroup=logtalkDirTag end=")\." contains=ALL +syn match logtalkDirTag ":- built_in\." syn match logtalkDirTag ":- dynamic\." syn region logtalkDir matchgroup=logtalkDirTag start=":- discontiguous(" matchgroup=logtalkDirTag end=")\." contains=ALL syn region logtalkDir matchgroup=logtalkDirTag start=":- multifile(" matchgroup=logtalkDirTag end=")\." contains=ALL @@ -131,17 +131,20 @@ syn match logtalkBuiltIn "\<\(instantiat\|specializ\)es_class\ze(" syn match logtalkBuiltIn "\<\(abolish\|define\)_events\ze(" syn match logtalkBuiltIn "\<current_event\ze(" -syn match logtalkBuiltIn "\<\(curren\|se\)t_logtalk_flag\ze(" +syn match logtalkBuiltIn "\<\(create\|current\|set\)_logtalk_flag\ze(" -syn match logtalkBuiltIn "\<logtalk_\(compile\|l\(ibrary_path\|oad\|oad_context\)\)\ze(" +syn match logtalkBuiltIn "\<logtalk_\(compile\|l\(ibrary_path\|oad\|oad_context\)\|make\(_target_action\)\?\)\ze(" +syn match logtalkBuiltIn "\<logtalk_make\>" syn match logtalkBuiltIn "\<\(for\|retract\)all\ze(" syn match logtalkBuiltIn "\<threaded\(_\(call\|once\|ignore\|exit\|peek\|wait\|notify\)\)\?\ze(" +syn match logtalkBuiltIn "\<threaded_engine\(_\(create\|destroy\|self\|next\|next_reified\|yield\|post\|fetch\)\)\?\ze(" " Logtalk built-in methods +syn match logtalkBuiltInMethod "\<context\ze(" syn match logtalkBuiltInMethod "\<parameter\ze(" syn match logtalkBuiltInMethod "\<se\(lf\|nder\)\ze(" syn match logtalkBuiltInMethod "\<this\ze(" @@ -159,6 +162,8 @@ syn match logtalkBuiltInMethod "\<f\(ind\|or\)all\ze(" syn match logtalkBuiltInMethod "\<before\ze(" syn match logtalkBuiltInMethod "\<after\ze(" +syn match logtalkBuiltInMethod "\<forward\ze(" + syn match logtalkBuiltInMethod "\<expand_\(goal\|term\)\ze(" syn match logtalkBuiltInMethod "\<\(goal\|term\)_expansion\ze(" syn match logtalkBuiltInMethod "\<phrase\ze(" @@ -174,6 +179,7 @@ syn match logtalkOperator "@" syn match logtalkKeyword "\<true\>" syn match logtalkKeyword "\<fail\>" +syn match logtalkKeyword "\<false\>" syn match logtalkKeyword "\<ca\(ll\|tch\)\ze(" syn match logtalkOperator "!" " syn match logtalkOperator "," @@ -181,11 +187,14 @@ syn match logtalkOperator ";" syn match logtalkOperator "-->" syn match logtalkOperator "->" syn match logtalkKeyword "\<throw\ze(" +syn match logtalkKeyword "\<\(instantiation\|system\)_error\>" +syn match logtalkKeyword "\<\(type\|domain\|existence\|permission\|representation\|evaluation\|resource\|syntax\)_error\ze(" " Term unification syn match logtalkOperator "=" +syn match logtalkKeyword "\<subsumes_term\ze(" syn match logtalkKeyword "\<unify_with_occurs_check\ze(" syn match logtalkOperator "\\=" @@ -199,6 +208,7 @@ syn match logtalkKeyword "\<float\ze(" syn match logtalkKeyword "\<c\(allable\|ompound\)\ze(" syn match logtalkKeyword "\<n\(onvar\|umber\)\ze(" syn match logtalkKeyword "\<ground\ze(" +syn match logtalkKeyword "\<acyclic_term\ze(" " Term comparison @@ -219,14 +229,20 @@ syn match logtalkKeyword "\<arg\ze(" syn match logtalkOperator "=\.\." syn match logtalkKeyword "\<copy_term\ze(" syn match logtalkKeyword "\<numbervars\ze(" +syn match logtalkKeyword "\<term_variables\ze(" + + +" Predicate aliases + +syn match logtalkOperator "\<as\>" -" Arithemtic evaluation +" Arithmetic evaluation syn match logtalkOperator "\<is\>" -" Arithemtic comparison +" Arithmetic comparison syn match logtalkOperator "=:=" syn match logtalkOperator "=\\=" @@ -299,16 +315,18 @@ syn match logtalkOperator "-" syn match logtalkOperator "\*" syn match logtalkOperator "//" syn match logtalkOperator "/" +syn match logtalkKeyword "\<div\ze(" syn match logtalkKeyword "\<r\(ound\|em\)\ze(" syn match logtalkKeyword "\<e\>" syn match logtalkKeyword "\<pi\>" +syn match logtalkKeyword "\<div\>" syn match logtalkKeyword "\<rem\>" -syn match logtalkKeyword "\<mod\ze(" +syn match logtalkKeyword "\<m\(ax\|in\|od\)\ze(" syn match logtalkKeyword "\<mod\>" syn match logtalkKeyword "\<abs\ze(" syn match logtalkKeyword "\<sign\ze(" syn match logtalkKeyword "\<flo\(or\|at\(_\(integer\|fractional\)_part\)\?\)\ze(" -syn match logtalkKeyword "\<truncate\ze(" +syn match logtalkKeyword "\<t\(an\|runcate\)\ze(" syn match logtalkKeyword "\<ceiling\ze(" @@ -317,7 +335,7 @@ syn match logtalkKeyword "\<ceiling\ze(" syn match logtalkOperator "\*\*" syn match logtalkKeyword "\<s\(in\|qrt\)\ze(" syn match logtalkKeyword "\<cos\ze(" -syn match logtalkKeyword "\<atan\ze(" +syn match logtalkKeyword "\<a\(cos\|sin\|tan\|tan2\)\ze(" syn match logtalkKeyword "\<exp\ze(" syn match logtalkKeyword "\<log\ze(" @@ -329,6 +347,7 @@ syn match logtalkOperator "<<" syn match logtalkOperator "/\\" syn match logtalkOperator "\\/" syn match logtalkOperator "\\" +syn match logtalkKeyword "\<xor\ze(" " Logtalk list operator @@ -347,7 +366,7 @@ syn match logtalkNumber "\<\d\+\>" syn match logtalkNumber "\<\d\+\.\d\+\>" syn match logtalkNumber "\<\d\+[eE][-+]\=\d\+\>" syn match logtalkNumber "\<\d\+\.\d\+[eE][-+]\=\d\+\>" -syn match logtalkNumber "\<0'.\|0''\|0'\"\>" +syn match logtalkNumber "\<0'[\\]\?.\|0''\|0'\"\>" syn match logtalkNumber "\<0b[0-1]\+\>" syn match logtalkNumber "\<0o\o\+\>" syn match logtalkNumber "\<0x\x\+\>" |