767,770c767,782
<   (TeX-insert-macro "documentclass")
<   (LaTeX-newline)
<   (LaTeX-newline)
<   (LaTeX-newline)
---
>   ;; just assume a single valid \\documentclass, i.e., one not in a
>   ;; commented line
>   (let ((found nil))
>     (save-excursion
>       (while (and (not found)
>         (re-search-backward
>          "\\\\documentclass\\(\\[[a-z0-9A-Z\-\_,]*\\]\\)?\\({[^}]+}\\)"
>          nil t))
>         (and (not (TeX-in-commented-line))
>              (setq found t))))
>     (if (not found)
>         (progn
>           (TeX-insert-macro "documentclass")
>           (LaTeX-newline)
>           (LaTeX-newline)
>           (LaTeX-newline))))