aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2017-02-09Merge branch 'maint'Siri Hansen
Conflicts: lib/sasl/test/systools_SUITE.erl
2017-02-09Merge pull request #1329 from brucify/update_readmeBjörn-Egil Dahlberg
Update README.md
2017-02-09Merge branch 'siri/systools/warnings_as_errors-return/OTP-14170' into maintSiri Hansen
* siri/systools/warnings_as_errors-return/OTP-14170: [systools] Fix return value for warnings_as_errors + silent
2017-02-09Merge branch 'maint'Raimo Niskanen
2017-02-09Merge branch 'maint-r16' into maintRaimo Niskanen
2017-02-09Merge branch 'maint-r16b02' into maint-r16maint-r16Raimo Niskanen
Conflicts: lib/snmp/doc/src/notes.xml lib/snmp/src/app/snmp.appup.src lib/snmp/vsn.mk
2017-02-09Merge branch 'maint'Ingela Anderton Andin
2017-02-09Merge branch 'maint-r15' into maintIngela Anderton Andin
2017-02-09Merge pull request #1327 from ↵Björn Gustavsson
bjorng/bjorn/asn1/maps-instead-of-records/OTP-14004 Teach the ASN.1 compiler the 'maps' option OTP-14219
2017-02-09Merge pull request #1312 from richcarl/shell-smart-compileBjörn Gustavsson
Extend shell c(...) to find and recompile modules OTP-14190
2017-02-09Merge branch 'maint'Björn Gustavsson
* maint: Fix observer term conversion error spelling
2017-02-09Merge pull request #1333 from lepoetemaudit/observer-term-error-spellingBjörn Gustavsson
Fix observer term conversion error spelling
2017-02-09Merge branch 'maint'Björn Gustavsson
* maint: Reduce size of the log file for Travis CI Include more otp_SUITE tests cases in the smoke test
2017-02-09Merge pull request #1336 from bjorng/bjorn/travis-less-verboseBjörn Gustavsson
Reduce size of the log file for Travis CI
2017-02-09Merge pull request #1334 from bjorng/bjorn/extend-smoke-testBjörn Gustavsson
Include more otp_SUITE tests cases in the smoke test
2017-02-09emacs: revert erldoc changeDan Gudmundsson
did not load erldoc after changes
2017-02-09Merge remote-tracking branch 'upstream/pr/1297'Dan Gudmundsson
* upstream/pr/1297: Emacs: Describe how to run unit tests Emacs: Consider arity when jumping to definitions
2017-02-09Merge branch 'maint'Hans Bolinder
* maint: dialyzer: Correct PLT tests
2017-02-09Merge branch 'hasse/dialyzer/correct_plt_tests' into maintHans Bolinder
* hasse/dialyzer/correct_plt_tests: dialyzer: Correct PLT tests
2017-02-08Emacs: Describe how to run unit testsJohan Claesson
Also prepare the test cases for Emacs 26.
2017-02-08Emacs: Consider arity when jumping to definitionsJohan Claesson
Only the xref front-end introduced in Emacs 25 consider arity. It is not implemented for older emacsen. Look for manual page files in lib/erlang/man in erlang-root-dir. Also do not give up in erlang-man-module when not finding the manual page file. Call manual-entry as a fallback. Do not bother to populate menu-bar with man pages when menu-bar-mode is nil. Add erlang extensions also to dired-omit-extensions. Remove some support for Emacs 18 and 19.
2017-02-08Reduce size of the log file for Travis CIBjörn Gustavsson
The huge log files are problematic. Add shell scripts that captures the log output to a temporary file and only display the log file if an error occurs.
2017-02-08Deprecate filename:find_src/1/2Richard Carlsson
2017-02-08Include more otp_SUITE tests cases in the smoke testBjörn Gustavsson
For the benefit of Travis CI, include more test cases from otp_SUITE in the smoke test. That will avoid having to run a pull request through the daily builds to find those kind of minor issues.
2017-02-08Merge branch 'dgud/tools/emacs/erlang-mode-cleanup'Dan Gudmundsson
* dgud/tools/emacs/erlang-mode-cleanup: Fix a command's name Clean-up erldoc.el Set some useful file-local variables in erlang-edoc.el Clean-up erlang-eunit.el Clean-up erlang-start.el Update erlang-pkg.el Set erlang-mode's encoding to utf-8 Remove redundant wrappers around Emacs version constants Convert some defvars to defcustoms and fix some docstrings Remove some unneeded backward compatibility code Remove redundant erlang-interactive-p Remove redundant function prog-mode Remove redundant function erlang-string-to-int Require Emacs 24.1 in erlang-mode Fix some whitespace in erlang-mode
2017-02-08Fix a command's nameBozhidar Batsov
2017-02-08Clean-up erldoc.elBozhidar Batsov
2017-02-08Set some useful file-local variables in erlang-edoc.elBozhidar Batsov
2017-02-08Clean-up erlang-eunit.elBozhidar Batsov
2017-02-08Clean-up erlang-start.elBozhidar Batsov
2017-02-08Update erlang-pkg.elBozhidar Batsov
2017-02-08Set erlang-mode's encoding to utf-8Bozhidar Batsov
2017-02-08Remove redundant wrappers around Emacs version constantsBozhidar Batsov
2017-02-08Convert some defvars to defcustoms and fix some docstringsBozhidar Batsov
2017-02-08Remove some unneeded backward compatibility codeBozhidar Batsov
2017-02-08Remove redundant erlang-interactive-pBozhidar Batsov
2017-02-08Remove redundant function prog-modeBozhidar Batsov
2017-02-08Remove redundant function erlang-string-to-intBozhidar Batsov
2017-02-08Require Emacs 24.1 in erlang-modeBozhidar Batsov
2017-02-08Fix some whitespace in erlang-modeBozhidar Batsov
2017-02-08Fix observer term conversion error spellingDave Jeffrey
In the observer UI, when inspecting state, the error given when attempting to convert a bad term contains a spelling mistake.
2017-02-08Merge branch 'maint'Dan Gudmundsson
* maint: [tools] Update erlang-edoc.el to include @param and @returns
2017-02-08Merge pull request #1282 from leoliu/maintDan Gudmundsson
[tools] Update erlang-edoc.el to include param and returns OTP-14217
2017-02-08Merge branch 'maint'Raimo Niskanen
Conflicts: OTP_VERSION
2017-02-08Merge branch 'maint-19' into maintRaimo Niskanen
Conflicts: OTP_VERSION
2017-02-07Merge branch 'hans/ssh/default_algo_list/OTP-14110'Hans Nilsson
2017-02-07[systools] Fix return value for warnings_as_errors + silentSiri Hansen
When both options 'warnings_as_errors' and 'silent' were given to systools:make_script or systools:make_relup, no error reason would be returned if warnings occured. Instead only the atom 'error' was returned. This is now corrected. Options 'warnings_as_errors' and 'no_warn_sasl' are now also allowed for systools:make_tar.
2017-02-07Updated OTP versionOTP-19.2.3Erlang/OTP
2017-02-07Prepare releaseErlang/OTP
2017-02-07Merge branch 'hans/inets/ftp_bad_return_checks_patch/OTP-14203' into maint-19Erlang/OTP
* hans/inets/ftp_bad_return_checks_patch/OTP-14203: ftp: allow different timing sequences