diff --git a/pkg/mods/epm/epm.elv b/pkg/mods/epm/epm.elv index d90750866..8d2391923 100644 --- a/pkg/mods/epm/epm.elv +++ b/pkg/mods/epm/epm.elv @@ -132,7 +132,7 @@ set -method-handler = [ -info "Updating "$pkg try { git -C $dest pull - } except _ { + } catch _ { -error "Something failed, please check error above and retry." } } @@ -393,7 +393,7 @@ fn install {|&silent-if-installed=$false @pkgs| # place) try { install $@deps - } except e { + } catch e { -error "Dependency installation failed. Uninstalling "$pkg", please check the errors above and try again." -uninstall-package $pkg } diff --git a/pkg/mods/readlinebinding/readline-binding.elv b/pkg/mods/readlinebinding/readline-binding.elv index d6b252eb6..fc93eed9b 100644 --- a/pkg/mods/readlinebinding/readline-binding.elv +++ b/pkg/mods/readlinebinding/readline-binding.elv @@ -1,6 +1,7 @@ set edit:global-binding[Ctrl-G] = $edit:close-mode~ -b={|k f| set edit:insert:binding[$k] = $f } { +{ + var b = {|k f| set edit:insert:binding[$k] = $f } $b Ctrl-A $edit:move-dot-sol~ $b Ctrl-B $edit:move-dot-left~ $b Ctrl-D { @@ -31,14 +32,16 @@ b={|k f| set edit:insert:binding[$k] = $f } { $b Alt-t $edit:transpose-word~ } -b={|k f| set edit:completion:binding[$k] = $f } { +{ + var b = {|k f| set edit:completion:binding[$k] = $f } $b Ctrl-B $edit:completion:left~ $b Ctrl-F $edit:completion:right~ $b Ctrl-N $edit:completion:down~ $b Ctrl-P $edit:completion:up~ } -b={|k f| set edit:navigation:binding[$k] = $f } { +{ + var b = {|k f| set edit:navigation:binding[$k] = $f } $b Ctrl-B $edit:navigation:left~ $b Ctrl-F $edit:navigation:right~ $b Ctrl-N $edit:navigation:down~ @@ -46,18 +49,21 @@ b={|k f| set edit:navigation:binding[$k] = $f } { $b Alt-f $edit:navigation:trigger-filter~ } -b={|k f| set edit:history:binding[$k] = $f } { +{ + var b = {|k f| set edit:history:binding[$k] = $f } $b Ctrl-N $edit:history:down-or-quit~ $b Ctrl-P $edit:history:up~ } -b={|k f| set edit:listing:binding[$k] = $f } { +{ + var b = {|k f| set edit:listing:binding[$k] = $f } $b Ctrl-N $edit:listing:down~ $b Ctrl-P $edit:listing:up~ $b Ctrl-V $edit:listing:page-down~ $b Alt-v $edit:listing:page-up~ } -b={|k f| set edit:histlist:binding[$k] = $f } { +{ + var b = {|k f| set edit:histlist:binding[$k] = $f } $b Alt-d $edit:histlist:toggle-dedup~ }