projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2005-03-08 Juergen Kreileder <jk@blackdown.de> (tiny change)
[gnus]
/
lisp
/
nnmh.el
diff --git
a/lisp/nnmh.el
b/lisp/nnmh.el
index
20a427b
..
7bc5221
100644
(file)
--- a/
lisp/nnmh.el
+++ b/
lisp/nnmh.el
@@
-1,8
+1,10
@@
;;; nnmh.el --- mhspool access for Gnus
;;; nnmh.el --- mhspool access for Gnus
-;; Copyright (C) 1995,96,97,98,99 Free Software Foundation, Inc.
+
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2003
+;; Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; 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.
@@
-39,16
+41,19
@@
(nnoo-declare nnmh)
(defvoo nnmh-directory message-directory
(nnoo-declare nnmh)
(defvoo nnmh-directory message-directory
- "
*
Mail spool directory.")
+ "Mail spool directory.")
(defvoo nnmh-get-new-mail t
(defvoo nnmh-get-new-mail t
- "
*
If non-nil, nnmh will check the incoming mail file and split the mail.")
+ "If non-nil, nnmh will check the incoming mail file and split the mail.")
(defvoo nnmh-prepare-save-mail-hook nil
(defvoo nnmh-prepare-save-mail-hook nil
- "
*
Hook run narrowed to an article before saving.")
+ "Hook run narrowed to an article before saving.")
(defvoo nnmh-be-safe nil
(defvoo nnmh-be-safe nil
- "*If non-nil, nnmh will check all articles to make sure whether they are new or not.")
+ "If non-nil, nnmh will check all articles to make sure whether they are new or not.
+Go through the .nnmh-articles file and compare with the actual
+articles in this folder. The articles that are \"new\" will be marked
+as unread by Gnus.")
\f
\f
@@
-60,6
+65,9
@@
(defvoo nnmh-status-string "")
(defvoo nnmh-group-alist nil)
(defvoo nnmh-status-string "")
(defvoo nnmh-group-alist nil)
+;; Don't even think about setting this variable. It does not exist.
+;; Forget about it. Uh-huh. Nope. Nobody here. It's only bound
+;; dynamically by certain functions in nndraft.
(defvar nnmh-allow-delete-final nil)
\f
(defvar nnmh-allow-delete-final nil)
\f
@@
-77,7
+85,7
@@
(large (and (numberp nnmail-large-newsgroup)
(> number nnmail-large-newsgroup)))
(count 0)
(large (and (numberp nnmail-large-newsgroup)
(> number nnmail-large-newsgroup)))
(count 0)
- (
pathname-coding-system 'binary
)
+ (
file-name-coding-system nnmail-pathname-coding-system
)
beg article)
(nnmh-possibly-change-directory newsgroup server)
;; We don't support fetching by Message-ID.
beg article)
(nnmh-possibly-change-directory newsgroup server)
;; We don't support fetching by Message-ID.
@@
-136,7
+144,7
@@
(let ((file (if (stringp id)
nil
(concat nnmh-current-directory (int-to-string id))))
(let ((file (if (stringp id)
nil
(concat nnmh-current-directory (int-to-string id))))
- (
pathname-coding-system 'binary
)
+ (
file-name-coding-system nnmail-pathname-coding-system
)
(nntp-server-buffer (or buffer nntp-server-buffer)))
(and (stringp file)
(file-exists-p file)
(nntp-server-buffer (or buffer nntp-server-buffer)))
(and (stringp file)
(file-exists-p file)
@@
-148,7
+156,7
@@
(nnheader-init-server-buffer)
(nnmh-possibly-change-directory group server)
(let ((pathname (nnmail-group-pathname group nnmh-directory))
(nnheader-init-server-buffer)
(nnmh-possibly-change-directory group server)
(let ((pathname (nnmail-group-pathname group nnmh-directory))
- (
pathname-coding-system 'binary
)
+ (
file-name-coding-system nnmail-pathname-coding-system
)
dir)
(cond
((not (file-directory-p pathname))
dir)
(cond
((not (file-directory-p pathname))
@@
-168,7
+176,7
@@
(nnheader-re-read-dir pathname)
(setq dir
(sort
(nnheader-re-read-dir pathname)
(setq dir
(sort
- (mapcar
(lambda (name) (string-to-int name))
+ (mapcar
'string-to-int
(directory-files pathname nil "^[0-9]+$" t))
'<))
(cond
(directory-files pathname nil "^[0-9]+$" t))
'<))
(cond
@@
-191,7
+199,7
@@
(deffoo nnmh-request-list (&optional server dir)
(nnheader-insert "")
(nnmh-possibly-change-directory nil server)
(deffoo nnmh-request-list (&optional server dir)
(nnheader-insert "")
(nnmh-possibly-change-directory nil server)
- (let ((
pathname-coding-system 'binary
)
+ (let ((
file-name-coding-system nnmail-pathname-coding-system
)
(nnmh-toplev
(file-truename (or dir (file-name-as-directory nnmh-directory)))))
(nnmh-request-list-1 nnmh-toplev))
(nnmh-toplev
(file-truename (or dir (file-name-as-directory nnmh-directory)))))
(nnmh-request-list-1 nnmh-toplev))
@@
-203,7
+211,6
@@
(setq dir (expand-file-name dir))
;; Recurse down all directories.
(let ((dirs (and (file-readable-p dir)
(setq dir (expand-file-name dir))
;; Recurse down all directories.
(let ((dirs (and (file-readable-p dir)
- (> (nth 1 (file-attributes (file-chase-links dir))) 2)
(nnheader-directory-files dir t nil t)))
rdir)
;; Recurse down directories.
(nnheader-directory-files dir t nil t)))
rdir)
;; Recurse down directories.
@@
-215,26
+222,27
@@
(nnmh-request-list-1 rdir))))
;; For each directory, generate an active file line.
(unless (string= (expand-file-name nnmh-toplev) dir)
(nnmh-request-list-1 rdir))))
;; For each directory, generate an active file line.
(unless (string= (expand-file-name nnmh-toplev) dir)
- (let ((files (mapcar
- (lambda (name) (string-to-int name))
- (directory-files dir nil "^[0-9]+$" t))))
+ (let ((files (mapcar 'string-to-int
+ (directory-files dir nil "^[0-9]+$" t))))
(when files
(save-excursion
(set-buffer nntp-server-buffer)
(goto-char (point-max))
(insert
(format
(when files
(save-excursion
(set-buffer nntp-server-buffer)
(goto-char (point-max))
(insert
(format
- "%s %
d %d
y\n"
+ "%s %
.0f %.0f
y\n"
(progn
(string-match
(regexp-quote
(file-truename (file-name-as-directory
(expand-file-name nnmh-toplev))))
dir)
(progn
(string-match
(regexp-quote
(file-truename (file-name-as-directory
(expand-file-name nnmh-toplev))))
dir)
- (nnheader-replace-chars-in-string
- (mm-decode-coding-string (substring dir (match-end 0))
- nnmail-pathname-coding-system)
- ?/ ?.))
+ (mm-string-as-multibyte
+ (mm-encode-coding-string
+ (nnheader-replace-chars-in-string
+ (substring dir (match-end 0))
+ ?/ ?.)
+ nnmail-pathname-coding-system)))
(apply 'max files)
(apply 'min files)))))))
t)
(apply 'max files)
(apply 'min files)))))))
t)
@@
-257,6
+265,13
@@
(setq is-old
(nnmail-expired-article-p newsgroup mod-time force)))
(progn
(setq is-old
(nnmail-expired-article-p newsgroup mod-time force)))
(progn
+ ;; Allow a special target group. -- jcn
+ (unless (eq nnmail-expiry-target 'delete)
+ (with-temp-buffer
+ (nnmh-request-article (car articles)
+ newsgroup server (current-buffer))
+ (nnmail-expiry-target-group
+ nnmail-expiry-target newsgroup)))
(nnheader-message 5 "Deleting article %s in %s..."
article newsgroup)
(condition-case ()
(nnheader-message 5 "Deleting article %s in %s..."
article newsgroup)
(condition-case ()
@@
-273,8
+288,8
@@
(deffoo nnmh-close-group (group &optional server)
t)
(deffoo nnmh-close-group (group &optional server)
t)
-(deffoo nnmh-request-move-article
-
(article group server accept-form &optional last
)
+(deffoo nnmh-request-move-article
(article group server accept-form
+
&optional last move-is-internal
)
(let ((buf (get-buffer-create " *nnmh move*"))
result)
(and
(let ((buf (get-buffer-create " *nnmh move*"))
result)
(and
@@
-299,7
+314,10
@@
(nnmh-possibly-change-directory group server)
(nnmail-check-syntax)
(when nnmail-cache-accepted-message-ids
(nnmh-possibly-change-directory group server)
(nnmail-check-syntax)
(when nnmail-cache-accepted-message-ids
- (nnmail-cache-insert (nnmail-fetch-field "message-id")))
+ (nnmail-cache-insert (nnmail-fetch-field "message-id")
+ group
+ (nnmail-fetch-field "subject")
+ (nnmail-fetch-field "from")))
(nnheader-init-server-buffer)
(prog1
(if (stringp group)
(nnheader-init-server-buffer)
(prog1
(if (stringp group)
@@
-336,11
+354,9
@@
nnmh-group-alist)
(nnmh-possibly-create-directory group)
(nnmh-possibly-change-directory group server)
nnmh-group-alist)
(nnmh-possibly-create-directory group)
(nnmh-possibly-change-directory group server)
- (let ((articles (mapcar
- (lambda (file)
- (string-to-int file))
- (directory-files
- nnmh-current-directory nil "^[0-9]+$"))))
+ (let ((articles (mapcar 'string-to-int
+ (directory-files
+ nnmh-current-directory nil "^[0-9]+$"))))
(when articles
(setcar active (apply 'min articles))
(setcdr active (apply 'max articles))))))
(when articles
(setcar active (apply 'min articles))
(setcdr active (apply 'max articles))))))
@@
-404,10
+420,10
@@
(nnmh-open-server server))
(when newsgroup
(let ((pathname (nnmail-group-pathname newsgroup nnmh-directory))
(nnmh-open-server server))
(when newsgroup
(let ((pathname (nnmail-group-pathname newsgroup nnmh-directory))
- (
pathname-coding-system 'binary
))
+ (
file-name-coding-system nnmail-pathname-coding-system
))
(if (file-directory-p pathname)
(setq nnmh-current-directory pathname)
(if (file-directory-p pathname)
(setq nnmh-current-directory pathname)
- (
error "No such newsgroup: %s" newsgroup
)))))
+ (
nnheader-report 'nnmh "Not a directory: %s" nnmh-directory
)))))
(defun nnmh-possibly-create-directory (group)
(let (dir dirs)
(defun nnmh-possibly-create-directory (group)
(let (dir dirs)
@@
-453,7
+469,7
@@
"Compute the next article number in GROUP."
(let ((active (cadr (assoc group nnmh-group-alist)))
(dir (nnmail-group-pathname group nnmh-directory))
"Compute the next article number in GROUP."
(let ((active (cadr (assoc group nnmh-group-alist)))
(dir (nnmail-group-pathname group nnmh-directory))
- (
pathname-coding-system 'binary
)
+ (
file-name-coding-system nnmail-pathname-coding-system
)
file)
(unless active
;; The group wasn't known to nnmh, so we just create an active
file)
(unless active
;; The group wasn't known to nnmh, so we just create an active
@@
-464,10
+480,8
@@
(gnus-make-directory dir))
;; Find the highest number in the group.
(let ((files (sort
(gnus-make-directory dir))
;; Find the highest number in the group.
(let ((files (sort
- (mapcar
- (lambda (f)
- (string-to-int f))
- (directory-files dir nil "^[0-9]+$"))
+ (mapcar 'string-to-int
+ (directory-files dir nil "^[0-9]+$"))
'>)))
(when files
(setcdr active (car files)))))
'>)))
(when files
(setcdr active (car files)))))
@@
-489,7
+503,7
@@
;; articles in this folder. The articles that are "new" will be
;; marked as unread by Gnus.
(let* ((dir nnmh-current-directory)
;; articles in this folder. The articles that are "new" will be
;; marked as unread by Gnus.
(let* ((dir nnmh-current-directory)
- (files (sort (mapcar
(function (lambda (name) (string-to-int name)))
+ (files (sort (mapcar
'string-to-int
(directory-files nnmh-current-directory
nil "^[0-9]+$" t))
'<))
(directory-files nnmh-current-directory
nil "^[0-9]+$" t))
'<))
@@
-563,4
+577,5
@@
(provide 'nnmh)
(provide 'nnmh)
+;;; arch-tag: 36c12a98-3bad-44b3-9953-628078ef0e04
;;; nnmh.el ends here
;;; nnmh.el ends here