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

file-directory-p.

2 files changed, 8 insertions, 2 deletions

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))))))