       (message "No patch"))))
 
 ;;;###autoload
-(defun el-patch-ediff-conflict (patch-definition)
+(defun el-patch-ediff-conflict (name type)
   "Show a patch conflict in Ediff.
 This is a diff between the expected and actual values of a
-patch's original definition. PATCH-DEFINITION is as returned by
-`el-patch--select-patch'."
-  (interactive (list (el-patch--select-patch)))
-  (let* ((expected-definition (el-patch--resolve-definition
+patch's original definition. NAME and TYPE are as returned by
+`el-patch-get'."
+  (interactive (el-patch--select-patch))
+  (let* ((patch-definition (el-patch-get name type))
+         (expected-definition (el-patch--resolve-definition
                                patch-definition nil))
          (name (cadr expected-definition))
          (actual-definition (el-patch--find-function name)))

;;;; Removing patches

;;;###autoload
(defun el-patch-unpatch (patch-definition)
  "Remove the patch given by the PATCH-DEFINITION.
This restores the original functionality of the object being
patched. PATCH-DEFINITION is as returned by
`el-patch--select-patch'."
  (interactive (list (el-patch--select-patch)))
  (let ((old-definition (el-patch--resolve-definition patch-definition nil))
        (new-definition (el-patch--resolve-definition patch-definition t)))
    (cl-destructuring-bind (type name . body) new-definition
      (eval old-definition)
      (remhash type (gethash name el-patch--patches)))))

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;; Closing remarks

     nil 'ediff-regions-wordwise 'word-mode nil)))

;;;###autoload
(defun el-patch-ediff-patch (name type)
  "Show the patch for an object in Ediff.
NAME and TYPE are as returned by `el-patch-get'."
  (interactive (el-patch--select-patch))
  (let* ((patch-definition (el-patch-get name type))
         (old-definition (el-patch--resolve-definition
                          patch-definition nil))
         (new-definition (el-patch--resolve-definition
                          patch-definition t)))
    (el-patch--ediff-forms
     "*el-patch original*" old-definition
     "*el-patch patched*" new-definition)
