0
0
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00

patch 7.4.1728

Problem:    The help for functions require a space after the "(".
Solution:   Make CTRL-] on a function name ignore the arguments. (Hirohito
            Higashi)
This commit is contained in:
Bram Moolenaar
2016-04-14 13:51:37 +02:00
parent ebf7dfa6f1
commit 81edd171a9
4 changed files with 319 additions and 294 deletions

View File

@@ -1801,8 +1801,7 @@ append( {lnum}, {string}) Number append {string} below line {lnum}
append({lnum}, {list}) Number append lines {list} below line {lnum} append({lnum}, {list}) Number append lines {list} below line {lnum}
argc() Number number of files in the argument list argc() Number number of files in the argument list
argidx() Number current index in the argument list argidx() Number current index in the argument list
arglistid( [{winnr} [, {tabnr}]]) arglistid([{winnr} [, {tabnr}]]) Number argument list id
Number argument list id
argv({nr}) String {nr} entry of the argument list argv({nr}) String {nr} entry of the argument list
argv() List the argument list argv() List the argument list
assert_equal({exp}, {act} [, {msg}]) none assert {exp} is equal to {act} assert_equal({exp}, {act} [, {msg}]) none assert {exp} is equal to {act}
@@ -1841,14 +1840,17 @@ ch_getjob( {channel}) Job get the Job of {channel}
ch_info({handle}) String info about channel {handle} ch_info({handle}) String info about channel {handle}
ch_log({msg} [, {handle}]) none write {msg} in the channel log file ch_log({msg} [, {handle}]) none write {msg} in the channel log file
ch_logfile({fname} [, {mode}]) none start logging channel activity ch_logfile({fname} [, {mode}]) none start logging channel activity
ch_open( {address} [, {options}]) Channel open a channel to {address} ch_open({address} [, {options}])
Channel open a channel to {address}
ch_read({handle} [, {options}]) String read from {handle} ch_read({handle} [, {options}]) String read from {handle}
ch_readraw( {handle} [, {options}]) String read raw from {handle} ch_readraw({handle} [, {options}])
String read raw from {handle}
ch_sendexpr({handle}, {expr} [, {options}]) ch_sendexpr({handle}, {expr} [, {options}])
any send {expr} over JSON {handle} any send {expr} over JSON {handle}
ch_sendraw({handle}, {string} [, {options}]) ch_sendraw({handle}, {string} [, {options}])
any send {string} over raw {handle} any send {string} over raw {handle}
ch_setoptions( {handle}, {options}) none set options for {handle} ch_setoptions({handle}, {options})
none set options for {handle}
ch_status({handle}) String status of channel {handle} ch_status({handle}) String status of channel {handle}
changenr() Number current change number changenr() Number current change number
char2nr({expr}[, {utf8}]) Number ASCII/UTF8 value of first char in {expr} char2nr({expr}[, {utf8}]) Number ASCII/UTF8 value of first char in {expr}
@@ -1875,7 +1877,8 @@ delete( {fname} [, {flags}]) Number delete the file or directory {fname}
did_filetype() Number TRUE if FileType autocommand event used did_filetype() Number TRUE if FileType autocommand event used
diff_filler({lnum}) Number diff filler lines about {lnum} diff_filler({lnum}) Number diff filler lines about {lnum}
diff_hlID({lnum}, {col}) Number diff highlighting at {lnum}/{col} diff_hlID({lnum}, {col}) Number diff highlighting at {lnum}/{col}
disable_char_avail_for_testing( {expr}) none test without typeahead disable_char_avail_for_testing({expr})
none test without typeahead
empty({expr}) Number TRUE if {expr} is empty empty({expr}) Number TRUE if {expr} is empty
escape({string}, {chars}) String escape {chars} in {string} with '\' escape({string}, {chars}) String escape {chars} in {string} with '\'
eval({string}) any evaluate {string} into its value eval({string}) any evaluate {string} into its value
@@ -1974,7 +1977,8 @@ index( {list}, {expr} [, {start} [, {ic}]])
Number index in {list} where {expr} appears Number index in {list} where {expr} appears
input({prompt} [, {text} [, {completion}]]) input({prompt} [, {text} [, {completion}]])
String get input from the user String get input from the user
inputdialog( {p} [, {t} [, {c}]]) String like input() but in a GUI dialog inputdialog({prompt} [, {text} [, {completion}]]])
String like input() but in a GUI dialog
inputlist({textlist}) Number let the user pick from a choice list inputlist({textlist}) Number let the user pick from a choice list
inputrestore() Number restore typeahead inputrestore() Number restore typeahead
inputsave() Number save and clear typeahead inputsave() Number save and clear typeahead
@@ -1988,7 +1992,8 @@ items( {dict}) List key-value pairs in {dict}
job_getchannel({job}) Channel get the channel handle for {job} job_getchannel({job}) Channel get the channel handle for {job}
job_info({job}) Dict get information about {job} job_info({job}) Dict get information about {job}
job_setoptions({job}, {options}) none set options for {job} job_setoptions({job}, {options}) none set options for {job}
job_start( {command} [, {options}]) Job start a job job_start({command} [, {options}])
Job start a job
job_status({job}) String get the status of {job} job_status({job}) String get the status of {job}
job_stop({job} [, {how}]) Number stop {job} job_stop({job} [, {how}]) Number stop {job}
join({list} [, {sep}]) String join {list} items into one String join({list} [, {sep}]) String join {list} items into one String
@@ -2085,7 +2090,8 @@ searchpos( {pattern} [, {flags} [, {stopline} [, {timeout}]]])
server2client({clientid}, {string}) server2client({clientid}, {string})
Number send reply string Number send reply string
serverlist() String get a list of available servers serverlist() String get a list of available servers
setbufvar( {expr}, {varname}, {val}) set {varname} in buffer {expr} to {val} setbufvar({expr}, {varname}, {val})
none set {varname} in buffer {expr} to {val}
setcharsearch({dict}) Dict set character search from {dict} setcharsearch({dict}) Dict set character search from {dict}
setcmdpos({pos}) Number set cursor position in command-line setcmdpos({pos}) Number set cursor position in command-line
setfperm({fname}, {mode}) Number set {fname} file permissions to {mode} setfperm({fname}, {mode}) Number set {fname} file permissions to {mode}
@@ -2096,10 +2102,11 @@ setmatches( {list}) Number restore a list of matches
setpos({expr}, {list}) Number set the {expr} position to {list} setpos({expr}, {list}) Number set the {expr} position to {list}
setqflist({list}[, {action}]) Number modify quickfix list using {list} setqflist({list}[, {action}]) Number modify quickfix list using {list}
setreg({n}, {v}[, {opt}]) Number set register to value and type setreg({n}, {v}[, {opt}]) Number set register to value and type
settabvar( {nr}, {varname}, {val}) set {varname} in tab page {nr} to {val} settabvar({nr}, {varname}, {val}) none set {varname} in tab page {nr} to {val}
settabwinvar( {tabnr}, {winnr}, {varname}, {val}) set {varname} in window settabwinvar({tabnr}, {winnr}, {varname}, {val})
{winnr} in tab page {tabnr} to {val} none set {varname} in window {winnr} in tab
setwinvar( {nr}, {varname}, {val}) set {varname} in window {nr} to {val} page {tabnr} to {val}
setwinvar({nr}, {varname}, {val}) none set {varname} in window {nr} to {val}
sha256({string}) String SHA256 checksum of {string} sha256({string}) String SHA256 checksum of {string}
shellescape({string} [, {special}]) shellescape({string} [, {special}])
String escape {string} for use as shell String escape {string} for use as shell
@@ -2146,8 +2153,7 @@ system( {expr} [, {input}]) String output of shell command/filter {expr}
systemlist({expr} [, {input}]) List output of shell command/filter {expr} systemlist({expr} [, {input}]) List output of shell command/filter {expr}
tabpagebuflist([{arg}]) List list of buffer numbers in tab page tabpagebuflist([{arg}]) List list of buffer numbers in tab page
tabpagenr([{arg}]) Number number of current or last tab page tabpagenr([{arg}]) Number number of current or last tab page
tabpagewinnr( {tabarg}[, {arg}]) tabpagewinnr({tabarg}[, {arg}]) Number number of current window in tab page
Number number of current window in tab page
taglist({expr}) List list of tags matching {expr} taglist({expr}) List list of tags matching {expr}
tagfiles() List tags files used tagfiles() List tags files used
tan({expr}) Float tangent of {expr} tan({expr}) Float tangent of {expr}

View File

@@ -6203,6 +6203,13 @@ find_help_tags(
*d++ = *s; *d++ = *s;
/*
* If tag contains "({" or "([", tag terminates at the "(".
* This is for help on functions, e.g.: abs({expr}).
*/
if (*s == '(' && (s[1] == '{' || s[1] =='['))
break;
/* /*
* If tag starts with ', toss everything after a second '. Fixes * If tag starts with ', toss everything after a second '. Fixes
* CTRL-] on 'option'. (would include the trailing '.'). * CTRL-] on 'option'. (would include the trailing '.').

View File

@@ -15,4 +15,14 @@ func Test_help_tagjump()
call assert_equal("help", &filetype) call assert_equal("help", &filetype)
call assert_true(getline('.') =~ "\\*'buflisted'\\*") call assert_true(getline('.') =~ "\\*'buflisted'\\*")
helpclose helpclose
exec "help! abs({expr})"
call assert_equal("help", &filetype)
call assert_true(getline('.') =~ '\*abs()\*')
helpclose
exec "help! arglistid([{winnr}"
call assert_equal("help", &filetype)
call assert_true(getline('.') =~ '\*arglistid()\*')
helpclose
endfunc endfunc

View File

@@ -748,6 +748,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1728,
/**/ /**/
1727, 1727,
/**/ /**/