3 files changed, 27 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 401e8b5bdb4..35f1ab21a13 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-11  Andreas Schwab  <schwab@suse.de>
+
+        * bindings.el: Add binding of `ESC functionkey' for every
+        `M-functionkey'.
+        * hexl.el (hexl-mode-map): Likewise.
+
 2005-06-10  Michael Hotchin  <michael@hotchin.net>  (tiny change)
 
         * progmodes/compile.el (compilation-error-regexp-alist-alist)
diff --git a/lisp/bindings.el b/lisp/bindings.el
index 4781f8dfa59..f9ca0f02b3f 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -751,6 +751,7 @@ language you are using."
 (define-key global-map [home]           'beginning-of-line)
 (define-key global-map [C-home]         'beginning-of-buffer)
 (define-key global-map [M-home]         'beginning-of-buffer-other-window)
+(define-key esc-map    [home]           'beginning-of-buffer-other-window)
 (define-key global-map [left]           'backward-char)
 (define-key global-map [up]             'previous-line)
 (define-key global-map [right]          'forward-char)
@@ -763,13 +764,17 @@ language you are using."
 (put 'scroll-left 'disabled t)
 (define-key global-map [C-next]         'scroll-left)
 (define-key global-map [M-next]         'scroll-other-window)
+(define-key esc-map    [next]           'scroll-other-window)
 (define-key global-map [M-prior]        'scroll-other-window-down)
+(define-key esc-map    [prior]          'scroll-other-window-down)
 (define-key esc-map [?\C-\S-v]          'scroll-other-window-down)
 (define-key global-map [end]            'end-of-line)
 (define-key global-map [C-end]          'end-of-buffer)
 (define-key global-map [M-end]          'end-of-buffer-other-window)
+(define-key esc-map    [end]            'end-of-buffer-other-window)
 (define-key global-map [begin]          'beginning-of-buffer)
 (define-key global-map [M-begin]        'beginning-of-buffer-other-window)
+(define-key esc-map    [begin]          'beginning-of-buffer-other-window)
 ;; (define-key global-map [select]      'function-key-error)
 ;; (define-key global-map [print]       'function-key-error)
 (define-key global-map [execute]        'execute-extended-command)
@@ -933,7 +938,9 @@ language you are using."
 (define-key global-map "\C-c" 'mode-specific-command-prefix)
 
 (global-set-key [M-right]  'forward-word)
+(define-key esc-map [right] 'forward-word)
 (global-set-key [M-left]   'backward-word)
+(define-key esc-map [left] 'backward-word)
 ;; ilya@math.ohio-state.edu says these bindings are standard on PC editors.
 (global-set-key [C-right]  'forward-word)
 (global-set-key [C-left]   'backward-word)
@@ -943,12 +950,18 @@ language you are using."
 ;; This is "move to the clipboard", or as close as we come.
 (global-set-key [S-delete] 'kill-region)
 
-(global-set-key [C-M-left]  'backward-sexp)
-(global-set-key [C-M-right] 'forward-sexp)
-(global-set-key [C-M-up]    'backward-up-list)
-(global-set-key [C-M-down]  'down-list)
-(global-set-key [C-M-home]  'beginning-of-defun)
-(global-set-key [C-M-end]   'end-of-defun)
+(global-set-key [C-M-left]    'backward-sexp)
+(define-key esc-map [C-left]  'backward-sexp)
+(global-set-key [C-M-right]   'forward-sexp)
+(define-key esc-map [C-right] 'forward-sexp)
+(global-set-key [C-M-up]      'backward-up-list)
+(define-key esc-map [C-up]    'backward-up-list)
+(global-set-key [C-M-down]    'down-list)
+(define-key esc-map [C-down]  'down-list)
+(global-set-key [C-M-home]    'beginning-of-defun)
+(define-key esc-map [C-home]  'beginning-of-defun)
+(global-set-key [C-M-end]     'end-of-defun)
+(define-key esc-map [C-end]   'end-of-defun)
 
 (define-key esc-map "\C-f" 'forward-sexp)
 (define-key esc-map "\C-b" 'backward-sexp)
diff --git a/lisp/hexl.el b/lisp/hexl.el
index b67ab7876b4..e24f6b7f72b 100644
--- a/lisp/hexl.el
+++ b/lisp/hexl.el
@@ -988,7 +988,9 @@ This function is assumed to be used as call back function for `hl-line-mode'."
   (define-key hexl-mode-map [up] 'hexl-previous-line)
   (define-key hexl-mode-map [down] 'hexl-next-line)
   (define-key hexl-mode-map [M-left] 'hexl-backward-short)
+  (define-key hexl-mode-map [?\e left] 'hexl-backward-short)
   (define-key hexl-mode-map [M-right] 'hexl-forward-short)
+  (define-key hexl-mode-map [?\e right] 'hexl-forward-short)
   (define-key hexl-mode-map [next] 'hexl-scroll-up)
   (define-key hexl-mode-map [prior] 'hexl-scroll-down)
   (define-key hexl-mode-map [home] 'hexl-beginning-of-line)