aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/vc/vc-sccs.el13
2 files changed, 9 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 072fb1bd1f4..f567369b46b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12012-09-29 Glenn Morris <rgm@gnu.org> 12012-09-29 Glenn Morris <rgm@gnu.org>
2 2
3 * vc/vc-sccs.el (vc-sccs-registered): Use the progn trick to get
4 the full definition in loaddefs, rather than duplicating it.
5
3 * help-macro.el (three-step-help): No need to autoload defcustom. 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)
diff --git a/lisp/vc/vc-sccs.el b/lisp/vc/vc-sccs.el
index 82f30b509ff..026aab1c412 100644
--- a/lisp/vc/vc-sccs.el
+++ b/lisp/vc/vc-sccs.el
@@ -107,13 +107,12 @@ For a description of possible values, see `vc-check-master-templates'."
107;;; State-querying functions 107;;; State-querying functions
108;;; 108;;;
109 109
110;; The autoload cookie below places vc-sccs-registered directly into 110;; The autoload cookie below places vc-rcs-registered directly into
111;; loaddefs.el, so that vc-sccs.el does not need to be loaded for 111;; loaddefs.el, so that vc-rcs.el does not need to be loaded for
112;; every file that is visited. The definition is repeated below 112;; every file that is visited.
113;; so that Help and etags can find it. 113;;;###autoload
114 114(progn
115;;;###autoload (defun vc-sccs-registered(f) (vc-default-registered 'SCCS f)) 115(defun vc-sccs-registered (f) (vc-default-registered 'SCCS f)))
116(defun vc-sccs-registered (f) (vc-default-registered 'SCCS f))
117 116
118(defun vc-sccs-state (file) 117(defun vc-sccs-state (file)
119 "SCCS-specific function to compute the version control state." 118 "SCCS-specific function to compute the version control state."