Change bindings of event-apply-control-modifier,

event-apply-meta-modifier, event-apply-hyper-modifier,
event-apply-shift-modifier, event-apply-alt-modifier, and
event-apply-super-modifier, in function-key-map, to use C-x @
instead of C-x ESC.  Using escape causes problems since that's
in function-key-map itself.

1 files changed, 6 insertions, 13 deletions

diff --git a/lisp/simple.el b/lisp/simple.el
index 256a39eb220..20a1d9fc4e7 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2857,19 +2857,12 @@ PREFIX is the string that represents this modifier in an event type symbol."
             event-type
           (cons event-type (cdr event)))))))
 
-(define-key function-key-map [?\C-x escape ?h] 'event-apply-hyper-modifier)
-(define-key function-key-map [?\C-x escape ?s] 'event-apply-super-modifier)
-(define-key function-key-map [?\C-x escape ?m] 'event-apply-meta-modifier)
-(define-key function-key-map [?\C-x escape ?a] 'event-apply-alt-modifier)
-(define-key function-key-map [?\C-x escape ?S] 'event-apply-shift-modifier)
-(define-key function-key-map [?\C-x escape ?c] 'event-apply-control-modifier)
-
-(define-key function-key-map [?\C-x ?\e ?h] 'event-apply-hyper-modifier)
-(define-key function-key-map [?\C-x ?\e ?s] 'event-apply-super-modifier)
-(define-key function-key-map [?\C-x ?\e ?m] 'event-apply-meta-modifier)
-(define-key function-key-map [?\C-x ?\e ?a] 'event-apply-alt-modifier)
-(define-key function-key-map [?\C-x ?\e ?S] 'event-apply-shift-modifier)
-(define-key function-key-map [?\C-x ?\e ?c] 'event-apply-control-modifier)
+(define-key function-key-map [?\C-x ?@ ?h] 'event-apply-hyper-modifier)
+(define-key function-key-map [?\C-x ?@ ?s] 'event-apply-super-modifier)
+(define-key function-key-map [?\C-x ?@ ?m] 'event-apply-meta-modifier)
+(define-key function-key-map [?\C-x ?@ ?a] 'event-apply-alt-modifier)
+(define-key function-key-map [?\C-x ?@ ?S] 'event-apply-shift-modifier)
+(define-key function-key-map [?\C-x ?@ ?c] 'event-apply-control-modifier)
 
 ;;;; Keypad support.