[Pkg-ocaml-maint-commits] [ocp-indent] 02/03: Merge tag 'upstream/1.5'

[Johannes Schauer]

This is an automated email from the git hooks/post-receive script.

josch pushed a commit to branch master
in repository ocp-indent.

commit 648fdcf9b26d6e3a887a8ce6f2e729dd77a8452e
Merge: 5753715 5f1f89c
Author: josch <j.schauer at email.de>
Date:   Wed Apr 29 19:39:44 2015 +0200

    Merge tag 'upstream/1.5'
    
    Upstream version 1.5

 .gitignore                                         |   9 +-
 ocp-indent.install                                 |   6 +-
 src/approx_lexer.mll                               |  68 +-
 src/approx_tokens.ml                               |   3 -
 src/indentArgs.ml                                  |  12 +-
 src/indentBlock.ml                                 | 189 ++---
 src/indentExtend.ml                                |   5 +
 src/indentPrinter.ml                               |  38 +-
 src/nstream.ml                                     |  24 +-
 src/ocp-indent.ocp                                 |   2 +-
 src/pos.mli                                        |   9 -
 tests/failing-output/js-args.ml                    |   6 +-
 tests/failing-output/js-bench.ml                   |  39 -
 tests/failing-output/js-default.ml                 |  10 -
 tests/failing-output/js-functor.ml                 |  33 +-
 tests/failing-output/js-let.ml                     |  43 --
 tests/failing-output/js-list.ml                    |  13 -
 tests/failing-output/js-low-priority.ml            |  36 -
 tests/failing-output/js-record.ml                  |   2 -
 tests/failing-output/js-test.ml                    |  35 -
 tests/failing-output/js-to-do.ml                   |   2 -
 tests/failing-output/js-try.ml                     |   5 -
 tests/failing-output/js-type.ml                    |  54 --
 tests/failing-output/lwt.ml                        |  24 -
 tests/failing.html                                 | 790 +++++++--------------
 tests/failing/js-args.ml                           |   2 -
 tests/failing/js-functor.ml                        |  25 +-
 tests/failing/js-record.ml                         |   2 -
 tests/failing/js-to-do.ml                          |   2 -
 tests/passing/exprs.ml                             |   8 +
 tests/passing/ifand.ml                             |   8 +-
 tests/passing/js-andand.ml                         |   3 +-
 tests/passing/js-begin.ml                          |   1 -
 tests/{failing => passing}/js-bench.ml             |   0
 tests/{failing => passing}/js-bench.ml.opts        |   0
 tests/passing/js-bind.ml                           |   2 -
 tests/passing/js-comment.ml                        |   8 +-
 tests/passing/js-comment.ml.ref                    |   8 +-
 tests/passing/js-comment1.ml                       |   8 +-
 tests/passing/js-comment1.ml.ref                   |   8 +-
 tests/{failing => passing}/js-default.ml           |   1 -
 tests/{failing => passing}/js-default.ml.opts      |   0
 tests/passing/js-fun.ml                            |  64 +-
 tests/passing/js-label.ml                          |  19 +
 .../js-let.ml.opts => passing/js-label.ml.opts}    |   0
 tests/{failing => passing}/js-let.ml               |   1 -
 tests/{failing => passing}/js-let.ml.opts          |   0
 tests/{failing => passing}/js-list.ml              |   1 -
 tests/{failing => passing}/js-list.ml.opts         |   0
 tests/{failing => passing}/js-low-priority.ml      |   5 +-
 tests/{failing => passing}/js-low-priority.ml.opts |   0
 tests/passing/js-syntax.ml                         |  12 +
 .../js-test.ml.opts => passing/js-syntax.ml.opts}  |   0
 tests/{failing => passing}/js-test.ml              |   0
 tests/{failing => passing}/js-test.ml.opts         |   0
 tests/{failing => passing}/js-try.ml               |   0
 tests/{failing => passing}/js-try.ml.opts          |   0
 tests/{failing => passing}/js-type.ml              |   0
 tests/{failing => passing}/js-type.ml.opts         |   0
 tests/{failing => passing}/lwt.ml                  |   0
 tests/{failing => passing}/lwt.ml.opts             |   0
 tests/passing/pattern.ml                           |   2 +-
 tests/passing/type-and.ml                          |   6 +
 tests/passing/unit-types.ml                        |   2 +-
 tools/ocp-indent.el                                |   9 +-
 tools/ocp-indent.vim                               |  85 +--
 tools/tuareg-indent                                |   2 +-
 67 files changed, 652 insertions(+), 1099 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocp-indent.git