X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fnndb.el;h=d8fb469cd19f08b4678ddc0f31df3a22e1032555;hb=f6b79c02c26ec6357bda3d838be9c59858244a38;hp=9a3efbac0dc00683a557b5e1ce6603b396edd166;hpb=9dc12b9ca22173804a9fe992e95f0feb774bf828;p=elisp%2Fgnus.git- diff --git a/lisp/nndb.el b/lisp/nndb.el index 9a3efba..d8fb469 100644 --- a/lisp/nndb.el +++ b/lisp/nndb.el @@ -1,5 +1,6 @@ ;;; nndb.el --- nndb access for Gnus -;; Copyright (C) 1997,98 Free Software Foundation, Inc. + +;; Copyright (C) 1997, 1998, 2000 Free Software Foundation, Inc. ;; Author: Masanobu UMEDA ;; Kai Grossjohann @@ -59,18 +60,11 @@ (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") (autoload 'telnet "telnet" nil t) (autoload 'telnet-send-input "telnet" nil t) - (autoload 'timezone-parse-date "timezone") (autoload 'gnus-declare-backend "gnus-start")) ;; Declare nndb as derived from nntp @@ -84,13 +78,13 @@ "*The program used to put a message in an NNDB group.") (defvoo nndb-server-side-expiry nil - "If t, expiry calculation will occur on the server side") + "If t, expiry calculation will occur on the server side.") (defvoo nndb-set-expire-date-on-mark nil "If t, the expiry date for a given article will be set to the time it was marked as expireable; otherwise the date will be the time the article was posted to nndb") - + ;; Variables copied from nntp (defvoo nndb-server-opened-hook '(nntp-send-authinfo-from-file) @@ -140,7 +134,7 @@ article was posted to nndb") (push art rest))) rest)) - + ;; (deffoo nndb-request-type (group &optional article) nndb-article-type) @@ -153,7 +147,7 @@ article was posted to nndb") (nntp-send-command nil "X-TOUCH" article)) (deffoo nndb-request-update-mark - (group article mark) + (group article mark) "Sets the expiry date for ARTICLE in GROUP to now, if the mark is 'E'" (if (and nndb-set-expire-date-on-mark (string-equal mark "E")) (nndb-touch-article group article)) @@ -175,7 +169,7 @@ article was posted to nndb") (nntp-send-command "^\\([23]\\|^423\\).*\n" "X-DATE" art) (setq msg (nndb-status-message)) (if (string-match "^423" msg) - () + () (or (string-match "'\\(.+\\)'" msg) (error "Not a valid response for X-DATE command: %s" msg)) @@ -188,12 +182,12 @@ article was posted to nndb") (setq num-delete (1+ num-delete))) (push art rest)))) (if (> (length delete-list) 0) - (progn + (progn (nnheader-message 5 "Deleting %s article(s) from %s" (int-to-string num-delete) group) (nntp-send-command "^[23].*\n" "X-DELETE" delete-list)) ) - + (nnheader-message 5 "") (nconc rest articles))) @@ -215,7 +209,7 @@ article was posted to nndb") "Let the nndb backend expire articles" (let (days art-string delete-list (num-delete 0)) (nntp-possibly-change-group group server) - + ;; first calculate the wait period in days (setq days (or (and nnmail-expiry-wait-function (funcall nnmail-expiry-wait-function group)) @@ -228,12 +222,12 @@ article was posted to nndb") (setq days -1)) ((eq days 'immediate) (setq days 0))) - + ;; build article string (setq art-string (concat days " " (nndb-build-article-string articles))) (nntp-send-command "^\.\r?\n\\|^[345].*\n" "X-EXPIRE" art-string) - + (setq delete-list (nndb-get-remote-expire-response)) (setq num-delete (length delete-list)) (if (> num-delete 0) @@ -260,7 +254,7 @@ Optional LAST is ignored." ;; which it will be for nndb, which is all that matters anyway (let ((new-group (nth 1 accept-form)) result) (nntp-possibly-change-group group server) - + ;; use the move command for nndb-to-nndb moves (if (string-match "^nndb" new-group) (let ((new-group-name (gnus-group-real-name new-group))) @@ -282,7 +276,7 @@ Optional LAST is ignored." t)) result) ))) - + (deffoo nndb-request-accept-article (group server &optional last) "The article in the current buffer is put into GROUP." (nntp-possibly-change-group group server) @@ -290,9 +284,9 @@ Optional LAST is ignored." (when (nntp-send-command "^[23].*\r?\n" "ACCEPT" group) (nnheader-insert "") (nntp-send-buffer "^[23].*\n")) - + (set-buffer nntp-server-buffer) - (setq msg (buffer-string (point-min) (point-max))) + (setq msg (buffer-substring (point-min) (point-max))) (or (string-match "^\\([0-9]+\\)" msg) (error "nndb: %s" msg)) (setq art (substring msg (match-beginning 1) (match-end 1))) @@ -300,8 +294,7 @@ Optional LAST is ignored." (list art))) (deffoo nndb-request-replace-article (article group buffer) - "ARTICLE is the number of the article in GROUP to be replaced -with the contents of the BUFFER." + "ARTICLE is the number of the article in GROUP to be replaced with the contents of the BUFFER." (set-buffer buffer) (when (nntp-send-command "^[23].*\r?\n" "X-REPLACE" (int-to-string article)) (nnheader-insert "") @@ -319,7 +312,7 @@ with the contents of the BUFFER." (deffoo nndb-status-message (&optional server) "Return server status as a string." (set-buffer nntp-server-buffer) - (buffer-string (point-min) (point-max))) + (buffer-substring (point-min) (point-max))) ;; Import stuff from nntp @@ -328,5 +321,4 @@ with the contents of the BUFFER." (provide 'nndb) - - +;;; nndb.el ends here