*** empty log message ***

[gnu-emacs] / lisp / vc-sccs.el

diff --git a/lisp/vc-sccs.el b/lisp/vc-sccs.el
index eddc990a4f4b345048fa4d0c859bccd1e212850a..99737ae2c598dd6be995f7a22820d273a1f8d819 100644 (file)
--- a/lisp/vc-sccs.el
+++ b/lisp/vc-sccs.el
@@ -5,7 +5,7 @@
 ;; Author:     FSF (see vc.el for full credits)
 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
 
-;; $Id: vc-sccs.el,v 1.16 2002/10/08 15:35:03 monnier Exp $
+;; $Id: vc-sccs.el,v 1.19 2002/11/13 12:37:58 spiegel Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -88,8 +88,13 @@ For a description of possible values, see `vc-check-master-templates'."
 ;;; State-querying functions
 ;;;
 
-;;;###autoload
-(progn (defun vc-sccs-registered (f) (vc-default-registered 'SCCS f)))
+;;; The autoload cookie below places vc-sccs-registered directly into
+;;; loaddefs.el, so that vc-sccs.el does not need to be loaded for
+;;; every file that is visited.  The definition is repeated below
+;;; so that Help and etags can find it.
+
+;;;###autoload (defun vc-sccs-registered(f) (vc-default-registered 'SCCS f))
+(defun vc-sccs-registered (f) (vc-default-registered 'SCCS f))
 
 (defun vc-sccs-state (file)
   "SCCS-specific function to compute the version control state."
@@ -237,7 +242,9 @@ locked.  REV is the revision to check out."
          ;; the file in the right place.
          (setq default-directory (file-name-directory file))
 
-         (and rev (string= rev "") (setq rev nil))
+         (and rev (or (string= rev "") 
+                       (not (stringp rev)))
+               (setq rev nil))
          (apply 'vc-do-command nil 0 "get" (vc-name file)
                 (if editable "-e")
                 (and rev (concat "-r" (vc-sccs-lookup-triple file rev)))