[nongnu] externals/caml 9d5668c 051/197: fix caml-help

[Stefan Monnier]

branch: externals/caml
commit 9d5668c3736fa7af320adf2346a065f35e7edc0d
Author: Jacques Garrigue <garrigue at math.nagoya-u.ac.jp>
Commit: Jacques Garrigue <garrigue at math.nagoya-u.ac.jp>

    fix caml-help
    
    
    git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4547 
f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
---
 Makefile     | 3 ++-
 caml-help.el | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index a9b29d8..dcda075 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ include ../config/Makefile
 
 # Files to install
 FILES= caml-font.el caml-hilit.el caml.el camldebug.el \
-       inf-caml.el caml-compat.el
+       inf-caml.el caml-compat.el caml-help.el
 
 # Where to install. If empty, automatically determined.
 #EMACSDIR=
@@ -20,6 +20,7 @@ COMPILECMD=(progn \
               (setq load-path (cons "." load-path)) \
               (byte-compile-file "caml.el") \
               (byte-compile-file "inf-caml.el") \
+              (byte-compile-file "caml-help.el") \
               (byte-compile-file "camldebug.el"))
 
 install:
diff --git a/caml-help.el b/caml-help.el
index a4dc36f..20d97db 100644
--- a/caml-help.el
+++ b/caml-help.el
@@ -450,7 +450,7 @@ This uses info files produced by ocamldoc."
     ))
 
 (defun ocaml-buffer-substring (region)
-  (and region (buffer-substring (car region) (cdr region))))
+  (and region (buffer-substring-no-properties (car region) (cdr region))))
 
 ;; Help function. 
 
@@ -467,7 +467,7 @@ current buffer using \\[ocaml-qualified-identifier]."
                   (and (file-exists-p
                         (concat (ocaml-uncapitalize module) ".mli"))
                        (ocaml-get-or-make-module module))))                  
-             (location (cdadr module-info)))
+             (location (cdr (car (cdr module-info)))))
         (cond
          (location
           (view-file (concat location (ocaml-uncapitalize module) ".mli"))