summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Heuer <kwzh@gnu.org>1995-01-19 22:24:43 +0000
committerKarl Heuer <kwzh@gnu.org>1995-01-19 22:24:43 +0000
commit184dfea799ec7d05db4c0db3a3867349888a01d3 (patch)
tree2c434baafd257eb0bbfc1d219347b3db44c43a50
parentdeb570fb56388b1adb1092f70715ba6a21c08a28 (diff)
downloademacs-184dfea799ec7d05db4c0db3a3867349888a01d3.tar.gz
(remote-shell-program): Reorder search path.
-rw-r--r--lisp/paths.el11
1 files changed, 8 insertions, 3 deletions
diff --git a/lisp/paths.el b/lisp/paths.el
index 37d86f967ff..7d120e7e11b 100644
--- a/lisp/paths.el
+++ b/lisp/paths.el
@@ -118,13 +118,18 @@ Its name should end with a slash.")
;; restricted shell and use remsh for the remote shell. Let's try to guess
;; based on what we actually find out there. The restricted shell is
;; almost certainly in /bin or /usr/bin, so it's probably safe to assume
- ;; that an rsh found elsewhere is the remote shell program.
+ ;; that an rsh found elsewhere is the remote shell program. The converse
+ ;; is not true: /usr/bin/rsh could be either one, so check that last.
((file-exists-p "/usr/ucb/remsh") "/usr/ucb/remsh")
- ((file-exists-p "/usr/ucb/rsh") "/usr/ucb/rsh")
+ ((file-exists-p "/usr/bsd/remsh") "/usr/bsd/remsh")
((file-exists-p "/bin/remsh") "/bin/remsh")
((file-exists-p "/usr/bin/remsh") "/bin/remsh")
+ ((file-exists-p "/usr/local/bin/remsh") "/usr/local/bin/remsh")
+ ((file-exists-p "/usr/ucb/rsh") "/usr/ucb/rsh")
+ ((file-exists-p "/usr/bsd/rsh") "/usr/bsd/rsh")
((file-exists-p "/usr/local/bin/rsh") "/usr/local/bin/rsh")
- ((memq system-type '(hpux usg-unix-v)) "remsh")
+ ((file-exists-p "/bin/rsh") "/bin/rsh")
+ ((file-exists-p "/usr/bin/rsh") "/usr/bin/rsh")
(t "rsh")))
(defconst term-file-prefix (if (eq system-type 'vax-vms) "[.term]" "term/")