From: Richard M. Stallman <rms@gnu.org>
Date: Tue, 2 Jan 2007 21:15:09 +0000 (+0000)
Subject: (widget-choose): Avoid ugly error for function keys.
X-Git-Tag: emacs-pretest-22.0.93~276
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=421be070361daada7d3e9560144a3aa35af8bed9;p=emacs.git

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

diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index 7d572363e0f..935d2b7719d 100644
--- 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)))