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

Rename ido ms -> ts

This commit is contained in:
Eivind Fonn 2016-09-02 09:45:06 +02:00
parent 37cdf07e91
commit df3ca63247
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
layers/+spacemacs/spacemacs-completion/funcs.el
View File

@ -227,15 +227,15 @@ See https://github.com/syl20bnr/spacemacs/issues/3700"
;; iteration setup a whole new minibuffer, we have to keep
;; track of any activated ido navigation transient-state and force
;; the reactivation at each iteration.
(when spacemacs--ido-navigation-ms-enabled
(spacemacs/ido-navigation-micro-state)))
(when spacemacs--ido-navigation-ts-enabled
(spacemacs/ido-navigation-transient-state/body)))
(defun spacemacs//ido-setup ()
(when spacemacs--ido-navigation-ms-face-cookie-minibuffer
(when spacemacs--ido-navigation-ts-face-cookie-minibuffer
(face-remap-remove-relative
spacemacs--ido-navigation-ms-face-cookie-minibuffer))
spacemacs--ido-navigation-ts-face-cookie-minibuffer))
;; be sure to wipe any previous transient-state flag
(setq spacemacs--ido-navigation-ms-enabled nil)
(setq spacemacs--ido-navigation-ts-enabled nil)
;; overwrite the key bindings for ido vertical mode only
(define-key ido-completion-map (kbd "C-<return>") 'ido-select-text)
;; use M-RET in terminal
@ -258,8 +258,8 @@ See https://github.com/syl20bnr/spacemacs/issues/3700"
(define-key ido-completion-map (kbd "C-t") 'spacemacs/ido-invoke-in-new-frame)
(define-key ido-completion-map (kbd "C-v") 'spacemacs/ido-invoke-in-horizontal-split)
;; initiate transient-state
(define-key ido-completion-map (kbd "M-SPC") 'spacemacs/ido-navigation-micro-state)
(define-key ido-completion-map (kbd "s-M-SPC") 'spacemacs/ido-navigation-micro-state))
(define-key ido-completion-map (kbd "M-SPC") 'spacemacs/ido-navigation-transient-state/body)
(define-key ido-completion-map (kbd "S-M-SPC") 'spacemacs/ido-navigation-transient-state/body))
(defun spacemacs/ido-invoke-in-other-window ()
"signals ido mode to switch to (or create) another window after exiting"
@ -285,24 +285,24 @@ See https://github.com/syl20bnr/spacemacs/issues/3700"
(setq ido-exit-minibuffer-target-window 'frame)
(ido-exit-minibuffer))
(defun spacemacs//ido-navigation-ms-set-face ()
(defun spacemacs//ido-navigation-ts-set-face ()
"Set faces for ido navigation transient-state."
(setq spacemacs--ido-navigation-ms-face-cookie-minibuffer
(setq spacemacs--ido-navigation-ts-face-cookie-minibuffer
(face-remap-add-relative
'minibuffer-prompt
'spacemacs-ido-navigation-ms-face)))
'spacemacs-ido-navigation-ts-face)))
(defun spacemacs//ido-navigation-ms-on-enter ()
(defun spacemacs//ido-navigation-ts-on-enter ()
"Initialization of ido transient-state."
(setq spacemacs--ido-navigation-ms-enabled t)
(spacemacs//ido-navigation-ms-set-face))
(setq spacemacs--ido-navigation-ts-enabled t)
(spacemacs//ido-navigation-ts-set-face))
(defun spacemacs//ido-navigation-ms-on-exit ()
(defun spacemacs//ido-navigation-ts-on-exit ()
"Action to perform when exiting ido transient-state."
(face-remap-remove-relative
spacemacs--ido-navigation-ms-face-cookie-minibuffer))
spacemacs--ido-navigation-ts-face-cookie-minibuffer))
(defun spacemacs//ido-navigation-ms-full-doc ()
(defun spacemacs//ido-navigation-ts-full-doc ()
"Full documentation for ido navigation transient-state."
"
[?] display this help

12
layers/+spacemacs/spacemacs-completion/packages.el
View File

@ -225,13 +225,13 @@ Current Action: %s(ivy-action-name)
(switch-to-buffer this-buffer)
result))
(defvar spacemacs--ido-navigation-ms-enabled nil
(defvar spacemacs--ido-navigation-ts-enabled nil
"Flag which is non nil when ido navigation transient-state is enabled.")
(defvar spacemacs--ido-navigation-ms-face-cookie-minibuffer nil
(defvar spacemacs--ido-navigation-ts-face-cookie-minibuffer nil
"Cookie pointing to the local face remapping.")
(defface spacemacs-ido-navigation-ms-face
(defface spacemacs-ido-navigation-ts-face
`((t :background ,(face-attribute 'error :foreground)
:foreground "black"
:weight bold))
@ -241,10 +241,10 @@ Current Action: %s(ivy-action-name)
(spacemacs|define-transient-state ido-navigation
:title "ido Transient State"
:foreign-keys run
:on-enter (spacemacs//ido-navigation-ms-on-enter)
:on-exit (spacemacs//ido-navigation-ms-on-exit)
:on-enter (spacemacs//ido-navigation-ts-on-enter)
:on-exit (spacemacs//ido-navigation-ts-on-exit)
:bindings
;;("?" nil (spacemacs//ido-navigation-ms-full-doc))
;;("?" nil (spacemacs//ido-navigation-ts-full-doc))
("<RET>" ido-exit-minibuffer :exit t)
("<escape>" nil :exit t)
("e" ido-select-text :exit t)