diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0505550b9..31982483d 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,12 @@
 2009-10-27  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org-src.el (org-src-window-setup): New option.
+	(org-src-switch-to-buffer): New function.
+	(org-edit-src-exit): Add optional argument CONTEXT and use it to
+	restore window configuration.
+	(org-edit-src-code, org-edit-src-continue, org-edit-src-exit):
+	Call `org-src-switch-to-buffer'.
+
 	* org.el (org-default-properties): Add STYLE property.
 	(org-files-list): Use the function call to get the files.
 	(org-additional-option-like-keywords): Add SETUPFILE to completion
diff --git a/lisp/org-src.el b/lisp/org-src.el
index a8f599ba7..069d3cfc5 100644
--- a/lisp/org-src.el
+++ b/lisp/org-src.el
@@ -114,10 +114,12 @@ When nil, the message will only be shown intermittently in the echo area."
   "How the source code edit buffer should be displayed.
 Possible values for this option are:
 
-current-window    Show edit buffer in the current window, keeping all other windows.
+current-window    Show edit buffer in the current window, keeping all other
+                  windows.
 other-window      Use `switch-to-buffer-other-window' to display edit buffer.
 reorganize-frame  Show only two windows on the current frame, the current
-                  window and the edit buffer. When exiting the edit buffer, return to one window.
+                  window and the edit buffer. When exiting the edit buffer,
+                  return to one window.
 other-frame       Use `switch-to-buffer-other-frame' to display edit buffer.
                   Also, when exiting the edit buffer, kill that frame."
   :group 'org-edit-structure