diff options
| author | Miles Bader <miles@gnu.org> | 2006-10-15 02:49:46 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-10-15 02:49:46 +0000 |
| commit | 92edaeeda5c362acf2c7e7f72b3666ab7673699a (patch) | |
| tree | d4338a2612cd6f4c7018512c001cd3d6b467e466 /lisp/gnus/mm-util.el | |
| parent | 646ff7942c3df41d0e548d848af9240c542a4c69 (diff) | |
| download | emacs-92edaeeda5c362acf2c7e7f72b3666ab7673699a.tar.gz | |
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
Diffstat (limited to 'lisp/gnus/mm-util.el')
| -rw-r--r-- | lisp/gnus/mm-util.el | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el index 1c9f9749f85..e75f2ef6d5f 100644 --- a/lisp/gnus/mm-util.el +++ b/lisp/gnus/mm-util.el @@ -1126,17 +1126,11 @@ If SUFFIX is non-nil, add that at the end of the file name." (setq file (concat file suffix))) (if dir-flag (make-directory file) - (if (or (featurep 'xemacs) - (= emacs-major-version 20)) - ;; NOTE: This is unsafe if Emacs 20 - ;; users and XEmacs users don't use - ;; a secure temp directory. - (if (file-exists-p file) - (signal 'file-already-exists - (list "File exists" file)) - (write-region "" nil file nil 'silent)) - (write-region "" nil file nil 'silent - nil 'excl))) + ;; NOTE: This is unsafe if Emacs 20 + ;; users and XEmacs users don't use + ;; a secure temp directory. + (gmm-write-region "" nil file nil 'silent + nil 'excl)) nil) (file-already-exists t) ;; The Emacs 20 and XEmacs versions of |