diff options
| author | Juanma Barranquero | 2004-04-23 21:03:21 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2004-04-23 21:03:21 +0000 |
| commit | 4b284383bb198e1c5ea311431bdc46947b4a46ef (patch) | |
| tree | cd6d07633f959864e090d78cb1e7c68e06f643eb | |
| parent | 0d2ce4efca2baa742c3740a3d1c542ea7378d9c4 (diff) | |
| download | emacs-4b284383bb198e1c5ea311431bdc46947b4a46ef.tar.gz emacs-4b284383bb198e1c5ea311431bdc46947b4a46ef.zip | |
(vc-print-log): Fix code that handles wrong-number-of-arguments in backend
call.
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/vc.el | 8 |
2 files changed, 11 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9d0215df2e4..802c4f780db 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2004-04-23 Andre Spiegel <spiegel@gnu.org> | ||
| 2 | |||
| 3 | * vc-hooks.el (vc-default-workfile-unchanged-p): Fix code that | ||
| 4 | handles wrong-number-of-arguments in backend call. | ||
| 5 | |||
| 6 | * vc.el (vc-print-log): Likewise. | ||
| 7 | |||
| 1 | 2004-04-23 Kenichi Handa <handa@m17n.org> | 8 | 2004-04-23 Kenichi Handa <handa@m17n.org> |
| 2 | 9 | ||
| 3 | * international/mule-util.el (char-displayable-p): Simplified by | 10 | * international/mule-util.el (char-displayable-p): Simplified by |
diff --git a/lisp/vc.el b/lisp/vc.el index 676b6bd6b88..f48cbe20b1c 100644 --- a/lisp/vc.el +++ b/lisp/vc.el | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | ;; Maintainer: Andre Spiegel <spiegel@gnu.org> | 7 | ;; Maintainer: Andre Spiegel <spiegel@gnu.org> |
| 8 | ;; Keywords: tools | 8 | ;; Keywords: tools |
| 9 | 9 | ||
| 10 | ;; $Id: vc.el,v 1.375 2004/04/11 15:05:18 spiegel Exp $ | 10 | ;; $Id: vc.el,v 1.376 2004/04/16 10:21:24 spiegel Exp $ |
| 11 | 11 | ||
| 12 | ;; This file is part of GNU Emacs. | 12 | ;; This file is part of GNU Emacs. |
| 13 | 13 | ||
| @@ -2357,11 +2357,11 @@ If FOCUS-REV is non-nil, leave the point at that revision." | |||
| 2357 | ;; without the optional buffer argument (for backward compatibility). | 2357 | ;; without the optional buffer argument (for backward compatibility). |
| 2358 | ;; Otherwise, resignal. | 2358 | ;; Otherwise, resignal. |
| 2359 | (if (or (not (eq (cadr err) | 2359 | (if (or (not (eq (cadr err) |
| 2360 | (indirect-function | 2360 | (indirect-function |
| 2361 | (vc-find-backend-function (vc-backend file) | 2361 | (vc-find-backend-function (vc-backend file) |
| 2362 | 'print-log)))) | 2362 | 'print-log)))) |
| 2363 | (not (eq (caddr err) 2))) | 2363 | (not (eq (caddr err) 2))) |
| 2364 | (signal 'wrong-number-of-arguments err) | 2364 | (signal (car err) (cdr err)) |
| 2365 | ;; for backward compatibility | 2365 | ;; for backward compatibility |
| 2366 | (vc-call print-log file) | 2366 | (vc-call print-log file) |
| 2367 | (set-buffer "*vc*")))) | 2367 | (set-buffer "*vc*")))) |