aboutsummaryrefslogtreecommitdiffstats
path: root/lib/tools/emacs
AgeCommit message (Collapse)Author
2012-08-27Merge branch 'maint'Fredrik Gustafsson
2012-08-27Merge branch 'mh/emacs-test-indentation/OTP-10226' into maintFredrik Gustafsson
* mh/emacs-test-indentation/OTP-10226: Add test_indentation target to lib/tools/emacs/Makefile
2012-08-22Add test_indentation target to lib/tools/emacs/MakefileMagnus Henoch
Automatically indent test.erl.orig, save to test.erl, and compare to test.erl.intended.
2012-08-13Merge branch 'maint'Fredrik Gustafsson
2012-08-07Fix highlighting of atoms ending with a dollar signMagnus Henoch
Like this: 'atom$'. In that example, the last single quote should be recognised as ending the atom. This needs a font-lock workaround similar to the one for strings.
2012-08-01Merge branch 'mh/remove-compilation-error-regexp'Henrik Nord
* mh/remove-compilation-error-regexp: Remove Erlang-specific compilation error regexp OTP-10168
2012-06-12Fix indentation of record fields in EmacsTomas Abrahamsson
In some situations, the indentation of record fields in Emacs was strange. This example below shows how Emacs previously would indent two similar pieces of code very differently: some_function_with_a_very_long_name() -> #'a-long-record-name-like-it-sometimes-is-with-asn.1-records'{ field1=a, field2=b}. x() -> #some_record_name{ field1=a, field2=b}. This changes the indentation to be like below for both cases: some_function() -> #some_record{ field1=a, field2=b}.
2012-06-08Remove Erlang-specific compilation error regexpMagnus Henoch
The purpose of this regexp is to ensure that, when invoking the Erlang compiler inside Emacs through M-x compile, any error messages be turned into links jumping to the right line in the right source file. However, it seems like this works out of the box in modern Emacsen, and furthermore, using a non-standard regexp inhibits jumping to a certain column when this is provided by the compiler.
2012-06-05Update to work with whitespace in exec pathLukas Larsson
OTP-10106 OTP-10107
2011-12-07Add deps as erlang-flymake include directory.Kevin Albrecht
Update erlang-flymake to recognize the "deps" folder as an include directory. This makes erlang-flymake compatible with the rebar dependency management tool's default folder structure, which puts included dependencies in "deps". Considered additionally adding deps/*/include, deps/*/ebin, and deps/*/src as include directories, but erlc's -I command line option does not support wildcards.
2011-11-22Revert "Update version numbers for pre-release of R15"Björn-Egil Dahlberg
This reverts commit e21ff9b0b69219ab3853be7e80813156113152b7.
2011-11-22Update version numbers for pre-release of R15OTP_R15ABjörn Gustavsson
2011-09-15Fix misspelling of compatibilityTuncer Ayaz
2011-08-30Teach the emacs mode to compile yecc and leex filesTomas Abrahamsson
If visiting a .yrl or .xrl file in emacs with erlang-mode, then the `erlang-compile' function (normally bound to C-c C-k), now knows how to compile yecc and leex files, and then, if that compilation succeeds, also compiles the resulting .erl files. Also introduce a `erlang-compile-command-function-alist' to make it possible to hook in other functions for computing compilation commands/expressions, depending on file name.
2011-04-15Inhibit electric newline after "->" when inside a type specMagnus Henoch
The Erlang mode for Emacs inserts a newline after every "->", which saves you one keystroke when writing a function, but that is inappropriate when writing a type spec, as you'd normally keep the spec on one line. This change inhibits the automatic insertion when the current line starts with "-spec" or "-type".
2011-03-11Update copyright yearsBjörn-Egil Dahlberg
2011-03-09Declare indentation options as "safe" in erlang-mode for EmacsMagnus Henoch
Emacs has a facility for setting options on a per-file basis based on comments in the source file. By default, all options are considered "unsafe", and the user is queried before the variable is set. This patch declares the variables erlang-indent-level, erlang-indent-guard and erlang-argument-indent to be safe, if the value specified in the source file is valid. Such declarations usually look like this: %% -*- erlang-indent-level: 2 -*- and appear on the first line of the file.
2010-09-30Emacs erlang-mode: fix syntax highlighting of $ in two casesMagnus Henoch
A string whose last character is a dollar sign used to make the syntax highlighter believe that the string never ends, breaking highlighting of following code: -vsn("$Revision: 42 $"). And the double quote as a character constant with a (superfluous) backslash used to make the syntax highlighter believe that a new string started: foo() -> $\". This change fixes both problems by adding two regexps to font-lock-syntactic-keywords in erlang-font-lock-init. One case that is still broken is when a multi-line string ends with a dollar sign: bar() -> "This multi-line string ends with a $". baz() -> this_gets_incorrectly_highlighted.
2010-06-07erlang-eunit: remove runtime dependency on cl packageChris Bernard
Follow the GNU recommendation of not introducing runtime dependencies on the Common Lisp package in ELisp packages that will be distributed for widespread use. In practice this means it's ok to use cl macros but not functions.
2010-06-07Add Emacs EUnit feature: run recentChris Bernard
This determines the most recent invocation of EUnit and runs it again -- whether one test or all tests in a module were run (and if all a module's tests were run, whether cover compilation was involved). This can be especially handy when one test is being run repeatedly, eliminating the need to position the cursor in the desired test just to run it. Default keybinding: C-c C-e l
2010-06-07Add Emacs EUnit feature: auto-saveChris Bernard
If the variable 'erlang-eunit-autosave' is non-nil, buffers will be automatically saved just before running tests -- the "Do you want to save?" prompt will be inhibited. This can be useful, reducing the save-compile-load-test cycle to just one keychord.
2010-06-07erlang-eunit: Optionally run code coverage analysis during eunit testsKlas Johansson
Add a number of features to the emacs mode which make it easier to work with eunit test cases while keeping track of code coverage. * C-cC-ec: Compile the module under test for code coverage analysis, run tests and show the results of the coverage analysis in a new buffer. * C-c-C-ev: Compile the current module for code coverage analysis. * C-cC-ea: Show the results of the coverage analysis in a new buffer.
2010-06-07erlang-eunit: Made alternative locations of files more flexibleKlas Johansson
Previously there were only two options: either the EUnit test file was placed directly within the test directory or within the same directory as the source file. Now a list of candidate locations are supported. This way more than two alternative locations are supported as well as arbitrarily deep directory structures (i.e. test/eunit/x_tests.erl). The default behaviour is still the same, but it's possible to specify locations by setting the following two variables: erlang-eunit-src-candidate-dirs erlang-eunit-test-candidate-dirs
2010-06-01Merge branch 'dgud/emacs-catch-improvements' into devErlang/OTP
* dgud/emacs-catch-improvements: Improved indentation of old catch. Added more type highlighting and fixed record indentation with types.
2010-06-01Improved indentation of old catch.Dan Gudmundsson
An example that didn't work previously. case Foo of {ok, X} -> ok; _ -> catch file:close(FD) end.
2010-06-01Added more type highlighting and fixed record indentation with types.Dan Gudmundsson
Type highlighting reported by Jay Nelson non_neg_integer() will highlight purple but pos_integer() does not. Closing record indentation problem reported by Maxim Treskin: -record(state, { sequence_number = 1 :: integer() }).
2010-06-01erlang-flymake: Document in READMEKlas Johansson
2010-06-01erlang-flymake: Make the syntax check command configurableKlas Johansson
2010-06-01erlang-flymake: By default pass <app>/include and <app>/ebin to compilerKlas Johansson
Hopefully this covers at least some of the common cases and makes the flymake support more usable as is. The purpose of including the ebin directory is to support things like behaviours and parse transforms.
2010-06-01erlang-flymake: Include in MakefileKlas Johansson
2010-06-01erlang-flymake: Syntax check erlang code on the fly (using flymake)Klas Johansson
2010-05-26Merge branch 'mh/escript-erlang-mode' into devErlang/OTP
* mh/escript-erlang-mode: Associate files using interpreter "escript" with Erlang mode
2010-05-26Merge branch 'cb/emacs-eunit-run-current-test' into devErlang/OTP
* cb/emacs-eunit-run-current-test: Add Emacs EUnit utility feature: run current test function.
2010-05-26Merge branch 'mh/fix-record-indentation' into devErlang/OTP
* mh/fix-record-indentation: Fix indentation of records with line breaks inside lists
2010-05-26Merge branch 'mh/inferior-erlang-cmd-uniq' into devErlang/OTP
* mh/inferior-erlang-cmd-uniq: inferior-erlang: specify command to run, uniquify buffer names
2010-05-26Merge branch 'mh/erlang-mode-imenu-arity' into devErlang/OTP
* mh/erlang-mode-imenu-arity: Let imenu distinguish functions by arity
2010-05-24Set erlang-mode-map when loading erlang.elMagnus Henoch
Create and assign the erlang-mode keymap to erlang-mode-map once erlang.el is loaded, not the first time it is used. This way of doing it follows the Emacs Lisp convention described at http://www.gnu.org/software/emacs/manual/html_node/elisp/Tips-for-Defining.html and also makes it easier for users to customize the keymap. Remove the now unneeded functions erlang-keymap-init and erlang-mode-commands. Also move the definition of inferior-erlang-use-cmm, so it is available when defining erlang-mode-map.
2010-05-20Let imenu distinguish functions by arityMagnus Henoch
Make the function names used by M-x imenu contain the function arity as well as the name. This makes it possible to jump to all functions of the same name, as opposed to only the one that is defined first. For example, in the following module there is now a way to jump directly to foo/1: -module(foo). foo() -> ok. bar() -> error. foo(A) -> {ok, A}.
2010-05-18Fix indentation of records with line breaks inside listsMagnus Henoch
Trying to indent this piece of code by hitting TAB on each line: foo() -> [#foo{ foo = foo}]. used to cause an error. Fix by ignoring errors when trying to skip backwards from a record. Also add this test case to test.erl.orig and test.erl.indented.
2010-05-18inferior-erlang: specify command to run, uniquify buffer namesMagnus Henoch
Add a new feature to the command inferior-erlang: when called with a prefix argument, prompt for the command to execute to start the Erlang shell. When possible (i.e., in Emacs 23 and later), allow tab completion as in a normal shell. Also create the shell buffer in such a way that, if uniquify-buffer-name-style is not nil and several Erlang shell buffers are started in different directories, the names of those buffers reflect their working directories instead of being *erlang*, *erlang*<2>, etc.
2010-05-18Associate files using interpreter "escript" with Erlang modeMagnus Henoch
A file whose first line contains "#!/usr/bin/env escript" should be opened in erlang-mode, even if its name doesn't end in ".erl". Add an entry to interpreter-mode-alist to that effect.
2010-05-18Add Emacs EUnit utility feature: run current test function.Chris Bernard
This determines the current test function under point (cursor), whether the active buffer contains a test module (foo_tests) or the module itself (foo), then compiles the source module (and test module if present) and runs that test function. Since this added a third testing feature, there was some natural duplication that needed to be factored out. The notion of 'compile and run tests' was decoupled from exactly which tests should be run. The definitions of default keybindings were converted to a list for clarity and conciseness.
2010-05-11Merge branch 'dgud/emacs-21-fix' into devErlang/OTP
* dgud/emacs-21-fix: Remove usage of 'font-lock-preprocessor-face' if not available
2010-05-04Merge branch 'rd/erlang-eunit' into devErlang/OTP
* rd/erlang-eunit: erlang-eunit.el: Require cl, as it is used
2010-05-03Remove usage of 'font-lock-preprocessor-face' if not availableDan Gudmundsson
i.e. in emacs-21
2010-03-22erlang-eunit.el: Require cl, as it is usedRalf Doering
erlang-eunit.el (part of erlang-mode) uses "flet", which is only available if emacs package cl was loaded. The docs of the CL package suggest that '...packages installed in Emacs must not load "CL" at run time.' We honour this by using eval-when-compile. This fixes warnings when byte-compiling erlang-eunit.el with: emacs -batch -f batch-byte-compile erlang-eunit.el The warning fixed is: In erlang-eunit-compile-and-run-tests: erlang-eunit.el:146:4:Warning: `(save-some-buffers (&optional any) nil)' is a malformed function This bug was reported initially against Ubuntu packages, see https://bugs.launchpad.net/bugs/541893 for reference Signed-off-by: Ralf Doering <[email protected]>
2010-03-22Merge branch 'dgud/emacs-bugfixes' into devErlang/OTP
* dgud/emacs-bugfixes: Fix another -spec() problem Add missing elisp files to the the release target Fix electric semi-colon and tuples inside lists OTP-8530 dgud/emacs-bugfixes Fixed emacs-mode installation problems and some other minor issues.
2010-03-15Fix another -spec() problemDan Gudmundsson
2010-03-15Add missing elisp files to the the release targetDan Gudmundsson
2010-03-15Fix electric semi-colon and tuples inside listsDan Gudmundsson