[nongnu] externals/caml 99e7ea3 119/197: merge changes from 3.10.2merged to 3.11.0

[Stefan Monnier]

branch: externals/caml
commit 99e7ea3a63d5aa820959f1d9b497af8f8ff07cc8
Author: Damien Doligez <damien.doligez-inria.fr>
Commit: Damien Doligez <damien.doligez-inria.fr>

    merge changes from 3.10.2merged to 3.11.0
    
    
    git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9153 
f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
---
 caml-font.el | 11 ++++++-----
 caml.el      | 10 +++++-----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/caml-font.el b/caml-font.el
index 2914fdf..e796abd 100644
--- a/caml-font.el
+++ b/caml-font.el
@@ -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 --git a/caml.el b/caml.el
index c68d109..4f03b5a 100644
--- a/caml.el
+++ b/caml.el
@@ -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)
@@ -791,7 +791,7 @@ variable caml-mode-indentation."
 ;; Hence we add a regexp.
 
 (defconst caml-error-regexp
-  "^[A-\377]+ \"\\([^\"\n]+\\)\", [A-\377]+ \\([0-9]+\\)[-,:]"
+  "^[ A-\377]+ \"\\([^\"\n]+\\)\", [A-\377]+ \\([0-9]+\\)[-,:]"
   "Regular expression matching the error messages produced by camlc.")
 
 (if (boundp 'compilation-error-regexp-alist)
@@ -804,7 +804,7 @@ variable caml-mode-indentation."
 ;; A regexp to extract the range info
 
 (defconst caml-error-chars-regexp
-  ".*, .*, [A-\377]+ \\([0-9]+\\)-\\([0-9]+\\):"
+  ".*, .*, [A-\377]+ \\([0-9]+\\)-\\([0-9]+\\):?"
   "Regular expression extracting the character numbers
 from an error message produced by camlc.")
 
@@ -816,7 +816,7 @@ from an error message produced by camlc.")
 (defun caml-string-to-int (x)
   (if (fboundp 'string-to-number) (string-to-number x) (string-to-int x)))
 
-;;itz 04-21-96 somebody didn't get the documetation for next-error
+;;itz 04-21-96 somebody didn't get the documentation for next-error
 ;;right. When the optional argument is a number n, it should move
 ;;forward n errors, not reparse.