From 490f11979e08aae4b4bab3e44f730895b83d1a43 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 17 Jan 2009 18:47:53 +0000
Subject: [PATCH] (Standard Hooks): Document `suspend-tty-functions' and
 `resume-tty-functions'.

---
 doc/lispref/ChangeLog  |  7 ++++++-
 doc/lispref/hooks.texi |  6 ++++++
 etc/NEWS               | 10 +++++++++-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 1ad7083f8df..460511c5792 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -4,16 +4,21 @@
 	frames.texi.
 
 	* hooks.texi (Standard Hooks): Document `delete-frame-functions'
-	and `delete-terminal-functions'.
+	`delete-terminal-functions', `suspend-tty-functions' and
+	`resume-tty-functions'.
 
 	* frames.texi (Frames): Document `frame-terminal' and
 	`terminal-live-p'.
 	(Multiple Displays): Document `make-frame-on-tty'.
 	(Multiple Terminals): Document `terminal-list', `delete-terminal',
 	`terminal-name', and `get-device-terminal'.
+	(Terminal Parameters): Document `terminal-parameters',
+	`terminal-parameter', and `set-terminal-parameter'.
 
 	* os.texi (System Environment): Document `environment' and
 	`initial-environment'.
+	(Suspending Emacs): Update for multi-tty; document
+	`suspend-tty', `resume-tty', and `controlling-tty-p'.
 
 	* nonascii.texi (Coding System Basics): More accurate description
 	of `raw-text'.
diff --git a/doc/lispref/hooks.texi b/doc/lispref/hooks.texi
index 40e50512736..a72a8883064 100644
--- a/doc/lispref/hooks.texi
+++ b/doc/lispref/hooks.texi
@@ -292,6 +292,9 @@ Manual}.
 @item redisplay-end-trigger-functions
 @xref{Window Hooks}.
 
+@item resume-tty-functions
+@xref{Suspending Emacs}.
+
 @item scheme-indent-function
 
 @item suspend-hook
@@ -300,6 +303,9 @@ Manual}.
 @item suspend-resume-hook
 @xref{Suspending Emacs}.
 
+@item suspend-tty-functions
+@xref{Suspending Emacs}.
+
 @item temp-buffer-setup-hook
 @xref{Temporary Displays}.
 
diff --git a/etc/NEWS b/etc/NEWS
index ff0c5a7f787..4d5ec0c0377 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1683,6 +1683,7 @@ type (`tty-type' parameter) to `make-terminal-frame'.
 *** The function `make-frame-on-display' now works during a tty
 session.
 
++++
 *** A new `terminal' data type.
 The functions `get-device-terminal', `terminal-parameters',
 `terminal-parameter', `set-terminal-parameter' use this data type.
@@ -1698,24 +1699,31 @@ which is not used directly any more.
 variable file-local-variables-alist, and before actually applying the
 file-local variables.
 
++++
 **** `suspend-tty-functions' and `resume-tty-functions' are called
 after a tty frame has been suspended or resumed, respectively.  The
 functions are called with the terminal id of the frame being
 suspended/resumed as a parameter.
 
++++
 **** The special hook `delete-terminal-functions' is called before
 deleting a terminal.
 
 *** New functions:
 
++++
 **** `environment'
 
-**** `delete-tty'
++++
+**** `delete-terminal'
 
++++
 **** `suspend-tty'
 
++++
 **** `resume-tty'.
 
++++
 *** `initial-environment' holds the environment inherited from Emacs's parent.
 
 ** Redisplay changes
-- 
2.11.4.GIT