From: Andreas Gerler <baron@bundesbrandschatzamt.de>
Date: Fri, 21 Oct 2016 12:22:09 +0000 (+0200)
Subject: fix for ediff-marked-pair
X-Git-Url: http://git.bundesbrandschatzamt.de/?a=commitdiff_plain;h=09fd8e57e517497f8a83c99a086f4873c0b29cfa;p=emacsconfig.git

fix for ediff-marked-pair
---

diff --git a/bba.org b/bba.org
index ff174daf..6e4f1821 100644
--- a/bba.org
+++ b/bba.org
@@ -2778,7 +2778,14 @@ Had to diff files on 2 different servers. What's better then dired and TRAMP?
                                        (dired-get-filename))) t))))
              (t (error "mark no more than 2 files")))))
 
-  (define-key dired-mode-map "=" 'mkm/ediff-marked-pair)
+
+
+      (add-hook 'dired-mode-hook
+                (lambda ()
+                  ;; The 'ls' executable requires the Gnu version on the Mac
+                  (define-key dired-mode-map "=" 'mkm/ediff-marked-pair)))
+
+#+END_SRC
 #+END_SRC
 
 * configure some default values
@@ -2930,6 +2937,7 @@ XML indentation
   (if (equal "work" (getenv "SYSENV"))
       (setq nxml-child-indent 4))
 #+END_SRC
+
 * other stuff
 
 #+BEGIN_SRC emacs-lisp