Mercurial > emacs
annotate lisp/server.el @ 105492:a712582124ee
*** empty log message ***
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Tue, 06 Oct 2009 18:32:07 +0000 |
parents | 84836b2f2c93 |
children | 1d1d5d9bd884 |
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, |
104543
da8b3e61b182
Use forward-line rather than goto-line.
Glenn Morris <rgm@gnu.org>
parents:
103622
diff
changeset
|
4 ;; 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 |
da8b3e61b182
Use forward-line rather than goto-line.
Glenn Morris <rgm@gnu.org>
parents:
103622
diff
changeset
|
5 ;; Free Software Foundation, Inc. |
844
bf829a2d63b4
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
814
diff
changeset
|
6 |
787
3cece0106722
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
702
diff
changeset
|
7 ;; Author: William Sommerfeld <wesommer@athena.mit.edu> |
17970 | 8 ;; Maintainer: FSF |
814
38b2499cb3e9
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
807
diff
changeset
|
9 ;; Keywords: processes |
787
3cece0106722
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
702
diff
changeset
|
10 |
3cece0106722
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
702
diff
changeset
|
11 ;; 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
|
12 ;; 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
|
13 |
50 | 14 ;; This file is part of GNU Emacs. |
15 | |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94295
diff
changeset
|
16 ;; GNU Emacs is free software: you can redistribute it and/or modify |
50 | 17 ;; it under the terms of the GNU General Public License as published by |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94295
diff
changeset
|
18 ;; the Free Software Foundation, either version 3 of the License, or |
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94295
diff
changeset
|
19 ;; (at your option) any later version. |
50 | 20 |
21 ;; GNU Emacs is distributed in the hope that it will be useful, | |
22 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
23 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
24 ;; GNU General Public License for more details. | |
25 | |
26 ;; You should have received a copy of the GNU General Public License | |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94295
diff
changeset
|
27 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
50 | 28 |
787
3cece0106722
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
702
diff
changeset
|
29 ;;; Commentary: |
50 | 30 |
14169 | 31 ;; This Lisp code is run in Emacs when it is to operate as |
32 ;; a server for other processes. | |
50 | 33 |
14169 | 34 ;; 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
|
35 ;; 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
|
36 ;; 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
|
37 ;; (other-buffer)) |
50 | 38 |
14169 | 39 ;; When some other program runs "the editor" to edit a file, |
40 ;; "the editor" can be the Emacs client program ../lib-src/emacsclient. | |
41 ;; This program transmits the file names to Emacs through | |
42 ;; the server subprocess, and Emacs visits them and lets you edit them. | |
50 | 43 |
83215
a9f716fbb9c6
Small tweaks in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents:
83195
diff
changeset
|
44 ;; Note that any number of clients may dispatch files to Emacs to be edited. |
50 | 45 |
14169 | 46 ;; 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
|
47 ;; 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
|
48 ;; Server buffer. When all the buffers for a client have been edited |
14169 | 49 ;; 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
|
50 ;; to the program that invoked it. |
50 | 51 |
14169 | 52 ;; Your editing commands and Emacs's display output go to and from |
53 ;; the terminal in the usual way. Thus, server operation is possible | |
54 ;; only when Emacs can talk to the terminal at the time you invoke | |
55 ;; the client. This is possible in four cases: | |
50 | 56 |
14169 | 57 ;; 1. On a window system, where Emacs runs in one window and the |
58 ;; program that wants to use "the editor" runs in another. | |
50 | 59 |
14169 | 60 ;; 2. On a multi-terminal system, where Emacs runs on one terminal and the |
61 ;; program that wants to use "the editor" runs on another. | |
50 | 62 |
14169 | 63 ;; 3. When the program that wants to use "the editor" is running |
64 ;; as a subprocess of Emacs. | |
50 | 65 |
14169 | 66 ;; 4. On a system with job control, when Emacs is suspended, the program |
67 ;; that wants to use "the editor" will stop and display | |
68 ;; "Waiting for Emacs...". It can then be suspended, and Emacs can be | |
69 ;; brought into the foreground for editing. When done editing, Emacs is | |
70 ;; suspended again, and the client program is brought into the foreground. | |
50 | 71 |
49206
7ebd98bb02a2
(server-process-filter): Use `minibufferp' to test
John Paul Wallington <jpw@pobox.com>
parents:
49187
diff
changeset
|
72 ;; 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
|
73 ;; the clients who are waiting for this buffer to be edited. |
14169 | 74 ;; The global variable "server-clients" lists all the waiting clients, |
75 ;; 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
|
76 |
85102 | 77 ;; Todo: |
78 | |
79 ;; - handle command-line-args-left. | |
80 ;; - move most of the args processing and decision making from emacsclient.c | |
81 ;; to here. | |
82 ;; - fix up handling of the client's environment (place it in the terminal?). | |
83 | |
787
3cece0106722
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
702
diff
changeset
|
84 ;;; Code: |
47517
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
85 |
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
86 (eval-when-compile (require 'cl)) |
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
87 |
19418 | 88 (defgroup server nil |
89 "Emacs running as a server process." | |
90 :group 'external) | |
50 | 91 |
73559
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
92 (defcustom server-use-tcp nil |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
93 "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
|
94 :set #'(lambda (sym val) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
95 (unless (featurep 'make-network-process '(:family local)) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
96 (setq val t) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
97 (unless load-in-progress |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
98 (message "Local sockets unsupported, using TCP sockets"))) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
99 (when val (random t)) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
100 (set-default sym val)) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
101 :group 'server |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
102 :type 'boolean |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
103 :version "22.1") |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
104 |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
105 (defcustom server-host nil |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
106 "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
|
107 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
|
108 :group 'server |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
109 :type '(choice |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
110 (string :tag "Name or IP address") |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
111 (const :tag "Local" nil)) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
112 :version "22.1") |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
113 (put 'server-host 'risky-local-variable t) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
114 |
99106
814d2d823dd7
New function `locate-user-emacs-file'.
Juanma Barranquero <lekktu@gmail.com>
parents:
98329
diff
changeset
|
115 (defcustom server-auth-dir (locate-user-emacs-file "server/") |
105108
84836b2f2c93
This fixes bug#4197 (merged to bug#865, though not identical).
Juanma Barranquero <lekktu@gmail.com>
parents:
105090
diff
changeset
|
116 "Directory for server authentication files. |
84836b2f2c93
This fixes bug#4197 (merged to bug#865, though not identical).
Juanma Barranquero <lekktu@gmail.com>
parents:
105090
diff
changeset
|
117 |
84836b2f2c93
This fixes bug#4197 (merged to bug#865, though not identical).
Juanma Barranquero <lekktu@gmail.com>
parents:
105090
diff
changeset
|
118 NOTE: On FAT32 filesystems, directories are not secure; |
84836b2f2c93
This fixes bug#4197 (merged to bug#865, though not identical).
Juanma Barranquero <lekktu@gmail.com>
parents:
105090
diff
changeset
|
119 files can be read and modified by any user or process. |
84836b2f2c93
This fixes bug#4197 (merged to bug#865, though not identical).
Juanma Barranquero <lekktu@gmail.com>
parents:
105090
diff
changeset
|
120 It is strongly suggested to set `server-auth-dir' to a |
84836b2f2c93
This fixes bug#4197 (merged to bug#865, though not identical).
Juanma Barranquero <lekktu@gmail.com>
parents:
105090
diff
changeset
|
121 directory residing in a NTFS partition instead." |
73559
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
122 :group 'server |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
123 :type 'directory |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
124 :version "22.1") |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
125 (put 'server-auth-dir 'risky-local-variable t) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
126 |
73891
7e65038a5be1
(server-raise-frame): New option.
Juanma Barranquero <lekktu@gmail.com>
parents:
73805
diff
changeset
|
127 (defcustom server-raise-frame t |
74268
3de22dfd43f8
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73929
diff
changeset
|
128 "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
|
129 :group 'server |
7e65038a5be1
(server-raise-frame): New option.
Juanma Barranquero <lekktu@gmail.com>
parents:
73805
diff
changeset
|
130 :type 'boolean |
7e65038a5be1
(server-raise-frame): New option.
Juanma Barranquero <lekktu@gmail.com>
parents:
73805
diff
changeset
|
131 :version "22.1") |
7e65038a5be1
(server-raise-frame): New option.
Juanma Barranquero <lekktu@gmail.com>
parents:
73805
diff
changeset
|
132 |
47612
2d55f7e8ff64
Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47524
diff
changeset
|
133 (defcustom server-visit-hook nil |
74268
3de22dfd43f8
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73929
diff
changeset
|
134 "Hook run when visiting a file for the Emacs server." |
19418 | 135 :group 'server |
47612
2d55f7e8ff64
Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47524
diff
changeset
|
136 :type 'hook) |
50 | 137 |
19418 | 138 (defcustom server-switch-hook nil |
74268
3de22dfd43f8
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73929
diff
changeset
|
139 "Hook run when switching to a buffer for the Emacs server." |
19418 | 140 :group 'server |
47612
2d55f7e8ff64
Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47524
diff
changeset
|
141 :type 'hook) |
19418 | 142 |
143 (defcustom server-done-hook nil | |
74268
3de22dfd43f8
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73929
diff
changeset
|
144 "Hook run when done editing a buffer for the Emacs server." |
19418 | 145 :group 'server |
47612
2d55f7e8ff64
Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47524
diff
changeset
|
146 :type 'hook) |
7597
99a600c67e82
(server-done-hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents:
7553
diff
changeset
|
147 |
49206
7ebd98bb02a2
(server-process-filter): Use `minibufferp' to test
John Paul Wallington <jpw@pobox.com>
parents:
49187
diff
changeset
|
148 (defvar server-process nil |
7ebd98bb02a2
(server-process-filter): Use `minibufferp' to test
John Paul Wallington <jpw@pobox.com>
parents:
49187
diff
changeset
|
149 "The current server process.") |
50 | 150 |
151 (defvar server-clients nil | |
152 "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
|
153 Each element is a process.") |
50 | 154 |
155 (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
|
156 "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
|
157 (make-variable-buffer-local 'server-buffer-clients) |
50 | 158 ;; Changing major modes should not erase this local. |
159 (put 'server-buffer-clients 'permanent-local t) | |
160 | |
49267 | 161 (defcustom server-window nil |
74268
3de22dfd43f8
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73929
diff
changeset
|
162 "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
|
163 If nil, use the selected window. |
49267 | 164 If it is a function, it should take one argument (a buffer) and |
165 display and select it. A common value is `pop-to-buffer'. | |
166 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
|
167 If it is a frame, use the frame's selected window. |
49267 | 168 |
169 It is not meaningful to set this to a specific frame or window with Custom. | |
170 Only programs can do so." | |
171 :group 'server | |
59996
aac0a33f5772
Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents:
59220
diff
changeset
|
172 :version "22.1" |
49267 | 173 :type '(choice (const :tag "Use selected window" |
174 :match (lambda (widget value) | |
175 (not (functionp value))) | |
176 nil) | |
78371
f0d8038376f8
(server-window): Add switch-to-buffer-other-frame option.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
177 (function-item :tag "Display in new frame" switch-to-buffer-other-frame) |
49267 | 178 (function-item :tag "Use pop-to-buffer" pop-to-buffer) |
179 (function :tag "Other function"))) | |
3661
65d530f613a8
(server-window): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
2866
diff
changeset
|
180 |
19418 | 181 (defcustom server-temp-file-regexp "^/tmp/Re\\|/draft$" |
74268
3de22dfd43f8
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73929
diff
changeset
|
182 "Regexp matching names of temporary files. |
49267 | 183 These are deleted and reused after each edit by the programs that |
184 invoke the Emacs server." | |
19418 | 185 :group 'server |
186 :type 'regexp) | |
50 | 187 |
31008
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
188 (defcustom server-kill-new-buffers t |
74268
3de22dfd43f8
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73929
diff
changeset
|
189 "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
|
190 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
|
191 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
|
192 `server-temp-file-regexp'. |
78978
5e0ec5155f3e
Chris Moore <dooglus at gmail.com>
Glenn Morris <rgm@gnu.org>
parents:
78371
diff
changeset
|
193 Please note that only buffers that still have a client are killed, |
99691
9df07af84d04
* server.el (server-temp-file-p): Use `string-match-p'.
Juanma Barranquero <lekktu@gmail.com>
parents:
99489
diff
changeset
|
194 i.e. buffers visited with \"emacsclient --no-wait\" are never killed |
9df07af84d04
* server.el (server-temp-file-p): Use `string-match-p'.
Juanma Barranquero <lekktu@gmail.com>
parents:
99489
diff
changeset
|
195 in this way." |
31008
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
196 :group 'server |
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
197 :type 'boolean |
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
198 :version "21.1") |
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
199 |
50 | 200 (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
|
201 (push '(server-buffer-clients " Server") minor-mode-alist)) |
50 | 202 |
31008
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
203 (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
|
204 "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
|
205 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
|
206 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
|
207 (make-variable-buffer-local 'server-existing-buffer) |
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
208 |
101392
03050eba53aa
(server-name): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
101349
diff
changeset
|
209 (defcustom server-name "server" |
03050eba53aa
(server-name): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
101349
diff
changeset
|
210 "The name of the Emacs server, if this Emacs process creates one. |
03050eba53aa
(server-name): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
101349
diff
changeset
|
211 The command `server-start' makes use of this. It should not be |
03050eba53aa
(server-name): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
101349
diff
changeset
|
212 changed while a server is running." |
03050eba53aa
(server-name): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
101349
diff
changeset
|
213 :group 'server |
03050eba53aa
(server-name): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
101349
diff
changeset
|
214 :type 'string |
03050eba53aa
(server-name): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
101349
diff
changeset
|
215 :version "23.1") |
54357
367f0279478f
(server-name): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53736
diff
changeset
|
216 |
101895 | 217 ;; We do not use `temporary-file-directory' here, because emacsclient |
218 ;; does not read the init file. | |
99209
01e8c1513572
* server.el, emacsclient.c: Use TMPDIR (default /tmp) instead of hardcoded /tmp.
Juanma Barranquero <lekktu@gmail.com>
parents:
99106
diff
changeset
|
219 (defvar server-socket-dir |
99691
9df07af84d04
* server.el (server-temp-file-p): Use `string-match-p'.
Juanma Barranquero <lekktu@gmail.com>
parents:
99489
diff
changeset
|
220 (and (featurep 'make-network-process '(:family local)) |
9df07af84d04
* server.el (server-temp-file-p): Use `string-match-p'.
Juanma Barranquero <lekktu@gmail.com>
parents:
99489
diff
changeset
|
221 (format "%s/emacs%d" (or (getenv "TMPDIR") "/tmp") (user-uid))) |
9df07af84d04
* server.el (server-temp-file-p): Use `string-match-p'.
Juanma Barranquero <lekktu@gmail.com>
parents:
99489
diff
changeset
|
222 "The directory in which to place the server socket. |
9df07af84d04
* server.el (server-temp-file-p): Use `string-match-p'.
Juanma Barranquero <lekktu@gmail.com>
parents:
99489
diff
changeset
|
223 If local sockets are not supported, this is nil.") |
47612
2d55f7e8ff64
Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47524
diff
changeset
|
224 |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
225 (defun server-clients-with (property value) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
226 "Return a list of clients with PROPERTY set to VALUE." |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
227 (let (result) |
84601
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
228 (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
|
229 (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
|
230 (push proc result))))) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
231 |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
232 (defun server-add-client (proc) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
233 "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
|
234 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
|
235 (add-to-list 'server-clients proc)) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
236 |
83403
51eb0aa362f3
Store client's environment in terminal parameters, not server parameters.
Karoly Lorentey <lorentey@elte.hu>
parents:
83395
diff
changeset
|
237 (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
|
238 "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
|
239 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
|
240 |
83403
51eb0aa362f3
Store client's environment in terminal parameters, not server parameters.
Karoly Lorentey <lorentey@elte.hu>
parents:
83395
diff
changeset
|
241 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
|
242 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
|
243 (declare (indent 2)) |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
244 (let ((var (make-symbol "var")) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
245 (value (make-symbol "value"))) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
246 `(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
|
247 (dolist (,var ,vars) |
84744
4f2e2dad61b9
(server-getenv-from): Remove. Use getenv-internal instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84635
diff
changeset
|
248 (let ((,value (getenv-internal ,var ,env))) |
101942
48d0501a9a76
* server.el (server-with-environment): Don't fail for negative entries in ENV.
Juanma Barranquero <lekktu@gmail.com>
parents:
101895
diff
changeset
|
249 (push (if (stringp ,value) |
48d0501a9a76
* server.el (server-with-environment): Don't fail for negative entries in ENV.
Juanma Barranquero <lekktu@gmail.com>
parents:
101895
diff
changeset
|
250 (concat ,var "=" ,value) |
48d0501a9a76
* server.el (server-with-environment): Don't fail for negative entries in ENV.
Juanma Barranquero <lekktu@gmail.com>
parents:
101895
diff
changeset
|
251 ,var) |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
252 process-environment))) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
253 (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
|
254 |
84601
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
255 (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
|
256 "Delete PROC, including its buffers, terminals and frames. |
99691
9df07af84d04
* server.el (server-temp-file-p): Use `string-match-p'.
Juanma Barranquero <lekktu@gmail.com>
parents:
99489
diff
changeset
|
257 If NOFRAME is non-nil, let the frames live. |
9df07af84d04
* server.el (server-temp-file-p): Use `string-match-p'.
Juanma Barranquero <lekktu@gmail.com>
parents:
99489
diff
changeset
|
258 Updates `server-clients'." |
87220
655d101f4e6b
(server-select-display): Fix important typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86380
diff
changeset
|
259 (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
|
260 ;; 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
|
261 (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
|
262 (let ((buffers (process-get proc 'buffers))) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
263 |
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
|
264 ;; Kill the client's buffers. |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
265 (dolist (buf buffers) |
83108
c7a76f7d323c
Fix error on deleting an emacsclient terminal (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents:
83105
diff
changeset
|
266 (when (buffer-live-p buf) |
c7a76f7d323c
Fix error on deleting an emacsclient terminal (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents:
83105
diff
changeset
|
267 (with-current-buffer buf |
c7a76f7d323c
Fix error on deleting an emacsclient terminal (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents:
83105
diff
changeset
|
268 ;; 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
|
269 (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
|
270 (list proc)) |
83108
c7a76f7d323c
Fix error on deleting an emacsclient terminal (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents:
83105
diff
changeset
|
271 (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
|
272 (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
|
273 (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
|
274 (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
|
275 (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
|
276 (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
|
277 (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
|
278 (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
|
279 (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
|
280 (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
|
281 ;; 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
|
282 (setq server-buffer-clients (list proc))))))))) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
283 |
83444
00c55c52afd8
Make all frames created in an emacsclient session belong to that client.
Karoly Lorentey <lorentey@elte.hu>
parents:
83439
diff
changeset
|
284 ;; 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
|
285 (unless noframe |
00c55c52afd8
Make all frames created in an emacsclient session belong to that client.
Karoly Lorentey <lorentey@elte.hu>
parents:
83439
diff
changeset
|
286 (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
|
287 (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
|
288 (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
|
289 ;; 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
|
290 ;; recursively. |
00c55c52afd8
Make all frames created in an emacsclient session belong to that client.
Karoly Lorentey <lorentey@elte.hu>
parents:
83439
diff
changeset
|
291 (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
|
292 (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
|
293 |
84601
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
294 (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
|
295 |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
296 ;; 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
|
297 (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
|
298 ;; 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
|
299 (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
|
300 (delete-terminal terminal))) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
301 |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
302 ;; 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
|
303 (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
|
304 (delete-process proc)) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
305 |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
306 (server-log "Deleted" proc)))) |
47612
2d55f7e8ff64
Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47524
diff
changeset
|
307 |
87876
5350f7d1e7aa
(server-log-time-function): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
87794
diff
changeset
|
308 (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
|
309 "Function to generate timestamps for `server-buffer'.") |
87876
5350f7d1e7aa
(server-log-time-function): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
87794
diff
changeset
|
310 |
88016
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
311 (defconst server-buffer " *server*" |
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
312 "Buffer used internally by Emacs's server. |
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
313 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
|
314 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
|
315 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
|
316 |
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
317 (defvar server-log nil |
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
318 "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
|
319 |
47517
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
320 (defun server-log (string &optional client) |
88016
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
321 "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
|
322 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
|
323 (when server-log |
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
324 (with-current-buffer (get-buffer-create server-buffer) |
73559
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
325 (goto-char (point-max)) |
87876
5350f7d1e7aa
(server-log-time-function): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
87794
diff
changeset
|
326 (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
|
327 (cond |
87876
5350f7d1e7aa
(server-log-time-function): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
87794
diff
changeset
|
328 ((null client) " ") |
5350f7d1e7aa
(server-log-time-function): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
87794
diff
changeset
|
329 ((listp client) (format " %s: " (car client))) |
5350f7d1e7aa
(server-log-time-function): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
87794
diff
changeset
|
330 (t (format " %s: " client))) |
73559
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
331 string) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
332 (or (bolp) (newline))))) |
50 | 333 |
334 (defun server-sentinel (proc msg) | |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
335 "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
|
336 ;; 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
|
337 ;; 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
|
338 (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
|
339 (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
|
340 (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
|
341 ;; Delete the associated connection file, if applicable. |
100368
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
342 ;; Although there's no 100% guarantee that the file is owned by the |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
343 ;; running Emacs instance, server-start uses server-running-p to check |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
344 ;; for possible servers before doing anything, so it *should* be ours. |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
345 (and (process-contact proc :server) |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
346 (eq (process-status proc) 'closed) |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
347 (ignore-errors (delete-file (process-get proc :server-file)))) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
348 (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
|
349 (server-delete-client proc)) |
47612
2d55f7e8ff64
Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47524
diff
changeset
|
350 |
47645
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
351 (defun server-select-display (display) |
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
352 ;; If the current frame is on `display' we're all set. |
99691
9df07af84d04
* server.el (server-temp-file-p): Use `string-match-p'.
Juanma Barranquero <lekktu@gmail.com>
parents:
99489
diff
changeset
|
353 ;; Similarly if we are unable to open frames on other displays, there's |
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
|
354 ;; 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
|
355 (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
|
356 (equal (frame-parameter (selected-frame) 'display) display)) |
47645
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
357 ;; 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
|
358 (dolist (frame (frame-list)) |
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
359 (when (equal (frame-parameter frame 'display) display) |
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
360 (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
|
361 ;; 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
|
362 (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
|
363 (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
|
364 (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
|
365 display |
fa022f5f8164
(server-select-display): Use a dummy buffer to detect when
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71650
diff
changeset
|
366 ;; 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
|
367 ;; 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
|
368 `((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
|
369 ;; 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
|
370 ;; 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
|
371 ;; unobtrusive as possible. |
fa022f5f8164
(server-select-display): Use a dummy buffer to detect when
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71650
diff
changeset
|
372 (visibility . nil))))) |
fa022f5f8164
(server-select-display): Use a dummy buffer to detect when
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71650
diff
changeset
|
373 (select-frame frame) |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
374 (set-window-buffer (selected-window) buffer) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
375 frame)))) |
73543
fa022f5f8164
(server-select-display): Use a dummy buffer to detect when
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71650
diff
changeset
|
376 |
fa022f5f8164
(server-select-display): Use a dummy buffer to detect when
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71650
diff
changeset
|
377 (defun server-unselect-display (frame) |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
378 (when (frame-live-p frame) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
379 ;; 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
|
380 ;; 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
|
381 ;; 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
|
382 ;; the last real frame is deleted. |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
383 (if (and (eq (frame-first-window frame) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
384 (next-window (frame-first-window frame) 'nomini)) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
385 (eq (window-buffer (frame-first-window frame)) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
386 (frame-parameter frame 'server-dummy-buffer))) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
387 ;; 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
|
388 ;; internal temp buffer. |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
389 (delete-frame frame) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
390 (set-frame-parameter frame 'visibility t)) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
391 (kill-buffer (frame-parameter frame 'server-dummy-buffer)) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
392 (set-frame-parameter frame 'server-dummy-buffer nil))) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
393 |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
394 (defun server-handle-delete-frame (frame) |
99691
9df07af84d04
* server.el (server-temp-file-p): Use `string-match-p'.
Juanma Barranquero <lekktu@gmail.com>
parents:
99489
diff
changeset
|
395 "Delete the client connection when the emacsclient frame is deleted. |
9df07af84d04
* server.el (server-temp-file-p): Use `string-match-p'.
Juanma Barranquero <lekktu@gmail.com>
parents:
99489
diff
changeset
|
396 \(To be used from `delete-frame-functions'.)" |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
397 (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
|
398 (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
|
399 proc |
83444
00c55c52afd8
Make all frames created in an emacsclient session belong to that client.
Karoly Lorentey <lorentey@elte.hu>
parents:
83439
diff
changeset
|
400 ;; 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
|
401 (>= 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
|
402 (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
|
403 (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
|
404 (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
|
405 frame-num))) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
406 (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
|
407 (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
|
408 |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
409 (defun server-handle-suspend-tty (terminal) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
410 "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
|
411 (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
|
412 (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
|
413 (condition-case err |
83246
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
414 (server-send-string proc "-suspend \n") |
84635
f539dbd0a615
(server-running-p): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84601
diff
changeset
|
415 (file-error ;The pipe/socket was closed. |
f539dbd0a615
(server-running-p): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84601
diff
changeset
|
416 (ignore-errors (server-delete-client proc)))))) |
47645
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
417 |
47612
2d55f7e8ff64
Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47524
diff
changeset
|
418 (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
|
419 "Remove &-quotation from ARG. |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
420 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
|
421 (replace-regexp-in-string |
2d55f7e8ff64
Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47524
diff
changeset
|
422 "&." (lambda (s) |
2d55f7e8ff64
Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47524
diff
changeset
|
423 (case (aref s 1) |
2d55f7e8ff64
Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47524
diff
changeset
|
424 (?& "&") |
2d55f7e8ff64
Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47524
diff
changeset
|
425 (?- "-") |
2d55f7e8ff64
Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47524
diff
changeset
|
426 (?n "\n") |
2d55f7e8ff64
Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47524
diff
changeset
|
427 (t " "))) |
2d55f7e8ff64
Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47524
diff
changeset
|
428 arg t t)) |
50 | 429 |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
430 (defun server-quote-arg (arg) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
431 "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
|
432 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
|
433 contains a space. |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
434 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
435 See `server-unquote-arg' and `server-process-filter'." |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
436 (replace-regexp-in-string |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
437 "[-&\n ]" (lambda (s) |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
438 (case (aref s 0) |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
439 (?& "&&") |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
440 (?- "&-") |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
441 (?\n "&n") |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
442 (?\s "&_"))) |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
443 arg t t)) |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
444 |
83246
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
445 (defun server-send-string (proc string) |
99691
9df07af84d04
* server.el (server-temp-file-p): Use `string-match-p'.
Juanma Barranquero <lekktu@gmail.com>
parents:
99489
diff
changeset
|
446 "A wrapper around `process-send-string' for logging." |
83246
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
447 (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
|
448 (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
|
449 |
50567
1b32397dd4e2
(server-socket-name): Use new safe location for socket.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49686
diff
changeset
|
450 (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
|
451 "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
|
452 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
|
453 - 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
|
454 - 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
|
455 - 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
|
456 (setq dir (directory-file-name dir)) |
105090
b9e58ef2bdb6
* server.el (server-ensure-safe-dir): Pass 'integer
Juanma Barranquero <lekktu@gmail.com>
parents:
104823
diff
changeset
|
457 (let ((attrs (file-attributes dir 'integer))) |
50567
1b32397dd4e2
(server-socket-name): Use new safe location for socket.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49686
diff
changeset
|
458 (unless attrs |
73559
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
459 (letf (((default-file-modes) ?\700)) (make-directory dir t)) |
105090
b9e58ef2bdb6
* server.el (server-ensure-safe-dir): Pass 'integer
Juanma Barranquero <lekktu@gmail.com>
parents:
104823
diff
changeset
|
460 (setq attrs (file-attributes dir 'integer))) |
105108
84836b2f2c93
This fixes bug#4197 (merged to bug#865, though not identical).
Juanma Barranquero <lekktu@gmail.com>
parents:
105090
diff
changeset
|
461 |
50567
1b32397dd4e2
(server-socket-name): Use new safe location for socket.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49686
diff
changeset
|
462 ;; Check that it's safe for use. |
105108
84836b2f2c93
This fixes bug#4197 (merged to bug#865, though not identical).
Juanma Barranquero <lekktu@gmail.com>
parents:
105090
diff
changeset
|
463 (let* ((uid (nth 2 attrs)) |
84836b2f2c93
This fixes bug#4197 (merged to bug#865, though not identical).
Juanma Barranquero <lekktu@gmail.com>
parents:
105090
diff
changeset
|
464 (w32 (eq system-type 'windows-nt)) |
84836b2f2c93
This fixes bug#4197 (merged to bug#865, though not identical).
Juanma Barranquero <lekktu@gmail.com>
parents:
105090
diff
changeset
|
465 (safe (catch :safe |
84836b2f2c93
This fixes bug#4197 (merged to bug#865, though not identical).
Juanma Barranquero <lekktu@gmail.com>
parents:
105090
diff
changeset
|
466 (unless (eq t (car attrs)) ; is a dir? |
84836b2f2c93
This fixes bug#4197 (merged to bug#865, though not identical).
Juanma Barranquero <lekktu@gmail.com>
parents:
105090
diff
changeset
|
467 (throw :safe nil)) |
84836b2f2c93
This fixes bug#4197 (merged to bug#865, though not identical).
Juanma Barranquero <lekktu@gmail.com>
parents:
105090
diff
changeset
|
468 (when (and w32 (zerop uid)) ; on FAT32? |
84836b2f2c93
This fixes bug#4197 (merged to bug#865, though not identical).
Juanma Barranquero <lekktu@gmail.com>
parents:
105090
diff
changeset
|
469 (display-warning |
84836b2f2c93
This fixes bug#4197 (merged to bug#865, though not identical).
Juanma Barranquero <lekktu@gmail.com>
parents:
105090
diff
changeset
|
470 'server |
84836b2f2c93
This fixes bug#4197 (merged to bug#865, though not identical).
Juanma Barranquero <lekktu@gmail.com>
parents:
105090
diff
changeset
|
471 (format "Using `%s' to store Emacs-server authentication files. |
84836b2f2c93
This fixes bug#4197 (merged to bug#865, though not identical).
Juanma Barranquero <lekktu@gmail.com>
parents:
105090
diff
changeset
|
472 Directories on FAT32 filesystems are NOT secure against tampering. |
84836b2f2c93
This fixes bug#4197 (merged to bug#865, though not identical).
Juanma Barranquero <lekktu@gmail.com>
parents:
105090
diff
changeset
|
473 See variable `server-auth-dir' for details." |
84836b2f2c93
This fixes bug#4197 (merged to bug#865, though not identical).
Juanma Barranquero <lekktu@gmail.com>
parents:
105090
diff
changeset
|
474 (file-name-as-directory dir)) |
84836b2f2c93
This fixes bug#4197 (merged to bug#865, though not identical).
Juanma Barranquero <lekktu@gmail.com>
parents:
105090
diff
changeset
|
475 :warning) |
84836b2f2c93
This fixes bug#4197 (merged to bug#865, though not identical).
Juanma Barranquero <lekktu@gmail.com>
parents:
105090
diff
changeset
|
476 (throw :safe t)) |
84836b2f2c93
This fixes bug#4197 (merged to bug#865, though not identical).
Juanma Barranquero <lekktu@gmail.com>
parents:
105090
diff
changeset
|
477 (unless (eql uid (user-uid)) ; is the dir ours? |
84836b2f2c93
This fixes bug#4197 (merged to bug#865, though not identical).
Juanma Barranquero <lekktu@gmail.com>
parents:
105090
diff
changeset
|
478 (throw :safe nil)) |
84836b2f2c93
This fixes bug#4197 (merged to bug#865, though not identical).
Juanma Barranquero <lekktu@gmail.com>
parents:
105090
diff
changeset
|
479 (when w32 ; on NTFS? |
84836b2f2c93
This fixes bug#4197 (merged to bug#865, though not identical).
Juanma Barranquero <lekktu@gmail.com>
parents:
105090
diff
changeset
|
480 (throw :safe t)) |
84836b2f2c93
This fixes bug#4197 (merged to bug#865, though not identical).
Juanma Barranquero <lekktu@gmail.com>
parents:
105090
diff
changeset
|
481 (unless (zerop (logand ?\077 (file-modes dir))) |
84836b2f2c93
This fixes bug#4197 (merged to bug#865, though not identical).
Juanma Barranquero <lekktu@gmail.com>
parents:
105090
diff
changeset
|
482 (throw :safe nil)) |
84836b2f2c93
This fixes bug#4197 (merged to bug#865, though not identical).
Juanma Barranquero <lekktu@gmail.com>
parents:
105090
diff
changeset
|
483 t))) |
84836b2f2c93
This fixes bug#4197 (merged to bug#865, though not identical).
Juanma Barranquero <lekktu@gmail.com>
parents:
105090
diff
changeset
|
484 (unless safe |
84836b2f2c93
This fixes bug#4197 (merged to bug#865, though not identical).
Juanma Barranquero <lekktu@gmail.com>
parents:
105090
diff
changeset
|
485 (error "The directory `%s' is unsafe" dir))))) |
50567
1b32397dd4e2
(server-socket-name): Use new safe location for socket.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49686
diff
changeset
|
486 |
256 | 487 ;;;###autoload |
50 | 488 (defun server-start (&optional leave-dead) |
489 "Allow this Emacs process to be a server for client processes. | |
490 This starts a server communications subprocess through which | |
83215
a9f716fbb9c6
Small tweaks in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents:
83195
diff
changeset
|
491 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
|
492 job. To use the server, set up the program `emacsclient' in the |
50 | 493 Emacs distribution as your standard \"editor\". |
494 | |
75442
09eed2796001
(server-start): Mention LEAVE-DEAD arg in the doc string.
Eli Zaretskii <eliz@gnu.org>
parents:
75182
diff
changeset
|
495 Optional argument LEAVE-DEAD (interactively, a prefix arg) means just |
100368
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
496 kill any existing server communications subprocess. |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
497 |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
498 If a server is already running, the server is not started. |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
499 To force-start a server, do \\[server-force-delete] and then |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
500 \\[server-start]." |
50 | 501 (interactive "P") |
101326
b837d61f9eba
(server-start): Allow server to shut down when no frames are available
Chong Yidong <cyd@stupidchicken.com>
parents:
101125
diff
changeset
|
502 (when (or (not server-clients) |
b837d61f9eba
(server-start): Allow server to shut down when no frames are available
Chong Yidong <cyd@stupidchicken.com>
parents:
101125
diff
changeset
|
503 ;; Ask the user before deleting existing clients---except |
b837d61f9eba
(server-start): Allow server to shut down when no frames are available
Chong Yidong <cyd@stupidchicken.com>
parents:
101125
diff
changeset
|
504 ;; when we can't get user input, which may happen when |
b837d61f9eba
(server-start): Allow server to shut down when no frames are available
Chong Yidong <cyd@stupidchicken.com>
parents:
101125
diff
changeset
|
505 ;; doing emacsclient --eval "(kill-emacs)" in daemon mode. |
b837d61f9eba
(server-start): Allow server to shut down when no frames are available
Chong Yidong <cyd@stupidchicken.com>
parents:
101125
diff
changeset
|
506 (if (and (daemonp) |
b837d61f9eba
(server-start): Allow server to shut down when no frames are available
Chong Yidong <cyd@stupidchicken.com>
parents:
101125
diff
changeset
|
507 (null (cdr (frame-list))) |
b837d61f9eba
(server-start): Allow server to shut down when no frames are available
Chong Yidong <cyd@stupidchicken.com>
parents:
101125
diff
changeset
|
508 (eq (selected-frame) terminal-frame)) |
b837d61f9eba
(server-start): Allow server to shut down when no frames are available
Chong Yidong <cyd@stupidchicken.com>
parents:
101125
diff
changeset
|
509 leave-dead |
b837d61f9eba
(server-start): Allow server to shut down when no frames are available
Chong Yidong <cyd@stupidchicken.com>
parents:
101125
diff
changeset
|
510 (yes-or-no-p |
b837d61f9eba
(server-start): Allow server to shut down when no frames are available
Chong Yidong <cyd@stupidchicken.com>
parents:
101125
diff
changeset
|
511 "The current server still has clients; delete them? "))) |
100368
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
512 (let* ((server-dir (if server-use-tcp server-auth-dir server-socket-dir)) |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
513 (server-file (expand-file-name server-name server-dir))) |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
514 (when server-process |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
515 ;; kill it dead! |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
516 (ignore-errors (delete-process server-process))) |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
517 ;; Delete the socket files made by previous server invocations. |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
518 (if (not (eq t (server-running-p server-name))) |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
519 ;; Remove any leftover socket or authentication file |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
520 (ignore-errors (delete-file server-file)) |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
521 (setq server-mode nil) ;; already set by the minor mode code |
102132
39b2e6feb768
(server-start): Make the warning more verbose (Bug#2395).
Chong Yidong <cyd@stupidchicken.com>
parents:
101942
diff
changeset
|
522 (display-warning |
39b2e6feb768
(server-start): Make the warning more verbose (Bug#2395).
Chong Yidong <cyd@stupidchicken.com>
parents:
101942
diff
changeset
|
523 'server |
39b2e6feb768
(server-start): Make the warning more verbose (Bug#2395).
Chong Yidong <cyd@stupidchicken.com>
parents:
101942
diff
changeset
|
524 (concat "Unable to start the Emacs server.\n" |
39b2e6feb768
(server-start): Make the warning more verbose (Bug#2395).
Chong Yidong <cyd@stupidchicken.com>
parents:
101942
diff
changeset
|
525 (format "There is an existing Emacs server, named %S.\n" |
39b2e6feb768
(server-start): Make the warning more verbose (Bug#2395).
Chong Yidong <cyd@stupidchicken.com>
parents:
101942
diff
changeset
|
526 server-name) |
39b2e6feb768
(server-start): Make the warning more verbose (Bug#2395).
Chong Yidong <cyd@stupidchicken.com>
parents:
101942
diff
changeset
|
527 "To start the server in this Emacs process, stop the existing |
39b2e6feb768
(server-start): Make the warning more verbose (Bug#2395).
Chong Yidong <cyd@stupidchicken.com>
parents:
101942
diff
changeset
|
528 server or call `M-x server-force-delete' to forcibly disconnect it.") |
39b2e6feb768
(server-start): Make the warning more verbose (Bug#2395).
Chong Yidong <cyd@stupidchicken.com>
parents:
101942
diff
changeset
|
529 :warning) |
100453
40eb1f585dc7
* server.el (server-start): If unable to start the server,
Juanma Barranquero <lekktu@gmail.com>
parents:
100368
diff
changeset
|
530 (setq leave-dead t)) |
100368
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
531 ;; If this Emacs already had a server, clear out associated status. |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
532 (while server-clients |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
533 (server-delete-client (car server-clients))) |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
534 ;; Now any previous server is properly stopped. |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
535 (if leave-dead |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
536 (progn |
100453
40eb1f585dc7
* server.el (server-start): If unable to start the server,
Juanma Barranquero <lekktu@gmail.com>
parents:
100368
diff
changeset
|
537 (unless (eq t leave-dead) (server-log (message "Server stopped"))) |
100368
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
538 (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
|
539 ;; 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
|
540 (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
|
541 (when server-process |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
542 (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
|
543 (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
|
544 (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
|
545 (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
|
546 (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
|
547 (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
|
548 (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
|
549 (setq server-process |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
550 (apply #'make-network-process |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
551 :name server-name |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
552 :server t |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
553 :noquery t |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
554 :sentinel 'server-sentinel |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
555 :filter 'server-process-filter |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
556 ;; 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
|
557 ;; Those are decoded by server-process-filter according |
94295
11c1515dc9e3
(server-start): Also don't get confused by CRs since we
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94195
diff
changeset
|
558 ;; to file-name-coding-system. Also don't get |
11c1515dc9e3
(server-start): Also don't get confused by CRs since we
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94195
diff
changeset
|
559 ;; confused by CRs since we don't quote them. |
11c1515dc9e3
(server-start): Also don't get confused by CRs since we
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94195
diff
changeset
|
560 :coding 'raw-text-unix |
88016
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
561 ;; 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
|
562 (if server-use-tcp |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
563 (list :family nil |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
564 :service t |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
565 :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
|
566 :plist '(:authenticated nil)) |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
567 (list :family 'local |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
568 :service server-file |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
569 :plist '(:authenticated t))))) |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
570 (unless server-process (error "Could not start server process")) |
100368
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
571 (process-put server-process :server-file server-file) |
83548
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
572 (when server-use-tcp |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
573 (let ((auth-key |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
574 (loop |
85350
209a22b247e0
*** empty log message ***
Juanma Barranquero <lekktu@gmail.com>
parents:
85341
diff
changeset
|
575 ;; 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
|
576 ;; range `!'..`~'. |
209a22b247e0
*** empty log message ***
Juanma Barranquero <lekktu@gmail.com>
parents:
85341
diff
changeset
|
577 for i below 64 |
209a22b247e0
*** empty log message ***
Juanma Barranquero <lekktu@gmail.com>
parents:
85341
diff
changeset
|
578 collect (+ 33 (random 94)) into auth |
209a22b247e0
*** empty log message ***
Juanma Barranquero <lekktu@gmail.com>
parents:
85341
diff
changeset
|
579 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
|
580 (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
|
581 (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
|
582 (set-buffer-multibyte nil) |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
583 (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
|
584 (insert (format-network-address |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
585 (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
|
586 " " (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
|
587 "\n" auth-key))))))))) |
49267 | 588 |
100368
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
589 ;;;###autoload |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
590 (defun server-force-delete (&optional name) |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
591 "Unconditionally delete connection file for server NAME. |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
592 If server is running, it is first stopped. |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
593 NAME defaults to `server-name'. With argument, ask for NAME." |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
594 (interactive |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
595 (list (if current-prefix-arg |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
596 (read-string "Server name: " nil nil server-name)))) |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
597 (when server-mode (with-temp-message nil (server-mode -1))) |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
598 (let ((file (expand-file-name (or name server-name) |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
599 (if server-use-tcp |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
600 server-auth-dir |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
601 server-socket-dir)))) |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
602 (condition-case nil |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
603 (progn |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
604 (delete-file file) |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
605 (message "Connection file %S deleted" file)) |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
606 (file-error |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
607 (message "No connection file %S" file))))) |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
608 |
84635
f539dbd0a615
(server-running-p): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84601
diff
changeset
|
609 (defun server-running-p (&optional name) |
100368
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
610 "Test whether server NAME is running. |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
611 |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
612 Return values: |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
613 nil the server is definitely not running. |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
614 t the server seems to be running. |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
615 something else we cannot determine whether it's running without using |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
616 commands which may have to wait for a long time." |
84635
f539dbd0a615
(server-running-p): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84601
diff
changeset
|
617 (unless name (setq name server-name)) |
f539dbd0a615
(server-running-p): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84601
diff
changeset
|
618 (condition-case nil |
100368
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
619 (if server-use-tcp |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
620 (with-temp-buffer |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
621 (insert-file-contents-literally (expand-file-name name server-auth-dir)) |
100767
c2a05360a02f
(server-running-p): Remove interactive spec. Fix
Andreas Schwab <schwab@suse.de>
parents:
100453
diff
changeset
|
622 (or (and (looking-at "127\\.0\\.0\\.1:[0-9]+ \\([0-9]+\\)") |
100368
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
623 (assq 'comm |
102205
0f4ba7f17aa0
Rename `system-process-attributes' to `process-attributes'
Miles Bader <miles@gnu.org>
parents:
102132
diff
changeset
|
624 (process-attributes |
100368
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
625 (string-to-number (match-string 1)))) |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
626 t) |
4647905e3ad9
* server.el (server-sentinel): Uncomment code to delete connection file.
Juanma Barranquero <lekktu@gmail.com>
parents:
99691
diff
changeset
|
627 :other)) |
84635
f539dbd0a615
(server-running-p): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84601
diff
changeset
|
628 (delete-process |
f539dbd0a615
(server-running-p): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84601
diff
changeset
|
629 (make-network-process |
f539dbd0a615
(server-running-p): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84601
diff
changeset
|
630 :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
|
631 :service (expand-file-name name server-socket-dir))) |
f539dbd0a615
(server-running-p): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84601
diff
changeset
|
632 t) |
f539dbd0a615
(server-running-p): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84601
diff
changeset
|
633 (file-error nil))) |
49267 | 634 |
635 ;;;###autoload | |
636 (define-minor-mode server-mode | |
637 "Toggle Server mode. | |
638 With ARG, turn Server mode on if ARG is positive, off otherwise. | |
639 Server mode runs a process that accepts commands from the | |
640 `emacsclient' program. See `server-start' and Info node `Emacs server'." | |
641 :global t | |
642 :group 'server | |
59996
aac0a33f5772
Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents:
59220
diff
changeset
|
643 :version "22.1" |
49267 | 644 ;; Fixme: Should this check for an existing server socket and do |
645 ;; nothing if there is one (for multiple Emacs sessions)? | |
646 (server-start (not server-mode))) | |
50 | 647 |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
648 (defun server-eval-and-print (expr proc) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
649 "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
|
650 (let ((v (eval (car (read-from-string expr))))) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
651 (when (and v proc) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
652 (with-temp-buffer |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
653 (let ((standard-output (current-buffer))) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
654 (pp v) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
655 (let ((text (buffer-substring-no-properties |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
656 (point-min) (point-max)))) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
657 (server-send-string |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
658 proc (format "-print %s\n" |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
659 (server-quote-arg text))))))))) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
660 |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
661 (defun server-create-tty-frame (tty type proc) |
101349
191a3121c949
* frame.el (make-frame-on-tty): Remove function, inline contents
Dan Nicolaescu <dann@ics.uci.edu>
parents:
101326
diff
changeset
|
662 (unless tty |
191a3121c949
* frame.el (make-frame-on-tty): Remove function, inline contents
Dan Nicolaescu <dann@ics.uci.edu>
parents:
101326
diff
changeset
|
663 (error "Invalid terminal device")) |
191a3121c949
* frame.el (make-frame-on-tty): Remove function, inline contents
Dan Nicolaescu <dann@ics.uci.edu>
parents:
101326
diff
changeset
|
664 (unless type |
191a3121c949
* frame.el (make-frame-on-tty): Remove function, inline contents
Dan Nicolaescu <dann@ics.uci.edu>
parents:
101326
diff
changeset
|
665 (error "Invalid terminal type")) |
85147
c164c81cba59
(server-create-tty-frame, server-create-window-system-frame):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85102
diff
changeset
|
666 (add-to-list 'frame-inherited-parameters 'client) |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
667 (let ((frame |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
668 (server-with-environment (process-get proc 'env) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
669 '("LANG" "LC_CTYPE" "LC_ALL" |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
670 ;; For tgetent(3); list according to ncurses(3). |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
671 "BAUDRATE" "COLUMNS" "ESCDELAY" "HOME" "LINES" |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
672 "NCURSES_ASSUMED_COLORS" "NCURSES_NO_PADDING" |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
673 "NCURSES_NO_SETBUF" "TERM" "TERMCAP" "TERMINFO" |
85722
5f0d32eed4eb
(server-process-filter): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
85365
diff
changeset
|
674 "TERMINFO_DIRS" "TERMPATH" |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
675 ;; rxvt wants these |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
676 "COLORFGBG" "COLORTERM") |
101349
191a3121c949
* frame.el (make-frame-on-tty): Remove function, inline contents
Dan Nicolaescu <dann@ics.uci.edu>
parents:
101326
diff
changeset
|
677 (make-frame `((window-system . nil) |
191a3121c949
* frame.el (make-frame-on-tty): Remove function, inline contents
Dan Nicolaescu <dann@ics.uci.edu>
parents:
101326
diff
changeset
|
678 (tty . ,tty) |
191a3121c949
* frame.el (make-frame-on-tty): Remove function, inline contents
Dan Nicolaescu <dann@ics.uci.edu>
parents:
101326
diff
changeset
|
679 (tty-type . ,type) |
191a3121c949
* frame.el (make-frame-on-tty): Remove function, inline contents
Dan Nicolaescu <dann@ics.uci.edu>
parents:
101326
diff
changeset
|
680 ;; Ignore nowait here; we always need to |
191a3121c949
* frame.el (make-frame-on-tty): Remove function, inline contents
Dan Nicolaescu <dann@ics.uci.edu>
parents:
101326
diff
changeset
|
681 ;; clean up opened ttys when the client dies. |
191a3121c949
* frame.el (make-frame-on-tty): Remove function, inline contents
Dan Nicolaescu <dann@ics.uci.edu>
parents:
101326
diff
changeset
|
682 (client . ,proc) |
191a3121c949
* frame.el (make-frame-on-tty): Remove function, inline contents
Dan Nicolaescu <dann@ics.uci.edu>
parents:
101326
diff
changeset
|
683 ;; This is a leftover from an earlier |
191a3121c949
* frame.el (make-frame-on-tty): Remove function, inline contents
Dan Nicolaescu <dann@ics.uci.edu>
parents:
101326
diff
changeset
|
684 ;; attempt at making it possible for process |
191a3121c949
* frame.el (make-frame-on-tty): Remove function, inline contents
Dan Nicolaescu <dann@ics.uci.edu>
parents:
101326
diff
changeset
|
685 ;; run in the server process to use the |
191a3121c949
* frame.el (make-frame-on-tty): Remove function, inline contents
Dan Nicolaescu <dann@ics.uci.edu>
parents:
101326
diff
changeset
|
686 ;; environment of the client process. |
191a3121c949
* frame.el (make-frame-on-tty): Remove function, inline contents
Dan Nicolaescu <dann@ics.uci.edu>
parents:
101326
diff
changeset
|
687 ;; It has no effect now and to make it work |
191a3121c949
* frame.el (make-frame-on-tty): Remove function, inline contents
Dan Nicolaescu <dann@ics.uci.edu>
parents:
101326
diff
changeset
|
688 ;; we'd need to decide how to make |
191a3121c949
* frame.el (make-frame-on-tty): Remove function, inline contents
Dan Nicolaescu <dann@ics.uci.edu>
parents:
101326
diff
changeset
|
689 ;; process-environment interact with client |
191a3121c949
* frame.el (make-frame-on-tty): Remove function, inline contents
Dan Nicolaescu <dann@ics.uci.edu>
parents:
101326
diff
changeset
|
690 ;; envvars, and then to change the |
191a3121c949
* frame.el (make-frame-on-tty): Remove function, inline contents
Dan Nicolaescu <dann@ics.uci.edu>
parents:
101326
diff
changeset
|
691 ;; C functions `child_setup' and |
191a3121c949
* frame.el (make-frame-on-tty): Remove function, inline contents
Dan Nicolaescu <dann@ics.uci.edu>
parents:
101326
diff
changeset
|
692 ;; `getenv_internal' accordingly. |
191a3121c949
* frame.el (make-frame-on-tty): Remove function, inline contents
Dan Nicolaescu <dann@ics.uci.edu>
parents:
101326
diff
changeset
|
693 (environment . ,(process-get proc 'env))))))) |
101060
be6cb2e93600
Revert previous change (commit mistake).
Chong Yidong <cyd@stupidchicken.com>
parents:
101058
diff
changeset
|
694 |
84744
4f2e2dad61b9
(server-getenv-from): Remove. Use getenv-internal instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84635
diff
changeset
|
695 ;; 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
|
696 ;; the DISPLAY environment on subprocesses. |
4f2e2dad61b9
(server-getenv-from): Remove. Use getenv-internal instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84635
diff
changeset
|
697 (set-frame-parameter frame 'display |
4f2e2dad61b9
(server-getenv-from): Remove. Use getenv-internal instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84635
diff
changeset
|
698 (getenv-internal "DISPLAY" (process-get proc 'env))) |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
699 (select-frame frame) |
84601
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
700 (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
|
701 (process-put proc 'terminal (frame-terminal frame)) |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
702 |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
703 ;; Display *scratch* by default. |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
704 (switch-to-buffer (get-buffer-create "*scratch*") 'norecord) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
705 |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
706 ;; Reply with our pid. |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
707 (server-send-string proc (concat "-emacs-pid " |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
708 (number-to-string (emacs-pid)) "\n")) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
709 frame)) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
710 |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
711 (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
|
712 (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
|
713 (if (not (fboundp 'make-frame-on-display)) |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
714 (progn |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
715 ;; This emacs does not support X. |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
716 (server-log "Window system unsupported" proc) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
717 (server-send-string proc "-window-system-unsupported \n") |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
718 nil) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
719 ;; 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
|
720 ;; This will prevent the frame from being deleted when |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
721 ;; emacsclient quits while also preventing |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
722 ;; `server-save-buffers-kill-terminal' from unexpectedly |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
723 ;; killing emacs on that frame. |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
724 (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
|
725 ;; This is a leftover, see above. |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
726 (environment . ,(process-get proc 'env)))) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
727 (frame (make-frame-on-display |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
728 (or display |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
729 (frame-parameter nil 'display) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
730 (getenv "DISPLAY") |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
731 (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
|
732 params))) |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
733 (server-log (format "%s created" frame) proc) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
734 (select-frame frame) |
84601
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
735 (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
|
736 (process-put proc 'terminal (frame-terminal frame)) |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
737 |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
738 ;; Display *scratch* by default. |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
739 (switch-to-buffer (get-buffer-create "*scratch*") 'norecord) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
740 frame))) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
741 |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
742 (defun server-goto-toplevel (proc) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
743 (condition-case nil |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
744 ;; 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
|
745 ;; display the buffer and switch to it. |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
746 (dolist (buffer (buffer-list)) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
747 (with-current-buffer buffer |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
748 (when (bound-and-true-p isearch-mode) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
749 (isearch-cancel)))) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
750 ;; Signaled by isearch-cancel. |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
751 (quit (message nil))) |
74268
3de22dfd43f8
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73929
diff
changeset
|
752 (when (> (recursion-depth) 0) |
3de22dfd43f8
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73929
diff
changeset
|
753 ;; 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
|
754 ;; 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
|
755 ;; 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
|
756 ;; the minibuffer). Better exit this minibuffer right away. |
3de22dfd43f8
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73929
diff
changeset
|
757 ;; Similarly with recursive-edits such as the splash screen. |
3de22dfd43f8
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73929
diff
changeset
|
758 (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
|
759 (lambda () (server-execute-continuation proc)))) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
760 (top-level))) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
761 |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
762 ;; We use various special properties on process objects: |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
763 ;; - `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
|
764 ;; - `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
|
765 ;; 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
|
766 ;; 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
|
767 ;; (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
|
768 |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
769 (defun server-execute-continuation (proc) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
770 (let ((continuation (process-get proc 'continuation))) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
771 (process-put proc 'continuation nil) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
772 (if continuation (ignore-errors (funcall continuation))))) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
773 |
73559
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
774 (defun* server-process-filter (proc string) |
49267 | 775 "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
|
776 PROC is the server process. STRING consists of a sequence of |
99489
4443a21738e1
* server.el (server-process-filter): Fix typos and reflow docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
99399
diff
changeset
|
777 commands prefixed by a dash. Some commands have arguments; |
4443a21738e1
* server.el (server-process-filter): Fix typos and reflow docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
99399
diff
changeset
|
778 these are &-quoted and need to be decoded by `server-unquote-arg'. |
4443a21738e1
* server.el (server-process-filter): Fix typos and reflow docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
99399
diff
changeset
|
779 The filter parses and executes these commands. |
83246
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
780 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
781 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
|
782 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
|
783 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
|
784 |
99489
4443a21738e1
* server.el (server-process-filter): Fix typos and reflow docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
99399
diff
changeset
|
785 -env HOME=/home/lorentey |
4443a21738e1
* server.el (server-process-filter): Fix typos and reflow docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
99399
diff
changeset
|
786 -env DISPLAY=:0.0 |
83246
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
787 ... 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
|
788 -display :0.0 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
789 -window-system |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
790 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
791 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
|
792 |
83548
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
793 `-auth AUTH-STRING' |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
794 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
|
795 AUTH-STRING. |
83548
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
796 |
83403
51eb0aa362f3
Store client's environment in terminal parameters, not server parameters.
Karoly Lorentey <lorentey@elte.hu>
parents:
83395
diff
changeset
|
797 `-env NAME=VALUE' |
83246
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
798 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
|
799 |
83499
0fe580113f72
Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents:
83477
diff
changeset
|
800 `-dir DIRNAME' |
0fe580113f72
Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents:
83477
diff
changeset
|
801 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
|
802 |
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
|
803 `-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
|
804 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
|
805 |
83246
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
806 `-nowait' |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
807 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
|
808 associated with this client. |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
809 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
810 `-display DISPLAY' |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
811 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
|
812 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
813 `-position LINE[:COLUMN]' |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
814 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
|
815 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
|
816 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
817 `-file FILENAME' |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
818 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
|
819 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
820 `-eval EXPR' |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
821 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
|
822 result in -print commands. |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
823 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
824 `-window-system' |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
825 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
|
826 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
827 `-tty DEVICENAME TYPE' |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
828 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
|
829 |
83499
0fe580113f72
Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents:
83477
diff
changeset
|
830 `-suspend' |
0fe580113f72
Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents:
83477
diff
changeset
|
831 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
|
832 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
|
833 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
|
834 |
83246
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
835 `-resume' |
85722
5f0d32eed4eb
(server-process-filter): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
85365
diff
changeset
|
836 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
|
837 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
|
838 controlling tty. |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
839 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
840 `-ignore COMMENT' |
99489
4443a21738e1
* server.el (server-process-filter): Fix typos and reflow docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
99399
diff
changeset
|
841 Do nothing, but put the comment in the server log. |
4443a21738e1
* server.el (server-process-filter): Fix typos and reflow docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
99399
diff
changeset
|
842 Useful for debugging. |
83246
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
843 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
844 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
845 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
|
846 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
847 `-emacs-pid PID' |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
848 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
|
849 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
|
850 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
851 `-window-system-unsupported' |
85722
5f0d32eed4eb
(server-process-filter): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
85365
diff
changeset
|
852 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
|
853 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
|
854 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
855 `-print STRING' |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
856 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
|
857 returned by -eval. |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
858 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
859 `-error DESCRIPTION' |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
860 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
|
861 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
862 `-suspend' |
85722
5f0d32eed4eb
(server-process-filter): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
85365
diff
changeset
|
863 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
|
864 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
|
865 (server-log (concat "Received " string) proc) |
73559
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
866 ;; First things first: let's check the authentication |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
867 (unless (process-get proc :authenticated) |
87964
fdac3d75dcdb
(server-process-filter): Don't force the authentication
Juanma Barranquero <lekktu@gmail.com>
parents:
87876
diff
changeset
|
868 (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
|
869 (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
|
870 (progn |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
871 (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
|
872 (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
|
873 (server-log "Authentication successful" proc)) |
73559
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
874 (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
|
875 (server-send-string |
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
876 proc (concat "-error " (server-quote-arg "Authentication failed"))) |
73559
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
877 (delete-process proc) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
878 ;; We return immediately |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
879 (return-from server-process-filter))) |
49686
64195811ff44
(server-previous-strings): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49267
diff
changeset
|
880 (let ((prev (process-get proc 'previous-string))) |
64195811ff44
(server-previous-strings): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49267
diff
changeset
|
881 (when prev |
64195811ff44
(server-previous-strings): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49267
diff
changeset
|
882 (setq string (concat prev string)) |
64195811ff44
(server-previous-strings): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49267
diff
changeset
|
883 (process-put proc 'previous-string nil))) |
83044
52039abab942
Verify the version of Emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents:
83043
diff
changeset
|
884 (condition-case err |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
885 (progn |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
886 (server-add-client proc) |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
887 (if (not (string-match "\n" string)) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
888 ;; Save for later any partial line that remains. |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
889 (when (> (length string) 0) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
890 (process-put proc 'previous-string string)) |
85722
5f0d32eed4eb
(server-process-filter): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
85365
diff
changeset
|
891 |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
892 ;; 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
|
893 ;; 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
|
894 ;; supported any more. |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
895 (assert (eq (match-end 0) (length string))) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
896 (let ((request (substring string 0 (match-beginning 0))) |
104823
68150c643e2e
Use default-value rather than default-enable-multibyte-characters.
Glenn Morris <rgm@gnu.org>
parents:
104543
diff
changeset
|
897 (coding-system (and (default-value 'enable-multibyte-characters) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
898 (or file-name-coding-system |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
899 default-file-name-coding-system))) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
900 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
|
901 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
|
902 display ; Open the frame on this display. |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
903 dontkill ; t if the client should not be killed. |
99390
0c8f4221f839
(server-process-filter): Don't call server-create-tty-frame when no
Chong Yidong <cyd@stupidchicken.com>
parents:
99252
diff
changeset
|
904 commands |
83499
0fe580113f72
Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents:
83477
diff
changeset
|
905 dir |
99252
8ee9512061d4
(server-process-filter): In daemon mode, default to emacsclient's tty
Chong Yidong <cyd@stupidchicken.com>
parents:
99209
diff
changeset
|
906 use-current-frame |
99390
0c8f4221f839
(server-process-filter): Don't call server-create-tty-frame when no
Chong Yidong <cyd@stupidchicken.com>
parents:
99252
diff
changeset
|
907 tty-name ;nil, `window-system', or the tty name. |
0c8f4221f839
(server-process-filter): Don't call server-create-tty-frame when no
Chong Yidong <cyd@stupidchicken.com>
parents:
99252
diff
changeset
|
908 tty-type ;string. |
0c8f4221f839
(server-process-filter): Don't call server-create-tty-frame when no
Chong Yidong <cyd@stupidchicken.com>
parents:
99252
diff
changeset
|
909 files |
0c8f4221f839
(server-process-filter): Don't call server-create-tty-frame when no
Chong Yidong <cyd@stupidchicken.com>
parents:
99252
diff
changeset
|
910 filepos |
86380
2f0cad6a4f81
* server.el (server-process-filter): Use `command-line-args-left'
David Kastrup <dak@gnu.org>
parents:
85975
diff
changeset
|
911 command-line-args-left |
2f0cad6a4f81
* server.el (server-process-filter): Use `command-line-args-left'
David Kastrup <dak@gnu.org>
parents:
85975
diff
changeset
|
912 arg) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
913 ;; Remove this line from STRING. |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
914 (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
|
915 (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
|
916 (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
|
917 (while (setq arg (pop command-line-args-left)) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
918 (cond |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
919 ;; -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
|
920 ((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
|
921 (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
|
922 |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
923 ;; -nowait: Emacsclient won't wait for a result. |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
924 ((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
|
925 |
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
|
926 ;; -current-frame: Don't create frames. |
99252
8ee9512061d4
(server-process-filter): In daemon mode, default to emacsclient's tty
Chong Yidong <cyd@stupidchicken.com>
parents:
99209
diff
changeset
|
927 ((equal "-current-frame" arg) (setq use-current-frame t)) |
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
|
928 |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
929 ;; -display DISPLAY: |
83403
51eb0aa362f3
Store client's environment in terminal parameters, not server parameters.
Karoly Lorentey <lorentey@elte.hu>
parents:
83395
diff
changeset
|
930 ;; 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
|
931 ((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
|
932 (setq display (pop command-line-args-left)) |
655d101f4e6b
(server-select-display): Fix important typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86380
diff
changeset
|
933 (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
|
934 |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
935 ;; -window-system: Open a new X frame. |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
936 ((equal "-window-system" arg) |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
937 (setq dontkill t) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
938 (setq tty-name 'window-system)) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
939 |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
940 ;; -resume: Resume a suspended tty frame. |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
941 ((equal "-resume" arg) |
84601
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
942 (lexical-let ((terminal (process-get proc 'terminal))) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
943 (setq dontkill t) |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
944 (push (lambda () |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
945 (when (eq (terminal-live-p terminal) t) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
946 (resume-tty terminal))) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
947 commands))) |
83043
78a785f205ea
Added -w option to emacsclient for opening a new X frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83031
diff
changeset
|
948 |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
949 ;; -suspend: Suspend the client's frame. (In case we |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
950 ;; 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
|
951 ;; emacsclient.) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
952 ((equal "-suspend" arg) |
84601
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
953 (lexical-let ((terminal (process-get proc 'terminal))) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
954 (setq dontkill t) |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
955 (push (lambda () |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
956 (when (eq (terminal-live-p terminal) t) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
957 (suspend-tty terminal))) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
958 commands))) |
83044
52039abab942
Verify the version of Emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents:
83043
diff
changeset
|
959 |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
960 ;; -ignore COMMENT: Noop; useful for debugging emacsclient. |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
961 ;; (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
|
962 ((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
|
963 (setq dontkill t) |
2f0cad6a4f81
* server.el (server-process-filter): Use `command-line-args-left'
David Kastrup <dak@gnu.org>
parents:
85975
diff
changeset
|
964 (pop command-line-args-left))) |
53233
fe9b37bee5f7
Fully eliminated global tty state variables.
Karoly Lorentey <lorentey@elte.hu>
parents:
53232
diff
changeset
|
965 |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
966 ;; -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
|
967 ((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
|
968 (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
|
969 (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
|
970 tty-type (pop command-line-args-left) |
99252
8ee9512061d4
(server-process-filter): In daemon mode, default to emacsclient's tty
Chong Yidong <cyd@stupidchicken.com>
parents:
99209
diff
changeset
|
971 dontkill (or dontkill |
8ee9512061d4
(server-process-filter): In daemon mode, default to emacsclient's tty
Chong Yidong <cyd@stupidchicken.com>
parents:
99209
diff
changeset
|
972 (not use-current-frame)))) |
83283
45e5f0224d81
Fix error when creating tty clients.
Karoly Lorentey <lorentey@elte.hu>
parents:
83257
diff
changeset
|
973 |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
974 ;; -position LINE[:COLUMN]: Set point to the given |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
975 ;; position in the next file. |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
976 ((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
|
977 command-line-args-left |
2f0cad6a4f81
* server.el (server-process-filter): Use `command-line-args-left'
David Kastrup <dak@gnu.org>
parents:
85975
diff
changeset
|
978 (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
|
979 (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
|
980 (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
|
981 (setq filepos |
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
982 (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
|
983 (string-to-number (or (match-string 2 arg) ""))))) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
984 |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
985 ;; -file FILENAME: Load the given file. |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
986 ((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
|
987 command-line-args-left) |
2f0cad6a4f81
* server.el (server-process-filter): Use `command-line-args-left'
David Kastrup <dak@gnu.org>
parents:
85975
diff
changeset
|
988 (let ((file (pop command-line-args-left))) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
989 (if coding-system |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
990 (setq file (decode-coding-string file coding-system))) |
102471
02f766280fad
* server.el (server-process-filter): Use expand-file-name rather than
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102205
diff
changeset
|
991 (setq file (expand-file-name file dir)) |
87794
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
992 (push (cons file filepos) files) |
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
993 (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
|
994 file (or filepos "")) proc)) |
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
995 (setq filepos nil)) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
996 |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
997 ;; -eval EXPR: Evaluate a Lisp expression. |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
998 ((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
|
999 command-line-args-left) |
99252
8ee9512061d4
(server-process-filter): In daemon mode, default to emacsclient's tty
Chong Yidong <cyd@stupidchicken.com>
parents:
99209
diff
changeset
|
1000 (if use-current-frame |
8ee9512061d4
(server-process-filter): In daemon mode, default to emacsclient's tty
Chong Yidong <cyd@stupidchicken.com>
parents:
99209
diff
changeset
|
1001 (setq use-current-frame 'always)) |
86380
2f0cad6a4f81
* server.el (server-process-filter): Use `command-line-args-left'
David Kastrup <dak@gnu.org>
parents:
85975
diff
changeset
|
1002 (lexical-let ((expr (pop command-line-args-left))) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
1003 (if coding-system |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
1004 (setq expr (decode-coding-string expr coding-system))) |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
1005 (push (lambda () (server-eval-and-print expr proc)) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
1006 commands) |
87794
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
1007 (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
|
1008 |
83403
51eb0aa362f3
Store client's environment in terminal parameters, not server parameters.
Karoly Lorentey <lorentey@elte.hu>
parents:
83395
diff
changeset
|
1009 ;; -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
|
1010 ((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
|
1011 (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
|
1012 ;; 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
|
1013 (process-put proc 'env |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
1014 (cons var (process-get proc 'env))))) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
1015 |
83499
0fe580113f72
Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents:
83477
diff
changeset
|
1016 ;; -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
|
1017 ((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
|
1018 (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
|
1019 (if coding-system |
0fe580113f72
Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents:
83477
diff
changeset
|
1020 (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
|
1021 (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
|
1022 |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
1023 ;; Unknown command. |
86380
2f0cad6a4f81
* server.el (server-process-filter): Use `command-line-args-left'
David Kastrup <dak@gnu.org>
parents:
85975
diff
changeset
|
1024 (t (error "Unknown command: %s" arg)))) |
85722
5f0d32eed4eb
(server-process-filter): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
85365
diff
changeset
|
1025 |
99252
8ee9512061d4
(server-process-filter): In daemon mode, default to emacsclient's tty
Chong Yidong <cyd@stupidchicken.com>
parents:
99209
diff
changeset
|
1026 (setq frame |
8ee9512061d4
(server-process-filter): In daemon mode, default to emacsclient's tty
Chong Yidong <cyd@stupidchicken.com>
parents:
99209
diff
changeset
|
1027 (cond |
8ee9512061d4
(server-process-filter): In daemon mode, default to emacsclient's tty
Chong Yidong <cyd@stupidchicken.com>
parents:
99209
diff
changeset
|
1028 ((and use-current-frame |
8ee9512061d4
(server-process-filter): In daemon mode, default to emacsclient's tty
Chong Yidong <cyd@stupidchicken.com>
parents:
99209
diff
changeset
|
1029 (or (eq use-current-frame 'always) |
8ee9512061d4
(server-process-filter): In daemon mode, default to emacsclient's tty
Chong Yidong <cyd@stupidchicken.com>
parents:
99209
diff
changeset
|
1030 ;; We can't use the Emacs daemon's |
8ee9512061d4
(server-process-filter): In daemon mode, default to emacsclient's tty
Chong Yidong <cyd@stupidchicken.com>
parents:
99209
diff
changeset
|
1031 ;; terminal frame. |
99399
6620e11a4f76
(server-process-filter): Only default to emacsclient's terminal in
Chong Yidong <cyd@stupidchicken.com>
parents:
99390
diff
changeset
|
1032 (not (and (daemonp) |
101326
b837d61f9eba
(server-start): Allow server to shut down when no frames are available
Chong Yidong <cyd@stupidchicken.com>
parents:
101125
diff
changeset
|
1033 (null (cdr (frame-list))) |
99252
8ee9512061d4
(server-process-filter): In daemon mode, default to emacsclient's tty
Chong Yidong <cyd@stupidchicken.com>
parents:
99209
diff
changeset
|
1034 (eq (selected-frame) |
8ee9512061d4
(server-process-filter): In daemon mode, default to emacsclient's tty
Chong Yidong <cyd@stupidchicken.com>
parents:
99209
diff
changeset
|
1035 terminal-frame))))) |
99399
6620e11a4f76
(server-process-filter): Only default to emacsclient's terminal in
Chong Yidong <cyd@stupidchicken.com>
parents:
99390
diff
changeset
|
1036 (setq tty-name nil tty-type nil) |
99252
8ee9512061d4
(server-process-filter): In daemon mode, default to emacsclient's tty
Chong Yidong <cyd@stupidchicken.com>
parents:
99209
diff
changeset
|
1037 (if display (server-select-display display))) |
8ee9512061d4
(server-process-filter): In daemon mode, default to emacsclient's tty
Chong Yidong <cyd@stupidchicken.com>
parents:
99209
diff
changeset
|
1038 ((eq tty-name 'window-system) |
8ee9512061d4
(server-process-filter): In daemon mode, default to emacsclient's tty
Chong Yidong <cyd@stupidchicken.com>
parents:
99209
diff
changeset
|
1039 (server-create-window-system-frame display nowait proc)) |
99390
0c8f4221f839
(server-process-filter): Don't call server-create-tty-frame when no
Chong Yidong <cyd@stupidchicken.com>
parents:
99252
diff
changeset
|
1040 ;; When resuming on a tty, tty-name is nil. |
0c8f4221f839
(server-process-filter): Don't call server-create-tty-frame when no
Chong Yidong <cyd@stupidchicken.com>
parents:
99252
diff
changeset
|
1041 (tty-name |
0c8f4221f839
(server-process-filter): Don't call server-create-tty-frame when no
Chong Yidong <cyd@stupidchicken.com>
parents:
99252
diff
changeset
|
1042 (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
|
1043 |
88016
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
1044 (process-put |
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
1045 proc 'continuation |
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
1046 (lexical-let ((proc proc) |
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
1047 (files files) |
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
1048 (nowait nowait) |
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
1049 (commands commands) |
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
1050 (dontkill dontkill) |
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
1051 (frame frame) |
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
1052 (dir dir) |
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
1053 (tty-name tty-name)) |
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
1054 (lambda () |
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
1055 (with-current-buffer (get-buffer-create server-buffer) |
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
1056 ;; 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
|
1057 ;; relative file names work correctly, even in `eval'. |
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
1058 (let ((default-directory |
88042
1da8bfe80e01
(server-log-time-function): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
88023
diff
changeset
|
1059 (if (and dir (file-directory-p dir)) |
1da8bfe80e01
(server-log-time-function): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
88023
diff
changeset
|
1060 dir default-directory))) |
88016
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
1061 (server-execute proc files nowait commands |
921eddfa6d43
(server-buffer): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87964
diff
changeset
|
1062 dontkill frame tty-name)))))) |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
1063 |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
1064 (when (or frame files) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
1065 (server-goto-toplevel proc)) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
1066 |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
1067 (server-execute-continuation proc)))) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
1068 ;; condition-case |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
1069 (error (server-return-error proc err)))) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
1070 |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
1071 (defun server-execute (proc files nowait commands dontkill frame tty-name) |
101874
76d5e3386e23
(server-execute): Enable quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101392
diff
changeset
|
1072 ;; This is run from timers and process-filters, i.e. "asynchronously". |
76d5e3386e23
(server-execute): Enable quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101392
diff
changeset
|
1073 ;; But w.r.t the user, this is not really asynchronous since the timer |
76d5e3386e23
(server-execute): Enable quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101392
diff
changeset
|
1074 ;; is run after 0s and the process-filter is run in response to the |
76d5e3386e23
(server-execute): Enable quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101392
diff
changeset
|
1075 ;; user running `emacsclient'. So it is OK to override the |
76d5e3386e23
(server-execute): Enable quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101392
diff
changeset
|
1076 ;; inhibit-quit flag, which is good since `commands' (as well as |
76d5e3386e23
(server-execute): Enable quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101392
diff
changeset
|
1077 ;; find-file-noselect via the major-mode) can run arbitrary code, |
76d5e3386e23
(server-execute): Enable quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101392
diff
changeset
|
1078 ;; including code that needs to wait. |
76d5e3386e23
(server-execute): Enable quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101392
diff
changeset
|
1079 (with-local-quit |
76d5e3386e23
(server-execute): Enable quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101392
diff
changeset
|
1080 (condition-case err |
76d5e3386e23
(server-execute): Enable quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101392
diff
changeset
|
1081 (let* ((buffers |
76d5e3386e23
(server-execute): Enable quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101392
diff
changeset
|
1082 (when files |
76d5e3386e23
(server-execute): Enable quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101392
diff
changeset
|
1083 (run-hooks 'pre-command-hook) |
76d5e3386e23
(server-execute): Enable quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101392
diff
changeset
|
1084 (prog1 (server-visit-files files proc nowait) |
76d5e3386e23
(server-execute): Enable quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101392
diff
changeset
|
1085 (run-hooks 'post-command-hook))))) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
1086 |
101874
76d5e3386e23
(server-execute): Enable quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101392
diff
changeset
|
1087 (mapc 'funcall (nreverse commands)) |
85722
5f0d32eed4eb
(server-process-filter): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
85365
diff
changeset
|
1088 |
101874
76d5e3386e23
(server-execute): Enable quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101392
diff
changeset
|
1089 ;; Delete the client if necessary. |
76d5e3386e23
(server-execute): Enable quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101392
diff
changeset
|
1090 (cond |
76d5e3386e23
(server-execute): Enable quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101392
diff
changeset
|
1091 (nowait |
76d5e3386e23
(server-execute): Enable quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101392
diff
changeset
|
1092 ;; Client requested nowait; return immediately. |
76d5e3386e23
(server-execute): Enable quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101392
diff
changeset
|
1093 (server-log "Close nowait client" proc) |
76d5e3386e23
(server-execute): Enable quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101392
diff
changeset
|
1094 (server-delete-client proc)) |
76d5e3386e23
(server-execute): Enable quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101392
diff
changeset
|
1095 ((and (not dontkill) (null buffers)) |
76d5e3386e23
(server-execute): Enable quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101392
diff
changeset
|
1096 ;; This client is empty; get rid of it immediately. |
76d5e3386e23
(server-execute): Enable quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101392
diff
changeset
|
1097 (server-log "Close empty client" proc) |
76d5e3386e23
(server-execute): Enable quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101392
diff
changeset
|
1098 (server-delete-client proc))) |
76d5e3386e23
(server-execute): Enable quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101392
diff
changeset
|
1099 (cond |
76d5e3386e23
(server-execute): Enable quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101392
diff
changeset
|
1100 ((or isearch-mode (minibufferp)) |
76d5e3386e23
(server-execute): Enable quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101392
diff
changeset
|
1101 nil) |
76d5e3386e23
(server-execute): Enable quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101392
diff
changeset
|
1102 ((and frame (null buffers)) |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
1103 (message "%s" (substitute-command-keys |
101874
76d5e3386e23
(server-execute): Enable quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101392
diff
changeset
|
1104 "When done with this frame, type \\[delete-frame]"))) |
76d5e3386e23
(server-execute): Enable quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101392
diff
changeset
|
1105 ((not (null buffers)) |
76d5e3386e23
(server-execute): Enable quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101392
diff
changeset
|
1106 (server-switch-buffer (car buffers) nil (cdr (car files))) |
76d5e3386e23
(server-execute): Enable quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101392
diff
changeset
|
1107 (run-hooks 'server-switch-hook) |
76d5e3386e23
(server-execute): Enable quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101392
diff
changeset
|
1108 (unless nowait |
76d5e3386e23
(server-execute): Enable quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101392
diff
changeset
|
1109 (message "%s" (substitute-command-keys |
76d5e3386e23
(server-execute): Enable quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101392
diff
changeset
|
1110 "When done with a buffer, type \\[server-edit]"))))) |
76d5e3386e23
(server-execute): Enable quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101392
diff
changeset
|
1111 (when (and frame (null tty-name)) |
76d5e3386e23
(server-execute): Enable quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101392
diff
changeset
|
1112 (server-unselect-display frame))) |
76d5e3386e23
(server-execute): Enable quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101392
diff
changeset
|
1113 (error (server-return-error proc err))))) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
1114 |
84600
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
1115 (defun server-return-error (proc err) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
1116 (ignore-errors |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
1117 (server-send-string |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
1118 proc (concat "-error " (server-quote-arg |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
1119 (error-message-string err)))) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
1120 (server-log (error-message-string err) proc) |
6cce7d77ef38
(server-with-environment): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83891
diff
changeset
|
1121 (delete-process proc))) |
50 | 1122 |
87794
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
1123 (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
|
1124 "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
|
1125 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
|
1126 (when line-col |
104543
da8b3e61b182
Use forward-line rather than goto-line.
Glenn Morris <rgm@gnu.org>
parents:
103622
diff
changeset
|
1127 (goto-char (point-min)) |
da8b3e61b182
Use forward-line rather than goto-line.
Glenn Morris <rgm@gnu.org>
parents:
103622
diff
changeset
|
1128 (forward-line (1- (car line-col))) |
87794
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
1129 (let ((column-number (cdr line-col))) |
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
1130 (when (> column-number 0) |
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
1131 (move-to-column (1- column-number)))))) |
46907
ce6e92081932
(server-process-filter): Simplify code.
Richard M. Stallman <rms@gnu.org>
parents:
42140
diff
changeset
|
1132 |
84601
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
1133 (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
|
1134 "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
|
1135 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
|
1136 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
|
1137 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
|
1138 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
|
1139 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
|
1140 ;; 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
|
1141 (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
|
1142 ;; 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
|
1143 ;; 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
|
1144 ;; 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
|
1145 (save-current-buffer |
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
1146 (dolist (file files) |
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
1147 ;; 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
|
1148 ;; 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
|
1149 ;; 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
|
1150 (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
|
1151 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
|
1152 (filen (car file)) |
47645
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
1153 (obuf (get-file-buffer filen))) |
70420
718312081ce0
(server-visit-files): Use add-to-history.
Kim F. Storm <storm@cua.dk>
parents:
69276
diff
changeset
|
1154 (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
|
1155 (if (null obuf) |
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
1156 (set-buffer (find-file-noselect filen)) |
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
1157 (set-buffer obuf) |
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
1158 (cond ((file-exists-p filen) |
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
1159 (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
|
1160 (revert-buffer t nil))) |
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
1161 (t |
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
1162 (when (y-or-n-p |
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
1163 (concat "File no longer exists: " filen |
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
1164 ", write buffer to file? ")) |
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
1165 (write-file filen)))) |
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
1166 (unless server-buffer-clients |
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
1167 (setq server-existing-buffer t))) |
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
1168 (server-goto-line-column (cdr file)) |
42624d4f31ed
(server-process-filter): Replace lineno and columnnno
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87542
diff
changeset
|
1169 (run-hooks 'server-visit-hook)) |
47645
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
1170 (unless nowait |
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
1171 ;; When the buffer is killed, inform the clients. |
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
1172 (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
|
1173 (push proc server-buffer-clients)) |
47645
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
1174 (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
|
1175 (unless nowait |
84601
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
1176 (process-put proc 'buffers |
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
1177 (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
|
1178 client-record)) |
50 | 1179 |
17712
41a4624c1e79
(server-buffer-done): New arg FOR-KILLING.
Richard M. Stallman <rms@gnu.org>
parents:
17434
diff
changeset
|
1180 (defun server-buffer-done (buffer &optional for-killing) |
50 | 1181 "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
|
1182 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
|
1183 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
|
1184 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
|
1185 a temp file). |
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
1186 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
|
1187 (let ((next-buffer nil) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
1188 (killed nil)) |
84601
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
1189 (dolist (proc server-clients) |
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
1190 (let ((buffers (process-get proc 'buffers))) |
47517
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
1191 (or next-buffer |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
1192 (setq next-buffer (nth 1 (memq buffer buffers)))) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
1193 (when buffers ; Ignore bufferless clients. |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
1194 (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
|
1195 ;; Delete all dead buffers from PROC. |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
1196 (dolist (b buffers) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
1197 (and (bufferp b) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
1198 (not (buffer-live-p b)) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
1199 (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
|
1200 (process-put proc 'buffers buffers) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
1201 ;; If client now has no pending buffers, |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
1202 ;; tell it that it is done, and forget it entirely. |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
1203 (unless buffers |
84601
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
1204 (server-log "Close" proc) |
98329
221d7f943454
(server-buffer-done): Avoid changing the buffer when deleting the
Chong Yidong <cyd@stupidchicken.com>
parents:
98040
diff
changeset
|
1205 (if for-killing |
221d7f943454
(server-buffer-done): Avoid changing the buffer when deleting the
Chong Yidong <cyd@stupidchicken.com>
parents:
98040
diff
changeset
|
1206 ;; `server-delete-client' might delete the client's |
221d7f943454
(server-buffer-done): Avoid changing the buffer when deleting the
Chong Yidong <cyd@stupidchicken.com>
parents:
98040
diff
changeset
|
1207 ;; frames, which might change the current buffer. We |
221d7f943454
(server-buffer-done): Avoid changing the buffer when deleting the
Chong Yidong <cyd@stupidchicken.com>
parents:
98040
diff
changeset
|
1208 ;; don't want that (bug#640). |
221d7f943454
(server-buffer-done): Avoid changing the buffer when deleting the
Chong Yidong <cyd@stupidchicken.com>
parents:
98040
diff
changeset
|
1209 (save-current-buffer |
221d7f943454
(server-buffer-done): Avoid changing the buffer when deleting the
Chong Yidong <cyd@stupidchicken.com>
parents:
98040
diff
changeset
|
1210 (server-delete-client proc)) |
221d7f943454
(server-buffer-done): Avoid changing the buffer when deleting the
Chong Yidong <cyd@stupidchicken.com>
parents:
98040
diff
changeset
|
1211 (server-delete-client proc)))))) |
73559
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1212 (when (and (bufferp buffer) (buffer-name buffer)) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1213 ;; We may or may not kill this buffer; |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1214 ;; 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
|
1215 ;; from kill-buffer-hook. |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1216 (let ((server-kill-buffer-running t)) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1217 (with-current-buffer buffer |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1218 (setq server-buffer-clients nil) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1219 (run-hooks 'server-done-hook)) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1220 ;; Notice whether server-done-hook killed the buffer. |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1221 (if (null (buffer-name buffer)) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1222 (setq killed t) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1223 ;; Don't bother killing or burying the buffer |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1224 ;; when we are called from kill-buffer. |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1225 (unless for-killing |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1226 (when (and (not killed) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1227 server-kill-new-buffers |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1228 (with-current-buffer buffer |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1229 (not server-existing-buffer))) |
21941
1baa3e876ad0
(server-buffer-done): Bind server-kill-buffer-running
Richard M. Stallman <rms@gnu.org>
parents:
19418
diff
changeset
|
1230 (setq killed t) |
73559
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1231 (bury-buffer buffer) |
103622
f16f1c3154df
* server.el (server-buffer-done): Prevent kill-buffer from
Chong Yidong <cyd@stupidchicken.com>
parents:
102471
diff
changeset
|
1232 ;; Prevent kill-buffer from prompting (Bug#3696). |
f16f1c3154df
* server.el (server-buffer-done): Prevent kill-buffer from
Chong Yidong <cyd@stupidchicken.com>
parents:
102471
diff
changeset
|
1233 (with-current-buffer buffer |
f16f1c3154df
* server.el (server-buffer-done): Prevent kill-buffer from
Chong Yidong <cyd@stupidchicken.com>
parents:
102471
diff
changeset
|
1234 (set-buffer-modified-p nil)) |
73559
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1235 (kill-buffer buffer)) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1236 (unless killed |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1237 (if (server-temp-file-p buffer) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1238 (progn |
103622
f16f1c3154df
* server.el (server-buffer-done): Prevent kill-buffer from
Chong Yidong <cyd@stupidchicken.com>
parents:
102471
diff
changeset
|
1239 (with-current-buffer buffer |
f16f1c3154df
* server.el (server-buffer-done): Prevent kill-buffer from
Chong Yidong <cyd@stupidchicken.com>
parents:
102471
diff
changeset
|
1240 (set-buffer-modified-p nil)) |
73559
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1241 (kill-buffer buffer) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1242 (setq killed t)) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1243 (bury-buffer buffer))))))) |
10961
88cba63f2a9b
(server-buffer-done): Return a list
Richard M. Stallman <rms@gnu.org>
parents:
10281
diff
changeset
|
1244 (list next-buffer killed))) |
50 | 1245 |
48123
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1246 (defun server-temp-file-p (&optional buffer) |
50 | 1247 "Return non-nil if BUFFER contains a file considered temporary. |
1248 These are files whose names suggest they are repeatedly | |
1249 reused to pass information to another program. | |
1250 | |
1251 The variable `server-temp-file-regexp' controls which filenames | |
1252 are considered temporary." | |
1253 (and (buffer-file-name buffer) | |
99691
9df07af84d04
* server.el (server-temp-file-p): Use `string-match-p'.
Juanma Barranquero <lekktu@gmail.com>
parents:
99489
diff
changeset
|
1254 (string-match-p server-temp-file-regexp (buffer-file-name buffer)))) |
50 | 1255 |
1256 (defun server-done () | |
1540 | 1257 "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
|
1258 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
|
1259 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
|
1260 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
|
1261 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
|
1262 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
|
1263 (when server-buffer-clients |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1264 (if (server-temp-file-p) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1265 ;; 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
|
1266 ;; (unless make-backup-files is nil). |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1267 (let ((version-control nil) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1268 (buffer-backed-up nil)) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1269 (save-buffer)) |
73559
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1270 (when (and (buffer-modified-p) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1271 buffer-file-name |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1272 (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
|
1273 (save-buffer))) |
48123
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1274 (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
|
1275 |
9883 | 1276 ;; Ask before killing a server buffer. |
1277 ;; It was suggested to release its client instead, | |
1278 ;; but I think that is dangerous--the client would proceed | |
1279 ;; 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
|
1280 (defun server-kill-buffer-query-function () |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
1281 "Ask before killing a server buffer." |
6993
0983fe01e614
(server-kill-emacs-query-function)
Richard M. Stallman <rms@gnu.org>
parents:
6960
diff
changeset
|
1282 (or (not server-buffer-clients) |
83009
b2b37c85b00a
Numerous bugfixes and small improvements.
Karoly Lorentey <lorentey@elte.hu>
parents:
82995
diff
changeset
|
1283 (let ((res t)) |
b2b37c85b00a
Numerous bugfixes and small improvements.
Karoly Lorentey <lorentey@elte.hu>
parents:
82995
diff
changeset
|
1284 (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
|
1285 (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
|
1286 (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
|
1287 (setq res nil)))) |
6993
0983fe01e614
(server-kill-emacs-query-function)
Richard M. Stallman <rms@gnu.org>
parents:
6960
diff
changeset
|
1288 (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
|
1289 (buffer-name (current-buffer)))))) |
0983fe01e614
(server-kill-emacs-query-function)
Richard M. Stallman <rms@gnu.org>
parents:
6960
diff
changeset
|
1290 |
0983fe01e614
(server-kill-emacs-query-function)
Richard M. Stallman <rms@gnu.org>
parents:
6960
diff
changeset
|
1291 (defun server-kill-emacs-query-function () |
85722
5f0d32eed4eb
(server-process-filter): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
85365
diff
changeset
|
1292 "Ask before exiting Emacs if it has live clients." |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
1293 (or (not server-clients) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
1294 (let (live-client) |
84601
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
1295 (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
|
1296 (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
|
1297 proc 'buffers))) |
83548
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
1298 (setq live-client t)))) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
1299 (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
|
1300 |
18049
f1fa9625e2b9
(server-kill-buffer): Prevent infinite recursion.
Richard M. Stallman <rms@gnu.org>
parents:
17970
diff
changeset
|
1301 (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
|
1302 "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
|
1303 |
17712
41a4624c1e79
(server-buffer-done): New arg FOR-KILLING.
Richard M. Stallman <rms@gnu.org>
parents:
17434
diff
changeset
|
1304 (defun server-kill-buffer () |
83215
a9f716fbb9c6
Small tweaks in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents:
83195
diff
changeset
|
1305 "Remove the current buffer from its clients' buffer list. |
a9f716fbb9c6
Small tweaks in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents:
83195
diff
changeset
|
1306 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
|
1307 ;; 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
|
1308 ;; call kill-buffer. |
f1fa9625e2b9
(server-kill-buffer): Prevent infinite recursion.
Richard M. Stallman <rms@gnu.org>
parents:
17970
diff
changeset
|
1309 (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
|
1310 (and server-buffer-clients |
1baa3e876ad0
(server-buffer-done): Bind server-kill-buffer-running
Richard M. Stallman <rms@gnu.org>
parents:
19418
diff
changeset
|
1311 (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
|
1312 (when server-process |
1baa3e876ad0
(server-buffer-done): Bind server-kill-buffer-running
Richard M. Stallman <rms@gnu.org>
parents:
19418
diff
changeset
|
1313 (server-buffer-done (current-buffer) t)))))) |
50 | 1314 |
1315 (defun server-edit (&optional arg) | |
1316 "Switch to next server editing buffer; say \"Done\" for current buffer. | |
1317 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
|
1318 The buffer is also killed if it did not exist before the clients asked for it. |
50 | 1319 When all of a client's buffers are marked as \"done\", the client is notified. |
1320 | |
1321 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
|
1322 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
|
1323 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
|
1324 prevent a backup for it.) The variable `server-temp-file-regexp' controls |
50 | 1325 which filenames are considered temporary. |
1326 | |
49206
7ebd98bb02a2
(server-process-filter): Use `minibufferp' to test
John Paul Wallington <jpw@pobox.com>
parents:
49187
diff
changeset
|
1327 If invoked with a prefix argument, or if there is no server process running, |
50 | 1328 starts server process and that is all. Invoked by \\[server-edit]." |
1329 (interactive "P") | |
71320
59c8b05c2ce4
* server.el (server-edit): No-op if no server buffers exist.
Chong Yidong <cyd@stupidchicken.com>
parents:
70672
diff
changeset
|
1330 (cond |
73611
d1bc957e4056
(server-visit-files): Use `when'.
Juanma Barranquero <lekktu@gmail.com>
parents:
73604
diff
changeset
|
1331 ((or arg |
d1bc957e4056
(server-visit-files): Use `when'.
Juanma Barranquero <lekktu@gmail.com>
parents:
73604
diff
changeset
|
1332 (not server-process) |
d1bc957e4056
(server-visit-files): Use `when'.
Juanma Barranquero <lekktu@gmail.com>
parents:
73604
diff
changeset
|
1333 (memq (process-status server-process) '(signal exit))) |
d1bc957e4056
(server-visit-files): Use `when'.
Juanma Barranquero <lekktu@gmail.com>
parents:
73604
diff
changeset
|
1334 (server-mode 1)) |
d1bc957e4056
(server-visit-files): Use `when'.
Juanma Barranquero <lekktu@gmail.com>
parents:
73604
diff
changeset
|
1335 (server-clients (apply 'server-switch-buffer (server-done))) |
d1bc957e4056
(server-visit-files): Use `when'.
Juanma Barranquero <lekktu@gmail.com>
parents:
73604
diff
changeset
|
1336 (t (message "No server editing buffers exist")))) |
50 | 1337 |
98040
003efd7220ff
(server-switch-buffer): New arg.
Chong Yidong <cyd@stupidchicken.com>
parents:
94678
diff
changeset
|
1338 (defun server-switch-buffer (&optional next-buffer killed-one filepos) |
50 | 1339 "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
|
1340 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
|
1341 |
a9f716fbb9c6
Small tweaks in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents:
83195
diff
changeset
|
1342 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
|
1343 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
|
1344 \"switch to some other buffer\" since we've already effectively |
98040
003efd7220ff
(server-switch-buffer): New arg.
Chong Yidong <cyd@stupidchicken.com>
parents:
94678
diff
changeset
|
1345 done that. |
003efd7220ff
(server-switch-buffer): New arg.
Chong Yidong <cyd@stupidchicken.com>
parents:
94678
diff
changeset
|
1346 |
003efd7220ff
(server-switch-buffer): New arg.
Chong Yidong <cyd@stupidchicken.com>
parents:
94678
diff
changeset
|
1347 FILEPOS specifies a new buffer position for NEXT-BUFFER, if we |
003efd7220ff
(server-switch-buffer): New arg.
Chong Yidong <cyd@stupidchicken.com>
parents:
94678
diff
changeset
|
1348 visit NEXT-BUFFER in an existing window. If non-nil, it should |
003efd7220ff
(server-switch-buffer): New arg.
Chong Yidong <cyd@stupidchicken.com>
parents:
94678
diff
changeset
|
1349 be a cons cell (LINENUMBER . COLUMNNUMBER)." |
47524
95ba2ac51138
(server-done): Fix harmlessly wrong arg to save-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47517
diff
changeset
|
1350 (if (null next-buffer) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
1351 (progn |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
1352 (let ((rest server-clients)) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
1353 (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
|
1354 (let ((proc (car rest))) |
94195
89ea665b6e71
(server-switch-buffer): Also consider clients in the
Andreas Schwab <schwab@suse.de>
parents:
93704
diff
changeset
|
1355 ;; Only look at frameless clients, or those in the selected |
89ea665b6e71
(server-switch-buffer): Also consider clients in the
Andreas Schwab <schwab@suse.de>
parents:
93704
diff
changeset
|
1356 ;; frame. |
89ea665b6e71
(server-switch-buffer): Also consider clients in the
Andreas Schwab <schwab@suse.de>
parents:
93704
diff
changeset
|
1357 (when (or (not (process-get proc 'frame)) |
89ea665b6e71
(server-switch-buffer): Also consider clients in the
Andreas Schwab <schwab@suse.de>
parents:
93704
diff
changeset
|
1358 (eq (process-get proc 'frame) (selected-frame))) |
84601
c38a9291ef0a
(server-clients): Only keep procs, no properties any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84600
diff
changeset
|
1359 (setq next-buffer (car (process-get proc 'buffers)))) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
1360 (setq rest (cdr rest))))) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
1361 (and next-buffer (server-switch-buffer next-buffer killed-one)) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
1362 (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
|
1363 ;; (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
|
1364 (message "No server buffers remain to edit"))) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
1365 (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
|
1366 ;; If NEXT-BUFFER is a dead buffer, remove the server records for it |
50 | 1367 ;; 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
|
1368 (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
|
1369 ;; 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
|
1370 (if (functionp server-window) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1371 (funcall server-window next-buffer) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1372 (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
|
1373 (if (and win (not server-window)) |
98040
003efd7220ff
(server-switch-buffer): New arg.
Chong Yidong <cyd@stupidchicken.com>
parents:
94678
diff
changeset
|
1374 ;; The buffer is already displayed: just reuse the |
003efd7220ff
(server-switch-buffer): New arg.
Chong Yidong <cyd@stupidchicken.com>
parents:
94678
diff
changeset
|
1375 ;; window. If FILEPOS is non-nil, use it to replace the |
003efd7220ff
(server-switch-buffer): New arg.
Chong Yidong <cyd@stupidchicken.com>
parents:
94678
diff
changeset
|
1376 ;; window's own value of point. |
73891
7e65038a5be1
(server-raise-frame): New option.
Juanma Barranquero <lekktu@gmail.com>
parents:
73805
diff
changeset
|
1377 (progn |
7e65038a5be1
(server-raise-frame): New option.
Juanma Barranquero <lekktu@gmail.com>
parents:
73805
diff
changeset
|
1378 (select-window win) |
98040
003efd7220ff
(server-switch-buffer): New arg.
Chong Yidong <cyd@stupidchicken.com>
parents:
94678
diff
changeset
|
1379 (set-buffer next-buffer) |
003efd7220ff
(server-switch-buffer): New arg.
Chong Yidong <cyd@stupidchicken.com>
parents:
94678
diff
changeset
|
1380 (when filepos |
003efd7220ff
(server-switch-buffer): New arg.
Chong Yidong <cyd@stupidchicken.com>
parents:
94678
diff
changeset
|
1381 (server-goto-line-column filepos))) |
48123
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1382 ;; Otherwise, let's find an appropriate window. |
81299
79cdba83d213
(server-switch-buffer): Remove redundant check.
Juanma Barranquero <lekktu@gmail.com>
parents:
76648
diff
changeset
|
1383 (cond ((window-live-p server-window) |
48123
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1384 (select-window server-window)) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1385 ((framep server-window) |
73559
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1386 (unless (frame-live-p server-window) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1387 (setq server-window (make-frame))) |
48123
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1388 (select-window (frame-selected-window server-window)))) |
73559
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1389 (when (window-minibuffer-p (selected-window)) |
408b3aee0a29
Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents:
73543
diff
changeset
|
1390 (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
|
1391 ;; 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
|
1392 (when (window-dedicated-p (selected-window)) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1393 (select-window |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1394 (get-window-with-predicate |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1395 (lambda (w) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1396 (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
|
1397 (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
|
1398 (frame-terminal (selected-frame))))) |
48123
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1399 'nomini 'visible (selected-window)))) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1400 (condition-case nil |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1401 (switch-to-buffer next-buffer) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1402 ;; 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
|
1403 ;; 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
|
1404 (error (pop-to-buffer next-buffer))))))) |
7e65038a5be1
(server-raise-frame): New option.
Juanma Barranquero <lekktu@gmail.com>
parents:
73805
diff
changeset
|
1405 (when server-raise-frame |
7e65038a5be1
(server-raise-frame): New option.
Juanma Barranquero <lekktu@gmail.com>
parents:
73805
diff
changeset
|
1406 (select-frame-set-input-focus (window-frame (selected-window)))))) |
50 | 1407 |
83403
51eb0aa362f3
Store client's environment in terminal parameters, not server parameters.
Karoly Lorentey <lorentey@elte.hu>
parents:
83395
diff
changeset
|
1408 ;;;###autoload |
101125
30796b5e3f42
(server-save-buffers-kill-terminal): Args changed. Handle nowait
Chong Yidong <cyd@stupidchicken.com>
parents:
101123
diff
changeset
|
1409 (defun server-save-buffers-kill-terminal (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
|
1410 ;; Called from save-buffers-kill-terminal in files.el. |
101125
30796b5e3f42
(server-save-buffers-kill-terminal): Args changed. Handle nowait
Chong Yidong <cyd@stupidchicken.com>
parents:
101123
diff
changeset
|
1411 "Offer to save each buffer, then kill the current client. |
99691
9df07af84d04
* server.el (server-temp-file-p): Use `string-match-p'.
Juanma Barranquero <lekktu@gmail.com>
parents:
99489
diff
changeset
|
1412 With ARG non-nil, silently save all file-visiting buffers, then kill. |
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
|
1413 |
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
|
1414 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
|
1415 only these files will be asked to be saved." |
101125
30796b5e3f42
(server-save-buffers-kill-terminal): Args changed. Handle nowait
Chong Yidong <cyd@stupidchicken.com>
parents:
101123
diff
changeset
|
1416 (let ((proc (frame-parameter (selected-frame) 'client))) |
30796b5e3f42
(server-save-buffers-kill-terminal): Args changed. Handle nowait
Chong Yidong <cyd@stupidchicken.com>
parents:
101123
diff
changeset
|
1417 (cond ((eq proc 'nowait) |
30796b5e3f42
(server-save-buffers-kill-terminal): Args changed. Handle nowait
Chong Yidong <cyd@stupidchicken.com>
parents:
101123
diff
changeset
|
1418 ;; Nowait frames have no client buffer list. |
30796b5e3f42
(server-save-buffers-kill-terminal): Args changed. Handle nowait
Chong Yidong <cyd@stupidchicken.com>
parents:
101123
diff
changeset
|
1419 (if (cdr (frame-list)) |
30796b5e3f42
(server-save-buffers-kill-terminal): Args changed. Handle nowait
Chong Yidong <cyd@stupidchicken.com>
parents:
101123
diff
changeset
|
1420 (progn (save-some-buffers arg) |
30796b5e3f42
(server-save-buffers-kill-terminal): Args changed. Handle nowait
Chong Yidong <cyd@stupidchicken.com>
parents:
101123
diff
changeset
|
1421 (delete-frame)) |
30796b5e3f42
(server-save-buffers-kill-terminal): Args changed. Handle nowait
Chong Yidong <cyd@stupidchicken.com>
parents:
101123
diff
changeset
|
1422 ;; If we're the last frame standing, kill Emacs. |
30796b5e3f42
(server-save-buffers-kill-terminal): Args changed. Handle nowait
Chong Yidong <cyd@stupidchicken.com>
parents:
101123
diff
changeset
|
1423 (save-buffers-kill-emacs arg))) |
30796b5e3f42
(server-save-buffers-kill-terminal): Args changed. Handle nowait
Chong Yidong <cyd@stupidchicken.com>
parents:
101123
diff
changeset
|
1424 ((processp proc) |
30796b5e3f42
(server-save-buffers-kill-terminal): Args changed. Handle nowait
Chong Yidong <cyd@stupidchicken.com>
parents:
101123
diff
changeset
|
1425 (let ((buffers (process-get proc 'buffers))) |
30796b5e3f42
(server-save-buffers-kill-terminal): Args changed. Handle nowait
Chong Yidong <cyd@stupidchicken.com>
parents:
101123
diff
changeset
|
1426 ;; If client is bufferless, emulate a normal Emacs exit |
30796b5e3f42
(server-save-buffers-kill-terminal): Args changed. Handle nowait
Chong Yidong <cyd@stupidchicken.com>
parents:
101123
diff
changeset
|
1427 ;; and offer to save all buffers. Otherwise, offer to |
30796b5e3f42
(server-save-buffers-kill-terminal): Args changed. Handle nowait
Chong Yidong <cyd@stupidchicken.com>
parents:
101123
diff
changeset
|
1428 ;; save only the buffers belonging to the client. |
30796b5e3f42
(server-save-buffers-kill-terminal): Args changed. Handle nowait
Chong Yidong <cyd@stupidchicken.com>
parents:
101123
diff
changeset
|
1429 (save-some-buffers |
30796b5e3f42
(server-save-buffers-kill-terminal): Args changed. Handle nowait
Chong Yidong <cyd@stupidchicken.com>
parents:
101123
diff
changeset
|
1430 arg (if buffers |
30796b5e3f42
(server-save-buffers-kill-terminal): Args changed. Handle nowait
Chong Yidong <cyd@stupidchicken.com>
parents:
101123
diff
changeset
|
1431 (lambda () (memq (current-buffer) buffers)) |
30796b5e3f42
(server-save-buffers-kill-terminal): Args changed. Handle nowait
Chong Yidong <cyd@stupidchicken.com>
parents:
101123
diff
changeset
|
1432 t)) |
30796b5e3f42
(server-save-buffers-kill-terminal): Args changed. Handle nowait
Chong Yidong <cyd@stupidchicken.com>
parents:
101123
diff
changeset
|
1433 (server-delete-client proc))) |
30796b5e3f42
(server-save-buffers-kill-terminal): Args changed. Handle nowait
Chong Yidong <cyd@stupidchicken.com>
parents:
101123
diff
changeset
|
1434 (t (error "Invalid client frame"))))) |
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
|
1435 |
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
|
1436 (define-key ctl-x-map "#" 'server-edit) |
42140
49087a9d073e
(server-unload-hook): New function.
Dave Love <fx@gnu.org>
parents:
41075
diff
changeset
|
1437 |
79243
cccc3ec23e08
(server-unload-function): Rename from `server-unload-hook' and
Juanma Barranquero <lekktu@gmail.com>
parents:
78978
diff
changeset
|
1438 (defun server-unload-function () |
cccc3ec23e08
(server-unload-function): Rename from `server-unload-hook' and
Juanma Barranquero <lekktu@gmail.com>
parents:
78978
diff
changeset
|
1439 "Unload the server library." |
70672
06de67179ba1
(server-start): Only create a directory if needed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70420
diff
changeset
|
1440 (server-mode -1) |
79256
02a9c3ab0adf
(server-unload-function): Unbind `server-edit' from `C-x #'.
Juanma Barranquero <lekktu@gmail.com>
parents:
79243
diff
changeset
|
1441 (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
|
1442 (save-current-buffer |
85741
29ea503e1863
(server-unload-function): Rename from `server-unload-hook' and
Juanma Barranquero <lekktu@gmail.com>
parents:
85722
diff
changeset
|
1443 (dolist (buffer (buffer-list)) |
29ea503e1863
(server-unload-function): Rename from `server-unload-hook' and
Juanma Barranquero <lekktu@gmail.com>
parents:
85722
diff
changeset
|
1444 (set-buffer buffer) |
29ea503e1863
(server-unload-function): Rename from `server-unload-hook' and
Juanma Barranquero <lekktu@gmail.com>
parents:
85722
diff
changeset
|
1445 (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
|
1446 ;; continue standard unloading |
cccc3ec23e08
(server-unload-function): Rename from `server-unload-hook' and
Juanma Barranquero <lekktu@gmail.com>
parents:
78978
diff
changeset
|
1447 nil) |
57543
e47852bd4fc4
(server-unload-hook): Set as a variable with add-hook.
Richard M. Stallman <rms@gnu.org>
parents:
57379
diff
changeset
|
1448 |
1079 | 1449 |
1450 (provide 'server) | |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
445
diff
changeset
|
1451 |
70672
06de67179ba1
(server-start): Only create a directory if needed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70420
diff
changeset
|
1452 ;; arch-tag: 1f7ecb42-f00a-49f8-906d-61995d84c8d6 |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
445
diff
changeset
|
1453 ;;; server.el ends here |