[Emacs-diffs] /srv/bzr/emacs/trunk r110251: Revert bogus vc autoloads change

[Glenn Morris]

------------------------------------------------------------
revno: 110251
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2012-09-29 12:19:17 -0700
message:
  Revert bogus vc autoloads change
modified:
  lisp/ChangeLog
  lisp/vc/vc-rcs.el
  lisp/vc/vc-sccs.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-09-29 18:28:01 +0000
+++ b/lisp/ChangeLog    2012-09-29 19:19:17 +0000
@@ -1,8 +1,5 @@
 2012-09-29  Glenn Morris  <address@hidden>
 
-       * 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)

=== modified file 'lisp/vc/vc-rcs.el'
--- a/lisp/vc/vc-rcs.el 2012-09-29 18:28:01 +0000
+++ b/lisp/vc/vc-rcs.el 2012-09-29 19:19:17 +0000
@@ -89,7 +89,9 @@
   :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"

=== modified file 'lisp/vc/vc-sccs.el'
--- a/lisp/vc/vc-sccs.el        2012-09-29 18:28:01 +0000
+++ b/lisp/vc/vc-sccs.el        2012-09-29 19:19:17 +0000
@@ -74,8 +74,9 @@
   :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"