[Emacs-diffs] Changes to emacs/lisp/ediff-merg.el

[Michael Kifer]

Index: emacs/lisp/ediff-merg.el
diff -c emacs/lisp/ediff-merg.el:1.21 emacs/lisp/ediff-merg.el:1.22
*** emacs/lisp/ediff-merg.el:1.21       Thu Dec 20 13:38:32 2001
--- emacs/lisp/ediff-merg.el    Mon Jan  7 23:36:01 2002
***************
*** 1,8 ****
  ;;; ediff-merg.el --- merging utilities
  
! ;; Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
  
! ;; Author: Michael Kifer <address@hidden>
  
  ;; This file is part of GNU Emacs.
  
--- 1,8 ----
  ;;; ediff-merg.el --- merging utilities
  
! ;; Copyright (C) 1994, 95, 96, 97, 98, 99, 2000, 01, 02 Free Software 
Foundation, Inc.
  
! ;; Author: Michael Kifer <address@hidden>
  
  ;; This file is part of GNU Emacs.
  
***************
*** 122,128 ****
        (combo-region "")
        (err-msg
         "ediff-combination-pattern: Invalid format. Please consult the 
documentation")
!       diff-region region-delim region-spec)
  
      (if (< (length pattern-list) 5)
        (error err-msg))
--- 122,128 ----
        (combo-region "")
        (err-msg
         "ediff-combination-pattern: Invalid format. Please consult the 
documentation")
!       region-delim region-spec)
  
      (if (< (length pattern-list) 5)
        (error err-msg))
***************
*** 133,139 ****
        (or (and (stringp region-delim) (memq region-spec '(A B Ancestor)))
          (error err-msg))
  
!       (condition-case err
          (setq combo-region
                (concat combo-region
                        region-delim "\n"
--- 133,139 ----
        (or (and (stringp region-delim) (memq region-spec '(A B Ancestor)))
          (error err-msg))
  
!       (condition-case nil
          (setq combo-region
                (concat combo-region
                        region-delim "\n"
***************
*** 221,229 ****
        (setq state-of-merge (ediff-get-state-of-merge n))
  
        (if remerging
!         (let ((reg-A (ediff-get-region-contents n 'A ediff-control-buffer))
!               (reg-B (ediff-get-region-contents n 'B ediff-control-buffer))
!               (reg-C (ediff-get-region-contents n 'C ediff-control-buffer)))
                
            ;; if region was edited since it was first set by default
            (if (or (ediff-merge-changed-from-default-p n)
--- 221,230 ----
        (setq state-of-merge (ediff-get-state-of-merge n))
  
        (if remerging
!         ;;(let ((reg-A (ediff-get-region-contents n 'A ediff-control-buffer))
!         ;;    (reg-B (ediff-get-region-contents n 'B ediff-control-buffer))
!         ;;    (reg-C (ediff-get-region-contents n 'C ediff-control-buffer)))
!         (let ()
                
            ;; if region was edited since it was first set by default
            (if (or (ediff-merge-changed-from-default-p n)
***************
*** 307,313 ****
    (interactive "P")
    (setq n (if (numberp n) (1- n) ediff-current-difference))
    
!   (let (regA regB reg-combined)
      ;;(setq regA (ediff-get-region-contents n 'A ediff-control-buffer)
      ;;          regB (ediff-get-region-contents n 'B ediff-control-buffer))
      ;;(setq reg-combined (ediff-make-combined-diff regA regB))
--- 308,314 ----
    (interactive "P")
    (setq n (if (numberp n) (1- n) ediff-current-difference))
    
!   (let (reg-combined)
      ;;(setq regA (ediff-get-region-contents n 'A ediff-control-buffer)
      ;;          regB (ediff-get-region-contents n 'B ediff-control-buffer))
      ;;(setq reg-combined (ediff-make-combined-diff regA regB))