aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2009-02-14 09:04:46 +0000
committerEli Zaretskii2009-02-14 09:04:46 +0000
commit0d58bedde6ba572d995a8f857fa5fdde9ab299ee (patch)
tree3837665c4dbd8475c2a0657f06b79265d04f8b01
parent580fe9f55c7ee5fe5b50340a3a11cb7356b1f8b9 (diff)
downloademacs-0d58bedde6ba572d995a8f857fa5fdde9ab299ee.tar.gz
emacs-0d58bedde6ba572d995a8f857fa5fdde9ab299ee.zip
(isearch-search-string): Use `with-no-warnings' around forms that refer
to translation-table-for-input.
-rw-r--r--lisp/isearch.el18
1 files changed, 13 insertions, 5 deletions
diff --git a/lisp/isearch.el b/lisp/isearch.el
index c08c114f7d5..663142ec687 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -2214,14 +2214,22 @@ update the match data, and return point."
2214 (let* ((func (isearch-search-fun)) 2214 (let* ((func (isearch-search-fun))
2215 (pos1 (save-excursion (funcall func string bound noerror))) 2215 (pos1 (save-excursion (funcall func string bound noerror)))
2216 pos2) 2216 pos2)
2217 (when (and (char-table-p translation-table-for-input) 2217 (when (and
2218 (multibyte-string-p string) 2218 ;; Avoid "obsolete" warnings for translation-table-for-input.
2219 ;; Minor optimization. 2219 (with-no-warnings
2220 (string-match-p "[^[:ascii:]]" string)) 2220 (char-table-p translation-table-for-input))
2221 (multibyte-string-p string)
2222 ;; Minor optimization.
2223 (string-match-p "[^[:ascii:]]" string))
2221 (let ((translated 2224 (let ((translated
2222 (apply 'string 2225 (apply 'string
2223 (mapcar (lambda (c) 2226 (mapcar (lambda (c)
2224 (or (aref translation-table-for-input c) c)) 2227 (or
2228 ;; Avoid "obsolete" warnings for
2229 ;; translation-table-for-input.
2230 (with-no-warnings
2231 (aref translation-table-for-input c))
2232 c))
2225 string))) 2233 string)))
2226 match-data) 2234 match-data)
2227 (when translated 2235 (when translated