diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/modeline-config.el | 13 | ||||
| -rw-r--r-- | modules/nerd-icons-config.el | 12 | ||||
| -rw-r--r-- | modules/popper-config.el | 4 | ||||
| -rw-r--r-- | modules/ui-config.el | 41 |
4 files changed, 52 insertions, 18 deletions
diff --git a/modules/modeline-config.el b/modules/modeline-config.el index 771d960f..61ab0f9d 100644 --- a/modules/modeline-config.el +++ b/modules/modeline-config.el @@ -141,15 +141,20 @@ Uses built-in cached values for performance.") (defun cj/modeline-vc-fetch (file) "Fetch modeline VC data for FILE. -Return a plist with `:branch' and `:state', or nil when FILE has no VC data." +Return a plist with `:branch' and `:state', or nil when FILE has no VC data. +Uses `vc-git--symbolic-ref' for branch names when available (it returns the +symbolic ref like \"main\" instead of a SHA when HEAD is on a branch), but +falls back to `vc-working-revision' if the internal accessor is missing -- +the symbol is internal and can be renamed or removed between Emacs versions." (unless (and (file-remote-p file) (not cj/modeline-vc-show-remote)) (when-let* ((backend (vc-backend file)) (branch (vc-working-revision file backend))) (when (eq backend 'Git) (unless (fboundp 'vc-git--symbolic-ref) - (require 'vc-git)) - (when-let* ((symbolic (vc-git--symbolic-ref file))) - (setq branch symbolic))) + (require 'vc-git nil 'noerror)) + (when (fboundp 'vc-git--symbolic-ref) + (when-let* ((symbolic (ignore-errors (vc-git--symbolic-ref file)))) + (setq branch symbolic)))) (list :branch branch :state (vc-state file backend))))) diff --git a/modules/nerd-icons-config.el b/modules/nerd-icons-config.el index 4a8ce194..52a4627d 100644 --- a/modules/nerd-icons-config.el +++ b/modules/nerd-icons-config.el @@ -70,11 +70,21 @@ every call. The `memq' check skips when the face is already present." ;; ------------------------------- Packages ------------------------------------ (use-package nerd-icons - :demand t + :defer t :config (advice-add 'nerd-icons-icon-for-dir :filter-return #'cj/--nerd-icons-color-dir) (cj/nerd-icons-apply-tint)) +;; If nerd-icons is already loaded (e.g. when this module is re-evaluated +;; after a session in which a feature module already required it), the +;; `:config' block above won't fire again -- fall through to install the +;; advice and tint immediately. +(with-eval-after-load 'nerd-icons + (unless (advice-member-p #'cj/--nerd-icons-color-dir 'nerd-icons-icon-for-dir) + (advice-add 'nerd-icons-icon-for-dir + :filter-return #'cj/--nerd-icons-color-dir)) + (cj/nerd-icons-apply-tint)) + (use-package nerd-icons-completion :demand t :after (nerd-icons marginalia) diff --git a/modules/popper-config.el b/modules/popper-config.el index 359e789c..35780eb2 100644 --- a/modules/popper-config.el +++ b/modules/popper-config.el @@ -37,6 +37,10 @@ (side . bottom) (slot . 0) (window-height . 0.5))) ; Half the frame height + ;; Mode activation moves to :config so `:disabled t' actually + ;; disables it (`:init' runs even when `:disabled t', `:config' + ;; does not). + :config (popper-mode +1) (popper-echo-mode +1)) diff --git a/modules/ui-config.el b/modules/ui-config.el index 5d3a6643..39b86182 100644 --- a/modules/ui-config.el +++ b/modules/ui-config.el @@ -120,21 +120,36 @@ through to `read-only' and keeps the orange cursor." (defun cj/set-cursor-color-according-to-mode () "Change cursor color according to buffer state (modified, read-only, overwrite). -Only updates for real user buffers, not internal/temporary buffers." - ;; Only update cursor for real buffers (not internal ones like *temp*, *Echo Area*, etc.) - (unless (string-prefix-p " " (buffer-name)) ; Internal buffers start with space - (let ((color (alist-get (cj/--buffer-cursor-state) cj/buffer-status-colors))) - ;; Only skip if BOTH color AND buffer are the same (optimization) - ;; This allows color to update when buffer state changes - (unless (and (string= color cj/-cursor-last-color) - (string= (buffer-name) cj/-cursor-last-buffer)) - (set-cursor-color color) - (setq cj/-cursor-last-color color - cj/-cursor-last-buffer (buffer-name)))))) +Only updates for real user buffers, not internal/temporary buffers. +A no-op on non-graphical frames -- TTY/batch sessions have no cursor color +to set." + (when (display-graphic-p) + ;; Only update cursor for real buffers (not internal ones like *temp*, *Echo Area*, etc.) + (unless (string-prefix-p " " (buffer-name)) ; Internal buffers start with space + (let ((color (alist-get (cj/--buffer-cursor-state) cj/buffer-status-colors))) + ;; Only skip if BOTH color AND buffer are the same (optimization) + ;; This allows color to update when buffer state changes + (unless (and (string= color cj/-cursor-last-color) + (string= (buffer-name) cj/-cursor-last-buffer)) + (set-cursor-color color) + (setq cj/-cursor-last-color color + cj/-cursor-last-buffer (buffer-name))))))) ;; Use post-command-hook to update cursor color after every command -;; This ensures cursor color always matches the current buffer's state -(add-hook 'post-command-hook #'cj/set-cursor-color-according-to-mode) +;; This ensures cursor color always matches the current buffer's state. +;; The hook only registers under a graphical session so batch / TTY runs +;; don't pay per-command overhead for a no-op. +(when (display-graphic-p) + (add-hook 'post-command-hook #'cj/set-cursor-color-according-to-mode)) +;; Daemon mode: the first frame may be created after this module loads. +;; Re-attempt the hook install once a GUI frame appears. +(add-hook 'server-after-make-frame-hook + (lambda () + (when (and (display-graphic-p) + (not (memq #'cj/set-cursor-color-according-to-mode + post-command-hook))) + (add-hook 'post-command-hook + #'cj/set-cursor-color-according-to-mode)))) ;; Don’t show a cursor in non-selected windows: (setq cursor-in-non-selected-windows nil) |