aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2004-04-23 21:01:07 +0000
committerJuanma Barranquero2004-04-23 21:01:07 +0000
commit0d2ce4efca2baa742c3740a3d1c542ea7378d9c4 (patch)
tree041fb7866ea9efd993c7d9e746319b967a3a5cf3
parent6a84b1a2f5a7e7512799a49e0d2b7b1066c8036d (diff)
downloademacs-0d2ce4efca2baa742c3740a3d1c542ea7378d9c4.tar.gz
emacs-0d2ce4efca2baa742c3740a3d1c542ea7378d9c4.zip
(vc-default-workfile-unchanged-p): Fix code that handles
wrong-number-of-arguments in backend call.
-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 e7278dcd2fa..d6cd8208540 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.166 2004/04/11 15:03:21 spiegel Exp $ 9;; $Id: vc-hooks.el,v 1.167 2004/04/16 10:21:51 spiegel Exp $
10 10
11;; This file is part of GNU Emacs. 11;; This file is part of GNU Emacs.
12 12
@@ -44,8 +44,8 @@
44 "set `vc-handled-backends' to nil to disable VC.") 44 "set `vc-handled-backends' to nil to disable VC.")
45 45
46(defvar vc-master-templates ()) 46(defvar vc-master-templates ())
47(make-obsolete-variable 'vc-master-templates 47(make-obsolete-variable 'vc-master-templates
48 "to define master templates for a given BACKEND, use 48 "to define master templates for a given BACKEND, use
49vc-BACKEND-master-templates. To enable or disable VC for a given 49vc-BACKEND-master-templates. To enable or disable VC for a given
50BACKEND, use `vc-handled-backends'.") 50BACKEND, use `vc-handled-backends'.")
51 51
@@ -474,8 +474,8 @@ Return non-nil if FILE is unchanged."
474 (indirect-function 474 (indirect-function
475 (vc-find-backend-function (vc-backend file) 475 (vc-find-backend-function (vc-backend file)
476 'diff)))) 476 'diff))))
477 (not (eq (caddr err) 5))) 477 (not (eq (caddr err) 4)))
478 (signal 'wrong-number-of-arguments err) 478 (signal (car err) (cdr err))
479 (vc-call diff file)))))) 479 (vc-call diff file))))))
480 480
481(defun vc-workfile-version (file) 481(defun vc-workfile-version (file)