emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [elpa] scratch/add-vdiff 0f640d3 007/258: Add header info


From: Justin Burkett
Subject: Re: [elpa] scratch/add-vdiff 0f640d3 007/258: Add header info
Date: Wed, 17 May 2017 10:45:30 -0400

> The copyright should be "Free Software Foundation, Inc".
> Run "make check_copyright" from the elpa GNUmakefile.

Thanks Stefan. I changed the copyright.

Here is a rewritten introduction for those unfamiliar with vimdiff.

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.

Justin

On Wed, May 17, 2017 at 8:42 AM, Stefan Monnier
<address@hidden> wrote:
>> +;;; vdiff.el --- Like vimdiff  -*- lexical-binding: t; -*-
>> +
>> +;; Copyright (C) 2016 Justin Burkett
>
> The copyright should be "Free Software Foundation, Inc".
> Run "make check_copyright" from the elpa GNUmakefile.
>
>> +;;; Commentary:
>> +
>> +;;; Code:
>
> I think it's safe to assume that many/most Emacs users haven't used Vim
> much, and hence aren't familiar with vimdiff.  Please describe briefly what
> it does (especially comparing it to ediff, I guess).
>
>
>         Stefan



reply via email to

[Prev in Thread] Current Thread [Next in Thread]