Browse Source

Add ChangeLog for Dan's patch and reformat a docstring

Carsten Dominik 16 years ago
parent
commit
089b5b2ff1
2 changed files with 11 additions and 2 deletions
  1. 7 0
      lisp/ChangeLog
  2. 4 2
      lisp/org-src.el

+ 7 - 0
lisp/ChangeLog

@@ -1,5 +1,12 @@
 2009-10-27  Carsten Dominik  <carsten.dominik@gmail.com>
 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.el (org-default-properties): Add STYLE property.
 	(org-files-list): Use the function call to get the files.
 	(org-files-list): Use the function call to get the files.
 	(org-additional-option-like-keywords): Add SETUPFILE to completion
 	(org-additional-option-like-keywords): Add SETUPFILE to completion

+ 4 - 2
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.
   "How the source code edit buffer should be displayed.
 Possible values for this option are:
 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.
 other-window      Use `switch-to-buffer-other-window' to display edit buffer.
 reorganize-frame  Show only two windows on the current frame, the current
 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.
 other-frame       Use `switch-to-buffer-other-frame' to display edit buffer.
                   Also, when exiting the edit buffer, kill that frame."
                   Also, when exiting the edit buffer, kill that frame."
   :group 'org-edit-structure
   :group 'org-edit-structure