diff options
| author | Michael Albinus | 2009-04-24 13:54:50 +0000 |
|---|---|---|
| committer | Michael Albinus | 2009-04-24 13:54:50 +0000 |
| commit | 65a099b6797eee713cb535ff4ed9d705863f5055 (patch) | |
| tree | bf6bf7fb2ca733f92c2ebbbbda22dc849a02e8fb | |
| parent | b71ac3dd2a20488c5513df8a8c15d7ea34a9acd3 (diff) | |
| download | emacs-65a099b6797eee713cb535ff4ed9d705863f5055.tar.gz emacs-65a099b6797eee713cb535ff4ed9d705863f5055.zip | |
* net/tramp.el (tramp-handle-directory-files-and-attributes-with-stat)
(tramp-handle-file-name-all-completions): Don't use "-b" as ls
arg. It does not work on OpenBSD. Reported by Taylor Venable
<taylor@metasyntax.net>.
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/net/tramp.el | 8 |
2 files changed, 13 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 14ef37558a0..5b08f7ecd7b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2009-04-24 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * net/tramp.el (tramp-handle-directory-files-and-attributes-with-stat) | ||
| 4 | (tramp-handle-file-name-all-completions): Don't use "-b" as ls | ||
| 5 | arg. It does not work on OpenBSD. Reported by Taylor Venable | ||
| 6 | <taylor@metasyntax.net>. | ||
| 7 | |||
| 1 | 2009-04-23 Chong Yidong <cyd@stupidchicken.com> | 8 | 2009-04-23 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 9 | ||
| 3 | * hi-lock.el (hi-lock--inhibit-font-lock-hook): New var. | 10 | * hi-lock.el (hi-lock--inhibit-font-lock-hook): New var. |
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index bb1d1416d1a..b2d5708d748 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el | |||
| @@ -2920,7 +2920,7 @@ value of `default-file-modes'." | |||
| 2920 | vec | 2920 | vec |
| 2921 | (format | 2921 | (format |
| 2922 | (concat | 2922 | (concat |
| 2923 | "cd %s; echo \"(\"; (%s -ab | xargs " | 2923 | "cd %s; echo \"(\"; (%s -a | xargs " |
| 2924 | "%s -c '(\"%%n\" (\"%%N\") %%h %s %s %%X.0 %%Y.0 %%Z.0 %%s.0 \"%%A\" t %%i.0 -1)'); " | 2924 | "%s -c '(\"%%n\" (\"%%N\") %%h %s %s %%X.0 %%Y.0 %%Z.0 %%s.0 \"%%A\" t %%i.0 -1)'); " |
| 2925 | "echo \")\"") | 2925 | "echo \")\"") |
| 2926 | (tramp-shell-quote-argument localname) | 2926 | (tramp-shell-quote-argument localname) |
| @@ -2962,7 +2962,7 @@ value of `default-file-modes'." | |||
| 2962 | ;; rock. --daniel@danann.net | 2962 | ;; rock. --daniel@danann.net |
| 2963 | (tramp-send-command | 2963 | (tramp-send-command |
| 2964 | v | 2964 | v |
| 2965 | (format (concat "%s -ab 2>/dev/null | while read f; do " | 2965 | (format (concat "%s -a 2>/dev/null | while read f; do " |
| 2966 | "if %s -d \"$f\" 2>/dev/null; " | 2966 | "if %s -d \"$f\" 2>/dev/null; " |
| 2967 | "then echo \"$f/\"; else echo \"$f\"; fi; done") | 2967 | "then echo \"$f/\"; else echo \"$f\"; fi; done") |
| 2968 | (tramp-get-ls-command v) | 2968 | (tramp-get-ls-command v) |
| @@ -7763,6 +7763,10 @@ Only works for Bourne-like shells." | |||
| 7763 | ;; encoding routine. | 7763 | ;; encoding routine. |
| 7764 | ;; * It makes me wonder if tramp couldn't fall back to ssh when scp | 7764 | ;; * It makes me wonder if tramp couldn't fall back to ssh when scp |
| 7765 | ;; isn't on the remote host. (Mark A. Hershberger) | 7765 | ;; isn't on the remote host. (Mark A. Hershberger) |
| 7766 | ;; * To improve the behavior in case of things like "git status", it | ||
| 7767 | ;; might be worthwhile to add some way to indicate that a particular | ||
| 7768 | ;; use of process-file is (supposed to be) free of side-effects. | ||
| 7769 | ;; (Stefan Monnier) | ||
| 7766 | 7770 | ||
| 7767 | ;; Functions for file-name-handler-alist: | 7771 | ;; Functions for file-name-handler-alist: |
| 7768 | ;; diff-latest-backup-file -- in diff.el | 7772 | ;; diff-latest-backup-file -- in diff.el |