[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111154: * lisp/international/mule-cmds.el (read-char-by-name): Move let-binding

[Juri Linkov]

------------------------------------------------------------
revno: 111154
fixes bug: http://debbugs.gnu.org/12615
committer: Juri Linkov <address@hidden>
branch nick: emacs-24
timestamp: Wed 2013-01-09 02:20:02 +0200
message:
  * 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'..
modified:
  lisp/ChangeLog
  lisp/international/mule-cmds.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-01-08 15:31:30 +0000
+++ b/lisp/ChangeLog    2013-01-09 00:20:02 +0000
@@ -1,3 +1,12 @@
+2013-01-09  Juri Linkov  <address@hidden>
+
+       * 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  <address@hidden>
 
        * progmodes/compile.el (compilation-parse-errors):

=== modified file 'lisp/international/mule-cmds.el'
--- a/lisp/international/mule-cmds.el   2013-01-01 09:11:05 +0000
+++ b/lisp/international/mule-cmds.el   2013-01-09 00:20:02 +0000
@@ -2945,14 +2945,13 @@
 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))