projects/fisher
1
0
Fork 0
mirror of https://github.com/jorgebucaran/fisher synced 2024-06-28 23:01:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Do not obliterate existing user bindings when installing bindings plugins. Close #283.

Browse source
This commit is contained in:
Jorge Bucaran 2016-05-17 13:35:25 +09:00
parent 47924cf232
commit 7f1e130236
No known key found for this signature in database
GPG key ID: E54BA3C0E646DB30
1 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
fisher.fish
View file

@ -1361,7 +1361,7 @@ function __fisher_key_bindings_append -a plugin_name file
next
}
/^end$/ {
/^end$/ && reading_function_source {
exit
}
@ -1404,6 +1404,26 @@ function __fisher_key_bindings_append -a plugin_name file
printf "%s\n" $plugin_key_bindings_source | source ^ /dev/null
fish_indent < "$user_key_bindings" | command awk '
{
if ($0 ~ /^function fish_user_key_bindings/) {
reading_function_source = 1
next
} else if ($0 ~ /^end$/ && reading_function_source) {
reading_function_source = 0
next
}
if (!reading_function_source) {
print($0)
}
}
' > "$user_key_bindings-copy"
command mv -f "$user_key_bindings-copy" "$user_key_bindings"
printf "%s\n" $key_bindings_source $plugin_key_bindings_source | command awk '
BEGIN {
@ -1416,7 +1436,7 @@ function __fisher_key_bindings_append -a plugin_name file
print "end"
}
' | fish_indent > "$user_key_bindings"
' | fish_indent >> "$user_key_bindings"
end