From: Eli Zaretskii <eliz@gnu.org>
Date: Wed, 4 Apr 2001 14:09:12 +0000 (+0000)
Subject: (pc-selection-mode): Call normal-erase-is-backspace-mode instead of
X-Git-Tag: emacs-pretest-21.0.101~5
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=58e4f61d2053d5ed92e5cfe5d7ad4c41691ba2b2;p=emacs.git

(pc-selection-mode): Call normal-erase-is-backspace-mode instead of
binding keys individually.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d2671d2458a..87f312df997 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2001-04-04  Eli Zaretskii  <eliz@is.elta.co.il>
 
+	* emulation/pc-select.el (pc-selection-mode): Call
+	normal-erase-is-backspace-mode instead of binding keys
+	individually.
+
 	* cus-load.el (normal-erase-is-backspace): Use it instead of
 	delete-key-deletes-forward.
 
diff --git a/lisp/emulation/pc-select.el b/lisp/emulation/pc-select.el
index ec8e0a956b1..46299eefeaa 100644
--- a/lisp/emulation/pc-select.el
+++ b/lisp/emulation/pc-select.el
@@ -727,6 +727,10 @@ but before calling pc-selection-mode):
 
   (or pc-select-selection-keys-only
       (progn
+	;; We are behaving like normal-erase-is-backspace-mode, so
+	;; say so explicitly.
+	(setq-default normal-erase-is-backspace t)
+	(normal-erase-is-backspace-mode 1)
 	(define-key global-map [S-insert]  'yank)
 	(define-key global-map [C-insert]  'copy-region-as-kill)
 	(define-key global-map [S-delete]  'kill-region)
@@ -741,16 +745,13 @@ but before calling pc-selection-mode):
 
 	;; The following bindings are from Pete Forman.
 	(global-set-key [f6] 'other-window)	; KNextPane     F6
-	(global-set-key [delete] 'delete-char)	; KDelete       Del
 	(global-set-key [C-delete] 'kill-line)	; KEraseEndLine cDel
 	(global-set-key "\M-\d" 'undo)		; KUndo         aBS
 
-	;; The following bindings are taken from pc-mode.el
+	;; The following binding is taken from pc-mode.el
 	;; as suggested by RMS.
-	;; I only used the ones that are not covered above.
-	(define-key function-key-map  [M-delete] [?\M-d])
+	;; I only used the one that is not covered above.
 	(global-set-key [C-M-delete]  'kill-sexp)
-	(global-set-key [C-backspace] 'backward-kill-word)
 	;; Next line proposed by Eli Barzilay
 	(global-set-key [C-escape]    'electric-buffer-list)))
   ;;