summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2012-04-21 16:05:22 +0200
committerBastien Guerry <bzg@altern.org>2012-04-21 16:05:22 +0200
commitcd053cc12f9c76862da37ad651e46ca3ac99f5c6 (patch)
treefa83e109d63a0c81254dc01272ff545f2a0d27d9
parent58bef074a7937888a39594a5299575e15684cd16 (diff)
parent9d01202a7b87cb9ce33208b14cf129ae26690266 (diff)
downloadorg-mode-cd053cc12f9c76862da37ad651e46ca3ac99f5c6.tar.gz
Merge branch 'maint' into master-merge-maint
Conflicts: lisp/org-footnote.el lisp/org.el
-rw-r--r--lisp/org-ctags.el2
-rw-r--r--lisp/org-protocol.el2
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/org-ctags.el b/lisp/org-ctags.el
index caf4c84..747797a 100644
--- a/lisp/org-ctags.el
+++ b/lisp/org-ctags.el
@@ -188,7 +188,7 @@ See the ctags documentation for more information.")
Created as a local variable in each buffer.")
(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.
The following patterns are replaced in the string:
`%t' - replaced with the capitalized title of the hyperlink"
diff --git a/lisp/org-protocol.el b/lisp/org-protocol.el
index 05a6364..9357bb0 100644
--- a/lisp/org-protocol.el
+++ b/lisp/org-protocol.el
@@ -225,7 +225,7 @@ Consider using the interactive functions `org-protocol-create' and
:type 'alist)
(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: