Skip to content

Commit ae7c96f

Browse files
committed
Merge pull request #22 from nfvs/master
Remove custom_ancestors since root_markers does the same thing.
2 parents 0051ac9 + 498e35f commit ae7c96f

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

autoload/ctrlp.vim

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ let [s:pref, s:bpref, s:opts, s:new_opts, s:lc_opts] =
5858
\ 'buffer_func': ['s:buffunc', {}],
5959
\ 'by_filename': ['s:byfname', 0],
6060
\ 'custom_ignore': ['s:usrign', s:ignore()],
61-
\ 'custom_ancestors': ['s:custom_markers', []],
6261
\ 'default_input': ['s:deftxt', 0],
6362
\ 'dont_split': ['s:nosplit', 'netrw'],
6463
\ 'dotfiles': ['s:showhidden', 0],

readme.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,13 @@ Use `:diffthis` when opening multiple files to run `:diffthis` on the first 4 fi
5555
`'r'` - use the nearest ancestor of the current file that contains one of these markers: `.git` `.hg` `.svn` `.bzr` `_darcs`
5656
`0` or `''` (empty string) - use the current working directory outside of CtrlP.
5757
58+
If none of the default markers (`.git` `.hg` `.svn` `.bzr` `_darcs`) are present in a project, you can define additional ones with `g:ctrlp_root_markers`:
59+
60+
```vim
61+
let g:ctrlp_root_markers = ['pom.xml', '.p4ignore']
62+
```
63+
5864
If more than one mode is specified, they will be tried in order until a directory is located.
59-
Define additional root markers with the `g:ctrlp_root_markers` option.
6065
6166
* Exclude files and directories using Vim's `wildignore` and CtrlP's own `g:ctrlp_custom_ignore`:
6267

0 commit comments

Comments
 (0)