branch: externals/caml
commit 97316f75419ba4e63b3de5071f6eeb0b5d464a68
Author: Damien Doligez <damien.doligez-inria.fr>
Commit: Damien Doligez <damien.doligez-inria.fr>
renaming of Objective Caml to OCaml and cleanup of copyright headers
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11156
f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
---
Makefile | 2 +-
README | 4 ++--
caml-compat.el | 2 +-
caml-emacs.el | 2 +-
caml-font-old.el | 4 ++--
caml-font.el | 12 ++++++++++++
caml-help.el | 2 +-
caml-hilit.el | 4 ++--
caml-types.el | 2 +-
caml-xemacs.el | 2 +-
caml.el | 6 +++---
camldebug.el | 2 +-
inf-caml.el | 2 +-
ocamltags.in | 2 +-
14 files changed, 30 insertions(+), 18 deletions(-)
diff --git a/Makefile b/Makefile
index 077770c..125e9eb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
# #
diff --git a/README b/README
index 7ddb362..7dedfc8 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
O'Caml emacs mode, snapshot of $Date$
The files in this archive define a caml-mode for emacs, for editing
-Objective Caml and Objective Label programs, as well as an
+OCaml and Objective Label programs, as well as an
inferior-caml-mode, to run a toplevel.
Caml-mode supports indentation, compilation and error retrieving,
@@ -21,7 +21,7 @@ three lines in your .emacs.
(autoload 'run-caml "inf-caml" "Run an inferior Caml process." t)
I added camldebug.el from the original distribution, since there will
-soon be a debugger for Objective Caml, but I do not know enough about
+soon be a debugger for OCaml, but I do not know enough about
it.
To install the mode itself, edit the Makefile and do
diff --git a/caml-compat.el b/caml-compat.el
index 8ba7a99..da54cd0 100644
--- a/caml-compat.el
+++ b/caml-compat.el
@@ -1,6 +1,6 @@
;(***********************************************************************)
;(* *)
-;(* Objective Caml *)
+;(* OCaml *)
;(* *)
;(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
;(* *)
diff --git a/caml-emacs.el b/caml-emacs.el
index d0a2c86..06cabf3 100644
--- a/caml-emacs.el
+++ b/caml-emacs.el
@@ -1,6 +1,6 @@
;(***********************************************************************)
;(* *)
-;(* Objective Caml *)
+;(* OCaml *)
;(* *)
;(* Didier Remy, projet Cristal, INRIA Rocquencourt *)
;(* *)
diff --git a/caml-font-old.el b/caml-font-old.el
index 8faa542..12c318c 100644
--- a/caml-font-old.el
+++ b/caml-font-old.el
@@ -1,6 +1,6 @@
;(***********************************************************************)
;(* *)
-;(* Objective Caml *)
+;(* OCaml *)
;(* *)
;(* Jacques Garrigue and Ian T Zimmerman *)
;(* *)
@@ -55,7 +55,7 @@
; The same definition is in caml.el:
; we don't know in which order they will be loaded.
(defvar caml-quote-char "'"
- "*Quote for character constants. \"'\" for Objective Caml, \"`\" for
Caml-Light.")
+ "*Quote for character constants. \"'\" for OCaml, \"`\" for Caml-Light.")
(defconst caml-font-lock-keywords
(list
diff --git a/caml-font.el b/caml-font.el
index 9562254..09d1ae7 100644
--- a/caml-font.el
+++ b/caml-font.el
@@ -1,3 +1,15 @@
+;(***********************************************************************)
+;(* *)
+;(* OCaml *)
+;(* *)
+;(* Jacques Garrigue and Ian T Zimmerman *)
+;(* *)
+;(* Copyright 1997 Institut National de Recherche en Informatique et *)
+;(* en Automatique. All rights reserved. This file is distributed *)
+;(* under the terms of the GNU General Public License. *)
+;(* *)
+;(***********************************************************************)
+
;; caml-font: font-lock support for OCaml files
;;
;; rewrite and clean-up.
diff --git a/caml-help.el b/caml-help.el
index 59d8a3b..1019632 100644
--- a/caml-help.el
+++ b/caml-help.el
@@ -1,6 +1,6 @@
;(***********************************************************************)
;(* *)
-;(* Objective Caml *)
+;(* OCaml *)
;(* *)
;(* Didier Remy, projet Cristal, INRIA Rocquencourt *)
;(* *)
diff --git a/caml-hilit.el b/caml-hilit.el
index 697e581..0d437c5 100644
--- a/caml-hilit.el
+++ b/caml-hilit.el
@@ -1,6 +1,6 @@
;(***********************************************************************)
;(* *)
-;(* Objective Caml *)
+;(* OCaml *)
;(* *)
;(* Jacques Garrigue and Ian T Zimmerman *)
;(* *)
@@ -16,7 +16,7 @@
; defined also in caml.el
(defvar caml-quote-char "'"
- "*Quote for character constants. \"'\" for Objective Caml, \"`\" for
Caml-Light.")
+ "*Quote for character constants. \"'\" for OCaml, \"`\" for Caml-Light.")
(defconst caml-mode-patterns
(list
diff --git a/caml-types.el b/caml-types.el
index 3c7433a..70d38bc 100644
--- a/caml-types.el
+++ b/caml-types.el
@@ -1,6 +1,6 @@
;(***********************************************************************)
;(* *)
-;(* Objective Caml *)
+;(* OCaml *)
;(* *)
;(* Damien Doligez, projet Moscova, INRIA Rocquencourt *)
;(* *)
diff --git a/caml-xemacs.el b/caml-xemacs.el
index 45d670c..79321e0 100644
--- a/caml-xemacs.el
+++ b/caml-xemacs.el
@@ -1,6 +1,6 @@
;(***********************************************************************)
;(* *)
-;(* Objective Caml *)
+;(* OCaml *)
;(* *)
;(* Didier Remy, projet Cristal, INRIA Rocquencourt *)
;(* *)
diff --git a/caml.el b/caml.el
index 2e37bff..342305d 100644
--- a/caml.el
+++ b/caml.el
@@ -1,6 +1,6 @@
;(***********************************************************************)
;(* *)
-;(* Objective Caml *)
+;(* OCaml *)
;(* *)
;(* Jacques Garrigue and Ian T Zimmerman *)
;(* *)
@@ -19,12 +19,12 @@
;;indentation code is Copyright (C) 1996 by Ian T Zimmerman <[email protected]>
;;copying: covered by the current FSF General Public License.
-;; indentation code adapted for Objective Caml by Jacques Garrigue,
+;; indentation code adapted for OCaml by Jacques Garrigue,
;; july 1997. <[email protected]>
;;user customizable variables
(defvar caml-quote-char "'"
- "*Quote for character constants. \"'\" for Objective Caml, \"`\" for
Caml-Light.")
+ "*Quote for character constants. \"'\" for OCaml, \"`\" for Caml-Light.")
(defvar caml-imenu-enable nil
"*Enable Imenu support.")
diff --git a/camldebug.el b/camldebug.el
index 57a9870..199a6cc 100644
--- a/camldebug.el
+++ b/camldebug.el
@@ -1,6 +1,6 @@
;(***********************************************************************)
;(* *)
-;(* Objective Caml *)
+;(* OCaml *)
;(* *)
;(* Jacques Garrigue and Ian T Zimmerman *)
;(* *)
diff --git a/inf-caml.el b/inf-caml.el
index f3e4c48..4b9cd6b 100644
--- a/inf-caml.el
+++ b/inf-caml.el
@@ -1,6 +1,6 @@
;(***********************************************************************)
;(* *)
-;(* Objective Caml *)
+;(* OCaml *)
;(* *)
;(* Xavier Leroy and Jacques Garrigue *)
;(* *)
diff --git a/ocamltags.in b/ocamltags.in
index aa3f8df..2a6aadb 100644
--- a/ocamltags.in
+++ b/ocamltags.in
@@ -2,7 +2,7 @@
;(***********************************************************************)
;(* *)
-;(* Objective Caml *)
+;(* OCaml *)
;(* *)
;(* Jacques Garrigue and Ian T Zimmerman *)
;(* *)
