X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;ds=sidebyside;f=lisp%2Fnnmaildir.el;h=2a8f8850a9ff50be17b2dcb3f070170cd66d9751;hb=50dffefb002f44bbc1d0c1785d652801cddc0326;hp=c1abf286e48e562f5c784c37d5668da3c3029259;hpb=08ee1d8afe937efa022c1775fd15515ad748e33a;p=gnus

diff --git a/lisp/nnmaildir.el b/lisp/nnmaildir.el
index c1abf286e..2a8f8850a 100644
--- a/lisp/nnmaildir.el
+++ b/lisp/nnmaildir.el
@@ -17,8 +17,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -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)))