Merge remote-tracking branches 'crybaby/master', 'gibson/master' and 'mdwdev/master'

[profile] / dot / emacs

diff --git a/dot/emacs b/dot/emacs
index 370cfee..ad17a56 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -389,6 +389,8 @@
 (setq-default comment-column 40)       ;Set a standard comment column
 (setq-default truncate-partial-width-windows nil
              truncate-lines t)
+(setq line-move-visual t
+      visual-order-cursor-movement t)
 (setq default-indicate-empty-lines t)
 (setq view-read-only t)
 (setq-default view-exit-action #'kill-buffer)
@@ -423,6 +425,20 @@
       '(("en_GB-ize-w_accents" "[[:alpha:]]" "[^[:alpha:]]" "'" t
         ("-d" "en_GB-ize-w_accents") nil utf-8))
       ispell-silently-savep t)
+(setq-default viper-case-fold-search t
+             viper-electric-mode t
+             viper-ex-style-motion nil
+             viper-ex-style-editing nil
+             viper-expert-level 5
+             viper-inhibit-startup-message t
+             ;;viper-insert-state-cursor-color "red"
+             viper-no-multiple-ESC nil
+             viper-re-query-replace t
+             viper-re-search t
+             ;;viper-replace-overlay-cursor-color "red"
+             viper-shift-width 2
+             viper-vi-style-in-minibuffer nil
+             viper-want-ctl-h-help t)
 (trap
   (require 'uniquify)
   (setq uniquify-buffer-name-style 'post-forward-angle-brackets)
@@ -437,6 +453,13 @@
   (tool-bar-mode 0))
 (trap (or mdw-fast-startup (global-auto-revert-mode t)))
 
+(defun mdw-set-viper-cursor-colour ()
+  ;; ?? doesn't seem to work
+  (set-frame-parameter nil 'cursor-color "green")
+  (message ";; %S" post-command-hook)
+  (sit-for 2))
+;;(add-hook 'viper-vi-state-hook 'mdw-set-viper-cursor-colour)
+
 (defvar mdw-black-background t)
 
 (eval-after-load "outline"