                (insert completion))
 
               (t
-               (with-output-to-temp-buffer "*Help*"
-                 (display-completion-list all-completions))
-               ))
+                (with-output-to-temp-buffer "*Completions*"
+                  (display-completion-list all-completions))
+                ))
                ))))
 
 
-;; Info files
-
-
-(defun ocaml-info-add-entries-old (entries dir name)
+;; Info files (only in ocamldoc style)
+
+
+(defvar ocaml-info-basename "ocaml"
+  "Basename of ocaml info files describing library modules.
+Suffix .info will be added to info files. 
+Additional suffix .gz may be added if info files are compressed.
+")
+;; 
+
+(defun ocaml-hevea-info-add-entries (entries dir name)
   (let*
       ((filter
         (concat "-type f -regex '.*/" name

                      )))
                 (if (null module)
                     (error "Can't find completion for \"%s\"" pattern)
                   (delete-region beg end)
                   (insert module "." pattern))))
                     
              ((not (string-equal pattern completion))

"
  (save-excursion
    (let ((module) (entry))
      (if (looking-at "[ \n]") (skip-chars-backward " ")) 
      (if (re-search-backward
           "[^A-Za-z0-9_.']\\([A-Za-z0-9_']*[.]\\)*[A-Za-z0-9_']*\\="
           (- (point) 100) t)
