~indieterminacy/3q20rq_oq_diffing_emacs

34faab9cecc0fb655964c2284ca1ea72088094d5 — Indieterminacy 3 months ago aa2524f
xwx-rw_mq-kq	converting-research_from-format koutliner into html
1 files changed, 283 insertions(+), 0 deletions(-)

A oqo_vdiff.html
A oqo_vdiff.html => oqo_vdiff.html +283 -0
@@ 0,0 1,283 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>oqo_vdiff</title>
<meta charset="utf-8">

<meta name="description" content="Created by Hyperbole's outliner.
See &quot;(hyperbole)Koutliner&quot; for more information.">
<meta name="viewport" content="width=device-width, initial-scale=1"><link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.9.0/css/all.min.css">
<style>

span.nobreak {
  white-space: nowrap;
}

div {
 display: inline;
}

li {
 list-style-type: none;
}

ul {
  margin-top: 0px;
  margin-bottom: 0px;
  padding-left: 30px;
}

.tdone {
  vertical-align: text-bottom;
  width: 1%;
}

.tdtwo {
  vertical-align: text-bottom;
  width: 2%;
}

.btn {
  all: unset;
  background-color: inherit;
  cursor: pointer;
  display: block;
  outline: inherit;
}

.btn:hover {
  background-color: #FAFAD2;
  font-size: 20px;
}

.content {
  display: block;
  font-size: 20px;
  margin-top: 0px;
  margin-bottom: 0px;
}

.label {
  display: block;
  color: #C100C1;
}

h1 {
  margin-top: 0px;
  margin-bottom: 0px;
}

pre {
  margin-top: 0px;
  margin-bottom: 0px;
  font-size: 20px;
}

body {
  background-color: white;
}

</style>
</head>

<body>

<h1>oqo_vdiff</h1>

<ul>
<!-- Level: 1, is-parent: nil, is-last-sibling: nil -->
<li>
<div class="content">
<table><tr>
<td class="tdone">
<span class="fas fa-chevron-down fa-fw" style="visibility:hidden"></span>
</td>
<td class="tdtwo"><span id="k1"></span><span id="k01"></span><pre class="label">1. </pre></td>
<td><pre>=&gt; <a href="https://github.com/justbur/emacs-vdiff">https://github.com/justbur/emacs-vdiff</a></pre></td>
</tr>
</table>
</div>
</li>
<!-- Level: 1, is-parent: nil, is-last-sibling: nil -->
<li>
<div class="content">
<table><tr>
<td class="tdone">
<span class="fas fa-chevron-down fa-fw" style="visibility:hidden"></span>
</td>
<td class="tdtwo"><span id="k2"></span><span id="k02"></span><pre class="label">2. </pre></td>
<td><pre>ie	vdiff compares two or three buffers on the basis of the output from the diff tool</pre></td>
</tr>
</table>
</div>
</li>
<!-- Level: 1, is-parent: nil, is-last-sibling: nil -->
<li>
<div class="content">
<table><tr>
<td class="tdone">
<span class="fas fa-chevron-down fa-fw" style="visibility:hidden"></span>
</td>
<td class="tdtwo"><span id="k3"></span><span id="k06"></span><pre class="label">3. </pre></td>
<td><pre>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)</pre></td>
</tr>
</table>
</div>
</li>
<!-- Level: 1, is-parent: nil, is-last-sibling: nil -->
<li>
<div class="content">
<table><tr>
<td class="tdone">
<span class="fas fa-chevron-down fa-fw" style="visibility:hidden"></span>
</td>
<td class="tdtwo"><span id="k4"></span><span id="k08"></span><pre class="label">4. </pre></td>
<td><pre>ie	This is similar to how ediff works, but in ediff you use a third “control buffer” to move through the diffed buffers</pre></td>
</tr>
</table>
</div>
</li>
<!-- Level: 1, is-parent: nil, is-last-sibling: nil -->
<li>
<div class="content">
<table><tr>
<td class="tdone">
<span class="fas fa-chevron-down fa-fw" style="visibility:hidden"></span>
</td>
<td class="tdtwo"><span id="k5"></span><span id="k09"></span><pre class="label">5. </pre></td>
<td><pre>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</pre></td>
</tr>
</table>
</div>
</li>
<!-- Level: 1, is-parent: nil, is-last-sibling: nil -->
<li>
<div class="content">
<table><tr>
<td class="tdone">
<span class="fas fa-chevron-down fa-fw" style="visibility:hidden"></span>
</td>
<td class="tdtwo"><span id="k6"></span><span id="k010"></span><pre class="label">6. </pre></td>
<td><pre>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</pre></td>
</tr>
</table>
</div>
</li>
<!-- Level: 1, is-parent: nil, is-last-sibling: nil -->
<li>
<div class="content">
<table><tr>
<td class="tdone">
<span class="fas fa-chevron-down fa-fw" style="visibility:hidden"></span>
</td>
<td class="tdtwo"><span id="k7"></span><span id="k011"></span><pre class="label">7. </pre></td>
<td><pre>ie	In contrast to ediff, vdiff also provides folding capabilities to fold sections of the buffers that don’t contain changes</pre></td>
</tr>
</table>
</div>
</li>
<!-- Level: 1, is-parent: nil, is-last-sibling: nil -->
<li>
<div class="content">
<table><tr>
<td class="tdone">
<span class="fas fa-chevron-down fa-fw" style="visibility:hidden"></span>
</td>
<td class="tdtwo"><span id="k8"></span><span id="k012"></span><pre class="label">8. </pre></td>
<td><pre>ie	This folding occurs automatically</pre></td>
</tr>
</table>
</div>
</li>
<!-- Level: 1, is-parent: nil, is-last-sibling: nil -->
<li>
<div class="content">
<table><tr>
<td class="tdone">
<span class="fas fa-chevron-down fa-fw" style="visibility:hidden"></span>
</td>
<td class="tdtwo"><span id="k9"></span><span id="k013"></span><pre class="label">9. </pre></td>
<td><pre>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</pre></td>
</tr>
</table>
</div>
</li>
<!-- Level: 1, is-parent: nil, is-last-sibling: nil -->
<li>
<div class="content">
<table><tr>
<td class="tdone">
<span class="fas fa-chevron-down fa-fw" style="visibility:hidden"></span>
</td>
<td class="tdtwo"><span id="k10"></span><span id="k05"></span><pre class="label">10. </pre></td>
<td><pre>ie	This functionality is all inspired by (but not equivalent to) the vimdiff tool from vim.</pre></td>
</tr>
</table>
</div>
</li>
<!-- Level: 1, is-parent: nil, is-last-sibling: nil -->
<li>
<div class="content">
<table><tr>
<td class="tdone">
<span class="fas fa-chevron-down fa-fw" style="visibility:hidden"></span>
</td>
<td class="tdtwo"><span id="k11"></span><span id="k03"></span><pre class="label">11. </pre></td>
<td><pre>rqr	investigate functionality for gLean</pre></td>
</tr>
</table>
</div>
</li>
<!-- Level: 1, is-parent: nil, is-last-sibling: t -->
<li>
<div class="content">
<table><tr>
<td class="tdone">
<span class="fas fa-chevron-down fa-fw" style="visibility:hidden"></span>
</td>
<td class="tdtwo"><span id="k12"></span><span id="k04"></span><pre class="label">12. </pre></td>
<td><pre>rqr_oqo	investigate emacs-vdiff-magit</pre></td>
</tr>
</table>
</div>
</li>
</ul>
</li>
</ul>
<script>
var allSpan = document.getElementsByClassName('btn');

function childElt(elt, tag)
{
    return elt.getElementsByTagName(tag)[0];
}

for (var x = 0; x < allSpan.length; x++)
{
  allSpan[x].onclick = function()
  {
    if (this.parentNode)
    {
      var icon = childElt(this, 'span');
      var childList = this.parentNode.getElementsByTagName('li');
      for (var y = 0; y < childList.length; y++)
      {
        var currentState = childList[y].style.display;
        if (currentState == 'none')
        {
          childList[y].style.display = 'block';
          icon.classList.add('fas', 'fa-chevron-down');
          icon.classList.remove('fa-chevron-right');
        }
        else
        {
          childList[y].style.display='none';
          icon.classList.add('fas', 'fa-chevron-right');
          icon.classList.remove('fa-chevron-down');
        }
      }
    }
  }
}
</script>
</body></html>