diff options
| author | Karoly Lorentey | 2005-06-15 12:57:51 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2005-06-15 12:57:51 +0000 |
| commit | ef85512e51f043d73788f00a2aed13cccde0682c (patch) | |
| tree | fc1fa1378533250f260ef8eaa9a84ae882d9df84 /lisp/bindings.el | |
| parent | 8736257554f49445f7b4402ac7a9436b38ce6452 (diff) | |
| parent | ef88a9999004e6c26148c8d280d6a41f623d7249 (diff) | |
| download | emacs-ef85512e51f043d73788f00a2aed13cccde0682c.tar.gz emacs-ef85512e51f043d73788f00a2aed13cccde0682c.zip | |
Merged from miles@gnu.org--gnu-2005 (patch 80-82, 350-422)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-350
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-351
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-352
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-353
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-354
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-355
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-356
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-357
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-358
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-359
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-360
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-361
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-362
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-363
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-364
Remove "-face" suffix from widget faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-365
Remove "-face" suffix from custom faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-366
Remove "-face" suffix from change-log faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-367
Remove "-face" suffix from compilation faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Remove "-face" suffix from diff-mode faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-369
lisp/longlines.el (longlines-visible-face): Face removed
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-370
Remove "-face" suffix from woman faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-371
Remove "-face" suffix from whitespace-highlight face
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-372
Remove "-face" suffix from ruler-mode faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-373
Remove "-face" suffix from show-paren faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-374
Remove "-face" suffix from log-view faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-375
Remove "-face" suffix from smerge faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-376
Remove "-face" suffix from show-tabs faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-377
Remove "-face" suffix from highlight-changes faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-378
Remove "-face" suffix from and downcase info faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-379
Remove "-face" suffix from pcvs faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-380
Update uses of renamed pcvs faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-381
Tweak ChangeLog
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-382
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-383
Remove "-face" suffix from strokes-char face
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-384
Remove "-face" suffix from compare-windows face
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-385
Remove "-face" suffix from calendar faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-386
Remove "-face" suffix from diary-button face
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-387
Remove "-face" suffix from testcover faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-388
Remove "-face" suffix from viper faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-389
Remove "-face" suffix from org faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-390
Remove "-face" suffix from sgml-namespace face
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-391
Remove "-face" suffix from table-cell face
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-392
Remove "-face" suffix from tex-mode faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-393
Remove "-face" suffix from texinfo-heading face
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-394
Remove "-face" suffix from flyspell faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-395
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-396
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-397
Remove "-face" suffix from gomoku faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-398
Remove "-face" suffix from mpuz faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-399
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-400
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-401
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-402
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-403
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-404
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-405
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-406
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-407
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-408
Remove "-face" suffix from Buffer-menu-buffer face
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-409
Remove "-face" suffix from antlr-mode faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-410
Remove "-face" suffix from ebrowse faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-411
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-412
Remove "-face" suffix from flymake faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-413
Remove "-face" suffix from idlwave faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-414
Remove "-face" suffix from sh-script faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-415
Remove "-face" suffix from vhdl-mode faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-416
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-417
Remove "-face" suffix from which-func face
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-418
Remove "-face" suffix from cperl-mode faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-419
Remove "-face" suffix from ld-script faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-420
Fix cperl-mode font-lock problem
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-421
Tweak which-func face
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-422
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-80
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-81
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-82
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-350
Diffstat (limited to 'lisp/bindings.el')
| -rw-r--r-- | lisp/bindings.el | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/lisp/bindings.el b/lisp/bindings.el index 72f08057b34..31be3a1997f 100644 --- a/lisp/bindings.el +++ b/lisp/bindings.el | |||
| @@ -751,6 +751,7 @@ language you are using." | |||
| 751 | (define-key global-map [home] 'beginning-of-line) | 751 | (define-key global-map [home] 'beginning-of-line) |
| 752 | (define-key global-map [C-home] 'beginning-of-buffer) | 752 | (define-key global-map [C-home] 'beginning-of-buffer) |
| 753 | (define-key global-map [M-home] 'beginning-of-buffer-other-window) | 753 | (define-key global-map [M-home] 'beginning-of-buffer-other-window) |
| 754 | (define-key esc-map [home] 'beginning-of-buffer-other-window) | ||
| 754 | (define-key global-map [left] 'backward-char) | 755 | (define-key global-map [left] 'backward-char) |
| 755 | (define-key global-map [up] 'previous-line) | 756 | (define-key global-map [up] 'previous-line) |
| 756 | (define-key global-map [right] 'forward-char) | 757 | (define-key global-map [right] 'forward-char) |
| @@ -763,13 +764,17 @@ language you are using." | |||
| 763 | (put 'scroll-left 'disabled t) | 764 | (put 'scroll-left 'disabled t) |
| 764 | (define-key global-map [C-next] 'scroll-left) | 765 | (define-key global-map [C-next] 'scroll-left) |
| 765 | (define-key global-map [M-next] 'scroll-other-window) | 766 | (define-key global-map [M-next] 'scroll-other-window) |
| 767 | (define-key esc-map [next] 'scroll-other-window) | ||
| 766 | (define-key global-map [M-prior] 'scroll-other-window-down) | 768 | (define-key global-map [M-prior] 'scroll-other-window-down) |
| 769 | (define-key esc-map [prior] 'scroll-other-window-down) | ||
| 767 | (define-key esc-map [?\C-\S-v] 'scroll-other-window-down) | 770 | (define-key esc-map [?\C-\S-v] 'scroll-other-window-down) |
| 768 | (define-key global-map [end] 'end-of-line) | 771 | (define-key global-map [end] 'end-of-line) |
| 769 | (define-key global-map [C-end] 'end-of-buffer) | 772 | (define-key global-map [C-end] 'end-of-buffer) |
| 770 | (define-key global-map [M-end] 'end-of-buffer-other-window) | 773 | (define-key global-map [M-end] 'end-of-buffer-other-window) |
| 774 | (define-key esc-map [end] 'end-of-buffer-other-window) | ||
| 771 | (define-key global-map [begin] 'beginning-of-buffer) | 775 | (define-key global-map [begin] 'beginning-of-buffer) |
| 772 | (define-key global-map [M-begin] 'beginning-of-buffer-other-window) | 776 | (define-key global-map [M-begin] 'beginning-of-buffer-other-window) |
| 777 | (define-key esc-map [begin] 'beginning-of-buffer-other-window) | ||
| 773 | ;; (define-key global-map [select] 'function-key-error) | 778 | ;; (define-key global-map [select] 'function-key-error) |
| 774 | ;; (define-key global-map [print] 'function-key-error) | 779 | ;; (define-key global-map [print] 'function-key-error) |
| 775 | (define-key global-map [execute] 'execute-extended-command) | 780 | (define-key global-map [execute] 'execute-extended-command) |
| @@ -933,7 +938,9 @@ language you are using." | |||
| 933 | (define-key global-map "\C-c" 'mode-specific-command-prefix) | 938 | (define-key global-map "\C-c" 'mode-specific-command-prefix) |
| 934 | 939 | ||
| 935 | (global-set-key [M-right] 'forward-word) | 940 | (global-set-key [M-right] 'forward-word) |
| 941 | (define-key esc-map [right] 'forward-word) | ||
| 936 | (global-set-key [M-left] 'backward-word) | 942 | (global-set-key [M-left] 'backward-word) |
| 943 | (define-key esc-map [left] 'backward-word) | ||
| 937 | ;; ilya@math.ohio-state.edu says these bindings are standard on PC editors. | 944 | ;; ilya@math.ohio-state.edu says these bindings are standard on PC editors. |
| 938 | (global-set-key [C-right] 'forward-word) | 945 | (global-set-key [C-right] 'forward-word) |
| 939 | (global-set-key [C-left] 'backward-word) | 946 | (global-set-key [C-left] 'backward-word) |
| @@ -943,12 +950,18 @@ language you are using." | |||
| 943 | ;; This is "move to the clipboard", or as close as we come. | 950 | ;; This is "move to the clipboard", or as close as we come. |
| 944 | (global-set-key [S-delete] 'kill-region) | 951 | (global-set-key [S-delete] 'kill-region) |
| 945 | 952 | ||
| 946 | (global-set-key [C-M-left] 'backward-sexp) | 953 | (global-set-key [C-M-left] 'backward-sexp) |
| 947 | (global-set-key [C-M-right] 'forward-sexp) | 954 | (define-key esc-map [C-left] 'backward-sexp) |
| 948 | (global-set-key [C-M-up] 'backward-up-list) | 955 | (global-set-key [C-M-right] 'forward-sexp) |
| 949 | (global-set-key [C-M-down] 'down-list) | 956 | (define-key esc-map [C-right] 'forward-sexp) |
| 950 | (global-set-key [C-M-home] 'beginning-of-defun) | 957 | (global-set-key [C-M-up] 'backward-up-list) |
| 951 | (global-set-key [C-M-end] 'end-of-defun) | 958 | (define-key esc-map [C-up] 'backward-up-list) |
| 959 | (global-set-key [C-M-down] 'down-list) | ||
| 960 | (define-key esc-map [C-down] 'down-list) | ||
| 961 | (global-set-key [C-M-home] 'beginning-of-defun) | ||
| 962 | (define-key esc-map [C-home] 'beginning-of-defun) | ||
| 963 | (global-set-key [C-M-end] 'end-of-defun) | ||
| 964 | (define-key esc-map [C-end] 'end-of-defun) | ||
| 952 | 965 | ||
| 953 | (define-key esc-map "\C-f" 'forward-sexp) | 966 | (define-key esc-map "\C-f" 'forward-sexp) |
| 954 | (define-key esc-map "\C-b" 'backward-sexp) | 967 | (define-key esc-map "\C-b" 'backward-sexp) |