Update Android port

* lisp/subr.el (read-char-from-minibuffer): Don't use undefined
variable.  Reported by Robert Pluim.

diff --git a/lisp/subr.el b/lisp/subr.el
index 45953f07f13ed6c579cdd92c487ef8ef9aa870fa..819aba631faabebd803b2636d04a0a8400a09c02 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -3471,8 +3471,8 @@ There is no need to explicitly add `help-char' to CHARS;
 
   ;; If text conversion is enabled in this buffer, then it will only
   ;; be disabled the next time `force-mode-line-update' happens.
-  (when (and overriding-text-conversion-style
-             text-conversion-style)
+  (when (and (bound-and-true-p 'overriding-text-conversion-style)
+             (bound-and-true-p 'text-conversion-style))
     (force-mode-line-update))
 
   (let* ((overriding-text-conversion-style nil)