; Update Android port

* lisp/subr.el (y-or-n-p): Don't call set-text-conversion-style when
not present.

diff --git a/lisp/subr.el b/lisp/subr.el
index 3e4808c54716d48ac827af57faf3dce9d146612c..58ec642dd928d207d2e2cd7e90686fc121d19f2d 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -3799,7 +3799,8 @@ like) while `y-or-n-p' is running)."
                     ;; If the minibuffer is already active, the
                     ;; selected window might not change.  Disable
                     ;; text conversion by hand.
-                    (set-text-conversion-style text-conversion-style)
+                    (when (fboundp 'set-text-conversion-style)
+                      (set-text-conversion-style text-conversion-style))
                     (read-from-minibuffer
                      prompt nil keymap nil
                      (or y-or-n-p-history-variable t)))))