summaryrefslogtreecommitdiff
path: root/lisp/vc-hooks.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/vc-hooks.el')
-rw-r--r--lisp/vc-hooks.el10
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index 80b9766caa0..3f5a46c5bea 100644
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -6,7 +6,7 @@
;; Author: FSF (see vc.el for full credits)
;; Maintainer: Andre Spiegel <spiegel@gnu.org>
-;; $Id: vc-hooks.el,v 1.165 2004/03/28 17:38:03 monnier Exp $
+;; $Id$
;; This file is part of GNU Emacs.
@@ -44,8 +44,8 @@
"set `vc-handled-backends' to nil to disable VC.")
(defvar vc-master-templates ())
-(make-obsolete-variable 'vc-master-templates
- "to define master templates for a given BACKEND, use
+(make-obsolete-variable 'vc-master-templates
+ "to define master templates for a given BACKEND, use
vc-BACKEND-master-templates. To enable or disable VC for a given
BACKEND, use `vc-handled-backends'.")
@@ -474,8 +474,8 @@ Return non-nil if FILE is unchanged."
(indirect-function
(vc-find-backend-function (vc-backend file)
'diff))))
- (not (eq (caddr err) 5)))
- (signal wrong-number-of-arguments err)
+ (not (eq (caddr err) 4)))
+ (signal (car err) (cdr err))
(vc-call diff file))))))
(defun vc-workfile-version (file)