Skip to content

Commit

Permalink
Remove viper support; I've stopped using it, and would explore "evil"…
Browse files Browse the repository at this point in the history
… instead these days
  • Loading branch information
purcell committed Jan 14, 2012
1 parent bed1c46 commit a9ab90f
Show file tree
Hide file tree
Showing 8 changed files with 1 addition and 56 deletions.
6 changes: 0 additions & 6 deletions init-auto-complete.el
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,6 @@
(add-to-list 'ac-modes mode))


(eval-after-load "viper"
'(progn
(define-key ac-completing-map (kbd "C-n") 'dabbrev-expand)
(define-key ac-completing-map (kbd "C-p") 'dabbrev-expand)
(define-key ac-completing-map viper-ESC-key 'viper-intercept-ESC-key)))

;; Exclude very large buffers from dabbrev
(defun smp-dabbrev-friend-buffer (other-buffer)
(< (buffer-size other-buffer) (* 1 1024 1024)))
Expand Down
3 changes: 0 additions & 3 deletions init-clojure.el
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,6 @@



(eval-after-load "viper"
'(add-to-list 'viper-vi-state-mode-list 'clojure-mode))

(eval-after-load "gist"
'(add-to-list 'gist-supported-modes-alist '(clojure-mode . ".clj")))

Expand Down
2 changes: 0 additions & 2 deletions init-elpa.el
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@
(require-package 'gnuplot)
(require-package 'haskell-mode)
(require-package 'tuareg)
(when *vi-emulation-support-enabled*
(require-package 'highlight-symbol))
(require-package 'flymake-cursor)
(require-package 'json)
(require-package 'js2-mode)
Expand Down
2 changes: 0 additions & 2 deletions init-javascript.el
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@
(setq js2-indent-on-enter-key t)
(setq js2-auto-indent-p t)
(setq js2-bounce-indent-p t)
(unless *vi-emulation-support-enabled*
(setq js2-mirror-mode t))

;; js-mode
(setq js-indent-level preferred-javascript-indent-level)
Expand Down
5 changes: 1 addition & 4 deletions init-osx-keys.el
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@
'(define-key nxml-mode-map (kbd "M-h") nil))
(global-set-key (kbd "M-ˍ") 'ns-do-hide-others) ;; what describe-key reports
(global-set-key (kbd "M-c") 'ns-copy-including-secondary)
(global-set-key (kbd "M-v") 'ns-paste-secondary))
;; Use Apple-w to close current buffer on OS-X (is normally bound to kill-ring-save)
(eval-after-load "viper"
'(global-set-key [(meta w)] 'kill-this-buffer)))
(global-set-key (kbd "M-v") 'ns-paste-secondary)))


(provide 'init-osx-keys)
4 changes: 0 additions & 4 deletions init-ruby-mode.el
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@
;;----------------------------------------------------------------------------
;; Ruby - misc
;;----------------------------------------------------------------------------
;; For some unknown reason, viper starts off in insert mode inside ruby-mode buffers
(eval-after-load "viper"
'(add-to-list 'viper-vi-state-mode-list 'ruby-mode))

(setq compile-command "rake ")

(defalias 'ri 'yari)
Expand Down
33 changes: 0 additions & 33 deletions init-viper.el

This file was deleted.

2 changes: 0 additions & 2 deletions init.el
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
;;----------------------------------------------------------------------------
;; Which functionality to enable (use t or nil for true and false)
;;----------------------------------------------------------------------------
(setq *vi-emulation-support-enabled* nil) ; "viper-mode"
(setq *spell-check-support-enabled* nil)
(setq *macbook-pro-support-enabled* t)
(setq *is-a-mac* (eq system-type 'darwin))
Expand All @@ -26,7 +25,6 @@
(require 'init-gui-frames)
(require 'init-proxies)
(require 'init-dired)
(require 'init-viper)
(require 'init-isearch)
(require 'init-uniquify)
(require 'init-ibuffer)
Expand Down

0 comments on commit a9ab90f

Please sign in to comment.