diff options
| author | Chong Yidong <cyd@gnu.org> | 2012-04-20 16:48:50 +0800 |
|---|---|---|
| committer | Chong Yidong <cyd@gnu.org> | 2012-04-20 16:48:50 +0800 |
| commit | c07a4c0b599e0debfb10acdf02ac6559b998a88a (patch) | |
| tree | f87bca47c21f04b43cca2347a21ed89c57b67958 /lisp/server.el | |
| parent | 6cf2a23e297b8a57a70c2a1dab5aa28b73461b0b (diff) | |
| parent | 50e5ebca7edcf5299b89ff74499991de01e22046 (diff) | |
Merge from emacs-24 branch
Diffstat (limited to 'lisp/server.el')
| -rw-r--r-- | lisp/server.el | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lisp/server.el b/lisp/server.el index c82a639eadf..123fea3743a 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -1174,6 +1174,13 @@ The following commands are accepted by the client: ;; Unknown command. (arg (error "Unknown command: %s" arg)))) + ;; If both -no-wait and -tty are given with file or sexp + ;; arguments, use an existing frame. + (and nowait + (not (eq tty-name 'window-system)) + (or files commands) + (setq use-current-frame t)) + (setq frame (cond ((and use-current-frame |