aboutsummaryrefslogtreecommitdiffstats
path: root/lib
AgeCommit message (Collapse)Author
2016-10-07Merge branch 'maint'Dan Gudmundsson
* maint: New file erlang-edoc.el to support EDoc in erlang-mode Allow reusing mnesia select continuations Fix guard test for chardata
2016-10-07Merge branch 'dgud/wx/fix-unicode-chardata/ERL-270/OTP-13934' into maintDan Gudmundsson
* dgud/wx/fix-unicode-chardata/ERL-270/OTP-13934: Fix guard test for chardata
2016-10-07Merge branch 'dgud/mnesia/dirty_select_cont/PR-1184/OTP-13944' into maintDan Gudmundsson
* dgud/mnesia/dirty_select_cont/PR-1184/OTP-13944: Allow reusing mnesia select continuations
2016-10-07Merge branch 'dgud/tools/emacs/edoc-support/PR-1195/OTP-13945' into maintDan Gudmundsson
* dgud/tools/emacs/edoc-support/PR-1195/OTP-13945: New file erlang-edoc.el to support EDoc in erlang-mode
2016-10-06New file erlang-edoc.el to support EDoc in erlang-modeLeo Liu
- EDoc markup font-locking and tag completion - EDoc comment indentation
2016-10-06Merge branch 'maint'Ingela Anderton Andin
Conflicts: OTP_VERSION
2016-10-06Merge branch 'maint-19' into maintIngela Anderton Andin
2016-10-06Update release notesErlang/OTP
2016-10-06Allow reusing mnesia select continuationsDániel Szoboszlay
A continuation returned by mnesia:select/[14] should be reusable in different, non-transactional activities. Aborting with wrong_transaction doesn't make sense in a dirty context.
2016-10-05Merge branch 'maint'Hans Bolinder
* maint: parsetools: Correct counting of newlines
2016-10-05Fix guard test for chardataDan Gudmundsson
Previously only accepted lists tough a call is made to unicode:characters_to_binary/1, and the functions where specified to handle chardata.
2016-10-05Merge branch 'hasse/parsetools/fix_leex_counting/ERL-263/OTP-13916' into maintHans Bolinder
* hasse/parsetools/fix_leex_counting/ERL-263/OTP-13916: parsetools: Correct counting of newlines
2016-10-05Merge branch 'maint'Dan Gudmundsson
* maint: wx: add wxWindowDragAcceptFiles wx: Add simple dropfiles support
2016-10-05Merge branch 'dgud/wx/drop-files/OTP-13933' into maintDan Gudmundsson
* dgud/wx/drop-files/OTP-13933: wx: add wxWindowDragAcceptFiles wx: Add simple dropfiles support
2016-10-05ssh: Prepare releaseIngela Anderton Andin
2016-10-05ssh: Handle gen_server:call/3 exits properlyIngela Anderton Andin
Handle all possible exit values that should be interpreted as {error, closed}. Failing to do so could lead to unexpected crashes for users of the ssh application.
2016-10-05Merge branch 'maint'Björn Gustavsson
* maint: Update primary bootstrap beam_block: Avoid unsafe inclusion of get_map_elements in blocks
2016-10-05Merge branch 'bjorn/compiler/beam_block/ERL-266/OTP-13931' into maintBjörn Gustavsson
* bjorn/compiler/beam_block/ERL-266/OTP-13931: beam_block: Avoid unsafe inclusion of get_map_elements in blocks
2016-10-05beam_block: Avoid unsafe inclusion of get_map_elements in blocksBjörn Gustavsson
c2035ebb8b restricted the get_map_elements instruction so that it could only occur at the beginning of a block. It turns out that including it anywhere in a block is unsafe. Therefore, never put get_map_elements instruction in blocks. (Also remove the beam_utils:join_even/2 function since it is no longer used.) ERL-266
2016-10-05Merge branch 'maint'Dan Gudmundsson
* maint: erlang-mode: do not configure require-final-newline
2016-10-05Merge branch 'dgud/emacs/do-not-require-final-newline/PR-1130' into maintDan Gudmundsson
* dgud/emacs/do-not-require-final-newline/PR-1130: erlang-mode: do not configure require-final-newline
2016-10-05Merge branch 'maint'Hans Bolinder
* maint: add info for param and returns tags
2016-10-05Merge branch 'cypherfox/edoc/add_doc/PR-1175' into maintHans Bolinder
* cypherfox/edoc/add_doc/PR-1175: add info for param and returns tags
2016-10-04Merge branch 'maint'Raimo Niskanen
2016-10-04Merge branch 'RoadRunnr/crypto/no-rc4/PR-1169/OTP-13896' into maintRaimo Niskanen
* RoadRunnr/crypto/no-rc4/PR-1169/OTP-13896: disable RC4 in SSL when crypto doesn't support it Fix compilation when OpenSSL doesn't support RC4 Conflicts: lib/crypto/c_src/crypto.c
2016-10-04Merge branch 'legoscia/crypto/no-rc2/PR-1163/OTP-13895' into maintRaimo Niskanen
* legoscia/crypto/no-rc2/PR-1163/OTP-13895: Fix compilation when OpenSSL doesn't support RC2
2016-10-04Merge branch 'maint'Ingela Anderton Andin
2016-10-04ssl: Correct tests tcp stream handlingIngela Anderton Andin
Data collection function active_once_raw/4 did not handle streamed data correctly (it assumed the stream was "packet oriented"), which could result in that the test case perceived that it did not receive all data even though it did.
2016-10-04add info for param and returns tagsLutz Behnke
2016-10-03Merge branch 'maint'Ingela Anderton Andin
2016-09-30ssl: Correct anonymous suite handlingIngela Anderton Andin
Test suite did not take TLS-version in to account. Also some anonymous suites where included incorrectly in some TLS versions.
2016-09-29Merge branch 'rickard/time-unit/OTP-13831'Rickard Green
* rickard/time-unit/OTP-13831: Replace usage of deprecated time units
2016-09-29Merge branch 'maint'Ingela Anderton Andin
Conflicts: OTP_VERSION
2016-09-29Merge branch 'maint-19' into maintIngela Anderton Andin
2016-09-29Merge branch 'josevalim/compiler/at-var/PR-1081/OTP-13924'Björn Gustavsson
* josevalim/compiler/at-var/PR-1081/OTP-13924: Use @ in variable names generated by core and kernel
2016-09-29Merge branch 'bjorn/compiler/misc'Björn Gustavsson
* bjorn/compiler/misc: sys_core_fold: Run optimizations to a fixpoint sys_core_fold: Improve case optimization sys_core_fold: Correct scope verification code core_pp: Correct printing of map updates Simplify handling of internal BIFs v3_life: Eliminate special handling of guards Simplify beam_utils bs_match_SUITE: Add a test case for beam_utils bif_SUITE: Cover the remaining uncovered lines erl_bifs: Remove error_logger:warning_map/0 as a safe BIF beam_validator: Correct reporting of y register number beam_jump: Don't try to handle a label at the very end beam_jump: Simplify eliminate_fallthroughs/2 beam_listing: Remove support for listing sys_pre_expand format
2016-09-29Merge branch 'nathanl/kernel/write_file-uses-writev/PR-1149/OTP-13909'Björn Gustavsson
* nathanl/kernel/write_file-uses-writev/PR-1149/OTP-13909: Let file:write_file/3 use writev
2016-09-29Merge branch 'maint'Siri Hansen
2016-09-29Merge branch 'siri/doc-add_pathsa-order/ERL-267/OTP-13920' into maintSiri Hansen
* siri/doc-add_pathsa-order/ERL-267/OTP-13920: Document the order of directories added with code:add_pathsa/1
2016-09-29wx: add wxWindowDragAcceptFilesDan Gudmundsson
Enable window to handle drop file events.
2016-09-29parsetools: Correct counting of newlinesHans Bolinder
See https://bugs.erlang.org/browse/ERL-263 The fix in commit c9bc5c94 of PR-431 (https://github.com/erlang/otp/pull/431) introduced new problems.
2016-09-29Merge branch 'maint'Hans Bolinder
* maint: parsetools: Correct handling of Unicode in Leex Don't report error for shutdown exit tuple
2016-09-29Merge branch 'hasse/parsetools/fix_leex_unicode/OTP-13919' into maintHans Bolinder
* hasse/parsetools/fix_leex_unicode/OTP-13919: parsetools: Correct handling of Unicode in Leex
2016-09-28Document the order of directories added with code:add_pathsa/1Siri Hansen
code:add_pathsa/1 reverts the list of directories when adding it at the beginning of the code path. The command line option '-pa' behaves in the same way. This is now documented.
2016-09-28Merge branch ↵Siri Hansen
'legoscia/dynamic-child-shutdown-tuple/ERL-163/PR-1158/OTP-13907' into maint * legoscia/dynamic-child-shutdown-tuple/ERL-163/PR-1158/OTP-13907: Don't report error for shutdown exit tuple
2016-09-28wx: Add simple dropfiles supportDan Gudmundsson
Added wxDropFiles event
2016-09-28Merge branch 'maint'Hans Nilsson
2016-09-28ssh: Update vsn.mkHans Nilsson
2016-09-28Merge branch 'maint'Hans Nilsson
2016-09-28Merge branch 'isvilen/ssh_REPL_exit_status/PR-1173/OTP-13905' into maintHans Nilsson