Mercurial > emacs
annotate lisp/server.el @ 47555:bb2e6b4867d5
(custom-make-dependencies): Fix previous change.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Thu, 19 Sep 2002 18:57:48 +0000 |
parents | 95ba2ac51138 |
children | 2d55f7e8ff64 |
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 |
37273
e558d3f235fd
(server-visit-files): Set server-existing-buffer
Gerd Moellmann <gerd@gnu.org>
parents:
36304
diff
changeset
|
3 ;; Copyright (C) 1986, 87, 92, 94, 95, 96, 97, 98, 99, 2000, 2001 |
34344
a160265d0a06
(server-visit-files): Push files on file-name-history.
Gerd Moellmann <gerd@gnu.org>
parents:
31008
diff
changeset
|
4 ;; Free Software Foundation, Inc. |
844
bf829a2d63b4
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
814
diff
changeset
|
5 |
787
3cece0106722
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
702
diff
changeset
|
6 ;; Author: William Sommerfeld <wesommer@athena.mit.edu> |
17970 | 7 ;; Maintainer: FSF |
814
38b2499cb3e9
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
807
diff
changeset
|
8 ;; Keywords: processes |
787
3cece0106722
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
702
diff
changeset
|
9 |
3cece0106722
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
702
diff
changeset
|
10 ;; Changes by peck@sun.com and by rms. |
3cece0106722
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
702
diff
changeset
|
11 |
50 | 12 ;; This file is part of GNU Emacs. |
13 | |
14 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
15 ;; it under the terms of the GNU General Public License as published by | |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
787
diff
changeset
|
16 ;; the Free Software Foundation; either version 2, or (at your option) |
50 | 17 ;; any later version. |
18 | |
19 ;; GNU Emacs is distributed in the hope that it will be useful, | |
20 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
21 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
22 ;; GNU General Public License for more details. | |
23 | |
24 ;; You should have received a copy of the GNU General Public License | |
14169 | 25 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
26 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
27 ;; Boston, MA 02111-1307, USA. | |
50 | 28 |
787
3cece0106722
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
702
diff
changeset
|
29 ;;; Commentary: |
50 | 30 |
14169 | 31 ;; This Lisp code is run in Emacs when it is to operate as |
32 ;; a server for other processes. | |
50 | 33 |
14169 | 34 ;; Load this library and do M-x server-edit to enable Emacs as a server. |
35 ;; Emacs runs the program ../arch-lib/emacsserver as a subprocess | |
36 ;; for communication with clients. If there are no client buffers to edit, | |
37 ;; server-edit acts like (switch-to-buffer (other-buffer)) | |
50 | 38 |
14169 | 39 ;; When some other program runs "the editor" to edit a file, |
40 ;; "the editor" can be the Emacs client program ../lib-src/emacsclient. | |
41 ;; This program transmits the file names to Emacs through | |
42 ;; the server subprocess, and Emacs visits them and lets you edit them. | |
50 | 43 |
14169 | 44 ;; Note that any number of clients may dispatch files to emacs to be edited. |
50 | 45 |
14169 | 46 ;; When you finish editing a Server buffer, again call server-edit |
47 ;; to mark that buffer as done for the client and switch to the next | |
48 ;; Server buffer. When all the buffers for a client have been edited | |
49 ;; and exited with server-edit, the client "editor" will return | |
50 ;; to the program that invoked it. | |
50 | 51 |
14169 | 52 ;; Your editing commands and Emacs's display output go to and from |
53 ;; the terminal in the usual way. Thus, server operation is possible | |
54 ;; only when Emacs can talk to the terminal at the time you invoke | |
55 ;; the client. This is possible in four cases: | |
50 | 56 |
14169 | 57 ;; 1. On a window system, where Emacs runs in one window and the |
58 ;; program that wants to use "the editor" runs in another. | |
50 | 59 |
14169 | 60 ;; 2. On a multi-terminal system, where Emacs runs on one terminal and the |
61 ;; program that wants to use "the editor" runs on another. | |
50 | 62 |
14169 | 63 ;; 3. When the program that wants to use "the editor" is running |
64 ;; as a subprocess of Emacs. | |
50 | 65 |
14169 | 66 ;; 4. On a system with job control, when Emacs is suspended, the program |
67 ;; that wants to use "the editor" will stop and display | |
68 ;; "Waiting for Emacs...". It can then be suspended, and Emacs can be | |
69 ;; brought into the foreground for editing. When done editing, Emacs is | |
70 ;; suspended again, and the client program is brought into the foreground. | |
50 | 71 |
14169 | 72 ;; The buffer local variable "server-buffer-clients" lists |
73 ;; the clients who are waiting for this buffer to be edited. | |
74 ;; The global variable "server-clients" lists all the waiting clients, | |
75 ;; and which files are yet to be edited for each. | |
787
3cece0106722
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
702
diff
changeset
|
76 |
3cece0106722
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
702
diff
changeset
|
77 ;;; Code: |
47517
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
78 |
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
79 (eval-when-compile (require 'cl)) |
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
80 |
19418 | 81 (defgroup server nil |
82 "Emacs running as a server process." | |
83 :group 'external) | |
50 | 84 |
19418 | 85 (defcustom server-program (expand-file-name "emacsserver" exec-directory) |
86 "*The program to use as the edit server." | |
87 :group 'server | |
88 :type 'string) | |
2866
48ddb3600ae6
* server.el (server-switch-hook): New hook.
Jim Blandy <jimb@redhat.com>
parents:
1540
diff
changeset
|
89 |
19418 | 90 (defcustom server-visit-hook nil |
91 "*List of hooks to call when visiting a file for the Emacs server." | |
92 :group 'server | |
93 :type '(repeat function)) | |
50 | 94 |
19418 | 95 (defcustom server-switch-hook nil |
96 "*List of hooks to call when switching to a buffer for the Emacs server." | |
97 :group 'server | |
98 :type '(repeat function)) | |
99 | |
100 (defcustom server-done-hook nil | |
101 "*List of hooks to call when done editing a buffer for the Emacs server." | |
102 :group 'server | |
103 :type '(repeat function)) | |
7597
99a600c67e82
(server-done-hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents:
7553
diff
changeset
|
104 |
50 | 105 (defvar server-process nil |
38010
8a8cf4d74475
(server-process, server-buffer-clients): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
37273
diff
changeset
|
106 "The current server process") |
50 | 107 |
138 | 108 (defvar server-previous-string "") |
109 | |
50 | 110 (defvar server-clients nil |
111 "List of current server clients. | |
7736
8c8410bc0f1b
(server-visit-files): Bind last-nonmenu-event.
Richard M. Stallman <rms@gnu.org>
parents:
7597
diff
changeset
|
112 Each element is (CLIENTID BUFFERS...) where CLIENTID is a string |
50 | 113 that can be given to the server process to identify a client. |
114 When a buffer is marked as \"done\", it is removed from this list.") | |
115 | |
116 (defvar server-buffer-clients nil | |
38010
8a8cf4d74475
(server-process, server-buffer-clients): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
37273
diff
changeset
|
117 "List of client ids for clients requesting editing of current buffer.") |
6176
1dbec303c87b
(kill-emacs-query-functions, kill-buffer-query-functions):
Richard M. Stallman <rms@gnu.org>
parents:
5749
diff
changeset
|
118 (make-variable-buffer-local 'server-buffer-clients) |
50 | 119 ;; Changing major modes should not erase this local. |
120 (put 'server-buffer-clients 'permanent-local t) | |
121 | |
3661
65d530f613a8
(server-window): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
2866
diff
changeset
|
122 (defvar server-window nil |
65d530f613a8
(server-window): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
2866
diff
changeset
|
123 "*The window to use for selecting Emacs server buffers. |
65d530f613a8
(server-window): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
2866
diff
changeset
|
124 If nil, use the selected window. |
65d530f613a8
(server-window): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
2866
diff
changeset
|
125 If it is a frame, use the frame's selected window.") |
65d530f613a8
(server-window): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
2866
diff
changeset
|
126 |
19418 | 127 (defcustom server-temp-file-regexp "^/tmp/Re\\|/draft$" |
50 | 128 "*Regexp which should match filenames of temporary files |
129 which are deleted and reused after each edit | |
31008
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
130 by the programs that invoke the Emacs server." |
19418 | 131 :group 'server |
132 :type 'regexp) | |
50 | 133 |
31008
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
134 (defcustom server-kill-new-buffers t |
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
135 "*Whether to kill buffers when done with them. |
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
136 If non-nil, kill a buffer unless it already existed before editing |
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
137 it with Emacs server. If nil, kill only buffers as specified by |
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
138 `server-temp-file-regexp'. |
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
139 Please note that only buffers are killed that still have a client, |
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
140 i.e. buffers visited which \"emacsclient --no-wait\" are never killed in |
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
141 this way." |
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
142 :group 'server |
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
143 :type 'boolean |
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
144 :version "21.1") |
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
145 |
50 | 146 (or (assq 'server-buffer-clients minor-mode-alist) |
147 (setq minor-mode-alist (cons '(server-buffer-clients " Server") minor-mode-alist))) | |
148 | |
31008
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
149 (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
|
150 "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
|
151 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
|
152 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
|
153 (make-variable-buffer-local 'server-existing-buffer) |
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
154 |
50 | 155 ;; If a *server* buffer exists, |
156 ;; write STRING to it for logging purposes. | |
47517
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
157 (defun server-log (string &optional client) |
50 | 158 (if (get-buffer "*server*") |
47517
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
159 (with-current-buffer "*server*" |
50 | 160 (goto-char (point-max)) |
47517
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
161 (insert (current-time-string) |
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
162 (if client (format " <%s>: " client) " ") |
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
163 string) |
13468
2c8da6b3b9e0
(server-log): Record the current time.
Richard M. Stallman <rms@gnu.org>
parents:
13157
diff
changeset
|
164 (or (bolp) (newline))))) |
50 | 165 |
166 (defun server-sentinel (proc msg) | |
167 (cond ((eq (process-status proc) 'exit) | |
168 (server-log (message "Server subprocess exited"))) | |
169 ((eq (process-status proc) 'signal) | |
170 (server-log (message "Server subprocess killed"))))) | |
171 | |
256 | 172 ;;;###autoload |
50 | 173 (defun server-start (&optional leave-dead) |
174 "Allow this Emacs process to be a server for client processes. | |
175 This starts a server communications subprocess through which | |
176 client \"editors\" can send your editing commands to this Emacs job. | |
7855
69ec123ef310
(server-start): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
7736
diff
changeset
|
177 To use the server, set up the program `emacsclient' in the |
50 | 178 Emacs distribution as your standard \"editor\". |
179 | |
180 Prefix arg means just kill any existing server communications subprocess." | |
181 (interactive "P") | |
182 ;; kill it dead! | |
47517
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
183 (condition-case () (delete-process server-process) (error nil)) |
16789
85b1a10101ff
(server-start): Don't delete ~/.emacs-server.
Richard M. Stallman <rms@gnu.org>
parents:
16075
diff
changeset
|
184 ;; Delete the socket files made by previous server invocations. |
13157
31242cebf1d3
(server-start): Try both full hostname and shortened
Richard M. Stallman <rms@gnu.org>
parents:
13070
diff
changeset
|
185 (let* ((sysname (system-name)) |
31242cebf1d3
(server-start): Try both full hostname and shortened
Richard M. Stallman <rms@gnu.org>
parents:
13070
diff
changeset
|
186 (dot-index (string-match "\\." sysname))) |
31242cebf1d3
(server-start): Try both full hostname and shortened
Richard M. Stallman <rms@gnu.org>
parents:
13070
diff
changeset
|
187 (condition-case () |
16789
85b1a10101ff
(server-start): Don't delete ~/.emacs-server.
Richard M. Stallman <rms@gnu.org>
parents:
16075
diff
changeset
|
188 (delete-file (format "~/.emacs-server-%s" sysname)) |
85b1a10101ff
(server-start): Don't delete ~/.emacs-server.
Richard M. Stallman <rms@gnu.org>
parents:
16075
diff
changeset
|
189 (error nil)) |
85b1a10101ff
(server-start): Don't delete ~/.emacs-server.
Richard M. Stallman <rms@gnu.org>
parents:
16075
diff
changeset
|
190 (condition-case () |
13157
31242cebf1d3
(server-start): Try both full hostname and shortened
Richard M. Stallman <rms@gnu.org>
parents:
13070
diff
changeset
|
191 (delete-file (format "/tmp/esrv%d-%s" (user-uid) sysname)) |
31242cebf1d3
(server-start): Try both full hostname and shortened
Richard M. Stallman <rms@gnu.org>
parents:
13070
diff
changeset
|
192 (error nil)) |
31242cebf1d3
(server-start): Try both full hostname and shortened
Richard M. Stallman <rms@gnu.org>
parents:
13070
diff
changeset
|
193 ;; In case the server file name was made with a domainless hostname, |
31242cebf1d3
(server-start): Try both full hostname and shortened
Richard M. Stallman <rms@gnu.org>
parents:
13070
diff
changeset
|
194 ;; try deleting that name too. |
31242cebf1d3
(server-start): Try both full hostname and shortened
Richard M. Stallman <rms@gnu.org>
parents:
13070
diff
changeset
|
195 (if dot-index |
16789
85b1a10101ff
(server-start): Don't delete ~/.emacs-server.
Richard M. Stallman <rms@gnu.org>
parents:
16075
diff
changeset
|
196 (let ((shortname (substring sysname 0 dot-index))) |
85b1a10101ff
(server-start): Don't delete ~/.emacs-server.
Richard M. Stallman <rms@gnu.org>
parents:
16075
diff
changeset
|
197 (condition-case () |
85b1a10101ff
(server-start): Don't delete ~/.emacs-server.
Richard M. Stallman <rms@gnu.org>
parents:
16075
diff
changeset
|
198 (delete-file (format "~/.emacs-server-%s" shortname)) |
85b1a10101ff
(server-start): Don't delete ~/.emacs-server.
Richard M. Stallman <rms@gnu.org>
parents:
16075
diff
changeset
|
199 (error nil)) |
85b1a10101ff
(server-start): Don't delete ~/.emacs-server.
Richard M. Stallman <rms@gnu.org>
parents:
16075
diff
changeset
|
200 (condition-case () |
85b1a10101ff
(server-start): Don't delete ~/.emacs-server.
Richard M. Stallman <rms@gnu.org>
parents:
16075
diff
changeset
|
201 (delete-file (format "/tmp/esrv%d-%s" (user-uid) shortname)) |
85b1a10101ff
(server-start): Don't delete ~/.emacs-server.
Richard M. Stallman <rms@gnu.org>
parents:
16075
diff
changeset
|
202 (error nil))))) |
85b1a10101ff
(server-start): Don't delete ~/.emacs-server.
Richard M. Stallman <rms@gnu.org>
parents:
16075
diff
changeset
|
203 ;; If this Emacs already had a server, clear out associated status. |
50 | 204 (while server-clients |
205 (let ((buffer (nth 1 (car server-clients)))) | |
206 (server-buffer-done buffer))) | |
47517
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
207 (unless leave-dead |
50 | 208 (if server-process |
209 (server-log (message "Restarting server"))) | |
8733
14b8f8a28ace
(server-start): Always use pipes for communication.
Richard M. Stallman <rms@gnu.org>
parents:
8202
diff
changeset
|
210 ;; Using a pty is wasteful, and the separate session causes |
14b8f8a28ace
(server-start): Always use pipes for communication.
Richard M. Stallman <rms@gnu.org>
parents:
8202
diff
changeset
|
211 ;; annoyance sometimes (some systems kill idle sessions). |
14b8f8a28ace
(server-start): Always use pipes for communication.
Richard M. Stallman <rms@gnu.org>
parents:
8202
diff
changeset
|
212 (let ((process-connection-type nil)) |
14b8f8a28ace
(server-start): Always use pipes for communication.
Richard M. Stallman <rms@gnu.org>
parents:
8202
diff
changeset
|
213 (setq server-process (start-process "server" nil server-program))) |
50 | 214 (set-process-sentinel server-process 'server-sentinel) |
215 (set-process-filter server-process 'server-process-filter) | |
24474
3b77bf7b709e
(server-start): Set coding system for the server
Kenichi Handa <handa@m17n.org>
parents:
21941
diff
changeset
|
216 ;; We must receive file names without being decoded. Those are |
3b77bf7b709e
(server-start): Set coding system for the server
Kenichi Handa <handa@m17n.org>
parents:
21941
diff
changeset
|
217 ;; decoded by server-process-filter accoding to |
3b77bf7b709e
(server-start): Set coding system for the server
Kenichi Handa <handa@m17n.org>
parents:
21941
diff
changeset
|
218 ;; file-name-coding-system. |
3b77bf7b709e
(server-start): Set coding system for the server
Kenichi Handa <handa@m17n.org>
parents:
21941
diff
changeset
|
219 (set-process-coding-system server-process 'raw-text 'raw-text) |
50 | 220 (process-kill-without-query server-process))) |
221 | |
222 ;Process a request from the server to edit some files. | |
223 ;Format of STRING is "Client: CLIENTID PATH PATH PATH... \n" | |
224 (defun server-process-filter (proc string) | |
225 (server-log string) | |
138 | 226 (setq string (concat server-previous-string string)) |
10281
44d98e169823
(server-process-filter): Process each line separately.
Richard M. Stallman <rms@gnu.org>
parents:
10218
diff
changeset
|
227 ;; If the input is multiple lines, |
44d98e169823
(server-process-filter): Process each line separately.
Richard M. Stallman <rms@gnu.org>
parents:
10218
diff
changeset
|
228 ;; process each line individually. |
44d98e169823
(server-process-filter): Process each line separately.
Richard M. Stallman <rms@gnu.org>
parents:
10218
diff
changeset
|
229 (while (string-match "\n" string) |
44d98e169823
(server-process-filter): Process each line separately.
Richard M. Stallman <rms@gnu.org>
parents:
10218
diff
changeset
|
230 (let ((request (substring string 0 (match-beginning 0))) |
24474
3b77bf7b709e
(server-start): Set coding system for the server
Kenichi Handa <handa@m17n.org>
parents:
21941
diff
changeset
|
231 (coding-system (and default-enable-multibyte-characters |
3b77bf7b709e
(server-start): Set coding system for the server
Kenichi Handa <handa@m17n.org>
parents:
21941
diff
changeset
|
232 (or file-name-coding-system |
3b77bf7b709e
(server-start): Set coding system for the server
Kenichi Handa <handa@m17n.org>
parents:
21941
diff
changeset
|
233 default-file-name-coding-system))) |
15956
0cefc98d243d
(server-visit-files): New argument NOWAIT.
Richard M. Stallman <rms@gnu.org>
parents:
14717
diff
changeset
|
234 client nowait |
50 | 235 (files nil) |
38462
a7043adf8855
(server-visit-files): Handle the case the specified
Gerd Moellmann <gerd@gnu.org>
parents:
38412
diff
changeset
|
236 (lineno 1) |
a7043adf8855
(server-visit-files): Handle the case the specified
Gerd Moellmann <gerd@gnu.org>
parents:
38412
diff
changeset
|
237 (columnno 0)) |
10281
44d98e169823
(server-process-filter): Process each line separately.
Richard M. Stallman <rms@gnu.org>
parents:
10218
diff
changeset
|
238 ;; Remove this line from STRING. |
44d98e169823
(server-process-filter): Process each line separately.
Richard M. Stallman <rms@gnu.org>
parents:
10218
diff
changeset
|
239 (setq string (substring string (match-end 0))) |
12411
884975f72dd5
(server-process-filter): Detect error messages from server.
Richard M. Stallman <rms@gnu.org>
parents:
11329
diff
changeset
|
240 (if (string-match "^Error: " request) |
14327
0df217c5842d
(server-process-filter): Pass proper format string to message.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
241 (message "Server error: %s" (substring request (match-end 0))) |
12411
884975f72dd5
(server-process-filter): Detect error messages from server.
Richard M. Stallman <rms@gnu.org>
parents:
11329
diff
changeset
|
242 (if (string-match "^Client: " request) |
13070
c668502d5a93
(server-process-filter): Ignore lines that don't start
Richard M. Stallman <rms@gnu.org>
parents:
12822
diff
changeset
|
243 (progn |
c668502d5a93
(server-process-filter): Ignore lines that don't start
Richard M. Stallman <rms@gnu.org>
parents:
12822
diff
changeset
|
244 (setq request (substring request (match-end 0))) |
c668502d5a93
(server-process-filter): Ignore lines that don't start
Richard M. Stallman <rms@gnu.org>
parents:
12822
diff
changeset
|
245 (setq client (list (substring request 0 (string-match " " request)))) |
c668502d5a93
(server-process-filter): Ignore lines that don't start
Richard M. Stallman <rms@gnu.org>
parents:
12822
diff
changeset
|
246 (setq request (substring request (match-end 0))) |
c668502d5a93
(server-process-filter): Ignore lines that don't start
Richard M. Stallman <rms@gnu.org>
parents:
12822
diff
changeset
|
247 (while (string-match "[^ ]+ " request) |
c668502d5a93
(server-process-filter): Ignore lines that don't start
Richard M. Stallman <rms@gnu.org>
parents:
12822
diff
changeset
|
248 (let ((arg |
16805
4b8907e5a574
(server-process-filter): Let-bind `pos'.
Richard M. Stallman <rms@gnu.org>
parents:
16789
diff
changeset
|
249 (substring request (match-beginning 0) (1- (match-end 0)))) |
4b8907e5a574
(server-process-filter): Let-bind `pos'.
Richard M. Stallman <rms@gnu.org>
parents:
16789
diff
changeset
|
250 (pos 0)) |
13070
c668502d5a93
(server-process-filter): Ignore lines that don't start
Richard M. Stallman <rms@gnu.org>
parents:
12822
diff
changeset
|
251 (setq request (substring request (match-end 0))) |
46907
ce6e92081932
(server-process-filter): Simplify code.
Richard M. Stallman <rms@gnu.org>
parents:
42140
diff
changeset
|
252 (cond |
ce6e92081932
(server-process-filter): Simplify code.
Richard M. Stallman <rms@gnu.org>
parents:
42140
diff
changeset
|
253 ((string-match "\\`-nowait" arg) |
ce6e92081932
(server-process-filter): Simplify code.
Richard M. Stallman <rms@gnu.org>
parents:
42140
diff
changeset
|
254 (setq nowait t)) |
ce6e92081932
(server-process-filter): Simplify code.
Richard M. Stallman <rms@gnu.org>
parents:
42140
diff
changeset
|
255 ;; ARG is a line number option. |
ce6e92081932
(server-process-filter): Simplify code.
Richard M. Stallman <rms@gnu.org>
parents:
42140
diff
changeset
|
256 ((string-match "\\`\\+[0-9]+\\'" arg) |
ce6e92081932
(server-process-filter): Simplify code.
Richard M. Stallman <rms@gnu.org>
parents:
42140
diff
changeset
|
257 (setq lineno (string-to-int (substring arg 1)))) |
47517
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
258 ;; ARG is line number:column option. |
46907
ce6e92081932
(server-process-filter): Simplify code.
Richard M. Stallman <rms@gnu.org>
parents:
42140
diff
changeset
|
259 ((string-match "\\`+\\([0-9]+\\):\\([0-9]+\\)\\'" arg) |
ce6e92081932
(server-process-filter): Simplify code.
Richard M. Stallman <rms@gnu.org>
parents:
42140
diff
changeset
|
260 (setq lineno (string-to-int (match-string 1 arg)) |
ce6e92081932
(server-process-filter): Simplify code.
Richard M. Stallman <rms@gnu.org>
parents:
42140
diff
changeset
|
261 columnno (string-to-int (match-string 2 arg)))) |
ce6e92081932
(server-process-filter): Simplify code.
Richard M. Stallman <rms@gnu.org>
parents:
42140
diff
changeset
|
262 (t |
ce6e92081932
(server-process-filter): Simplify code.
Richard M. Stallman <rms@gnu.org>
parents:
42140
diff
changeset
|
263 ;; ARG is a file name. |
ce6e92081932
(server-process-filter): Simplify code.
Richard M. Stallman <rms@gnu.org>
parents:
42140
diff
changeset
|
264 ;; Collapse multiple slashes to single slashes. |
ce6e92081932
(server-process-filter): Simplify code.
Richard M. Stallman <rms@gnu.org>
parents:
42140
diff
changeset
|
265 (setq arg (command-line-normalize-file-name arg)) |
ce6e92081932
(server-process-filter): Simplify code.
Richard M. Stallman <rms@gnu.org>
parents:
42140
diff
changeset
|
266 ;; Undo the quoting that emacsclient does |
ce6e92081932
(server-process-filter): Simplify code.
Richard M. Stallman <rms@gnu.org>
parents:
42140
diff
changeset
|
267 ;; for certain special characters. |
47517
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
268 (setq arg |
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
269 (replace-regexp-in-string |
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
270 "&." (lambda (s) |
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
271 (case (aref s 1) |
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
272 (?& "&") |
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
273 (?- "-") |
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
274 (?n "\n") |
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
275 (t " "))) |
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
276 arg t t)) |
46907
ce6e92081932
(server-process-filter): Simplify code.
Richard M. Stallman <rms@gnu.org>
parents:
42140
diff
changeset
|
277 ;; Now decode the file name if necessary. |
ce6e92081932
(server-process-filter): Simplify code.
Richard M. Stallman <rms@gnu.org>
parents:
42140
diff
changeset
|
278 (if coding-system |
ce6e92081932
(server-process-filter): Simplify code.
Richard M. Stallman <rms@gnu.org>
parents:
42140
diff
changeset
|
279 (setq arg (decode-coding-string arg coding-system))) |
47517
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
280 (push (list arg lineno columnno) files) |
46907
ce6e92081932
(server-process-filter): Simplify code.
Richard M. Stallman <rms@gnu.org>
parents:
42140
diff
changeset
|
281 (setq lineno 1) |
ce6e92081932
(server-process-filter): Simplify code.
Richard M. Stallman <rms@gnu.org>
parents:
42140
diff
changeset
|
282 (setq columnno 0))))) |
47517
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
283 (when files |
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
284 (run-hooks 'pre-command-hook) |
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
285 (server-visit-files files client nowait) |
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
286 (run-hooks 'post-command-hook)) |
13070
c668502d5a93
(server-process-filter): Ignore lines that don't start
Richard M. Stallman <rms@gnu.org>
parents:
12822
diff
changeset
|
287 ;; CLIENT is now a list (CLIENTNUM BUFFERS...) |
25272
db26c1e76313
(server-process-filter): If a client visits no buffers,
Karl Heuer <kwzh@gnu.org>
parents:
24474
diff
changeset
|
288 (if (null (cdr client)) |
db26c1e76313
(server-process-filter): If a client visits no buffers,
Karl Heuer <kwzh@gnu.org>
parents:
24474
diff
changeset
|
289 ;; This client is empty; get rid of it immediately. |
db26c1e76313
(server-process-filter): If a client visits no buffers,
Karl Heuer <kwzh@gnu.org>
parents:
24474
diff
changeset
|
290 (progn |
db26c1e76313
(server-process-filter): If a client visits no buffers,
Karl Heuer <kwzh@gnu.org>
parents:
24474
diff
changeset
|
291 (send-string server-process |
db26c1e76313
(server-process-filter): If a client visits no buffers,
Karl Heuer <kwzh@gnu.org>
parents:
24474
diff
changeset
|
292 (format "Close: %s Done\n" (car client))) |
47517
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
293 (server-log "Close empty client" (car client))) |
25272
db26c1e76313
(server-process-filter): If a client visits no buffers,
Karl Heuer <kwzh@gnu.org>
parents:
24474
diff
changeset
|
294 ;; We visited some buffer for this client. |
47517
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
295 (or nowait (push client server-clients)) |
25272
db26c1e76313
(server-process-filter): If a client visits no buffers,
Karl Heuer <kwzh@gnu.org>
parents:
24474
diff
changeset
|
296 (server-switch-buffer (nth 1 client)) |
db26c1e76313
(server-process-filter): If a client visits no buffers,
Karl Heuer <kwzh@gnu.org>
parents:
24474
diff
changeset
|
297 (run-hooks 'server-switch-hook) |
47517
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
298 (unless nowait |
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
299 (message (substitute-command-keys |
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
300 "When done with a buffer, type \\[server-edit]"))))))))) |
10281
44d98e169823
(server-process-filter): Process each line separately.
Richard M. Stallman <rms@gnu.org>
parents:
10218
diff
changeset
|
301 ;; Save for later any partial line that remains. |
44d98e169823
(server-process-filter): Process each line separately.
Richard M. Stallman <rms@gnu.org>
parents:
10218
diff
changeset
|
302 (setq server-previous-string string)) |
50 | 303 |
46907
ce6e92081932
(server-process-filter): Simplify code.
Richard M. Stallman <rms@gnu.org>
parents:
42140
diff
changeset
|
304 (defun server-goto-line-column (file-line-col) |
ce6e92081932
(server-process-filter): Simplify code.
Richard M. Stallman <rms@gnu.org>
parents:
42140
diff
changeset
|
305 (goto-line (nth 1 file-line-col)) |
ce6e92081932
(server-process-filter): Simplify code.
Richard M. Stallman <rms@gnu.org>
parents:
42140
diff
changeset
|
306 (let ((column-number (nth 2 file-line-col))) |
ce6e92081932
(server-process-filter): Simplify code.
Richard M. Stallman <rms@gnu.org>
parents:
42140
diff
changeset
|
307 (if (> column-number 0) |
ce6e92081932
(server-process-filter): Simplify code.
Richard M. Stallman <rms@gnu.org>
parents:
42140
diff
changeset
|
308 (move-to-column (1- column-number))))) |
ce6e92081932
(server-process-filter): Simplify code.
Richard M. Stallman <rms@gnu.org>
parents:
42140
diff
changeset
|
309 |
15956
0cefc98d243d
(server-visit-files): New argument NOWAIT.
Richard M. Stallman <rms@gnu.org>
parents:
14717
diff
changeset
|
310 (defun server-visit-files (files client &optional nowait) |
50 | 311 "Finds FILES and returns the list CLIENT with the buffers nconc'd. |
38462
a7043adf8855
(server-visit-files): Handle the case the specified
Gerd Moellmann <gerd@gnu.org>
parents:
38412
diff
changeset
|
312 FILES is an alist whose elements are (FILENAME LINENUMBER COLUMNNUMBER). |
15956
0cefc98d243d
(server-visit-files): New argument NOWAIT.
Richard M. Stallman <rms@gnu.org>
parents:
14717
diff
changeset
|
313 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
|
314 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
|
315 ;; Bind last-nonmenu-event to force use of keyboard, not mouse, for queries. |
8c8410bc0f1b
(server-visit-files): Bind last-nonmenu-event.
Richard M. Stallman <rms@gnu.org>
parents:
7597
diff
changeset
|
316 (let (client-record (last-nonmenu-event t) (obuf (current-buffer))) |
4500
56d7c4beae9f
(server-visit-files): Restore current-buffer by hand,
Richard M. Stallman <rms@gnu.org>
parents:
4096
diff
changeset
|
317 ;; 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
|
318 ;; 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
|
319 ;; if it happens to be one of those specified by the server. |
56d7c4beae9f
(server-visit-files): Restore current-buffer by hand,
Richard M. Stallman <rms@gnu.org>
parents:
4096
diff
changeset
|
320 (unwind-protect |
56d7c4beae9f
(server-visit-files): Restore current-buffer by hand,
Richard M. Stallman <rms@gnu.org>
parents:
4096
diff
changeset
|
321 (while files |
31008
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
322 ;; If there is an existing buffer modified or the file is |
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
323 ;; modified, revert it. If there is an existing buffer with |
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
324 ;; deleted file, offer to write it. |
4500
56d7c4beae9f
(server-visit-files): Restore current-buffer by hand,
Richard M. Stallman <rms@gnu.org>
parents:
4096
diff
changeset
|
325 (let* ((filen (car (car files))) |
56d7c4beae9f
(server-visit-files): Restore current-buffer by hand,
Richard M. Stallman <rms@gnu.org>
parents:
4096
diff
changeset
|
326 (obuf (get-file-buffer filen))) |
34344
a160265d0a06
(server-visit-files): Push files on file-name-history.
Gerd Moellmann <gerd@gnu.org>
parents:
31008
diff
changeset
|
327 (push filen file-name-history) |
4500
56d7c4beae9f
(server-visit-files): Restore current-buffer by hand,
Richard M. Stallman <rms@gnu.org>
parents:
4096
diff
changeset
|
328 (if (and obuf (set-buffer obuf)) |
37273
e558d3f235fd
(server-visit-files): Set server-existing-buffer
Gerd Moellmann <gerd@gnu.org>
parents:
36304
diff
changeset
|
329 (progn |
e558d3f235fd
(server-visit-files): Set server-existing-buffer
Gerd Moellmann <gerd@gnu.org>
parents:
36304
diff
changeset
|
330 (cond ((file-exists-p filen) |
46907
ce6e92081932
(server-process-filter): Simplify code.
Richard M. Stallman <rms@gnu.org>
parents:
42140
diff
changeset
|
331 (if (not (verify-visited-file-modtime obuf)) |
37273
e558d3f235fd
(server-visit-files): Set server-existing-buffer
Gerd Moellmann <gerd@gnu.org>
parents:
36304
diff
changeset
|
332 (revert-buffer t nil))) |
e558d3f235fd
(server-visit-files): Set server-existing-buffer
Gerd Moellmann <gerd@gnu.org>
parents:
36304
diff
changeset
|
333 (t |
e558d3f235fd
(server-visit-files): Set server-existing-buffer
Gerd Moellmann <gerd@gnu.org>
parents:
36304
diff
changeset
|
334 (if (y-or-n-p |
e558d3f235fd
(server-visit-files): Set server-existing-buffer
Gerd Moellmann <gerd@gnu.org>
parents:
36304
diff
changeset
|
335 (concat "File no longer exists: " |
e558d3f235fd
(server-visit-files): Set server-existing-buffer
Gerd Moellmann <gerd@gnu.org>
parents:
36304
diff
changeset
|
336 filen |
e558d3f235fd
(server-visit-files): Set server-existing-buffer
Gerd Moellmann <gerd@gnu.org>
parents:
36304
diff
changeset
|
337 ", write buffer to file? ")) |
e558d3f235fd
(server-visit-files): Set server-existing-buffer
Gerd Moellmann <gerd@gnu.org>
parents:
36304
diff
changeset
|
338 (write-file filen)))) |
e558d3f235fd
(server-visit-files): Set server-existing-buffer
Gerd Moellmann <gerd@gnu.org>
parents:
36304
diff
changeset
|
339 (setq server-existing-buffer t) |
46907
ce6e92081932
(server-process-filter): Simplify code.
Richard M. Stallman <rms@gnu.org>
parents:
42140
diff
changeset
|
340 (server-goto-line-column (car files))) |
4500
56d7c4beae9f
(server-visit-files): Restore current-buffer by hand,
Richard M. Stallman <rms@gnu.org>
parents:
4096
diff
changeset
|
341 (set-buffer (find-file-noselect filen)) |
46907
ce6e92081932
(server-process-filter): Simplify code.
Richard M. Stallman <rms@gnu.org>
parents:
42140
diff
changeset
|
342 (server-goto-line-column (car files)) |
4500
56d7c4beae9f
(server-visit-files): Restore current-buffer by hand,
Richard M. Stallman <rms@gnu.org>
parents:
4096
diff
changeset
|
343 (run-hooks 'server-visit-hook))) |
15956
0cefc98d243d
(server-visit-files): New argument NOWAIT.
Richard M. Stallman <rms@gnu.org>
parents:
14717
diff
changeset
|
344 (if (not nowait) |
0cefc98d243d
(server-visit-files): New argument NOWAIT.
Richard M. Stallman <rms@gnu.org>
parents:
14717
diff
changeset
|
345 (setq server-buffer-clients |
0cefc98d243d
(server-visit-files): New argument NOWAIT.
Richard M. Stallman <rms@gnu.org>
parents:
14717
diff
changeset
|
346 (cons (car client) server-buffer-clients))) |
4500
56d7c4beae9f
(server-visit-files): Restore current-buffer by hand,
Richard M. Stallman <rms@gnu.org>
parents:
4096
diff
changeset
|
347 (setq client-record (cons (current-buffer) client-record)) |
56d7c4beae9f
(server-visit-files): Restore current-buffer by hand,
Richard M. Stallman <rms@gnu.org>
parents:
4096
diff
changeset
|
348 (setq files (cdr files))) |
56d7c4beae9f
(server-visit-files): Restore current-buffer by hand,
Richard M. Stallman <rms@gnu.org>
parents:
4096
diff
changeset
|
349 (set-buffer obuf)) |
50 | 350 (nconc client client-record))) |
351 | |
17712
41a4624c1e79
(server-buffer-done): New arg FOR-KILLING.
Richard M. Stallman <rms@gnu.org>
parents:
17434
diff
changeset
|
352 (defun server-buffer-done (buffer &optional for-killing) |
50 | 353 "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
|
354 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
|
355 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
|
356 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
|
357 a temp file). |
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
358 FOR-KILLING if non-nil indicates that we are called from `kill-buffer'." |
50 | 359 (let ((running (eq (process-status server-process) 'run)) |
360 (next-buffer nil) | |
10961
88cba63f2a9b
(server-buffer-done): Return a list
Richard M. Stallman <rms@gnu.org>
parents:
10281
diff
changeset
|
361 (killed nil) |
12822
6fb78108d62d
(server-buffer-done): Pause between client commands,
Richard M. Stallman <rms@gnu.org>
parents:
12411
diff
changeset
|
362 (first t) |
50 | 363 (old-clients server-clients)) |
364 (while old-clients | |
365 (let ((client (car old-clients))) | |
47517
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
366 (or next-buffer |
50 | 367 (setq next-buffer (nth 1 (memq buffer client)))) |
368 (delq buffer client) | |
10281
44d98e169823
(server-process-filter): Process each line separately.
Richard M. Stallman <rms@gnu.org>
parents:
10218
diff
changeset
|
369 ;; Delete all dead buffers from CLIENT. |
44d98e169823
(server-process-filter): Process each line separately.
Richard M. Stallman <rms@gnu.org>
parents:
10218
diff
changeset
|
370 (let ((tail client)) |
44d98e169823
(server-process-filter): Process each line separately.
Richard M. Stallman <rms@gnu.org>
parents:
10218
diff
changeset
|
371 (while tail |
44d98e169823
(server-process-filter): Process each line separately.
Richard M. Stallman <rms@gnu.org>
parents:
10218
diff
changeset
|
372 (and (bufferp (car tail)) |
44d98e169823
(server-process-filter): Process each line separately.
Richard M. Stallman <rms@gnu.org>
parents:
10218
diff
changeset
|
373 (null (buffer-name (car tail))) |
44d98e169823
(server-process-filter): Process each line separately.
Richard M. Stallman <rms@gnu.org>
parents:
10218
diff
changeset
|
374 (delq (car tail) client)) |
44d98e169823
(server-process-filter): Process each line separately.
Richard M. Stallman <rms@gnu.org>
parents:
10218
diff
changeset
|
375 (setq tail (cdr tail)))) |
50 | 376 ;; If client now has no pending buffers, |
377 ;; tell it that it is done, and forget it entirely. | |
378 (if (cdr client) nil | |
379 (if running | |
380 (progn | |
12822
6fb78108d62d
(server-buffer-done): Pause between client commands,
Richard M. Stallman <rms@gnu.org>
parents:
12411
diff
changeset
|
381 ;; Don't send emacsserver two commands in close succession. |
6fb78108d62d
(server-buffer-done): Pause between client commands,
Richard M. Stallman <rms@gnu.org>
parents:
12411
diff
changeset
|
382 ;; It cannot handle that. |
6fb78108d62d
(server-buffer-done): Pause between client commands,
Richard M. Stallman <rms@gnu.org>
parents:
12411
diff
changeset
|
383 (or first (sit-for 1)) |
6fb78108d62d
(server-buffer-done): Pause between client commands,
Richard M. Stallman <rms@gnu.org>
parents:
12411
diff
changeset
|
384 (setq first nil) |
47517
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
385 (send-string server-process |
50 | 386 (format "Close: %s Done\n" (car client))) |
47517
8e9589a87f9b
(server-log): Add `client' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46907
diff
changeset
|
387 (server-log "Close" (car client)))) |
50 | 388 (setq server-clients (delq client server-clients)))) |
389 (setq old-clients (cdr old-clients))) | |
10281
44d98e169823
(server-process-filter): Process each line separately.
Richard M. Stallman <rms@gnu.org>
parents:
10218
diff
changeset
|
390 (if (and (bufferp buffer) (buffer-name buffer)) |
21941
1baa3e876ad0
(server-buffer-done): Bind server-kill-buffer-running
Richard M. Stallman <rms@gnu.org>
parents:
19418
diff
changeset
|
391 ;; We may or may not kill this buffer; |
1baa3e876ad0
(server-buffer-done): Bind server-kill-buffer-running
Richard M. Stallman <rms@gnu.org>
parents:
19418
diff
changeset
|
392 ;; if we do, do not call server-buffer-done recursively |
1baa3e876ad0
(server-buffer-done): Bind server-kill-buffer-running
Richard M. Stallman <rms@gnu.org>
parents:
19418
diff
changeset
|
393 ;; from kill-buffer-hook. |
1baa3e876ad0
(server-buffer-done): Bind server-kill-buffer-running
Richard M. Stallman <rms@gnu.org>
parents:
19418
diff
changeset
|
394 (let ((server-kill-buffer-running t)) |
6176
1dbec303c87b
(kill-emacs-query-functions, kill-buffer-query-functions):
Richard M. Stallman <rms@gnu.org>
parents:
5749
diff
changeset
|
395 (save-excursion |
1dbec303c87b
(kill-emacs-query-functions, kill-buffer-query-functions):
Richard M. Stallman <rms@gnu.org>
parents:
5749
diff
changeset
|
396 (set-buffer buffer) |
7597
99a600c67e82
(server-done-hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents:
7553
diff
changeset
|
397 (setq server-buffer-clients nil) |
99a600c67e82
(server-done-hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents:
7553
diff
changeset
|
398 (run-hooks 'server-done-hook)) |
21941
1baa3e876ad0
(server-buffer-done): Bind server-kill-buffer-running
Richard M. Stallman <rms@gnu.org>
parents:
19418
diff
changeset
|
399 ;; Notice whether server-done-hook killed the buffer. |
1baa3e876ad0
(server-buffer-done): Bind server-kill-buffer-running
Richard M. Stallman <rms@gnu.org>
parents:
19418
diff
changeset
|
400 (if (null (buffer-name buffer)) |
1baa3e876ad0
(server-buffer-done): Bind server-kill-buffer-running
Richard M. Stallman <rms@gnu.org>
parents:
19418
diff
changeset
|
401 (setq killed t) |
1baa3e876ad0
(server-buffer-done): Bind server-kill-buffer-running
Richard M. Stallman <rms@gnu.org>
parents:
19418
diff
changeset
|
402 ;; Don't bother killing or burying the buffer |
1baa3e876ad0
(server-buffer-done): Bind server-kill-buffer-running
Richard M. Stallman <rms@gnu.org>
parents:
19418
diff
changeset
|
403 ;; when we are called from kill-buffer. |
1baa3e876ad0
(server-buffer-done): Bind server-kill-buffer-running
Richard M. Stallman <rms@gnu.org>
parents:
19418
diff
changeset
|
404 (unless for-killing |
31008
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
405 (when (and (not killed) |
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
406 server-kill-new-buffers |
40915
e26c1e76e1ca
(server-buffer-done): Test of server-existing-buffer was backwards.
Richard M. Stallman <rms@gnu.org>
parents:
39177
diff
changeset
|
407 (with-current-buffer buffer |
e26c1e76e1ca
(server-buffer-done): Test of server-existing-buffer was backwards.
Richard M. Stallman <rms@gnu.org>
parents:
39177
diff
changeset
|
408 (not server-existing-buffer))) |
31008
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
409 (setq killed t) |
34685
7218b9b8c2ad
(server-buffer-done): Bury the buffer before
Gerd Moellmann <gerd@gnu.org>
parents:
34344
diff
changeset
|
410 (bury-buffer buffer) |
31008
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
411 (kill-buffer buffer)) |
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
412 (unless killed |
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
413 (if (server-temp-file-p buffer) |
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
414 (progn |
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
415 (kill-buffer buffer) |
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
416 (setq killed t)) |
ac8beefc28a9
(server-kill-new-buffers): New user option.
Gerd Moellmann <gerd@gnu.org>
parents:
30004
diff
changeset
|
417 (bury-buffer buffer))))))) |
10961
88cba63f2a9b
(server-buffer-done): Return a list
Richard M. Stallman <rms@gnu.org>
parents:
10281
diff
changeset
|
418 (list next-buffer killed))) |
50 | 419 |
420 (defun server-temp-file-p (buffer) | |
421 "Return non-nil if BUFFER contains a file considered temporary. | |
422 These are files whose names suggest they are repeatedly | |
423 reused to pass information to another program. | |
424 | |
425 The variable `server-temp-file-regexp' controls which filenames | |
426 are considered temporary." | |
427 (and (buffer-file-name buffer) | |
428 (string-match server-temp-file-regexp (buffer-file-name buffer)))) | |
429 | |
430 (defun server-done () | |
1540 | 431 "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
|
432 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
|
433 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
|
434 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
|
435 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
|
436 specifically for the clients and did not exist before their request for it." |
50 | 437 (let ((buffer (current-buffer))) |
438 (if server-buffer-clients | |
7553
e473c5ad9e7d
(server-done): Never kill buffer here.
Richard M. Stallman <rms@gnu.org>
parents:
7300
diff
changeset
|
439 (progn |
50 | 440 (if (server-temp-file-p buffer) |
4096
badd80e9e4fc
(server-done): Let save-buffer make the backup,
Richard M. Stallman <rms@gnu.org>
parents:
3746
diff
changeset
|
441 ;; For a temp file, save, and do make a non-numeric backup |
badd80e9e4fc
(server-done): Let save-buffer make the backup,
Richard M. Stallman <rms@gnu.org>
parents:
3746
diff
changeset
|
442 ;; (unless make-backup-files is nil). |
badd80e9e4fc
(server-done): Let save-buffer make the backup,
Richard M. Stallman <rms@gnu.org>
parents:
3746
diff
changeset
|
443 (let ((version-control nil) |
badd80e9e4fc
(server-done): Let save-buffer make the backup,
Richard M. Stallman <rms@gnu.org>
parents:
3746
diff
changeset
|
444 (buffer-backed-up nil)) |
7553
e473c5ad9e7d
(server-done): Never kill buffer here.
Richard M. Stallman <rms@gnu.org>
parents:
7300
diff
changeset
|
445 (save-buffer)) |
50 | 446 (if (and (buffer-modified-p) |
17434
5fb0f4a5336f
(server-done): If buffer visits no file, don't offer save.
Richard M. Stallman <rms@gnu.org>
parents:
16805
diff
changeset
|
447 buffer-file-name |
50 | 448 (y-or-n-p (concat "Save file " buffer-file-name "? "))) |
47524
95ba2ac51138
(server-done): Fix harmlessly wrong arg to save-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47517
diff
changeset
|
449 (save-buffer))) |
7553
e473c5ad9e7d
(server-done): Never kill buffer here.
Richard M. Stallman <rms@gnu.org>
parents:
7300
diff
changeset
|
450 (server-buffer-done buffer))))) |
6176
1dbec303c87b
(kill-emacs-query-functions, kill-buffer-query-functions):
Richard M. Stallman <rms@gnu.org>
parents:
5749
diff
changeset
|
451 |
9883 | 452 ;; Ask before killing a server buffer. |
453 ;; It was suggested to release its client instead, | |
454 ;; but I think that is dangerous--the client would proceed | |
455 ;; 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
|
456 (defun server-kill-buffer-query-function () |
0983fe01e614
(server-kill-emacs-query-function)
Richard M. Stallman <rms@gnu.org>
parents:
6960
diff
changeset
|
457 (or (not server-buffer-clients) |
0983fe01e614
(server-kill-emacs-query-function)
Richard M. Stallman <rms@gnu.org>
parents:
6960
diff
changeset
|
458 (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
|
459 (buffer-name (current-buffer)))))) |
0983fe01e614
(server-kill-emacs-query-function)
Richard M. Stallman <rms@gnu.org>
parents:
6960
diff
changeset
|
460 |
6176
1dbec303c87b
(kill-emacs-query-functions, kill-buffer-query-functions):
Richard M. Stallman <rms@gnu.org>
parents:
5749
diff
changeset
|
461 (add-hook 'kill-buffer-query-functions |
6993
0983fe01e614
(server-kill-emacs-query-function)
Richard M. Stallman <rms@gnu.org>
parents:
6960
diff
changeset
|
462 'server-kill-buffer-query-function) |
6176
1dbec303c87b
(kill-emacs-query-functions, kill-buffer-query-functions):
Richard M. Stallman <rms@gnu.org>
parents:
5749
diff
changeset
|
463 |
6993
0983fe01e614
(server-kill-emacs-query-function)
Richard M. Stallman <rms@gnu.org>
parents:
6960
diff
changeset
|
464 (defun server-kill-emacs-query-function () |
7736
8c8410bc0f1b
(server-visit-files): Bind last-nonmenu-event.
Richard M. Stallman <rms@gnu.org>
parents:
7597
diff
changeset
|
465 (let (live-client |
8c8410bc0f1b
(server-visit-files): Bind last-nonmenu-event.
Richard M. Stallman <rms@gnu.org>
parents:
7597
diff
changeset
|
466 (tail server-clients)) |
8c8410bc0f1b
(server-visit-files): Bind last-nonmenu-event.
Richard M. Stallman <rms@gnu.org>
parents:
7597
diff
changeset
|
467 ;; See if any clients have any buffers that are still alive. |
8c8410bc0f1b
(server-visit-files): Bind last-nonmenu-event.
Richard M. Stallman <rms@gnu.org>
parents:
7597
diff
changeset
|
468 (while tail |
8c8410bc0f1b
(server-visit-files): Bind last-nonmenu-event.
Richard M. Stallman <rms@gnu.org>
parents:
7597
diff
changeset
|
469 (if (memq t (mapcar 'stringp (mapcar 'buffer-name (cdr (car tail))))) |
8c8410bc0f1b
(server-visit-files): Bind last-nonmenu-event.
Richard M. Stallman <rms@gnu.org>
parents:
7597
diff
changeset
|
470 (setq live-client t)) |
8c8410bc0f1b
(server-visit-files): Bind last-nonmenu-event.
Richard M. Stallman <rms@gnu.org>
parents:
7597
diff
changeset
|
471 (setq tail (cdr tail))) |
8c8410bc0f1b
(server-visit-files): Bind last-nonmenu-event.
Richard M. Stallman <rms@gnu.org>
parents:
7597
diff
changeset
|
472 (or (not live-client) |
8c8410bc0f1b
(server-visit-files): Bind last-nonmenu-event.
Richard M. Stallman <rms@gnu.org>
parents:
7597
diff
changeset
|
473 (yes-or-no-p "Server buffers still have clients; exit anyway? ")))) |
6993
0983fe01e614
(server-kill-emacs-query-function)
Richard M. Stallman <rms@gnu.org>
parents:
6960
diff
changeset
|
474 |
0983fe01e614
(server-kill-emacs-query-function)
Richard M. Stallman <rms@gnu.org>
parents:
6960
diff
changeset
|
475 (add-hook 'kill-emacs-query-functions 'server-kill-emacs-query-function) |
17712
41a4624c1e79
(server-buffer-done): New arg FOR-KILLING.
Richard M. Stallman <rms@gnu.org>
parents:
17434
diff
changeset
|
476 |
18049
f1fa9625e2b9
(server-kill-buffer): Prevent infinite recursion.
Richard M. Stallman <rms@gnu.org>
parents:
17970
diff
changeset
|
477 (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
|
478 "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
|
479 |
17712
41a4624c1e79
(server-buffer-done): New arg FOR-KILLING.
Richard M. Stallman <rms@gnu.org>
parents:
17434
diff
changeset
|
480 ;; When a buffer is killed, inform the clients. |
41a4624c1e79
(server-buffer-done): New arg FOR-KILLING.
Richard M. Stallman <rms@gnu.org>
parents:
17434
diff
changeset
|
481 (add-hook 'kill-buffer-hook 'server-kill-buffer) |
41a4624c1e79
(server-buffer-done): New arg FOR-KILLING.
Richard M. Stallman <rms@gnu.org>
parents:
17434
diff
changeset
|
482 (defun server-kill-buffer () |
18049
f1fa9625e2b9
(server-kill-buffer): Prevent infinite recursion.
Richard M. Stallman <rms@gnu.org>
parents:
17970
diff
changeset
|
483 ;; 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
|
484 ;; call kill-buffer. |
f1fa9625e2b9
(server-kill-buffer): Prevent infinite recursion.
Richard M. Stallman <rms@gnu.org>
parents:
17970
diff
changeset
|
485 (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
|
486 (and server-buffer-clients |
1baa3e876ad0
(server-buffer-done): Bind server-kill-buffer-running
Richard M. Stallman <rms@gnu.org>
parents:
19418
diff
changeset
|
487 (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
|
488 (when server-process |
1baa3e876ad0
(server-buffer-done): Bind server-kill-buffer-running
Richard M. Stallman <rms@gnu.org>
parents:
19418
diff
changeset
|
489 (server-buffer-done (current-buffer) t)))))) |
50 | 490 |
491 (defun server-edit (&optional arg) | |
492 "Switch to next server editing buffer; say \"Done\" for current buffer. | |
493 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
|
494 The buffer is also killed if it did not exist before the clients asked for it. |
50 | 495 When all of a client's buffers are marked as \"done\", the client is notified. |
496 | |
497 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
|
498 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
|
499 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
|
500 prevent a backup for it.) The variable `server-temp-file-regexp' controls |
50 | 501 which filenames are considered temporary. |
502 | |
503 If invoked with a prefix argument, or if there is no server process running, | |
504 starts server process and that is all. Invoked by \\[server-edit]." | |
505 (interactive "P") | |
506 (if (or arg | |
507 (not server-process) | |
508 (memq (process-status server-process) '(signal exit))) | |
509 (server-start nil) | |
10961
88cba63f2a9b
(server-buffer-done): Return a list
Richard M. Stallman <rms@gnu.org>
parents:
10281
diff
changeset
|
510 (apply 'server-switch-buffer (server-done)))) |
50 | 511 |
11329
ecbfde696360
(server-switch-buffer): Make first arg optional too;
Roland McGrath <roland@gnu.org>
parents:
11235
diff
changeset
|
512 (defun server-switch-buffer (&optional next-buffer killed-one) |
50 | 513 "Switch to another buffer, preferably one that has a client. |
514 Arg NEXT-BUFFER is a suggestion; if it is a live buffer, use it." | |
10961
88cba63f2a9b
(server-buffer-done): Return a list
Richard M. Stallman <rms@gnu.org>
parents:
10281
diff
changeset
|
515 ;; KILLED-ONE is t in a recursive call |
88cba63f2a9b
(server-buffer-done): Return a list
Richard M. Stallman <rms@gnu.org>
parents:
10281
diff
changeset
|
516 ;; if we have already killed one temp-file server buffer. |
88cba63f2a9b
(server-buffer-done): Return a list
Richard M. Stallman <rms@gnu.org>
parents:
10281
diff
changeset
|
517 ;; This means we should avoid the final "switch to some other buffer" |
88cba63f2a9b
(server-buffer-done): Return a list
Richard M. Stallman <rms@gnu.org>
parents:
10281
diff
changeset
|
518 ;; since we've already effectively done that. |
47524
95ba2ac51138
(server-done): Fix harmlessly wrong arg to save-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47517
diff
changeset
|
519 (if (null next-buffer) |
95ba2ac51138
(server-done): Fix harmlessly wrong arg to save-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47517
diff
changeset
|
520 (if server-clients |
95ba2ac51138
(server-done): Fix harmlessly wrong arg to save-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47517
diff
changeset
|
521 (server-switch-buffer (nth 1 (car server-clients)) killed-one) |
95ba2ac51138
(server-done): Fix harmlessly wrong arg to save-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47517
diff
changeset
|
522 (unless (or killed-one |
95ba2ac51138
(server-done): Fix harmlessly wrong arg to save-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47517
diff
changeset
|
523 (window-dedicated-p (selected-window))) |
95ba2ac51138
(server-done): Fix harmlessly wrong arg to save-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47517
diff
changeset
|
524 (switch-to-buffer (other-buffer)))) |
95ba2ac51138
(server-done): Fix harmlessly wrong arg to save-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47517
diff
changeset
|
525 (if (not (buffer-name next-buffer)) |
95ba2ac51138
(server-done): Fix harmlessly wrong arg to save-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47517
diff
changeset
|
526 ;; If NEXT-BUFFER is a dead buffer, remove the server records for it |
50 | 527 ;; 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
|
528 (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
|
529 ;; OK, we know next-buffer is live, let's display and select it. |
95ba2ac51138
(server-done): Fix harmlessly wrong arg to save-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47517
diff
changeset
|
530 (let ((win (get-buffer-window next-buffer 0))) |
95ba2ac51138
(server-done): Fix harmlessly wrong arg to save-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47517
diff
changeset
|
531 (if (and win (not server-window)) |
95ba2ac51138
(server-done): Fix harmlessly wrong arg to save-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47517
diff
changeset
|
532 ;; The buffer is already displayed: just reuse the window. |
95ba2ac51138
(server-done): Fix harmlessly wrong arg to save-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47517
diff
changeset
|
533 (let ((frame (window-frame win))) |
95ba2ac51138
(server-done): Fix harmlessly wrong arg to save-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47517
diff
changeset
|
534 (if (eq (frame-visible-p frame) 'icon) |
95ba2ac51138
(server-done): Fix harmlessly wrong arg to save-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47517
diff
changeset
|
535 (raise-frame frame)) |
95ba2ac51138
(server-done): Fix harmlessly wrong arg to save-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47517
diff
changeset
|
536 (select-window win) |
95ba2ac51138
(server-done): Fix harmlessly wrong arg to save-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47517
diff
changeset
|
537 (set-buffer next-buffer)) |
95ba2ac51138
(server-done): Fix harmlessly wrong arg to save-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47517
diff
changeset
|
538 ;; Otherwise, let's find an appropriate window. |
95ba2ac51138
(server-done): Fix harmlessly wrong arg to save-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47517
diff
changeset
|
539 (cond ((and (windowp server-window) |
95ba2ac51138
(server-done): Fix harmlessly wrong arg to save-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47517
diff
changeset
|
540 (window-live-p server-window)) |
95ba2ac51138
(server-done): Fix harmlessly wrong arg to save-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47517
diff
changeset
|
541 (select-window server-window)) |
95ba2ac51138
(server-done): Fix harmlessly wrong arg to save-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47517
diff
changeset
|
542 ((framep server-window) |
95ba2ac51138
(server-done): Fix harmlessly wrong arg to save-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47517
diff
changeset
|
543 (if (not (frame-live-p server-window)) |
95ba2ac51138
(server-done): Fix harmlessly wrong arg to save-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47517
diff
changeset
|
544 (setq server-window (make-frame))) |
95ba2ac51138
(server-done): Fix harmlessly wrong arg to save-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47517
diff
changeset
|
545 (select-window (frame-selected-window server-window)))) |
95ba2ac51138
(server-done): Fix harmlessly wrong arg to save-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47517
diff
changeset
|
546 (if (window-minibuffer-p (selected-window)) |
95ba2ac51138
(server-done): Fix harmlessly wrong arg to save-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47517
diff
changeset
|
547 (select-window (next-window nil 'nomini 0))) |
95ba2ac51138
(server-done): Fix harmlessly wrong arg to save-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47517
diff
changeset
|
548 ;; Move to a non-dedicated window, if we have one. |
95ba2ac51138
(server-done): Fix harmlessly wrong arg to save-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47517
diff
changeset
|
549 (when (window-dedicated-p (selected-window)) |
95ba2ac51138
(server-done): Fix harmlessly wrong arg to save-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47517
diff
changeset
|
550 (select-window (get-window-with-predicate |
95ba2ac51138
(server-done): Fix harmlessly wrong arg to save-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47517
diff
changeset
|
551 (lambda (w) (not (window-dedicated-p w))) |
95ba2ac51138
(server-done): Fix harmlessly wrong arg to save-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47517
diff
changeset
|
552 'nomini 'visible (selected-window)))) |
95ba2ac51138
(server-done): Fix harmlessly wrong arg to save-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47517
diff
changeset
|
553 (set-window-dedicated-p (selected-window) nil) |
95ba2ac51138
(server-done): Fix harmlessly wrong arg to save-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47517
diff
changeset
|
554 (switch-to-buffer next-buffer)))))) |
50 | 555 |
556 (global-set-key "\C-x#" 'server-edit) | |
42140
49087a9d073e
(server-unload-hook): New function.
Dave Love <fx@gnu.org>
parents:
41075
diff
changeset
|
557 |
49087a9d073e
(server-unload-hook): New function.
Dave Love <fx@gnu.org>
parents:
41075
diff
changeset
|
558 (defun server-unload-hook () |
49087a9d073e
(server-unload-hook): New function.
Dave Love <fx@gnu.org>
parents:
41075
diff
changeset
|
559 (remove-hook 'kill-buffer-query-functions 'server-kill-buffer-query-function) |
49087a9d073e
(server-unload-hook): New function.
Dave Love <fx@gnu.org>
parents:
41075
diff
changeset
|
560 (remove-hook 'kill-emacs-query-functions 'server-kill-emacs-query-function) |
49087a9d073e
(server-unload-hook): New function.
Dave Love <fx@gnu.org>
parents:
41075
diff
changeset
|
561 (remove-hook 'kill-buffer-hook 'server-kill-buffer)) |
1079 | 562 |
563 (provide 'server) | |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
445
diff
changeset
|
564 |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
445
diff
changeset
|
565 ;;; server.el ends here |