From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Daniel Colascione Newsgroups: gmane.emacs.devel Subject: [PATCH 6/9] Rename `w32' local to `nt' for clarity Date: Tue, 07 Aug 2012 01:19:27 -0700 Message-ID: <440e43a6bda12b5a329d84ceaf7bc33251ec9701.1344326992.git.dancol@dancol.org> References: NNTP-Posting-Host: plane.gmane.org X-Trace: dough.gmane.org 1344328946 11159 80.91.229.3 (7 Aug 2012 08:42:26 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 7 Aug 2012 08:42:26 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Aug 07 10:42:25 2012 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1SyfMu-0003wE-OD for ged-emacs-devel@m.gmane.org; Tue, 07 Aug 2012 10:42:24 +0200 Original-Received: from localhost ([::1]:52853 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Syf1Q-0002KQ-UA for ged-emacs-devel@m.gmane.org; Tue, 07 Aug 2012 04:20:12 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:57359) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Syf0p-0000fP-BQ for emacs-devel@gnu.org; Tue, 07 Aug 2012 04:19:39 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Syf0n-0007k5-TJ for emacs-devel@gnu.org; Tue, 07 Aug 2012 04:19:35 -0400 Original-Received: from dancol.org ([96.126.100.184]:37134) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Syf0n-0007id-LX for emacs-devel@gnu.org; Tue, 07 Aug 2012 04:19:33 -0400 Original-Received: from dancol by dancol.org with local (Exim 4.72) (envelope-from ) id 1Syf0h-0006q5-7a for emacs-devel@gnu.org; Tue, 07 Aug 2012 01:19:27 -0700 In-Reply-To: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 96.126.100.184 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:152244 Archived-At: --- lisp/server.el | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lisp/server.el b/lisp/server.el index 0ef76dc..656be75 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -519,10 +519,10 @@ Creates the directory if necessary and makes sure: ;; Check that it's safe for use. (let* ((uid (nth 2 attrs)) - (w32 (eq system-type 'windows-nt)) + (nt (eq system-type 'windows-nt)) (safe (cond ((not (eq t (car attrs))) nil) ; is a dir? - ((and w32 (zerop uid)) ; on FAT32? + ((and nt (zerop uid)) ; on FAT32? (display-warning 'server (format "Using `%s' to store Emacs-server authentication files. @@ -532,13 +532,13 @@ See variable `server-auth-dir' for details." :warning) t) ((and (/= uid (user-uid)) ; is the dir ours? - (or (not w32) + (or (not nt) ;; Files created on Windows by Administrator ;; (RID=500) have the Administrators (RID=544) ;; group recorded as the owner. (/= uid 544) (/= (user-uid) 500))) nil) - (w32 t) ; on NTFS? + (nt t) ; on NTFS? (t ; else, check permissions (zerop (logand ?\077 (file-modes dir))))))) (unless safe -- 1.7.2.5