diff options
| author | Tino Calancha | 2017-02-10 20:05:11 +0900 |
|---|---|---|
| committer | Tino Calancha | 2017-02-10 20:05:11 +0900 |
| commit | 3f7493e27c57bec21806c579cdb6e419b9102bed (patch) | |
| tree | 7f7dd7363321d9ac7b2d856eb6a7a50f93c9954d | |
| parent | c54cf8dcfd016783bc4881eb218d7b556020a18c (diff) | |
| download | emacs-3f7493e27c57bec21806c579cdb6e419b9102bed.tar.gz emacs-3f7493e27c57bec21806c579cdb6e419b9102bed.zip | |
; 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.el | 2 |
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." | |||
| 556 | (if (and (window-live-p wind-A) | 556 | (if (and (window-live-p wind-A) |
| 557 | (null use-same-frame) ; implies wind-A is suitable | 557 | (null use-same-frame) ; implies wind-A is suitable |
| 558 | (null use-same-frame-for-AB)) | 558 | (null use-same-frame-for-AB)) |
| 559 | (progn ; bug A on its own | 559 | (progn ; buf A on its own |
| 560 | ;; buffer buf-A is seen in live wind-A | 560 | ;; buffer buf-A is seen in live wind-A |
| 561 | (select-window wind-A) | 561 | (select-window wind-A) |
| 562 | (delete-other-windows) | 562 | (delete-other-windows) |