From: Andreas Gerler <baron@bundesbrandschatzamt.de>
Date: Mon, 17 Oct 2016 10:18:54 +0000 (+0200)
Subject: added ediff-marked-pair
X-Git-Url: http://git.bundesbrandschatzamt.de/?a=commitdiff_plain;h=c7101478882d974eb1f369d354dbfd471e5baae3;p=emacsconfig.git

added ediff-marked-pair

- thanks to
  http://stackoverflow.com/questions/18121808/emacs-ediff-marked-files-in-different-dired-buffers
  we can diff files in 2 different dired buffers. Eg dired via tramp on
  2 different servers and compare the files.

Signed-off-by: Andreas Gerler <baron@bundesbrandschatzamt.de>
---

diff --git a/bba.org b/bba.org
index 2a4c40a6..a485de37 100644
--- a/bba.org
+++ b/bba.org
@@ -2741,6 +2741,45 @@ Kill the current buffer without asking if there is no prefix.
 
   (global-set-key (kbd "C-x k") 'jcs-kill-a-buffer)
 #+END_SRC
+
+* [[http://stackoverflow.com/questions/18121808/emacs-ediff-marked-files-in-different-dired-buffers][ediff marked pair]]
+[2016-10-17 Mon 11:57]
+
+Had to diff files on 2 different servers. What's better then dired and TRAMP?
+
+#+BEGIN_SRC emacs-lisp
+  (defun mkm/ediff-marked-pair ()
+     "Run ediff-files on a pair of files marked in dired buffer"
+     (interactive)
+     (let* ((marked-files (dired-get-marked-files nil nil))
+            (other-win (get-window-with-predicate
+                        (lambda (window)
+                          (with-current-buffer (window-buffer window)
+                            (and (not (eq window (selected-window)))
+                                 (eq major-mode 'dired-mode))))))
+            (other-marked-files (and other-win
+                                     (with-current-buffer (window-buffer other-win)
+                                       (dired-get-marked-files nil)))))
+       (cond ((= (length marked-files) 2)
+              (ediff-files (nth 0 marked-files)
+                           (nth 1 marked-files)))
+             ((and (= (length marked-files) 1)
+                   (= (length other-marked-files) 1))
+              (ediff-files (nth 0 marked-files)
+                           (nth 0 other-marked-files)))
+             ((= (length marked-files) 1)
+              (let ((single-file (nth 0 marked-files)))
+                (ediff-files single-file
+                             (read-file-name
+                              (format "Diff %s with: " single-file)
+                              nil (m (if (string= single-file (dired-get-filename))
+                                         nil
+                                       (dired-get-filename))) t))))
+             (t (error "mark no more than 2 files")))))
+
+  (define-key dired-mode-map "=" 'mkm/ediff-marked-pair)
+#+END_SRC
+
 * configure some default values
     [2014-10-02 Thu 00:27]