annotate lisp/server.el @ 111449:132f2dfd549f

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