branch: elpa/auto-dim-other-buffers
commit ec74b4803adeadf06296c84595fb6ccf4e1b4a3f
Author: Michal Nazarewicz <[email protected]>
Commit: Michal Nazarewicz <[email protected]>
Split ‘adob--dim-buffer’ into two no-argument functions
The resulting two functios are much easier to read and removel of the
argument complicated only one call site so this is overall a positive
change.
---
auto-dim-other-buffers.el | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/auto-dim-other-buffers.el b/auto-dim-other-buffers.el
index 3c864c1002..44e860c892 100644
--- a/auto-dim-other-buffers.el
+++ b/auto-dim-other-buffers.el
@@ -82,16 +82,18 @@ Currently only mini buffer and echo areas are ignored."
(defvar-local adob--face-mode-remapping nil
"Current remapping cookie for `auto-dim-other-buffers-mode'.")
-(defun adob--dim-buffer (dim)
- "Dim (if DIM is non-nil) or undim (otherwise) current buffer."
- (when (cond ((and dim (not adob--face-mode-remapping))
- (setq adob--face-mode-remapping
- (face-remap-add-relative 'default
- 'auto-dim-other-buffers-face)))
- ((and (not dim) adob--face-mode-remapping)
- (face-remap-remove-relative adob--face-mode-remapping)
- (setq adob--face-mode-remapping nil)
- t))
+(defun adob--dim-buffer ()
+ "Dim current buffer if not already dimmed."
+ (when (not adob--face-mode-remapping)
+ (setq adob--face-mode-remapping
+ (face-remap-add-relative 'default 'auto-dim-other-buffers-face))
+ (force-window-update (current-buffer))))
+
+(defun adob--undim-buffer ()
+ "Undim current buffer if dimmed."
+ (when adob--face-mode-remapping
+ (face-remap-remove-relative adob--face-mode-remapping)
+ (setq adob--face-mode-remapping nil)
(force-window-update (current-buffer))))
(defun adob--buffer-list-update-hook ()
@@ -107,10 +109,10 @@ Currently only mini buffer and echo areas are ignored."
(and (buffer-live-p adob--last-buffer)
(not (adob--never-dim-p adob--last-buffer))
(with-current-buffer adob--last-buffer
- (adob--dim-buffer t)))
+ (adob--dim-buffer)))
;; Undim the new buffer.
(with-current-buffer buf
- (adob--dim-buffer nil))
+ (adob--undim-buffer))
(setq adob--last-buffer buf))))
(defun adob--focus-out-hook ()
@@ -121,7 +123,7 @@ Currently only mini buffer and echo areas are ignored."
(defun adob--focus-in-hook ()
"Undim current buffers if `auto-dim-other-buffers-dim-on-focus-out'."
(when auto-dim-other-buffers-dim-on-focus-out
- (adob--dim-buffer nil)
+ (adob--undim-buffer)
(setq adob--last-buffer (current-buffer))))
(defun adob--dim-all-buffers (dim)
@@ -132,7 +134,7 @@ function."
(dolist (buffer (buffer-list))
(unless (adob--never-dim-p buffer)
(set-buffer buffer)
- (adob--dim-buffer dim)))))
+ (if dim (adob--dim-buffer) (adob--undim-buffer))))))
(defun adob--hooks (callback)
"Add (if CALLBACK is `add-hook') or remove (if `remove-hook') adob hooks."
