aboutsummaryrefslogtreecommitdiffstats
path: root/lib/tools/emacs/erlang.el
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-08-19 09:21:32 +0200
committerFredrik Gustafsson <[email protected]>2013-08-19 09:21:32 +0200
commit8bfff9e0f80868ad7edc08dfda6c51a2b00966e6 (patch)
tree188d553e7b1d7c0e39a316efce400cb7541f4a80 /lib/tools/emacs/erlang.el
parent410bd502e75b22cfa355ffc11eb160360c20bd6f (diff)
parent104c60227d3efea4c858a32c486ee15127d6edbc (diff)
downloadotp-8bfff9e0f80868ad7edc08dfda6c51a2b00966e6.tar.gz
otp-8bfff9e0f80868ad7edc08dfda6c51a2b00966e6.tar.bz2
otp-8bfff9e0f80868ad7edc08dfda6c51a2b00966e6.zip
Merge branch 'mh/line-initial-commas/OTP-11242' into maint
* mh/line-initial-commas/OTP-11242: Inside parentheses, line-initial commas align with the open parenthesis
Diffstat (limited to 'lib/tools/emacs/erlang.el')
-rw-r--r--lib/tools/emacs/erlang.el3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/tools/emacs/erlang.el b/lib/tools/emacs/erlang.el
index f3bc95e3e5..3ecda1d285 100644
--- a/lib/tools/emacs/erlang.el
+++ b/lib/tools/emacs/erlang.el
@@ -2813,6 +2813,9 @@ Return nil if inside string, t if in a comment."
(- (+ previous erlang-argument-indent) 1))))
(t
(nth 2 stack-top))))
+ ((= (following-char) ?,)
+ ;; a comma at the start of the line: line up with opening parenthesis.
+ (nth 2 stack-top))
(t
(goto-char (nth 1 stack-top))
(let ((base (cond ((looking-at "[({]\\s *\\($\\|%\\)")