summaryrefslogtreecommitdiff
path: root/lisp/vc/ediff-init.el
Commit message (Expand)AuthorAgeFilesLines
* ; Add 2024 to copyright yearsPo Lu2024-01-021-1/+1
* ; Add a doc string for 'ediff-window-display-p' obsolescenceEli Zaretskii2023-02-281-1/+4
* ; Add 2023 to copyright years.Eli Zaretskii2023-01-011-1/+1
* Make XEmacs compat alias face-background-pixmap obsoleteStefan Kangas2022-08-231-1/+1
* Minor cleanups in ediff-*.elStefan Kangas2022-08-071-47/+17
* Make ediff-window-display-p obsoleteStefan Kangas2022-08-071-10/+7
* Make ediff-file-remote-p obsolete in favor of file-remote-pStefan Kangas2022-08-071-3/+1
* ; Improve obsoletions in ediff-init.elStefan Kangas2022-08-071-12/+4
* Declare unused function ediff-user-grabbed-mouse obsoleteStefan Kangas2022-08-071-18/+19
* Fix too-long ediff defface doc stringsLars Ingebrigtsen2022-06-211-5/+5
* Merge from origin/emacs-28Eli Zaretskii2022-01-011-1/+1
|\
| * ; Add 2022 to copyright years.Eli Zaretskii2022-01-011-1/+1
* | Use substitute-command-keys for literal key sequencesStefan Kangas2021-11-221-2/+2
|/
* Don't use `format' on strings without % format directivesLars Ingebrigtsen2021-09-211-2/+2
* ; Delete a spurious commentStefan Kangas2021-09-191-6/+0
* Make doc argument of ediff-defvar-local optionalStefan Kangas2021-09-181-24/+23
* ; More stylistic docfixes in vc/*.el found by checkdocStefan Kangas2021-09-181-79/+85
* ; Minor stylistic fixes found by checkdocStefan Kangas2021-09-161-3/+3
* ; More minor docfixes found by checkdocStefan Kangas2021-09-141-7/+7
* Remove some remaining references to XEmacsStefan Kangas2021-09-131-1/+0
* lisp/vc/*.el: Use lexical-bindings in all the filesStefan Monnier2021-02-261-3/+5
* Fix ediff even/odd faces to increase their contrast and readabilityJuri Linkov2021-02-101-14/+28
* Don't set removed variable facemenu-unlisted-facesStefan Kangas2021-02-041-24/+4
* Prefer defvar-local in vc/*.elStefan Kangas2021-01-311-3/+2
* Update copyright year to 2021Paul Eggert2021-01-011-1/+1
* Shorten over-wide docstrings in defcustomsStefan Kangas2020-12-191-3/+3
* Fix over-wide doc stringsEli Zaretskii2020-12-191-3/+3
* Remove some compat code from ediffLars Ingebrigtsen2020-08-181-3/+2
* Remove some compat code from ediff-init.elLars Ingebrigtsen2020-08-121-15/+0
* gnus-shorten-url: Improve and avoid args-out-of-range errorŠtěpán Němec2020-04-131-10/+0
* Remove more XEmacs compat code from ediff*.elStefan Kangas2020-03-211-18/+4
* Make more load-hooks obsoleteGlenn Morris2020-01-161-0/+2
* Merge from origin/emacs-27Paul Eggert2020-01-011-1/+1
|\
| * Update copyright year to 2020Paul Eggert2020-01-011-1/+1
* | Use regexp type for regexps in defcustom declarationsMattias Engdegård2019-12-261-1/+1
|/
* Add ':extend' attribute to faces and themesEli Zaretskii2019-11-301-12/+12
* Add ':extend t' face attribute to diff faces (bug#37774)Juri Linkov2019-10-191-47/+47
* Remove most of the XEmacs compat code from ediff*.elLars Ingebrigtsen2019-10-051-149/+63
* Remove some XEmacs compat code from ediff*.elLars Ingebrigtsen2019-10-041-248/+154
* * lisp/vc/ediff-*.el: Use lexical-binding, plus misc cleanupStefan Monnier2019-06-211-34/+5
* Disable lexical-binding in ediffGlenn Morris2019-06-181-1/+1
* Use lexical binding for ediffAlex Branham2019-06-091-1/+1
* Merge from origin/emacs-26Paul Eggert2018-12-311-1/+1
|\
| * Update copyright year to 2019Paul Eggert2019-01-011-1/+1
* | Replace insignificant backquotesMichael Heerdegen2018-11-251-11/+11
|/
* Update copyright year to 2018Paul Eggert2018-01-011-1/+1
* Prefer HTTPS to FTP and HTTP in documentationPaul Eggert2017-09-131-1/+1
* ediff: use user-error rather than debug-ignored-errorsGlenn Morris2017-04-171-3/+3
* Show ancestor buffer in 3way mergesTino Calancha2017-03-141-0/+10
* diff-mode: Improve default faces for buffer ancestorTino Calancha2017-03-141-14/+22
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-05 15:13:54 +0000