* server.el (server-ensure-safe-dir): Pass 'integer

  to `file-attributes', as suggested.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 76144677c870101e0c5662f81a7735f8a2e5e59e..976b8190c221f0ee480d416c91e3de3174350132 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-18  Juanma Barranquero  <lekktu@gmail.com>
+
+       * server.el (server-ensure-safe-dir): Pass 'integer
+       to `file-attributes', as suggested.
+
 2009-09-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * dired-aux.el (dired-query-alist): Remove spurious backslash.

diff --git a/lisp/server.el b/lisp/server.el
index 610ace05590a7be65f26607a6fbf14022e8409ea..f198ac836930bdb4fd28e3804002a92f4a2d990d 100644 (file)
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -449,10 +449,10 @@ Creates the directory if necessary and makes sure:
 - it's owned by us
 - it's not readable/writable by anybody else."
   (setq dir (directory-file-name dir))
-  (let ((attrs (file-attributes dir)))
+  (let ((attrs (file-attributes dir 'integer)))
     (unless attrs
       (letf (((default-file-modes) ?\700)) (make-directory dir t))
-      (setq attrs (file-attributes dir)))
+      (setq attrs (file-attributes dir 'integer)))
     ;; Check that it's safe for use.
     (unless (and (eq t (car attrs)) (eql (nth 2 attrs) (user-uid))
                  (or (eq system-type 'windows-nt)