aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2015-02-15 23:10:06 +0000
committerKatsumi Yamaoka2015-02-15 23:10:06 +0000
commit6090b8f68dfc37bfe8bee539fc43149f9dd5d6bb (patch)
tree74aa0a460b1bd23e382ff8f86073bfd84975449e
parent4aafd19a0e800607e36779f423052df8b7a84f5f (diff)
downloademacs-6090b8f68dfc37bfe8bee539fc43149f9dd5d6bb.tar.gz
emacs-6090b8f68dfc37bfe8bee539fc43149f9dd5d6bb.zip
Revert previous patch
(let ((url-news-server "news.gmane.org")) (url-retrieve-synchronously "news:87y4p9y2cq.fsf@violet.siamics.net")) works fine for me
-rw-r--r--lisp/gnus/ChangeLog5
-rw-r--r--lisp/gnus/nntp.el3
2 files changed, 1 insertions, 7 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index df331984865..b9ae796782d 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,8 +1,3 @@
12015-02-14 Ivan Shmakov <ivan@siamics.net>
2
3 * nntp.el (nntp-open-server): Set variables in the correct buffer
4 (bug#19583).
5
62015-02-14 Lars Ingebrigtsen <larsi@gnus.org> 12015-02-14 Lars Ingebrigtsen <larsi@gnus.org>
7 2
8 * mm-decode.el (mm-head-p): New function. 3 * mm-decode.el (mm-head-p): New function.
diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el
index a86f45e8bf3..0891dba0387 100644
--- a/lisp/gnus/nntp.el
+++ b/lisp/gnus/nntp.el
@@ -1066,8 +1066,7 @@ command whose response triggered the error."
1066 (setq defs (cons (list 'nntp-port-number (car defs)) (cdr defs)))) 1066 (setq defs (cons (list 'nntp-port-number (car defs)) (cdr defs))))
1067 (unless (assq 'nntp-address defs) 1067 (unless (assq 'nntp-address defs)
1068 (setq defs (append defs (list (list 'nntp-address server))))) 1068 (setq defs (append defs (list (list 'nntp-address server)))))
1069 (with-current-buffer nntp-server-buffer 1069 (nnoo-change-server 'nntp server defs)
1070 (nnoo-change-server 'nntp server defs))
1071 (if connectionless 1070 (if connectionless
1072 t 1071 t
1073 (or (nntp-find-connection nntp-server-buffer) 1072 (or (nntp-find-connection nntp-server-buffer)