From 9d8b5d2052f0fdbe97c16267fd5cffc47fa6bdf9 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 14 Feb 2019 16:25:33 +0100 Subject: [PATCH] Ediff: Define EDIFF-COPY-BOTH-TO-C --- .emacs.d/lisp/functions.el | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.emacs.d/lisp/functions.el b/.emacs.d/lisp/functions.el index cfa940b8..7b9db787 100644 --- a/.emacs.d/lisp/functions.el +++ b/.emacs.d/lisp/functions.el @@ -40,6 +40,14 @@ (setq key (pop bindings) def (pop bindings)))) +;; TODO: Bind this to ediff control panel. +(defun ambrevar/ediff-copy-both-to-C () + (interactive) + (ediff-copy-diff ediff-current-difference nil 'C nil + (concat + (ediff-get-region-contents ediff-current-difference 'A ediff-control-buffer) + (ediff-get-region-contents ediff-current-difference 'B ediff-control-buffer)))) + (defun ambrevar/escape-region (&optional regex to-string) "Escape double-quotes and backslashes. This is useful for writing Elisp strings containing those