Merge pull request Malabarba#168 from lyro/master

Consider separators in computation of maximal mode width
phil-s · Jan 20, 2016 · 9002cb1 · 9002cb1
2 parents 25db875 + c0053cf
commit 9002cb1
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/smart-mode-line.el b/smart-mode-line.el
@@ -1520,11 +1520,15 @@ duplicated buffer names) from being displayed."
     (let* (;; The minor-mode-alist
            (nameList (rm--mode-list-as-string-list))
            ;; The size available
-           (size (if (member sml/mode-width '(full right))
-                     ;; Calculate how much width is available
-                     (sml/fill-width-available)
-                   ;; or use what the user requested.
-                   sml/mode-width))
+           (size (- (if (member sml/mode-width '(full right))
+                        ;; Calculate how much width is available
+                        (sml/fill-width-available)
+                      ;; or use what the user requested.
+                      sml/mode-width)
+                    (string-width (format-mode-line
+                                   'sml/pre-minor-modes-separator))
+                    (string-width (format-mode-line
+                                   'sml/pos-minor-modes-separator))))
            ;; Used for counting size.
            (finalNameList (mapconcat 'identity  nameList ""))
            needs-removing filling)
@@ -1546,11 +1550,7 @@ duplicated buffer names) from being displayed."
         (add-to-list 'nameList sml/propertized-shorten-mode-string t))
 
       ;; Padding
-      (setq filling (- size (length (format-mode-line
-                                     (list ""
-                                           'sml/pre-minor-modes-separator
-                                           nameList
-                                           'sml/pos-minor-modes-separator)))))
+      (setq filling (- size (length (format-mode-line nameList))))
       (setq filling (make-string (max 0 filling) sml/fill-char))
 
       (if (eq sml/mode-width 'right)