From 353380ad3dae01f892b2bc97878bffe7eadafd4f Mon Sep 17 00:00:00 2001 From: yamaoka Date: Wed, 15 Feb 2006 08:39:40 +0000 Subject: [PATCH] Synch to No Gnus 200602150839. --- lisp/ChangeLog | 6 +++++- lisp/mm-util.el | 13 ++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a80efbe..8011f1b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2006-02-15 Katsumi Yamaoka + + * mm-util.el (mm-make-temp-file): Don't catch file-error in Emacs. + 2006-02-14 Reiner Steib * spam.el (spam-check-spamassassin-headers): Adapt format for @@ -22,7 +26,7 @@ * gnus-draft.el (gnus-draft-send): Replace message-narrow-to-head with message-narrow-to-headers. (gnus-draft-setup): Narrow to header to run message-fetch-field. - (gnus-draft-check-draft-articles articles): New function. + (gnus-draft-check-draft-articles): New function. (gnus-draft-edit-message, gnus-draft-send-message): Use it. 2006-02-13 Reiner Steib diff --git a/lisp/mm-util.el b/lisp/mm-util.el index 1823b35..7853c06 100644 --- a/lisp/mm-util.el +++ b/lisp/mm-util.el @@ -1077,7 +1077,7 @@ If SUFFIX is non-nil, add that at the end of the file name." ;; loosen them later, whereas it's impossible to close the ;; time-window of loose permissions otherwise. (set-default-file-modes 448) - (while (condition-case () + (while (condition-case err (progn (setq file (make-temp-name @@ -1092,8 +1092,8 @@ If SUFFIX is non-nil, add that at the end of the file name." (if dir-flag (make-directory file) (if (featurep 'xemacs) - ;; NOTE: This is unsafe if an XEmacs user - ;; doesn't use a secure temp directory. + ;; NOTE: This is unsafe if XEmacs users + ;; don't use a secure temp directory. (if (file-exists-p file) (signal 'file-already-exists (list "File exists" file)) @@ -1102,8 +1102,11 @@ If SUFFIX is non-nil, add that at the end of the file name." nil 'excl))) nil) (file-already-exists t) - ;; The XEmacs version of `make-directory' issues it. - (file-error t)) + ;; The XEmacs version of `make-directory' issues + ;; `file-error'. + (file-error (or (and (featurep 'xemacs) + (file-exists-p file)) + (signal (car err) (cdr err))))) ;; the file was somehow created by someone else between ;; `make-temp-name' and `write-region', let's try again. nil) -- 1.7.10.4