annotate lisp/server.el @ 83367:2b5fb28780be

Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server. * lib-src/emacsclient.c (decode_options): Make --no-wait imply --current-frame, except when it is the only option given. Make sure no frame is opened when --current-frame is set. (main): Pass --current-frame to server.el. * lisp/server.el (server-process-filter): Handle -current-frame command. Don't create frames when it is given. Don't bind X frames to the client when we are in -no-wait mode. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-407
author Karoly Lorentey <lorentey@elte.hu>
date Sat, 10 Sep 2005 23:51:08 +0000
parents 532e0a9335a9
children 0d0962d43546
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
38412
253f761ad37b Some fixes to follow coding conventions in files maintained by FSF.
Pavel Janík <Pavel@Janik.cz>
parents: 38010
diff changeset
1 ;;; server.el --- Lisp code for GNU Emacs running as server process
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 445
diff changeset
2
64762
41bb365f41c4 Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 64372
diff changeset
3 ;; Copyright (C) 1986, 1987, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
41bb365f41c4 Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 64372
diff changeset
4 ;; 2001, 2002, 2003, 2004, 2005 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
720d1f98ae42 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 17801
diff changeset
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
38da30b6253c Initial revision
root <root>
parents:
diff changeset
13 ;; This file is part of GNU Emacs.
38da30b6253c Initial revision
root <root>
parents:
diff changeset
14
38da30b6253c Initial revision
root <root>
parents:
diff changeset
15 ;; GNU Emacs is free software; you can redistribute it and/or modify
38da30b6253c Initial revision
root <root>
parents:
diff changeset
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
38da30b6253c Initial revision
root <root>
parents:
diff changeset
18 ;; any later version.
38da30b6253c Initial revision
root <root>
parents:
diff changeset
19
38da30b6253c Initial revision
root <root>
parents:
diff changeset
20 ;; GNU Emacs is distributed in the hope that it will be useful,
38da30b6253c Initial revision
root <root>
parents:
diff changeset
21 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
38da30b6253c Initial revision
root <root>
parents:
diff changeset
22 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
38da30b6253c Initial revision
root <root>
parents:
diff changeset
23 ;; GNU General Public License for more details.
38da30b6253c Initial revision
root <root>
parents:
diff changeset
24
38da30b6253c Initial revision
root <root>
parents:
diff changeset
25 ;; You should have received a copy of the GNU General Public License
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13468
diff changeset
26 ;; along with GNU Emacs; see the file COPYING. If not, write to the
64091
6fb026ad601f Update FSF's address.
Lute Kamstra <lute@gnu.org>
parents: 62402
diff changeset
27 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
6fb026ad601f Update FSF's address.
Lute Kamstra <lute@gnu.org>
parents: 62402
diff changeset
28 ;; Boston, MA 02110-1301, USA.
50
38da30b6253c Initial revision
root <root>
parents:
diff changeset
29
787
3cece0106722 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 702
diff changeset
30 ;;; Commentary:
50
38da30b6253c Initial revision
root <root>
parents:
diff changeset
31
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13468
diff changeset
32 ;; This Lisp code is run in Emacs when it is to operate as
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13468
diff changeset
33 ;; a server for other processes.
50
38da30b6253c Initial revision
root <root>
parents:
diff changeset
34
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13468
diff changeset
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
38da30b6253c Initial revision
root <root>
parents:
diff changeset
39
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13468
diff changeset
40 ;; When some other program runs "the editor" to edit a file,
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13468
diff changeset
41 ;; "the editor" can be the Emacs client program ../lib-src/emacsclient.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13468
diff changeset
42 ;; This program transmits the file names to Emacs through
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13468
diff changeset
43 ;; the server subprocess, and Emacs visits them and lets you edit them.
50
38da30b6253c Initial revision
root <root>
parents:
diff changeset
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
38da30b6253c Initial revision
root <root>
parents:
diff changeset
46
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13468
diff changeset
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
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13468
diff changeset
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
38da30b6253c Initial revision
root <root>
parents:
diff changeset
52
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13468
diff changeset
53 ;; Your editing commands and Emacs's display output go to and from
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13468
diff changeset
54 ;; the terminal in the usual way. Thus, server operation is possible
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13468
diff changeset
55 ;; only when Emacs can talk to the terminal at the time you invoke
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13468
diff changeset
56 ;; the client. This is possible in four cases:
50
38da30b6253c Initial revision
root <root>
parents:
diff changeset
57
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13468
diff changeset
58 ;; 1. On a window system, where Emacs runs in one window and the
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13468
diff changeset
59 ;; program that wants to use "the editor" runs in another.
50
38da30b6253c Initial revision
root <root>
parents:
diff changeset
60
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13468
diff changeset
61 ;; 2. On a multi-terminal system, where Emacs runs on one terminal and the
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13468
diff changeset
62 ;; program that wants to use "the editor" runs on another.
50
38da30b6253c Initial revision
root <root>
parents:
diff changeset
63
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13468
diff changeset
64 ;; 3. When the program that wants to use "the editor" is running
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13468
diff changeset
65 ;; as a subprocess of Emacs.
50
38da30b6253c Initial revision
root <root>
parents:
diff changeset
66
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13468
diff changeset
67 ;; 4. On a system with job control, when Emacs is suspended, the program
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13468
diff changeset
68 ;; that wants to use "the editor" will stop and display
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13468
diff changeset
69 ;; "Waiting for Emacs...". It can then be suspended, and Emacs can be
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13468
diff changeset
70 ;; brought into the foreground for editing. When done editing, Emacs is
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13468
diff changeset
71 ;; suspended again, and the client program is brought into the foreground.
50
38da30b6253c Initial revision
root <root>
parents:
diff changeset
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
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13468
diff changeset
75 ;; The global variable "server-clients" lists all the waiting clients,
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13468
diff changeset
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
142900099257 Customized.
Richard M. Stallman <rms@gnu.org>
parents: 18049
diff changeset
82 (defgroup server nil
142900099257 Customized.
Richard M. Stallman <rms@gnu.org>
parents: 18049
diff changeset
83 "Emacs running as a server process."
142900099257 Customized.
Richard M. Stallman <rms@gnu.org>
parents: 18049
diff changeset
84 :group 'external)
50
38da30b6253c Initial revision
root <root>
parents:
diff changeset
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
142900099257 Customized.
Richard M. Stallman <rms@gnu.org>
parents: 18049
diff changeset
88 :group 'server
47612
2d55f7e8ff64 Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47524
diff changeset
89 :type 'hook)
50
38da30b6253c Initial revision
root <root>
parents:
diff changeset
90
19418
142900099257 Customized.
Richard M. Stallman <rms@gnu.org>
parents: 18049
diff changeset
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
142900099257 Customized.
Richard M. Stallman <rms@gnu.org>
parents: 18049
diff changeset
93 :group 'server
47612
2d55f7e8ff64 Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47524
diff changeset
94 :type 'hook)
19418
142900099257 Customized.
Richard M. Stallman <rms@gnu.org>
parents: 18049
diff changeset
95
142900099257 Customized.
Richard M. Stallman <rms@gnu.org>
parents: 18049
diff changeset
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
142900099257 Customized.
Richard M. Stallman <rms@gnu.org>
parents: 18049
diff changeset
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
38da30b6253c Initial revision
root <root>
parents:
diff changeset
103
38da30b6253c Initial revision
root <root>
parents:
diff changeset
104 (defvar server-clients nil
38da30b6253c Initial revision
root <root>
parents:
diff changeset
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
38da30b6253c Initial revision
root <root>
parents:
diff changeset
108
38da30b6253c Initial revision
root <root>
parents:
diff changeset
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
38da30b6253c Initial revision
root <root>
parents:
diff changeset
112 ;; Changing major modes should not erase this local.
38da30b6253c Initial revision
root <root>
parents:
diff changeset
113 (put 'server-buffer-clients 'permanent-local t)
38da30b6253c Initial revision
root <root>
parents:
diff changeset
114
49267
cc4646701e99 (server-window): Customize.
Dave Love <fx@gnu.org>
parents: 49206
diff changeset
115 (defcustom server-window nil
cc4646701e99 (server-window): Customize.
Dave Love <fx@gnu.org>
parents: 49206
diff changeset
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
cc4646701e99 (server-window): Customize.
Dave Love <fx@gnu.org>
parents: 49206
diff changeset
118 If it is a function, it should take one argument (a buffer) and
cc4646701e99 (server-window): Customize.
Dave Love <fx@gnu.org>
parents: 49206
diff changeset
119 display and select it. A common value is `pop-to-buffer'.
cc4646701e99 (server-window): Customize.
Dave Love <fx@gnu.org>
parents: 49206
diff changeset
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
cc4646701e99 (server-window): Customize.
Dave Love <fx@gnu.org>
parents: 49206
diff changeset
122
cc4646701e99 (server-window): Customize.
Dave Love <fx@gnu.org>
parents: 49206
diff changeset
123 It is not meaningful to set this to a specific frame or window with Custom.
cc4646701e99 (server-window): Customize.
Dave Love <fx@gnu.org>
parents: 49206
diff changeset
124 Only programs can do so."
cc4646701e99 (server-window): Customize.
Dave Love <fx@gnu.org>
parents: 49206
diff changeset
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
cc4646701e99 (server-window): Customize.
Dave Love <fx@gnu.org>
parents: 49206
diff changeset
127 :type '(choice (const :tag "Use selected window"
cc4646701e99 (server-window): Customize.
Dave Love <fx@gnu.org>
parents: 49206
diff changeset
128 :match (lambda (widget value)
cc4646701e99 (server-window): Customize.
Dave Love <fx@gnu.org>
parents: 49206
diff changeset
129 (not (functionp value)))
cc4646701e99 (server-window): Customize.
Dave Love <fx@gnu.org>
parents: 49206
diff changeset
130 nil)
cc4646701e99 (server-window): Customize.
Dave Love <fx@gnu.org>
parents: 49206
diff changeset
131 (function-item :tag "Use pop-to-buffer" pop-to-buffer)
cc4646701e99 (server-window): Customize.
Dave Love <fx@gnu.org>
parents: 49206
diff changeset
132 (function :tag "Other function")))
3661
65d530f613a8 (server-window): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 2866
diff changeset
133
19418
142900099257 Customized.
Richard M. Stallman <rms@gnu.org>
parents: 18049
diff changeset
134 (defcustom server-temp-file-regexp "^/tmp/Re\\|/draft$"
49267
cc4646701e99 (server-window): Customize.
Dave Love <fx@gnu.org>
parents: 49206
diff changeset
135 "*Regexp matching names of temporary files.
cc4646701e99 (server-window): Customize.
Dave Love <fx@gnu.org>
parents: 49206
diff changeset
136 These are deleted and reused after each edit by the programs that
cc4646701e99 (server-window): Customize.
Dave Love <fx@gnu.org>
parents: 49206
diff changeset
137 invoke the Emacs server."
19418
142900099257 Customized.
Richard M. Stallman <rms@gnu.org>
parents: 18049
diff changeset
138 :group 'server
142900099257 Customized.
Richard M. Stallman <rms@gnu.org>
parents: 18049
diff changeset
139 :type 'regexp)
50
38da30b6253c Initial revision
root <root>
parents:
diff changeset
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
38da30b6253c Initial revision
root <root>
parents:
diff changeset
153 (or (assq 'server-buffer-clients minor-mode-alist)
38da30b6253c Initial revision
root <root>
parents:
diff changeset
154 (setq minor-mode-alist (cons '(server-buffer-clients " Server") minor-mode-alist)))
38da30b6253c Initial revision
root <root>
parents:
diff changeset
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)
83343
ccccb663aed3 Cosmetic changes in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents: 83335
diff changeset
253 "Delete CLIENT, including its buffers, devices and frames.
83109
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.
83343
ccccb663aed3 Cosmetic changes in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents: 83335
diff changeset
277 (let ((device (server-client-get client 'device)))
ccccb663aed3 Cosmetic changes in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents: 83335
diff changeset
278 (when (eq (display-live-p device) t)
ccccb663aed3 Cosmetic changes in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents: 83335
diff changeset
279 (delete-display device)))
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
38da30b6253c Initial revision
root <root>
parents:
diff changeset
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
38da30b6253c Initial revision
root <root>
parents:
diff changeset
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
38da30b6253c Initial revision
root <root>
parents:
diff changeset
308
38da30b6253c Initial revision
root <root>
parents:
diff changeset
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)))
83335
60208d3a0bb1 Handle and document that `delete-frame' may call functions in `delete-frame-functions' twice.
Karoly Lorentey <lorentey@elte.hu>
parents: 83334
diff changeset
317 (when (and (frame-live-p frame)
60208d3a0bb1 Handle and document that `delete-frame' may call functions in `delete-frame-functions' twice.
Karoly Lorentey <lorentey@elte.hu>
parents: 83334
diff changeset
318 proc
83167
69ebc75cb461 Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83165
diff changeset
319 (or (window-system frame)
83343
ccccb663aed3 Cosmetic changes in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents: 83335
diff changeset
320 ;; A terminal device must not yet be deleted if
83167
69ebc75cb461 Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83165
diff changeset
321 ;; 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
322 (< 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
323 (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
324 (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
325 (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
326 (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
327 (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
328 frame-num))))
83103
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
329 (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
330 (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
331
83343
ccccb663aed3 Cosmetic changes in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents: 83335
diff changeset
332 (defun server-handle-suspend-tty (device)
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
333 "Notify the emacsclient process to suspend itself when its tty device is suspended."
83343
ccccb663aed3 Cosmetic changes in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents: 83335
diff changeset
334 (dolist (proc (server-clients-with 'device device))
ccccb663aed3 Cosmetic changes in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents: 83335
diff changeset
335 (server-log (format "server-handle-suspend-tty, device %s" device) proc)
83215
a9f716fbb9c6 Small tweaks in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents: 83195
diff changeset
336 (condition-case err
83246
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
337 (server-send-string proc "-suspend \n")
83215
a9f716fbb9c6 Small tweaks in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents: 83195
diff changeset
338 (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
339
47612
2d55f7e8ff64 Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47524
diff changeset
340 (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
341 "Remove &-quotation from ARG.
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
342 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
343 (replace-regexp-in-string
2d55f7e8ff64 Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47524
diff changeset
344 "&." (lambda (s)
2d55f7e8ff64 Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47524
diff changeset
345 (case (aref s 1)
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 (?- "-")
2d55f7e8ff64 Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47524
diff changeset
348 (?n "\n")
2d55f7e8ff64 Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47524
diff changeset
349 (t " ")))
2d55f7e8ff64 Use built-in network primitives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47524
diff changeset
350 arg t t))
50
38da30b6253c Initial revision
root <root>
parents:
diff changeset
351
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
352 (defun server-quote-arg (arg)
83103
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
353 "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
354 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
355 contains a space.
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
356
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
357 See `server-unquote-arg' and `server-process-filter'."
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
358 (replace-regexp-in-string
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
359 "[-&\n ]" (lambda (s)
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
360 (case (aref s 0)
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 (?- "&-")
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
363 (?\n "&n")
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
364 (?\s "&_")))
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
365 arg t t))
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
366
83246
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
367 (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
368 "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
369 (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
370 (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
371
50567
1b32397dd4e2 (server-socket-name): Use new safe location for socket.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49686
diff changeset
372 (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
373 "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
374 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
375 - 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
376 - 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
377 - 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
378 (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
379 (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
380 (unless attrs
1b32397dd4e2 (server-socket-name): Use new safe location for socket.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49686
diff changeset
381 (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
382 (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
383 ;; 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
384 (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
385 (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
386 (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
387
256
7e4c7ef44243 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 138
diff changeset
388 ;;;###autoload
50
38da30b6253c Initial revision
root <root>
parents:
diff changeset
389 (defun server-start (&optional leave-dead)
38da30b6253c Initial revision
root <root>
parents:
diff changeset
390 "Allow this Emacs process to be a server for client processes.
38da30b6253c Initial revision
root <root>
parents:
diff changeset
391 This starts a server communications subprocess through which
83215
a9f716fbb9c6 Small tweaks in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents: 83195
diff changeset
392 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
393 job. To use the server, set up the program `emacsclient' in the
50
38da30b6253c Initial revision
root <root>
parents:
diff changeset
394 Emacs distribution as your standard \"editor\".
38da30b6253c Initial revision
root <root>
parents:
diff changeset
395
83215
a9f716fbb9c6 Small tweaks in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents: 83195
diff changeset
396 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
397 communications subprocess."
50
38da30b6253c Initial revision
root <root>
parents:
diff changeset
398 (interactive "P")
83155
235fb3b11e1f Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents: 83139
diff changeset
399 (when (or
235fb3b11e1f Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents: 83139
diff changeset
400 (not server-clients)
235fb3b11e1f Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents: 83139
diff changeset
401 (yes-or-no-p
235fb3b11e1f Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents: 83139
diff changeset
402 "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
403 ;; 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
404 (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
405 (format "/tmp/emacs%d" (user-uid))))
235fb3b11e1f Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents: 83139
diff changeset
406 ;; 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
407 (server-ensure-safe-dir server-socket-dir)
235fb3b11e1f Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents: 83139
diff changeset
408 ;; kill it dead!
50
38da30b6253c Initial revision
root <root>
parents:
diff changeset
409 (if server-process
83155
235fb3b11e1f Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents: 83139
diff changeset
410 (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
411 ;; 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
412 (condition-case ()
235fb3b11e1f Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents: 83139
diff changeset
413 (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
414 (error nil))
235fb3b11e1f Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents: 83139
diff changeset
415 ;; 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
416 (while server-clients
235fb3b11e1f Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents: 83139
diff changeset
417 (server-delete-client (car server-clients)))
235fb3b11e1f Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents: 83139
diff changeset
418 (if leave-dead
235fb3b11e1f Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents: 83139
diff changeset
419 (progn
235fb3b11e1f Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents: 83139
diff changeset
420 (server-log (message "Server stopped"))
235fb3b11e1f Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents: 83139
diff changeset
421 (setq server-process nil))
235fb3b11e1f Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents: 83139
diff changeset
422 (if server-process
235fb3b11e1f Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents: 83139
diff changeset
423 (server-log (message "Restarting server"))
235fb3b11e1f Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents: 83139
diff changeset
424 (server-log (message "Starting server")))
235fb3b11e1f Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents: 83139
diff changeset
425 (letf (((default-file-modes) ?\700))
235fb3b11e1f Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents: 83139
diff changeset
426 (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
427 (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
428 (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
429 (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
430 (setq server-process
235fb3b11e1f Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents: 83139
diff changeset
431 (make-network-process
235fb3b11e1f Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents: 83139
diff changeset
432 :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
433 :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
434 :sentinel 'server-sentinel :filter 'server-process-filter
235fb3b11e1f Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents: 83139
diff changeset
435 ;; 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
436 ;; 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
437 ;; to file-name-coding-system.
235fb3b11e1f Make server-start safe against accidental restarts.
Karoly Lorentey <lorentey@elte.hu>
parents: 83139
diff changeset
438 :coding 'raw-text))))))
49267
cc4646701e99 (server-window): Customize.
Dave Love <fx@gnu.org>
parents: 49206
diff changeset
439
cc4646701e99 (server-window): Customize.
Dave Love <fx@gnu.org>
parents: 49206
diff changeset
440 ;;;###autoload
cc4646701e99 (server-window): Customize.
Dave Love <fx@gnu.org>
parents: 49206
diff changeset
441 (define-minor-mode server-mode
cc4646701e99 (server-window): Customize.
Dave Love <fx@gnu.org>
parents: 49206
diff changeset
442 "Toggle Server mode.
cc4646701e99 (server-window): Customize.
Dave Love <fx@gnu.org>
parents: 49206
diff changeset
443 With ARG, turn Server mode on if ARG is positive, off otherwise.
cc4646701e99 (server-window): Customize.
Dave Love <fx@gnu.org>
parents: 49206
diff changeset
444 Server mode runs a process that accepts commands from the
cc4646701e99 (server-window): Customize.
Dave Love <fx@gnu.org>
parents: 49206
diff changeset
445 `emacsclient' program. See `server-start' and Info node `Emacs server'."
cc4646701e99 (server-window): Customize.
Dave Love <fx@gnu.org>
parents: 49206
diff changeset
446 :global t
cc4646701e99 (server-window): Customize.
Dave Love <fx@gnu.org>
parents: 49206
diff changeset
447 :group 'server
59996
aac0a33f5772 Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents: 59220
diff changeset
448 :version "22.1"
49267
cc4646701e99 (server-window): Customize.
Dave Love <fx@gnu.org>
parents: 49206
diff changeset
449 ;; Fixme: Should this check for an existing server socket and do
cc4646701e99 (server-window): Customize.
Dave Love <fx@gnu.org>
parents: 49206
diff changeset
450 ;; nothing if there is one (for multiple Emacs sessions)?
cc4646701e99 (server-window): Customize.
Dave Love <fx@gnu.org>
parents: 49206
diff changeset
451 (server-start (not server-mode)))
50
38da30b6253c Initial revision
root <root>
parents:
diff changeset
452
38da30b6253c Initial revision
root <root>
parents:
diff changeset
453 (defun server-process-filter (proc string)
49267
cc4646701e99 (server-window): Customize.
Dave Love <fx@gnu.org>
parents: 49206
diff changeset
454 "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
455 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
456 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
457 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
458 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
459
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
460 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
461 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
462 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
463
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
464 -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
465 -env HOME /home/lorentey
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
466 -env DISPLAY :0.0
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
467 ... 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
468 -display :0.0
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
469 -window-system
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
470
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
471 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
472 as a response.
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
473
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
474 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
475
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
476 `-version CLIENT-VERSION'
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
477 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
478 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
479 `-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
480
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
481 `-env NAME VALUE'
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
482 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
483
83367
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
484 `-current-frame'
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
485 Forbid the creation of new frames.
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
486
83246
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
487 `-nowait'
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
488 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
489 associated with this client.
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
490
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
491 `-display DISPLAY'
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
492 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
493
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
494 `-position LINE[:COLUMN]'
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
495 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
496 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
497
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
498 `-file FILENAME'
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
499 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
500
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
501 `-eval EXPR'
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
502 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
503 result in -print commands.
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
504
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
505 `-window-system'
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
506 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
507
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
508 `-tty DEVICENAME TYPE'
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
509 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
510
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
511 `-resume'
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
512 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
513 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
514 controlling tty.
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
515
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
516 `-suspend'
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
517 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
518 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
519 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
520
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
521 `-ignore COMMENT'
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
522 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
523 log. Useful for debugging.
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
524
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
525
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
526 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
527
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
528 `-good-version'
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
529 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
530
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
531 `-emacs-pid PID'
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
532 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
533 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
534
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
535 `-window-system-unsupported'
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
536 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
537 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
538 frame.
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 `-print STRING'
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
541 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
542 returned by -eval.
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
543
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
544 `-error DESCRIPTION'
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
545 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
546
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
547 `-suspend'
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
548 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
549 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
550 (server-log (concat "Received " string) proc)
49686
64195811ff44 (server-previous-strings): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49267
diff changeset
551 (let ((prev (process-get proc 'previous-string)))
64195811ff44 (server-previous-strings): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49267
diff changeset
552 (when prev
64195811ff44 (server-previous-strings): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49267
diff changeset
553 (setq string (concat prev string))
64195811ff44 (server-previous-strings): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49267
diff changeset
554 (process-put proc 'previous-string nil)))
83044
52039abab942 Verify the version of Emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83043
diff changeset
555 (condition-case err
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
556 (progn
83103
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
557 (server-add-client proc)
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
558 ;; If the input is multiple lines,
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
559 ;; process each line individually.
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
560 (while (string-match "\n" string)
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
561 (let ((request (substring string 0 (match-beginning 0)))
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
562 (coding-system (and default-enable-multibyte-characters
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
563 (or file-name-coding-system
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
564 default-file-name-coding-system)))
83103
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
565 (client (server-client proc))
83367
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
566 current-frame
83103
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
567 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
568 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
569 display ; Open the frame on this display.
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
570 dontkill ; t if the client should not be killed.
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
571 (files nil)
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
572 (lineno 1)
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
573 (columnno 0))
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
574 ;; Remove this line from STRING.
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
575 (setq string (substring string (match-end 0)))
83103
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
576 (while (string-match " *[^ ]* " request)
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
577 (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
578 (setq request (substring request (match-end 0)))
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
579 (cond
83103
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
580 ;; -version CLIENT-VERSION:
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
581 ;; 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
582 ((and (equal "-version" arg)
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
583 (string-match "\\([0-9.]+\\) " request))
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
584 (let* ((client-version (match-string 1 request))
83103
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
585 (truncated-emacs-version
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
586 (substring emacs-version 0 (length client-version))))
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
587 (setq request (substring request (match-end 0)))
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
588 (if (equal client-version truncated-emacs-version)
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
589 (progn
83246
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
590 (server-send-string proc "-good-version \n")
83103
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
591 (server-client-set client 'version client-version))
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
592 (error (concat "Version mismatch: Emacs is "
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
593 truncated-emacs-version
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
594 ", 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
595
83103
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
596 ;; -nowait: Emacsclient won't wait for a result.
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
597 ((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
598
83367
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
599 ;; -current-frame: Don't create frames.
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
600 ((equal "-current-frame" arg) (setq current-frame t))
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
601
83103
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
602 ;; -display DISPLAY:
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
603 ;; 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
604 ((and (equal "-display" arg) (string-match "\\([^ ]*\\) " request))
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
605 (setq display (match-string 1 request)
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
606 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
607
83103
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
608 ;; -window-system: Open a new X frame.
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
609 ((equal "-window-system" arg)
83103
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
610 (unless (server-client-get client 'version)
83044
52039abab942 Verify the version of Emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83043
diff changeset
611 (error "Protocol error; make sure to use the correct version of emacsclient"))
83367
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
612 (unless current-frame
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
613 (if (fboundp 'x-create-frame)
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
614 (let ((params (if nowait
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
615 nil
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
616 (list (cons 'client proc)))))
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
617 (setq frame (make-frame-on-display
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
618 (or display
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
619 (frame-parameter nil 'device)
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
620 (getenv "DISPLAY")
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
621 (error "Please specify display"))
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
622 params))
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
623 (server-log (format "%s created" frame) proc)
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
624 ;; XXX We need to ensure the parameters are
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
625 ;; really set because Emacs forgets unhandled
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
626 ;; initialization parameters for X frames at
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
627 ;; the moment.
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
628 (modify-frame-parameters frame params)
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
629 (select-frame frame)
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
630 (server-client-set client 'frame frame)
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
631 (server-client-set client 'device (frame-display frame))
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
632 (setq dontkill t))
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
633 ;; This emacs does not support X.
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
634 (server-log "Window system unsupported" proc)
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
635 (server-send-string proc "-window-system-unsupported \n")
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
636 (setq dontkill t))))
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
637
83103
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
638 ;; -resume: Resume a suspended tty frame.
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
639 ((equal "-resume" arg)
83343
ccccb663aed3 Cosmetic changes in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents: 83335
diff changeset
640 (let ((device (server-client-get client 'device)))
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
641 (setq dontkill t)
83343
ccccb663aed3 Cosmetic changes in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents: 83335
diff changeset
642 (when (eq (display-live-p device) t)
ccccb663aed3 Cosmetic changes in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents: 83335
diff changeset
643 (resume-tty device))))
83043
78a785f205ea Added -w option to emacsclient for opening a new X frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83031
diff changeset
644
83103
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
645 ;; -suspend: Suspend the client's frame. (In case we
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
646 ;; 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
647 ;; emacsclient.)
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
648 ((equal "-suspend" arg)
83343
ccccb663aed3 Cosmetic changes in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents: 83335
diff changeset
649 (let ((device (server-client-get client 'device)))
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
650 (setq dontkill t)
83343
ccccb663aed3 Cosmetic changes in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents: 83335
diff changeset
651 (when (eq (display-live-p device) t)
ccccb663aed3 Cosmetic changes in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents: 83335
diff changeset
652 (suspend-tty device))))
83044
52039abab942 Verify the version of Emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83043
diff changeset
653
83103
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
654 ;; -ignore COMMENT: Noop; useful for debugging emacsclient.
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
655 ;; (The given comment appears in the server log.)
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
656 ((and (equal "-ignore" arg) (string-match "\\([^ ]*\\) " request))
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
657 (setq dontkill t
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
658 request (substring request (match-end 0))))
53233
fe9b37bee5f7 Fully eliminated global tty state variables.
Karoly Lorentey <lorentey@elte.hu>
parents: 53232
diff changeset
659
83103
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
660 ;; -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
661 ((and (equal "-tty" arg) (string-match "\\([^ ]*\\) \\([^ ]*\\) " request))
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
662 (let ((tty (server-unquote-arg (match-string 1 request)))
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
663 (type (server-unquote-arg (match-string 2 request))))
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
664 (setq request (substring request (match-end 0)))
83103
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
665 (unless (server-client-get client 'version)
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
666 (error "Protocol error; make sure you use the correct version of emacsclient"))
83367
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
667 (unless current-frame
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
668 (server-with-client-environment proc
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
669 ("LANG" "LC_CTYPE" "LC_ALL"
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
670 ;; For tgetent(3); list according to ncurses(3).
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
671 "BAUDRATE" "COLUMNS" "ESCDELAY" "HOME" "LINES"
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
672 "NCURSES_ASSUMED_COLORS" "NCURSES_NO_PADDING"
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
673 "NCURSES_NO_SETBUF" "TERM" "TERMCAP" "TERMINFO"
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
674 "TERMINFO_DIRS" "TERMPATH")
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
675 (setq frame (make-frame-on-tty tty type
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
676 ;; Ignore nowait here; we always need to clean
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
677 ;; up opened ttys when the client dies.
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
678 `((client . ,proc)))))
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
679 (select-frame frame)
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
680 (server-client-set client 'frame frame)
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
681 (server-client-set client 'tty (display-name frame))
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
682 (server-client-set client 'device (frame-display frame))
83283
45e5f0224d81 Fix error when creating tty clients.
Karoly Lorentey <lorentey@elte.hu>
parents: 83257
diff changeset
683
83367
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
684 ;; Reply with our pid.
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
685 (server-send-string proc (concat "-emacs-pid " (number-to-string (emacs-pid)) "\n"))
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
686 (setq dontkill t))))
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
687
83103
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
688 ;; -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
689 ((and (equal "-position" arg) (string-match "\\(\\+[0-9]+\\) " request))
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
690 (setq request (substring request (match-end 0))
83307
21eea50897a7 Merged from miles@gnu.org--gnu-2005 (patch 69, 313-319)
Karoly Lorentey <lorentey@elte.hu>
parents: 83300 62402
diff changeset
691 lineno (string-to-number (substring (match-string 1 request) 1))))
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
692
83103
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
693 ;; -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
694 ((and (equal "-position" arg) (string-match "\\+\\([0-9]+\\):\\([0-9]+\\) " request))
83307
21eea50897a7 Merged from miles@gnu.org--gnu-2005 (patch 69, 313-319)
Karoly Lorentey <lorentey@elte.hu>
parents: 83300 62402
diff changeset
695 (setq lineno (string-to-number (match-string 1 request))
21eea50897a7 Merged from miles@gnu.org--gnu-2005 (patch 69, 313-319)
Karoly Lorentey <lorentey@elte.hu>
parents: 83300 62402
diff changeset
696 columnno (string-to-number (match-string 2 request))
83257
bcf610fb9517 Fix line/column number positioning in emacsclient. (Reported by Han Boetes.)
Karoly Lorentey <lorentey@elte.hu>
parents: 83251
diff changeset
697 request (substring request (match-end 0))))
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
698
83103
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
699 ;; -file FILENAME: Load the given file.
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
700 ((and (equal "-file" arg) (string-match "\\([^ ]+\\) " request))
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
701 (let ((file (server-unquote-arg (match-string 1 request))))
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
702 (setq request (substring request (match-end 0)))
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
703 (if coding-system
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
704 (setq file (decode-coding-string file coding-system)))
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
705 (setq file (command-line-normalize-file-name file))
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
706 (push (list file lineno columnno) files))
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
707 (setq lineno 1
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
708 columnno 0))
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
709
83103
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
710 ;; -eval EXPR: Evaluate a Lisp expression.
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
711 ((and (equal "-eval" arg) (string-match "\\([^ ]+\\) " request))
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
712 (let ((expr (server-unquote-arg (match-string 1 request))))
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
713 (setq request (substring request (match-end 0)))
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
714 (if coding-system
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
715 (setq expr (decode-coding-string expr coding-system)))
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
716 (let ((v (eval (car (read-from-string expr)))))
83103
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
717 (when (and (not frame) v)
83044
52039abab942 Verify the version of Emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83043
diff changeset
718 (with-temp-buffer
52039abab942 Verify the version of Emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83043
diff changeset
719 (let ((standard-output (current-buffer)))
52039abab942 Verify the version of Emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83043
diff changeset
720 (pp v)
83246
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
721 (server-send-string
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
722 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
723 (server-quote-arg
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
724 (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
725 (point-max)))))))))
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
726 (setq lineno 1
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
727 columnno 0)))
83043
78a785f205ea Added -w option to emacsclient for opening a new X frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83031
diff changeset
728
83103
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
729 ;; -env NAME VALUE: An environment variable.
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
730 ((and (equal "-env" arg) (string-match "\\([^ ]+\\) \\([^ ]+\\) " request))
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
731 (let ((name (server-unquote-arg (match-string 1 request)))
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
732 (value (server-unquote-arg (match-string 2 request))))
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
733 (when coding-system
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
734 (setq name (decode-coding-string name coding-system))
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
735 (setq value (decode-coding-string value coding-system)))
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
736 (setq request (substring request (match-end 0)))
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
737 (server-client-set
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
738 client 'environment
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
739 (cons (cons name value)
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
740 (server-client-get client 'environment)))))
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
741
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
742 ;; Unknown command.
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
743 (t (error "Unknown command: %s" arg)))))
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
744
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
745 (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
746 (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
747 (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
748 (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
749 (run-hooks 'post-command-hook))
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
750
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
751 ;; 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
752 (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
753 (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
754 ;; 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
755 (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
756 (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
757 ((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
758 ;; 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
759 (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
760 (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
761 (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
762 ((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
763 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
764 ((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
765 (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
766 "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
767 ((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
768 (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
769 (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
770 (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
771 (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
772 "When done with a buffer, type \\[server-edit]"))))))))
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
773
83044
52039abab942 Verify the version of Emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83043
diff changeset
774 ;; Save for later any partial line that remains.
52039abab942 Verify the version of Emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83043
diff changeset
775 (when (> (length string) 0)
52039abab942 Verify the version of Emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83043
diff changeset
776 (process-put proc 'previous-string string)))
52039abab942 Verify the version of Emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83043
diff changeset
777 ;; condition-case
52039abab942 Verify the version of Emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83043
diff changeset
778 (error (ignore-errors
83246
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83221
diff changeset
779 (server-send-string
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83044
diff changeset
780 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
781 (setq string "")
52039abab942 Verify the version of Emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83043
diff changeset
782 (server-log (error-message-string err) proc)
52039abab942 Verify the version of Emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83043
diff changeset
783 (delete-process proc)))))
50
38da30b6253c Initial revision
root <root>
parents:
diff changeset
784
46907
ce6e92081932 (server-process-filter): Simplify code.
Richard M. Stallman <rms@gnu.org>
parents: 42140
diff changeset
785 (defun server-goto-line-column (file-line-col)
83215
a9f716fbb9c6 Small tweaks in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents: 83195
diff changeset
786 "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
787 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
788 `server-visit-files'."
46907
ce6e92081932 (server-process-filter): Simplify code.
Richard M. Stallman <rms@gnu.org>
parents: 42140
diff changeset
789 (goto-line (nth 1 file-line-col))
ce6e92081932 (server-process-filter): Simplify code.
Richard M. Stallman <rms@gnu.org>
parents: 42140
diff changeset
790 (let ((column-number (nth 2 file-line-col)))
ce6e92081932 (server-process-filter): Simplify code.
Richard M. Stallman <rms@gnu.org>
parents: 42140
diff changeset
791 (if (> column-number 0)
ce6e92081932 (server-process-filter): Simplify code.
Richard M. Stallman <rms@gnu.org>
parents: 42140
diff changeset
792 (move-to-column (1- column-number)))))
ce6e92081932 (server-process-filter): Simplify code.
Richard M. Stallman <rms@gnu.org>
parents: 42140
diff changeset
793
15956
0cefc98d243d (server-visit-files): New argument NOWAIT.
Richard M. Stallman <rms@gnu.org>
parents: 14717
diff changeset
794 (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
795 "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
796 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
797 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
798 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
799 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
800 ;; 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
801 (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
802 ;; 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
803 ;; 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
804 ;; 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
805 (save-current-buffer
d033b85fc797 (server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47612
diff changeset
806 (dolist (file files)
d033b85fc797 (server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47612
diff changeset
807 ;; 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
808 ;; 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
809 ;; deleted file, offer to write it.
d033b85fc797 (server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47612
diff changeset
810 (let* ((filen (car file))
d033b85fc797 (server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47612
diff changeset
811 (obuf (get-file-buffer filen)))
d033b85fc797 (server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47612
diff changeset
812 (push filen file-name-history)
d033b85fc797 (server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47612
diff changeset
813 (if (and obuf (set-buffer obuf))
d033b85fc797 (server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47612
diff changeset
814 (progn
d033b85fc797 (server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47612
diff changeset
815 (cond ((file-exists-p filen)
d033b85fc797 (server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47612
diff changeset
816 (if (not (verify-visited-file-modtime obuf))
d033b85fc797 (server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47612
diff changeset
817 (revert-buffer t nil)))
d033b85fc797 (server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47612
diff changeset
818 (t
d033b85fc797 (server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47612
diff changeset
819 (if (y-or-n-p
83103
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
820 (concat "File no longer exists: " filen
47645
d033b85fc797 (server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47612
diff changeset
821 ", write buffer to file? "))
d033b85fc797 (server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47612
diff changeset
822 (write-file filen))))
d033b85fc797 (server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47612
diff changeset
823 (setq server-existing-buffer t)
d033b85fc797 (server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47612
diff changeset
824 (server-goto-line-column file))
d033b85fc797 (server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47612
diff changeset
825 (set-buffer (find-file-noselect filen))
d033b85fc797 (server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47612
diff changeset
826 (server-goto-line-column file)
d033b85fc797 (server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47612
diff changeset
827 (run-hooks 'server-visit-hook)))
d033b85fc797 (server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47612
diff changeset
828 (unless nowait
d033b85fc797 (server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47612
diff changeset
829 ;; When the buffer is killed, inform the clients.
d033b85fc797 (server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47612
diff changeset
830 (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
831 (push (car client) server-buffer-clients))
d033b85fc797 (server-select-display): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47612
diff changeset
832 (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
833 (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
834 (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
835 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
836 (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
837 client-record))
50
38da30b6253c Initial revision
root <root>
parents:
diff changeset
838
17712
41a4624c1e79 (server-buffer-done): New arg FOR-KILLING.
Richard M. Stallman <rms@gnu.org>
parents: 17434
diff changeset
839 (defun server-buffer-done (buffer &optional for-killing)
50
38da30b6253c Initial revision
root <root>
parents:
diff changeset
840 "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
841 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
842 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
843 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
844 a temp file).
8e9589a87f9b (server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46907
diff changeset
845 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
846 (let ((next-buffer nil)
83103
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
847 (killed nil))
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
848 (dolist (client server-clients)
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
849 (let ((buffers (server-client-get client 'buffers)))
47517
8e9589a87f9b (server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46907
diff changeset
850 (or next-buffer
83103
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
851 (setq next-buffer (nth 1 (memq buffer buffers))))
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
852 (when buffers ; Ignore bufferless clients.
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
853 (setq buffers (delq buffer buffers))
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
854 ;; Delete all dead buffers from CLIENT.
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
855 (dolist (b buffers)
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
856 (and (bufferp b)
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
857 (not (buffer-live-p b))
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
858 (setq buffers (delq b buffers))))
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
859 (server-client-set client 'buffers buffers)
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
860 ;; If client now has no pending buffers,
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
861 ;; tell it that it is done, and forget it entirely.
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
862 (unless buffers
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
863 (server-log "Close" client)
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
864 (server-delete-client client)))))
10281
44d98e169823 (server-process-filter): Process each line separately.
Richard M. Stallman <rms@gnu.org>
parents: 10218
diff changeset
865 (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
866 ;; 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
867 ;; 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
868 ;; from kill-buffer-hook.
1baa3e876ad0 (server-buffer-done): Bind server-kill-buffer-running
Richard M. Stallman <rms@gnu.org>
parents: 19418
diff changeset
869 (let ((server-kill-buffer-running t))
48123
66755860a8f1 (server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48069
diff changeset
870 (with-current-buffer buffer
7597
99a600c67e82 (server-done-hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents: 7553
diff changeset
871 (setq server-buffer-clients nil)
99a600c67e82 (server-done-hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents: 7553
diff changeset
872 (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
873 ;; 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
874 (if (null (buffer-name buffer))
1baa3e876ad0 (server-buffer-done): Bind server-kill-buffer-running
Richard M. Stallman <rms@gnu.org>
parents: 19418
diff changeset
875 (setq killed t)
1baa3e876ad0 (server-buffer-done): Bind server-kill-buffer-running
Richard M. Stallman <rms@gnu.org>
parents: 19418
diff changeset
876 ;; 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
877 ;; 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
878 (unless for-killing
31008
ac8beefc28a9 (server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents: 30004
diff changeset
879 (when (and (not killed)
ac8beefc28a9 (server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents: 30004
diff changeset
880 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
881 (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
882 (not server-existing-buffer)))
31008
ac8beefc28a9 (server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents: 30004
diff changeset
883 (setq killed t)
34685
7218b9b8c2ad (server-buffer-done): Bury the buffer before
Gerd Moellmann <gerd@gnu.org>
parents: 34344
diff changeset
884 (bury-buffer buffer)
31008
ac8beefc28a9 (server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents: 30004
diff changeset
885 (kill-buffer buffer))
ac8beefc28a9 (server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents: 30004
diff changeset
886 (unless killed
ac8beefc28a9 (server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents: 30004
diff changeset
887 (if (server-temp-file-p buffer)
ac8beefc28a9 (server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents: 30004
diff changeset
888 (progn
ac8beefc28a9 (server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents: 30004
diff changeset
889 (kill-buffer buffer)
ac8beefc28a9 (server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents: 30004
diff changeset
890 (setq killed t))
ac8beefc28a9 (server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents: 30004
diff changeset
891 (bury-buffer buffer)))))))
10961
88cba63f2a9b (server-buffer-done): Return a list
Richard M. Stallman <rms@gnu.org>
parents: 10281
diff changeset
892 (list next-buffer killed)))
50
38da30b6253c Initial revision
root <root>
parents:
diff changeset
893
48123
66755860a8f1 (server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48069
diff changeset
894 (defun server-temp-file-p (&optional buffer)
50
38da30b6253c Initial revision
root <root>
parents:
diff changeset
895 "Return non-nil if BUFFER contains a file considered temporary.
38da30b6253c Initial revision
root <root>
parents:
diff changeset
896 These are files whose names suggest they are repeatedly
38da30b6253c Initial revision
root <root>
parents:
diff changeset
897 reused to pass information to another program.
38da30b6253c Initial revision
root <root>
parents:
diff changeset
898
38da30b6253c Initial revision
root <root>
parents:
diff changeset
899 The variable `server-temp-file-regexp' controls which filenames
38da30b6253c Initial revision
root <root>
parents:
diff changeset
900 are considered temporary."
38da30b6253c Initial revision
root <root>
parents:
diff changeset
901 (and (buffer-file-name buffer)
38da30b6253c Initial revision
root <root>
parents:
diff changeset
902 (string-match server-temp-file-regexp (buffer-file-name buffer))))
38da30b6253c Initial revision
root <root>
parents:
diff changeset
903
38da30b6253c Initial revision
root <root>
parents:
diff changeset
904 (defun server-done ()
1540
f3554332993b Doc fix.
Christopher Zaborsky <rogue@erratum.com>
parents: 1079
diff changeset
905 "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
906 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
907 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
908 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
909 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
910 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
911 (when server-buffer-clients
66755860a8f1 (server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48069
diff changeset
912 (if (server-temp-file-p)
66755860a8f1 (server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48069
diff changeset
913 ;; 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
914 ;; (unless make-backup-files is nil).
66755860a8f1 (server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48069
diff changeset
915 (let ((version-control nil)
66755860a8f1 (server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48069
diff changeset
916 (buffer-backed-up nil))
66755860a8f1 (server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48069
diff changeset
917 (save-buffer))
66755860a8f1 (server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48069
diff changeset
918 (if (and (buffer-modified-p)
66755860a8f1 (server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48069
diff changeset
919 buffer-file-name
66755860a8f1 (server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48069
diff changeset
920 (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
921 (save-buffer)))
66755860a8f1 (server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48069
diff changeset
922 (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
923
9883
7c4393810151 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 9252
diff changeset
924 ;; Ask before killing a server buffer.
7c4393810151 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 9252
diff changeset
925 ;; It was suggested to release its client instead,
7c4393810151 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 9252
diff changeset
926 ;; but I think that is dangerous--the client would proceed
7c4393810151 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 9252
diff changeset
927 ;; 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
928 (defun server-kill-buffer-query-function ()
83103
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
929 "Ask before killing a server buffer."
6993
0983fe01e614 (server-kill-emacs-query-function)
Richard M. Stallman <rms@gnu.org>
parents: 6960
diff changeset
930 (or (not server-buffer-clients)
83009
b2b37c85b00a Numerous bugfixes and small improvements.
Karoly Lorentey <lorentey@elte.hu>
parents: 82995
diff changeset
931 (let ((res t))
b2b37c85b00a Numerous bugfixes and small improvements.
Karoly Lorentey <lorentey@elte.hu>
parents: 82995
diff changeset
932 (dolist (proc server-buffer-clients res)
83103
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
933 (let ((client (server-client proc)))
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
934 (when (and client (eq (process-status proc) 'open))
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
935 (setq res nil)))))
6993
0983fe01e614 (server-kill-emacs-query-function)
Richard M. Stallman <rms@gnu.org>
parents: 6960
diff changeset
936 (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
937 (buffer-name (current-buffer))))))
0983fe01e614 (server-kill-emacs-query-function)
Richard M. Stallman <rms@gnu.org>
parents: 6960
diff changeset
938
0983fe01e614 (server-kill-emacs-query-function)
Richard M. Stallman <rms@gnu.org>
parents: 6960
diff changeset
939 (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
940 "Ask before exiting Emacs it has live clients."
83103
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
941 (or (not server-clients)
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
942 (let (live-client)
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
943 (dolist (client server-clients live-client)
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
944 (if (memq t (mapcar 'buffer-live-p (server-client-get
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
945 client 'buffers)))
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
946 (setq live-client t))))
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
947 (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
948
18049
f1fa9625e2b9 (server-kill-buffer): Prevent infinite recursion.
Richard M. Stallman <rms@gnu.org>
parents: 17970
diff changeset
949 (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
950 "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
951
17712
41a4624c1e79 (server-buffer-done): New arg FOR-KILLING.
Richard M. Stallman <rms@gnu.org>
parents: 17434
diff changeset
952 (defun server-kill-buffer ()
83215
a9f716fbb9c6 Small tweaks in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents: 83195
diff changeset
953 "Remove the current buffer from its clients' buffer list.
a9f716fbb9c6 Small tweaks in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents: 83195
diff changeset
954 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
955 ;; 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
956 ;; call kill-buffer.
f1fa9625e2b9 (server-kill-buffer): Prevent infinite recursion.
Richard M. Stallman <rms@gnu.org>
parents: 17970
diff changeset
957 (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
958 (and server-buffer-clients
1baa3e876ad0 (server-buffer-done): Bind server-kill-buffer-running
Richard M. Stallman <rms@gnu.org>
parents: 19418
diff changeset
959 (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
960 (when server-process
1baa3e876ad0 (server-buffer-done): Bind server-kill-buffer-running
Richard M. Stallman <rms@gnu.org>
parents: 19418
diff changeset
961 (server-buffer-done (current-buffer) t))))))
50
38da30b6253c Initial revision
root <root>
parents:
diff changeset
962
38da30b6253c Initial revision
root <root>
parents:
diff changeset
963 (defun server-edit (&optional arg)
38da30b6253c Initial revision
root <root>
parents:
diff changeset
964 "Switch to next server editing buffer; say \"Done\" for current buffer.
38da30b6253c Initial revision
root <root>
parents:
diff changeset
965 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
966 The buffer is also killed if it did not exist before the clients asked for it.
50
38da30b6253c Initial revision
root <root>
parents:
diff changeset
967 When all of a client's buffers are marked as \"done\", the client is notified.
38da30b6253c Initial revision
root <root>
parents:
diff changeset
968
38da30b6253c Initial revision
root <root>
parents:
diff changeset
969 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
970 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
971 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
972 prevent a backup for it.) The variable `server-temp-file-regexp' controls
50
38da30b6253c Initial revision
root <root>
parents:
diff changeset
973 which filenames are considered temporary.
38da30b6253c Initial revision
root <root>
parents:
diff changeset
974
49206
7ebd98bb02a2 (server-process-filter): Use `minibufferp' to test
John Paul Wallington <jpw@pobox.com>
parents: 49187
diff changeset
975 If invoked with a prefix argument, or if there is no server process running,
50
38da30b6253c Initial revision
root <root>
parents:
diff changeset
976 starts server process and that is all. Invoked by \\[server-edit]."
38da30b6253c Initial revision
root <root>
parents:
diff changeset
977 (interactive "P")
38da30b6253c Initial revision
root <root>
parents:
diff changeset
978 (if (or arg
38da30b6253c Initial revision
root <root>
parents:
diff changeset
979 (not server-process)
38da30b6253c Initial revision
root <root>
parents:
diff changeset
980 (memq (process-status server-process) '(signal exit)))
38da30b6253c Initial revision
root <root>
parents:
diff changeset
981 (server-start nil)
10961
88cba63f2a9b (server-buffer-done): Return a list
Richard M. Stallman <rms@gnu.org>
parents: 10281
diff changeset
982 (apply 'server-switch-buffer (server-done))))
50
38da30b6253c Initial revision
root <root>
parents:
diff changeset
983
11329
ecbfde696360 (server-switch-buffer): Make first arg optional too;
Roland McGrath <roland@gnu.org>
parents: 11235
diff changeset
984 (defun server-switch-buffer (&optional next-buffer killed-one)
50
38da30b6253c Initial revision
root <root>
parents:
diff changeset
985 "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
986 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
987
a9f716fbb9c6 Small tweaks in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents: 83195
diff changeset
988 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
989 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
990 \"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
991 done that."
47524
95ba2ac51138 (server-done): Fix harmlessly wrong arg to save-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47517
diff changeset
992 (if (null next-buffer)
83103
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
993 (progn
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
994 (let ((rest server-clients))
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
995 (while (and rest (not next-buffer))
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
996 (let ((client (car rest)))
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
997 ;; Only look at frameless clients.
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
998 (when (not (server-client-get client 'frame))
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
999 (setq next-buffer (car (server-client-get client 'buffers))))
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
1000 (setq rest (cdr rest)))))
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
1001 (and next-buffer (server-switch-buffer next-buffer killed-one))
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
1002 (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
1003 ;; (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
1004 (message "No server buffers remain to edit")))
83103
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
1005 (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
1006 ;; If NEXT-BUFFER is a dead buffer, remove the server records for it
50
38da30b6253c Initial revision
root <root>
parents:
diff changeset
1007 ;; 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
1008 (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
1009 ;; 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
1010 (if (functionp server-window)
66755860a8f1 (server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48069
diff changeset
1011 (funcall server-window next-buffer)
66755860a8f1 (server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48069
diff changeset
1012 (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
1013 (if (and win (not server-window))
66755860a8f1 (server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48069
diff changeset
1014 ;; 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
1015 (let ((frame (window-frame win)))
66755860a8f1 (server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48069
diff changeset
1016 (if (eq (frame-visible-p frame) 'icon)
66755860a8f1 (server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48069
diff changeset
1017 (raise-frame frame))
66755860a8f1 (server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48069
diff changeset
1018 (select-window win)
66755860a8f1 (server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48069
diff changeset
1019 (set-buffer next-buffer))
66755860a8f1 (server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48069
diff changeset
1020 ;; Otherwise, let's find an appropriate window.
66755860a8f1 (server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48069
diff changeset
1021 (cond ((and (windowp server-window)
66755860a8f1 (server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48069
diff changeset
1022 (window-live-p server-window))
66755860a8f1 (server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48069
diff changeset
1023 (select-window server-window))
66755860a8f1 (server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48069
diff changeset
1024 ((framep server-window)
66755860a8f1 (server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48069
diff changeset
1025 (if (not (frame-live-p server-window))
66755860a8f1 (server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48069
diff changeset
1026 (setq server-window (make-frame)))
66755860a8f1 (server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48069
diff changeset
1027 (select-window (frame-selected-window server-window))))
66755860a8f1 (server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48069
diff changeset
1028 (if (window-minibuffer-p (selected-window))
66755860a8f1 (server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48069
diff changeset
1029 (select-window (next-window nil 'nomini 0)))
66755860a8f1 (server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48069
diff changeset
1030 ;; 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
1031 (when (window-dedicated-p (selected-window))
66755860a8f1 (server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48069
diff changeset
1032 (select-window
66755860a8f1 (server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48069
diff changeset
1033 (get-window-with-predicate
66755860a8f1 (server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48069
diff changeset
1034 (lambda (w)
66755860a8f1 (server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48069
diff changeset
1035 (and (not (window-dedicated-p w))
83343
ccccb663aed3 Cosmetic changes in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents: 83335
diff changeset
1036 (equal (frame-parameter (window-frame w) 'device)
ccccb663aed3 Cosmetic changes in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents: 83335
diff changeset
1037 (frame-parameter (selected-frame) 'device))))
48123
66755860a8f1 (server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48069
diff changeset
1038 'nomini 'visible (selected-window))))
66755860a8f1 (server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48069
diff changeset
1039 (condition-case nil
66755860a8f1 (server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48069
diff changeset
1040 (switch-to-buffer next-buffer)
66755860a8f1 (server-sentinel): Kill buffers if applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48069
diff changeset
1041 ;; 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
1042 ;; 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
1043 (error (pop-to-buffer next-buffer)))))))))
50
38da30b6253c Initial revision
root <root>
parents:
diff changeset
1044
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
1045 (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
1046 "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
1047 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
1048
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
1049 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
1050
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
1051 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
1052 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
1053 (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
1054 (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
1055 (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
1056 (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
1057 ;; 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
1058 ;; 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
1059 ;; 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
1060 (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
1061 (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
1062 (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
1063 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
1064 (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
1065 (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
1066
64372
5cedf2e32893 Bind "C-x #" in a way that works even if C-x is redefined to a command key,
Eli Zaretskii <eliz@gnu.org>
parents: 64091
diff changeset
1067 (define-key ctl-x-map "#" 'server-edit)
42140
49087a9d073e (server-unload-hook): New function.
Dave Love <fx@gnu.org>
parents: 41075
diff changeset
1068
49087a9d073e (server-unload-hook): New function.
Dave Love <fx@gnu.org>
parents: 41075
diff changeset
1069 (defun server-unload-hook ()
83215
a9f716fbb9c6 Small tweaks in server.el.
Karoly Lorentey <lorentey@elte.hu>
parents: 83195
diff changeset
1070 "Unload the server library."
49267
cc4646701e99 (server-window): Customize.
Dave Love <fx@gnu.org>
parents: 49206
diff changeset
1071 (server-start t)
83103
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
1072 (remove-hook 'suspend-tty-functions 'server-handle-suspend-tty)
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83078
diff changeset
1073 (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
1074 (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
1075 (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
1076 (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
1077
e47852bd4fc4 (server-unload-hook): Set as a variable with add-hook.
Richard M. Stallman <rms@gnu.org>
parents: 57379
diff changeset
1078 (add-hook 'server-unload-hook 'server-unload-hook)
1079
0c960257c363 entered into RCS
Roland McGrath <roland@gnu.org>
parents: 844
diff changeset
1079
0c960257c363 entered into RCS
Roland McGrath <roland@gnu.org>
parents: 844
diff changeset
1080 (provide 'server)
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 445
diff changeset
1081
52401
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 52045
diff changeset
1082 ;;; arch-tag: 1f7ecb42-f00a-49f8-906d-61995d84c8d6
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 445
diff changeset
1083 ;;; server.el ends here