summaryrefslogtreecommitdiff
path: root/lisp/vc/ediff-init.el
Commit message (Expand)AuthorAge
* ; Add a doc string for 'ediff-window-display-p' obsolescenceEli Zaretskii2023-02-28
* ; Add 2023 to copyright years.Eli Zaretskii2023-01-01
* Make XEmacs compat alias face-background-pixmap obsoleteStefan Kangas2022-08-23
* 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
* ; Improve obsoletions in ediff-init.elStefan Kangas2022-08-07
* Declare unused function ediff-user-grabbed-mouse obsoleteStefan Kangas2022-08-07
* Fix too-long ediff defface doc stringsLars Ingebrigtsen2022-06-21
* Merge from origin/emacs-28Eli Zaretskii2022-01-01
|\
| * ; Add 2022 to copyright years.Eli Zaretskii2022-01-01
* | Use substitute-command-keys for literal key sequencesStefan Kangas2021-11-22
|/
* Don't use `format' on strings without % format directivesLars Ingebrigtsen2021-09-21
* ; Delete a spurious commentStefan Kangas2021-09-19
* Make doc argument of ediff-defvar-local optionalStefan Kangas2021-09-18
* ; More stylistic docfixes in vc/*.el found by checkdocStefan Kangas2021-09-18
* ; Minor stylistic fixes found by checkdocStefan Kangas2021-09-16
* ; More minor docfixes found by checkdocStefan Kangas2021-09-14
* Remove some remaining references to XEmacsStefan Kangas2021-09-13
* lisp/vc/*.el: Use lexical-bindings in all the filesStefan Monnier2021-02-26
* Fix ediff even/odd faces to increase their contrast and readabilityJuri Linkov2021-02-10
* Don't set removed variable facemenu-unlisted-facesStefan Kangas2021-02-04
* Prefer defvar-local in vc/*.elStefan Kangas2021-01-31
* Update copyright year to 2021Paul Eggert2021-01-01
* Shorten over-wide docstrings in defcustomsStefan Kangas2020-12-19
* Fix over-wide doc stringsEli Zaretskii2020-12-19
* Remove some compat code from ediffLars Ingebrigtsen2020-08-18
* Remove some compat code from ediff-init.elLars Ingebrigtsen2020-08-12
* gnus-shorten-url: Improve and avoid args-out-of-range errorŠtěpán Němec2020-04-13
* Remove more XEmacs compat code from ediff*.elStefan Kangas2020-03-21
* Make more load-hooks obsoleteGlenn Morris2020-01-16
* Merge from origin/emacs-27Paul Eggert2020-01-01
|\
| * Update copyright year to 2020Paul Eggert2020-01-01
* | Use regexp type for regexps in defcustom declarationsMattias Engdegård2019-12-26
|/
* Add ':extend' attribute to faces and themesEli Zaretskii2019-11-30
* Add ':extend t' face attribute to diff faces (bug#37774)Juri Linkov2019-10-19
* 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/vc/ediff-*.el: Use lexical-binding, plus misc cleanupStefan Monnier2019-06-21
* Disable lexical-binding in ediffGlenn Morris2019-06-18
* Use lexical binding for ediffAlex Branham2019-06-09
* Merge from origin/emacs-26Paul Eggert2018-12-31
|\
| * Update copyright year to 2019Paul Eggert2019-01-01
* | Replace insignificant backquotesMichael Heerdegen2018-11-25
|/
* Update copyright year to 2018Paul Eggert2018-01-01
* Prefer HTTPS to FTP and HTTP in documentationPaul Eggert2017-09-13
* ediff: use user-error rather than debug-ignored-errorsGlenn Morris2017-04-17
* Show ancestor buffer in 3way mergesTino Calancha2017-03-14
* diff-mode: Improve default faces for buffer ancestorTino Calancha2017-03-14
* ediff-difference-vector-alist: Drop duplicated definitionTino Calancha2017-01-25