Index: fish/config.fish
==================================================================
--- fish/config.fish
+++ fish/config.fish
@@ -21,15 +21,10 @@
 set -g fish_color_user 00ff00
 set -g fish_color_valid_path normal
 set -g fish_color_vcs 43d696
 set -g fish_color_vcs_braces 29bc7d
 
-set -g _fish_abbr_fl fossil
-set -g _fish_abbr_flc fossil changes --differ
-set -g _fish_abbr_gpg gpg2
-set -g _fish_abbr_vi vim
-
 test -n "$XDG_CONFIG_HOME"
 or set -x XDG_CONFIG_HOME $HOME/.config
 test -n "$XDG_CACHE_HOME"
 or set -x XDG_CACHE_HOME $HOME/.cache
 test -n "$XDG_DATA_HOME"

ADDED   fish/functions/fl.fish
Index: fish/functions/fl.fish
==================================================================
--- fish/functions/fl.fish
+++ fish/functions/fl.fish
@@ -0,0 +1,3 @@
+function fl --wraps=fossil
+    command fossil $argv
+end

ADDED   fish/functions/flc.fish
Index: fish/functions/flc.fish
==================================================================
--- fish/functions/flc.fish
+++ fish/functions/flc.fish
@@ -0,0 +1,3 @@
+function flc --wraps='fossil changes --differ'
+    command fossil changes --differ $argv
+end

Index: fish/functions/fld.fish
==================================================================
--- fish/functions/fld.fish
+++ fish/functions/fld.fish
@@ -1,3 +1,3 @@
-function fld
-    fossil diff $argv -N | colordiff | less -FRX
+function fld --wraps 'fossil diff'
+    command fossil diff $argv -N | colordiff | less -FRX
 end

ADDED   fish/functions/gpg.fish
Index: fish/functions/gpg.fish
==================================================================
--- fish/functions/gpg.fish
+++ fish/functions/gpg.fish
@@ -0,0 +1,3 @@
+function gpg --wraps=gpg2
+    command gpg2 $argv
+end

ADDED   fish/functions/vi.fish
Index: fish/functions/vi.fish
==================================================================
--- fish/functions/vi.fish
+++ fish/functions/vi.fish
@@ -0,0 +1,3 @@
+function vi --wraps=vim
+    command vim $argv
+end