Luj/eat-emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Prefer 'and-let*' and 'when-let*' over 'when-let'

Browse source 
* eat.el (eat--t-set-sgr-params): Use 'and-let*' instead of 'when-let'
for side-effect free 'when-let'.
* eat.el (eat--flip-cursor-blink-state, eat--synchronize-scroll)
(eat-exec, eat--eshell-setup-proc-and-term)
(eat--eshell-synchronize-scroll, eat--eshell-visual-sentinel)
(eat--trace-replay-eval-next): Use 'when-let*' instead of 'when-let'
for 'when-let's with side-effect.
This commit is contained in:
Akib Azmain Turja 2022-11-28 23:22:52 +06:00
parent 2dd4e42773
commit a736f08ea9
No known key found for this signature in database
GPG key ID: 5535FCF54D88616B
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
eat.el
View file

@ -3349,7 +3349,7 @@ TOP defaults to 1 and BOTTOM defaults to the height of the display."
nil t))))) nil t)))))
;; Update face according to the attributes. ;; Update face according to the attributes.
(setf (eat--t-face-face face) (setf (eat--t-face-face face)
`(,@(when-let ((fg (or (if (eat--t-face-conceal face) `(,@(and-let* ((fg (or (if (eat--t-face-conceal face)
(eat--t-face-bg face) (eat--t-face-bg face)
(eat--t-face-fg face)) (eat--t-face-fg face))
(cond (cond
@ -3361,31 +3361,31 @@ TOP defaults to 1 and BOTTOM defaults to the height of the display."
:background :background
:foreground) :foreground)
fg)) fg))
,@(when-let ((bg (or (eat--t-face-bg face) ,@(and-let* ((bg (or (eat--t-face-bg face)
(and (eat--t-face-inverse face) (and (eat--t-face-inverse face)
(face-background 'default))))) (face-background 'default)))))
(list (if (eat--t-face-inverse face) (list (if (eat--t-face-inverse face)
:foreground :foreground
:background) :background)
bg)) bg))
,@(when-let ((underline (eat--t-face-underline face))) ,@(and-let* ((underline (eat--t-face-underline face)))
(list (list
:underline :underline
(list :color (eat--t-face-underline-color face) (list :color (eat--t-face-underline-color face)
:style underline))) :style underline)))
,@(when-let ((crossed (eat--t-face-crossed face))) ,@(and-let* ((crossed (eat--t-face-crossed face)))
;; REVIEW: How about colors? No terminal supports ;; REVIEW: How about colors? No terminal supports
;; crossed attribute with colors, so we'll need to be ;; crossed attribute with colors, so we'll need to be
;; creative to add the feature. ;; creative to add the feature.
`(:strike-through t)) `(:strike-through t))
:inherit :inherit
(,@(when-let ((intensity (eat--t-face-intensity face))) (,@(and-let* ((intensity (eat--t-face-intensity face)))
(list intensity)) (list intensity))
,@(when-let ((italic (eat--t-face-italic face))) ,@(and-let* ((italic (eat--t-face-italic face)))
(cl-assert (1value (eq (1value italic) (cl-assert (1value (eq (1value italic)
'eat-term-italic))) 'eat-term-italic)))
(list (1value italic))) (list (1value italic)))
,@(when-let ((blink (eat--t-face-blink face))) ,@(and-let* ((blink (eat--t-face-blink face)))
(list blink)) (list blink))
,(eat--t-face-font face)))))) ,(eat--t-face-font face))))))
@ -5041,7 +5041,7 @@ return \"eat-color\", otherwise return \"eat-mono\"."
(setq eat--cursor-blink-state (not eat--cursor-blink-state)) (setq eat--cursor-blink-state (not eat--cursor-blink-state))
;; REVIEW: This is expensive, and some causes flickering. Any ;; REVIEW: This is expensive, and some causes flickering. Any
;; better way? ;; better way?
(when-let ((window (get-buffer-window nil 'visible))) (when-let* ((window (get-buffer-window nil 'visible)))
(redraw-frame (window-frame window))))) (redraw-frame (window-frame window)))))
(defun eat--cursor-blink-stop-timers () (defun eat--cursor-blink-stop-timers ()
@ -5466,7 +5466,7 @@ selection, or nil if none."
(defun eat--synchronize-scroll () (defun eat--synchronize-scroll ()
"Synchronize scrolling and point between terminal and window." "Synchronize scrolling and point between terminal and window."
(when-let ((window (get-buffer-window (current-buffer)))) (when-let* ((window (get-buffer-window (current-buffer))))
(set-window-start (set-window-start
window (eat-term-display-beginning eat--terminal))) window (eat-term-display-beginning eat--terminal)))
(goto-char (eat-term-display-cursor eat--terminal))) (goto-char (eat-term-display-cursor eat--terminal)))
@ -5756,7 +5756,7 @@ same Eat buffer. The hook `eat-exec-hook' is run after each exec."
(insert "\n\n")) (insert "\n\n"))
(setq eat--terminal (eat-term-make buffer (point))) (setq eat--terminal (eat-term-make buffer (point)))
(eat-semi-char-mode) (eat-semi-char-mode)
(when-let ((window (get-buffer-window nil t))) (when-let* ((window (get-buffer-window nil t)))
(with-selected-window window (with-selected-window window
(eat-term-resize eat--terminal (window-max-chars-per-line) (eat-term-resize eat--terminal (window-max-chars-per-line)
(window-text-height)))) (window-text-height))))
@ -6020,7 +6020,7 @@ PROGRAM can be a shell command."
(eat-term-manipulate-selection-function eat--terminal) (eat-term-manipulate-selection-function eat--terminal)
#'eat--manipulate-kill-ring #'eat--manipulate-kill-ring
(eat-term-ring-bell-function eat--terminal) #'eat--bell) (eat-term-ring-bell-function eat--terminal) #'eat--bell)
(when-let ((window (get-buffer-window nil t))) (when-let* ((window (get-buffer-window nil t)))
(with-selected-window window (with-selected-window window
(eat-term-resize eat--terminal (window-max-chars-per-line) (eat-term-resize eat--terminal (window-max-chars-per-line)
(window-text-height)))) (window-text-height))))
@ -6150,7 +6150,7 @@ sane 2>%s ; if [ $1 = .. ]; then shift; fi; exec \"$@\""
(defun eat--eshell-synchronize-scroll () (defun eat--eshell-synchronize-scroll ()
"Synchronize scrolling and point between terminal and window." "Synchronize scrolling and point between terminal and window."
(when-let ((window (get-buffer-window (current-buffer)))) (when-let* ((window (get-buffer-window (current-buffer))))
(set-window-start (set-window-start
window window
(if (or (eat-term-in-alternative-display-p eat--terminal) (if (or (eat-term-in-alternative-display-p eat--terminal)
@ -6344,9 +6344,9 @@ MSG describes PROC's status."
(not (eq 'run (process-status proc))) (not (eq 'run (process-status proc)))
(= (process-exit-status proc) 0)) (= (process-exit-status proc) 0))
(if (eq (current-buffer) proc-buf) (if (eq (current-buffer) proc-buf)
(when-let ((buf (and (boundp 'eshell-parent-buffer) (when-let* ((buf (and (boundp 'eshell-parent-buffer)
(buffer-live-p eshell-parent-buffer) (buffer-live-p eshell-parent-buffer)
eshell-parent-buffer))) eshell-parent-buffer)))
(switch-to-buffer buf))) (switch-to-buffer buf)))
(kill-buffer proc-buf))))) (kill-buffer proc-buf)))))
@ -6749,7 +6749,7 @@ FN is the original definition of `eat--eshell-cleanup', which see."
(backward-list) (backward-list)
(move-overlay eat--trace-replay-current-sexp-overlay (move-overlay eat--trace-replay-current-sexp-overlay
(point) (point)) (point) (point))
(when-let ((window (get-buffer-window))) (when-let* ((window (get-buffer-window)))
(set-window-point window (point))) (set-window-point window (point)))
(with-current-buffer eat--trace-replay-buffer (with-current-buffer eat--trace-replay-buffer
(cl-incf eat--trace-replay-progress-frame) (cl-incf eat--trace-replay-progress-frame)