summaryrefslogtreecommitdiff
path: root/lisp/vc/ediff.el
AgeCommit message (Expand)Author
2026-01-01; Add 2026 to copyright years.Sean Whitton
2025-04-05ediff-current-file: New optional startup-hooks argPaul D. Nelson
2025-01-01Update copyright year to 2025Paul Eggert
2024-01-02; Add 2024 to copyright yearsPo Lu
2023-10-01Doc fix; more consistently refer to "text terminals"Stefan Kangas
2023-01-01; Add 2023 to copyright years.Eli Zaretskii
2022-08-17Merge from origin/emacs-28Stefan Kangas
2022-08-16; * lisp/vc/ediff.el: Improve wording in last change.Stefan Kangas
2022-08-13Merge from origin/emacs-28Stefan Kangas
2022-08-12Delete references to deleted library hilit19.elStefan Kangas
2022-08-07Minor cleanups in ediff-*.elStefan Kangas
2022-01-01Merge from origin/emacs-28Eli Zaretskii
2022-01-01; Add 2022 to copyright years.Eli Zaretskii
2021-11-17Use substitute-command-keys in some messagesStefan Kangas
2021-11-10; Fix typos in CONTRIBUTE, ELisp manual, ediffTom Levy
2021-09-26; Fix some recent fixes to doc stringsEli Zaretskii
2021-09-26; Adjust overly long docstrings to fit 80 charactersStefan Kangas
2021-09-18; More stylistic docfixes in vc/*.el found by checkdocStefan Kangas
2021-09-14; More minor docfixes found by checkdocStefan Kangas
2021-02-26lisp/vc/*.el: Use lexical-bindings in all the filesStefan Monnier
2021-01-15Make libraries works with xterm-mouse-mode.Jared Finder
2021-01-01Update copyright year to 2021Paul Eggert
2020-09-06Use `format-prompt' when prompting with default valuesLars Ingebrigtsen
2020-01-01Update copyright year to 2020Paul Eggert
2019-10-28Remove obsolete doc references to XEmacs (Bug#37899)Stefan Kangas
2019-10-05Remove most of the XEmacs compat code from ediff*.elLars Ingebrigtsen
2019-06-21* lisp/vc/ediff-*.el: Use lexical-binding, plus misc cleanupStefan Monnier
2019-06-18Disable lexical-binding in ediffGlenn Morris
2019-06-09Use lexical binding for ediffAlex Branham
2018-12-31Merge from origin/emacs-26Paul Eggert
2019-01-01Update copyright year to 2019Paul Eggert
2018-11-28Merge from origin/emacs-26Glenn Morris
2018-11-27Improve documentation of Ediff wordwise commandsEli Zaretskii
2018-03-23Remove some declare-function stub definitionsGlenn Morris
2018-02-26Update some lisp function declarationsGlenn Morris
2018-01-01Update copyright year to 2018Paul Eggert
2017-11-05Ediff: add some missing documentationPhilipp Stephani
2017-09-13Prefer HTTPS to FTP and HTTP in documentationPaul Eggert
2017-04-17ediff: use user-error rather than debug-ignored-errorsGlenn Morris
2017-01-01Merge from origin/emacs-25Paul Eggert
2016-12-31Update copyright year to 2017Paul Eggert
2016-11-23Clarify ediff-directories promptDima Kogan
2016-03-20Don't bug out on nil `patch-buf' argumentsLars Magne Ingebrigtsen
2016-02-23Require that the buffer that we're trying to patch existLars Ingebrigtsen
2016-02-23Require that the buffer that we're trying to patch existTino Calancha
2016-01-01Update copyright year to 2016Paul Eggert
2015-09-17Backslash cleanup in Elisp source filesPaul Eggert
2015-08-28Fix minor text quoting in calc, calendar, vcPaul Eggert
2015-01-01Update copyright year to 2015Paul Eggert
2014-06-28Doc and comment fixes re "online" helpGlenn Morris
generated by cgit v1.3 (git 2.53.0) at 2026-07-13 01:33:48 +0000