1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-29 00:31:01 -08:00
emacs/lisp/vc
Daniel Colascione e5ee1d2a74 Adapt ediff to nonstandard layouts
Make ediff cope with having some of its windows (especially the control
window) not shown by a custom ediff-window-setup-function.
Modernize relevant adjacent code. After this change, one can write a
custom ediff-window-setup-function that doesn't show the control window.

* doc/misc/ediff.texi (Notes on Heavy-duty Customization): Refine
language to explain that the window setup function doesn't have to show
all windows.
* lisp/vc/ediff-util.el (ediff-select-control-window-on-setup):
New variable.
(ediff-setup, ediff-recenter, ediff-recenter-one-window)
(ediff-recenter-ancestor, ediff-toggle-read-only)
(ediff-operate-on-windows, ediff-jump-to-difference-at-point)
(ediff-default-suspend-function)
(ediff-clone-buffer-for-region-comparison)
(ediff-clone-buffer-for-window-comparison): Modernize control flow;
select only windows that exist.
* lisp/vc/ediff-wind.el (ediff-with-live-window): New convenience macro.
(ediff-window-setup-function): Explain relaxed contract.
2025-03-21 20:56:12 -04:00
..
add-log.el Revert "Correctly fill generated ChangeLog entries" 2025-02-26 07:22:27 +01:00
compare-w.el Update copyright year to 2025 2025-01-02 18:39:42 +01:00
cvs-status.el Update copyright year to 2025 2025-01-02 18:39:42 +01:00
diff-mode.el Teach diff-apply-hunk to handle hunks with empty context 2025-03-15 04:54:11 +02:00
diff.el Merge from origin/emacs-30 2025-03-01 10:01:54 -05:00
ediff-diff.el Update copyright year to 2025 2025-01-02 18:39:42 +01:00
ediff-help.el Update copyright year to 2025 2025-01-02 18:39:42 +01:00
ediff-hook.el Merge branch 'scratch/no-purespace' into 'master' 2025-02-01 04:56:52 +01:00
ediff-init.el Prefer defface's ':slant italic' to obsolete alias ':italic t' 2025-01-21 09:56:59 +01:00
ediff-merg.el Update copyright year to 2025 2025-01-02 18:39:42 +01:00
ediff-mult.el Guard against user saving ediff-meta-diff-buffer 2025-03-09 08:10:17 -03:00
ediff-ptch.el Prefer '(evenp A)' to '(= 0 (% A 2))' 2025-02-17 05:37:10 +01:00
ediff-util.el Adapt ediff to nonstandard layouts 2025-03-21 20:56:12 -04:00
ediff-vers.el Fix unwanted revert file prompt after repeated vc-ediff (bug#11605) 2025-03-04 11:58:15 +08:00
ediff-wind.el Adapt ediff to nonstandard layouts 2025-03-21 20:56:12 -04:00
ediff.el Update copyright year to 2025 2025-01-02 18:39:42 +01:00
emerge.el Improve integer file mode options docstrings 2025-01-06 11:10:10 +01:00
log-edit.el ; Add comment to explain recent change 2025-03-10 20:35:28 +01:00
log-view.el Update copyright year to 2025 2025-01-02 18:39:42 +01:00
pcvs-defs.el Merge branch 'scratch/no-purespace' into 'master' 2025-02-01 04:56:52 +01:00
pcvs-info.el Update copyright year to 2025 2025-01-02 18:39:42 +01:00
pcvs-parse.el Update copyright year to 2025 2025-01-02 18:39:42 +01:00
pcvs-util.el Prefer decf to cl-decf 2025-02-23 00:38:22 +01:00
pcvs.el Update copyright year to 2025 2025-01-02 18:39:42 +01:00
smerge-mode.el Prefer decf to cl-decf 2025-02-23 00:38:22 +01:00
vc-annotate.el Update copyright year to 2025 2025-01-02 18:39:42 +01:00
vc-bzr.el Make marking conflicted files as resolved upon saving opt-out 2025-03-17 06:55:07 -03:00
vc-cvs.el Delete redundant lambdas around unary functions 2025-02-11 19:04:00 +01:00
vc-dav.el Update copyright year to 2025 2025-01-02 18:39:42 +01:00
vc-dir.el Update copyright year to 2025 2025-01-02 18:39:42 +01:00
vc-dispatcher.el vc-setup-buffer: Don't set current buffer as parent (bug#59457) 2025-03-10 17:14:33 +08:00
vc-filewise.el Update copyright year to 2025 2025-01-02 18:39:42 +01:00
vc-git.el Make marking conflicted files as resolved upon saving opt-out 2025-03-17 06:55:07 -03:00
vc-hg.el Make marking conflicted files as resolved upon saving opt-out 2025-03-17 06:55:07 -03:00
vc-hooks.el Use defvar-keymap for some trivial keymaps 2025-03-16 13:48:11 +01:00
vc-rcs.el Merge branch 'scratch/no-purespace' into 'master' 2025-02-01 04:56:52 +01:00
vc-sccs.el Merge branch 'scratch/no-purespace' into 'master' 2025-02-01 04:56:52 +01:00
vc-src.el Merge branch 'scratch/no-purespace' into 'master' 2025-02-01 04:56:52 +01:00
vc-svn.el Make marking conflicted files as resolved upon saving opt-out 2025-03-17 06:55:07 -03:00
vc.el Make marking conflicted files as resolved upon saving opt-out 2025-03-17 06:55:07 -03:00