]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1042fc7)
Move defvars out of eval-when-compile.
authorStefan Monnier <monnier@iro.umontreal.ca>
Wed, 18 Jan 2006 16:43:46 +0000 (16:43 +0000)
committerStefan Monnier <monnier@iro.umontreal.ca>
Wed, 18 Jan 2006 16:43:46 +0000 (16:43 +0000)
(url-news-fetch-message-id, url-news-fetch-newsgroup): Use with-current-buffer.

lisp/url/ChangeLog patch | blob | history
lisp/url/url-news.el patch | blob | history

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 56d1faaa84d22a4b6dbde33b0f4acb675b744806..04cd080db8f4b3ab711c72efab86cd8586283155 100644 (file)
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * url-news.el: Move defvars out of eval-when-compile.
+       (url-news-fetch-message-id, url-news-fetch-newsgroup):
+       Use with-current-buffer.
+
 2006-01-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * url.el (url-retrieve-synchronously): Adjust the workaround so as not
diff --git a/lisp/url/url-news.el b/lisp/url/url-news.el
index 93a9dd5e504dd2c715e3d9195877a24941540157..47d4878c890d804feaafbdbd73691ce55ce39bff 100644 (file)
--- a/lisp/url/url-news.el
+++ b/lisp/url/url-news.el
@@ -1,7 +1,7 @@
 ;;; url-news.el --- News Uniform Resource Locator retrieval code
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes
 
@@ -30,10 +30,9 @@
 (require 'nntp)
 (autoload 'url-warn "url")
 (autoload 'gnus-group-read-ephemeral-group "gnus-group")
-(eval-when-compile
-  (require 'cl)
-  (defvar nntp-open-tls-stream)
-  (defvar nntp-open-ssl-stream))
+(eval-when-compile (require 'cl))
+(defvar nntp-open-tls-stream)
+(defvar nntp-open-ssl-stream)
 
 (defgroup url-news nil
   "News related options."
@@ -59,8 +58,7 @@
     (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"
@@ -97,8 +95,7 @@
   ;; 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)
@@ -117,9 +114,8 @@
         (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)))
@@ -138,5 +134,5 @@
 
 (provide 'url-news)
 
-;;; arch-tag: 8975be13-04e8-4d38-bfff-47918e3ad311
+;; arch-tag: 8975be13-04e8-4d38-bfff-47918e3ad311
 ;;; url-news.el ends here