From 407771183e9d70b7e4b8ed9e2d773c9bc8e7af14 Mon Sep 17 00:00:00 2001 From: Case Duckworth Date: Thu, 29 Apr 2021 12:16:03 -0500 Subject: Massively refactor - Redefine as much as possible as `setup' forms - Reorganize into "Setup", "Basics", and "Packages" sections - Within each section, alphabetize sexps - Also (mostly) alphabetize acdw- files - (Not the ones that are almost completely others' code) - Sidebar: Why is this not a thing in elisp!? Should write a function - Break karthink's thing into another library `acdw-re' - Add a function to `acdw': `acdw/find-emacs-source' - Should refactor that to better find the source I think everything looks much more better now! --- lisp/acdw-modeline.el | 92 ++++++++++++++++++++++++--------------------------- 1 file changed, 44 insertions(+), 48 deletions(-) (limited to 'lisp/acdw-modeline.el') diff --git a/lisp/acdw-modeline.el b/lisp/acdw-modeline.el index c7b904f..79249bb 100644 --- a/lisp/acdw-modeline.el +++ b/lisp/acdw-modeline.el @@ -22,64 +22,60 @@ (require 'simple-modeline) (require 'minions) -;; modified from `simple-modeline' -(defun acdw-modeline/modified () - "Displays a color-coded buffer modification/read-only +(defun acdw-modeline/buffer-name () ; gonsie + (propertize " %b " + 'face + (if (buffer-modified-p) + 'font-lock-warning-face + 'font-lock-type-face) + 'help-echo (buffer-file-name))) + +(defun acdw-modeline/god-mode-indicator () + (when (bound-and-true-p god-local-mode) + " God")) + +(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))) + (if (not (string-match-p "\\*.*\\*" (buffer-name))) + (let* ((read-only (and buffer-read-only (buffer-file-name))) (modified (buffer-modified-p))) (propertize (if read-only " =" (if modified " +" " -")) '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 ")) + (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-1 + (lambda (event) + (interactive "e") + (with-selected-window + (posn-window (event-start event)) + (read-only-mode 'toggle))))) 'mouse-face 'mode-line-highlight)))) -;; all me, baby -(defun acdw-modeline/minions () - "Display a button for `minions-minor-modes-menu'." - (concat - " " - (propertize - "&" - 'help-echo (format - "Minor modes menu\nmouse-1: show menu.") - 'local-map (purecopy (simple-modeline-make-mouse-map - 'mouse-1 - (lambda (event) - (interactive "e") - (with-selected-window (posn-window - (event-start event)) - (minions-minor-modes-menu))))) - 'mouse-face 'mode-line-highlight))) +(defun acdw-modeline/minions () ; by me + "Display a button for `minions-minor-modes-menu'." + (concat + " " + (propertize + "&" + 'help-echo (format + "Minor modes menu\nmouse-1: show menu.") + 'local-map (purecopy (simple-modeline-make-mouse-map + 'mouse-1 + (lambda (event) + (interactive "e") + (with-selected-window (posn-window + (event-start event)) + (minions-minor-modes-menu))))) + 'mouse-face 'mode-line-highlight))) -;; from https://www.gonsie.com/blorg/modeline.html, from Doom (defun acdw-modeline/vc-branch () + ;; from https://www.gonsie.com/blorg/modeline.html, from Doom (if-let ((backend (vc-backend buffer-file-name))) - (substring vc-mode (+ (if (eq backend 'Hg) 2 3) 2)))) - -;; from gonsie -(defun acdw-modeline/buffer-name () - (propertize " %b " - 'face - (if (buffer-modified-p) - 'font-lock-warning-face - 'font-lock-type-face) - 'help-echo (buffer-file-name))) - -;; god-mode indicator -(defun acdw-modeline/god-mode-indicator () - (when (bound-and-true-p god-local-mode) - " God")) + (substring vc-mode (+ (if (eq backend 'Hg) 2 3) 2)))) (provide 'acdw-modeline) -- cgit 1.4.1-21-gabe81