# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1201448246 0
# Node ID c17f9d4259173d61c5de22707054855ee56e80c3
# Parent  a31afa284500b08a28db5bde278918dfe2a45da3
* server.el (server-process-filter): Check for non-nil before calling
file-directory-p.

diff -r a31afa284500 -r c17f9d425917 lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Jan 27 13:59:47 2008 +0000
+++ b/lisp/ChangeLog	Sun Jan 27 15:37:26 2008 +0000
@@ -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 -r a31afa284500 -r c17f9d425917 lisp/server.el
--- a/lisp/server.el	Sun Jan 27 13:59:47 2008 +0000
+++ b/lisp/server.el	Sun Jan 27 15:37:26 2008 +0000
@@ -952,7 +952,8 @@
                    ;; 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))))))