summaryrefslogtreecommitdiff
path: root/lisp/vc/ediff-init.el
Commit message (Expand)AuthorAgeFilesLines
* 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
* Make vc-toggle-read-only an alias for toggle-read-only.Chong Yidong2011-10-231-5/+3
* ediff-init.el fix for bug#1821. (tiny change)David Abrahams2011-03-031-2/+2
* Convert consecutive FSF copyright years to ranges.Glenn Morris2011-01-241-2/+1
* Nuke arch-tags.Glenn Morris2011-01-151-1/+0
* Merge from emacs-23Stefan Monnier2011-01-141-1/+1
* Remove some functions, variables and aliases obsolete since at least 21.1.Glenn Morris2010-10-011-10/+0
* Add "Package:" file headers to denote built-in packages.Chong Yidong2010-08-291-0/+1
* Move version control related files to the "vc" subdirectory.Juri Linkov2010-06-111-0/+1821