aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2015-10-13 10:57:45 +0200
committerHenrik Nord <[email protected]>2015-10-13 10:57:45 +0200
commit04960b9d82b7ff4aec535da4bb552bee2648f8f5 (patch)
treefe2a8e3c991824913e0900993a870ca8f7e56276
parent20f3e74fd1d4bec892771c1feeba43a6fdc75975 (diff)
parent981dd4509dbabcf3af3d4df611163987e10bca41 (diff)
downloadotp-04960b9d82b7ff4aec535da4bb552bee2648f8f5.tar.gz
otp-04960b9d82b7ff4aec535da4bb552bee2648f8f5.tar.bz2
otp-04960b9d82b7ff4aec535da4bb552bee2648f8f5.zip
Merge branch 'maint'
-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)))