aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2008-02-02 04:18:45 +0000
committerGlenn Morris2008-02-02 04:18:45 +0000
commite0576f07f3cc1596f9aee709cd772f46a8c3ad27 (patch)
tree97235a7be526756b4da8246bcb1adfe762870411
parent434b9acba5f119e5005bc81b351160605fb819c6 (diff)
downloademacs-e0576f07f3cc1596f9aee709cd772f46a8c3ad27.tar.gz
emacs-e0576f07f3cc1596f9aee709cd772f46a8c3ad27.zip
(widget-string-complete): Use assoc-string rather than assoc-ignore-case.
(widget-key-sequence-read-event): Use characterp rather than char-valid-p.
-rw-r--r--lisp/wid-edit.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index d89e49fc79e..205f70d32ef 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -3043,7 +3043,7 @@ widget. If that isn't a list, it's evalled and expected to yield a list."
3043 ;; Replace field with completion in case its case is different. 3043 ;; Replace field with completion in case its case is different.
3044 (delete-region (widget-field-start widget) 3044 (delete-region (widget-field-start widget)
3045 (widget-field-end widget)) 3045 (widget-field-end widget))
3046 (insert-and-inherit (car (assoc-ignore-case prefix alist)))) 3046 (insert-and-inherit (car (assoc-string prefix alist t))))
3047 (message "Only match")) 3047 (message "Only match"))
3048 ((null completion) 3048 ((null completion)
3049 (error "No match")) 3049 (error "No match"))
@@ -3302,7 +3302,7 @@ It reads a directory name from an editable text field."
3302 (setq unread-command-events (cons ev unread-command-events) 3302 (setq unread-command-events (cons ev unread-command-events)
3303 ev (read-quoted-char (format "Enter code (radix %d)" read-quoted-char-radix)) 3303 ev (read-quoted-char (format "Enter code (radix %d)" read-quoted-char-radix))
3304 tr nil) 3304 tr nil)
3305 (if (and (integerp ev) (not (char-valid-p ev))) 3305 (if (and (integerp ev) (not (characterp ev)))
3306 (insert (char-to-string ev)))) ;; throw invalid char error 3306 (insert (char-to-string ev)))) ;; throw invalid char error
3307 (setq ev (key-description (list ev))) 3307 (setq ev (key-description (list ev)))
3308 (when (arrayp tr) 3308 (when (arrayp tr)