(widget-choose): Avoid ugly error for function keys.

diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index 7d572363e0fb7096c12d01128aa864e2f92a2841..935d2b7719dcb22a7f6921a998726906f0601755 100644 (file)
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -275,14 +275,15 @@ minibuffer."
                     keys
                     (char 0)
                     (arg 1))
-                (while (not (or (and (>= char ?0) (< char next-digit))
+                (while (not (or (and (integerp char)
+                                     (>= char ?0) (< char next-digit))
                                 (eq value 'keyboard-quit)))
                   ;; Unread a SPC to lead to our new menu.
                   (setq unread-command-events (cons ?\s unread-command-events))
                   (setq keys (read-key-sequence title))
                   (setq value
                         (lookup-key overriding-terminal-local-map keys t)
-                        char (string-to-char (substring keys 1)))
+                        char (aref keys 1))
                   (cond ((eq value 'scroll-other-window)
                          (let ((minibuffer-scroll-window
                                 (get-buffer-window buf)))