From: Po Lu <luangruo@yahoo.com>
Date: Tue, 4 Apr 2023 10:34:44 +0000 (+0800)
Subject: Update Android port
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6bdbb4cbfc2deb7d3a02e1428768e101f3dbd265;p=emacs.git

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 45953f07f13..819aba631fa 100644
--- 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)