Add further consideration to string-width (Bug#24972)

* lisp/ibuffer.el (ibuffer-compile-make-eliding-form):
(ibuffer-compile-make-substring-form): Use truncate-string-to-width.

diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el
index 8c6417978581e86fe45fd7990dac7b3a28d05de5..faadb67408a5b0136085ce97bf80ad1229f3fc95 100644 (file)
--- a/lisp/ibuffer.el
+++ b/lisp/ibuffer.el
@@ -1558,18 +1558,17 @@ If point is on a group name, this function operates on that group."
             ,(if from-end-p
                  `(concat ,ellipsis
                           (substring ,strvar
-                                     (length ibuffer-eliding-string)))
-               `(concat
-                 (substring ,strvar 0 (- strlen ,(length ellipsis)))
+                                     (string-width ibuffer-eliding-string)))
+               `(truncate-string-to-width
+                 ,strvar strlen nil nil
                  ,ellipsis))
           ,strvar)
       strvar)))
 
 (defun ibuffer-compile-make-substring-form (strvar maxvar from-end-p)
   (if from-end-p
-      `(substring str
-                 (- strlen ,maxvar))
-    `(substring ,strvar 0 ,maxvar)))
+      `(truncate-string-to-width str (string-width str) (- strlen ,maxvar))
+    `(truncate-string-to-width ,strvar ,maxvar)))
 
 (defun ibuffer-compile-make-format-form (strvar widthform alignment)
   (let* ((left `(make-string tmp2 ?\s))