Synch to No Gnus 200506270911.

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

diff --git a/lisp/nnmaildir.el b/lisp/nnmaildir.el
index 337fb38..ab9a915 100644 (file)
--- a/lisp/nnmaildir.el
+++ b/lisp/nnmaildir.el
@@ -1030,7 +1030,7 @@ by nnmaildir-request-article.")
        (throw 'return nil))
       (when (save-match-data (string-match "[\0/\t]" gname))
        (setf (nnmaildir--srv-error nnmaildir--cur-server)
-             (concat "Illegal characters (null, tab, or /) in group name: "
+             (concat "Invalid characters (null, tab, or /) in group name: "
                      gname))
        (throw 'return nil))
       (setq groups (nnmaildir--srv-groups nnmaildir--cur-server))
@@ -1075,7 +1075,7 @@ by nnmaildir-request-article.")
        (throw 'return nil))
       (when (save-match-data (string-match "[\0/\t]" new-name))
        (setf (nnmaildir--srv-error nnmaildir--cur-server)
-             (concat "Illegal characters (null, tab, or /) in group name: "
+             (concat "Invalid characters (null, tab, or /) in group name: "
                      new-name))
        (throw 'return nil))
       (if (string-equal gname new-name) (throw 'return t))
@@ -1305,7 +1305,7 @@ by nnmaildir-request-article.")
       t)))
 
 (defun nnmaildir-request-move-article (article gname server accept-form
-                                              &optional last)
+                                              &optional last move-is-internal)
   (let ((group (nnmaildir--prepare server gname))
        pgname suffix result nnmaildir--file deactivate-mark)
     (catch 'return
@@ -1395,8 +1395,9 @@ by nnmaildir-request-article.")
         (write-region (point-min) (point-max) tmpfile nil 'no-message nil
                       'excl)
         (unix-sync))) ;; no fsync :(
-      (cancel-timer 24h)
-      (condition-case err (add-name-to-file tmpfile curfile)
+      (nnheader-cancel-timer 24h)
+      (condition-case err
+         (add-name-to-file tmpfile curfile)
        (error
         (setf (nnmaildir--srv-error nnmaildir--cur-server)
               (concat "Error linking: " (prin1-to-string err)))