diff --git a/core/core-ui.el b/core/core-ui.el index 37e10dc04..d653e1140 100644 --- a/core/core-ui.el +++ b/core/core-ui.el @@ -95,14 +95,13 @@ behavior). Do not set this directly, this is let-bound in `doom|init-theme'.") (setq doom--last-window (selected-window))))) (defun doom|run-switch-frame-hooks (&rest _) - (let ((selected-frame (selected-frame))) - (unless (or doom-inhibit-switch-frame-hooks - (eq doom--last-frame (selected-frame)) - (frame-parameter nil 'parent-frame)) - (let ((doom-inhibit-switch-frame-hooks t)) - (run-hooks 'doom-switch-frame-hook) - (doom-log "Frame switched to %s" (selected-frame)) - (setq doom--last-frame (selected-frame)))))) + (unless (or doom-inhibit-switch-frame-hooks + (eq doom--last-frame (selected-frame)) + (frame-parameter nil 'parent-frame)) + (let ((doom-inhibit-switch-frame-hooks t)) + (run-hooks 'doom-switch-frame-hook) + (doom-log "Frame switched to %s" (selected-frame)) + (setq doom--last-frame (selected-frame))))) (defun doom*run-switch-buffer-hooks (orig-fn buffer-or-name &rest args) (if (or doom-inhibit-switch-buffer-hooks diff --git a/modules/completion/ivy/autoload/ivy.el b/modules/completion/ivy/autoload/ivy.el index c05856ea0..25c61be66 100644 --- a/modules/completion/ivy/autoload/ivy.el +++ b/modules/completion/ivy/autoload/ivy.el @@ -303,8 +303,8 @@ order. (projectile-project-name)) ((file-relative-name directory project-root)))))) (require 'counsel) - (let ((counsel-more-chars-alist - (if query '((t . 1)) counsel-more-chars-alist))) + (let ((ivy-more-chars-alist + (if query '((t . 1)) ivy-more-chars-alist))) (pcase engine ('grep (let ((args (if recursive " -R")) diff --git a/modules/completion/ivy/config.el b/modules/completion/ivy/config.el index 7b9a11898..4bc511fed 100644 --- a/modules/completion/ivy/config.el +++ b/modules/completion/ivy/config.el @@ -89,7 +89,7 @@ immediately runs it on the current candidate (ending the ivy session)." counsel-projectile-switch-to-buffer)) (ivy-set-display-transformer cmd 'ivy-rich--ivy-switch-buffer-transformer)) ;; Use `+ivy-rich-buffer-name' to display buffer names - (let* ((plist (plist-get ivy-rich--display-transformers-list 'ivy-switch-buffer)) + (let* ((plist (plist-get ivy-rich-display-transformers-list 'ivy-switch-buffer)) (colplist (plist-get plist :columns)) (switch-buffer-alist (assq 'ivy-rich-candidate colplist))) (when switch-buffer-alist diff --git a/modules/feature/lookup/autoload/lookup.el b/modules/feature/lookup/autoload/lookup.el index 4a6c2c9b1..888a04a65 100644 --- a/modules/feature/lookup/autoload/lookup.el +++ b/modules/feature/lookup/autoload/lookup.el @@ -135,7 +135,7 @@ Otherwise, these properties are available to be set: (defun +lookup--jump-to (prop identifier &optional other-window) (let ((ret - (condition-case e + (condition-case _ (run-hook-wrapped (plist-get (list :definition '+lookup-definition-functions :references '+lookup-references-functions @@ -198,7 +198,7 @@ falling back to git-grep)." (+helm-file-search nil :query query) t)))))) -(defun +lookup-evil-goto-definition-backend (identifier) +(defun +lookup-evil-goto-definition-backend (_identifier) "Uses `evil-goto-definition' to conduct a text search for IDENTIFIER in the current buffer." (and (fboundp 'evil-goto-definition) @@ -272,7 +272,7 @@ search otherwise." ((error "Couldn't find references of '%s'" identifier)))) ;;;###autoload -(defun +lookup/documentation (identifier &optional arg) +(defun +lookup/documentation (identifier &optional _arg) "Show documentation for IDENTIFIER (defaults to symbol at point or selection. First attempts the :documentation handler specified with `set-lookup-handlers!'