This commit was generated by cvs2svn to compensate for changes in r5670,

[chise/xemacs-chise.git.1] / lisp / keydefs.el

diff --git a/lisp/keydefs.el b/lisp/keydefs.el
index 82652ea..b7296d0 100644 (file)
--- a/lisp/keydefs.el
+++ b/lisp/keydefs.el
@@ -156,6 +156,10 @@ Keymap for characters following C-c.")
 (define-key global-map (vector help-char) 'help-command)
 (define-key global-map 'help 'help-command)
 (define-key global-map 'f1 'help-command)
+;; This is a failsafe mechanism, esp. on TTY's, in case the terminal is
+;; somewhat broken and f1 keys can't work, and backspace is redefined to
+;; do backspace.
+(define-key global-map '(meta ??) 'help-command)
 
 ;; FSFmacs indent.el
 
@@ -238,7 +242,8 @@ Keymap for characters following C-c.")
 (define-key global-map '(control meta -) 'negative-argument)
 
 (define-key global-map "\C-k" 'kill-line)
-(define-key global-map '(control K) 'historical-kill-line)
+;will change like this in 21.5.
+;(define-key global-map "\M-k" 'kill-entire-line)
 (define-key global-map "\C-w" 'kill-region)
 (define-key global-map "\M-w" 'kill-ring-save)
 (define-key global-map "\M-\C-w" 'append-next-kill)
@@ -272,6 +277,10 @@ Keymap for characters following C-c.")
 (define-key global-map "\M-\C-t" 'transpose-sexps)
 (define-key global-map "\C-x\C-t" 'transpose-lines)
 
+;; XEmacs: much more reasonable and useful key definitions.
+(define-key global-map '(control T) 'transpose-line-down)
+(define-key global-map '(meta T) 'transpose-line-up)
+
 (define-key global-map "\M-;" 'indent-for-comment)
 (define-key global-map "\M-j" 'indent-new-comment-line)
 (define-key global-map "\M-\C-j" 'indent-new-comment-line)
@@ -328,9 +337,11 @@ Keymap for characters following C-c.")
 (define-key global-map "\C-xr+" 'increment-register)
 (define-key global-map "\C-xrc" 'clear-rectangle)
 (define-key global-map "\C-xrk" 'kill-rectangle)
+(define-key global-map "\C-xrd" 'delete-rectangle)
 (define-key global-map "\C-xry" 'yank-rectangle)
 (define-key global-map "\C-xro" 'open-rectangle)
 (define-key global-map "\C-xrt" 'string-rectangle)
+(define-key global-map "\C-xrp" 'replace-rectangle)
 (define-key global-map "\C-xrw" 'window-configuration-to-register)
 ;(define-key global-map "\C-xrf" 'frame-configuration-to-register)
 
@@ -348,6 +359,8 @@ Keymap for characters following C-c.")
 (define-key global-map "\M-a" 'backward-sentence)
 (define-key global-map "\M-e" 'forward-sentence)
 (define-key global-map "\M-k" 'kill-sentence)
+;will change like this in 21.5.
+;(define-key global-map "\M-K" 'kill-sentence)
 ;;(define-key global-map "\C-x\177" 'backward-kill-sentence)
 
 (define-key global-map "\C-x[" 'backward-page)
@@ -385,6 +398,7 @@ Keymap for characters following C-c.")
 ;; Default binding of "Control-h" is help.
 (define-key global-map 'backspace 'delete-backward-char)
 (define-key global-map '(meta backspace) 'backward-kill-word)
+(define-key global-map [(control x) backspace] 'backward-kill-sentence)
 
 (define-key global-map "\M-\C-z" 'activate-region)
 
@@ -549,24 +563,26 @@ Keymap for characters following C-c.")
 (define-key global-map '(control kp-down) 'forward-block-of-lines)
 
 ;; context-sensitive movement
-;; (meta control left/right) should be reserved for bindings that
-;; switch between buffers/web pages/etc.
 (define-key global-map '(meta left)    'backward-sexp)
 (define-key global-map '(meta right)   'forward-sexp)
-(define-key global-map '(meta up)      'backward-sentence)
-(define-key global-map '(meta down)    'forward-sentence)
-(define-key global-map '(meta control up) 'backward-paragraph)
-(define-key global-map '(meta control down) 'forward-paragraph)
+(define-key global-map '(meta up)      'backward-paragraph)
+(define-key global-map '(meta down)    'forward-paragraph)
+(define-key global-map '(meta control left) 'backward-sentence)
+(define-key global-map '(meta control right) 'forward-sentence)
+(define-key global-map '(meta control up) 'scroll-down-one)
+(define-key global-map '(meta control down) 'scroll-up-one)
 (define-key global-map '(meta control home)    'beginning-of-defun)
 (define-key global-map '(meta control end)     'end-of-defun)
 (define-key global-map '(meta control prior)   'backward-page)
 (define-key global-map '(meta control next)    'forward-page)
 (define-key global-map '(meta kp-left)  'backward-sexp)
 (define-key global-map '(meta kp-right) 'forward-sexp)
-(define-key global-map '(meta kp-up)   'backward-sentence)
-(define-key global-map '(meta kp-down) 'forward-sentence)
-(define-key global-map '(meta control kp-up) 'backward-paragraph)
-(define-key global-map '(meta control kp-down) 'forward-paragraph)
+(define-key global-map '(meta kp-up)   'backward-paragraph)
+(define-key global-map '(meta kp-down) 'forward-paragraph)
+(define-key global-map '(meta control kp-left) 'backward-sentence)
+(define-key global-map '(meta control kp-right) 'forward-sentence)
+(define-key global-map '(meta control kp-up) 'scroll-down-one)
+(define-key global-map '(meta control kp-down) 'scroll-up-one)
 (define-key global-map '(meta control kp-home) 'beginning-of-defun)
 (define-key global-map '(meta control kp-end)  'end-of-defun)
 (define-key global-map '(meta control kp-prior)        'backward-page)