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

Merge pull request #3825 from JakDar/develop

Browse source 
If +flyspell enabled, disable spell-fu keybindings and use flyspell ones
This commit is contained in:
Henrik Lissner 2020-08-24 22:26:03 -04:00 • committed by GitHub
commit 04057aec0c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -279,8 +279,10 @@
(:when (featurep! :lang org +present) (:when (featurep! :lang org +present)
:desc "org-tree-slide mode" "p" #'org-tree-slide-mode) :desc "org-tree-slide mode" "p" #'org-tree-slide-mode)
:desc "Read-only mode" "r" #'read-only-mode :desc "Read-only mode" "r" #'read-only-mode
(:when (featurep! :checkers spell) (:when (and (featurep! :checkers spell) (not (featurep! :checkers spell +flyspell)))
:desc "Spell checker" "s" #'spell-fu-mode) :desc "Spell checker" "s" #'spell-fu-mode)
(:when (featurep! :checkers spell +flyspell)
:desc "Spell checker" "s" #'flyspell-mode)
(:when (featurep! :lang org +pomodoro) (:when (featurep! :lang org +pomodoro)
:desc "Pomodoro timer" "t" #'org-pomodoro) :desc "Pomodoro timer" "t" #'org-pomodoro)
(:when (featurep! :ui zen) (:when (featurep! :ui zen)

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

@ -661,8 +661,10 @@
(:when (featurep! :lang org +present) (:when (featurep! :lang org +present)
:desc "org-tree-slide mode" "p" #'org-tree-slide-mode) :desc "org-tree-slide mode" "p" #'org-tree-slide-mode)
:desc "Read-only mode" "r" #'read-only-mode :desc "Read-only mode" "r" #'read-only-mode
(:when (featurep! :checkers spell) (:when (and (featurep! :checkers spell) (not (featurep! :checkers spell +flyspell)))
:desc "Spell checker" "s" #'spell-fu-mode) :desc "Spell checker" "s" #'spell-fu-mode)
(:when (featurep! :checkers spell +flyspell)
:desc "Spell checker" "s" #'flyspell-mode)
(:when (featurep! :lang org +pomodoro) (:when (featurep! :lang org +pomodoro)
:desc "Pomodoro timer" "t" #'org-pomodoro) :desc "Pomodoro timer" "t" #'org-pomodoro)
:desc "Soft line wrapping" "w" #'visual-line-mode :desc "Soft line wrapping" "w" #'visual-line-mode

10
modules/editor/evil/config.el
View file

@ -382,10 +382,12 @@ directives. By default, this only recognizes C directives.")
;; implement dictionary keybinds ;; implement dictionary keybinds
;; evil already defines 'z=' to `ispell-word' = correct word at point ;; evil already defines 'z=' to `ispell-word' = correct word at point
:n "zq" #'spell-fu-word-add (:when (not (featurep! :checkers spell +flyspell))
:n "zw" #'spell-fu-word-remove :n "zq" #'spell-fu-word-add
:m "[s" #'spell-fu-goto-previous-error :n "zw" #'spell-fu-word-remove
:m "]s" #'spell-fu-goto-next-error :m "[s" #'spell-fu-goto-previous-error
:m "]s" #'spell-fu-goto-next-error
)
;; ported from vim-unimpaired ;; ported from vim-unimpaired
:n "] SPC" #'+evil/insert-newline-below :n "] SPC" #'+evil/insert-newline-below