diff -up ./emacs/caml-font.el.orig ./emacs/caml-font.el
--- ./emacs/caml-font.el.orig	2008-01-11 17:13:16.000000000 +0100
+++ ./emacs/caml-font.el	2008-12-01 10:30:03.000000000 +0100
@@ -80,11 +80,12 @@
     (cond
      (in-string 'font-lock-string-face)
      (in-comment
-      (goto-char start)
-      (cond
-       ((looking-at "(\\*\\*/\\*\\*)") 'caml-font-stop-face)
-       ((looking-at "(\\*\\*[^*]")     'caml-font-doccomment-face)
-       (t                              'font-lock-comment-face))))))
+      (save-excursion
+        (goto-char start)
+        (cond
+         ((looking-at "(\\*\\*/\\*\\*)") 'caml-font-stop-face)
+         ((looking-at "(\\*\\*[^*]")     'caml-font-doccomment-face)
+         (t                              'font-lock-comment-face)))))))


 ;; font-lock commands are similar for caml-mode and inferior-caml-mode
diff -up ./emacs/caml.el.orig ./emacs/caml.el
--- ./emacs/caml.el.orig	2008-12-01 10:27:52.000000000 +0100
+++ ./emacs/caml.el	2008-12-01 10:29:13.000000000 +0100
@@ -411,10 +411,10 @@ have caml-electric-indent on, which see.
   ; backslash is an escape sequence
   (modify-syntax-entry ?\\ "\\" caml-mode-syntax-table)
   ; ( is first character of comment start
-  (modify-syntax-entry ?\( "()1" caml-mode-syntax-table)
+  (modify-syntax-entry ?\( "()1n" caml-mode-syntax-table)
   ; * is second character of comment start,
   ; and first character of comment end
-  (modify-syntax-entry ?*  ". 23" caml-mode-syntax-table)
+  (modify-syntax-entry ?*  ". 23n" caml-mode-syntax-table)
   ; ) is last character of comment end
   (modify-syntax-entry ?\) ")(4" caml-mode-syntax-table)
   ; backquote was a string-like delimiter (for character literals)