Mercurial > emacs
comparison lisp/vc-hooks.el @ 83099:9cb7ecf775c9
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-218
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-219
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-139
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Fri, 16 Apr 2004 13:36:07 +0000 |
parents | eb7e8d483840 08fcaad03634 |
children | 1a68e4b22355 |
comparison
equal
deleted
inserted
replaced
83098:0643dc72a250 | 83099:9cb7ecf775c9 |
---|---|
473 (if (or (not (eq (cadr err) | 473 (if (or (not (eq (cadr err) |
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) 5))) |
478 (signal wrong-number-of-arguments err) | 478 (signal 'wrong-number-of-arguments 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) |
482 "Return the version level of the current workfile FILE. | 482 "Return the version level of the current workfile FILE. |
483 If FILE is not registered, this function always returns nil." | 483 If FILE is not registered, this function always returns nil." |