;;; url-news.el --- News Uniform Resource Locator retrieval code
-;; Copyright (c) 1996 - 1999, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
+;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
;; Keywords: comm, data, processes
;; GNU Emacs is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
;; any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Code:
(eval-when-compile (require 'cl))
(defgroup url-news nil
- "News related options"
+ "News related options."
:group 'url)
(defun url-news-open-host (host port user pass)
(if (fboundp 'nnheader-init-server-buffer)
(nnheader-init-server-buffer))
- (nntp-open-server host (list (string-to-int port)))
+ (nntp-open-server host (list port))
(if (and user pass)
(progn
(nntp-send-command "^.*\r?\n" "AUTHINFO USER" user)
(if (cdr-safe (nntp-request-article message-id nil host buf))
;; Successfully retrieved the article
nil
- (save-excursion
- (set-buffer buf)
+ (with-current-buffer buf
(insert "Content-type: text/html\n\n"
"<html>\n"
" <head>\n"
;; This saves us from checking new news if Gnus is already running
;; FIXME - is it relatively safe to use gnus-alive-p here? FIXME
(if (or (not (get-buffer gnus-group-buffer))
- (save-excursion
- (set-buffer gnus-group-buffer)
+ (with-current-buffer gnus-group-buffer
(not (eq major-mode 'gnus-group-mode))))
(gnus))
(set-buffer gnus-group-buffer)
(goto-char (point-min))
(gnus-group-read-ephemeral-group newsgroup
(list 'nntp host
- 'nntp-open-connection-function
- nntp-open-connection-function)
+ (list 'nntp-open-connection-function
+ nntp-open-connection-function))
nil
(cons (current-buffer) 'browse)))
-
+
;;;###autoload
(defun url-news (url)
;; Find a news reference
(port (url-port url))
(article-brackets nil)
(buf nil)
- (article (url-filename url)))
+ (article (url-unhex-string (url-filename url))))
(url-news-open-host host port (url-user url) (url-password url))
- (setq article (url-unhex-string article))
(cond
((string-match "@" article) ; Its a specific article
(setq buf (url-news-fetch-message-id host article)))
;;;###autoload
(defun url-snews (url)
- (let ((nntp-open-connection-function (if (eq 'tls url-gateway-method)
- nntp-open-tls-stream
- nntp-open-ssl-stream)))
+ (let ((nntp-open-connection-function (if (eq 'ssl url-gateway-method)
+ 'nntp-open-ssl-stream
+ 'nntp-open-tls-stream)))
(url-news url)))
(provide 'url-news)
-;;; arch-tag: 8975be13-04e8-4d38-bfff-47918e3ad311
+;; arch-tag: 8975be13-04e8-4d38-bfff-47918e3ad311
;;; url-news.el ends here
HCoop / bpt / emacs.git / blobdiff