1 files changed, 6 insertions, 4 deletions

diff --git a/lisp/international/encoded-kb.el b/lisp/international/encoded-kb.el
index 53bd38de53d..56c684a91fb 100644
--- a/lisp/international/encoded-kb.el
+++ b/lisp/international/encoded-kb.el
@@ -70,11 +70,13 @@
 
 (defvar encoded-kbd-iso2022-designation-map
   (let ((map (make-sparse-keymap))
-        (l charset-list))
+        (l charset-list)
+        final-char)
     (while l
-      (define-key map
-        (char-to-string (charset-iso-final-char (car l)))
-        'encoded-kbd-iso2022-designation)
+      (setq final-char (charset-iso-final-char (car l)))
+      (if final-char
+          (define-key map (char-to-string final-char)
+            'encoded-kbd-iso2022-designation))
       (setq l (cdr l)))
     map)
   "Keymap for handling ISO2022 designation sequence in Encoded-kbd mode.")