From: Dave Love <fx@gnu.org>
Date: Sun, 8 Oct 2000 16:31:12 +0000 (+0000)
Subject: (vcursor-cs-binding): Remove compatibility code.
X-Git-Tag: emacs-pretest-21.0.90~1039
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=df003ee6abf255660c89a9f9ae9848b0feb54b4b;p=emacs.git

(vcursor-cs-binding): Remove compatibility code.
Clean up remainder.
---

diff --git a/lisp/vcursor.el b/lisp/vcursor.el
index 386f2d2959f..3c7afbb5b0b 100644
--- a/lisp/vcursor.el
+++ b/lisp/vcursor.el
@@ -39,7 +39,6 @@
 ;;   or t), which means that copying from the vcursor will be turned
 ;;   off after any operation not involving the vcursor, but the
 ;;   vcursor itself will be left alone.
-;; - should now work unmodified under XEmacs
 ;; - works on dumb terminals with Emacs 19.29 and later
 ;; - new keymap vcursor-map for binding to a prefix key
 ;; - vcursor-compare-windows substantially improved
@@ -344,14 +343,11 @@ disable the vcursor."
   :group 'vcursor)
 
 ;; Needed for defcustom, must be up here
-(if (not (string-match "XEmacs" emacs-version))
-    (defun vcursor-cs-binding (base &optional meta)
-      (read (concat "[" (if meta "M-" "") "C-S-" base "]")))
-  (require 'overlay)
-  (defun vcursor-cs-binding (base &optional meta)
-    (read (concat "[(" (if meta "meta " "") "control shift "
-		  base ")]")))
-  )
+(defun vcursor-cs-binding (base &optional meta)
+  (vector (let ((key (list 'control 'shift (intern base))))
+	    (if meta
+		(cons 'meta key)
+	      key))))
 
 (defun vcursor-bind-keys (var value)
   "Alter the value of the variable VAR to VALUE, binding keys as required.
@@ -563,7 +559,6 @@ If that's disabled, don't go anywhere but don't complain."
   (and (overlayp vcursor-overlay)
        (overlay-buffer vcursor-overlay)
        (set-buffer (overlay-buffer vcursor-overlay))
-       (overlay-start vcursor-overlay)	; needed for XEmacs
        (goto-char (overlay-start vcursor-overlay)))
   )