Mercurial > emacs
annotate lisp/server.el @ 83257:bcf610fb9517
Fix line/column number positioning in emacsclient. (Reported by Han Boetes.)
* lisp/server.el (server-process-filter): When processing -position
command, don't change the request string until the parameters are
extracted.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-297
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Sun, 20 Feb 2005 20:15:41 +0000 |
parents | de637975e99a |
children | 45e5f0224d81 |
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 |
53736
df8ff5ff116d
(server-socket-name): Don't use the hostname in the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
3 ;; Copyright (C) 1986,87,92,94,95,96,97,98,99,2000,01,02,03,2004 |
34344
a160265d0a06
(server-visit-files): Push files on file-name-history.
Gerd Moellmann <gerd@gnu.org>
parents:
31008
diff
changeset
|
4 ;; 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 |
27 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
28 ;; Boston, MA 02111-1307, 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 |
47612
2d55f7e8ff64
Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47524
diff
changeset
|
86 (defcustom server-visit-hook nil |
2d55f7e8ff64
Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47524
diff
changeset
|
87 "*Hook run when visiting a file for the Emacs server." |
19418 | 88 :group 'server |
47612
2d55f7e8ff64
Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47524
diff
changeset
|
89 :type 'hook) |
50 | 90 |
19418 | 91 (defcustom server-switch-hook nil |
47612
2d55f7e8ff64
Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47524
diff
changeset
|
92 "*Hook run when switching to a buffer for the Emacs server." |
19418 | 93 :group 'server |
47612
2d55f7e8ff64
Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47524
diff
changeset
|
94 :type 'hook) |
19418 | 95 |
96 (defcustom server-done-hook nil | |
47612
2d55f7e8ff64
Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47524
diff
changeset
|
97 "*Hook run when done editing a buffer for the Emacs server." |
19418 | 98 :group 'server |
47612
2d55f7e8ff64
Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47524
diff
changeset
|
99 :type 'hook) |
7597
99a600c67e82
(server-done-hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents:
7553
diff
changeset
|
100 |
49206
7ebd98bb02a2
(server-process-filter): Use `minibufferp' to test
John Paul Wallington <jpw@pobox.com>
parents:
49187
diff
changeset
|
101 (defvar server-process nil |
7ebd98bb02a2
(server-process-filter): Use `minibufferp' to test
John Paul Wallington <jpw@pobox.com>
parents:
49187
diff
changeset
|
102 "The current server process.") |
50 | 103 |
104 (defvar server-clients nil | |
105 "List of current server clients. | |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
106 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
|
107 and PROPERTIES is an association list of client properties.") |
50 | 108 |
109 (defvar server-buffer-clients nil | |
38010
8a8cf4d74475
(server-process, server-buffer-clients): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
37273
diff
changeset
|
110 "List of client ids for clients 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
|
111 (make-variable-buffer-local 'server-buffer-clients) |
50 | 112 ;; Changing major modes should not erase this local. |
113 (put 'server-buffer-clients 'permanent-local t) | |
114 | |
49267 | 115 (defcustom server-window nil |
116 "*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
|
117 If nil, use the selected window. |
49267 | 118 If it is a function, it should take one argument (a buffer) and |
119 display and select it. A common value is `pop-to-buffer'. | |
120 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
|
121 If it is a frame, use the frame's selected window. |
49267 | 122 |
123 It is not meaningful to set this to a specific frame or window with Custom. | |
124 Only programs can do so." | |
125 :group 'server | |
59996
aac0a33f5772
Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents:
59220
diff
changeset
|
126 :version "22.1" |
49267 | 127 :type '(choice (const :tag "Use selected window" |
128 :match (lambda (widget value) | |
129 (not (functionp value))) | |
130 nil) | |
131 (function-item :tag "Use pop-to-buffer" pop-to-buffer) | |
132 (function :tag "Other function"))) | |
3661
65d530f613a8
(server-window): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
2866
diff
changeset
|
133 |
19418 | 134 (defcustom server-temp-file-regexp "^/tmp/Re\\|/draft$" |
49267 | 135 "*Regexp matching names of temporary files. |
136 These are deleted and reused after each edit by the programs that | |
137 invoke the Emacs server." | |
19418 | 138 :group 'server |
139 :type 'regexp) | |
50 | 140 |
31008
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
141 (defcustom server-kill-new-buffers t |
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
142 "*Whether to kill buffers when done with them. |
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
143 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
|
144 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
|
145 `server-temp-file-regexp'. |
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
146 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
|
147 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
|
148 this way." |
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
149 :group 'server |
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
150 :type 'boolean |
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
151 :version "21.1") |
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
152 |
50 | 153 (or (assq 'server-buffer-clients minor-mode-alist) |
154 (setq minor-mode-alist (cons '(server-buffer-clients " Server") minor-mode-alist))) | |
155 | |
31008
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
156 (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
|
157 "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
|
158 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
|
159 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
|
160 (make-variable-buffer-local 'server-existing-buffer) |
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
161 |
54357
367f0279478f
(server-name): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53736
diff
changeset
|
162 (defvar server-name "server") |
367f0279478f
(server-name): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53736
diff
changeset
|
163 |
83135
0c9a34bef526
Fix server-socket-dir initialization (rep. by Friedrich Delgado Friedrichs).
Karoly Lorentey <lorentey@elte.hu>
parents:
83131
diff
changeset
|
164 (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
|
165 "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
|
166 Initialized by `server-start'.") |
47612
2d55f7e8ff64
Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47524
diff
changeset
|
167 |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
168 (defun server-client (proc) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
169 "Return the Emacs client corresponding to PROC. |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
170 PROC must be a process object. |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
171 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
|
172 See `server-client-get' and `server-client-set'." |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
173 (assq proc server-clients)) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
174 |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
175 (defun server-client-get (client property) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
176 "Get the value of PROPERTY in CLIENT. |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
177 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
|
178 Return nil if CLIENT has no such property." |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
179 (or (listp client) (setq client (server-client client))) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
180 (cdr (assq property (cdr client)))) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
181 |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
182 (defun server-client-set (client property value) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
183 "Set the PROPERTY to VALUE in CLIENT, and return VALUE. |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
184 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
|
185 (let (p proc) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
186 (if (listp client) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
187 (setq proc (car client)) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
188 (setq proc client |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
189 client (server-client client))) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
190 (setq p (assq property client)) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
191 (cond |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
192 (p (setcdr p value)) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
193 (client (setcdr client (cons (cons property value) (cdr client)))) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
194 (t (setq server-clients |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
195 `((,proc (,property . ,value)) . ,server-clients)))) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
196 value)) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
197 |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
198 (defun server-clients-with (property value) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
199 "Return a list of clients with PROPERTY set to VALUE." |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
200 (let (result) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
201 (dolist (client server-clients result) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
202 (when (equal value (server-client-get client property)) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
203 (setq result (cons (car client) result)))))) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
204 |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
205 (defun server-add-client (proc) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
206 "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
|
207 New clients have no properties." |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
208 (unless (server-client proc) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
209 (setq server-clients (cons (cons proc nil) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
210 server-clients)))) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
211 |
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
|
212 ;;;###autoload |
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
|
213 (defun server-getenv (variable &optional frame) |
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
|
214 "Get the value of VARIABLE in the client environment of frame FRAME. |
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
|
215 VARIABLE should be a string. Value is nil if VARIABLE is undefined in |
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
|
216 the environment. Otherwise, value is a string. |
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
|
217 |
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
|
218 If FRAME is an emacsclient frame, then the variable is looked up |
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
|
219 in the environment of the emacsclient process; otherwise the |
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
|
220 function consults the environment of the Emacs process. |
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
|
221 |
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
|
222 If FRAME is nil or missing, then the selected frame is used." |
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
|
223 (when (not frame) (setq frame (selected-frame))) |
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
|
224 (let ((client (frame-parameter frame 'client)) env) |
8131adf4ac7b
Set ncurses-related environment variables while creating a new tty frame. (Reported by Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83215
diff
changeset
|
225 (if (null client) |
8131adf4ac7b
Set ncurses-related environment variables while creating a new tty frame. (Reported by Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83215
diff
changeset
|
226 (getenv variable) |
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
|
227 (setq env (server-client-get client 'environment)) |
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
|
228 (if (null env) |
8131adf4ac7b
Set ncurses-related environment variables while creating a new tty frame. (Reported by Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83215
diff
changeset
|
229 (getenv variable) |
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
|
230 (cdr (assoc variable env)))))) |
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
|
231 |
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
|
232 (defmacro server-with-client-environment (client vars &rest body) |
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
|
233 "Evaluate BODY with environment variables VARS set to those of CLIENT. |
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
|
234 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
|
235 |
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
|
236 VARS should be a list of strings." |
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
|
237 (declare (indent 2)) |
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
|
238 (let ((oldvalues (make-symbol "oldvalues")) |
8131adf4ac7b
Set ncurses-related environment variables while creating a new tty frame. (Reported by Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83215
diff
changeset
|
239 (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
|
240 (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
|
241 (pair (make-symbol "pair"))) |
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
|
242 `(let (,oldvalues) |
8131adf4ac7b
Set ncurses-related environment variables while creating a new tty frame. (Reported by Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83215
diff
changeset
|
243 (dolist (,var (quote ,vars)) |
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
|
244 (let ((,value (cdr (assoc ,var (server-client-get ,client 'environment))))) |
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
|
245 (setq ,oldvalues (cons (cons ,var (getenv ,var)) ,oldvalues)) |
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
|
246 (setenv ,var ,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
|
247 (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
|
248 (progn ,@body) |
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
|
249 (dolist (,pair ,oldvalues) |
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
|
250 (setenv (car ,pair) (cdr ,pair))))))) |
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
|
251 |
83109
1707638677c9
Fix one more case of the previous error.
Karoly Lorentey <lorentey@elte.hu>
parents:
83108
diff
changeset
|
252 (defun server-delete-client (client &optional noframe) |
1707638677c9
Fix one more case of the previous error.
Karoly Lorentey <lorentey@elte.hu>
parents:
83108
diff
changeset
|
253 "Delete CLIENT, including its buffers, displays and frames. |
1707638677c9
Fix one more case of the previous error.
Karoly Lorentey <lorentey@elte.hu>
parents:
83108
diff
changeset
|
254 If NOFRAME is non-nil, let the frames live. (To be used from |
1707638677c9
Fix one more case of the previous error.
Karoly Lorentey <lorentey@elte.hu>
parents:
83108
diff
changeset
|
255 `delete-frame-functions'." |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
256 ;; Force a new lookup of client (prevents infinite recursion). |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
257 (setq client (server-client |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
258 (if (listp client) (car client) client))) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
259 (let ((proc (car client)) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
260 (buffers (server-client-get client 'buffers))) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
261 (when client |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
262 (setq server-clients (delq client server-clients)) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
263 |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
264 (dolist (buf buffers) |
83108
c7a76f7d323c
Fix error on deleting an emacsclient terminal (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents:
83105
diff
changeset
|
265 (when (buffer-live-p buf) |
c7a76f7d323c
Fix error on deleting an emacsclient terminal (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents:
83105
diff
changeset
|
266 (with-current-buffer buf |
c7a76f7d323c
Fix error on deleting an emacsclient terminal (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents:
83105
diff
changeset
|
267 ;; Remove PROC from the clients of each buffer. |
c7a76f7d323c
Fix error on deleting an emacsclient terminal (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents:
83105
diff
changeset
|
268 (setq server-buffer-clients (delq proc server-buffer-clients)) |
c7a76f7d323c
Fix error on deleting an emacsclient terminal (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents:
83105
diff
changeset
|
269 ;; Kill the buffer if necessary. |
c7a76f7d323c
Fix error on deleting an emacsclient terminal (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents:
83105
diff
changeset
|
270 (when (and (null server-buffer-clients) |
c7a76f7d323c
Fix error on deleting an emacsclient terminal (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents:
83105
diff
changeset
|
271 (or (and server-kill-new-buffers |
c7a76f7d323c
Fix error on deleting an emacsclient terminal (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents:
83105
diff
changeset
|
272 (not server-existing-buffer)) |
c7a76f7d323c
Fix error on deleting an emacsclient terminal (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents:
83105
diff
changeset
|
273 (server-temp-file-p))) |
c7a76f7d323c
Fix error on deleting an emacsclient terminal (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents:
83105
diff
changeset
|
274 (kill-buffer (current-buffer)))))) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
275 |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
276 ;; Delete the client's tty. |
83167
69ebc75cb461
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83165
diff
changeset
|
277 (let ((display-id (server-client-get client 'display))) |
69ebc75cb461
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83165
diff
changeset
|
278 (when (eq (display-live-p display-id) t) |
69ebc75cb461
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83165
diff
changeset
|
279 (delete-display display-id))) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
280 |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
281 ;; Delete the client's frames. |
83109
1707638677c9
Fix one more case of the previous error.
Karoly Lorentey <lorentey@elte.hu>
parents:
83108
diff
changeset
|
282 (unless noframe |
1707638677c9
Fix one more case of the previous error.
Karoly Lorentey <lorentey@elte.hu>
parents:
83108
diff
changeset
|
283 (dolist (frame (frame-list)) |
1707638677c9
Fix one more case of the previous error.
Karoly Lorentey <lorentey@elte.hu>
parents:
83108
diff
changeset
|
284 (if (and (frame-live-p frame) |
1707638677c9
Fix one more case of the previous error.
Karoly Lorentey <lorentey@elte.hu>
parents:
83108
diff
changeset
|
285 (equal (car client) (frame-parameter frame 'client))) |
1707638677c9
Fix one more case of the previous error.
Karoly Lorentey <lorentey@elte.hu>
parents:
83108
diff
changeset
|
286 (delete-frame frame)))) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
287 |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
288 ;; Delete the client's process. |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
289 (if (eq (process-status (car client)) 'open) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
290 (delete-process (car client))) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
291 |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
292 (server-log "Deleted" proc)))) |
47612
2d55f7e8ff64
Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47524
diff
changeset
|
293 |
47517
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
294 (defun server-log (string &optional client) |
83215
a9f716fbb9c6
Small tweaks in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents:
83195
diff
changeset
|
295 "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
|
296 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
|
297 message." |
50 | 298 (if (get-buffer "*server*") |
47517
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
299 (with-current-buffer "*server*" |
50 | 300 (goto-char (point-max)) |
47517
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
301 (insert (current-time-string) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
302 (cond |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
303 ((null client) " ") |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
304 ((listp client) (format " %s: " (car client))) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
305 (t (format " %s: " client))) |
47517
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
306 string) |
13468
2c8da6b3b9e0
(server-log): Record the current time.
Richard M. Stallman <rms@gnu.org>
parents:
13157
diff
changeset
|
307 (or (bolp) (newline))))) |
50 | 308 |
309 (defun server-sentinel (proc msg) | |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
310 "The process sentinel for Emacs server connections." |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
311 (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
|
312 (server-delete-client proc)) |
47612
2d55f7e8ff64
Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47524
diff
changeset
|
313 |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
314 (defun server-handle-delete-frame (frame) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
315 "Delete the client connection when the emacsclient frame is deleted." |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
316 (let ((proc (frame-parameter frame 'client))) |
83167
69ebc75cb461
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83165
diff
changeset
|
317 (when (and proc |
69ebc75cb461
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83165
diff
changeset
|
318 (or (window-system frame) |
69ebc75cb461
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83165
diff
changeset
|
319 ;; A terminal display must not yet be deleted if |
69ebc75cb461
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83165
diff
changeset
|
320 ;; there are other frames on it. |
69ebc75cb461
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83165
diff
changeset
|
321 (< 0 (let ((frame-num 0)) |
69ebc75cb461
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83165
diff
changeset
|
322 (mapc (lambda (f) |
69ebc75cb461
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83165
diff
changeset
|
323 (when (eq (frame-display f) |
69ebc75cb461
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83165
diff
changeset
|
324 (frame-display frame)) |
69ebc75cb461
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83165
diff
changeset
|
325 (setq frame-num (1+ frame-num)))) |
69ebc75cb461
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83165
diff
changeset
|
326 (frame-list)) |
69ebc75cb461
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83165
diff
changeset
|
327 frame-num)))) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
328 (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
|
329 (server-delete-client proc 'noframe)))) ; Let delete-frame delete the frame later. |
82988
f82e3a6f5ccb
A few more bugfixes and new features.
Karoly Lorentey <lorentey@elte.hu>
parents:
82987
diff
changeset
|
330 |
83167
69ebc75cb461
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83165
diff
changeset
|
331 (defun server-handle-suspend-tty (display) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
332 "Notify the emacsclient process to suspend itself when its tty device is suspended." |
83167
69ebc75cb461
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83165
diff
changeset
|
333 (dolist (proc (server-clients-with 'display display)) |
69ebc75cb461
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83165
diff
changeset
|
334 (server-log (format "server-handle-suspend-tty, display %s" display) proc) |
83215
a9f716fbb9c6
Small tweaks in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents:
83195
diff
changeset
|
335 (condition-case err |
83246
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
336 (server-send-string proc "-suspend \n") |
83215
a9f716fbb9c6
Small tweaks in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents:
83195
diff
changeset
|
337 (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
|
338 |
47612
2d55f7e8ff64
Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47524
diff
changeset
|
339 (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
|
340 "Remove &-quotation from ARG. |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
341 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
|
342 (replace-regexp-in-string |
2d55f7e8ff64
Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47524
diff
changeset
|
343 "&." (lambda (s) |
2d55f7e8ff64
Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47524
diff
changeset
|
344 (case (aref s 1) |
2d55f7e8ff64
Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47524
diff
changeset
|
345 (?& "&") |
2d55f7e8ff64
Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47524
diff
changeset
|
346 (?- "-") |
2d55f7e8ff64
Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47524
diff
changeset
|
347 (?n "\n") |
2d55f7e8ff64
Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47524
diff
changeset
|
348 (t " "))) |
2d55f7e8ff64
Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47524
diff
changeset
|
349 arg t t)) |
50 | 350 |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
351 (defun server-quote-arg (arg) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
352 "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
|
353 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
|
354 contains a space. |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
355 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
356 See `server-unquote-arg' and `server-process-filter'." |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
357 (replace-regexp-in-string |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
358 "[-&\n ]" (lambda (s) |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
359 (case (aref s 0) |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
360 (?& "&&") |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
361 (?- "&-") |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
362 (?\n "&n") |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
363 (?\s "&_"))) |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
364 arg t t)) |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
365 |
83246
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
366 (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
|
367 "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
|
368 (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
|
369 (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
|
370 |
50567
1b32397dd4e2
(server-socket-name): Use new safe location for socket.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49686
diff
changeset
|
371 (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
|
372 "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
|
373 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
|
374 - 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
|
375 - 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
|
376 - 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
|
377 (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
|
378 (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
|
379 (unless attrs |
1b32397dd4e2
(server-socket-name): Use new safe location for socket.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49686
diff
changeset
|
380 (letf (((default-file-modes) ?\700)) (make-directory dir)) |
1b32397dd4e2
(server-socket-name): Use new safe location for socket.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49686
diff
changeset
|
381 (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
|
382 ;; Check that it's safe for use. |
1b32397dd4e2
(server-socket-name): Use new safe location for socket.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49686
diff
changeset
|
383 (unless (and (eq t (car attrs)) (eq (nth 2 attrs) (user-uid)) |
1b32397dd4e2
(server-socket-name): Use new safe location for socket.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49686
diff
changeset
|
384 (zerop (logand ?\077 (file-modes dir)))) |
1b32397dd4e2
(server-socket-name): Use new safe location for socket.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49686
diff
changeset
|
385 (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
|
386 |
256 | 387 ;;;###autoload |
50 | 388 (defun server-start (&optional leave-dead) |
389 "Allow this Emacs process to be a server for client processes. | |
390 This starts a server communications subprocess through which | |
83215
a9f716fbb9c6
Small tweaks in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents:
83195
diff
changeset
|
391 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
|
392 job. To use the server, set up the program `emacsclient' in the |
50 | 393 Emacs distribution as your standard \"editor\". |
394 | |
83215
a9f716fbb9c6
Small tweaks in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents:
83195
diff
changeset
|
395 Prefix arg LEAVE-DEAD means just kill any existing server |
a9f716fbb9c6
Small tweaks in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents:
83195
diff
changeset
|
396 communications subprocess." |
50 | 397 (interactive "P") |
83155
235fb3b11e1f
Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents:
83139
diff
changeset
|
398 (when (or |
235fb3b11e1f
Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents:
83139
diff
changeset
|
399 (not server-clients) |
235fb3b11e1f
Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents:
83139
diff
changeset
|
400 (yes-or-no-p |
235fb3b11e1f
Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents:
83139
diff
changeset
|
401 "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
|
402 ;; 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
|
403 (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
|
404 (format "/tmp/emacs%d" (user-uid)))) |
235fb3b11e1f
Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents:
83139
diff
changeset
|
405 ;; Make sure there is a safe directory in which to place the socket. |
235fb3b11e1f
Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents:
83139
diff
changeset
|
406 (server-ensure-safe-dir server-socket-dir) |
235fb3b11e1f
Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents:
83139
diff
changeset
|
407 ;; kill it dead! |
50 | 408 (if server-process |
83155
235fb3b11e1f
Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents:
83139
diff
changeset
|
409 (condition-case () (delete-process server-process) (error nil))) |
235fb3b11e1f
Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents:
83139
diff
changeset
|
410 ;; 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
|
411 (condition-case () |
235fb3b11e1f
Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents:
83139
diff
changeset
|
412 (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
|
413 (error nil)) |
235fb3b11e1f
Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents:
83139
diff
changeset
|
414 ;; 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
|
415 (while server-clients |
235fb3b11e1f
Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents:
83139
diff
changeset
|
416 (server-delete-client (car server-clients))) |
235fb3b11e1f
Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents:
83139
diff
changeset
|
417 (if leave-dead |
235fb3b11e1f
Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents:
83139
diff
changeset
|
418 (progn |
235fb3b11e1f
Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents:
83139
diff
changeset
|
419 (server-log (message "Server stopped")) |
235fb3b11e1f
Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents:
83139
diff
changeset
|
420 (setq server-process nil)) |
235fb3b11e1f
Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents:
83139
diff
changeset
|
421 (if server-process |
235fb3b11e1f
Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents:
83139
diff
changeset
|
422 (server-log (message "Restarting server")) |
235fb3b11e1f
Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents:
83139
diff
changeset
|
423 (server-log (message "Starting server"))) |
235fb3b11e1f
Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents:
83139
diff
changeset
|
424 (letf (((default-file-modes) ?\700)) |
235fb3b11e1f
Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents:
83139
diff
changeset
|
425 (add-hook 'suspend-tty-functions 'server-handle-suspend-tty) |
235fb3b11e1f
Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents:
83139
diff
changeset
|
426 (add-hook 'delete-frame-functions 'server-handle-delete-frame) |
235fb3b11e1f
Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents:
83139
diff
changeset
|
427 (add-hook 'kill-buffer-query-functions 'server-kill-buffer-query-function) |
235fb3b11e1f
Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents:
83139
diff
changeset
|
428 (add-hook 'kill-emacs-query-functions 'server-kill-emacs-query-function) |
235fb3b11e1f
Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents:
83139
diff
changeset
|
429 (setq server-process |
235fb3b11e1f
Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents:
83139
diff
changeset
|
430 (make-network-process |
235fb3b11e1f
Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents:
83139
diff
changeset
|
431 :name "server" :family 'local :server t :noquery t |
235fb3b11e1f
Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents:
83139
diff
changeset
|
432 :service (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
|
433 :sentinel 'server-sentinel :filter 'server-process-filter |
235fb3b11e1f
Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents:
83139
diff
changeset
|
434 ;; We must receive file names without being decoded. |
235fb3b11e1f
Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents:
83139
diff
changeset
|
435 ;; Those are decoded by server-process-filter according |
235fb3b11e1f
Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents:
83139
diff
changeset
|
436 ;; to file-name-coding-system. |
235fb3b11e1f
Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents:
83139
diff
changeset
|
437 :coding 'raw-text)))))) |
49267 | 438 |
439 ;;;###autoload | |
440 (define-minor-mode server-mode | |
441 "Toggle Server mode. | |
442 With ARG, turn Server mode on if ARG is positive, off otherwise. | |
443 Server mode runs a process that accepts commands from the | |
444 `emacsclient' program. See `server-start' and Info node `Emacs server'." | |
445 :global t | |
446 :group 'server | |
59996
aac0a33f5772
Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents:
59220
diff
changeset
|
447 :version "22.1" |
49267 | 448 ;; Fixme: Should this check for an existing server socket and do |
449 ;; nothing if there is one (for multiple Emacs sessions)? | |
450 (server-start (not server-mode))) | |
50 | 451 |
452 (defun server-process-filter (proc string) | |
49267 | 453 "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
|
454 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
|
455 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
|
456 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
|
457 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
|
458 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
459 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
|
460 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
|
461 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
|
462 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
463 -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
|
464 -env HOME /home/lorentey |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
465 -env DISPLAY :0.0 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
466 ... 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
|
467 -display :0.0 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
468 -window-system |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
469 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
470 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
|
471 as a response. |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
472 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
473 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
|
474 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
475 `-version CLIENT-VERSION' |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
476 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
|
477 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
|
478 `-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
|
479 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
480 `-env NAME VALUE' |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
481 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
|
482 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
483 `-nowait' |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
484 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
|
485 associated with this client. |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
486 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
487 `-display DISPLAY' |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
488 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
|
489 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
490 `-position LINE[:COLUMN]' |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
491 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
|
492 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
|
493 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
494 `-file FILENAME' |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
495 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
|
496 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
497 `-eval EXPR' |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
498 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
|
499 result in -print commands. |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
500 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
501 `-window-system' |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
502 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
|
503 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
504 `-tty DEVICENAME TYPE' |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
505 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
|
506 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
507 `-resume' |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
508 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
|
509 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
|
510 controlling tty. |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
511 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
512 `-suspend' |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
513 Suspend this tty frame. The client sends this string in |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
514 response to SIGTSTP and SIGTTOU. The server must cease all I/O |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
515 on this tty until it gets a -resume command. |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
516 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
517 `-ignore COMMENT' |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
518 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
|
519 log. Useful for debugging. |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
520 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
521 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
522 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
|
523 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
524 `-good-version' |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
525 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
|
526 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
527 `-emacs-pid PID' |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
528 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
|
529 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
|
530 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
531 `-window-system-unsupported' |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
532 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
|
533 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
|
534 frame. |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
535 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
536 `-print STRING' |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
537 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
|
538 returned by -eval. |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
539 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
540 `-error DESCRIPTION' |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
541 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
|
542 |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
543 `-suspend' |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
544 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
|
545 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
|
546 (server-log (concat "Received " string) proc) |
49686
64195811ff44
(server-previous-strings): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49267
diff
changeset
|
547 (let ((prev (process-get proc 'previous-string))) |
64195811ff44
(server-previous-strings): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49267
diff
changeset
|
548 (when prev |
64195811ff44
(server-previous-strings): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49267
diff
changeset
|
549 (setq string (concat prev string)) |
64195811ff44
(server-previous-strings): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49267
diff
changeset
|
550 (process-put proc 'previous-string nil))) |
83044
52039abab942
Verify the version of Emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents:
83043
diff
changeset
|
551 (condition-case err |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
552 (progn |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
553 (server-add-client proc) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
554 ;; If the input is multiple lines, |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
555 ;; process each line individually. |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
556 (while (string-match "\n" string) |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
557 (let ((request (substring string 0 (match-beginning 0))) |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
558 (coding-system (and default-enable-multibyte-characters |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
559 (or file-name-coding-system |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
560 default-file-name-coding-system))) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
561 (client (server-client proc)) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
562 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
|
563 frame ; The frame that was opened for the client (if any). |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
564 display ; Open the frame on this display. |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
565 dontkill ; t if the client should not be killed. |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
566 (files nil) |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
567 (lineno 1) |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
568 (columnno 0)) |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
569 ;; Remove this line from STRING. |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
570 (setq string (substring string (match-end 0))) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
571 (while (string-match " *[^ ]* " request) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
572 (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
|
573 (setq request (substring request (match-end 0))) |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
574 (cond |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
575 ;; -version CLIENT-VERSION: |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
576 ;; 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
|
577 ((and (equal "-version" arg) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
578 (string-match "\\([0-9.]+\\) " request)) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
579 (let* ((client-version (match-string 1 request)) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
580 (truncated-emacs-version |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
581 (substring emacs-version 0 (length client-version)))) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
582 (setq request (substring request (match-end 0))) |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
583 (if (equal client-version truncated-emacs-version) |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
584 (progn |
83246
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
585 (server-send-string proc "-good-version \n") |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
586 (server-client-set client 'version client-version)) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
587 (error (concat "Version mismatch: Emacs is " |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
588 truncated-emacs-version |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
589 ", 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
|
590 |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
591 ;; -nowait: Emacsclient won't wait for a result. |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
592 ((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
|
593 |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
594 ;; -display DISPLAY: |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
595 ;; Open X frames on the given instead of the default. |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
596 ((and (equal "-display" arg) (string-match "\\([^ ]*\\) " request)) |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
597 (setq display (match-string 1 request) |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
598 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
|
599 |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
600 ;; -window-system: Open a new X frame. |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
601 ((equal "-window-system" arg) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
602 (unless (server-client-get client 'version) |
83044
52039abab942
Verify the version of Emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents:
83043
diff
changeset
|
603 (error "Protocol error; make sure to use the correct version of emacsclient")) |
83246
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
604 (if (fboundp 'x-create-frame) |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
605 (progn |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
606 (setq frame (make-frame-on-display |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
607 (or display |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
608 (frame-parameter nil 'display) |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
609 (getenv "DISPLAY") |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
610 (error "Please specify display")) |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
611 (list (cons 'client proc)))) |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
612 ;; XXX We need to ensure the client parameter is |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
613 ;; really set because Emacs forgets initialization |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
614 ;; parameters for X frames at the moment. |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
615 (modify-frame-parameters frame (list (cons 'client proc))) |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
616 (select-frame frame) |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
617 (server-client-set client 'frame frame) |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
618 (server-client-set client 'display (frame-display frame)) |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
619 (setq dontkill t)) |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
620 ;; This emacs does not support X. |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
621 (server-log "Window system unsupported" proc) |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
622 (server-send-string proc "-window-system-unsupported \n") |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
623 (setq dontkill t))) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
624 |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
625 ;; -resume: Resume a suspended tty frame. |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
626 ((equal "-resume" arg) |
83167
69ebc75cb461
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83165
diff
changeset
|
627 (let ((display-id (server-client-get client 'display))) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
628 (setq dontkill t) |
83167
69ebc75cb461
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83165
diff
changeset
|
629 (when (eq (display-live-p display-id) t) |
69ebc75cb461
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83165
diff
changeset
|
630 (resume-tty display-id)))) |
83043
78a785f205ea
Added -w option to emacsclient for opening a new X frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83031
diff
changeset
|
631 |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
632 ;; -suspend: Suspend the client's frame. (In case we |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
633 ;; 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
|
634 ;; emacsclient.) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
635 ((equal "-suspend" arg) |
83167
69ebc75cb461
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83165
diff
changeset
|
636 (let ((display-id (server-client-get client 'display))) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
637 (setq dontkill t) |
83167
69ebc75cb461
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83165
diff
changeset
|
638 (when (eq (display-live-p display-id) t) |
69ebc75cb461
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83165
diff
changeset
|
639 (suspend-tty display-id)))) |
83044
52039abab942
Verify the version of Emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents:
83043
diff
changeset
|
640 |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
641 ;; -ignore COMMENT: Noop; useful for debugging emacsclient. |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
642 ;; (The given comment appears in the server log.) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
643 ((and (equal "-ignore" arg) (string-match "\\([^ ]*\\) " request)) |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
644 (setq dontkill t |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
645 request (substring request (match-end 0)))) |
53233
fe9b37bee5f7
Fully eliminated global tty state variables.
Karoly Lorentey <lorentey@elte.hu>
parents:
53232
diff
changeset
|
646 |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
647 ;; -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
|
648 ((and (equal "-tty" arg) (string-match "\\([^ ]*\\) \\([^ ]*\\) " request)) |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
649 (let ((tty (server-unquote-arg (match-string 1 request))) |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
650 (type (server-unquote-arg (match-string 2 request)))) |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
651 (setq request (substring request (match-end 0))) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
652 (unless (server-client-get client 'version) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
653 (error "Protocol error; make sure you use the correct version of emacsclient")) |
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
|
654 ;; Set up client's environment for tgetent(3) |
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
|
655 ;; according to ncurses(3). |
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
|
656 (server-with-client-environment proc |
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
|
657 ("BAUDRATE" "COLUMNS" "ESCDELAY" "HOME" "LINES" |
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
|
658 "NCURSES_ASSUMED_COLORS" "NCURSES_NO_PADDING" |
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
|
659 "NCURSES_NO_SETBUF" "TERM" "TERMCAP" "TERMINFO" |
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
|
660 "TERMINFO_DIRS" "TERMPATH") |
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
|
661 (setq frame (make-frame-on-tty tty type |
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
|
662 `((client . ,proc))))) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
663 (select-frame frame) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
664 (server-client-set client 'frame frame) |
83167
69ebc75cb461
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83165
diff
changeset
|
665 (server-client-set client 'tty (display-name frame)) |
69ebc75cb461
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83165
diff
changeset
|
666 (server-client-set client 'display (frame-display frame)) |
83131
24e9d5ea9a88
Use the remote locale for terminal & keyboard coding system.
Karoly Lorentey <lorentey@elte.hu>
parents:
83130
diff
changeset
|
667 ;; Set up display for the remote locale. |
24e9d5ea9a88
Use the remote locale for terminal & keyboard coding system.
Karoly Lorentey <lorentey@elte.hu>
parents:
83130
diff
changeset
|
668 (configure-display-for-locale) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
669 ;; Reply with our pid. |
83246
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
670 (server-send-string proc (concat "-emacs-pid " (number-to-string (emacs-pid)) "\n")) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
671 (setq dontkill t))) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
672 |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
673 ;; -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
|
674 ((and (equal "-position" arg) (string-match "\\(\\+[0-9]+\\) " request)) |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
675 (setq request (substring request (match-end 0)) |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
676 lineno (string-to-int (substring (match-string 1 request) 1)))) |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
677 |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
678 ;; -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
|
679 ((and (equal "-position" arg) (string-match "\\+\\([0-9]+\\):\\([0-9]+\\) " request)) |
83257
bcf610fb9517
Fix line/column number positioning in emacsclient. (Reported by Han Boetes.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83251
diff
changeset
|
680 (setq lineno (string-to-int (match-string 1 request)) |
bcf610fb9517
Fix line/column number positioning in emacsclient. (Reported by Han Boetes.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83251
diff
changeset
|
681 columnno (string-to-int (match-string 2 request)) |
bcf610fb9517
Fix line/column number positioning in emacsclient. (Reported by Han Boetes.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83251
diff
changeset
|
682 request (substring request (match-end 0)))) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
683 |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
684 ;; -file FILENAME: Load the given file. |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
685 ((and (equal "-file" arg) (string-match "\\([^ ]+\\) " request)) |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
686 (let ((file (server-unquote-arg (match-string 1 request)))) |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
687 (setq request (substring request (match-end 0))) |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
688 (if coding-system |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
689 (setq file (decode-coding-string file coding-system))) |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
690 (setq file (command-line-normalize-file-name file)) |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
691 (push (list file lineno columnno) files)) |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
692 (setq lineno 1 |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
693 columnno 0)) |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
694 |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
695 ;; -eval EXPR: Evaluate a Lisp expression. |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
696 ((and (equal "-eval" arg) (string-match "\\([^ ]+\\) " request)) |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
697 (let ((expr (server-unquote-arg (match-string 1 request)))) |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
698 (setq request (substring request (match-end 0))) |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
699 (if coding-system |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
700 (setq expr (decode-coding-string expr coding-system))) |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
701 (let ((v (eval (car (read-from-string expr))))) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
702 (when (and (not frame) v) |
83044
52039abab942
Verify the version of Emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents:
83043
diff
changeset
|
703 (with-temp-buffer |
52039abab942
Verify the version of Emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents:
83043
diff
changeset
|
704 (let ((standard-output (current-buffer))) |
52039abab942
Verify the version of Emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents:
83043
diff
changeset
|
705 (pp v) |
83246
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
706 (server-send-string |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
707 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
|
708 (server-quote-arg |
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
709 (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
|
710 (point-max))))))))) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
711 (setq lineno 1 |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
712 columnno 0))) |
83043
78a785f205ea
Added -w option to emacsclient for opening a new X frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83031
diff
changeset
|
713 |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
714 ;; -env NAME VALUE: An environment variable. |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
715 ((and (equal "-env" arg) (string-match "\\([^ ]+\\) \\([^ ]+\\) " request)) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
716 (let ((name (server-unquote-arg (match-string 1 request))) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
717 (value (server-unquote-arg (match-string 2 request)))) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
718 (when coding-system |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
719 (setq name (decode-coding-string name coding-system)) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
720 (setq value (decode-coding-string value coding-system))) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
721 (setq request (substring request (match-end 0))) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
722 (server-client-set |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
723 client 'environment |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
724 (cons (cons name value) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
725 (server-client-get client 'environment))))) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
726 |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
727 ;; Unknown command. |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
728 (t (error "Unknown command: %s" arg))))) |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
729 |
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
|
730 (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
|
731 (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
|
732 (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
|
733 (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
|
734 (run-hooks 'post-command-hook)) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
735 |
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
|
736 ;; 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
|
737 (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
|
738 (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
|
739 ;; 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
|
740 (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
|
741 (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
|
742 ((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
|
743 ;; 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
|
744 (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
|
745 (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
|
746 (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
|
747 ((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
|
748 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
|
749 ((and frame (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
|
750 (message (substitute-command-keys |
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
|
751 "When done with this frame, type \\[delete-frame]"))) |
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
|
752 ((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
|
753 (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
|
754 (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
|
755 (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
|
756 (message (substitute-command-keys |
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
|
757 "When done with a buffer, type \\[server-edit]")))))))) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
758 |
83044
52039abab942
Verify the version of Emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents:
83043
diff
changeset
|
759 ;; Save for later any partial line that remains. |
52039abab942
Verify the version of Emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents:
83043
diff
changeset
|
760 (when (> (length string) 0) |
52039abab942
Verify the version of Emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents:
83043
diff
changeset
|
761 (process-put proc 'previous-string string))) |
52039abab942
Verify the version of Emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents:
83043
diff
changeset
|
762 ;; condition-case |
52039abab942
Verify the version of Emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents:
83043
diff
changeset
|
763 (error (ignore-errors |
83246
5bc762f84335
Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents:
83221
diff
changeset
|
764 (server-send-string |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83044
diff
changeset
|
765 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
|
766 (setq string "") |
52039abab942
Verify the version of Emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents:
83043
diff
changeset
|
767 (server-log (error-message-string err) proc) |
52039abab942
Verify the version of Emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents:
83043
diff
changeset
|
768 (delete-process proc))))) |
50 | 769 |
46907
ce6e92081932
(server-process-filter): Simplify code.
Richard M. Stallman <rms@gnu.org>
parents:
42140
diff
changeset
|
770 (defun server-goto-line-column (file-line-col) |
83215
a9f716fbb9c6
Small tweaks in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents:
83195
diff
changeset
|
771 "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
|
772 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
|
773 `server-visit-files'." |
46907
ce6e92081932
(server-process-filter): Simplify code.
Richard M. Stallman <rms@gnu.org>
parents:
42140
diff
changeset
|
774 (goto-line (nth 1 file-line-col)) |
ce6e92081932
(server-process-filter): Simplify code.
Richard M. Stallman <rms@gnu.org>
parents:
42140
diff
changeset
|
775 (let ((column-number (nth 2 file-line-col))) |
ce6e92081932
(server-process-filter): Simplify code.
Richard M. Stallman <rms@gnu.org>
parents:
42140
diff
changeset
|
776 (if (> column-number 0) |
ce6e92081932
(server-process-filter): Simplify code.
Richard M. Stallman <rms@gnu.org>
parents:
42140
diff
changeset
|
777 (move-to-column (1- column-number))))) |
ce6e92081932
(server-process-filter): Simplify code.
Richard M. Stallman <rms@gnu.org>
parents:
42140
diff
changeset
|
778 |
15956
0cefc98d243d
(server-visit-files): New argument NOWAIT.
Richard M. Stallman <rms@gnu.org>
parents:
14717
diff
changeset
|
779 (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
|
780 "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
|
781 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
|
782 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
|
783 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
|
784 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
|
785 ;; 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
|
786 (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
|
787 ;; 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
|
788 ;; 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
|
789 ;; 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
|
790 (save-current-buffer |
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
791 (dolist (file files) |
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
792 ;; 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
|
793 ;; 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
|
794 ;; deleted file, offer to write it. |
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
795 (let* ((filen (car file)) |
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
796 (obuf (get-file-buffer filen))) |
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
797 (push filen file-name-history) |
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
798 (if (and obuf (set-buffer obuf)) |
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
799 (progn |
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
800 (cond ((file-exists-p filen) |
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
801 (if (not (verify-visited-file-modtime obuf)) |
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
802 (revert-buffer t nil))) |
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
803 (t |
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
804 (if (y-or-n-p |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
805 (concat "File no longer exists: " filen |
47645
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
806 ", write buffer to file? ")) |
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
807 (write-file filen)))) |
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
808 (setq server-existing-buffer t) |
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
809 (server-goto-line-column file)) |
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
810 (set-buffer (find-file-noselect filen)) |
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
811 (server-goto-line-column file) |
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
812 (run-hooks 'server-visit-hook))) |
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
813 (unless nowait |
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
814 ;; When the buffer is killed, inform the clients. |
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
815 (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
|
816 (push (car client) server-buffer-clients)) |
d033b85fc797
(server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47612
diff
changeset
|
817 (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
|
818 (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
|
819 (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
|
820 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
|
821 (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
|
822 client-record)) |
50 | 823 |
17712
41a4624c1e79
(server-buffer-done): New arg FOR-KILLING.
Richard M. Stallman <rms@gnu.org>
parents:
17434
diff
changeset
|
824 (defun server-buffer-done (buffer &optional for-killing) |
50 | 825 "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
|
826 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
|
827 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
|
828 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
|
829 a temp file). |
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
830 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
|
831 (let ((next-buffer nil) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
832 (killed nil)) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
833 (dolist (client server-clients) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
834 (let ((buffers (server-client-get client 'buffers))) |
47517
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
835 (or next-buffer |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
836 (setq next-buffer (nth 1 (memq buffer buffers)))) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
837 (when buffers ; Ignore bufferless clients. |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
838 (setq buffers (delq buffer buffers)) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
839 ;; Delete all dead buffers from CLIENT. |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
840 (dolist (b buffers) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
841 (and (bufferp b) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
842 (not (buffer-live-p b)) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
843 (setq buffers (delq b buffers)))) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
844 (server-client-set client 'buffers buffers) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
845 ;; If client now has no pending buffers, |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
846 ;; tell it that it is done, and forget it entirely. |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
847 (unless buffers |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
848 (server-log "Close" client) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
849 (server-delete-client client))))) |
10281
44d98e169823
(server-process-filter): Process each line separately.
Richard M. Stallman <rms@gnu.org>
parents:
10218
diff
changeset
|
850 (if (and (bufferp buffer) (buffer-name buffer)) |
21941
1baa3e876ad0
(server-buffer-done): Bind server-kill-buffer-running
Richard M. Stallman <rms@gnu.org>
parents:
19418
diff
changeset
|
851 ;; We may or may not kill this buffer; |
1baa3e876ad0
(server-buffer-done): Bind server-kill-buffer-running
Richard M. Stallman <rms@gnu.org>
parents:
19418
diff
changeset
|
852 ;; if we do, do not call server-buffer-done recursively |
1baa3e876ad0
(server-buffer-done): Bind server-kill-buffer-running
Richard M. Stallman <rms@gnu.org>
parents:
19418
diff
changeset
|
853 ;; from kill-buffer-hook. |
1baa3e876ad0
(server-buffer-done): Bind server-kill-buffer-running
Richard M. Stallman <rms@gnu.org>
parents:
19418
diff
changeset
|
854 (let ((server-kill-buffer-running t)) |
48123
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
855 (with-current-buffer buffer |
7597
99a600c67e82
(server-done-hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents:
7553
diff
changeset
|
856 (setq server-buffer-clients nil) |
99a600c67e82
(server-done-hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents:
7553
diff
changeset
|
857 (run-hooks 'server-done-hook)) |
21941
1baa3e876ad0
(server-buffer-done): Bind server-kill-buffer-running
Richard M. Stallman <rms@gnu.org>
parents:
19418
diff
changeset
|
858 ;; Notice whether server-done-hook killed the buffer. |
1baa3e876ad0
(server-buffer-done): Bind server-kill-buffer-running
Richard M. Stallman <rms@gnu.org>
parents:
19418
diff
changeset
|
859 (if (null (buffer-name buffer)) |
1baa3e876ad0
(server-buffer-done): Bind server-kill-buffer-running
Richard M. Stallman <rms@gnu.org>
parents:
19418
diff
changeset
|
860 (setq killed t) |
1baa3e876ad0
(server-buffer-done): Bind server-kill-buffer-running
Richard M. Stallman <rms@gnu.org>
parents:
19418
diff
changeset
|
861 ;; Don't bother killing or burying the buffer |
1baa3e876ad0
(server-buffer-done): Bind server-kill-buffer-running
Richard M. Stallman <rms@gnu.org>
parents:
19418
diff
changeset
|
862 ;; when we are called from kill-buffer. |
1baa3e876ad0
(server-buffer-done): Bind server-kill-buffer-running
Richard M. Stallman <rms@gnu.org>
parents:
19418
diff
changeset
|
863 (unless for-killing |
31008
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
864 (when (and (not killed) |
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
865 server-kill-new-buffers |
40915
e26c1e76e1ca
(server-buffer-done): Test of server-existing-buffer was backwards.
Richard M. Stallman <rms@gnu.org>
parents:
39177
diff
changeset
|
866 (with-current-buffer buffer |
e26c1e76e1ca
(server-buffer-done): Test of server-existing-buffer was backwards.
Richard M. Stallman <rms@gnu.org>
parents:
39177
diff
changeset
|
867 (not server-existing-buffer))) |
31008
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
868 (setq killed t) |
34685
7218b9b8c2ad
(server-buffer-done): Bury the buffer before
Gerd Moellmann <gerd@gnu.org>
parents:
34344
diff
changeset
|
869 (bury-buffer buffer) |
31008
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
870 (kill-buffer buffer)) |
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
871 (unless killed |
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
872 (if (server-temp-file-p buffer) |
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
873 (progn |
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
874 (kill-buffer buffer) |
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
875 (setq killed t)) |
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
876 (bury-buffer buffer))))))) |
10961
88cba63f2a9b
(server-buffer-done): Return a list
Richard M. Stallman <rms@gnu.org>
parents:
10281
diff
changeset
|
877 (list next-buffer killed))) |
50 | 878 |
48123
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
879 (defun server-temp-file-p (&optional buffer) |
50 | 880 "Return non-nil if BUFFER contains a file considered temporary. |
881 These are files whose names suggest they are repeatedly | |
882 reused to pass information to another program. | |
883 | |
884 The variable `server-temp-file-regexp' controls which filenames | |
885 are considered temporary." | |
886 (and (buffer-file-name buffer) | |
887 (string-match server-temp-file-regexp (buffer-file-name buffer)))) | |
888 | |
889 (defun server-done () | |
1540 | 890 "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
|
891 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
|
892 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
|
893 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
|
894 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
|
895 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
|
896 (when server-buffer-clients |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
897 (if (server-temp-file-p) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
898 ;; 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
|
899 ;; (unless make-backup-files is nil). |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
900 (let ((version-control nil) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
901 (buffer-backed-up nil)) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
902 (save-buffer)) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
903 (if (and (buffer-modified-p) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
904 buffer-file-name |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
905 (y-or-n-p (concat "Save file " buffer-file-name "? "))) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
906 (save-buffer))) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
907 (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
|
908 |
9883 | 909 ;; Ask before killing a server buffer. |
910 ;; It was suggested to release its client instead, | |
911 ;; but I think that is dangerous--the client would proceed | |
912 ;; 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
|
913 (defun server-kill-buffer-query-function () |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
914 "Ask before killing a server buffer." |
6993
0983fe01e614
(server-kill-emacs-query-function)
Richard M. Stallman <rms@gnu.org>
parents:
6960
diff
changeset
|
915 (or (not server-buffer-clients) |
83009
b2b37c85b00a
Numerous bugfixes and small improvements.
Karoly Lorentey <lorentey@elte.hu>
parents:
82995
diff
changeset
|
916 (let ((res t)) |
b2b37c85b00a
Numerous bugfixes and small improvements.
Karoly Lorentey <lorentey@elte.hu>
parents:
82995
diff
changeset
|
917 (dolist (proc server-buffer-clients res) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
918 (let ((client (server-client proc))) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
919 (when (and client (eq (process-status proc) 'open)) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
920 (setq res nil))))) |
6993
0983fe01e614
(server-kill-emacs-query-function)
Richard M. Stallman <rms@gnu.org>
parents:
6960
diff
changeset
|
921 (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
|
922 (buffer-name (current-buffer)))))) |
0983fe01e614
(server-kill-emacs-query-function)
Richard M. Stallman <rms@gnu.org>
parents:
6960
diff
changeset
|
923 |
0983fe01e614
(server-kill-emacs-query-function)
Richard M. Stallman <rms@gnu.org>
parents:
6960
diff
changeset
|
924 (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
|
925 "Ask before exiting Emacs it has live clients." |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
926 (or (not server-clients) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
927 (let (live-client) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
928 (dolist (client server-clients live-client) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
929 (if (memq t (mapcar 'buffer-live-p (server-client-get |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
930 client 'buffers))) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
931 (setq live-client t)))) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
932 (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
|
933 |
18049
f1fa9625e2b9
(server-kill-buffer): Prevent infinite recursion.
Richard M. Stallman <rms@gnu.org>
parents:
17970
diff
changeset
|
934 (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
|
935 "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
|
936 |
17712
41a4624c1e79
(server-buffer-done): New arg FOR-KILLING.
Richard M. Stallman <rms@gnu.org>
parents:
17434
diff
changeset
|
937 (defun server-kill-buffer () |
83215
a9f716fbb9c6
Small tweaks in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents:
83195
diff
changeset
|
938 "Remove the current buffer from its clients' buffer list. |
a9f716fbb9c6
Small tweaks in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents:
83195
diff
changeset
|
939 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
|
940 ;; 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
|
941 ;; call kill-buffer. |
f1fa9625e2b9
(server-kill-buffer): Prevent infinite recursion.
Richard M. Stallman <rms@gnu.org>
parents:
17970
diff
changeset
|
942 (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
|
943 (and server-buffer-clients |
1baa3e876ad0
(server-buffer-done): Bind server-kill-buffer-running
Richard M. Stallman <rms@gnu.org>
parents:
19418
diff
changeset
|
944 (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
|
945 (when server-process |
1baa3e876ad0
(server-buffer-done): Bind server-kill-buffer-running
Richard M. Stallman <rms@gnu.org>
parents:
19418
diff
changeset
|
946 (server-buffer-done (current-buffer) t)))))) |
50 | 947 |
948 (defun server-edit (&optional arg) | |
949 "Switch to next server editing buffer; say \"Done\" for current buffer. | |
950 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
|
951 The buffer is also killed if it did not exist before the clients asked for it. |
50 | 952 When all of a client's buffers are marked as \"done\", the client is notified. |
953 | |
954 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
|
955 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
|
956 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
|
957 prevent a backup for it.) The variable `server-temp-file-regexp' controls |
50 | 958 which filenames are considered temporary. |
959 | |
49206
7ebd98bb02a2
(server-process-filter): Use `minibufferp' to test
John Paul Wallington <jpw@pobox.com>
parents:
49187
diff
changeset
|
960 If invoked with a prefix argument, or if there is no server process running, |
50 | 961 starts server process and that is all. Invoked by \\[server-edit]." |
962 (interactive "P") | |
963 (if (or arg | |
964 (not server-process) | |
965 (memq (process-status server-process) '(signal exit))) | |
966 (server-start nil) | |
10961
88cba63f2a9b
(server-buffer-done): Return a list
Richard M. Stallman <rms@gnu.org>
parents:
10281
diff
changeset
|
967 (apply 'server-switch-buffer (server-done)))) |
50 | 968 |
11329
ecbfde696360
(server-switch-buffer): Make first arg optional too;
Roland McGrath <roland@gnu.org>
parents:
11235
diff
changeset
|
969 (defun server-switch-buffer (&optional next-buffer killed-one) |
50 | 970 "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
|
971 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
|
972 |
a9f716fbb9c6
Small tweaks in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents:
83195
diff
changeset
|
973 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
|
974 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
|
975 \"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
|
976 done that." |
47524
95ba2ac51138
(server-done): Fix harmlessly wrong arg to save-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47517
diff
changeset
|
977 (if (null next-buffer) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
978 (progn |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
979 (let ((rest server-clients)) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
980 (while (and rest (not next-buffer)) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
981 (let ((client (car rest))) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
982 ;; Only look at frameless clients. |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
983 (when (not (server-client-get client 'frame)) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
984 (setq next-buffer (car (server-client-get client 'buffers)))) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
985 (setq rest (cdr rest))))) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
986 (and next-buffer (server-switch-buffer next-buffer killed-one)) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
987 (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
|
988 ;; (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
|
989 (message "No server buffers remain to edit"))) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
990 (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
|
991 ;; If NEXT-BUFFER is a dead buffer, remove the server records for it |
50 | 992 ;; 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
|
993 (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
|
994 ;; 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
|
995 (if (functionp server-window) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
996 (funcall server-window next-buffer) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
997 (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
|
998 (if (and win (not server-window)) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
999 ;; The buffer is already displayed: just reuse the window. |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1000 (let ((frame (window-frame win))) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1001 (if (eq (frame-visible-p frame) 'icon) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1002 (raise-frame frame)) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1003 (select-window win) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1004 (set-buffer next-buffer)) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1005 ;; Otherwise, let's find an appropriate window. |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1006 (cond ((and (windowp server-window) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1007 (window-live-p server-window)) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1008 (select-window server-window)) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1009 ((framep server-window) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1010 (if (not (frame-live-p server-window)) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1011 (setq server-window (make-frame))) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1012 (select-window (frame-selected-window server-window)))) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1013 (if (window-minibuffer-p (selected-window)) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1014 (select-window (next-window nil 'nomini 0))) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1015 ;; 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
|
1016 (when (window-dedicated-p (selected-window)) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1017 (select-window |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1018 (get-window-with-predicate |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1019 (lambda (w) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1020 (and (not (window-dedicated-p w)) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1021 (equal (frame-parameter (window-frame w) 'display) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1022 (frame-parameter (selected-frame) 'display)))) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1023 'nomini 'visible (selected-window)))) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1024 (condition-case nil |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1025 (switch-to-buffer next-buffer) |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1026 ;; 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
|
1027 ;; a minibuffer/dedicated-window (if there's no other). |
66755860a8f1
(server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48069
diff
changeset
|
1028 (error (pop-to-buffer next-buffer))))))))) |
50 | 1029 |
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
|
1030 (defun server-save-buffers-kill-display (&optional arg) |
e2567214221d
Change binding of C-x C-c to only exit emacsclient, not Emacs itself.
Karoly Lorentey <lorentey@elte.hu>
parents:
83172
diff
changeset
|
1031 "Offer to save each buffer, then kill the current connection. |
e2567214221d
Change binding of C-x C-c to only exit emacsclient, not Emacs itself.
Karoly Lorentey <lorentey@elte.hu>
parents:
83172
diff
changeset
|
1032 If the current frame has no client, kill Emacs itself. |
e2567214221d
Change binding of C-x C-c to only exit emacsclient, not Emacs itself.
Karoly Lorentey <lorentey@elte.hu>
parents:
83172
diff
changeset
|
1033 |
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
|
1034 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
|
1035 |
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
|
1036 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
|
1037 only these files will be asked to be saved." |
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
|
1038 (interactive "P") |
e2567214221d
Change binding of C-x C-c to only exit emacsclient, not Emacs itself.
Karoly Lorentey <lorentey@elte.hu>
parents:
83172
diff
changeset
|
1039 (let ((proc (frame-parameter (selected-frame) 'client))) |
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
|
1040 (if proc |
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
|
1041 (let ((buffers (server-client-get proc 'buffers))) |
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
|
1042 ;; If client is bufferless, emulate a normal Emacs session |
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
|
1043 ;; exit and offer to save all buffers. Otherwise, offer to |
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
|
1044 ;; save only the buffers belonging to the client. |
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
|
1045 (save-some-buffers arg |
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
|
1046 (if buffers |
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
|
1047 (lambda () (memq (current-buffer) buffers)) |
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
|
1048 t)) |
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
|
1049 (server-delete-client proc)) |
e2567214221d
Change binding of C-x C-c to only exit emacsclient, not Emacs itself.
Karoly Lorentey <lorentey@elte.hu>
parents:
83172
diff
changeset
|
1050 (save-buffers-kill-emacs)))) |
e2567214221d
Change binding of C-x C-c to only exit emacsclient, not Emacs itself.
Karoly Lorentey <lorentey@elte.hu>
parents:
83172
diff
changeset
|
1051 |
50 | 1052 (global-set-key "\C-x#" 'server-edit) |
42140
49087a9d073e
(server-unload-hook): New function.
Dave Love <fx@gnu.org>
parents:
41075
diff
changeset
|
1053 |
49087a9d073e
(server-unload-hook): New function.
Dave Love <fx@gnu.org>
parents:
41075
diff
changeset
|
1054 (defun server-unload-hook () |
83215
a9f716fbb9c6
Small tweaks in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents:
83195
diff
changeset
|
1055 "Unload the server library." |
49267 | 1056 (server-start t) |
83103
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
1057 (remove-hook 'suspend-tty-functions 'server-handle-suspend-tty) |
efc0b56b83d9
Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents:
83078
diff
changeset
|
1058 (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
|
1059 (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
|
1060 (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
|
1061 (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
|
1062 |
e47852bd4fc4
(server-unload-hook): Set as a variable with add-hook.
Richard M. Stallman <rms@gnu.org>
parents:
57379
diff
changeset
|
1063 (add-hook 'server-unload-hook 'server-unload-hook) |
1079 | 1064 |
1065 (provide 'server) | |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
445
diff
changeset
|
1066 |
52401 | 1067 ;;; arch-tag: 1f7ecb42-f00a-49f8-906d-61995d84c8d6 |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
445
diff
changeset
|
1068 ;;; server.el ends here |