summaryrefslogtreecommitdiff
path: root/lisp/obsolete/terminal.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/obsolete/terminal.el')
-rw-r--r--lisp/obsolete/terminal.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/obsolete/terminal.el b/lisp/obsolete/terminal.el
index cac533a4b2f..13667589c9e 100644
--- a/lisp/obsolete/terminal.el
+++ b/lisp/obsolete/terminal.el
@@ -1095,7 +1095,9 @@ subprocess started."
(or explicit-shell-file-name
(getenv "ESHELL")
(getenv "SHELL")
- "/bin/sh"))
+ (if (eq system-type 'android)
+ "/system/bin/sh"
+ "/bin/sh")))
(s (read-string
(format "Run program in emulator (default %s): "
default-s))))
@@ -1152,7 +1154,7 @@ subprocess started."
(defun te-parse-program-and-args (s)
- (cond ((string-match "\\`\\([-a-zA-Z0-9+=_.@/:]+[ \t]*\\)+\\'" s)
+ (cond ((string-match "\\`[-a-zA-Z0-9+=_.@/:][-a-zA-Z0-9+=_.@/: \t]*\\'" s)
(let ((l ()) (p 0))
(while p
(setq l (cons (if (string-match