hiro/boon
1
0
Fork 0
mirror of https://github.com/vale981/boon synced 2025-03-05 09:31:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

oops, kill duplicated code

Browse source
This commit is contained in:
Jean-Philippe Bernardy 2018-03-19 13:26:50 +01:00
parent b6b103e3f5
commit b4cf42bbc5
2 changed files with 14 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
boon-keys.el
View file

@ -83,39 +83,6 @@
(define-key minibuffer-local-must-match-map [escape] 'minibuffer-keyboard-quit) (define-key minibuffer-local-must-match-map [escape] 'minibuffer-keyboard-quit)
(define-key isearch-mode-map [escape] 'isearch-abort) (define-key isearch-mode-map [escape] 'isearch-abort)
(defun boon-god-control-swap (event)
"Swap the control 'bit' in EVENT, unless C-c <event> is a prefix reserved for modes."
(interactive (list (read-key)))
(cond
((memq event '(9 13 ?{ ?} ?[ ?] ?$ ?< ?> ?: ?\; ?/ ?? ?. ?, ?' ?\")) event)
((<= event 27) (+ 96 event))
((not (eq 0 (logand (lsh 1 26) event))) (logxor (lsh 1 26) event))
(t (list 'control event))))
(defun boon-c-god (arg)
"Input a key sequence, prepending C- to keys unless keys are
already reserved for modes, and run the command bound to that
sequence."
(interactive "P")
(let ((keys '((control c)))
(binding (key-binding (kbd "C-c")))
(key-vector (kbd "C-c"))
(prompt "C-c-"))
(while (and binding
(or (eq binding 'mode-specific-command-prefix)
;; if using universal prefix, the above will happen.
(not (symbolp binding))))
(let ((key (read-key (format "%s" prompt))))
(if (eq key ?h) (describe-bindings key-vector) ;; h -> show help
(push (boon-god-control-swap key) keys)
(setq key-vector (vconcat (reverse keys)))
(setq prompt (key-description key-vector))
(setq binding (key-binding key-vector)))))
(cond
((not binding) (error "No command bound to %s" prompt))
((commandp binding)
(let ((current-prefix-arg arg)) (call-interactively binding)))
(t (error "Key not bound to a command: %s" binding)))))
(provide 'boon-keys) (provide 'boon-keys)
;;; boon-keys.el ends here ;;; boon-keys.el ends here

22
boon-main.el
View file

@ -350,31 +350,37 @@ Replace the region if it is active."
(keyboard-quit)))) (keyboard-quit))))
(defun boon-god-control-swap (event) (defun boon-god-control-swap (event)
"Swap the control 'bit' in EVENT, if that is a good choice." "Swap the control 'bit' in EVENT, unless C-c <event> is a prefix reserved for modes."
(interactive (list (read-key))) (interactive (list (read-key)))
(cond (cond
((memq event '(9 13)) event) ((memq event '(9 13 ?{ ?} ?[ ?] ?$ ?< ?> ?: ?\; ?/ ?? ?. ?, ?' ?\")) event)
((<= event 27) (+ 96 event)) ((<= event 27) (+ 96 event))
((not (eq 0 (logand (lsh 1 26) event))) (logxor (lsh 1 26) event)) ((not (eq 0 (logand (lsh 1 26) event))) (logxor (lsh 1 26) event))
(t (list 'control event)))) (t (list 'control event))))
(defun boon-c-god () (defun boon-c-god (arg)
"Input a key sequence, prepend C- to each key, and run the command bound to that sequence." "Input a key sequence, prepending C- to keys unless keys are
(interactive) already reserved for modes, and run the command bound to that
sequence."
(interactive "P")
(let ((keys '((control c))) (let ((keys '((control c)))
(binding (key-binding (kbd "C-c"))) (binding (key-binding (kbd "C-c")))
(key-vector (kbd "C-c")) (key-vector (kbd "C-c"))
(prompt "C-c-")) (prompt "C-c-"))
(while (and binding (not (symbolp binding))) (while (and binding
(or (eq binding 'mode-specific-command-prefix)
;; if using universal prefix, the above will happen.
(not (symbolp binding))))
(let ((key (read-key (format "%s" prompt)))) (let ((key (read-key (format "%s" prompt))))
(if (eq key ?h) (describe-bindings key-vector) (if (eq key ?h) (describe-bindings key-vector) ;; h -> show help
(push (boon-god-control-swap key) keys) (push (boon-god-control-swap key) keys)
(setq key-vector (vconcat (reverse keys))) (setq key-vector (vconcat (reverse keys)))
(setq prompt (key-description key-vector)) (setq prompt (key-description key-vector))
(setq binding (key-binding key-vector))))) (setq binding (key-binding key-vector)))))
(cond (cond
((not binding) (error "No command bound to %s" prompt)) ((not binding) (error "No command bound to %s" prompt))
((commandp binding) (call-interactively binding)) ((commandp binding)
(let ((current-prefix-arg arg)) (call-interactively binding)))
(t (error "Key not bound to a command: %s" binding))))) (t (error "Key not bound to a command: %s" binding)))))
(defun boon-adjust-indent () (defun boon-adjust-indent ()