ryuslash/transient-navigation
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add another keymap, simplify mode en-/disabling

Browse source 
The new keymap is based on some `M-' keybindings.

Instead of specifying each keybinding to enable or disable by hand, map
through a new hashtable which contains function->wrapper mappings.
This commit is contained in:
Tom Willemse 2014-01-01 20:13:51 +01:00
parent 515f65df7d
commit 9ca2d33ab7
1 changed files with 21 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
transient-navigation.el
View file

@ -26,17 +26,21 @@
;;; Code: ;;; Code:
(defvar transient-navigation-map (make-sparse-keymap)) (defvar transient-navigation-map (make-sparse-keymap))
(defvar transient-word-navigation-map (make-sparse-keymap))
(defvar transient-function-map (make-hash-table))
(defmacro transnav-make-transient (key map func) (defmacro transnav-make-transient (key map func)
"Bind KEY in MAP to FUNC with a transient map." "Bind KEY in MAP to FUNC with a transient map."
(let ((funcname (intern (concat "transient-" (symbol-name func))))) (let* ((ofuncname (symbol-name func))
(funcname (intern (concat "transient-" ofuncname))))
`(progn `(progn
(defun ,funcname (&optional n) (defun ,funcname (&rest args)
(interactive) (interactive)
(ignore n) (ignore args)
(call-interactively #',func) (call-interactively #',func)
(set-transient-map transient-navigation-map t)) (set-transient-map ,map t))
(define-key ,map (kbd ,key) #',funcname)))) (define-key ,map (kbd ,key) #',func)
(setf (gethash ',func transient-function-map) ',funcname))))
(transnav-make-transient "f" transient-navigation-map forward-char) (transnav-make-transient "f" transient-navigation-map forward-char)
(transnav-make-transient "b" transient-navigation-map backward-char) (transnav-make-transient "b" transient-navigation-map backward-char)
@ -45,24 +49,23 @@
(transnav-make-transient "e" transient-navigation-map end-of-line) (transnav-make-transient "e" transient-navigation-map end-of-line)
(transnav-make-transient "a" transient-navigation-map beginning-of-line) (transnav-make-transient "a" transient-navigation-map beginning-of-line)
(transnav-make-transient "f" transient-word-navigation-map forward-word)
(transnav-make-transient "b" transient-word-navigation-map backward-word)
(transnav-make-transient "e" transient-word-navigation-map forward-sentence)
(transnav-make-transient "a" transient-word-navigation-map backward-sentence)
;;;###autoload ;;;###autoload
(define-minor-mode transient-navigation-mode (define-minor-mode transient-navigation-mode
"Remap certain navigation commands to ones with a transient map." "Remap certain navigation commands to ones with a transient map."
nil nil nil nil nil nil
(if transient-navigation-mode (if transient-navigation-mode
(progn (maphash (lambda (k v)
(define-key global-map [remap forward-char] #'transient-forward-char) (define-key global-map (vector 'remap k) v))
(define-key global-map [remap backward-char] #'transient-backward-char) transient-function-map)
(define-key global-map [remap next-line] #'transient-next-line) (maphash (lambda (k v)
(define-key global-map [remap previous-line] #'transient-previous-line) (ignore v)
(define-key global-map [remap end-of-line] #'transient-end-of-line) (define-key global-map (vector 'remap k) nil))
(define-key global-map [remap beginning-of-line] #'transient-beginning-of-line)) transient-function-map)))
(define-key global-map [remap transient-forward-char] #'forward-char)
(define-key global-map [remap transient-backward-char] #'backward-char)
(define-key global-map [remap transient-next-line] #'next-line)
(define-key global-map [remap transient-previous-line] #'previous-line)
(define-key global-map [remap transient-end-of-line] #'end-of-line)
(define-key global-map [remap transient-beginning-of-line] #'beginning-of-line)))
(provide 'transient-navigation) (provide 'transient-navigation)
;;; transient-navigation.el ends here ;;; transient-navigation.el ends here