Skip to content

Commit

Permalink
Merge pull request #23 from zkry/20-rebind-block-move-to-meta
Browse files Browse the repository at this point in the history
rebind block movements to use the meta key
  • Loading branch information
zkry committed Nov 12, 2022
2 parents 87a8d66 + 071fe0b commit 374d970
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 17 deletions.
8 changes: 4 additions & 4 deletions asm-blox.el
Original file line number Diff line number Diff line change
Expand Up @@ -2877,10 +2877,10 @@ If COPY-ONLY is non-nil, don't kill the text but add it to kill ring."
(define-key map (kbd "<S-return>") #'asm-blox--next-row-cell)
(define-key map (kbd "s-z") #'asm-blox-undo)
(define-key map (kbd "s-y") #'asm-blox-redo)
(define-key map (kbd "<s-up>") #'asm-blox-shift-box-up)
(define-key map (kbd "<s-down>") #'asm-blox-shift-box-down)
(define-key map (kbd "<s-left>") #'asm-blox-shift-box-left)
(define-key map (kbd "<s-right>") #'asm-blox-shift-box-right)
(define-key map (kbd "<M-up>") #'asm-blox-shift-box-up)
(define-key map (kbd "<M-down>") #'asm-blox-shift-box-down)
(define-key map (kbd "<M-left>") #'asm-blox-shift-box-left)
(define-key map (kbd "<M-right>") #'asm-blox-shift-box-right)
(define-key map [remap undo] #'asm-blox-undo)
(define-key map [remap completion-at-point] #'asm-blox-complete)
(define-key map [remap complete-symbol] #'asm-blox-complete)
Expand Down
16 changes: 8 additions & 8 deletions asm-blox.info
Original file line number Diff line number Diff line change
Expand Up @@ -721,8 +721,8 @@ File: asm-blox.info, Node: Undo and Redo, Next: Advanced editing, Up: Editing

Asm-blox support undo and redo on a per-cell basis.

* `asm-blox-undo' (bound `s-z'): undo a previous action in the
current code cell.
* `asm-blox-undo' (bound `s-z', remap `undo'): undo a previous
action in the current code cell.

* `asm-blox-redo' (bound `s-y'): redo a previous undo in the current
code cell.
Expand All @@ -733,16 +733,16 @@ File: asm-blox.info, Node: Advanced editing, Prev: Undo and Redo, Up: Editing
7.2 Advanced editing
====================

* `asm-blox-shift-box-up' (bound `<s-up>'): Swap the current code
* `asm-blox-shift-box-up' (bound `<M-up>'): Swap the current code
cell with the one above the current one.

* `asm-blox-shift-box-down' (bound `<s-down>'): Swap the current
* `asm-blox-shift-box-down' (bound `<M-down>'): Swap the current
code cell with the one below the current one.

* `asm-blox-shift-box-left' (bound `<s-left>'): Swap the current
* `asm-blox-shift-box-left' (bound `<M-left>'): Swap the current
code cell with the one to the left of the current one.

* `asm-blox-shift-box-right' (bound `<s-right>'): Swap the current
* `asm-blox-shift-box-right' (bound `<M-right>'): Swap the current
code cell with the one to the right of the current one.

* `asm-blox-kill-region' (bound `<C-w>'): kill the highlighted
Expand Down Expand Up @@ -797,7 +797,7 @@ Node: Controller Cells and Editor Problems18565
Node: Legacy YAML-defined Modules20510
Node: Editing Commands21573
Node: Undo and Redo22774
Node: Advanced editing23137
Node: Customizations24220
Node: Advanced editing23151
Node: Customizations24234

End Tag Table
10 changes: 5 additions & 5 deletions doc/asm-blox.org
Original file line number Diff line number Diff line change
Expand Up @@ -530,20 +530,20 @@ following code:

Asm-blox support undo and redo on a per-cell basis.

- ~asm-blox-undo~ (bound ~s-z~): undo a previous action in the
- ~asm-blox-undo~ (bound ~s-z~, remap ~undo~): undo a previous action in the
current code cell.
- ~asm-blox-redo~ (bound ~s-y~): redo a previous undo in the
current code cell.

** Advanced editing

- ~asm-blox-shift-box-up~ (bound ~<s-up>~): Swap the current code
- ~asm-blox-shift-box-up~ (bound ~<M-up>~): Swap the current code
cell with the one above the current one.
- ~asm-blox-shift-box-down~ (bound ~<s-down>~): Swap the current
- ~asm-blox-shift-box-down~ (bound ~<M-down>~): Swap the current
code cell with the one below the current one.
- ~asm-blox-shift-box-left~ (bound ~<s-left>~): Swap the current
- ~asm-blox-shift-box-left~ (bound ~<M-left>~): Swap the current
code cell with the one to the left of the current one.
- ~asm-blox-shift-box-right~ (bound ~<s-right>~): Swap the current
- ~asm-blox-shift-box-right~ (bound ~<M-right>~): Swap the current
code cell with the one to the right of the current one.
- ~asm-blox-kill-region~ (bound ~<C-w>~): kill the highlighted
region of the current code cell. Note that the two ends of the
Expand Down
Binary file modified doc/asm-blox.pdf
Binary file not shown.

0 comments on commit 374d970

Please sign in to comment.