From: Juri Linkov <juri@jurta.org>
Date: Wed, 9 Jan 2013 00:20:02 +0000 (+0200)
Subject: * lisp/international/mule-cmds.el (read-char-by-name): Move let-binding
X-Git-Url: http://git.hcoop.net/bpt/emacs.git/commitdiff_plain/39a0786e1b37704c54dc1cce142b495856c2b13e

* 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
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1d04542572..ee55ef0485 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 57fd95a169..f51daa0eac 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))