summaryrefslogtreecommitdiff
path: root/lisp/vc/ediff-wind.el
Commit message (Expand)AuthorAgeFilesLines
* * lisp/vc/ediff-*.el: Use lexical-binding, plus misc cleanupStefan Monnier2019-06-211-21/+12
* 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
* | Remove some declare-function stub definitionsGlenn Morris2018-03-231-4/+0
* | Merge from origin/emacs-26Paul Eggert2018-01-011-1/+1
|\ \ | |/
| * Update copyright year to 2018Paul Eggert2018-01-011-1/+1
| * Fix typos in ediff-wind.elEli Zaretskii2017-11-031-5/+5
* | Merge from origin/emacs-26Paul Eggert2017-11-021-0/+2
|\ \ | |/
| * Avoid fullscreen ediff control frames by default (Bug#29026)Martin Rudalics2017-10-311-0/+2
* | * lisp/vc/ediff-wind.el: Don't pop spurious frame in corner caseStefan Monnier2017-10-261-133/+106
|/
* 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-1/+1
* Merge from origin/emacs-25Paul Eggert2017-03-191-1/+1
|\
| * ; Fix a typo in commentTino Calancha2017-02-101-1/+1
* | Show ancestor buffer in 3way mergesTino Calancha2017-03-141-11/+75
|/
* Update copyright year to 2017Paul Eggert2016-12-311-1/+1
* Update copyright year to 2016Paul Eggert2016-01-011-1/+1
* Fix docstring quoting problems with ‘ '’Paul Eggert2015-11-171-1/+1
* Backslash cleanup in Elisp source filesPaul Eggert2015-09-171-2/+2
* Update copyright year to 2015Paul Eggert2015-01-011-1/+1
* Update copyright year to 2014 by running admin/update-copyright.Paul Eggert2014-01-011-1/+1
* * lisp/dired-x.el:Daniel Hackney2013-09-041-5/+5
* Do not call to `selected-window' where it is assumed by default.Dmitry Antipov2013-08-051-3/+3
* Silence ediff compilationGlenn Morris2013-05-231-7/+10
* Update copyright notices for 2013.Paul Eggert2013-01-011-1/+1
* Use declare forms, where possible, to mark obsolete functions.Chong Yidong2012-09-251-3/+1
* Replace version 24.2 with 24.3 where appropriate (hopefully)Glenn Morris2012-08-151-2/+2
* Remove incorrect uses of "modeline".Chong Yidong2012-06-021-2/+2
* Adapt ediff window handling to multi-tty.Chong Yidong2012-04-261-11/+26
* Add 2012 to FSF copyright years for Emacs filesGlenn Morris2012-01-051-1/+1
* Spelling fixes.Paul Eggert2011-11-141-1/+1
* Refill some long/short copyright headers.Glenn Morris2011-01-261-2/+1
* Convert consecutive FSF copyright years to ranges.Glenn Morris2011-01-241-2/+1
* Refill some copyright headers.Glenn Morris2011-01-151-2/+3
* Merge from emacs-23Stefan Monnier2011-01-141-3/+2
* Remove some tests for defunct system-types.Glenn Morris2010-10-081-9/+8
* 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/+1313