diff options
| author | Daniel Shahaf <d.s@daniel.shahaf.name> | 2015-07-07 20:30:15 +0000 |
|---|---|---|
| committer | Daniel Shahaf <d.s@daniel.shahaf.name> | 2015-07-13 23:21:54 +0000 |
| commit | 35ffe36318955d03fca3df0d34a0997970cfc6a3 (patch) | |
| tree | 505c4679b9ba33ba4970ed7c5d177b70e73ed786 | |
| parent | 5911aca85f200cb7621b65ff61d79919fd21cfcb (diff) | |
| download | zsh-35ffe36318955d03fca3df0d34a0997970cfc6a3.tar.gz zsh-35ffe36318955d03fca3df0d34a0997970cfc6a3.zip | |
35769: edit-command-line: Go to the right byte offset
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Functions/Zle/edit-command-line | 12 |
2 files changed, 16 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2015-07-13 Daniel Shahaf <d.s@daniel.shahaf.name> + + * 35769: Functions/Zle/edit-command-line: edit-command-line: + Go to the right byte offset + 2015-07-13 Oliver Kiddle <opk@zsh.org> * 35737: (tweaked c.f. Peter: 35759): Src/Zle/zle_utils.c, diff --git a/Functions/Zle/edit-command-line b/Functions/Zle/edit-command-line index 100af9601..2ad4825b7 100644 --- a/Functions/Zle/edit-command-line +++ b/Functions/Zle/edit-command-line @@ -8,7 +8,17 @@ () { exec </dev/tty - ${=${VISUAL:-${EDITOR:-vi}}} $1 + + # Open the editor, placing the cursor at the right place if we know how. + local editor=${${VISUAL:-${EDITOR:-vi}}} + integer byteoffset=$(( $#PREBUFFER + $#LBUFFER + 1 )) + case $editor in + (*vim*) ${=editor} -c "normal! ${byteoffset}go" -- $1;; + (*emacs*) ${=editor} $1 -eval "(goto-char ${byteoffset})";; + (*) ${=editor} $1;; + esac + + # Replace the buffer with the editor output. print -Rz - "$(<$1)" } =(<<<"$PREBUFFER$BUFFER") |