diff options
| author | Juri Linkov <juri@jurta.org> | 2013-01-09 02:20:02 +0200 |
|---|---|---|
| committer | Juri Linkov <juri@jurta.org> | 2013-01-09 02:20:02 +0200 |
| commit | 39a0786e1b37704c54dc1cce142b495856c2b13e (patch) | |
| tree | 3e4ed33f93c91f6080c6152c233fa2517b8892d4 | |
| parent | 04c285b2644d4fc551c907365a574ebbfd260b23 (diff) | |
| download | emacs-39a0786e1b37704c54dc1cce142b495856c2b13e.tar.gz | |
* lisp/international/mule-cmds.el (read-char-by-name): Move let-binding
of completion-ignore-case around completing-read to fix regression
exhibited by the test case `C-x 8 RET *acc TAB' and caused by
`string-match-p' using the nil value of `case-fold-search' and
`completion-ignore-case' in `completion-pcm--all-completions'..
Fixes: debbugs:12615
| -rw-r--r-- | lisp/ChangeLog | 9 | ||||
| -rw-r--r-- | lisp/international/mule-cmds.el | 15 |
2 files changed, 16 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1d045425720..ee55ef04858 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2013-01-09 Juri Linkov <juri@jurta.org> + + * international/mule-cmds.el (read-char-by-name): Move let-binding + of completion-ignore-case around completing-read to fix regression + exhibited by the test case `C-x 8 RET *acc TAB' and caused by + `string-match-p' using the nil value of `case-fold-search' and + `completion-ignore-case' in `completion-pcm--all-completions'. + (Bug#12615). + 2013-01-07 Glenn Morris <rgm@gnu.org> * progmodes/compile.el (compilation-parse-errors): diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index 57fd95a1692..f51daa0eac0 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@ -2945,14 +2945,13 @@ at the beginning of the name. This function also accepts a hexadecimal number of Unicode code point or a number in hash notation, e.g. #o21430 for octal, #x2318 for hex, or #10r8984 for decimal." - (let ((input - (completing-read - prompt - (lambda (string pred action) - (let ((completion-ignore-case t)) - (if (eq action 'metadata) - '(metadata (category . unicode-name)) - (complete-with-action action (ucs-names) string pred))))))) + (let* ((completion-ignore-case t) + (input (completing-read + prompt + (lambda (string pred action) + (if (eq action 'metadata) + '(metadata (category . unicode-name)) + (complete-with-action action (ucs-names) string pred)))))) (cond ((string-match-p "\\`[0-9a-fA-F]+\\'" input) (string-to-number input 16)) |