From: Carsten Dominik <carsten.dominik@gmail.com>
Date: Fri, 12 Nov 2010 22:34:06 +0000 (-0600)
Subject: Remove autoload for org-capture-templates
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~265
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=12517c7b716a5ac196c7b1747dffc8b5a6320ae8;p=emacs.git

Remove autoload for org-capture-templates
---

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 @@
 2010-11-12  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org-capture.el (org-capture-templates): Remove autoload from
+	defcustom.
+
 	* ob-lisp.el (slime): Don't expect slime to be present.
 
 2010-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 @@
   :tag "Org Capture"
   :group 'org)
 
-;;;###autoload
 (defcustom org-capture-templates nil
   "Templates for the creation of new entries.