github/doom-modeline
1
0
Fork 0
mirror of https://github.com/correl/doom-modeline.git synced 2024-11-27 11:09:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix when-let* for Emacs 25.

Browse source
This commit is contained in:
Vincent Zhang 2018-08-13 22:03:57 +08:00
parent 415140b368
commit 69e3f08d5b
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
doom-modeline.el
View file

@ -63,6 +63,12 @@
(require 'shrink-path) (require 'shrink-path)
(unless (>= emacs-major-version 26)
(with-no-warnings
;; if-let and when-let are deprecated in Emacs 26+ in favor of their
;; if-let* variants, so we alias them for 25 users.
(defalias 'when-let* #'when-let)))
;; ;;
;; Variables ;; Variables
;; ;;
@ -277,7 +283,7 @@ Example:
"Set the modeline format. Does nothing if the modeline KEY doesn't exist. "Set the modeline format. Does nothing if the modeline KEY doesn't exist.
If DEFAULT is non-nil, set the default mode-line for all buffers." If DEFAULT is non-nil, set the default mode-line for all buffers."
(let ((modeline (doom-modeline key))) (when-let* ((modeline (doom-modeline key)))
(setf (if default (setf (if default
(default-value 'mode-line-format) (default-value 'mode-line-format)
(buffer-local-value 'mode-line-format (current-buffer))) (buffer-local-value 'mode-line-format (current-buffer)))
@ -353,7 +359,7 @@ If STRICT-P, return nil if no project was found, otherwise return
(defvar doom-modeline-current-window (frame-selected-window)) (defvar doom-modeline-current-window (frame-selected-window))
(defun doom-modeline-set-selected-window (&rest _) (defun doom-modeline-set-selected-window (&rest _)
"Set `doom-modeline-current-window' appropriately." "Set `doom-modeline-current-window' appropriately."
(let ((win (frame-selected-window))) (when-let* ((win (frame-selected-window)))
(unless (minibuffer-window-active-p win) (unless (minibuffer-window-active-p win)
(setq doom-modeline-current-window win) (setq doom-modeline-current-window win)
(force-mode-line-update)))) (force-mode-line-update))))