~indieterminacy/3q20rq_oq_diffing_emacs

4849ef7db2d4441e7be9061d21ad290339dfb3ff — Indieterminacy 2 years ago 4ba1757
dwd-kqk	updating-order-blocks
1 files changed, 39 insertions(+), 8 deletions(-)

M oqo_vdiff.kotl
M oqo_vdiff.kotl => oqo_vdiff.kotl +39 -8
@@ 3,17 3,31 @@

   1. => https://github.com/justbur/emacs-vdiff

   2. re	vdiff compares two or three buffers on the basis of the output from the diff tool. The buffers are kept synchronized so that as you move through one of the buffers the top of the active buffer aligns with the corresponding top of the other buffer(s). This is similar to how ediff works, but in ediff you use a third “control buffer” to move through the diffed buffers. The key difference is that in vdiff you are meant to actively edit one of the buffers and the display will update automatically for the other buffer. Similar to ediff, vdiff provides commands to “send” and “receive” hunks from one buffer to the other as well as commands to traverse the diff hunks, which are useful if you are trying to merge changes. In contrast to ediff, vdiff also provides folding capabilities to fold sections of the buffers that don’t contain changes. This folding occurs automatically. Finally, you are encouraged to bind a key to `vdiff-hydra/body’, which will use hydra.el (in ELPA) to create a convenient transient keymap containing most of the useful vdiff commands.
      
      This functionality is all inspired by (but not equivalent to) the vimdiff tool from vim.
   2. ie	vdiff compares two or three buffers on the basis of the output from the diff tool

   3. rqr	investigate functionality for gLean
   3. ie	The buffers are kept synchronized so that as you move through one of the buffers the top of the active buffer aligns with the corresponding top of the other buffer(s)

   4. rqr_oqo	investigate emacs-vdiff-magit
   4. ie	This is similar to how ediff works, but in ediff you use a third “control buffer” to move through the diffed buffers

   5. ie	The key difference is that in vdiff you are meant to actively edit one of the buffers and the display will update automatically for the other buffer

   6. ie	Similar to ediff, vdiff provides commands to “send” and “receive” hunks from one buffer to the other as well as commands to traverse the diff hunks, which are useful if you are trying to merge changes

   7. ie	In contrast to ediff, vdiff also provides folding capabilities to fold sections of the buffers that don’t contain changes

   8. ie	This folding occurs automatically

   9. ie	Finally, you are encouraged to bind a key to `vdiff-hydra/body’, which will use hydra.el (in ELPA) to create a convenient transient keymap containing most of the useful vdiff commands

  10. ie	This functionality is all inspired by (but not equivalent to) the vimdiff tool from vim.

  11. rqr	investigate functionality for gLean

  12. rqr_oqo	investigate emacs-vdiff-magit


"ben" ;; kvspec:current
4 ;; id-counter
13 ;; id-counter
alpha ;; label-type
4 ;; label-min-width
". " ;; label-separator


@@ 21,12 35,29 @@ alpha ;; label-type

;; depth-first kcell attributes
[[0
  (creator "pepys24@qiuy04" create-time "20211229:18:59:01" id-counter 4 file "/home/pepys24/3q20rq_diffing/oq_emacs/oqo_vdiff.kotl")]
  (creator "pepys24@qiuy04" create-time "20220222:11:02:57" id-counter 13 file "/home/pepys24/3q20rq_diffing/oq_emacs/oqo_vdiff.kotl")]
 [1
  (creator "pepys24@qiuy04" create-time "20211229:18:59:01")]
 [2
  (creator "pepys24@qiuy04" create-time "20211229:18:59:39" no-fill t)]
 [6
  (idstamp 2 creator "pepys24@qiuy04" create-time "20211229:18:59:39" no-fill t)]
 [8
  (idstamp 6 idstamp 2 creator "pepys24@qiuy04" create-time "20211229:18:59:39" no-fill t)]
 [9
  (idstamp 8 idstamp 6 idstamp 2 creator "pepys24@qiuy04" create-time "20211229:18:59:39" no-fill t)]
 [10
  (idstamp 9 idstamp 8 idstamp 6 idstamp 2 creator "pepys24@qiuy04" create-time "20211229:18:59:39" no-fill t)]
 [11
  (idstamp 10 idstamp 9 idstamp 8 idstamp 6 idstamp 2 creator "pepys24@qiuy04" create-time "20211229:18:59:39" no-fill t)]
 [12
  (idstamp 11 idstamp 10 idstamp 9 idstamp 8 idstamp 6 idstamp 2 creator "pepys24@qiuy04" create-time "20211229:18:59:39" no-fill t)]
 [13
  (idstamp 12 idstamp 11 idstamp 10 idstamp 9 idstamp 8 idstamp 6 idstamp 2 creator "pepys24@qiuy04" create-time "20211229:18:59:39" no-fill t)]
 [5
  (idstamp 2 creator "pepys24@qiuy04" create-time "20211229:18:59:39" no-fill t)]
 [3
  (creator "pepys24@qiuy04" create-time "20211229:18:59:58" no-fill t)]
 [4
  (creator "pepys24@qiuy04" create-time "20211229:19:05:18" no-fill t)]]
  (creator "pepys24@qiuy04" create-time "20211229:19:05:18" no-fill t)]
 nil]