Mercurial > emacs

changeset 33636:2c1708b98891

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(vc-rcs-state): Before calling vc-workfile-unchanged-p, require vc.
author André Spiegel <spiegel@gnu.org>
date Mon, 20 Nov 2000 14:14:25 +0000
parents 6242368d9e4c
children 6cab2125de9c
files lisp/vc-rcs.el
diffstat 1 files changed, 9 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/vc-rcs.el	Mon Nov 20 14:07:03 2000 +0000
+++ b/lisp/vc-rcs.el	Mon Nov 20 14:14:25 2000 +0000
@@ -5,7 +5,7 @@
 ;; Author:     FSF (see vc.el for full credits)
 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
 
-;; $Id: vc-rcs.el,v 1.12 2000/11/16 18:13:16 spiegel Exp $
+;; $Id: vc-rcs.el,v 1.13 2000/11/19 09:46:04 spiegel Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -123,13 +123,14 @@
          (vc-rcs-fetch-master-state file
                                     (vc-file-getprop file
                                                      'vc-workfile-version))))
-    (if (eq state 'up-to-date)
-        (if (vc-workfile-unchanged-p file)
-            'up-to-date
-          (if (eq (vc-checkout-model file) 'locking)
-              'unlocked-changes
-            'edited))
-      state)))
+    (if (not (eq state 'up-to-date))
+        state
+      (require 'vc)
+      (if (vc-workfile-unchanged-p file)
+          'up-to-date
+        (if (eq (vc-checkout-model file) 'locking)
+            'unlocked-changes
+          'edited)))))
 
 (defun vc-rcs-state-heuristic (file)
   "State heuristic for RCS."