From cacbb685914f7a6b4d3d3c229741d8c2f5a07f47 Mon Sep 17 00:00:00 2001 From: William Ting Date: Fri, 30 Sep 2016 10:21:58 -0700 Subject: [PATCH 1/4] Regenerate docs, minor tweaks. --- README.md | 14 +++++++------- docs/autojump.1 | 21 ++++++++++++--------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 182193a..0cbfea8 100644 --- a/README.md +++ b/README.md @@ -25,8 +25,8 @@ can be used with `autojump` can be used with `j` and vice versa. - Jump To A Child Directory: Sometimes it's convenient to jump to a child directory - (sub-directory of current directory) rather than typing out the full - name. + (sub-directory of current directory) rather than typing out the + full name. jc bar @@ -49,10 +49,10 @@ can be used with `autojump` can be used with `j` and vice versa. 30 /home/user/mail/inbox 10 /home/user/work/inbox - `j in` would jump into /home/user/mail/inbox as the higher weighted - entry. However you can pass multiple arguments to autojump to prefer - a different entry. In the above example, `j w in` would then change - directory to /home/user/work/inbox. + `j in` would jump into /home/user/mail/inbox as the higher + weighted entry. However you can pass multiple arguments to autojump + to prefer a different entry. In the above example, `j w in` would + then change directory to /home/user/work/inbox. For more options refer to help: @@ -128,7 +128,7 @@ KNOWN ISSUES export PROMPT_COMMAND="history -a" - Instead append to the end of the existing $PROMPT\_COMMAND: + Instead append to the end of the existing \$PROMPT\_COMMAND: export PROMPT_COMMAND="${PROMPT_COMMAND:+$PROMPT_COMMAND ;} history -a" diff --git a/docs/autojump.1 b/docs/autojump.1 index 2e185ce..98e0d44 100644 --- a/docs/autojump.1 +++ b/docs/autojump.1 @@ -1,7 +1,10 @@ -.TH autojump 1 "10 April 2012" "release-v22" +.\" Automatically generated by Pandoc 1.16.0.2 +.\" +.TH "autojump" "1" "10 April 2012" "release\-v22" "" +.hy .SS NAME .PP -autojump - a faster way to navigate your filesystem +autojump \- a faster way to navigate your filesystem .SS DESCRIPTION .PP autojump is a faster way to navigate your filesystem. @@ -29,7 +32,7 @@ Jump To A Child Directory: .RS 2 .PP Sometimes it\[aq]s convenient to jump to a child directory -(sub-directory of current directory) rather than typing out the full +(sub\-directory of current directory) rather than typing out the full name. .IP .nf @@ -43,8 +46,8 @@ Open File Manager To Directories (instead of jumping): .RS 2 .PP Instead of jumping to a directory, you can open a file explorer window -(Mac Finder, Windows Explorer, GNOME Nautilus, etc.) - to the directory instead. +(Mac Finder, Windows Explorer, GNOME Nautilus, etc.) to the directory +instead. .IP .nf \f[C] @@ -85,12 +88,12 @@ For more options refer to help: .IP .nf \f[C] -autojump\ --help +autojump\ \-\-help \f[] .fi .SS KNOWN ISSUES .IP \[bu] 2 -autojump does not support directories that begin with \f[C]-\f[]. +autojump does not support directories that begin with \f[C]\-\f[]. .IP \[bu] 2 For bash users, autojump keeps track of directories by modifying \f[C]$PROMPT_COMMAND\f[]. @@ -99,7 +102,7 @@ Do not overwrite \f[C]$PROMPT_COMMAND\f[]: .IP .nf \f[C] -export\ PROMPT_COMMAND="history\ -a" +export\ PROMPT_COMMAND="history\ \-a" \f[] .fi .PP @@ -107,7 +110,7 @@ Instead append to the end of the existing $PROMPT_COMMAND: .IP .nf \f[C] -export\ PROMPT_COMMAND="${PROMPT_COMMAND:+$PROMPT_COMMAND\ ;}\ history\ -a" +export\ PROMPT_COMMAND="${PROMPT_COMMAND:+$PROMPT_COMMAND\ ;}\ history\ \-a" \f[] .fi .RE From df935c664cd0eef62c575ecf89fb573ac03923c7 Mon Sep 17 00:00:00 2001 From: William Ting Date: Fri, 30 Sep 2016 10:22:22 -0700 Subject: [PATCH 2/4] Bump version to v22.4.0. --- bin/autojump | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/autojump b/bin/autojump index f4494ea..06fa9f9 100755 --- a/bin/autojump +++ b/bin/autojump @@ -65,7 +65,7 @@ from autojump_utils import sanitize from autojump_utils import take from autojump_utils import unico -VERSION = '22.3.5' +VERSION = '22.4.0' FUZZY_MATCH_THRESHOLD = 0.6 TAB_ENTRIES_COUNT = 9 TAB_SEPARATOR = '__' From 8eb094220b686f0cae0bf628acd5793ff169789c Mon Sep 17 00:00:00 2001 From: William Ting Date: Fri, 30 Sep 2016 10:24:35 -0700 Subject: [PATCH 3/4] Update changelog for v22.4.0. --- CHANGES.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 3fe12ea..68d058e 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,9 @@ ## Summary of release changes, see commit history for more details: ## https://github.com/joelthelion/autojump/commits/master/ +### Release v22.4.0: +- minor zsh performance improvement + ### Release v22.3.0: - use colors only if stdout is a terminal - updated RedHat docs From b2f243ee17e918821e2d15a1de5e20b0f7f981f2 Mon Sep 17 00:00:00 2001 From: William Ting Date: Fri, 30 Sep 2016 12:10:07 -0700 Subject: [PATCH 4/4] Revert "Merge remote-tracking branch 'sodiumjoe/optimize-startup'" This reverts commit 39990fff58f4141bf60cebd30d93954bae84828a, reversing changes made to c4d82b1888059f9d210e0db25a0e444de8e3dbcf. --- bin/autojump | 2 +- bin/autojump.zsh | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/bin/autojump b/bin/autojump index 06fa9f9..c458ba8 100755 --- a/bin/autojump +++ b/bin/autojump @@ -65,7 +65,7 @@ from autojump_utils import sanitize from autojump_utils import take from autojump_utils import unico -VERSION = '22.4.0' +VERSION = '22.4.1' FUZZY_MATCH_THRESHOLD = 0.6 TAB_ENTRIES_COUNT = 9 TAB_SEPARATOR = '__' diff --git a/bin/autojump.zsh b/bin/autojump.zsh index 79f7cd2..92c31d7 100644 --- a/bin/autojump.zsh +++ b/bin/autojump.zsh @@ -10,9 +10,8 @@ fi # set homebrew installation paths -local brew_prefix=${BREW_PREFIX:-$(brew --prefix)} -if [[ -d "${brew_prefix}/share/zsh/site-functions" ]]; then - fpath=("${brew_prefix}/share/zsh/site-functions" ${fpath}) +if command -v brew &>/dev/null && [[ -d "$(brew --prefix)/share/zsh/site-functions" ]]; then + fpath=("$(brew --prefix)/share/zsh/site-functions" ${fpath}) fi