diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/Makefile.in | 2 | ||||
| -rw-r--r-- | lisp/net/tramp-sh.el | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ad4f3b9a7f3..ce381315b40 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2015-02-08 Paul Eggert <eggert@cs.ucla.edu> + + Port to platforms lacking test -a and -o + * Makefile.in (compile-clean): + * net/tramp-sh.el (tramp-find-executable): + Prefer '&&' and '||' to 'test -a' and 'test -o'. + 2015-02-08 Artur Malabarba <bruce.connor.am@gmail.com> * newcomment.el (comment-line): Fix missing paren. diff --git a/lisp/Makefile.in b/lisp/Makefile.in index 7bf53861e71..e5cfc6326e1 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@ -324,7 +324,7 @@ compile-clean: @cd $(lisp) && $(setwins); \ elcs=`echo "$$wins " | sed -e 's|/\./|/|g' -e 's|/\. | |g' -e 's| |/*.elc |g'`; \ for el in `echo $$elcs | sed -e 's/\.elc/\.el/g'`; do \ - if test -f "$$el" -o \! -f "$${el}c"; then :; else \ + if test -f "$$el" || test ! -f "$${el}c"; then :; else \ echo rm "$${el}c"; \ rm "$${el}c"; \ fi \ diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 9c8a222285c..45050cdd77a 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -3796,7 +3796,7 @@ This function expects to be in the right *tramp* buffer." (tramp-send-command vec (format (concat "while read d; " - "do if test -x $d/%s -a -f $d/%s; " + "do if test -x $d/%s && test -f $d/%s; " "then echo tramp_executable $d/%s; " "break; fi; done <<'%s'\n" "%s\n%s") |