diff options
| -rw-r--r-- | lisp/ediff.el | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lisp/ediff.el b/lisp/ediff.el index d1a77115548..1d1da6a1930 100644 --- a/lisp/ediff.el +++ b/lisp/ediff.el | |||
| @@ -1691,7 +1691,7 @@ rcs.el and want to use it instead of the standard vc.el. | |||
| 1691 | Note: both packages provide access to RCS, but only vc.el comes with Emacs | 1691 | Note: both packages provide access to RCS, but only vc.el comes with Emacs |
| 1692 | distribution.") | 1692 | distribution.") |
| 1693 | 1693 | ||
| 1694 | (defvar ediff-revision-key "=" | 1694 | (defvar ediff-revision-key nil |
| 1695 | "Key to which `ediff-revision' is to be bound.") | 1695 | "Key to which `ediff-revision' is to be bound.") |
| 1696 | 1696 | ||
| 1697 | (defvar ediff-use-last-dir nil | 1697 | (defvar ediff-use-last-dir nil |
| @@ -2556,11 +2556,12 @@ and `ediff-revision-key' for customization."))) | |||
| 2556 | (progn | 2556 | (progn |
| 2557 | (message "") ; kill the message from `locate-library' | 2557 | (message "") ; kill the message from `locate-library' |
| 2558 | (require ediff-version-control-package) | 2558 | (require ediff-version-control-package) |
| 2559 | (define-key | 2559 | (if ediff-revision-key |
| 2560 | (cond ((eq ediff-version-control-package 'vc) vc-prefix-map) | 2560 | (define-key |
| 2561 | ((eq ediff-version-control-package 'rcs) global-map) | 2561 | (cond ((eq ediff-version-control-package 'vc) vc-prefix-map) |
| 2562 | (t global-map)) | 2562 | ((eq ediff-version-control-package 'rcs) global-map) |
| 2563 | ediff-revision-key 'ediff-revision)) | 2563 | (t global-map)) |
| 2564 | ediff-revision-key 'ediff-revision))) | ||
| 2564 | (or silent | 2565 | (or silent |
| 2565 | (error "Version control package %S.el not found. Use vc.el instead" | 2566 | (error "Version control package %S.el not found. Use vc.el instead" |
| 2566 | ediff-version-control-package))))) | 2567 | ediff-version-control-package))))) |