Document windmove work-around

doc/ChangeLog

@@ -1,3 +1,7 @@
+2010-04-26  Carsten Dominik  <carsten.dominik@gmail.com>
+
+	* org.texi (Conflicts): Document new work-around for windmove.el.
+
 2010-04-23  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org.texi (Plain lists): Document the commands to promote/demote

doc/org.texi

@@ -11371,7 +11371,18 @@ fixed this problem:
 @item @file{windmove.el} by Hovav Shacham
 @cindex @file{windmove.el}
 This package also uses the @kbd{S-<cursor>} keys, so everything written
-in the paragraph above about CUA mode also applies here.
+in the paragraph above about CUA mode also applies here.  If you want make
+the windmove function active in locations where Org-mode does not have
+special functionality on @kbd{S-@key{cursor}}, add this to your
+configuration:
+
+@lisp
+;; Make windmove work in org-mode:
+(add-hook 'org-shiftup-final-hook 'windmove-up)
+(add-hook 'org-shiftleft-final-hook 'windmove-left)
+(add-hook 'org-shiftdown-final-hook 'windmove-down)
+(add-hook 'org-shiftright-final-hook 'windmove-right)
+@end lisp
 
 @item @file{viper.el} by Michael Kifer
 @cindex @file{viper.el}