Merge branch 'maint'
This commit is contained in:
commit
e44524b3b2
|
@ -12807,7 +12807,7 @@ height:width ratio, do the following
|
|||
|
||||
@cindex #+ATTR_ODT
|
||||
You can control the manner in which an image is anchored by setting the
|
||||
@code{:anchor} property of it's @code{#+ATTR_ODT} line. You can specify one
|
||||
@code{:anchor} property of its @code{#+ATTR_ODT} line. You can specify one
|
||||
of the following three values for the @code{:anchor} property:
|
||||
@samp{"as-char"}, @samp{"paragraph"} and @samp{"page"}.
|
||||
|
||||
|
@ -12930,7 +12930,7 @@ You can label and caption various category of objects---an inline image, a
|
|||
table, a @LaTeX{} fragment or a Math formula---using @code{#+LABEL} and
|
||||
@code{#+CAPTION} lines. @xref{Images and tables}. ODT exporter enumerates
|
||||
each labeled or captioned object of a given category separately. As a
|
||||
result, each such object is assigned a sequence number based on order of it's
|
||||
result, each such object is assigned a sequence number based on order of its
|
||||
appearance in the Org file.
|
||||
|
||||
In the exported document, a user-provided caption is augmented with the
|
||||
|
|
14
lisp/ob-C.el
14
lisp/ob-C.el
|
@ -81,7 +81,7 @@ This function calls `org-babel-execute:C++'."
|
|||
(org-babel-execute:C++ body params))
|
||||
|
||||
(defun org-babel-expand-body:cpp (body params)
|
||||
"Expand a block of C++ code with org-babel according to it's
|
||||
"Expand a block of C++ code with org-babel according to its
|
||||
header arguments."
|
||||
(org-babel-expand-body:C++ body params))
|
||||
|
||||
|
@ -91,7 +91,7 @@ This function is called by `org-babel-execute-src-block'."
|
|||
(let ((org-babel-c-variant 'cpp)) (org-babel-C-execute body params)))
|
||||
|
||||
(defun org-babel-expand-body:C++ (body params)
|
||||
"Expand a block of C++ code with org-babel according to it's
|
||||
"Expand a block of C++ code with org-babel according to its
|
||||
header arguments."
|
||||
(let ((org-babel-c-variant 'cpp)) (org-babel-C-expand-C++ body params)))
|
||||
|
||||
|
@ -101,7 +101,7 @@ This function is called by `org-babel-execute-src-block'."
|
|||
(let ((org-babel-c-variant 'd)) (org-babel-C-execute body params)))
|
||||
|
||||
(defun org-babel-expand-body:D (body params)
|
||||
"Expand a block of D code with org-babel according to it's
|
||||
"Expand a block of D code with org-babel according to its
|
||||
header arguments."
|
||||
(let ((org-babel-c-variant 'd)) (org-babel-C-expand-D body params)))
|
||||
|
||||
|
@ -111,7 +111,7 @@ This function is called by `org-babel-execute-src-block'."
|
|||
(let ((org-babel-c-variant 'c)) (org-babel-C-execute body params)))
|
||||
|
||||
(defun org-babel-expand-body:C (body params)
|
||||
"Expand a block of C code with org-babel according to it's
|
||||
"Expand a block of C code with org-babel according to its
|
||||
header arguments."
|
||||
(let ((org-babel-c-variant 'c)) (org-babel-C-expand-C body params)))
|
||||
|
||||
|
@ -175,12 +175,12 @@ or `org-babel-execute:C++' or `org-babel-execute:D'."
|
|||
|
||||
(defun org-babel-C-expand-C++ (body params)
|
||||
"Expand a block of C or C++ code with org-babel according to
|
||||
it's header arguments."
|
||||
its header arguments."
|
||||
(org-babel-C-expand-C body params))
|
||||
|
||||
(defun org-babel-C-expand-C (body params)
|
||||
"Expand a block of C or C++ code with org-babel according to
|
||||
it's header arguments."
|
||||
its header arguments."
|
||||
(let ((vars (org-babel--get-vars params))
|
||||
(colnames (cdr (assq :colname-names params)))
|
||||
(main-p (not (string= (cdr (assoc :main params)) "no")))
|
||||
|
@ -229,7 +229,7 @@ it's header arguments."
|
|||
|
||||
(defun org-babel-C-expand-D (body params)
|
||||
"Expand a block of D code with org-babel according to
|
||||
it's header arguments."
|
||||
its header arguments."
|
||||
(let ((vars (org-babel--get-vars params))
|
||||
(colnames (cdr (assq :colname-names params)))
|
||||
(main-p (not (string= (cdr (assoc :main params)) "no")))
|
||||
|
|
|
@ -108,7 +108,7 @@ code ---- the default, display the code inside the block but do
|
|||
not process
|
||||
|
||||
results - just like none only the block is run on export ensuring
|
||||
that it's results are present in the org-mode buffer
|
||||
that its results are present in the org-mode buffer
|
||||
|
||||
none ---- do not display either code or results upon export
|
||||
|
||||
|
|
|
@ -77,7 +77,7 @@
|
|||
|
||||
(defun org-babel-expand-body:fortran (body params)
|
||||
"Expand a block of fortran or fortran code with org-babel according to
|
||||
it's header arguments."
|
||||
its header arguments."
|
||||
(let ((vars (org-babel--get-vars params))
|
||||
(main-p (not (string= (cdr (assoc :main params)) "no")))
|
||||
(includes (or (cdr (assoc :includes params))
|
||||
|
|
|
@ -7587,7 +7587,9 @@ to switch between filtering and excluding."
|
|||
(defun org-agenda-filter-by-tag-refine (arg &optional char)
|
||||
"Refine the current filter. See `org-agenda-filter-by-tag'."
|
||||
(interactive "P")
|
||||
(org-agenda-filter-by-tag arg char 'refine))
|
||||
(org-agenda-filter-by-tag arg char))
|
||||
(make-obsolete 'org-agenda-filter-by-tag-refine
|
||||
"use `org-agenda-filter-by-tag' instead." "8.3.4")
|
||||
|
||||
(defun org-agenda-filter-make-matcher (filter type &optional expand)
|
||||
"Create the form that tests a line for agenda filter. Optional
|
||||
|
|
|
@ -3417,7 +3417,7 @@ contextual information."
|
|||
(when (org-export-table-cell-starts-colgroup-p
|
||||
table-cell info)
|
||||
"\n<colgroup>")
|
||||
;; Add a column. Also specify it's alignment.
|
||||
;; Add a column. Also specify its alignment.
|
||||
(format "\n%s"
|
||||
(org-html-close-tag
|
||||
"col" (concat " " (format alignspec alignment)) info))
|
||||
|
|
|
@ -48,7 +48,7 @@ Current buffer is a copy of the original buffer."
|
|||
(org-export-to-file 'html html-file))
|
||||
;; should create a .html file
|
||||
(should (file-exists-p html-file))
|
||||
;; should not create a file with "::" appended to it's name
|
||||
;; should not create a file with "::" appended to its name
|
||||
(should-not (file-exists-p (concat org-test-no-heading-file "::")))
|
||||
(when (file-exists-p html-file) (delete-file html-file))))
|
||||
|
||||
|
@ -77,7 +77,7 @@ Current buffer is a copy of the original buffer."
|
|||
(org-export-to-file 'html html-file))
|
||||
;; should create a .html file
|
||||
(should (file-exists-p html-file))
|
||||
;; should not create a file with "::" appended to it's name
|
||||
;; should not create a file with "::" appended to its name
|
||||
(should-not (file-exists-p (concat org-test-link-in-heading-file "::")))
|
||||
(when (file-exists-p html-file) (delete-file html-file))))
|
||||
|
||||
|
|
|
@ -134,7 +134,7 @@ executable."
|
|||
|
||||
(defun org-test-buffer (&optional file)
|
||||
"TODO: Setup and return a buffer to work with.
|
||||
If file is non-nil insert it's contents in there.")
|
||||
If file is non-nil insert its contents in there.")
|
||||
|
||||
(defun org-test-compare-with-file (&optional file)
|
||||
"TODO: Compare the contents of the test buffer with FILE.
|
||||
|
|
Loading…
Reference in New Issue