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

Merge pull request #1734 from JakDar/fix/add-add-featurep-condition-to-global-bindings

Browse source 
Fix/add featurep condition to global keybindings
This commit is contained in:
Henrik Lissner 2019-10-03 14:57:52 -04:00 • committed by GitHub
commit bc9eebe367
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
modules/config/default/+emacs-bindings.el
View file

@ -369,9 +369,10 @@
"P" #'neotree-select-previous-sibling-node))
;;; popups
"C-x p" #'+popup/other
"C-`" #'+popup/toggle
"C-~" #'+popup/raise
(:when (featurep! :ui popup)
"C-x p" #'+popup/other
"C-`" #'+popup/toggle
"C-~" #'+popup/raise)
;;; repl
"C-c C-z" #'+eval/open-repl-other-window

17
modules/config/default/+evil-bindings.el
View file

@ -521,7 +521,8 @@
:desc "window" "w" evil-window-map
:desc "help" "h" help-map
:desc "Toggle last popup" "~" #'+popup/toggle
(:when (featurep! :ui popup)
:desc "Toggle last popup" "~" #'+popup/toggle)
:desc "Find file" "." #'find-file
:desc "Switch buffer" "," #'switch-to-buffer
@ -619,8 +620,7 @@
(:when (featurep! :tools flycheck)
:desc "List errors" "x" #'flycheck-list-errors)
(:unless (featurep! :tools flycheck)
:desc "List errors" "x" #'flymake-show-diagnostics-buffer)
)
:desc "List errors" "x" #'flymake-show-diagnostics-buffer))
;;; <leader> f --- file
(:prefix-map ("f" . "file")
@ -832,12 +832,17 @@
:desc "Flymake" "f" #'flymake-mode)
:desc "Frame fullscreen" "F" #'toggle-frame-fullscreen
:desc "Evil goggles" "g" #'evil-goggles-mode
:desc "Indent guides" "i" #'highlight-indent-guides-mode
:desc "Indent style" "I" #'doom/toggle-indent-style
:desc "Line numbers" "l" #'doom/toggle-line-numbers
:desc "Word-wrap mode" "w" #'+word-wrap-mode
:desc "org-tree-slide mode" "p" #'+org-present/start
:desc "Flyspell" "s" #'flyspell-mode))
(:when (featurep! :lang org +present)
:desc "org-tree-slide mode" "p" #'+org-present/start)
(:when (featurep! :tools flycheck)
:desc "Flycheck" "f" #'flycheck-mode)
(:when (featurep! :tools flyspell)
:desc "Flyspell" "s" #'flyspell-mode)
(:when (featurep! :ui indent-guides)
:desc "Indent guides" "i" #'highlight-indent-guides-mode)))
;;