Remove fill-column-indicator since for now it cause a bug with search-forward. Fix bug with revive hook. Clean up unused packages. evil-insert-map is not reinitialized anymore.

config/config-session.el

@@ -115,7 +115,3 @@
 (put 'erase-buffer 'disabled nil)
 (put 'scroll-left 'disabled nil)
 (put 'dired-find-alternate-file 'disabled nil)
-
-;; save and restore layout
-(add-hook 'kill-emacs-hook 'emacs-save-layout)
-(add-hook 'after-init-hook 'emacs-load-layout t)

init-extension/init-revive.el

@@ -1 +1,5 @@
 (require 'revive-mode-config)
+
+;; save and restore layout
+(add-hook 'kill-emacs-hook 'emacs-save-layout)
+(add-hook 'after-init-hook 'emacs-load-layout t)

init-package/init-evil.el

@@ -1,5 +1,4 @@
 (setq evil-mode-line-format 'before)
-(setq evil-want-C-u-scroll t)
 
 (setq evil-emacs-state-cursor  '("red" box))
 (setq evil-normal-state-cursor '("orange" box))
@@ -31,13 +30,3 @@
 ;;   (lambda ()
 ;;     (add-hook 'post-command-hook 'evil-motion-state-2-evil-normal-state)))
 
-;; from
-;; Insert state clobbers some useful Emacs keybindings
-;; The solution to this is to clear the insert state keymap, leaving you with
-;; unadulterated Emacs behavior. You might still want to poke around the keymap
-;; (defined in evil-maps.el) and see if you want to salvage some useful insert
-;; state command by rebinding them to keys of your liking. Also, you need to
-;; bind ESC to putting you back in normal mode. So, try using this code.
-;; With it, I have no practical need to ever switch to Emacs state.
-(setcdr evil-insert-state-map nil)
-;; see my-keychords.el file for the binding to revert to normal mode

init-package/init-multi-term.el

@@ -1,29 +0,0 @@
-(require 'multi-term)
-;; zsh
-(setq multi-term-program "/usr/bin/zsh")
-;; for solarized dark theme
-(custom-set-variables
-   '(term-default-bg-color "#002b36")
-   '(term-default-fg-color "#93a1a1"))
-;; enable evil
-(evil-set-initial-state 'term-mode 'emacs)
-;; don't switch to other multi-term when closing
-;; the current one
-(setq multi-term-switch-after-close nil)
-
-;; Following code was take from:
-;; http://emacswiki.org/emacs/MultiTerm
-(defun last-multi-term-buffer (l)
-  "Return most recently used term buffer."
-  (when l
-    (if (eq 'term-mode (with-current-buffer (car l) major-mode))
-        (car l) (zoo/last-term-buffer (cdr l)))))
-
-(defun last-used-multi-term ()
-  "Switch to the term buffer last used, or create a new one if
-    none exists, or if the current buffer is already a term."
-  (interactive)
-  (let ((b (last-multi-term-buffer (buffer-list))))
-    (if (or (not b) (eq 'term-mode major-mode))
-        (multi-term)
-      (switch-to-buffer b))))

init-package/init-multiple-cursors.el

@@ -1 +0,0 @@
-(require 'multiple-cursors)

init-package/init-smex.el

@@ -1,3 +0,0 @@
-(setq smex-save-file (concat user-emacs-directory ".smex-items"))
-(smex-initialize)
-(global-set-key (kbd "M-x") 'smex)

packages.el

@@ -24,9 +24,8 @@
     erlang
     evil
     evil-leader
-    exec-path-from-shell
     expand-region
-    fill-column-indicator
+    ;; fill-column-indicator
     find-file-in-project
     flymake
     flymake-cursor
@@ -40,7 +39,6 @@
     helm-c-yasnippet
     helm-projectile
     htmlize
-    ;; ido-ubiquitous
     jedi
     json-mode
     key-chord
@@ -48,8 +46,6 @@
     magit
     markdown-mode
     move-text
-    ;; multiple-cursors
-    multi-term
     nose
     org
     p4
@@ -64,7 +60,6 @@
     recentf
     rfringe
     smart-operator
-    ;; smex
     solarized-theme
     sr-speedbar
     stripe-buffer

post-extensions.el

@@ -3,17 +3,15 @@
     auto-close-parens
     auto-highlight-symbol-mode
     centered-cursor
-    delim-pad
+     delim-pad
     ;; distel
     edts
     elixir
-    ;; emacs-eclim
     evil-plugins
     flycheck
     mu4e
     o-blog
     pylookup
-    ;; pymacs
     revive
     window-numbering
     ))