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))
