From f8212611e4282b75c4d05a00bcb8c32e366b6c73 Mon Sep 17 00:00:00 2001
From: Phil Hagelberg <technomancy@gmail.com>
Date: Wed, 10 Dec 2008 16:02:02 -0800
Subject: [PATCH] Autoload and invoke paredit. Fix ruby-mode RET.

---
 elpa-to-submit/paredit.el | 1 +
 starter-kit-elpa.el       | 1 +
 starter-kit-lisp.el       | 4 ++++
 starter-kit-misc.el       | 1 +
 starter-kit-ruby.el       | 1 +
 5 files changed, 8 insertions(+)

diff --git a/elpa-to-submit/paredit.el b/elpa-to-submit/paredit.el
index 73a9d51c5b..32fead621b 100644
--- a/elpa-to-submit/paredit.el
+++ b/elpa-to-submit/paredit.el
@@ -236,6 +236,7 @@ Signal an error if no clause matches."
 (defvar paredit-mode-map (make-sparse-keymap)
   "Keymap for the paredit minor mode.")
 
+;;;###autoload
 (define-minor-mode paredit-mode
   "Minor mode for pseudo-structurally editing Lisp code.
 \\<paredit-mode-map>"
diff --git a/starter-kit-elpa.el b/starter-kit-elpa.el
index 111696f39e..2de1a95792 100644
--- a/starter-kit-elpa.el
+++ b/starter-kit-elpa.el
@@ -9,6 +9,7 @@
                                "css-mode"
                                "ert"
                                ;; To submit:
+;;;                                "paredit"
 ;;;                                "haml"
 ;;;                                "sass"
 ;;;                                "clojure-mode"
diff --git a/starter-kit-lisp.el b/starter-kit-lisp.el
index 34b1a912b0..8cfb840b9f 100644
--- a/starter-kit-lisp.el
+++ b/starter-kit-lisp.el
@@ -8,6 +8,10 @@
 
 (add-hook 'emacs-lisp-mode-hook 'emacs-lisp-remove-elc-on-save)
 
+(when (boundp 'paredit-mode)
+  (add-hook emacs-lisp-mode-hook (lambda () (paredit-mode +1)))
+  (add-hook lisp-mode-hook (lambda () (paredit-mode +1))))
+
 (defun emacs-lisp-remove-elc-on-save ()
   "If you're saving an elisp file, likely the .elc is no longer valid."
   (make-local-variable 'after-save-hook)
diff --git a/starter-kit-misc.el b/starter-kit-misc.el
index ce773c9820..89c2bd9bd6 100644
--- a/starter-kit-misc.el
+++ b/starter-kit-misc.el
@@ -26,6 +26,7 @@
                                   indentation space-after-tab)
       whitespace-line-column 100
       ediff-window-setup-function 'ediff-setup-windows-plain
+      oddmuse-directory (concat dotfiles-dir "oddmuse")
       save-place-file (concat dotfiles-dir "places"))
 
 ;; Set this to whatever browser you use:
diff --git a/starter-kit-ruby.el b/starter-kit-ruby.el
index a76110394d..ec87c7ed0e 100644
--- a/starter-kit-ruby.el
+++ b/starter-kit-ruby.el
@@ -6,6 +6,7 @@
   '(progn
      (require 'inf-ruby)
      (require 'ruby-compilation)
+     (define-key ruby-mode-map (kbd "RET") 'reindent-then-newline-and-indent)
      (define-key ruby-mode-map (kbd "C-c l") "lambda")))
 
 (global-set-key (kbd "C-h r") 'ri)