summaryrefslogtreecommitdiff
path: root/lisp/vc/ediff-init.el
Commit message (Expand)AuthorAge
* 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
* Merge from origin/emacs-25Paul Eggert2017-01-01
|\
| * Update copyright year to 2017Paul Eggert2016-12-31
* | ; Spelling fixesPaul Eggert2016-12-22
|/
* Update copyright year to 2016Paul Eggert2016-01-01
* Fix docstring quoting problems with ‘ '’Paul Eggert2015-11-17
* Backslash cleanup in Elisp source filesPaul Eggert2015-09-17
* Fix minor text quoting in calc, calendar, vcPaul Eggert2015-08-28
* Update copyright year to 2015Paul Eggert2015-01-01
* * lisp: Prefer inlinable functions to macros.Stefan Monnier2014-12-05
* ediff: Replace obsolete toggle-read-only with read-only-modeGlenn Morris2014-07-25
* * lisp/vc/ediff-init.el (ediff-current-diff-Ancestor)Juri Linkov2014-06-18
* * lisp/vc/ediff-diff.el (ediff-set-fine-diff-properties-in-one-buffer):Stefan Monnier2014-05-02
* Ediff's overlay priorities cause more trouble than they solve.Stefan Monnier2014-04-10
* * lisp/vc/ediff-init.el (ediff-use-faces, ediff-highlight-all-diffs):Glenn Morris2014-02-15
* Update copyright year to 2014 by running admin/update-copyright.Paul Eggert2014-01-01
* * lisp/dired-x.el:Daniel Hackney2013-09-04
* Update copyright notices for 2013.Paul Eggert2013-01-01
* * lisp/facemenu.el (list-colors-sort): Add option "Luminance".Juri Linkov2012-09-30
* Use declare forms, where possible, to mark obsolete functions.Chong Yidong2012-09-25
* Use the same diff color scheme as in modern VCSes (bug#10181).Juri Linkov2012-05-25
* Adapt ediff window handling to multi-tty.Chong Yidong2012-04-26