From 28d5e6f2cba53db3c48b576cee02265a49dbc5df Mon Sep 17 00:00:00 2001 From: Kien N Date: Thu, 14 Jun 2012 21:22:53 +0700 Subject: [PATCH] Option to follow all symlinks indiscriminately Close #215 --- autoload/ctrlp.vim | 2 +- doc/ctrlp.txt | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/autoload/ctrlp.vim b/autoload/ctrlp.vim index 55b6c19..8444da6 100644 --- a/autoload/ctrlp.vim +++ b/autoload/ctrlp.vim @@ -1249,7 +1249,7 @@ fu! ctrlp#dirnfile(entries) elsei etype == 'link' if s:folsym let isfile = !isdirectory(each) - if !s:samerootsyml(each, isfile, cwd) + if s:folsym == 2 || !s:samerootsyml(each, isfile, cwd) cal add(items[isfile], each) en en diff --git a/doc/ctrlp.txt b/doc/ctrlp.txt index b33be39..daa18b4 100644 --- a/doc/ctrlp.txt +++ b/doc/ctrlp.txt @@ -321,10 +321,12 @@ Pressing or will then prompt for a keypress. The key can be: |g:ctrlp_open_multiple_files|. *'g:ctrlp_follow_symlinks'* -Set this to 1 to follow symbolic links when listing files: > +If non-zero, CtrlP will follow symbolic links when listing files: > let g:ctrlp_follow_symlinks = 0 < -When enabled, looped internal symlinks will be ignored to avoid duplicates. + 0 - don't follow symbolic links. + 1 - follow but ignore looped internal symlinks to avoid duplicates. + 2 - follow all symlinks indiscriminately. *'g:ctrlp_lazy_update'* Set this to 1 to enable the lazy-update feature: only update the match window @@ -1031,6 +1033,7 @@ CHANGELOG *ctrlp-changelog* Before 2012/06/15~ + + New value for |g:ctrlp_follow_symlinks|: 2. + New value for |g:ctrlp_open_multiple_files|: 'j'. + Allow using , , to open files marked by . + Extend '..' (|ctrlp-input-formats| (d))