From a9c0dedfbc908be9bef30101737f9e0a1a5112d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20Andr=C3=A9e?= <maandree@operamail.com>
Date: Wed, 22 Aug 2012 02:50:35 +0200
Subject: [PATCH] wrap correction

---
 CHANGELOG               | 7 +++++++
 manuals/ponysay.texinfo | 7 +++++++
 ponysay                 | 2 +-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 9c56e939..da945aee 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,13 @@ Version 2.3
 
 	`-q` accepts file names.
 
+	Improved Unicode support: treats combining characters as invisible
+
+	Optional support for UCS pony names
+
+	Pony files and balloon style files can be pipes (as
+	well as sockets, doors and as always regular files.)
+
 
 Version 2.2
 
diff --git a/manuals/ponysay.texinfo b/manuals/ponysay.texinfo
index f5ca6af6..77947aaf 100644
--- a/manuals/ponysay.texinfo
+++ b/manuals/ponysay.texinfo
@@ -1138,6 +1138,13 @@ first pony file in common.
 Support for @code{best.pony} file.
 @item
 @code{-q} accepts file names.
+@item
+Improved Unicode support: treats combining characters as invisible 
+@item
+Optional support for UCS pony names
+@item
+Pony files and balloon style files can be pipes (as well as sockets, doors
+and as always regular files)
 @end itemize
 
 @heading Version 2.2
diff --git a/ponysay b/ponysay
index 50e19b2d..1a69e01d 100755
--- a/ponysay
+++ b/ponysay
@@ -1305,7 +1305,7 @@ class Backend():
             msg = self.__wrapMessage(msg, wrap)
         lines = msg.split('\n')
         
-        return self.balloon.get(width, height, lines, lambda text : self.__len(text) - UCS.countCombining(text))
+        return self.balloon.get(width, height, lines, self.__len)
     
     
     '''