diff options
author | Hans Bolinder <hasse@erlang.org> | 2013-03-18 15:31:07 +0100 |
---|---|---|
committer | Hans Bolinder <hasse@erlang.org> | 2013-03-19 13:03:01 +0100 |
commit | f247d246725d76412242e547e7c212bf947542f8 (patch) | |
tree | cfa871edd7a69c0004608cb8eaf97b375bcae201 /erts | |
parent | 395e5870020df6807c6e73462e75d594a07e40a8 (diff) | |
download | otp-f247d246725d76412242e547e7c212bf947542f8.tar.gz otp-f247d246725d76412242e547e7c212bf947542f8.tar.bz2 otp-f247d246725d76412242e547e7c212bf947542f8.zip |
Let escript recognize an encoding comment on the second line
The manual says that an Emacs directive can be placed on the second
line. With this patch that directive is also recognized when selecting
encoding of the script.
Diffstat (limited to 'erts')
-rw-r--r-- | erts/doc/src/escript.xml | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/erts/doc/src/escript.xml b/erts/doc/src/escript.xml index 66e904f64f..9e2a87dde6 100644 --- a/erts/doc/src/escript.xml +++ b/erts/doc/src/escript.xml @@ -4,7 +4,7 @@ <comref> <header> <copyright> - <year>2007</year><year>2011</year> + <year>2007</year><year>2013</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> @@ -85,6 +85,11 @@ $ <input>escript factorial 5</input> </pre> enter the major mode for editing Erlang source files. If the directive is present it must be located on the second line.</p> + + <p>If there is a comment selecting the <seealso + marker="stdlib:epp#encoding">encoding</seealso> it can be + located on the second line.</p> + <p>On the third line (or second line depending on the presence of the Emacs directive), it is possible to give arguments to the emulator, such as </p> @@ -133,7 +138,9 @@ halt(1).</pre> <pre> -include_lib("kernel/include/file.hrl").</pre> <p>to include the record definitions for the records used by the - <c>file:read_link_info/1</c> function.</p> + <c>file:read_link_info/1</c> function. You can also select + encoding here, but if there is a valid encoding comment on + the second line it takes precedence.</p> <p>The script will be checked for syntactic and semantic correctness before being run. If there are warnings (such as |