emacs/lisp/ediff-util.el

105 	`ediff-windows-wordwise'
106 	`ediff-windows-linewise'
249   (define-key ediff-mode-map "="   'ediff-inferior-compare-regions)
271 ;; after this buf is created and before any windows are set and such.
331 	    ediff-windows-job (ediff-windows-job)
431       ;; This has effect only on ediff-windows/regions
516       (ediff-setup-windows buffer-A buffer-B buffer-C control-buffer)
772 	(ediff-setup-windows
850       ;; context must be saved before switching to windows A/B/C
862 	(if (and window ediff-windows-job)
936 	      ediff-highlight-all-diffs)
938 	 (setq ediff-highlight-all-diffs  nil
946 	       ediff-highlight-all-diffs  nil
951 	       ediff-highlight-all-diffs  nil))
956 	       ediff-highlight-all-diffs  t)))
958   (if (and ediff-use-faces ediff-highlight-all-diffs)
1282   (ediff-recenter 'no-rehighlight) ; make sure buffs are displayed in windows
1313   (cond ((eq ediff-window-setup-function 'ediff-setup-windows-multiframe)
1314 	 (setq window-setup-func 'ediff-setup-windows-plain))
1315 	((eq ediff-window-setup-function 'ediff-setup-windows-plain)
1318 	 (setq window-setup-func 'ediff-setup-windows-multiframe)))
1432 Used in ediff-windows/regions only."
1444 ;; ediff-regions-wordwise/linewise or ediff-windows-wordwise/linewise.
1452     ;; If ediff-*-regions/windows, ediff-visible-bounds is already set
1481 ;; Performs some operation on the two file windows (if they are showing).
1482 ;; Traps all errors on the operation in windows A/B/C.
1485 (defun ediff-operate-on-windows (operation arg)
1487   ;; make sure windows aren't dead
1529   ;; make sure windows aren't dead
1539   (ediff-operate-on-windows
1569 the width of the A/B/C windows."
1573   ;; make sure windows aren't dead
1583   (ediff-operate-on-windows
1623 ;;JOB-NAME holds ediff-job-name.  The ediff-windows job positions regions
1628   (if ediff-windows-job
1631 	;; at this point, windows are positioned at the beginning of the
1696 ;; The purpose of this coefficient is to make the windows scroll in sync, so
2437   ;; Restore the visibility range.  This affects only ediff-*-regions/windows.
2636     (balance-windows)
2759 ;; Buries Ediff buffers, kills all windows.
2788 	  (delete-other-windows)
2797 	  (delete-other-windows)
2806 	  (delete-other-windows)
2829 Hit \\[ediff-recenter] to reset the windows afterward."
2947 	       (ediff-highlight-diff n))
3027 (defun ediff-highlight-diff-in-one-buffer (n buf-type)
3070 		  ediff-use-faces ediff-highlight-all-diffs)
3089 (defun ediff-highlight-diff (n)
3091   (ediff-highlight-diff-in-one-buffer n 'A)
3092   (ediff-highlight-diff-in-one-buffer n 'B)
3093   (ediff-highlight-diff-in-one-buffer n 'C)
3094   (ediff-highlight-diff-in-one-buffer n 'Ancestor)
3345 	(pop-up-windows t)
3354     (delete-other-windows)
3479 (defun ediff-inferior-compare-regions ()
3501 	   ;; ask which buffer to compare to the merge buffer
3517 		"Which buffer to compare to the merge buffer (A or B)? ")
3521 	   ;; ask which two buffers to compare
3537 	       (message "Enter the 1st buffer you want to compare (%s): "
3556 	       (message "Enter the 2nd buffer you want to compare (%s): "
3736 ;; ediff-highlighting-style, and ediff-highlight-all-diffs variables.
3741 	     ediff-highlight-all-diffs)
3895 	  ;; try also buffers that are not displayed in windows
3988     (delete-other-windows)
4033 				      'delete-other-windows