summaryrefslogtreecommitdiff
path: root/lisp/vc/ediff.el
Commit message (Expand)AuthorAgeFilesLines
* Merge from origin/emacs-28Stefan Kangas2022-08-171-5/+5
|\
| * ; * lisp/vc/ediff.el: Improve wording in last change.Stefan Kangas2022-08-161-5/+5
* | Merge from origin/emacs-28Stefan Kangas2022-08-131-6/+5
|\|
| * Delete references to deleted library hilit19.elStefan Kangas2022-08-121-6/+5
* | Minor cleanups in ediff-*.elStefan Kangas2022-08-071-3/+2
* | Merge from origin/emacs-28Eli Zaretskii2022-01-011-1/+1
|\|
| * ; Add 2022 to copyright years.Eli Zaretskii2022-01-011-1/+1
* | Use substitute-command-keys in some messagesStefan Kangas2021-11-171-1/+3
|/
* ; Fix typos in CONTRIBUTE, ELisp manual, ediffTom Levy2021-11-101-2/+2
* ; Fix some recent fixes to doc stringsEli Zaretskii2021-09-261-2/+1
* ; Adjust overly long docstrings to fit 80 charactersStefan Kangas2021-09-261-4/+6
* ; More stylistic docfixes in vc/*.el found by checkdocStefan Kangas2021-09-181-6/+9
* ; More minor docfixes found by checkdocStefan Kangas2021-09-141-1/+1
* lisp/vc/*.el: Use lexical-bindings in all the filesStefan Monnier2021-02-261-26/+26
* Make libraries works with xterm-mouse-mode.Jared Finder2021-01-151-1/+1
* Update copyright year to 2021Paul Eggert2021-01-011-1/+1
* Use `format-prompt' when prompting with default valuesLars Ingebrigtsen2020-09-061-54/+47
* Update copyright year to 2020Paul Eggert2020-01-011-1/+1
* Remove obsolete doc references to XEmacs (Bug#37899)Stefan Kangas2019-10-281-2/+1
* Remove most of the XEmacs compat code from ediff*.elLars Ingebrigtsen2019-10-051-4/+2
* * lisp/vc/ediff-*.el: Use lexical-binding, plus misc cleanupStefan Monnier2019-06-211-104/+96
* Disable lexical-binding in ediffGlenn Morris2019-06-181-1/+1
* Use lexical binding for ediffAlex Branham2019-06-091-7/+4
* 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
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-13 00:27:13 +0000