emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix #12: don't shadow major-mode bindings with local map

Browse source
This commit is contained in:
Henrik Lissner 2016-10-07 19:25:32 +02:00
parent c99c4a20c9
commit 6b099f07ce
1 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

25
core/defuns/defuns-popups.el
View file

@ -16,17 +16,12 @@
(define-key map [remap evil-window-move-far-right] 'ignore) (define-key map [remap evil-window-move-far-right] 'ignore)
(define-key map [remap evil-window-split] 'ignore) (define-key map [remap evil-window-split] 'ignore)
(define-key map [remap evil-window-vsplit] 'ignore) (define-key map [remap evil-window-vsplit] 'ignore)
(define-key map [remap evil-force-normal-state] 'doom/popup-close-maybe)
(define-key map [escape] 'doom/popup-close-maybe)
(define-key map (kbd "ESC") 'doom/popup-close-maybe)
map) map)
"Active keymap in popup windows.") "Active keymap in popup windows.")
(defvar doom-popup-mode-local-map
(let ((map (make-sparse-keymap)))
(define-key map [remap evil-force-normal-state] 'doom/popup-close)
(define-key map [escape] 'doom/popup-close)
(define-key map (kbd "ESC") 'doom/popup-close)
map)
"Active keymap in popup windows with ESC bindings.")
(advice-add 'doom/evil-window-move :around 'doom*popup-window-move) (advice-add 'doom/evil-window-move :around 'doom*popup-window-move)
;;;###autoload ;;;###autoload
@ -93,6 +88,15 @@ window. Returns nil or the popup window."
(delete-window window) (delete-window window)
(unless dont-redraw (redraw-frame)))) (unless dont-redraw (redraw-frame))))
;;;###autoload
(defun doom/popup-close-maybe ()
"Close the current popup *if* its buffer doesn't have a :noesc rule in
`doom-popup-rules'."
(interactive)
(if (memq :noesc doom-popup-rule)
(call-interactively 'evil-force-normal-state)
(doom/popup-close)))
;;;###autoload ;;;###autoload
(defun doom/popup-close-all (&optional dont-kill dont-redraw) (defun doom/popup-close-all (&optional dont-kill dont-redraw)
"Closes all popups (kill them if DONT-KILL-BUFFERS is non-nil). Then redraw "Closes all popups (kill them if DONT-KILL-BUFFERS is non-nil). Then redraw
@ -155,10 +159,7 @@ variables."
(cdr it))) (cdr it)))
doom-popup-rules))) doom-popup-rules)))
(setq doom-last-popup (current-buffer)) (setq doom-last-popup (current-buffer))
(setq-local doom-popup-rule rules) (setq-local doom-popup-rule rules)))
(let ((map doom-popup-mode-map))
(unless (memq :noesc rules)
(use-local-map doom-popup-mode-local-map)))))
(provide 'defuns-popups) (provide 'defuns-popups)
;;; defuns-popups.el ends here ;;; defuns-popups.el ends here