Merge remote-tracking branch 'upstream/master' into optimize-startup

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

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
+    (sub-directory of current directory) rather than typing out the
-    name.
+    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
+    `j in` would jump into /home/user/mail/inbox as the higher
-    entry. However you can pass multiple arguments to autojump to prefer
+    weighted entry. However you can pass multiple arguments to autojump
-    a different entry. In the above example, `j w in` would then change
+    to prefer a different entry. In the above example, `j w in` would
-    directory to /home/user/work/inbox.
+    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"
 

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.1'
 FUZZY_MATCH_THRESHOLD = 0.6
 TAB_ENTRIES_COUNT = 9
 TAB_SEPARATOR = '__'

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.)
+(Mac Finder, Windows Explorer, GNOME Nautilus, etc.) to the directory
- to the directory instead.
+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