X-Git-Url: https://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=lisp%2Fnnmaildir.el;h=8e2cd4bdde34138c5dee91d4f5b02473f238504d;hp=65f93f8e06d7f9b7c71f4442bab26fe8f2aeec61;hb=034742263e7ca5aed088d9b9dcfe4c456d6a26ea;hpb=8b5af94e55ef83ee46b42d32d92fa1ce95dcacf5

diff --git a/lisp/nnmaildir.el b/lisp/nnmaildir.el
index 65f93f8e0..8e2cd4bdd 100644
--- a/lisp/nnmaildir.el
+++ b/lisp/nnmaildir.el
@@ -59,7 +59,7 @@
    )
 ]
 
-;; For Emacs < 22.2.
+;; For Emacs <22.2 and XEmacs.
 (eval-and-compile
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 
@@ -208,20 +208,16 @@ by nnmaildir-request-article.")
   (eval param))
 
 (defmacro nnmaildir--with-nntp-buffer (&rest body)
-  `(save-excursion
-     (set-buffer nntp-server-buffer)
+  `(with-current-buffer nntp-server-buffer
      ,@body))
 (defmacro nnmaildir--with-work-buffer (&rest body)
-  `(save-excursion
-     (set-buffer (get-buffer-create " *nnmaildir work*"))
+  `(with-current-buffer (get-buffer-create " *nnmaildir work*")
      ,@body))
 (defmacro nnmaildir--with-nov-buffer (&rest body)
-  `(save-excursion
-     (set-buffer (get-buffer-create " *nnmaildir nov*"))
+  `(with-current-buffer (get-buffer-create " *nnmaildir nov*")
      ,@body))
 (defmacro nnmaildir--with-move-buffer (&rest body)
-  `(save-excursion
-     (set-buffer (get-buffer-create " *nnmaildir move*"))
+  `(with-current-buffer (get-buffer-create " *nnmaildir move*")
      ,@body))
 
 (defmacro nnmaildir--subdir (dir subdir)
@@ -270,8 +266,8 @@ by nnmaildir-request-article.")
 	(setq attr (file-attributes
 		    (concat dir (number-to-string number-linked))))
 	(or attr (throw 'return (1- number-linked)))
-	(if (/= ino-opened (nth 10 attr))
-	    (setq number-opened number-linked))))))
+	(unless (equal ino-opened (nth 10 attr))
+	  (setq number-opened number-linked))))))
 
 ;; Make the given server, if non-nil, be the current server.  Then make the
 ;; given group, if non-nil, be the current group of the current server.  Then
@@ -361,9 +357,9 @@ by nnmaildir-request-article.")
 		  number-open number-link))
 	   ((nnmaildir--eexist-p err)
 	    (let ((attr (file-attributes path-link)))
-	      (if (/= (nth 10 attr) ino-open)
-		  (setq number-open number-link
-			number-link 0))))
+	      (unless (equal (nth 10 attr) ino-open)
+		(setq number-open number-link
+		      number-link 0))))
 	   (t (signal (car err) (cdr err)))))))))
 
 (defun nnmaildir--update-nov (server group article)
@@ -744,7 +740,7 @@ by nnmaildir-request-article.")
 	    ls (or (nnmaildir--param pgname 'directory-files) srv-ls))
       (unless read-only
 	(setq x (nth 11 (file-attributes tdir)))
-	(unless (and (= x (nth 11 nattr)) (= x (nth 11 cattr)))
+	(unless (and (equal x (nth 11 nattr)) (equal x (nth 11 cattr)))
 	  (setf (nnmaildir--srv-error nnmaildir--cur-server)
 		(concat "Maildir spans filesystems: " absdir))
 	  (throw 'return nil))
@@ -920,7 +916,7 @@ by nnmaildir-request-article.")
 		  "\n")))))
   'group)
 
-(defun nnmaildir-request-update-info (gname info &optional server)
+(defun nnmaildir-request-marks (gname info &optional server)
   (let ((group (nnmaildir--prepare server gname))
 	pgname flist always-marks never-marks old-marks dotfile num dir
 	markdirs marks mark ranges markdir article read end new-marks ls
@@ -987,7 +983,7 @@ by nnmaildir-request-article.")
       (setf (nnmaildir--grp-mmth group) new-mmth)
       info)))
 
-(defun nnmaildir-request-group (gname &optional server fast)
+(defun nnmaildir-request-group (gname &optional server fast info)
   (let ((group (nnmaildir--prepare server gname))
 	deactivate-mark)
     (catch 'return
@@ -1249,8 +1245,7 @@ by nnmaildir-request-article.")
 	(setf (nnmaildir--srv-error nnmaildir--cur-server)
 	      "Article has expired")
 	(throw 'return nil))
-      (save-excursion
-	(set-buffer (or to-buffer nntp-server-buffer))
+      (with-current-buffer (or to-buffer nntp-server-buffer)
 	(erase-buffer)
 	(nnheader-insert-file-contents nnmaildir-article-file-name))
       (cons gname num-msgid))))
@@ -1289,8 +1284,7 @@ by nnmaildir-request-article.")
 	(setf (nnmaildir--srv-error nnmaildir--cur-server)
 	      (concat "File exists: " tmpfile))
 	(throw 'return nil))
-      (save-excursion
-	(set-buffer buffer)
+      (with-current-buffer buffer
 	(gmm-write-region (point-min) (point-max) tmpfile nil 'no-message nil
 			  'excl))
       (unix-sync) ;; no fsync :(
@@ -1565,7 +1559,7 @@ by nnmaildir-request-article.")
 		  (t (signal (car err) (cdr err))))))
 	     todo-marks))
 	  set-action (lambda (article)
-		       (funcall add-action)
+		       (funcall add-action article)
 		       (mapcar (lambda (mark)
 				 (unless (memq mark todo-marks)
 				   (funcall del-mark mark)))
@@ -1596,7 +1590,7 @@ by nnmaildir-request-article.")
 	(nnmaildir--nlist-iterate nlist ranges
 				  (cond ((eq 'del (cadr action)) del-action)
 					((eq 'add (cadr action)) add-action)
-					(t set-action))))
+					((eq 'set (cadr action)) set-action))))
       nil)))
 
 (defun nnmaildir-close-group (gname &optional server)
@@ -1667,5 +1661,4 @@ by nnmaildir-request-article.")
 ;; fill-column: 77
 ;; End:
 
-;; arch-tag: 0c4e44cd-dfde-4040-888e-5597ec771849
 ;;; nnmaildir.el ends here