From 1334d466b56520d5889b373c634ef4e902dcfa80 Mon Sep 17 00:00:00 2001
From: Elis Axelsson <elis.axelsson@gmail.com>
Date: Thu, 19 Jul 2012 21:28:35 +0200
Subject: [PATCH 1/2] Made the fish-completion aware of the ttyponies, and
 cleaned it up

---
 completion/fish-completion.fish | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/completion/fish-completion.fish b/completion/fish-completion.fish
index ea98382c..8d3c9111 100644
--- a/completion/fish-completion.fish
+++ b/completion/fish-completion.fish
@@ -4,21 +4,33 @@
 #
 # Author: Elis Axelsson <etu AT elis DOT nu>
 
-
-if test -d /usr/share/ponysay/ponies/
-	set -g systemponies (ls --color=no /usr/share/ponysay/ponies/ | sed 's/\.pony/\t Pony from \/usr\/share\/ponysay\/ponies\//')
+if test $TERM = "linux"
+	set -g systempath "/usr/share/ponysay/ttyponies/"
+	set -g homepath   "~/.local/share/ponysay/ttyponies/"
+else
+	set -g systempath "/usr/share/ponysay/ponies/"
+	set -g homepath   "~/.local/share/ponysay/ponies/"
 end
 
-if test -d ~/.local/share/ponysay/ponies/
-	set -g homeponies (ls --color=no ~/.local/share/ponysay/ponies/ | sed 's/\.pony/\t Pony from ~\/.local\/share\/ponysay\/ponies\//')
+
+if test -d $systempath
+	set -g systemponies (ls --color=no $systempath | sed 's/\.pony//')
 end
 
+if test -d $homepath
+	set -g homeponies   (ls --color=no $homepath | sed 's/\.pony//')
+end
+
+
 complete -c ponysay -s h --description "Help of ponysay"
 complete -c ponysay -s v --description "Version of ponysay"
 complete -c ponysay -s l --description "List pony files"
-complete -c ponysay -s f -a "$systemponies $homeponies" --description "Select a pony, either a filename or pony name"
+complete -c ponysay -s f -a "$homeponies $systemponies" --description "Ponyfile"
 complete -c ponysay -s W -a "Integer" --description "The screen column where the message should be wrapped"
 
+
+set -e systempath
+set -e homepath
 set -e systemponies
 set -e homeponies
 

From 66f94046d32bebf5da47c491898d6dedd262a2e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20Andr=C3=A9e?= <maandree@operamail.com>
Date: Thu, 19 Jul 2012 21:32:51 +0200
Subject: [PATCH 2/2] moving jristz into active developers

---
 CREDITS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CREDITS b/CREDITS
index 4134678f..aa46e417 100644
--- a/CREDITS
+++ b/CREDITS
@@ -4,12 +4,12 @@
 Erkin Batu Altunbaş
 Mattias Andrée
 Sven-Hendrik Haase
+Pablo Lezaeta
 Jan Alexander Steffens
 
 # Patchers and other contributors
 Elis Axelsson
 Duane Bekaert
-Pablo Lezaeta
 Kyah Rindlisbacher
 James Ross-Gowan
 Louis Taylor