# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1348695232 -10800
# Node ID c0ab115a12ccb9a8def2bed9395554a83633fb8d
# Parent  79c13b7327fa7f50a6b463e287e871cb92083e35
Don't spawn separate ediff frame as this conflict with my setting in Fvwm:
  AddToFunc MyFuncFocusWindow
  + I FlipFocus
  + I WarpToWindow 50 50
  DestroyModuleConfig FvwmEvent-NewWindow
  *FvwmEvent-NewWindow: Cmd
  *FvwmEvent-NewWindow: add_window MyFuncFocusWindow
  AddToFunc StartFunction I Module FvwmEvent
  AddToFunc StartFunction I FvwmEvent FvwmEvent-NewWindow

Refer to thread: http://permalink.gmane.org/gmane.emacs.help/86918

diff -r 79c13b7327fa -r c0ab115a12cc .emacs-my
--- a/.emacs-my	Mon Sep 24 19:58:13 2012 +0300
+++ b/.emacs-my	Thu Sep 27 00:33:52 2012 +0300
@@ -1862,6 +1862,7 @@
 
 (setq ediff-diff-options "")
 (setq ediff-custom-diff-options "-u")
+(setq ediff-window-setup-function 'ediff-setup-windows-plain)
 
 (when window-system
   (eval-after-load 'diff-mode