summaryrefslogtreecommitdiff
path: root/lisp/vc/ediff-util.el
Commit message (Expand)AuthorAgeFilesLines
* Prefer setq-local in vc/*.elStefan Kangas2020-12-051-2/+1
* Remove pointless use of internAndreas Schwab2020-09-171-4/+4
* Use `format-prompt' when prompting with default valuesLars Ingebrigtsen2020-09-061-16/+13
* Remove some compat code from ediffLars Ingebrigtsen2020-08-181-8/+6
* Remove some compat code from ediff-util.elLars Ingebrigtsen2020-08-181-5/+3
* Remove more XEmacs compat code from ediff*.elStefan Kangas2020-03-211-5/+2
* Improve prefix arg support in 'ediff-scroll-horizontally'Kyle Hubert2020-02-081-2/+2
* Update copyright year to 2020Paul Eggert2020-01-011-1/+1
* * lisp/vc/ediff-util.el: Set this-command to ediff-quit (bug#38219)Juri Linkov2019-11-181-0/+2
* Fix some quoting glitches in doc stringsPaul Eggert2019-11-111-3/+3
* Remove most of the XEmacs compat code from ediff*.elLars Ingebrigtsen2019-10-051-148/+49
* Remove some XEmacs compat code from ediff*.elLars Ingebrigtsen2019-10-041-20/+9
* lisp/*.el: Fix typos and other trivial doc fixesJuanma Barranquero2019-09-211-1/+1
* * lisp/vc/ediff-*.el: Use lexical-binding, plus misc cleanupStefan Monnier2019-06-211-54/+30
* Merge from origin/emacs-26Paul Eggert2018-12-311-1/+1
|\
| * Update copyright year to 2019Paul Eggert2019-01-011-1/+1
* | Handle `make-process' in Tramp and ange-ftpMichael Albinus2018-12-231-3/+3
* | Let ediff '=' compare against ancestor buffer (Bug#11320)Noam Postavsky2018-06-281-18/+12
* | Remove some declare-function stub definitionsGlenn Morris2018-03-231-3/+0
* | * lisp/subr.el (focus-frame, unfocus-frame): Remove obsolete no-ops.Glenn Morris2018-03-121-2/+2
* | Replace uses of the obsolete local-write-file-hooksGlenn Morris2018-03-081-1/+1
|/
* Update copyright year to 2018Paul Eggert2018-01-011-1/+1
* 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-15/+15
* Remove references to OS/2 in code, doc, and commentsGlenn Morris2017-04-081-10/+8
* Show ancestor buffer in 3way mergesTino Calancha2017-03-141-55/+100
* Merge from origin/emacs-25Paul Eggert2017-01-011-1/+1
|\
| * Update copyright year to 2017Paul Eggert2016-12-311-1/+1
* | Merge from origin/emacs-25Paul Eggert2017-01-011-1/+1
|\|
| * ; Add missing symbol quoting.Philipp Stephani2016-12-181-1/+1
* | Merge from origin/emacs-25Paul Eggert2016-12-071-0/+2
|\|
| * ; * lisp/vc/ediff-util.el (ediff-janitor): Fix last change. (Bug#25046)Eli Zaretskii2016-12-021-1/+1
| * * lisp/vc/ediff-util.el (ediff-janitor): Doc fix. (Bug#25046)Eli Zaretskii2016-12-021-0/+2
* | Prevent to apply funcall on tStefan Monnier2016-07-121-1/+3
* | * lisp/vc/ediff-util.el: Use lexical-binding.Stefan Monnier2016-05-041-12/+16
* | No need to test for jka-comprLars Ingebrigtsen2016-04-301-5/+2
* | Be more verbose when changing frame mode in ediffTino Calancha2016-02-231-3/+5
|/
* Update copyright year to 2016Paul Eggert2016-01-011-1/+1
* Avoid redisplay error in ediff-regions-wordwiseEli Zaretskii2015-09-281-0/+1
* Backslash cleanup in Elisp source filesPaul Eggert2015-09-171-9/+9
* Fix minor text quoting in calc, calendar, vcPaul Eggert2015-08-281-8/+10
* Prefer "this" to “this” in doc stringsPaul Eggert2015-05-191-1/+1
* Fix minor quoting problems in doc stringsPaul Eggert2015-05-191-1/+1
* Fix selective diff browsing in EdiffEli Zaretskii2015-05-141-0/+2
* Update copyright year to 2015Paul Eggert2015-01-011-1/+1
* ediff: Replace obsolete toggle-read-only with read-only-modeGlenn Morris2014-07-251-5/+5
* * lisp/vc/ediff-diff.el (ediff-set-fine-diff-properties-in-one-buffer):Stefan Monnier2014-05-021-3/+3
* Ediff's overlay priorities cause more trouble than they solve.Stefan Monnier2014-04-101-2/+0
* Update copyright year to 2014 by running admin/update-copyright.Paul Eggert2014-01-011-1/+1
* * lisp/dired-x.el:Daniel Hackney2013-09-041-3/+3
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-11 18:40:21 +0000