--- a/.emacs-my Mon Oct 11 17:05:51 2010 +0300 +++ b/.emacs-my Tue Oct 12 15:05:33 2010 +0300 @@ -993,6 +993,7 @@ (setq diff-switches "-u") (setq ediff-diff-options "") +(setq ediff-custom-diff-options "-u") ;;; ---------------------------------------------------------------- ;;; indenting.