From ca2c8b5a4592f129619afbaa6810f93538dc42fe Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 18 Jun 2018 15:02:24 +0200 Subject: [PATCH] Minor refactor, across the board Do you see the board? Now look at the other side. That's how far this refactor extends. Yes. --- core/autoload/debug.el | 2 +- core/autoload/help.el | 2 +- modules/feature/evil/config.el | 3 +-- modules/feature/file-templates/autoload.el | 2 +- modules/tools/magit/config.el | 8 +++++--- modules/ui/doom-modeline/config.el | 23 +++++++++++----------- modules/ui/neotree/config.el | 2 +- modules/ui/popup/autoload/popup.el | 8 -------- modules/ui/popup/config.el | 8 ++++++++ modules/ui/pretty-code/autoload.el | 2 +- 10 files changed, 31 insertions(+), 29 deletions(-) diff --git a/core/autoload/debug.el b/core/autoload/debug.el index a352ffc66..4e99faffe 100644 --- a/core/autoload/debug.el +++ b/core/autoload/debug.el @@ -275,7 +275,7 @@ If INIT-FILE is non-nil, profile that instead of USER-INIT-FILE." init-file esup-server-port esup-depth) - "--eval=(run-hooks 'after-init-hook 'emacs-startup-hook 'window-setup-hook)"))) + "--eval=(doom|run-all-startup-hooks)"))) (when esup-run-as-batch-p (setq process-args (append process-args '("--batch")))) (setq esup-child-process (apply #'start-process process-args))) diff --git a/core/autoload/help.el b/core/autoload/help.el index 3eae63701..b3e97d69d 100644 --- a/core/autoload/help.el +++ b/core/autoload/help.el @@ -232,7 +232,7 @@ live server (if one is found) to tell it to run this function. If called from an interactive session, tries to reload autoloads files (if necessary), reinistalize doom (via `doom-initialize') and reloads your private init.el and config.el. Then runs `doom-reload-hook'." - (interactive) + (interactive "P") (require 'core-dispatcher) (cond ((and noninteractive (not (daemonp))) (require 'server) diff --git a/modules/feature/evil/config.el b/modules/feature/evil/config.el index 3435a4fb0..e8d4b1297 100644 --- a/modules/feature/evil/config.el +++ b/modules/feature/evil/config.el @@ -89,8 +89,7 @@ variable for an explanation of the defaults (in comments). See (after! wgrep ;; A wrapper that invokes `wgrep-mark-deletion' across lines you use ;; `evil-delete' in wgrep buffers. - (define-key! wgrep-mode-map - [remap evil-delete] #'+evil-delete)) + (define-key wgrep-mode-map [remap evil-delete] #'+evil-delete)) ;; replace native folding commands (define-key! 'global diff --git a/modules/feature/file-templates/autoload.el b/modules/feature/file-templates/autoload.el index 43315b931..7109de471 100644 --- a/modules/feature/file-templates/autoload.el +++ b/modules/feature/file-templates/autoload.el @@ -27,7 +27,7 @@ these properties: ;;;###autodef (defun set-file-templates! (&rest templates) - "Like `doom--set:file-template', but register many file templates at once." + "Like `set-file-templates!', but register many file templates at once." (after! (:when (boundp '+file-templates-alist)) (setq +file-templates-alist (append (list templates) +file-templates-alist)))) diff --git a/modules/tools/magit/config.el b/modules/tools/magit/config.el index 739a346c6..84a55f4fb 100644 --- a/modules/tools/magit/config.el +++ b/modules/tools/magit/config.el @@ -56,7 +56,8 @@ load everything.") ;; more so. (advice-add #'magithub-settings--format-magithub.enabled :override #'+magit*hub-settings--format-magithub.enabled)) - (magithub-feature-autoinject +magit-hub-features)) + (when +magit-hub-features + (magithub-feature-autoinject +magit-hub-features))) (def-package! magit-gitflow @@ -66,8 +67,9 @@ load everything.") (def-package! evil-magit :when (featurep! :feature evil +everywhere) :after magit - :init (setq evil-magit-state 'normal - evil-magit-use-z-for-folds t) + :init + (setq evil-magit-state 'normal + evil-magit-use-z-for-folds t) :config (define-key! magit-mode-map (kbd "M-1") nil diff --git a/modules/ui/doom-modeline/config.el b/modules/ui/doom-modeline/config.el index 85aaaaf55..4fa65dda7 100644 --- a/modules/ui/doom-modeline/config.el +++ b/modules/ui/doom-modeline/config.el @@ -55,17 +55,18 @@ (add-hook 'window-configuration-change-hook #'+doom-modeline|set-selected-window) (add-hook 'doom-after-switch-window-hook #'+doom-modeline|set-selected-window) -(if (not (boundp 'after-focus-change-function)) - (progn - (add-hook 'focus-in-hook #'+doom-modeline|set-selected-window) - (add-hook 'focus-out-hook #'+doom-modeline|unset-selected-window)) - (defun +doom-modeline|refresh-frame () - (setq +doom-modeline-current-window nil) - (cl-loop for frame in (frame-list) - if (eq (frame-focus-state frame) t) - return (setq +doom-modeline-current-window (frame-selected-window frame))) - (force-mode-line-update)) - (add-function :after after-focus-change-function #'+doom-modeline|refresh-frame)) +(with-no-warnings + (if (not (boundp 'after-focus-change-function)) + (progn + (add-hook 'focus-in-hook #'+doom-modeline|set-selected-window) + (add-hook 'focus-out-hook #'+doom-modeline|unset-selected-window)) + (defun +doom-modeline|refresh-frame () + (setq +doom-modeline-current-window nil) + (cl-loop for frame in (frame-list) + if (eq (frame-focus-state frame) t) + return (setq +doom-modeline-current-window (frame-selected-window frame))) + (force-mode-line-update)) + (add-function :after after-focus-change-function #'+doom-modeline|refresh-frame))) ;; diff --git a/modules/ui/neotree/config.el b/modules/ui/neotree/config.el index b308ee247..07422fdab 100644 --- a/modules/ui/neotree/config.el +++ b/modules/ui/neotree/config.el @@ -40,7 +40,7 @@ :quit 'current :select t) (after! winner - (cl-pushnew neo-buffer-name winner-boring-buffers)) + (add-to-list 'winner-boring-buffers neo-buffer-name)) ;; The cursor always sits at bol. `+neotree*fix-cursor' and ;; `+neotree*indent-cursor' change that behavior, so that the cursor is always diff --git a/modules/ui/popup/autoload/popup.el b/modules/ui/popup/autoload/popup.el index 32a1f8457..b3ad9fdf2 100644 --- a/modules/ui/popup/autoload/popup.el +++ b/modules/ui/popup/autoload/popup.el @@ -1,13 +1,5 @@ ;;; ui/popup/autoload/popup.el -*- lexical-binding: t; -*- -(defvar +popup--populate-wparams (not EMACS26+)) -(defvar +popup--inhibit-transient nil) -(defvar +popup--inhibit-select nil) -(defvar +popup--old-display-buffer-alist nil) -(defvar +popup--remember-last t) -(defvar +popup--last nil) -(defvar-local +popup--timer nil) - (defun +popup--remember (windows) "Remember WINDOWS (a list of windows) for later restoration." (cl-assert (cl-every #'windowp windows) t) diff --git a/modules/ui/popup/config.el b/modules/ui/popup/config.el index 7e89c04df..966cc74f6 100644 --- a/modules/ui/popup/config.el +++ b/modules/ui/popup/config.el @@ -24,6 +24,14 @@ Modifying this has no effect, unless done before ui/popup loads.") "Size of the margins to give popup windows. Set this to nil to disable margin adjustment.") +(defvar +popup--populate-wparams (not EMACS26+)) +(defvar +popup--inhibit-transient nil) +(defvar +popup--inhibit-select nil) +(defvar +popup--old-display-buffer-alist nil) +(defvar +popup--remember-last t) +(defvar +popup--last nil) +(defvar-local +popup--timer nil) + ;; ;; Global modes diff --git a/modules/ui/pretty-code/autoload.el b/modules/ui/pretty-code/autoload.el index 46fe9a629..82be11ea2 100644 --- a/modules/ui/pretty-code/autoload.el +++ b/modules/ui/pretty-code/autoload.el @@ -289,7 +289,7 @@ Use the :iosevka property to enable (or disable) it regardless.") (tail (cdr l))) (cond ((not (consp l)) '()) ((not (consp tail)) (list head)) - ((cons head (cons nil (+pretty-code--icon-to-char tail))))))) + ((cons head (cons glue (+pretty-code--icon-to-char tail))))))) ;;;###autodef (defun set-pretty-symbols! (modes &rest plist)