comparison lisp/vc-rcs.el @ 56318:b9c0ed2a46bd

(vc-rcs-checkout-model): Look at the version headers only if vc-consult-headers is non-nil.
author André Spiegel <spiegel@gnu.org>
date Fri, 02 Jul 2004 07:26:21 +0000
parents 37e95eddf2e8
children 2cc3f5b16438 e8df1878cfd1 6f6e9fe4658b
comparison
equal deleted inserted replaced
56317:7d126dcf72aa 56318:b9c0ed2a46bd
3 ;; Copyright (C) 1992,93,94,95,96,97,98,99,2000,2001 Free Software Foundation, Inc. 3 ;; Copyright (C) 1992,93,94,95,96,97,98,99,2000,2001 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.38 2003/09/01 15:45:17 miles Exp $ 8 ;; $Id: vc-rcs.el,v 1.39 2004/03/21 15:46:23 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
196 (vc-insert-file (vc-name file) "^desc") 196 (vc-insert-file (vc-name file) "^desc")
197 (vc-rcs-find-most-recent-rev (vc-branch-part version)))))) 197 (vc-rcs-find-most-recent-rev (vc-branch-part version))))))
198 198
199 (defun vc-rcs-checkout-model (file) 199 (defun vc-rcs-checkout-model (file)
200 "RCS-specific version of `vc-checkout-model'." 200 "RCS-specific version of `vc-checkout-model'."
201 (vc-rcs-consult-headers file) 201 (let (result)
202 (or (vc-file-getprop file 'vc-checkout-model) 202 (when vc-consult-headers
203 (progn (vc-rcs-fetch-master-state file) 203 (vc-file-setprop file 'vc-checkout-model nil)
204 (vc-file-getprop file 'vc-checkout-model)))) 204 (vc-rcs-consult-headers file)
205 (setq result (vc-file-getprop file 'vc-checkout-model)))
206 (or result
207 (progn (vc-rcs-fetch-master-state file)
208 (vc-file-getprop file 'vc-checkout-model)))))
205 209
206 (defun vc-rcs-workfile-unchanged-p (file) 210 (defun vc-rcs-workfile-unchanged-p (file)
207 "RCS-specific implementation of vc-workfile-unchanged-p." 211 "RCS-specific implementation of vc-workfile-unchanged-p."
208 ;; Try to use rcsdiff --brief. If rcsdiff does not understand that, 212 ;; Try to use rcsdiff --brief. If rcsdiff does not understand that,
209 ;; do a double take and remember the fact for the future 213 ;; do a double take and remember the fact for the future