update doc

README.cn.md

@@ -341,8 +341,31 @@ alias zh='z -I -t .'
 
 第一列数据代表该路径多少秒以前访问过，第二列是路径名称。此时，你可以试着敲几个字母，用 fzf 的字符串模糊匹配进行定位，或者用光标键的上和下（CTRL+J/K 也可以）来上下移动，最后按回车 cd 过去，或者 ESC 放弃。
 
+版本 `v1.5.1` 引入了模拟 `dirstack` 可以通过： `z -`，`z --` 和 `z -{num}` 来操作：
+
+```bash
+# 显示当前的 dir stack
+$ z --    
+ 0  /home/skywind/work/match/memory-match
+ 1  /home/skywind/.local/etc
+ 2  /home/skywind/software/vifm-0.9.1
+ 3  /home/skywind/work
+ 4  /home/skywind/work/match
+
+# cd 到栈里 2 号路径
+$ z -2
+  => cd /home/skywind/software/vifm-0.9.1
+
+# 弹出栈顶 (cd 到上一次的老路径)，和 "z -0" 相同
+$ z -
+  => cd -
+```
+
+这个 `dirstack` 是根据 z.lua 的路径历史数据库计算的出来的，所以和具体的 shell 或者操作系统都没有关系。你退出再登陆不会丢失这些路径历史，不同的 shell 之间也可以共享同一份历史数据。
+
 注意：最好把增强匹配模式打开，这样查看历史路径时可以把当前路径过滤掉。
 
+
 ## Tips
 
 推荐一些常用的命令别名:

README.md

@@ -343,7 +343,29 @@ NOTE: To enable this, command `fzf` must be found in `$PATH` before initializati
 
 ## Most Recently Accessed Path
 
-We always use `cd -` to go back to last accessed directory, but with the help of `fzf` we can achieve this productively:
+`z.lua` provides a fast way to visit MRU directories without typing any keyword. That is `dirstack`, which records recently visited paths and can be manipulated by `z -`, `z --` and `z -{num}`:
+
+```bash
+# display current dir stack
+$ z --    
+ 0  /home/skywind/work/match/memory-match
+ 1  /home/skywind/.local/etc
+ 2  /home/skywind/software/vifm-0.9.1
+ 3  /home/skywind/work
+ 4  /home/skywind/work/match
+
+# cd to the 2nd directory in the stack
+$ z -2
+  => cd /home/skywind/software/vifm-0.9.1
+
+# popup stacktop (cd to previous directory), same as "z -0"
+$ z -
+  => cd -
+```
+
+The `dirstack` is calculated from z.lua's database, and has no dependency on shells or systems. You will not lost records after re-login, and history can be shared across shells and sessions.
+
+There is another way to access MRU directories interactively by utilizing parameter `-I` (fzf) and `-t` (sort by time):
 
 ```bash
 alias zh='z -I -t .'
@@ -355,11 +377,12 @@ The new alias `zh` (jump to history) uses a parameter `-t` to sort the result by
 
 The first column indicates how many seconds ago you have visited, and the second column is the path name. With `zh`, you can type some character to use string matching in fzf, or use `<Up>`/`<Down>` (as well as `CTRL+j/k`) to move the selector (red `>`) up and down. 
 
-At last, press `<enter>` to accept or `<ESC>` to give up.
+At last, press `<enter>` to accept or `<ESC>` to give up. 
 
 Remember to enable the [enhanced matching](#enhanced-matching) algorithm, the current working directory can be skipped with it.
 
 
+
 ## Tips
 
 Recommended aliases you may find useful:
@@ -427,6 +450,8 @@ As you see, z.lua is the fastest one and requires less resource.
 
 ## History
 
+- 1.5.2 (2019-02-16): be aware of all arguments in fzf completion.
+- 1.5.1 (2019-02-15): new: simulated dir stack by `z -`, `z --` and `z -{num}`.
 - 1.5.0 (2019-02-14): fixed minor issues in backward jumping.
 - 1.4.7 (2019-02-13): Don't use regex in backward jumping (use plain text instead).
 - 1.4.6 (2019-02-12): change: `_ZL_EXCLUDE_DIRS` to a comma separated list of dirs to exclude.

z.cmd

@@ -108,4 +108,5 @@ if /i "%RunMode%"=="-n" (
 )
 
 :end
+echo.
 

z.lua

@@ -4,7 +4,7 @@
 -- z.lua - a cd command that learns, by skywind 2018, 2019
 -- Licensed under MIT license.
 --
--- Version 1.5.0, Last Modified: 2019/02/14 22:57
+-- Version 1.5.2, Last Modified: 2019/02/16 14:25
 --
 -- * 10x faster than fasd and autojump, 3x faster than z.sh
 -- * available for posix shells: bash, zsh, sh, ash, dash, busybox
@@ -124,7 +124,6 @@ Z_SKIPPWD = false
 os.LOG_NAME = os.getenv('_ZL_LOG_NAME')
 
 
-
 -----------------------------------------------------------------------
 -- string lib
 -----------------------------------------------------------------------
@@ -779,8 +778,16 @@ function os.getopt(argv)
 			if head ~= '-' then
 				break
 			end
-			local part = arg:split('=')
-			options[part[1]] = part[2] ~= nil and part[2] or ''
+			if arg == '-' then
+				options['-'] = ''
+			elseif arg == '--' then
+				options['-'] = '-'
+			elseif arg:match('^-%d+$') then
+				options['-'] = arg:sub(2)
+			else
+				local part = arg:split('=')
+				options[part[1]] = part[2] ~= nil and part[2] or ''
+			end
 		end
 		index = index + 1
 	end
@@ -1540,16 +1547,28 @@ end
 
 
 -----------------------------------------------------------------------
--- cd forward
+-- cd minus: "z -", "z --", "z -2"
 -----------------------------------------------------------------------
-function cd_forward(args, options)
-end
-
-
------------------------------------------------------------------------
--- cd detour
------------------------------------------------------------------------
-function cd_forward(args, options)
+function cd_minus(args, options)
+	Z_SKIPPWD = true
+	local M = z_match({}, 'time', Z_SUBDIR)
+	local size = #M
+	if options['-'] == '-' then
+		for i, item in ipairs(M) do
+			if i > 10 then break end
+			io.stderr:write(' ' .. tostring(i - 1) .. '  ' .. item.name .. '\n')
+		end
+	else
+		local level = 0
+		local num = options['-']
+		if num and num ~= '' then
+			level = tonumber(num)
+		end
+		if level >= 0 and level < size then
+			return M[level + 1].name
+		end
+	end
+	return nil
 end
 
 
@@ -1588,10 +1607,8 @@ function main(argv)
 		local path = ''
 		if options['-b'] then
 			path = cd_backward(args, options)
-		elseif options['-f'] then
-			path = cd_forward(args, options)
-		elseif options['-d'] then
-			path = cd_detour(args, options)
+		elseif options['-'] then
+			path = cd_minus(args, options)
 		elseif #args == 0 then
 			path = nil
 		else
@@ -1883,8 +1900,7 @@ if [ "$TERM" != "dumb" ] && command -v fzf >/dev/null 2>&1; then
 	# To redraw line after fzf closes (printf '\e[5n')
 	bind '"\e[0n": redraw-current-line'
 	_zlua_fzf_complete() {
-		local query="${COMP_WORDS[COMP_CWORD]}"
-		local selected=$(_zlua | sed "s|$HOME|\~|" | $zlua_fzf --query "$query" | sed 's/^[0-9,.]* *//')
+		local selected=$(_zlua -l "${COMP_WORDS[@]:1}" | sed "s|$HOME|\~|" | $zlua_fzf | sed 's/^[0-9,.]* *//')
 		if [ -n "$selected" ]; then
 			COMPREPLY=( "$selected" )
 		fi
@@ -2049,8 +2065,8 @@ function _zlua
 			else
 				_zlua_call "$_ZL_CD" "$dest"
 			end
+			if test -n "$_ZL_ECHO"; pwd; end
 		end
-		if test -n "$_ZL_ECHO"; pwd; end
 	end
 end