projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c54cf8d
)
; Fix a typo in comment
author
Tino Calancha
<tino.calancha@gmail.com>
Fri, 10 Feb 2017 11:05:11 +0000
(20:05 +0900)
committer
Tino Calancha
<tino.calancha@gmail.com>
Fri, 10 Feb 2017 11:05:11 +0000
(20:05 +0900)
* lisp/vc/ediff-wind.el (ediff-setup-windows-multiframe-merge):
Fix a typo in comment.
lisp/vc/ediff-wind.el
patch
|
blob
|
history
diff --git
a/lisp/vc/ediff-wind.el
b/lisp/vc/ediff-wind.el
index cd10288643d19f1c6b70161e6826b9e2735c0c4c..eb76988293f77fe855dc69033ae647ed50539820 100644
(file)
--- a/
lisp/vc/ediff-wind.el
+++ b/
lisp/vc/ediff-wind.el
@@
-556,7
+556,7
@@
into icons, regardless of the window manager."
(if (and (window-live-p wind-A)
(null use-same-frame) ; implies wind-A is suitable
(null use-same-frame-for-AB))
- (progn ; bu
g
A on its own
+ (progn ; bu
f
A on its own
;; buffer buf-A is seen in live wind-A
(select-window wind-A)
(delete-other-windows)