diff options
author | Barton E. Schaefer <schaefer@zsh.org> | 2014-04-07 07:21:21 -0700 |
---|---|---|
committer | Barton E. Schaefer <schaefer@zsh.org> | 2014-04-07 07:21:21 -0700 |
commit | 141089231c9731811939d6ce24888fc95693eb6e (patch) | |
tree | 376d6a022648790ae06fec23c1c2877e6fa9b1b7 /Functions | |
parent | 2be3ff58e234456348765e435ef3185ff9d43a1c (diff) | |
parent | 08d4a6136e5c289d1be6d6290568866c2d59ef53 (diff) | |
download | zsh-141089231c9731811939d6ce24888fc95693eb6e.tar.gz zsh-141089231c9731811939d6ce24888fc95693eb6e.tar.xz zsh-141089231c9731811939d6ce24888fc95693eb6e.zip |
Merge branch 'master' of git://git.code.sf.net/p/zsh/code
Conflicts: ChangeLog
Diffstat (limited to 'Functions')
-rw-r--r-- | Functions/Misc/zcalc | 3 | ||||
-rw-r--r-- | Functions/Zle/.distfiles | 1 | ||||
-rw-r--r-- | Functions/Zle/zcalc-auto-insert | 8 |
3 files changed, 12 insertions, 0 deletions
diff --git a/Functions/Misc/zcalc b/Functions/Misc/zcalc index b79644687..63f67adb0 100644 --- a/Functions/Misc/zcalc +++ b/Functions/Misc/zcalc @@ -96,6 +96,9 @@ emulate -L zsh setopt extendedglob +# For testing in ZLE functions. +local ZCALC_ACTIVE=1 + # TODO: make local variables that shouldn't be visible in expressions # begin with _. local line ans base defbase forms match mbegin mend psvar optlist opt arg diff --git a/Functions/Zle/.distfiles b/Functions/Zle/.distfiles index 5b301b62b..b43476032 100644 --- a/Functions/Zle/.distfiles +++ b/Functions/Zle/.distfiles @@ -44,5 +44,6 @@ up-case-word-match up-line-or-beginning-search url-quote-magic which-command +zcalc-auto-insert zed-set-file-name ' diff --git a/Functions/Zle/zcalc-auto-insert b/Functions/Zle/zcalc-auto-insert new file mode 100644 index 000000000..c9a5c8867 --- /dev/null +++ b/Functions/Zle/zcalc-auto-insert @@ -0,0 +1,8 @@ +# Bind to a binary operator keystroke for use with zcalc + +if [[ -n $ZCALC_ACTIVE ]]; then + if [[ $CURSOR -eq 0 || $LBUFFER[-1] = "(" ]]; then + LBUFFER+=${ZCALC_AUTO_INSERT_PREFIX:-"ans "} + fi +fi +zle .self-insert |