diff --git a/emacs/site-lisp/oni.el b/emacs/site-lisp/oni.el
index 11378be..8883167 100644
--- a/emacs/site-lisp/oni.el
+++ b/emacs/site-lisp/oni.el
@@ -260,6 +260,7 @@ extracts the parts I want to know about."
         (eolpos (line-end-position)))
     (beginning-of-line)
     (if (and comment-start
+             (not (looking-at (regexp-quote comment-start)))
              (comment-search-forward eolpos t))
         (progn
           (search-backward-regexp (concat "[^ \t" comment-start "]"))