Merge imenu support.

Author: technomancy

clojure-mode.el

@@ -35,6 +35,10 @@
 ;;   (defun lisp-enable-paredit-hook () (paredit-mode 1))
 ;;   (add-hook 'clojure-mode-hook 'lisp-enable-paredit-hook)
 
+;;; Todo:
+
+;; * hashbang is also a valid comment character
+
 ;;; License:
 
 ;; This program is free software; you can redistribute it and/or
@@ -137,6 +141,9 @@ All commands in `lisp-mode-shared-map' are inherited by this map.")
 This holds a cons cell of the form `(DIRECTORY . FILE)'
 describing the last `clojure-load-file' or `clojure-compile-file' command.")
 
+(defvar clojure-def-regexp "^\\s *\\((def\\S *\\s +\\(\\S +\\)\\)"
+  "A regular expression to match any top-level definitions.")
+
 ;;;###autoload
 (defun clojure-mode ()
   "Major mode for editing Clojure code - similar to Lisp mode..
@@ -163,6 +170,12 @@ if that value is non-nil."
        'clojure-indent-function)
   (set (make-local-variable 'font-lock-multiline) t)
 
+  (setq lisp-imenu-generic-expression
+        `((nil ,clojure-def-regexp 2)))
+  (setq imenu-create-index-function
+        (lambda ()
+          (imenu--generic-function lisp-imenu-generic-expression)))
+
   (if (and (not (boundp 'font-lock-extend-region-functions))
            (or clojure-mode-font-lock-multiline-def
                clojure-mode-font-lock-comment-sexp))