Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix ediff-keep.el

  • Loading branch information...
commit 6cc4bee29360b7ca39f6b22f3504a3a6dd2ea2c8 1 parent 2f90562
@jwiegley authored
Showing with 7 additions and 7 deletions.
  1. +7 −7 lisp/ediff-keep.el
View
14 lisp/ediff-keep.el
@@ -94,46 +94,46 @@
;; here for completeness' sake.
(defun ediff-keep-head ()
(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 0 marks)) (cdr (nth 0 marks)))))
(defun ediff-keep-ancestor ()
(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 0 marks)) (cdr (nth 1 marks)))))
(defun ediff-keep-incoming ()
(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 0 marks)) (cdr (nth 2 marks)))))
(defun ediff-keep-head-and-ancestor ()
(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 1 marks)) (cdr (nth 1 marks)))
(delete-region (car (nth 0 marks)) (cdr (nth 0 marks)))))
(defun ediff-keep-head-and-incoming ()
(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 1 marks)) (cdr (nth 2 marks)))
(delete-region (car (nth 0 marks)) (cdr (nth 0 marks)))))
(defun ediff-keep-ancestor-and-incoming ()
(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 2 marks)) (cdr (nth 2 marks)))
(delete-region (car (nth 0 marks)) (cdr (nth 1 marks)))))
(defun ediff-keep-combine-all ()
(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 2 marks)) (cdr (nth 3 marks)))
(delete-region (car (nth 1 marks)) (cdr (nth 1 marks)))
Please sign in to comment.
Something went wrong with that request. Please try again.