Commit Graph

56 Commits (63e31394eb2cb73943e242902549d1fdbacd3234)

Author SHA1 Message Date
Damien Doligez 7844495624 Merge branch 4.01 from branching point to 4.01.0+rc1
Command line used:
  svn merge --accept postpone -r 13776:14055 $REPO/version/4.01 .


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14060 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-09-04 15:12:37 +00:00
Damien Doligez 18962fdd15 fix whitespace and over-long lines
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13428 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-03-22 18:19:29 +00:00
Jacques Garrigue 6970ac6e71 merge patch by Stefan Monnier from PR#5884
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13253 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-01-17 02:56:00 +00:00
Damien Doligez def31744f9 remove all $Id keywords
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13013 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-10-15 17:50:56 +00:00
Damien Doligez f169f1eafd PR#5727: emacs caml-mode indents shebang line in toplevel scripts
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12974 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-09-28 16:56:30 +00:00
Damien Doligez fadcb07197 PR#5070, continued: also parse backtrace locations
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12843 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-08-08 15:25:55 +00:00
Damien Doligez f88c9efcf1 PR#4994: ocaml-mode doesn't work with xemacs21
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12840 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-08-08 14:32:59 +00:00
Damien Doligez d4522f062c Change "Ocaml" to "OCaml" everywhere
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12152 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-02-13 17:48:41 +00:00
Damien Doligez e7f5b858c2 More renaming to OCaml
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12149 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-02-10 16:15:24 +00:00
Damien Doligez 3b507dd1aa 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
2011-07-27 14:17:02 +00:00
Damien Doligez c91db736b1 merge changes from 3.12.0 to 3.12.1
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11123 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-07-20 09:17:07 +00:00
Damien Doligez 1f95b17570 merge changes from 3.10.2merged to 3.11.0
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9153 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-12-03 18:09:09 +00:00
Damien Doligez ea524ca14f bug string-to-number
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8990 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-08-19 12:54:51 +00:00
Damien Doligez 7ca1d89250 amelioration des annotations
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8958 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-07-29 15:42:44 +00:00
Damien Doligez cdd5542ee9 PR#4469 enhanced caml-set-compile-command
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8765 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-01-11 11:53:24 +00:00
Damien Doligez 0593f338d4 PR#4440 added function to skip warnings and jump to error
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8704 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-12-04 13:37:47 +00:00
Damien Doligez 1dd68ccf50 ajout des annotations pour variables et appels terminaux
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8232 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-05-16 08:21:41 +00:00
Didier Rémy 09e17d4a6f Ajout de camldebug dans le menu Caml d'emacs.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6779 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2005-02-04 17:19:21 +00:00
Jacques Garrigue 47a8343f6e indentation of comments
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6622 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-09-24 08:52:29 +00:00
Damien Doligez c3a39fc8c8 Fusion des modifs de la branche release308 entre 3.08.0 et 3.08.1
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6612 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-08-20 17:04:35 +00:00
Didier Rémy 7cbb6ca64b caml-types:
- largest typed region is now dynamically recomputed.
 - changed binding to C-down-mouse-1 (allow other bindings).
 - allow scrolling when mouse is moved to bottom or top of window.
 - ignore key events, out of frame-motion, and wait for mouse release.


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5875 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-10-20 12:06:42 +00:00
Didier Rémy 8088053d8c caml-types: mouse track + little things
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5864 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-10-10 13:25:38 +00:00
Didier Rémy f9d0ac0c87 - added file caml-xemacs.el for XEmacs compatibility.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5751 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-07-28 18:06:49 +00:00
Didier Rémy 10a0767fda Changes to caml-types.el:
- added mouse exploration
 - revert annotation buffer when changed
 - narrow annotation buffer
 - added prefix arg to show annotation buffer

Changers to ocaml.el:
 - made caml-types and caml-help autoloaded.
 - move bindings from  caml-help and caml-types into caml.el


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5732 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-07-24 08:46:52 +00:00
Damien Doligez bdda8e194a integration de caml-types a caml.el
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5725 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-07-23 14:20:33 +00:00
Didier Rémy da20273d56 - compile-command in caml.le
- added hypertext links in caml-help (in addition to info link)


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5660 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-07-07 08:46:23 +00:00
Didier Rémy 4ebd6d1d12 - Fixed bugs + improved caml-help.el
- Added caml-set-compile-command hook to caml-mode-hook.


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5360 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-12-27 18:24:33 +00:00
Jacques Garrigue 1404188744 interactions bizarres de with
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5257 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-11-12 09:04:43 +00:00
Jacques Garrigue 5bce520453 skip structs in let module ... in
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5068 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-08-04 09:14:06 +00:00
Jacques Garrigue 956da4fa8c simplify electric
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4913 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-06-10 02:40:08 +00:00
Jacques Garrigue ea744c5028 caml-find-phrase
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4584 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-04-04 01:51:02 +00:00
Jacques Garrigue c2876e5c25 better interaction with toplevel
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4565 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-03-27 09:13:09 +00:00
Didier Rémy 96c3bf4e5c Made run-caml autoload in caml.el
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4243 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-01-09 20:38:33 +00:00
Didier Rémy 03acc6441f caml-indent-phrase
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4166 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2001-12-14 10:41:02 +00:00
Jacques Garrigue e6b3d2f09a improve indentation
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4165 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2001-12-14 00:22:23 +00:00
Didier Rémy efcdf92b6b Changement du mode inf-caml
- principalement pour qu'il reporte les erreurs du toplevel comme il le fait
pour le mode compilé.

 - également pour pourvoir envoyé plusieurs phrases d'un coup avec préfix
arg, ou successivement (le curseur suit l'envoi des phrases).

Vous pouvez tester et me dire s'il y a des problèmes avec la sémantique
actuelle. En particulier caml-mark-phrase est remplace par caml-find-phrase
qui ne fonctionne pas pareille.

        Didier


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4066 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2001-12-03 08:59:32 +00:00
Jacques Garrigue adcc99ac5b indentation autour de ";;"
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4065 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2001-12-03 06:13:55 +00:00
Jacques Garrigue db58f9cdcf xemacs keybind (PR#631)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4012 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2001-11-15 10:09:48 +00:00
Jacques Garrigue f1275a8793 process ;; correctly
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3968 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2001-11-01 07:41:18 +00:00
Damien Doligez fc53c99cda detabisation
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3573 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2001-07-12 12:54:24 +00:00
Jacques Garrigue 3d234f9659 patch par Didier le Botlan pour les commentaires
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3296 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2000-09-07 00:38:55 +00:00
Jacques Garrigue 5cefdb5aa4 indentation of else
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3248 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2000-07-24 02:39:34 +00:00
Jacques Garrigue 780b65fca6 nouvelle syntaxe avec tilde
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3061 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2000-04-12 03:43:25 +00:00
Damien Doligez 3f6a493b87 MacOS: ajout macosunix; portage bigarray et systhreads; tabs
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3042 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2000-04-05 18:30:22 +00:00
Jacques Garrigue 9bef4eaefb refinements
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@2457 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
1999-11-02 16:49:20 +00:00
Xavier Leroy 07e9a60325 MAJ avec la derniere version de Jacques
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@2439 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
1999-10-18 09:40:46 +00:00
Jacques Garrigue 7c7451976b intelligent indentation of parenthesis
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@2355 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
1999-03-30 06:07:26 +00:00
Xavier Leroy b474d60ca5 Manque un quote
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@2345 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
1999-03-10 09:51:32 +00:00
Jacques Garrigue c65f88f163 Snapshot 99/01/29
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@2260 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
1999-02-01 01:55:27 +00:00
Jacques Garrigue 705810fdde some changes due to ITZ
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@2238 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
1998-12-16 09:32:04 +00:00