* lisp/international/mule-util.el (truncate-string-ellipsis): New var.

(truncate-string-to-width): Use it.

diff --git a/etc/NEWS b/etc/NEWS
index f9cb42e2d2bdefa4e81ffaf25be035e3efb30586..27e9cfa0e3c4d10528749787c8dc2429cdcac853 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -46,6 +46,8 @@ Use './configure PKG_CONFIG=/full/name/of/pkg-config' if you need to.
 \f
 * 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 af2eb9712ae30edaf46d68a0702988fa18616241..1bc768a3b52405dd6f348e93a8b56a781e6f1525 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * international/mule-util.el (truncate-string-ellipsis): New var.
+       (truncate-string-to-width): Use it.
+
 2014-06-19  Robert Brown  <robert.brown@gmail.com>  (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 efafb96538b5ad30bc0f21b8d57303b4bacda97b..42bc5ef1e5c34448fb4628b35fe62973c3bf93cf 100644 (file)
--- 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))