From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Sun, 27 Jan 2008 15:37:26 +0000 (+0000)
Subject: * server.el (server-process-filter): Check for non-nil before calling
X-Git-Tag: emacs-pretest-23.0.90~8373
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=475b5907736f25b9b67641c1698937cc0ca76b83;p=emacs.git

* server.el (server-process-filter): Check for non-nil before calling
file-directory-p.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2f734eacf03..679784fbcd0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-27  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* server.el (server-process-filter): Check for non-nil before
+	calling file-directory-p.
+
 2008-01-27  Alan Mackenzie  <acm@muc.de>
 
 	* progmodes/cc-vars.el (c-hanging-braces-alist): new element for
@@ -5,7 +10,7 @@
 
 	* progmodes/cc-cmds.el (c-brace-newlines): Determine the newlines
 	for a brace with syntax arglist-cont-nonempty.
-	
+
 	* progmodes/cc-styles.el (c-style-alist): Add elements for
 	arglist-cont-nonempty into 5 styles (gnu, ellemtel, linux, python,
 	awk).
diff --git a/lisp/server.el b/lisp/server.el
index d3606f5c860..ad4608f2fd2 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -952,7 +952,8 @@ The following commands are accepted by the client:
                    ;; Use the same cwd as the emacsclient, if possible, so
                    ;; relative file names work correctly, even in `eval'.
                    (let ((default-directory
-                           (if (file-directory-p dir) dir default-directory)))
+                           (if (and dir (file-directory-p dir))
+			       dir default-directory)))
                      (server-execute proc files nowait commands
                                      dontkill frame tty-name))))))