2011-02-12 02:27:53 +00:00
|
|
|
|
;;; server.el --- Lisp code for GNU Emacs running as server process -*- lexical-binding: t -*-
|
1992-05-30 21:11:25 +00:00
|
|
|
|
|
2013-01-01 09:11:05 +00:00
|
|
|
|
;; Copyright (C) 1986-1987, 1992, 1994-2013 Free Software Foundation,
|
|
|
|
|
;; Inc.
|
1992-07-22 03:58:44 +00:00
|
|
|
|
|
1992-07-15 21:31:44 +00:00
|
|
|
|
;; Author: William Sommerfeld <wesommer@athena.mit.edu>
|
1997-05-27 15:32:03 +00:00
|
|
|
|
;; Maintainer: FSF
|
1992-07-17 20:24:00 +00:00
|
|
|
|
;; Keywords: processes
|
1992-07-15 21:31:44 +00:00
|
|
|
|
|
1990-02-22 10:44:55 +00:00
|
|
|
|
;; Changes by peck@sun.com and by rms.
|
2004-05-18 19:58:00 +00:00
|
|
|
|
;; Overhaul by Karoly Lorentey <lorentey@elte.hu> for multi-tty support.
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
|
2008-05-06 08:06:51 +00:00
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
1990-02-22 10:44:55 +00:00
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 08:06:51 +00:00
|
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
;; (at your option) any later version.
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2008-05-06 08:06:51 +00:00
|
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
1992-07-15 21:31:44 +00:00
|
|
|
|
;;; Commentary:
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
1996-01-14 07:34:30 +00:00
|
|
|
|
;; This Lisp code is run in Emacs when it is to operate as
|
|
|
|
|
;; a server for other processes.
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
1996-01-14 07:34:30 +00:00
|
|
|
|
;; Load this library and do M-x server-edit to enable Emacs as a server.
|
2002-09-27 17:43:29 +00:00
|
|
|
|
;; Emacs opens up a socket for communication with clients. If there are no
|
|
|
|
|
;; client buffers to edit, server-edit acts like (switch-to-buffer
|
|
|
|
|
;; (other-buffer))
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
1996-01-14 07:34:30 +00:00
|
|
|
|
;; When some other program runs "the editor" to edit a file,
|
|
|
|
|
;; "the editor" can be the Emacs client program ../lib-src/emacsclient.
|
|
|
|
|
;; This program transmits the file names to Emacs through
|
|
|
|
|
;; the server subprocess, and Emacs visits them and lets you edit them.
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
2004-10-10 16:41:15 +00:00
|
|
|
|
;; Note that any number of clients may dispatch files to Emacs to be edited.
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
1996-01-14 07:34:30 +00:00
|
|
|
|
;; When you finish editing a Server buffer, again call server-edit
|
2003-01-13 16:44:07 +00:00
|
|
|
|
;; to mark that buffer as done for the client and switch to the next
|
|
|
|
|
;; Server buffer. When all the buffers for a client have been edited
|
1996-01-14 07:34:30 +00:00
|
|
|
|
;; and exited with server-edit, the client "editor" will return
|
2003-01-13 16:44:07 +00:00
|
|
|
|
;; to the program that invoked it.
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
1996-01-14 07:34:30 +00:00
|
|
|
|
;; Your editing commands and Emacs's display output go to and from
|
|
|
|
|
;; the terminal in the usual way. Thus, server operation is possible
|
|
|
|
|
;; only when Emacs can talk to the terminal at the time you invoke
|
|
|
|
|
;; the client. This is possible in four cases:
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
1996-01-14 07:34:30 +00:00
|
|
|
|
;; 1. On a window system, where Emacs runs in one window and the
|
|
|
|
|
;; program that wants to use "the editor" runs in another.
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
1996-01-14 07:34:30 +00:00
|
|
|
|
;; 2. On a multi-terminal system, where Emacs runs on one terminal and the
|
|
|
|
|
;; program that wants to use "the editor" runs on another.
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
1996-01-14 07:34:30 +00:00
|
|
|
|
;; 3. When the program that wants to use "the editor" is running
|
|
|
|
|
;; as a subprocess of Emacs.
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
1996-01-14 07:34:30 +00:00
|
|
|
|
;; 4. On a system with job control, when Emacs is suspended, the program
|
|
|
|
|
;; that wants to use "the editor" will stop and display
|
|
|
|
|
;; "Waiting for Emacs...". It can then be suspended, and Emacs can be
|
|
|
|
|
;; brought into the foreground for editing. When done editing, Emacs is
|
|
|
|
|
;; suspended again, and the client program is brought into the foreground.
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
2003-01-13 16:44:07 +00:00
|
|
|
|
;; The buffer local variable "server-buffer-clients" lists
|
|
|
|
|
;; the clients who are waiting for this buffer to be edited.
|
1996-01-14 07:34:30 +00:00
|
|
|
|
;; The global variable "server-clients" lists all the waiting clients,
|
|
|
|
|
;; and which files are yet to be edited for each.
|
1992-07-15 21:31:44 +00:00
|
|
|
|
|
2007-10-09 04:22:36 +00:00
|
|
|
|
;; Todo:
|
|
|
|
|
|
|
|
|
|
;; - handle command-line-args-left.
|
|
|
|
|
;; - move most of the args processing and decision making from emacsclient.c
|
|
|
|
|
;; to here.
|
|
|
|
|
;; - fix up handling of the client's environment (place it in the terminal?).
|
|
|
|
|
|
1992-07-15 21:31:44 +00:00
|
|
|
|
;;; Code:
|
2002-09-18 02:10:18 +00:00
|
|
|
|
|
More CL cleanups and reduction of use of cl.el.
* woman.el, winner.el, vc/vc-rcs.el, vc/vc-hooks.el, vc/vc-hg.el:
* vc/vc-git.el, vc/vc-dir.el, vc/vc-bzr.el, vc/vc-annotate.el:
* textmodes/tex-mode.el, textmodes/sgml-mode.el, tar-mode.el:
* strokes.el, ses.el, server.el, progmodes/js.el, progmodes/gdb-mi.el:
* progmodes/flymake.el, progmodes/ebrowse.el, progmodes/compile.el:
* play/tetris.el, play/snake.el, play/pong.el, play/landmark.el:
* play/hanoi.el, play/decipher.el, play/5x5.el, nxml/nxml-mode.el:
* net/secrets.el, net/quickurl.el, midnight.el, mail/footnote.el:
* image-dired.el, ibuffer.el, ibuf-macs.el, ibuf-ext.el, hexl.el:
* eshell/eshell.el, eshell/esh-io.el, eshell/esh-ext.el:
* eshell/esh-cmd.el, eshell/em-ls.el, eshell/em-hist.el:
* eshell/em-cmpl.el, eshell/em-banner.el:
* url/url.el, url/url-queue.el, url/url-parse.el, url/url-http.el:
* url/url-future.el, url/url-dav.el, url/url-cookie.el:
* calendar/parse-time.el, test/eshell.el: Use cl-lib.
* wid-browse.el, wdired.el, vc/vc.el, vc/vc-mtn.el, vc/vc-cvs.el:
* vc/vc-arch.el, tree-widget.el, textmodes/texinfo.el:
* textmodes/refill.el, textmodes/css-mode.el, term/tvi970.el:
* term/ns-win.el, term.el, shell.el, ps-samp.el:
* progmodes/perl-mode.el, progmodes/pascal.el, progmodes/gud.el:
* progmodes/glasses.el, progmodes/etags.el, progmodes/cwarn.el:
* play/gamegrid.el, play/bubbles.el, novice.el, notifications.el:
* net/zeroconf.el, net/xesam.el, net/snmp-mode.el, net/mairix.el:
* net/ldap.el, net/eudc.el, net/browse-url.el, man.el:
* mail/mailheader.el, mail/feedmail.el:
* url/url-util.el, url/url-privacy.el, url/url-nfs.el, url/url-misc.el:
* url/url-methods.el, url/url-gw.el, url/url-file.el, url/url-expand.el:
Dont use CL.
* ibuf-ext.el (ibuffer-mark-old-buffers): Use float-time.
* eshell/esh-opt.el (eshell-eval-using-options): Quote code with
`lambda' rather than with `quote'.
(eshell-do-opt): Adjust accordingly.
(eshell-process-option): Simplify.
* eshell/esh-var.el:
* eshell/em-script.el: Require `esh-opt' for eshell-eval-using-options.
* emacs-pcase.el (pcase--dontcare-upats, pcase--let*)
(pcase--expand, pcase--u1): Rename pcase's internal `dontcare' pattern
to `pcase--dontcare'.
* emacs-cl.el (labels): Mark obsolete.
(cl--letf, letf): Move to cl-lib.
(cl--letf*, letf*): Remove.
* emacs-cl-lib.el (cl-nth-value): Use defalias.
* emacs-cl-macs.el (cl-dolist, cl-dotimes): Add indent rule.
(cl-progv): Rewrite.
(cl--letf, cl-letf): Move from cl.el.
(cl-letf*): New macro.
* emacs-cl-extra.el (cl--progv-before, cl--progv-after): Remove.
2012-07-11 23:13:41 +00:00
|
|
|
|
(eval-when-compile (require 'cl-lib))
|
2002-09-18 02:10:18 +00:00
|
|
|
|
|
1997-08-18 20:01:25 +00:00
|
|
|
|
(defgroup server nil
|
|
|
|
|
"Emacs running as a server process."
|
|
|
|
|
:group 'external)
|
|
|
|
|
|
2006-10-30 23:24:18 +00:00
|
|
|
|
(defcustom server-use-tcp nil
|
|
|
|
|
"If non-nil, use TCP sockets instead of local sockets."
|
|
|
|
|
:set #'(lambda (sym val)
|
|
|
|
|
(unless (featurep 'make-network-process '(:family local))
|
|
|
|
|
(setq val t)
|
|
|
|
|
(unless load-in-progress
|
|
|
|
|
(message "Local sockets unsupported, using TCP sockets")))
|
|
|
|
|
(set-default sym val))
|
|
|
|
|
:group 'server
|
|
|
|
|
:type 'boolean
|
|
|
|
|
:version "22.1")
|
|
|
|
|
|
|
|
|
|
(defcustom server-host nil
|
|
|
|
|
"The name or IP address to use as host address of the server process.
|
2012-09-30 09:18:38 +00:00
|
|
|
|
If set, the server accepts remote connections; otherwise it is local.
|
|
|
|
|
|
|
|
|
|
DO NOT give this a non-nil value unless you know what you are
|
|
|
|
|
doing! On unsecured networks, accepting remote connections is
|
|
|
|
|
very dangerous, because server-client communication (including
|
|
|
|
|
session authentication) is not encrypted."
|
2006-10-30 23:24:18 +00:00
|
|
|
|
:group 'server
|
|
|
|
|
:type '(choice
|
|
|
|
|
(string :tag "Name or IP address")
|
|
|
|
|
(const :tag "Local" nil))
|
|
|
|
|
:version "22.1")
|
2010-10-27 06:42:15 +00:00
|
|
|
|
;;;###autoload
|
2006-10-30 23:24:18 +00:00
|
|
|
|
(put 'server-host 'risky-local-variable t)
|
|
|
|
|
|
2010-10-26 07:40:07 +00:00
|
|
|
|
(defcustom server-port nil
|
2011-08-28 18:46:38 +00:00
|
|
|
|
"The port number that the server process should listen on.
|
|
|
|
|
This variable only takes effect when the Emacs server is using
|
|
|
|
|
TCP instead of local sockets. A nil value means to use a random
|
|
|
|
|
port number."
|
2010-10-26 07:40:07 +00:00
|
|
|
|
:group 'server
|
|
|
|
|
:type '(choice
|
|
|
|
|
(string :tag "Port number")
|
|
|
|
|
(const :tag "Random" nil))
|
|
|
|
|
:version "24.1")
|
2010-10-27 06:42:15 +00:00
|
|
|
|
;;;###autoload
|
|
|
|
|
(put 'server-port 'risky-local-variable t)
|
2010-10-26 07:40:07 +00:00
|
|
|
|
|
2008-10-24 09:39:27 +00:00
|
|
|
|
(defcustom server-auth-dir (locate-user-emacs-file "server/")
|
2009-09-19 14:56:04 +00:00
|
|
|
|
"Directory for server authentication files.
|
2012-02-02 07:48:39 +00:00
|
|
|
|
We only use this if `server-use-tcp' is non-nil.
|
|
|
|
|
Otherwise we use `server-socket-dir'.
|
2009-09-19 14:56:04 +00:00
|
|
|
|
|
|
|
|
|
NOTE: On FAT32 filesystems, directories are not secure;
|
|
|
|
|
files can be read and modified by any user or process.
|
|
|
|
|
It is strongly suggested to set `server-auth-dir' to a
|
|
|
|
|
directory residing in a NTFS partition instead."
|
2006-10-30 23:24:18 +00:00
|
|
|
|
:group 'server
|
|
|
|
|
:type 'directory
|
|
|
|
|
:version "22.1")
|
2010-10-27 06:42:15 +00:00
|
|
|
|
;;;###autoload
|
2006-10-30 23:24:18 +00:00
|
|
|
|
(put 'server-auth-dir 'risky-local-variable t)
|
|
|
|
|
|
2012-04-14 11:16:17 +00:00
|
|
|
|
(defcustom server-auth-key nil
|
|
|
|
|
"Server authentication key.
|
2012-09-30 09:18:38 +00:00
|
|
|
|
This is only used if `server-use-tcp' is non-nil.
|
2012-04-14 11:16:17 +00:00
|
|
|
|
|
2012-04-14 12:58:29 +00:00
|
|
|
|
Normally, the authentication key is randomly generated when the
|
2012-09-30 09:18:38 +00:00
|
|
|
|
server starts. It is recommended to leave it that way. Using a
|
|
|
|
|
long-lived shared key will decrease security (especially since
|
|
|
|
|
the key is transmitted as plain-text).
|
2012-04-14 11:16:17 +00:00
|
|
|
|
|
|
|
|
|
In some situations however, it can be difficult to share randomly
|
2012-04-14 12:58:29 +00:00
|
|
|
|
generated passwords with remote hosts (eg. no shared directory),
|
|
|
|
|
so you can set the key with this variable and then copy the
|
|
|
|
|
server file to the remote host (with possible changes to IP
|
|
|
|
|
address and/or port if that applies).
|
2012-04-14 11:16:17 +00:00
|
|
|
|
|
2012-09-30 09:18:38 +00:00
|
|
|
|
Note that the usual security risks of using the server over
|
|
|
|
|
remote TCP, arising from the fact that client-server
|
|
|
|
|
communications are unencrypted, still apply.
|
2012-04-14 11:16:17 +00:00
|
|
|
|
|
2012-09-30 09:18:38 +00:00
|
|
|
|
The key must consist of 64 ASCII printable characters except for
|
|
|
|
|
space (this means characters from ! to ~; or from code 33 to
|
|
|
|
|
126). You can use \\[server-generate-key] to get a random key."
|
2012-04-14 11:16:17 +00:00
|
|
|
|
:group 'server
|
|
|
|
|
:type '(choice
|
|
|
|
|
(const :tag "Random" nil)
|
|
|
|
|
(string :tag "Password"))
|
2012-08-15 16:29:11 +00:00
|
|
|
|
:version "24.3")
|
2012-04-14 11:16:17 +00:00
|
|
|
|
|
2006-11-10 09:46:51 +00:00
|
|
|
|
(defcustom server-raise-frame t
|
2006-11-27 20:58:37 +00:00
|
|
|
|
"If non-nil, raise frame when switching to a buffer."
|
2006-11-10 09:46:51 +00:00
|
|
|
|
:group 'server
|
|
|
|
|
:type 'boolean
|
|
|
|
|
:version "22.1")
|
|
|
|
|
|
1997-08-18 20:01:25 +00:00
|
|
|
|
(defcustom server-visit-hook nil
|
2006-11-27 20:58:37 +00:00
|
|
|
|
"Hook run when visiting a file for the Emacs server."
|
1997-08-18 20:01:25 +00:00
|
|
|
|
:group 'server
|
2002-09-25 19:54:13 +00:00
|
|
|
|
:type 'hook)
|
1997-08-18 20:01:25 +00:00
|
|
|
|
|
|
|
|
|
(defcustom server-switch-hook nil
|
2006-11-27 20:58:37 +00:00
|
|
|
|
"Hook run when switching to a buffer for the Emacs server."
|
1997-08-18 20:01:25 +00:00
|
|
|
|
:group 'server
|
2002-09-25 19:54:13 +00:00
|
|
|
|
:type 'hook)
|
1997-08-18 20:01:25 +00:00
|
|
|
|
|
|
|
|
|
(defcustom server-done-hook nil
|
2006-11-27 20:58:37 +00:00
|
|
|
|
"Hook run when done editing a buffer for the Emacs server."
|
1997-08-18 20:01:25 +00:00
|
|
|
|
:group 'server
|
2002-09-25 19:54:13 +00:00
|
|
|
|
:type 'hook)
|
1994-05-20 23:48:12 +00:00
|
|
|
|
|
2003-01-13 16:44:07 +00:00
|
|
|
|
(defvar server-process nil
|
|
|
|
|
"The current server process.")
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
|
|
|
|
(defvar server-clients nil
|
|
|
|
|
"List of current server clients.
|
(server-clients): Only keep procs, no properties any more.
(server-client): Remove.
(server-client-get, server-client-set): Remove, replace all callers by
process-get and process-put resp.
(server-clients-with, server-add-client, server-delete-client)
(server-create-tty-frame, server-create-window-system-frame)
(server-process-filter, server-execute, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer)
(server-save-buffers-kill-terminal): Update accordingly.
2007-09-16 05:16:42 +00:00
|
|
|
|
Each element is a process.")
|
Bugfix festival.
lib-src/emacsclient.c (main_argc, main_argv): New variables.
(main): Initialize them.
(fail): Use them.
(window_change, copy_from_to): Don't kill if emacs_pid is zero.
(pty_conversation): Watch the command socket, too. Read emacs_pid
here. Emacs and emacsclient could deadlock if Emacs tried to do a
reset_sys_modes before sending its pid.
lisp/server.el: Automatically delete the client frame when done editing.
(server-frames): New variable.
(server-process-filter, server-sentinel, server-buffer-done): Use it.
(server-process-filter): Do a redisplay before evaluating other
parameters. (Prevents "emacsclient -h -e '(delete-frame)'" from
messing up the system.
src/dispextern.h: Update prototypes.
src/dispnew.c (window_change_signal): Do nothing if !term_initted.
(init_display): Set the frame size from the tty data after term_init.
src/emacs.c (main): Make sure things that init_sys_modes needs are
initialized before init_display (which calls init_sys_modes now).
(sort_args): Use xfree, not free.
(shut_down_emacs) [!EMACS_HAVE_TTY_PGRP]: Use reset_all_sys_modes
instead of reset_sys_modes.
src/frame.c (make_terminal_frame): Sigh. Move terminal initialization
back to the middle of frame setup. Handle errors by making sure that
the delete_tty() called from term_init() will see and delete this
frame.
(Fdelete_frame): Kill the frame before calling delete_tty(). Fix
condition for tty deletion.
src/keyboard.c (Fset_input_mode): Use reset_sys_modes on the current
terminal only.
src/lisp.h: Remove duplicate prototypes.
src/msdos.c (croak): use reset_all_sys_modes().
src/sysdeps.c (init_baud_rate): Added tty parameter, use it instead of CURTTY.
(child_setup_tty): Reset sigio on stdin, not CURTTY().
(reset_sigio): Added fd parameter, put explicit fcntl there.
(request_sigio, unrequest_sigio)[FASYNC]: Simply block/unblock the
SIGIO signal, don't touch the file params. There are multiple ttys
now, and we can't disable the SIGIO from emacsclient.
(get_tty_size)[VMS]: Use tty_out instead of CURTTY().
(reset_sys_modes): Don't call cursor_to, clear_end_of_line; call
cmgoto and tty_clear_end_of_line instead. The frame may already be
dead. Updated reset_sigio call.
src/term.c (clear_and_of_line): Separate tty-dependent stuff to
tty_clear_end_of_line() for reset_sys_modes.
(tty_clear_end_of_line): New function.
(term_init): Added frame parameter, don't use selected_frame.
Set the frame's output_data.tty value (in case there is an error
later). Set the frame size in Wcm, not in the frame. Only free the
termcap buffer if there is a termcap-related error. Call
init_sys_modes last, not first.
(deleting_tty): New variable.
(delete_tty): Use it for handling recursive calls. Free deleted tty,
except its Wcm (there is still a dangling reference somewhere).
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-19
2003-12-29 07:16:26 +00:00
|
|
|
|
|
1990-02-22 10:44:55 +00:00
|
|
|
|
(defvar server-buffer-clients nil
|
2006-02-23 02:59:27 +00:00
|
|
|
|
"List of client processes requesting editing of current buffer.")
|
1994-03-03 19:23:59 +00:00
|
|
|
|
(make-variable-buffer-local 'server-buffer-clients)
|
1990-02-22 10:44:55 +00:00
|
|
|
|
;; Changing major modes should not erase this local.
|
|
|
|
|
(put 'server-buffer-clients 'permanent-local t)
|
|
|
|
|
|
2003-01-15 17:49:32 +00:00
|
|
|
|
(defcustom server-window nil
|
2006-11-27 20:58:37 +00:00
|
|
|
|
"Specification of the window to use for selecting Emacs server buffers.
|
1993-06-11 18:28:44 +00:00
|
|
|
|
If nil, use the selected window.
|
2002-11-02 05:29:13 +00:00
|
|
|
|
If it is a function, it should take one argument (a buffer) and
|
2003-01-15 17:49:32 +00:00
|
|
|
|
display and select it. A common value is `pop-to-buffer'.
|
|
|
|
|
If it is a window, use that.
|
|
|
|
|
If it is a frame, use the frame's selected window.
|
|
|
|
|
|
|
|
|
|
It is not meaningful to set this to a specific frame or window with Custom.
|
|
|
|
|
Only programs can do so."
|
|
|
|
|
:group 'server
|
2005-02-09 15:50:47 +00:00
|
|
|
|
:version "22.1"
|
2003-01-15 17:49:32 +00:00
|
|
|
|
:type '(choice (const :tag "Use selected window"
|
|
|
|
|
:match (lambda (widget value)
|
|
|
|
|
(not (functionp value)))
|
|
|
|
|
nil)
|
2007-07-31 13:14:33 +00:00
|
|
|
|
(function-item :tag "Display in new frame" switch-to-buffer-other-frame)
|
2003-01-15 17:49:32 +00:00
|
|
|
|
(function-item :tag "Use pop-to-buffer" pop-to-buffer)
|
|
|
|
|
(function :tag "Other function")))
|
1993-06-11 18:28:44 +00:00
|
|
|
|
|
1997-08-18 20:01:25 +00:00
|
|
|
|
(defcustom server-temp-file-regexp "^/tmp/Re\\|/draft$"
|
2006-11-27 20:58:37 +00:00
|
|
|
|
"Regexp matching names of temporary files.
|
2003-01-15 17:49:32 +00:00
|
|
|
|
These are deleted and reused after each edit by the programs that
|
|
|
|
|
invoke the Emacs server."
|
1997-08-18 20:01:25 +00:00
|
|
|
|
:group 'server
|
|
|
|
|
:type 'regexp)
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
2000-08-21 15:26:01 +00:00
|
|
|
|
(defcustom server-kill-new-buffers t
|
2006-11-27 20:58:37 +00:00
|
|
|
|
"Whether to kill buffers when done with them.
|
2000-08-21 15:26:01 +00:00
|
|
|
|
If non-nil, kill a buffer unless it already existed before editing
|
2007-10-06 01:44:51 +00:00
|
|
|
|
it with the Emacs server. If nil, kill only buffers as specified by
|
2000-08-21 15:26:01 +00:00
|
|
|
|
`server-temp-file-regexp'.
|
2007-10-06 01:44:51 +00:00
|
|
|
|
Please note that only buffers that still have a client are killed,
|
2008-11-18 16:27:06 +00:00
|
|
|
|
i.e. buffers visited with \"emacsclient --no-wait\" are never killed
|
|
|
|
|
in this way."
|
2000-08-21 15:26:01 +00:00
|
|
|
|
:group 'server
|
|
|
|
|
:type 'boolean
|
|
|
|
|
:version "21.1")
|
|
|
|
|
|
1990-02-22 10:44:55 +00:00
|
|
|
|
(or (assq 'server-buffer-clients minor-mode-alist)
|
2006-11-01 21:37:11 +00:00
|
|
|
|
(push '(server-buffer-clients " Server") minor-mode-alist))
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
2000-08-21 15:26:01 +00:00
|
|
|
|
(defvar server-existing-buffer nil
|
2002-09-18 12:19:57 +00:00
|
|
|
|
"Non-nil means the buffer existed before the server was asked to visit it.
|
2001-11-11 17:56:23 +00:00
|
|
|
|
This means that the server should not kill the buffer when you say you
|
2002-09-18 12:19:57 +00:00
|
|
|
|
are done with it in the server.")
|
2000-08-21 15:26:01 +00:00
|
|
|
|
(make-variable-buffer-local 'server-existing-buffer)
|
|
|
|
|
|
2009-01-23 04:52:40 +00:00
|
|
|
|
(defcustom server-name "server"
|
|
|
|
|
"The name of the Emacs server, if this Emacs process creates one.
|
|
|
|
|
The command `server-start' makes use of this. It should not be
|
|
|
|
|
changed while a server is running."
|
|
|
|
|
:group 'server
|
|
|
|
|
:type 'string
|
|
|
|
|
:version "23.1")
|
2004-03-11 18:35:20 +00:00
|
|
|
|
|
2009-02-07 21:59:35 +00:00
|
|
|
|
;; We do not use `temporary-file-directory' here, because emacsclient
|
|
|
|
|
;; does not read the init file.
|
2008-10-29 10:42:31 +00:00
|
|
|
|
(defvar server-socket-dir
|
2008-11-18 16:27:06 +00:00
|
|
|
|
(and (featurep 'make-network-process '(:family local))
|
|
|
|
|
(format "%s/emacs%d" (or (getenv "TMPDIR") "/tmp") (user-uid)))
|
|
|
|
|
"The directory in which to place the server socket.
|
|
|
|
|
If local sockets are not supported, this is nil.")
|
2002-09-25 19:54:13 +00:00
|
|
|
|
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
(defun server-clients-with (property value)
|
|
|
|
|
"Return a list of clients with PROPERTY set to VALUE."
|
|
|
|
|
(let (result)
|
2011-06-01 19:32:04 +00:00
|
|
|
|
(dolist (proc server-clients)
|
(server-clients): Only keep procs, no properties any more.
(server-client): Remove.
(server-client-get, server-client-set): Remove, replace all callers by
process-get and process-put resp.
(server-clients-with, server-add-client, server-delete-client)
(server-create-tty-frame, server-create-window-system-frame)
(server-process-filter, server-execute, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer)
(server-save-buffers-kill-terminal): Update accordingly.
2007-09-16 05:16:42 +00:00
|
|
|
|
(when (equal value (process-get proc property))
|
2011-06-01 19:32:04 +00:00
|
|
|
|
(push proc result)))
|
|
|
|
|
result))
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
|
|
|
|
|
(defun server-add-client (proc)
|
|
|
|
|
"Create a client for process PROC, if it doesn't already have one.
|
|
|
|
|
New clients have no properties."
|
(server-clients): Only keep procs, no properties any more.
(server-client): Remove.
(server-client-get, server-client-set): Remove, replace all callers by
process-get and process-put resp.
(server-clients-with, server-add-client, server-delete-client)
(server-create-tty-frame, server-create-window-system-frame)
(server-process-filter, server-execute, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer)
(server-save-buffers-kill-terminal): Update accordingly.
2007-09-16 05:16:42 +00:00
|
|
|
|
(add-to-list 'server-clients proc))
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
|
2005-11-19 19:17:56 +00:00
|
|
|
|
(defmacro server-with-environment (env vars &rest body)
|
|
|
|
|
"Evaluate BODY with environment variables VARS set to those in ENV.
|
2004-10-10 18:11:21 +00:00
|
|
|
|
The environment variables are then restored to their previous values.
|
|
|
|
|
|
2005-11-19 19:17:56 +00:00
|
|
|
|
VARS should be a list of strings.
|
|
|
|
|
ENV should be in the same format as `process-environment'."
|
2004-10-10 18:11:21 +00:00
|
|
|
|
(declare (indent 2))
|
2007-09-16 04:53:39 +00:00
|
|
|
|
(let ((var (make-symbol "var"))
|
|
|
|
|
(value (make-symbol "value")))
|
|
|
|
|
`(let ((process-environment process-environment))
|
2005-11-19 19:17:56 +00:00
|
|
|
|
(dolist (,var ,vars)
|
2007-09-21 07:10:07 +00:00
|
|
|
|
(let ((,value (getenv-internal ,var ,env)))
|
2009-02-11 09:22:59 +00:00
|
|
|
|
(push (if (stringp ,value)
|
|
|
|
|
(concat ,var "=" ,value)
|
|
|
|
|
,var)
|
2007-09-16 04:53:39 +00:00
|
|
|
|
process-environment)))
|
|
|
|
|
(progn ,@body))))
|
2004-10-10 18:11:21 +00:00
|
|
|
|
|
(server-clients): Only keep procs, no properties any more.
(server-client): Remove.
(server-client-get, server-client-set): Remove, replace all callers by
process-get and process-put resp.
(server-clients-with, server-add-client, server-delete-client)
(server-create-tty-frame, server-create-window-system-frame)
(server-process-filter, server-execute, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer)
(server-save-buffers-kill-terminal): Update accordingly.
2007-09-16 05:16:42 +00:00
|
|
|
|
(defun server-delete-client (proc &optional noframe)
|
2007-10-28 15:17:08 +00:00
|
|
|
|
"Delete PROC, including its buffers, terminals and frames.
|
2008-11-18 16:27:06 +00:00
|
|
|
|
If NOFRAME is non-nil, let the frames live.
|
|
|
|
|
Updates `server-clients'."
|
2007-12-10 03:51:25 +00:00
|
|
|
|
(server-log (concat "server-delete-client" (if noframe " noframe")) proc)
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
;; Force a new lookup of client (prevents infinite recursion).
|
(server-clients): Only keep procs, no properties any more.
(server-client): Remove.
(server-client-get, server-client-set): Remove, replace all callers by
process-get and process-put resp.
(server-clients-with, server-add-client, server-delete-client)
(server-create-tty-frame, server-create-window-system-frame)
(server-process-filter, server-execute, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer)
(server-save-buffers-kill-terminal): Update accordingly.
2007-09-16 05:16:42 +00:00
|
|
|
|
(when (memq proc server-clients)
|
|
|
|
|
(let ((buffers (process-get proc 'buffers)))
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
|
2006-02-23 02:59:27 +00:00
|
|
|
|
;; Kill the client's buffers.
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
(dolist (buf buffers)
|
2004-04-19 14:16:10 +00:00
|
|
|
|
(when (buffer-live-p buf)
|
|
|
|
|
(with-current-buffer buf
|
|
|
|
|
;; Kill the buffer if necessary.
|
2006-02-23 02:59:27 +00:00
|
|
|
|
(when (and (equal server-buffer-clients
|
|
|
|
|
(list proc))
|
2004-04-19 14:16:10 +00:00
|
|
|
|
(or (and server-kill-new-buffers
|
|
|
|
|
(not server-existing-buffer))
|
2006-02-23 02:59:27 +00:00
|
|
|
|
(server-temp-file-p))
|
|
|
|
|
(not (buffer-modified-p)))
|
|
|
|
|
(let (flag)
|
|
|
|
|
(unwind-protect
|
|
|
|
|
(progn (setq server-buffer-clients nil)
|
|
|
|
|
(kill-buffer (current-buffer))
|
|
|
|
|
(setq flag t))
|
|
|
|
|
(unless flag
|
|
|
|
|
;; Restore clients if user pressed C-g in `kill-buffer'.
|
|
|
|
|
(setq server-buffer-clients (list proc)))))))))
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
|
2006-01-02 07:50:53 +00:00
|
|
|
|
;; Delete the client's frames.
|
|
|
|
|
(unless noframe
|
|
|
|
|
(dolist (frame (frame-list))
|
|
|
|
|
(when (and (frame-live-p frame)
|
|
|
|
|
(equal proc (frame-parameter frame 'client)))
|
|
|
|
|
;; Prevent `server-handle-delete-frame' from calling us
|
|
|
|
|
;; recursively.
|
|
|
|
|
(set-frame-parameter frame 'client nil)
|
|
|
|
|
(delete-frame frame))))
|
|
|
|
|
|
(server-clients): Only keep procs, no properties any more.
(server-client): Remove.
(server-client-get, server-client-set): Remove, replace all callers by
process-get and process-put resp.
(server-clients-with, server-add-client, server-delete-client)
(server-create-tty-frame, server-create-window-system-frame)
(server-process-filter, server-execute, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer)
(server-save-buffers-kill-terminal): Update accordingly.
2007-09-16 05:16:42 +00:00
|
|
|
|
(setq server-clients (delq proc server-clients))
|
2006-02-23 02:59:27 +00:00
|
|
|
|
|
2011-12-04 17:13:01 +00:00
|
|
|
|
;; Delete the client's tty, except on Windows (both GUI and console),
|
|
|
|
|
;; where there's only one terminal and does not make sense to delete it.
|
|
|
|
|
(unless (eq system-type 'windows-nt)
|
|
|
|
|
(let ((terminal (process-get proc 'terminal)))
|
|
|
|
|
;; Only delete the terminal if it is non-nil.
|
|
|
|
|
(when (and terminal (eq (terminal-live-p terminal) t))
|
|
|
|
|
(delete-terminal terminal))))
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
|
|
|
|
|
;; Delete the client's process.
|
(server-clients): Only keep procs, no properties any more.
(server-client): Remove.
(server-client-get, server-client-set): Remove, replace all callers by
process-get and process-put resp.
(server-clients-with, server-add-client, server-delete-client)
(server-create-tty-frame, server-create-window-system-frame)
(server-process-filter, server-execute, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer)
(server-save-buffers-kill-terminal): Update accordingly.
2007-09-16 05:16:42 +00:00
|
|
|
|
(if (eq (process-status proc) 'open)
|
|
|
|
|
(delete-process proc))
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
|
|
|
|
|
(server-log "Deleted" proc))))
|
|
|
|
|
|
2008-01-21 12:06:59 +00:00
|
|
|
|
(defvar server-log-time-function 'current-time-string
|
2008-01-27 22:47:58 +00:00
|
|
|
|
"Function to generate timestamps for `server-buffer'.")
|
2008-01-21 12:06:59 +00:00
|
|
|
|
|
2008-01-26 21:54:44 +00:00
|
|
|
|
(defconst server-buffer " *server*"
|
|
|
|
|
"Buffer used internally by Emacs's server.
|
|
|
|
|
One use is to log the I/O for debugging purposes (see `server-log'),
|
|
|
|
|
the other is to provide a current buffer in which the process filter can
|
2008-01-27 22:47:58 +00:00
|
|
|
|
safely let-bind buffer-local variables like `default-directory'.")
|
2008-01-26 21:54:44 +00:00
|
|
|
|
|
|
|
|
|
(defvar server-log nil
|
|
|
|
|
"If non-nil, log the server's inputs and outputs in the `server-buffer'.")
|
|
|
|
|
|
2002-09-18 02:10:18 +00:00
|
|
|
|
(defun server-log (string &optional client)
|
2008-01-26 21:54:44 +00:00
|
|
|
|
"If `server-log' is non-nil, log STRING to `server-buffer'.
|
2007-10-28 15:17:08 +00:00
|
|
|
|
If CLIENT is non-nil, add a description of it to the logged message."
|
2008-01-26 21:54:44 +00:00
|
|
|
|
(when server-log
|
|
|
|
|
(with-current-buffer (get-buffer-create server-buffer)
|
2006-10-30 23:24:18 +00:00
|
|
|
|
(goto-char (point-max))
|
2008-01-21 12:06:59 +00:00
|
|
|
|
(insert (funcall server-log-time-function)
|
2006-12-03 15:03:30 +00:00
|
|
|
|
(cond
|
2011-02-10 18:53:49 +00:00
|
|
|
|
((null client) " ")
|
|
|
|
|
((listp client) (format " %s: " (car client)))
|
|
|
|
|
(t (format " %s: " client)))
|
2006-10-30 23:24:18 +00:00
|
|
|
|
string)
|
|
|
|
|
(or (bolp) (newline)))))
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
|
|
|
|
(defun server-sentinel (proc msg)
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
"The process sentinel for Emacs server connections."
|
2005-10-24 11:06:03 +00:00
|
|
|
|
;; If this is a new client process, set the query-on-exit flag to nil
|
|
|
|
|
;; for this process (it isn't inherited from the server process).
|
|
|
|
|
(when (and (eq (process-status proc) 'open)
|
|
|
|
|
(process-query-on-exit-flag proc))
|
|
|
|
|
(set-process-query-on-exit-flag proc nil))
|
2006-11-02 23:46:14 +00:00
|
|
|
|
;; Delete the associated connection file, if applicable.
|
2008-12-12 00:33:30 +00:00
|
|
|
|
;; Although there's no 100% guarantee that the file is owned by the
|
|
|
|
|
;; running Emacs instance, server-start uses server-running-p to check
|
|
|
|
|
;; for possible servers before doing anything, so it *should* be ours.
|
|
|
|
|
(and (process-contact proc :server)
|
|
|
|
|
(eq (process-status proc) 'closed)
|
2010-05-01 02:19:40 +00:00
|
|
|
|
(ignore-errors
|
2011-02-10 18:53:49 +00:00
|
|
|
|
(delete-file (process-get proc :server-file))))
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
(server-log (format "Status changed to %s: %s" (process-status proc) msg) proc)
|
|
|
|
|
(server-delete-client proc))
|
2002-09-25 19:54:13 +00:00
|
|
|
|
|
2012-04-04 17:13:00 +00:00
|
|
|
|
(defun server--on-display-p (frame display)
|
|
|
|
|
(and (equal (frame-parameter frame 'display) display)
|
|
|
|
|
;; Note: TTY frames still get a `display' parameter set to the value of
|
|
|
|
|
;; $DISPLAY. This is useful when running from that tty frame
|
|
|
|
|
;; sub-processes that want to connect to the X server, but that means we
|
|
|
|
|
;; have to be careful here not to be tricked into thinking those frames
|
|
|
|
|
;; are on `display'.
|
|
|
|
|
(not (eq (framep frame) t))))
|
|
|
|
|
|
2007-09-16 04:53:39 +00:00
|
|
|
|
(defun server-select-display (display)
|
|
|
|
|
;; If the current frame is on `display' we're all set.
|
2008-11-18 16:27:06 +00:00
|
|
|
|
;; Similarly if we are unable to open frames on other displays, there's
|
2007-10-17 16:22:48 +00:00
|
|
|
|
;; nothing more we can do.
|
|
|
|
|
(unless (or (not (fboundp 'make-frame-on-display))
|
2012-04-04 17:13:00 +00:00
|
|
|
|
(server--on-display-p (selected-frame) display))
|
2007-09-16 04:53:39 +00:00
|
|
|
|
;; Otherwise, look for an existing frame there and select it.
|
|
|
|
|
(dolist (frame (frame-list))
|
2012-04-04 17:13:00 +00:00
|
|
|
|
(when (server--on-display-p frame display)
|
2007-09-16 04:53:39 +00:00
|
|
|
|
(select-frame frame)))
|
|
|
|
|
;; If there's no frame on that display yet, create and select one.
|
2012-04-04 17:13:00 +00:00
|
|
|
|
(unless (server--on-display-p (selected-frame) display)
|
2007-09-16 04:53:39 +00:00
|
|
|
|
(let* ((buffer (generate-new-buffer " *server-dummy*"))
|
|
|
|
|
(frame (make-frame-on-display
|
|
|
|
|
display
|
|
|
|
|
;; Make it display (and remember) some dummy buffer, so
|
|
|
|
|
;; we can detect later if the frame is in use or not.
|
2007-12-10 03:51:25 +00:00
|
|
|
|
`((server-dummy-buffer . ,buffer)
|
2007-09-16 04:53:39 +00:00
|
|
|
|
;; This frame may be deleted later (see
|
|
|
|
|
;; server-unselect-display) so we want it to be as
|
|
|
|
|
;; unobtrusive as possible.
|
|
|
|
|
(visibility . nil)))))
|
|
|
|
|
(select-frame frame)
|
|
|
|
|
(set-window-buffer (selected-window) buffer)
|
|
|
|
|
frame))))
|
|
|
|
|
|
|
|
|
|
(defun server-unselect-display (frame)
|
|
|
|
|
(when (frame-live-p frame)
|
|
|
|
|
;; If the temporary frame is in use (displays something real), make it
|
|
|
|
|
;; visible. If not (which can happen if the user's customizations call
|
|
|
|
|
;; pop-to-buffer etc.), delete it to avoid preserving the connection after
|
|
|
|
|
;; the last real frame is deleted.
|
2012-02-08 08:02:17 +00:00
|
|
|
|
|
|
|
|
|
;; Rewritten to avoid inadvertently killing the current buffer after
|
|
|
|
|
;; `delete-frame' removed FRAME (Bug#10729).
|
|
|
|
|
(let ((buffer (frame-parameter frame 'server-dummy-buffer)))
|
2012-02-08 16:48:25 +00:00
|
|
|
|
(if (and (one-window-p 'nomini frame)
|
|
|
|
|
(eq (window-buffer (frame-first-window frame)) buffer))
|
|
|
|
|
;; The temp frame still only shows one buffer, and that is the
|
|
|
|
|
;; internal temp buffer.
|
|
|
|
|
(delete-frame frame)
|
|
|
|
|
(set-frame-parameter frame 'visibility t)
|
|
|
|
|
(set-frame-parameter frame 'server-dummy-buffer nil))
|
2012-02-08 14:59:05 +00:00
|
|
|
|
(when (buffer-live-p buffer)
|
|
|
|
|
(kill-buffer buffer)))))
|
2007-09-16 04:53:39 +00:00
|
|
|
|
|
2004-02-19 23:55:51 +00:00
|
|
|
|
(defun server-handle-delete-frame (frame)
|
2008-11-18 16:27:06 +00:00
|
|
|
|
"Delete the client connection when the emacsclient frame is deleted.
|
|
|
|
|
\(To be used from `delete-frame-functions'.)"
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
(let ((proc (frame-parameter frame 'client)))
|
2005-07-06 01:41:56 +00:00
|
|
|
|
(when (and (frame-live-p frame)
|
|
|
|
|
proc
|
2006-01-02 07:50:53 +00:00
|
|
|
|
;; See if this is the last frame for this client.
|
2006-01-02 09:07:22 +00:00
|
|
|
|
(>= 1 (let ((frame-num 0))
|
2011-02-10 18:53:49 +00:00
|
|
|
|
(dolist (f (frame-list))
|
|
|
|
|
(when (eq proc (frame-parameter f 'client))
|
|
|
|
|
(setq frame-num (1+ frame-num))))
|
|
|
|
|
frame-num)))
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
(server-log (format "server-handle-delete-frame, frame %s" frame) proc)
|
2004-04-19 14:21:37 +00:00
|
|
|
|
(server-delete-client proc 'noframe)))) ; Let delete-frame delete the frame later.
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
|
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
* src/termhooks.h (struct device): Rename to `terminal'. Rename member
`next_device' to `next_terminal'.
(device_list): Rename to `terminal_list'.
(FRAME_DEVICE): Rename to `FRAME_TERMINAL'.
(DEVICE_TERMINAL_CODING): Rename to `TERMINAL_TERMINAL_CODING'.
(TERMINAL_KEYBOARD_CODING): Rename to `TERMINAL_KEYBOARD_CODING'.
(DEVICE_ACTIVE_P): Rename to `TERMINAL_ACTIVE_P'.
Update declarations and macro definitions.
* src/termchar.h (tty_display_info): Rename member `device' to `terminal'.
(FRAME_TTY): Update for renames.
* src/xterm.h (x_display_info): Rename member `device' to `terminal'.
* src/frame.h (frame): Rename `device' member to `terminal'.
(FRAME_KBOARD, FRAME_LIVE_P, Qdevice, Qdisplay_live_p):
Update for renames.
* src/lisp.h (set_process_environment): Rename to `set_global_environment'.
(device): Rename to `terminal'.
* src/dispextern.h: Update declarations and macro definitions.
* src/terminal.c (device_list): Rename to `terminal_list'.
(next_device_id): Rename to `next_terminal_id'.
(initial_device): Rename to `initial_terminal'.
(get_device): Rename to `get_terminal'.
(create_device): Rename to `create_terminal'.
(mark_devices): Rename to `mark_terminals'.
(delete_device): Rename to `delete_terminal'.
(Fdelete_display): Rename to `Fdelete_terminal'.
(Fframe_terminal): Move here from frame.c.
(Fdisplay_live_p): Rename to `Fterminal_live_p'.
(Fdisplay_list): Rename to `Fterminal_list'.
(Fdisplay_name): Rename to `Fterminal_name'.
(init_initial_device): Rename to `init_initial_terminal'.
(delete_initial_device): Rename to `delete_initial_terminal'.
(ring_bell, update_begin, update_end, set_terminal_window)
(cursor_to, raw_cursor_to, clear_to_end, clear_frame)
(clear_end_of_line, write_glyphs, insert_glyphs, delete_glyphs)
(ins_del_lines, get_terminal_param, store_terminal_param)
(Fterminal_parameters, Fterminal_parameter)
(Fmodify_terminal_parameters, Fset_terminal_parameter)
(syms_of_terminal): Update for renames.
* src/term.c (get_tty_device): Rename to `get_tty_terminal'. Update.
(Fdisplay_tty_type): Rename to `Ftty_type'.
(Fdisplay_controlling_tty_p): Rename to `Fcontrolling_tty_p'.
(delete_tty, tty_set_terminal_modes, tty_reset_terminal_modes)
(Ftty_display_color_p, Ftty_display_color_cells, get_named_tty)
(Ftty_no_underline, Fsuspend_tty, Fresume_tty, create_tty_output)
(init_tty, maybe_fatal, delete_tty, syms_of_term): Update for rename.
* src/frame.c (Qdevice): Rename to `Qterminal'.
(Qdisplay_live_p): Rename to `Qterminal_live_p'.
(terminal_frame_count): Rename to `tty_frame_count'.
(Fframe_display): Move to terminal.c, rename to `Fframe_terminal'.
(make_frame_without_minibuffer, make_initial_frame)
(make_terminal_frame, Fmodify_frame_parameters)
(do_switch_frame, Fdelete_frame, Fmouse_position)
(Fmouse_pixel_position, Fraise_frame, Flower_frame)
(Fredirect_frame_focus, set_term_frame_name, syms_of_frame):
Update for renames.
* src/xdisp.c (message2_nolog, message3_nolog, redisplay_internal)
(set_vertical_scroll_bar, redisplay_window, check_x_display_info)
(x_set_scroll_bar_foreground, x_set_scroll_bar_background)
(Fx_create_frame, Fxw_display_color_p, Fx_display_grayscale_p)
(Fx_display_pixel_width, Fx_display_pixel_height)
(Fx_display_planes, Fx_display_color_cells)
(Fx_server_max_request_size, Fx_server_vendor, Fx_server_version)
(Fx_display_screens, Fx_display_mm_height, Fx_display_mm_width)
(Fx_display_backing_store, Fx_display_visual_class)
(Fx_display_save_under, Fx_close_connection, x_create_tip_frame):
Update for renames.
* xterm.c (handle_one_xevent): Initialize `f' to NULL.
(x_delete_device): Rename to `x_delete_terminal'.
(x_create_device): Rename to `x_create_terminal'.
(XTset_terminal_modes, XTreset_terminal_modes)
(XTread_socket, x_connection_closed, x_term_init)
(x_term_init, x_delete_display): Update for renames.
* src/dispnew.c (Fredraw_frame, Fsend_string_to_terminal)
(Fsend_string_to_terminal, init_display): Update for renames.
* src/keyboard.c (push_frame_kboard, pop_kboard, pop_kboard)
(kbd_buffer_get_event, read_avail_input, tty_read_avail_input)
(interrupt_signal, Fset_output_flow_control)
(Fset_input_meta_mode, Fset_quit_char, delete_kboard)
(syms_of_keyboard): Update for renames.
* src/alloc.c (mark_devices): Update declaration.
(Fgarbage_collect): Update for renames.
* src/coding.c (Fset_terminal_coding_system_internal)
(Fterminal_coding_system4)
(Fset_keyboard_coding_system_internal)
(Fkeyboard_coding_system): Update for renames.
* src/data.c (Fterminal_local_value, Fset_terminal_local_value):
Update for renames.
* src/minibuf.c (read_minibuf): Update for renames.
* src/sysdep.c (init_sys_modes, reset_sys_modes): Update for renames.
* xselect.c (x_handle_selection_clear): Update for renames.
* lisp/files.el (save-buffers-kill-display): Rename to `save-buffers-kill-terminal'.
(save-buffers-kill-terminal, ctl-x-map): Update for renames.
* frame.el (make-frame): Rename 'device frame parameter to 'terminal. Update.
(frames-on-display-list, framep-on-display, suspend-frame): Update for renames.
(selected-display): Rename to `selected-terminal'.
* server.el (server-save-buffers-kill-display): Rename to
`server-save-buffers-kill-terminal'.
(server-delete-client, server-handle-delete-frame)
(server-handle-suspend-tty, server-process-filter)
(server-switch-buffer): Update for renames.
* startup.el (normal-splash-screen, normal-splash-screen): Update for renames.
* talk.el (talk): Update for renames.
* termdev.el (terminal-id): Update for renames.
* xt-mouse.el (turn-on-xterm-mouse-tracking-on-terminal)
(turn-off-xterm-mouse-tracking-on-terminal)
(xterm-mouse-handle-delete-frame): Update for renames.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-471
2005-12-29 18:20:26 +00:00
|
|
|
|
(defun server-handle-suspend-tty (terminal)
|
2011-03-01 05:03:24 +00:00
|
|
|
|
"Notify the client process that its tty device is suspended."
|
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
* src/termhooks.h (struct device): Rename to `terminal'. Rename member
`next_device' to `next_terminal'.
(device_list): Rename to `terminal_list'.
(FRAME_DEVICE): Rename to `FRAME_TERMINAL'.
(DEVICE_TERMINAL_CODING): Rename to `TERMINAL_TERMINAL_CODING'.
(TERMINAL_KEYBOARD_CODING): Rename to `TERMINAL_KEYBOARD_CODING'.
(DEVICE_ACTIVE_P): Rename to `TERMINAL_ACTIVE_P'.
Update declarations and macro definitions.
* src/termchar.h (tty_display_info): Rename member `device' to `terminal'.
(FRAME_TTY): Update for renames.
* src/xterm.h (x_display_info): Rename member `device' to `terminal'.
* src/frame.h (frame): Rename `device' member to `terminal'.
(FRAME_KBOARD, FRAME_LIVE_P, Qdevice, Qdisplay_live_p):
Update for renames.
* src/lisp.h (set_process_environment): Rename to `set_global_environment'.
(device): Rename to `terminal'.
* src/dispextern.h: Update declarations and macro definitions.
* src/terminal.c (device_list): Rename to `terminal_list'.
(next_device_id): Rename to `next_terminal_id'.
(initial_device): Rename to `initial_terminal'.
(get_device): Rename to `get_terminal'.
(create_device): Rename to `create_terminal'.
(mark_devices): Rename to `mark_terminals'.
(delete_device): Rename to `delete_terminal'.
(Fdelete_display): Rename to `Fdelete_terminal'.
(Fframe_terminal): Move here from frame.c.
(Fdisplay_live_p): Rename to `Fterminal_live_p'.
(Fdisplay_list): Rename to `Fterminal_list'.
(Fdisplay_name): Rename to `Fterminal_name'.
(init_initial_device): Rename to `init_initial_terminal'.
(delete_initial_device): Rename to `delete_initial_terminal'.
(ring_bell, update_begin, update_end, set_terminal_window)
(cursor_to, raw_cursor_to, clear_to_end, clear_frame)
(clear_end_of_line, write_glyphs, insert_glyphs, delete_glyphs)
(ins_del_lines, get_terminal_param, store_terminal_param)
(Fterminal_parameters, Fterminal_parameter)
(Fmodify_terminal_parameters, Fset_terminal_parameter)
(syms_of_terminal): Update for renames.
* src/term.c (get_tty_device): Rename to `get_tty_terminal'. Update.
(Fdisplay_tty_type): Rename to `Ftty_type'.
(Fdisplay_controlling_tty_p): Rename to `Fcontrolling_tty_p'.
(delete_tty, tty_set_terminal_modes, tty_reset_terminal_modes)
(Ftty_display_color_p, Ftty_display_color_cells, get_named_tty)
(Ftty_no_underline, Fsuspend_tty, Fresume_tty, create_tty_output)
(init_tty, maybe_fatal, delete_tty, syms_of_term): Update for rename.
* src/frame.c (Qdevice): Rename to `Qterminal'.
(Qdisplay_live_p): Rename to `Qterminal_live_p'.
(terminal_frame_count): Rename to `tty_frame_count'.
(Fframe_display): Move to terminal.c, rename to `Fframe_terminal'.
(make_frame_without_minibuffer, make_initial_frame)
(make_terminal_frame, Fmodify_frame_parameters)
(do_switch_frame, Fdelete_frame, Fmouse_position)
(Fmouse_pixel_position, Fraise_frame, Flower_frame)
(Fredirect_frame_focus, set_term_frame_name, syms_of_frame):
Update for renames.
* src/xdisp.c (message2_nolog, message3_nolog, redisplay_internal)
(set_vertical_scroll_bar, redisplay_window, check_x_display_info)
(x_set_scroll_bar_foreground, x_set_scroll_bar_background)
(Fx_create_frame, Fxw_display_color_p, Fx_display_grayscale_p)
(Fx_display_pixel_width, Fx_display_pixel_height)
(Fx_display_planes, Fx_display_color_cells)
(Fx_server_max_request_size, Fx_server_vendor, Fx_server_version)
(Fx_display_screens, Fx_display_mm_height, Fx_display_mm_width)
(Fx_display_backing_store, Fx_display_visual_class)
(Fx_display_save_under, Fx_close_connection, x_create_tip_frame):
Update for renames.
* xterm.c (handle_one_xevent): Initialize `f' to NULL.
(x_delete_device): Rename to `x_delete_terminal'.
(x_create_device): Rename to `x_create_terminal'.
(XTset_terminal_modes, XTreset_terminal_modes)
(XTread_socket, x_connection_closed, x_term_init)
(x_term_init, x_delete_display): Update for renames.
* src/dispnew.c (Fredraw_frame, Fsend_string_to_terminal)
(Fsend_string_to_terminal, init_display): Update for renames.
* src/keyboard.c (push_frame_kboard, pop_kboard, pop_kboard)
(kbd_buffer_get_event, read_avail_input, tty_read_avail_input)
(interrupt_signal, Fset_output_flow_control)
(Fset_input_meta_mode, Fset_quit_char, delete_kboard)
(syms_of_keyboard): Update for renames.
* src/alloc.c (mark_devices): Update declaration.
(Fgarbage_collect): Update for renames.
* src/coding.c (Fset_terminal_coding_system_internal)
(Fterminal_coding_system4)
(Fset_keyboard_coding_system_internal)
(Fkeyboard_coding_system): Update for renames.
* src/data.c (Fterminal_local_value, Fset_terminal_local_value):
Update for renames.
* src/minibuf.c (read_minibuf): Update for renames.
* src/sysdep.c (init_sys_modes, reset_sys_modes): Update for renames.
* xselect.c (x_handle_selection_clear): Update for renames.
* lisp/files.el (save-buffers-kill-display): Rename to `save-buffers-kill-terminal'.
(save-buffers-kill-terminal, ctl-x-map): Update for renames.
* frame.el (make-frame): Rename 'device frame parameter to 'terminal. Update.
(frames-on-display-list, framep-on-display, suspend-frame): Update for renames.
(selected-display): Rename to `selected-terminal'.
* server.el (server-save-buffers-kill-display): Rename to
`server-save-buffers-kill-terminal'.
(server-delete-client, server-handle-delete-frame)
(server-handle-suspend-tty, server-process-filter)
(server-switch-buffer): Update for renames.
* startup.el (normal-splash-screen, normal-splash-screen): Update for renames.
* talk.el (talk): Update for renames.
* termdev.el (terminal-id): Update for renames.
* xt-mouse.el (turn-on-xterm-mouse-tracking-on-terminal)
(turn-off-xterm-mouse-tracking-on-terminal)
(xterm-mouse-handle-delete-frame): Update for renames.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-471
2005-12-29 18:20:26 +00:00
|
|
|
|
(dolist (proc (server-clients-with 'terminal terminal))
|
2011-03-01 05:03:24 +00:00
|
|
|
|
(server-log (format "server-handle-suspend-tty, terminal %s" terminal)
|
|
|
|
|
proc)
|
|
|
|
|
(condition-case nil
|
2005-02-04 13:56:51 +00:00
|
|
|
|
(server-send-string proc "-suspend \n")
|
2007-09-19 02:00:54 +00:00
|
|
|
|
(file-error ;The pipe/socket was closed.
|
|
|
|
|
(ignore-errors (server-delete-client proc))))))
|
2002-09-27 17:43:29 +00:00
|
|
|
|
|
2002-09-25 19:54:13 +00:00
|
|
|
|
(defun server-unquote-arg (arg)
|
2005-02-04 13:56:51 +00:00
|
|
|
|
"Remove &-quotation from ARG.
|
|
|
|
|
See `server-quote-arg' and `server-process-filter'."
|
2002-09-25 19:54:13 +00:00
|
|
|
|
(replace-regexp-in-string
|
|
|
|
|
"&." (lambda (s)
|
More CL cleanups and reduction of use of cl.el.
* woman.el, winner.el, vc/vc-rcs.el, vc/vc-hooks.el, vc/vc-hg.el:
* vc/vc-git.el, vc/vc-dir.el, vc/vc-bzr.el, vc/vc-annotate.el:
* textmodes/tex-mode.el, textmodes/sgml-mode.el, tar-mode.el:
* strokes.el, ses.el, server.el, progmodes/js.el, progmodes/gdb-mi.el:
* progmodes/flymake.el, progmodes/ebrowse.el, progmodes/compile.el:
* play/tetris.el, play/snake.el, play/pong.el, play/landmark.el:
* play/hanoi.el, play/decipher.el, play/5x5.el, nxml/nxml-mode.el:
* net/secrets.el, net/quickurl.el, midnight.el, mail/footnote.el:
* image-dired.el, ibuffer.el, ibuf-macs.el, ibuf-ext.el, hexl.el:
* eshell/eshell.el, eshell/esh-io.el, eshell/esh-ext.el:
* eshell/esh-cmd.el, eshell/em-ls.el, eshell/em-hist.el:
* eshell/em-cmpl.el, eshell/em-banner.el:
* url/url.el, url/url-queue.el, url/url-parse.el, url/url-http.el:
* url/url-future.el, url/url-dav.el, url/url-cookie.el:
* calendar/parse-time.el, test/eshell.el: Use cl-lib.
* wid-browse.el, wdired.el, vc/vc.el, vc/vc-mtn.el, vc/vc-cvs.el:
* vc/vc-arch.el, tree-widget.el, textmodes/texinfo.el:
* textmodes/refill.el, textmodes/css-mode.el, term/tvi970.el:
* term/ns-win.el, term.el, shell.el, ps-samp.el:
* progmodes/perl-mode.el, progmodes/pascal.el, progmodes/gud.el:
* progmodes/glasses.el, progmodes/etags.el, progmodes/cwarn.el:
* play/gamegrid.el, play/bubbles.el, novice.el, notifications.el:
* net/zeroconf.el, net/xesam.el, net/snmp-mode.el, net/mairix.el:
* net/ldap.el, net/eudc.el, net/browse-url.el, man.el:
* mail/mailheader.el, mail/feedmail.el:
* url/url-util.el, url/url-privacy.el, url/url-nfs.el, url/url-misc.el:
* url/url-methods.el, url/url-gw.el, url/url-file.el, url/url-expand.el:
Dont use CL.
* ibuf-ext.el (ibuffer-mark-old-buffers): Use float-time.
* eshell/esh-opt.el (eshell-eval-using-options): Quote code with
`lambda' rather than with `quote'.
(eshell-do-opt): Adjust accordingly.
(eshell-process-option): Simplify.
* eshell/esh-var.el:
* eshell/em-script.el: Require `esh-opt' for eshell-eval-using-options.
* emacs-pcase.el (pcase--dontcare-upats, pcase--let*)
(pcase--expand, pcase--u1): Rename pcase's internal `dontcare' pattern
to `pcase--dontcare'.
* emacs-cl.el (labels): Mark obsolete.
(cl--letf, letf): Move to cl-lib.
(cl--letf*, letf*): Remove.
* emacs-cl-lib.el (cl-nth-value): Use defalias.
* emacs-cl-macs.el (cl-dolist, cl-dotimes): Add indent rule.
(cl-progv): Rewrite.
(cl--letf, cl-letf): Move from cl.el.
(cl-letf*): New macro.
* emacs-cl-extra.el (cl--progv-before, cl--progv-after): Remove.
2012-07-11 23:13:41 +00:00
|
|
|
|
(pcase (aref s 1)
|
2002-09-25 19:54:13 +00:00
|
|
|
|
(?& "&")
|
|
|
|
|
(?- "-")
|
|
|
|
|
(?n "\n")
|
More CL cleanups and reduction of use of cl.el.
* woman.el, winner.el, vc/vc-rcs.el, vc/vc-hooks.el, vc/vc-hg.el:
* vc/vc-git.el, vc/vc-dir.el, vc/vc-bzr.el, vc/vc-annotate.el:
* textmodes/tex-mode.el, textmodes/sgml-mode.el, tar-mode.el:
* strokes.el, ses.el, server.el, progmodes/js.el, progmodes/gdb-mi.el:
* progmodes/flymake.el, progmodes/ebrowse.el, progmodes/compile.el:
* play/tetris.el, play/snake.el, play/pong.el, play/landmark.el:
* play/hanoi.el, play/decipher.el, play/5x5.el, nxml/nxml-mode.el:
* net/secrets.el, net/quickurl.el, midnight.el, mail/footnote.el:
* image-dired.el, ibuffer.el, ibuf-macs.el, ibuf-ext.el, hexl.el:
* eshell/eshell.el, eshell/esh-io.el, eshell/esh-ext.el:
* eshell/esh-cmd.el, eshell/em-ls.el, eshell/em-hist.el:
* eshell/em-cmpl.el, eshell/em-banner.el:
* url/url.el, url/url-queue.el, url/url-parse.el, url/url-http.el:
* url/url-future.el, url/url-dav.el, url/url-cookie.el:
* calendar/parse-time.el, test/eshell.el: Use cl-lib.
* wid-browse.el, wdired.el, vc/vc.el, vc/vc-mtn.el, vc/vc-cvs.el:
* vc/vc-arch.el, tree-widget.el, textmodes/texinfo.el:
* textmodes/refill.el, textmodes/css-mode.el, term/tvi970.el:
* term/ns-win.el, term.el, shell.el, ps-samp.el:
* progmodes/perl-mode.el, progmodes/pascal.el, progmodes/gud.el:
* progmodes/glasses.el, progmodes/etags.el, progmodes/cwarn.el:
* play/gamegrid.el, play/bubbles.el, novice.el, notifications.el:
* net/zeroconf.el, net/xesam.el, net/snmp-mode.el, net/mairix.el:
* net/ldap.el, net/eudc.el, net/browse-url.el, man.el:
* mail/mailheader.el, mail/feedmail.el:
* url/url-util.el, url/url-privacy.el, url/url-nfs.el, url/url-misc.el:
* url/url-methods.el, url/url-gw.el, url/url-file.el, url/url-expand.el:
Dont use CL.
* ibuf-ext.el (ibuffer-mark-old-buffers): Use float-time.
* eshell/esh-opt.el (eshell-eval-using-options): Quote code with
`lambda' rather than with `quote'.
(eshell-do-opt): Adjust accordingly.
(eshell-process-option): Simplify.
* eshell/esh-var.el:
* eshell/em-script.el: Require `esh-opt' for eshell-eval-using-options.
* emacs-pcase.el (pcase--dontcare-upats, pcase--let*)
(pcase--expand, pcase--u1): Rename pcase's internal `dontcare' pattern
to `pcase--dontcare'.
* emacs-cl.el (labels): Mark obsolete.
(cl--letf, letf): Move to cl-lib.
(cl--letf*, letf*): Remove.
* emacs-cl-lib.el (cl-nth-value): Use defalias.
* emacs-cl-macs.el (cl-dolist, cl-dotimes): Add indent rule.
(cl-progv): Rewrite.
(cl--letf, cl-letf): Move from cl.el.
(cl-letf*): New macro.
* emacs-cl-extra.el (cl--progv-before, cl--progv-after): Remove.
2012-07-11 23:13:41 +00:00
|
|
|
|
(_ " ")))
|
2002-09-25 19:54:13 +00:00
|
|
|
|
arg t t))
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
Implemented suspending of emacsclient frames.
lib-src/emacsclient.c (quote_file_name): Renamed to quote_argument.
(unquote_argument, handle_sigcont, handle_sigtstp): New functions.
(out, in): New global variables for communicating with the Emacs process.
(init_signals): Set up handlers for SIGCONT, SIGTSTP and SIGTTOU.
(main): Changed out and in to global variables. Prepend `-eval' or
'-file' to each argument. Use fsync to force sending the strings to Emacs.
Removed obsolete -bad-version code. Support the -suspend command.
Cleaned up newline handling.
lisp/frame.el (suspend-frame): New function.
Substitute key definition of suspend-emacs with suspend-frame.
lisp/server.el (server-log): Cosmetic change in log format.
(server-handle-delete-tty, server-handle-delete-frame): Added logging.
(server-handle-suspend-tty, server-quote-arg): New functions.
(server-start): Install server-handle-suspend-tty.
(server-process-filter): Reorganized source code for clarity.
Implemented -resume, -suspend and -ignore commands.
lisp/term/x-win.el (x-initialize-window-system): Don't change the
binding of C-z.
src/cm.c: Replaced TTY_INPUT, TTY_OUTPUT, TTY_TERMSCRIPT calls with
their macro expansion.
src/dispnew.c: Ditto.
src/frame.c: Ditto.
src/keyboard.c: Ditto.
src/sysdep.c: Ditto.
src/keyboard.c (tty_read_avail_input): Don't read if the terminal is
suspended.
src/sysdep.c (discard_tty_input, init_sys_modes, reset_sys_modes): Ditto.
src/term.c (tty_set_terminal_modes, tty_reset_terminal_modes): Ditto.
src/term.c (Vsuspend_tty_functions, Vresume_tty_functions): New hooks.
(syms_of_term): Defvar them.
(term_init): Don't allow opening a new frame on a suspended tty device.
(Fsuspend_tty, Fresume_tty): New functions.
(syms_of_term): Defsubr them.
src/termchar.c (struct tty_display_info): Update documentation of
input and output.
(TTY_INPUT, TTY_OUTPUT, TTY_TERMSCRIPT): Removed.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-105
2004-02-28 01:23:39 +00:00
|
|
|
|
(defun server-quote-arg (arg)
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
"In ARG, insert a & before each &, each space, each newline, and -.
|
Implemented suspending of emacsclient frames.
lib-src/emacsclient.c (quote_file_name): Renamed to quote_argument.
(unquote_argument, handle_sigcont, handle_sigtstp): New functions.
(out, in): New global variables for communicating with the Emacs process.
(init_signals): Set up handlers for SIGCONT, SIGTSTP and SIGTTOU.
(main): Changed out and in to global variables. Prepend `-eval' or
'-file' to each argument. Use fsync to force sending the strings to Emacs.
Removed obsolete -bad-version code. Support the -suspend command.
Cleaned up newline handling.
lisp/frame.el (suspend-frame): New function.
Substitute key definition of suspend-emacs with suspend-frame.
lisp/server.el (server-log): Cosmetic change in log format.
(server-handle-delete-tty, server-handle-delete-frame): Added logging.
(server-handle-suspend-tty, server-quote-arg): New functions.
(server-start): Install server-handle-suspend-tty.
(server-process-filter): Reorganized source code for clarity.
Implemented -resume, -suspend and -ignore commands.
lisp/term/x-win.el (x-initialize-window-system): Don't change the
binding of C-z.
src/cm.c: Replaced TTY_INPUT, TTY_OUTPUT, TTY_TERMSCRIPT calls with
their macro expansion.
src/dispnew.c: Ditto.
src/frame.c: Ditto.
src/keyboard.c: Ditto.
src/sysdep.c: Ditto.
src/keyboard.c (tty_read_avail_input): Don't read if the terminal is
suspended.
src/sysdep.c (discard_tty_input, init_sys_modes, reset_sys_modes): Ditto.
src/term.c (tty_set_terminal_modes, tty_reset_terminal_modes): Ditto.
src/term.c (Vsuspend_tty_functions, Vresume_tty_functions): New hooks.
(syms_of_term): Defvar them.
(term_init): Don't allow opening a new frame on a suspended tty device.
(Fsuspend_tty, Fresume_tty): New functions.
(syms_of_term): Defsubr them.
src/termchar.c (struct tty_display_info): Update documentation of
input and output.
(TTY_INPUT, TTY_OUTPUT, TTY_TERMSCRIPT): Removed.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-105
2004-02-28 01:23:39 +00:00
|
|
|
|
Change spaces to underscores, too, so that the return value never
|
2005-02-04 13:56:51 +00:00
|
|
|
|
contains a space.
|
|
|
|
|
|
|
|
|
|
See `server-unquote-arg' and `server-process-filter'."
|
Implemented suspending of emacsclient frames.
lib-src/emacsclient.c (quote_file_name): Renamed to quote_argument.
(unquote_argument, handle_sigcont, handle_sigtstp): New functions.
(out, in): New global variables for communicating with the Emacs process.
(init_signals): Set up handlers for SIGCONT, SIGTSTP and SIGTTOU.
(main): Changed out and in to global variables. Prepend `-eval' or
'-file' to each argument. Use fsync to force sending the strings to Emacs.
Removed obsolete -bad-version code. Support the -suspend command.
Cleaned up newline handling.
lisp/frame.el (suspend-frame): New function.
Substitute key definition of suspend-emacs with suspend-frame.
lisp/server.el (server-log): Cosmetic change in log format.
(server-handle-delete-tty, server-handle-delete-frame): Added logging.
(server-handle-suspend-tty, server-quote-arg): New functions.
(server-start): Install server-handle-suspend-tty.
(server-process-filter): Reorganized source code for clarity.
Implemented -resume, -suspend and -ignore commands.
lisp/term/x-win.el (x-initialize-window-system): Don't change the
binding of C-z.
src/cm.c: Replaced TTY_INPUT, TTY_OUTPUT, TTY_TERMSCRIPT calls with
their macro expansion.
src/dispnew.c: Ditto.
src/frame.c: Ditto.
src/keyboard.c: Ditto.
src/sysdep.c: Ditto.
src/keyboard.c (tty_read_avail_input): Don't read if the terminal is
suspended.
src/sysdep.c (discard_tty_input, init_sys_modes, reset_sys_modes): Ditto.
src/term.c (tty_set_terminal_modes, tty_reset_terminal_modes): Ditto.
src/term.c (Vsuspend_tty_functions, Vresume_tty_functions): New hooks.
(syms_of_term): Defvar them.
(term_init): Don't allow opening a new frame on a suspended tty device.
(Fsuspend_tty, Fresume_tty): New functions.
(syms_of_term): Defsubr them.
src/termchar.c (struct tty_display_info): Update documentation of
input and output.
(TTY_INPUT, TTY_OUTPUT, TTY_TERMSCRIPT): Removed.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-105
2004-02-28 01:23:39 +00:00
|
|
|
|
(replace-regexp-in-string
|
|
|
|
|
"[-&\n ]" (lambda (s)
|
More CL cleanups and reduction of use of cl.el.
* woman.el, winner.el, vc/vc-rcs.el, vc/vc-hooks.el, vc/vc-hg.el:
* vc/vc-git.el, vc/vc-dir.el, vc/vc-bzr.el, vc/vc-annotate.el:
* textmodes/tex-mode.el, textmodes/sgml-mode.el, tar-mode.el:
* strokes.el, ses.el, server.el, progmodes/js.el, progmodes/gdb-mi.el:
* progmodes/flymake.el, progmodes/ebrowse.el, progmodes/compile.el:
* play/tetris.el, play/snake.el, play/pong.el, play/landmark.el:
* play/hanoi.el, play/decipher.el, play/5x5.el, nxml/nxml-mode.el:
* net/secrets.el, net/quickurl.el, midnight.el, mail/footnote.el:
* image-dired.el, ibuffer.el, ibuf-macs.el, ibuf-ext.el, hexl.el:
* eshell/eshell.el, eshell/esh-io.el, eshell/esh-ext.el:
* eshell/esh-cmd.el, eshell/em-ls.el, eshell/em-hist.el:
* eshell/em-cmpl.el, eshell/em-banner.el:
* url/url.el, url/url-queue.el, url/url-parse.el, url/url-http.el:
* url/url-future.el, url/url-dav.el, url/url-cookie.el:
* calendar/parse-time.el, test/eshell.el: Use cl-lib.
* wid-browse.el, wdired.el, vc/vc.el, vc/vc-mtn.el, vc/vc-cvs.el:
* vc/vc-arch.el, tree-widget.el, textmodes/texinfo.el:
* textmodes/refill.el, textmodes/css-mode.el, term/tvi970.el:
* term/ns-win.el, term.el, shell.el, ps-samp.el:
* progmodes/perl-mode.el, progmodes/pascal.el, progmodes/gud.el:
* progmodes/glasses.el, progmodes/etags.el, progmodes/cwarn.el:
* play/gamegrid.el, play/bubbles.el, novice.el, notifications.el:
* net/zeroconf.el, net/xesam.el, net/snmp-mode.el, net/mairix.el:
* net/ldap.el, net/eudc.el, net/browse-url.el, man.el:
* mail/mailheader.el, mail/feedmail.el:
* url/url-util.el, url/url-privacy.el, url/url-nfs.el, url/url-misc.el:
* url/url-methods.el, url/url-gw.el, url/url-file.el, url/url-expand.el:
Dont use CL.
* ibuf-ext.el (ibuffer-mark-old-buffers): Use float-time.
* eshell/esh-opt.el (eshell-eval-using-options): Quote code with
`lambda' rather than with `quote'.
(eshell-do-opt): Adjust accordingly.
(eshell-process-option): Simplify.
* eshell/esh-var.el:
* eshell/em-script.el: Require `esh-opt' for eshell-eval-using-options.
* emacs-pcase.el (pcase--dontcare-upats, pcase--let*)
(pcase--expand, pcase--u1): Rename pcase's internal `dontcare' pattern
to `pcase--dontcare'.
* emacs-cl.el (labels): Mark obsolete.
(cl--letf, letf): Move to cl-lib.
(cl--letf*, letf*): Remove.
* emacs-cl-lib.el (cl-nth-value): Use defalias.
* emacs-cl-macs.el (cl-dolist, cl-dotimes): Add indent rule.
(cl-progv): Rewrite.
(cl--letf, cl-letf): Move from cl.el.
(cl-letf*): New macro.
* emacs-cl-extra.el (cl--progv-before, cl--progv-after): Remove.
2012-07-11 23:13:41 +00:00
|
|
|
|
(pcase (aref s 0)
|
Implemented suspending of emacsclient frames.
lib-src/emacsclient.c (quote_file_name): Renamed to quote_argument.
(unquote_argument, handle_sigcont, handle_sigtstp): New functions.
(out, in): New global variables for communicating with the Emacs process.
(init_signals): Set up handlers for SIGCONT, SIGTSTP and SIGTTOU.
(main): Changed out and in to global variables. Prepend `-eval' or
'-file' to each argument. Use fsync to force sending the strings to Emacs.
Removed obsolete -bad-version code. Support the -suspend command.
Cleaned up newline handling.
lisp/frame.el (suspend-frame): New function.
Substitute key definition of suspend-emacs with suspend-frame.
lisp/server.el (server-log): Cosmetic change in log format.
(server-handle-delete-tty, server-handle-delete-frame): Added logging.
(server-handle-suspend-tty, server-quote-arg): New functions.
(server-start): Install server-handle-suspend-tty.
(server-process-filter): Reorganized source code for clarity.
Implemented -resume, -suspend and -ignore commands.
lisp/term/x-win.el (x-initialize-window-system): Don't change the
binding of C-z.
src/cm.c: Replaced TTY_INPUT, TTY_OUTPUT, TTY_TERMSCRIPT calls with
their macro expansion.
src/dispnew.c: Ditto.
src/frame.c: Ditto.
src/keyboard.c: Ditto.
src/sysdep.c: Ditto.
src/keyboard.c (tty_read_avail_input): Don't read if the terminal is
suspended.
src/sysdep.c (discard_tty_input, init_sys_modes, reset_sys_modes): Ditto.
src/term.c (tty_set_terminal_modes, tty_reset_terminal_modes): Ditto.
src/term.c (Vsuspend_tty_functions, Vresume_tty_functions): New hooks.
(syms_of_term): Defvar them.
(term_init): Don't allow opening a new frame on a suspended tty device.
(Fsuspend_tty, Fresume_tty): New functions.
(syms_of_term): Defsubr them.
src/termchar.c (struct tty_display_info): Update documentation of
input and output.
(TTY_INPUT, TTY_OUTPUT, TTY_TERMSCRIPT): Removed.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-105
2004-02-28 01:23:39 +00:00
|
|
|
|
(?& "&&")
|
|
|
|
|
(?- "&-")
|
|
|
|
|
(?\n "&n")
|
|
|
|
|
(?\s "&_")))
|
|
|
|
|
arg t t))
|
|
|
|
|
|
2005-02-04 13:56:51 +00:00
|
|
|
|
(defun server-send-string (proc string)
|
2008-11-18 16:27:06 +00:00
|
|
|
|
"A wrapper around `process-send-string' for logging."
|
2005-02-04 13:56:51 +00:00
|
|
|
|
(server-log (concat "Sent " string) proc)
|
|
|
|
|
(process-send-string proc string))
|
|
|
|
|
|
2003-04-12 19:04:11 +00:00
|
|
|
|
(defun server-ensure-safe-dir (dir)
|
|
|
|
|
"Make sure DIR is a directory with no race-condition issues.
|
|
|
|
|
Creates the directory if necessary and makes sure:
|
|
|
|
|
- there's no symlink involved
|
|
|
|
|
- it's owned by us
|
|
|
|
|
- it's not readable/writable by anybody else."
|
|
|
|
|
(setq dir (directory-file-name dir))
|
2009-09-18 16:55:21 +00:00
|
|
|
|
(let ((attrs (file-attributes dir 'integer)))
|
2003-04-12 19:04:11 +00:00
|
|
|
|
(unless attrs
|
More CL cleanups and reduction of use of cl.el.
* woman.el, winner.el, vc/vc-rcs.el, vc/vc-hooks.el, vc/vc-hg.el:
* vc/vc-git.el, vc/vc-dir.el, vc/vc-bzr.el, vc/vc-annotate.el:
* textmodes/tex-mode.el, textmodes/sgml-mode.el, tar-mode.el:
* strokes.el, ses.el, server.el, progmodes/js.el, progmodes/gdb-mi.el:
* progmodes/flymake.el, progmodes/ebrowse.el, progmodes/compile.el:
* play/tetris.el, play/snake.el, play/pong.el, play/landmark.el:
* play/hanoi.el, play/decipher.el, play/5x5.el, nxml/nxml-mode.el:
* net/secrets.el, net/quickurl.el, midnight.el, mail/footnote.el:
* image-dired.el, ibuffer.el, ibuf-macs.el, ibuf-ext.el, hexl.el:
* eshell/eshell.el, eshell/esh-io.el, eshell/esh-ext.el:
* eshell/esh-cmd.el, eshell/em-ls.el, eshell/em-hist.el:
* eshell/em-cmpl.el, eshell/em-banner.el:
* url/url.el, url/url-queue.el, url/url-parse.el, url/url-http.el:
* url/url-future.el, url/url-dav.el, url/url-cookie.el:
* calendar/parse-time.el, test/eshell.el: Use cl-lib.
* wid-browse.el, wdired.el, vc/vc.el, vc/vc-mtn.el, vc/vc-cvs.el:
* vc/vc-arch.el, tree-widget.el, textmodes/texinfo.el:
* textmodes/refill.el, textmodes/css-mode.el, term/tvi970.el:
* term/ns-win.el, term.el, shell.el, ps-samp.el:
* progmodes/perl-mode.el, progmodes/pascal.el, progmodes/gud.el:
* progmodes/glasses.el, progmodes/etags.el, progmodes/cwarn.el:
* play/gamegrid.el, play/bubbles.el, novice.el, notifications.el:
* net/zeroconf.el, net/xesam.el, net/snmp-mode.el, net/mairix.el:
* net/ldap.el, net/eudc.el, net/browse-url.el, man.el:
* mail/mailheader.el, mail/feedmail.el:
* url/url-util.el, url/url-privacy.el, url/url-nfs.el, url/url-misc.el:
* url/url-methods.el, url/url-gw.el, url/url-file.el, url/url-expand.el:
Dont use CL.
* ibuf-ext.el (ibuffer-mark-old-buffers): Use float-time.
* eshell/esh-opt.el (eshell-eval-using-options): Quote code with
`lambda' rather than with `quote'.
(eshell-do-opt): Adjust accordingly.
(eshell-process-option): Simplify.
* eshell/esh-var.el:
* eshell/em-script.el: Require `esh-opt' for eshell-eval-using-options.
* emacs-pcase.el (pcase--dontcare-upats, pcase--let*)
(pcase--expand, pcase--u1): Rename pcase's internal `dontcare' pattern
to `pcase--dontcare'.
* emacs-cl.el (labels): Mark obsolete.
(cl--letf, letf): Move to cl-lib.
(cl--letf*, letf*): Remove.
* emacs-cl-lib.el (cl-nth-value): Use defalias.
* emacs-cl-macs.el (cl-dolist, cl-dotimes): Add indent rule.
(cl-progv): Rewrite.
(cl--letf, cl-letf): Move from cl.el.
(cl-letf*): New macro.
* emacs-cl-extra.el (cl--progv-before, cl--progv-after): Remove.
2012-07-11 23:13:41 +00:00
|
|
|
|
(cl-letf (((default-file-modes) ?\700)) (make-directory dir t))
|
2009-09-18 16:55:21 +00:00
|
|
|
|
(setq attrs (file-attributes dir 'integer)))
|
2009-09-19 14:56:04 +00:00
|
|
|
|
|
2003-04-12 19:04:11 +00:00
|
|
|
|
;; Check that it's safe for use.
|
2009-09-19 14:56:04 +00:00
|
|
|
|
(let* ((uid (nth 2 attrs))
|
|
|
|
|
(w32 (eq system-type 'windows-nt))
|
2012-04-17 17:05:22 +00:00
|
|
|
|
(safe (cond
|
|
|
|
|
((not (eq t (car attrs))) nil) ; is a dir?
|
|
|
|
|
((and w32 (zerop uid)) ; on FAT32?
|
|
|
|
|
(display-warning
|
|
|
|
|
'server
|
|
|
|
|
(format "Using `%s' to store Emacs-server authentication files.
|
2009-09-19 14:56:04 +00:00
|
|
|
|
Directories on FAT32 filesystems are NOT secure against tampering.
|
|
|
|
|
See variable `server-auth-dir' for details."
|
2012-04-17 17:05:22 +00:00
|
|
|
|
(file-name-as-directory dir))
|
|
|
|
|
:warning)
|
|
|
|
|
t)
|
|
|
|
|
((and (/= uid (user-uid)) ; is the dir ours?
|
|
|
|
|
(or (not w32)
|
|
|
|
|
;; Files created on Windows by Administrator
|
|
|
|
|
;; (RID=500) have the Administrators (RID=544)
|
|
|
|
|
;; group recorded as the owner.
|
|
|
|
|
(/= uid 544) (/= (user-uid) 500)))
|
|
|
|
|
nil)
|
|
|
|
|
(w32 t) ; on NTFS?
|
|
|
|
|
(t ; else, check permissions
|
|
|
|
|
(zerop (logand ?\077 (file-modes dir)))))))
|
2009-09-19 14:56:04 +00:00
|
|
|
|
(unless safe
|
|
|
|
|
(error "The directory `%s' is unsafe" dir)))))
|
2003-04-12 19:04:11 +00:00
|
|
|
|
|
2012-04-14 11:16:17 +00:00
|
|
|
|
(defun server-generate-key ()
|
2012-04-14 12:58:29 +00:00
|
|
|
|
"Generate and return a random authentication key.
|
|
|
|
|
The key is a 64-byte string of random chars in the range `!'..`~'.
|
|
|
|
|
If called interactively, also inserts it into current buffer."
|
2012-04-14 11:16:17 +00:00
|
|
|
|
(interactive)
|
|
|
|
|
(let ((auth-key
|
More CL cleanups and reduction of use of cl.el.
* woman.el, winner.el, vc/vc-rcs.el, vc/vc-hooks.el, vc/vc-hg.el:
* vc/vc-git.el, vc/vc-dir.el, vc/vc-bzr.el, vc/vc-annotate.el:
* textmodes/tex-mode.el, textmodes/sgml-mode.el, tar-mode.el:
* strokes.el, ses.el, server.el, progmodes/js.el, progmodes/gdb-mi.el:
* progmodes/flymake.el, progmodes/ebrowse.el, progmodes/compile.el:
* play/tetris.el, play/snake.el, play/pong.el, play/landmark.el:
* play/hanoi.el, play/decipher.el, play/5x5.el, nxml/nxml-mode.el:
* net/secrets.el, net/quickurl.el, midnight.el, mail/footnote.el:
* image-dired.el, ibuffer.el, ibuf-macs.el, ibuf-ext.el, hexl.el:
* eshell/eshell.el, eshell/esh-io.el, eshell/esh-ext.el:
* eshell/esh-cmd.el, eshell/em-ls.el, eshell/em-hist.el:
* eshell/em-cmpl.el, eshell/em-banner.el:
* url/url.el, url/url-queue.el, url/url-parse.el, url/url-http.el:
* url/url-future.el, url/url-dav.el, url/url-cookie.el:
* calendar/parse-time.el, test/eshell.el: Use cl-lib.
* wid-browse.el, wdired.el, vc/vc.el, vc/vc-mtn.el, vc/vc-cvs.el:
* vc/vc-arch.el, tree-widget.el, textmodes/texinfo.el:
* textmodes/refill.el, textmodes/css-mode.el, term/tvi970.el:
* term/ns-win.el, term.el, shell.el, ps-samp.el:
* progmodes/perl-mode.el, progmodes/pascal.el, progmodes/gud.el:
* progmodes/glasses.el, progmodes/etags.el, progmodes/cwarn.el:
* play/gamegrid.el, play/bubbles.el, novice.el, notifications.el:
* net/zeroconf.el, net/xesam.el, net/snmp-mode.el, net/mairix.el:
* net/ldap.el, net/eudc.el, net/browse-url.el, man.el:
* mail/mailheader.el, mail/feedmail.el:
* url/url-util.el, url/url-privacy.el, url/url-nfs.el, url/url-misc.el:
* url/url-methods.el, url/url-gw.el, url/url-file.el, url/url-expand.el:
Dont use CL.
* ibuf-ext.el (ibuffer-mark-old-buffers): Use float-time.
* eshell/esh-opt.el (eshell-eval-using-options): Quote code with
`lambda' rather than with `quote'.
(eshell-do-opt): Adjust accordingly.
(eshell-process-option): Simplify.
* eshell/esh-var.el:
* eshell/em-script.el: Require `esh-opt' for eshell-eval-using-options.
* emacs-pcase.el (pcase--dontcare-upats, pcase--let*)
(pcase--expand, pcase--u1): Rename pcase's internal `dontcare' pattern
to `pcase--dontcare'.
* emacs-cl.el (labels): Mark obsolete.
(cl--letf, letf): Move to cl-lib.
(cl--letf*, letf*): Remove.
* emacs-cl-lib.el (cl-nth-value): Use defalias.
* emacs-cl-macs.el (cl-dolist, cl-dotimes): Add indent rule.
(cl-progv): Rewrite.
(cl--letf, cl-letf): Move from cl.el.
(cl-letf*): New macro.
* emacs-cl-extra.el (cl--progv-before, cl--progv-after): Remove.
2012-07-11 23:13:41 +00:00
|
|
|
|
(cl-loop repeat 64
|
|
|
|
|
collect (+ 33 (random 94)) into auth
|
|
|
|
|
finally return (concat auth))))
|
2012-04-14 11:36:26 +00:00
|
|
|
|
(if (called-interactively-p 'interactive)
|
2012-04-14 11:16:17 +00:00
|
|
|
|
(insert auth-key))
|
|
|
|
|
auth-key))
|
|
|
|
|
|
|
|
|
|
(defun server-get-auth-key ()
|
2012-04-14 12:58:29 +00:00
|
|
|
|
"Return server's authentication key.
|
2012-04-14 11:16:17 +00:00
|
|
|
|
|
2012-04-14 12:58:29 +00:00
|
|
|
|
If `server-auth-key' is nil, just call `server-generate-key'.
|
|
|
|
|
Otherwise, if `server-auth-key' is a valid key, return it.
|
|
|
|
|
If the key is not valid, signal an error."
|
2012-04-14 11:16:17 +00:00
|
|
|
|
(if server-auth-key
|
2012-04-14 12:58:29 +00:00
|
|
|
|
(if (string-match-p "^[!-~]\\{64\\}$" server-auth-key)
|
2012-04-14 11:16:17 +00:00
|
|
|
|
server-auth-key
|
|
|
|
|
(error "The key '%s' is invalid" server-auth-key))
|
|
|
|
|
(server-generate-key)))
|
|
|
|
|
|
1991-05-09 21:50:34 +00:00
|
|
|
|
;;;###autoload
|
2010-11-01 03:35:06 +00:00
|
|
|
|
(defun server-start (&optional leave-dead inhibit-prompt)
|
1990-02-22 10:44:55 +00:00
|
|
|
|
"Allow this Emacs process to be a server for client processes.
|
2012-04-14 12:58:29 +00:00
|
|
|
|
This starts a server communications subprocess through which client
|
|
|
|
|
\"editors\" can send your editing commands to this Emacs job.
|
|
|
|
|
To use the server, set up the program `emacsclient' in the Emacs
|
|
|
|
|
distribution as your standard \"editor\".
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
2007-01-27 19:03:43 +00:00
|
|
|
|
Optional argument LEAVE-DEAD (interactively, a prefix arg) means just
|
2008-12-12 00:33:30 +00:00
|
|
|
|
kill any existing server communications subprocess.
|
|
|
|
|
|
2010-11-01 03:35:06 +00:00
|
|
|
|
If a server is already running, restart it. If clients are
|
|
|
|
|
running, ask the user for confirmation first, unless optional
|
|
|
|
|
argument INHIBIT-PROMPT is non-nil.
|
|
|
|
|
|
2008-12-12 00:33:30 +00:00
|
|
|
|
To force-start a server, do \\[server-force-delete] and then
|
|
|
|
|
\\[server-start]."
|
1990-02-22 10:44:55 +00:00
|
|
|
|
(interactive "P")
|
2009-01-21 20:33:17 +00:00
|
|
|
|
(when (or (not server-clients)
|
|
|
|
|
;; Ask the user before deleting existing clients---except
|
|
|
|
|
;; when we can't get user input, which may happen when
|
|
|
|
|
;; doing emacsclient --eval "(kill-emacs)" in daemon mode.
|
2010-11-01 03:35:06 +00:00
|
|
|
|
(cond
|
|
|
|
|
((and (daemonp)
|
|
|
|
|
(null (cdr (frame-list)))
|
|
|
|
|
(eq (selected-frame) terminal-frame))
|
|
|
|
|
leave-dead)
|
|
|
|
|
(inhibit-prompt t)
|
|
|
|
|
(t (yes-or-no-p
|
|
|
|
|
"The current server still has clients; delete them? "))))
|
2008-12-12 00:33:30 +00:00
|
|
|
|
(let* ((server-dir (if server-use-tcp server-auth-dir server-socket-dir))
|
|
|
|
|
(server-file (expand-file-name server-name server-dir)))
|
|
|
|
|
(when server-process
|
|
|
|
|
;; kill it dead!
|
|
|
|
|
(ignore-errors (delete-process server-process)))
|
|
|
|
|
;; Delete the socket files made by previous server invocations.
|
|
|
|
|
(if (not (eq t (server-running-p server-name)))
|
|
|
|
|
;; Remove any leftover socket or authentication file
|
2010-05-01 02:19:40 +00:00
|
|
|
|
(ignore-errors
|
2011-02-10 18:53:49 +00:00
|
|
|
|
(let (delete-by-moving-to-trash)
|
|
|
|
|
(delete-file server-file)))
|
2008-12-12 00:33:30 +00:00
|
|
|
|
(setq server-mode nil) ;; already set by the minor mode code
|
2009-02-20 02:16:25 +00:00
|
|
|
|
(display-warning
|
|
|
|
|
'server
|
|
|
|
|
(concat "Unable to start the Emacs server.\n"
|
|
|
|
|
(format "There is an existing Emacs server, named %S.\n"
|
|
|
|
|
server-name)
|
|
|
|
|
"To start the server in this Emacs process, stop the existing
|
|
|
|
|
server or call `M-x server-force-delete' to forcibly disconnect it.")
|
|
|
|
|
:warning)
|
2008-12-16 21:23:03 +00:00
|
|
|
|
(setq leave-dead t))
|
2008-12-12 00:33:30 +00:00
|
|
|
|
;; If this Emacs already had a server, clear out associated status.
|
|
|
|
|
(while server-clients
|
|
|
|
|
(server-delete-client (car server-clients)))
|
|
|
|
|
;; Now any previous server is properly stopped.
|
|
|
|
|
(if leave-dead
|
|
|
|
|
(progn
|
2008-12-16 21:23:03 +00:00
|
|
|
|
(unless (eq t leave-dead) (server-log (message "Server stopped")))
|
2008-12-12 00:33:30 +00:00
|
|
|
|
(setq server-process nil))
|
2006-12-03 15:03:30 +00:00
|
|
|
|
;; Make sure there is a safe directory in which to place the socket.
|
|
|
|
|
(server-ensure-safe-dir server-dir)
|
|
|
|
|
(when server-process
|
|
|
|
|
(server-log (message "Restarting server")))
|
More CL cleanups and reduction of use of cl.el.
* woman.el, winner.el, vc/vc-rcs.el, vc/vc-hooks.el, vc/vc-hg.el:
* vc/vc-git.el, vc/vc-dir.el, vc/vc-bzr.el, vc/vc-annotate.el:
* textmodes/tex-mode.el, textmodes/sgml-mode.el, tar-mode.el:
* strokes.el, ses.el, server.el, progmodes/js.el, progmodes/gdb-mi.el:
* progmodes/flymake.el, progmodes/ebrowse.el, progmodes/compile.el:
* play/tetris.el, play/snake.el, play/pong.el, play/landmark.el:
* play/hanoi.el, play/decipher.el, play/5x5.el, nxml/nxml-mode.el:
* net/secrets.el, net/quickurl.el, midnight.el, mail/footnote.el:
* image-dired.el, ibuffer.el, ibuf-macs.el, ibuf-ext.el, hexl.el:
* eshell/eshell.el, eshell/esh-io.el, eshell/esh-ext.el:
* eshell/esh-cmd.el, eshell/em-ls.el, eshell/em-hist.el:
* eshell/em-cmpl.el, eshell/em-banner.el:
* url/url.el, url/url-queue.el, url/url-parse.el, url/url-http.el:
* url/url-future.el, url/url-dav.el, url/url-cookie.el:
* calendar/parse-time.el, test/eshell.el: Use cl-lib.
* wid-browse.el, wdired.el, vc/vc.el, vc/vc-mtn.el, vc/vc-cvs.el:
* vc/vc-arch.el, tree-widget.el, textmodes/texinfo.el:
* textmodes/refill.el, textmodes/css-mode.el, term/tvi970.el:
* term/ns-win.el, term.el, shell.el, ps-samp.el:
* progmodes/perl-mode.el, progmodes/pascal.el, progmodes/gud.el:
* progmodes/glasses.el, progmodes/etags.el, progmodes/cwarn.el:
* play/gamegrid.el, play/bubbles.el, novice.el, notifications.el:
* net/zeroconf.el, net/xesam.el, net/snmp-mode.el, net/mairix.el:
* net/ldap.el, net/eudc.el, net/browse-url.el, man.el:
* mail/mailheader.el, mail/feedmail.el:
* url/url-util.el, url/url-privacy.el, url/url-nfs.el, url/url-misc.el:
* url/url-methods.el, url/url-gw.el, url/url-file.el, url/url-expand.el:
Dont use CL.
* ibuf-ext.el (ibuffer-mark-old-buffers): Use float-time.
* eshell/esh-opt.el (eshell-eval-using-options): Quote code with
`lambda' rather than with `quote'.
(eshell-do-opt): Adjust accordingly.
(eshell-process-option): Simplify.
* eshell/esh-var.el:
* eshell/em-script.el: Require `esh-opt' for eshell-eval-using-options.
* emacs-pcase.el (pcase--dontcare-upats, pcase--let*)
(pcase--expand, pcase--u1): Rename pcase's internal `dontcare' pattern
to `pcase--dontcare'.
* emacs-cl.el (labels): Mark obsolete.
(cl--letf, letf): Move to cl-lib.
(cl--letf*, letf*): Remove.
* emacs-cl-lib.el (cl-nth-value): Use defalias.
* emacs-cl-macs.el (cl-dolist, cl-dotimes): Add indent rule.
(cl-progv): Rewrite.
(cl--letf, cl-letf): Move from cl.el.
(cl-letf*): New macro.
* emacs-cl-extra.el (cl--progv-before, cl--progv-after): Remove.
2012-07-11 23:13:41 +00:00
|
|
|
|
(cl-letf (((default-file-modes) ?\700))
|
2007-09-04 23:28:49 +00:00
|
|
|
|
(add-hook 'suspend-tty-functions 'server-handle-suspend-tty)
|
2006-12-03 15:03:30 +00:00
|
|
|
|
(add-hook 'delete-frame-functions 'server-handle-delete-frame)
|
More CL cleanups and reduction of use of cl.el.
* woman.el, winner.el, vc/vc-rcs.el, vc/vc-hooks.el, vc/vc-hg.el:
* vc/vc-git.el, vc/vc-dir.el, vc/vc-bzr.el, vc/vc-annotate.el:
* textmodes/tex-mode.el, textmodes/sgml-mode.el, tar-mode.el:
* strokes.el, ses.el, server.el, progmodes/js.el, progmodes/gdb-mi.el:
* progmodes/flymake.el, progmodes/ebrowse.el, progmodes/compile.el:
* play/tetris.el, play/snake.el, play/pong.el, play/landmark.el:
* play/hanoi.el, play/decipher.el, play/5x5.el, nxml/nxml-mode.el:
* net/secrets.el, net/quickurl.el, midnight.el, mail/footnote.el:
* image-dired.el, ibuffer.el, ibuf-macs.el, ibuf-ext.el, hexl.el:
* eshell/eshell.el, eshell/esh-io.el, eshell/esh-ext.el:
* eshell/esh-cmd.el, eshell/em-ls.el, eshell/em-hist.el:
* eshell/em-cmpl.el, eshell/em-banner.el:
* url/url.el, url/url-queue.el, url/url-parse.el, url/url-http.el:
* url/url-future.el, url/url-dav.el, url/url-cookie.el:
* calendar/parse-time.el, test/eshell.el: Use cl-lib.
* wid-browse.el, wdired.el, vc/vc.el, vc/vc-mtn.el, vc/vc-cvs.el:
* vc/vc-arch.el, tree-widget.el, textmodes/texinfo.el:
* textmodes/refill.el, textmodes/css-mode.el, term/tvi970.el:
* term/ns-win.el, term.el, shell.el, ps-samp.el:
* progmodes/perl-mode.el, progmodes/pascal.el, progmodes/gud.el:
* progmodes/glasses.el, progmodes/etags.el, progmodes/cwarn.el:
* play/gamegrid.el, play/bubbles.el, novice.el, notifications.el:
* net/zeroconf.el, net/xesam.el, net/snmp-mode.el, net/mairix.el:
* net/ldap.el, net/eudc.el, net/browse-url.el, man.el:
* mail/mailheader.el, mail/feedmail.el:
* url/url-util.el, url/url-privacy.el, url/url-nfs.el, url/url-misc.el:
* url/url-methods.el, url/url-gw.el, url/url-file.el, url/url-expand.el:
Dont use CL.
* ibuf-ext.el (ibuffer-mark-old-buffers): Use float-time.
* eshell/esh-opt.el (eshell-eval-using-options): Quote code with
`lambda' rather than with `quote'.
(eshell-do-opt): Adjust accordingly.
(eshell-process-option): Simplify.
* eshell/esh-var.el:
* eshell/em-script.el: Require `esh-opt' for eshell-eval-using-options.
* emacs-pcase.el (pcase--dontcare-upats, pcase--let*)
(pcase--expand, pcase--u1): Rename pcase's internal `dontcare' pattern
to `pcase--dontcare'.
* emacs-cl.el (labels): Mark obsolete.
(cl--letf, letf): Move to cl-lib.
(cl--letf*, letf*): Remove.
* emacs-cl-lib.el (cl-nth-value): Use defalias.
* emacs-cl-macs.el (cl-dolist, cl-dotimes): Add indent rule.
(cl-progv): Rewrite.
(cl--letf, cl-letf): Move from cl.el.
(cl-letf*): New macro.
* emacs-cl-extra.el (cl--progv-before, cl--progv-after): Remove.
2012-07-11 23:13:41 +00:00
|
|
|
|
(add-hook 'kill-buffer-query-functions
|
|
|
|
|
'server-kill-buffer-query-function)
|
|
|
|
|
(add-hook 'kill-emacs-query-functions
|
|
|
|
|
'server-kill-emacs-query-function)
|
2010-11-01 03:35:06 +00:00
|
|
|
|
(add-hook 'kill-emacs-hook 'server-force-stop) ;Cleanup upon exit.
|
2006-12-03 15:03:30 +00:00
|
|
|
|
(setq server-process
|
|
|
|
|
(apply #'make-network-process
|
|
|
|
|
:name server-name
|
|
|
|
|
:server t
|
|
|
|
|
:noquery t
|
|
|
|
|
:sentinel 'server-sentinel
|
|
|
|
|
:filter 'server-process-filter
|
|
|
|
|
;; We must receive file names without being decoded.
|
|
|
|
|
;; Those are decoded by server-process-filter according
|
2008-04-23 15:37:07 +00:00
|
|
|
|
;; to file-name-coding-system. Also don't get
|
|
|
|
|
;; confused by CRs since we don't quote them.
|
|
|
|
|
:coding 'raw-text-unix
|
2008-01-26 21:54:44 +00:00
|
|
|
|
;; The other args depend on the kind of socket used.
|
2006-12-03 15:03:30 +00:00
|
|
|
|
(if server-use-tcp
|
2010-08-03 13:04:20 +00:00
|
|
|
|
(list :family 'ipv4 ;; We're not ready for IPv6 yet
|
2010-10-26 07:40:07 +00:00
|
|
|
|
:service (or server-port t)
|
2010-09-25 00:32:09 +00:00
|
|
|
|
:host (or server-host 'local)
|
2006-12-03 15:03:30 +00:00
|
|
|
|
:plist '(:authenticated nil))
|
|
|
|
|
(list :family 'local
|
|
|
|
|
:service server-file
|
|
|
|
|
:plist '(:authenticated t)))))
|
|
|
|
|
(unless server-process (error "Could not start server process"))
|
2008-12-12 00:33:30 +00:00
|
|
|
|
(process-put server-process :server-file server-file)
|
2006-12-03 15:03:30 +00:00
|
|
|
|
(when server-use-tcp
|
2012-04-14 11:16:17 +00:00
|
|
|
|
(let ((auth-key (server-get-auth-key)))
|
2006-12-03 15:03:30 +00:00
|
|
|
|
(process-put server-process :auth-key auth-key)
|
|
|
|
|
(with-temp-file server-file
|
|
|
|
|
(set-buffer-multibyte nil)
|
|
|
|
|
(setq buffer-file-coding-system 'no-conversion)
|
|
|
|
|
(insert (format-network-address
|
|
|
|
|
(process-contact server-process :local))
|
2010-10-01 01:28:45 +00:00
|
|
|
|
" " (number-to-string (emacs-pid)) ; Kept for compatibility
|
2006-12-03 15:03:30 +00:00
|
|
|
|
"\n" auth-key)))))))))
|
2003-01-15 17:49:32 +00:00
|
|
|
|
|
2010-11-01 03:35:06 +00:00
|
|
|
|
(defun server-force-stop ()
|
|
|
|
|
"Kill all connections to the current server.
|
|
|
|
|
This function is meant to be called from `kill-emacs-hook'."
|
2010-11-16 20:09:47 +00:00
|
|
|
|
(server-start t t))
|
2010-11-01 03:35:06 +00:00
|
|
|
|
|
2008-12-12 00:33:30 +00:00
|
|
|
|
;;;###autoload
|
|
|
|
|
(defun server-force-delete (&optional name)
|
|
|
|
|
"Unconditionally delete connection file for server NAME.
|
|
|
|
|
If server is running, it is first stopped.
|
|
|
|
|
NAME defaults to `server-name'. With argument, ask for NAME."
|
|
|
|
|
(interactive
|
|
|
|
|
(list (if current-prefix-arg
|
|
|
|
|
(read-string "Server name: " nil nil server-name))))
|
|
|
|
|
(when server-mode (with-temp-message nil (server-mode -1)))
|
|
|
|
|
(let ((file (expand-file-name (or name server-name)
|
|
|
|
|
(if server-use-tcp
|
|
|
|
|
server-auth-dir
|
|
|
|
|
server-socket-dir))))
|
|
|
|
|
(condition-case nil
|
2010-05-01 02:19:40 +00:00
|
|
|
|
(let (delete-by-moving-to-trash)
|
2008-12-12 00:33:30 +00:00
|
|
|
|
(delete-file file)
|
|
|
|
|
(message "Connection file %S deleted" file))
|
|
|
|
|
(file-error
|
|
|
|
|
(message "No connection file %S" file)))))
|
|
|
|
|
|
2007-09-19 02:00:54 +00:00
|
|
|
|
(defun server-running-p (&optional name)
|
2008-12-12 00:33:30 +00:00
|
|
|
|
"Test whether server NAME is running.
|
|
|
|
|
|
|
|
|
|
Return values:
|
|
|
|
|
nil the server is definitely not running.
|
|
|
|
|
t the server seems to be running.
|
|
|
|
|
something else we cannot determine whether it's running without using
|
|
|
|
|
commands which may have to wait for a long time."
|
2007-09-19 02:00:54 +00:00
|
|
|
|
(unless name (setq name server-name))
|
|
|
|
|
(condition-case nil
|
2008-12-12 00:33:30 +00:00
|
|
|
|
(if server-use-tcp
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
(insert-file-contents-literally (expand-file-name name server-auth-dir))
|
2008-12-30 11:28:14 +00:00
|
|
|
|
(or (and (looking-at "127\\.0\\.0\\.1:[0-9]+ \\([0-9]+\\)")
|
2008-12-12 00:33:30 +00:00
|
|
|
|
(assq 'comm
|
2009-02-23 05:06:36 +00:00
|
|
|
|
(process-attributes
|
2008-12-12 00:33:30 +00:00
|
|
|
|
(string-to-number (match-string 1))))
|
|
|
|
|
t)
|
|
|
|
|
:other))
|
2007-09-19 02:00:54 +00:00
|
|
|
|
(delete-process
|
|
|
|
|
(make-network-process
|
|
|
|
|
:name "server-client-test" :family 'local :server nil :noquery t
|
|
|
|
|
:service (expand-file-name name server-socket-dir)))
|
|
|
|
|
t)
|
|
|
|
|
(file-error nil)))
|
|
|
|
|
|
2003-01-15 17:49:32 +00:00
|
|
|
|
;;;###autoload
|
|
|
|
|
(define-minor-mode server-mode
|
|
|
|
|
"Toggle Server mode.
|
Fix minor mode docstrings for the new meaning of a nil ARG.
* abbrev.el (abbrev-mode):
* allout.el (allout-mode):
* autoinsert.el (auto-insert-mode):
* autoarg.el (autoarg-mode, autoarg-kp-mode):
* autorevert.el (auto-revert-mode, auto-revert-tail-mode)
(global-auto-revert-mode):
* battery.el (display-battery-mode):
* composite.el (global-auto-composition-mode)
(auto-composition-mode):
* delsel.el (delete-selection-mode):
* desktop.el (desktop-save-mode):
* dired-x.el (dired-omit-mode):
* dirtrack.el (dirtrack-mode):
* doc-view.el (doc-view-minor-mode):
* double.el (double-mode):
* electric.el (electric-indent-mode, electric-pair-mode):
* emacs-lock.el (emacs-lock-mode):
* epa-hook.el (auto-encryption-mode):
* follow.el (follow-mode):
* font-core.el (font-lock-mode):
* frame.el (auto-raise-mode, auto-lower-mode, blink-cursor-mode):
* help.el (temp-buffer-resize-mode):
* hilit-chg.el (highlight-changes-mode)
(highlight-changes-visible-mode):
* hi-lock.el (hi-lock-mode):
* hl-line.el (hl-line-mode, global-hl-line-mode):
* icomplete.el (icomplete-mode):
* ido.el (ido-everywhere):
* image-file.el (auto-image-file-mode):
* image-mode.el (image-minor-mode):
* iswitchb.el (iswitchb-mode):
* jka-cmpr-hook.el (auto-compression-mode):
* linum.el (linum-mode):
* longlines.el (longlines-mode):
* master.el (master-mode):
* mb-depth.el (minibuffer-depth-indicate-mode):
* menu-bar.el (menu-bar-mode):
* minibuf-eldef.el (minibuffer-electric-default-mode):
* mouse-sel.el (mouse-sel-mode):
* msb.el (msb-mode):
* mwheel.el (mouse-wheel-mode):
* outline.el (outline-minor-mode):
* paren.el (show-paren-mode):
* recentf.el (recentf-mode):
* reveal.el (reveal-mode, global-reveal-mode):
* rfn-eshadow.el (file-name-shadow-mode):
* ruler-mode.el (ruler-mode):
* savehist.el (savehist-mode):
* scroll-all.el (scroll-all-mode):
* scroll-bar.el (scroll-bar-mode):
* server.el (server-mode):
* shell.el (shell-dirtrack-mode):
* simple.el (auto-fill-mode, transient-mark-mode)
(visual-line-mode, overwrite-mode, binary-overwrite-mode)
(line-number-mode, column-number-mode, size-indication-mode)
(auto-save-mode, normal-erase-is-backspace-mode, visible-mode):
* strokes.el (strokes-mode):
* time.el (display-time-mode):
* t-mouse.el (gpm-mouse-mode):
* tool-bar.el (tool-bar-mode):
* tooltip.el (tooltip-mode):
* type-break.el (type-break-mode-line-message-mode)
(type-break-query-mode):
* view.el (view-mode):
* whitespace.el (whitespace-mode, whitespace-newline-mode)
(global-whitespace-mode, global-whitespace-newline-mode):
* xt-mouse.el (xterm-mouse-mode): Doc fix.
* emacs-lisp/easy-mmode.el (define-globalized-minor-mode): Fix
autogenerated docstring.
2011-10-19 12:54:24 +00:00
|
|
|
|
With a prefix argument ARG, enable Server mode if ARG is
|
|
|
|
|
positive, and disable it otherwise. If called from Lisp, enable
|
|
|
|
|
Server mode if ARG is omitted or nil.
|
|
|
|
|
|
2003-01-15 17:49:32 +00:00
|
|
|
|
Server mode runs a process that accepts commands from the
|
Fix minor mode docstrings for the new meaning of a nil ARG.
* abbrev.el (abbrev-mode):
* allout.el (allout-mode):
* autoinsert.el (auto-insert-mode):
* autoarg.el (autoarg-mode, autoarg-kp-mode):
* autorevert.el (auto-revert-mode, auto-revert-tail-mode)
(global-auto-revert-mode):
* battery.el (display-battery-mode):
* composite.el (global-auto-composition-mode)
(auto-composition-mode):
* delsel.el (delete-selection-mode):
* desktop.el (desktop-save-mode):
* dired-x.el (dired-omit-mode):
* dirtrack.el (dirtrack-mode):
* doc-view.el (doc-view-minor-mode):
* double.el (double-mode):
* electric.el (electric-indent-mode, electric-pair-mode):
* emacs-lock.el (emacs-lock-mode):
* epa-hook.el (auto-encryption-mode):
* follow.el (follow-mode):
* font-core.el (font-lock-mode):
* frame.el (auto-raise-mode, auto-lower-mode, blink-cursor-mode):
* help.el (temp-buffer-resize-mode):
* hilit-chg.el (highlight-changes-mode)
(highlight-changes-visible-mode):
* hi-lock.el (hi-lock-mode):
* hl-line.el (hl-line-mode, global-hl-line-mode):
* icomplete.el (icomplete-mode):
* ido.el (ido-everywhere):
* image-file.el (auto-image-file-mode):
* image-mode.el (image-minor-mode):
* iswitchb.el (iswitchb-mode):
* jka-cmpr-hook.el (auto-compression-mode):
* linum.el (linum-mode):
* longlines.el (longlines-mode):
* master.el (master-mode):
* mb-depth.el (minibuffer-depth-indicate-mode):
* menu-bar.el (menu-bar-mode):
* minibuf-eldef.el (minibuffer-electric-default-mode):
* mouse-sel.el (mouse-sel-mode):
* msb.el (msb-mode):
* mwheel.el (mouse-wheel-mode):
* outline.el (outline-minor-mode):
* paren.el (show-paren-mode):
* recentf.el (recentf-mode):
* reveal.el (reveal-mode, global-reveal-mode):
* rfn-eshadow.el (file-name-shadow-mode):
* ruler-mode.el (ruler-mode):
* savehist.el (savehist-mode):
* scroll-all.el (scroll-all-mode):
* scroll-bar.el (scroll-bar-mode):
* server.el (server-mode):
* shell.el (shell-dirtrack-mode):
* simple.el (auto-fill-mode, transient-mark-mode)
(visual-line-mode, overwrite-mode, binary-overwrite-mode)
(line-number-mode, column-number-mode, size-indication-mode)
(auto-save-mode, normal-erase-is-backspace-mode, visible-mode):
* strokes.el (strokes-mode):
* time.el (display-time-mode):
* t-mouse.el (gpm-mouse-mode):
* tool-bar.el (tool-bar-mode):
* tooltip.el (tooltip-mode):
* type-break.el (type-break-mode-line-message-mode)
(type-break-query-mode):
* view.el (view-mode):
* whitespace.el (whitespace-mode, whitespace-newline-mode)
(global-whitespace-mode, global-whitespace-newline-mode):
* xt-mouse.el (xterm-mouse-mode): Doc fix.
* emacs-lisp/easy-mmode.el (define-globalized-minor-mode): Fix
autogenerated docstring.
2011-10-19 12:54:24 +00:00
|
|
|
|
`emacsclient' program. See Info node `Emacs server' and
|
|
|
|
|
`server-start' for details."
|
2003-01-15 17:49:32 +00:00
|
|
|
|
:global t
|
|
|
|
|
:group 'server
|
2005-02-09 15:50:47 +00:00
|
|
|
|
:version "22.1"
|
2003-01-15 17:49:32 +00:00
|
|
|
|
;; Fixme: Should this check for an existing server socket and do
|
|
|
|
|
;; nothing if there is one (for multiple Emacs sessions)?
|
|
|
|
|
(server-start (not server-mode)))
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
2007-09-16 04:53:39 +00:00
|
|
|
|
(defun server-eval-and-print (expr proc)
|
|
|
|
|
"Eval EXPR and send the result back to client PROC."
|
2011-11-22 15:18:56 +00:00
|
|
|
|
;; While we're running asynchronously (from a process filter), it is likely
|
|
|
|
|
;; that the emacsclient command was run in response to a user
|
|
|
|
|
;; action, so the user probably knows that Emacs is processing this
|
|
|
|
|
;; emacsclient request, so if we get a C-g it's likely that the user
|
|
|
|
|
;; intended it to interrupt us rather than interrupt whatever Emacs
|
|
|
|
|
;; was doing before it started handling the process filter.
|
|
|
|
|
;; Hence `with-local-quit' (bug#6585).
|
|
|
|
|
(let ((v (with-local-quit (eval (car (read-from-string expr))))))
|
2011-07-04 01:04:29 +00:00
|
|
|
|
(when proc
|
2007-09-16 04:53:39 +00:00
|
|
|
|
(with-temp-buffer
|
|
|
|
|
(let ((standard-output (current-buffer)))
|
|
|
|
|
(pp v)
|
|
|
|
|
(let ((text (buffer-substring-no-properties
|
|
|
|
|
(point-min) (point-max))))
|
2012-03-11 17:53:07 +00:00
|
|
|
|
(server-reply-print (server-quote-arg text) proc)))))))
|
|
|
|
|
|
|
|
|
|
(defconst server-msg-size 1024
|
|
|
|
|
"Maximum size of a message sent to a client.")
|
|
|
|
|
|
|
|
|
|
(defun server-reply-print (qtext proc)
|
|
|
|
|
"Send a `-print QTEXT' command to client PROC.
|
|
|
|
|
QTEXT must be already quoted.
|
|
|
|
|
This handles splitting the command if it would be bigger than
|
|
|
|
|
`server-msg-size'."
|
|
|
|
|
(let ((prefix "-print ")
|
|
|
|
|
part)
|
|
|
|
|
(while (> (+ (length qtext) (length prefix) 1) server-msg-size)
|
|
|
|
|
;; We have to split the string
|
|
|
|
|
(setq part (substring qtext 0 (- server-msg-size (length prefix) 1)))
|
|
|
|
|
;; Don't split in the middle of a quote sequence
|
|
|
|
|
(if (string-match "\\(^\\|[^&]\\)\\(&&\\)+$" part)
|
|
|
|
|
;; There is an uneven number of & at the end
|
|
|
|
|
(setq part (substring part 0 -1)))
|
|
|
|
|
(setq qtext (substring qtext (length part)))
|
|
|
|
|
(server-send-string proc (concat prefix part "\n"))
|
|
|
|
|
(setq prefix "-print-nonl "))
|
|
|
|
|
(server-send-string proc (concat prefix qtext "\n"))))
|
2007-09-16 04:53:39 +00:00
|
|
|
|
|
|
|
|
|
(defun server-create-tty-frame (tty type proc)
|
2009-01-22 06:58:10 +00:00
|
|
|
|
(unless tty
|
|
|
|
|
(error "Invalid terminal device"))
|
|
|
|
|
(unless type
|
|
|
|
|
(error "Invalid terminal type"))
|
2007-10-10 20:43:22 +00:00
|
|
|
|
(add-to-list 'frame-inherited-parameters 'client)
|
2007-09-16 04:53:39 +00:00
|
|
|
|
(let ((frame
|
|
|
|
|
(server-with-environment (process-get proc 'env)
|
2011-02-10 18:53:49 +00:00
|
|
|
|
'("LANG" "LC_CTYPE" "LC_ALL"
|
|
|
|
|
;; For tgetent(3); list according to ncurses(3).
|
|
|
|
|
"BAUDRATE" "COLUMNS" "ESCDELAY" "HOME" "LINES"
|
|
|
|
|
"NCURSES_ASSUMED_COLORS" "NCURSES_NO_PADDING"
|
|
|
|
|
"NCURSES_NO_SETBUF" "TERM" "TERMCAP" "TERMINFO"
|
|
|
|
|
"TERMINFO_DIRS" "TERMPATH"
|
|
|
|
|
;; rxvt wants these
|
|
|
|
|
"COLORFGBG" "COLORTERM")
|
|
|
|
|
(make-frame `((window-system . nil)
|
|
|
|
|
(tty . ,tty)
|
|
|
|
|
(tty-type . ,type)
|
|
|
|
|
;; Ignore nowait here; we always need to
|
|
|
|
|
;; clean up opened ttys when the client dies.
|
|
|
|
|
(client . ,proc)
|
|
|
|
|
;; This is a leftover from an earlier
|
|
|
|
|
;; attempt at making it possible for process
|
|
|
|
|
;; run in the server process to use the
|
|
|
|
|
;; environment of the client process.
|
|
|
|
|
;; It has no effect now and to make it work
|
|
|
|
|
;; we'd need to decide how to make
|
|
|
|
|
;; process-environment interact with client
|
|
|
|
|
;; envvars, and then to change the
|
|
|
|
|
;; C functions `child_setup' and
|
|
|
|
|
;; `getenv_internal' accordingly.
|
|
|
|
|
(environment . ,(process-get proc 'env)))))))
|
2009-01-10 13:07:04 +00:00
|
|
|
|
|
2007-09-21 07:10:07 +00:00
|
|
|
|
;; ttys don't use the `display' parameter, but callproc.c does to set
|
|
|
|
|
;; the DISPLAY environment on subprocesses.
|
|
|
|
|
(set-frame-parameter frame 'display
|
|
|
|
|
(getenv-internal "DISPLAY" (process-get proc 'env)))
|
2007-09-16 04:53:39 +00:00
|
|
|
|
(select-frame frame)
|
(server-clients): Only keep procs, no properties any more.
(server-client): Remove.
(server-client-get, server-client-set): Remove, replace all callers by
process-get and process-put resp.
(server-clients-with, server-add-client, server-delete-client)
(server-create-tty-frame, server-create-window-system-frame)
(server-process-filter, server-execute, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer)
(server-save-buffers-kill-terminal): Update accordingly.
2007-09-16 05:16:42 +00:00
|
|
|
|
(process-put proc 'frame frame)
|
|
|
|
|
(process-put proc 'terminal (frame-terminal frame))
|
2007-09-16 04:53:39 +00:00
|
|
|
|
frame))
|
|
|
|
|
|
2011-06-25 18:05:48 +00:00
|
|
|
|
(defun server-create-window-system-frame (display nowait proc parent-id
|
|
|
|
|
&optional parameters)
|
2012-09-17 11:55:05 +00:00
|
|
|
|
(let* ((display (or display
|
|
|
|
|
(frame-parameter nil 'display)
|
|
|
|
|
(error "Please specify display.")))
|
|
|
|
|
(w (or (cdr (assq 'window-system parameters))
|
|
|
|
|
(window-system-for-display display))))
|
|
|
|
|
|
|
|
|
|
(unless (assq w window-system-initialization-alist)
|
|
|
|
|
(setq w nil))
|
|
|
|
|
|
2012-11-09 06:28:27 +00:00
|
|
|
|
;; Special case for ns. This is because DISPLAY may not be set at all
|
|
|
|
|
;; which in the ns case isn't an error. The variable display then becomes
|
|
|
|
|
;; the fully qualified hostname, which make-frame-on-display below
|
|
|
|
|
;; does not understand and throws an error.
|
|
|
|
|
;; It may also be a valid X display, but if Emacs is compiled for ns, it
|
|
|
|
|
;; can not make X frames.
|
2012-11-08 19:25:39 +00:00
|
|
|
|
(if (featurep 'ns-win)
|
|
|
|
|
(setq w 'ns display "ns"))
|
|
|
|
|
|
2012-09-17 11:55:05 +00:00
|
|
|
|
(cond (w
|
|
|
|
|
;; Flag frame as client-created, but use a dummy client.
|
|
|
|
|
;; This will prevent the frame from being deleted when
|
|
|
|
|
;; emacsclient quits while also preventing
|
|
|
|
|
;; `server-save-buffers-kill-terminal' from unexpectedly
|
|
|
|
|
;; killing emacs on that frame.
|
|
|
|
|
(let* ((params `((client . ,(if nowait 'nowait proc))
|
|
|
|
|
;; This is a leftover, see above.
|
|
|
|
|
(environment . ,(process-get proc 'env))
|
|
|
|
|
,@parameters))
|
|
|
|
|
frame)
|
|
|
|
|
(if parent-id
|
|
|
|
|
(push (cons 'parent-id (string-to-number parent-id)) params))
|
|
|
|
|
(add-to-list 'frame-inherited-parameters 'client)
|
|
|
|
|
(setq frame (make-frame-on-display display params))
|
|
|
|
|
(server-log (format "%s created" frame) proc)
|
|
|
|
|
(select-frame frame)
|
|
|
|
|
(process-put proc 'frame frame)
|
|
|
|
|
(process-put proc 'terminal (frame-terminal frame))
|
|
|
|
|
frame))
|
|
|
|
|
|
|
|
|
|
(t
|
|
|
|
|
(server-log "Window system unsupported" proc)
|
|
|
|
|
(server-send-string proc "-window-system-unsupported \n")
|
|
|
|
|
nil))))
|
2007-09-16 04:53:39 +00:00
|
|
|
|
|
|
|
|
|
(defun server-goto-toplevel (proc)
|
|
|
|
|
(condition-case nil
|
|
|
|
|
;; If we're running isearch, we must abort it to allow Emacs to
|
|
|
|
|
;; display the buffer and switch to it.
|
|
|
|
|
(dolist (buffer (buffer-list))
|
|
|
|
|
(with-current-buffer buffer
|
|
|
|
|
(when (bound-and-true-p isearch-mode)
|
|
|
|
|
(isearch-cancel))))
|
|
|
|
|
;; Signaled by isearch-cancel.
|
|
|
|
|
(quit (message nil)))
|
|
|
|
|
(when (> (recursion-depth) 0)
|
|
|
|
|
;; We're inside a minibuffer already, so if the emacs-client is trying
|
|
|
|
|
;; to open a frame on a new display, we might end up with an unusable
|
|
|
|
|
;; frame because input from that display will be blocked (until exiting
|
|
|
|
|
;; the minibuffer). Better exit this minibuffer right away.
|
|
|
|
|
;; Similarly with recursive-edits such as the splash screen.
|
2011-02-10 18:53:49 +00:00
|
|
|
|
(run-with-timer 0 nil (lambda () (server-execute-continuation proc)))
|
2007-09-16 04:53:39 +00:00
|
|
|
|
(top-level)))
|
|
|
|
|
|
|
|
|
|
;; We use various special properties on process objects:
|
|
|
|
|
;; - `env' stores the info about the environment of the emacsclient process.
|
|
|
|
|
;; - `continuation' is a no-arg function that we need to execute. It contains
|
|
|
|
|
;; commands we wanted to execute in some earlier invocation of the process
|
|
|
|
|
;; filter but that we somehow were unable to process at that time
|
|
|
|
|
;; (e.g. because we first need to throw to the toplevel).
|
|
|
|
|
|
|
|
|
|
(defun server-execute-continuation (proc)
|
|
|
|
|
(let ((continuation (process-get proc 'continuation)))
|
|
|
|
|
(process-put proc 'continuation nil)
|
|
|
|
|
(if continuation (ignore-errors (funcall continuation)))))
|
|
|
|
|
|
More CL cleanups and reduction of use of cl.el.
* woman.el, winner.el, vc/vc-rcs.el, vc/vc-hooks.el, vc/vc-hg.el:
* vc/vc-git.el, vc/vc-dir.el, vc/vc-bzr.el, vc/vc-annotate.el:
* textmodes/tex-mode.el, textmodes/sgml-mode.el, tar-mode.el:
* strokes.el, ses.el, server.el, progmodes/js.el, progmodes/gdb-mi.el:
* progmodes/flymake.el, progmodes/ebrowse.el, progmodes/compile.el:
* play/tetris.el, play/snake.el, play/pong.el, play/landmark.el:
* play/hanoi.el, play/decipher.el, play/5x5.el, nxml/nxml-mode.el:
* net/secrets.el, net/quickurl.el, midnight.el, mail/footnote.el:
* image-dired.el, ibuffer.el, ibuf-macs.el, ibuf-ext.el, hexl.el:
* eshell/eshell.el, eshell/esh-io.el, eshell/esh-ext.el:
* eshell/esh-cmd.el, eshell/em-ls.el, eshell/em-hist.el:
* eshell/em-cmpl.el, eshell/em-banner.el:
* url/url.el, url/url-queue.el, url/url-parse.el, url/url-http.el:
* url/url-future.el, url/url-dav.el, url/url-cookie.el:
* calendar/parse-time.el, test/eshell.el: Use cl-lib.
* wid-browse.el, wdired.el, vc/vc.el, vc/vc-mtn.el, vc/vc-cvs.el:
* vc/vc-arch.el, tree-widget.el, textmodes/texinfo.el:
* textmodes/refill.el, textmodes/css-mode.el, term/tvi970.el:
* term/ns-win.el, term.el, shell.el, ps-samp.el:
* progmodes/perl-mode.el, progmodes/pascal.el, progmodes/gud.el:
* progmodes/glasses.el, progmodes/etags.el, progmodes/cwarn.el:
* play/gamegrid.el, play/bubbles.el, novice.el, notifications.el:
* net/zeroconf.el, net/xesam.el, net/snmp-mode.el, net/mairix.el:
* net/ldap.el, net/eudc.el, net/browse-url.el, man.el:
* mail/mailheader.el, mail/feedmail.el:
* url/url-util.el, url/url-privacy.el, url/url-nfs.el, url/url-misc.el:
* url/url-methods.el, url/url-gw.el, url/url-file.el, url/url-expand.el:
Dont use CL.
* ibuf-ext.el (ibuffer-mark-old-buffers): Use float-time.
* eshell/esh-opt.el (eshell-eval-using-options): Quote code with
`lambda' rather than with `quote'.
(eshell-do-opt): Adjust accordingly.
(eshell-process-option): Simplify.
* eshell/esh-var.el:
* eshell/em-script.el: Require `esh-opt' for eshell-eval-using-options.
* emacs-pcase.el (pcase--dontcare-upats, pcase--let*)
(pcase--expand, pcase--u1): Rename pcase's internal `dontcare' pattern
to `pcase--dontcare'.
* emacs-cl.el (labels): Mark obsolete.
(cl--letf, letf): Move to cl-lib.
(cl--letf*, letf*): Remove.
* emacs-cl-lib.el (cl-nth-value): Use defalias.
* emacs-cl-macs.el (cl-dolist, cl-dotimes): Add indent rule.
(cl-progv): Rewrite.
(cl--letf, cl-letf): Move from cl.el.
(cl-letf*): New macro.
* emacs-cl-extra.el (cl--progv-before, cl--progv-after): Remove.
2012-07-11 23:13:41 +00:00
|
|
|
|
(cl-defun server-process-filter (proc string)
|
2003-01-15 17:49:32 +00:00
|
|
|
|
"Process a request from the server to edit some files.
|
2005-02-04 13:56:51 +00:00
|
|
|
|
PROC is the server process. STRING consists of a sequence of
|
2008-11-11 10:51:35 +00:00
|
|
|
|
commands prefixed by a dash. Some commands have arguments;
|
|
|
|
|
these are &-quoted and need to be decoded by `server-unquote-arg'.
|
|
|
|
|
The filter parses and executes these commands.
|
2005-02-04 13:56:51 +00:00
|
|
|
|
|
|
|
|
|
To illustrate the protocol, here is an example command that
|
|
|
|
|
emacsclient sends to create a new X frame (note that the whole
|
|
|
|
|
sequence is sent on a single line):
|
|
|
|
|
|
2008-11-11 10:51:35 +00:00
|
|
|
|
-env HOME=/home/lorentey
|
|
|
|
|
-env DISPLAY=:0.0
|
2005-02-04 13:56:51 +00:00
|
|
|
|
... lots of other -env commands
|
|
|
|
|
-display :0.0
|
|
|
|
|
-window-system
|
|
|
|
|
|
|
|
|
|
The following commands are accepted by the server:
|
|
|
|
|
|
2006-12-03 15:03:30 +00:00
|
|
|
|
`-auth AUTH-STRING'
|
|
|
|
|
Authenticate the client using the secret authentication string
|
2007-06-12 08:21:13 +00:00
|
|
|
|
AUTH-STRING.
|
2006-12-03 15:03:30 +00:00
|
|
|
|
|
2005-11-19 19:17:56 +00:00
|
|
|
|
`-env NAME=VALUE'
|
2005-02-04 13:56:51 +00:00
|
|
|
|
An environment variable on the client side.
|
|
|
|
|
|
2006-03-26 16:34:35 +00:00
|
|
|
|
`-dir DIRNAME'
|
|
|
|
|
The current working directory of the client process.
|
|
|
|
|
|
2005-09-10 23:51:08 +00:00
|
|
|
|
`-current-frame'
|
|
|
|
|
Forbid the creation of new frames.
|
|
|
|
|
|
2011-06-25 18:05:48 +00:00
|
|
|
|
`-frame-parameters ALIST'
|
|
|
|
|
Set the parameters of the created frame.
|
|
|
|
|
|
2005-02-04 13:56:51 +00:00
|
|
|
|
`-nowait'
|
|
|
|
|
Request that the next frame created should not be
|
|
|
|
|
associated with this client.
|
|
|
|
|
|
|
|
|
|
`-display DISPLAY'
|
|
|
|
|
Set the display name to open X frames on.
|
|
|
|
|
|
|
|
|
|
`-position LINE[:COLUMN]'
|
|
|
|
|
Go to the given line and column number
|
|
|
|
|
in the next file opened.
|
|
|
|
|
|
|
|
|
|
`-file FILENAME'
|
|
|
|
|
Load the given file in the current frame.
|
|
|
|
|
|
|
|
|
|
`-eval EXPR'
|
|
|
|
|
Evaluate EXPR as a Lisp expression and return the
|
|
|
|
|
result in -print commands.
|
|
|
|
|
|
|
|
|
|
`-window-system'
|
|
|
|
|
Open a new X frame.
|
|
|
|
|
|
|
|
|
|
`-tty DEVICENAME TYPE'
|
|
|
|
|
Open a new tty frame at the client.
|
|
|
|
|
|
|
|
|
|
`-suspend'
|
|
|
|
|
Suspend this tty frame. The client sends this string in
|
|
|
|
|
response to SIGTSTP and SIGTTOU. The server must cease all I/O
|
|
|
|
|
on this tty until it gets a -resume command.
|
|
|
|
|
|
2006-03-26 16:34:35 +00:00
|
|
|
|
`-resume'
|
2007-10-28 15:17:08 +00:00
|
|
|
|
Resume this tty frame. The client sends this string when it
|
2006-03-26 16:34:35 +00:00
|
|
|
|
gets the SIGCONT signal and it is the foreground process on its
|
|
|
|
|
controlling tty.
|
|
|
|
|
|
2005-02-04 13:56:51 +00:00
|
|
|
|
`-ignore COMMENT'
|
2008-11-11 10:51:35 +00:00
|
|
|
|
Do nothing, but put the comment in the server log.
|
|
|
|
|
Useful for debugging.
|
2005-02-04 13:56:51 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
The following commands are accepted by the client:
|
|
|
|
|
|
|
|
|
|
`-emacs-pid PID'
|
|
|
|
|
Describes the process id of the Emacs process;
|
|
|
|
|
used to forward window change signals to it.
|
|
|
|
|
|
|
|
|
|
`-window-system-unsupported'
|
2007-10-28 15:17:08 +00:00
|
|
|
|
Signals that the server does not support creating X frames;
|
|
|
|
|
the client must try again with a tty frame.
|
2005-02-04 13:56:51 +00:00
|
|
|
|
|
|
|
|
|
`-print STRING'
|
|
|
|
|
Print STRING on stdout. Used to send values
|
|
|
|
|
returned by -eval.
|
|
|
|
|
|
2012-03-11 17:53:07 +00:00
|
|
|
|
`-print-nonl STRING'
|
|
|
|
|
Print STRING on stdout. Used to continue a
|
|
|
|
|
preceding -print command that would be too big to send
|
|
|
|
|
in a single message.
|
|
|
|
|
|
2005-02-04 13:56:51 +00:00
|
|
|
|
`-error DESCRIPTION'
|
2010-09-29 13:24:55 +00:00
|
|
|
|
Signal an error and delete process PROC.
|
2005-02-04 13:56:51 +00:00
|
|
|
|
|
|
|
|
|
`-suspend'
|
2007-10-28 15:17:08 +00:00
|
|
|
|
Suspend this terminal, i.e., stop the client process.
|
|
|
|
|
Sent when the user presses C-z."
|
2005-02-04 13:56:51 +00:00
|
|
|
|
(server-log (concat "Received " string) proc)
|
2006-10-30 23:24:18 +00:00
|
|
|
|
;; First things first: let's check the authentication
|
|
|
|
|
(unless (process-get proc :authenticated)
|
2008-01-25 15:43:05 +00:00
|
|
|
|
(if (and (string-match "-auth \\([!-~]+\\)\n?" string)
|
2006-12-03 15:03:30 +00:00
|
|
|
|
(equal (match-string 1 string) (process-get proc :auth-key)))
|
|
|
|
|
(progn
|
|
|
|
|
(setq string (substring string (match-end 0)))
|
|
|
|
|
(process-put proc :authenticated t)
|
|
|
|
|
(server-log "Authentication successful" proc))
|
2006-10-30 23:24:18 +00:00
|
|
|
|
(server-log "Authentication failed" proc)
|
2006-12-03 15:03:30 +00:00
|
|
|
|
(server-send-string
|
|
|
|
|
proc (concat "-error " (server-quote-arg "Authentication failed")))
|
2010-10-03 00:03:44 +00:00
|
|
|
|
;; Before calling `delete-process', give emacsclient time to
|
|
|
|
|
;; receive the error string and shut down on its own.
|
|
|
|
|
(sit-for 1)
|
2006-10-30 23:24:18 +00:00
|
|
|
|
(delete-process proc)
|
More CL cleanups and reduction of use of cl.el.
* woman.el, winner.el, vc/vc-rcs.el, vc/vc-hooks.el, vc/vc-hg.el:
* vc/vc-git.el, vc/vc-dir.el, vc/vc-bzr.el, vc/vc-annotate.el:
* textmodes/tex-mode.el, textmodes/sgml-mode.el, tar-mode.el:
* strokes.el, ses.el, server.el, progmodes/js.el, progmodes/gdb-mi.el:
* progmodes/flymake.el, progmodes/ebrowse.el, progmodes/compile.el:
* play/tetris.el, play/snake.el, play/pong.el, play/landmark.el:
* play/hanoi.el, play/decipher.el, play/5x5.el, nxml/nxml-mode.el:
* net/secrets.el, net/quickurl.el, midnight.el, mail/footnote.el:
* image-dired.el, ibuffer.el, ibuf-macs.el, ibuf-ext.el, hexl.el:
* eshell/eshell.el, eshell/esh-io.el, eshell/esh-ext.el:
* eshell/esh-cmd.el, eshell/em-ls.el, eshell/em-hist.el:
* eshell/em-cmpl.el, eshell/em-banner.el:
* url/url.el, url/url-queue.el, url/url-parse.el, url/url-http.el:
* url/url-future.el, url/url-dav.el, url/url-cookie.el:
* calendar/parse-time.el, test/eshell.el: Use cl-lib.
* wid-browse.el, wdired.el, vc/vc.el, vc/vc-mtn.el, vc/vc-cvs.el:
* vc/vc-arch.el, tree-widget.el, textmodes/texinfo.el:
* textmodes/refill.el, textmodes/css-mode.el, term/tvi970.el:
* term/ns-win.el, term.el, shell.el, ps-samp.el:
* progmodes/perl-mode.el, progmodes/pascal.el, progmodes/gud.el:
* progmodes/glasses.el, progmodes/etags.el, progmodes/cwarn.el:
* play/gamegrid.el, play/bubbles.el, novice.el, notifications.el:
* net/zeroconf.el, net/xesam.el, net/snmp-mode.el, net/mairix.el:
* net/ldap.el, net/eudc.el, net/browse-url.el, man.el:
* mail/mailheader.el, mail/feedmail.el:
* url/url-util.el, url/url-privacy.el, url/url-nfs.el, url/url-misc.el:
* url/url-methods.el, url/url-gw.el, url/url-file.el, url/url-expand.el:
Dont use CL.
* ibuf-ext.el (ibuffer-mark-old-buffers): Use float-time.
* eshell/esh-opt.el (eshell-eval-using-options): Quote code with
`lambda' rather than with `quote'.
(eshell-do-opt): Adjust accordingly.
(eshell-process-option): Simplify.
* eshell/esh-var.el:
* eshell/em-script.el: Require `esh-opt' for eshell-eval-using-options.
* emacs-pcase.el (pcase--dontcare-upats, pcase--let*)
(pcase--expand, pcase--u1): Rename pcase's internal `dontcare' pattern
to `pcase--dontcare'.
* emacs-cl.el (labels): Mark obsolete.
(cl--letf, letf): Move to cl-lib.
(cl--letf*, letf*): Remove.
* emacs-cl-lib.el (cl-nth-value): Use defalias.
* emacs-cl-macs.el (cl-dolist, cl-dotimes): Add indent rule.
(cl-progv): Rewrite.
(cl--letf, cl-letf): Move from cl.el.
(cl-letf*): New macro.
* emacs-cl-extra.el (cl--progv-before, cl--progv-after): Remove.
2012-07-11 23:13:41 +00:00
|
|
|
|
;; We return immediately.
|
|
|
|
|
(cl-return-from server-process-filter)))
|
2003-02-10 21:44:24 +00:00
|
|
|
|
(let ((prev (process-get proc 'previous-string)))
|
|
|
|
|
(when prev
|
|
|
|
|
(setq string (concat prev string))
|
|
|
|
|
(process-put proc 'previous-string nil)))
|
2004-02-20 01:22:10 +00:00
|
|
|
|
(condition-case err
|
Implemented suspending of emacsclient frames.
lib-src/emacsclient.c (quote_file_name): Renamed to quote_argument.
(unquote_argument, handle_sigcont, handle_sigtstp): New functions.
(out, in): New global variables for communicating with the Emacs process.
(init_signals): Set up handlers for SIGCONT, SIGTSTP and SIGTTOU.
(main): Changed out and in to global variables. Prepend `-eval' or
'-file' to each argument. Use fsync to force sending the strings to Emacs.
Removed obsolete -bad-version code. Support the -suspend command.
Cleaned up newline handling.
lisp/frame.el (suspend-frame): New function.
Substitute key definition of suspend-emacs with suspend-frame.
lisp/server.el (server-log): Cosmetic change in log format.
(server-handle-delete-tty, server-handle-delete-frame): Added logging.
(server-handle-suspend-tty, server-quote-arg): New functions.
(server-start): Install server-handle-suspend-tty.
(server-process-filter): Reorganized source code for clarity.
Implemented -resume, -suspend and -ignore commands.
lisp/term/x-win.el (x-initialize-window-system): Don't change the
binding of C-z.
src/cm.c: Replaced TTY_INPUT, TTY_OUTPUT, TTY_TERMSCRIPT calls with
their macro expansion.
src/dispnew.c: Ditto.
src/frame.c: Ditto.
src/keyboard.c: Ditto.
src/sysdep.c: Ditto.
src/keyboard.c (tty_read_avail_input): Don't read if the terminal is
suspended.
src/sysdep.c (discard_tty_input, init_sys_modes, reset_sys_modes): Ditto.
src/term.c (tty_set_terminal_modes, tty_reset_terminal_modes): Ditto.
src/term.c (Vsuspend_tty_functions, Vresume_tty_functions): New hooks.
(syms_of_term): Defvar them.
(term_init): Don't allow opening a new frame on a suspended tty device.
(Fsuspend_tty, Fresume_tty): New functions.
(syms_of_term): Defsubr them.
src/termchar.c (struct tty_display_info): Update documentation of
input and output.
(TTY_INPUT, TTY_OUTPUT, TTY_TERMSCRIPT): Removed.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-105
2004-02-28 01:23:39 +00:00
|
|
|
|
(progn
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
(server-add-client proc)
|
2010-09-30 02:53:26 +00:00
|
|
|
|
;; Send our pid
|
|
|
|
|
(server-send-string proc (concat "-emacs-pid "
|
|
|
|
|
(number-to-string (emacs-pid)) "\n"))
|
2007-09-16 04:53:39 +00:00
|
|
|
|
(if (not (string-match "\n" string))
|
|
|
|
|
;; Save for later any partial line that remains.
|
|
|
|
|
(when (> (length string) 0)
|
|
|
|
|
(process-put proc 'previous-string string))
|
2007-10-28 15:17:08 +00:00
|
|
|
|
|
2007-09-16 04:53:39 +00:00
|
|
|
|
;; In earlier versions of server.el (where we used an `emacsserver'
|
|
|
|
|
;; process), there could be multiple lines. Nowadays this is not
|
|
|
|
|
;; supported any more.
|
More CL cleanups and reduction of use of cl.el.
* woman.el, winner.el, vc/vc-rcs.el, vc/vc-hooks.el, vc/vc-hg.el:
* vc/vc-git.el, vc/vc-dir.el, vc/vc-bzr.el, vc/vc-annotate.el:
* textmodes/tex-mode.el, textmodes/sgml-mode.el, tar-mode.el:
* strokes.el, ses.el, server.el, progmodes/js.el, progmodes/gdb-mi.el:
* progmodes/flymake.el, progmodes/ebrowse.el, progmodes/compile.el:
* play/tetris.el, play/snake.el, play/pong.el, play/landmark.el:
* play/hanoi.el, play/decipher.el, play/5x5.el, nxml/nxml-mode.el:
* net/secrets.el, net/quickurl.el, midnight.el, mail/footnote.el:
* image-dired.el, ibuffer.el, ibuf-macs.el, ibuf-ext.el, hexl.el:
* eshell/eshell.el, eshell/esh-io.el, eshell/esh-ext.el:
* eshell/esh-cmd.el, eshell/em-ls.el, eshell/em-hist.el:
* eshell/em-cmpl.el, eshell/em-banner.el:
* url/url.el, url/url-queue.el, url/url-parse.el, url/url-http.el:
* url/url-future.el, url/url-dav.el, url/url-cookie.el:
* calendar/parse-time.el, test/eshell.el: Use cl-lib.
* wid-browse.el, wdired.el, vc/vc.el, vc/vc-mtn.el, vc/vc-cvs.el:
* vc/vc-arch.el, tree-widget.el, textmodes/texinfo.el:
* textmodes/refill.el, textmodes/css-mode.el, term/tvi970.el:
* term/ns-win.el, term.el, shell.el, ps-samp.el:
* progmodes/perl-mode.el, progmodes/pascal.el, progmodes/gud.el:
* progmodes/glasses.el, progmodes/etags.el, progmodes/cwarn.el:
* play/gamegrid.el, play/bubbles.el, novice.el, notifications.el:
* net/zeroconf.el, net/xesam.el, net/snmp-mode.el, net/mairix.el:
* net/ldap.el, net/eudc.el, net/browse-url.el, man.el:
* mail/mailheader.el, mail/feedmail.el:
* url/url-util.el, url/url-privacy.el, url/url-nfs.el, url/url-misc.el:
* url/url-methods.el, url/url-gw.el, url/url-file.el, url/url-expand.el:
Dont use CL.
* ibuf-ext.el (ibuffer-mark-old-buffers): Use float-time.
* eshell/esh-opt.el (eshell-eval-using-options): Quote code with
`lambda' rather than with `quote'.
(eshell-do-opt): Adjust accordingly.
(eshell-process-option): Simplify.
* eshell/esh-var.el:
* eshell/em-script.el: Require `esh-opt' for eshell-eval-using-options.
* emacs-pcase.el (pcase--dontcare-upats, pcase--let*)
(pcase--expand, pcase--u1): Rename pcase's internal `dontcare' pattern
to `pcase--dontcare'.
* emacs-cl.el (labels): Mark obsolete.
(cl--letf, letf): Move to cl-lib.
(cl--letf*, letf*): Remove.
* emacs-cl-lib.el (cl-nth-value): Use defalias.
* emacs-cl-macs.el (cl-dolist, cl-dotimes): Add indent rule.
(cl-progv): Rewrite.
(cl--letf, cl-letf): Move from cl.el.
(cl-letf*): New macro.
* emacs-cl-extra.el (cl--progv-before, cl--progv-after): Remove.
2012-07-11 23:13:41 +00:00
|
|
|
|
(cl-assert (eq (match-end 0) (length string)))
|
Implemented suspending of emacsclient frames.
lib-src/emacsclient.c (quote_file_name): Renamed to quote_argument.
(unquote_argument, handle_sigcont, handle_sigtstp): New functions.
(out, in): New global variables for communicating with the Emacs process.
(init_signals): Set up handlers for SIGCONT, SIGTSTP and SIGTTOU.
(main): Changed out and in to global variables. Prepend `-eval' or
'-file' to each argument. Use fsync to force sending the strings to Emacs.
Removed obsolete -bad-version code. Support the -suspend command.
Cleaned up newline handling.
lisp/frame.el (suspend-frame): New function.
Substitute key definition of suspend-emacs with suspend-frame.
lisp/server.el (server-log): Cosmetic change in log format.
(server-handle-delete-tty, server-handle-delete-frame): Added logging.
(server-handle-suspend-tty, server-quote-arg): New functions.
(server-start): Install server-handle-suspend-tty.
(server-process-filter): Reorganized source code for clarity.
Implemented -resume, -suspend and -ignore commands.
lisp/term/x-win.el (x-initialize-window-system): Don't change the
binding of C-z.
src/cm.c: Replaced TTY_INPUT, TTY_OUTPUT, TTY_TERMSCRIPT calls with
their macro expansion.
src/dispnew.c: Ditto.
src/frame.c: Ditto.
src/keyboard.c: Ditto.
src/sysdep.c: Ditto.
src/keyboard.c (tty_read_avail_input): Don't read if the terminal is
suspended.
src/sysdep.c (discard_tty_input, init_sys_modes, reset_sys_modes): Ditto.
src/term.c (tty_set_terminal_modes, tty_reset_terminal_modes): Ditto.
src/term.c (Vsuspend_tty_functions, Vresume_tty_functions): New hooks.
(syms_of_term): Defvar them.
(term_init): Don't allow opening a new frame on a suspended tty device.
(Fsuspend_tty, Fresume_tty): New functions.
(syms_of_term): Defsubr them.
src/termchar.c (struct tty_display_info): Update documentation of
input and output.
(TTY_INPUT, TTY_OUTPUT, TTY_TERMSCRIPT): Removed.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-105
2004-02-28 01:23:39 +00:00
|
|
|
|
(let ((request (substring string 0 (match-beginning 0)))
|
2009-09-03 06:54:57 +00:00
|
|
|
|
(coding-system (and (default-value 'enable-multibyte-characters)
|
Implemented suspending of emacsclient frames.
lib-src/emacsclient.c (quote_file_name): Renamed to quote_argument.
(unquote_argument, handle_sigcont, handle_sigtstp): New functions.
(out, in): New global variables for communicating with the Emacs process.
(init_signals): Set up handlers for SIGCONT, SIGTSTP and SIGTTOU.
(main): Changed out and in to global variables. Prepend `-eval' or
'-file' to each argument. Use fsync to force sending the strings to Emacs.
Removed obsolete -bad-version code. Support the -suspend command.
Cleaned up newline handling.
lisp/frame.el (suspend-frame): New function.
Substitute key definition of suspend-emacs with suspend-frame.
lisp/server.el (server-log): Cosmetic change in log format.
(server-handle-delete-tty, server-handle-delete-frame): Added logging.
(server-handle-suspend-tty, server-quote-arg): New functions.
(server-start): Install server-handle-suspend-tty.
(server-process-filter): Reorganized source code for clarity.
Implemented -resume, -suspend and -ignore commands.
lisp/term/x-win.el (x-initialize-window-system): Don't change the
binding of C-z.
src/cm.c: Replaced TTY_INPUT, TTY_OUTPUT, TTY_TERMSCRIPT calls with
their macro expansion.
src/dispnew.c: Ditto.
src/frame.c: Ditto.
src/keyboard.c: Ditto.
src/sysdep.c: Ditto.
src/keyboard.c (tty_read_avail_input): Don't read if the terminal is
suspended.
src/sysdep.c (discard_tty_input, init_sys_modes, reset_sys_modes): Ditto.
src/term.c (tty_set_terminal_modes, tty_reset_terminal_modes): Ditto.
src/term.c (Vsuspend_tty_functions, Vresume_tty_functions): New hooks.
(syms_of_term): Defvar them.
(term_init): Don't allow opening a new frame on a suspended tty device.
(Fsuspend_tty, Fresume_tty): New functions.
(syms_of_term): Defsubr them.
src/termchar.c (struct tty_display_info): Update documentation of
input and output.
(TTY_INPUT, TTY_OUTPUT, TTY_TERMSCRIPT): Removed.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-105
2004-02-28 01:23:39 +00:00
|
|
|
|
(or file-name-coding-system
|
|
|
|
|
default-file-name-coding-system)))
|
2010-05-29 23:50:47 +00:00
|
|
|
|
nowait ; t if emacsclient does not want to wait for us.
|
|
|
|
|
frame ; Frame opened for the client (if any).
|
|
|
|
|
display ; Open frame on this display.
|
|
|
|
|
parent-id ; Window ID for XEmbed
|
|
|
|
|
dontkill ; t if client should not be killed.
|
2008-11-04 18:42:04 +00:00
|
|
|
|
commands
|
2006-03-26 16:34:35 +00:00
|
|
|
|
dir
|
2008-10-30 15:50:01 +00:00
|
|
|
|
use-current-frame
|
2011-06-25 18:05:48 +00:00
|
|
|
|
frame-parameters ;parameters for newly created frame
|
2010-05-29 23:50:47 +00:00
|
|
|
|
tty-name ; nil, `window-system', or the tty name.
|
|
|
|
|
tty-type ; string.
|
2008-11-04 18:42:04 +00:00
|
|
|
|
files
|
|
|
|
|
filepos
|
2011-02-10 19:41:44 +00:00
|
|
|
|
args-left)
|
Implemented suspending of emacsclient frames.
lib-src/emacsclient.c (quote_file_name): Renamed to quote_argument.
(unquote_argument, handle_sigcont, handle_sigtstp): New functions.
(out, in): New global variables for communicating with the Emacs process.
(init_signals): Set up handlers for SIGCONT, SIGTSTP and SIGTTOU.
(main): Changed out and in to global variables. Prepend `-eval' or
'-file' to each argument. Use fsync to force sending the strings to Emacs.
Removed obsolete -bad-version code. Support the -suspend command.
Cleaned up newline handling.
lisp/frame.el (suspend-frame): New function.
Substitute key definition of suspend-emacs with suspend-frame.
lisp/server.el (server-log): Cosmetic change in log format.
(server-handle-delete-tty, server-handle-delete-frame): Added logging.
(server-handle-suspend-tty, server-quote-arg): New functions.
(server-start): Install server-handle-suspend-tty.
(server-process-filter): Reorganized source code for clarity.
Implemented -resume, -suspend and -ignore commands.
lisp/term/x-win.el (x-initialize-window-system): Don't change the
binding of C-z.
src/cm.c: Replaced TTY_INPUT, TTY_OUTPUT, TTY_TERMSCRIPT calls with
their macro expansion.
src/dispnew.c: Ditto.
src/frame.c: Ditto.
src/keyboard.c: Ditto.
src/sysdep.c: Ditto.
src/keyboard.c (tty_read_avail_input): Don't read if the terminal is
suspended.
src/sysdep.c (discard_tty_input, init_sys_modes, reset_sys_modes): Ditto.
src/term.c (tty_set_terminal_modes, tty_reset_terminal_modes): Ditto.
src/term.c (Vsuspend_tty_functions, Vresume_tty_functions): New hooks.
(syms_of_term): Defvar them.
(term_init): Don't allow opening a new frame on a suspended tty device.
(Fsuspend_tty, Fresume_tty): New functions.
(syms_of_term): Defsubr them.
src/termchar.c (struct tty_display_info): Update documentation of
input and output.
(TTY_INPUT, TTY_OUTPUT, TTY_TERMSCRIPT): Removed.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-105
2004-02-28 01:23:39 +00:00
|
|
|
|
;; Remove this line from STRING.
|
|
|
|
|
(setq string (substring string (match-end 0)))
|
2011-02-10 19:41:44 +00:00
|
|
|
|
(setq args-left
|
2007-11-23 23:59:19 +00:00
|
|
|
|
(mapcar 'server-unquote-arg (split-string request " " t)))
|
2011-02-10 19:41:44 +00:00
|
|
|
|
(while args-left
|
|
|
|
|
(pcase (pop args-left)
|
|
|
|
|
;; -version CLIENT-VERSION: obsolete at birth.
|
|
|
|
|
(`"-version" (pop args-left))
|
|
|
|
|
|
|
|
|
|
;; -nowait: Emacsclient won't wait for a result.
|
|
|
|
|
(`"-nowait" (setq nowait t))
|
|
|
|
|
|
|
|
|
|
;; -current-frame: Don't create frames.
|
|
|
|
|
(`"-current-frame" (setq use-current-frame t))
|
|
|
|
|
|
2011-06-25 18:05:48 +00:00
|
|
|
|
;; -frame-parameters: Set frame parameters
|
|
|
|
|
(`"-frame-parameters"
|
|
|
|
|
(let ((alist (pop args-left)))
|
|
|
|
|
(if coding-system
|
|
|
|
|
(setq alist (decode-coding-string alist coding-system)))
|
|
|
|
|
(setq frame-parameters (car (read-from-string alist)))))
|
|
|
|
|
|
2011-02-10 19:41:44 +00:00
|
|
|
|
;; -display DISPLAY:
|
|
|
|
|
;; Open X frames on the given display instead of the default.
|
|
|
|
|
(`"-display"
|
|
|
|
|
(setq display (pop args-left))
|
|
|
|
|
(if (zerop (length display)) (setq display nil)))
|
|
|
|
|
|
|
|
|
|
;; -parent-id ID:
|
|
|
|
|
;; Open X frame within window ID, via XEmbed.
|
|
|
|
|
(`"-parent-id"
|
|
|
|
|
(setq parent-id (pop args-left))
|
|
|
|
|
(if (zerop (length parent-id)) (setq parent-id nil)))
|
|
|
|
|
|
|
|
|
|
;; -window-system: Open a new X frame.
|
|
|
|
|
(`"-window-system"
|
2012-04-20 10:37:57 +00:00
|
|
|
|
(if (fboundp 'x-create-frame)
|
|
|
|
|
(setq dontkill t
|
|
|
|
|
tty-name 'window-system)))
|
2011-02-10 19:41:44 +00:00
|
|
|
|
|
|
|
|
|
;; -resume: Resume a suspended tty frame.
|
|
|
|
|
(`"-resume"
|
2011-02-12 02:27:53 +00:00
|
|
|
|
(let ((terminal (process-get proc 'terminal)))
|
2011-02-10 19:41:44 +00:00
|
|
|
|
(setq dontkill t)
|
|
|
|
|
(push (lambda ()
|
|
|
|
|
(when (eq (terminal-live-p terminal) t)
|
|
|
|
|
(resume-tty terminal)))
|
|
|
|
|
commands)))
|
|
|
|
|
|
|
|
|
|
;; -suspend: Suspend the client's frame. (In case we
|
|
|
|
|
;; get out of sync, and a C-z sends a SIGTSTP to
|
|
|
|
|
;; emacsclient.)
|
|
|
|
|
(`"-suspend"
|
2011-02-12 02:27:53 +00:00
|
|
|
|
(let ((terminal (process-get proc 'terminal)))
|
2011-02-10 19:41:44 +00:00
|
|
|
|
(setq dontkill t)
|
|
|
|
|
(push (lambda ()
|
|
|
|
|
(when (eq (terminal-live-p terminal) t)
|
|
|
|
|
(suspend-tty terminal)))
|
|
|
|
|
commands)))
|
|
|
|
|
|
|
|
|
|
;; -ignore COMMENT: Noop; useful for debugging emacsclient.
|
|
|
|
|
;; (The given comment appears in the server log.)
|
|
|
|
|
(`"-ignore"
|
|
|
|
|
(setq dontkill t)
|
|
|
|
|
(pop args-left))
|
|
|
|
|
|
2012-04-20 10:37:57 +00:00
|
|
|
|
;; -tty DEVICE-NAME TYPE: Open a new tty frame.
|
|
|
|
|
;; (But if we see -window-system later, use that.)
|
2011-02-10 19:41:44 +00:00
|
|
|
|
(`"-tty"
|
|
|
|
|
(setq tty-name (pop args-left)
|
|
|
|
|
tty-type (pop args-left)
|
|
|
|
|
dontkill (or dontkill
|
2011-12-04 17:13:01 +00:00
|
|
|
|
(not use-current-frame)))
|
2012-09-17 11:55:03 +00:00
|
|
|
|
;; On Windows, emacsclient always asks for a tty
|
|
|
|
|
;; frame. If running a GUI server, force the frame
|
|
|
|
|
;; type to GUI. (Cygwin is perfectly happy with
|
|
|
|
|
;; multi-tty support, so don't override the user's
|
|
|
|
|
;; choice there.)
|
|
|
|
|
(when (and (eq system-type 'windows-nt)
|
|
|
|
|
(eq window-system 'w32))
|
2011-12-04 17:13:01 +00:00
|
|
|
|
(push "-window-system" args-left)))
|
2011-02-10 19:41:44 +00:00
|
|
|
|
|
|
|
|
|
;; -position LINE[:COLUMN]: Set point to the given
|
|
|
|
|
;; position in the next file.
|
|
|
|
|
(`"-position"
|
|
|
|
|
(if (not (string-match "\\+\\([0-9]+\\)\\(?::\\([0-9]+\\)\\)?"
|
|
|
|
|
(car args-left)))
|
|
|
|
|
(error "Invalid -position command in client args"))
|
|
|
|
|
(let ((arg (pop args-left)))
|
|
|
|
|
(setq filepos
|
|
|
|
|
(cons (string-to-number (match-string 1 arg))
|
|
|
|
|
(string-to-number (or (match-string 2 arg)
|
|
|
|
|
""))))))
|
|
|
|
|
|
|
|
|
|
;; -file FILENAME: Load the given file.
|
|
|
|
|
(`"-file"
|
|
|
|
|
(let ((file (pop args-left)))
|
|
|
|
|
(if coding-system
|
|
|
|
|
(setq file (decode-coding-string file coding-system)))
|
|
|
|
|
(setq file (expand-file-name file dir))
|
|
|
|
|
(push (cons file filepos) files)
|
|
|
|
|
(server-log (format "New file: %s %s"
|
|
|
|
|
file (or filepos "")) proc))
|
|
|
|
|
(setq filepos nil))
|
|
|
|
|
|
|
|
|
|
;; -eval EXPR: Evaluate a Lisp expression.
|
|
|
|
|
(`"-eval"
|
|
|
|
|
(if use-current-frame
|
|
|
|
|
(setq use-current-frame 'always))
|
2011-02-12 02:27:53 +00:00
|
|
|
|
(let ((expr (pop args-left)))
|
2011-02-10 19:41:44 +00:00
|
|
|
|
(if coding-system
|
|
|
|
|
(setq expr (decode-coding-string expr coding-system)))
|
|
|
|
|
(push (lambda () (server-eval-and-print expr proc))
|
|
|
|
|
commands)
|
|
|
|
|
(setq filepos nil)))
|
|
|
|
|
|
|
|
|
|
;; -env NAME=VALUE: An environment variable.
|
|
|
|
|
(`"-env"
|
|
|
|
|
(let ((var (pop args-left)))
|
|
|
|
|
;; XXX Variables should be encoded as in getenv/setenv.
|
|
|
|
|
(process-put proc 'env
|
|
|
|
|
(cons var (process-get proc 'env)))))
|
|
|
|
|
|
|
|
|
|
;; -dir DIRNAME: The cwd of the emacsclient process.
|
|
|
|
|
(`"-dir"
|
|
|
|
|
(setq dir (pop args-left))
|
|
|
|
|
(if coding-system
|
|
|
|
|
(setq dir (decode-coding-string dir coding-system)))
|
2012-06-25 23:01:42 +00:00
|
|
|
|
(setq dir (command-line-normalize-file-name dir))
|
|
|
|
|
(process-put proc 'server-client-directory dir))
|
2011-02-10 19:41:44 +00:00
|
|
|
|
|
|
|
|
|
;; Unknown command.
|
|
|
|
|
(arg (error "Unknown command: %s" arg))))
|
2007-10-28 15:17:08 +00:00
|
|
|
|
|
2012-04-15 08:49:24 +00:00
|
|
|
|
;; If both -no-wait and -tty are given with file or sexp
|
|
|
|
|
;; arguments, use an existing frame.
|
|
|
|
|
(and nowait
|
|
|
|
|
(not (eq tty-name 'window-system))
|
|
|
|
|
(or files commands)
|
|
|
|
|
(setq use-current-frame t))
|
|
|
|
|
|
2008-10-30 15:50:01 +00:00
|
|
|
|
(setq frame
|
|
|
|
|
(cond
|
|
|
|
|
((and use-current-frame
|
|
|
|
|
(or (eq use-current-frame 'always)
|
|
|
|
|
;; We can't use the Emacs daemon's
|
|
|
|
|
;; terminal frame.
|
2008-11-05 21:16:17 +00:00
|
|
|
|
(not (and (daemonp)
|
2009-01-21 20:33:17 +00:00
|
|
|
|
(null (cdr (frame-list)))
|
2008-10-30 15:50:01 +00:00
|
|
|
|
(eq (selected-frame)
|
|
|
|
|
terminal-frame)))))
|
2008-11-05 21:16:17 +00:00
|
|
|
|
(setq tty-name nil tty-type nil)
|
2008-10-30 15:50:01 +00:00
|
|
|
|
(if display (server-select-display display)))
|
|
|
|
|
((eq tty-name 'window-system)
|
2010-05-29 23:50:47 +00:00
|
|
|
|
(server-create-window-system-frame display nowait proc
|
2011-06-25 18:05:48 +00:00
|
|
|
|
parent-id
|
|
|
|
|
frame-parameters))
|
2008-11-04 18:42:04 +00:00
|
|
|
|
;; When resuming on a tty, tty-name is nil.
|
|
|
|
|
(tty-name
|
|
|
|
|
(server-create-tty-frame tty-name tty-type proc))))
|
2007-09-16 04:53:39 +00:00
|
|
|
|
|
2008-01-26 21:54:44 +00:00
|
|
|
|
(process-put
|
|
|
|
|
proc 'continuation
|
2011-02-10 18:53:49 +00:00
|
|
|
|
(lambda ()
|
|
|
|
|
(with-current-buffer (get-buffer-create server-buffer)
|
|
|
|
|
;; Use the same cwd as the emacsclient, if possible, so
|
|
|
|
|
;; relative file names work correctly, even in `eval'.
|
|
|
|
|
(let ((default-directory
|
|
|
|
|
(if (and dir (file-directory-p dir))
|
|
|
|
|
dir default-directory)))
|
|
|
|
|
(server-execute proc files nowait commands
|
|
|
|
|
dontkill frame tty-name)))))
|
2007-09-16 04:53:39 +00:00
|
|
|
|
|
|
|
|
|
(when (or frame files)
|
|
|
|
|
(server-goto-toplevel proc))
|
|
|
|
|
|
|
|
|
|
(server-execute-continuation proc))))
|
2004-02-20 01:22:10 +00:00
|
|
|
|
;; condition-case
|
2007-09-16 04:53:39 +00:00
|
|
|
|
(error (server-return-error proc err))))
|
|
|
|
|
|
|
|
|
|
(defun server-execute (proc files nowait commands dontkill frame tty-name)
|
2009-02-07 16:24:36 +00:00
|
|
|
|
;; This is run from timers and process-filters, i.e. "asynchronously".
|
|
|
|
|
;; But w.r.t the user, this is not really asynchronous since the timer
|
|
|
|
|
;; is run after 0s and the process-filter is run in response to the
|
|
|
|
|
;; user running `emacsclient'. So it is OK to override the
|
|
|
|
|
;; inhibit-quit flag, which is good since `commands' (as well as
|
|
|
|
|
;; find-file-noselect via the major-mode) can run arbitrary code,
|
|
|
|
|
;; including code that needs to wait.
|
|
|
|
|
(with-local-quit
|
|
|
|
|
(condition-case err
|
2012-04-20 10:04:19 +00:00
|
|
|
|
(let ((buffers (server-visit-files files proc nowait)))
|
2009-02-07 16:24:36 +00:00
|
|
|
|
(mapc 'funcall (nreverse commands))
|
|
|
|
|
|
2012-04-20 10:04:19 +00:00
|
|
|
|
;; If we were told only to open a new client, obey
|
|
|
|
|
;; `initial-buffer-choice' if it specifies a file.
|
|
|
|
|
(unless (or files commands)
|
|
|
|
|
(if (stringp initial-buffer-choice)
|
|
|
|
|
(find-file initial-buffer-choice)
|
|
|
|
|
(switch-to-buffer (get-buffer-create "*scratch*")
|
|
|
|
|
'norecord)))
|
|
|
|
|
|
2009-02-07 16:24:36 +00:00
|
|
|
|
;; Delete the client if necessary.
|
|
|
|
|
(cond
|
|
|
|
|
(nowait
|
|
|
|
|
;; Client requested nowait; return immediately.
|
|
|
|
|
(server-log "Close nowait client" proc)
|
|
|
|
|
(server-delete-client proc))
|
|
|
|
|
((and (not dontkill) (null buffers))
|
|
|
|
|
;; This client is empty; get rid of it immediately.
|
|
|
|
|
(server-log "Close empty client" proc)
|
|
|
|
|
(server-delete-client proc)))
|
|
|
|
|
(cond
|
|
|
|
|
((or isearch-mode (minibufferp))
|
|
|
|
|
nil)
|
|
|
|
|
((and frame (null buffers))
|
2007-09-16 04:53:39 +00:00
|
|
|
|
(message "%s" (substitute-command-keys
|
2009-02-07 16:24:36 +00:00
|
|
|
|
"When done with this frame, type \\[delete-frame]")))
|
|
|
|
|
((not (null buffers))
|
|
|
|
|
(server-switch-buffer (car buffers) nil (cdr (car files)))
|
|
|
|
|
(run-hooks 'server-switch-hook)
|
|
|
|
|
(unless nowait
|
|
|
|
|
(message "%s" (substitute-command-keys
|
|
|
|
|
"When done with a buffer, type \\[server-edit]")))))
|
|
|
|
|
(when (and frame (null tty-name))
|
|
|
|
|
(server-unselect-display frame)))
|
2011-07-04 22:40:03 +00:00
|
|
|
|
((quit error)
|
|
|
|
|
(when (eq (car err) 'quit)
|
|
|
|
|
(message "Quit emacsclient request"))
|
|
|
|
|
(server-return-error proc err)))))
|
2007-09-16 04:53:39 +00:00
|
|
|
|
|
|
|
|
|
(defun server-return-error (proc err)
|
|
|
|
|
(ignore-errors
|
|
|
|
|
(server-send-string
|
|
|
|
|
proc (concat "-error " (server-quote-arg
|
|
|
|
|
(error-message-string err))))
|
|
|
|
|
(server-log (error-message-string err) proc)
|
2010-10-03 00:03:44 +00:00
|
|
|
|
;; Before calling `delete-process', give emacsclient time to
|
|
|
|
|
;; receive the error string and shut down on its own.
|
|
|
|
|
(sit-for 5)
|
2007-09-16 04:53:39 +00:00
|
|
|
|
(delete-process proc)))
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
2008-01-16 16:21:08 +00:00
|
|
|
|
(defun server-goto-line-column (line-col)
|
|
|
|
|
"Move point to the position indicated in LINE-COL.
|
|
|
|
|
LINE-COL should be a pair (LINE . COL)."
|
|
|
|
|
(when line-col
|
2009-08-22 19:29:18 +00:00
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(forward-line (1- (car line-col)))
|
2008-01-16 16:21:08 +00:00
|
|
|
|
(let ((column-number (cdr line-col)))
|
|
|
|
|
(when (> column-number 0)
|
|
|
|
|
(move-to-column (1- column-number))))))
|
2002-08-15 20:13:48 +00:00
|
|
|
|
|
(server-clients): Only keep procs, no properties any more.
(server-client): Remove.
(server-client-get, server-client-set): Remove, replace all callers by
process-get and process-put resp.
(server-clients-with, server-add-client, server-delete-client)
(server-create-tty-frame, server-create-window-system-frame)
(server-process-filter, server-execute, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer)
(server-save-buffers-kill-terminal): Update accordingly.
2007-09-16 05:16:42 +00:00
|
|
|
|
(defun server-visit-files (files proc &optional nowait)
|
2004-07-10 20:56:57 +00:00
|
|
|
|
"Find FILES and return a list of buffers created.
|
2008-01-16 16:21:08 +00:00
|
|
|
|
FILES is an alist whose elements are (FILENAME . FILEPOS)
|
|
|
|
|
where FILEPOS can be nil or a pair (LINENUMBER . COLUMNNUMBER).
|
(server-clients): Only keep procs, no properties any more.
(server-client): Remove.
(server-client-get, server-client-set): Remove, replace all callers by
process-get and process-put resp.
(server-clients-with, server-add-client, server-delete-client)
(server-create-tty-frame, server-create-window-system-frame)
(server-process-filter, server-execute, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer)
(server-save-buffers-kill-terminal): Update accordingly.
2007-09-16 05:16:42 +00:00
|
|
|
|
PROC is the client that requested this operation.
|
1996-08-28 23:26:13 +00:00
|
|
|
|
NOWAIT non-nil means this client is not waiting for the results,
|
|
|
|
|
so don't mark these buffers specially, just visit them normally."
|
1994-05-28 17:22:31 +00:00
|
|
|
|
;; Bind last-nonmenu-event to force use of keyboard, not mouse, for queries.
|
2002-09-27 17:43:29 +00:00
|
|
|
|
(let ((last-nonmenu-event t) client-record)
|
1993-08-09 05:56:29 +00:00
|
|
|
|
;; Restore the current buffer afterward, but not using save-excursion,
|
|
|
|
|
;; because we don't want to save point in this buffer
|
|
|
|
|
;; if it happens to be one of those specified by the server.
|
2002-09-27 17:43:29 +00:00
|
|
|
|
(save-current-buffer
|
|
|
|
|
(dolist (file files)
|
|
|
|
|
;; If there is an existing buffer modified or the file is
|
|
|
|
|
;; modified, revert it. If there is an existing buffer with
|
|
|
|
|
;; deleted file, offer to write it.
|
2006-11-12 05:36:52 +00:00
|
|
|
|
(let* ((minibuffer-auto-raise (or server-raise-frame
|
2006-12-03 15:03:30 +00:00
|
|
|
|
minibuffer-auto-raise))
|
2006-11-11 14:11:13 +00:00
|
|
|
|
(filen (car file))
|
2002-09-27 17:43:29 +00:00
|
|
|
|
(obuf (get-file-buffer filen)))
|
2006-05-05 23:37:55 +00:00
|
|
|
|
(add-to-history 'file-name-history filen)
|
2008-01-16 16:21:08 +00:00
|
|
|
|
(if (null obuf)
|
2010-08-26 13:46:19 +00:00
|
|
|
|
(progn
|
2011-07-04 01:04:29 +00:00
|
|
|
|
(run-hooks 'pre-command-hook)
|
2010-08-26 13:46:19 +00:00
|
|
|
|
(set-buffer (find-file-noselect filen)))
|
2008-01-16 16:21:08 +00:00
|
|
|
|
(set-buffer obuf)
|
2010-08-26 13:46:19 +00:00
|
|
|
|
;; separately for each file, in sync with post-command hooks,
|
|
|
|
|
;; with the new buffer current:
|
2011-07-04 01:04:29 +00:00
|
|
|
|
(run-hooks 'pre-command-hook)
|
2008-01-16 16:21:08 +00:00
|
|
|
|
(cond ((file-exists-p filen)
|
|
|
|
|
(when (not (verify-visited-file-modtime obuf))
|
|
|
|
|
(revert-buffer t nil)))
|
|
|
|
|
(t
|
|
|
|
|
(when (y-or-n-p
|
|
|
|
|
(concat "File no longer exists: " filen
|
|
|
|
|
", write buffer to file? "))
|
|
|
|
|
(write-file filen))))
|
|
|
|
|
(unless server-buffer-clients
|
|
|
|
|
(setq server-existing-buffer t)))
|
|
|
|
|
(server-goto-line-column (cdr file))
|
2010-08-26 13:46:19 +00:00
|
|
|
|
(run-hooks 'server-visit-hook)
|
|
|
|
|
;; hooks may be specific to current buffer:
|
2011-07-04 01:04:29 +00:00
|
|
|
|
(run-hooks 'post-command-hook))
|
2002-09-27 17:43:29 +00:00
|
|
|
|
(unless nowait
|
|
|
|
|
;; When the buffer is killed, inform the clients.
|
|
|
|
|
(add-hook 'kill-buffer-hook 'server-kill-buffer nil t)
|
(server-clients): Only keep procs, no properties any more.
(server-client): Remove.
(server-client-get, server-client-set): Remove, replace all callers by
process-get and process-put resp.
(server-clients-with, server-add-client, server-delete-client)
(server-create-tty-frame, server-create-window-system-frame)
(server-process-filter, server-execute, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer)
(server-save-buffers-kill-terminal): Update accordingly.
2007-09-16 05:16:42 +00:00
|
|
|
|
(push proc server-buffer-clients))
|
2004-07-10 20:56:57 +00:00
|
|
|
|
(push (current-buffer) client-record)))
|
|
|
|
|
(unless nowait
|
(server-clients): Only keep procs, no properties any more.
(server-client): Remove.
(server-client-get, server-client-set): Remove, replace all callers by
process-get and process-put resp.
(server-clients-with, server-add-client, server-delete-client)
(server-create-tty-frame, server-create-window-system-frame)
(server-process-filter, server-execute, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer)
(server-save-buffers-kill-terminal): Update accordingly.
2007-09-16 05:16:42 +00:00
|
|
|
|
(process-put proc 'buffers
|
|
|
|
|
(nconc (process-get proc 'buffers) client-record)))
|
2004-07-10 20:56:57 +00:00
|
|
|
|
client-record))
|
2011-03-01 05:03:24 +00:00
|
|
|
|
|
|
|
|
|
(defvar server-kill-buffer-running nil
|
|
|
|
|
"Non-nil while `server-kill-buffer' or `server-buffer-done' is running.")
|
|
|
|
|
|
1997-05-10 00:37:24 +00:00
|
|
|
|
(defun server-buffer-done (buffer &optional for-killing)
|
1990-02-22 10:44:55 +00:00
|
|
|
|
"Mark BUFFER as \"done\" for its client(s).
|
1995-03-11 20:32:48 +00:00
|
|
|
|
This buries the buffer, then returns a list of the form (NEXT-BUFFER KILLED).
|
|
|
|
|
NEXT-BUFFER is another server buffer, as a suggestion for what to select next,
|
2002-09-18 02:10:18 +00:00
|
|
|
|
or nil. KILLED is t if we killed BUFFER (typically, because it was visiting
|
|
|
|
|
a temp file).
|
|
|
|
|
FOR-KILLING if non-nil indicates that we are called from `kill-buffer'."
|
2002-09-25 19:54:13 +00:00
|
|
|
|
(let ((next-buffer nil)
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
(killed nil))
|
(server-clients): Only keep procs, no properties any more.
(server-client): Remove.
(server-client-get, server-client-set): Remove, replace all callers by
process-get and process-put resp.
(server-clients-with, server-add-client, server-delete-client)
(server-create-tty-frame, server-create-window-system-frame)
(server-process-filter, server-execute, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer)
(server-save-buffers-kill-terminal): Update accordingly.
2007-09-16 05:16:42 +00:00
|
|
|
|
(dolist (proc server-clients)
|
|
|
|
|
(let ((buffers (process-get proc 'buffers)))
|
2002-09-18 02:10:18 +00:00
|
|
|
|
(or next-buffer
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
(setq next-buffer (nth 1 (memq buffer buffers))))
|
|
|
|
|
(when buffers ; Ignore bufferless clients.
|
|
|
|
|
(setq buffers (delq buffer buffers))
|
(server-clients): Only keep procs, no properties any more.
(server-client): Remove.
(server-client-get, server-client-set): Remove, replace all callers by
process-get and process-put resp.
(server-clients-with, server-add-client, server-delete-client)
(server-create-tty-frame, server-create-window-system-frame)
(server-process-filter, server-execute, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer)
(server-save-buffers-kill-terminal): Update accordingly.
2007-09-16 05:16:42 +00:00
|
|
|
|
;; Delete all dead buffers from PROC.
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
(dolist (b buffers)
|
|
|
|
|
(and (bufferp b)
|
|
|
|
|
(not (buffer-live-p b))
|
|
|
|
|
(setq buffers (delq b buffers))))
|
(server-clients): Only keep procs, no properties any more.
(server-client): Remove.
(server-client-get, server-client-set): Remove, replace all callers by
process-get and process-put resp.
(server-clients-with, server-add-client, server-delete-client)
(server-create-tty-frame, server-create-window-system-frame)
(server-process-filter, server-execute, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer)
(server-save-buffers-kill-terminal): Update accordingly.
2007-09-16 05:16:42 +00:00
|
|
|
|
(process-put proc 'buffers buffers)
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
;; If client now has no pending buffers,
|
|
|
|
|
;; tell it that it is done, and forget it entirely.
|
|
|
|
|
(unless buffers
|
(server-clients): Only keep procs, no properties any more.
(server-client): Remove.
(server-client-get, server-client-set): Remove, replace all callers by
process-get and process-put resp.
(server-clients-with, server-add-client, server-delete-client)
(server-create-tty-frame, server-create-window-system-frame)
(server-process-filter, server-execute, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer)
(server-save-buffers-kill-terminal): Update accordingly.
2007-09-16 05:16:42 +00:00
|
|
|
|
(server-log "Close" proc)
|
2008-09-24 20:12:02 +00:00
|
|
|
|
(if for-killing
|
|
|
|
|
;; `server-delete-client' might delete the client's
|
|
|
|
|
;; frames, which might change the current buffer. We
|
|
|
|
|
;; don't want that (bug#640).
|
|
|
|
|
(save-current-buffer
|
|
|
|
|
(server-delete-client proc))
|
|
|
|
|
(server-delete-client proc))))))
|
2006-10-30 23:24:18 +00:00
|
|
|
|
(when (and (bufferp buffer) (buffer-name buffer))
|
|
|
|
|
;; We may or may not kill this buffer;
|
|
|
|
|
;; if we do, do not call server-buffer-done recursively
|
|
|
|
|
;; from kill-buffer-hook.
|
|
|
|
|
(let ((server-kill-buffer-running t))
|
|
|
|
|
(with-current-buffer buffer
|
|
|
|
|
(setq server-buffer-clients nil)
|
|
|
|
|
(run-hooks 'server-done-hook))
|
|
|
|
|
;; Notice whether server-done-hook killed the buffer.
|
|
|
|
|
(if (null (buffer-name buffer))
|
|
|
|
|
(setq killed t)
|
|
|
|
|
;; Don't bother killing or burying the buffer
|
|
|
|
|
;; when we are called from kill-buffer.
|
|
|
|
|
(unless for-killing
|
|
|
|
|
(when (and (not killed)
|
|
|
|
|
server-kill-new-buffers
|
|
|
|
|
(with-current-buffer buffer
|
|
|
|
|
(not server-existing-buffer)))
|
1998-05-05 00:39:35 +00:00
|
|
|
|
(setq killed t)
|
2006-10-30 23:24:18 +00:00
|
|
|
|
(bury-buffer buffer)
|
2009-06-29 03:25:10 +00:00
|
|
|
|
;; Prevent kill-buffer from prompting (Bug#3696).
|
|
|
|
|
(with-current-buffer buffer
|
|
|
|
|
(set-buffer-modified-p nil))
|
2006-10-30 23:24:18 +00:00
|
|
|
|
(kill-buffer buffer))
|
|
|
|
|
(unless killed
|
|
|
|
|
(if (server-temp-file-p buffer)
|
|
|
|
|
(progn
|
2009-06-29 03:25:10 +00:00
|
|
|
|
(with-current-buffer buffer
|
|
|
|
|
(set-buffer-modified-p nil))
|
2006-10-30 23:24:18 +00:00
|
|
|
|
(kill-buffer buffer)
|
|
|
|
|
(setq killed t))
|
|
|
|
|
(bury-buffer buffer)))))))
|
1995-03-11 20:32:48 +00:00
|
|
|
|
(list next-buffer killed)))
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
2002-11-02 05:29:13 +00:00
|
|
|
|
(defun server-temp-file-p (&optional buffer)
|
1990-02-22 10:44:55 +00:00
|
|
|
|
"Return non-nil if BUFFER contains a file considered temporary.
|
|
|
|
|
These are files whose names suggest they are repeatedly
|
|
|
|
|
reused to pass information to another program.
|
|
|
|
|
|
|
|
|
|
The variable `server-temp-file-regexp' controls which filenames
|
|
|
|
|
are considered temporary."
|
|
|
|
|
(and (buffer-file-name buffer)
|
2008-11-18 16:27:06 +00:00
|
|
|
|
(string-match-p server-temp-file-regexp (buffer-file-name buffer))))
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
|
|
|
|
(defun server-done ()
|
1992-11-03 21:08:55 +00:00
|
|
|
|
"Offer to save current buffer, mark it as \"done\" for clients.
|
2001-11-13 03:14:23 +00:00
|
|
|
|
This kills or buries the buffer, then returns a list
|
|
|
|
|
of the form (NEXT-BUFFER KILLED). NEXT-BUFFER is another server buffer,
|
|
|
|
|
as a suggestion for what to select next, or nil.
|
|
|
|
|
KILLED is t if we killed BUFFER, which happens if it was created
|
|
|
|
|
specifically for the clients and did not exist before their request for it."
|
2002-11-02 05:29:13 +00:00
|
|
|
|
(when server-buffer-clients
|
|
|
|
|
(if (server-temp-file-p)
|
|
|
|
|
;; For a temp file, save, and do make a non-numeric backup
|
|
|
|
|
;; (unless make-backup-files is nil).
|
|
|
|
|
(let ((version-control nil)
|
|
|
|
|
(buffer-backed-up nil))
|
|
|
|
|
(save-buffer))
|
2006-10-30 23:24:18 +00:00
|
|
|
|
(when (and (buffer-modified-p)
|
|
|
|
|
buffer-file-name
|
|
|
|
|
(y-or-n-p (concat "Save file " buffer-file-name "? ")))
|
|
|
|
|
(save-buffer)))
|
2002-11-02 05:29:13 +00:00
|
|
|
|
(server-buffer-done (current-buffer))))
|
1994-03-03 19:23:59 +00:00
|
|
|
|
|
1994-11-10 16:13:30 +00:00
|
|
|
|
;; Ask before killing a server buffer.
|
|
|
|
|
;; It was suggested to release its client instead,
|
|
|
|
|
;; but I think that is dangerous--the client would proceed
|
|
|
|
|
;; using whatever is on disk in that file. -- rms.
|
1994-04-20 20:26:25 +00:00
|
|
|
|
(defun server-kill-buffer-query-function ()
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
"Ask before killing a server buffer."
|
1994-04-20 20:26:25 +00:00
|
|
|
|
(or (not server-buffer-clients)
|
2004-01-10 12:56:22 +00:00
|
|
|
|
(let ((res t))
|
2011-06-01 19:32:04 +00:00
|
|
|
|
(dolist (proc server-buffer-clients)
|
(server-clients): Only keep procs, no properties any more.
(server-client): Remove.
(server-client-get, server-client-set): Remove, replace all callers by
process-get and process-put resp.
(server-clients-with, server-add-client, server-delete-client)
(server-create-tty-frame, server-create-window-system-frame)
(server-process-filter, server-execute, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer)
(server-save-buffers-kill-terminal): Update accordingly.
2007-09-16 05:16:42 +00:00
|
|
|
|
(when (and (memq proc server-clients)
|
|
|
|
|
(eq (process-status proc) 'open))
|
2011-06-01 19:32:04 +00:00
|
|
|
|
(setq res nil)))
|
|
|
|
|
res)
|
1994-04-20 20:26:25 +00:00
|
|
|
|
(yes-or-no-p (format "Buffer `%s' still has clients; kill it? "
|
|
|
|
|
(buffer-name (current-buffer))))))
|
|
|
|
|
|
|
|
|
|
(defun server-kill-emacs-query-function ()
|
2007-10-28 15:17:08 +00:00
|
|
|
|
"Ask before exiting Emacs if it has live clients."
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
(or (not server-clients)
|
|
|
|
|
(let (live-client)
|
2011-06-01 19:32:04 +00:00
|
|
|
|
(dolist (proc server-clients)
|
(server-clients): Only keep procs, no properties any more.
(server-client): Remove.
(server-client-get, server-client-set): Remove, replace all callers by
process-get and process-put resp.
(server-clients-with, server-add-client, server-delete-client)
(server-create-tty-frame, server-create-window-system-frame)
(server-process-filter, server-execute, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer)
(server-save-buffers-kill-terminal): Update accordingly.
2007-09-16 05:16:42 +00:00
|
|
|
|
(when (memq t (mapcar 'buffer-live-p (process-get
|
|
|
|
|
proc 'buffers)))
|
2011-06-01 19:32:04 +00:00
|
|
|
|
(setq live-client t)))
|
|
|
|
|
live-client)
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
(yes-or-no-p "This Emacs session has clients; exit anyway? ")))
|
1997-05-10 00:37:24 +00:00
|
|
|
|
|
|
|
|
|
(defun server-kill-buffer ()
|
2004-10-10 16:41:15 +00:00
|
|
|
|
"Remove the current buffer from its clients' buffer list.
|
|
|
|
|
Designed to be added to `kill-buffer-hook'."
|
1997-05-31 00:31:40 +00:00
|
|
|
|
;; Prevent infinite recursion if user has made server-done-hook
|
|
|
|
|
;; call kill-buffer.
|
|
|
|
|
(or server-kill-buffer-running
|
1998-05-05 00:39:35 +00:00
|
|
|
|
(and server-buffer-clients
|
|
|
|
|
(let ((server-kill-buffer-running t))
|
|
|
|
|
(when server-process
|
|
|
|
|
(server-buffer-done (current-buffer) t))))))
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
|
|
|
|
(defun server-edit (&optional arg)
|
|
|
|
|
"Switch to next server editing buffer; say \"Done\" for current buffer.
|
|
|
|
|
If a server buffer is current, it is marked \"done\" and optionally saved.
|
2001-11-13 03:14:23 +00:00
|
|
|
|
The buffer is also killed if it did not exist before the clients asked for it.
|
1990-02-22 10:44:55 +00:00
|
|
|
|
When all of a client's buffers are marked as \"done\", the client is notified.
|
|
|
|
|
|
|
|
|
|
Temporary files such as MH <draft> files are always saved and backed up,
|
1993-07-15 04:01:14 +00:00
|
|
|
|
no questions asked. (The variable `make-backup-files', if nil, still
|
|
|
|
|
inhibits a backup; you can set it locally in a particular buffer to
|
|
|
|
|
prevent a backup for it.) The variable `server-temp-file-regexp' controls
|
1990-02-22 10:44:55 +00:00
|
|
|
|
which filenames are considered temporary.
|
|
|
|
|
|
2003-01-13 16:44:07 +00:00
|
|
|
|
If invoked with a prefix argument, or if there is no server process running,
|
1990-02-22 10:44:55 +00:00
|
|
|
|
starts server process and that is all. Invoked by \\[server-edit]."
|
|
|
|
|
(interactive "P")
|
2006-06-11 18:59:31 +00:00
|
|
|
|
(cond
|
2011-02-10 18:53:49 +00:00
|
|
|
|
((or arg
|
|
|
|
|
(not server-process)
|
|
|
|
|
(memq (process-status server-process) '(signal exit)))
|
|
|
|
|
(server-mode 1))
|
|
|
|
|
(server-clients (apply 'server-switch-buffer (server-done)))
|
|
|
|
|
(t (message "No server editing buffers exist"))))
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
2008-09-06 17:17:05 +00:00
|
|
|
|
(defun server-switch-buffer (&optional next-buffer killed-one filepos)
|
1990-02-22 10:44:55 +00:00
|
|
|
|
"Switch to another buffer, preferably one that has a client.
|
2004-10-10 16:41:15 +00:00
|
|
|
|
Arg NEXT-BUFFER is a suggestion; if it is a live buffer, use it.
|
|
|
|
|
|
|
|
|
|
KILLED-ONE is t in a recursive call if we have already killed one
|
|
|
|
|
temp-file server buffer. This means we should avoid the final
|
|
|
|
|
\"switch to some other buffer\" since we've already effectively
|
2008-09-06 17:17:05 +00:00
|
|
|
|
done that.
|
|
|
|
|
|
|
|
|
|
FILEPOS specifies a new buffer position for NEXT-BUFFER, if we
|
|
|
|
|
visit NEXT-BUFFER in an existing window. If non-nil, it should
|
|
|
|
|
be a cons cell (LINENUMBER . COLUMNNUMBER)."
|
2002-09-18 12:19:57 +00:00
|
|
|
|
(if (null next-buffer)
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
(progn
|
|
|
|
|
(let ((rest server-clients))
|
|
|
|
|
(while (and rest (not next-buffer))
|
(server-clients): Only keep procs, no properties any more.
(server-client): Remove.
(server-client-get, server-client-set): Remove, replace all callers by
process-get and process-put resp.
(server-clients-with, server-add-client, server-delete-client)
(server-create-tty-frame, server-create-window-system-frame)
(server-process-filter, server-execute, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer)
(server-save-buffers-kill-terminal): Update accordingly.
2007-09-16 05:16:42 +00:00
|
|
|
|
(let ((proc (car rest)))
|
2008-04-20 08:32:11 +00:00
|
|
|
|
;; Only look at frameless clients, or those in the selected
|
|
|
|
|
;; frame.
|
|
|
|
|
(when (or (not (process-get proc 'frame))
|
|
|
|
|
(eq (process-get proc 'frame) (selected-frame)))
|
(server-clients): Only keep procs, no properties any more.
(server-client): Remove.
(server-client-get, server-client-set): Remove, replace all callers by
process-get and process-put resp.
(server-clients-with, server-add-client, server-delete-client)
(server-create-tty-frame, server-create-window-system-frame)
(server-process-filter, server-execute, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer)
(server-save-buffers-kill-terminal): Update accordingly.
2007-09-16 05:16:42 +00:00
|
|
|
|
(setq next-buffer (car (process-get proc 'buffers))))
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
(setq rest (cdr rest)))))
|
|
|
|
|
(and next-buffer (server-switch-buffer next-buffer killed-one))
|
|
|
|
|
(unless (or next-buffer killed-one (window-dedicated-p (selected-window)))
|
|
|
|
|
;; (switch-to-buffer (other-buffer))
|
2002-10-29 18:17:46 +00:00
|
|
|
|
(message "No server buffers remain to edit")))
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
(if (not (buffer-live-p next-buffer))
|
2002-09-18 12:19:57 +00:00
|
|
|
|
;; If NEXT-BUFFER is a dead buffer, remove the server records for it
|
1990-02-22 10:44:55 +00:00
|
|
|
|
;; and try the next surviving server buffer.
|
2002-09-18 12:19:57 +00:00
|
|
|
|
(apply 'server-switch-buffer (server-buffer-done next-buffer))
|
|
|
|
|
;; OK, we know next-buffer is live, let's display and select it.
|
2002-11-02 05:29:13 +00:00
|
|
|
|
(if (functionp server-window)
|
|
|
|
|
(funcall server-window next-buffer)
|
|
|
|
|
(let ((win (get-buffer-window next-buffer 0)))
|
|
|
|
|
(if (and win (not server-window))
|
2008-09-06 17:17:05 +00:00
|
|
|
|
;; The buffer is already displayed: just reuse the
|
|
|
|
|
;; window. If FILEPOS is non-nil, use it to replace the
|
|
|
|
|
;; window's own value of point.
|
2006-11-10 09:46:51 +00:00
|
|
|
|
(progn
|
|
|
|
|
(select-window win)
|
2008-09-06 17:17:05 +00:00
|
|
|
|
(set-buffer next-buffer)
|
|
|
|
|
(when filepos
|
|
|
|
|
(server-goto-line-column filepos)))
|
2002-11-02 05:29:13 +00:00
|
|
|
|
;; Otherwise, let's find an appropriate window.
|
2007-06-11 00:23:06 +00:00
|
|
|
|
(cond ((window-live-p server-window)
|
2002-11-02 05:29:13 +00:00
|
|
|
|
(select-window server-window))
|
|
|
|
|
((framep server-window)
|
2006-10-30 23:24:18 +00:00
|
|
|
|
(unless (frame-live-p server-window)
|
|
|
|
|
(setq server-window (make-frame)))
|
2002-11-02 05:29:13 +00:00
|
|
|
|
(select-window (frame-selected-window server-window))))
|
2006-10-30 23:24:18 +00:00
|
|
|
|
(when (window-minibuffer-p (selected-window))
|
|
|
|
|
(select-window (next-window nil 'nomini 0)))
|
2002-11-02 05:29:13 +00:00
|
|
|
|
;; Move to a non-dedicated window, if we have one.
|
|
|
|
|
(when (window-dedicated-p (selected-window))
|
|
|
|
|
(select-window
|
|
|
|
|
(get-window-with-predicate
|
|
|
|
|
(lambda (w)
|
|
|
|
|
(and (not (window-dedicated-p w))
|
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
* src/termhooks.h (struct device): Rename to `terminal'. Rename member
`next_device' to `next_terminal'.
(device_list): Rename to `terminal_list'.
(FRAME_DEVICE): Rename to `FRAME_TERMINAL'.
(DEVICE_TERMINAL_CODING): Rename to `TERMINAL_TERMINAL_CODING'.
(TERMINAL_KEYBOARD_CODING): Rename to `TERMINAL_KEYBOARD_CODING'.
(DEVICE_ACTIVE_P): Rename to `TERMINAL_ACTIVE_P'.
Update declarations and macro definitions.
* src/termchar.h (tty_display_info): Rename member `device' to `terminal'.
(FRAME_TTY): Update for renames.
* src/xterm.h (x_display_info): Rename member `device' to `terminal'.
* src/frame.h (frame): Rename `device' member to `terminal'.
(FRAME_KBOARD, FRAME_LIVE_P, Qdevice, Qdisplay_live_p):
Update for renames.
* src/lisp.h (set_process_environment): Rename to `set_global_environment'.
(device): Rename to `terminal'.
* src/dispextern.h: Update declarations and macro definitions.
* src/terminal.c (device_list): Rename to `terminal_list'.
(next_device_id): Rename to `next_terminal_id'.
(initial_device): Rename to `initial_terminal'.
(get_device): Rename to `get_terminal'.
(create_device): Rename to `create_terminal'.
(mark_devices): Rename to `mark_terminals'.
(delete_device): Rename to `delete_terminal'.
(Fdelete_display): Rename to `Fdelete_terminal'.
(Fframe_terminal): Move here from frame.c.
(Fdisplay_live_p): Rename to `Fterminal_live_p'.
(Fdisplay_list): Rename to `Fterminal_list'.
(Fdisplay_name): Rename to `Fterminal_name'.
(init_initial_device): Rename to `init_initial_terminal'.
(delete_initial_device): Rename to `delete_initial_terminal'.
(ring_bell, update_begin, update_end, set_terminal_window)
(cursor_to, raw_cursor_to, clear_to_end, clear_frame)
(clear_end_of_line, write_glyphs, insert_glyphs, delete_glyphs)
(ins_del_lines, get_terminal_param, store_terminal_param)
(Fterminal_parameters, Fterminal_parameter)
(Fmodify_terminal_parameters, Fset_terminal_parameter)
(syms_of_terminal): Update for renames.
* src/term.c (get_tty_device): Rename to `get_tty_terminal'. Update.
(Fdisplay_tty_type): Rename to `Ftty_type'.
(Fdisplay_controlling_tty_p): Rename to `Fcontrolling_tty_p'.
(delete_tty, tty_set_terminal_modes, tty_reset_terminal_modes)
(Ftty_display_color_p, Ftty_display_color_cells, get_named_tty)
(Ftty_no_underline, Fsuspend_tty, Fresume_tty, create_tty_output)
(init_tty, maybe_fatal, delete_tty, syms_of_term): Update for rename.
* src/frame.c (Qdevice): Rename to `Qterminal'.
(Qdisplay_live_p): Rename to `Qterminal_live_p'.
(terminal_frame_count): Rename to `tty_frame_count'.
(Fframe_display): Move to terminal.c, rename to `Fframe_terminal'.
(make_frame_without_minibuffer, make_initial_frame)
(make_terminal_frame, Fmodify_frame_parameters)
(do_switch_frame, Fdelete_frame, Fmouse_position)
(Fmouse_pixel_position, Fraise_frame, Flower_frame)
(Fredirect_frame_focus, set_term_frame_name, syms_of_frame):
Update for renames.
* src/xdisp.c (message2_nolog, message3_nolog, redisplay_internal)
(set_vertical_scroll_bar, redisplay_window, check_x_display_info)
(x_set_scroll_bar_foreground, x_set_scroll_bar_background)
(Fx_create_frame, Fxw_display_color_p, Fx_display_grayscale_p)
(Fx_display_pixel_width, Fx_display_pixel_height)
(Fx_display_planes, Fx_display_color_cells)
(Fx_server_max_request_size, Fx_server_vendor, Fx_server_version)
(Fx_display_screens, Fx_display_mm_height, Fx_display_mm_width)
(Fx_display_backing_store, Fx_display_visual_class)
(Fx_display_save_under, Fx_close_connection, x_create_tip_frame):
Update for renames.
* xterm.c (handle_one_xevent): Initialize `f' to NULL.
(x_delete_device): Rename to `x_delete_terminal'.
(x_create_device): Rename to `x_create_terminal'.
(XTset_terminal_modes, XTreset_terminal_modes)
(XTread_socket, x_connection_closed, x_term_init)
(x_term_init, x_delete_display): Update for renames.
* src/dispnew.c (Fredraw_frame, Fsend_string_to_terminal)
(Fsend_string_to_terminal, init_display): Update for renames.
* src/keyboard.c (push_frame_kboard, pop_kboard, pop_kboard)
(kbd_buffer_get_event, read_avail_input, tty_read_avail_input)
(interrupt_signal, Fset_output_flow_control)
(Fset_input_meta_mode, Fset_quit_char, delete_kboard)
(syms_of_keyboard): Update for renames.
* src/alloc.c (mark_devices): Update declaration.
(Fgarbage_collect): Update for renames.
* src/coding.c (Fset_terminal_coding_system_internal)
(Fterminal_coding_system4)
(Fset_keyboard_coding_system_internal)
(Fkeyboard_coding_system): Update for renames.
* src/data.c (Fterminal_local_value, Fset_terminal_local_value):
Update for renames.
* src/minibuf.c (read_minibuf): Update for renames.
* src/sysdep.c (init_sys_modes, reset_sys_modes): Update for renames.
* xselect.c (x_handle_selection_clear): Update for renames.
* lisp/files.el (save-buffers-kill-display): Rename to `save-buffers-kill-terminal'.
(save-buffers-kill-terminal, ctl-x-map): Update for renames.
* frame.el (make-frame): Rename 'device frame parameter to 'terminal. Update.
(frames-on-display-list, framep-on-display, suspend-frame): Update for renames.
(selected-display): Rename to `selected-terminal'.
* server.el (server-save-buffers-kill-display): Rename to
`server-save-buffers-kill-terminal'.
(server-delete-client, server-handle-delete-frame)
(server-handle-suspend-tty, server-process-filter)
(server-switch-buffer): Update for renames.
* startup.el (normal-splash-screen, normal-splash-screen): Update for renames.
* talk.el (talk): Update for renames.
* termdev.el (terminal-id): Update for renames.
* xt-mouse.el (turn-on-xterm-mouse-tracking-on-terminal)
(turn-off-xterm-mouse-tracking-on-terminal)
(xterm-mouse-handle-delete-frame): Update for renames.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-471
2005-12-29 18:20:26 +00:00
|
|
|
|
(equal (frame-terminal (window-frame w))
|
|
|
|
|
(frame-terminal (selected-frame)))))
|
2002-11-02 05:29:13 +00:00
|
|
|
|
'nomini 'visible (selected-window))))
|
|
|
|
|
(condition-case nil
|
|
|
|
|
(switch-to-buffer next-buffer)
|
|
|
|
|
;; After all the above, we might still have ended up with
|
|
|
|
|
;; a minibuffer/dedicated-window (if there's no other).
|
2006-11-10 09:46:51 +00:00
|
|
|
|
(error (pop-to-buffer next-buffer)))))))
|
|
|
|
|
(when server-raise-frame
|
|
|
|
|
(select-frame-set-input-focus (window-frame (selected-window))))))
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
2005-11-19 19:17:56 +00:00
|
|
|
|
;;;###autoload
|
2009-01-11 16:45:36 +00:00
|
|
|
|
(defun server-save-buffers-kill-terminal (arg)
|
2007-12-23 22:46:07 +00:00
|
|
|
|
;; Called from save-buffers-kill-terminal in files.el.
|
2009-01-11 16:45:36 +00:00
|
|
|
|
"Offer to save each buffer, then kill the current client.
|
2008-11-18 16:27:06 +00:00
|
|
|
|
With ARG non-nil, silently save all file-visiting buffers, then kill.
|
2005-02-10 21:23:33 +00:00
|
|
|
|
|
|
|
|
|
If emacsclient was started with a list of filenames to edit, then
|
|
|
|
|
only these files will be asked to be saved."
|
2009-01-11 16:45:36 +00:00
|
|
|
|
(let ((proc (frame-parameter (selected-frame) 'client)))
|
|
|
|
|
(cond ((eq proc 'nowait)
|
|
|
|
|
;; Nowait frames have no client buffer list.
|
|
|
|
|
(if (cdr (frame-list))
|
|
|
|
|
(progn (save-some-buffers arg)
|
|
|
|
|
(delete-frame))
|
|
|
|
|
;; If we're the last frame standing, kill Emacs.
|
|
|
|
|
(save-buffers-kill-emacs arg)))
|
|
|
|
|
((processp proc)
|
|
|
|
|
(let ((buffers (process-get proc 'buffers)))
|
|
|
|
|
;; If client is bufferless, emulate a normal Emacs exit
|
|
|
|
|
;; and offer to save all buffers. Otherwise, offer to
|
|
|
|
|
;; save only the buffers belonging to the client.
|
|
|
|
|
(save-some-buffers
|
|
|
|
|
arg (if buffers
|
|
|
|
|
(lambda () (memq (current-buffer) buffers))
|
|
|
|
|
t))
|
|
|
|
|
(server-delete-client proc)))
|
|
|
|
|
(t (error "Invalid client frame")))))
|
2004-08-16 19:54:16 +00:00
|
|
|
|
|
2005-07-16 11:58:10 +00:00
|
|
|
|
(define-key ctl-x-map "#" 'server-edit)
|
2001-12-18 16:42:38 +00:00
|
|
|
|
|
2007-10-29 00:51:51 +00:00
|
|
|
|
(defun server-unload-function ()
|
2004-10-10 16:41:15 +00:00
|
|
|
|
"Unload the server library."
|
2006-05-16 06:53:01 +00:00
|
|
|
|
(server-mode -1)
|
2007-10-30 00:20:02 +00:00
|
|
|
|
(substitute-key-definition 'server-edit nil ctl-x-map)
|
2007-10-29 00:51:51 +00:00
|
|
|
|
(save-current-buffer
|
|
|
|
|
(dolist (buffer (buffer-list))
|
|
|
|
|
(set-buffer buffer)
|
|
|
|
|
(remove-hook 'kill-buffer-hook 'server-kill-buffer t)))
|
|
|
|
|
;; continue standard unloading
|
|
|
|
|
nil)
|
2004-10-17 06:55:07 +00:00
|
|
|
|
|
2011-05-02 02:06:53 +00:00
|
|
|
|
(defun server-eval-at (server form)
|
2012-02-02 07:48:39 +00:00
|
|
|
|
"Contact the Emacs server named SERVER and evaluate FORM there.
|
|
|
|
|
Returns the result of the evaluation, or signals an error if it
|
|
|
|
|
cannot contact the specified server. For example:
|
|
|
|
|
\(server-eval-at \"server\" '(emacs-pid))
|
2012-03-11 17:54:16 +00:00
|
|
|
|
returns the process ID of the Emacs instance running \"server\"."
|
|
|
|
|
(let* ((server-dir (if server-use-tcp server-auth-dir server-socket-dir))
|
|
|
|
|
(server-file (expand-file-name server server-dir))
|
|
|
|
|
(coding-system-for-read 'binary)
|
|
|
|
|
(coding-system-for-write 'binary)
|
|
|
|
|
address port secret process)
|
|
|
|
|
(unless (file-exists-p server-file)
|
|
|
|
|
(error "No such server: %s" server))
|
2011-05-02 02:06:53 +00:00
|
|
|
|
(with-temp-buffer
|
2012-03-11 17:54:16 +00:00
|
|
|
|
(when server-use-tcp
|
|
|
|
|
(let ((coding-system-for-read 'no-conversion))
|
|
|
|
|
(insert-file-contents server-file)
|
|
|
|
|
(unless (looking-at "\\([0-9.]+\\):\\([0-9]+\\)")
|
|
|
|
|
(error "Invalid auth file"))
|
|
|
|
|
(setq address (match-string 1)
|
|
|
|
|
port (string-to-number (match-string 2)))
|
|
|
|
|
(forward-line 1)
|
|
|
|
|
(setq secret (buffer-substring (point) (line-end-position)))
|
|
|
|
|
(erase-buffer)))
|
|
|
|
|
(unless (setq process (make-network-process
|
|
|
|
|
:name "eval-at"
|
|
|
|
|
:buffer (current-buffer)
|
|
|
|
|
:host address
|
|
|
|
|
:service (if server-use-tcp port server-file)
|
|
|
|
|
:family (if server-use-tcp 'ipv4 'local)
|
|
|
|
|
:noquery t))
|
|
|
|
|
(error "Unable to contact the server"))
|
|
|
|
|
(if server-use-tcp
|
|
|
|
|
(process-send-string process (concat "-auth " secret "\n")))
|
|
|
|
|
(process-send-string process
|
|
|
|
|
(concat "-eval "
|
|
|
|
|
(server-quote-arg (format "%S" form))
|
|
|
|
|
"\n"))
|
2011-05-02 02:06:53 +00:00
|
|
|
|
(while (memq (process-status process) '(open run))
|
|
|
|
|
(accept-process-output process 0 10))
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
;; If the result is nil, there's nothing in the buffer. If the
|
|
|
|
|
;; result is non-nil, it's after "-print ".
|
2012-03-11 17:53:07 +00:00
|
|
|
|
(let ((answer ""))
|
|
|
|
|
(while (re-search-forward "\n-print\\(-nonl\\)? " nil t)
|
|
|
|
|
(setq answer
|
|
|
|
|
(concat answer
|
|
|
|
|
(buffer-substring (point)
|
|
|
|
|
(progn (skip-chars-forward "^\n")
|
|
|
|
|
(point))))))
|
|
|
|
|
(if (not (equal answer ""))
|
2012-03-11 17:54:16 +00:00
|
|
|
|
(read (decode-coding-string (server-unquote-arg answer)
|
|
|
|
|
'emacs-internal)))))))
|
2011-05-02 02:06:53 +00:00
|
|
|
|
|
1992-09-04 21:49:15 +00:00
|
|
|
|
|
|
|
|
|
(provide 'server)
|
1992-05-30 21:11:25 +00:00
|
|
|
|
|
|
|
|
|
;;; server.el ends here
|