aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2015-10-13 10:57:23 +0200
committerHenrik Nord <[email protected]>2015-10-13 10:57:23 +0200
commit981dd4509dbabcf3af3d4df611163987e10bca41 (patch)
tree6887099f16d34ec0fc17e21e3520f1a7287b5f17 /lib
parent76197244444991e5dc97089dc0848159d93f4db6 (diff)
parent3e8de426873759d6e9f6b2f82b55ad4256d6a39f (diff)
downloadotp-981dd4509dbabcf3af3d4df611163987e10bca41.tar.gz
otp-981dd4509dbabcf3af3d4df611163987e10bca41.tar.bz2
otp-981dd4509dbabcf3af3d4df611163987e10bca41.zip
Merge branch 'legoscia/callback-arrow-no-newline' into maint
* legoscia/callback-arrow-no-newline: Don't add newline after arrow on -callback lines OTP-13042
Diffstat (limited to 'lib')
-rw-r--r--lib/tools/emacs/erlang.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/tools/emacs/erlang.el b/lib/tools/emacs/erlang.el
index 4aa1ab7d38..466bf139b9 100644
--- a/lib/tools/emacs/erlang.el
+++ b/lib/tools/emacs/erlang.el
@@ -4236,7 +4236,7 @@ This function is designed to be a member of a criteria list."
This function is designed to be a member of a criteria list."
(save-excursion
(beginning-of-line)
- (when (save-match-data (looking-at "-\\(spec\\|type\\)"))
+ (when (save-match-data (looking-at "-\\(spec\\|type\\|callback\\)"))
'stop)))