From 2923922f5ec17c2ccd38d7d7c7d3d98de357443d Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 29 Sep 2012 11:28:01 -0700 Subject: [PATCH] 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. --- lisp/ChangeLog | 9 ++++++--- lisp/vc/vc-rcs.el | 4 +--- lisp/vc/vc-sccs.el | 3 +-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 048966a6061..bb9d19c0862 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,17 +1,20 @@ 2012-09-29 Glenn Morris - * 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. diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el index ecd7b826437..083089834a0 100644 --- a/lisp/vc/vc-rcs.el +++ b/lisp/vc/vc-rcs.el @@ -89,9 +89,7 @@ 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) -;;;###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" diff --git a/lisp/vc/vc-sccs.el b/lisp/vc/vc-sccs.el index a34222f7236..d283425a976 100644 --- a/lisp/vc/vc-sccs.el +++ b/lisp/vc/vc-sccs.el @@ -74,9 +74,8 @@ 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 - (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" -- 2.39.2