mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-15 10:30:25 -08:00
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
This commit is contained in:
parent
646ff7942c
commit
92edaeeda5
7 changed files with 56 additions and 19 deletions
|
|
@ -428,7 +428,8 @@ by nnmaildir-request-article.")
|
|||
(prin1 (vector storage-version num msgid nov) (current-buffer))
|
||||
(setq file (concat novfile ":"))
|
||||
(nnmaildir--unlink file)
|
||||
(write-region (point-min) (point-max) file nil 'no-message nil 'excl))
|
||||
(gmm-write-region (point-min) (point-max) file nil 'no-message nil
|
||||
'excl))
|
||||
(rename-file file novfile 'replace)
|
||||
(setf (nnmaildir--art-msgid article) msgid)
|
||||
nov)))
|
||||
|
|
@ -1246,8 +1247,8 @@ by nnmaildir-request-article.")
|
|||
(throw 'return nil))
|
||||
(save-excursion
|
||||
(set-buffer buffer)
|
||||
(write-region (point-min) (point-max) tmpfile nil 'no-message nil
|
||||
'excl))
|
||||
(gmm-write-region (point-min) (point-max) tmpfile nil 'no-message nil
|
||||
'excl))
|
||||
(unix-sync) ;; no fsync :(
|
||||
(rename-file tmpfile (concat (nnmaildir--cur dir) file suffix) 'replace)
|
||||
t)))
|
||||
|
|
@ -1341,8 +1342,8 @@ by nnmaildir-request-article.")
|
|||
(condition-case nil
|
||||
(add-name-to-file nnmaildir--file tmpfile)
|
||||
(error
|
||||
(write-region (point-min) (point-max) tmpfile nil 'no-message nil
|
||||
'excl)
|
||||
(gmm-write-region (point-min) (point-max) tmpfile nil 'no-message nil
|
||||
'excl)
|
||||
(unix-sync))) ;; no fsync :(
|
||||
(nnheader-cancel-timer 24h)
|
||||
(condition-case err
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue