* lisp/mpc.el (mpc-format): Use truncate-string-to-width.

Fixes: debbugs:13143

2 files changed, 5 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 49e129cd77a..a5fab65b34f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-12-12  David Cadé  <codename68@gmail.com>
+
+        * mpc.el (mpc-format): Use truncate-string-to-width (bug#13143).
+
 2012-12-12  Jonas Bernoulli  <jonas@bernoul.li>
 
         * lisp/emacs-lisp/eieio.el: Prettier object pretty-printing (bug#13115).
diff --git a/lisp/mpc.el b/lisp/mpc.el
index e8b5c50e561..65363de40f3 100644
--- a/lisp/mpc.el
+++ b/lisp/mpc.el
@@ -1034,11 +1034,8 @@ If PLAYLIST is t or nil or missing, use the main playlist."
             (let ((display
                    (if (and size
                             (> (+ postwidth textwidth) size))
-                       ;; This doesn't even obey double-width chars :-(
                        (propertize
-                        (if (zerop (- size postwidth 1))
-                            (substring text 0 1)
-                          (concat (substring text 0 (- size postwidth textwidth 1)) "…"))
+                        (truncate-string-to-width text size nil nil "…")
                         'help-echo text)
                      text)))
               (when (memq tag '(Artist Album Composer)) ;FIXME: wrong list.