Commits

scop  committed 21b5bb4

2002-08-21 Ville Skyttä <ville.skytta@xemacs.org>

* Sync package with upstream 3.06.

* Makefile (AUTHOR_VERSION): 3.06.
* caml.el (caml-find-in-match): Handle "end".

  • Participants
  • Parent commits 42677e4

Comments (0)

Files changed (5)

+2002-08-21  Ville Skyttä  <ville.skytta@xemacs.org>
+
+	* Sync package with upstream 3.06.
+
+	* Makefile (AUTHOR_VERSION): 3.06.
+	* caml.el (caml-find-in-match): Handle "end".
+
 2002-08-12  Rendhalver [Peter Brown]  <rendhalver@xemacs.org>
 
 	* Makefile (VERSION): XEmacs package 0.02 released.
 # Boston, MA 02111-1307, USA.
 
 VERSION = 0.02
-AUTHOR_VERSION = 3.05
+AUTHOR_VERSION = 3.06
 MAINTAINER = XEmacs Development Team <xemacs-beta@xemacs.org>
 PACKAGE = ocaml
 PKG_TYPE = regular
 
     % make install-ocamltags
 
-To use highlighting capabilities, add ONE of the following two
-lines to your .emacs.
+To use highlighting capabilities, add ONE of the following two lines
+to your .emacs.  The second one works better on recent versions of
+emacs.
 
     (if window-system (require 'caml-hilit))
     (if window-system (require 'caml-font))
 Changes log:
 -----------
 
+Version 3.05:
+-------------
+* improved interaction with inferior caml mode
+
+* access help from the source
+
+* fixes in indentation code
+
 Version 3.03:
 -------------
 * process ;; properly
 (defun caml-find-in-match ()
   (let ((unbalanced 1) (kwop t))
     (while (and (not (= 0 unbalanced)) kwop)
-      (setq kwop (caml-find-kwop "\\<\\(in\\|let\\)\\>"))
+      (setq kwop (caml-find-kwop "\\<\\(in\\|let\\|end\\)\\>"))
       (cond
        ((not kwop))
+       ((string= kwop "end") (caml-find-end-match))
        ((string= kwop "in") (setq unbalanced (1+ unbalanced)))
-       ( t (setq unbalanced (1- unbalanced)))))
+       (t (setq unbalanced (1- unbalanced)))))
     kwop))
 
 (defun caml-find-with-match ()

File caml.el.upstream

 (defun caml-find-in-match ()
   (let ((unbalanced 1) (kwop t))
     (while (and (not (= 0 unbalanced)) kwop)
-      (setq kwop (caml-find-kwop "\\<\\(in\\|let\\)\\>"))
+      (setq kwop (caml-find-kwop "\\<\\(in\\|let\\|end\\)\\>"))
       (cond
        ((not kwop))
+       ((string= kwop "end") (caml-find-end-match))
        ((string= kwop "in") (setq unbalanced (1+ unbalanced)))
-       ( t (setq unbalanced (1- unbalanced)))))
+       (t (setq unbalanced (1- unbalanced)))))
     kwop))
 
 (defun caml-find-with-match ()