Mercurial > emacs

comparison lisp/vc-rcs.el @ 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 32bcc6e27e02
children 1b45907ef7a8
comparison
equal deleted inserted replaced
33635:6242368d9e4c 33636:2c1708b98891
3 ;; Copyright (C) 1992,93,94,95,96,97,98,99,2000 Free Software Foundation, Inc. 3 ;; Copyright (C) 1992,93,94,95,96,97,98,99,2000 Free Software Foundation, Inc.
4 4
5 ;; Author: FSF (see vc.el for full credits) 5 ;; Author: FSF (see vc.el for full credits)
6 ;; Maintainer: Andre Spiegel <spiegel@gnu.org> 6 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
7 7
8 ;; $Id: vc-rcs.el,v 1.12 2000/11/16 18:13:16 spiegel Exp $ 8 ;; $Id: vc-rcs.el,v 1.13 2000/11/19 09:46:04 spiegel Exp $
9 9
10 ;; This file is part of GNU Emacs. 10 ;; This file is part of GNU Emacs.
11 11
12 ;; GNU Emacs is free software; you can redistribute it and/or modify 12 ;; GNU Emacs is free software; you can redistribute it and/or modify
13 ;; it under the terms of the GNU General Public License as published by 13 ;; it under the terms of the GNU General Public License as published by
121 ;; property is nil. vc-rcs-fetch-master-state knows how to 121 ;; property is nil. vc-rcs-fetch-master-state knows how to
122 ;; handle that. 122 ;; handle that.
123 (vc-rcs-fetch-master-state file 123 (vc-rcs-fetch-master-state file
124 (vc-file-getprop file 124 (vc-file-getprop file
125 'vc-workfile-version)))) 125 'vc-workfile-version))))
126 (if (eq state 'up-to-date) 126 (if (not (eq state 'up-to-date))
127 (if (vc-workfile-unchanged-p file) 127 state
128 'up-to-date 128 (require 'vc)
129 (if (eq (vc-checkout-model file) 'locking) 129 (if (vc-workfile-unchanged-p file)
130 'unlocked-changes 130 'up-to-date
131 'edited)) 131 (if (eq (vc-checkout-model file) 'locking)
132 state))) 132 'unlocked-changes
133 'edited)))))
133 134
134 (defun vc-rcs-state-heuristic (file) 135 (defun vc-rcs-state-heuristic (file)
135 "State heuristic for RCS." 136 "State heuristic for RCS."
136 (let (vc-rcs-headers-result) 137 (let (vc-rcs-headers-result)
137 (if (and vc-consult-headers 138 (if (and vc-consult-headers