diff options
| author | Raimo Niskanen <[email protected]> | 2017-03-03 11:48:27 +0100 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2017-03-03 11:48:27 +0100 |
| commit | e7ec27f781b2db75b7b82903ae73f089a1b3286a (patch) | |
| tree | 8e3173e98aaaab54613fe2ebe7c5194605868f79 /lib/tools/emacs | |
| parent | 6df4e8aaf35488defd19c468395f4a5ae9714ada (diff) | |
| parent | 960b4e63c8fcfa8577ac877464e300959f20db12 (diff) | |
| download | otp-e7ec27f781b2db75b7b82903ae73f089a1b3286a.tar.gz otp-e7ec27f781b2db75b7b82903ae73f089a1b3286a.tar.bz2 otp-e7ec27f781b2db75b7b82903ae73f089a1b3286a.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/tools/emacs')
| -rw-r--r-- | lib/tools/emacs/erlang-skels.el | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/lib/tools/emacs/erlang-skels.el b/lib/tools/emacs/erlang-skels.el index eeba7f34e9..bdb3d9ad4a 100644 --- a/lib/tools/emacs/erlang-skels.el +++ b/lib/tools/emacs/erlang-skels.el @@ -1,7 +1,7 @@ ;; ;; %CopyrightBegin% ;; -;; Copyright Ericsson AB 2010-2016. All Rights Reserved. +;; Copyright Ericsson AB 2010-2017. All Rights Reserved. ;; ;; Licensed under the Apache License, Version 2.0 (the "License"); ;; you may not use this file except in compliance with the License. @@ -915,11 +915,7 @@ Please see the function `tempo-define-template'.") "%% process to initialize." n (erlang-skel-separator-end 2) "-spec init(Args :: term()) ->" n> - "{ok, State :: term(), Data :: term()} |" n> - "{ok, State :: term(), Data :: term()," n> - "[gen_statem:action()] | gen_statem:action()} |" n> - "ignore |" n> - "{stop, Reason :: term()}." n + "gen_statem:init_result(atom())." n "init([]) ->" n> "process_flag(trap_exit, true)," n> "{ok, state_name, #data{}}." n @@ -1028,11 +1024,7 @@ Please see the function `tempo-define-template'.") "%% process to initialize." n (erlang-skel-separator-end 2) "-spec init(Args :: term()) ->" n> - "{ok, State :: term(), Data :: term()} |" n> - "{ok, State :: term(), Data :: term()," n> - "[gen_statem:action()] | gen_statem:action()} |" n> - "ignore |" n> - "{stop, Reason :: term()}." n + "gen_statem:init_result(term())." n "init([]) ->" n> "process_flag(trap_exit, true)," n> "{ok, state_name, #data{}}." n |