Fix.

[elisp/gnus.git-] / lisp / nndb.el

diff --git a/lisp/nndb.el b/lisp/nndb.el
index 6cc95c3..fa5e641 100644 (file)
--- a/lisp/nndb.el
+++ b/lisp/nndb.el
@@ -1,6 +1,6 @@
 ;;; nndb.el --- nndb access for Gnus
 
-;; Copyright (C) 1997, 1998, 2000 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 2000, 2003 Free Software Foundation, Inc.
 
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
 ;;         Kai Grossjohann <grossjohann@ls6.informatik.uni-dortmund.de>
@@ -8,7 +8,7 @@
 ;;         David Blacka <davidb@rwhois.net>
 ;; Keywords: news
 
-;; This file is NOT part of GNU Emacs.
+;; This file is part of GNU Emacs.
 
 ;; 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
@@ -60,12 +60,6 @@
 (eval-when-compile (require 'cl))
 
 (eval-and-compile
-  (unless (fboundp 'open-network-stream)
-    (require 'tcp)))
-
-(eval-when-compile (require 'cl))
-
-(eval-and-compile
   (autoload 'news-setup "rnewspost")
   (autoload 'news-reply-mode "rnewspost")
   (autoload 'cancel-timer "timer")
@@ -202,12 +196,12 @@ article was posted to nndb")
     (set-buffer nntp-server-buffer)
     (goto-char (point-min))
     (if (looking-at "^[34]")
-       ;; x-expire returned error--presume no articles were expirable)
+       ;; x-expire returned error--presume no articles were expirable)
        (setq list nil)
       ;; otherwise, pull all of the following numbers into the list
       (re-search-forward "follows\r?\n?" nil t)
       (while (re-search-forward "^[0-9]+$" nil t)
-      (push (string-to-int (match-string 0)) list)))
+       (push (string-to-int (match-string 0)) list)))
     list))
 
 (defun nndb-request-expire-articles-remote
@@ -219,15 +213,15 @@ article was posted to nndb")
     ;; first calculate the wait period in days
     (setq days (or (and nnmail-expiry-wait-function
                        (funcall nnmail-expiry-wait-function group))
-    nnmail-expiry-wait))
+                  nnmail-expiry-wait))
     ;; now handle the special cases
     (cond (force
-    (setq days 0))
+          (setq days 0))
          ((eq days 'never)
           ;; This isn't an expirable group.
-         (setq days -1))
+          (setq days -1))
          ((eq days 'immediate)
-         (setq days 0)))
+          (setq days 0)))
 
 
     ;; build article string
@@ -268,19 +262,19 @@ Optional LAST is ignored."
          (cons new-group article))
       ;; else move normally
       (let ((artbuf (get-buffer-create " *nndb move*")))
-      (and
-       (nndb-request-article article group server artbuf)
-       (save-excursion
-        (set-buffer artbuf)
-        (insert-buffer-substring nntp-server-buffer)
-        (setq result (eval accept-form))
-        (kill-buffer (current-buffer))
-        result)
-       (nndb-request-expire-articles (list article)
-                                    group
-                                    server
-                                    t))
-      result)
+       (and
+        (nndb-request-article article group server artbuf)
+        (save-excursion
+          (set-buffer artbuf)
+          (insert-buffer-substring nntp-server-buffer)
+          (setq result (eval accept-form))
+          (kill-buffer (current-buffer))
+          result)
+        (nndb-request-expire-articles (list article)
+                                      group
+                                      server
+                                      t))
+       result)
       )))
 
 (deffoo nndb-request-accept-article (group server &optional last)
@@ -292,7 +286,7 @@ Optional LAST is ignored."
       (nntp-send-buffer "^[23].*\n"))
 
     (set-buffer nntp-server-buffer)
-    (setq msg (buffer-substring (point-min) (point-max)))
+    (setq msg (buffer-string))
     (or (string-match "^\\([0-9]+\\)" msg)
        (error "nndb: %s" msg))
     (setq art (substring msg (match-beginning 1) (match-end 1)))
@@ -307,18 +301,18 @@ Optional LAST is ignored."
     (nntp-send-buffer "^[23.*\n")
     (list (int-to-string article))))
 
-                           ; nndb-request-delete-group does not exist
-                                       ; todo -- maybe later
+; nndb-request-delete-group does not exist
+; todo -- maybe later
 
-                           ; nndb-request-rename-group does not exist
-                                       ; todo -- maybe later
+; nndb-request-rename-group does not exist
+; todo -- maybe later
 
 ;; -- standard compatability functions
 
 (deffoo nndb-status-message (&optional server)
   "Return server status as a string."
   (set-buffer nntp-server-buffer)
-  (buffer-substring (point-min) (point-max)))
+  (buffer-string))
 
 ;; Import stuff from nntp