Commit 475b5907 authored by Dan Nicolaescu's avatar Dan Nicolaescu
Browse files

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

file-directory-p.
parent 4fae8922
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).
......
......@@ -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))))))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment