branch: externals/objed commit 1127d6fdec989fb9577cb55fa6adedce7b4035e0 Author: Clemens Radermacher <clem...@posteo.net> Commit: Clemens Radermacher <clem...@posteo.net>
Adjust default binding scheme again --- README.asc | 5 +---- objed.el | 11 ++++++----- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/README.asc b/README.asc index c071641..651e177 100644 --- a/README.asc +++ b/README.asc @@ -155,7 +155,7 @@ If commands allow for numeric arguments you can input them without the use of kbd:[Ctrl] or kbd:[Meta]. kbd:[0] can be used as an alternative for the universal argument (kbd:[C-u]). To add custom commands to the modal state you can use `objed-user-map` which is available under prefix key kbd:['] and -`objed-other-user-map` bound to kbd:[?]. It's recommended to use one of these +`objed-other-user-map` bound to kbd:[-]. It's recommended to use one of these map for custom object bindings and the other one for additional operations. In addition to the commands configured in `objed-cmd-alist` you can use the @@ -438,9 +438,6 @@ You can add your own prefix bindings using `objed-define-dispatch`. |kbd:[ยด] |Activate part from point backward until boundary of some object. -|kbd:[-] -|Extend current object by including leading whitespace. - |kbd:[+] |Extend current object by including trailing whitespace. |=== diff --git a/objed.el b/objed.el index 3553bf8..ce61d8a 100644 --- a/objed.el +++ b/objed.el @@ -630,7 +630,7 @@ selected one." (define-key map (kbd (format "C-%c" n)) 'digit-argument)) ;; common emacs keys (define-key map (kbd "C-g") 'objed-quit) - (define-key map (kbd "C-h b") 'objed-show-top-level) + (define-key map (kbd "?") 'objed-show-top-level) ;; TODO: switch with q, so quit window is qq? (define-key map "g" 'objed-quit) (define-key map "q" 'objed-quit-window-or-reformat) @@ -747,9 +747,10 @@ selected one." ;; (define-key map "M" 'objed-unmark-all) (define-key map "@" 'objed-extend) - (define-key map "-" 'objed-include-leading-ws) + ;; TODO: second + include more (define-key map "+" 'objed-include-trailing-ws) - + ;; (define-key map "" 'objed-include-leading-ws) + ;; basic edit ops (define-key map "k" 'objed-kill) (define-key map "K" 'objed-kill) @@ -784,7 +785,7 @@ selected one." (define-key map "c" 'objed-object-map) ;; for custom user object and op commands (define-key map "'" 'objed-user-map) - (define-key map "?" 'objed-other-user-map) + (define-key map "-" 'objed-other-user-map) (define-key map (kbd "M-g o") 'objed-occur) @@ -936,7 +937,7 @@ To define new operations see `objed-define-op'.") "Keymap for custom user bindings.") (defvar objed-other-user-map - (let ((map (objed--define-prefix "?" 'objed-user-map))) + (let ((map (objed--define-prefix "-" 'objed-user-map))) map) "Keymap for custom user bindings.")