[Emacs-diffs] /srv/bzr/emacs/trunk r110249: No need to autoload vc-rcs, vc-sccs defcustoms.

[Glenn Morris]

------------------------------------------------------------
revno: 110249
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2012-09-29 11:28:01 -0700
message:
  No need to autoload vc-rcs, vc-sccs defcustoms.
  
  * lisp/vc/vc-rcs.el (vc-rcs-master-templates):
  * lisp/vc/vc-sccs.el (vc-sccs-master-templates): No need to autoload.
modified:
  lisp/ChangeLog
  lisp/vc/vc-rcs.el
  lisp/vc/vc-sccs.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-09-29 18:21:45 +0000
+++ b/lisp/ChangeLog    2012-09-29 18:28:01 +0000
@@ -1,17 +1,20 @@
 2012-09-29  Glenn Morris  <address@hidden>
 
-       * help-macro.el (three-step-help): Do not autoload defcustom.
+       * 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)
        (inferior-lisp-program, inferior-lisp-load-command)
        (inferior-lisp-prompt, inferior-lisp-mode-hook):
-       Do not autoload defcustoms.
+       No need to autoload defcustoms.
 
        * hippie-exp.el (hippie-expand-try-functions-list)
        (hippie-expand-verbose, hippie-expand-dabbrev-skip-space)
        (hippie-expand-dabbrev-as-symbol, hippie-expand-no-restriction)
        (hippie-expand-max-buffers, hippie-expand-ignore-buffers)
-       (hippie-expand-only-buffers): Do not autoload defcustoms.
+       (hippie-expand-only-buffers): No need to autoload defcustoms.
        * progmodes/vhdl-mode.el (vhdl-line-expand):
        Explicitly load hippie-exp, so it does not get autoloaded
        while hippie-expand-try-functions-list is let-bound.

=== modified file 'lisp/vc/vc-rcs.el'
--- a/lisp/vc/vc-rcs.el 2012-07-11 23:13:41 +0000
+++ b/lisp/vc/vc-rcs.el 2012-09-29 18:28:01 +0000
@@ -89,9 +89,7 @@
   :type '(choice (const :tag "Work out" nil) (const yes) (const no))
   :group 'vc-rcs)
 
-;;;###autoload
-(defcustom vc-rcs-master-templates
-  (purecopy '("%sRCS/%s,v" "%s%s,v" "%sRCS/%s"))
+(defcustom vc-rcs-master-templates '("%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-06-06 00:29:10 +0000
+++ b/lisp/vc/vc-sccs.el        2012-09-29 18:28:01 +0000
@@ -74,9 +74,8 @@
   :version "24.1"     ; no longer consult the obsolete vc-header-alist
   :group 'vc-sccs)
 
-;;;###autoload
 (defcustom vc-sccs-master-templates
-  (purecopy '("%sSCCS/s.%s" "%ss.%s" vc-sccs-search-project-dir))
+  '("%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"