2000-12-14 23:00:00 ShengHuo ZHU <zsh@cs.rochester.edu>

	* gpg.el (gpg-make-temp-file): Don't check file-modes of M$Windows.

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index f32980b..f26dbb2 100644 (file)
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,7 @@
+2000-12-14 23:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gpg.el (gpg-make-temp-file): Don't check file-modes of M$Windows.
+
 2000-12-14 10:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gpg.el (gpg-passphrase-store): Don't activate timer if it is live.
@@ -12,7 +16,7 @@
        (gpg-with-temp-files): Ditto.
        (gpg-show-result): Ditto.
 
-2000-11-08  Bj\e-Aörn Torkelsson  <torkel@hpc2n.umu.se>\e$)A
+2000-11-08  Bj\e,Av\e(Brn Torkelsson  <torkel@hpc2n.umu.se>
 
        * gpg.el: In Xemacs it is called point-at-eol, not
        line-end-position
@@ -29,7 +33,7 @@
 
        * gpg.el (gpg-verify): The last argument of apply is a list.
        (gpg-encrypt): Add passphrase as a parameter.
-       
+
 ;; Local Variables:
 ;; coding: iso-2022-7bit
 ;; End:

diff --git a/contrib/gpg.el b/contrib/gpg.el
index 79b9091..593823c 100644 (file)
--- a/contrib/gpg.el
+++ b/contrib/gpg.el
@@ -7,7 +7,7 @@
 ;; Keywords: crypto
 ;; Created: 2000-04-15
 
-;; $Id: gpg.el,v 1.5 2000/12/01 04:13:45 zsh Exp $
+;; $Id: gpg.el,v 1.6 2000/12/14 15:48:28 zsh Exp $
 
 ;; This file is NOT (yet?) part of GNU Emacs.
 
@@ -616,7 +616,8 @@ adjust according to `gpg-command-passphrase-env'."
       ;; make-temp-name doesn't create the file, and an ordinary
       ;; write-file operation is prone to nasty symlink attacks if the
       ;; temporary file resides in a world-writable directory.
-      (unless (eq (file-modes gpg-temp-directory) 448) ; mode 0700
+      (unless (or (memq system-type '(windows-nt cygwin32 win32 w32 mswindows))
+                 (eq (file-modes gpg-temp-directory) 448)) ; mode 0700
        (error "Directory for temporary files must have mode 0700."))
       (setq name (make-temp-name name))
       (let ((mode (default-file-modes)))