aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBastien Guerry2012-04-26 22:46:10 +0200
committerBastien Guerry2012-04-26 22:46:10 +0200
commit5e0e5e3676bb46c303a4798c8e8a829f2e5343e4 (patch)
tree545b8c100749f032ae0c75c73999fa0c9095cdd7
parentcdb45185ee0bb3f5504bdb1e7c2dfdfcfb5a81c2 (diff)
downloademacs-5e0e5e3676bb46c303a4798c8e8a829f2e5343e4.tar.gz
emacs-5e0e5e3676bb46c303a4798c8e8a829f2e5343e4.zip
org-ctags.el (org-ctags-new-topic-template): Fix the option default value back again.
This option was changed by error in this commit: http://git.savannah.gnu.org/cgit/emacs.git/diff/lisp/org/org-protocol.el?h=emacs-24&id=0fc749f9 I first overwrote this change by error, then backported it into Org git repo, then backported the error back into Emacs. This is now fixed.
-rw-r--r--lisp/org/ChangeLog5
-rw-r--r--lisp/org/org-ctags.el2
2 files changed, 1 insertions, 6 deletions
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 6af0e9bf6b9..1f4c1f90997 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -16,11 +16,6 @@
16 16
17 * org-faces.el (org-date-selected): Fix docstring. 17 * org-faces.el (org-date-selected): Fix docstring.
18 18
192012-04-26 Bastien Guerry <bzg@gnu.org>
20
21 * org-ctags.el (org-ctags-new-topic-template): Remove * character
22 in front of variable docstring.
23
242012-04-26 Nicolas Goaziou <n.goaziou@gmail.com> 192012-04-26 Nicolas Goaziou <n.goaziou@gmail.com>
25 20
26 * org-list.el (org-list-struct-indent): Follow 21 * org-list.el (org-list-struct-indent): Follow
diff --git a/lisp/org/org-ctags.el b/lisp/org/org-ctags.el
index 5874646ff48..48656190a0c 100644
--- a/lisp/org/org-ctags.el
+++ b/lisp/org/org-ctags.el
@@ -188,7 +188,7 @@ See the ctags documentation for more information.")
188Created as a local variable in each buffer.") 188Created as a local variable in each buffer.")
189 189
190(defcustom org-ctags-new-topic-template 190(defcustom org-ctags-new-topic-template
191 "<<%t>>\n\n\n\n\n\n" 191 "* <<%t>>\n\n\n\n\n\n"
192 "Text to insert when creating a new org file via opening a hyperlink. 192 "Text to insert when creating a new org file via opening a hyperlink.
193The following patterns are replaced in the string: 193The following patterns are replaced in the string:
194 `%t' - replaced with the capitalized title of the hyperlink" 194 `%t' - replaced with the capitalized title of the hyperlink"