Merge pull request #138 from drothlis/v2

Calling (paredit-mode) etc. from elisp code always enables, not toggles, the mode
technomancy · May 4, 2012 · c22fa56 · c22fa56
2 parents 794a005 + c71507f
commit c22fa56
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/modules/starter-kit-lisp.el b/modules/starter-kit-lisp.el
@@ -82,7 +82,7 @@
       (font-lock-add-keywords (intern (concat (symbol-name mode) "-mode"))
                               '(("(\\|)" . 'esk-paren-face))))
     (add-hook (intern (concat (symbol-name mode) "-mode-hook"))
-              'esk-turn-on-paredit))
+              'paredit-mode))
 
   (defun esk-pretty-fn ()
     (font-lock-add-keywords nil `(("(\\(\\<fn\\>\\)"

diff --git a/starter-kit-defuns.el b/starter-kit-defuns.el
@@ -60,15 +60,6 @@
   (require 'saveplace)
   (setq save-place t))
 
-(defun esk-turn-on-whitespace ()
-  (whitespace-mode t))
-
-(defun esk-turn-on-paredit ()
-  (paredit-mode t))
-
-(defun esk-turn-on-idle-highlight-mode ()
-  (idle-highlight-mode t))
-
 (defun esk-pretty-lambdas ()
   (font-lock-add-keywords
    nil `(("(?\\(lambda\\>\\)"
@@ -87,7 +78,7 @@
 (add-hook 'prog-mode-hook 'esk-turn-on-save-place-mode)
 (add-hook 'prog-mode-hook 'esk-pretty-lambdas)
 (add-hook 'prog-mode-hook 'esk-add-watchwords)
-(add-hook 'prog-mode-hook 'esk-turn-on-idle-highlight-mode)
+(add-hook 'prog-mode-hook 'idle-highlight-mode)
 
 (defun esk-prog-mode-hook ()
   (run-hooks 'prog-mode-hook))