X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fzsh%2Fzshrc;h=415ec436326b4932ecfcd8106ed9a2cb56fa1468;hb=d5f9c90f24b44699313ae6f2d4ac57d95d168c38;hp=335d71e18ea9ea5c08d5841510da096c2361da87;hpb=81427a707f5fafbbb018611812bd785e001f932f;p=grml-etc-core.git diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc index 335d71e..415ec43 100644 --- a/etc/zsh/zshrc +++ b/etc/zsh/zshrc @@ -1195,10 +1195,10 @@ help_zle_parse_keybindings() if [[ "$cline" == (#s)[[:space:]]#\#k\#[[:space:]]##(#b)(*)[[:space:]]#(#e) ]]; then lastkeybind_desc="$match[*]" num_lines_elapsed=0 - #zsh pattern: matches lines that set a keybinding using bindkey or compdef -k + #zsh pattern: matches lines that set a keybinding using bind2map, bindkey or compdef -k # ignores lines that are commentend out # grabs first in '' or "" enclosed string with length between 1 and 6 characters - elif [[ "$cline" == [^#]#(bindkey|compdef -k)[[:space:]](*)(#b)(\"((?)(#c1,6))\"|\'((?)(#c1,6))\')(#B)(*) ]]; then + elif [[ "$cline" == [^#]#(bind2maps[[:space:]](*)-s|bindkey|compdef -k)[[:space:]](*)(#b)(\"((?)(#c1,6))\"|\'((?)(#c1,6))\')(#B)(*) ]]; then #description prevously found ? description not more than 2 lines away ? keybinding not empty ? if [[ -n $lastkeybind_desc && $num_lines_elapsed -lt 2 && -n $match[1] ]]; then #substitute keybinding string with something readable @@ -1855,7 +1855,7 @@ grml_prompt_pre_default=( newline '' path '%B' percent '' - rc '%F{red}' + rc '%B%F{red}' rc-always '' sad-smiley '' shell-level '%F{red}' @@ -1876,7 +1876,7 @@ grml_prompt_post_default=( newline '' path '%b' percent '' - rc '%f' + rc '%f%b' rc-always '' sad-smiley '' shell-level '%f' @@ -2035,7 +2035,7 @@ function grml_prompt_addto () { for it in "${items[@]}"; do zstyle -s ":prompt:${grmltheme}:${lr}:items:$it" pre apre \ || apre=${grml_prompt_pre_default[$it]} - zstyle -s ":prompt:grml:${grmltheme}:${lr}:$it" post apost \ + zstyle -s ":prompt:${grmltheme}:${lr}:items:$it" post apost \ || apost=${grml_prompt_post_default[$it]} zstyle -s ":prompt:${grmltheme}:${lr}:items:$it" token new \ || new=${grml_prompt_token_default[$it]} @@ -2159,7 +2159,7 @@ if is437; then unset i zstyle ':prompt:grml(|-large|-chroot):right:setup' use-rprompt false elif (( EUID == 0 )); then - zstyle ':prompt:grml(|-large|-chroot):*:items:user' pre '%F{red}' + zstyle ':prompt:grml(|-large|-chroot):*:items:user' pre '%B%F{red}' fi # Finally enable one of the prompts.