Synch to No Gnus 200506060511.

[elisp/gnus.git-] / lisp / nnfolder.el

diff --git a/lisp/nnfolder.el b/lisp/nnfolder.el
index dfa7a16..7c277e1 100644 (file)
--- a/lisp/nnfolder.el
+++ b/lisp/nnfolder.el
@@ -201,7 +201,7 @@ the group.  Then the marks file will be regenerated properly by Gnus.")
                       ((search-backward (concat "\n" nnfolder-article-marker)
                                         nil t)
                        (goto-char (match-end 0))
-                       (setq num (string-to-int
+                       (setq num (string-to-number
                                   (buffer-substring
                                    (point) (point-at-eol))))
                        (goto-char start)
@@ -211,7 +211,7 @@ the group.  Then the marks file will be regenerated properly by Gnus.")
                      (search-forward (concat "\n" nnfolder-article-marker)
                                      nil t)
                      (progn
-                       (setq num (string-to-int
+                       (setq num (string-to-number
                                   (buffer-substring
                                    (point) (point-at-eol))))
                        (> num article))
@@ -286,7 +286,7 @@ the group.  Then the marks file will be regenerated properly by Gnus.")
            (cons nnfolder-current-group
                  (if (search-forward (concat "\n" nnfolder-article-marker)
                                      nil t)
-                     (string-to-int (buffer-substring
+                     (string-to-number (buffer-substring
                                      (point) (point-at-eol)))
                    -1))))))))
 
@@ -468,8 +468,8 @@ the group.  Then the marks file will be regenerated properly by Gnus.")
       (nnfolder-save-active nnfolder-group-alist nnfolder-active-file)
       (gnus-sorted-difference articles (nreverse deleted-articles)))))
 
-(deffoo nnfolder-request-move-article (article group server
-                                              accept-form &optional last)
+(deffoo nnfolder-request-move-article (article group server accept-form 
+                                              &optional last move-is-internal)
   (save-excursion
     (let ((buf (get-buffer-create " *nnfolder move*"))
          result)
@@ -874,8 +874,9 @@ deleted.  Point is left where the deleted region was."
         (buffer (set-buffer
                  (let ((nnheader-file-coding-system
                         nnfolder-file-coding-system))
-                   (nnheader-find-file-noselect file)))))
+                   (nnheader-find-file-noselect file t)))))
     (set-buffer-multibyte t) ;; Use multibyte buffer for future copying.
+    (buffer-disable-undo)
     (if (equal (cadr (assoc group nnfolder-scantime-alist))
               (nth 5 (file-attributes file)))
        ;; This looks up-to-date, so we don't do any scanning.
@@ -902,7 +903,6 @@ deleted.  Point is left where the deleted region was."
              maxid start end newscantime
              novbuf articles newnum
              buffer-read-only)
-         (buffer-disable-undo)
          (setq maxid (cdr active))
 
          (unless (or gnus-nov-is-evil nnfolder-nov-is-evil