imenu and ocaml-mode 1.05

[Fritz Heinrichmeyer <fritz.heinrichmeyer@fernuni-hagen.de>]

Ocaml-mode 1.05 did not work with emacs-20.2 due a changed imenu
interface. 

Here is a patch included (sorry, attachments are not allowed in this
list):

*** caml-mode/caml.el	Thu Jul 17 15:06:05 1997
--- /home/jfh/lisp/caml.el	Mon Nov 24 10:53:45 1997
***************
*** 423,428 ****
--- 423,430 ----
      ;imenu support (not for Xemacs)
      (make-local-variable 'imenu-create-index-function)
      (setq imenu-create-index-function 'caml-create-index-function)
+     (make-local-variable 'imenu-generic-expression)
+     (setq imenu-generic-expression caml-imenu-generic-expression)
      (if caml-imenu-disable nil
        (require 'imenu)
        (imenu-add-to-menubar "Defs")))
***************
*** 451,457 ****
  (defun caml-show-subshell () (inferior-caml-show-subshell))
  
  ;;; Imenu support
! (defconst caml-imenu-search-regexp
    (concat "\\<in\\>\\|"
  	  "^[ \t]*\\(let\\|class\\|type\\|m\\(odule\\|ethod\\)"
  	  "\\|functor\\|and\\|val\\)[ \t]+"
--- 453,459 ----
  (defun caml-show-subshell () (inferior-caml-show-subshell))
  
  ;;; Imenu support
! (defconst caml-imenu-generic-expression
    (concat "\\<in\\>\\|"
  	  "^[ \t]*\\(let\\|class\\|type\\|m\\(odule\\|ethod\\)"
  	  "\\|functor\\|and\\|val\\)[ \t]+"
***************
*** 461,467 ****
  (defun caml-prev-index-position-function ()
    (let (found data)
      (while (and (setq found
! 		      (re-search-backward caml-imenu-search-regexp nil 'move))
  		(progn (setq data (match-data)) t)
  		(or (caml-in-literal-p)
  		    (caml-in-comment-p)
--- 463,470 ----
  (defun caml-prev-index-position-function ()
    (let (found data)
      (while (and (setq found
! 		      (re-search-backward caml-imenu-generic-expression
! 					  nil 'move))
  		(progn (setq data (match-data)) t)
  		(or (caml-in-literal-p)
  		    (caml-in-comment-p)