1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-02 08:22:22 +00:00

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

file-directory-p.
This commit is contained in:
Dan Nicolaescu 2008-01-27 15:37:26 +00:00
parent 4fae8922be
commit 475b590773
2 changed files with 8 additions and 2 deletions

View File

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

View File

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