*** empty log message ***

[gnus] / lisp / nnmh.el

diff --git a/lisp/nnmh.el b/lisp/nnmh.el
index 0ffd775..cad9cb4 100644 (file)
--- a/lisp/nnmh.el
+++ b/lisp/nnmh.el
@@ -32,9 +32,9 @@
 
 (require 'nnheader)
 (require 'nnmail)
-(require 'gnus)
+(require 'gnus-start)
 (require 'nnoo)
-(eval-and-compile (require 'cl))
+(require 'cl)
 
 (nnoo-declare nnmh)
 
@@ -157,6 +157,8 @@
        (nnheader-report 'nnmh "Selected group %s" group)
        t)
        (t
+       ;; Re-scan the directory if it's on a foreign system.
+       (nnheader-re-read-dir pathname)
        (setq dir 
              (sort
               (mapcar (lambda (name) (string-to-int name))
@@ -212,12 +214,13 @@
            "%s %d %d y\n" 
            (progn
              (string-match 
-              (file-truename (file-name-as-directory 
-                              (expand-file-name nnmh-toplev))) dir)
+              (regexp-quote
+               (file-truename (file-name-as-directory 
+                               (expand-file-name nnmh-toplev)))) dir)
              (nnheader-replace-chars-in-string
               (substring dir (match-end 0)) ?/ ?.))
-           (apply (function max) files) 
-           (apply (function min) files)))))))
+           (apply 'max files) 
+           (apply 'min files)))))))
   t)
 
 (deffoo nnmh-request-newgroups (date &optional server)
@@ -248,6 +251,8 @@
                (condition-case ()
                    (funcall nnmail-delete-file-function article)
                  (file-error
+                  (nnheader-message 1 "Couldn't delete article %s in %s"
+                                    article newsgroup)
                   (setq rest (cons (car articles) rest)))))
            (setq rest (cons (car articles) rest))))
       (setq articles (cdr articles)))
@@ -270,10 +275,12 @@
        (setq result (eval accept-form))
        (kill-buffer (current-buffer))
        result)
-     (condition-case ()
-        (funcall nnmail-delete-file-function
-                 (concat nnmh-current-directory (int-to-string article)))
-       (file-error nil)))
+     (progn
+       (nnmh-possibly-change-directory group server)
+       (condition-case ()
+          (funcall nnmail-delete-file-function
+                   (concat nnmh-current-directory (int-to-string article)))
+        (file-error nil))))
     result))
 
 (deffoo nnmh-request-accept-article (group &optional server last noinsert)
@@ -297,9 +304,10 @@
     (nnmh-possibly-create-directory group)
     (condition-case ()
        (progn
-         (write-region (point-min) (point-max)
-                       (concat nnmh-current-directory (int-to-string article))
-                       nil (if (nnheader-be-verbose 5) nil 'nomesg))
+         (nnmail-write-region 
+          (point-min) (point-max)
+          (concat nnmh-current-directory (int-to-string article))
+          nil (if (nnheader-be-verbose 5) nil 'nomesg))
          t)
       (error nil))))
 
@@ -347,21 +355,31 @@
 
 (deffoo nnmh-request-rename-group (group new-name &optional server)
   (nnmh-possibly-change-directory group server)
-  ;; Rename directory.
-  (and (file-writable-p nnmh-current-directory)
-       (condition-case ()
-          (progn
-            (rename-file 
-             (directory-file-name nnmh-current-directory)
-             (directory-file-name 
-              (nnmail-group-pathname new-name nnmh-directory)))
-            t)
-        (error nil))
-       ;; That went ok, so we change the internal structures.
-       (let ((entry (assoc group nnmh-group-alist)))
-        (and entry (setcar entry new-name))
-        (setq nnmh-current-directory nil)
-        t)))
+  (let ((new-dir (nnmail-group-pathname new-name nnmh-directory))
+       (old-dir (nnmail-group-pathname group nnmh-directory)))
+    (when (condition-case ()
+             (progn
+               (make-directory new-dir t)
+               t)
+           (error nil))
+      ;; We move the articles file by file instead of renaming
+      ;; the directory -- there may be subgroups in this group.
+      ;; One might be more clever, I guess.
+      (let ((files (nnheader-article-to-file-alist old-dir)))
+       (while files
+         (rename-file 
+          (concat old-dir (cdar files))
+          (concat new-dir (cdar files)))
+         (pop files)))
+      (when (<= (length (directory-files old-dir)) 2)
+       (condition-case ()
+           (delete-directory old-dir)
+         (error nil)))
+      ;; That went ok, so we change the internal structures.
+      (let ((entry (assoc group nnmh-group-alist)))
+       (and entry (setcar entry new-name))
+       (setq nnmh-current-directory nil)
+       t))))
 
 \f
 ;;; Internal functions.
@@ -412,7 +430,7 @@
              ;; It was already saved, so we just make a hard link.
              (funcall nnmail-crosspost-link-function first file t)
            ;; Save the article.
-           (write-region (point-min) (point-max) file nil nil)
+           (nnmail-write-region (point-min) (point-max) file nil nil)
            (setq first file)))
        (setq ga (cdr ga))))
     group-art))
@@ -496,7 +514,7 @@
       (insert ";; Gnus article active file for " group "\n\n")
       (insert "(setq nnmh-newsgroup-articles '")
       (insert (prin1-to-string articles) ")\n")
-      (write-region (point-min) (point-max) nnmh-file nil 'nomesg)
+      (nnmail-write-region (point-min) (point-max) nnmh-file nil 'nomesg)
       (kill-buffer (current-buffer)))))
 
 (defun nnmh-deletable-article-p (group article)