Files
emacs/lisp
Olivier Certner c8b9922e26 ediff: Merges with ancestor: Fix computation of hunks and proposed merge
Hunks were not computed correctly because the diff3 command was
invoked with arguments in an incorrect order.  The correct order is
the local file first, the base (or "ancestor") second and the other
file third.  This erroneous behavior had two consequences.  First, the
output of diff3 would change, since it tries to merge chunks according
to maximal matches between the second and first files, and the second
and third files.  Second, ediff, more precisely, `ediff-do-merge',
would consequently try to merge the reverse of the changes from the
base to the other file.

* lisp/vc/ediff-diff.el (ediff-setup-diff-regions3): In the arguments
to `ediff-exec-process', swap the other file with the ancestor (only
when merging with an ancestor).

(ediff-extract-diffs3): Match the hunk data for the ancestor and the
other file correctly.  The local variable `three-way-comp' indicates
this is a merge with ancestors when it is nil.

(Bug#59182)
2022-11-17 11:40:09 +02:00
..
2022-11-11 15:52:37 +01:00
2022-11-17 09:34:24 +01:00
2022-11-17 09:34:24 +01:00
2022-10-26 23:04:23 +02:00
2022-11-11 15:52:37 +01:00
2022-11-17 09:34:24 +01:00
2022-11-17 09:34:24 +01:00
2022-11-17 09:34:24 +01:00
2022-11-17 09:34:24 +01:00
2022-10-06 10:56:27 +08:00
2022-10-26 23:04:23 +02:00
2022-07-11 11:30:00 +02:00
2022-10-27 23:04:37 +02:00
2022-11-11 15:52:37 +01:00
2022-08-10 11:21:24 +02:00
2022-11-16 20:34:28 -06:00
2022-11-10 01:31:22 +01:00
2022-07-19 14:13:25 +02:00
2022-11-11 15:52:37 +01:00
2022-08-08 14:23:29 +02:00
2022-11-11 15:52:37 +01:00
2022-11-17 09:34:24 +01:00
2022-11-11 15:52:37 +01:00
2022-05-28 07:06:30 +02:00
2022-06-27 15:32:53 +03:00
2022-10-15 17:22:48 +02:00
2022-09-13 18:19:26 +02:00
2022-10-30 09:40:06 -04:00
2022-11-15 19:48:39 +08:00
2022-10-26 23:04:23 +02:00
2022-08-05 11:47:05 +02:00
2022-09-21 10:25:06 +02:00
2022-09-13 11:06:40 +02:00
2022-09-20 12:39:29 +02:00
2022-08-30 19:09:00 +03:00
2022-09-06 12:54:42 +02:00
2022-10-26 23:04:23 +02:00
2022-09-27 15:29:33 +02:00
2022-07-22 22:43:38 +02:00
2022-10-29 08:21:59 +02:00
2022-09-20 12:21:40 +02:00
2022-07-11 11:30:00 +02:00
2022-09-21 10:25:06 +02:00
2022-11-11 15:52:37 +01:00
2022-09-28 17:34:59 +02:00
2022-10-26 21:09:14 +02:00
2022-11-15 05:09:10 +01:00
2022-04-01 20:07:33 -04:00
2022-10-20 20:50:34 +03:00
2022-07-26 14:23:30 +02:00
2022-08-22 19:22:33 +02:00
2022-09-09 11:27:30 +02:00
2022-07-04 17:01:53 +02:00
2022-08-13 06:30:27 +02:00
2022-11-11 15:52:37 +01:00
2022-07-14 11:37:42 +02:00
2022-07-14 11:37:42 +02:00
2022-09-21 10:25:06 +02:00
2022-09-09 11:27:30 +02:00
2022-08-04 11:39:23 +02:00
2022-11-01 10:30:09 +01:00
2022-07-20 22:38:01 +02:00
2022-11-17 09:34:24 +01:00
2022-10-25 19:51:08 +08:00

This directory contains source code for the parts of Emacs that are
written in Emacs Lisp.  *.el files are Emacs Lisp source, and the
corresponding *.elc files are byte-compiled versions.  Byte-compiled
files are architecture-independent.

The term subdirectory contains Lisp files that customize Emacs for
certain terminal types.  When Emacs starts, it checks the TERM
environment variable to get the terminal type and loads
'term/${TERM}.el' if it exists.

The other subdirectories hold Lisp packages grouped by their general
purpose.