aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2016-05-20Merge branch 'binarin/fix-absolute-paths/PR-1056/OTP-13617'Björn-Egil Dahlberg
* binarin/fix-absolute-paths/PR-1056/OTP-13617: Fix program paths used in build process
2016-05-20Merge branch 'kostis/compiler/cerl-arity/PR-1059'Björn Gustavsson
* kostis/compiler/cerl-arity/PR-1059: Use arity() consistently
2016-05-20Merge branch 'dgud/observer/process-display-binary'Dan Gudmundsson
* dgud/observer/process-display-binary: observer: sync close to avoid process crash reports Test cuddling observer: Align system info boxes Change binary debug tuple to size and refc info
2016-05-20Merge branch 'dgud/tools/emacs-xref/PR-1051'Dan Gudmundsson
* dgud/tools/emacs-xref/PR-1051: Add xref support in erlang.el Conflicts: lib/tools/emacs/erlang.el
2016-05-20Add xref support in erlang.elJohan Claesson
In GNU Emacs 25 xref will be introduced. It is a framework for cross referencing commands, in particular commands for finding definitions. It does not replace etags. It rather resides on top of it and provides user-friendly commands. The idea is that the user commands should be the same regardless of what back-end does the actual finding of definitions. Add to the xref commands awareness of the module:tag syntax in a similar way that is already done for the old etags commands. Xref completion support is not included in this commit. Remove all compilation warnings for GNU Emacs 24.5 and current 25 (4ffec91). Remove XEmacs incompatibility in erlang-font-lock-exported-function-name-face. Add file erlang-test.el with a single unit test. Add TAGS to .gitignore.
2016-05-20Merge branch 'ingela/ssl/gen-statem-setopts/ERL-147'Ingela Anderton Andin
* ingela/ssl/gen-statem-setopts/ERL-147: ssl: Setopts should be allowed in all states
2016-05-19Merge branch 'mururu/eunit/debugvalall/PR-1024/OTP-13612'Björn Gustavsson
* mururu/eunit/debugvalall/PR-1024/OTP-13612: eunit: Add ?debugValAll macro
2016-05-19ssl: Setopts should be allowed in all statesIngela Anderton Andin
2016-05-19Merge branch 'egil/odbc/fix-unmatched_return/OTP-13595'Björn-Egil Dahlberg
* egil/odbc/fix-unmatched_return/OTP-13595: odbc: Fix unmatched return warnings
2016-05-18Use arity() consistentlyKostis Sagonas
Specs of various *_arity functions in this module used different types (integer(), non_neg_integer(), byte()) to refer to the type arity().
2016-05-18Merge branch 'lars/inets-deprecated-now/OTP-12441'Lars Thorsen
* lars/inets-deprecated-now/OTP-12441: [inets] Remove calls to the inets_time_compat module [inets] Remove usage of erlang:now()
2016-05-18[inets] Remove calls to the inets_time_compat moduleLars Thorsen
2016-05-18[inets] Remove usage of erlang:now()Lars Thorsen
2016-05-18odbc: Fix unmatched return warningsBjörn-Egil Dahlberg
2016-05-18Merge branch 'egil/xmerl/fix-unmatched_return/OTP-13595'Björn-Egil Dahlberg
* egil/xmerl/fix-unmatched_return/OTP-13595: xmerl: Fix unmatched return warnings
2016-05-18Merge branch 'egil/percept/fix-unmatched_return/OTP-13595'Björn-Egil Dahlberg
* egil/percept/fix-unmatched_return/OTP-13595: egd: Fix unmatched return warnings egd: Small code style refactoring percept: Fix unmatched return warnings percept: Small code style refactoring
2016-05-18Merge branch 'dgud/tools/emacs/PR-1054/OTP-13610'Dan Gudmundsson
* dgud/tools/emacs/PR-1054/OTP-13610: Fix line-initial commas' indentation in type specs
2016-05-18Fix line-initial commas' indentation in type specsDániel Szoboszlay
Inside type specs, line-initial commas shall align with open curly braces. This also applies to record definitions with type specs for the fields. For example: -type foo() :: { a :: integer() , b :: integer() }. For type specs for functions, the commas shall align with the opening parenthese. So do a closing parenthese when put on a new line. For example: -spec foo( X :: integer() , Y :: integer() ) -> integer(). This does not affect coding styles that don't put commas at the beginning of lines.
2016-05-18Merge branch 'hasse/erl_docgen/datatype_anchors/OTP-13600/ERL-141'Hans Bolinder
* hasse/erl_docgen/datatype_anchors/OTP-13600/ERL-141: kernel: Remove no longer needed anchors in documentation stdlib: Remove no longer needed anchors in documentation erts: Remove no longer needed anchors in documentation erl_docgen: Add anchors to datatypes without name attribute
2016-05-18Merge branch 'bjorn/handle-bad-path/ERL-142'Björn Gustavsson
* bjorn/handle-bad-path/ERL-142: Tolerate bad directories in the code path
2016-05-18Merge branch 'bjorn/erts/raise-doc/OTP-13599'Björn Gustavsson
* bjorn/erts/raise-doc/OTP-13599: Remove the warning about using erlang:raise/3
2016-05-18Merge branch 'bjorn/erts/cuddle-with-tests'Björn Gustavsson
* bjorn/erts/cuddle-with-tests: time_SUITE: Make consistency/1 work in any timezone
2016-05-17Merge branch 'sverker/test-einode-core'Sverker Eriksson
2016-05-17Merge branch 'sverker/hipe-amd64-code-alloc/OTP-13359'Sverker Eriksson
This merge is actually only some left overs. The bulk work for hipe-amd64-code-alloc has already been merge (without ticket number) at 42a1166b47721cd444.
2016-05-17Merge branch 'sverker/runtime_tools/trace_ip_drv/OTP-13576/ERL-119'Sverker Eriksson
2016-05-17Merge branch 'sverker/trace-send-receive-matchspec/OTP-13507'Sverker Eriksson
Second merge of this branch to master with some more docs
2016-05-17Merge branch 'mikpe/otp-19-erts-integer-truncation-bugs/PR-1045/OTP-13606'Lukas Larsson
* mikpe/otp-19-erts-integer-truncation-bugs/PR-1045/OTP-13606: erl_unicode.c: fix integer truncation problems do not limit heap fragments to 4 giga-words erts_new_mso_binary(): do not truncate len Conflicts: erts/emulator/beam/erl_nif.c
2016-05-17xmerl: Fix unmatched return warningsBjörn-Egil Dahlberg
2016-05-17Merge branch 'lukas/erts/max_heap_fix_erllvm/OTP-13174'Lukas Larsson
* lukas/erts/max_heap_fix_erllvm/OTP-13174: erts: Move max_heap_size field so that ErLLVM works again
2016-05-17Fix program paths used in build processAlexey Lebedeff
Followup to https://github.com/erlang/otp/pull/1023 - make/make_emakefile is fixed because otherwise './otp_build tests' fails early. - And grep showed that there is only one other file that also should be fixed - lib/public_key/priv/generate
2016-05-17erts: Move max_heap_size field so that ErLLVM works againLukas Larsson
2016-05-17Merge branch 'lukas/erts/re-openbsd-gcc-bug/OTP-13602'Lukas Larsson
* lukas/erts/re-openbsd-gcc-bug/OTP-13602: erts: Fix OpenBSD gcc compiler bug in re code
2016-05-17erts: Fix OpenBSD gcc compiler bug in re codeLukas Larsson
The OpenBSD 5.8 gcc compiler emits erroneous code which results in the re:run function behaving badly, though strangely enough it does not segfault the vm. This fix moves code around a bit in order to make gcc emit correct code.
2016-05-17Merge branch 'lukas/erts/tracing/fix-non-smp-trace/OTP-13503'Lukas Larsson
* lukas/erts/tracing/fix-non-smp-trace/OTP-13503: erts: Fix erl_tracer xml doc errors erts: Fix bug when tracing in non-smp non-scheduler thread
2016-05-17erts: Fix erl_tracer xml doc errorsLukas Larsson
2016-05-17erts: Fix bug when tracing in non-smp non-scheduler threadLukas Larsson
2016-05-17Merge branch 'dgud/wx/cmd-queue-bug'Dan Gudmundsson
* dgud/wx/cmd-queue-bug: Fix compilation warning wx: Fix generated defines in gl.hrl wx: Fix driver command queue
2016-05-17observer: sync close to avoid process crash reportsDan Gudmundsson
Try to make observer stop nicer, i.e. without async crash reports
2016-05-17Merge branch 'jrobhoward/os_mon/fix-freebsd_get_os_wordsize/PR-1039/OTP-13601'Björn-Egil Dahlberg
* jrobhoward/os_mon/fix-freebsd_get_os_wordsize/PR-1039/OTP-13601: Fix memsup:get_os_wordsize() on 64-bit Linux PPC os_mon: Test wordsize of memsup:get_os_wordsize/0 Fix memsup:get_os_wordsize() on 64-bit FreeBSD
2016-05-17egd: Fix unmatched return warningsBjörn-Egil Dahlberg
2016-05-17egd: Small code style refactoringBjörn-Egil Dahlberg
2016-05-17Merge remote-tracking branch 'origin/ingela/public_key/tests'Ingela Anderton Andin
* origin/ingela/public_key/tests: public_key: Remove test_server config macros and unsed hooks
2016-05-17percept: Fix unmatched return warningsBjörn-Egil Dahlberg
2016-05-17percept: Small code style refactoringBjörn-Egil Dahlberg
2016-05-17kernel: Remove no longer needed anchors in documentationHans Bolinder
2016-05-17stdlib: Remove no longer needed anchors in documentationHans Bolinder
2016-05-17erts: Remove no longer needed anchors in documentationHans Bolinder
2016-05-17erl_docgen: Add anchors to datatypes without name attributeHans Bolinder
db_html.xsl generates anchors for data types referred to by strings (instead of 'name' attributes). For example: <datatype> <name>edge()</name> </datatype> generates: <p><a name="type-edge"><span class="bold_code">edge()</span></a><br></p>
2016-05-17Merge branch 'egil/egd/improve-line/OTP-13598'Björn-Egil Dahlberg
* egil/egd/improve-line/OTP-13598: egd: Save images during tests egd: Use anti-aliasing for lines egd: Add more line tests egd: Add line thickness algorithm for lines egd: Use maps to map height to line spans egd: Refactor precompile objects egd: Refactor object_on_line egd: Refactor primitives style egd: Improve span calculation
2016-05-17Merge branch 'ingela/inets/dialyzer'Ingela Anderton Andin
* ingela/inets/dialyzer: inets: httpd_util:split does not return {error, Reason}