diff options
author | Xue Fuqiao <xfq.free@gmail.com> | 2013-08-04 10:59:08 +0800 |
---|---|---|
committer | Xue Fuqiao <xfq.free@gmail.com> | 2013-08-04 10:59:08 +0800 |
commit | 99191b89ff64172740add88e67f163619a07830c (patch) | |
tree | 828d1ac7c917076703b9d4a3746ff7480bd97f0d /lisp/server.el | |
parent | ab419665caa6e2ad7465cf59ef902cc4ad1d2117 (diff) | |
parent | 2ad0a067728ccc7f8b32b0c3db1677ca351943fe (diff) | |
download | emacs-99191b89ff64172740add88e67f163619a07830c.tar.gz |
Merge from mainline.
Diffstat (limited to 'lisp/server.el')
-rw-r--r-- | lisp/server.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/server.el b/lisp/server.el index 05ac345d904..8a2a466a315 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -1611,7 +1611,7 @@ With ARG non-nil, silently save all file-visiting buffers, then kill. If emacsclient was started with a list of filenames to edit, then only these files will be asked to be saved." - (let ((proc (frame-parameter (selected-frame) 'client))) + (let ((proc (frame-parameter nil 'client))) (cond ((eq proc 'nowait) ;; Nowait frames have no client buffer list. (if (cdr (frame-list)) |