diff options
author | Peter Ammon <corydoras@ridiculousfish.com> | 2012-05-30 00:22:45 -0700 |
---|---|---|
committer | Peter Ammon <corydoras@ridiculousfish.com> | 2012-05-30 00:22:45 -0700 |
commit | 9d8ae184c9b23b383e8932870c2f289784d3cb68 (patch) | |
tree | 7cde514f67b24ce3654da110c84bee4c16a41ceb | |
parent | 4afdcf56fcdf3f7b67c6b6bf3cad46245d98875c (diff) |
Fix for annoying messages when launching on SnowLeopard
Fix for missing .o file in Makefile.in
-rw-r--r-- | Makefile.in | 2 | ||||
-rw-r--r-- | share/functions/fish_default_key_bindings.fish | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index 70f0ff2c..d770102f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -773,7 +773,7 @@ mimedb: $(MIME_OBJS) # Build the set_color program # -set_color: set_color.o print_help.o common.o color.o +set_color: set_color.o print_help.o common.o color.o wutil.o $(CXX) set_color.o print_help.o common.o wutil.o color.o $(LDFLAGS_SET_COLOR) -o $@ diff --git a/share/functions/fish_default_key_bindings.fish b/share/functions/fish_default_key_bindings.fish index a26387d4..b62da166 100644 --- a/share/functions/fish_default_key_bindings.fish +++ b/share/functions/fish_default_key_bindings.fish @@ -31,8 +31,10 @@ function fish_default_key_bindings -d "Default (Emacs-like) key bindings for fis bind \e\[H beginning-of-line bind \e\[F end-of-line - bind -k home beginning-of-line - bind -k end end-of-line + + # OS X SnowLeopard doesn't have these keys. Don't show an annoying error message. + bind -k home beginning-of-line 2> /dev/null + bind -k end end-of-line 2> /dev/null bind \e\eOC nextd-or-forward-word bind \e\eOD prevd-or-backward-word |