Skip to content

Commit 4575876

Browse files
committed
Updated runtime files.
1 parent 3e8474d commit 4575876

File tree

5 files changed

+15
-17
lines changed

5 files changed

+15
-17
lines changed

runtime/autoload/rubycomplete.vim

+1-1
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ function! rubycomplete#Complete(findstart, base)
196196
if c =~ '\w'
197197
continue
198198
elseif ! c =~ '\.'
199-
idx = -1
199+
let idx = -1
200200
break
201201
else
202202
break

runtime/doc/options.txt

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*options.txt* For Vim version 8.0. Last change: 2016 Oct 01
1+
*options.txt* For Vim version 8.0. Last change: 2016 Oct 12
22

33

44
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|.
79667966
"xterm", "xterm2", "urxvt" or "sgr" (because dec mouse codes conflict
79677967
with them).
79687968
This option is automatically set to "xterm", when the 'term' option is
7969-
set to a name that starts with "xterm", "mlterm", "screen", "st" (full
7970-
match only), "st-" or "stterm", and 'ttymouse' is not set already.
7969+
set to a name that starts with "xterm", "mlterm", "screen", "tmux",
7970+
"st" (full match only), "st-" or "stterm", and 'ttymouse' is not set
7971+
already.
79717972
Additionally, if vim is compiled with the |+termresponse| feature and
79727973
|t_RV| is set to the escape sequence to request the xterm version
79737974
number, more intelligent detection process runs.

runtime/doc/tags

+4-2
Original file line numberDiff line numberDiff line change
@@ -6556,7 +6556,7 @@ gui-w32-printing gui_w32.txt /*gui-w32-printing*
65566556
gui-w32-start gui_w32.txt /*gui-w32-start*
65576557
gui-w32-various gui_w32.txt /*gui-w32-various*
65586558
gui-w32-windowid gui_w32.txt /*gui-w32-windowid*
6559-
gui-w32s gui_w32.txt /*gui-w32s*
6559+
gui-w32s os_win32.txt /*gui-w32s*
65606560
gui-win32-maximized gui_w32.txt /*gui-win32-maximized*
65616561
gui-x11 gui_x11.txt /*gui-x11*
65626562
gui-x11-athena gui_x11.txt /*gui-x11-athena*
@@ -7262,7 +7262,6 @@ mouse_winid-variable eval.txt /*mouse_winid-variable*
72627262
movement intro.txt /*movement*
72637263
ms-dos os_msdos.txt /*ms-dos*
72647264
msdos os_msdos.txt /*msdos*
7265-
msdos-mode gui_w32.txt /*msdos-mode*
72667265
msql.vim syntax.txt /*msql.vim*
72677266
mswin.vim gui_w32.txt /*mswin.vim*
72687267
multi-byte mbyte.txt /*multi-byte*
@@ -9232,6 +9231,7 @@ win32-startup os_win32.txt /*win32-startup*
92329231
win32-term os_win32.txt /*win32-term*
92339232
win32-vimrun gui_w32.txt /*win32-vimrun*
92349233
win32-win3.1 os_win32.txt /*win32-win3.1*
9234+
win32-win95 os_win32.txt /*win32-win95*
92359235
win32s os_win32.txt /*win32s*
92369236
win_findbuf() eval.txt /*win_findbuf()*
92379237
win_getid() eval.txt /*win_getid()*
@@ -9261,6 +9261,8 @@ windows-intro windows.txt /*windows-intro*
92619261
windows-starting windows.txt /*windows-starting*
92629262
windows.txt windows.txt /*windows.txt*
92639263
windows95 os_win32.txt /*windows95*
9264+
windows98 os_win32.txt /*windows98*
9265+
windowsme os_win32.txt /*windowsme*
92649266
winheight() eval.txt /*winheight()*
92659267
winid windows.txt /*winid*
92669268
winline() eval.txt /*winline()*

runtime/doc/todo.txt

+2-8
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ not be repeated below, unless there is extra information.
3838
- Problem with stderr on Windows? (Vincent Rischmann, 2016 Aug 31, #1026)
3939
- Add 'cwd' argument to start_job(): directory to change to in the child.
4040
check for valid directory before forking.
41+
Part of patch for environment, Yasuhiro Matsumoto, #1160
4142
- Implement |job-term| ?
4243
- Channel test fails with Motif. Sometimes kills the X11 server.
4344
- When a message in the queue but there is no callback, drop it after a while?
@@ -104,20 +105,13 @@ Or avoid recursiveness.
104105

105106
Error in test_startup_utf8 on Solaris. (Danek Duvall, 2016 Aug 17)
106107

107-
Patch to recognize tmux. (Michael Henry, 2016 Sep 29)
108-
109108
Patch to fix escaping of job arguments. (Yasuhiro Matsumoto, 2016 Oct 5)
109+
Still not right.
110110

111111
Once .exe with updated installer is available: Add remark to download page
112112
about /S and /D options (Ken Takata, 2016 Apr 13)
113113
Or point to nightly builds: https://github.com/vim/vim-win32-installer/releases
114114

115-
Javascript indent wrong after /* in single quoted string:
116-
var SRC = 'src/*.js';
117-
function log(tag) {
118-
a = b;
119-
}
120-
121115
Problem passing non-UTF-8 strings to Python 3. (Björn Linse, 2016 Sep 11,
122116
#1053) With patch, does it work?
123117

runtime/indent/ruby.vim

+4-3
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,12 @@ let s:end_skip_expr = s:skip_expr .
9292
\ ' && getline(".") =~ "^\\s*\\<\\(while\\|until\\|for\\):\\@!\\>")'
9393

9494
" Regex that defines continuation lines, not including (, {, or [.
95-
let s:non_bracket_continuation_regex = '\%([\\.,:*/%+]\|\<and\|\<or\|\%(<%\)\@<![=-]\|\W[|&?]\|||\|&&\)\s*\%(#.*\)\=$'
95+
let s:non_bracket_continuation_regex =
96+
\ '\%([\\.,:*/%+]\|\<and\|\<or\|\%(<%\)\@<![=-]\|:\@<![^[:alnum:]:][|&?]\|||\|&&\)\s*\%(#.*\)\=$'
9697

9798
" Regex that defines continuation lines.
9899
let s:continuation_regex =
99-
\ '\%(%\@<![({[\\.,:*/%+]\|\<and\|\<or\|\%(<%\)\@<![=-]\|\W[|&?]\|||\|&&\)\s*\%(#.*\)\=$'
100+
\ '\%(%\@<![({[\\.,:*/%+]\|\<and\|\<or\|\%(<%\)\@<![=-]\|:\@<![^[:alnum:]:][|&?]\|||\|&&\)\s*\%(#.*\)\=$'
100101

101102
" Regex that defines continuable keywords
102103
let s:continuable_regex =
@@ -389,7 +390,7 @@ function! s:FindContainingClass()
389390
call setpos('.', saved_position)
390391
return found_lnum
391392
endif
392-
endif
393+
endwhile
393394

394395
call setpos('.', saved_position)
395396
return 0

0 commit comments

Comments
 (0)