summaryrefslogtreecommitdiff
path: root/lisp/vc/ediff.el
Commit message (Expand)AuthorAge
* Make libraries works with xterm-mouse-mode.Jared Finder2021-01-15
* Update copyright year to 2021Paul Eggert2021-01-01
* Use `format-prompt' when prompting with default valuesLars Ingebrigtsen2020-09-06
* Update copyright year to 2020Paul Eggert2020-01-01
* Remove obsolete doc references to XEmacs (Bug#37899)Stefan Kangas2019-10-28
* Remove most of the XEmacs compat code from ediff*.elLars Ingebrigtsen2019-10-05
* * 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
* Merge from origin/emacs-26Paul Eggert2018-12-31
|\
| * Update copyright year to 2019Paul Eggert2019-01-01
* | Merge from origin/emacs-26Glenn Morris2018-11-28
|\|
| * Improve documentation of Ediff wordwise commandsEli Zaretskii2018-11-27
* | Remove some declare-function stub definitionsGlenn Morris2018-03-23
* | Update some lisp function declarationsGlenn Morris2018-02-26
|/
* Update copyright year to 2018Paul Eggert2018-01-01
* Ediff: add some missing documentationPhilipp Stephani2017-11-05
* Prefer HTTPS to FTP and HTTP in documentationPaul Eggert2017-09-13
* ediff: use user-error rather than debug-ignored-errorsGlenn Morris2017-04-17
* Merge from origin/emacs-25Paul Eggert2017-01-01
|\
| * Update copyright year to 2017Paul Eggert2016-12-31
* | Clarify ediff-directories promptDima Kogan2016-11-23
* | Don't bug out on nil `patch-buf' argumentsLars Magne Ingebrigtsen2016-03-20
* | Require that the buffer that we're trying to patch existLars Ingebrigtsen2016-02-23
* | Require that the buffer that we're trying to patch existTino Calancha2016-02-23
|/
* 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
* Update copyright year to 2015Paul Eggert2015-01-01
* Doc and comment fixes re "online" helpGlenn Morris2014-06-28
* Small codes update for revert-buffer-function no longer being nil by defaultGlenn Morris2014-04-02
* Update copyright year to 2014 by running admin/update-copyright.Paul Eggert2014-01-01
* Update some function declarationsGlenn Morris2013-09-11
* * lisp/dired-x.el:Daniel Hackney2013-09-04
* Do not call to `selected-frame' where it is assumed by default.Dmitry Antipov2013-08-05
* * faces.el (tty-run-terminal-initialization): function changed (StefanMichael Kifer2013-07-07
* Silence ediff compilationGlenn Morris2013-05-23
* * lisp/vc/ediff.el (ediff-version): Use called-interactively-p on Emacs.Glenn Morris2013-05-21
* Update copyright notices for 2013.Paul Eggert2013-01-01
* Prefer typical American spelling for "acknowledgment".Paul Eggert2012-07-24
* * vc/ediff.el (ediff-directories): Add trailing space to prompts.Michael Albinus2012-07-16
* Don't warn on toggle-read-only calls.Chong Yidong2012-07-13
* Tweaks to Customize interface. Set custom-reset-button-menu to t.Chong Yidong2012-04-22
* Add 2012 to FSF copyright years for Emacs filesGlenn Morris2012-01-05
* (ediff-patch-file): Clarify doc stringLars Magne Ingebrigtsen2011-07-11
* Convert consecutive FSF copyright years to ranges.Glenn Morris2011-01-24
* Nuke arch-tags.Glenn Morris2011-01-15
* Merge from emacs-23Stefan Monnier2011-01-14
* Add "Version:" and "Package:" Lisp file headers.Chong Yidong2010-08-29
* * lisp/finder.el (finder-known-keywords): Add keyword "vc"Juri Linkov2010-06-11