emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

General reformatting & minor refactors

Browse source
This commit is contained in:
Henrik Lissner 2019-02-19 15:03:14 -05:00
parent 43975d3cd4
commit c82faf7f10
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
5 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/autoload/packages.el
View file

@ -372,7 +372,7 @@ package.el as appropriate."
(cl-check-type name symbol) (cl-check-type name symbol)
(doom-initialize-packages) (doom-initialize-packages)
(unless (package-installed-p name) (unless (package-installed-p name)
(user-error "%s isn't installed" name)) (error "%s isn't installed" name))
(when (doom-package-different-backend-p name) (when (doom-package-different-backend-p name)
(user-error "%s's backend has changed and must be uninstalled first" name)) (user-error "%s's backend has changed and must be uninstalled first" name))
(when (or force-p (doom-package-outdated-p name)) (when (or force-p (doom-package-outdated-p name))

4
core/core-keybinds.el
View file

@ -76,14 +76,14 @@ If any hook returns non-nil, all hooks after it are ignored.")
(after! evil (after! evil
(defmacro define-leader-key! (&rest args) (defmacro define-leader-key! (&rest args)
`(general-define-key `(general-define-key
:states '(normal visual motion insert emacs) :states '(normal visual motion emacs)
:keymaps 'doom-leader-map :keymaps 'doom-leader-map
:prefix doom-leader-key :prefix doom-leader-key
:non-normal-prefix doom-leader-alt-key :non-normal-prefix doom-leader-alt-key
,@args)) ,@args))
(general-create-definer define-localleader-key! (general-create-definer define-localleader-key!
:states '(normal visual motion insert emacs) :states '(normal visual motion emacs)
:major-modes t :major-modes t
:wk-full-keys nil :wk-full-keys nil
:prefix doom-localleader-key :prefix doom-localleader-key

2
core/core-ui.el
View file

@ -251,7 +251,7 @@ behavior). Do not set this directly, this is let-bound in `doom|init-theme'.")
(setq whitespace-line-column nil (setq whitespace-line-column nil
whitespace-style whitespace-style
'(face indentation tabs tab-mark spaces space-mark newline newline-mark '(face indentation tabs tab-mark spaces space-mark newline newline-mark
trailing lines-tail) trailing lines-tail)
whitespace-display-mappings whitespace-display-mappings
'((tab-mark ?\t [?› ?\t]) '((tab-mark ?\t [?› ?\t])
(newline-mark ?\n [?¬ ?\n]) (newline-mark ?\n [?¬ ?\n])

2
modules/lang/data/config.el
View file

@ -27,7 +27,7 @@
:mode "\\.gql\\'") :mode "\\.gql\\'")
(def-package! json-mode (def-package! json-mode
:mode "\\.js\\(?:on\\|[hl]int\\(rc\\)?\\)\\'" :mode "\\.js\\(?:on\\|[hl]int\\(?:rc\\)?\\)\\'"
:config :config
(set-electric! 'json-mode :chars '(?\n ?: ?{ ?}))) (set-electric! 'json-mode :chars '(?\n ?: ?{ ?})))

4
modules/ui/window-select/config.el
View file

@ -4,7 +4,7 @@
:when (featurep! +switch-window) :when (featurep! +switch-window)
:defer t :defer t
:init :init
(define-key global-map [remap other-window] #'switch-window) (global-set-key [remap other-window] #'switch-window)
:config :config
(setq switch-window-shortcut-style 'qwerty (setq switch-window-shortcut-style 'qwerty
switch-window-qwerty-shortcuts '("a" "s" "d" "f" "g" "h" "j" "k" "l"))) switch-window-qwerty-shortcuts '("a" "s" "d" "f" "g" "h" "j" "k" "l")))
@ -14,7 +14,7 @@
:unless (featurep! +switch-window) :unless (featurep! +switch-window)
:defer t :defer t
:init :init
(define-key global-map [remap other-window] #'ace-window) (global-set-key [remap other-window] #'ace-window)
:config :config
(setq aw-keys '(?a ?s ?d ?f ?g ?h ?j ?k ?l) (setq aw-keys '(?a ?s ?d ?f ?g ?h ?j ?k ?l)
aw-scope 'frame aw-scope 'frame