[nongnu] externals/caml 51b6e03 120/197: merge changes from release/3.11.1 to release/3.11.2

[Stefan Monnier]

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

    merge changes from release/3.11.1 to release/3.11.2
    
    git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9540 
f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
---
 caml-types.el | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/caml-types.el b/caml-types.el
index 44f09a0..05b1a2c 100644
--- a/caml-types.el
+++ b/caml-types.el
@@ -256,9 +256,9 @@ See `caml-types-location-re' for annotation file format.
           (let* ((loc-re (concat caml-types-position-re " "
                                  caml-types-position-re))
                  (end-re (concat caml-types-position-re " --"))
-                 (def-re (concat "def \\([^ ]\\)* " loc-re))
-                 (def-end-re (concat "def \\([^ ]\\)* " end-re))
-                 (internal-re (concat "int_ref \\([^ ]\\)* " loc-re))
+                 (def-re (concat "def \\([^ ]*\\) " loc-re))
+                 (def-end-re (concat "def \\([^ ]*\\) " end-re))
+                 (internal-re (concat "int_ref \\([^ ]*\\) " loc-re))
                  (external-re "ext_ref \\(.*\\)"))
             (cond
              ((string-match def-re kind)
@@ -359,7 +359,7 @@ See `caml-types-location-re' for annotation file format.
                            (expand-file-name "_build" project-dir)))))
          (if (equal project-dir (parent-dir project-dir))
              (error (concat "No annotation file. "
-                            "You should compile with option \"-dtypes\".")))
+                            "You should compile with option \"-annot\".")))
          (setq project-dir (parent-dir project-dir)))
        type-path))))