diff options
author | Damien Doligez <damien.doligez-inria.fr> | 2005-08-13 20:59:37 +0000 |
---|---|---|
committer | Damien Doligez <damien.doligez-inria.fr> | 2005-08-13 20:59:37 +0000 |
commit | a4a3c10e70d755e2382c2eebf5e891582ff79325 (patch) | |
tree | 8b7af748bc36975b07568fc7b2c2ba84d9b7c008 /emacs | |
parent | f4cc48c8ea61899ee53adb8b635fc228cd13962a (diff) | |
download | ocaml-a4a3c10e70d755e2382c2eebf5e891582ff79325.tar.gz |
fusion des modifs de 3.08.4
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7019 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'emacs')
-rw-r--r-- | emacs/caml-types.el | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/emacs/caml-types.el b/emacs/caml-types.el index 4bbd76322c..6bdfba9825 100644 --- a/emacs/caml-types.el +++ b/emacs/caml-types.el @@ -128,17 +128,14 @@ See `caml-types-location-re' for annotation file format. (type-file (concat (file-name-sans-extension (buffer-file-name)) ".annot"))) (caml-types-preprocess type-file) - (unless caml-types-buffer - (setq caml-types-buffer (get-buffer-create caml-types-buffer-name))) + (setq caml-types-buffer (get-buffer-create caml-types-buffer-name)) (let* ((targ-loc (vector target-file target-line target-bol target-cnum)) (node (caml-types-find-location targ-loc () caml-types-annotation-tree))) (cond ((null node) - (delete-overlay caml-types-expr-ovl) - (message "Point is not within a typechecked expression or pattern.") - ; (with-current-buffer type-buf (narrow-to-region 1 1)) - ) + (delete-overlay caml-types-expr-ovl) + (message "Point is not within a typechecked expression or pattern.")) (t (let ((left (caml-types-get-pos target-buf (elt node 0))) (right (caml-types-get-pos target-buf (elt node 1))) @@ -426,9 +423,7 @@ The function uses two overlays. (progn (caml-types-preprocess type-file) (setq target-tree caml-types-annotation-tree) - (unless caml-types-buffer - (setq caml-types-buffer - (get-buffer-create caml-types-buffer-name))) + (setq caml-types-buffer (get-buffer-create caml-types-buffer-name)) ;; (message "Drag the mouse to explore types") (unwind-protect (caml-track-mouse @@ -569,4 +564,10 @@ The function uses two overlays. (min (point-max) (+ end 1)) target-buf) (cons start end))) +(defun caml-types-version () + "internal version number of caml-types.el" + (interactive) + (message "2") +) + (provide 'caml-types) |