changeset 83654:e9a88d9f47fb

Import changelog info from arch logs into ChangeLog.multi-tty files Revision: [e-mail]/emacs--multi-tty--0--patch-34

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ChangeLog.multi-tty	Wed Aug 22 11:46:14 2007 +0000
@@ -0,0 +1,14 @@
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* configure.in (HAVE_GTK_MULTIDISPLAY): Remove override.
+
+	* configure: Regenerate.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* configure.in (HAVE_GTK_MULTIDISPLAY): Disable test,
+	unconditionally undefine.
+	* configure: Regenerate.
+
+
+;; arch-tag: 472a1b2a-6a1d-494e-b1c1-ad536efc3b8e

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/etc/ChangeLog.multi-tty	Wed Aug 22 11:46:14 2007 +0000
@@ -0,0 +1,6 @@
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* TODO: Fix deviation from CVS.
+
+
+;; arch-tag: 4f8ad61b-c6bd-43e8-8e27-372643aa2d84

--- a/lib-src/ChangeLog.multi-tty	Tue Aug 21 04:55:30 2007 +0000
+++ b/lib-src/ChangeLog.multi-tty	Wed Aug 22 11:46:14 2007 +0000
@@ -1,7 +1,7 @@
 2007-05-26  Dan Nicolaescu  <[e-mail]>
 
 	* emacsclient.c (main): Avoid having a declaration after a
-	statement. 
+	statement.
 
 2007-05-21  Juanma Barranquero  <[e-mail]>
 
@@ -45,6 +45,55 @@
 	(main) [NO_SOCKETS_IN_FILE_SYSTEM]: Don't call init_signals.
 	(strprefix): Define unconditionally.
 
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* emacsclient.c (in, out): Remove.
+	(s): New variable (moved out from main).
+	(handle_sigcont, handle_sigtstp): Use SEND_STRING.
+	(main): Fix typos.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* emacsclient.c: Copy IS_*_SEP definitions from lisp.h.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* emacsclient.c: Include sys/stat.h.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* emacsclient.c (get_current_dir_name): New function, copied here
+	from sysdep.c.
+	(main): Use it to send over the current directory.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* emacsclient.c (main): Send environment only when a new display
+	is created.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* emacsclient.c (decode_options): Make --no-wait imply
+	--current-frame, except when it is the only option given.  Make
+	sure no frame is opened when --current-frame is set.
+	(main): Pass --current-frame to server.el.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* emacsclient.c (handle_sigcont): Reestablish signal handler. (Dan
+	Nicolaescu)
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* emacsclient.c (main): Handle -window-system-unsupported
+	command.  Doc update.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* emacsclient.c (main): Don't exit prematurely on --no-wait,
+	let Emacs close the connection for us.
+
+
 ;; Local Variables:
 ;; coding: iso-2022-7bit
 ;; add-log-time-zone-rule: t

--- a/lisp/ChangeLog.multi-tty	Tue Aug 21 04:55:30 2007 +0000
+++ b/lisp/ChangeLog.multi-tty	Wed Aug 22 11:46:14 2007 +0000
@@ -108,10 +108,895 @@
 
 	* env.el (getenv): Pass frame to getenv-internal.
 
-2007-05-12  L$,1 q(Brentey K,Aa(Broly  <[e-mail]>
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* ldefs-boot.el: Regenerate.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* term/x-win.el (x-initialize-window-system): Make a copy of pure list.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* bindings.el (mode-line-client): Don't set the local-map and
+	mouse-face properties.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* menu-bar.el (menu-bar-open): New function.
+	Bind it to f10.
+
+	* term/x-win.el: Don't bind f10.
+
+	* tmm.el: Remove autoload binding for f10.
+
+	* ldefs-boot.el: Regenerate.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* frame.el (make-frame): Always inherit 'environment and 'client
+	parameters.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* term/xterm.el (xterm-function-map): Fix typo.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* env.el (read-envvar-name): Remove reference to global-environment.
+	(setenv-internal): New function.
+	(setenv): Use it.  Always set process-environment.  Update docs.
+	(getenv): Update docs.
+	(environment): Rewrite for the new environment design.  Update docs.
+
+	* frame.el (frame-initialize): Copy the environment from the
+	initial frame.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* term/iris-ansi.el (iris-function-map): Fix read syntax.
+	* term/lk201.el (lk201-function-map): Fix read syntax.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* faces.el (tty-create-frame-with-faces): Set up faces and
+	background mode only after the terminal has been initialized.
+	(frame-set-background-mode): Handle the 'background-mode terminal
+	parameter.
+	(tty-run-terminal-initialization): Add type option.
+
+	* term/README: Update.
+	* term/rxvt.el: Simplify.
+	* term/xterm.el: Simplify and fix.
+	* term/*.el: Simplify and fix.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* faces.el (tty-find-type): New function.
+	(tty-run-terminal-initialization): Load files just once per Emacs
+	session, and call terminit functions just once per terminal.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* vc.el (vc-annotate-color-map): Undo previous change.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* vc.el (vc-annotate-color-map): Call `tty-display-color-p' only on
+	ttys.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* startup.el (normal-splash-screen): Fix typo.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* mh-e/mh-e.el (mh-strip-package-version): Add autoload cookie.
+
+	* ldefs-boot.el: Update.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* term/x-win.el (x-setup-function-keys): Protect against multiple
+	calls on the same terminal.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* server.el (server-process-filter): Accept `-dir' command.  Set
+	`default-directory' of the *scratch* buffer on connect, if applicable.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* tool-bar.el (toggle-tool-bar-mode-from-frame): New function.
+
+	* menu-bar.el (toggle-menu-bar-mode-from-frame): New function.
+	(menu-bar-showhide-menu): Use them to change "Menu-bar" and
+	"Tool-bar" toggles to reflect the state of the current frame.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* faces.el (x-create-frame-with-faces): Remove bogus check for first
+	frame.  Call `tool-bar-setup'.
+
+	* frame.el (window-system-default-frame-alist): Enhance doc string.
+
+	* frame.el (frame-notice-user-settings): Don't put 'tool-bar-lines
+	in `default-frame-alist' when initial frame is on a tty.
+
+	* frame.el (modify-all-frames-parameters): Simplify using
+	`assq-delete-all'.  Remove specified parameters from
+	`window-system-default-frame-alist'.
+
+	* fringe.el (set-fringe-mode): Simplify and fix using
+	`modify-all-frames-parameters'.
+	* menu-bar.el (menu-bar-mode): Ditto.
+	* scroll-bar.el (set-scroll-bar-mode): Ditto.
+	* tool-bar.el (tool-bar-mode): Ditto.  Remove 'tool-bar-map length
+	check before calling `tool-bar-setup'.
+
+	* tool-bar.el (tool-bar-setup): New variable.
+
+	* tool-bar.el (tool-bar-setup): Use it to guard against multiple
+	calls.  Add optional frame parameter, and select that frame before
+	adding items.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* mail/emacsbug.el (report-emacs-bug-pretest-address):
+	Set pretest address to [e-mail].
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* startup.el (display-startup-echo-area-message):
+	Handle `inhibit-startup-echo-area-message' here.
+	(command-line-1): Moved from here.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* ediff-wind.el (ediff-window-setup-function): Fix typo.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* subr.el (with-selected-frame): Make sure the current buffer is
+	restored as well.
+
+	* faces.el (x-create-frame-with-faces): Don't make frame visible
+	until we are done setting up all its parameters.
+
+	* ediff-wind.el (ediff-setup-windows-automatic): New function.
+	(ediff-window-setup-function): Use it as default.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* server.el (server-buffer-clients): Doc update.
+	(server-delete-client): Handle quits in kill-buffer.  Don't kill
+	modified buffers.  Add extra logging.
+	(server-visit-files): Don't set `server-existing-buffer' if the
+	buffer already has other clients.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* server.el (server-process-filter): Switch to *scratch* immediately
+	after creating the frame, before evaluating any -evals.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* loadup.el: Delay loading env; mule-conf gets confused by cl during
+	bootstrap.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* server.el (server-process-filter): Protect `display-splash-screen'
+	call in a condition-case.  Explain why.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* simple.el (normal-erase-is-backspace-mode): Fix enabled/disabled
+	logic.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* server.el (server-handle-delete-frame): Fix last frame check.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* server.el (server-handle-delete-frame): Fix typo.
+
+	* server.el (server-process-filter): Call
+	`display-startup-echo-area-message' before `display-splash-screen'.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* frame.el (make-frame): Also inherit 'client parameter.  Don't
+	override explicitly specified values with inherited ones.
+
+	* server.el (server-delete-client): Delete frames after deleting
+	the tty.  Clear 'client parameter before deleting a frame.
+
+	* server.el (server-handle-delete-frame): Delete the client
+	if this was its last frame.
+
+	* startup.el (fancy-splash-default-action): Fix typo in comment.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* server.el (server-process-filter): Don't display the splash screen
+	when no frame was created.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* startup.el (fancy-splash-screens): Use `overriding-local-map'
+	instead of `overriding-terminal-local-map' for now; the latter doesn't
+	work right, it looses keypresses to another terminal.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* startup.el (fancy-splash-screens): Use
+	`overriding-terminal-local-map' to set up keymap.  Install a
+	`delete-frame-functions' hook to catch `delete-frame' events.  Ignore
+	`select-window' events to cope better with `focus-follows-mouse'.
+	Don't switch back to the original buffer if the splash frame has been
+	killed.
+	(normal-splash-screen): Don't let-bind `mode-line-format'; it changes
+	the global binding---setq it instead.
+	(display-splash-screen): Don't do anything if the splash screen is
+	already displayed elsewhere.
+	(fancy-splash-exit, fancy-splash-delete-frame): New functions.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* bindings.el (mode-line-client): New variable.
+	(help-echo): Add it to the default mode-line format.
+
+	* files.el (mode-line-client): Set it as risky.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* server.el (server-process-filter): Show the Emacs splash screen
+	and startup echo area message.  Display the *scratch* buffer by
+	default.
+
+	* startup.el (fancy-splash-screens): Restore previous buffer, even
+	if it's *scratch*.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* 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.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* env.el (setenv, getenv): Update doc strings.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* env.el (read-envvar-name, setenv, getenv, environment): Use frame
+	parameters to store the local environment, not terminal parameters.
+
+	* server.el (server-process-filter): Store the local environment in a
+	frame (not terminal) parameter.  Do not try to decode environment
+	strings.
+
+	* frame.el (make-frame): Set up the 'environment frame parameter,
+	when needed.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* env.el: Require cl for byte compilation. (For `block' and `return'.)
+	(read-envvar-name): Update for rename.  Include
+	`process-environment' as well.
+	(setenv): Update for rename also handle `process-environment'.
+	Update doc.
+	(getenv): Update doc.
+	(environment): New function.
+	(let-environment): New macro.
+
+	* font-lock.el (lisp-font-lock-keywords-2): Add `let-environment'.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* cus-start.el: Fix compilation error.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* env.el (setenv, getenv): Add optional terminal parameter.  Update docs.
+	(setenv): Handle `local-environment-variables'.
+	(read-envvar-name): Also allow (and complete) local
+	environment variables on the current terminal.
+
+	* termdev.el (terminal-id): Make parameter optional.
+	(terminal-getenv, terminal-setenv, with-terminal-environment):
+	Disable functions.
+
+	* mule-cmds.el (set-locale-environment): Convert `terminal-getenv'
+	calls to `getenv'.
+	* rxvt.el (rxvt-set-background-mode): Ditto.
+	* x-win.el (x-initialize-window-system): Ditto.
+	* xterm.el (terminal-init-xterm): Ditto.
+
+	* server.el (server-process-filter): Fix reference to the 'display
+	frame parameter.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* termdev.el (terminal-parameter-alist, terminal-parameters)
+	(terminal-parameter-p, terminal-parameter, set-terminal-parameter)
+	(terminal-handle-delete-frame): Remove.
+
+	* simple.el (normal-erase-is-backspace-setup-frame)
+	(normal-erase-is-backspace-mode): Rephrase things
+	without terminal-parameter-p.
+
+	* termdev.el (terminal-getenv, terminal-setenv)
+	(with-terminal-environment): Ditto.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* international/encoded-kb.el (encoded-kbd-setup-display): Use
+	`set-input-meta-mode'.
+	* linux.el (terminal-init-linux): Ditto.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* termdev.el: New file.  Move terminal parameter-related functions
+	here from frame.el.
+	(terminal-getenv, with-terminal-environment): Reimplement and extend.
+	(terminal-setenv, terminal-setenv-internal): New functions.
+
+	* frame.el (make-frame-on-tty, framep-on-display, suspend-frame):
+	Extend doc string, update parameter names.
+	(terminal-id, terminal-parameter-alist, terminal-parameters)
+	(terminal-parameter-p, terminal-parameter, set-terminal-parameter)
+	(terminal-handle-delete-frame, terminal-getenv, terminal-getenv)
+	(with-terminal-environment): Move to termdev.el.
+
+	* loadup.el: Load termdev as well.
+	* Makefile.in (lisp, shortlisp): Add termdev.elc.
+	* makefile.MPW (shortlisp): Ditto.
+
+	* ebuff-menu.el (electric-buffer-menu-mode-map): Bind C-z to
+	`suspend-frame', not `suspend-emacs'.
+	* echistory.el (electric-history-map): Ditto.
+	* ebrowse.el (ebrowse-electric-list-mode-map): Ditto.
+	* ebrowse.el (ebrowse-electric-position-mode-map): Ditto.
+
+	* startup.el (normal-splash-screen): Use `save-buffers-kill-display'
+	instead of `save-buffers-kill-emacs'.
+
+	* x-win.el (x-initialize-window-system): Add 'global-ok option to
+	`terminal-getenv'.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* loadup.el: Don't load server.
+	* ldefs-boot.el: Update.
+
+	* server.el (server-save-buffers-kill-display): Add autoload
+	cookie.  Move stuff not specific to server into
+	`save-buffers-kill-display'.
+
+	* files.el (save-buffers-kill-display): New function.
+	(ctl-x-map): Bind it to C-x C-c.
+
+	* frame.el (terminal-getenv): New function.
+	* international/mule-cmds.el (set-locale-environment): Use it.
+
+	* frame.el (with-terminal-environment): New macro.
+
+	* server.el (server-getenv, server-with-client-environment):
+	Remove.
+	(server-getenv-from, server-with-environment): New functions.
+	(server-process-filter): Change syntax of environment variables.
+	Put environment into terminal parameters, not client parameters.
+
+	* term/rxvt.el: Don't require server.
+	(rxvt-set-background-mode): Use terminal-getenv, not server-getenv.
+	* term/x-win.el (x-initialize-window-system): Ditto.
+	* term/xterm.el (terminal-init-xterm): Ditto.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* loadup.el: Reorganize order of loading x-dnd vs. term/x-win.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* frame.el (frames-on-display-list): Use terminal-id to get the
+	display id.
+	(terminal-id): Also accept X display strings and tty device names.
+
+	Revision:
 
-	This placeholder will be replaced by the Arch logs of the
-	multi-tty branch.
+	* edmacro.el (edmacro-format-keys): Remove terminal-local-value calls.
+	* emulation/cua-base.el (cua--pre-command-handler-1): Ditto.
+	* international/encoded-kb.el (encoded-kbd-setup-display): Ditto.
+	* isearch.el (isearch-other-meta-char): Ditto.
+	* obsolete/keyswap.el (the-table): Ditto.
+	* simple.el (normal-erase-is-backspace-mode): Ditto.
+	* subr.el (keyboard-translate, read-quoted-char): Ditto.
+	* term/AT386.el (terminal-init-AT386): Ditto.
+	* term/internal.el: Ditto.
+	* term/iris-ansi.el (terminal-init-iris-ansi): Ditto.
+	* term/lk201.el (terminal-init-lk201): Ditto.
+	* term/mac-win.el: Ditto.
+	* term/news.el (terminal-init-news): Ditto.
+	* term/rxvt.el (terminal-init-rxvt): Ditto.
+	* term/sun.el (terminal-init-sun): Ditto.
+	* term/tvi970.el (terminal-init-tvi970): Ditto.
+	* term/vt200.el (terminal-init-vt200): Ditto.
+	* term/vt201.el (terminal-init-vt201): Ditto.
+	* term/vt220.el (terminal-init-vt220): Ditto.
+	* term/vt240.el (terminal-init-vt240): Ditto.
+	* term/vt300.el (terminal-init-vt300): Ditto.
+	* term/vt320.el (terminal-init-vt320): Ditto.
+	* term/vt400.el (terminal-init-vt400): Ditto.
+	* term/vt420.el (terminal-init-vt420): Ditto.
+	* term/wyse50.el (terminal-init-wyse50): Ditto.
+	* term/x-win.el (x-setup-function-keys): Ditto.
+	* term/xterm.el (terminal-init-xterm): Ditto.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* subr.el (keyboard-translate): Fix stupid thinko.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* subr.el (keyboard-translate): Use `terminal-local-value' to
+	access `keyboard-translate-table'.
+	* obsolete/keyswap.el: Ditto.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* mh-e/.arch-inventory: Ignore mh-loaddefs.el.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* frame.el (terminal-parameter-p): New function.
+	(terminal-parameter): Use it.
+
+	* simple.el (normal-erase-is-backspace): Add 'maybe option, set it
+	as default.
+	(normal-erase-is-backspace-mode): Rewrite for multiple display
+	support.
+	(normal-erase-is-backspace-setup-frame): New function.
+
+	* frame.el (make-frame): Call it.
+	* startup.el (command-line): Call it.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* server.el (server-process-filter): Use a dummy client with
+	--no-wait's X frames.
+	(server-save-buffers-kill-display): Explicitly delete frame after
+	deleting its client, in case it was a dummy.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* xt-mouse.el (xterm-mouse-x, xterm-mouse-y): Convert to terminal
+	parameters.
+	(xterm-mouse-position-function, xterm-mouse-event): Update.
+	(xterm-mouse-mode): Don't depend on current value of
+	window-system.
+	(turn-on-xterm-mouse-tracking, turn-off-xterm-mouse-tracking):
+	Update for multi-tty.
+	(turn-on-xterm-mouse-tracking-on-terminal)
+	(turn-off-xterm-mouse-tracking-on-terminal)
+	(xterm-mouse-handle-delete-frame): New functions.
+	(delete-frame-functions, after-make-frame-functions)
+	(suspend-tty-functions, resume-tty-functions): Install extra hooks
+	for multi-tty.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* server.el (server-process-filter): In `-position LINE' handler,
+	don't ruin the request string until the line number is extracted.  Log
+	opened files.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* server.el (server-process-filter): Handle -current-frame command.
+	Don't create frames when it is given.  Don't bind X frames to the
+	client when we are in -no-wait mode.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* cus-start.el: Remove bogus window-system reference from GTK test.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* term/xterm.el (terminal-init-xterm): Protect function-key-map
+	against multiple invocations on the same terminal.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* frame.el (frame-notice-user-settings): Extend to apply
+	settings in `window-system-default-frame-alist' as well.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* faces.el (tty-run-terminal-initialization): New function.
+	(tty-create-frame-with-faces): Use it.
+
+	* startup.el (command-line): Replace duplicated code with a call to
+	tty-run-terminal-initialization.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* faces.el (tty-create-frame-with-faces): Call terminal-init-*.
+	Don't load the initialization file more than once.
+
+	* startup.el (command-line): Don't load the terminal initialization
+	file more than once.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* term/xterm.el (xterm-function-map): Fix key definitions.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* frame.el (make-frame): Append window-system-default-frame-alist to
+	parameters before calling frame-creation-function.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* international/encoded-kb.el (encoded-kbd-setup-display): Fix
+	broken condition before set-input-mode.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* double.el (double-setup): Replace global-key-translation-map with key-translation-map.
+	* international/encoded-kb.el (encoded-kbd-setup-display): Ditto.
+	* international/iso-transl.el: Ditto.
+	* obsolete/iso-acc.el (iso-accents-customize): Ditto.
+
+	* edmacro.el (edmacro-format-keys): Use terminal-local binding of
+	local-function-key-map instead of function-key-map.
+	* emulation/cua-base.el (cua--pre-command-handler): Ditto.
+	* isearch.el (isearch-other-meta-char): Ditto.
+	* subr.el (read-quoted-char): Ditto.
+	* term/vt200.el: Ditto.
+	* term/vt201.el: Ditto.
+	* term/vt220.el: Ditto.
+	* term/vt240.el: Ditto.
+	* term/vt300.el: Ditto.
+	* term/vt320.el: Ditto.
+	* term/vt400.el: Ditto.
+	* term/vt420.el: Ditto.
+
+	* simple.el (normal-erase-is-backspace-mode): Add todo note.
+	* xt-mouse.el: Ditto.
+
+	* term/AT386.el: Adapt for renaming of function-key-map to
+	local-function-key-map.
+	* term/internal.el: Ditto.
+	* term/iris-ansi.el: Ditto.
+	* term/lk201.el: Ditto.
+	* term/mac-win.el: Ditto.
+	* term/news.el: Ditto.
+	* term/rxvt.el: Ditto.
+	* term/sun.el: Ditto.
+	* term/tvi970.el: Ditto.
+	* term/wyse50.el: Ditto.
+	* term/x-win.el (x-setup-function-keys): Ditto.
+	* term/xterm.el: Ditto.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* server.el: Use `device' instead of `display' or `display-id' in
+	variable and client parameter names.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* frame.el (make-frame): Rename frame parameter `display-id' to
+	`device'.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* frame.el (terminal-handle-delete-frame): Check that the frame is
+	alive.
+	* server.el (server-handle-delete-frame): Ditto.  Remove bogus comment.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* international/mule-cmds.el (set-locale-environment): Use
+	server-getenv, not getenv.
+
+	* server.el (server-handle-delete-frame): Add note on possible race
+	condition.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* frame.el (terminal-id, terminal-parameters, terminal-parameter)
+	(set-terminal-parameter, terminal-handle-delete-frame): New functions.
+	(delete-frame-functions): Add to `delete-frame-functions' hook.
+	(terminal-parameter-alist): New variable.
+
+	* international/encoded-kb.el (saved-input-mode): Delete variable.
+	(encoded-kbd-setup-display): Store the saved input method as a terminal
+	parameter.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* term/xterm.el: Remove pointless conditional around key
+	substitution block.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* term/xterm.el: Move key substitutions back before the
+	define-keys.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* term/xterm.el: Don't do the key substitutions unless f13-f60 are
+	really defined.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* term/AT386.el: Wrap function-key-map accesses
+	in (set-)terminal-local-value.
+	* term/internal.el: Ditto.
+	* term/iris-ansi.el: Ditto.
+	* term/lk201.el: Ditto.
+	* term/mac-win.el: Ditto.
+	* term/news.el: Ditto.
+	* term/rxvt.el: Ditto.
+	* term/sun.el: Ditto.
+	* term/tvi970.el: Ditto.
+	* term/wyse50.el: Ditto.
+	* term/x-win.el: Ditto.
+	* term/xterm.el: Ditto.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* international/encoded-kb.el (encoded-kbd-setup-keymap): Add keymap
+	parameter.  Use it instead of changing key-translation-map directly.
+	(encoded-kbd-setup-display): Use terminal-local-value and
+	set-terminal-local-value to access key-translation-map.  Remove
+	debugging messages.
+
+	* international/mule.el (keyboard-coding-system): Test for
+	encoded-kbd-setup-display, not encoded-kbd-mode.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* ldefs-boot.el: Regenerate.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* international/encoded-kb.el (saved-key-translation-map): Remove.
+	(encoded-kbd-mode): Remove.
+	(encoded-kbd-setup-display): New function.
+
+	* international/mule.el (set-keyboard-coding-system): Use it.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* term/mac-win.el (mac-handle-language-change): Use
+	global-key-translation-map instead of key-translation-map.
+	* obsolete/iso-acc.el (iso-accents-customize): Ditto.
+	* international/iso-transl.el (iso-transl-ctl-x-8-map): Ditto.
+	* double.el (double-setup): Ditto.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* term/x-win.el (x-setup-function-keys): New function.  Move
+	function-key-map tweaks here.
+
+	* faces.el (x-create-frame-with-faces): Call x-setup-function-keys.
+
+	* term/iris-ansi.el: Update for terminal-local function-key-map.
+	* term/lk201.el: Ditto.
+	* term/news.el: Ditto.
+	* term/rxvt.el: Ditto.
+	* term/sun.el: Ditto.
+	* term/xterm.el: Ditto.
+
+	* startup.el: Cosmetic change.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* term/xterm.el: Speed up load time by protecting
+	`substitute-key-definition' and `define-key' calls against multiple
+	execution.
+
+	* term/rxvt.el: Ditto.
+	* term/lk201.el: Ditto.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* server.el (server-process-filter): Set locale environment
+	variables from client while creating tty frames.
+
+	* faces.el (tty-create-frame-with-faces): Call set-locale-environment.
+
+	* international/mule-cmds.el
+	(set-display-table-and-terminal-coding-system): Add DISPLAY
+	parameter.  Pass it to set-terminal-coding-system.
+	(set-locale-environment): Add DISPLAY parameter.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* international/mule-cmds.el (set-locale-environment): Ignore
+	window-system; always set the keyboard coding system.
+
+	* international/mule.el (set-terminal-coding-system)
+	(set-keyboard-coding-system): Add DISPLAY parameter.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* term/xterm.el: Protect extended function-key-map from being added
+	to the real function-key-map each time the file is loaded.
+	(xterm-function-map): New variable.
+
+	* term/rxvt.el: Ditto.
+	(rxvt-function-map): New variable.
+
+	* term/lk201.el: Add note on buggy globalness of define-key.
+	* term/iris-ansi.el: Ditto.
+	* term/news.el: Ditto.
+	* term/sun.el: Ditto.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* help-fns.el (describe-variable): Describe frame-local variables
+	correctly.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* loadup.el: Load dnd.el before x-dnd.el.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* server.el (server-process-filter): Disable call to
+	configure-display-for-locale.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* startup.el (command-line): Remove call to nonexistent function
+	`set-locale-translation-file-name'.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* term/rxvt.el: Don't embed `(require 'server)' in eval-when-compile.
+	* term/xterm.el: Ditto.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* server.el (server-process-filter): When processing -position
+	command, don't change the request string until the parameters are
+	extracted.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* frame.el (blink-cursor-mode): Adapt blink-cursor-mode default
+	value from startup.el.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* server.el (server-kill-emacs-query-function): Fix typo in docs.
+	(server-save-buffers-kill-display): If emacsclient was started with a
+	list of filenames to edit, then offer to save only these buffers.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* frame.el (make-frame-on-display): Protect condition on
+	x-initialized when x-win.el is not loaded.
+
+	* server.el (server-process-filter): Don't try to create an X frame
+	when Emacs does not support it.  Improve logging.
+
+	* server.el (server-send-string): New function.
+	(server-handle-suspend-tty, server-process-filter): Use it.
+
+	* server.el (server-process-filter, server-unquote-arg)
+	(server-quote-arg): Doc updates.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* progmodes/gdb-ui.el: Protect define-fringe-bitmap with fboundp.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* server.el (server-with-client-environment): New macro.
+	(server-process-filter): Temporarily set ncurses-related environment
+	variables to those of the client while creating a new tty frame.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* server.el: Doc updates.
+	(server-select-display): Remove (unused).
+	(server-handle-suspend-tty): Kill the client in case of errors from
+	process-send-string.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* server.el ("\C-x#"): Fix typo.  (Thanks Han Boetes, Ted Morse and
+	Ami Fischman.)
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* server.el (server-save-buffers-kill-display): New function.
+
+	* files.el (ctl-x-map): Change binding of C-x C-c to
+	server-save-buffers-kill-display.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* emulation/viper-util.el: Unconditionally fset viper-get-face and
+	viper-color-defined-p under Emacs.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* emulation/viper-init.el (viper-has-face-support-p): Acknowledge
+	that Emacs has face support on ttys.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* frame.el (suspend-frame): Use display-controlling-tty-p to decide
+	between suspend-emacs and suspend-tty.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* server.el (server-process-filter): Select buffers opened by
+	nowait clients, don't leave them buried under others.  (Reported by
+	Dan Nicolaescu.)
+	(server-visit-files): Return list of buffers created. Update doc.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* frame.el (make-frame-on-display): Update doc.
+	(make-frame): Handle display-id parameter.  Update doc.
+	(frames-on-display-list): Update for display ids.
+	(framep-on-display): Ditto.
+	(suspend-frame): Use display-name, not frame-tty-name.
+	(selected-display): New function.
+
+	* server.el (server-delete-client): Use delete-display, not
+	delete-tty.
+	(server-tty-live-p, server-handle-delete-tty): Removed.
+	(server-handle-delete-frame): Delete tty clients, if needed.
+	(server-process-filter): Set the display parameter, and use it
+	when appropriate.
+	(server-handle-suspend-tty): Use the display parameter.
+	(server-start, server-unload-hook): Removed obsolete delete-tty
+	hook.
+
+	* talk.el (talk): Always use talk-add-display.
+	(talk-add-tty-frame, talk-handle-delete-tty): Removed.
+	(talk-handle-delete-frame): New function.
+	(talk-add-display): Open a new frame only if parameter was not a frame.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* server.el (server-visit-files): Don't set client-record when nowait.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* server.el (server-start): Ask before restarting if the old server
+	still has clients.  Added feedback messages.
+
 
 ;; Local Variables:
 ;; coding: iso-2022-7bit

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lwlib/ChangeLog.multi-tty	Wed Aug 22 11:46:14 2007 +0000
@@ -0,0 +1,12 @@
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* xlwmenu.c (XlwMenuRealize): Fix x_catch_errors and
+	x_uncatch_errors invocation.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* xlwmenu.c (XlwMenuRealize): Ignore X errors while setting up
+	cursor shape.
+
+
+;; arch-tag: bee9b967-809c-4221-906c-50446a308c77

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mac/ChangeLog.multi-tty	Wed Aug 22 11:46:14 2007 +0000
@@ -0,0 +1,11 @@
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* makefile.MPW (callproc.c.x): Update dependencies.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* makefile.MPW (EmacsObjects): Add terminal.c.x.
+	({Src}terminal.c.x): Add dependencies.
+
+
+;; arch-tag: f3b2ce5d-5476-47dd-a18b-4b481c737a25

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/man/ChangeLog.multi-tty	Wed Aug 22 11:46:14 2007 +0000
@@ -0,0 +1,6 @@
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* frames.texi: Fix two typos in Drag and Drop node.
+
+
+;; arch-tag: 3c379c08-9497-420c-a975-29017aee7cf5

--- a/src/ChangeLog.multi-tty	Tue Aug 21 04:55:30 2007 +0000
+++ b/src/ChangeLog.multi-tty	Wed Aug 22 11:46:14 2007 +0000
@@ -166,10 +166,1455 @@
 
 	* s/ms-w32.h (SYSTEM_PURESIZE_EXTRA): Bump to 50k.
 
-2007-05-12  L$,1 q(Brentey K,Aa(Broly  <[e-mail]>
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* xterm.c (x_scroll_bar_expose): Fix reference to foreground pixel.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* frame.c (x_set_screen_gamma, store_frame_param): Fix compilation
+	errors.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* window.c (set_window_buffer): Don't call clear_mouse_face on tty
+	frames.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* puresize.h (BASE_PURESIZE): Increase puresize.
+
+	* alloc.c (emacs_blocked_malloc): Disable mallopt call.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* puresize.h (BASE_PURESIZE): Increase to 1126000.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* keyboard.c (interrupt_signal, handle_interrupt, Fset_quit_char):
+	Fix get_named_tty calls for the controlling tty.
+	(Patch by Kalle Olavi Niemitalo <[e-mail]>)
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* xmenu.c (Fx_menu_bar_open) [USE_X_TOOLKIT, USE_GTK]:
+	Rename from Fmenu_bar_open.
+	(syms_of_xmenu): Update defsubr.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* xterm.h: Remove declaration for x_fully_uncatch_errors.
+
+	* xterm.c (x_fully_uncatch_errors): Disable definition.
+
+	* eval.c (unwind_to_catch): Don't call x_fully_uncatch_errors.
+	(internal_condition_case, internal_condition_case_1)
+	(internal_condition_case_2): Don't abort when x_catching_errors.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* callproc.c (Vglobal_environment, Vlocal_environment_variables):
+	Remove.
+	(getenv_internal, child_setup): Don't look at global-environment
+	or local-environment-variables.
+	(Fgetenv_internal): Update docs.
+	(set_initial_environment): Rename from set_global_environment.
+	Store Emacs environment in initial frame parameter.
+	(syms_of_callproc): Remove obsolete defvars.  Update docs.
+
+	* emacs.c (main): Call set_initial_environment, not
+	set_global_environment.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* frame.c (make_terminal_frame): Don't create frames on a terminal
+	that is being deleted.
+	* xfns.c (Fx_create_frame, x_create_tip_frame): Ditto.
+
+	* keyboard.c (tty_read_avail_input): Don't read from a terminal that
+	is being deleted.
+
+	* term.c (get_named_tty): Abort if tty name is NULL.  Simplify
+	accordingly.
+
+	* term.c (Ftty_type): Return nil if terminal is not on a tty instead
+	of throwing an error.  Doc update.
+
+	* term.c (init_tty): Set name before calling `get_named_tty'.
+
+	* term.c (delete_tty): Let delete_terminal delete the frames.  Plug
+	memory leak caused by tty->name.  Remove reference to `deleting_tty'.
+
+	* term.c (syms_of_term) <Vsuspend_tty_functions, Vresume_tty_functions>:
+	Doc update.
+
+	* termhooks.h (terminal) <name>: Explain why identifying terminals
+	by name is a bad idea.
+
+	* terminal.c (delete_terminal): Doc update.
+
+	* xterm.c (XTread_socket): Disable loop on all X displays.
+
+	* xterm.c (x_delete_display): Doc update to reflect changes in
+	delete_terminal.
+
+	* xterm.c (x_delete_terminal): Don't set terminal->deleted and let
+	delete_terminal delete the frames on the terminal.
+
+	* xterm.h (x_display_info) <terminal>: Move member earlier in the
+	struct.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* termhooks.h (terminal) <deleted>: New member.
+
+	* term.c (delete_tty): Use it.
+	(deleting_tty): Remove old variable.
+
+	* terminal.c (delete_terminal): Use terminal->deleted.
+
+	* xterm.c (x_delete_terminal): Use terminal->deleted.  Delete all
+	frames on the display explicitly.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* term.c (Fsuspend_tty): Call clear_tty_hooks.
+	(Fresume_tty, init_tty): Call set_tty_hooks.
+	(clear_tty_hooks, set_tty_hooks): New functions.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* puresize.h (BASE_PURESIZE): Increase to 1240000.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* xfaces.c (realize_default_face): Don't use FRAME_FONT unless frame
+	is an X frame.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* dispnew.c (Fsend_string_to_terminal): Update call to
+	`get_tty_terminal'.
+
+	* term.c (Fsuspend_tty, Fresume_tty): Update call to
+	`get_tty_terminal'.
+	(get_tty_terminal): Add throw parameter.
+	(Ftty_display_color_p, Ftty_display_color_cells): Don't throw
+	errors on X frames.
+
+	* dispextern.h (get_tty_terminal): Update prototype.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* frame.c (make_terminal_frame): Use FRAME_BACKGROUND_PIXEL and
+	FRAME_FOREGROUND_PIXEL.
+	* gtkutil.c (xg_create_frame_widgets): Ditto.
+	* macfns.c (x_set_mouse_color): Ditto.
+	* macfns.c (x_make_gc): Ditto.
+	* msdos.c (ScreenVisualBell): Ditto.
+	* msdos.c (internal_terminal_init): Ditto.
+	* w32term.c (x_free_frame_resources): Ditto.
+	* xfns.c (x_window): Ditto.
+	* xterm.c (x_scroll_bar_create): Ditto.
+	* xterm.c (x_scroll_bar_set_handle): Ditto.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* xterm.h (x_output): Remove background_pixel and foreground_pixel
+	fields.
+
+	* widget.c (update_from_various_frame_slots): Use
+	FRAME_BACKGROUND_PIXEL and FRAME_FOREGROUND_PIXEL.
+
+	* xfns.c (x_set_foreground_color): Ditto.
+	* xfns.c (x_set_background_color): Ditto.
+	* xfns.c (x_set_mouse_color): Ditto.
+	* xfns.c (x_set_cursor_color): Ditto.
+	* xfns.c (x_make_gc): Ditto.
+	* xfns.c (Fx_create_frame): Ditto.
+	* xfns.c (x_create_tip_frame): Ditto.
+	* xfns.c (build_string): Ditto.
+	* xterm.c (XTflash): Ditto.
+	* xterm.c (x_free_frame_resources): Ditto.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* term.c: Include errno.h.
+	(Fcontrolling_tty_p): Compare name with "/dev/tty", not NULL.
+	(Fresume_tty): Handle errors on reopening ttys.  Don't dissociate
+	if terminal was explicitly opened on the controlling terminal.
+	(init_tty): Initialize local pointers.  Always set name (use
+	"/dev/tty" for controlling tty.)  Remove special case for name ==
+	NULL.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* frame.c (syms_of_frame): Enhance doc string of `default-frame-alist'.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* xfns.c (x_create_tip_frame): Fix syntax error.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* xfns.c (Fx_create_frame): Use `store_frame_param' to set
+	`window-system' frame parameter, and make sure it overrides any
+	user-supplied setting.
+
+	* xfns.c (x_icon): Disable redundant call to
+	`x_wm_set_window_state'. (Also applied in CVS.)
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* frame.c (Fmake_terminal_frame): Handle NULL tty names correctly.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* .gdbinit (init_sys_modes): Use Vinitial_window_system instead of
+	Vwindow_system.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* keyboard.c (read_key_sequence): Remove unused variable
+	wrong_kboard_jmpbuf.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* frame.c (store_frame_param): Check for found_for_frame before
+	calling XFRAME.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* puresize.h (BASE_PURESIZE): Increase to 1230000.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* regex.c (extend_range_table_work_area, regex_compile, fastmap):
+	Revert previous unnecessary changes.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* keyboard.c (Fset_quit_char): Don't leave tty state uninitialized
+	after an error.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* xterm.c (x_catch_errors_unwind): Abort if x_error_message is NULL.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* callproc.c (getenv_internal): Fix C99ism.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* keyboard.c (read_char): Declare.  Update call to
+	`read_char_minibuf_menu_prompt'.  Set wrong_kboard_jmpbuf correctly in
+	recursive calls.
+	(read_char_minibuf_menu_prompt): Add wrong_kboard_jmpbuf
+	parameter.  Use it in call to `read_char'.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* Makefile.in (SOME_MACHINE_LISP): Fix typo.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* process.c (Fmake_network_process): Don't unrequest_sigio on modern
+	systems.
+
+	* keyboard.c (Fset_input_interrupt_mode): Cosmetic change.
+
+	* sysdep.c (request_sigio): Make it a no-op if noninteractive.
+	(unrequest_sigio): Make it a no-op if noninteractive.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* keyboard.c (read_char): Enhance comment before extra longjmp to
+	wrong_kboard_jmpbuf.
+	(read_key_sequence): Handle deleted interrupted_kboards correctly; that
+	is a legal case.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* callint.c (Fcall_interactively): Update call to
+	`temporarily_switch_to_single_kboard'.
+
+	* fns.c (Fy_or_n_p): Ditto.
+
+	* frame.c (Fdelete_frame): Remove unused variable `count'.
+
+	* keyboard.c (wrong_kboard_jmpbuf): Remove global variable.
+
+	* keyboard.c (read_char): Add wrong_kboard_jmpbuf parameter to allow
+	for recursive calls.  Update longjmp invocations.  Remember the
+	original current_kboard, and longjmp to `wrong_kboard_jmpbuf' when a
+	filter, timer or sentinel changes it.  Comment out unnecessary calls to
+	`record_single_kboard_state' and `any_kboard_state'.  Update recursive
+	calls.
+
+	* keyboard.c (read_key_sequence): Add `wrong_kboard_jmpbuf' local
+	variable.  Update setjmp and read_char calls.  Abort if
+	interrupted_kboard died in read_char.
+
+	* keyboard.c (any_kboard_state, single_kboard_state)
+	(record_single_kboard_state): Comment out obsolete functions.
+	(push_frame_kboard): Remove function.
+	(pop_kboard): Switch out of single_kboard mode if the
+	kboard has been deleted.
+	(temporarily_switch_to_single_kboard): Change first
+	parameter to a frame pointer.  Throw an error when caller wants to
+	change kboards while in single_kboard mode.
+	(restore_kboard_configuration): Abort if pop_kboard changed
+	the kboard in single_kboard mode.
+	(Frecursive_edit): Switch to single_kboard mode only in
+	nested command loops.
+	(cmd_error, command_loop, command_loop_1, timer_check):
+	Comment out unnecessary call to `any_kboard_state' and
+	`record_single_kboard_state'.
+
+	* keyboard.c (delete_kboard): Exit single_kboard mode if we have just
+	deleted that kboard.
+
+	* keyboard.c (interrupt_signal): Use `Fkill_emacs' to exit Emacs, not
+	`fatal_error_signal'.
+
+	* keyboard.h (read_char, single_kboard_state)
+	(record_single_kboard_state): Remove.
+	(temporarily_switch_to_single_kboard): Update.
+
+	* lread.c: Include setjmp.h.  Update declaration of `read_char'.
+	(read_filtered_event): Call `read_char' with a local
+	`wrong_kboard_jmpbuf'.
+
+	* minibuf.c (read_minibuf): Update call to
+	`temporarily_switch_to_single_kboard'.
+
+	* termchar.h (tty_display_info): Rename `previous_terminal_frame'
+	member to `previous_frame'.
+
+	* xdisp.c (redisplay_internal): Update references to
+	`previous_terminal_frame'.
+	(display_mode_line, Fformat_mode_line): Replace calls to
+	`push_frame_kboard' with `push_kboard'.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* keyboard.c (pop_kboard): Help debugging by not changing
+	current_kboard unnecessarily.
+	(temporarily_switch_to_single_kboard, record_single_kboard_state):
+	Don't push_kboard if we weren't in single kboard state.
+	Don't pop_kboard if we popped into any kboard state.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* xfns.c (Fx_close_connection, Fx_synchronize): Unify argument names
+	with the rest of the DEFUNs.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* frame.c (Fframe_with_environment): Fix typo.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* terminal.c: Include <stdio.h>.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* xdisp.c (get_glyph_string_clip_rects): Add extra parentheses and
+	braces to prevent compiler warnings.
+	(calc_pixel_width_or_height): Add xassert to check that the
+	frame is alive.  Don't call `lookup_image' on a termcap frame.
+
+	* image.c (lookup_image): Don't initialize `c' until the xasserts
+	have been run.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* callproc.c (syms_of_callproc): Initialize
+	`Vlocal-environment-variables' to `Qt'.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* 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.
+
+	* termchar.h (tty_display_info): Rename member `device' to `terminal'.
+	(FRAME_TTY): Update for renames.
+
+	* xterm.h (x_display_info): Rename member `device' to `terminal'.
+
+	* frame.h (frame): Rename `device' member to `terminal'.
+	(FRAME_KBOARD, FRAME_LIVE_P, Qdevice, Qdisplay_live_p):
+	Update for renames.
+
+	* lisp.h (set_process_environment): Rename to `set_global_environment'.
+	(device): Rename to `terminal'.
+
+	* dispextern.h: Update declarations and macro definitions.
+
+	* 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.
+
+	* 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.
+
+	* 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.
+
+	* 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.
+
+	* dispnew.c (Fredraw_frame, Fsend_string_to_terminal)
+	(Fsend_string_to_terminal, init_display): Update for renames.
+
+	* 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.
+
+	* alloc.c (mark_devices): Update declaration.
+	(Fgarbage_collect): Update for renames.
+
+	* coding.c (Fset_terminal_coding_system_internal)
+	(Fterminal_coding_system4)
+	(Fset_keyboard_coding_system_internal)
+	(Fkeyboard_coding_system): Update for renames.
+
+	* data.c (Fterminal_local_value, Fset_terminal_local_value):
+	Update for renames.
+
+	* minibuf.c (read_minibuf): Update for renames.
+
+	* sysdep.c (init_sys_modes, reset_sys_modes): Update for renames.
+
+	* xselect.c (x_handle_selection_clear): Update for renames.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* callproc.c (Fgetenv_internal, syms_of_callproc): Update doc strings.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* callproc.c (child_setup, getenv_internal, Fgetenv_internal):
+	Store the local environment in a frame (not terminal) parameter.
+	Update doc strings.
+	(syms_of_callproc): Update doc strings.
+	(Qenvironment): Moved to frame.c.
+
+	* frame.c (Qenvironment): Move here from callproc.c.
+	(Fdelete_frame): Don't allow other frames to refer to a deleted frame
+	in their 'environment parameter.
+	(Fframe_with_environment): New function.
+	(syms_of_frame): Defsubr it.  Initialize and staticpro Qenvironment.
+
+	* frame.h (Qenvironment): Declare.
+	* lisp.h (Fframe_with_environment): EXFUN it.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* callproc.c (syms_of_callproc): Initialize Vprocess_environment
+	to nil.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* callproc.c (Vglobal_environment): New variable, taking over the
+	previous role of `Vprocess_environment', which is now something else.
+	(add_env): New function.
+	(child_setup): Use it.
+	(child_setup, getenv_internal): Rename Vprocess_environment to
+	Vglobal_environment.  Handle the new Vprocess_environment.
+	(Fgetenv_internal, egetenv): Update doc.
+	(set_process_environment): Rename to `set_global_environment'.  Rename
+	Vprocess_environment to Vglobal_environment.
+	(syms_of_callproc): Rename process-environment to global-environment,
+	add new process-environment, update docs.
+
+	* emacs.c (main): Call set_global_environment instead of
+	set_process_environment.
+
+	* fileio.c (Fread_file_name): Update comment.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* callproc.c (getenv_internal): Fix get_terminal_param call.
+
+	* dispextern.h (get_device): Move declaration to termhooks.h.
+	* termhooks.h (get_device): Move here.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* callproc.c: Include frame.h and termhooks.h, for terminal parameters.
+	(Qenvironment): New constant.
+	(Vlocal_environment_variables): New variable.
+	(syms_of_callproc): Register and initialize them.
+	(child_setup): Handle Vlocal_environment_variables.
+	(getenv_internal): Add terminal parameter.  Handle
+	Vlocal_environment_variables.
+	(Fgetenv_internal): Add terminal parameter.
+
+	* termhooks.h (get_terminal_param): Declare.
+
+	* Makefile.in (callproc.o): Update dependencies.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* term.c (Vring_bell_function, device_list, initial_device)
+	(next_device_id, 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_device, Fdisplay_name, create_device, delete_device)
+	(Fdelete_display, Fdisplay_live_p, Fdisplay_list)
+	Move to terminal.c.
+	(syms_of_term): Move their initialization to terminal.c.
+
+	* terminal.c: New file.
+	(device_list, next_device_id, initial_device, Vring_bell_function)
+	(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_device, create_device, delete_device)
+	(Fdelete_display, Fdisplay_live_p, Fdisplay_list, Fdisplay_name):
+	Move here.
+	(mark_devices, get_terminal_param, store_terminal_param)
+	(Fterminal_parameters, Fterminal_parameter)
+	(Fmodify_terminal_parameters, Fset_terminal_parameter)
+	(init_initial_device, delete_initial_device)
+	(syms_of_terminal): New functions.
+
+	* Makefile.in (obj): Add terminal.o.
+	(terminal.o): Add dependencies.
+	[HAVE_CARBON]: Make terminal.o depend on macgui.h.
+
+	* alloc.c (mark_devices): Declare.
+	(Fgarbage_collect): Call `mark_devices'.
+
+	* dispextern.h  (set_scroll_region, turn_off_insert)
+	(turn_off_highlight, background_highlight, clear_end_of_line_raw)
+	(tty_clear_end_of_line, tty_setup_colors, delete_tty): Remove.
+	(raw_cursor_to, clear_to_end, tty_turn_off_insert)
+	(tty_turn_off_highlight): Add declaration.
+
+	* emacs.c (main): Call `syms_of_terminal'.
+
+	* frame.c (get_future_frame_param): New function.
+	(Fmake_terminal_frame): Use it.
+
+	* keyboard.c (pop_kboard): Remove unused variable.
+	(Fset_output_flow_control): Return nil.
+
+	* keymap.h (Fset_keymap_parent): Add EXFUN.
+
+	* lisp.h (syms_of_terminal): Declare it.
+
+	* sysdep.c (reset_sys_modes): Update for renames.
+
+	* term.c (set_scroll_region): Rename to `tty_set_scroll_region'.
+	(turn_on_insert): Rename to `tty_turn_on_insert'.
+	(turn_off_insert): Rename to `tty_turn_off_insert'.
+	(turn_off_highlight): Rename to `tty_turn_off_highlight'.
+	(turn_on_highlight): Rename to `tty_turn_on_highlight'.
+	(toggle_highligh): Rename to `tty_toggle_highlight'.
+	(background_highlight): Rename to `tty_background_highlight'.
+	(highlight_if_desired): Rename to `tty_highlight_if_desired'.
+
+	(tty_ring_bell, tty_update_end, tty_set_terminal_window)
+	(tty_set_scroll_region, tty_background_highlight)
+	(tty_cursor_to, tty_raw_cursor_to, tty_clear_to_end)
+	(tty_clear_frame, tty_clear_end_of_line, tty_write_glyphs)
+	(tty_insert_glyphs, tty_delete_glyphs, tty_ins_del_lines)
+	(term_get_fkeys, tty_setup_colors, dissociate_if_controlling_tty)
+	(delete_tty): Add static modifier.
+
+	(tty_reset_terminal_modes, tty_set_terminal_window)
+	(tty_set_scroll_region, tty_background_highlight)
+	(tty_highlight_if_desired, tty_cursor_to)
+	(tty_raw_cursor_to, tty_clear_to_end, tty_clear_frame)
+	(tty_clear_end_of_line, tty_write_glyphs, tty_insert_glyphs)
+	(tty_delete_glyphs, tty_ins_del_lines, turn_on_face):
+	Update for renames.
+
+	* termhooks.h (param_alist): New member to struct device.
+
+	* xterm.h (x_delete_device): Declare.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* keyboard.c (Fset_input_interrupt_mode): Fix compilation error
+	during non-X builds.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* print.c (print_preprocess): Don't loose print_depth levels while
+	iterating.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* keyboard.c (Fset_input_interrupt_mode, Fset_output_flow_control)
+	(syms_of_keyboard): Defsubr them.
+	(Fset_input_meta_mode, Fset_quit_char): New functions.
+	(Fset_input_mode): Split to above functions.
+
+	* lisp.h: EXFUN the new functions.
+
+	* xterm.c (x_initialize): Use Fset_input_interrupt_mode.
+	* macterm.c (mac_initialize): Ditto.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* term.c (suspend-tty): Update doc string.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* dispnew.c (window_change_signal): Fix typo.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* dispnew.c (window_change_signal): Don't believe width/height values
+	that are impossibly small.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* xterm.c (x_term_init) [!HAVE_GTK_MULTIDISPLAY]:
+	Refuse to create secondary X connections.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* keyboard.c (kbd_buffer_store_event_hold): Simplify condition.
+	(read_key_sequence): Reinitialize fkey and keytran at each replay.
+
+	* coding.c (Fkeyboard_coding_system): Update doc.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* puresize.h (BASE_PURESIZE): Increase to 1220000.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* puresize.h (BASE_PURESIZE): Increase to 1210000.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* data.c (do_symval_forwarding, store_symval_forwarding)
+	(find_symbol_value): Use the selected frame's keyboard, not
+	current_kboard.
+
+	* data.c (Fterminal_local_value, Fset_terminal_local_value): Disable
+	these functions.
+
+	* data.c (syms_of_data): Don't defsubr them.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* keyboard.c (mark_kboards): Also mark Vkeyboard_translate_table.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* keyboard.c (Vkeyboard_translate_table): Moved to struct kboard.
+	* keyboard.h (Vkeyboard_translate_table): Moved to struct kboard.
+
+	* keyboard.c (read_char): Use current_kboard to access
+	Vkeyboard_translate_table.
+	* keymap.c (Fdescribe_buffer_bindings): Ditto.
+
+	* keyboard.c (init_kboard): Initialize Vkeyboard_translate_table.
+
+	* keyboard.c (syms_of_keyboard): Use DEFVAR_KBOARD to define
+	Vkeyboard_translate_table. Update doc strings.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* keyboard.c (syms_of_keyboard): Update docs of
+	local-function-key-map and function-key-map.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* emacs.c (REPORT_EMACS_BUG_PRETEST_ADDRESS): Change address to the
+	multi-tty mailing list.
+
[phone]  Karoly Lorentey  <[e-mail]>
 
-	This placeholder will be replaced by the Arch logs of the
-	multi-tty branch.
+	* term.c (tty_set_terminal_modes): Output newlines on the correct
+	terminal device.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* keyboard.c (pop_kboard): Set current_kboard to the kboard of the
+	selected frame when the stored kboard object has been deleted before
+	pop_kboard.
+	(restore_kboard_configuration): Call pop_kboard only after setting up
+	single_kboard mode.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* keyboard.c: Add forward declaration of restore_kboard_configuration.
+
+	emacs--multi-tty--0--patch-414
+
+	* fns.c: Include termhooks.h.
+	(Fy_or_n_p): Use temporarily_switch_to_single_kboard to prevent crashes
+	caused by bogus longjmps in read_char.
+
+	* callint.c (Fcall_interactively): Use
+	temporarily_switch_to_single_kboard instead of single_kboard_state.
+	Make sure it is correctly unwinded.
+
+	* keyboard.c (recursive_edit_unwind): Remove single_kboard stuff.
+	(Frecursive_edit): Use temporarily_switch_to_single_kboard for
+	single_kboard state management.
+
+	* minibuf.c (read_minibuf): Use temporarily_switch_to_single_kboard
+	instead of simply calling single_kboard_state.
+
+	* keyboard.c (push_device_kboard): Remove function.
+	(push_kboard): New function.
+	(push_frame_kboard): Use it.
+	(pop_frame_kboard): Rename to pop_kboard.
+
+	* xdisp.c (display_mode_line, Fformat_mode_line): Update uses.
+
+	* data.c: Include termhooks.h.
+	(Fterminal_local_value, Fset_terminal_local_value): Update.
+
+	* Makefile.in (data.o, fns.o): Add termhooks.h dependency.
+
+	* keyboard.h (push_device_kboard, pop_frame_kboard): Remove
+	declarations.
+	(push_kboard, pop_kboard, temporarily_switch_to_single_kboard)
+	(record_single_kboard_state): New declarations.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* dispextern.h (get_tty_device): Declare.
+
+	* dispnew.c (Fsend_string_to_terminal): Add optional TERMINAL
+	parameter.
+
+	* fns.c (Fy_or_n_p, Fyes_or_no_p): Don't try to open an X dialog on
+	tty terminals.
+
+	* term.c (get_tty_device): Remove static qualifier.
+
+	* xmenu.c (create_and_show_dialog, create_and_show_popup_menu)
+	(free_frame_menubar, mouse_position_for_popup, set_frame_menubar)
+	(update_frame_menubar, x_activate_menubar, xdialog_show, xmenu_show):
+	Abort when given a non-X frame.
+
+	* xmenu.c (Fx_popup_menu, Fx_popup_dialog): Throw an error when run
+	on a non-X frame.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* dispnew.c (init_display): Set up `window-system' and `tty-type'
+	frame parameters in the initial tty frame.
+
+	* frame.c (Fmake_terminal_frame): Look up the `tty-type' frame
+	parameter, not `tty' when discovering the tty type of the new frame.
+	Initialize `tty' and `tty-type' frame parameters in the new frame.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* window.c (window_internal_height): Remove bogus make_number call.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* xsmfns.c (x_session_close): New function.
+	* xterm.h: Declare it.
+
+	* xterm.c (XTread_socket): Don't call x_session_check_input for
+	secondary displays.
+	(x_term_init): Do not initialize X session management when the
+	initial display was a tty frame.
+	(x_delete_display): Close X session management when we close its
+	display.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* keyboard.h (struct kboard): Rename member 'Vfunction_key_map' to
+	'Vlocal_function_key_map', and 'Vkey_translation_map' to
+	'Vlocal_key_translation_map'.
+	(Vfunction_key_map, Vkey_translation_map): New declarations.
+
+	* keyboard.c (Vfunction_key_map): New variable.
+	(Vglobal_key_translation_map): Rename to
+	Vglobal_key_translation_map.
+	(read_key_sequence, init_kboard, syms_of_keyboard, mark_kboards):
+	Update.
+
+	* keymap.c (Fdescribe_buffer_bindings): Update.
+	* term.c (term_get_fkeys_1): Update.
+
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* xdisp.c (select_frame_for_redisplay): Fix xassert.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* termhooks.h (struct device): Rename to `struct device'.
+	Rename member `next_display' to `next_device'.
+	Rename member `delete_display_hook' to `delete_device_hook'.
+	(FRAME_DISPLAY): Rename to FRAME_DEVICE.
+	(DISPLAY_ACTIVE_P): Rename to DEVICE_ACTIVE_P.
+	(DISPLAY_TERMINAL_CODING): Rename to DEVICE_TERMINAL_CODING.
+	(DISPLAY_KEYBOARD_CODING): Rename to DEVICE_KEYBOARD_CODING.
+
+	* frame.h (stuct frame): Rename `display' member to `device'.
+
+	* xterm.h (x_display_info): Rename member `frame_display' to `device'.
+
+	* termchar.h (struct tty_display_info): Rename `display' member to
+	`device'.
+
+	* keyboard.c (push_display_kboard): Rename to push_device_kboard.
+
+	* frame.c (Fmake_terminal_frame): Ditto.
+	* xfns.c (Fx_create_frame): Ditto.
+
+	* term.c (display_list): Rename to device_list.
+	* term.c (initial_display): Rename to initial_device.
+	* term.c (next_display_id): Rename to next_device_id.
+	* term.c (get_display): Rename to get_device.
+	* term.c (get_tty_display): Rename to get_tty_device.
+	* term.c (get_named_tty_display): Rename to get_named_tty.
+	* term.c (init_initial_display): Rename to init_initial_device.
+	* term.c (delete_initial_display): Rename to delete_initial_device.
+	* term.c (create_display): Rename to create_device.
+	* term.c (delete_display): Rename to delete_device.
+
+	* xfns.c (check_x_display_info): Document that the function allows
+	display ids as well.
+
+	* xterm.c (x_delete_frame_display): Rename to x_delete_device.
+	* xterm.c (x_create_frame_display): Rename to x_create_device.
+
+	* coding.c: Update.
+	* dispextern.h: Update.
+	* data.c: Update.
+	* dispnew.c: Update.
+	* frame.c: Update.
+	* frame.h: Update.
+	* keyboard.c: Update.
+	* keyboard.h: Update.
+	* lisp.h: Update.
+	* sysdep.c: Update.
+	* term.c: Update.
+	* xdisp.c: Update.
+	* xselect.c: Update.
+	* xterm.c: Update.
+
+	* prefix-args.c: Include stdlib.h for exit.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* term.c (term_init): Rename to init_tty.
+
+	* dispextern.h (term_init): Rename to init_tty.
+
+	* dispnew.c (init_display): Update.
+	* frame.c (Fmake_terminal_frame): Update.
+	* term.c (tty_setup_colors): Update comment.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* xdisp.c (select_frame_for_redisplay): Add xassert for
+	FRAME_LIVE_P.
+	(unwind_redisplay): Don't restore previous frame if it has been
+	deleted.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* term.c (term_init): Move maybe_fatal declaration to top-level to
+	prevent complaints from GCC 4.0.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* frame.c (syms_of_frame): Add warning to `delete-frame-functions' description.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* term.c (tty_set_terminal_modes, tty_reset_terminal_modes): Flush
+	tty output before returning.
+
+	* sysdep.c (reset_sys_modes): Remove superflous fflush call.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* data.c (Fterminal_local_value, Fset_terminal_local_value): New functions.
+	(syms_of_data): Defsubr them.
+
+	* keyboard.c (syms_of_keyboard): Expand docs of terminal-local
+	variables to warn about their random bindings.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* keyboard.c (push_display_kboard): New function.
+	* keyboard.h (push_display_kboard): Declare it.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* termhooks.h (display): New field: kboard.
+
+	* xterm.h (x_display_info): Remove kboard field.
+	* termchar.h (tty_display_info): Ditto.
+	* frame.h (frame): Ditto.
+	(FRAME_KBOARD): Update.
+
+	* dispnew.c (init_display): Don't initialize kboard.
+	* frame.c (make_frame, make_initial_frame, make_terminal_frame): Ditto.
+
+	* frame.c (make_frame_without_minibuffer, Fdelete_frame): Update
+	kboard access.
+	* keyboard.c (delete_kboard): Ditto.
+	* term.c (term_init): Ditto.
+	* xfns.c (Fx_create_frame, x_create_tip_frame): Ditto.
+	* xselect.c (x_handle_selection_clear): Ditto.
+	* xterm.c (x_term_init): Ditto.
+
+	* term.c (init_initial_display): Initialize kboard.
+	* xterm.c (x_term_init): Ditto.
+
+	* term.c (delete_tty): Remove kboard deletion.
+	(delete_display): Delete kboard as well.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* keymap.c (Vkey_translation_map): Remove.
+	(syms_of_keymap): Remove DEFVAR for key-translation-map.
+	(Fdescribe_buffer_bindings): Update for terminal-local
+	key-translation-map.
+
+	* keyboard.h (kboard): Add Vkey_translation_map field.
+	(Vglobal_key_translation_map): Declare.
+
+	* keyboard.c (Vglobal_key_translation_map): New variable.
+	(syms_of_keyboard): DEFVAR it and Vkey_translation_map.
+	(mark_kboards): Mark key-translation-map.
+	(read_key_sequence): Update for terminal-local key-translation-map.
+
+	* emacs.c (main): Call syms_of_keymap before syms_of_keyboard.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* keyboard.c (Fset_input_mode): Call reset_sys_modes and
+	init_sys_modes on the selected device only; do not use the bulk
+	functions reset_all_sys_modes and init_all_sys_modes.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* term.c (term_init): Make sure the function keys are set up in the
+	correct function-key-map.
+	(term_get_fkeys_arg): Rename to term_get_fkeys_address.
+	(term_get_fkeys_kboard): New variable.
+	(term_get_fkeys): Use it.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* keyboard.h (kboard): Move Vfunction_key_map inside the kboard struct.
+
+	* keyboard.c (Vfunction_key_map): Remove declaration.
+	(read_key_sequence, init_kboard): Update references to
+	Vfunction_key_map.
+	(syms_of_keyboard): Declare function-key-map as a terminal-local
+	variable.
+	(mark_kboards): Mark Vfunction_key_map.
+
+	* keymap.c (Vfunction_key_map): Remove.
+	(Fdescribe_buffer_bindings): Update references to Vfunction_key_map.
+	(syms_of_keymap): Remove DEFVAR for Vfunction_key_map.
+
+	* term.c (term_get_fkeys_1): Update references to Vfunction_key_map.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* xfns.c (start_hourglass): Disable display type check, it would
+	break multi-tty.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* term.c (get_display): Fix typo.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* termhooks.h (DISPLAY_TERMINAL_CODING, DISPLAY_KEYBOARD_CODING):
+	New macros.
+
+	* coding.c (Fset_terminal_coding_system_internal)
+	(Fterminal_coding_system, Fset_keyboard_coding_system_internal)
+	(Fkeyboard_coding_system): Add DISPLAY parameter.
+
+	* term.c (get_display): Add THROW parameter.
+	(get_tty_display, Fdisplay_name, Fdisplay_tty_type)
+	(Fdisplay_controlling_tty_p, Fdelete_display, Fdisplay_live_p):
+	Update callers.
+
+	* xfns.c (check_x_display_info): Ditto.
+	* frame.c (Fmake_terminal_frame, Fframe_display): Ditto.
+
+	* dispextern.h (get_display): Update prototype.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* xdisp.c (with_echo_area_buffer, set_message, set_message_1)
+	(echo_area_display): Revert change applied in patch-328.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* Makefile.in (SOME_MACHINE_LISP): Add dnd.elc.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* xfaces.c (internal_resolve_face_name, resolve_face_name_error):
+	New functions.
+	(resolve_face_name): Protect against loops and errors thrown by
+	Fget.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* xfns.c (unwind_create_frame): Don't do anything if the frame is
+	already dead.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* xterm.c (x_delete_frame_display): Call xg_display_close under GTK.
+	(x_connection_closed): Don't close the display before its frames
+	are deleted.  Protect against the last frame calling the display
+	delete hook.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* termchar.h: Fix deviation from CVS.
+	* xfns.c (Fx_create_frame): Ditto.
+
+	* xterm.c (x_delete_display): Cosmetic change.
+	* xterm.c (x_create_frame_display): Cosmetic change.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* xfns.c (Fx_close_connection): Remove declaration cruft.
+
+	* xterm.c (x_delete_frame_display): Declare i. Fix initialization of
+	dpyinfo.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* xfns.c (Fx_close_connection): Move code to x_delete_frame_display.
+	(x_delete_frame_display): Actually close the X connection.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* sysdep.c (narrow_foreground_group): Don't abort if inherited_pgroup
+	is zero.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* xterm.c (Vinhibit_redisplay): Declare for x_flush.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* xterm.c (x_flush): Return immediately when redisplay is inhibited.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* keyboard.c (interrupt_signal, handle_interrupt): Move thread check
+	to interrupt_signal.  Check for frame on controlling tty instead of
+	current selected frame in handle_interrupt.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* dispnew.c (build_frame_matrix_from_leaf_window): Fix typo.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* xfaces.c (x_free_gc): Protect xassert with GLYPH_DEBUG.
+	* xfns.c (unwind_create_frame): Ditto.
+	* dispnew.c (build_frame_matrix_from_leaf_window): Ditto.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* xfns.c (x_create_tip_frame): Copy color slot initialization
+	safeguards from x-create-frame.  Trivial doc update.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* puresize.h (BASE_PURESIZE): Enlarge base value by 100000.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* dispextern.h (updated_window): Remove comment reference to
+	updating_frame.
+
+	* dispnew.c (update_window): Remove bogus xassert.
+
+	* xterm.c: (x_clear_frame): Update comment.
+	(x_draw_window_cursor): Remove reference to updating_frame.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* keyboard.c (cmd_error_internal): Remove slightly bogus comment.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* xdisp.c (handle_single_display_prop): Use FRAME_WINDOW_P instead of
+	checking against specific frame types.  Ignore images on non-window
+	frames.
+	(echo_area_display): Use FRAME_INITIAL_P to check for initial frame.
+	(redisplay_preserve_echo_area): Update for multi-tty support.
+	(redisplay_window): Don't bother with toolbars, fringe bitmaps or
+	vertical borders on tty frames.
+	(display_line): Remove superflous #ifdefs.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* fringe.c (init_fringe_bitmap): Removed C99ism.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* Makefile.in (minibuf.o): Fix typo.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* xterm.c (x_connection_closed): Inhibit redisplay while frames are
+	being deleted.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* xfns.c (Fx_create_frame): Fix verifying return value of x_get_arg
+	for Qdisplay_id.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* term.c (Fdisplay_controlling_tty_p): New function.
+
+	* term.c (syms_of_term): Initialize Sdisplay_controlling_tty_p.
+
+	* keyboard.c (Fsuspend_emacs): Give a better error message when
+	there are multiple open tty devices.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* keyboard.c (interrupt_signal): Don't call fatal_error_signal with
+	an extra parameter.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* term.c (get_tty_display): Don't signal an error on the initial frame.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* dispextern.h (get_display, Fdisplay_tty_type):  New prototypes.
+	(Fframe_tty_type): Removed.
+
+	* dispnew.c (init_display): Use Fdisplay_tty_type, not Fframe_tty_type.
+
+	* frame.c (Qdisplay_id, Qdisplay_live_p): New symbols.
+	(make_terminal_frame): Get display as a parameter.
+	(Fmake_terminal_frame): Get/create display here; pass it to
+	make_terminal_frame.
+	(Fframe_display): New function.
+	(Fdelete_frame): Stop if the hook deleted the frame.
+	(syms_of_frame): Register new stuff.
+
+	* frame.h (Qdisplay_id, Qdisplay_live_p, make_terminal_frame):
+	Updated prototypes.
+
+	* keyboard.c (interrupt_signal): Updated comment.
+
+	* term.c (Vdelete_tty_after_functions): Removed variable.
+	(Qframe_tty_name, Qframe_tty_type): Removed.
+	(next_display_id): New var.
+	(tty_ring_bell): Don't do anything on suspended frames.
+	(Ftty_display_color_p, Ftty_display_color_cells): Doc update.
+	(get_display): New function.
+	(get_tty_display): Use it.
+	(get_named_tty_display): Ignore suspended displays.
+	(Fframe_tty_name): Renamed to Fdisplay_name.  Handle all kinds of
+	displays.
+	(Fframe_tty_type): Renamed to Fdisplay_tty_type.
+	(init_initial_display): Set display name.
+	(term_init): Allow more displays on the same device.  Set display name.
+	(Fdelete_tty): Removed.
+	(delete_tty): Don't run hooks.
+	(create_display): Set display id.
+	(delete_display): Free display name.
+	(Fdelete_display, Fdisplay_live_p, Fdisplay_list): New functions.
+	(Fsuspend_tty): Call hook with display id.  Doc update.
+	(Fresume_tty): Refuse to resume when there is already an active display
+	on the same device.  Call hook with display id.  Doc update.
+	(syms_of_term): Reflect above changes.
+
+	* termhooks.h (struct display): Added `id' and `name' members.
+	(DISPLAY_ACTIVE_P): New macro.
+
+	* xfns.c (check_x_display_info): Handle display ids.
+	(Fx_create_frame): Try to get display from `display-id' parameter.
+
+	* xterm.c (x_term_init): Set display name.
+	(x_delete_display): Handle the case when `font_table' is NULL.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* term.c (Ftty_display_color_cells): Return 0 in case of an error,
+	not nil.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* term.c (dissociate_if_controlling_tty)[USG]: Fix parse error.
+	(Contributed by ARISAWA Akihiro <[e-mail]>).
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* term.c (dissociate_if_controlling_tty): On some systems TIOCNOTTY
+	works only on /dev/tty.  Adapt the function accordingly.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* keyboard.c (interrupt_signal): Don't call Fkill_emacs from a
+	signal handler; use fatal_error_signal instead.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* keyboard.c (command_loop): Clear single_kboard each time Emacs
+	returns to top-level.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* term.c (tty_insert_glyphs): Added missing first
+	parameter (contributed by Yoshiaki Kasahara
+	<[e-mail]>).
+	(encode_terminal_code): Converted to use ANSI prototype syntax.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* dispnew.c (init_display): Always install handler for SIGWINCH.
+	(Reported by Yoshiaki Kasahara <[e-mail]>.)
+
+	* term.c: Massive updates throuout the file.
+	(TS_*, TN_*): Moved to struct tty_output.
+	(RPov, delete_in_insert_mode se_is_so, costs_set, insert_mode):
+	Ditto.
+	(standout_mode, specified_window, tty_cursor_hidden): Ditto.
+	(tty_set_terminal_modes, tty_reset_terminal_modes): New functions.
+	(turn_on_insert, turn_off_insert): Added tty parameter.
+	(turn_on_highlight, turn_off_highlight, toggle_highlight): Added
+	tty parameter.
+	(tty_hide_cursor, tty_show_cursor): Ditto.
+	(background_highlight, highlight_if_desired): Ditto.
+	(tty_capable_p): Changed first parameter to tty_output.
+	(term_init): Make sure top_frame is initialized.  Don't exit on
+	errors if this would have been a secondary terminal.  Call
+	set_terminal_modes on the end.
+	(delete_tty): New function.
+	(delete_tty_1): New function.
+	(print_all_frames): New function, marginally useful for debugging.
+
+	* termchar.h (struct tty_output): Changed old_tty to be a pointer.
+	Removed old_tty_valid member.  Added tty-specific variables from
+	term.c.
+
+	* xfaces.c (Ftty_supports_face_attributes_p): Update for new
+	tty_capable_p.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* term.c (clear_end_of_line): Use updating_frame instead of
+	selected_frame.
+	(set_scroll_region, clear_to_end, clear_frame, tty_show_cursor):
+	Ditto.
+	(tty_hide_cursor, turn_on_highlight, turn_off_highlight): Ditto.
+	(turn_on_insert, turn_off_insert): Ditto.
+
+	* termchar.h (struct terminal): Renamed to struct tty_output.
+	Added name, type, input, output, termscript, old_tty,
+	term_initted, old_tty_valid, background_pixel, foreground_pixel,
+	next fields.
+	(TERMINAL_*): Renamed to TTY_* for brevity.
+	(CURRENT_TERMINAL): Renamed to CURTTY for brevity.
+	(tty_list): New variable.
+	(TERMINAL_PTR): Removed.
+	(FRAME_TTY): New function.
+	(TTY_NAME, TTY_TYPE): New macros.
+
+	* term.c (current_terminal): Removed.
+	(_current_terminal): Removed.
+	(tty_list): New variable.
+	(OUTPUT, OUTPUT1, OUTPUTL, OUTPUT_IF, OUTPUT1_IF): Added tty
+	parameter.
+	(set_terminal_modes): Added tty parameter.
+	(reset_terminal_modes): Added tty parameter.
+	(cursor_to, raw_cursor_to): Updated cmgoto() calls.
+	(clear_end_of_line, write_glyphs): Add indirection to terminal
+	output, updated cmcheckmagic() calls.
+	(get_named_tty): New function.
+	(term_dummy_init): New function.
+	(term_init): Added name parameter, added tty_output return value.
+	Changed algorithm to update tty_list.  Call init_sys_modes() to
+	set up tty mode on the newly opened terminal device.
+	(get_current_tty): New function, intended for debugging.
+
+	* termhooks.h (termscript): Removed.
+
+	* w32term.h (FRAME_FOREGROUND_PIXEL, FRAME_BACKGROUND_PIXEL):
+	Removed redundant definition.
+	* macterm.h (FRAME_FOREGROUND_PIXEL, FRAME_BACKGROUND_PIXEL): Ditto.
+
+	* window.c (init_window_once): Call make_terminal_frame with two
+	zero parameters.
+
+	* cm.h (emacs_tputs): New macro to set current_tty, and then call
+	tputs().
+	(current_tty): New variable, for cmputc().
+	(cmcheckmagic, cmputc, cmgoto): Added prototypes.
+
+	* cm.c (current_tty): New variable, for cmputc().
+	(cmputc): Use it.
+	(cmcheckmagic): Added tty parameter, look up terminal streams
+	there.
+	(calccost): Added tty parameter.  Use emacs_tputs() instead of
+	tputs().
+	(cmgoto): Added tty parameter.  Pass it on to calccost().  Use
+	emacs_tputs() instead of tputs().
+
+	* dispextern.h (set_terminal_modes, reset_terminal_modes): Added
+	tty parameter.
+	(term_init): Added name parameter (the filename of the terminal
+	device). Added return value (struct tty_output).
+
+	* dispnew.c: Replace CURTTY() with local variables throughout the
+	file (where applicable).
+	(termscript): Moved to struct tty_output.
+	(terminal_type): Removed.
+
+	* emacs.c (main): Don't call init_sys_modes(), the new term_init()
+	already does that during init_display().
+	(shut_down_emacs): Call reset_all_sys_modes() instead of
+	reset_sys_modes().
+
+	* frame.c (Qtty, Qtty_type): New variables.
+	(syms_of_frame): Initialize them.
+	(tty_display): Removed.
+	(make_terminal_frame): New parameters (tty filename and type).
+	Initialize output_data.tty field instead of output_data.x.  Use
+	term_init() to find the right tty_output.  (Use term_dummy_init()
+	during bootstrap.)
+	(Fmake_terminal_frame): Get device filename and type from frame
+	parameters.
+
+	* frame.h (FRAME_FOREGROUND_PIXEL, FRAME_BACKGROUND_PIXEL): Do the
+	right thing if the frame is a tty.
+	(struct frame): New member in output_data: tty.
+	(make_terminal_frame): Updated of prototype.
+
+	* keyboard.c (Fset_input_mode): Call reset_all_sys_modes(), not
+	reset_sys_modes().  Ditto with init_sys_modes().
+
+	* lisp.h (tty_output): Added forward declaration.
+	(init_sys_modes, reset_sys_modes): Updated prototype.
+	(init_all_sys_modes, reset_all_sys_modes): New prototypes.
+
+	* scroll.c: Replace CURTTY() with local variables throughout the
+	file (where applicable).
+
+	* sysdep.c (old_tty, term_initted, old_tty_valid): Moved to struct
+	tty_output.
+	(init_all_sys_modes): New function.
+	(init_sys_modes): Added tty_output parameter.  Use it.
+	(reset_all_sys_modes): New function.
+	(reset_sys_modes): Added tty_output parameter.  Use it.
+
+	* Makefile.in: Update dependencies.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* termchar.h (struct terminal): New struct.
+	(must_write_spaces, min_padding_speed, line_ins_del_ok)
+	(char_ins_del_ok, scroll_region_ok, scroll_region_cost)
+	(memory_below_frame, fast_clear_end_of_line): Moved to struct
+	terminal.
+	(current_terminal): New variable.
+	(CURRENT_TERMINAL, TERMINAL_*): New accessor macros.
+	(min_padding_speed, dont_calculate_costs): Commented out (unused).
+
+	* term.c (_current_terminal): New variable.  Will be removed when
+	true multi-tty support is implemented.
+
+	* termopts.h (no_redraw_on_reenter): Moved here.
+
+	* term.c (set_terminal_window, ins_del_lines, calculate_costs)
+	(term_init): Use the accessor macros for terminal characteristics.
+	* dispnew.c (line_hash_code, line_draw_cost)
+	(direct_output_for_insert, update_frame_1, scrolling)
+	(update_frame_line): Ditto.
+	* macterm.c (mac_initialize): Ditto.
+	* msdos.c (internal_terminal_init): Ditto.
+	* scroll.c (calculate_scrolling, calculate_direct_scrolling)
+	(scrolling_1, scroll_cost): Ditto.
+	* sysdep.c (hft_init): Ditto.
+	* w32term.c (w32_initialize): Ditto.
+	* xdisp.c (try_window_id): Ditto.
+	* xterm.c (x_initialize): Ditto.
+
[phone]  Karoly Lorentey  <[e-mail]>
+
+	* keyboard.c (echo_dash): Do nothing if there already is a dash at
+	the end of the echo string.
+
 
 ;; Local Variables:
 ;; coding: iso-2022-7bit