[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] externals/caml 074d219 106/197: fusion des changements jusqu'a
From: |
Stefan Monnier |
Subject: |
[nongnu] externals/caml 074d219 106/197: fusion des changements jusqu'a 3.08.3 |
Date: |
Sat, 21 Nov 2020 01:19:47 -0500 (EST) |
branch: externals/caml
commit 074d2191427fd37380a77a4aa07189e964dfb99f
Author: Damien Doligez <damien.doligez-inria.fr>
Commit: Damien Doligez <damien.doligez-inria.fr>
fusion des changements jusqu'a 3.08.3
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6824
f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
---
caml-types.el | 4 ++--
caml-xemacs.el | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/caml-types.el b/caml-types.el
index ac2197a..4bbd763 100644
--- a/caml-types.el
+++ b/caml-types.el
@@ -112,8 +112,8 @@ For the moment, the only possible keyword is \"type\"."
. Even if type checking fails, you can still look at the types
in the file, up to where the type checker failed.
-Types are also diplayed in the buffer *caml-types*, which buffer is
-display when the commande is called with Prefix argument 4.
+Types are also displayed in the buffer *caml-types*, which is
+displayed when the command is called with Prefix argument 4.
See also `caml-types-explore' for exploration by mouse dragging.
See `caml-types-location-re' for annotation file format.
diff --git a/caml-xemacs.el b/caml-xemacs.el
index 8f40fb9..fe141c5 100644
--- a/caml-xemacs.el
+++ b/caml-xemacs.el
@@ -40,8 +40,8 @@
(defun caml-sit-for (sec &optional mili)
- (sit-for (+ sec (if mili (* 0.001 mili)))))
-
+ (sit-for (+ sec (if mili (* 0.001 mili) 0))))
+
(defmacro caml-track-mouse (&rest body) (cons 'progn body))
- [nongnu] externals/caml 38c4de4 082/197: bricoles, (continued)
- [nongnu] externals/caml 38c4de4 082/197: bricoles, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml 432e972 081/197: duh, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml 285775f 080/197: plus rapide, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml e1a8649 084/197: - added file caml-xemacs.el for XEmacs compatibility., Stefan Monnier, 2020/11/21
- [nongnu] externals/caml a94bd19 083/197: hash-table des annotations, Stefan Monnier, 2020/11/21
- [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 <=
- [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, 2020/11/21
- [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