Disable auto-indent-mode as it is too complex

2 files changed, 22 insertions, 0 deletions

diff --git a/init.el b/init.el
index 9fea42f..0fb0767 100644
--- a/init.el
+++ b/init.el
@@ -86,6 +86,7 @@
 (use-package auto-indent-mode
   :config (auto-indent-global-mode)
   :diminish auto-indent-mode
+  :disabled t ;; this mode tries to do way too much
   :ensure t
   )
 
diff --git a/ravi-init-appearance.el b/ravi-init-appearance.el
index 56ae28a..0571f9d 100644
--- a/ravi-init-appearance.el
+++ b/ravi-init-appearance.el
@@ -84,6 +84,9 @@
 ;; Prevent addition of lines at end of file when down arrow is pressed.
 (setq next-line-add-newlines nil)
 
+;; Kill the entire line, please
+(setq kill-whole-line t)
+
 ;; Easily navigate sillycased words
 (global-subword-mode 1)
 
@@ -92,6 +95,23 @@
   :ensure t
   )
 
+;; Enable automatic indentation, if possible
+(bind-key "<return>" 'newline-and-indent prog-mode-map)
+
+;; Automatic indentation of yanked text
+(dolist (command '(yank yank-pop))
+  (eval `(defadvice ,command (after indent-region activate)
+           (and (not current-prefix-arg)
+                (member major-mode '(emacs-lisp-mode lisp-mode
+                                     clojure-mode    scheme-mode
+                                     haskell-mode    ruby-mode
+                                     rspec-mode      python-mode
+                                     c-mode          c++-mode
+                                     objc-mode       latex-mode
+                                     plain-tex-mode))
+                (let ((mark-even-if-inactive transient-mark-mode))
+                  (indent-region (region-beginning) (region-end) nil))))))
+
 ;; Keep my navigation simple
 (setq line-move-visual nil)
 
@@ -117,6 +137,7 @@
   (progn
     (add-hook 'dired-mode-hook 'discover-turn-on-in-dired)
    )
+  :disabled t ;; unstable API and hosing user-provided keybindings
   :ensure t
   )