Mercurial > hg > xemacs-beta

comparison lisp/ediff/ediff-util.el @ 155:43dd3413c7c7 r20-3b4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-3b4
author cvs
date Mon, 13 Aug 2007 09:39:39 +0200
parents 318232e2a3f0
children 2d532a89d707
comparison
equal deleted inserted replaced
154:94141801dd7e 155:43dd3413c7c7
261 (ediff-unique-buffer-name "*Ediff Control Panel" "*")) 261 (ediff-unique-buffer-name "*Ediff Control Panel" "*"))
262 (control-buffer (ediff-eval-in-buffer buffer-A 262 (control-buffer (ediff-eval-in-buffer buffer-A
263 (get-buffer-create control-buffer-name)))) 263 (get-buffer-create control-buffer-name))))
264 (ediff-eval-in-buffer control-buffer 264 (ediff-eval-in-buffer control-buffer
265 (ediff-mode) 265 (ediff-mode)
266 ;; set variables classifying the current ediff job
267 (setq ediff-3way-comparison-job (ediff-3way-comparison-job)
268 ediff-merge-job (ediff-merge-job)
269 ediff-merge-with-ancestor-job (ediff-merge-with-ancestor-job)
270 ediff-3way-job (ediff-3way-job)
271 ediff-diff3-job (ediff-diff3-job)
272 ediff-narrow-job (ediff-narrow-job)
273 ediff-windows-job (ediff-windows-job)
274 ediff-word-mode-job (ediff-word-mode-job))
275 266
276 (make-local-variable 'ediff-use-long-help-message) 267 (make-local-variable 'ediff-use-long-help-message)
277 (make-local-variable 'ediff-prefer-iconified-control-frame) 268 (make-local-variable 'ediff-prefer-iconified-control-frame)
278 (make-local-variable 'ediff-split-window-function) 269 (make-local-variable 'ediff-split-window-function)
279 (make-local-variable 'ediff-default-variant) 270 (make-local-variable 'ediff-default-variant)
284 ;; unwrap set up parameters passed as argument 275 ;; unwrap set up parameters passed as argument
285 (while setup-parameters 276 (while setup-parameters
286 (set (car (car setup-parameters)) (cdr (car setup-parameters))) 277 (set (car (car setup-parameters)) (cdr (car setup-parameters)))
287 (setq setup-parameters (cdr setup-parameters))) 278 (setq setup-parameters (cdr setup-parameters)))
288 279
280 ;; set variables classifying the current ediff job
281 ;; must come AFTER setup-parameters
282 (setq ediff-3way-comparison-job (ediff-3way-comparison-job)
283 ediff-merge-job (ediff-merge-job)
284 ediff-merge-with-ancestor-job (ediff-merge-with-ancestor-job)
285 ediff-3way-job (ediff-3way-job)
286 ediff-diff3-job (ediff-diff3-job)
287 ediff-narrow-job (ediff-narrow-job)
288 ediff-windows-job (ediff-windows-job)
289 ediff-word-mode-job (ediff-word-mode-job))
289 290
290 ;; Don't delete variants in case of ediff-buffer-* jobs without asking. 291 ;; Don't delete variants in case of ediff-buffer-* jobs without asking.
291 ;; This is because u may loose work---dangerous. 292 ;; This is because u may loose work---dangerous.
292 (if (string-match "buffer" (symbol-name ediff-job-name)) 293 (if (string-match "buffer" (symbol-name ediff-job-name))
293 (setq ediff-keep-variants t)) 294 (setq ediff-keep-variants t))
2616 (format "Buffer C = %S\n" (buffer-name)))))) 2617 (format "Buffer C = %S\n" (buffer-name))))))
2617 (princ (format "Customized diff output %s\n" 2618 (princ (format "Customized diff output %s\n"
2618 (if (ediff-buffer-live-p ediff-custom-diff-buffer) 2619 (if (ediff-buffer-live-p ediff-custom-diff-buffer)
2619 (concat "\tin buffer " 2620 (concat "\tin buffer "
2620 (buffer-name ediff-custom-diff-buffer)) 2621 (buffer-name ediff-custom-diff-buffer))
2621 "is not available"))) 2622 " is not available")))
2622 (princ (format "Plain diff output %s\n" 2623 (princ (format "Plain diff output %s\n"
2623 (if (ediff-buffer-live-p ediff-diff-buffer) 2624 (if (ediff-buffer-live-p ediff-diff-buffer)
2624 (concat "\tin buffer " 2625 (concat "\tin buffer "
2625 (buffer-name ediff-diff-buffer)) 2626 (buffer-name ediff-diff-buffer))
2626 "is not available"))) 2627 " is not available")))
2627 2628
2628 (let* ((A-line (ediff-eval-in-buffer ediff-buffer-A 2629 (let* ((A-line (ediff-eval-in-buffer ediff-buffer-A
2629 (1+ (count-lines (point-min) (point))))) 2630 (1+ (count-lines (point-min) (point)))))
2630 (B-line (ediff-eval-in-buffer ediff-buffer-B 2631 (B-line (ediff-eval-in-buffer ediff-buffer-B
2631 (1+ (count-lines (point-min) (point))))) 2632 (1+ (count-lines (point-min) (point)))))
2643 ((>= ediff-current-difference 2644 ((>= ediff-current-difference
2644 ediff-number-of-differences) 'end) 2645 ediff-number-of-differences) 'end)
2645 (t (1+ ediff-current-difference))))) 2646 (t (1+ ediff-current-difference)))))
2646 2647
2647 (princ 2648 (princ
2648 (format "\n%s regions that differ only in white space & line breaks" 2649 (format "\n%s regions that differ in white space & line breaks only"
2649 (if ediff-ignore-similar-regions 2650 (if ediff-ignore-similar-regions
2650 "Skipping" "Not skipping"))) 2651 "Ignoring" "Showing")))
2651 (if (and ediff-merge-job ediff-show-clashes-only) 2652 (if (and ediff-merge-job ediff-show-clashes-only)
2652 (princ 2653 (princ
2653 "\nFocusing on regions where both buffers differ from the ancestor")) 2654 "\nFocusing on regions where both buffers differ from the ancestor"))
2654 2655
2655 (cond ((eq ediff-skip-diff-region-function 'ediff-show-all-diffs) 2656 (cond ((eq ediff-skip-diff-region-function 'ediff-show-all-diffs)