forked from mirrors/org-mode
Merge branch 'bugfix'
As mentioned in 2e36ac2ac
(Merge single quote fixes from Emacs's
master, 2022-07-24), this merge is keeping Org main's side of
org-babel-lua-read-string and org-agenda-sorting-strategy rather than
the variant introduced in the Emacs repo that's now in bugfix.
Note that for org-agenda-sorting-strategy docstring I think it'd
probably be preferable to change main's
\\='(time-up category-keep priority-down)
to a bare
(time-up category-keep priority-down)
but, at least for this merge, I'm sticking to choosing between the
variables that are in one of the sides.
This commit is contained in:
commit
5a64429b27
|
@ -2887,12 +2887,12 @@ For more information and examples see the [[https://orgmode.org/worg/org-tutoria
|
|||
- transpose ::
|
||||
|
||||
When =y=, =yes=, or =t= attempt to transpose the table data before
|
||||
plotting. Also recognises the shorthand option =trans=.
|
||||
plotting. Also recognizes the shorthand option =trans=.
|
||||
|
||||
- =type= ::
|
||||
|
||||
Specify the type of the plot, by default one of =2d=, =3d=, =radar=, or =grid=.
|
||||
Available types can be customised with ~org-plot/preset-plot-types~.
|
||||
Available types can be customized with ~org-plot/preset-plot-types~.
|
||||
|
||||
- =with= ::
|
||||
|
||||
|
|
20
etc/ORG-NEWS
20
etc/ORG-NEWS
|
@ -657,7 +657,7 @@ with width equal to the pixel-width of the buffer text multiplied by 0.7.
|
|||
This functionality is implemented in a new function,
|
||||
~org-display-inline-image--width~ which contains the width
|
||||
determination logic previously in ~org-display-inline-images~ and the
|
||||
new behaviour.
|
||||
new behavior.
|
||||
|
||||
** New options
|
||||
*** Option ~org-hidden-keywords~ now also applies to #+SUBTITLE:
|
||||
|
@ -675,7 +675,7 @@ descriptions.
|
|||
*** New option ~org-id-ts-format~
|
||||
|
||||
Earlier, IDs generated using =ts= method had a hard-coded format (i.e. =20200923T160237.891616=).
|
||||
The new option allows user to customise the format.
|
||||
The new option allows user to customize the format.
|
||||
Defaults are unchanged.
|
||||
|
||||
*** New argument for ~file-desc~ babel header
|
||||
|
@ -874,16 +874,16 @@ heading, except return nil.
|
|||
|
||||
*** Faces of all the heading text elements now conform to the headline face
|
||||
|
||||
In the past, faces of todo keywords, emphasised text, tags, and
|
||||
In the past, faces of todo keywords, emphasized text, tags, and
|
||||
priority cookies inherited =default= face. The resulting headline
|
||||
fontification was not always consistent, as discussed in [[msg::87h7sawubl.fsf@protesilaos.com][this bug
|
||||
report]]. Now, the relevant faces adapt to face used to fontify the
|
||||
current headline level.
|
||||
|
||||
Users who prefer to keep the old behaviour should change their face
|
||||
customisation explicitly stating that =default= face is inherited.
|
||||
Users who prefer to keep the old behavior should change their face
|
||||
customization explicitly stating that =default= face is inherited.
|
||||
|
||||
Example of old face customisation:
|
||||
Example of old face customization:
|
||||
|
||||
#+begin_src emacs-lisp
|
||||
(setq org-todo-keyword-faces '(("TODO"
|
||||
|
@ -891,7 +891,7 @@ Example of old face customisation:
|
|||
:height 0.75)))
|
||||
#+end_src
|
||||
|
||||
To preserve the old behaviour the above customisation should be
|
||||
To preserve the old behavior the above customization should be
|
||||
changed to
|
||||
|
||||
#+begin_src emacs-lisp
|
||||
|
@ -914,7 +914,7 @@ The function does not allow for a third optional parameter anymore.
|
|||
*** LaTeX environment =#+results= are now removed
|
||||
|
||||
If a babel src block produces a raw LaTeX environment, it will now be
|
||||
recognised as a result, and so replaced when re-evaluated.
|
||||
recognized as a result, and so replaced when re-evaluated.
|
||||
|
||||
*** Tag completion now uses =completing-read-multiple=
|
||||
|
||||
|
@ -1052,7 +1052,7 @@ enabled, and point is neither in a table nor on a timestamp or a link:
|
|||
- =C-j= (bound to the new command ~org-return-and-maybe-indent~)
|
||||
merely inserts a newline.
|
||||
|
||||
To get the previous behaviour back, disable ~electric-indent-mode~
|
||||
To get the previous behavior back, disable ~electric-indent-mode~
|
||||
explicitly:
|
||||
|
||||
#+begin_src emacs-lisp
|
||||
|
@ -1400,7 +1400,7 @@ Previously all session names had ~org-babel-session-~ prepended.
|
|||
*** Forward/backward paragraph functions in line with the rest of Emacs
|
||||
|
||||
~org-forward-paragraph~ and ~org-backward-paragraph~, bound to
|
||||
~<C-UP>~ and ~<C-DOWN>~ functions mimic more closely behaviour of
|
||||
~<C-UP>~ and ~<C-DOWN>~ functions mimic more closely behavior of
|
||||
~forward-paragraph~ and ~backward-paragraph~ functions when
|
||||
available.
|
||||
|
||||
|
|
|
@ -487,7 +487,7 @@ evaluates to a string.
|
|||
A closure is evaluated when the source block is being
|
||||
evaluated (e.g. during execution or export), with point at the
|
||||
source block. It is not possible to use an arbitrary function
|
||||
symbol (e.g. \\='some-func), since org uses lexical binding. To
|
||||
symbol (e.g. `some-func'), since org uses lexical binding. To
|
||||
achieve the same functionality, call the function within a
|
||||
closure (e.g. (lambda () (some-func))).
|
||||
|
||||
|
|
|
@ -250,8 +250,8 @@ end")
|
|||
(defun org-babel-julia-evaluate-external-process
|
||||
(body result-type result-params column-names-p)
|
||||
"Evaluate BODY in external julia process.
|
||||
If RESULT-TYPE equals \\='output then return standard output as a
|
||||
string. If RESULT-TYPE equals \\='value then return the value of the
|
||||
If RESULT-TYPE equals `output' then return standard output as a
|
||||
string. If RESULT-TYPE equals `value' then return the value of the
|
||||
last statement in BODY, as elisp."
|
||||
(cl-case result-type
|
||||
(value
|
||||
|
@ -274,8 +274,8 @@ last statement in BODY, as elisp."
|
|||
(defun org-babel-julia-evaluate-session
|
||||
(session body result-type result-params column-names-p)
|
||||
"Evaluate BODY in SESSION.
|
||||
If RESULT-TYPE equals \\='output then return standard output as a
|
||||
string. If RESULT-TYPE equals \\='value then return the value of the
|
||||
If RESULT-TYPE equals `output' then return standard output as a
|
||||
string. If RESULT-TYPE equals `value' then return the value of the
|
||||
last statement in BODY, as elisp."
|
||||
(cl-case result-type
|
||||
(value
|
||||
|
|
|
@ -84,7 +84,7 @@ is the equivalent of the following source code block:
|
|||
#+end_src
|
||||
|
||||
NOTE: The quotation marks around the function name,
|
||||
\\='source-block\\=', are optional.
|
||||
`source-block', are optional.
|
||||
|
||||
NOTE: By default, string variable names are interpreted as
|
||||
references to source-code blocks, to force interpretation of a
|
||||
|
|
|
@ -961,7 +961,7 @@ characters that should be escaped."
|
|||
|
||||
(defun org-link-decode (s)
|
||||
"Decode percent-encoded parts in string S.
|
||||
E.g. \"%C3%B6\" becomes the german o-Umlaut."
|
||||
E.g. \"%C3%B6\" becomes the German o-Umlaut."
|
||||
(replace-regexp-in-string "\\(%[0-9A-Za-z]\\{2\\}\\)+"
|
||||
#'org-link--decode-compound s t t))
|
||||
|
||||
|
|
|
@ -1646,7 +1646,7 @@ alpha-down Sort headlines alphabetically, reversed.
|
|||
|
||||
The different possibilities will be tried in sequence, and testing stops
|
||||
if one comparison returns a \"not-equal\". For example, the default
|
||||
\\='(time-up category-keep priority-down)
|
||||
`(time-up category-keep priority-down)'
|
||||
means: Pull out all entries having a specified time of day and sort them,
|
||||
in order to make a time schedule for the current day the first thing in the
|
||||
agenda listing for the day. Of the entries without a time indication, keep
|
||||
|
@ -4156,7 +4156,7 @@ dimming them." ;FIXME: The arg isn't used, actually!
|
|||
|
||||
If the header at `org-hd-marker' is blocked according to
|
||||
`org-entry-blocked-p', then if `org-agenda-dim-blocked-tasks' is
|
||||
\\='invisible and the header is not blocked by checkboxes, set the
|
||||
`invisible' and the header is not blocked by checkboxes, set the
|
||||
text property `org-todo-blocked' to `invisible', otherwise set it
|
||||
to t."
|
||||
(when (get-text-property 0 'todo-state entry)
|
||||
|
|
|
@ -5462,7 +5462,7 @@ The table is taken from the parameter TXT, or from the buffer at point."
|
|||
(nreverse table)))))
|
||||
|
||||
(defun org-table-collapse-header (table &optional separator max-header-lines)
|
||||
"Collapse the lines before \\='hline into a single header.
|
||||
"Collapse the lines before `hline' into a single header.
|
||||
|
||||
The given TABLE is a list of lists as returned by `org-table-to-lisp'.
|
||||
The leading lines before the first `hline' symbol are considered
|
||||
|
|
|
@ -2911,7 +2911,7 @@ Starred and \"displaymath\" environments are not numbered."
|
|||
|
||||
(defun org-html--unlabel-latex-environment (latex-frag)
|
||||
"Change environment in LATEX-FRAG string to an unnumbered one.
|
||||
For instance, change an \\='equation\\=' environment to \\='equation*\\='."
|
||||
For instance, change an `equation' environment to `equation*'."
|
||||
(replace-regexp-in-string
|
||||
"\\`[ \t]*\\\\begin{\\([^*]+?\\)}"
|
||||
"\\1*"
|
||||
|
|
Loading…
Reference in a new issue