[Emacs-diffs] Changes to emacs/lisp/server.el,v

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   08/01/27 15:37:29

Index: server.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/server.el,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -b -r1.160 -r1.161
--- server.el   26 Jan 2008 21:54:44 -0000      1.160
+++ server.el   27 Jan 2008 15:37:26 -0000      1.161
@@ -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))))))