Navigation Menu

Skip to content

Commit

Permalink
Fix ediff-keep.el
Browse files Browse the repository at this point in the history
  • Loading branch information
@jwiegley
jwiegley committed Jul 17, 2012
1 parent 2f90562 commit 6cc4bee
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions lisp/ediff-keep.el
View file
Expand Up @@ -94,46 +94,46 @@
;; here for completeness' sake. ;; here for completeness' sake.
(defun ediff-keep-head () (defun ediff-keep-head ()
(interactive) (interactive)
(let ((marks (my-identify-conflicts))) (let ((marks (ediff-keep-identify-conflicts)))
(delete-region (car (nth 1 marks)) (cdr (nth 3 marks))) (delete-region (car (nth 1 marks)) (cdr (nth 3 marks)))
(delete-region (car (nth 0 marks)) (cdr (nth 0 marks))))) (delete-region (car (nth 0 marks)) (cdr (nth 0 marks)))))


(defun ediff-keep-ancestor () (defun ediff-keep-ancestor ()
(interactive) (interactive)
(let ((marks (my-identify-conflicts))) (let ((marks (ediff-keep-identify-conflicts)))
(delete-region (car (nth 2 marks)) (cdr (nth 3 marks))) (delete-region (car (nth 2 marks)) (cdr (nth 3 marks)))
(delete-region (car (nth 0 marks)) (cdr (nth 1 marks))))) (delete-region (car (nth 0 marks)) (cdr (nth 1 marks)))))


(defun ediff-keep-incoming () (defun ediff-keep-incoming ()
(interactive) (interactive)
(let ((marks (my-identify-conflicts))) (let ((marks (ediff-keep-identify-conflicts)))
(delete-region (car (nth 3 marks)) (cdr (nth 3 marks))) (delete-region (car (nth 3 marks)) (cdr (nth 3 marks)))
(delete-region (car (nth 0 marks)) (cdr (nth 2 marks))))) (delete-region (car (nth 0 marks)) (cdr (nth 2 marks)))))


(defun ediff-keep-head-and-ancestor () (defun ediff-keep-head-and-ancestor ()
(interactive) (interactive)
(let ((marks (my-identify-conflicts))) (let ((marks (ediff-keep-identify-conflicts)))
(delete-region (car (nth 2 marks)) (cdr (nth 3 marks))) (delete-region (car (nth 2 marks)) (cdr (nth 3 marks)))
(delete-region (car (nth 1 marks)) (cdr (nth 1 marks))) (delete-region (car (nth 1 marks)) (cdr (nth 1 marks)))
(delete-region (car (nth 0 marks)) (cdr (nth 0 marks))))) (delete-region (car (nth 0 marks)) (cdr (nth 0 marks)))))


(defun ediff-keep-head-and-incoming () (defun ediff-keep-head-and-incoming ()
(interactive) (interactive)
(let ((marks (my-identify-conflicts))) (let ((marks (ediff-keep-identify-conflicts)))
(delete-region (car (nth 3 marks)) (cdr (nth 3 marks))) (delete-region (car (nth 3 marks)) (cdr (nth 3 marks)))
(delete-region (car (nth 1 marks)) (cdr (nth 2 marks))) (delete-region (car (nth 1 marks)) (cdr (nth 2 marks)))
(delete-region (car (nth 0 marks)) (cdr (nth 0 marks))))) (delete-region (car (nth 0 marks)) (cdr (nth 0 marks)))))


(defun ediff-keep-ancestor-and-incoming () (defun ediff-keep-ancestor-and-incoming ()
(interactive) (interactive)
(let ((marks (my-identify-conflicts))) (let ((marks (ediff-keep-identify-conflicts)))
(delete-region (car (nth 3 marks)) (cdr (nth 3 marks))) (delete-region (car (nth 3 marks)) (cdr (nth 3 marks)))
(delete-region (car (nth 2 marks)) (cdr (nth 2 marks))) (delete-region (car (nth 2 marks)) (cdr (nth 2 marks)))
(delete-region (car (nth 0 marks)) (cdr (nth 1 marks))))) (delete-region (car (nth 0 marks)) (cdr (nth 1 marks)))))


(defun ediff-keep-combine-all () (defun ediff-keep-combine-all ()
(interactive) (interactive)
(let ((marks (my-identify-conflicts))) (let ((marks (ediff-keep-identify-conflicts)))
(delete-region (car (nth 3 marks)) (cdr (nth 3 marks))) (delete-region (car (nth 3 marks)) (cdr (nth 3 marks)))
(delete-region (car (nth 2 marks)) (cdr (nth 3 marks))) (delete-region (car (nth 2 marks)) (cdr (nth 3 marks)))
(delete-region (car (nth 1 marks)) (cdr (nth 1 marks))) (delete-region (car (nth 1 marks)) (cdr (nth 1 marks)))
Expand Down

0 comments on commit 6cc4bee

Please sign in to comment.