diff lisp/gnus/mm-util.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 <[e-mail]> * 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 <[e-mail]> * lisp/gnus/gmm-utils.el (gmm-write-region): Fix variable name. 2006-10-10 Reiner Steib <[e-mail]> * 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 <[e-mail]> * man/gnus.texi (Other modes): Fix typo. Add alternative index entry for gnus-dired-attach. (Selecting a Group): Fix typo. Revision: [e-mail]/emacs--devo--0--patch-475

--- a/lisp/gnus/mm-util.el	Sat Oct 14 23:25:55 2006 +0000
+++ b/lisp/gnus/mm-util.el	Sun Oct 15 02:49:46 2006 +0000
@@ -1126,17 +1126,11 @@
 			     (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