From: Lucien Cartier-Tilet <lucien@phundrak.com>
Date: Fri, 14 Jan 2022 08:17:25 +0000 (+0100)
Subject: (battery-status-function) Fix errors in Termux
X-Git-Tag: emacs-29.0.90~3068
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3c0e51e4e59f45d6f6268223fa4b91de0053b36a;p=emacs.git

(battery-status-function) Fix errors in Termux

* lisp/battery.el (battery-status-function): In Termux, neither
/sys/ or /proc/ are readable on phones that are not rooted. This
patch makes Emacs verify if they are readable before it attemps
reading them (bug#53026).

Copyright-paperwork-exempt: yes
---

diff --git a/lisp/battery.el b/lisp/battery.el
index 45334163fa6..b7b81a11a1c 100644
--- a/lisp/battery.el
+++ b/lisp/battery.el
@@ -96,12 +96,14 @@ Value does not include \".\" or \"..\"."
   (cond ((member battery-upower-service (dbus-list-activatable-names))
          #'battery-upower)
         ((and (eq system-type 'gnu/linux)
+              (file-readable-p "/sys/")
               (battery--find-linux-sysfs-batteries))
          #'battery-linux-sysfs)
 	((and (eq system-type 'gnu/linux)
 	      (file-directory-p "/proc/acpi/battery"))
 	 #'battery-linux-proc-acpi)
 	((and (eq system-type 'gnu/linux)
+              (file-readable-p "/proc/")
               (file-readable-p "/proc/apm"))
          #'battery-linux-proc-apm)
 	((and (eq system-type 'berkeley-unix)