Revert bogus vc autoloads change

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bb9d19c0862d6b929140c91781aae61d4ce59411..072fb1bd1f41ec4c573dfbc7618516fe577e8022 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,5 @@
 2012-09-29  Glenn Morris  <rgm@gnu.org>
 
-       * vc/vc-rcs.el (vc-rcs-master-templates):
-       * vc/vc-sccs.el (vc-sccs-master-templates): No need to autoload.
-
        * help-macro.el (three-step-help): No need to autoload defcustom.
 
        * progmodes/inf-lisp.el (inferior-lisp-filter-regexp)

diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el
index 083089834a036f9640bbd86842a3cb2d922c4089..ecd7b826437fbd5a34170bf9abdd55d63b0fc1e5 100644 (file)
--- a/lisp/vc/vc-rcs.el
+++ b/lisp/vc/vc-rcs.el
@@ -89,7 +89,9 @@ to use --brief and sets this variable to remember whether it worked."
   :type '(choice (const :tag "Work out" nil) (const yes) (const no))
   :group 'vc-rcs)
 
-(defcustom vc-rcs-master-templates '("%sRCS/%s,v" "%s%s,v" "%sRCS/%s")
+;;;###autoload
+(defcustom vc-rcs-master-templates
+  (purecopy '("%sRCS/%s,v" "%s%s,v" "%sRCS/%s"))
   "Where to look for RCS master files.
 For a description of possible values, see `vc-check-master-templates'."
   :type '(choice (const :tag "Use standard RCS file names"

diff --git a/lisp/vc/vc-sccs.el b/lisp/vc/vc-sccs.el
index d283425a97622b291a69b3e1e92222250092c229..a34222f72369239de626f4e9f25ba705757c6d88 100644 (file)
--- a/lisp/vc/vc-sccs.el
+++ b/lisp/vc/vc-sccs.el
@@ -74,8 +74,9 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
   :version "24.1"     ; no longer consult the obsolete vc-header-alist
   :group 'vc-sccs)
 
+;;;###autoload
 (defcustom vc-sccs-master-templates
-  '("%sSCCS/s.%s" "%ss.%s" vc-sccs-search-project-dir)
+  (purecopy '("%sSCCS/s.%s" "%ss.%s" vc-sccs-search-project-dir))
   "Where to look for SCCS master files.
 For a description of possible values, see `vc-check-master-templates'."
   :type '(choice (const :tag "Use standard SCCS file names"