procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reinstate defvar-keymap expansion

Browse source 
* lisp/emacs-lisp/byte-opt.el
(byte-optimize-define-keymap--define): Make more robust.
This commit is contained in:
Lars Ingebrigtsen 2021-10-17 21:29:59 +02:00
parent 94fe416c95
commit 5029684358
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lisp/emacs-lisp/byte-opt.el
View file

@ -1237,14 +1237,17 @@ See Info node `(elisp) Integer Basics'."
(defun byte-optimize-define-keymap--define (form)
"Expand key bindings in FORM."
(let ((optimized (byte-optimize-define-keymap (nth 1 form))))
(if (eq optimized (nth 1 form))
;; No improvement.
form
(list (car form) optimized))))
(if (not (consp (nth 1 form)))
form
(let ((optimized (byte-optimize-define-keymap (nth 1 form))))
(if (eq optimized (nth 1 form))
;; No improvement.
form
(list (car form) optimized)))))
;;(put 'define-keymap 'byte-optimizer #'byte-optimize-define-keymap)
;;(put 'define-keymap--define 'byte-optimizer #'byte-optimize-define-keymap--define)
(put 'define-keymap 'byte-optimizer #'byte-optimize-define-keymap)
(put 'define-keymap--define 'byte-optimizer
#'byte-optimize-define-keymap--define)
;; I'm not convinced that this is necessary. Doesn't the optimizer loop
;; take care of this? - Jamie