[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:35:32

Index: buff-menu.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/buff-menu.el,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -b -r1.118 -r1.119
--- buff-menu.el        20 Nov 2008 15:22:19 -0000      1.118
+++ buff-menu.el        20 Nov 2008 15:35:32 -0000      1.119
@@ -596,26 +596,24 @@
   (interactive "P")
   (display-buffer (list-buffers-noselect files-only)))
 
+(defconst Buffer-menu-short-ellipsis (if (char-displayable-p ?…) "…" ":"))
+
 (defun Buffer-menu-buffer+size (name size &optional name-props size-props)
-  (if (> (+ (string-width name) (string-width size) 2) 
Buffer-menu-buffer+size-width)
+  (if (> (+ (string-width name) (string-width size) 2)
+         Buffer-menu-buffer+size-width)
       (setq name
+            (let ((tail
            (if (string-match "<[0-9]+>$" name)
-               (concat (truncate-string-to-width name
-                                                 (- 
Buffer-menu-buffer+size-width
-                                                    (max (string-width size) 3)
-                                                    (string-width 
(match-string 0))
-                                                    2)
-                                                 0
-                                                 ?\s)
-                       ":"             ; narrow ellipsis
-                       (match-string 0 name))
-             (concat (truncate-string-to-width name
+                       (match-string 0 name)
+                     "")))
+              (concat (truncate-string-to-width
+                       name
                                                (- Buffer-menu-buffer+size-width
                                                   (max (string-width size) 3)
-                                                  2)
-                                               0
-                                               ?\s)
-                     ":")))            ; narrow ellipsis
+                          (string-width tail)
+                          2))
+                      Buffer-menu-short-ellipsis
+                      tail)))
     ;; Don't put properties on (buffer-name).
     (setq name (copy-sequence name)))
   (add-text-properties 0 (length name) name-props name)
@@ -846,9 +844,7 @@
                "  "
                (if (> (string-width (nth 4 buffer)) Buffer-menu-mode-width)
                    (truncate-string-to-width (nth 4 buffer)
-                                             Buffer-menu-mode-width
-                                             0
-                                             ?\s)
+                                             Buffer-menu-mode-width)
                  (nth 4 buffer)))
        (when (nth 5 buffer)
          (indent-to (+ Buffer-menu-buffer-column Buffer-menu-buffer+size-width