Mercurial > emacs
annotate lisp/server.el @ 92207:d12d3e6a5f77
*** empty log message ***
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Mon, 25 Feb 2008 11:28:07 +0000 |
parents | 1da8bfe80e01 |
children | c70e45a7acfd 986cecd901e8 |
rev | line source |
---|---|
38412
253f761ad37b
Some fixes to follow coding conventions in files maintained by FSF.
Pavel Janík <Pavel@Janik.cz>
parents:
38010
diff
changeset
|
1 ;;; server.el --- Lisp code for GNU Emacs running as server process |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
445
diff
changeset
|
2 |
64762
41bb365f41c4
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64372
diff
changeset
|
3 ;; Copyright (C) 1986, 1987, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
87542
04772d747469
(server-create-window-system-frame): Remove workaround for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87380
diff
changeset
|
4 ;; 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
844
bf829a2d63b4
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
814
diff
changeset
|
5 |
787
3cece0106722
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
702
diff
changeset
|
6 ;; Author: William Sommerfeld <wesommer@athena.mit.edu> |
17970 | 7 ;; Maintainer: FSF |
814
38b2499cb3e9
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
807
diff
changeset
|
8 ;; Keywords: processes |
787
3cece0106722
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
702
diff
changeset
|
9 |
3cece0106722
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
702
diff
changeset
|
10 ;; Changes by peck@sun.com and by rms. |
83124
d153d9579f9b
Fix fatal error during startup (rep. by Friedrich Delgado Friedrichs)
Karoly Lorentey <lorentey@elte.hu>
parents:
83118
diff
changeset
|
11 ;; Overhaul by Karoly Lorentey <lorentey@elte.hu> for multi-tty support. |
787
3cece0106722
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
702
diff
changeset
|
12 |
50 | 13 ;; This file is part of GNU Emacs. |
14 | |
15 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
16 ;; it under the terms of the GNU General Public License as published by | |
78236
9355f9b7bbff
Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents:
76648
diff
changeset
|
17 ;; the Free Software Foundation; either version 3, or (at your option) |
50 | 18 ;; any later version. |
19 | |
20 ;; GNU Emacs is distributed in the hope that it will be useful, | |
21 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
22 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
23 ;; GNU General Public License for more details. | |
24 | |
25 ;; You should have received a copy of the GNU General Public License | |
14169 | 26 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
64091 | 27 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
28 ;; Boston, MA 02110-1301, USA. | |
50 | 29 |
787
3cece0106722
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
702
diff
changeset
|
30 ;;; Commentary: |
50 | 31 |
14169 | 32 ;; This Lisp code is run in Emacs when it is to operate as |
33 ;; a server for other processes. | |
50 | 34 |
14169 | 35 ;; Load this library and do M-x server-edit to enable Emacs as a server. |
47645
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
36 ;; Emacs opens up a socket for communication with clients. If there are no |
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
37 ;; client buffers to edit, server-edit acts like (switch-to-buffer |
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
38 ;; (other-buffer)) |
50 | 39 |
14169 | 40 ;; When some other program runs "the editor" to edit a file, |
41 ;; "the editor" can be the Emacs client program ../lib-src/emacsclient. | |
42 ;; This program transmits the file names to Emacs through | |
43 ;; the server subprocess, and Emacs visits them and lets you edit them. | |
50 | 44 |
83215
a9f716fbb9c6
Small tweaks in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents:
83195
diff
changeset
|
45 ;; Note that any number of clients may dispatch files to Emacs to be edited. |
50 | 46 |
14169 | 47 ;; When you finish editing a Server buffer, again call server-edit |
49206
7ebd98bb02a2
(server-process-filter): Use `minibufferp' to test
John Paul Wallington <jpw@pobox.com>
parents:
49187
diff
changeset
|
48 ;; to mark that buffer as done for the client and switch to the next |
7ebd98bb02a2
(server-process-filter): Use `minibufferp' to test
John Paul Wallington <jpw@pobox.com>
parents:
49187
diff
changeset
|
49 ;; Server buffer. When all the buffers for a client have been edited |
14169 | 50 ;; and exited with server-edit, the client "editor" will return |
49206
7ebd98bb02a2
(server-process-filter): Use `minibufferp' to test
John Paul Wallington <jpw@pobox.com>
parents:
49187
diff
changeset
|
51 ;; to the program that invoked it. |
50 | 52 |
14169 | 53 ;; Your editing commands and Emacs's display output go to and from |
54 ;; the terminal in the usual way. Thus, server operation is possible | |
55 ;; only when Emacs can talk to the terminal at the time you invoke | |
56 ;; the client. This is possible in four cases: | |
50 | 57 |
14169 | 58 ;; 1. On a window system, where Emacs runs in one window and the |
59 ;; program that wants to use "the editor" runs in another. | |
50 | 60 |
14169 | 61 ;; 2. On a multi-terminal system, where Emacs runs on one terminal and the |
62 ;; program that wants to use "the editor" runs on another. | |
50 | 63 |
14169 | 64 ;; 3. When the program that wants to use "the editor" is running |
65 ;; as a subprocess of Emacs. | |
50 | 66 |
14169 | 67 ;; 4. On a system with job control, when Emacs is suspended, the program |
68 ;; that wants to use "the editor" will stop and display | |
69 ;; "Waiting for Emacs...". It can then be suspended, and Emacs can be | |
70 ;; brought into the foreground for editing. When done editing, Emacs is | |
71 ;; suspended again, and the client program is brought into the foreground. | |
50 | 72 |
49206
7ebd98bb02a2
(server-process-filter): Use `minibufferp' to test
John Paul Wallington <jpw@pobox.com>
parents:
49187
diff
changeset
|
73 ;; The buffer local variable "server-buffer-clients" lists |
7ebd98bb02a2
(server-process-filter): Use `minibufferp' to test
John Paul Wallington <jpw@pobox.com>
parents:
49187
diff
changeset
|
74 ;; the clients who are waiting for this buffer to be edited. |
14169 | 75 ;; The global variable "server-clients" lists all the waiting clients, |
76 ;; and which files are yet to be edited for each. | |
787
3cece0106722
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
702
diff
changeset
|
77 |
85102 | 78 ;; Todo: |
79 | |
80 ;; - handle command-line-args-left. | |
81 ;; - move most of the args processing and decision making from emacsclient.c | |
82 ;; to here. | |
83 ;; - fix up handling of the client's environment (place it in the terminal?). | |
84 | |
787
3cece0106722
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
702
diff
changeset
|
85 ;;; Code: |
47517
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
86 |
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
87 (eval-when-compile (require 'cl)) |
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
88 |
19418 | 89 (defgroup server nil |
90 "Emacs running as a server process." | |
91 :group 'external) | |
50 | 92 |
73559
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
93 (defcustom server-use-tcp nil |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
94 "If non-nil, use TCP sockets instead of local sockets." |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
95 :set #'(lambda (sym val) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
96 (unless (featurep 'make-network-process '(:family local)) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
97 (setq val t) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
98 (unless load-in-progress |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
99 (message "Local sockets unsupported, using TCP sockets"))) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
100 (when val (random t)) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
101 (set-default sym val)) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
102 :group 'server |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
103 :type 'boolean |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
104 :version "22.1") |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
105 |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
106 (defcustom server-host nil |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
107 "The name or IP address to use as host address of the server process. |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
108 If set, the server accepts remote connections; otherwise it is local." |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
109 :group 'server |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
110 :type '(choice |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
111 (string :tag "Name or IP address") |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
112 (const :tag "Local" nil)) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
113 :version "22.1") |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
114 (put 'server-host 'risky-local-variable t) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
115 |
81346
5f86f2151f34
(server-auth-dir): Use user-emacs-directory.
Chong Yidong <cyd@stupidchicken.com>
parents:
81299
diff
changeset
|
116 (defcustom server-auth-dir (concat user-emacs-directory "server/") |
73559
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
117 "Directory for server authentication files." |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
118 :group 'server |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
119 :type 'directory |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
120 :version "22.1") |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
121 (put 'server-auth-dir 'risky-local-variable t) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
122 |
73891
7e65038a5be1
(server-raise-frame): New option.
Juanma Barranquero <lekktu@gmail.com>
parents:
73805
diff
changeset
|
123 (defcustom server-raise-frame t |
74268
3de22dfd43f8
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73929
diff
changeset
|
124 "If non-nil, raise frame when switching to a buffer." |
73891
7e65038a5be1
(server-raise-frame): New option.
Juanma Barranquero <lekktu@gmail.com>
parents:
73805
diff
changeset
|
125 :group 'server |
7e65038a5be1
(server-raise-frame): New option.
Juanma Barranquero <lekktu@gmail.com>
parents:
73805
diff
changeset
|
126 :type 'boolean |
7e65038a5be1
(server-raise-frame): New option.
Juanma Barranquero <lekktu@gmail.com>
parents:
73805
diff
changeset
|
127 :version "22.1") |
7e65038a5be1
(server-raise-frame): New option.
Juanma Barranquero <lekktu@gmail.com>
parents:
73805
diff
changeset
|
128 |
47612
2d55f7e8ff64
Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47524
diff
changeset
|
129 (defcustom server-visit-hook nil |
74268
3de22dfd43f8
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73929
diff
changeset
|
130 "Hook run when visiting a file for the Emacs server." |
19418 | 131 :group 'server |
47612
2d55f7e8ff64
Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47524
diff
changeset
|
132 :type 'hook) |
50 | 133 |
19418 | 134 (defcustom server-switch-hook nil |
74268
3de22dfd43f8
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73929
diff
changeset
|
135 "Hook run when switching to a buffer for the Emacs server." |
19418 | 136 :group 'server |
47612
2d55f7e8ff64
Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47524
diff
changeset
|
137 :type 'hook) |
19418 | 138 |
139 (defcustom server-done-hook nil | |
74268
3de22dfd43f8
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73929
diff
changeset
|
140 "Hook run when done editing a buffer for the Emacs server." |
19418 | 141 :group 'server |
47612
2d55f7e8ff64
Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47524
diff
changeset
|
142 :type 'hook) |
7597
99a600c67e82
(server-done-hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents:
7553
diff
changeset
|
143 |
49206
7ebd98bb02a2
(server-process-filter): Use `minibufferp' to test
John Paul Wallington <jpw@pobox.com>
parents:
49187
diff
changeset
|
144 (defvar server-process nil |
7ebd98bb02a2
(server-process-filter): Use `minibufferp' to test
John Paul Wallington <jpw@pobox.com>
parents:
49187
diff
changeset
|
145 "The current server process.") |
50 | 146 |
147 (defvar server-clients nil | |
148 "List of current server clients. | |
84601
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
149 Each element is a process.") |
50 | 150 |
151 (defvar server-buffer-clients nil | |
83477
3a9507e5aa39
Fix `server-delete-client' behavior when the user quits `kill-buffer'. (Reported by Han Boetes.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83470
diff
changeset
|
152 "List of client processes requesting editing of current buffer.") |
6176
1dbec303c87b
(kill-emacs-query-functions, kill-buffer-query-functions):
Richard M. Stallman <rms@gnu.org>
parents:
5749
diff
changeset
|
153 (make-variable-buffer-local 'server-buffer-clients) |
50 | 154 ;; Changing major modes should not erase this local. |
155 (put 'server-buffer-clients 'permanent-local t) | |
156 | |
49267 | 157 (defcustom server-window nil |
74268
3de22dfd43f8
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73929
diff
changeset
|
158 "Specification of the window to use for selecting Emacs server buffers. |
3661
65d530f613a8
(server-window): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
2866
diff
changeset
|
159 If nil, use the selected window. |
49267 | 160 If it is a function, it should take one argument (a buffer) and |
161 display and select it. A common value is `pop-to-buffer'. | |
162 If it is a window, use that. | |
48123
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
163 If it is a frame, use the frame's selected window. |
49267 | 164 |
165 It is not meaningful to set this to a specific frame or window with Custom. | |
166 Only programs can do so." | |
167 :group 'server | |
59996
aac0a33f5772
Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents:
59220
diff
changeset
|
168 :version "22.1" |
49267 | 169 :type '(choice (const :tag "Use selected window" |
170 :match (lambda (widget value) | |
171 (not (functionp value))) | |
172 nil) | |
78371
f0d8038376f8
(server-window): Add switch-to-buffer-other-frame option.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
173 (function-item :tag "Display in new frame" switch-to-buffer-other-frame) |
49267 | 174 (function-item :tag "Use pop-to-buffer" pop-to-buffer) |
175 (function :tag "Other function"))) | |
3661
65d530f613a8
(server-window): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
2866
diff
changeset
|
176 |
19418 | 177 (defcustom server-temp-file-regexp "^/tmp/Re\\|/draft$" |
74268
3de22dfd43f8
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73929
diff
changeset
|
178 "Regexp matching names of temporary files. |
49267 | 179 These are deleted and reused after each edit by the programs that |
180 invoke the Emacs server." | |
19418 | 181 :group 'server |
182 :type 'regexp) | |
50 | 183 |
31008
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
184 (defcustom server-kill-new-buffers t |
74268
3de22dfd43f8
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73929
diff
changeset
|
185 "Whether to kill buffers when done with them. |
31008
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
186 If non-nil, kill a buffer unless it already existed before editing |
78978
5e0ec5155f3e
Chris Moore <dooglus at gmail.com>
Glenn Morris <rgm@gnu.org>
parents:
78371
diff
changeset
|
187 it with the Emacs server. If nil, kill only buffers as specified by |
31008
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
188 `server-temp-file-regexp'. |
78978
5e0ec5155f3e
Chris Moore <dooglus at gmail.com>
Glenn Morris <rgm@gnu.org>
parents:
78371
diff
changeset
|
189 Please note that only buffers that still have a client are killed, |
5e0ec5155f3e
Chris Moore <dooglus at gmail.com>
Glenn Morris <rgm@gnu.org>
parents:
78371
diff
changeset
|
190 i.e. buffers visited with \"emacsclient --no-wait\" are never killed in |
31008
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
191 this way." |
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
192 :group 'server |
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
193 :type 'boolean |
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
194 :version "21.1") |
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
195 |
50 | 196 (or (assq 'server-buffer-clients minor-mode-alist) |
73604
3b0b74acfa45
Try and fit within 80 columns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73559
diff
changeset
|
197 (push '(server-buffer-clients " Server") minor-mode-alist)) |
50 | 198 |
31008
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
199 (defvar server-existing-buffer nil |
47524
95ba2ac51138
(server-done): Fix harmlessly wrong arg to save-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47517
diff
changeset
|
200 "Non-nil means the buffer existed before the server was asked to visit it. |
40915
e26c1e76e1ca
(server-buffer-done): Test of server-existing-buffer was backwards.
Richard M. Stallman <rms@gnu.org>
parents:
39177
diff
changeset
|
201 This means that the server should not kill the buffer when you say you |
47524
95ba2ac51138
(server-done): Fix harmlessly wrong arg to save-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47517
diff
changeset
|
202 are done with it in the server.") |
31008
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
203 (make-variable-buffer-local 'server-existing-buffer) |
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
204 |
54357
367f0279478f
(server-name): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53736
diff
changeset
|
205 (defvar server-name "server") |
367f0279478f
(server-name): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53736
diff
changeset
|
206 |
83135
0c9a34bef526
Fix server-socket-dir initialization (rep. by Friedrich Delgado Friedrichs).
Karoly Lorentey <lorentey@elte.hu>
parents:
83131
diff
changeset
|
207 (defvar server-socket-dir nil |
0c9a34bef526
Fix server-socket-dir initialization (rep. by Friedrich Delgado Friedrichs).
Karoly Lorentey <lorentey@elte.hu>
parents:
83131
diff
changeset
|
208 "The directory in which to place the server socket. |
0c9a34bef526
Fix server-socket-dir initialization (rep. by Friedrich Delgado Friedrichs).
Karoly Lorentey <lorentey@elte.hu>
parents:
83131
diff
changeset
|
209 Initialized by `server-start'.") |
47612
2d55f7e8ff64
Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47524
diff
changeset
|
210 |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
211 (defun server-clients-with (property value) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
212 "Return a list of clients with PROPERTY set to VALUE." |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
213 (let (result) |
84601
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
214 (dolist (proc server-clients result) |
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
215 (when (equal value (process-get proc property)) |
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
216 (push proc result))))) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
217 |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
218 (defun server-add-client (proc) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
219 "Create a client for process PROC, if it doesn't already have one. |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
220 New clients have no properties." |
84601
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
221 (add-to-list 'server-clients proc)) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
222 |
83403
51eb0aa362f3
Store client's environment in terminal parameters, not server parameters.
Karoly Lorentey <lorentey@elte.hu>
parents:
83395
diff
changeset
|
223 (defmacro server-with-environment (env vars &rest body) |
51eb0aa362f3
Store client's environment in terminal parameters, not server parameters.
Karoly Lorentey <lorentey@elte.hu>
parents:
83395
diff
changeset
|
224 "Evaluate BODY with environment variables VARS set to those in ENV. |
83217
8131adf4ac7b
Set ncurses-related environment variables while creating a new tty frame. (Reported by Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83215
diff
changeset
|
225 The environment variables are then restored to their previous values. |
8131adf4ac7b
Set ncurses-related environment variables while creating a new tty frame. (Reported by Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83215
diff
changeset
|
226 |
83403
51eb0aa362f3
Store client's environment in terminal parameters, not server parameters.
Karoly Lorentey <lorentey@elte.hu>
parents:
83395
diff
changeset
|
227 VARS should be a list of strings. |
51eb0aa362f3
Store client's environment in terminal parameters, not server parameters.
Karoly Lorentey <lorentey@elte.hu>
parents:
83395
diff
changeset
|
228 ENV should be in the same format as `process-environment'." |
83217
8131adf4ac7b
Set ncurses-related environment variables while creating a new tty frame. (Reported by Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83215
diff
changeset
|
229 (declare (indent 2)) |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
230 (let ((var (make-symbol "var")) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
231 (value (make-symbol "value"))) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
232 `(let ((process-environment process-environment)) |
83403
51eb0aa362f3
Store client's environment in terminal parameters, not server parameters.
Karoly Lorentey <lorentey@elte.hu>
parents:
83395
diff
changeset
|
233 (dolist (,var ,vars) |
84744
4f2e2dad61b9
(server-getenv-from): Remove. Use getenv-internal instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84635
diff
changeset
|
234 (let ((,value (getenv-internal ,var ,env))) |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
235 (push (if (null ,value) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
236 ,var |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
237 (concat ,var "=" ,value)) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
238 process-environment))) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
239 (progn ,@body)))) |
83217
8131adf4ac7b
Set ncurses-related environment variables while creating a new tty frame. (Reported by Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83215
diff
changeset
|
240 |
84601
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
241 (defun server-delete-client (proc &optional noframe) |
85722
5f0d32eed4eb
(server-process-filter): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
85365
diff
changeset
|
242 "Delete PROC, including its buffers, terminals and frames. |
83109
1707638677c9
Fix one more case of the previous error.
Karoly Lorentey <lorentey@elte.hu>
parents:
83108
diff
changeset
|
243 If NOFRAME is non-nil, let the frames live. (To be used from |
83477
3a9507e5aa39
Fix `server-delete-client' behavior when the user quits `kill-buffer'. (Reported by Han Boetes.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83470
diff
changeset
|
244 `delete-frame-functions'.)" |
87220
655d101f4e6b
(server-select-display): Fix important typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86380
diff
changeset
|
245 (server-log (concat "server-delete-client" (if noframe " noframe")) proc) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
246 ;; Force a new lookup of client (prevents infinite recursion). |
84601
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
247 (when (memq proc server-clients) |
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
248 (let ((buffers (process-get proc 'buffers))) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
249 |
83477
3a9507e5aa39
Fix `server-delete-client' behavior when the user quits `kill-buffer'. (Reported by Han Boetes.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83470
diff
changeset
|
250 ;; Kill the client's buffers. |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
251 (dolist (buf buffers) |
83108
c7a76f7d323c
Fix error on deleting an emacsclient terminal (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents:
83105
diff
changeset
|
252 (when (buffer-live-p buf) |
c7a76f7d323c
Fix error on deleting an emacsclient terminal (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents:
83105
diff
changeset
|
253 (with-current-buffer buf |
c7a76f7d323c
Fix error on deleting an emacsclient terminal (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents:
83105
diff
changeset
|
254 ;; Kill the buffer if necessary. |
83477
3a9507e5aa39
Fix `server-delete-client' behavior when the user quits `kill-buffer'. (Reported by Han Boetes.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83470
diff
changeset
|
255 (when (and (equal server-buffer-clients |
3a9507e5aa39
Fix `server-delete-client' behavior when the user quits `kill-buffer'. (Reported by Han Boetes.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83470
diff
changeset
|
256 (list proc)) |
83108
c7a76f7d323c
Fix error on deleting an emacsclient terminal (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents:
83105
diff
changeset
|
257 (or (and server-kill-new-buffers |
c7a76f7d323c
Fix error on deleting an emacsclient terminal (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents:
83105
diff
changeset
|
258 (not server-existing-buffer)) |
83477
3a9507e5aa39
Fix `server-delete-client' behavior when the user quits `kill-buffer'. (Reported by Han Boetes.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83470
diff
changeset
|
259 (server-temp-file-p)) |
3a9507e5aa39
Fix `server-delete-client' behavior when the user quits `kill-buffer'. (Reported by Han Boetes.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83470
diff
changeset
|
260 (not (buffer-modified-p))) |
3a9507e5aa39
Fix `server-delete-client' behavior when the user quits `kill-buffer'. (Reported by Han Boetes.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83470
diff
changeset
|
261 (let (flag) |
3a9507e5aa39
Fix `server-delete-client' behavior when the user quits `kill-buffer'. (Reported by Han Boetes.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83470
diff
changeset
|
262 (unwind-protect |
3a9507e5aa39
Fix `server-delete-client' behavior when the user quits `kill-buffer'. (Reported by Han Boetes.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83470
diff
changeset
|
263 (progn (setq server-buffer-clients nil) |
3a9507e5aa39
Fix `server-delete-client' behavior when the user quits `kill-buffer'. (Reported by Han Boetes.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83470
diff
changeset
|
264 (kill-buffer (current-buffer)) |
3a9507e5aa39
Fix `server-delete-client' behavior when the user quits `kill-buffer'. (Reported by Han Boetes.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83470
diff
changeset
|
265 (setq flag t)) |
3a9507e5aa39
Fix `server-delete-client' behavior when the user quits `kill-buffer'. (Reported by Han Boetes.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83470
diff
changeset
|
266 (unless flag |
3a9507e5aa39
Fix `server-delete-client' behavior when the user quits `kill-buffer'. (Reported by Han Boetes.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83470
diff
changeset
|
267 ;; Restore clients if user pressed C-g in `kill-buffer'. |
3a9507e5aa39
Fix `server-delete-client' behavior when the user quits `kill-buffer'. (Reported by Han Boetes.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83470
diff
changeset
|
268 (setq server-buffer-clients (list proc))))))))) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
269 |
83444
00c55c52afd8
Make all frames created in an emacsclient session belong to that client.
Karoly Lorentey <lorentey@elte.hu>
parents:
83439
diff
changeset
|
270 ;; Delete the client's frames. |
00c55c52afd8
Make all frames created in an emacsclient session belong to that client.
Karoly Lorentey <lorentey@elte.hu>
parents:
83439
diff
changeset
|
271 (unless noframe |
00c55c52afd8
Make all frames created in an emacsclient session belong to that client.
Karoly Lorentey <lorentey@elte.hu>
parents:
83439
diff
changeset
|
272 (dolist (frame (frame-list)) |
00c55c52afd8
Make all frames created in an emacsclient session belong to that client.
Karoly Lorentey <lorentey@elte.hu>
parents:
83439
diff
changeset
|
273 (when (and (frame-live-p frame) |
00c55c52afd8
Make all frames created in an emacsclient session belong to that client.
Karoly Lorentey <lorentey@elte.hu>
parents:
83439
diff
changeset
|
274 (equal proc (frame-parameter frame 'client))) |
00c55c52afd8
Make all frames created in an emacsclient session belong to that client.
Karoly Lorentey <lorentey@elte.hu>
parents:
83439
diff
changeset
|
275 ;; Prevent `server-handle-delete-frame' from calling us |
00c55c52afd8
Make all frames created in an emacsclient session belong to that client.
Karoly Lorentey <lorentey@elte.hu>
parents:
83439
diff
changeset
|
276 ;; recursively. |
00c55c52afd8
Make all frames created in an emacsclient session belong to that client.
Karoly Lorentey <lorentey@elte.hu>
parents:
83439
diff
changeset
|
277 (set-frame-parameter frame 'client nil) |
00c55c52afd8
Make all frames created in an emacsclient session belong to that client.
Karoly Lorentey <lorentey@elte.hu>
parents:
83439
diff
changeset
|
278 (delete-frame frame)))) |
00c55c52afd8
Make all frames created in an emacsclient session belong to that client.
Karoly Lorentey <lorentey@elte.hu>
parents:
83439
diff
changeset
|
279 |
84601
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
280 (setq server-clients (delq proc server-clients)) |
83477
3a9507e5aa39
Fix `server-delete-client' behavior when the user quits `kill-buffer'. (Reported by Han Boetes.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83470
diff
changeset
|
281 |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
282 ;; Delete the client's tty. |
84601
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
283 (let ((terminal (process-get proc 'terminal))) |
84967
90cae4d53a9c
(server-delete-client): Only delete the terminal if it
Dan Nicolaescu <dann@ics.uci.edu>
parents:
84744
diff
changeset
|
284 ;; Only delete the terminal if it is non-nil. |
90cae4d53a9c
(server-delete-client): Only delete the terminal if it
Dan Nicolaescu <dann@ics.uci.edu>
parents:
84744
diff
changeset
|
285 (when (and terminal (eq (terminal-live-p terminal) t)) |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
286 (delete-terminal terminal))) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
287 |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
288 ;; Delete the client's process. |
84601
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
289 (if (eq (process-status proc) 'open) |
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
290 (delete-process proc)) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
291 |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
292 (server-log "Deleted" proc)))) |
47612
2d55f7e8ff64
Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47524
diff
changeset
|
293 |
87876
5350f7d1e7aa
(server-log-time-function): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
87794
diff
changeset
|
294 (defvar server-log-time-function 'current-time-string |
88042
1da8bfe80e01
(server-log-time-function): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
88023
diff
changeset
|
295 "Function to generate timestamps for `server-buffer'.") |
87876
5350f7d1e7aa
(server-log-time-function): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
87794
diff
changeset
|
296 |
88016
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
297 (defconst server-buffer " *server*" |
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
298 "Buffer used internally by Emacs's server. |
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
299 One use is to log the I/O for debugging purposes (see `server-log'), |
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
300 the other is to provide a current buffer in which the process filter can |
88042
1da8bfe80e01
(server-log-time-function): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
88023
diff
changeset
|
301 safely let-bind buffer-local variables like `default-directory'.") |
88016
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
302 |
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
303 (defvar server-log nil |
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
304 "If non-nil, log the server's inputs and outputs in the `server-buffer'.") |
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
305 |
47517
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
306 (defun server-log (string &optional client) |
88016
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
307 "If `server-log' is non-nil, log STRING to `server-buffer'. |
85722
5f0d32eed4eb
(server-process-filter): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
85365
diff
changeset
|
308 If CLIENT is non-nil, add a description of it to the logged message." |
88016
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
309 (when server-log |
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
310 (with-current-buffer (get-buffer-create server-buffer) |
73559
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
311 (goto-char (point-max)) |
87876
5350f7d1e7aa
(server-log-time-function): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
87794
diff
changeset
|
312 (insert (funcall server-log-time-function) |
83548
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
313 (cond |
87876
5350f7d1e7aa
(server-log-time-function): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
87794
diff
changeset
|
314 ((null client) " ") |
5350f7d1e7aa
(server-log-time-function): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
87794
diff
changeset
|
315 ((listp client) (format " %s: " (car client))) |
5350f7d1e7aa
(server-log-time-function): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
87794
diff
changeset
|
316 (t (format " %s: " client))) |
73559
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
317 string) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
318 (or (bolp) (newline))))) |
50 | 319 |
320 (defun server-sentinel (proc msg) | |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
321 "The process sentinel for Emacs server connections." |
66388
ad0d12f9aa9e
(server-sentinel): Set query-on-exit flag to nil on new client processes
Romain Francoise <romain@orebokech.com>
parents:
65582
diff
changeset
|
322 ;; If this is a new client process, set the query-on-exit flag to nil |
ad0d12f9aa9e
(server-sentinel): Set query-on-exit flag to nil on new client processes
Romain Francoise <romain@orebokech.com>
parents:
65582
diff
changeset
|
323 ;; for this process (it isn't inherited from the server process). |
ad0d12f9aa9e
(server-sentinel): Set query-on-exit flag to nil on new client processes
Romain Francoise <romain@orebokech.com>
parents:
65582
diff
changeset
|
324 (when (and (eq (process-status proc) 'open) |
ad0d12f9aa9e
(server-sentinel): Set query-on-exit flag to nil on new client processes
Romain Francoise <romain@orebokech.com>
parents:
65582
diff
changeset
|
325 (process-query-on-exit-flag proc)) |
ad0d12f9aa9e
(server-sentinel): Set query-on-exit flag to nil on new client processes
Romain Francoise <romain@orebokech.com>
parents:
65582
diff
changeset
|
326 (set-process-query-on-exit-flag proc nil)) |
73628
97c917d6101a
(server-auth-key): Remove. Replace by a process-property.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73611
diff
changeset
|
327 ;; Delete the associated connection file, if applicable. |
97c917d6101a
(server-auth-key): Remove. Replace by a process-property.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73611
diff
changeset
|
328 ;; This is actually problematic: the file may have been overwritten by |
97c917d6101a
(server-auth-key): Remove. Replace by a process-property.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73611
diff
changeset
|
329 ;; another Emacs server in the mean time, so it's not ours any more. |
97c917d6101a
(server-auth-key): Remove. Replace by a process-property.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73611
diff
changeset
|
330 ;; (and (process-contact proc :server) |
97c917d6101a
(server-auth-key): Remove. Replace by a process-property.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73611
diff
changeset
|
331 ;; (eq (process-status proc) 'closed) |
97c917d6101a
(server-auth-key): Remove. Replace by a process-property.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73611
diff
changeset
|
332 ;; (ignore-errors (delete-file (process-get proc :server-file)))) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
333 (server-log (format "Status changed to %s: %s" (process-status proc) msg) proc) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
334 (server-delete-client proc)) |
47612
2d55f7e8ff64
Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47524
diff
changeset
|
335 |
47645
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
336 (defun server-select-display (display) |
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
337 ;; If the current frame is on `display' we're all set. |
85365
a10ee3a5c9ce
(server-select-display): Nop if we do not support m-f-o-d.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85350
diff
changeset
|
338 ;; Similarly if we are unable to open a frames on other displays, there's |
a10ee3a5c9ce
(server-select-display): Nop if we do not support m-f-o-d.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85350
diff
changeset
|
339 ;; nothing more we can do. |
a10ee3a5c9ce
(server-select-display): Nop if we do not support m-f-o-d.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85350
diff
changeset
|
340 (unless (or (not (fboundp 'make-frame-on-display)) |
a10ee3a5c9ce
(server-select-display): Nop if we do not support m-f-o-d.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85350
diff
changeset
|
341 (equal (frame-parameter (selected-frame) 'display) display)) |
47645
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
342 ;; Otherwise, look for an existing frame there and select it. |
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
343 (dolist (frame (frame-list)) |
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
344 (when (equal (frame-parameter frame 'display) display) |
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
345 (select-frame frame))) |
71650
dcb7e8b2f7b3
* server.el (server-select-display): Don't make the temp frame
Chong Yidong <cyd@stupidchicken.com>
parents:
71320
diff
changeset
|
346 ;; If there's no frame on that display yet, create and select one. |
47645
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
347 (unless (equal (frame-parameter (selected-frame) 'display) display) |
73543
fa022f5f8164
(server-select-display): Use a dummy buffer to detect when
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71650
diff
changeset
|
348 (let* ((buffer (generate-new-buffer " *server-dummy*")) |
fa022f5f8164
(server-select-display): Use a dummy buffer to detect when
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71650
diff
changeset
|
349 (frame (make-frame-on-display |
fa022f5f8164
(server-select-display): Use a dummy buffer to detect when
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71650
diff
changeset
|
350 display |
fa022f5f8164
(server-select-display): Use a dummy buffer to detect when
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71650
diff
changeset
|
351 ;; Make it display (and remember) some dummy buffer, so |
fa022f5f8164
(server-select-display): Use a dummy buffer to detect when
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71650
diff
changeset
|
352 ;; we can detect later if the frame is in use or not. |
87220
655d101f4e6b
(server-select-display): Fix important typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86380
diff
changeset
|
353 `((server-dummy-buffer . ,buffer) |
73543
fa022f5f8164
(server-select-display): Use a dummy buffer to detect when
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71650
diff
changeset
|
354 ;; This frame may be deleted later (see |
fa022f5f8164
(server-select-display): Use a dummy buffer to detect when
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71650
diff
changeset
|
355 ;; server-unselect-display) so we want it to be as |
fa022f5f8164
(server-select-display): Use a dummy buffer to detect when
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71650
diff
changeset
|
356 ;; unobtrusive as possible. |
fa022f5f8164
(server-select-display): Use a dummy buffer to detect when
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71650
diff
changeset
|
357 (visibility . nil))))) |
fa022f5f8164
(server-select-display): Use a dummy buffer to detect when
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71650
diff
changeset
|
358 (select-frame frame) |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
359 (set-window-buffer (selected-window) buffer) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
360 frame)))) |
73543
fa022f5f8164
(server-select-display): Use a dummy buffer to detect when
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71650
diff
changeset
|
361 |
fa022f5f8164
(server-select-display): Use a dummy buffer to detect when
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71650
diff
changeset
|
362 (defun server-unselect-display (frame) |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
363 (when (frame-live-p frame) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
364 ;; If the temporary frame is in use (displays something real), make it |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
365 ;; visible. If not (which can happen if the user's customizations call |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
366 ;; pop-to-buffer etc.), delete it to avoid preserving the connection after |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
367 ;; the last real frame is deleted. |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
368 (if (and (eq (frame-first-window frame) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
369 (next-window (frame-first-window frame) 'nomini)) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
370 (eq (window-buffer (frame-first-window frame)) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
371 (frame-parameter frame 'server-dummy-buffer))) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
372 ;; The temp frame still only shows one buffer, and that is the |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
373 ;; internal temp buffer. |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
374 (delete-frame frame) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
375 (set-frame-parameter frame 'visibility t)) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
376 (kill-buffer (frame-parameter frame 'server-dummy-buffer)) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
377 (set-frame-parameter frame 'server-dummy-buffer nil))) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
378 |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
379 (defun server-handle-delete-frame (frame) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
380 "Delete the client connection when the emacsclient frame is deleted." |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
381 (let ((proc (frame-parameter frame 'client))) |
83335
60208d3a0bb1
Handle and document that `delete-frame' may call functions in `delete-frame-functions' twice.
Karoly Lorentey <lorentey@elte.hu>
parents:
83334
diff
changeset
|
382 (when (and (frame-live-p frame) |
60208d3a0bb1
Handle and document that `delete-frame' may call functions in `delete-frame-functions' twice.
Karoly Lorentey <lorentey@elte.hu>
parents:
83334
diff
changeset
|
383 proc |
83444
00c55c52afd8
Make all frames created in an emacsclient session belong to that client.
Karoly Lorentey <lorentey@elte.hu>
parents:
83439
diff
changeset
|
384 ;; See if this is the last frame for this client. |
83447
a78c6255d3be
Fix last frame check in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents:
83446
diff
changeset
|
385 (>= 1 (let ((frame-num 0)) |
83446
8eba1344ed4f
Fix typo in `server-handle-delete-frame'; fix startup echo area message.
Karoly Lorentey <lorentey@elte.hu>
parents:
83444
diff
changeset
|
386 (dolist (f (frame-list)) |
83444
00c55c52afd8
Make all frames created in an emacsclient session belong to that client.
Karoly Lorentey <lorentey@elte.hu>
parents:
83439
diff
changeset
|
387 (when (eq proc (frame-parameter f 'client)) |
00c55c52afd8
Make all frames created in an emacsclient session belong to that client.
Karoly Lorentey <lorentey@elte.hu>
parents:
83439
diff
changeset
|
388 (setq frame-num (1+ frame-num)))) |
00c55c52afd8
Make all frames created in an emacsclient session belong to that client.
Karoly Lorentey <lorentey@elte.hu>
parents:
83439
diff
changeset
|
389 frame-num))) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
390 (server-log (format "server-handle-delete-frame, frame %s" frame) proc) |
83109
1707638677c9
Fix one more case of the previous error.
Karoly Lorentey <lorentey@elte.hu>
parents:
83108
diff
changeset
|
391 (server-delete-client proc 'noframe)))) ; Let delete-frame delete the frame later. |
73543
fa022f5f8164
(server-select-display): Use a dummy buffer to detect when
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71650
diff
changeset
|
392 |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
393 (defun server-handle-suspend-tty (terminal) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
394 "Notify the emacsclient process to suspend itself when its tty device is suspended." |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
395 (dolist (proc (server-clients-with 'terminal terminal)) |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
396 (server-log (format "server-handle-suspend-tty, terminal %s" terminal) proc) |
83215
a9f716fbb9c6
Small tweaks in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents:
83195
diff
changeset
|
397 (condition-case err |
83246
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
398 (server-send-string proc "-suspend \n") |
84635
f539dbd0a615
(server-running-p): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84601
diff
changeset
|
399 (file-error ;The pipe/socket was closed. |
f539dbd0a615
(server-running-p): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84601
diff
changeset
|
400 (ignore-errors (server-delete-client proc)))))) |
47645
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
401 |
47612
2d55f7e8ff64
Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47524
diff
changeset
|
402 (defun server-unquote-arg (arg) |
83246
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
403 "Remove &-quotation from ARG. |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
404 See `server-quote-arg' and `server-process-filter'." |
47612
2d55f7e8ff64
Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47524
diff
changeset
|
405 (replace-regexp-in-string |
2d55f7e8ff64
Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47524
diff
changeset
|
406 "&." (lambda (s) |
2d55f7e8ff64
Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47524
diff
changeset
|
407 (case (aref s 1) |
2d55f7e8ff64
Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47524
diff
changeset
|
408 (?& "&") |
2d55f7e8ff64
Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47524
diff
changeset
|
409 (?- "-") |
2d55f7e8ff64
Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47524
diff
changeset
|
410 (?n "\n") |
2d55f7e8ff64
Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47524
diff
changeset
|
411 (t " "))) |
2d55f7e8ff64
Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47524
diff
changeset
|
412 arg t t)) |
50 | 413 |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
414 (defun server-quote-arg (arg) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
415 "In ARG, insert a & before each &, each space, each newline, and -. |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
416 Change spaces to underscores, too, so that the return value never |
83246
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
417 contains a space. |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
418 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
419 See `server-unquote-arg' and `server-process-filter'." |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
420 (replace-regexp-in-string |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
421 "[-&\n ]" (lambda (s) |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
422 (case (aref s 0) |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
423 (?& "&&") |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
424 (?- "&-") |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
425 (?\n "&n") |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
426 (?\s "&_"))) |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
427 arg t t)) |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
428 |
83246
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
429 (defun server-send-string (proc string) |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
430 "A wrapper around `proc-send-string' for logging." |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
431 (server-log (concat "Sent " string) proc) |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
432 (process-send-string proc string)) |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
433 |
50567
1b32397dd4e2
(server-socket-name): Use new safe location for socket.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49686
diff
changeset
|
434 (defun server-ensure-safe-dir (dir) |
1b32397dd4e2
(server-socket-name): Use new safe location for socket.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49686
diff
changeset
|
435 "Make sure DIR is a directory with no race-condition issues. |
1b32397dd4e2
(server-socket-name): Use new safe location for socket.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49686
diff
changeset
|
436 Creates the directory if necessary and makes sure: |
1b32397dd4e2
(server-socket-name): Use new safe location for socket.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49686
diff
changeset
|
437 - there's no symlink involved |
1b32397dd4e2
(server-socket-name): Use new safe location for socket.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49686
diff
changeset
|
438 - it's owned by us |
1b32397dd4e2
(server-socket-name): Use new safe location for socket.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49686
diff
changeset
|
439 - it's not readable/writable by anybody else." |
1b32397dd4e2
(server-socket-name): Use new safe location for socket.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49686
diff
changeset
|
440 (setq dir (directory-file-name dir)) |
1b32397dd4e2
(server-socket-name): Use new safe location for socket.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49686
diff
changeset
|
441 (let ((attrs (file-attributes dir))) |
1b32397dd4e2
(server-socket-name): Use new safe location for socket.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49686
diff
changeset
|
442 (unless attrs |
73559
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
443 (letf (((default-file-modes) ?\700)) (make-directory dir t)) |
50567
1b32397dd4e2
(server-socket-name): Use new safe location for socket.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49686
diff
changeset
|
444 (setq attrs (file-attributes dir))) |
1b32397dd4e2
(server-socket-name): Use new safe location for socket.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49686
diff
changeset
|
445 ;; Check that it's safe for use. |
75182
54c43f5d4c8b
(server-ensure-safe-dir): UIDs may be floats.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74268
diff
changeset
|
446 (unless (and (eq t (car attrs)) (eql (nth 2 attrs) (user-uid)) |
73559
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
447 (or (eq system-type 'windows-nt) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
448 (zerop (logand ?\077 (file-modes dir))))) |
50567
1b32397dd4e2
(server-socket-name): Use new safe location for socket.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49686
diff
changeset
|
449 (error "The directory %s is unsafe" dir)))) |
1b32397dd4e2
(server-socket-name): Use new safe location for socket.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49686
diff
changeset
|
450 |
256 | 451 ;;;###autoload |
50 | 452 (defun server-start (&optional leave-dead) |
453 "Allow this Emacs process to be a server for client processes. | |
454 This starts a server communications subprocess through which | |
83215
a9f716fbb9c6
Small tweaks in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents:
83195
diff
changeset
|
455 client \"editors\" can send your editing commands to this Emacs |
a9f716fbb9c6
Small tweaks in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents:
83195
diff
changeset
|
456 job. To use the server, set up the program `emacsclient' in the |
50 | 457 Emacs distribution as your standard \"editor\". |
458 | |
75442
09eed2796001
(server-start): Mention LEAVE-DEAD arg in the doc string.
Eli Zaretskii <eliz@gnu.org>
parents:
75182
diff
changeset
|
459 Optional argument LEAVE-DEAD (interactively, a prefix arg) means just |
09eed2796001
(server-start): Mention LEAVE-DEAD arg in the doc string.
Eli Zaretskii <eliz@gnu.org>
parents:
75182
diff
changeset
|
460 kill any existing server communications subprocess." |
50 | 461 (interactive "P") |
83155
235fb3b11e1f
Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents:
83139
diff
changeset
|
462 (when (or |
235fb3b11e1f
Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents:
83139
diff
changeset
|
463 (not server-clients) |
235fb3b11e1f
Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents:
83139
diff
changeset
|
464 (yes-or-no-p |
235fb3b11e1f
Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents:
83139
diff
changeset
|
465 "The current server still has clients; delete them? ")) |
235fb3b11e1f
Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents:
83139
diff
changeset
|
466 ;; It is safe to get the user id now. |
235fb3b11e1f
Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents:
83139
diff
changeset
|
467 (setq server-socket-dir (or server-socket-dir |
235fb3b11e1f
Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents:
83139
diff
changeset
|
468 (format "/tmp/emacs%d" (user-uid)))) |
83548
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
469 (when server-process |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
470 ;; kill it dead! |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
471 (ignore-errors (delete-process server-process))) |
83155
235fb3b11e1f
Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents:
83139
diff
changeset
|
472 ;; Delete the socket files made by previous server invocations. |
235fb3b11e1f
Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents:
83139
diff
changeset
|
473 (condition-case () |
235fb3b11e1f
Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents:
83139
diff
changeset
|
474 (delete-file (expand-file-name server-name server-socket-dir)) |
235fb3b11e1f
Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents:
83139
diff
changeset
|
475 (error nil)) |
235fb3b11e1f
Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents:
83139
diff
changeset
|
476 ;; If this Emacs already had a server, clear out associated status. |
235fb3b11e1f
Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents:
83139
diff
changeset
|
477 (while server-clients |
235fb3b11e1f
Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents:
83139
diff
changeset
|
478 (server-delete-client (car server-clients))) |
83517 | 479 ;; Now any previous server is properly stopped. |
83155
235fb3b11e1f
Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents:
83139
diff
changeset
|
480 (if leave-dead |
235fb3b11e1f
Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents:
83139
diff
changeset
|
481 (progn |
235fb3b11e1f
Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents:
83139
diff
changeset
|
482 (server-log (message "Server stopped")) |
235fb3b11e1f
Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents:
83139
diff
changeset
|
483 (setq server-process nil)) |
83548
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
484 (let* ((server-dir (if server-use-tcp server-auth-dir server-socket-dir)) |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
485 (server-file (expand-file-name server-name server-dir))) |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
486 ;; Make sure there is a safe directory in which to place the socket. |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
487 (server-ensure-safe-dir server-dir) |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
488 ;; Remove any leftover socket or authentication file. |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
489 (ignore-errors (delete-file server-file)) |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
490 (when server-process |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
491 (server-log (message "Restarting server"))) |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
492 (letf (((default-file-modes) ?\700)) |
83891
dab32bc3edc8
* server.el (server-start, server-unload-hook): Undo previous
Dan Nicolaescu <dann@ics.uci.edu>
parents:
83875
diff
changeset
|
493 (add-hook 'suspend-tty-functions 'server-handle-suspend-tty) |
83548
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
494 (add-hook 'delete-frame-functions 'server-handle-delete-frame) |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
495 (add-hook 'kill-buffer-query-functions 'server-kill-buffer-query-function) |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
496 (add-hook 'kill-emacs-query-functions 'server-kill-emacs-query-function) |
85944
69f410562c03
(server-start): Only register cleanup after server was
Andreas Schwab <schwab@suse.de>
parents:
85741
diff
changeset
|
497 (add-hook 'kill-emacs-hook (lambda () (server-mode -1))) ;Cleanup upon exit. |
83548
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
498 (setq server-process |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
499 (apply #'make-network-process |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
500 :name server-name |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
501 :server t |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
502 :noquery t |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
503 :sentinel 'server-sentinel |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
504 :filter 'server-process-filter |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
505 ;; We must receive file names without being decoded. |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
506 ;; Those are decoded by server-process-filter according |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
507 ;; to file-name-coding-system. |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
508 :coding 'raw-text |
88016
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
509 ;; The other args depend on the kind of socket used. |
83548
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
510 (if server-use-tcp |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
511 (list :family nil |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
512 :service t |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
513 :host (or server-host 'local) |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
514 :plist '(:authenticated nil)) |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
515 (list :family 'local |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
516 :service server-file |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
517 :plist '(:authenticated t))))) |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
518 (unless server-process (error "Could not start server process")) |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
519 (when server-use-tcp |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
520 (let ((auth-key |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
521 (loop |
85350
209a22b247e0
*** empty log message ***
Juanma Barranquero <lekktu@gmail.com>
parents:
85341
diff
changeset
|
522 ;; The auth key is a 64-byte string of random chars in the |
209a22b247e0
*** empty log message ***
Juanma Barranquero <lekktu@gmail.com>
parents:
85341
diff
changeset
|
523 ;; range `!'..`~'. |
209a22b247e0
*** empty log message ***
Juanma Barranquero <lekktu@gmail.com>
parents:
85341
diff
changeset
|
524 for i below 64 |
209a22b247e0
*** empty log message ***
Juanma Barranquero <lekktu@gmail.com>
parents:
85341
diff
changeset
|
525 collect (+ 33 (random 94)) into auth |
209a22b247e0
*** empty log message ***
Juanma Barranquero <lekktu@gmail.com>
parents:
85341
diff
changeset
|
526 finally return (concat auth)))) |
83548
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
527 (process-put server-process :auth-key auth-key) |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
528 (with-temp-file server-file |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
529 (set-buffer-multibyte nil) |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
530 (setq buffer-file-coding-system 'no-conversion) |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
531 (insert (format-network-address |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
532 (process-contact server-process :local)) |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
533 " " (int-to-string (emacs-pid)) |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
534 "\n" auth-key))))))))) |
49267 | 535 |
84635
f539dbd0a615
(server-running-p): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84601
diff
changeset
|
536 (defun server-running-p (&optional name) |
f539dbd0a615
(server-running-p): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84601
diff
changeset
|
537 "Test whether server NAME is running." |
f539dbd0a615
(server-running-p): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84601
diff
changeset
|
538 (interactive |
f539dbd0a615
(server-running-p): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84601
diff
changeset
|
539 (list (if current-prefix-arg |
f539dbd0a615
(server-running-p): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84601
diff
changeset
|
540 (read-string "Server name: " nil nil server-name)))) |
f539dbd0a615
(server-running-p): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84601
diff
changeset
|
541 (unless name (setq name server-name)) |
f539dbd0a615
(server-running-p): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84601
diff
changeset
|
542 (condition-case nil |
f539dbd0a615
(server-running-p): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84601
diff
changeset
|
543 (progn |
f539dbd0a615
(server-running-p): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84601
diff
changeset
|
544 (delete-process |
f539dbd0a615
(server-running-p): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84601
diff
changeset
|
545 (make-network-process |
f539dbd0a615
(server-running-p): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84601
diff
changeset
|
546 :name "server-client-test" :family 'local :server nil :noquery t |
f539dbd0a615
(server-running-p): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84601
diff
changeset
|
547 :service (expand-file-name name server-socket-dir))) |
f539dbd0a615
(server-running-p): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84601
diff
changeset
|
548 t) |
f539dbd0a615
(server-running-p): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84601
diff
changeset
|
549 (file-error nil))) |
49267 | 550 |
551 ;;;###autoload | |
552 (define-minor-mode server-mode | |
553 "Toggle Server mode. | |
554 With ARG, turn Server mode on if ARG is positive, off otherwise. | |
555 Server mode runs a process that accepts commands from the | |
556 `emacsclient' program. See `server-start' and Info node `Emacs server'." | |
557 :global t | |
558 :group 'server | |
59996
aac0a33f5772
Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents:
59220
diff
changeset
|
559 :version "22.1" |
49267 | 560 ;; Fixme: Should this check for an existing server socket and do |
561 ;; nothing if there is one (for multiple Emacs sessions)? | |
562 (server-start (not server-mode))) | |
50 | 563 |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
564 (defun server-eval-and-print (expr proc) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
565 "Eval EXPR and send the result back to client PROC." |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
566 (let ((v (eval (car (read-from-string expr))))) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
567 (when (and v proc) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
568 (with-temp-buffer |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
569 (let ((standard-output (current-buffer))) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
570 (pp v) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
571 (let ((text (buffer-substring-no-properties |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
572 (point-min) (point-max)))) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
573 (server-send-string |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
574 proc (format "-print %s\n" |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
575 (server-quote-arg text))))))))) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
576 |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
577 (defun server-create-tty-frame (tty type proc) |
85147
c164c81cba59
(server-create-tty-frame, server-create-window-system-frame):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85102
diff
changeset
|
578 (add-to-list 'frame-inherited-parameters 'client) |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
579 (let ((frame |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
580 (server-with-environment (process-get proc 'env) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
581 '("LANG" "LC_CTYPE" "LC_ALL" |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
582 ;; For tgetent(3); list according to ncurses(3). |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
583 "BAUDRATE" "COLUMNS" "ESCDELAY" "HOME" "LINES" |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
584 "NCURSES_ASSUMED_COLORS" "NCURSES_NO_PADDING" |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
585 "NCURSES_NO_SETBUF" "TERM" "TERMCAP" "TERMINFO" |
85722
5f0d32eed4eb
(server-process-filter): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
85365
diff
changeset
|
586 "TERMINFO_DIRS" "TERMPATH" |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
587 ;; rxvt wants these |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
588 "COLORFGBG" "COLORTERM") |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
589 (make-frame-on-tty tty type |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
590 ;; Ignore nowait here; we always need to |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
591 ;; clean up opened ttys when the client dies. |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
592 `((client . ,proc) |
85147
c164c81cba59
(server-create-tty-frame, server-create-window-system-frame):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85102
diff
changeset
|
593 ;; This is a leftover from an earlier |
c164c81cba59
(server-create-tty-frame, server-create-window-system-frame):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85102
diff
changeset
|
594 ;; attempt at making it possible for process |
c164c81cba59
(server-create-tty-frame, server-create-window-system-frame):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85102
diff
changeset
|
595 ;; run in the server process to use the |
c164c81cba59
(server-create-tty-frame, server-create-window-system-frame):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85102
diff
changeset
|
596 ;; environment of the client process. |
c164c81cba59
(server-create-tty-frame, server-create-window-system-frame):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85102
diff
changeset
|
597 ;; It has no effect now and to make it work |
c164c81cba59
(server-create-tty-frame, server-create-window-system-frame):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85102
diff
changeset
|
598 ;; we'd need to decide how to make |
c164c81cba59
(server-create-tty-frame, server-create-window-system-frame):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85102
diff
changeset
|
599 ;; process-environment interact with client |
c164c81cba59
(server-create-tty-frame, server-create-window-system-frame):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85102
diff
changeset
|
600 ;; envvars, and then to change the |
c164c81cba59
(server-create-tty-frame, server-create-window-system-frame):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85102
diff
changeset
|
601 ;; C functions `child_setup' and |
c164c81cba59
(server-create-tty-frame, server-create-window-system-frame):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85102
diff
changeset
|
602 ;; `getenv_internal' accordingly. |
84601
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
603 (environment . ,(process-get proc 'env))))))) |
85722
5f0d32eed4eb
(server-process-filter): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
85365
diff
changeset
|
604 |
84744
4f2e2dad61b9
(server-getenv-from): Remove. Use getenv-internal instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84635
diff
changeset
|
605 ;; ttys don't use the `display' parameter, but callproc.c does to set |
4f2e2dad61b9
(server-getenv-from): Remove. Use getenv-internal instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84635
diff
changeset
|
606 ;; the DISPLAY environment on subprocesses. |
4f2e2dad61b9
(server-getenv-from): Remove. Use getenv-internal instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84635
diff
changeset
|
607 (set-frame-parameter frame 'display |
4f2e2dad61b9
(server-getenv-from): Remove. Use getenv-internal instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84635
diff
changeset
|
608 (getenv-internal "DISPLAY" (process-get proc 'env))) |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
609 (select-frame frame) |
84601
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
610 (process-put proc 'frame frame) |
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
611 (process-put proc 'terminal (frame-terminal frame)) |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
612 |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
613 ;; Display *scratch* by default. |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
614 (switch-to-buffer (get-buffer-create "*scratch*") 'norecord) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
615 |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
616 ;; Reply with our pid. |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
617 (server-send-string proc (concat "-emacs-pid " |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
618 (number-to-string (emacs-pid)) "\n")) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
619 frame)) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
620 |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
621 (defun server-create-window-system-frame (display nowait proc) |
85147
c164c81cba59
(server-create-tty-frame, server-create-window-system-frame):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85102
diff
changeset
|
622 (add-to-list 'frame-inherited-parameters 'client) |
84744
4f2e2dad61b9
(server-getenv-from): Remove. Use getenv-internal instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84635
diff
changeset
|
623 (if (not (fboundp 'make-frame-on-display)) |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
624 (progn |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
625 ;; This emacs does not support X. |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
626 (server-log "Window system unsupported" proc) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
627 (server-send-string proc "-window-system-unsupported \n") |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
628 nil) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
629 ;; Flag frame as client-created, but use a dummy client. |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
630 ;; This will prevent the frame from being deleted when |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
631 ;; emacsclient quits while also preventing |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
632 ;; `server-save-buffers-kill-terminal' from unexpectedly |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
633 ;; killing emacs on that frame. |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
634 (let* ((params `((client . ,(if nowait 'nowait proc)) |
85147
c164c81cba59
(server-create-tty-frame, server-create-window-system-frame):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85102
diff
changeset
|
635 ;; This is a leftover, see above. |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
636 (environment . ,(process-get proc 'env)))) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
637 (frame (make-frame-on-display |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
638 (or display |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
639 (frame-parameter nil 'display) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
640 (getenv "DISPLAY") |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
641 (error "Please specify display")) |
84601
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
642 params))) |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
643 (server-log (format "%s created" frame) proc) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
644 (select-frame frame) |
84601
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
645 (process-put proc 'frame frame) |
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
646 (process-put proc 'terminal (frame-terminal frame)) |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
647 |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
648 ;; Display *scratch* by default. |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
649 (switch-to-buffer (get-buffer-create "*scratch*") 'norecord) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
650 frame))) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
651 |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
652 |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
653 (defun server-goto-toplevel (proc) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
654 (condition-case nil |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
655 ;; If we're running isearch, we must abort it to allow Emacs to |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
656 ;; display the buffer and switch to it. |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
657 (dolist (buffer (buffer-list)) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
658 (with-current-buffer buffer |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
659 (when (bound-and-true-p isearch-mode) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
660 (isearch-cancel)))) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
661 ;; Signaled by isearch-cancel. |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
662 (quit (message nil))) |
74268
3de22dfd43f8
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73929
diff
changeset
|
663 (when (> (recursion-depth) 0) |
3de22dfd43f8
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73929
diff
changeset
|
664 ;; We're inside a minibuffer already, so if the emacs-client is trying |
3de22dfd43f8
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73929
diff
changeset
|
665 ;; to open a frame on a new display, we might end up with an unusable |
3de22dfd43f8
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73929
diff
changeset
|
666 ;; frame because input from that display will be blocked (until exiting |
3de22dfd43f8
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73929
diff
changeset
|
667 ;; the minibuffer). Better exit this minibuffer right away. |
3de22dfd43f8
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73929
diff
changeset
|
668 ;; Similarly with recursive-edits such as the splash screen. |
3de22dfd43f8
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73929
diff
changeset
|
669 (run-with-timer 0 nil (lexical-let ((proc proc)) |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
670 (lambda () (server-execute-continuation proc)))) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
671 (top-level))) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
672 |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
673 ;; We use various special properties on process objects: |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
674 ;; - `env' stores the info about the environment of the emacsclient process. |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
675 ;; - `continuation' is a no-arg function that we need to execute. It contains |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
676 ;; commands we wanted to execute in some earlier invocation of the process |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
677 ;; filter but that we somehow were unable to process at that time |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
678 ;; (e.g. because we first need to throw to the toplevel). |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
679 |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
680 (defun server-execute-continuation (proc) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
681 (let ((continuation (process-get proc 'continuation))) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
682 (process-put proc 'continuation nil) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
683 (if continuation (ignore-errors (funcall continuation))))) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
684 |
73559
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
685 (defun* server-process-filter (proc string) |
49267 | 686 "Process a request from the server to edit some files. |
83246
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
687 PROC is the server process. STRING consists of a sequence of |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
688 commands prefixed by a dash. Some commands have arguments; these |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
689 are &-quoted and need to be decoded by `server-unquote-arg'. The |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
690 filter parses and executes these commands. |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
691 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
692 To illustrate the protocol, here is an example command that |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
693 emacsclient sends to create a new X frame (note that the whole |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
694 sequence is sent on a single line): |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
695 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
696 -env HOME /home/lorentey |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
697 -env DISPLAY :0.0 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
698 ... lots of other -env commands |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
699 -display :0.0 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
700 -window-system |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
701 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
702 The following commands are accepted by the server: |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
703 |
83548
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
704 `-auth AUTH-STRING' |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
705 Authenticate the client using the secret authentication string |
83633
3c43b53861c8
(server-process-filter): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
83621
diff
changeset
|
706 AUTH-STRING. |
83548
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
707 |
83403
51eb0aa362f3
Store client's environment in terminal parameters, not server parameters.
Karoly Lorentey <lorentey@elte.hu>
parents:
83395
diff
changeset
|
708 `-env NAME=VALUE' |
83246
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
709 An environment variable on the client side. |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
710 |
83499
0fe580113f72
Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents:
83477
diff
changeset
|
711 `-dir DIRNAME' |
0fe580113f72
Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents:
83477
diff
changeset
|
712 The current working directory of the client process. |
0fe580113f72
Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents:
83477
diff
changeset
|
713 |
83367
2b5fb28780be
Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
714 `-current-frame' |
2b5fb28780be
Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
715 Forbid the creation of new frames. |
2b5fb28780be
Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
716 |
83246
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
717 `-nowait' |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
718 Request that the next frame created should not be |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
719 associated with this client. |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
720 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
721 `-display DISPLAY' |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
722 Set the display name to open X frames on. |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
723 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
724 `-position LINE[:COLUMN]' |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
725 Go to the given line and column number |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
726 in the next file opened. |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
727 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
728 `-file FILENAME' |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
729 Load the given file in the current frame. |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
730 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
731 `-eval EXPR' |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
732 Evaluate EXPR as a Lisp expression and return the |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
733 result in -print commands. |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
734 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
735 `-window-system' |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
736 Open a new X frame. |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
737 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
738 `-tty DEVICENAME TYPE' |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
739 Open a new tty frame at the client. |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
740 |
83499
0fe580113f72
Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents:
83477
diff
changeset
|
741 `-suspend' |
0fe580113f72
Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents:
83477
diff
changeset
|
742 Suspend this tty frame. The client sends this string in |
0fe580113f72
Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents:
83477
diff
changeset
|
743 response to SIGTSTP and SIGTTOU. The server must cease all I/O |
0fe580113f72
Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents:
83477
diff
changeset
|
744 on this tty until it gets a -resume command. |
0fe580113f72
Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents:
83477
diff
changeset
|
745 |
83246
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
746 `-resume' |
85722
5f0d32eed4eb
(server-process-filter): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
85365
diff
changeset
|
747 Resume this tty frame. The client sends this string when it |
83246
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
748 gets the SIGCONT signal and it is the foreground process on its |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
749 controlling tty. |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
750 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
751 `-ignore COMMENT' |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
752 Do nothing, but put the comment in the server |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
753 log. Useful for debugging. |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
754 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
755 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
756 The following commands are accepted by the client: |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
757 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
758 `-emacs-pid PID' |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
759 Describes the process id of the Emacs process; |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
760 used to forward window change signals to it. |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
761 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
762 `-window-system-unsupported' |
85722
5f0d32eed4eb
(server-process-filter): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
85365
diff
changeset
|
763 Signals that the server does not support creating X frames; |
5f0d32eed4eb
(server-process-filter): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
85365
diff
changeset
|
764 the client must try again with a tty frame. |
83246
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
765 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
766 `-print STRING' |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
767 Print STRING on stdout. Used to send values |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
768 returned by -eval. |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
769 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
770 `-error DESCRIPTION' |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
771 Signal an error (but continue processing). |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
772 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
773 `-suspend' |
85722
5f0d32eed4eb
(server-process-filter): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
85365
diff
changeset
|
774 Suspend this terminal, i.e., stop the client process. |
5f0d32eed4eb
(server-process-filter): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
85365
diff
changeset
|
775 Sent when the user presses C-z." |
83246
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
776 (server-log (concat "Received " string) proc) |
73559
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
777 ;; First things first: let's check the authentication |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
778 (unless (process-get proc :authenticated) |
87964
fdac3d75dcdb
(server-process-filter): Don't force the authentication
Juanma Barranquero <lekktu@gmail.com>
parents:
87876
diff
changeset
|
779 (if (and (string-match "-auth \\([!-~]+\\)\n?" string) |
83548
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
780 (equal (match-string 1 string) (process-get proc :auth-key))) |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
781 (progn |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
782 (setq string (substring string (match-end 0))) |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
783 (process-put proc :authenticated t) |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
784 (server-log "Authentication successful" proc)) |
73559
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
785 (server-log "Authentication failed" proc) |
83548
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
786 (server-send-string |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
787 proc (concat "-error " (server-quote-arg "Authentication failed"))) |
73559
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
788 (delete-process proc) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
789 ;; We return immediately |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
790 (return-from server-process-filter))) |
49686
64195811ff44
(server-previous-strings): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49267
diff
changeset
|
791 (let ((prev (process-get proc 'previous-string))) |
64195811ff44
(server-previous-strings): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49267
diff
changeset
|
792 (when prev |
64195811ff44
(server-previous-strings): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49267
diff
changeset
|
793 (setq string (concat prev string)) |
64195811ff44
(server-previous-strings): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49267
diff
changeset
|
794 (process-put proc 'previous-string nil))) |
83044
52039abab942
Verify the version of Emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents:
83043
diff
changeset
|
795 (condition-case err |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
796 (progn |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
797 (server-add-client proc) |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
798 (if (not (string-match "\n" string)) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
799 ;; Save for later any partial line that remains. |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
800 (when (> (length string) 0) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
801 (process-put proc 'previous-string string)) |
85722
5f0d32eed4eb
(server-process-filter): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
85365
diff
changeset
|
802 |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
803 ;; In earlier versions of server.el (where we used an `emacsserver' |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
804 ;; process), there could be multiple lines. Nowadays this is not |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
805 ;; supported any more. |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
806 (assert (eq (match-end 0) (length string))) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
807 (let ((request (substring string 0 (match-beginning 0))) |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
808 (coding-system (and default-enable-multibyte-characters |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
809 (or file-name-coding-system |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
810 default-file-name-coding-system))) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
811 nowait ; t if emacsclient does not want to wait for us. |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
812 frame ; The frame that was opened for the client (if any). |
83403
51eb0aa362f3
Store client's environment in terminal parameters, not server parameters.
Karoly Lorentey <lorentey@elte.hu>
parents:
83395
diff
changeset
|
813 display ; Open the frame on this display. |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
814 dontkill ; t if the client should not be killed. |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
815 (commands ()) |
83499
0fe580113f72
Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents:
83477
diff
changeset
|
816 dir |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
817 (tty-name nil) ;nil, `window-system', or the tty name. |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
818 tty-type ;string. |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
819 (files nil) |
87794
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
820 (filepos nil) |
86380
2f0cad6a4f81
* server.el (server-process-filter): Use `command-line-args-left'
David Kastrup <dak@gnu.org>
parents:
85975
diff
changeset
|
821 command-line-args-left |
2f0cad6a4f81
* server.el (server-process-filter): Use `command-line-args-left'
David Kastrup <dak@gnu.org>
parents:
85975
diff
changeset
|
822 arg) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
823 ;; Remove this line from STRING. |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
824 (setq string (substring string (match-end 0))) |
86380
2f0cad6a4f81
* server.el (server-process-filter): Use `command-line-args-left'
David Kastrup <dak@gnu.org>
parents:
85975
diff
changeset
|
825 (setq command-line-args-left |
2f0cad6a4f81
* server.el (server-process-filter): Use `command-line-args-left'
David Kastrup <dak@gnu.org>
parents:
85975
diff
changeset
|
826 (mapcar 'server-unquote-arg (split-string request " " t))) |
2f0cad6a4f81
* server.el (server-process-filter): Use `command-line-args-left'
David Kastrup <dak@gnu.org>
parents:
85975
diff
changeset
|
827 (while (setq arg (pop command-line-args-left)) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
828 (cond |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
829 ;; -version CLIENT-VERSION: obsolete at birth. |
86380
2f0cad6a4f81
* server.el (server-process-filter): Use `command-line-args-left'
David Kastrup <dak@gnu.org>
parents:
85975
diff
changeset
|
830 ((and (equal "-version" arg) command-line-args-left) |
2f0cad6a4f81
* server.el (server-process-filter): Use `command-line-args-left'
David Kastrup <dak@gnu.org>
parents:
85975
diff
changeset
|
831 (pop command-line-args-left)) |
83043
78a785f205ea
Added -w option to emacsclient for opening a new X frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83031
diff
changeset
|
832 |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
833 ;; -nowait: Emacsclient won't wait for a result. |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
834 ((equal "-nowait" arg) (setq nowait t)) |
83043
78a785f205ea
Added -w option to emacsclient for opening a new X frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83031
diff
changeset
|
835 |
83367
2b5fb28780be
Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
836 ;; -current-frame: Don't create frames. |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
837 ((equal "-current-frame" arg) (setq tty-name nil)) |
83367
2b5fb28780be
Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
838 |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
839 ;; -display DISPLAY: |
83403
51eb0aa362f3
Store client's environment in terminal parameters, not server parameters.
Karoly Lorentey <lorentey@elte.hu>
parents:
83395
diff
changeset
|
840 ;; Open X frames on the given display instead of the default. |
86380
2f0cad6a4f81
* server.el (server-process-filter): Use `command-line-args-left'
David Kastrup <dak@gnu.org>
parents:
85975
diff
changeset
|
841 ((and (equal "-display" arg) command-line-args-left) |
87220
655d101f4e6b
(server-select-display): Fix important typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86380
diff
changeset
|
842 (setq display (pop command-line-args-left)) |
655d101f4e6b
(server-select-display): Fix important typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86380
diff
changeset
|
843 (if (zerop (length display)) (setq display nil))) |
83043
78a785f205ea
Added -w option to emacsclient for opening a new X frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83031
diff
changeset
|
844 |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
845 ;; -window-system: Open a new X frame. |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
846 ((equal "-window-system" arg) |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
847 (setq dontkill t) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
848 (setq tty-name 'window-system)) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
849 |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
850 ;; -resume: Resume a suspended tty frame. |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
851 ((equal "-resume" arg) |
84601
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
852 (lexical-let ((terminal (process-get proc 'terminal))) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
853 (setq dontkill t) |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
854 (push (lambda () |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
855 (when (eq (terminal-live-p terminal) t) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
856 (resume-tty terminal))) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
857 commands))) |
83043
78a785f205ea
Added -w option to emacsclient for opening a new X frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83031
diff
changeset
|
858 |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
859 ;; -suspend: Suspend the client's frame. (In case we |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
860 ;; get out of sync, and a C-z sends a SIGTSTP to |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
861 ;; emacsclient.) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
862 ((equal "-suspend" arg) |
84601
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
863 (lexical-let ((terminal (process-get proc 'terminal))) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
864 (setq dontkill t) |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
865 (push (lambda () |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
866 (when (eq (terminal-live-p terminal) t) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
867 (suspend-tty terminal))) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
868 commands))) |
83044
52039abab942
Verify the version of Emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents:
83043
diff
changeset
|
869 |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
870 ;; -ignore COMMENT: Noop; useful for debugging emacsclient. |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
871 ;; (The given comment appears in the server log.) |
86380
2f0cad6a4f81
* server.el (server-process-filter): Use `command-line-args-left'
David Kastrup <dak@gnu.org>
parents:
85975
diff
changeset
|
872 ((and (equal "-ignore" arg) command-line-args-left |
2f0cad6a4f81
* server.el (server-process-filter): Use `command-line-args-left'
David Kastrup <dak@gnu.org>
parents:
85975
diff
changeset
|
873 (setq dontkill t) |
2f0cad6a4f81
* server.el (server-process-filter): Use `command-line-args-left'
David Kastrup <dak@gnu.org>
parents:
85975
diff
changeset
|
874 (pop command-line-args-left))) |
53233
fe9b37bee5f7
Fully eliminated global tty state variables.
Karoly Lorentey <lorentey@elte.hu>
parents:
53232
diff
changeset
|
875 |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
876 ;; -tty DEVICE-NAME TYPE: Open a new tty frame at the client. |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
877 ((and (equal "-tty" arg) |
86380
2f0cad6a4f81
* server.el (server-process-filter): Use `command-line-args-left'
David Kastrup <dak@gnu.org>
parents:
85975
diff
changeset
|
878 (cdr command-line-args-left)) |
2f0cad6a4f81
* server.el (server-process-filter): Use `command-line-args-left'
David Kastrup <dak@gnu.org>
parents:
85975
diff
changeset
|
879 (setq tty-name (pop command-line-args-left) |
2f0cad6a4f81
* server.el (server-process-filter): Use `command-line-args-left'
David Kastrup <dak@gnu.org>
parents:
85975
diff
changeset
|
880 tty-type (pop command-line-args-left) |
2f0cad6a4f81
* server.el (server-process-filter): Use `command-line-args-left'
David Kastrup <dak@gnu.org>
parents:
85975
diff
changeset
|
881 dontkill t)) |
83283
45e5f0224d81
Fix error when creating tty clients.
Karoly Lorentey <lorentey@elte.hu>
parents:
83257
diff
changeset
|
882 |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
883 ;; -position LINE[:COLUMN]: Set point to the given |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
884 ;; position in the next file. |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
885 ((and (equal "-position" arg) |
86380
2f0cad6a4f81
* server.el (server-process-filter): Use `command-line-args-left'
David Kastrup <dak@gnu.org>
parents:
85975
diff
changeset
|
886 command-line-args-left |
2f0cad6a4f81
* server.el (server-process-filter): Use `command-line-args-left'
David Kastrup <dak@gnu.org>
parents:
85975
diff
changeset
|
887 (string-match "\\+\\([0-9]+\\)\\(?::\\([0-9]+\\)\\)?" |
2f0cad6a4f81
* server.el (server-process-filter): Use `command-line-args-left'
David Kastrup <dak@gnu.org>
parents:
85975
diff
changeset
|
888 (car command-line-args-left))) |
2f0cad6a4f81
* server.el (server-process-filter): Use `command-line-args-left'
David Kastrup <dak@gnu.org>
parents:
85975
diff
changeset
|
889 (setq arg (pop command-line-args-left)) |
87794
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
890 (setq filepos |
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
891 (cons (string-to-number (match-string 1 arg)) |
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
892 (string-to-number (or (match-string 2 arg) ""))))) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
893 |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
894 ;; -file FILENAME: Load the given file. |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
895 ((and (equal "-file" arg) |
86380
2f0cad6a4f81
* server.el (server-process-filter): Use `command-line-args-left'
David Kastrup <dak@gnu.org>
parents:
85975
diff
changeset
|
896 command-line-args-left) |
2f0cad6a4f81
* server.el (server-process-filter): Use `command-line-args-left'
David Kastrup <dak@gnu.org>
parents:
85975
diff
changeset
|
897 (let ((file (pop command-line-args-left))) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
898 (if coding-system |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
899 (setq file (decode-coding-string file coding-system))) |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
900 (setq file (command-line-normalize-file-name file)) |
87794
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
901 (push (cons file filepos) files) |
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
902 (server-log (format "New file: %s %s" |
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
903 file (or filepos "")) proc)) |
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
904 (setq filepos nil)) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
905 |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
906 ;; -eval EXPR: Evaluate a Lisp expression. |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
907 ((and (equal "-eval" arg) |
86380
2f0cad6a4f81
* server.el (server-process-filter): Use `command-line-args-left'
David Kastrup <dak@gnu.org>
parents:
85975
diff
changeset
|
908 command-line-args-left) |
2f0cad6a4f81
* server.el (server-process-filter): Use `command-line-args-left'
David Kastrup <dak@gnu.org>
parents:
85975
diff
changeset
|
909 (lexical-let ((expr (pop command-line-args-left))) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
910 (if coding-system |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
911 (setq expr (decode-coding-string expr coding-system))) |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
912 (push (lambda () (server-eval-and-print expr proc)) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
913 commands) |
87794
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
914 (setq filepos nil))) |
83043
78a785f205ea
Added -w option to emacsclient for opening a new X frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83031
diff
changeset
|
915 |
83403
51eb0aa362f3
Store client's environment in terminal parameters, not server parameters.
Karoly Lorentey <lorentey@elte.hu>
parents:
83395
diff
changeset
|
916 ;; -env NAME=VALUE: An environment variable. |
86380
2f0cad6a4f81
* server.el (server-process-filter): Use `command-line-args-left'
David Kastrup <dak@gnu.org>
parents:
85975
diff
changeset
|
917 ((and (equal "-env" arg) command-line-args-left) |
2f0cad6a4f81
* server.el (server-process-filter): Use `command-line-args-left'
David Kastrup <dak@gnu.org>
parents:
85975
diff
changeset
|
918 (let ((var (pop command-line-args-left))) |
83427
2afc49c9f0c0
Store local environment in frame (not terminal) parameters.
Karoly Lorentey <lorentey@elte.hu>
parents:
83421
diff
changeset
|
919 ;; XXX Variables should be encoded as in getenv/setenv. |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
920 (process-put proc 'env |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
921 (cons var (process-get proc 'env))))) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
922 |
83499
0fe580113f72
Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents:
83477
diff
changeset
|
923 ;; -dir DIRNAME: The cwd of the emacsclient process. |
86380
2f0cad6a4f81
* server.el (server-process-filter): Use `command-line-args-left'
David Kastrup <dak@gnu.org>
parents:
85975
diff
changeset
|
924 ((and (equal "-dir" arg) command-line-args-left) |
2f0cad6a4f81
* server.el (server-process-filter): Use `command-line-args-left'
David Kastrup <dak@gnu.org>
parents:
85975
diff
changeset
|
925 (setq dir (pop command-line-args-left)) |
83499
0fe580113f72
Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents:
83477
diff
changeset
|
926 (if coding-system |
0fe580113f72
Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents:
83477
diff
changeset
|
927 (setq dir (decode-coding-string dir coding-system))) |
0fe580113f72
Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents:
83477
diff
changeset
|
928 (setq dir (command-line-normalize-file-name dir))) |
0fe580113f72
Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents:
83477
diff
changeset
|
929 |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
930 ;; Unknown command. |
86380
2f0cad6a4f81
* server.el (server-process-filter): Use `command-line-args-left'
David Kastrup <dak@gnu.org>
parents:
85975
diff
changeset
|
931 (t (error "Unknown command: %s" arg)))) |
85722
5f0d32eed4eb
(server-process-filter): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
85365
diff
changeset
|
932 |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
933 (setq frame |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
934 (case tty-name |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
935 ((nil) (if display (server-select-display display))) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
936 ((window-system) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
937 (server-create-window-system-frame display nowait proc)) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
938 (t (server-create-tty-frame tty-name tty-type proc)))) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
939 |
88016
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
940 (process-put |
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
941 proc 'continuation |
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
942 (lexical-let ((proc proc) |
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
943 (files files) |
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
944 (nowait nowait) |
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
945 (commands commands) |
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
946 (dontkill dontkill) |
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
947 (frame frame) |
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
948 (dir dir) |
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
949 (tty-name tty-name)) |
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
950 (lambda () |
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
951 (with-current-buffer (get-buffer-create server-buffer) |
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
952 ;; Use the same cwd as the emacsclient, if possible, so |
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
953 ;; relative file names work correctly, even in `eval'. |
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
954 (let ((default-directory |
88042
1da8bfe80e01
(server-log-time-function): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
88023
diff
changeset
|
955 (if (and dir (file-directory-p dir)) |
1da8bfe80e01
(server-log-time-function): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
88023
diff
changeset
|
956 dir default-directory))) |
88016
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
957 (server-execute proc files nowait commands |
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
958 dontkill frame tty-name)))))) |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
959 |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
960 (when (or frame files) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
961 (server-goto-toplevel proc)) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
962 |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
963 (server-execute-continuation proc)))) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
964 ;; condition-case |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
965 (error (server-return-error proc err)))) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
966 |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
967 (defun server-execute (proc files nowait commands dontkill frame tty-name) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
968 (condition-case err |
84601
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
969 (let* ((buffers |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
970 (when files |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
971 (run-hooks 'pre-command-hook) |
84601
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
972 (prog1 (server-visit-files files proc nowait) |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
973 (run-hooks 'post-command-hook))))) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
974 |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
975 (mapc 'funcall (nreverse commands)) |
85722
5f0d32eed4eb
(server-process-filter): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
85365
diff
changeset
|
976 |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
977 ;; Delete the client if necessary. |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
978 (cond |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
979 (nowait |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
980 ;; Client requested nowait; return immediately. |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
981 (server-log "Close nowait client" proc) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
982 (server-delete-client proc)) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
983 ((and (not dontkill) (null buffers)) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
984 ;; This client is empty; get rid of it immediately. |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
985 (server-log "Close empty client" proc) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
986 (server-delete-client proc))) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
987 (cond |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
988 ((or isearch-mode (minibufferp)) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
989 nil) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
990 ((and frame (null buffers)) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
991 (message "%s" (substitute-command-keys |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
992 "When done with this frame, type \\[delete-frame]"))) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
993 ((not (null buffers)) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
994 (server-switch-buffer (car buffers)) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
995 (run-hooks 'server-switch-hook) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
996 (unless nowait |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
997 (message "%s" (substitute-command-keys |
73611
d1bc957e4056
(server-visit-files): Use `when'.
Juanma Barranquero <lekktu@gmail.com>
parents:
73604
diff
changeset
|
998 "When done with a buffer, type \\[server-edit]"))))) |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
999 (when (and frame (null tty-name)) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
1000 (server-unselect-display frame))) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
1001 (error (server-return-error proc err)))) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
1002 |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
1003 (defun server-return-error (proc err) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
1004 (ignore-errors |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
1005 (server-send-string |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
1006 proc (concat "-error " (server-quote-arg |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
1007 (error-message-string err)))) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
1008 (server-log (error-message-string err) proc) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
1009 (delete-process proc))) |
50 | 1010 |
87794
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
1011 (defun server-goto-line-column (line-col) |
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
1012 "Move point to the position indicated in LINE-COL. |
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
1013 LINE-COL should be a pair (LINE . COL)." |
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
1014 (when line-col |
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
1015 (goto-line (car line-col)) |
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
1016 (let ((column-number (cdr line-col))) |
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
1017 (when (> column-number 0) |
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
1018 (move-to-column (1- column-number)))))) |
46907
ce6e92081932
(server-process-filter): Simplify code.
Richard M. Stallman <rms@gnu.org>
parents:
42140
diff
changeset
|
1019 |
84601
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
1020 (defun server-visit-files (files proc &optional nowait) |
83172
1a136b47986d
Don't leave buffers created by nowait clients buried under others (rep. by Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents:
83167
diff
changeset
|
1021 "Find FILES and return a list of buffers created. |
87794
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
1022 FILES is an alist whose elements are (FILENAME . FILEPOS) |
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
1023 where FILEPOS can be nil or a pair (LINENUMBER . COLUMNNUMBER). |
84601
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
1024 PROC is the client that requested this operation. |
15956
0cefc98d243d
(server-visit-files): New argument NOWAIT.
Richard M. Stallman <rms@gnu.org>
parents:
14717
diff
changeset
|
1025 NOWAIT non-nil means this client is not waiting for the results, |
0cefc98d243d
(server-visit-files): New argument NOWAIT.
Richard M. Stallman <rms@gnu.org>
parents:
14717
diff
changeset
|
1026 so don't mark these buffers specially, just visit them normally." |
7736
8c8410bc0f1b
(server-visit-files): Bind last-nonmenu-event.
Richard M. Stallman <rms@gnu.org>
parents:
7597
diff
changeset
|
1027 ;; Bind last-nonmenu-event to force use of keyboard, not mouse, for queries. |
47645
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
1028 (let ((last-nonmenu-event t) client-record) |
4500
56d7c4beae9f
(server-visit-files): Restore current-buffer by hand,
Richard M. Stallman <rms@gnu.org>
parents:
4096
diff
changeset
|
1029 ;; Restore the current buffer afterward, but not using save-excursion, |
56d7c4beae9f
(server-visit-files): Restore current-buffer by hand,
Richard M. Stallman <rms@gnu.org>
parents:
4096
diff
changeset
|
1030 ;; because we don't want to save point in this buffer |
56d7c4beae9f
(server-visit-files): Restore current-buffer by hand,
Richard M. Stallman <rms@gnu.org>
parents:
4096
diff
changeset
|
1031 ;; if it happens to be one of those specified by the server. |
47645
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
1032 (save-current-buffer |
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
1033 (dolist (file files) |
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
1034 ;; If there is an existing buffer modified or the file is |
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
1035 ;; modified, revert it. If there is an existing buffer with |
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
1036 ;; deleted file, offer to write it. |
73929
f4ca1a5d7df7
(server-visit-files): If `minibuffer-auto-raise' has been set to t, respect it.
Juanma Barranquero <lekktu@gmail.com>
parents:
73918
diff
changeset
|
1037 (let* ((minibuffer-auto-raise (or server-raise-frame |
83548
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
1038 minibuffer-auto-raise)) |
73918
93040c47199f
(server-visit-files): Bind `minibuffer-auto-raise' to the value of
Juanma Barranquero <lekktu@gmail.com>
parents:
73891
diff
changeset
|
1039 (filen (car file)) |
47645
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
1040 (obuf (get-file-buffer filen))) |
70420
718312081ce0
(server-visit-files): Use add-to-history.
Kim F. Storm <storm@cua.dk>
parents:
69276
diff
changeset
|
1041 (add-to-history 'file-name-history filen) |
87794
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
1042 (if (null obuf) |
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
1043 (set-buffer (find-file-noselect filen)) |
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
1044 (set-buffer obuf) |
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
1045 (cond ((file-exists-p filen) |
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
1046 (when (not (verify-visited-file-modtime obuf)) |
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
1047 (revert-buffer t nil))) |
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
1048 (t |
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
1049 (when (y-or-n-p |
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
1050 (concat "File no longer exists: " filen |
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
1051 ", write buffer to file? ")) |
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
1052 (write-file filen)))) |
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
1053 (unless server-buffer-clients |
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
1054 (setq server-existing-buffer t))) |
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
1055 (server-goto-line-column (cdr file)) |
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
1056 (run-hooks 'server-visit-hook)) |
47645
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
1057 (unless nowait |
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
1058 ;; When the buffer is killed, inform the clients. |
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
1059 (add-hook 'kill-buffer-hook 'server-kill-buffer nil t) |
84601
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
1060 (push proc server-buffer-clients)) |
47645
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
1061 (push (current-buffer) client-record))) |
83172
1a136b47986d
Don't leave buffers created by nowait clients buried under others (rep. by Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents:
83167
diff
changeset
|
1062 (unless nowait |
84601
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
1063 (process-put proc 'buffers |
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
1064 (nconc (process-get proc 'buffers) client-record))) |
83172
1a136b47986d
Don't leave buffers created by nowait clients buried under others (rep. by Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents:
83167
diff
changeset
|
1065 client-record)) |
50 | 1066 |
17712
41a4624c1e79
(server-buffer-done): New arg FOR-KILLING.
Richard M. Stallman <rms@gnu.org>
parents:
17434
diff
changeset
|
1067 (defun server-buffer-done (buffer &optional for-killing) |
50 | 1068 "Mark BUFFER as \"done\" for its client(s). |
10961
88cba63f2a9b
(server-buffer-done): Return a list
Richard M. Stallman <rms@gnu.org>
parents:
10281
diff
changeset
|
1069 This buries the buffer, then returns a list of the form (NEXT-BUFFER KILLED). |
88cba63f2a9b
(server-buffer-done): Return a list
Richard M. Stallman <rms@gnu.org>
parents:
10281
diff
changeset
|
1070 NEXT-BUFFER is another server buffer, as a suggestion for what to select next, |
47517
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
1071 or nil. KILLED is t if we killed BUFFER (typically, because it was visiting |
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
1072 a temp file). |
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
1073 FOR-KILLING if non-nil indicates that we are called from `kill-buffer'." |
47612
2d55f7e8ff64
Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47524
diff
changeset
|
1074 (let ((next-buffer nil) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
1075 (killed nil)) |
84601
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
1076 (dolist (proc server-clients) |
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
1077 (let ((buffers (process-get proc 'buffers))) |
47517
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
1078 (or next-buffer |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
1079 (setq next-buffer (nth 1 (memq buffer buffers)))) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
1080 (when buffers ; Ignore bufferless clients. |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
1081 (setq buffers (delq buffer buffers)) |
84601
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
1082 ;; Delete all dead buffers from PROC. |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
1083 (dolist (b buffers) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
1084 (and (bufferp b) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
1085 (not (buffer-live-p b)) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
1086 (setq buffers (delq b buffers)))) |
84601
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
1087 (process-put proc 'buffers buffers) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
1088 ;; If client now has no pending buffers, |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
1089 ;; tell it that it is done, and forget it entirely. |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
1090 (unless buffers |
84601
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
1091 (server-log "Close" proc) |
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
1092 (server-delete-client proc))))) |
73559
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1093 (when (and (bufferp buffer) (buffer-name buffer)) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1094 ;; We may or may not kill this buffer; |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1095 ;; if we do, do not call server-buffer-done recursively |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1096 ;; from kill-buffer-hook. |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1097 (let ((server-kill-buffer-running t)) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1098 (with-current-buffer buffer |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1099 (setq server-buffer-clients nil) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1100 (run-hooks 'server-done-hook)) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1101 ;; Notice whether server-done-hook killed the buffer. |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1102 (if (null (buffer-name buffer)) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1103 (setq killed t) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1104 ;; Don't bother killing or burying the buffer |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1105 ;; when we are called from kill-buffer. |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1106 (unless for-killing |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1107 (when (and (not killed) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1108 server-kill-new-buffers |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1109 (with-current-buffer buffer |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1110 (not server-existing-buffer))) |
21941
1baa3e876ad0
(server-buffer-done): Bind server-kill-buffer-running
Richard M. Stallman <rms@gnu.org>
parents:
19418
diff
changeset
|
1111 (setq killed t) |
73559
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1112 (bury-buffer buffer) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1113 (kill-buffer buffer)) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1114 (unless killed |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1115 (if (server-temp-file-p buffer) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1116 (progn |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1117 (kill-buffer buffer) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1118 (setq killed t)) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1119 (bury-buffer buffer))))))) |
10961
88cba63f2a9b
(server-buffer-done): Return a list
Richard M. Stallman <rms@gnu.org>
parents:
10281
diff
changeset
|
1120 (list next-buffer killed))) |
50 | 1121 |
48123
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1122 (defun server-temp-file-p (&optional buffer) |
50 | 1123 "Return non-nil if BUFFER contains a file considered temporary. |
1124 These are files whose names suggest they are repeatedly | |
1125 reused to pass information to another program. | |
1126 | |
1127 The variable `server-temp-file-regexp' controls which filenames | |
1128 are considered temporary." | |
1129 (and (buffer-file-name buffer) | |
1130 (string-match server-temp-file-regexp (buffer-file-name buffer)))) | |
1131 | |
1132 (defun server-done () | |
1540 | 1133 "Offer to save current buffer, mark it as \"done\" for clients. |
40972
cb428483fb22
(server-edit, server-done): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
40915
diff
changeset
|
1134 This kills or buries the buffer, then returns a list |
cb428483fb22
(server-edit, server-done): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
40915
diff
changeset
|
1135 of the form (NEXT-BUFFER KILLED). NEXT-BUFFER is another server buffer, |
cb428483fb22
(server-edit, server-done): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
40915
diff
changeset
|
1136 as a suggestion for what to select next, or nil. |
cb428483fb22
(server-edit, server-done): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
40915
diff
changeset
|
1137 KILLED is t if we killed BUFFER, which happens if it was created |
cb428483fb22
(server-edit, server-done): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
40915
diff
changeset
|
1138 specifically for the clients and did not exist before their request for it." |
48123
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1139 (when server-buffer-clients |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1140 (if (server-temp-file-p) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1141 ;; For a temp file, save, and do make a non-numeric backup |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1142 ;; (unless make-backup-files is nil). |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1143 (let ((version-control nil) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1144 (buffer-backed-up nil)) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1145 (save-buffer)) |
73559
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1146 (when (and (buffer-modified-p) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1147 buffer-file-name |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1148 (y-or-n-p (concat "Save file " buffer-file-name "? "))) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1149 (save-buffer))) |
48123
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1150 (server-buffer-done (current-buffer)))) |
6176
1dbec303c87b
(kill-emacs-query-functions, kill-buffer-query-functions):
Richard M. Stallman <rms@gnu.org>
parents:
5749
diff
changeset
|
1151 |
9883 | 1152 ;; Ask before killing a server buffer. |
1153 ;; It was suggested to release its client instead, | |
1154 ;; but I think that is dangerous--the client would proceed | |
1155 ;; using whatever is on disk in that file. -- rms. | |
6993
0983fe01e614
(server-kill-emacs-query-function)
Richard M. Stallman <rms@gnu.org>
parents:
6960
diff
changeset
|
1156 (defun server-kill-buffer-query-function () |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
1157 "Ask before killing a server buffer." |
6993
0983fe01e614
(server-kill-emacs-query-function)
Richard M. Stallman <rms@gnu.org>
parents:
6960
diff
changeset
|
1158 (or (not server-buffer-clients) |
83009
b2b37c85b00a
Numerous bugfixes and small improvements.
Karoly Lorentey <lorentey@elte.hu>
parents:
82995
diff
changeset
|
1159 (let ((res t)) |
b2b37c85b00a
Numerous bugfixes and small improvements.
Karoly Lorentey <lorentey@elte.hu>
parents:
82995
diff
changeset
|
1160 (dolist (proc server-buffer-clients res) |
84601
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
1161 (when (and (memq proc server-clients) |
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
1162 (eq (process-status proc) 'open)) |
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
1163 (setq res nil)))) |
6993
0983fe01e614
(server-kill-emacs-query-function)
Richard M. Stallman <rms@gnu.org>
parents:
6960
diff
changeset
|
1164 (yes-or-no-p (format "Buffer `%s' still has clients; kill it? " |
0983fe01e614
(server-kill-emacs-query-function)
Richard M. Stallman <rms@gnu.org>
parents:
6960
diff
changeset
|
1165 (buffer-name (current-buffer)))))) |
0983fe01e614
(server-kill-emacs-query-function)
Richard M. Stallman <rms@gnu.org>
parents:
6960
diff
changeset
|
1166 |
0983fe01e614
(server-kill-emacs-query-function)
Richard M. Stallman <rms@gnu.org>
parents:
6960
diff
changeset
|
1167 (defun server-kill-emacs-query-function () |
85722
5f0d32eed4eb
(server-process-filter): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
85365
diff
changeset
|
1168 "Ask before exiting Emacs if it has live clients." |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
1169 (or (not server-clients) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
1170 (let (live-client) |
84601
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
1171 (dolist (proc server-clients live-client) |
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
1172 (when (memq t (mapcar 'buffer-live-p (process-get |
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
1173 proc 'buffers))) |
83548
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
1174 (setq live-client t)))) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
1175 (yes-or-no-p "This Emacs session has clients; exit anyway? "))) |
17712
41a4624c1e79
(server-buffer-done): New arg FOR-KILLING.
Richard M. Stallman <rms@gnu.org>
parents:
17434
diff
changeset
|
1176 |
18049
f1fa9625e2b9
(server-kill-buffer): Prevent infinite recursion.
Richard M. Stallman <rms@gnu.org>
parents:
17970
diff
changeset
|
1177 (defvar server-kill-buffer-running nil |
21941
1baa3e876ad0
(server-buffer-done): Bind server-kill-buffer-running
Richard M. Stallman <rms@gnu.org>
parents:
19418
diff
changeset
|
1178 "Non-nil while `server-kill-buffer' or `server-buffer-done' is running.") |
18049
f1fa9625e2b9
(server-kill-buffer): Prevent infinite recursion.
Richard M. Stallman <rms@gnu.org>
parents:
17970
diff
changeset
|
1179 |
17712
41a4624c1e79
(server-buffer-done): New arg FOR-KILLING.
Richard M. Stallman <rms@gnu.org>
parents:
17434
diff
changeset
|
1180 (defun server-kill-buffer () |
83215
a9f716fbb9c6
Small tweaks in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents:
83195
diff
changeset
|
1181 "Remove the current buffer from its clients' buffer list. |
a9f716fbb9c6
Small tweaks in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents:
83195
diff
changeset
|
1182 Designed to be added to `kill-buffer-hook'." |
18049
f1fa9625e2b9
(server-kill-buffer): Prevent infinite recursion.
Richard M. Stallman <rms@gnu.org>
parents:
17970
diff
changeset
|
1183 ;; Prevent infinite recursion if user has made server-done-hook |
f1fa9625e2b9
(server-kill-buffer): Prevent infinite recursion.
Richard M. Stallman <rms@gnu.org>
parents:
17970
diff
changeset
|
1184 ;; call kill-buffer. |
f1fa9625e2b9
(server-kill-buffer): Prevent infinite recursion.
Richard M. Stallman <rms@gnu.org>
parents:
17970
diff
changeset
|
1185 (or server-kill-buffer-running |
21941
1baa3e876ad0
(server-buffer-done): Bind server-kill-buffer-running
Richard M. Stallman <rms@gnu.org>
parents:
19418
diff
changeset
|
1186 (and server-buffer-clients |
1baa3e876ad0
(server-buffer-done): Bind server-kill-buffer-running
Richard M. Stallman <rms@gnu.org>
parents:
19418
diff
changeset
|
1187 (let ((server-kill-buffer-running t)) |
1baa3e876ad0
(server-buffer-done): Bind server-kill-buffer-running
Richard M. Stallman <rms@gnu.org>
parents:
19418
diff
changeset
|
1188 (when server-process |
1baa3e876ad0
(server-buffer-done): Bind server-kill-buffer-running
Richard M. Stallman <rms@gnu.org>
parents:
19418
diff
changeset
|
1189 (server-buffer-done (current-buffer) t)))))) |
50 | 1190 |
1191 (defun server-edit (&optional arg) | |
1192 "Switch to next server editing buffer; say \"Done\" for current buffer. | |
1193 If a server buffer is current, it is marked \"done\" and optionally saved. | |
40972
cb428483fb22
(server-edit, server-done): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
40915
diff
changeset
|
1194 The buffer is also killed if it did not exist before the clients asked for it. |
50 | 1195 When all of a client's buffers are marked as \"done\", the client is notified. |
1196 | |
1197 Temporary files such as MH <draft> files are always saved and backed up, | |
4096
badd80e9e4fc
(server-done): Let save-buffer make the backup,
Richard M. Stallman <rms@gnu.org>
parents:
3746
diff
changeset
|
1198 no questions asked. (The variable `make-backup-files', if nil, still |
badd80e9e4fc
(server-done): Let save-buffer make the backup,
Richard M. Stallman <rms@gnu.org>
parents:
3746
diff
changeset
|
1199 inhibits a backup; you can set it locally in a particular buffer to |
badd80e9e4fc
(server-done): Let save-buffer make the backup,
Richard M. Stallman <rms@gnu.org>
parents:
3746
diff
changeset
|
1200 prevent a backup for it.) The variable `server-temp-file-regexp' controls |
50 | 1201 which filenames are considered temporary. |
1202 | |
49206
7ebd98bb02a2
(server-process-filter): Use `minibufferp' to test
John Paul Wallington <jpw@pobox.com>
parents:
49187
diff
changeset
|
1203 If invoked with a prefix argument, or if there is no server process running, |
50 | 1204 starts server process and that is all. Invoked by \\[server-edit]." |
1205 (interactive "P") | |
71320
59c8b05c2ce4
* server.el (server-edit): No-op if no server buffers exist.
Chong Yidong <cyd@stupidchicken.com>
parents:
70672
diff
changeset
|
1206 (cond |
73611
d1bc957e4056
(server-visit-files): Use `when'.
Juanma Barranquero <lekktu@gmail.com>
parents:
73604
diff
changeset
|
1207 ((or arg |
d1bc957e4056
(server-visit-files): Use `when'.
Juanma Barranquero <lekktu@gmail.com>
parents:
73604
diff
changeset
|
1208 (not server-process) |
d1bc957e4056
(server-visit-files): Use `when'.
Juanma Barranquero <lekktu@gmail.com>
parents:
73604
diff
changeset
|
1209 (memq (process-status server-process) '(signal exit))) |
d1bc957e4056
(server-visit-files): Use `when'.
Juanma Barranquero <lekktu@gmail.com>
parents:
73604
diff
changeset
|
1210 (server-mode 1)) |
d1bc957e4056
(server-visit-files): Use `when'.
Juanma Barranquero <lekktu@gmail.com>
parents:
73604
diff
changeset
|
1211 (server-clients (apply 'server-switch-buffer (server-done))) |
d1bc957e4056
(server-visit-files): Use `when'.
Juanma Barranquero <lekktu@gmail.com>
parents:
73604
diff
changeset
|
1212 (t (message "No server editing buffers exist")))) |
50 | 1213 |
11329
ecbfde696360
(server-switch-buffer): Make first arg optional too;
Roland McGrath <roland@gnu.org>
parents:
11235
diff
changeset
|
1214 (defun server-switch-buffer (&optional next-buffer killed-one) |
50 | 1215 "Switch to another buffer, preferably one that has a client. |
83215
a9f716fbb9c6
Small tweaks in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents:
83195
diff
changeset
|
1216 Arg NEXT-BUFFER is a suggestion; if it is a live buffer, use it. |
a9f716fbb9c6
Small tweaks in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents:
83195
diff
changeset
|
1217 |
a9f716fbb9c6
Small tweaks in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents:
83195
diff
changeset
|
1218 KILLED-ONE is t in a recursive call if we have already killed one |
a9f716fbb9c6
Small tweaks in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents:
83195
diff
changeset
|
1219 temp-file server buffer. This means we should avoid the final |
a9f716fbb9c6
Small tweaks in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents:
83195
diff
changeset
|
1220 \"switch to some other buffer\" since we've already effectively |
a9f716fbb9c6
Small tweaks in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents:
83195
diff
changeset
|
1221 done that." |
47524
95ba2ac51138
(server-done): Fix harmlessly wrong arg to save-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47517
diff
changeset
|
1222 (if (null next-buffer) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
1223 (progn |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
1224 (let ((rest server-clients)) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
1225 (while (and rest (not next-buffer)) |
84601
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
1226 (let ((proc (car rest))) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
1227 ;; Only look at frameless clients. |
84601
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
1228 (when (not (process-get proc 'frame)) |
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
1229 (setq next-buffer (car (process-get proc 'buffers)))) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
1230 (setq rest (cdr rest))))) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
1231 (and next-buffer (server-switch-buffer next-buffer killed-one)) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
1232 (unless (or next-buffer killed-one (window-dedicated-p (selected-window))) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
1233 ;; (switch-to-buffer (other-buffer)) |
48069
518adc9496ed
(server-switch-buffer): Say when no server buffers remain.
Richard M. Stallman <rms@gnu.org>
parents:
47658
diff
changeset
|
1234 (message "No server buffers remain to edit"))) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
1235 (if (not (buffer-live-p next-buffer)) |
47524
95ba2ac51138
(server-done): Fix harmlessly wrong arg to save-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47517
diff
changeset
|
1236 ;; If NEXT-BUFFER is a dead buffer, remove the server records for it |
50 | 1237 ;; and try the next surviving server buffer. |
47524
95ba2ac51138
(server-done): Fix harmlessly wrong arg to save-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47517
diff
changeset
|
1238 (apply 'server-switch-buffer (server-buffer-done next-buffer)) |
95ba2ac51138
(server-done): Fix harmlessly wrong arg to save-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47517
diff
changeset
|
1239 ;; OK, we know next-buffer is live, let's display and select it. |
48123
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1240 (if (functionp server-window) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1241 (funcall server-window next-buffer) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1242 (let ((win (get-buffer-window next-buffer 0))) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1243 (if (and win (not server-window)) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1244 ;; The buffer is already displayed: just reuse the window. |
73891
7e65038a5be1
(server-raise-frame): New option.
Juanma Barranquero <lekktu@gmail.com>
parents:
73805
diff
changeset
|
1245 (progn |
7e65038a5be1
(server-raise-frame): New option.
Juanma Barranquero <lekktu@gmail.com>
parents:
73805
diff
changeset
|
1246 (select-window win) |
7e65038a5be1
(server-raise-frame): New option.
Juanma Barranquero <lekktu@gmail.com>
parents:
73805
diff
changeset
|
1247 (set-buffer next-buffer)) |
48123
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1248 ;; Otherwise, let's find an appropriate window. |
81299
79cdba83d213
(server-switch-buffer): Remove redundant check.
Juanma Barranquero <lekktu@gmail.com>
parents:
76648
diff
changeset
|
1249 (cond ((window-live-p server-window) |
48123
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1250 (select-window server-window)) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1251 ((framep server-window) |
73559
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1252 (unless (frame-live-p server-window) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1253 (setq server-window (make-frame))) |
48123
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1254 (select-window (frame-selected-window server-window)))) |
73559
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1255 (when (window-minibuffer-p (selected-window)) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1256 (select-window (next-window nil 'nomini 0))) |
48123
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1257 ;; Move to a non-dedicated window, if we have one. |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1258 (when (window-dedicated-p (selected-window)) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1259 (select-window |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1260 (get-window-with-predicate |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1261 (lambda (w) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1262 (and (not (window-dedicated-p w)) |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
1263 (equal (frame-terminal (window-frame w)) |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
1264 (frame-terminal (selected-frame))))) |
48123
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1265 'nomini 'visible (selected-window)))) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1266 (condition-case nil |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1267 (switch-to-buffer next-buffer) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1268 ;; After all the above, we might still have ended up with |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1269 ;; a minibuffer/dedicated-window (if there's no other). |
73891
7e65038a5be1
(server-raise-frame): New option.
Juanma Barranquero <lekktu@gmail.com>
parents:
73805
diff
changeset
|
1270 (error (pop-to-buffer next-buffer))))))) |
7e65038a5be1
(server-raise-frame): New option.
Juanma Barranquero <lekktu@gmail.com>
parents:
73805
diff
changeset
|
1271 (when server-raise-frame |
7e65038a5be1
(server-raise-frame): New option.
Juanma Barranquero <lekktu@gmail.com>
parents:
73805
diff
changeset
|
1272 (select-frame-set-input-focus (window-frame (selected-window)))))) |
50 | 1273 |
83403
51eb0aa362f3
Store client's environment in terminal parameters, not server parameters.
Karoly Lorentey <lorentey@elte.hu>
parents:
83395
diff
changeset
|
1274 ;;;###autoload |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
1275 (defun server-save-buffers-kill-terminal (proc &optional arg) |
87380
cd847b2ba99f
(server-save-buffers-kill-terminal): Check the `proc' is indeed a process.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87220
diff
changeset
|
1276 ;; Called from save-buffers-kill-terminal in files.el. |
83403
51eb0aa362f3
Store client's environment in terminal parameters, not server parameters.
Karoly Lorentey <lorentey@elte.hu>
parents:
83395
diff
changeset
|
1277 "Offer to save each buffer, then kill PROC. |
83192
e2567214221d
Change binding of C-x C-c to only exit emacsclient, not Emacs itself.
Karoly Lorentey <lorentey@elte.hu>
parents:
83172
diff
changeset
|
1278 |
83251
de637975e99a
On C-x C-c, restrict `save-some-buffers' to the client's buffers. (Reported by Han Boetes.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83250
diff
changeset
|
1279 With prefix arg, silently save all file-visiting buffers, then kill. |
de637975e99a
On C-x C-c, restrict `save-some-buffers' to the client's buffers. (Reported by Han Boetes.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83250
diff
changeset
|
1280 |
de637975e99a
On C-x C-c, restrict `save-some-buffers' to the client's buffers. (Reported by Han Boetes.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83250
diff
changeset
|
1281 If emacsclient was started with a list of filenames to edit, then |
de637975e99a
On C-x C-c, restrict `save-some-buffers' to the client's buffers. (Reported by Han Boetes.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83250
diff
changeset
|
1282 only these files will be asked to be saved." |
87380
cd847b2ba99f
(server-save-buffers-kill-terminal): Check the `proc' is indeed a process.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87220
diff
changeset
|
1283 ;; save-buffers-kill-terminal occasionally calls us with proc set |
cd847b2ba99f
(server-save-buffers-kill-terminal): Check the `proc' is indeed a process.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87220
diff
changeset
|
1284 ;; to `nowait' (comes from the value of the `client' frame parameter). |
cd847b2ba99f
(server-save-buffers-kill-terminal): Check the `proc' is indeed a process.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87220
diff
changeset
|
1285 (when (processp proc) |
cd847b2ba99f
(server-save-buffers-kill-terminal): Check the `proc' is indeed a process.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87220
diff
changeset
|
1286 (let ((buffers (process-get proc 'buffers))) |
cd847b2ba99f
(server-save-buffers-kill-terminal): Check the `proc' is indeed a process.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87220
diff
changeset
|
1287 ;; If client is bufferless, emulate a normal Emacs session |
cd847b2ba99f
(server-save-buffers-kill-terminal): Check the `proc' is indeed a process.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87220
diff
changeset
|
1288 ;; exit and offer to save all buffers. Otherwise, offer to |
cd847b2ba99f
(server-save-buffers-kill-terminal): Check the `proc' is indeed a process.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87220
diff
changeset
|
1289 ;; save only the buffers belonging to the client. |
cd847b2ba99f
(server-save-buffers-kill-terminal): Check the `proc' is indeed a process.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87220
diff
changeset
|
1290 (save-some-buffers arg |
cd847b2ba99f
(server-save-buffers-kill-terminal): Check the `proc' is indeed a process.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87220
diff
changeset
|
1291 (if buffers |
cd847b2ba99f
(server-save-buffers-kill-terminal): Check the `proc' is indeed a process.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87220
diff
changeset
|
1292 (lambda () (memq (current-buffer) buffers)) |
cd847b2ba99f
(server-save-buffers-kill-terminal): Check the `proc' is indeed a process.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87220
diff
changeset
|
1293 t)) |
cd847b2ba99f
(server-save-buffers-kill-terminal): Check the `proc' is indeed a process.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87220
diff
changeset
|
1294 (server-delete-client proc)))) |
83192
e2567214221d
Change binding of C-x C-c to only exit emacsclient, not Emacs itself.
Karoly Lorentey <lorentey@elte.hu>
parents:
83172
diff
changeset
|
1295 |
64372
5cedf2e32893
Bind "C-x #" in a way that works even if C-x is redefined to a command key,
Eli Zaretskii <eliz@gnu.org>
parents:
64091
diff
changeset
|
1296 (define-key ctl-x-map "#" 'server-edit) |
42140
49087a9d073e
(server-unload-hook): New function.
Dave Love <fx@gnu.org>
parents:
41075
diff
changeset
|
1297 |
79243
cccc3ec23e08
(server-unload-function): Rename from `server-unload-hook' and
Juanma Barranquero <lekktu@gmail.com>
parents:
78978
diff
changeset
|
1298 (defun server-unload-function () |
cccc3ec23e08
(server-unload-function): Rename from `server-unload-hook' and
Juanma Barranquero <lekktu@gmail.com>
parents:
78978
diff
changeset
|
1299 "Unload the server library." |
70672
06de67179ba1
(server-start): Only create a directory if needed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70420
diff
changeset
|
1300 (server-mode -1) |
79256
02a9c3ab0adf
(server-unload-function): Unbind `server-edit' from `C-x #'.
Juanma Barranquero <lekktu@gmail.com>
parents:
79243
diff
changeset
|
1301 (substitute-key-definition 'server-edit nil ctl-x-map) |
79243
cccc3ec23e08
(server-unload-function): Rename from `server-unload-hook' and
Juanma Barranquero <lekktu@gmail.com>
parents:
78978
diff
changeset
|
1302 (save-current-buffer |
85741
29ea503e1863
(server-unload-function): Rename from `server-unload-hook' and
Juanma Barranquero <lekktu@gmail.com>
parents:
85722
diff
changeset
|
1303 (dolist (buffer (buffer-list)) |
29ea503e1863
(server-unload-function): Rename from `server-unload-hook' and
Juanma Barranquero <lekktu@gmail.com>
parents:
85722
diff
changeset
|
1304 (set-buffer buffer) |
29ea503e1863
(server-unload-function): Rename from `server-unload-hook' and
Juanma Barranquero <lekktu@gmail.com>
parents:
85722
diff
changeset
|
1305 (remove-hook 'kill-buffer-hook 'server-kill-buffer t))) |
79243
cccc3ec23e08
(server-unload-function): Rename from `server-unload-hook' and
Juanma Barranquero <lekktu@gmail.com>
parents:
78978
diff
changeset
|
1306 ;; continue standard unloading |
cccc3ec23e08
(server-unload-function): Rename from `server-unload-hook' and
Juanma Barranquero <lekktu@gmail.com>
parents:
78978
diff
changeset
|
1307 nil) |
57543
e47852bd4fc4
(server-unload-hook): Set as a variable with add-hook.
Richard M. Stallman <rms@gnu.org>
parents:
57379
diff
changeset
|
1308 |
1079 | 1309 |
1310 (provide 'server) | |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
445
diff
changeset
|
1311 |
70672
06de67179ba1
(server-start): Only create a directory if needed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70420
diff
changeset
|
1312 ;; arch-tag: 1f7ecb42-f00a-49f8-906d-61995d84c8d6 |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
445
diff
changeset
|
1313 ;;; server.el ends here |