aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Dominik2010-11-12 16:34:06 -0600
committerCarsten Dominik2010-11-12 16:34:06 -0600
commit12517c7b716a5ac196c7b1747dffc8b5a6320ae8 (patch)
treec13dac933c3e6932a678d1022331a114d0eec24c
parent78835dd0546b7c724e82826b7a0897f9497e6ad4 (diff)
downloademacs-12517c7b716a5ac196c7b1747dffc8b5a6320ae8.tar.gz
emacs-12517c7b716a5ac196c7b1747dffc8b5a6320ae8.zip
Remove autoload for org-capture-templates
-rw-r--r--lisp/org/ChangeLog3
-rw-r--r--lisp/org/org-capture.el1
2 files changed, 3 insertions, 1 deletions
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index e1440fabd8b..e3495c9f30f 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,5 +1,8 @@
12010-11-12 Carsten Dominik <carsten.dominik@gmail.com> 12010-11-12 Carsten Dominik <carsten.dominik@gmail.com>
2 2
3 * org-capture.el (org-capture-templates): Remove autoload from
4 defcustom.
5
3 * ob-lisp.el (slime): Don't expect slime to be present. 6 * ob-lisp.el (slime): Don't expect slime to be present.
4 7
52010-11-11 Dan Davison <dandavison7@gmail.com> 82010-11-11 Dan Davison <dandavison7@gmail.com>
diff --git a/lisp/org/org-capture.el b/lisp/org/org-capture.el
index b463d29a389..2abe5c72bf6 100644
--- a/lisp/org/org-capture.el
+++ b/lisp/org/org-capture.el
@@ -76,7 +76,6 @@
76 :tag "Org Capture" 76 :tag "Org Capture"
77 :group 'org) 77 :group 'org)
78 78
79;;;###autoload
80(defcustom org-capture-templates nil 79(defcustom org-capture-templates nil
81 "Templates for the creation of new entries. 80 "Templates for the creation of new entries.
82 81