comparison lisp/keydefs.el @ 4408:8bbabcab2c42

Merge.
author Aidan Kehoe <kehoea@parhasard.net>
date Sun, 20 Jan 2008 13:09:58 +0100
parents 9e28067e3083
children 308d34e9f07d
comparison
equal deleted inserted replaced
4407:4ee73bbe4f8e 4408:8bbabcab2c42
618 (define-key global-map 'delete 'backward-or-forward-delete-char) 618 (define-key global-map 'delete 'backward-or-forward-delete-char)
619 (define-key global-map '(control delete) 'backward-or-forward-kill-word) 619 (define-key global-map '(control delete) 'backward-or-forward-kill-word)
620 (define-key global-map '(meta delete) 'backward-or-forward-kill-word) 620 (define-key global-map '(meta delete) 'backward-or-forward-kill-word)
621 (define-key global-map [(control x) (delete)] 621 (define-key global-map [(control x) (delete)]
622 'backward-or-forward-kill-sentence) 622 'backward-or-forward-kill-sentence)
623 (define-key global-map '(shift delete) 'kill-primary-selection)
624
623 (define-key global-map 'kp-delete 'backward-or-forward-delete-char) 625 (define-key global-map 'kp-delete 'backward-or-forward-delete-char)
624 (define-key global-map '(control kp-delete) 'backward-or-forward-kill-word) 626 (define-key global-map '(control kp-delete) 'backward-or-forward-kill-word)
625 (define-key global-map '(meta kp-delete) 'backward-or-forward-kill-word) 627 (define-key global-map '(meta kp-delete) 'backward-or-forward-kill-word)
626 (define-key global-map [(control x) (kp-delete)] 628 (define-key global-map [(control x) (kp-delete)]
627 'backward-or-forward-kill-sentence) 629 'backward-or-forward-kill-sentence)
630
631 (define-key global-map '(shift kp-delete) 'kill-primary-selection)
628 632
629 ;; don't try this one at home, kids. 633 ;; don't try this one at home, kids.
630 (define-key global-map '(control meta delete) 'backward-or-forward-kill-sexp) 634 (define-key global-map '(control meta delete) 'backward-or-forward-kill-sexp)
631 (define-key global-map '(control meta kp-delete) 'backward-or-forward-kill-sexp) 635 (define-key global-map '(control meta kp-delete) 'backward-or-forward-kill-sexp)
632 ;; or this one, either, on Linux. 636 ;; or this one, either, on Linux.