summaryrefslogtreecommitdiff
path: root/lisp/vc/ediff-init.el
Commit message (Expand)AuthorAgeFilesLines
* 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
* ediff-difference-vector-alist: Drop duplicated definitionTino Calancha2017-01-251-26/+20
* Merge from origin/emacs-25Paul Eggert2017-01-011-1/+1
|\
| * Update copyright year to 2017Paul Eggert2016-12-311-1/+1
* | ; Spelling fixesPaul Eggert2016-12-221-1/+1
|/
* Update copyright year to 2016Paul Eggert2016-01-011-1/+1
* Fix docstring quoting problems with ‘ '’Paul Eggert2015-11-171-3/+3
* Backslash cleanup in Elisp source filesPaul Eggert2015-09-171-1/+1
* Fix minor text quoting in calc, calendar, vcPaul Eggert2015-08-281-0/+3
* Update copyright year to 2015Paul Eggert2015-01-011-1/+1
* * lisp: Prefer inlinable functions to macros.Stefan Monnier2014-12-051-6/+5
* ediff: Replace obsolete toggle-read-only with read-only-modeGlenn Morris2014-07-251-1/+1
* * lisp/vc/ediff-init.el (ediff-current-diff-Ancestor)Juri Linkov2014-06-181-4/+24
* * lisp/vc/ediff-diff.el (ediff-set-fine-diff-properties-in-one-buffer):Stefan Monnier2014-05-021-1/+1
* Ediff's overlay priorities cause more trouble than they solve.Stefan Monnier2014-04-101-31/+0
* * lisp/vc/ediff-init.el (ediff-use-faces, ediff-highlight-all-diffs):Glenn Morris2014-02-151-2/+4
* Update copyright year to 2014 by running admin/update-copyright.Paul Eggert2014-01-011-1/+1
* * lisp/dired-x.el:Daniel Hackney2013-09-041-2/+2
* Update copyright notices for 2013.Paul Eggert2013-01-011-1/+1
* * lisp/facemenu.el (list-colors-sort): Add option "Luminance".Juri Linkov2012-09-301-1/+1
* Use declare forms, where possible, to mark obsolete functions.Chong Yidong2012-09-251-3/+1
* Use the same diff color scheme as in modern VCSes (bug#10181).Juri Linkov2012-05-251-6/+30
* Adapt ediff window handling to multi-tty.Chong Yidong2012-04-261-13/+6
* Remove * characters from the front of variable docstrings.Chong Yidong2012-04-091-1/+1
* Fix mode-line-format handling bug in Ediff.Chong Yidong2012-02-191-2/+4
* Add 2012 to FSF copyright years for Emacs filesGlenn Morris2012-01-051-1/+1
* Spelling fixes.Paul Eggert2011-12-041-1/+1
* Spelling fixes.Paul Eggert2011-11-131-1/+1
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-10 22:52:48 +0000