mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-12-23 10:34:17 +00:00
Code

docstring edits

Browse Source 
* lisp/ob.el (org-babel-merge-params): docstring typo
This commit is contained in:
Dan Davison 2011-01-20 15:05:22 +00:00
parent 05ef2ae7cc
commit dcfeec887a
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lisp/ob-python.el
View File

@ -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)

2
lisp/ob.el
View File

@ -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