   (use-local-map rdebug-breakpoints-mode-map)
   (setq buffer-read-only t)
   (set (make-local-variable 'rdebug-secondary-buffer) t)
-  (run-mode-hooks 'rdebug-breakpoints-mode-hook)
-  ;;(if (eq (buffer-local-value 'gud-minor-mode gud-comint-buffer) 'gdba)
-  ;;    'gdb-invalidate-breakpoints
-  ;;  'gdbmi-invalidate-breakpoints)
-  )
-
-;; Work in progress...
-(defvar rdebug-breakpoints-font-lock-keywords
-  '(("\\([0-9]+\\) +[ny] +at +\\(\\(.*\\):\\([0-9]+\\)\\|\\(.*\\):\\([a-zA-Z_][a-zA-Z0-9_]\\)$")
-    (1 font-lock-constant-face)
-    (2 font-lock-warning-face)))
-
-;;  '(("@[a-zA-Z0-9_]+" 0 font-lock-variable-name-face)
-;;    ("\\<\\(nil\\|true\\|false\\)\\>" 0 font-lock-constant-face)
-;;    ("#<\\([a-zA-Z0-9_]+\\):\\([0-9a-fx]*\\)"
-;;     (1 font-lock-type-face)
-;;     (2 font-lock-constant-face)))
-;;  "Font-lock rules for the variables and watch windows in `rdebug'.")
+  (set (make-local-variable 'font-lock-defaults)
+       '(rdebug-breakpoints-font-lock-keywords))
+  (run-mode-hooks 'rdebug-breakpoints-mode-hook))
+
 
 (defun rdebug--setup-breakpoints-buffer (buf comint-buffer)
   "Detects breakpoint lines and sets up keymap and mouse navigation."
   (rdebug-debug-enter "rdebug--setup-breakpoints-buffer"
     (with-current-buffer buf
-      (let ((inhibit-read-only t) 
-	    (old-line-number (buffer-local-value 'rdebug-current-line-number 
+      (let ((inhibit-read-only t)
+	    (old-line-number (buffer-local-value 'rdebug-current-line-number
 						 buf))
 	    (flag))
         (rdebug-breakpoints-mode)

    map)
  "Keymap to navigate/set/enable rdebug breakpoints.")

(defun rdebug-breakpoints-mode ()
  "Major mode for displaying breakpoints in the `rdebug' Ruby debugger.


                                (buffer-substring b e))
              (add-text-properties b e
                                   (list 'mouse-face 'highlight
                                         'keymap rdebug-breakpoints-mode-map)))
            (forward-line)))
	(goto-line old-line-number)))
    (rdebug-breakpoints-parse-and-update-cache)
    (rdebug-breakpoints-update-icons (rdebug-all-breakpoints))))
