diff options
Diffstat (limited to 'emacs')
| -rw-r--r-- | emacs/Makefile | 2 | ||||
| -rw-r--r-- | emacs/README | 4 | ||||
| -rw-r--r-- | emacs/caml-compat.el | 2 | ||||
| -rw-r--r-- | emacs/caml-emacs.el | 2 | ||||
| -rw-r--r-- | emacs/caml-font-old.el | 4 | ||||
| -rw-r--r-- | emacs/caml-font.el | 12 | ||||
| -rw-r--r-- | emacs/caml-help.el | 2 | ||||
| -rw-r--r-- | emacs/caml-hilit.el | 4 | ||||
| -rw-r--r-- | emacs/caml-types.el | 2 | ||||
| -rw-r--r-- | emacs/caml-xemacs.el | 2 | ||||
| -rw-r--r-- | emacs/caml.el | 6 | ||||
| -rw-r--r-- | emacs/camldebug.el | 2 | ||||
| -rw-r--r-- | emacs/inf-caml.el | 2 | ||||
| -rw-r--r-- | emacs/ocamltags.in | 2 |
14 files changed, 30 insertions, 18 deletions
diff --git a/emacs/Makefile b/emacs/Makefile index 077770c64..125e9eb54 100644 --- a/emacs/Makefile +++ b/emacs/Makefile @@ -1,6 +1,6 @@ ######################################################################### # # -# Objective Caml # +# OCaml # # # # Xavier Leroy, projet Cristal, INRIA Rocquencourt # # # diff --git a/emacs/README b/emacs/README index 7ddb362b4..7dedfc89a 100644 --- a/emacs/README +++ b/emacs/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/emacs/caml-compat.el b/emacs/caml-compat.el index 8ba7a99c7..da54cd0dc 100644 --- a/emacs/caml-compat.el +++ b/emacs/caml-compat.el @@ -1,6 +1,6 @@ ;(***********************************************************************) ;(* *) -;(* Objective Caml *) +;(* OCaml *) ;(* *) ;(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *) ;(* *) diff --git a/emacs/caml-emacs.el b/emacs/caml-emacs.el index d0a2c86ee..06cabf302 100644 --- a/emacs/caml-emacs.el +++ b/emacs/caml-emacs.el @@ -1,6 +1,6 @@ ;(***********************************************************************) ;(* *) -;(* Objective Caml *) +;(* OCaml *) ;(* *) ;(* Didier Remy, projet Cristal, INRIA Rocquencourt *) ;(* *) diff --git a/emacs/caml-font-old.el b/emacs/caml-font-old.el index 8faa542f0..12c318c90 100644 --- a/emacs/caml-font-old.el +++ b/emacs/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/emacs/caml-font.el b/emacs/caml-font.el index 956225466..09d1ae701 100644 --- a/emacs/caml-font.el +++ b/emacs/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/emacs/caml-help.el b/emacs/caml-help.el index 59d8a3b0c..101963294 100644 --- a/emacs/caml-help.el +++ b/emacs/caml-help.el @@ -1,6 +1,6 @@ ;(***********************************************************************) ;(* *) -;(* Objective Caml *) +;(* OCaml *) ;(* *) ;(* Didier Remy, projet Cristal, INRIA Rocquencourt *) ;(* *) diff --git a/emacs/caml-hilit.el b/emacs/caml-hilit.el index 697e58173..0d437c509 100644 --- a/emacs/caml-hilit.el +++ b/emacs/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/emacs/caml-types.el b/emacs/caml-types.el index 3c7433a81..70d38bcce 100644 --- a/emacs/caml-types.el +++ b/emacs/caml-types.el @@ -1,6 +1,6 @@ ;(***********************************************************************) ;(* *) -;(* Objective Caml *) +;(* OCaml *) ;(* *) ;(* Damien Doligez, projet Moscova, INRIA Rocquencourt *) ;(* *) diff --git a/emacs/caml-xemacs.el b/emacs/caml-xemacs.el index 45d670c7a..79321e005 100644 --- a/emacs/caml-xemacs.el +++ b/emacs/caml-xemacs.el @@ -1,6 +1,6 @@ ;(***********************************************************************) ;(* *) -;(* Objective Caml *) +;(* OCaml *) ;(* *) ;(* Didier Remy, projet Cristal, INRIA Rocquencourt *) ;(* *) diff --git a/emacs/caml.el b/emacs/caml.el index 2e37bff52..342305de9 100644 --- a/emacs/caml.el +++ b/emacs/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 <itz@rahul.net> ;;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. <garrigue@kurims.kyoto-u.ac.jp> ;;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/emacs/camldebug.el b/emacs/camldebug.el index 57a98701b..199a6cc1a 100644 --- a/emacs/camldebug.el +++ b/emacs/camldebug.el @@ -1,6 +1,6 @@ ;(***********************************************************************) ;(* *) -;(* Objective Caml *) +;(* OCaml *) ;(* *) ;(* Jacques Garrigue and Ian T Zimmerman *) ;(* *) diff --git a/emacs/inf-caml.el b/emacs/inf-caml.el index f3e4c48d1..4b9cd6bb8 100644 --- a/emacs/inf-caml.el +++ b/emacs/inf-caml.el @@ -1,6 +1,6 @@ ;(***********************************************************************) ;(* *) -;(* Objective Caml *) +;(* OCaml *) ;(* *) ;(* Xavier Leroy and Jacques Garrigue *) ;(* *) diff --git a/emacs/ocamltags.in b/emacs/ocamltags.in index aa3f8df1d..2a6aadbfb 100644 --- a/emacs/ocamltags.in +++ b/emacs/ocamltags.in @@ -2,7 +2,7 @@ ;(***********************************************************************) ;(* *) -;(* Objective Caml *) +;(* OCaml *) ;(* *) ;(* Jacques Garrigue and Ian T Zimmerman *) ;(* *) |