comparison lisp/gnus/nnmaildir.el @ 73370:7d511b8dc9c6

Merge from gnus--rel--5.10 Patches applied: * gnus--rel--5.10 (patch 150-152) - Update from CVS 2006-10-13 Andreas Seltenreich <uwi7@rz.uni-karlsruhe.de> * lisp/gnus/mm-uu.el (mm-uu-pgp-signed-extract-1): Use RFC 2440 definition of "blank line" when searching for end of armor headers. 2006-10-11 Katsumi Yamaoka <yamaoka@jpl.org> * lisp/gnus/gmm-utils.el (gmm-write-region): Fix variable name. 2006-10-10 Reiner Steib <Reiner.Steib@gmx.de> * lisp/gnus/gmm-utils.el (gmm-write-region): New function based on compatibility code from `mm-make-temp-file'. * lisp/gnus/mm-util.el (mm-make-temp-file): Use `gmm-write-region'. * lisp/gnus/nnmaildir.el (nnmaildir--update-nov) (nnmaildir-request-replace-article, nnmaildir-request-accept-article): Use `gmm-write-region'. 2006-10-13 Andreas Seltenreich <uwi7@rz.uni-karlsruhe.de> * man/gnus.texi (Other modes): Fix typo. Add alternative index entry for gnus-dired-attach. (Selecting a Group): Fix typo. Revision: emacs@sv.gnu.org/emacs--devo--0--patch-475
author Miles Bader <miles@gnu.org>
date Sun, 15 Oct 2006 02:49:46 +0000
parents 18a818a2ee7c
children 24202b793a08
comparison
equal deleted inserted replaced
73369:8ab1128eef12 73370:7d511b8dc9c6
426 ;; Store this new NOV data in a file 426 ;; Store this new NOV data in a file
427 (erase-buffer) 427 (erase-buffer)
428 (prin1 (vector storage-version num msgid nov) (current-buffer)) 428 (prin1 (vector storage-version num msgid nov) (current-buffer))
429 (setq file (concat novfile ":")) 429 (setq file (concat novfile ":"))
430 (nnmaildir--unlink file) 430 (nnmaildir--unlink file)
431 (write-region (point-min) (point-max) file nil 'no-message nil 'excl)) 431 (gmm-write-region (point-min) (point-max) file nil 'no-message nil
432 'excl))
432 (rename-file file novfile 'replace) 433 (rename-file file novfile 'replace)
433 (setf (nnmaildir--art-msgid article) msgid) 434 (setf (nnmaildir--art-msgid article) msgid)
434 nov))) 435 nov)))
435 436
436 (defun nnmaildir--cache-nov (group article nov) 437 (defun nnmaildir--cache-nov (group article nov)
1244 (setf (nnmaildir--srv-error nnmaildir--cur-server) 1245 (setf (nnmaildir--srv-error nnmaildir--cur-server)
1245 (concat "File exists: " tmpfile)) 1246 (concat "File exists: " tmpfile))
1246 (throw 'return nil)) 1247 (throw 'return nil))
1247 (save-excursion 1248 (save-excursion
1248 (set-buffer buffer) 1249 (set-buffer buffer)
1249 (write-region (point-min) (point-max) tmpfile nil 'no-message nil 1250 (gmm-write-region (point-min) (point-max) tmpfile nil 'no-message nil
1250 'excl)) 1251 'excl))
1251 (unix-sync) ;; no fsync :( 1252 (unix-sync) ;; no fsync :(
1252 (rename-file tmpfile (concat (nnmaildir--cur dir) file suffix) 'replace) 1253 (rename-file tmpfile (concat (nnmaildir--cur dir) file suffix) 'replace)
1253 t))) 1254 t)))
1254 1255
1255 (defun nnmaildir-request-move-article (article gname server accept-form 1256 (defun nnmaildir-request-move-article (article gname server accept-form
1339 "24-hour timer expired") 1340 "24-hour timer expired")
1340 (throw 'return nil)))) 1341 (throw 'return nil))))
1341 (condition-case nil 1342 (condition-case nil
1342 (add-name-to-file nnmaildir--file tmpfile) 1343 (add-name-to-file nnmaildir--file tmpfile)
1343 (error 1344 (error
1344 (write-region (point-min) (point-max) tmpfile nil 'no-message nil 1345 (gmm-write-region (point-min) (point-max) tmpfile nil 'no-message nil
1345 'excl) 1346 'excl)
1346 (unix-sync))) ;; no fsync :( 1347 (unix-sync))) ;; no fsync :(
1347 (nnheader-cancel-timer 24h) 1348 (nnheader-cancel-timer 24h)
1348 (condition-case err 1349 (condition-case err
1349 (add-name-to-file tmpfile curfile) 1350 (add-name-to-file tmpfile curfile)
1350 (error 1351 (error