aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2012-10-11 16:05:47 -0400
committerStefan Monnier2012-10-11 16:05:47 -0400
commitac9fc2c779445a88cdf0ae2fa042879bb7ff0d16 (patch)
tree20cc6090bb9fbc2d67c8e08ace9acb046db639b3
parent7cded46f2bef23f86041cc883618ac82b6dbfe61 (diff)
downloademacs-ac9fc2c779445a88cdf0ae2fa042879bb7ff0d16.tar.gz
emacs-ac9fc2c779445a88cdf0ae2fa042879bb7ff0d16.zip
* lisp/international/mule-cmds.el (read-char-by-name): Move let-binding of
completion-ignore-case in case that var is buffer-local. Fixes: debbugs:12615
-rw-r--r--lisp/ChangeLog9
-rw-r--r--lisp/international/mule-cmds.el15
2 files changed, 15 insertions, 9 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b8c4e518b0c..ba105ce4716 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12012-10-11 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * international/mule-cmds.el (read-char-by-name): Move let-binding of
4 completion-ignore-case in case that var is buffer-local (bug#12615).
5
12012-10-11 Kenichi Handa <handa@gnu.org> 62012-10-11 Kenichi Handa <handa@gnu.org>
2 7
3 * international/eucjp-ms.el: Re-generated. 8 * international/eucjp-ms.el: Re-generated.
@@ -10,8 +15,8 @@
102012-10-10 Martin Rudalics <rudalics@gmx.at> 152012-10-10 Martin Rudalics <rudalics@gmx.at>
11 16
12 * window.el (switch-to-buffer-preserve-window-point): New option. 17 * window.el (switch-to-buffer-preserve-window-point): New option.
13 (switch-to-buffer): Obey 18 (switch-to-buffer):
14 `switch-to-buffer-preserve-window-point' (Bug#4041). 19 Obey `switch-to-buffer-preserve-window-point' (Bug#4041).
15 20
162012-10-09 Stefan Monnier <monnier@iro.umontreal.ca> 212012-10-09 Stefan Monnier <monnier@iro.umontreal.ca>
17 22
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 58dd24ec8ea..3431c81df88 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -2945,13 +2945,14 @@ at the beginning of the name.
2945This function also accepts a hexadecimal number of Unicode code 2945This function also accepts a hexadecimal number of Unicode code
2946point or a number in hash notation, e.g. #o21430 for octal, 2946point 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* ((completion-ignore-case t) 2948 (let ((input
2949 (input (completing-read 2949 (completing-read
2950 prompt 2950 prompt
2951 (lambda (string pred action) 2951 (lambda (string pred action)
2952 (if (eq action 'metadata) 2952 (let ((completion-ignore-case t))
2953 '(metadata (category . unicode-name)) 2953 (if (eq action 'metadata)
2954 (complete-with-action action (ucs-names) string pred)))))) 2954 '(metadata (category . unicode-name))
2955 (complete-with-action action (ucs-names) string pred)))))))
2955 (cond 2956 (cond
2956 ((string-match-p "\\`[0-9a-fA-F]+\\'" input) 2957 ((string-match-p "\\`[0-9a-fA-F]+\\'" input)
2957 (string-to-number input 16)) 2958 (string-to-number input 16))