diff options
| author | Dan Davison <dandavison7@gmail.com> | 2011-01-20 15:05:22 +0000 |
|---|---|---|
| committer | Dan Davison <dandavison7@gmail.com> | 2011-01-20 17:20:19 +0000 |
| commit | dcfeec887a8843eeafb99c0355c4ff2e4b106acb (patch) | |
| tree | bb7921017539528e48d306a30a6826b9cbe38124 | |
| parent | 05ef2ae7cc544b75023efb069fd26e9abbc09cf4 (diff) | |
| download | org-mode-dcfeec887a8843eeafb99c0355c4ff2e4b106acb.tar.gz | |
docstring edits
* lisp/ob.el (org-babel-merge-params): docstring typo
| -rw-r--r-- | lisp/ob-python.el | 3 | ||||
| -rw-r--r-- | lisp/ob.el | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lisp/ob-python.el b/lisp/ob-python.el index 0f532b0..1fb1d46 100644 --- a/lisp/ob-python.el +++ b/lisp/ob-python.el @@ -46,7 +46,8 @@ "Name of command for executing python code.") (defvar org-babel-python-mode (if (featurep 'xemacs) 'python-mode 'python) - "Preferred python mode for use in running python interactively.") + "Preferred python mode for use in running python interactively. +This will typically be either 'python or 'python-mode.") (defvar org-src-preserve-indentation) @@ -1601,7 +1601,7 @@ file's directory then expand relative links." (defun org-babel-merge-params (&rest plists) "Combine all parameter association lists in PLISTS. -Later elements of PLISTS override the values of previous element. +Later elements of PLISTS override the values of previous elements. This takes into account some special considerations for certain parameters when merging lists." (let ((results-exclusive-groups |