Missed a merge area
This commit is contained in:
parent
9a808da2db
commit
52ca5dd236
1 changed files with 5 additions and 13 deletions
18
emacs/.emacs
18
emacs/.emacs
|
@ -139,25 +139,17 @@
|
||||||
(evil-mode 1)
|
(evil-mode 1)
|
||||||
(setq evil-ex-substitute-global t)
|
(setq evil-ex-substitute-global t)
|
||||||
(define-key evil-normal-state-map "/" 'swiper)
|
(define-key evil-normal-state-map "/" 'swiper)
|
||||||
<<<<<<< HEAD
|
(define-key evil-motion-state-map [down-mouse-1] 'silence)
|
||||||
(define-key evil-motion-state-map [down-mouse-1] 'silence)
|
(define-key evil-motion-state-map [mouse-1] 'silence)
|
||||||
(define-key evil-motion-state-map [mouse-1] 'silence)
|
(setq-default evil-cross-lines t))
|
||||||
(setq-default evil-cross-lines t))
|
|
||||||
=======
|
|
||||||
(setq-default evil-cross-lines t)
|
|
||||||
(define-key evil-insert-state-map (kbd "<up>") 'nope)
|
|
||||||
(define-key evil-insert-state-map (kbd "<left>") 'nope)
|
|
||||||
(define-key evil-insert-state-map (kbd "<right>") 'nope)
|
|
||||||
(define-key evil-insert-state-map (kbd "<down>") 'nope))
|
|
||||||
>>>>>>> 88de92aa599c6c9f35ce00728ce948fcd63e5682
|
|
||||||
|
|
||||||
;; Auto-Complete
|
;; Auto-Complete
|
||||||
(use-package auto-complete
|
(use-package auto-complete
|
||||||
:ensure t
|
:ensure t
|
||||||
:demand t
|
:demand t
|
||||||
:config (progn
|
:config (progn
|
||||||
(require 'auto-complete-config)
|
(require 'auto-complete-config)
|
||||||
(ac-config-default)))
|
(ac-config-default)))
|
||||||
|
|
||||||
;; ivy
|
;; ivy
|
||||||
(use-package ivy
|
(use-package ivy
|
||||||
|
|
Loading…
Reference in a new issue