Mercurial > hg > xemacs-beta

comparison lisp/gnus/nnmail.el @ 22:8fc7fe29b841 r19-15b94

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r19-15b94
author cvs
date Mon, 13 Aug 2007 08:50:29 +0200
parents 0293115a14e9
children 4103f0995bd7
comparison
equal deleted inserted replaced
21:b88636d63495 22:8fc7fe29b841
554 (list nnmail-internal-password)))))) 554 (list nnmail-internal-password))))))
555 (if (not (buffer-modified-p errors)) 555 (if (not (buffer-modified-p errors))
556 ;; No output => movemail won 556 ;; No output => movemail won
557 (progn 557 (progn
558 (unless popmail 558 (unless popmail
559 (set-file-modes tofile nnmail-default-file-modes)) 559 (when (file-exists-p tofile)
560 (set-file-modes tofile nnmail-default-file-modes)))
560 (push inbox nnmail-moved-inboxes)) 561 (push inbox nnmail-moved-inboxes))
561 (set-buffer errors) 562 (set-buffer errors)
562 ;; There may be a warning about older revisions. We 563 ;; There may be a warning about older revisions. We
563 ;; ignore those. 564 ;; ignore those.
564 (goto-char (point-min)) 565 (goto-char (point-min))
565 (if (search-forward "older revision" nil t) 566 (if (search-forward "older revision" nil t)
566 (progn 567 (progn
567 (unless popmail 568 (unless popmail
568 (set-file-modes tofile nnmail-default-file-modes)) 569 (when (file-exists-p tofile)
570 (set-file-modes tofile nnmail-default-file-modes)))
569 (push inbox nnmail-moved-inboxes)) 571 (push inbox nnmail-moved-inboxes))
570 ;; Probably a real error. 572 ;; Probably a real error.
571 (subst-char-in-region (point-min) (point-max) ?\n ?\ ) 573 (subst-char-in-region (point-min) (point-max) ?\n ?\ )
572 (goto-char (point-max)) 574 (goto-char (point-max))
573 (skip-chars-backward " \t") 575 (skip-chars-backward " \t")
1252 (nconc 1254 (nconc
1253 (apply 1255 (apply
1254 'nconc 1256 'nconc
1255 (mapcar 1257 (mapcar
1256 (lambda (file) 1258 (lambda (file)
1257 (if (file-directory-p file) 1259 (if (and (not (string-match "^po:" file))
1260 (file-directory-p file))
1258 (nnheader-directory-regular-files file) 1261 (nnheader-directory-regular-files file)
1259 (list file))) 1262 (list file)))
1260 nnmail-spool-file)) 1263 nnmail-spool-file))
1261 procmails)) 1264 procmails))
1262 ((and (stringp nnmail-spool-file) 1265 ((stringp nnmail-spool-file)
1263 (not (file-directory-p nnmail-spool-file))) 1266 (if (and (not (string-match "^po:" nnmail-spool-file))
1264 (cons nnmail-spool-file procmails)) 1267 (file-directory-p nnmail-spool-file))
1265 ((and (stringp nnmail-spool-file) 1268 (nconc
1266 (file-directory-p nnmail-spool-file)) 1269 (nnheader-directory-regular-files nnmail-spool-file)
1267 (nconc 1270 procmails)
1268 (nnheader-directory-regular-files nnmail-spool-file) 1271 (cons nnmail-spool-file procmails)))
1269 procmails))
1270 ((eq nnmail-spool-file 'pop) 1272 ((eq nnmail-spool-file 'pop)
1271 (cons (format "po:%s" (user-login-name)) procmails)) 1273 (cons (format "po:%s" (user-login-name)) procmails))
1272 (t 1274 (t
1273 procmails)))))) 1275 procmails))))))
1274 1276