   (zomp-add-action zomp-tl-help [(control c)(control h)] "Show toplevel help")
 
   (zomp-add-seperator zomp-sep4)
-  (zomp-add-action zomp-indent-current [(meta q)] "Indent current")
+  (zomp-add-action zomp-indent-current-or-fill [(meta q)] "Indent current")
   (zomp-add-action zomp-indent-buffer [(shift meta q)] "Indent buffer")
 
   (zomp-add-seperator zomp-sep-2)

      (back-to-indentation))
    ))

(defun zomp-indent-current ()
  (interactive)
  (save-excursion
    (zomp-mark-current)
    (indent-region (region-beginning) (region-end))))

(defun zomp-indent-buffer ()
  (interactive)


(defun zomp-setup ()
  (setq comment-start "//")
  (setq comment-start-skip "\\(?://+\\|/\\*+\\) *")
  (setq comment-end "")

  (dolist (op (list ?: ?+ ?- ?= ?! ?? ?* ?/ ?& ?| ?^))
