Mercurial > emacs
changeset 11760:898ec89f5379
(ediff-revision-key): Default value nil.
(ediff-load-version-control): Don't remind any key if
ediff-revision-key is nil.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Mon, 08 May 1995 23:53:13 +0000 |
| parents | 51816af03215 |
| children | d110042c1d95 |
| files | lisp/ediff.el |
| diffstat | 1 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ediff.el Mon May 08 23:23:37 1995 +0000 +++ b/lisp/ediff.el Mon May 08 23:53:13 1995 +0000 @@ -1691,7 +1691,7 @@ Note: both packages provide access to RCS, but only vc.el comes with Emacs distribution.") -(defvar ediff-revision-key "=" +(defvar ediff-revision-key nil "Key to which `ediff-revision' is to be bound.") (defvar ediff-use-last-dir nil @@ -2556,11 +2556,12 @@ (progn (message "") ; kill the message from `locate-library' (require ediff-version-control-package) - (define-key - (cond ((eq ediff-version-control-package 'vc) vc-prefix-map) - ((eq ediff-version-control-package 'rcs) global-map) - (t global-map)) - ediff-revision-key 'ediff-revision)) + (if ediff-revision-key + (define-key + (cond ((eq ediff-version-control-package 'vc) vc-prefix-map) + ((eq ediff-version-control-package 'rcs) global-map) + (t global-map)) + ediff-revision-key 'ediff-revision))) (or silent (error "Version control package %S.el not found. Use vc.el instead" ediff-version-control-package)))))