diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-09-29 12:19:17 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-09-29 12:19:17 -0700 |
| commit | d2a54f135f49226ceb27b4caf3806af4ce84467b (patch) | |
| tree | 73ce6a04ee7a1ffdae119c90950c0454391e71b0 /lisp | |
| parent | 3ef6d50528bf31c40b0f5c5b4be9f871d8d7e392 (diff) | |
| download | emacs-d2a54f135f49226ceb27b4caf3806af4ce84467b.tar.gz | |
Revert bogus vc autoloads change
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/vc/vc-rcs.el | 4 | ||||
| -rw-r--r-- | lisp/vc/vc-sccs.el | 3 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bb9d19c0862..072fb1bd1f4 100644 --- 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 083089834a0..ecd7b826437 100644 --- 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 d283425a976..a34222f7236 100644 --- 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" |