X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fnnmh.el;h=f630e0c8218aad50cd8daa62ab417dee00a1b627;hb=e2696774a2e225ea60d46cc665d4232c80412731;hp=6272d540ccf35b750ac155535450a55df47c2e94;hpb=027a90912122f2cb3e36d82310f32962e3ce2f71;p=elisp%2Fgnus.git- diff --git a/lisp/nnmh.el b/lisp/nnmh.el index 6272d54..f630e0c 100644 --- a/lisp/nnmh.el +++ b/lisp/nnmh.el @@ -1,8 +1,11 @@ ;;; 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 -;; Masanobu UMEDA +;; Masanobu UMEDA +;; MORIOKA Tomohiko ;; Keywords: news, mail ;; This file is part of GNU Emacs. @@ -30,25 +33,26 @@ ;;; Code: +(eval-when-compile (require 'cl)) + (require 'nnheader) (require 'nnmail) (require 'gnus-start) (require 'nnoo) -(eval-when-compile (require 'cl)) (nnoo-declare nnmh) (defvoo nnmh-directory message-directory - "*Mail spool directory.") + "Mail spool directory.") (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 - "*Hook run narrowed to an article before saving.") + "Hook run narrowed to an article before saving.") (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.") @@ -83,7 +87,7 @@ as unread by Gnus.") (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. @@ -116,7 +120,7 @@ as unread by Gnus.") (when large (nnheader-message 5 "nnmh: Receiving headers...done")) - (nnheader-fold-continuation-lines) + ;; (nnheader-fold-continuation-lines) 'headers)))) (deffoo nnmh-open-server (server &optional defs) @@ -142,7 +146,7 @@ as unread by Gnus.") (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) @@ -154,7 +158,7 @@ as unread by Gnus.") (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)) @@ -174,7 +178,7 @@ as unread by Gnus.") (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 @@ -197,7 +201,7 @@ as unread by Gnus.") (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)) @@ -209,7 +213,6 @@ as unread by Gnus.") (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. @@ -221,26 +224,27 @@ as unread by Gnus.") (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 - "%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) - (nnheader-replace-chars-in-string - (mm-decode-coding-string (substring dir (match-end 0)) - nnmail-pathname-coding-system) - ?/ ?.)) + (string-as-multibyte + (encode-coding-string + (nnheader-replace-chars-in-string + (substring dir (match-end 0)) + ?/ ?.) + nnmail-pathname-coding-system))) (apply 'max files) (apply 'min files))))))) t) @@ -263,6 +267,13 @@ as unread by Gnus.") (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 () @@ -279,8 +290,8 @@ as unread by Gnus.") (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) (let ((buf (get-buffer-create " *nnmh move*")) result) (and @@ -303,9 +314,14 @@ as unread by Gnus.") (deffoo nnmh-request-accept-article (group &optional server last noinsert) (nnmh-possibly-change-directory group server) - (nnmail-check-syntax) + (if (and (not (equal group "queue")) + (not (equal group "draft"))) + (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) @@ -342,11 +358,9 @@ as unread by Gnus.") 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)))))) @@ -410,10 +424,10 @@ as unread by Gnus.") (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) - (error "No such newsgroup: %s" newsgroup))))) + (nnheader-report 'nnmh "Not a directory: %s" nnmh-directory))))) (defun nnmh-possibly-create-directory (group) (let (dir dirs) @@ -459,7 +473,7 @@ as unread by Gnus.") "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 @@ -470,10 +484,8 @@ as unread by Gnus.") (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))))) @@ -495,7 +507,7 @@ as unread by Gnus.") ;; 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)) '<))