[Emacs-diffs] Changes to emacs/lisp/buff-menu.el,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/11/20 15:22:19

Index: buff-menu.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/buff-menu.el,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -b -r1.117 -r1.118
--- buff-menu.el        3 Sep 2008 04:05:07 -0000       1.117
+++ buff-menu.el        20 Nov 2008 15:22:19 -0000      1.118
@@ -597,21 +597,24 @@
   (display-buffer (list-buffers-noselect files-only)))
 
 (defun Buffer-menu-buffer+size (name size &optional name-props size-props)
-  (if (> (+ (length name) (length size) 2) Buffer-menu-buffer+size-width)
+  (if (> (+ (string-width name) (string-width size) 2) 
Buffer-menu-buffer+size-width)
       (setq name
            (if (string-match "<[0-9]+>$" name)
-               (concat (substring name 0
+               (concat (truncate-string-to-width name
                                   (- Buffer-menu-buffer+size-width
-                                     (max (length size) 3)
-                                     (match-end 0)
-                                     (- (match-beginning 0))
-                                     2))
+                                                    (max (string-width size) 3)
+                                                    (string-width 
(match-string 0))
+                                                    2)
+                                                 0
+                                                 ?\s)
                        ":"             ; narrow ellipsis
                        (match-string 0 name))
-             (concat (substring name 0
+             (concat (truncate-string-to-width name
                                 (- Buffer-menu-buffer+size-width
-                                   (max (length size) 3)
-                                   2))
+                                                  (max (string-width size) 3)
+                                                  2)
+                                               0
+                                               ?\s)
                      ":")))            ; narrow ellipsis
     ;; Don't put properties on (buffer-name).
     (setq name (copy-sequence name)))
@@ -619,8 +622,8 @@
   (add-text-properties 0 (length size) size-props size)
   (concat name
          (make-string (- Buffer-menu-buffer+size-width
-                         (length name)
-                         (length size))
+                         (string-width name)
+                         (string-width size))
                       ?\s)
          size))
 
@@ -841,8 +844,11 @@
                                            name
                                          "mouse-2: select this buffer"))))
                  "  "
-               (if (> (length (nth 4 buffer)) Buffer-menu-mode-width)
-                   (substring (nth 4 buffer) 0 Buffer-menu-mode-width)
+               (if (> (string-width (nth 4 buffer)) Buffer-menu-mode-width)
+                   (truncate-string-to-width (nth 4 buffer)
+                                             Buffer-menu-mode-width
+                                             0
+                                             ?\s)
                  (nth 4 buffer)))
        (when (nth 5 buffer)
          (indent-to (+ Buffer-menu-buffer-column Buffer-menu-buffer+size-width