 ;; From http://www.emacswiki.org/emacs/DavidBoon#toc8
 (defvar ar/ediff-bwin-config nil "Window configuration before ediff.")
 (defcustom ar/ediff-bwin-reg ?b
-  "*Register to be set up to hold `ar/ediff-bwin-config'
-    configuration.")
+  "Register to be set up to hold ar/ediff-bwin-config configuration.")
 
 (defun ar/ediff-bsh ()
-  "Function to be called before any buffers or window setup for
-    ediff."
+  "Function to be called before any buffers or window setup for ediff."
   (remove-hook 'ediff-quit-hook 'ediff-cleanup-mess)
   (window-configuration-to-register ar/ediff-bwin-reg))
 
-(defun ar/ediff-aswh ()
-  "setup hook used to remove the `ediff-cleanup-mess' function.  It causes errors."
+(defun ar/ediff-Aswh ()
+  "Setup hook used to remove the `ediff-cleanup-mess' function.  It causes errors."
   (remove-hook 'ediff-quit-hook 'ediff-cleanup-mess))
 
 (defun ar/ediff-qh ()


;; Enable RET to follow Org links.
(setq org-return-follows-link t)

(helm-mode 1)

(defun ar/helm-do-grep-recursive (&optional non-recursive)
  "Like `helm-do-grep', but greps recursively by default.
Optional argument NON-RECURSIVE to shallow-search."
  (interactive "P")
  (let* ((current-prefix-arg (not non-recursive))
         (helm-current-prefix-arg non-recursive))
