From d10a551d9d6b25de0f46c18a30b7399c993d498e Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 19 Jun 2014 10:58:57 -0400 Subject: [PATCH] * lisp/international/mule-util.el (truncate-string-ellipsis): New var. (truncate-string-to-width): Use it. --- etc/NEWS | 2 ++ lisp/ChangeLog | 5 +++++ lisp/international/mule-util.el | 7 +++++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index f9cb42e2d2b..27e9cfa0e3c 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -46,6 +46,8 @@ Use './configure PKG_CONFIG=/full/name/of/pkg-config' if you need to. * Changes in Emacs 24.5 +** New var `truncate-string-ellipsis' to choose how to indicate truncation. + --- ** The default value of `history-length' has increased to 100. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index af2eb9712ae..1bc768a3b52 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-06-19 Stefan Monnier + + * international/mule-util.el (truncate-string-ellipsis): New var. + (truncate-string-to-width): Use it. + 2014-06-19 Robert Brown (tiny change) * emacs-lisp/lisp-mode.el (lisp-string-after-doc-keyword-p): New fun. diff --git a/lisp/international/mule-util.el b/lisp/international/mule-util.el index efafb96538b..42bc5ef1e5c 100644 --- a/lisp/international/mule-util.el +++ b/lisp/international/mule-util.el @@ -56,6 +56,9 @@ (setq i (1+ i))))) string) +(defvar truncate-string-ellipsis "..." ;"…" + "String to use to indicate truncation.") + ;;;###autoload (defun truncate-string-to-width (str end-column &optional start-column padding ellipsis) @@ -80,11 +83,11 @@ If ELLIPSIS is non-nil, it should be a string which will replace the end of STR (including any padding) if it extends beyond END-COLUMN, unless the display width of STR is equal to or less than the display width of ELLIPSIS. If it is non-nil and not a string, then ELLIPSIS -defaults to \"...\"." +defaults to `truncate-string-ellipsis'." (or start-column (setq start-column 0)) (when (and ellipsis (not (stringp ellipsis))) - (setq ellipsis "...")) + (setq ellipsis truncate-string-ellipsis)) (let ((str-len (length str)) (str-width (string-width str)) (ellipsis-len (if ellipsis (length ellipsis) 0)) -- 2.39.5