aboutsummaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorJonas Bernoulli <jonas@bernoul.li>2015-08-16 19:28:00 +0200
committerJonas Bernoulli <jonas@bernoul.li>2015-08-16 19:28:00 +0200
commit47ff67a04dafb514095cc05e8951da2d0d28c141 (patch)
tree29fb188cd6c4efb77b8e117b5ee289709fc50856 /lisp
parenta3ff8d3615f22d325add088ff05ad0214f97717c (diff)
allow users to prevent the use of async-bytecomp-package-mode
Also see #2156 and 2.2.0.txt.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/magit-popup.el1
-rw-r--r--lisp/with-editor.el1
2 files changed, 2 insertions, 0 deletions
diff --git a/lisp/magit-popup.el b/lisp/magit-popup.el
index fd59d79..f2982d9 100644
--- a/lisp/magit-popup.el
+++ b/lisp/magit-popup.el
@@ -54,6 +54,7 @@
(require 'format-spec)
(and (require 'async-bytecomp nil t)
+ (memq 'magit (bound-and-true-p async-bytecomp-allowed-packages))
(fboundp 'async-bytecomp-package-mode)
(async-bytecomp-package-mode 1))
diff --git a/lisp/with-editor.el b/lisp/with-editor.el
index 320ca9a..5354cd3 100644
--- a/lisp/with-editor.el
+++ b/lisp/with-editor.el
@@ -85,6 +85,7 @@
(require 'tramp-sh nil t)
(and (require 'async-bytecomp nil t)
+ (memq 'magit (bound-and-true-p async-bytecomp-allowed-packages))
(fboundp 'async-bytecomp-package-mode)
(async-bytecomp-package-mode 1))