       (setq arg (- arg 1))))
   (back-to-indentation))
 
-(defun haml-mark-sexp ()
-  "Marks the next Haml block."
-  (let ((forward-sexp-function 'haml-forward-sexp))
-    (mark-sexp)))
-
 (defun haml-mark-sexp-but-not-next-line ()
-  "Marks the next Haml block, but puts the mark at the end of the
+  "Marks the next Haml sexp, but puts the mark at the end of the
 last line of the sexp rather than the first non-whitespace
 character of the next line."
-  (haml-mark-sexp)
+  (mark-sexp)
   (set-mark
    (save-excursion
      (goto-char (mark))

    (beginning-of-line)
    (if (bobp) 0
      (haml-forward-through-whitespace t)
      (let ((indent (funcall haml-indent-function)))
        (cond
         ((integerp indent) indent)
         (indent (+ (current-indentation) haml-indent-offset))
         (t (current-indentation)))))))

(defun haml-indent-region (start end)
  "Indent each nonblank line in the region.


\\{haml-mode-map}"
  (set-syntax-table haml-mode-syntax-table)
  (set (make-local-variable 'indent-line-function) 'haml-indent-line)
  (set (make-local-variable 'indent-region-function) 'haml-indent-region)
  (set (make-local-variable 'forward-sexp-function) 'haml-forward-sexp)
  (setq indent-tabs-mode nil)
  (setq font-lock-defaults '((haml-font-lock-keywords) nil t)))

;; Navigation

