vim/ctrlp.vim
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename and tweak g:ctrlp_open_multi

Browse Source
This commit is contained in:
Kien N 2012-03-01 18:48:03 +07:00
parent 6285f507a3
commit fcd20d1c94
2 changed files with 55 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
autoload/ctrlp.vim
View File

@ -43,8 +43,9 @@ fu! s:opts()
exe 'let' va[0] '=' string(exists(ke) ? eval(ke) : va[1]) exe 'let' va[0] '=' string(exists(ke) ? eval(ke) : va[1])
endfo endfo
let new_opts = { let new_opts = {
\ 'g:ctrlp_reuse_window': 's:nosplit', \ 'g:ctrlp_open_multiple_files': 's:opmul',
\ 'g:ctrlp_regexp': 's:regexp', \ 'g:ctrlp_regexp': 's:regexp',
\ 'g:ctrlp_reuse_window': 's:nosplit',
\ 'g:ctrlp_switch_buffer': 's:jmptobuf', \ 'g:ctrlp_switch_buffer': 's:jmptobuf',
\ } \ }
for [key, val] in items(new_opts) for [key, val] in items(new_opts)
@ -718,7 +719,7 @@ fu! s:SetWD(...) "{{{1
cal ctrlp#setdir(s:crfpath) cal ctrlp#setdir(s:crfpath)
en en
if pathmode == 1 | retu | en if pathmode == 1 | retu | en
let markers = ['root.dir', '.git/', '.hg/', '.svn/', '_darcs/', '.bzr/'] let markers = ['root.dir', '.git/', '.hg/', '.svn/', '.bzr/', '_darcs/']
if type(s:rmarkers) == 3 && !empty(s:rmarkers) if type(s:rmarkers) == 3 && !empty(s:rmarkers)
cal extend(markers, s:rmarkers, 0) cal extend(markers, s:rmarkers, 0)
en en
@ -880,7 +881,7 @@ fu! s:OpenMulti()
cal s:PrtExit() cal s:PrtExit()
" Move the cursor to a reusable window " Move the cursor to a reusable window
let [tail, fnesc] = [s:tail(), exists('*fnameescape') && v:version > 701] let [tail, fnesc] = [s:tail(), exists('*fnameescape') && v:version > 701]
let emptytail = empty(tail) let [emptytail, nwpt] = [empty(tail), exists('g:ctrlp_open_multiple_files')]
let useb = bufnr('^'.mkd[0].'$') > 0 && emptytail let useb = bufnr('^'.mkd[0].'$') > 0 && emptytail
let fst = call('ctrlp#normcmd', useb ? ['b', 'bo vert sb'] : ['e']) let fst = call('ctrlp#normcmd', useb ? ['b', 'bo vert sb'] : ['e'])
" Check if it's a replaceable buffer " Check if it's a replaceable buffer
@ -896,8 +897,9 @@ fu! s:OpenMulti()
let snd = md != '' && has_key(cmds, md) ? let snd = md != '' && has_key(cmds, md) ?
\ ( useb ? cmds[md][0] : cmds[md][1] ) : ( useb ? 'vert sb' : 'vne' ) \ ( useb ? cmds[md][0] : cmds[md][1] ) : ( useb ? 'vert sb' : 'vne' )
let cmd = ic == 1 && ( ucr == 'r' || repabl ) ? fst : snd let cmd = ic == 1 && ( ucr == 'r' || repabl ) ? fst : snd
if ( nr != '' && nr > 1 && nr < ic ) || ( nr == '' && ic > 1 ) let conds = [( nr != '' && nr > 1 && nr < ic ) || ( nr == '' && ic > 1 ),
" If exceeded the max number of windows \ nr != '' && nr < ic]
if conds[nwpt]
if bufnr <= 0 | if fnesc if bufnr <= 0 | if fnesc
cal s:openfile('bad', fnamemodify(va, ':.'), '') cal s:openfile('bad', fnamemodify(va, ':.'), '')
el el

88
doc/ctrlp.txt
View File

@ -21,7 +21,7 @@ CONTENTS *ctrlp-contents*
6. Extensions...................................|ctrlp-extensions| 6. Extensions...................................|ctrlp-extensions|
=============================================================================== ===============================================================================
1. Intro *ctrlp-intro* INTRO *ctrlp-intro*
Full path fuzzy file, buffer, mru and tag finder with an intuitive interface. Full path fuzzy file, buffer, mru and tag finder with an intuitive interface.
Written in pure Vimscript for MacVim and Vim version 7.0+. Has full support for Written in pure Vimscript for MacVim and Vim version 7.0+. Has full support for
@ -31,7 +31,7 @@ finder, and more.
To enable optional extensions (tag, dir, rtscript...), see |ctrlp-extensions|. To enable optional extensions (tag, dir, rtscript...), see |ctrlp-extensions|.
=============================================================================== ===============================================================================
2. Options *ctrlp-options* OPTIONS *ctrlp-options*
Below are the available options and their default values:~ Below are the available options and their default values:~
@ -94,7 +94,7 @@ variable: >
< <
1 - the parent directory of the current file. 1 - the parent directory of the current file.
2 - the nearest ancestor that contains one of these directories or files: 2 - the nearest ancestor that contains one of these directories or files:
.git/ .hg/ .bzr/ _darcs/ .svn/ .git/ .hg/ .svn/ .bzr/ _darcs/
0 - don’t manage working directory. 0 - don’t manage working directory.
Note: you can use b:ctrlp_working_path_mode (a |b:var|) to set this option on a Note: you can use b:ctrlp_working_path_mode (a |b:var|) to set this option on a
per buffer basis. per buffer basis.
@ -105,7 +105,7 @@ markers will take precedence: >
let g:ctrlp_root_markers = [''] let g:ctrlp_root_markers = ['']
< <
These markers (builtins and yours) will serve as identifiers for the '/' and These markers (builtins and yours) will serve as identifiers for the '/' and
'\' special inputs (section 5.e). '\' special inputs (|ctrlp-input-formats| (e)).
*'g:ctrlp_use_caching'* *'g:ctrlp_use_caching'*
Set this to 0 to disable per-session caching. When disabled, caching will still Set this to 0 to disable per-session caching. When disabled, caching will still
@ -310,20 +310,21 @@ pressing <c-y>:
let g:ctrlp_open_new_file = 'v' let g:ctrlp_open_new_file = 'v'
< <
*'g:ctrlp_open_multi'* *'g:ctrlp_open_multiple_files'*
If non-zero, this will enable opening multiple files with <c-z> and <c-o>: > If non-zero, this will enable opening multiple files with <c-z> and <c-o>: >
let g:ctrlp_open_multi = '1v' let g:ctrlp_open_multiple_files = 'v'
<
Example: >
let g:ctrlp_open_multiple_files = '2vr'
< <
For the number: For the number:
- If bigger than 1, it’ll be used as the maximum number of windows or tabs to - If given, it’ll be used as the maximum number of windows or tabs to create
create when opening the files (the rest will be hidden buffers). when opening the files (the rest will be opened as hidden buffers).
- If is 1, <c-o> will open all files, each in a new window or new tab. - If not given, <c-o> will open all files, each in a new window or new tab.
- If no number is given, only the first file will be opened in a window,
either new window or reused, and the rest will be hidden buffers.
For the letters: For the letters:
t - each in a new tab t - each file in a new tab.
h - each in a new horizontal split h - each file in a new horizontal split.
v - each in a new vertical split v - each file in a new vertical split.
Reuse the current window: Reuse the current window:
tr, tr,
hr, hr,
@ -342,7 +343,7 @@ Pressing <c-o> or <c-y> will then prompt for a keypress. The key can be:
r - open in current window (for <c-y> only) r - open in current window (for <c-y> only)
<esc>, <c-c> - cancel and go back to the prompt. <esc>, <c-c> - cancel and go back to the prompt.
Any other key - use the behavior specified with |g:ctrlp_open_new_file| and Any other key - use the behavior specified with |g:ctrlp_open_new_file| and
|g:ctrlp_open_multi|. |g:ctrlp_open_multiple_files|.
*'g:ctrlp_reuse_window'* *'g:ctrlp_reuse_window'*
When opening a file with <cr>, |CtrlP| avoids opening it in windows created by When opening a file with <cr>, |CtrlP| avoids opening it in windows created by
@ -388,7 +389,7 @@ Example: >
See https://gist.github.com/1610859 for a working example. See https://gist.github.com/1610859 for a working example.
=============================================================================== ===============================================================================
3. Commands *ctrlp-commands* COMMANDS *ctrlp-commands*
*:CtrlP* *:CtrlP*
:CtrlP [starting-directory] :CtrlP [starting-directory]
@ -433,7 +434,7 @@ The following commands ignore the current value of |g:ctrlp_working_path_mode|:
This acts like |:CtrlP| with |path_mode| = 2 This acts like |:CtrlP| with |path_mode| = 2
=============================================================================== ===============================================================================
4. Mappings *ctrlp-mappings* MAPPINGS *ctrlp-mappings*
*'ctrlp-<c-p>'* *'ctrlp-<c-p>'*
<c-p> <c-p>
@ -442,14 +443,14 @@ The following commands ignore the current value of |g:ctrlp_working_path_mode|:
Once inside the prompt:~ Once inside the prompt:~
<c-r> *'ctrlp-fullregexp'* <c-r> *'ctrlp-fullregexp'*
Toggle between the string mode (section 5.a & b) and full |regexp| mode. Toggle between the string mode and full |regexp| mode.
(note: in full |regexp| mode, the prompt’s base is 'r>>' instead of '>>>') Note: in full |regexp| mode, the prompt’s base is 'r>>' instead of '>>>'
See also |input-formats| (guide) and |g:ctrlp_regexp_search| (option). See also |input-formats| (guide) and |g:ctrlp_regexp_search| (option).
<c-d> <c-d>
Toggle between full-path search and filename only search. Toggle between full-path search and filename only search.
(note: in filename mode, the prompt’s base is '>d>' instead of '>>>') Note: in filename mode, the prompt’s base is '>d>' instead of '>>>'
<c-f>, 'forward' <c-f>, 'forward'
<c-up> <c-up>
@ -547,7 +548,7 @@ Once inside the prompt:~
<c-c>, <c-c>,
<c-g> <c-g>
Exit |CtrlP|. Exit |CtrlP|.
<c-c> can also be used to stop the scan if it’s taking too long. Note: <c-c> can also be used to stop the scan if it’s taking too long.
Choose your own mappings with |g:ctrlp_prompt_mappings|. Choose your own mappings with |g:ctrlp_prompt_mappings|.
@ -560,7 +561,7 @@ When inside the match window (press <s-tab> to switch):~
matches that key. matches that key.
=============================================================================== ===============================================================================
5. Input Formats *ctrlp-input-formats* INPUT FORMATS *ctrlp-input-formats*
Formats for inputting in the prompt:~ Formats for inputting in the prompt:~
@ -608,7 +609,7 @@ f) Type the name of a non-existent file and press <c-y> to create it. Mark a
g) Submit ? to open this help file. g) Submit ? to open this help file.
=============================================================================== ===============================================================================
6. Extensions *g:ctrlp-extensions* EXTENSIONS *g:ctrlp-extensions*
Extensions are optional. To enable an extension, add its name to the variable Extensions are optional. To enable an extension, add its name to the variable
g:ctrlp_extensions: > g:ctrlp_extensions: >
@ -716,7 +717,7 @@ Statuslines:~
For rebuilding the statuslines, see |g:ctrlp_status_func|. For rebuilding the statuslines, see |g:ctrlp_status_func|.
=============================================================================== ===============================================================================
MISCELLANEOUS-CONFIGS *ctrlp-miscellaneous-configs* MISCELLANEOUS CONFIGS *ctrlp-miscellaneous-configs*
* Use |wildignore| for |g:ctrlp_user_command|: * Use |wildignore| for |g:ctrlp_user_command|:
> >
@ -798,10 +799,17 @@ Special thanks:~
=============================================================================== ===============================================================================
CHANGELOG *ctrlp-changelog* CHANGELOG *ctrlp-changelog*
Before 2012/03/01~ Before 2012/03/02~
+ New option: |g:ctrlp_mruf_last_entered| change MRU to recently-entered. + Rename:
*g:ctrlp_regexp_search* -> |g:ctrlp_regexp|,
*g:ctrlp_dont_split* -> |g:ctrlp_reuse_window|,
*g:ctrlp_jump_to_buffer* -> |g:ctrlp_switch_buffer|.
+ Rename and tweak:
*g:ctrlp_open_multi* -> |g:ctrlp_open_multiple_files|.
+ Deprecate *g:ctrlp_highlight_match*
+ Extend |g:ctrlp_user_command| to support multiple commands. + Extend |g:ctrlp_user_command| to support multiple commands.
+ New option: |g:ctrlp_mruf_last_entered| change MRU to Recently-Entered.
Before 2012/01/15~ Before 2012/01/15~
@ -810,7 +818,7 @@ Before 2012/01/15~
+ New options: |g:ctrlp_arg_map| for <c-y>, <c-o> to accept an argument. + New options: |g:ctrlp_arg_map| for <c-y>, <c-o> to accept an argument.
|g:ctrlp_status_func| custom statusline. |g:ctrlp_status_func| custom statusline.
|g:ctrlp_mruf_relative| show only MRU files inside cwd. |g:ctrlp_mruf_relative| show only MRU files inside cwd.
+ Extend |g:ctrlp_open_multi| with new optional values: tr, hr, vr. + Extend g:ctrlp_open_multi with new optional values: tr, hr, vr.
+ Extend |g:ctrlp_custom_ignore| to specifically filter dir, file and link. + Extend |g:ctrlp_custom_ignore| to specifically filter dir, file and link.
Before 2012/01/05~ Before 2012/01/05~
@ -830,29 +838,29 @@ Before 2011/11/30~
Before 2011/11/13~ Before 2011/11/13~
+ New special input: '/' and '\' find root (section 5.e) + New special input: '/' and '\' find root (|ctrlp-input-formats| (e))
+ Remove ctrlp#SetWorkingPath(). + Remove ctrlp#SetWorkingPath().
+ Remove |g:ctrlp_mru_files|, make MRU permanent. + Remove *g:ctrlp_mru_files* and make MRU mode permanent.
+ Extend |g:ctrlp_open_multi|, add new ways to open files. + Extend g:ctrlp_open_multi, add new ways to open files.
+ New option: |g:ctrlp_dont_split|, + New option: g:ctrlp_dont_split,
|g:ctrlp_mruf_case_sensitive| |g:ctrlp_mruf_case_sensitive|
Before 2011/10/30~ Before 2011/10/30~
+ New feature: Support for custom extensions. + New feature: Support for custom extensions.
<F5> also removes non-existent files from MRU list. <F5> also removes non-existent files from MRU list.
+ New option: |g:ctrlp_jump_to_buffer| + New option: g:ctrlp_jump_to_buffer
Before 2011/10/12~ Before 2011/10/12~
+ New features: Open multiple files. + New features: Open multiple files.
Pass Vim’s |++opt| and |+cmd| to the opening file Pass Vim’s |++opt| and |+cmd| to the opening file
(section 5.c) (|ctrlp-input-formats| (c))
Auto-complete each dir for |:CtrlP| [starting-directory] Auto-complete each dir for |:CtrlP| [starting-directory]
+ New mappings: <c-z> mark/unmark a file to be opened with <c-o>. + New mappings: <c-z> mark/unmark a file to be opened with <c-o>.
<c-o> open all marked files. <c-o> open all marked files.
+ New option: |g:ctrlp_open_multi| + New option: g:ctrlp_open_multi
+ Remove |g:ctrlp_persistent_input|, |g:ctrlp_live_update| and <c-^>. + Remove *g:ctrlp_persistent_input* *g:ctrlp_live_update* and <c-^>.
Before 2011/09/29~ Before 2011/09/29~
@ -867,19 +875,19 @@ Before 2011/09/19~
+ New command: |ResetCtrlP| + New command: |ResetCtrlP|
+ New options: |g:ctrlp_max_files|, + New options: |g:ctrlp_max_files|,
|g:ctrlp_max_depth|, |g:ctrlp_max_depth|,
|g:ctrlp_live_update| g:ctrlp_live_update
+ New mapping: <c-^> + New mapping: <c-^>
Before 2011/09/12~ Before 2011/09/12~
+ Ability to cycle through matched lines in the match window. + Ability to cycle through matched lines in the match window.
+ Extend the behavior of |g:ctrlp_persistent_input| + Extend the behavior of g:ctrlp_persistent_input
+ Extend the behavior of |:CtrlP| + Extend the behavior of |:CtrlP|
+ New options: |g:ctrlp_dotfiles|, + New options: |g:ctrlp_dotfiles|,
|g:ctrlp_clear_cache_on_exit|, |g:ctrlp_clear_cache_on_exit|,
|g:ctrlp_highlight_match|, g:ctrlp_highlight_match,
|g:ctrlp_user_command| |g:ctrlp_user_command|
+ New special input: '..' (section 5.d) + New special input: '..' (|ctrlp-input-formats| (d))
+ New mapping: <F5>. + New mapping: <F5>.
+ New commands: |:CtrlPCurWD|, + New commands: |:CtrlPCurWD|,
|:CtrlPCurFile|, |:CtrlPCurFile|,
@ -888,7 +896,7 @@ Before 2011/09/12~
+ New feature: Search in most recently used (MRU) files + New feature: Search in most recently used (MRU) files
+ New mapping: <c-b>. + New mapping: <c-b>.
+ Extended the behavior of <c-f>. + Extended the behavior of <c-f>.
+ New options: |g:ctrlp_mru_files|, + New options: g:ctrlp_mru_files,
|g:ctrlp_mruf_max|, |g:ctrlp_mruf_max|,
|g:ctrlp_mruf_exclude|, |g:ctrlp_mruf_exclude|,
|g:ctrlp_mruf_include| |g:ctrlp_mruf_include|