[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] externals/caml d287472 095/197: petits bugs
From: |
Stefan Monnier |
Subject: |
[nongnu] externals/caml d287472 095/197: petits bugs |
Date: |
Sat, 21 Nov 2020 01:19:45 -0500 (EST) |
branch: externals/caml
commit d2874721071c6b8503efae17dd1d24fb49ef63c4
Author: Damien Doligez <damien.doligez-inria.fr>
Commit: Damien Doligez <damien.doligez-inria.fr>
petits bugs
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5865
f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
---
caml-types.el | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/caml-types.el b/caml-types.el
index 018c17d..5955320 100644
--- a/caml-types.el
+++ b/caml-types.el
@@ -162,6 +162,8 @@ See `caml-types-location-re' for annotation file format.
(target-file (file-name-nondirectory (buffer-file-name)))
(target-date (nth 5 (file-attributes target-file))))
(unless (and caml-types-annotation-tree
+ type-date
+ caml-types-annotation-date
(not (caml-types-date< caml-types-annotation-date type-date)))
(if (and type-date target-date (caml-types-date< type-date target-date))
(error (format "%s is more recent than %s" target-file type-file)))
@@ -378,7 +380,7 @@ See `caml-types-location-re' for annotation file format.
(with-current-buffer buf (toggle-read-only 1))
)
(t
- (error "No annotation file. You may compile with \"-dtypes\" option"))
+ (error "No annotation file. You should compile with option \"-dtypes\"."))
)
buf))
@@ -401,12 +403,12 @@ and its type is displayed in the minibuffer, until the
move is released."
target-pos
Left Right limits cnum node mes type
region
+ target-tree
)
(unwind-protect
(progn
- (if type-file (caml-types-preprocess type-file)
- (error
- "No annotation file. You may compile with \"-dtypes\" option"))
+ (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)))
@@ -419,7 +421,7 @@ and its type is displayed in the minibuffer, until the move
is released."
(while (and event
(integer-or-marker-p
(setq cnum (caml-event-point-end event))))
- (if (and region (<= (car region) cnum) (<= cnum (cdr region)))
+ (if (and region (<= (car region) cnum) (< cnum (cdr region)))
(if (and limits
(>= cnum (car limits)) (< cnum (cdr limits)))
(message mes)
@@ -432,7 +434,7 @@ and its type is displayed in the minibuffer, until the move
is released."
(vector target-file target-line target-bol cnum))
(save-excursion
(setq node (caml-types-find-location
- target-pos () caml-types-annotation-tree))
+ target-pos () target-tree))
(set-buffer caml-types-buffer)
(erase-buffer)
(cond
@@ -453,8 +455,7 @@ and its type is displayed in the minibuffer, until the move
is released."
(setq type "*no type information*")
(setq limits
(caml-types-find-interval
- target-buf target-pos
- caml-types-annotation-tree))
+ target-buf target-pos target-tree))
))
(message (setq mes (format "type: %s" type)))
(insert type)
@@ -469,12 +470,12 @@ and its type is displayed in the minibuffer, until the
move is released."
;; the mouse is down. One should prevent against mouse release,
;; which could do something undesirable.
;; In most common cases, next event will be mouse release.
- ;; However, it could also be a character stroke before mourse release.
+ ;; However, it could also be a key stroke before mouse release.
;; Will then execute the action for mouse release (if bound).
;; Emacs does not allow to test whether mouse is up or down.
- ;; Same problem may happen abouve while exploring
+ ;; Same problem may happen above while exploring
(if (and event (caml-read-event)))
- ))
+ )))
(defun caml-types-typed-make-overlay (target-buf pos)
(interactive "p")
@@ -486,7 +487,7 @@ and its type is displayed in the minibuffer, until the move
is released."
(if (and (equal target-buf (current-buffer))
(setq left (caml-types-get-pos target-buf (elt node 0))
right (caml-types-get-pos target-buf (elt node 1)))
- (<= left pos) (>= right pos)
+ (<= left pos) (> right pos)
)
(setq start (min start left)
end (max end right))
- [nongnu] externals/caml d7bde19 088/197: Modified `caml-types-explore' so that all well-typed subexpressions of the, (continued)
- [nongnu] externals/caml d7bde19 088/197: Modified `caml-types-explore' so that all well-typed subexpressions of the, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml 570c595 089/197: installer caml-emacs.el, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml ab2d4cc 107/197: fusion des modifs de 3.08.4, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml 347ceba 108/197: PR#3767 features 1 and 2: display full location of events instead of one position, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml 4238e85 110/197: fusion des changements 3.09.3 -> release309_merge310, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml 074d219 106/197: fusion des changements jusqu'a 3.08.3, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml 8fc9a47 117/197: amelioration des annotations, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml bcceb79 122/197: fixes bug 0005016, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml 55b8c79 124/197: fixes bug 0004997, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml d213e6d 076/197: integration de caml-types a caml.el, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml d287472 095/197: petits bugs,
Stefan Monnier <=
- [nongnu] externals/caml eddf5e0 099/197: camldebug-command-name should be user-settable, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml 901e8dd 103/197: Fusion des modifs de la branche release308 entre 3.08.0 et 3.08.1, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml afff6d2 040/197: Adding file caml-help.el, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml b060e59 041/197: indentation autour de "; ; ", Stefan Monnier, 2020/11/21
- [nongnu] externals/caml 4759555 044/197: Amelioration de caml-help, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml 05d89fc 061/197: added menu entries for caml-help and caml-complete, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml bf460c2 062/197: interactions bizarres de with, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml f45af82 063/197: - Fixed bugs + improved caml-help.el, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml 5e6f8b6 071/197: value obsolete, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml 9ece2ad 045/197: Remise au mode info HeVeA par default., Stefan Monnier, 2020/11/21