aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/vc-hooks.el13
1 files changed, 10 insertions, 3 deletions
diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index 1354d442e26..d0c444d2d91 100644
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -6,7 +6,7 @@
6;; Author: FSF (see vc.el for full credits) 6;; Author: FSF (see vc.el for full credits)
7;; Maintainer: Andre Spiegel <spiegel@gnu.org> 7;; Maintainer: Andre Spiegel <spiegel@gnu.org>
8 8
9;; $Id: vc-hooks.el,v 1.160 2003/09/01 15:45:17 miles Exp $ 9;; $Id: vc-hooks.el,v 1.161 2004/03/15 03:53:05 monnier Exp $
10 10
11;; This file is part of GNU Emacs. 11;; This file is part of GNU Emacs.
12 12
@@ -463,8 +463,15 @@ and does not employ any heuristic at all."
463(defun vc-default-workfile-unchanged-p (backend file) 463(defun vc-default-workfile-unchanged-p (backend file)
464 "Check if FILE is unchanged by diffing against the master version. 464 "Check if FILE is unchanged by diffing against the master version.
465Return non-nil if FILE is unchanged." 465Return non-nil if FILE is unchanged."
466 ;; If rev1 is nil, `diff' uses the current workfile version. 466 (let ((diff-args-length
467 (zerop (vc-call diff file))) 467 (length (cadr (symbol-function
468 (vc-find-backend-function backend 'diff))))))
469 (zerop (if (> diff-args-length 4)
470 ;; If the implementation supports it, let the output
471 ;; go to *vc*, not *vc-diff*, since this is an internal call.
472 (vc-call diff file nil nil "*vc*")
473 ;; for backward compatibility
474 (vc-call diff file)))))
468 475
469(defun vc-workfile-version (file) 476(defun vc-workfile-version (file)
470 "Return the version level of the current workfile FILE. 477 "Return the version level of the current workfile FILE.