tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'km/from-emacs-master'

This commit is contained in:
Kyle Meyer 2022-11-20 22:30:47 -05:00
parent 62e1513b5a 257df88645
commit aed55381bd
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/org-manual.org
View File

@ -17021,7 +17021,7 @@ identifying a reference in the bibliography.
- Each key can be qualified by a /prefix/ (e.g.\nbsp{}"see ") and/or - Each key can be qualified by a /prefix/ (e.g.\nbsp{}"see ") and/or
a /suffix/ (e.g.\nbsp{}"p.\nbsp{}123"), giving information useful or necessary a /suffix/ (e.g.\nbsp{}"p.\nbsp{}123"), giving information useful or necessary
fo the comprehension of the citation but not included in the for the comprehension of the citation but not included in the
reference. reference.
- A single citation can cite more than one reference ; the keys are - A single citation can cite more than one reference ; the keys are

8
etc/ORG-NEWS
View File

@ -3539,7 +3539,7 @@ can pass the converted path to the =sqlcmd= tool.
**** Improved support of header arguments for postgresql **** Improved support of header arguments for postgresql
The postgresql engine in a sql code block supports now ~:dbport~ nd The postgresql engine in a sql code block now supports ~:dbport~ and
~:dbpassword~ as header arguments. ~:dbpassword~ as header arguments.
**** Support for additional plantuml output formats **** Support for additional plantuml output formats
@ -6455,7 +6455,7 @@ that Calc formulas can operate on them.
**** org-ctags.el (Paul Sexton) **** org-ctags.el (Paul Sexton)
Targets like =<<my target>>= can now be found by Emacs' etag Targets like =<<my target>>= can now be found by Emacs' etag
functionality, and Org-mode links can be used to to link to functionality, and Org-mode links can be used to link to
etags, also in non-Org-mode files. For details, see the file etags, also in non-Org-mode files. For details, see the file
/org-ctags.el/. /org-ctags.el/.
@ -6812,7 +6812,7 @@ that Calc formulas can operate on them.
code that is actually evaluated comprises the code block contents, code that is actually evaluated comprises the code block contents,
augmented with the extra code which assigns the referenced data to augmented with the extra code which assigns the referenced data to
variables. It is now possible to preview expanded contents, and variables. It is now possible to preview expanded contents, and
also to expand code during during tangling. This expansion takes also to expand code during tangling. This expansion takes
into account all header arguments, and variables. into account all header arguments, and variables.
A new keybinding `C-c M-b p' bound to `org-babel-expand-src-block' A new keybinding `C-c M-b p' bound to `org-babel-expand-src-block'
@ -6927,7 +6927,7 @@ that Calc formulas can operate on them.
**** Localized clock tables **** Localized clock tables
Clock tables now support a new new =:lang= parameter, allowing Clock tables now support a new =:lang= parameter, allowing
the user to customize the localization of the table headers. See the user to customize the localization of the table headers. See
the variable =org-clock-clocktable-language-setup= which controls the variable =org-clock-clocktable-language-setup= which controls
available translated strings. available translated strings.

2
lisp/ol.el
View File

@ -357,7 +357,7 @@ another window."
(defcustom org-link-search-must-match-exact-headline 'query-to-create (defcustom org-link-search-must-match-exact-headline 'query-to-create
"Non-nil means internal fuzzy links can only match headlines. "Non-nil means internal fuzzy links can only match headlines.
When nil, the a fuzzy link may point to a target or a named When nil, the fuzzy link may point to a target or a named
construct in the document. When set to the special value construct in the document. When set to the special value
`query-to-create', offer to create a new headline when none `query-to-create', offer to create a new headline when none
matched. matched.

2
lisp/org-faces.el
View File

@ -140,7 +140,7 @@ The following faces apply, with this priority.
Since column view works by putting overlays with a display property Since column view works by putting overlays with a display property
over individual characters in the buffer, the face of the underlining over individual characters in the buffer, the face of the underlining
character (this might for example be the a TODO keyword) might still character (this might for example be the TODO keyword) might still
shine through in some properties. So when your column view looks shine through in some properties. So when your column view looks
funny, with \"random\" colors, weight, strike-through, try to explicitly funny, with \"random\" colors, weight, strike-through, try to explicitly
set the properties in the `org-column' face. For example, set set the properties in the `org-column' face. For example, set