Commit Graph

153 Commits (0f1bb864df2b92d2ffc87d62a539d6cd2f1ab403)

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
Damien Doligez 44d2d94fe5 fix undeclared variable
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13427 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-03-22 18:19:21 +00:00
Gabriel Scherer 0b2eaffff3 PR#5954 fix 'defface' use in emacs/caml-help.el (patched by 'zakkak')
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13402 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-03-17 17:17:21 +00:00
Damien Doligez c63f9e0957 fix a few problems with whitespace and over-long lines
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13393 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-03-09 22:38:52 +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 3c4ae5ead5 do byte-compile file caml-font.el
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12842 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-08-08 15:25:23 +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 6be05dae42 add some missing copyright headers
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12814 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-08-02 08:17:59 +00:00
Damien Doligez 997a678d5e clean up TABs and whitespace
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12799 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-30 18:04:46 +00:00
Damien Doligez 5b7fbfba8a PR#5137: caml-types-explore does not work
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12696 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-10 17:51:04 +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 816ac58196 PR#5176: caml-types.el: large types trigger stack overflow in regexp matcher
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12119 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-02-03 20:37:26 +00:00
Damien Doligez 1afe70ff8a PR#5403: give better error message when emacs is not found in PATH
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12118 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-02-03 16:04:49 +00:00
Damien Doligez 2a15127aa8 fix whitespace
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12083 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-01-27 10:42:59 +00:00
Damien Doligez e6c0b95f40 PR#5455: .emacs instructions, add lines to recognize ocaml scripts
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11979 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-12-29 22:10:39 +00:00
Damien Doligez 19e2bca8ea correct syntax highlighting in emacs (continued)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11923 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-12-21 15:39:12 +00:00
Damien Doligez 07a128aea1 correct fontification for strings and comments
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11289 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-11-29 15:18:41 +00:00
Didier Rémy 37b6033e8a - Replaced setq by add-to-list in README
- Fixed detection of site-lisp in Makefile (to fail when ambiguous). 


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11190 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-09-13 12:25:52 +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 90664f4ea1 uniform .ignore system
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11133 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-07-20 15:37:36 +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
Didier Rémy 486270b604 Undoing last commit by error.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10609 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-06-29 12:15:52 +00:00
Didier Rémy abf1ca980c Fixed caml-help (would loose the position of the symbol search for).
Added highlighting of the symbol searched for. 


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10608 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-06-29 12:12:24 +00:00
Didier Rémy 34c0efcc4e Added save-excursion to ocaml-link-activate.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10323 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-04-28 11:11:07 +00:00
Didier Rémy ffb6aee83e fixes bug 0004997
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10322 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-04-28 10:33:43 +00:00
Didier Rémy 482ae23e13 fixes bug 0005016--missing quote
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10317 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-04-27 08:45:18 +00:00
Didier Rémy e36857e8eb fixes bug 0005016
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10316 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-04-27 08:26:53 +00:00
Damien Doligez 04b1656222 clean up spaces and tabs
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9547 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-01-22 12:48:24 +00:00
Damien Doligez bdc0fadee2 merge changes from release/3.11.1 to release/3.11.2
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9540 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-01-20 16:26:46 +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 50da157513 amelioration des annotations
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8959 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-07-29 15:49:31 +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 9ea5edac9a merge changes 3.10.0 -> 3.10.1
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8768 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-01-11 16:13:18 +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 9d7b5513e3 petit problem de doc
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8413 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-10-08 12:27:15 +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
Damien Doligez f700284aac fusion des changements 3.09.3 -> release309_merge310
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7849 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-02-09 13:31:15 +00:00
Damien Doligez 00d04c0c92 nettoyage
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7169 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2005-10-26 13:23:12 +00:00
Damien Doligez 1ced22dda7 PR#3767 features 1 and 2: display full location of events instead of one position
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7031 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2005-08-25 15:35:16 +00:00
Damien Doligez a4a3c10e70 fusion des modifs de 3.08.4
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7019 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2005-08-13 20:59:37 +00:00
Damien Doligez e6007f6057 fusion des changements jusqu'a 3.08.3
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6824 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2005-03-24 17:20:54 +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