From 3a23ff56cd054d744fe1df5e11a9f466cfb59f65 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 2 Sep 2018 17:18:31 +0200 Subject: [PATCH] General formatting & minor refactors --- core/core-editor.el | 4 +++- core/core-os.el | 3 +-- core/core-ui.el | 3 ++- modules/lang/elixir/config.el | 4 ++-- modules/lang/javascript/config.el | 22 +++++++++++----------- modules/tools/magit/config.el | 2 +- modules/ui/modeline/config.el | 6 ++---- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/core/core-editor.el b/core/core-editor.el index 5e9a68459..6151c7c46 100644 --- a/core/core-editor.el +++ b/core/core-editor.el @@ -297,7 +297,9 @@ savehist file." (def-package! ws-butler :after-call (after-find-file) :config - (nconc ws-butler-global-exempt-modes '(special-mode comint-mode term-mode eshell-mode)) + (setq ws-butler-global-exempt-modes + (append ws-butler-global-exempt-modes + '(special-mode comint-mode term-mode eshell-mode))) (ws-butler-global-mode)) (provide 'core-editor) diff --git a/core/core-os.el b/core/core-os.el index 9e1178496..e0723f6a7 100644 --- a/core/core-os.el +++ b/core/core-os.el @@ -8,8 +8,7 @@ ;; stop copying each visual state move to the clipboard: ;; https://bitbucket.org/lyro/evil/issue/336/osx-visual-state-copies-the-region-on -;; Most of this code grokked from: -;; http://stackoverflow.com/questions/15873346/elisp-rename-macro +;; grokked from: http://stackoverflow.com/questions/15873346/elisp-rename-macro (advice-add #'evil-visual-update-x-selection :override #'ignore) (defmacro set-env! (&rest _vars) diff --git a/core/core-ui.el b/core/core-ui.el index 0672d744c..4015c6d67 100644 --- a/core/core-ui.el +++ b/core/core-ui.el @@ -372,7 +372,8 @@ frame's window-system, the theme will be reloaded.") ;; frames, however. There's always `doom/reload-theme' if you need it! (defun doom|reload-theme-in-frame-maybe (frame) "Reloads the theme in new daemon or tty frames." - (when (and (framep frame) + (when (and doom-theme + (framep frame) (not (eq doom-last-window-system (framep-on-display frame)))) (with-selected-frame frame (load-theme doom-theme t)) diff --git a/modules/lang/elixir/config.el b/modules/lang/elixir/config.el index 5f90a772e..cfa23f7b0 100644 --- a/modules/lang/elixir/config.el +++ b/modules/lang/elixir/config.el @@ -22,8 +22,8 @@ :init (set-company-backend! 'elixir-mode '(alchemist-company company-yasnippet)) :config - ;; Alchemist doesn't use hook symbols to add these backends, so we have to use - ;; the entire closure to get rid of it. + ;; Alchemist doesn't use hook symbols to add these backends, so we have to + ;; use the entire closure to get rid of it. (let ((fn (byte-compile (lambda () (add-to-list (make-local-variable 'company-backends) 'alchemist-company))))) (remove-hook 'alchemist-mode-hook fn) (remove-hook 'alchemist-iex-mode-hook fn))) diff --git a/modules/lang/javascript/config.el b/modules/lang/javascript/config.el index 043c0840c..794822161 100644 --- a/modules/lang/javascript/config.el +++ b/modules/lang/javascript/config.el @@ -249,17 +249,17 @@ :n "se" #'skewer-html-eval-tag)) ;; `npm-mode' -(map! (:after npm-mode - :map npm-mode-keymap - :localleader - :n "nn" #'npm-mode-npm-init - :n "ni" #'npm-mode-npm-install - :n "ns" #'npm-mode-npm-install-save - :n "nd" #'npm-mode-npm-install-save-dev - :n "nu" #'npm-mode-npm-uninstall - :n "nl" #'npm-mode-npm-list - :n "nr" #'npm-mode-npm-run - :n "nv" #'npm-mode-visit-project-file)) +(map! :after npm-mode + :map npm-mode-keymap + :localleader + :n "nn" #'npm-mode-npm-init + :n "ni" #'npm-mode-npm-install + :n "ns" #'npm-mode-npm-install-save + :n "nd" #'npm-mode-npm-install-save-dev + :n "nu" #'npm-mode-npm-uninstall + :n "nl" #'npm-mode-npm-list + :n "nr" #'npm-mode-npm-run + :n "nv" #'npm-mode-visit-project-file) ;; ;; Projects diff --git a/modules/tools/magit/config.el b/modules/tools/magit/config.el index a9930cb7b..fe0d4d1e4 100644 --- a/modules/tools/magit/config.el +++ b/modules/tools/magit/config.el @@ -87,7 +87,7 @@ available.") (setq evil-magit-state 'normal evil-magit-use-z-for-folds t) :config - (define-key! magit-mode-map + (define-key! magit-mode-map ; replaced by z1, z2, z3, etc (kbd "M-1") nil (kbd "M-2") nil (kbd "M-3") nil diff --git a/modules/ui/modeline/config.el b/modules/ui/modeline/config.el index 7f80e329d..955b84af4 100644 --- a/modules/ui/modeline/config.el +++ b/modules/ui/modeline/config.el @@ -249,7 +249,7 @@ Currently available functions: concat (if (eq idx len) "\"};" "\",\n"))) 'xpm t :ascent 'center))))) -(defun +modeline-build-path (&optional path) +(defun +modeline-build-path (path) "Construct the file path for the `+modeline-buffer-id' segment using `+mdoeline-buffer-path-function'. If the buffer has no `buffer-file-name', just use `buffer-name'." @@ -433,9 +433,7 @@ Meant for `+modeline-buffer-path-function'." :on-hooks (find-file-hook after-save-hook after-revert-hook) :init (propertize "%b" 'face 'doom-modeline-buffer-file) :faces t - (if buffer-file-name - (+modeline-build-path (buffer-file-name (buffer-base-buffer))) - (propertize "%b" 'face 'doom-modeline-buffer-file))) + (+modeline-build-path (buffer-file-name (buffer-base-buffer)))) (def-modeline-segment! +modeline-buffer-directory (let ((face (if (active) 'doom-modeline-buffer-path)))