Ensure local `default-directory' when calling `process-attributes'.

* lisp/server.el (server-running-p):
* lisp/subr.el (memory-limit): Ensure local `default-directory'
when calling `process-attributes'.

diff --git a/lisp/server.el b/lisp/server.el
index da60f1cda77c4d48bc71221b5bcb082aba0d5b31..763cf27f7aca71d6f67e40041fee4b80d6476d02 100644 (file)
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -779,7 +779,8 @@ by the current Emacs process, use the `server-process' variable."
   (condition-case nil
       (if server-use-tcp
          (with-temp-buffer
-           (insert-file-contents-literally (expand-file-name name server-auth-dir))
+            (setq default-directory server-auth-dir)
+           (insert-file-contents-literally (expand-file-name name))
            (or (and (looking-at "127\\.0\\.0\\.1:[0-9]+ \\([0-9]+\\)")
                     (assq 'comm
                           (process-attributes

diff --git a/lisp/subr.el b/lisp/subr.el
index 34f7bb6888a41aa08066d16958c30c07fbc358b3..e7d5d36461c9cce91a84c6d490510a863647e2df 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2719,7 +2719,8 @@ It can be retrieved with `(process-get PROCESS PROPNAME)'."
 
 (defun memory-limit ()
   "Return an estimate of Emacs virtual memory usage, divided by 1024."
-  (or (cdr (assq 'vsize (process-attributes (emacs-pid)))) 0))
+  (let ((default-directory temporary-file-directory))
+    (or (cdr (assq 'vsize (process-attributes (emacs-pid)))) 0)))
 
 \f
 ;;;; Input and display facilities.