index
:
forks/emacs.git
local/emacs-29
local/emacs30
master
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
lisp
/
vc
/
ediff-wind.el
Commit message (
Expand
)
Author
Age
Files
Lines
*
Make libraries works with xterm-mouse-mode.
Jared Finder
2021-01-15
1
-2
/
+3
*
Update copyright year to 2021
Paul Eggert
2021-01-01
1
-1
/
+1
*
Shorten over-wide docstrings in variables
Stefan Kangas
2020-12-19
1
-1
/
+1
*
Remove some XEmacs compat code from ediff-wind.el
Stefan Kangas
2020-11-20
1
-9
/
+4
*
Remove more XEmacs compat code from ediff*.el
Stefan Kangas
2020-03-21
1
-12
/
+9
*
Update copyright year to 2020
Paul Eggert
2020-01-01
1
-1
/
+1
*
Remove most of the XEmacs compat code from ediff*.el
Lars Ingebrigtsen
2019-10-05
1
-82
/
+35
*
Remove some XEmacs compat code from ediff*.el
Lars Ingebrigtsen
2019-10-04
1
-13
/
+6
*
* lisp/vc/ediff-*.el: Use lexical-binding, plus misc cleanup
Stefan Monnier
2019-06-21
1
-21
/
+12
*
Disable lexical-binding in ediff
Glenn Morris
2019-06-18
1
-1
/
+1
*
Use lexical binding for ediff
Alex Branham
2019-06-09
1
-1
/
+1
*
Merge from origin/emacs-26
Paul Eggert
2018-12-31
1
-1
/
+1
|
\
|
*
Update copyright year to 2019
Paul Eggert
2019-01-01
1
-1
/
+1
*
|
Remove some declare-function stub definitions
Glenn Morris
2018-03-23
1
-4
/
+0
*
|
Merge from origin/emacs-26
Paul Eggert
2018-01-01
1
-1
/
+1
|
\
|
|
*
Update copyright year to 2018
Paul Eggert
2018-01-01
1
-1
/
+1
|
*
Fix typos in ediff-wind.el
Eli Zaretskii
2017-11-03
1
-5
/
+5
*
|
Merge from origin/emacs-26
Paul Eggert
2017-11-02
1
-0
/
+2
|
\
|
|
*
Avoid fullscreen ediff control frames by default (Bug#29026)
Martin Rudalics
2017-10-31
1
-0
/
+2
*
|
* lisp/vc/ediff-wind.el: Don't pop spurious frame in corner case
Stefan Monnier
2017-10-26
1
-133
/
+106
|
/
*
Prefer HTTPS to FTP and HTTP in documentation
Paul Eggert
2017-09-13
1
-1
/
+1
*
ediff: use user-error rather than debug-ignored-errors
Glenn Morris
2017-04-17
1
-1
/
+1
*
Merge from origin/emacs-25
Paul Eggert
2017-03-19
1
-1
/
+1
|
\
|
*
; Fix a typo in comment
Tino Calancha
2017-02-10
1
-1
/
+1
*
|
Show ancestor buffer in 3way merges
Tino Calancha
2017-03-14
1
-11
/
+75
|
/
*
Update copyright year to 2017
Paul Eggert
2016-12-31
1
-1
/
+1
*
Update copyright year to 2016
Paul Eggert
2016-01-01
1
-1
/
+1
*
Fix docstring quoting problems with ‘ '’
Paul Eggert
2015-11-17
1
-1
/
+1
*
Backslash cleanup in Elisp source files
Paul Eggert
2015-09-17
1
-2
/
+2
*
Update copyright year to 2015
Paul Eggert
2015-01-01
1
-1
/
+1
*
Update copyright year to 2014 by running admin/update-copyright.
Paul Eggert
2014-01-01
1
-1
/
+1
*
* lisp/dired-x.el:
Daniel Hackney
2013-09-04
1
-5
/
+5
*
Do not call to `selected-window' where it is assumed by default.
Dmitry Antipov
2013-08-05
1
-3
/
+3
*
Silence ediff compilation
Glenn Morris
2013-05-23
1
-7
/
+10
*
Update copyright notices for 2013.
Paul Eggert
2013-01-01
1
-1
/
+1
*
Use declare forms, where possible, to mark obsolete functions.
Chong Yidong
2012-09-25
1
-3
/
+1
*
Replace version 24.2 with 24.3 where appropriate (hopefully)
Glenn Morris
2012-08-15
1
-2
/
+2
*
Remove incorrect uses of "modeline".
Chong Yidong
2012-06-02
1
-2
/
+2
*
Adapt ediff window handling to multi-tty.
Chong Yidong
2012-04-26
1
-11
/
+26
*
Add 2012 to FSF copyright years for Emacs files
Glenn Morris
2012-01-05
1
-1
/
+1
*
Spelling fixes.
Paul Eggert
2011-11-14
1
-1
/
+1
*
Refill some long/short copyright headers.
Glenn Morris
2011-01-26
1
-2
/
+1
*
Convert consecutive FSF copyright years to ranges.
Glenn Morris
2011-01-24
1
-2
/
+1
*
Refill some copyright headers.
Glenn Morris
2011-01-15
1
-2
/
+3
*
Merge from emacs-23
Stefan Monnier
2011-01-14
1
-3
/
+2
*
Remove some tests for defunct system-types.
Glenn Morris
2010-10-08
1
-9
/
+8
*
Add "Package:" file headers to denote built-in packages.
Chong Yidong
2010-08-29
1
-0
/
+1
*
Move version control related files to the "vc" subdirectory.
Juri Linkov
2010-06-11
1
-0
/
+1313
