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

Clean up

Browse source
This commit is contained in:
Henrik Lissner 2015-09-29 03:06:06 -04:00
parent 3c408dec4d
commit 99375cf001
3 changed files with 11 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/core-defuns.el
View file

@ -126,8 +126,7 @@ Examples:
("e" . emacs) ("e" . emacs)
("o" . operator) ("o" . operator)
("m" . motion) ("m" . motion)
("r" . replace) ("r" . replace))))
("I" . iedit))))
(unless keymaps (unless keymaps
(setq keymaps default-keymaps)) (setq keymaps default-keymaps))
(while rest (while rest
@ -178,12 +177,9 @@ Examples:
out-forms) out-forms)
(dolist (keymap keymaps) (dolist (keymap keymaps)
(if (not states) (if (not states)
;; (add-to-list 'out-forms `(define-key ,keymap ,key ,def) t)
(add-to-list 'out-forms `(evil-define-key nil ,keymap ,key ,def) t) (add-to-list 'out-forms `(evil-define-key nil ,keymap ,key ,def) t)
(dolist (state states) (dolist (state states)
(add-to-list 'out-forms `(evil-define-key ',state ,keymap ,key ,def) t)))) (add-to-list 'out-forms `(evil-define-key ',state ,keymap ,key ,def) t))))
;; (add-to-list 'out-forms `(define-key (evil-get-auxiliary-keymap ,keymap ',state) ,key ,def) t))))
(setq prefix (if (eq first-key :prefix) first-value)) (setq prefix (if (eq first-key :prefix) first-value))
(setq keymaps (if (eq first-key :map) first-value default-keymaps)) (setq keymaps (if (eq first-key :map) first-value default-keymaps))
(setq states '()) (setq states '())

22
core/core-evil.el
View file

@ -105,13 +105,13 @@ See https://bitbucket.org/lyro/evil/issue/527"
:functions (iedit-current-occurrence-string iedit-restrict-region) :functions (iedit-current-occurrence-string iedit-restrict-region)
:commands (evil-iedit-state evil-iedit-state/iedit-mode) :commands (evil-iedit-state evil-iedit-state/iedit-mode)
:config :config
(bind! ; Don't interfere with evil-snipe (bind! :map evil-iedit-state-map ; Don't interfere with evil-snipe
:I :unset "s" "s" nil
:I :unset "S" "S" nil
:I "V" 'evil-visual-line "V" 'evil-visual-line
:I "C" 'evil-iedit-state/substitute ; instead of s/S "C" 'evil-iedit-state/substitute ; instead of s/S
:I "za" 'iedit-toggle-unmatched-lines-visible "za" 'iedit-toggle-unmatched-lines-visible)
:v "SPC" 'narf:iedit-restrict-to-region)) (bind! :v "SPC" 'narf:iedit-restrict-to-region))
(use-package evil-indent-textobject (use-package evil-indent-textobject
:commands (evil-indent-i-indent :commands (evil-indent-i-indent
@ -190,12 +190,8 @@ See https://bitbucket.org/lyro/evil/issue/527"
(evil-space-setup "?" "N" "n") (evil-space-setup "?" "N" "n")
(after! evil-snipe (after! evil-snipe
(evil-space-setup 'evil-snipe-f 'evil-snipe-repeat 'evil-snipe-repeat-reverse) (mapc (lambda (x) (evil-space-setup x 'evil-snipe-repeat 'evil-snipe-repeat-reverse))
(evil-space-setup 'evil-snipe-F 'evil-snipe-repeat 'evil-snipe-repeat-reverse) '(evil-snipe-f evil-snipe-F evil-snipe-t evil-snipe-T evil-snipe-s evil-snipe-S)))
(evil-space-setup 'evil-snipe-t 'evil-snipe-repeat 'evil-snipe-repeat-reverse)
(evil-space-setup 'evil-snipe-T 'evil-snipe-repeat 'evil-snipe-repeat-reverse)
(evil-space-setup 'evil-snipe-s 'evil-snipe-repeat 'evil-snipe-repeat-reverse)
(evil-space-setup 'evil-snipe-S 'evil-snipe-repeat 'evil-snipe-repeat-reverse))
(after! evil-visualstar (after! evil-visualstar
(evil-space-setup 'evil-visualstar/begin-search-forward "n" "N") (evil-space-setup 'evil-visualstar/begin-search-forward "n" "N")

2
core/core-ui.el
View file

@ -115,7 +115,7 @@
path))) path)))
(powerline-buffer-id))) (powerline-buffer-id)))
(if (buffer-modified-p) (if (buffer-modified-p)
(propertize "*" 'font-lock-face '(:inherit other-face :foreground "orange"))) (propertize "*" 'font-lock-face `(:inherit ,other-face :foreground "orange")))
" ") " ")
:tight-right t) :tight-right t)