diff options
| author | hut <hut@lepus.uberspace.de> | 2014-02-15 13:02:00 +0100 |
|---|---|---|
| committer | hut <hut@lepus.uberspace.de> | 2014-02-15 13:02:00 +0100 |
| commit | 86dc932374f0ae7b72bafb5a63125578ca5f9521 (patch) | |
| tree | 0a250584f68b06e2f99fdf36cfd4c3d1fffad6ba | |
| parent | e52be7b05b904fbea2e69e7f29878594909243aa (diff) | |
| parent | 2f1d6e4fbab229cf77d5c917bfa7a4aea432b2ab (diff) | |
| download | ranger-86dc932374f0ae7b72bafb5a63125578ca5f9521.tar.gz | |
Merge branch 'cd_bookmarks' of https://github.com/serpent7776/ranger
| -rw-r--r-- | ranger/config/commands.py | 3 | ||||
| -rw-r--r-- | ranger/config/rc.conf | 3 | ||||
| -rw-r--r-- | ranger/container/settings.py | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/ranger/config/commands.py b/ranger/config/commands.py index 9fe2b2c8..68714009 100644 --- a/ranger/config/commands.py +++ b/ranger/config/commands.py @@ -154,7 +154,8 @@ class cd(Command): pass else: dirnames.sort() - dirnames = bookmarks + dirnames + if self.fm.settings.cd_bookmarks: + dirnames = bookmarks + dirnames # no results, return None if len(dirnames) == 0: diff --git a/ranger/config/rc.conf b/ranger/config/rc.conf index 37efb265..11a0ae15 100644 --- a/ranger/config/rc.conf +++ b/ranger/config/rc.conf @@ -156,6 +156,9 @@ set sort_directories_first true # (Especially on xterm) set xterm_alt_key false +# whether to include bookmarks in cd command +set cd_bookmarks true + # =================================================================== # == Local Options # =================================================================== diff --git a/ranger/container/settings.py b/ranger/container/settings.py index 58ddffc9..27fed711 100644 --- a/ranger/container/settings.py +++ b/ranger/container/settings.py @@ -53,6 +53,7 @@ ALLOWED_SETTINGS = { 'vcs_backend_hg': str, 'vcs_backend_bzr': str, 'xterm_alt_key': bool, + 'cd_bookmarks': bool, } DEFAULT_VALUES = { |