madmaurice/configfiles
1
1
Fork 0
Code Issues Pull requests Releases Wiki Activity

Missed a merge area

Browse source
This commit is contained in:
madmaurice 2017-06-15 14:33:58 +02:00
parent 9a808da2db
commit 52ca5dd236
1 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
emacs/.emacs
View file

@ -139,25 +139,17 @@
(evil-mode 1)
(setq evil-ex-substitute-global t)
(define-key evil-normal-state-map "/" 'swiper)
<<<<<<< HEAD
(define-key evil-motion-state-map [down-mouse-1] 'silence)
(define-key evil-motion-state-map [mouse-1] 'silence)
(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
(define-key evil-motion-state-map [down-mouse-1] 'silence)
(define-key evil-motion-state-map [mouse-1] 'silence)
(setq-default evil-cross-lines t))
;; Auto-Complete
(use-package auto-complete
:ensure t
:demand t
:config (progn
(require 'auto-complete-config)
(ac-config-default)))
(require 'auto-complete-config)
(ac-config-default)))
;; ivy
(use-package ivy