aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Claesson <[email protected]>2017-04-27 23:33:32 +0200
committerJohan Claesson <[email protected]>2017-04-27 23:37:26 +0200
commitc7585b231565d964ea625c7901cd2ec2ec890076 (patch)
tree00670bb496add0b5cf0af7324028d44d49c6f1ee
parentd91ceb27ee802711d6333fecb74142ebe74c05cf (diff)
downloadotp-c7585b231565d964ea625c7901cd2ec2ec890076.tar.gz
otp-c7585b231565d964ea625c7901cd2ec2ec890076.tar.bz2
otp-c7585b231565d964ea625c7901cd2ec2ec890076.zip
Restore Emacs 25 support
Fix loading of byte-compiled erlang.elc on Emacs 25 and the erlang shell.
-rw-r--r--lib/tools/emacs/erlang.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/tools/emacs/erlang.el b/lib/tools/emacs/erlang.el
index 2d86eb44d4..d4803d8d40 100644
--- a/lib/tools/emacs/erlang.el
+++ b/lib/tools/emacs/erlang.el
@@ -4707,6 +4707,7 @@ for a tag on the form `module:tag'."
(if (fboundp 'advice-add)
;; Emacs 24.4+
+ (require 'etags)
(advice-add 'etags-tags-completion-table :around
#'erlang-etags-tags-completion-table-advice)
;; Emacs 23.1-24.3
@@ -4873,6 +4874,7 @@ considered first when it is time to jump to the definition.")
(and (erlang-soft-require 'xref)
(erlang-soft-require 'cl-generic)
(erlang-soft-require 'eieio)
+ (erlang-soft-require 'etags)
;; The purpose of using eval here is to avoid compilation
;; warnings in emacsen without cl-defmethod etc.
(eval
@@ -5351,7 +5353,7 @@ editing control characters:
\\{erlang-shell-mode-map}"
(interactive
(when current-prefix-arg
- (list ((read-shell-command "Erlang command: ")))))
+ (list (read-shell-command "Erlang command: "))))
(require 'comint)
(let (cmd opts)
(if command