summaryrefslogtreecommitdiff
path: root/lisp/vc/ediff.el
Commit message (Expand)AuthorAgeFilesLines
* Merge from origin/emacs-26Paul Eggert2018-12-311-1/+1
|\
| * Update copyright year to 2019Paul Eggert2019-01-011-1/+1
* | Merge from origin/emacs-26Glenn Morris2018-11-281-3/+6
|\ \ | |/
| * Improve documentation of Ediff wordwise commandsEli Zaretskii2018-11-271-3/+6
* | Remove some declare-function stub definitionsGlenn Morris2018-03-231-4/+0
* | Update some lisp function declarationsGlenn Morris2018-02-261-1/+1
|/
* Update copyright year to 2018Paul Eggert2018-01-011-1/+1
* Ediff: add some missing documentationPhilipp Stephani2017-11-051-25/+100
* 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-67/+17
* Merge from origin/emacs-25Paul Eggert2017-01-011-1/+1
|\
| * Update copyright year to 2017Paul Eggert2016-12-311-1/+1
* | Clarify ediff-directories promptDima Kogan2016-11-231-14/+14
* | Don't bug out on nil `patch-buf' argumentsLars Magne Ingebrigtsen2016-03-201-2/+2
* | Require that the buffer that we're trying to patch existLars Ingebrigtsen2016-02-231-1/+2
* | Require that the buffer that we're trying to patch existTino Calancha2016-02-231-3/+2
|/
* Update copyright year to 2016Paul Eggert2016-01-011-1/+1
* Backslash cleanup in Elisp source filesPaul Eggert2015-09-171-2/+2
* Fix minor text quoting in calc, calendar, vcPaul Eggert2015-08-281-3/+3
* Update copyright year to 2015Paul Eggert2015-01-011-1/+1
* Doc and comment fixes re "online" helpGlenn Morris2014-06-281-1/+1
* Small codes update for revert-buffer-function no longer being nil by defaultGlenn Morris2014-04-021-2/+4
* Update copyright year to 2014 by running admin/update-copyright.Paul Eggert2014-01-011-1/+1
* Update some function declarationsGlenn Morris2013-09-111-1/+1
* * lisp/dired-x.el:Daniel Hackney2013-09-041-1/+1
* Do not call to `selected-frame' where it is assumed by default.Dmitry Antipov2013-08-051-1/+1
* * faces.el (tty-run-terminal-initialization): function changed (StefanMichael Kifer2013-07-071-2/+71
* Silence ediff compilationGlenn Morris2013-05-231-5/+15
* * lisp/vc/ediff.el (ediff-version): Use called-interactively-p on Emacs.Glenn Morris2013-05-211-3/+3
* Update copyright notices for 2013.Paul Eggert2013-01-011-1/+1
* Prefer typical American spelling for "acknowledgment".Paul Eggert2012-07-241-1/+1
* * vc/ediff.el (ediff-directories): Add trailing space to prompts.Michael Albinus2012-07-161-6/+6
* Don't warn on toggle-read-only calls.Chong Yidong2012-07-131-1/+1
* Tweaks to Customize interface. Set custom-reset-button-menu to t.Chong Yidong2012-04-221-1/+1
* Add 2012 to FSF copyright years for Emacs filesGlenn Morris2012-01-051-1/+1
* (ediff-patch-file): Clarify doc stringLars Magne Ingebrigtsen2011-07-111-1/+1
* 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
* Add "Version:" and "Package:" Lisp file headers.Chong Yidong2010-08-291-0/+1
* * lisp/finder.el (finder-known-keywords): Add keyword "vc"Juri Linkov2010-06-111-1/+1
* Move version control related files to the "vc" subdirectory.Juri Linkov2010-06-111-0/+1565
View Lorry Controller Status