From 4575876dc865d4160f20d61bd822fbe7cafbec41 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 12 Oct 2016 23:08:06 +0200 Subject: Updated runtime files. --- runtime/autoload/rubycomplete.vim | 2 +- runtime/doc/options.txt | 7 ++++--- runtime/doc/tags | 6 ++++-- runtime/doc/todo.txt | 10 ++-------- runtime/indent/ruby.vim | 7 ++++--- 5 files changed, 15 insertions(+), 17 deletions(-) (limited to 'runtime') diff --git a/runtime/autoload/rubycomplete.vim b/runtime/autoload/rubycomplete.vim index 440dfd42e9..40b87f4cbe 100644 --- a/runtime/autoload/rubycomplete.vim +++ b/runtime/autoload/rubycomplete.vim @@ -196,7 +196,7 @@ function! rubycomplete#Complete(findstart, base) if c =~ '\w' continue elseif ! c =~ '\.' - idx = -1 + let idx = -1 break else break diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index fad643de38..390fab01de 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 8.0. Last change: 2016 Oct 01 +*options.txt* For Vim version 8.0. Last change: 2016 Oct 12 VIM REFERENCE MANUAL by Bram Moolenaar @@ -7966,8 +7966,9 @@ A jump table for the options with a short description can be found at |Q_op|. "xterm", "xterm2", "urxvt" or "sgr" (because dec mouse codes conflict with them). This option is automatically set to "xterm", when the 'term' option is - set to a name that starts with "xterm", "mlterm", "screen", "st" (full - match only), "st-" or "stterm", and 'ttymouse' is not set already. + set to a name that starts with "xterm", "mlterm", "screen", "tmux", + "st" (full match only), "st-" or "stterm", and 'ttymouse' is not set + already. Additionally, if vim is compiled with the |+termresponse| feature and |t_RV| is set to the escape sequence to request the xterm version number, more intelligent detection process runs. diff --git a/runtime/doc/tags b/runtime/doc/tags index 72d4801265..fa1465e069 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -6556,7 +6556,7 @@ gui-w32-printing gui_w32.txt /*gui-w32-printing* gui-w32-start gui_w32.txt /*gui-w32-start* gui-w32-various gui_w32.txt /*gui-w32-various* gui-w32-windowid gui_w32.txt /*gui-w32-windowid* -gui-w32s gui_w32.txt /*gui-w32s* +gui-w32s os_win32.txt /*gui-w32s* gui-win32-maximized gui_w32.txt /*gui-win32-maximized* gui-x11 gui_x11.txt /*gui-x11* gui-x11-athena gui_x11.txt /*gui-x11-athena* @@ -7262,7 +7262,6 @@ mouse_winid-variable eval.txt /*mouse_winid-variable* movement intro.txt /*movement* ms-dos os_msdos.txt /*ms-dos* msdos os_msdos.txt /*msdos* -msdos-mode gui_w32.txt /*msdos-mode* msql.vim syntax.txt /*msql.vim* mswin.vim gui_w32.txt /*mswin.vim* multi-byte mbyte.txt /*multi-byte* @@ -9232,6 +9231,7 @@ win32-startup os_win32.txt /*win32-startup* win32-term os_win32.txt /*win32-term* win32-vimrun gui_w32.txt /*win32-vimrun* win32-win3.1 os_win32.txt /*win32-win3.1* +win32-win95 os_win32.txt /*win32-win95* win32s os_win32.txt /*win32s* win_findbuf() eval.txt /*win_findbuf()* win_getid() eval.txt /*win_getid()* @@ -9261,6 +9261,8 @@ windows-intro windows.txt /*windows-intro* windows-starting windows.txt /*windows-starting* windows.txt windows.txt /*windows.txt* windows95 os_win32.txt /*windows95* +windows98 os_win32.txt /*windows98* +windowsme os_win32.txt /*windowsme* winheight() eval.txt /*winheight()* winid windows.txt /*winid* winline() eval.txt /*winline()* diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index e966361e77..736c5412b4 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -38,6 +38,7 @@ not be repeated below, unless there is extra information. - Problem with stderr on Windows? (Vincent Rischmann, 2016 Aug 31, #1026) - Add 'cwd' argument to start_job(): directory to change to in the child. check for valid directory before forking. + Part of patch for environment, Yasuhiro Matsumoto, #1160 - 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? @@ -104,20 +105,13 @@ Or avoid recursiveness. Error in test_startup_utf8 on Solaris. (Danek Duvall, 2016 Aug 17) -Patch to recognize tmux. (Michael Henry, 2016 Sep 29) - Patch to fix escaping of job arguments. (Yasuhiro Matsumoto, 2016 Oct 5) +Still not right. Once .exe with updated installer is available: Add remark to download page about /S and /D options (Ken Takata, 2016 Apr 13) Or point to nightly builds: https://github.com/vim/vim-win32-installer/releases -Javascript indent wrong after /* in single quoted string: - var SRC = 'src/*.js'; - function log(tag) { - a = b; - } - Problem passing non-UTF-8 strings to Python 3. (Björn Linse, 2016 Sep 11, #1053) With patch, does it work? diff --git a/runtime/indent/ruby.vim b/runtime/indent/ruby.vim index 4f87ec7823..a97f4828d6 100644 --- a/runtime/indent/ruby.vim +++ b/runtime/indent/ruby.vim @@ -92,11 +92,12 @@ let s:end_skip_expr = s:skip_expr . \ ' && getline(".") =~ "^\\s*\\<\\(while\\|until\\|for\\):\\@!\\>")' " Regex that defines continuation lines, not including (, {, or [. -let s:non_bracket_continuation_regex = '\%([\\.,:*/%+]\|\