procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix typos in ediff-wind.el

Browse source 
* lisp/vc/ediff-wind.el (ediff-setup-windows-multiframe-merge):
Fix typos in commentary.  (Bug#29138)
This commit is contained in:
Eli Zaretskii 2017-11-03 21:12:41 +02:00
parent 4f38bdec74
commit b02c2714c3
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lisp/vc/ediff-wind.el
View file

@ -518,12 +518,12 @@ into icons, regardless of the window manager."
;;; Algorithm: ;;; Algorithm:
;;; 1. Never use frames that have dedicated windows in them---it is bad to ;;; 1. Never use frames that have dedicated windows in them---it is bad to
;;; destroy dedicated windows. ;;; destroy dedicated windows.
;;; 2. If A and B are in the same frame but C's frame is different--- use one ;;; 2. If A and B are in the same frame but C's frame is different---use one
;;; frame for A and B and use a separate frame for C. ;;; frame for A and B, and use a separate frame for C.
;;; 3. If C's frame is non-existent, then: if the first suitable ;;; 3. If C's frame is non-existent, then: if the first suitable
;;; non-dedicated frame is different from A&B's, then use it for C. ;;; non-dedicated frame is different from A&B's, then use it for C.
;;; Otherwise, put A,B, and C in one frame. ;;; Otherwise, put A, B, and C in one frame.
;;; 4. If buffers A, B, C are is separate frames, use them to display these ;;; 4. If buffers A, B, C are in separate frames, use them to display these
;;; buffers. ;;; buffers.
;; Skip dedicated or iconified frames. ;; Skip dedicated or iconified frames.