From xemacs-m  Fri May 30 16:22:30 1997
Received: from cs.sunysb.edu (sbcs.sunysb.edu [130.245.1.15])
	by xemacs.org (8.8.5/8.8.5) with SMTP id QAA09358;
	Fri, 30 May 1997 16:22:27 -0500 (CDT)
Received: from sbkifer.cs.sunysb.edu (sbkifer.cs.sunysb.edu [130.245.1.35]) by cs.sunysb.edu (8.6.12/8.6.9) with SMTP id RAA16186; Fri, 30 May 1997 17:21:54 -0400
Message-Id: <199705302121.RAA16186@cs.sunysb.edu>
X-Authentication-Warning: sbcs.cs.sunysb.edu: Host sbkifer.cs.sunysb.edu didn't use HELO protocol
From: kifer@CS.SunySB.EDU (Michael Kifer)
To: steve@xemacs.org
Cc: Ricardo Marek <ricky@ornet.co.il>
cc: XEmacs Beta List <xemacs-beta@xemacs.org>
Subject: Re: [20.3-b2] Ediff stills broken??? 
In-reply-to: "Ricardo Marek" of Thu, 29 May 1997 14:40:27 +0300
             <199705291140.OAA12932@merlin.ornet.co.il> 
Date: Fri, 30 May 1997 17:21:49 -0400
Sender: kifer@CS.SunySB.EDU

>>>>> "RM" == Ricardo Marek <of Thu, 29 May 1997 14:40:27 +0300> writes:

    RM> I'm trying again to run ediff from the main-menu on two buffers in
    RM> order to merge them into a third one, but I get the ussuall error.

    The following patch should fix this problem. Please apply it to b4.


	--michael  


*** /home/facfs1/kifer/sbk/xemacs-20.3-b2/lisp/ediff/ediff-util.el	Sat May 10 19:20:49 1997
--- /home/facfs1/kifer/emacslib/ediff/ediff-util.el	Fri May 30 17:14:32 1997
***************
*** 263,277 ****
  			   (get-buffer-create control-buffer-name))))
      (ediff-eval-in-buffer control-buffer
        (ediff-mode)                 
-       ;; set variables classifying the current ediff job
-       (setq ediff-3way-comparison-job (ediff-3way-comparison-job)
- 	    ediff-merge-job (ediff-merge-job)
- 	    ediff-merge-with-ancestor-job (ediff-merge-with-ancestor-job)
- 	    ediff-3way-job (ediff-3way-job)
- 	    ediff-diff3-job (ediff-diff3-job)
- 	    ediff-narrow-job (ediff-narrow-job)
- 	    ediff-windows-job (ediff-windows-job)
- 	    ediff-word-mode-job (ediff-word-mode-job))
  	
        (make-local-variable 'ediff-use-long-help-message)
        (make-local-variable 'ediff-prefer-iconified-control-frame)
--- 263,268 ----
***************
*** 286,291 ****
--- 277,292 ----
  	(set (car (car setup-parameters)) (cdr (car setup-parameters)))
  	(setq setup-parameters (cdr setup-parameters)))
  	
+       ;; set variables classifying the current ediff job
+       ;; must come AFTER setup-parameters
+       (setq ediff-3way-comparison-job (ediff-3way-comparison-job)
+ 	    ediff-merge-job (ediff-merge-job)
+ 	    ediff-merge-with-ancestor-job (ediff-merge-with-ancestor-job)
+ 	    ediff-3way-job (ediff-3way-job)
+ 	    ediff-diff3-job (ediff-diff3-job)
+ 	    ediff-narrow-job (ediff-narrow-job)
+ 	    ediff-windows-job (ediff-windows-job)
+ 	    ediff-word-mode-job (ediff-word-mode-job))
  
        ;; Don't delete variants in case of ediff-buffer-* jobs without asking.
        ;; This is because u may loose work---dangerous.
***************
*** 2618,2629 ****
  		   (if (ediff-buffer-live-p ediff-custom-diff-buffer)
  		       (concat "\tin buffer "
  			       (buffer-name ediff-custom-diff-buffer))
! 		     "is not available")))
      (princ (format "Plain diff output %s\n"
  		   (if (ediff-buffer-live-p ediff-diff-buffer)
  		       (concat "\tin buffer "
  			       (buffer-name ediff-diff-buffer))
! 		     "is not available")))
  			      
      (let* ((A-line (ediff-eval-in-buffer ediff-buffer-A
  		     (1+ (count-lines (point-min) (point)))))
--- 2619,2630 ----
  		   (if (ediff-buffer-live-p ediff-custom-diff-buffer)
  		       (concat "\tin buffer "
  			       (buffer-name ediff-custom-diff-buffer))
! 		     " is not available")))
      (princ (format "Plain diff output %s\n"
  		   (if (ediff-buffer-live-p ediff-diff-buffer)
  		       (concat "\tin buffer "
  			       (buffer-name ediff-diff-buffer))
! 		     " is not available")))
  			      
      (let* ((A-line (ediff-eval-in-buffer ediff-buffer-A
  		     (1+ (count-lines (point-min) (point)))))
***************
*** 2645,2653 ****
  			 (t (1+ ediff-current-difference)))))
  
      (princ
!      (format "\n%s regions that differ only in white space & line breaks"
  	     (if ediff-ignore-similar-regions
! 		 "Skipping" "Not skipping")))
      (if (and ediff-merge-job ediff-show-clashes-only)
  	(princ
  	 "\nFocusing on regions where both buffers differ from the ancestor"))
--- 2646,2654 ----
  			 (t (1+ ediff-current-difference)))))
  
      (princ
!      (format "\n%s regions that differ in white space & line breaks only"
  	     (if ediff-ignore-similar-regions
! 		 "Ignoring" "Showing")))
      (if (and ediff-merge-job ediff-show-clashes-only)
  	(princ
  	 "\nFocusing on regions where both buffers differ from the ancestor"))



