forked from mirrors/org-mode
Merge branch 'maint' into master-merge-maint
Conflicts: lisp/org-footnote.el lisp/org.el
This commit is contained in:
commit
cd053cc12f
|
@ -188,7 +188,7 @@ See the ctags documentation for more information.")
|
||||||
Created as a local variable in each buffer.")
|
Created as a local variable in each buffer.")
|
||||||
|
|
||||||
(defcustom org-ctags-new-topic-template
|
(defcustom org-ctags-new-topic-template
|
||||||
"* <<%t>>\n\n\n\n\n\n"
|
"<<%t>>\n\n\n\n\n\n"
|
||||||
"Text to insert when creating a new org file via opening a hyperlink.
|
"Text to insert when creating a new org file via opening a hyperlink.
|
||||||
The following patterns are replaced in the string:
|
The following patterns are replaced in the string:
|
||||||
`%t' - replaced with the capitalized title of the hyperlink"
|
`%t' - replaced with the capitalized title of the hyperlink"
|
||||||
|
|
|
@ -225,7 +225,7 @@ Consider using the interactive functions `org-protocol-create' and
|
||||||
:type 'alist)
|
:type 'alist)
|
||||||
|
|
||||||
(defcustom org-protocol-protocol-alist nil
|
(defcustom org-protocol-protocol-alist nil
|
||||||
"* Register custom handlers for org-protocol.
|
"Register custom handlers for org-protocol.
|
||||||
|
|
||||||
Each element of this list must be of the form:
|
Each element of this list must be of the form:
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue