1 files changed, 39 insertions, 33 deletions

@@ -33,13 +33,18 @@ Otherwise, cdr should be a function that takes two points (see `count-words')."
 
 (defun acdw-modeline/buffer-name ()     ; gonsie
   "Display the buffer name in a face reflecting its modified status."
-  (propertize (concat (format " %-20s" (truncate-string 20 (buffer-name) "~")))
-              'face 'bold
-              ;; (if (buffer-modified-p)
-              ;;     'font-lock-warning-face
-              ;;   'font-lock-type-face)
-              'help-echo (or (buffer-file-name)
-                             (buffer-name))))
+  (propertize
+   (concat
+    (format " %-20s"
+            (truncate-string 20
+                             (string-trim (buffer-name) "*" "*")
+                             "~")))
+   'face 'bold
+   ;; (if (buffer-modified-p)
+   ;;     'font-lock-warning-face
+   ;;   'font-lock-type-face)
+   'help-echo (or (buffer-file-name)
+                  (buffer-name))))
 
 (defun acdw-modeline/erc ()
   "ERC indicator for the modeline."
@@ -90,31 +95,32 @@ Otherwise, cdr should be a function that takes two points (see `count-words')."
 (defun acdw-modeline/modified ()        ; modified from `simple-modeline'
   "Displays a color-coded buffer modification/read-only
 indicator in the mode-line."
-  (if (not (string-match-p "\\*.*\\*" (buffer-name)))
-      (let* ((read-only (and buffer-read-only (buffer-file-name)))
-             (modified (buffer-modified-p)))
-        (propertize
-         (concat " "
-                 (cond
-                  ((derived-mode-p 'special-mode
-                                   'lui-mode)
-                   "~")
-                  (read-only "=")
-                  (modified "+")
-                  (t "-")))
-         'help-echo (format
-                     (concat "Buffer is %s and %smodified\n"
-                             "mouse-1: Toggle read-only status.")
-                     (if read-only "read-only" "writable")
-                     (if modified "" "not "))
-         'local-map (purecopy (simple-modeline-make-mouse-map
-                               'mouse-1
-                               (lambda (event)
-                                 (interactive "e")
-                                 (with-selected-window
-                                     (posn-window (event-start event))
-                                   (read-only-mode 'toggle)))))
-         'mouse-face 'mode-line-highlight))))
+  (let* ((read-only (and buffer-read-only (buffer-file-name)))
+         (modified (buffer-modified-p)))
+    (propertize
+     (concat " "
+             (cond
+              ((string-match-p "\\*.*\\*" (buffer-name))
+               "*")
+              ((derived-mode-p 'special-mode
+                               'lui-mode)
+               "~")
+              (read-only "=")
+              (modified "+")
+              (t "-")))
+     'help-echo (format
+                 (concat "Buffer is %s and %smodified\n"
+                         "mouse-1: Toggle read-only status.")
+                 (if read-only "read-only" "writable")
+                 (if modified "" "not "))
+     'local-map (purecopy (simple-modeline-make-mouse-map
+                           'mouse-1
+                           (lambda (event)
+                             (interactive "e")
+                             (with-selected-window
+                                 (posn-window (event-start event))
+                               (read-only-mode 'toggle)))))
+     'mouse-face 'mode-line-highlight)))
 
 (defun acdw-modeline/narrowed ()
   "Display an indication if the buffer is narrowed."
@@ -195,7 +201,7 @@ is, if point < mark."
 (defun acdw-modeline/wc ()
   "Display current `wc-buffer-stats'."
   (when (bound-and-true-p wc-mode)
-    (or wc-buffer-stats " [w]")))
+    (format "%8s" (or (cadr wc-buffer-stats) "[w]"))))
 
 (defun acdw-modeline/winum ()
   "Show the `winum' number of the current window in the modeline.