(function-key-map): Map C-@ to C-SPC if C-@ is unbound.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 980143b288f79ce5b0fa6500c18b2f31569eb077..14cf0c7578a57c32051c5559620ad14c777d0c19 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2009-10-19  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * bindings.el (function-key-map): Map C-@ to C-SPC if C-@ is unbound.
+
        * info.el (Info-complete-menu-item): Handle `boundaries' explicitly.
        (Info-menu): Remove unused vars `last' and `completions'.
        (Info-index-nodes): Remove unused var `node'.

diff --git a/lisp/bindings.el b/lisp/bindings.el
index e6ccbac6eabb7ce7ea2c2173ca2290a047fc6f94..4bcd9a740ea07be20166d4bc95e15393b39a52bc 100644 (file)
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -970,6 +970,9 @@ language you are using."
 
 ;; X11R6 distinguishes these keys from the non-kp keys.
 ;; Make them behave like the non-kp keys unless otherwise bound.
+;; FIXME: rather than list such mappings for every modifier-combination,
+;;   we should come up with a way to do it generically, something like
+;;   (define-key function-key-map [*-kp-home] [*-home])
 (define-key function-key-map [kp-home] [home])
 (define-key function-key-map [kp-left] [left])
 (define-key function-key-map [kp-up] [up])
@@ -1020,6 +1023,11 @@ language you are using."
 (define-key function-key-map [C-S-kp-8] [C-S-up])
 (define-key function-key-map [C-S-kp-9] [C-S-prior])
 
+;; Hitting C-SPC on text terminals, usually sends the ascii code 0 (aka C-@),
+;; so we can't distinguish those two keys, but usually we consider C-SPC
+;; (rather than C-@) as the "canonical" binding.
+(define-key function-key-map [?\C-@] [?\C-\s])
+
 (define-key global-map [mouse-movement] 'ignore)
 
 (define-key global-map "\C-t" 'transpose-chars)