mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-28 16:21:07 -08:00
Code Issues Projects Releases Wiki Activity

Fix problem with changing to correct NNTP server

Browse source 
* lisp/gnus/nntp.el (nntp-close-server):
* lisp/gnus/nnimap.el (nnimap-close-server):
* lisp/gnus/gnus-int.el (gnus-close-server): Take an optional DEFS
parameter to enable switching to the correct nnoo server (bug#20319)
when there's two servers with the same address.
This commit is contained in:
Lars Ingebrigtsen 2019-09-27 02:17:14 +02:00
parent fd6f4bf648
commit 2712187032
7 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lisp/gnus/gnus-int.el
View file

@ -352,7 +352,8 @@ If it is down, start it up (again)."
(when (stringp gnus-command-method)
(setq gnus-command-method (gnus-server-to-method gnus-command-method)))
(funcall (gnus-get-function gnus-command-method 'close-server)
(nth 1 gnus-command-method)))
(nth 1 gnus-command-method)
(nthcdr 2 gnus-command-method)))
(defun gnus-request-list (gnus-command-method)
"Request the active file from GNUS-COMMAND-METHOD."

2
lisp/gnus/nnbabyl.el
View file

@ -130,7 +130,7 @@
nnbabyl-mbox-file)
t)))
(deffoo nnbabyl-close-server (&optional server)
(deffoo nnbabyl-close-server (&optional server _defs)
;; Restore buffer mode.
(when (and (nnbabyl-server-opened)
nnbabyl-previous-buffer-mode)

4
lisp/gnus/nnimap.el
View file

@ -627,8 +627,8 @@ textual parts.")
(setq result (cdr (cadr elem))))))
result))
(deffoo nnimap-close-server (&optional server)
(when (nnoo-change-server 'nnimap server nil)
(deffoo nnimap-close-server (&optional server defs)
(when (nnoo-change-server 'nnimap server defs)
(ignore-errors
(delete-process (get-buffer-process (nnimap-buffer))))
(nnoo-close-server 'nnimap server)

2
lisp/gnus/nnmbox.el
View file

@ -130,7 +130,7 @@
nnmbox-mbox-file)
t)))
(deffoo nnmbox-close-server (&optional server)
(deffoo nnmbox-close-server (&optional server _defs)
(when (buffer-live-p nnmbox-mbox-buffer)
(kill-buffer nnmbox-mbox-buffer))
(nnoo-close-server 'nnmbox server)

2
lisp/gnus/nnregistry.el
View file

@ -39,7 +39,7 @@
(deffoo nnregistry-server-opened (server)
gnus-registry-enabled)
(deffoo nnregistry-close-server (server)
(deffoo nnregistry-close-server (server &optional defs)
t)
(deffoo nnregistry-status-message (server)

3
lisp/gnus/nntp.el
View file

@ -1062,7 +1062,8 @@ command whose response triggered the error."
(or (nntp-find-connection nntp-server-buffer)
(nntp-open-connection nntp-server-buffer)))))
(deffoo nntp-close-server (&optional server)
(deffoo nntp-close-server (&optional server defs)
(nnoo-change-server 'nntp server defs)
(nntp-possibly-change-group nil server t)
(let ((process (nntp-find-connection nntp-server-buffer)))
(while process

2
lisp/gnus/nnweb.el
View file

@ -170,7 +170,7 @@ Valid types include `google', `dejanews', and `gmane'.")
(nnheader-report 'nnweb "Fetched article %s" article)
(cons group (and (numberp article) article))))))
(deffoo nnweb-close-server (&optional server)
(deffoo nnweb-close-server (&optional server _defs)
(when (and (nnweb-server-opened server)
(gnus-buffer-live-p nnweb-buffer))
(with-current-buffer nnweb-buffer