TakeV/spacemacs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix auto complete with key sequence in Hybrid mode

Browse source 
Implement handling of `evil-hybrid-state-map` keymap to make completion
with a key sequence work in Hybird state.
This commit is contained in:
MadAnd 2016-06-12 23:20:21 +03:00 committed by Eivind Fonn
parent 1993e490ef
commit a7232d53e7
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
layers/+completion/auto-completion/funcs.el
View file

@ -88,6 +88,7 @@
(defvar spacemacs--auto-completion-complete-last-candidate nil)
(defvar spacemacs--auto-completion-shadowed-insert-binding nil)
(defvar spacemacs--auto-completion-shadowed-emacs-binding nil)
(defvar spacemacs--auto-completion-shadowed-hybrid-binding nil)
(defun spacemacs//auto-completion-key-sequence-start ()
"Initiate auto-completion sequence."
@ -104,6 +105,8 @@
(lookup-key evil-insert-state-map second-key))
(setq spacemacs--auto-completion-shadowed-emacs-binding
(lookup-key evil-emacs-state-map second-key))
(setq spacemacs--auto-completion-shadowed-hybrid-binding
(lookup-key evil-hybrid-state-map second-key))
(define-key
evil-insert-state-map
second-key
@ -111,6 +114,10 @@
(define-key
evil-emacs-state-map
second-key
'spacemacs//auto-completion-key-sequence-end)
(define-key
evil-hybrid-state-map
second-key
'spacemacs//auto-completion-key-sequence-end))
;; set a timer to restore the old bindings
(run-at-time auto-completion-complete-with-key-sequence-delay
@ -149,7 +156,11 @@
(define-key
evil-emacs-state-map
second-key
spacemacs--auto-completion-shadowed-emacs-binding)))
spacemacs--auto-completion-shadowed-emacs-binding)
(define-key
evil-hybrid-state-map
second-key
spacemacs--auto-completion-shadowed-hybrid-binding)))
;; Editing style