imenu and ocaml-mode 1.05

imenu and ocaml-mode 1.05

[Fritz Heinrichmeyer]

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)

ocaml-mode 1.06

[Jacques GARRIGUE]

As Fritz Heinrichmeyer reported yesterday, there are compatibility
problems between ocaml-mode-1.05 and GNU Emacs 20. Also, Imenu support
was not very stable, there were a few other bugs, and ocaml's syntax
changed a little. For all these reasons, there is a minor upgrade to
ocaml-mode.

  http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/
  ftp://ftp.kurims.kyoto-u.ac.jp/pub/lang/olabl/ocaml-mode-1.06.tar.gz

---------------------------------------------------------------------------
Jacques Garrigue      Kyoto University     garrigue at kurims.kyoto-u.ac.jp
		<A HREF=http://wwwfun.kurims.kyoto-u.ac.jp/~garrigue/>JG</A>

Re: ocaml-mode 1.06

[Fritz Heinrichmeyer]

when compiling and using next-error, the error expression is not
correctly marked. Here is the patch from 
John Gerard Malecki <johnm@artisan.com> (against ocaml-mode 1.05, but it
can be applied trivially by hand):

635,637c635,636
<             (setq end (- (+ (point) end 1) beg) ;; (+ (point) end)
<                   beg (+ (point) 1) ;; (+ (point) beg)
<                   )
---
>             (setq beg (+ (point) beg)
>                   end (+ (point) end))