Mercurial > emacs

diff lisp/server.el @ 88023:c17f9d425917

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* server.el (server-process-filter): Check for non-nil before calling file-directory-p.
author Dan Nicolaescu <dann@ics.uci.edu>
date Sun, 27 Jan 2008 15:37:26 +0000
parents 921eddfa6d43
children 1da8bfe80e01
line wrap: on
line diff
--- 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))))))