aboutsummaryrefslogtreecommitdiffstats
path: root/lib/tools/emacs/erlang.el
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2016-10-07 09:57:38 +0200
committerDan Gudmundsson <[email protected]>2016-10-07 09:57:38 +0200
commit217bec24c9d369c1bfc14584270ffc90efe5f40c (patch)
tree60457614e013989d7c0e99bbfed910d4033b141a /lib/tools/emacs/erlang.el
parent1c18d72600eb2156c6dee75026d8cb904249fbaa (diff)
parente368a0a6773df3d764ec65760e235da559f5f56b (diff)
downloadotp-217bec24c9d369c1bfc14584270ffc90efe5f40c.tar.gz
otp-217bec24c9d369c1bfc14584270ffc90efe5f40c.tar.bz2
otp-217bec24c9d369c1bfc14584270ffc90efe5f40c.zip
Merge branch 'dgud/tools/emacs/edoc-support/PR-1195/OTP-13945' into maint
* dgud/tools/emacs/edoc-support/PR-1195/OTP-13945: New file erlang-edoc.el to support EDoc in erlang-mode
Diffstat (limited to 'lib/tools/emacs/erlang.el')
-rw-r--r--lib/tools/emacs/erlang.el5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/tools/emacs/erlang.el b/lib/tools/emacs/erlang.el
index 788de75b3a..67e88bac30 100644
--- a/lib/tools/emacs/erlang.el
+++ b/lib/tools/emacs/erlang.el
@@ -78,6 +78,10 @@
;; Variables:
+(defgroup erlang nil
+ "The Erlang programming language."
+ :group 'languages)
+
(defconst erlang-version "2.7"
"The version number of Erlang mode.")
@@ -2444,6 +2448,7 @@ Return the amount the indentation changed by."
;; after the indentation. Else stay at same point in text.
(if (> (- (point-max) pos) (point))
(goto-char (- (point-max) pos)))
+ (run-hooks 'erlang-indent-line-hook)
shift-amt))