From c9cacdf23c4f2012d13ab0aaa1d426bb457f98c0 Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Sun, 26 Jul 2015 22:00:20 +0200 Subject: Remove evil settings --- emacs/.emacs.d/Cask | 3 --- emacs/.emacs.d/init.el | 47 ----------------------------------------------- 2 files changed, 50 deletions(-) (limited to 'emacs') diff --git a/emacs/.emacs.d/Cask b/emacs/.emacs.d/Cask index e4f7d62..fbe39ae 100644 --- a/emacs/.emacs.d/Cask +++ b/emacs/.emacs.d/Cask @@ -34,9 +34,6 @@ (depends-on "emms") (depends-on "eshell-fringe-status") (depends-on "esxml") -(depends-on "evil") -(depends-on "evil-nerd-commenter") -(depends-on "evil-surround") (depends-on "eww-lnum") (depends-on "expand-region") (depends-on "feature-mode") diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el index 3a22c60..bd7fc0e 100644 --- a/emacs/.emacs.d/init.el +++ b/emacs/.emacs.d/init.el @@ -333,13 +333,6 @@ But only if it is a maildir inbox." (when (fboundp 'prettify-symbols-mode) (prettify-symbols-mode arg))) -(defun oni:maybe-switch-to-normal-state () - "Switch the current buffer to normal state. - -Only do this when the mode is not in emacs state by default." - (unless (memql major-mode (oni:modes-starting-in 'emacs)) - (evil-normal-state))) - (defun oni:mini-fix-timestamp-string (date-string) "A minimal version of Xah Lee's `fix-timestamp-string'. Turn DATE-STRING into something else that can be worked with in @@ -376,10 +369,6 @@ extracts the parts I want to know about." (format "[%s - %s]" band title)) song))) -(defun oni:modes-starting-in (state) - "Get a list of the modes whose default state is STATE." - (symbol-value (evil-state-property state :modes))) - (defun oni:move-beginning-of-dwim () "Move to beginning of line either after indentation or before." (interactive) @@ -952,11 +941,6 @@ from myaethon2.core.decorators import ( (topmost-intro-cont first c-lineup-topmost-intro-cont c-lineup-gnu-DEFUN-intro-cont)))) -(stante-after colemak-evil - (define-key evil-insert-state-map (kbd "C-g") #'evil-normal-state) - (define-key evil-replace-state-map (kbd "C-g") #'evil-normal-state) - (define-key evil-visual-state-map (kbd "C-g") #'evil-normal-state)) - (stante-after compile (setq compilation-scroll-output t)) @@ -1036,32 +1020,6 @@ from myaethon2.core.decorators import ( (add-to-list 'eshell-output-filter-functions #'oni:eshell-handle-url) (add-to-list 'eshell-output-filter-functions #'eshell-truncate-buffer)) -(stante-after evil - (evil-define-operator oni:evil-sort-lines-operator (beg end) - "Sort text." - :move-point nil - :type line - (sort-lines nil beg end)) - - (mapc (lambda (mode) (evil-set-initial-state mode 'emacs)) - '(jabber-roster-mode grep-mode avandu-overview-mode - avandu-article-mode gnus-summary-mode - gnus-article-mode gnus-group-mode - magit-status-mode magit-key-mode - sql-interactive-mode Info-mode - jabber-chat-mode diff-mode prodigy-mode - calculator-mode messages-buffer-mode - help-mode prodigy-view-mode eww-mode)) - (evil-set-initial-state 'git-commit-mode 'insert) - (add-hook 'org-capture-mode-hook #'evil-insert-state) - (require 'evil-nerd-commenter) - (define-key evil-normal-state-map ",," 'evilnc-comment-operator) - (define-key evil-normal-state-map ",," 'evilnc-comment-operator) - (define-key evil-normal-state-map ",s" 'oni:evil-sort-lines-operator) - (add-hook 'before-save-hook #'oni:maybe-switch-to-normal-state) - (evil-declare-key 'motion org-mode-map (kbd "RET") #'org-return) - (evil-declare-key 'normal outline-minor-mode-map (kbd "TAB") #'oni:outline-toggle-entry)) - (stante-after eww (setq eww-download-directory ; Don't go to ~/Downloads "~/downloads/")) @@ -1466,11 +1424,6 @@ from myaethon2.core.decorators import ( (yas-global-mode) (projectile-global-mode) - (evil-mode) - (kill-local-variable 'mode-line-format) - (when (string-equal (system-name) "drd") - (require 'evil-colemak)) - (global-evil-surround-mode) (global-company-mode)) (with-eval-after-load 'ruby -- cgit v1.2.3-54-g00ecf