summaryrefslogtreecommitdiff
path: root/lisp/vc/ediff-util.el
Commit message (Expand)AuthorAgeFilesLines
* Minor cleanups in ediff-*.elStefan Kangas2022-08-071-41/+10
* Make ediff-window-display-p obsoleteStefan Kangas2022-08-071-9/+9
* Make ediff-file-remote-p obsolete in favor of file-remote-pStefan Kangas2022-08-071-3/+3
* Declare unused function ediff-user-grabbed-mouse obsoleteStefan Kangas2022-08-071-4/+0
* Remove workaround for XEmacs bug in ediff-util.elStefan Kangas2022-08-071-7/+1
* Make indented-text-mode alias obsoleteStefan Kangas2022-08-061-3/+2
* Simplify a few timestampsPaul Eggert2022-08-011-4/+4
* ; * lisp/vc/ediff-util.el (ediff-show-diff-output): Doc fix.Eli Zaretskii2022-05-091-1/+1
* Make ediff-show-diff-output work better on unsaved buffersLars Ingebrigtsen2022-05-091-1/+7
* Merge from origin/emacs-28Eli Zaretskii2022-01-011-1/+1
|\
| * ; Add 2022 to copyright years.Eli Zaretskii2022-01-011-1/+1
* | Merge from origin/emacs-28Stefan Kangas2021-12-161-1/+19
|\|
| * Fix control buffer window height in 'ediff-setup-control-buffer' (Bug#49277)Martin Rudalics2021-12-151-1/+19
* | Merge from origin/emacs-28Glenn Morris2021-10-051-1/+1
|\|
| * ; Minor stylistic fixes found by checkdocStefan Kangas2021-10-051-1/+1
* | Use format-prompt for many more promptsStefan Kangas2021-10-051-5/+1
|/
* Use command substitution instead of raw keys in more placesStefan Kangas2021-09-241-2/+2
* Make doc argument of ediff-defvar-local optionalStefan Kangas2021-09-181-1/+1
* ; More stylistic docfixes in vc/*.el found by checkdocStefan Kangas2021-09-181-25/+33
* * lisp/vc/ediff-util.el (ediff-member): Make obsolete.Stefan Kangas2021-09-171-0/+1
* Make ediff-set-difference into obsolete alias for seq-differenceStefan Kangas2021-09-171-10/+1
* Make ediff-intersection into obsolete alias for seq-intersectionStefan Kangas2021-09-171-10/+1
* Make ediff-union into obsolete alias for seq-unionStefan Kangas2021-09-171-14/+1
* Remove some remaining references to XEmacsStefan Kangas2021-09-131-5/+3
* Avoid making backup files in ediff when `make-backup-files' is nilLars Ingebrigtsen2021-07-081-2/+3
* ediff shouldn't alter the kill ring when copying a diffLars Ingebrigtsen2021-05-031-5/+4
* Remove code commented out since 1995 from ediff-util.elStefan Kangas2021-04-051-4/+0
* Make ediff-copy-list alias obsoleteStefan Kangas2021-04-051-2/+1
* lisp/vc/*.el: Use lexical-bindings in all the filesStefan Monnier2021-02-261-74/+74
* Prefer setq-local in a few more placesStefan Kangas2021-02-081-2/+2
* Update copyright year to 2021Paul Eggert2021-01-011-1/+1
* Fix some over-wide docstringsStefan Kangas2020-12-301-2/+2
* Prefer setq-local in vc/*.elStefan Kangas2020-12-051-2/+1
* Remove pointless use of internAndreas Schwab2020-09-171-4/+4
* Use `format-prompt' when prompting with default valuesLars Ingebrigtsen2020-09-061-16/+13
* Remove some compat code from ediffLars Ingebrigtsen2020-08-181-8/+6
* Remove some compat code from ediff-util.elLars Ingebrigtsen2020-08-181-5/+3
* Remove more XEmacs compat code from ediff*.elStefan Kangas2020-03-211-5/+2
* Improve prefix arg support in 'ediff-scroll-horizontally'Kyle Hubert2020-02-081-2/+2
* Update copyright year to 2020Paul Eggert2020-01-011-1/+1
* * lisp/vc/ediff-util.el: Set this-command to ediff-quit (bug#38219)Juri Linkov2019-11-181-0/+2
* Fix some quoting glitches in doc stringsPaul Eggert2019-11-111-3/+3
* Remove most of the XEmacs compat code from ediff*.elLars Ingebrigtsen2019-10-051-148/+49
* Remove some XEmacs compat code from ediff*.elLars Ingebrigtsen2019-10-041-20/+9
* lisp/*.el: Fix typos and other trivial doc fixesJuanma Barranquero2019-09-211-1/+1
* * lisp/vc/ediff-*.el: Use lexical-binding, plus misc cleanupStefan Monnier2019-06-211-54/+30
* Merge from origin/emacs-26Paul Eggert2018-12-311-1/+1
|\
| * Update copyright year to 2019Paul Eggert2019-01-011-1/+1
* | Handle `make-process' in Tramp and ange-ftpMichael Albinus2018-12-231-3/+3
* | Let ediff '=' compare against ancestor buffer (Bug#11320)Noam Postavsky2018-06-281-18/+12
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-14 08:52:22 +0000