projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2003-02-19 Reiner Steib <Reiner.Steib@gmx.de>
[gnus]
/
lisp
/
nnsoup.el
diff --git
a/lisp/nnsoup.el
b/lisp/nnsoup.el
index
93451d1
..
009a1d3
100644
(file)
--- a/
lisp/nnsoup.el
+++ b/
lisp/nnsoup.el
@@
-1,10
+1,10
@@
;;; nnsoup.el --- SOUP access for Gnus
;;; nnsoup.el --- SOUP access for Gnus
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000
, 2001, 2002, 2003
;; Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
-;; Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
+;; Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
;; Keywords: news, mail
;; This file is part of GNU Emacs.
;; Keywords: news, mail
;; This file is part of GNU Emacs.
@@
-114,7
+114,7
@@
backend for the messages.")
;; articles in SEQUENCE come from.
(while (and areas sequence)
;; Peel off areas that are below sequence.
;; articles in SEQUENCE come from.
(while (and areas sequence)
;; Peel off areas that are below sequence.
- (while (and areas (< (cda
ar areas
) (car sequence)))
+ (while (and areas (< (cda
r (car areas)
) (car sequence)))
(setq areas (cdr areas)))
(when areas
;; This is a useful area.
(setq areas (cdr areas)))
(when areas
;; This is a useful area.
@@
-130,7
+130,7
@@
backend for the messages.")
(setq use-nov nil))
;; We assign the portion of `sequence' that is relevant to
;; this MSG packet to this packet.
(setq use-nov nil))
;; We assign the portion of `sequence' that is relevant to
;; this MSG packet to this packet.
- (while (and sequence (<= (car sequence) (cda
ar areas
)))
+ (while (and sequence (<= (car sequence) (cda
r (car areas)
)))
(push (car sequence) this-area-seq)
(setq sequence (cdr sequence)))
(setcar useful-areas (cons (nreverse this-area-seq)
(push (car sequence) this-area-seq)
(setq sequence (cdr sequence)))
(setcar useful-areas (cons (nreverse this-area-seq)
@@
-158,7
+158,7
@@
backend for the messages.")
(when index-buffer
(insert-buffer-substring index-buffer)
(goto-char b)
(when index-buffer
(insert-buffer-substring index-buffer)
(goto-char b)
- ;; We have to remove the index number ent
ir
es and
+ ;; We have to remove the index number ent
ri
es and
;; insert article numbers instead.
(while (looking-at "[0-9]+")
(replace-match (int-to-string number) t t)
;; insert article numbers instead.
(while (looking-at "[0-9]+")
(replace-match (int-to-string number) t t)
@@
-249,7
+249,7
@@
backend for the messages.")
;; Try to guess the type based on the first article in the group.
(when (not article)
(setq article
;; Try to guess the type based on the first article in the group.
(when (not article)
(setq article
- (cda
ar (cddr (assoc group nnsoup-group-alist
)))))
+ (cda
r (car (cddr (assoc group nnsoup-group-alist)
)))))
(if (not article)
'unknown
(let ((kind (gnus-soup-encoding-kind
(if (not article)
'unknown
(let ((kind (gnus-soup-encoding-kind
@@
-257,7
+257,7
@@
backend for the messages.")
(nth 1 (nnsoup-article-to-area
article nnsoup-current-group))))))
(cond ((= kind ?m) 'mail)
(nth 1 (nnsoup-article-to-area
article nnsoup-current-group))))))
(cond ((= kind ?m) 'mail)
- ((= kind ?n) 'news)
+ ((= kind ?n) 'news)
(t 'unknown)))))
(deffoo nnsoup-close-group (group &optional server)
(t 'unknown)))))
(deffoo nnsoup-close-group (group &optional server)
@@
-337,7
+337,7
@@
backend for the messages.")
(delete-file (nnsoup-file prefix t)))
t)
(setcdr (cdr total-infolist) (delq info (cddr total-infolist)))
(delete-file (nnsoup-file prefix t)))
t)
(setcdr (cdr total-infolist) (delq info (cddr total-infolist)))
- (setq articles (gnus-sorted-
complement
articles range-list))))
+ (setq articles (gnus-sorted-
difference
articles range-list))))
(when (not mod-time)
(setcdr (cdr total-infolist) (delq info (cddr total-infolist)))))
(if (cddr total-infolist)
(when (not mod-time)
(setcdr (cdr total-infolist) (delq info (cddr total-infolist)))))
(if (cddr total-infolist)
@@
-371,7
+371,7
@@
backend for the messages.")
(setq min (caaar e))
(while (cdr e)
(setq e (cdr e)))
(setq min (caaar e))
(while (cdr e)
(setq e (cdr e)))
- (setq max (cda
ar e
))
+ (setq max (cda
r (car e)
))
(setcdr entry (cons (cons min max) (cdr entry)))))
(setq nnsoup-group-alist-touched t))
nnsoup-group-alist))
(setcdr entry (cons (cons min max) (cdr entry)))))
(setq nnsoup-group-alist-touched t))
nnsoup-group-alist))
@@
-399,7
+399,7
@@
backend for the messages.")
prefix))
(defun nnsoup-file-name (dir file)
prefix))
(defun nnsoup-file-name (dir file)
- "Return the full
path
of FILE (in any case) in DIR."
+ "Return the full
name
of FILE (in any case) in DIR."
(let* ((case-fold-search t)
(files (directory-files dir t))
(regexp (concat (regexp-quote file) "$")))
(let* ((case-fold-search t)
(files (directory-files dir t))
(regexp (concat (regexp-quote file) "$")))
@@
-651,25
+651,25
@@
backend for the messages.")
(defun nnsoup-article-to-area (article group)
"Return the area that ARTICLE in GROUP is located in."
(let ((areas (cddr (assoc group nnsoup-group-alist))))
(defun nnsoup-article-to-area (article group)
"Return the area that ARTICLE in GROUP is located in."
(let ((areas (cddr (assoc group nnsoup-group-alist))))
- (while (and areas (< (cda
ar areas
) article))
+ (while (and areas (< (cda
r (car areas)
) article))
(setq areas (cdr areas)))
(and areas (car areas))))
(defvar nnsoup-old-functions
(setq areas (cdr areas)))
(and areas (car areas))))
(defvar nnsoup-old-functions
- (list message-send-mail-function message-send-news-function))
+ (list message-send-mail-
real-
function message-send-news-function))
;;;###autoload
(defun nnsoup-set-variables ()
"Use the SOUP methods for posting news and mailing mail."
(interactive)
(setq message-send-news-function 'nnsoup-request-post)
;;;###autoload
(defun nnsoup-set-variables ()
"Use the SOUP methods for posting news and mailing mail."
(interactive)
(setq message-send-news-function 'nnsoup-request-post)
- (setq message-send-mail-function 'nnsoup-request-mail))
+ (setq message-send-mail-
real-
function 'nnsoup-request-mail))
;;;###autoload
(defun nnsoup-revert-variables ()
"Revert posting and mailing methods to the standard Emacs methods."
(interactive)
;;;###autoload
(defun nnsoup-revert-variables ()
"Revert posting and mailing methods to the standard Emacs methods."
(interactive)
- (setq message-send-mail-function (car nnsoup-old-functions))
+ (setq message-send-mail-
real-
function (car nnsoup-old-functions))
(setq message-send-news-function (cadr nnsoup-old-functions)))
(defun nnsoup-store-reply (kind)
(setq message-send-news-function (cadr nnsoup-old-functions)))
(defun nnsoup-store-reply (kind)