diff options
| author | Robert Pluim | 2022-01-14 09:03:53 +0100 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2022-01-14 09:26:06 +0100 |
| commit | 39114e1e2b2cf7042cb5e4e6b3a0367ebfd53555 (patch) | |
| tree | a001e12bf8fd81296fc9d2d23b0adea2800519b3 | |
| parent | 102dd6e59bcc49bab669ff35512e4d2008f34cde (diff) | |
| download | emacs-39114e1e2b2cf7042cb5e4e6b3a0367ebfd53555.tar.gz emacs-39114e1e2b2cf7042cb5e4e6b3a0367ebfd53555.zip | |
Improve some nntp/nnimap error messages
* lisp/gnus/nntp.el (nntp-send-string):
(nntp-wait-for):
(nntp-accept-process-output):
(nntp-possibly-change-group):
* lisp/gnus/nnimap.el (nnimap-retrieve-headers): Improve error
messages (bug#53070).
| -rw-r--r-- | lisp/gnus/nnimap.el | 2 | ||||
| -rw-r--r-- | lisp/gnus/nntp.el | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el index 090cb9b245b..cff628061e9 100644 --- a/lisp/gnus/nnimap.el +++ b/lisp/gnus/nnimap.el | |||
| @@ -246,7 +246,7 @@ during splitting, which may be slow." | |||
| 246 | (nnimap-header-parameters)) | 246 | (nnimap-header-parameters)) |
| 247 | t) | 247 | t) |
| 248 | (unless (process-live-p (get-buffer-process (current-buffer))) | 248 | (unless (process-live-p (get-buffer-process (current-buffer))) |
| 249 | (error "Server closed connection")) | 249 | (error "IMAP server %S closed connection" nnimap-address)) |
| 250 | (nnimap-transform-headers) | 250 | (nnimap-transform-headers) |
| 251 | (nnheader-remove-cr-followed-by-lf)) | 251 | (nnheader-remove-cr-followed-by-lf)) |
| 252 | (insert-buffer-substring | 252 | (insert-buffer-substring |
diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el index 624c64d4d75..0dcff9743ad 100644 --- a/lisp/gnus/nntp.el +++ b/lisp/gnus/nntp.el | |||
| @@ -306,7 +306,7 @@ backend doesn't catch this error.") | |||
| 306 | (nntp-record-command string)) | 306 | (nntp-record-command string)) |
| 307 | (process-send-string process (concat string nntp-end-of-line)) | 307 | (process-send-string process (concat string nntp-end-of-line)) |
| 308 | (or (memq (process-status process) '(open run)) | 308 | (or (memq (process-status process) '(open run)) |
| 309 | (nntp-report "Server closed connection"))) | 309 | (nntp-report "NNTP server %S closed connection" nntp-address))) |
| 310 | 310 | ||
| 311 | (defun nntp-record-command (string) | 311 | (defun nntp-record-command (string) |
| 312 | "Record the command STRING." | 312 | "Record the command STRING." |
| @@ -369,7 +369,7 @@ retried once before actually displaying the error report." | |||
| 369 | (nntp-snarf-error-message) | 369 | (nntp-snarf-error-message) |
| 370 | nil)) | 370 | nil)) |
| 371 | ((not (memq (process-status process) '(open run))) | 371 | ((not (memq (process-status process) '(open run))) |
| 372 | (nntp-report "Server closed connection")) | 372 | (nntp-report "NNTP server %S closed connection" nntp-address)) |
| 373 | (t | 373 | (t |
| 374 | (goto-char (point-max)) | 374 | (goto-char (point-max)) |
| 375 | (let ((limit (point-min)) | 375 | (let ((limit (point-min)) |
| @@ -1431,7 +1431,7 @@ If SEND-IF-FORCE, only send authinfo to the server if the | |||
| 1431 | ;; be the process's former output buffer (i.e. now killed) | 1431 | ;; be the process's former output buffer (i.e. now killed) |
| 1432 | (or (and process | 1432 | (or (and process |
| 1433 | (memq (process-status process) '(open run))) | 1433 | (memq (process-status process) '(open run))) |
| 1434 | (nntp-report "Server closed connection"))))) | 1434 | (nntp-report "NNTP server %S closed connection" nntp-address))))) |
| 1435 | 1435 | ||
| 1436 | (defun nntp-accept-response () | 1436 | (defun nntp-accept-response () |
| 1437 | "Wait for output from the process that outputs to BUFFER." | 1437 | "Wait for output from the process that outputs to BUFFER." |
| @@ -1450,7 +1450,7 @@ If SEND-IF-FORCE, only send authinfo to the server if the | |||
| 1450 | (when group | 1450 | (when group |
| 1451 | (let ((entry (nntp-find-connection-entry nntp-server-buffer))) | 1451 | (let ((entry (nntp-find-connection-entry nntp-server-buffer))) |
| 1452 | (cond ((not entry) | 1452 | (cond ((not entry) |
| 1453 | (nntp-report "Server closed connection")) | 1453 | (nntp-report "NNTP server %S closed connection" nntp-address)) |
| 1454 | ((not (equal group (caddr entry))) | 1454 | ((not (equal group (caddr entry))) |
| 1455 | (with-current-buffer (process-buffer (car entry)) | 1455 | (with-current-buffer (process-buffer (car entry)) |
| 1456 | (erase-buffer) | 1456 | (erase-buffer) |