Merge branch 'maint' of orgmode.org:org-mode
This commit is contained in:
commit
0630d89a0c
|
@ -75,9 +75,8 @@ results
|
|||
|
||||
NOTE: by default string variable names are interpreted as
|
||||
references to source-code blocks, to force interpretation of a
|
||||
cell's value as a string, prefix the identifier with two \"$\"s
|
||||
rather than a single \"$\" (i.e. \"$$2\" instead of \"$2\" in the
|
||||
example above.
|
||||
cell's value as a string, prefix the identifier a \"$\" (e.g.,
|
||||
\"$$2\" instead of \"$2\" or \"$@2$2\" instead of \"@2$2\").
|
||||
|
||||
NOTE: it is also possible to pass header arguments to the code
|
||||
block. In this case a table cell should hold the string value of
|
||||
|
|
|
@ -192,9 +192,11 @@ exported source code blocks by language."
|
|||
(when only-this-block
|
||||
(unless (org-babel-where-is-src-block-head)
|
||||
(error "Point is not currently inside of a code block"))
|
||||
(unless target-file
|
||||
(setq target-file
|
||||
(read-from-minibuffer "Tangle to: " (buffer-file-name))))
|
||||
(save-match-data
|
||||
(unless (or (cdr (assoc :tangle (nth 2 (org-babel-get-src-block-info))))
|
||||
target-file)
|
||||
(setq target-file
|
||||
(read-from-minibuffer "Tangle to: " (buffer-file-name)))))
|
||||
(narrow-to-region (match-beginning 0) (match-end 0)))
|
||||
(save-excursion
|
||||
(let ((block-counter 0)
|
||||
|
|
|
@ -2225,6 +2225,8 @@ block but are passed literally to the \"example-block\"."
|
|||
(setq index (point))
|
||||
(nb-add
|
||||
(with-current-buffer parent-buffer
|
||||
(save-restriction
|
||||
(widen)
|
||||
(mapconcat ;; interpose PREFIX between every line
|
||||
#'identity
|
||||
(split-string
|
||||
|
@ -2284,7 +2286,7 @@ block but are passed literally to the \"example-block\"."
|
|||
"could not be resolved (see "
|
||||
"`org-babel-noweb-error-langs')"))
|
||||
"")))
|
||||
"[\n\r]") (concat "\n" prefix)))))
|
||||
"[\n\r]") (concat "\n" prefix))))))
|
||||
(nb-add (buffer-substring index (point-max)))))
|
||||
new-body))
|
||||
|
||||
|
|
Loading…
Reference in New Issue