HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca
[bpt/emacs.git]
/
lisp
/
mpc.el
diff --git
a/lisp/mpc.el
b/lisp/mpc.el
index
e8b5c50
..
a649457
100644
(file)
--- a/
lisp/mpc.el
+++ b/
lisp/mpc.el
@@
-1,6
+1,6
@@
;;; mpc.el --- A client for the Music Player Daemon -*- coding: utf-8; lexical-binding: t -*-
;;; mpc.el --- A client for the Music Player Daemon -*- coding: utf-8; lexical-binding: t -*-
-;; Copyright (C) 2006-201
2
Free Software Foundation, Inc.
+;; Copyright (C) 2006-201
3
Free Software Foundation, Inc.
;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
;; Keywords: multimedia
;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
;; Keywords: multimedia
@@
-1034,11
+1034,8
@@
If PLAYLIST is t or nil or missing, use the main playlist."
(let ((display
(if (and size
(> (+ postwidth textwidth) size))
(let ((display
(if (and size
(> (+ postwidth textwidth) size))
- ;; This doesn't even obey double-width chars :-(
(propertize
(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.
'help-echo text)
text)))
(when (memq tag '(Artist Album Composer)) ;FIXME: wrong list.