diff options
| author | Juri Linkov | 2013-01-09 02:20:02 +0200 |
|---|---|---|
| committer | Juri Linkov | 2013-01-09 02:20:02 +0200 |
| commit | 39a0786e1b37704c54dc1cce142b495856c2b13e (patch) | |
| tree | 3e4ed33f93c91f6080c6152c233fa2517b8892d4 /lisp | |
| parent | 04c285b2644d4fc551c907365a574ebbfd260b23 (diff) | |
| download | emacs-39a0786e1b37704c54dc1cce142b495856c2b13e.tar.gz emacs-39a0786e1b37704c54dc1cce142b495856c2b13e.zip | |
* 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
Diffstat (limited to 'lisp')
| -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 @@ | |||
| 1 | 2013-01-09 Juri Linkov <juri@jurta.org> | ||
| 2 | |||
| 3 | * international/mule-cmds.el (read-char-by-name): Move let-binding | ||
| 4 | of completion-ignore-case around completing-read to fix regression | ||
| 5 | exhibited by the test case `C-x 8 RET *acc TAB' and caused by | ||
| 6 | `string-match-p' using the nil value of `case-fold-search' and | ||
| 7 | `completion-ignore-case' in `completion-pcm--all-completions'. | ||
| 8 | (Bug#12615). | ||
| 9 | |||
| 1 | 2013-01-07 Glenn Morris <rgm@gnu.org> | 10 | 2013-01-07 Glenn Morris <rgm@gnu.org> |
| 2 | 11 | ||
| 3 | * progmodes/compile.el (compilation-parse-errors): | 12 | * 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. | |||
| 2945 | This function also accepts a hexadecimal number of Unicode code | 2945 | This function also accepts a hexadecimal number of Unicode code |
| 2946 | point or a number in hash notation, e.g. #o21430 for octal, | 2946 | point or a number in hash notation, e.g. #o21430 for octal, |
| 2947 | #x2318 for hex, or #10r8984 for decimal." | 2947 | #x2318 for hex, or #10r8984 for decimal." |
| 2948 | (let ((input | 2948 | (let* ((completion-ignore-case t) |
| 2949 | (completing-read | 2949 | (input (completing-read |
| 2950 | prompt | 2950 | prompt |
| 2951 | (lambda (string pred action) | 2951 | (lambda (string pred action) |
| 2952 | (let ((completion-ignore-case t)) | 2952 | (if (eq action 'metadata) |
| 2953 | (if (eq action 'metadata) | 2953 | '(metadata (category . unicode-name)) |
| 2954 | '(metadata (category . unicode-name)) | 2954 | (complete-with-action action (ucs-names) string pred)))))) |
| 2955 | (complete-with-action action (ucs-names) string pred))))))) | ||
| 2956 | (cond | 2955 | (cond |
| 2957 | ((string-match-p "\\`[0-9a-fA-F]+\\'" input) | 2956 | ((string-match-p "\\`[0-9a-fA-F]+\\'" input) |
| 2958 | (string-to-number input 16)) | 2957 | (string-to-number input 16)) |