summaryrefslogtreecommitdiff
path: root/lisp/vc/ediff-diff.el
Commit message (Expand)AuthorAge
* Prefer defvar-local in vc/*.elStefan Kangas2021-01-31
* Update copyright year to 2021Paul Eggert2021-01-01
* Shorten over-wide docstrings in variablesStefan Kangas2020-12-19
* Fix problem with non-ASCII characters in ediff error messagesLars Ingebrigtsen2020-08-20
* Update copyright year to 2020Paul Eggert2020-01-01
* 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
* Update copyright year to 2019Paul Eggert2019-01-01
* ; Use GNU not Gnu in docsGlenn Morris2018-03-23
* 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
* Check that file argument is a stringKaushal Modi2017-04-07
* Make ediff handle remote and quoted file namesPhilipp Stephani2017-04-04
* Merge from origin/emacs-25Paul Eggert2017-01-01
|\
| * Update copyright year to 2017Paul Eggert2016-12-31
* | Add file-local-nameMichael Albinus2016-11-20
|/
* Update copyright year to 2016Paul Eggert2016-01-01
* Backslash cleanup in Elisp source filesPaul Eggert2015-09-17
* Fix minor text quoting in calc, calendar, vcPaul Eggert2015-08-28
* Prefer directed to neutral quotesPaul Eggert2015-08-24
* Update copyright year to 2015Paul Eggert2015-01-01
* * lisp/vc/ediff-diff.el (ediff-set-fine-diff-properties-in-one-buffer):Stefan Monnier2014-05-02
* Fix application of dolist to a vector (Bug#17257).YAMAMOTO Mitsuharu2014-04-14
* Ediff's overlay priorities cause more trouble than they solve.Stefan Monnier2014-04-10
* Update copyright year to 2014 by running admin/update-copyright.Paul Eggert2014-01-01
* * lisp/dired-x.el:Daniel Hackney2013-09-04
* Silence ediff compilationGlenn Morris2013-05-23
* Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.caPaul Eggert2013-01-02
|\
| * Update copyright notices for 2013.Paul Eggert2013-01-01
* | Obsolete longlines.el.Chong Yidong2012-12-04
|/
* * vc/ediff.el (ediff-directories): Add trailing space to prompts.Michael Albinus2012-07-16
* * vc/ediff-diff.el (ediff-same-file-contents): Fix it for remoteMichael Albinus2012-07-03
* Remove * characters from the front of variable docstrings.Chong Yidong2012-04-09
* Add 2012 to FSF copyright years for Emacs filesGlenn Morris2012-01-05
* Fix typos.Juanma Barranquero2011-11-20
* Don't quote lambda expressions with `quote'.Stefan Monnier2011-05-23
* Refill some long/short copyright headers.Glenn Morris2011-01-26
* Convert consecutive FSF copyright years to ranges.Glenn Morris2011-01-24
* Refill some copyright headers.Glenn Morris2011-01-15
* Merge from emacs-23Stefan Monnier2011-01-14
* Remove some tests for defunct system-types.Glenn Morris2010-10-08
* Add "Package:" file headers to denote built-in packages.Chong Yidong2010-08-29
* Move version control related files to the "vc" subdirectory.Juri Linkov2010-06-11