Mercurial Mercurial > dot-emacs / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't spawn separate ediff frame as this conflict with my setting in Fvwm:
authorOleksandr Gavenko <gavenkoa@gmail.com>
Thu, 27 Sep 2012 00:33:52 +0300
changeset 946 c0ab115a12cc
parent 945 79c13b7327fa
child 947 7c53dd33d231
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
.emacs-my file | annotate | diff | comparison | revisions 
--- 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
dot-emacs