summaryrefslogtreecommitdiff
path: root/lisp/vc/ediff-wind.el
Commit message (Expand)AuthorAgeFilesLines
* ; Add 2024 to copyright yearsPo Lu2024-01-021-1/+1
* ; Add 2023 to copyright years.Eli Zaretskii2023-01-011-1/+1
* Delete many items obsolete since 24.3Stefan Kangas2022-09-091-8/+0
* Minor cleanups in ediff-*.elStefan Kangas2022-08-071-18/+6
* Make ediff-window-display-p obsoleteStefan Kangas2022-08-071-6/+6
* Declare unused function ediff-user-grabbed-mouse obsoleteStefan Kangas2022-08-071-1/+1
* Tune when to show "Quick Help" in Ediff mode-lineMichael Heerdegen2022-06-191-3/+1
* Make the ediff control panel mode line prettierLars Ingebrigtsen2022-06-131-13/+18
* ; Add 2022 to copyright years.Eli Zaretskii2022-01-011-1/+1
* ; More stylistic docfixes in vc/*.el found by checkdocStefan Kangas2021-09-181-30/+28
* Fix ediff3 layouts with window-combination-resize non-nil (Bug#49277)pillule2021-08-181-24/+10
* lisp/vc/*.el: Use lexical-bindings in all the filesStefan Monnier2021-02-261-3/+3
* Make libraries works with xterm-mouse-mode.Jared Finder2021-01-151-2/+3
* Update copyright year to 2021Paul Eggert2021-01-011-1/+1
* Shorten over-wide docstrings in variablesStefan Kangas2020-12-191-1/+1
* Remove some XEmacs compat code from ediff-wind.elStefan Kangas2020-11-201-9/+4
* Remove more XEmacs compat code from ediff*.elStefan Kangas2020-03-211-12/+9
* Update copyright year to 2020Paul Eggert2020-01-011-1/+1
* Remove most of the XEmacs compat code from ediff*.elLars Ingebrigtsen2019-10-051-82/+35
* Remove some XEmacs compat code from ediff*.elLars Ingebrigtsen2019-10-041-13/+6
* * 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
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-05 21:11:06 +0000