Mercurial > hg > xemacs-beta

comparison lisp/ediff/ediff-init.el @ 144:318232e2a3f0 r20-2b6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-2b6
author cvs
date Mon, 13 Aug 2007 09:34:14 +0200
parents a145efe76779
children 2d532a89d707
comparison
equal deleted inserted replaced
143:50e7fedfe353 144:318232e2a3f0
127 (defmacro ediff-get-difference (n buf-type) 127 (defmacro ediff-get-difference (n buf-type)
128 (` (aref 128 (` (aref
129 (symbol-value 129 (symbol-value
130 (intern (format "ediff-difference-vector-%S" (, buf-type)))) (, n)))) 130 (intern (format "ediff-difference-vector-%S" (, buf-type)))) (, n))))
131 131
132 ;; tell if it has been previously determined that the region has 132 ;; Tell if it has been previously determined that the region has
133 ;; no diffs other than the white space and newlines 133 ;; no diffs other than the white space and newlines
134 ;; The argument, N, is the diff region number used by Ediff to index the 134 ;; The argument, N, is the diff region number used by Ediff to index the
135 ;; diff vector. It is 1 less than the number seen by the user. 135 ;; diff vector. It is 1 less than the number seen by the user.
136 ;; Returns:
137 ;; t if the diffs are whitespace in all buffers
138 ;; 'A (in 3-buf comparison only) if there are only whitespace
139 ;; diffs in bufs B and C
140 ;; 'B (in 3-buf comparison only) if there are only whitespace
141 ;; diffs in bufs A and C
142 ;; 'C (in 3-buf comparison only) if there are only whitespace
143 ;; diffs in bufs A and B
136 ;; 144 ;;
137 ;; A difference vector has the form: 145 ;; A difference vector has the form:
138 ;; [diff diff diff ...] 146 ;; [diff diff diff ...]
139 ;; where each diff has the form: 147 ;; where each diff has the form:
140 ;; [overlay fine-diff-vector no-fine-diffs-flag] 148 ;; [overlay fine-diff-vector no-fine-diffs-flag]