("Turkish"): Sync with HEAD.

diff --git a/lisp/language/european.el b/lisp/language/european.el
index afdb0ed17d175e36abbafb4a88733e8fa7fc41ff..497be4023b8c844886e2a6ff052faa354e42c3fa 100644 (file)
--- a/lisp/language/european.el
+++ b/lisp/language/european.el
@@ -486,19 +486,25 @@ and it selects the Spanish tutorial."))
             (unibyte-display . iso-latin-5)
             (input-method . "turkish-postfix")
             (sample-text . "Turkish (T\e$(D+d\e(Brk\e$(D+.\e(Be)   Merhaba")
-            (setup-function
-             . (lambda ()
-                 (set-case-syntax-pair ?I ?\e$(D)E\e(B (standard-case-table))
-                 (set-case-syntax-pair ?\e$(D*D\e(B ?i (standard-case-table))))
-            (exit-function
-             . (lambda ()
-                 (set-case-syntax-pair ?I ?i (standard-case-table))
-                 (set-case-syntax ?\e$(D)E\e(B "w" (standard-case-table))
-                 (set-case-syntax ?\e$(D*D\e(B "w" (standard-case-table))))
+            (setup-function . turkish-case-conversion-enable)
+            (setup-function . turkish-case-conversion-disable)
             (documentation . "Support for Turkish.
 Differs from the Latin-5 environment in using the `turkish-postfix' input
 method and applying Turkish case rules for the characters i, I, \e$(D)E\e(B, \e$(D*D\e(B.")))
 
+(defun turkish-case-conversion-enable ()
+  "Set up Turkish case conversion of `i' and `I' into `\e$(D*D\e(B' and `\e$(D)E\e(B'."
+  (let ((table (standard-case-table)))
+    (set-case-syntax-pair ?\e$(D*D\e(B ?i table)
+    (set-case-syntax-pair ?I ?\e$(D)E\e(B table)))
+
+(defun turkish-case-conversion-disable ()
+  "Set up normal (non-Turkish) case conversion of `i' into `I'."
+  (let ((table (standard-case-table)))
+    (set-case-syntax-pair ?I ?i table)
+    (set-case-syntax ?\e$(D*D\e(B "w" table)
+    (set-case-syntax ?\e$(D)E\e(B "w" table)))
+
 ;; Polish ISO 8859-2 environment.
 ;; Maintainer: Wlodek Bzyl <matwb@univ.gda.pl>
 ;; Keywords: multilingual, Polish