summaryrefslogtreecommitdiff
path: root/lisp/vc/ediff-util.el
Commit message (Expand)AuthorAge
* ; Add 2023 to copyright years.Eli Zaretskii2023-01-01
* ; Fix typosStefan Kangas2022-11-18
* Minor cleanups in ediff-*.elStefan Kangas2022-08-07
* Make ediff-window-display-p obsoleteStefan Kangas2022-08-07
* Make ediff-file-remote-p obsolete in favor of file-remote-pStefan Kangas2022-08-07
* Declare unused function ediff-user-grabbed-mouse obsoleteStefan Kangas2022-08-07
* Remove workaround for XEmacs bug in ediff-util.elStefan Kangas2022-08-07
* Make indented-text-mode alias obsoleteStefan Kangas2022-08-06
* Simplify a few timestampsPaul Eggert2022-08-01
* ; * lisp/vc/ediff-util.el (ediff-show-diff-output): Doc fix.Eli Zaretskii2022-05-09
* Make ediff-show-diff-output work better on unsaved buffersLars Ingebrigtsen2022-05-09
* Merge from origin/emacs-28Eli Zaretskii2022-01-01
|\
| * ; Add 2022 to copyright years.Eli Zaretskii2022-01-01
* | Merge from origin/emacs-28Stefan Kangas2021-12-16
|\|
| * Fix control buffer window height in 'ediff-setup-control-buffer' (Bug#49277)Martin Rudalics2021-12-15
* | Merge from origin/emacs-28Glenn Morris2021-10-05
|\|
| * ; Minor stylistic fixes found by checkdocStefan Kangas2021-10-05
* | Use format-prompt for many more promptsStefan Kangas2021-10-05
|/
* Use command substitution instead of raw keys in more placesStefan Kangas2021-09-24
* Make doc argument of ediff-defvar-local optionalStefan Kangas2021-09-18
* ; More stylistic docfixes in vc/*.el found by checkdocStefan Kangas2021-09-18
* * lisp/vc/ediff-util.el (ediff-member): Make obsolete.Stefan Kangas2021-09-17
* Make ediff-set-difference into obsolete alias for seq-differenceStefan Kangas2021-09-17
* Make ediff-intersection into obsolete alias for seq-intersectionStefan Kangas2021-09-17
* Make ediff-union into obsolete alias for seq-unionStefan Kangas2021-09-17
* Remove some remaining references to XEmacsStefan Kangas2021-09-13
* Avoid making backup files in ediff when `make-backup-files' is nilLars Ingebrigtsen2021-07-08
* ediff shouldn't alter the kill ring when copying a diffLars Ingebrigtsen2021-05-03
* Remove code commented out since 1995 from ediff-util.elStefan Kangas2021-04-05
* Make ediff-copy-list alias obsoleteStefan Kangas2021-04-05
* lisp/vc/*.el: Use lexical-bindings in all the filesStefan Monnier2021-02-26
* Prefer setq-local in a few more placesStefan Kangas2021-02-08
* Update copyright year to 2021Paul Eggert2021-01-01
* Fix some over-wide docstringsStefan Kangas2020-12-30
* Prefer setq-local in vc/*.elStefan Kangas2020-12-05
* Remove pointless use of internAndreas Schwab2020-09-17
* Use `format-prompt' when prompting with default valuesLars Ingebrigtsen2020-09-06
* Remove some compat code from ediffLars Ingebrigtsen2020-08-18
* Remove some compat code from ediff-util.elLars Ingebrigtsen2020-08-18
* Remove more XEmacs compat code from ediff*.elStefan Kangas2020-03-21
* Improve prefix arg support in 'ediff-scroll-horizontally'Kyle Hubert2020-02-08
* Update copyright year to 2020Paul Eggert2020-01-01
* * lisp/vc/ediff-util.el: Set this-command to ediff-quit (bug#38219)Juri Linkov2019-11-18
* Fix some quoting glitches in doc stringsPaul Eggert2019-11-11
* Remove most of the XEmacs compat code from ediff*.elLars Ingebrigtsen2019-10-05
* Remove some XEmacs compat code from ediff*.elLars Ingebrigtsen2019-10-04
* lisp/*.el: Fix typos and other trivial doc fixesJuanma Barranquero2019-09-21
* * lisp/vc/ediff-*.el: Use lexical-binding, plus misc cleanupStefan Monnier2019-06-21
* Merge from origin/emacs-26Paul Eggert2018-12-31
|\
| * Update copyright year to 2019Paul Eggert2019-01-01