Add with-file-modes macro, and use it

* lisp/subr.el (with-file-modes): New macro.

* lisp/printing.el (pr-save-file-modes):
* lisp/eshell/esh-util.el (eshell-with-file-modes): Make obsolete.

* lisp/emacs-lisp/lisp-mode.el (lisp-el-font-lock-keywords-2):
Add with-file-modes.

* lisp/doc-view.el (doc-view-make-safe-dir):
* lisp/epg.el (epg--start):
* lisp/files.el (locate-user-emacs-file, make-temp-file)
(backup-buffer-copy, move-file-to-trash):
* printing.el (pr-despool-print, pr-call-process, pr-text2ps):
* eshell/esh-util.el (eshell-with-private-file-modes)
(eshell-make-private-directory):
* lisp/net/browse-url.el (browse-url-mosaic):
* lisp/obsolete/mailpost.el (post-mail-send-it):
* lisp/obsolete/pgg-pgp.el (pgg-pgp-verify-region):
* lisp/obsolete/pgg-pgp5.el (pgg-pgp5-verify-region):
* lisp/url/url-util.el (url-make-private-file):
Use with-file-modes.

* doc/lispref/files.texi (Changing Files): Mention with-file-modes.

* etc/NEWS: Mention this.

1 files changed, 51 insertions, 54 deletions

diff --git a/lisp/printing.el b/lisp/printing.el
index de7958ea0e6..39da132d64e 100644
--- a/lisp/printing.el
+++ b/lisp/printing.el
@@ -3171,12 +3171,9 @@ See `pr-ps-printer-alist'.")
 
 
 (defmacro pr-save-file-modes (&rest body)
-  "Set temporally file modes to `pr-file-modes'."
-  `(let ((pr--default-file-modes (default-file-modes)))	; save default
-     (set-default-file-modes pr-file-modes)
-     ,@body
-     (set-default-file-modes pr--default-file-modes))) ; restore default
-
+  "Execute BODY with file permissions temporarily set to `pr-file-modes'."
+  (declare (obsolete with-file-modes "24.5"))
+  `(with-file-modes pr-file-modes ,@body))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Keys & Menus
@@ -4372,12 +4369,12 @@ Noninteractively, the argument FILENAME is treated as follows: if it is nil,
 send the image to the printer.  If FILENAME is a string, save the PostScript
 image in a file with that name."
   (interactive (list (ps-print-preprint current-prefix-arg)))
-  (pr-save-file-modes
-   (let ((ps-lpr-command         (pr-command pr-ps-command))
-	 (ps-lpr-switches        pr-ps-switches)
-	 (ps-printer-name-option pr-ps-printer-switch)
-	 (ps-printer-name        pr-ps-printer))
-     (ps-despool filename))))
+  (with-file-modes pr-file-modes
+    (let ((ps-lpr-command         (pr-command pr-ps-command))
+	  (ps-lpr-switches        pr-ps-switches)
+	  (ps-printer-name-option pr-ps-printer-switch)
+	  (ps-printer-name        pr-ps-printer))
+      (ps-despool filename))))
 
 
 ;;;###autoload
@@ -5640,12 +5637,12 @@ If menu binding was not done, calls `pr-menu-bind'."
       (goto-char (point-max))
       (insert (format "%s %S\n" cmd args)))
     ;; *Printing Command Output* == show any return message from command
-    (pr-save-file-modes
-     (setq status
-	   (condition-case data
-	       (apply 'call-process cmd nil buffer nil args)
-	     ((quit error)
-	      (error-message-string data)))))
+    (with-file-modes pr-file-modes
+      (setq status
+	    (condition-case data
+		(apply 'call-process cmd nil buffer nil args)
+	      ((quit error)
+	       (error-message-string data)))))
     ;; *Printing Command Output* == show exit status
     (with-current-buffer buffer
       (goto-char (point-max))
@@ -5890,42 +5887,42 @@ If menu binding was not done, calls `pr-menu-bind'."
 
 
 (defun pr-text2ps (kind n-up filename &optional from to)
-  (pr-save-file-modes
-   (let ((ps-n-up-printing n-up)
-	 (ps-spool-config (and (eq ps-spool-config 'setpagedevice)
-			       'setpagedevice)))
-     (pr-delete-file-if-exists filename)
-     (cond (pr-faces-p
-	    (cond (pr-spool-p
-		   ;; pr-faces-p and pr-spool-p
-		   ;; here FILENAME arg is ignored
-		   (cond ((eq kind 'buffer)
-			  (ps-spool-buffer-with-faces))
-			 ((eq kind 'region)
-			  (ps-spool-region-with-faces (or from (point))
-						      (or to (mark))))
-			 ))
-		  ;; pr-faces-p and not pr-spool-p
-		  ((eq kind 'buffer)
-		   (ps-print-buffer-with-faces filename))
-		  ((eq kind 'region)
-		   (ps-print-region-with-faces (or from (point))
-					       (or to (mark)) filename))
-		  ))
-	   (pr-spool-p
-	    ;; not pr-faces-p and pr-spool-p
-	    ;; here FILENAME arg is ignored
-	    (cond ((eq kind 'buffer)
-		   (ps-spool-buffer))
-		  ((eq kind 'region)
-		   (ps-spool-region (or from (point)) (or to (mark))))
-		  ))
-	   ;; not pr-faces-p and not pr-spool-p
-	   ((eq kind 'buffer)
-	    (ps-print-buffer filename))
-	   ((eq kind 'region)
-	    (ps-print-region (or from (point)) (or to (mark)) filename))
-	   ))))
+  (with-file-modes pr-file-modes
+    (let ((ps-n-up-printing n-up)
+	  (ps-spool-config (and (eq ps-spool-config 'setpagedevice)
+				'setpagedevice)))
+      (pr-delete-file-if-exists filename)
+      (cond (pr-faces-p
+	     (cond (pr-spool-p
+		    ;; pr-faces-p and pr-spool-p
+		    ;; here FILENAME arg is ignored
+		    (cond ((eq kind 'buffer)
+			   (ps-spool-buffer-with-faces))
+			  ((eq kind 'region)
+			   (ps-spool-region-with-faces (or from (point))
+						       (or to (mark))))
+			  ))
+		   ;; pr-faces-p and not pr-spool-p
+		   ((eq kind 'buffer)
+		    (ps-print-buffer-with-faces filename))
+		   ((eq kind 'region)
+		    (ps-print-region-with-faces (or from (point))
+						(or to (mark)) filename))
+		   ))
+	    (pr-spool-p
+	     ;; not pr-faces-p and pr-spool-p
+	     ;; here FILENAME arg is ignored
+	     (cond ((eq kind 'buffer)
+		    (ps-spool-buffer))
+		   ((eq kind 'region)
+		    (ps-spool-region (or from (point)) (or to (mark))))
+		   ))
+	    ;; not pr-faces-p and not pr-spool-p
+	    ((eq kind 'buffer)
+	     (ps-print-buffer filename))
+	    ((eq kind 'region)
+	     (ps-print-region (or from (point)) (or to (mark)) filename))
+	    ))))
 
 
 (defun pr-command (command)