summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2019-10-03 17:17:50 +0200
committerLars Ingebrigtsen <larsi@gnus.org>2019-10-03 17:17:50 +0200
commit3ad9e5133e7c9895c41bb31b2209d2c1f8fe3239 (patch)
treec4bf6beeb4567e4bcb3f1c7e8e91e368128136d4 /lisp/emacs-lisp
parent4cf9bbcbc141c29c6ec66178ef46d3b21d276c1a (diff)
downloademacs-3ad9e5133e7c9895c41bb31b2209d2c1f8fe3239.tar.gz
emacs-3ad9e5133e7c9895c41bb31b2209d2c1f8fe3239.tar.bz2
emacs-3ad9e5133e7c9895c41bb31b2209d2c1f8fe3239.zip
Fix bytecomp.el warning a different way than the previous patch
* lisp/emacs-lisp/bytecomp.el (emacs-lisp-compilation-mode-map): No need to use set-keymap-parent here; `define-derived-mode' will do that automatically.
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/bytecomp.el3
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 1d0f07a9410..905d99a5971 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -124,7 +124,7 @@
(require 'backquote)
(require 'macroexp)
(require 'cconv)
-(require 'compile)
+(eval-when-compile (require 'compile))
;; Refrain from using cl-lib at run-time here, since it otherwise prevents
;; us from emitting warnings when compiling files which use cl-lib without
;; requiring it! (bug#30635)
@@ -1047,7 +1047,6 @@ message buffer `default-directory'."
(defvar emacs-lisp-compilation-mode-map
(let ((map (make-sparse-keymap)))
- (set-keymap-parent map compilation-minor-mode-map)
(define-key map "g" 'emacs-lisp-compilation-recompile)
map))