Mercurial > hg > xemacs-beta

comparison lisp/ediff/ediff-wind.el @ 2:ac2d302a0011 r19-15b2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r19-15b2
author cvs
date Mon, 13 Aug 2007 08:46:35 +0200
parents 376386a54a3c
children bcdc7deadc19
comparison
equal deleted inserted replaced
1:c0c6a60d29db 2:ac2d302a0011
1187 (eq (window-buffer A-wind) ediff-buffer-A) 1187 (eq (window-buffer A-wind) ediff-buffer-A)
1188 (eq (window-buffer B-wind) ediff-buffer-B) 1188 (eq (window-buffer B-wind) ediff-buffer-B)
1189 (or (not ediff-3way-job) 1189 (or (not ediff-3way-job)
1190 (eq (window-buffer C-wind) ediff-buffer-C)) 1190 (eq (window-buffer C-wind) ediff-buffer-C))
1191 (string= ediff-window-config-saved 1191 (string= ediff-window-config-saved
1192 (format "%S%S%S%S%S%S%S" 1192 (format "\%S\%S\%S\%S\%S\%S\%S"
1193 ctl-wind A-wind B-wind C-wind 1193 ctl-wind A-wind B-wind C-wind
1194 ediff-split-window-function 1194 ediff-split-window-function
1195 (ediff-multiframe-setup-p) 1195 (ediff-multiframe-setup-p)
1196 ediff-wide-display-p))))))) 1196 ediff-wide-display-p)))))))
1197 1197