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