Sync with HEAD.

1 files changed, 14 insertions, 7 deletions

diff --git a/lisp/international/characters.el b/lisp/international/characters.el
index ff60ceb1b5b..b671b96c624 100644
--- a/lisp/international/characters.el
+++ b/lisp/international/characters.el
@@ -433,11 +433,6 @@
 
 (let ((tbl (standard-case-table)) c)
 
-;; In some languages, U+0049 LATIN CAPITAL LETTER I and U+0131 LATIN
-;; SMALL LETTER DOTLESS I make a case pair, and so do U+0130 LATIN
-;; CAPITAL LETTER I WITH DOT ABOVE and U+0069 LATIN SMALL LETTER I.
-;; See the Turkish language environment.
-
   ;; Latin-1
 
   ;; Fixme: Some of the non-word syntaxes here perhaps should be
@@ -485,8 +480,20 @@
          (zerop (% c 2))
          (set-case-syntax-pair (1- c) c tbl))
     (setq c (1+ c)))
-  (set-downcase-syntax  ?İ ?i tbl)
-  (set-upcase-syntax    ?I ?ı tbl)
+
+
+  ;; In some languages, such as Turkish, U+0049 LATIN CAPITAL LETTER I
+  ;; and U+0131 LATIN SMALL LETTER DOTLESS I make a case pair, and so
+  ;; do U+0130 LATIN CAPITAL LETTER I WITH DOT ABOVE and U+0069 LATIN
+  ;; SMALL LETTER I.
+
+  ;; We used to set up half of those correspondence unconditionally,
+  ;; but that makes searches slow.  So now we don't set up either half
+  ;; of these correspondences by default.
+
+  ;; (set-downcase-syntax  ?İ ?i tbl)
+  ;; (set-upcase-syntax    ?I ?ı tbl)
+
   (set-case-syntax-pair ?IJ ?ij tbl)
   (set-case-syntax-pair ?Ĵ ?ĵ tbl)
   (set-case-syntax-pair ?Ķ ?ķ tbl)