From: Richard M. Stallman <rms@gnu.org>
Date: Mon, 8 May 1995 23:53:13 +0000 (+0000)
Subject: (ediff-revision-key): Default value nil.
X-Git-Tag: emacs-19.34~4098
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d8e54b47e612f215c26ff0d2bacd5f4feb523db9;p=emacs.git

(ediff-revision-key): Default value nil.
(ediff-load-version-control): Don't remind any key if
ediff-revision-key is nil.
---

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.
 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 @@ and `ediff-revision-key' for customization.")))
 	  (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)))))