diff options
| author | Reiner Steib | 2008-03-19 21:32:23 +0000 |
|---|---|---|
| committer | Reiner Steib | 2008-03-19 21:32:23 +0000 |
| commit | ea666a77e120ad8f6e8e9e1d0c9d0038cf8f792d (patch) | |
| tree | 71f1502ec4916d06335c6e49c40b28fc768e9c53 | |
| parent | aff67808c108e2b24bbc626d66647d6c759134b9 (diff) | |
| download | emacs-ea666a77e120ad8f6e8e9e1d0c9d0038cf8f792d.tar.gz emacs-ea666a77e120ad8f6e8e9e1d0c9d0038cf8f792d.zip | |
(open-tls-stream): Reindent.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/net/tls.el | 18 |
2 files changed, 13 insertions, 9 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ed6f30769b0..0616e34f96e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2008-03-19 Reiner Steib <Reiner.Steib@gmx.de> | ||
| 2 | |||
| 3 | * net/tls.el (open-tls-stream): Reindent. | ||
| 4 | |||
| 1 | 2008-03-19 Michael Albinus <michael.albinus@gmx.de> | 5 | 2008-03-19 Michael Albinus <michael.albinus@gmx.de> |
| 2 | 6 | ||
| 3 | * net/tramp.el (tramp-let-maybe): Removed. | 7 | * net/tramp.el (tramp-let-maybe): Removed. |
diff --git a/lisp/net/tls.el b/lisp/net/tls.el index 9360a905861..7dc563af995 100644 --- a/lisp/net/tls.el +++ b/lisp/net/tls.el | |||
| @@ -251,19 +251,19 @@ Fourth arg PORT is an integer specifying a port to connect to." | |||
| 251 | ;; `openssl s_client' and `gnutls' print | 251 | ;; `openssl s_client' and `gnutls' print |
| 252 | (let ((start-of-data nil)) | 252 | (let ((start-of-data nil)) |
| 253 | (while | 253 | (while |
| 254 | (not (setq start-of-data | 254 | (not (setq start-of-data |
| 255 | ;; the string matching `tls-end-of-info' | 255 | ;; the string matching `tls-end-of-info' |
| 256 | ;; might come in separate chunks from | 256 | ;; might come in separate chunks from |
| 257 | ;; `accept-process-output', so start the | 257 | ;; `accept-process-output', so start the |
| 258 | ;; search where `tls-success' ended | 258 | ;; search where `tls-success' ended |
| 259 | (save-excursion | 259 | (save-excursion |
| 260 | (if (re-search-forward tls-end-of-info nil t) | 260 | (if (re-search-forward tls-end-of-info nil t) |
| 261 | (match-end 0))))) | 261 | (match-end 0))))) |
| 262 | (accept-process-output process 1)) | 262 | (accept-process-output process 1)) |
| 263 | (if start-of-data | 263 | (if start-of-data |
| 264 | ;; move point to start of client data | 264 | ;; move point to start of client data |
| 265 | (goto-char start-of-data))) | 265 | (goto-char start-of-data))) |
| 266 | (setq done process)))) | 266 | (setq done process)))) |
| 267 | (when (and done | 267 | (when (and done |
| 268 | (or | 268 | (or |
| 269 | (and tls-checktrust | 269 | (and tls-checktrust |