aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorEli Zaretskii2009-01-17 16:32:09 +0000
committerEli Zaretskii2009-01-17 16:32:09 +0000
commit0ed8034edcbd7ff84230258ef40f031e02fa3c05 (patch)
treeabd7412285b23358b5c323ffdcb437f0849332bb /doc
parent20cb6c9b3298942cf769c5aab9db1f978db5f464 (diff)
downloademacs-0ed8034edcbd7ff84230258ef40f031e02fa3c05.tar.gz
emacs-0ed8034edcbd7ff84230258ef40f031e02fa3c05.zip
(Standard Hooks): Document `delete-frame-functions' and
`delete-terminal-functions'.
Diffstat (limited to 'doc')
-rw-r--r--doc/lispref/ChangeLog12
-rw-r--r--doc/lispref/hooks.texi7
2 files changed, 19 insertions, 0 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index e249c0dde76..a477b43717b 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,5 +1,17 @@
12009-01-17 Eli Zaretskii <eliz@gnu.org> 12009-01-17 Eli Zaretskii <eliz@gnu.org>
2 2
3 * hooks.texi (Standard Hooks): Document `delete-frame-functions'
4 and `delete-terminal-functions'.
5
6 * frames.texi (Frames): Document `frame-terminal' and
7 `terminal-live-p'.
8 (Multiple Displays): Document `make-frame-on-tty'.
9 (Multiple Terminals): Document `terminal-list', `delete-terminal',
10 `terminal-name', and `get-device-terminal'.
11
12 * os.texi (System Environment): Document `environment' and
13 `initial-environment'.
14
3 * nonascii.texi (Coding System Basics): More accurate description 15 * nonascii.texi (Coding System Basics): More accurate description
4 of `raw-text'. 16 of `raw-text'.
5 17
diff --git a/doc/lispref/hooks.texi b/doc/lispref/hooks.texi
index 73a4168d3bc..40e50512736 100644
--- a/doc/lispref/hooks.texi
+++ b/doc/lispref/hooks.texi
@@ -121,6 +121,13 @@ Hook called after defining each customize option.
121@item deactivate-mark-hook 121@item deactivate-mark-hook
122@xref{The Mark}. 122@xref{The Mark}.
123 123
124@item delete-frame-functions
125Functions to call when Emacs deletes a frame. @xref{Deleting Frames}.
126
127@item delete-terminal-functions
128Functions to call when Emacs deletes a terminal. @xref{Multiple
129Terminals}.
130
124@item desktop-after-read-hook 131@item desktop-after-read-hook
125Normal hook run after a successful @code{desktop-read}. May be used 132Normal hook run after a successful @code{desktop-read}. May be used
126to show a buffer list. @xref{Saving Emacs Sessions,, Saving Emacs 133to show a buffer list. @xref{Saving Emacs Sessions,, Saving Emacs