summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTino Calancha <tino.calancha@gmail.com>2017-02-10 20:05:11 +0900
committerTino Calancha <tino.calancha@gmail.com>2017-02-10 20:05:11 +0900
commit3f7493e27c57bec21806c579cdb6e419b9102bed (patch)
tree7f7dd7363321d9ac7b2d856eb6a7a50f93c9954d
parentc54cf8dcfd016783bc4881eb218d7b556020a18c (diff)
downloademacs-3f7493e27c57bec21806c579cdb6e419b9102bed.tar.gz
; Fix a typo in comment
* lisp/vc/ediff-wind.el (ediff-setup-windows-multiframe-merge): Fix a typo in comment.
-rw-r--r--lisp/vc/ediff-wind.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/vc/ediff-wind.el b/lisp/vc/ediff-wind.el
index cd10288643d..eb76988293f 100644
--- 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 ; bug A on its own
+ (progn ; buf A on its own
;; buffer buf-A is seen in live wind-A
(select-window wind-A)
(delete-other-windows)