diff options
author | layman <layman@localhost> | 2013-01-26 17:59:35 +0100 |
---|---|---|
committer | Martin Väth <martin@mvath.de> | 2015-10-11 10:48:35 +0200 |
commit | 3e1950ff2f70e6140f52b244516aab0efb03789c (patch) | |
tree | 5d723a4ab7fab0506ad43b3d886a01ba6c48448d | |
parent | Bump zshrc-mv (diff) | |
download | mv-3e1950ff2f70e6140f52b244516aab0efb03789c.tar.gz mv-3e1950ff2f70e6140f52b244516aab0efb03789c.tar.bz2 mv-3e1950ff2f70e6140f52b244516aab0efb03789c.zip |
Bump zshrc-mv and auto-fu-zsh. Shift kill-line to zshrc-mv
-rw-r--r-- | app-shells/auto-fu-zsh/ChangeLog | 5 | ||||
l--------- | app-shells/auto-fu-zsh/auto-fu-zsh-0.0.1.12-r3.ebuild | 1 | ||||
l--------- | app-shells/auto-fu-zsh/auto-fu-zsh-0.0.1.12-r4.ebuild | 1 | ||||
-rw-r--r-- | app-shells/auto-fu-zsh/auto-fu-zsh-99999999-r2.ebuild (renamed from app-shells/auto-fu-zsh/auto-fu-zsh-99999999-r1.ebuild) | 41 | ||||
-rw-r--r-- | app-shells/auto-fu-zsh/files/kill-line-live.patch | 35 | ||||
-rw-r--r-- | app-shells/auto-fu-zsh/files/kill-line.patch | 35 | ||||
-rw-r--r-- | app-shells/auto-fu-zsh/metadata.xml | 1 | ||||
-rw-r--r-- | app-shells/zshrc-mv/ChangeLog | 5 | ||||
-rw-r--r-- | app-shells/zshrc-mv/Manifest | 2 | ||||
-rw-r--r-- | app-shells/zshrc-mv/zshrc-mv-1.6.ebuild (renamed from app-shells/zshrc-mv/zshrc-mv-1.5.ebuild) | 1 | ||||
-rw-r--r-- | profiles/use.local.desc | 1 |
11 files changed, 42 insertions, 86 deletions
diff --git a/app-shells/auto-fu-zsh/ChangeLog b/app-shells/auto-fu-zsh/ChangeLog index e8bbcd77..71292f63 100644 --- a/app-shells/auto-fu-zsh/ChangeLog +++ b/app-shells/auto-fu-zsh/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*auto-fu-zsh-0.0.1.12-r4, auto-fu-zsh-99999999-r2 (26 Jan 2012) + + 26 Jan 2013; Martin Väth <martin@mvath.de> + Remove kill-line patch. Instead describe it in zshrc-example. + *auto-fu-zsh-0.0.1.12-r3, auto-fu-zsh-99999999-r1 (10 Jan 2012) 10 Jan 2013; Martin Väth <martin@mvath.de> diff --git a/app-shells/auto-fu-zsh/auto-fu-zsh-0.0.1.12-r3.ebuild b/app-shells/auto-fu-zsh/auto-fu-zsh-0.0.1.12-r3.ebuild deleted file mode 120000 index ecbfcdbe..00000000 --- a/app-shells/auto-fu-zsh/auto-fu-zsh-0.0.1.12-r3.ebuild +++ /dev/null @@ -1 +0,0 @@ -auto-fu-zsh-99999999-r1.ebuild
\ No newline at end of file diff --git a/app-shells/auto-fu-zsh/auto-fu-zsh-0.0.1.12-r4.ebuild b/app-shells/auto-fu-zsh/auto-fu-zsh-0.0.1.12-r4.ebuild new file mode 120000 index 00000000..85b5b98c --- /dev/null +++ b/app-shells/auto-fu-zsh/auto-fu-zsh-0.0.1.12-r4.ebuild @@ -0,0 +1 @@ +auto-fu-zsh-99999999-r2.ebuild
\ No newline at end of file diff --git a/app-shells/auto-fu-zsh/auto-fu-zsh-99999999-r1.ebuild b/app-shells/auto-fu-zsh/auto-fu-zsh-99999999-r2.ebuild index 61572f8a..daf4241d 100644 --- a/app-shells/auto-fu-zsh/auto-fu-zsh-99999999-r1.ebuild +++ b/app-shells/auto-fu-zsh/auto-fu-zsh-99999999-r2.ebuild @@ -31,7 +31,7 @@ HOMEPAGE="https://github.com/hchbaw/auto-fu.zsh/" LICENSE="HPND" SLOT="0" -IUSE="+compile +kill-line" +IUSE="+compile" DEPEND="compile? ( app-shells/zsh )" @@ -72,7 +72,31 @@ zstyle ':auto-fu:var' postdisplay # \$'\\n-azfu-' #zstyle ':auto-fu:var' disable magic-space zle-line-init() auto-fu-init zle -N zle-line-init -zle -N zle-keymap-select auto-fu-zle-keymap-select" +zle -N zle-keymap-select auto-fu-zle-keymap-select + +# Starting a line with a space or tab or quoting the first word +# or escaping a word should deactivate auto-fu for that line/word. +# This is useful e.g. if auto-fu is too slow for you in some cases. +zstyle ':auto-fu:var' autoable-function/skiplines '[[:blank:]\\\\\"'\'']*' +zstyle ':auto-fu:var' autoable-function/skipwords '[\\\\]*' + +# Let Ctrl-d successively remove tail of line, whole line, and exit +kill-line-maybe() { + if ((\$#BUFFER > CURSOR)) + then zle kill-line + else zle kill-whole-line + fi +} +zle -N kill-line-maybe +bindkey '\C-d' kill-line-maybe + +# Keep Ctrl-d behavior also when auto-fu is active +afu+orf-ignoreeof-deletechar-list() { + afu-eof-maybe afu-ignore-eof zle kill-line-maybe +} +afu+orf-exit-deletechar-list() { + afu-eof-maybe exit zle kill-line-maybe +}" } src_prepare() { @@ -80,17 +104,10 @@ src_prepare() { umask 022 generate_example >"${S}"/zshrc-example ) - if ${LIVE} - then if use kill-line - then epatch "${FILESDIR}"/kill-line-live.patch - fi - else + if ! ${LIVE} + then # Make Ctrl-D return correctly. - # In case of nonempty buffer act like kill-line or kill-whole-line. - if use kill-line - then epatch "${FILESDIR}"/kill-line.patch - else epatch "${FILESDIR}"/exit.patch - fi + epatch "${FILESDIR}"/exit.patch # Reset color with "return": epatch "${FILESDIR}"/reset-color.patch # Make it work with older zsh versions: diff --git a/app-shells/auto-fu-zsh/files/kill-line-live.patch b/app-shells/auto-fu-zsh/files/kill-line-live.patch deleted file mode 100644 index c341e898..00000000 --- a/app-shells/auto-fu-zsh/files/kill-line-live.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- auto-fu.zsh -+++ auto-fu.zsh -@@ -386,19 +386,21 @@ - } - } - --afu-eof-maybe () { -- local eof="$1"; shift -- [[ -z $BUFFER ]] && { $eof; return } -- "$@" --} -- - afu-ignore-eof () { zle -M "zsh: use 'exit' to exit." } - --afu-register-zle-eof () { -- local fun="$1" -- local then="$2" -- local else="${3:-delete-char-or-list}" -- eval "$fun () { afu-eof-maybe $then zle $else }; zle -N $fun" -+afu-kill-line() { -+if (($#BUFFER > CURSOR)) -+then zle kill-line -+else zle kill-whole-line -+fi -+} -+afu-register-zle-eof() { -+eval $1'() { [[ -z $BUFFER ]] && { '$2' -+return -+} -+afu-kill-line -+}' -+zle -N $1 - } - afu-register-zle-eof afu+orf-ignoreeof-deletechar-list afu-ignore-eof - afu-register-zle-eof afu+orf-exit-deletechar-list exit diff --git a/app-shells/auto-fu-zsh/files/kill-line.patch b/app-shells/auto-fu-zsh/files/kill-line.patch deleted file mode 100644 index cca7af05..00000000 --- a/app-shells/auto-fu-zsh/files/kill-line.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- auto-fu.zsh -+++ auto-fu.zsh -@@ -285,19 +285,21 @@ - } - } - --afu-eof-maybe () { -- local eof="$1"; shift -- [[ "$BUFFER" != '' ]] || { $eof; return } -- "$@" --} -- - afu-ignore-eof () { zle -M "zsh: use 'exit' to exit." } - --afu-register-zle-eof () { -- local fun="$1" -- local then="$2" -- local else="${3:-delete-char-or-list}" -- eval "$fun () { afu-eof-maybe $then zle $else }; zle -N $fun" -+afu-kill-line() { -+if (($#BUFFER > CURSOR)) -+then zle kill-line -+else zle kill-whole-line -+fi -+} -+afu-register-zle-eof() { -+eval $1'() { [[ -z $BUFFER ]] && { '$2' -+return -+} -+afu-kill-line -+}' -+zle -N $1 - } - afu-register-zle-eof afu+orf-ignoreeof-deletechar-list afu-ignore-eof - afu-register-zle-eof afu+orf-exit-deletechar-list exit diff --git a/app-shells/auto-fu-zsh/metadata.xml b/app-shells/auto-fu-zsh/metadata.xml index bf66b582..9c7557cb 100644 --- a/app-shells/auto-fu-zsh/metadata.xml +++ b/app-shells/auto-fu-zsh/metadata.xml @@ -14,6 +14,5 @@ </upstream> <use> <flag name="compile">Byte-compile to speed up</flag> - <flag name="kill-line">Make Ctrl-D work correctly and in case of nonempty buffer work as kill-line resp. kill-whole-line</flag> </use> </pkgmetadata> diff --git a/app-shells/zshrc-mv/ChangeLog b/app-shells/zshrc-mv/ChangeLog index d6e8b7d0..d5bc053a 100644 --- a/app-shells/zshrc-mv/ChangeLog +++ b/app-shells/zshrc-mv/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*zshrc-1.6 (26 Jan 2013) + + 26 Jan 2013; Martin Väth <martin@mvath.de> + Version bump, remove old ebuild. + *zshrc-1.5 (24 Jan 2013) 24 Jan 2013; Martin Väth <martin@mvath.de> diff --git a/app-shells/zshrc-mv/Manifest b/app-shells/zshrc-mv/Manifest index 3ecc4260..1c233ed3 100644 --- a/app-shells/zshrc-mv/Manifest +++ b/app-shells/zshrc-mv/Manifest @@ -1 +1 @@ -DIST zshrc-mv-1.5.tar.gz 7303 SHA256 eb85b387fbbca1d491dd567b650d92044ad81529c8f0a80b107aca0ee8ede787 SHA512 3ca098b549ef9c9586abeb4374a2fa8bbc76f850400047b144dab3c24f1eb1b31b4213418d90351421e17a618e6eab21b5d122cb48b5d63a828156e5ab306524 WHIRLPOOL bd04ba8ad2cf7f4f885bc9653935fdc8134cf204a7634cbfe83cfb554e48903bf93a9889f96d38d2fd09a27ca27dba6e4c7382b77204fa7640e952750d58cb52 +DIST zshrc-mv-1.6.tar.gz 7566 SHA256 d28f098521195d698d5130fa110b8d3df80afaa6282db9a7f13d884e55ec3abb SHA512 a6b9d7614204b2145a47e5f58a9694a82b57dd52f34165ce9e564c574c340a3e914642173a3f48186054f0e7fa943c09375101a33e6addbbd73b44a85e9280b8 WHIRLPOOL 8d2b5a4e1ec1ee7c1308cc4337314660406bed8b0ea9967e310ea693fd0edf60f1a82b849197d401fdd0b1504ce79ab9b972e8815371f890eeacdb810ceb4936 diff --git a/app-shells/zshrc-mv/zshrc-mv-1.5.ebuild b/app-shells/zshrc-mv/zshrc-mv-1.6.ebuild index 0fe73a15..49f92186 100644 --- a/app-shells/zshrc-mv/zshrc-mv-1.5.ebuild +++ b/app-shells/zshrc-mv/zshrc-mv-1.6.ebuild @@ -14,6 +14,7 @@ LICENSE="public-domain" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" +RDEPEND="!app-shells/auto-fu-zsh[kill-line(-)]" src_prepare() { epatch_user diff --git a/profiles/use.local.desc b/profiles/use.local.desc index 2f35004a..f5189711 100644 --- a/profiles/use.local.desc +++ b/profiles/use.local.desc @@ -13,7 +13,6 @@ app-portage/eix:sqlite - Compile in support for portage's sqlite backend; to act app-portage/eix:strong-optimization - Adds several more agressive CXXFLAGS/LDFLAGS for optimization like graphite (if available). May cause trouble with some buggy compiler versions. Absense of this USE flag does not strip user's *FLAGS app-portage/eix:tools - Create separate binary for script helper tools; useful if they are called extremely often app-shells/auto-fu-zsh:compile - Byte-compile to speed up -app-shells/auto-fu-zsh:kill-line - Make Ctrl-D work correctly and in case of nonempty buffer work as kill-line resp. kill-whole-line app-shells/zsh:completion_AIX - install completions for AIX app-shells/zsh:completion_BSD - install completions for BSD app-shells/zsh:completion_Cygwin - install completions for Cygwin |