diff options
| author | Michael Albinus | 2023-11-22 13:29:19 +0100 |
|---|---|---|
| committer | Michael Albinus | 2023-11-22 13:29:19 +0100 |
| commit | 8256bf4cdfbdc12838c20b00edcaedddcdf08a32 (patch) | |
| tree | afaef8f7ab6c7368288e237e46fec59b52ab3c05 | |
| parent | 81b63ec032fefcc2c98149d31b667b61691e700d (diff) | |
| download | emacs-8256bf4cdfbdc12838c20b00edcaedddcdf08a32.tar.gz emacs-8256bf4cdfbdc12838c20b00edcaedddcdf08a32.zip | |
Fix CRLF handling in Tramp (don't merge)
* lisp/net/tramp-sh.el (tramp-send-command-and-read): Use 'space'
instead of 'blank' in rx expression, in order to handle also CR
and alike. Reported by Dominique Quatravaux
<dominique@quatravaux.org>.
| -rw-r--r-- | lisp/net/tramp-sh.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 7dc75cb337a..aa1d025bf19 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el | |||
| @@ -5509,7 +5509,7 @@ raises an error." | |||
| 5509 | (unless noerror signal-hook-function))) | 5509 | (unless noerror signal-hook-function))) |
| 5510 | (read (current-buffer))) | 5510 | (read (current-buffer))) |
| 5511 | ;; Error handling. | 5511 | ;; Error handling. |
| 5512 | (when (re-search-forward (rx (not blank)) (line-end-position) t) | 5512 | (when (re-search-forward (rx (not space)) (line-end-position) t) |
| 5513 | (error nil))) | 5513 | (error nil))) |
| 5514 | (error (unless noerror | 5514 | (error (unless noerror |
| 5515 | (tramp-error | 5515 | (tramp-error |