[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/vc-rcs.el [emacs-unicode-2]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/vc-rcs.el [emacs-unicode-2] |
Date: |
Mon, 05 Jul 2004 23:00:44 -0400 |
Index: emacs/lisp/vc-rcs.el
diff -c emacs/lisp/vc-rcs.el:1.37.4.1 emacs/lisp/vc-rcs.el:1.37.4.2
*** emacs/lisp/vc-rcs.el:1.37.4.1 Fri Apr 16 12:50:10 2004
--- emacs/lisp/vc-rcs.el Tue Jul 6 02:56:10 2004
***************
*** 5,11 ****
;; Author: FSF (see vc.el for full credits)
;; Maintainer: Andre Spiegel <address@hidden>
! ;; $Id: vc-rcs.el,v 1.37.4.1 2004/04/16 12:50:10 handa Exp $
;; This file is part of GNU Emacs.
--- 5,11 ----
;; Author: FSF (see vc.el for full credits)
;; Maintainer: Andre Spiegel <address@hidden>
! ;; $Id: vc-rcs.el,v 1.37.4.2 2004/07/06 02:56:10 miles Exp $
;; This file is part of GNU Emacs.
***************
*** 198,207 ****
(defun vc-rcs-checkout-model (file)
"RCS-specific version of `vc-checkout-model'."
! (vc-rcs-consult-headers file)
! (or (vc-file-getprop file 'vc-checkout-model)
! (progn (vc-rcs-fetch-master-state file)
! (vc-file-getprop file 'vc-checkout-model))))
(defun vc-rcs-workfile-unchanged-p (file)
"RCS-specific implementation of vc-workfile-unchanged-p."
--- 198,211 ----
(defun vc-rcs-checkout-model (file)
"RCS-specific version of `vc-checkout-model'."
! (let (result)
! (when vc-consult-headers
! (vc-file-setprop file 'vc-checkout-model nil)
! (vc-rcs-consult-headers file)
! (setq result (vc-file-getprop file 'vc-checkout-model)))
! (or result
! (progn (vc-rcs-fetch-master-state file)
! (vc-file-getprop file 'vc-checkout-model)))))
(defun vc-rcs-workfile-unchanged-p (file)
"RCS-specific implementation of vc-workfile-unchanged-p."
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/vc-rcs.el [emacs-unicode-2],
Miles Bader <=