diff options
| author | Glenn Morris | 2012-09-29 11:28:01 -0700 |
|---|---|---|
| committer | Glenn Morris | 2012-09-29 11:28:01 -0700 |
| commit | 2923922f5ec17c2ccd38d7d7c7d3d98de357443d (patch) | |
| tree | d04c33127f2daa728780bcaad9685941baeffd6a | |
| parent | ced0838266516d9fb1b8a4576c077d0f710ff90c (diff) | |
| download | emacs-2923922f5ec17c2ccd38d7d7c7d3d98de357443d.tar.gz emacs-2923922f5ec17c2ccd38d7d7c7d3d98de357443d.zip | |
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.
| -rw-r--r-- | lisp/ChangeLog | 9 | ||||
| -rw-r--r-- | lisp/vc/vc-rcs.el | 4 | ||||
| -rw-r--r-- | 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 @@ | |||
| 1 | 2012-09-29 Glenn Morris <rgm@gnu.org> | 1 | 2012-09-29 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * help-macro.el (three-step-help): Do not autoload defcustom. | 3 | * vc/vc-rcs.el (vc-rcs-master-templates): |
| 4 | * vc/vc-sccs.el (vc-sccs-master-templates): No need to autoload. | ||
| 5 | |||
| 6 | * help-macro.el (three-step-help): No need to autoload defcustom. | ||
| 4 | 7 | ||
| 5 | * progmodes/inf-lisp.el (inferior-lisp-filter-regexp) | 8 | * progmodes/inf-lisp.el (inferior-lisp-filter-regexp) |
| 6 | (inferior-lisp-program, inferior-lisp-load-command) | 9 | (inferior-lisp-program, inferior-lisp-load-command) |
| 7 | (inferior-lisp-prompt, inferior-lisp-mode-hook): | 10 | (inferior-lisp-prompt, inferior-lisp-mode-hook): |
| 8 | Do not autoload defcustoms. | 11 | No need to autoload defcustoms. |
| 9 | 12 | ||
| 10 | * hippie-exp.el (hippie-expand-try-functions-list) | 13 | * hippie-exp.el (hippie-expand-try-functions-list) |
| 11 | (hippie-expand-verbose, hippie-expand-dabbrev-skip-space) | 14 | (hippie-expand-verbose, hippie-expand-dabbrev-skip-space) |
| 12 | (hippie-expand-dabbrev-as-symbol, hippie-expand-no-restriction) | 15 | (hippie-expand-dabbrev-as-symbol, hippie-expand-no-restriction) |
| 13 | (hippie-expand-max-buffers, hippie-expand-ignore-buffers) | 16 | (hippie-expand-max-buffers, hippie-expand-ignore-buffers) |
| 14 | (hippie-expand-only-buffers): Do not autoload defcustoms. | 17 | (hippie-expand-only-buffers): No need to autoload defcustoms. |
| 15 | * progmodes/vhdl-mode.el (vhdl-line-expand): | 18 | * progmodes/vhdl-mode.el (vhdl-line-expand): |
| 16 | Explicitly load hippie-exp, so it does not get autoloaded | 19 | Explicitly load hippie-exp, so it does not get autoloaded |
| 17 | while hippie-expand-try-functions-list is let-bound. | 20 | 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." | |||
| 89 | :type '(choice (const :tag "Work out" nil) (const yes) (const no)) | 89 | :type '(choice (const :tag "Work out" nil) (const yes) (const no)) |
| 90 | :group 'vc-rcs) | 90 | :group 'vc-rcs) |
| 91 | 91 | ||
| 92 | ;;;###autoload | 92 | (defcustom vc-rcs-master-templates '("%sRCS/%s,v" "%s%s,v" "%sRCS/%s") |
| 93 | (defcustom vc-rcs-master-templates | ||
| 94 | (purecopy '("%sRCS/%s,v" "%s%s,v" "%sRCS/%s")) | ||
| 95 | "Where to look for RCS master files. | 93 | "Where to look for RCS master files. |
| 96 | For a description of possible values, see `vc-check-master-templates'." | 94 | For a description of possible values, see `vc-check-master-templates'." |
| 97 | :type '(choice (const :tag "Use standard RCS file names" | 95 | :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." | |||
| 74 | :version "24.1" ; no longer consult the obsolete vc-header-alist | 74 | :version "24.1" ; no longer consult the obsolete vc-header-alist |
| 75 | :group 'vc-sccs) | 75 | :group 'vc-sccs) |
| 76 | 76 | ||
| 77 | ;;;###autoload | ||
| 78 | (defcustom vc-sccs-master-templates | 77 | (defcustom vc-sccs-master-templates |
| 79 | (purecopy '("%sSCCS/s.%s" "%ss.%s" vc-sccs-search-project-dir)) | 78 | '("%sSCCS/s.%s" "%ss.%s" vc-sccs-search-project-dir) |
| 80 | "Where to look for SCCS master files. | 79 | "Where to look for SCCS master files. |
| 81 | For a description of possible values, see `vc-check-master-templates'." | 80 | For a description of possible values, see `vc-check-master-templates'." |
| 82 | :type '(choice (const :tag "Use standard SCCS file names" | 81 | :type '(choice (const :tag "Use standard SCCS file names" |