aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThien-Thi Nguyen2004-07-05 23:38:43 +0000
committerThien-Thi Nguyen2004-07-05 23:38:43 +0000
commitfe3b7e35ad6b06267d01a4649d2c512f714a45b2 (patch)
tree91a5425f923d2362c420d96b61ff5b50d80693bf
parent81e898ea68215faaebc0a4d82ae8e30057cf7f7b (diff)
downloademacs-fe3b7e35ad6b06267d01a4649d2c512f714a45b2.tar.gz
emacs-fe3b7e35ad6b06267d01a4649d2c512f714a45b2.zip
Update copyright.
(Session Management): Grammar fix. Clarify which Emacs does the restarting. Use @samp for *scratch* buffer.
-rw-r--r--lispref/ChangeLog7
-rw-r--r--lispref/os.texi8
2 files changed, 11 insertions, 4 deletions
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index f8f492777cc..a27d59b72fa 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,10 @@
12004-07-06 Thien-Thi Nguyen <ttn@gnu.org>
2
3 * os.texi: Update copyright.
4 (Session Management): Grammar fix.
5 Clarify which Emacs does the restarting.
6 Use @samp for *scratch* buffer.
7
12004-07-04 Alan Mackenzie <acm@muc.de> 82004-07-04 Alan Mackenzie <acm@muc.de>
2 9
3 * frames.texi (Input Focus): Add documentation for 10 * frames.texi (Input Focus): Add documentation for
diff --git a/lispref/os.texi b/lispref/os.texi
index b5814372df9..d52464e7409 100644
--- a/lispref/os.texi
+++ b/lispref/os.texi
@@ -1,6 +1,6 @@
1@c -*-texinfo-*- 1@c -*-texinfo-*-
2@c This is part of the GNU Emacs Lisp Reference Manual. 2@c This is part of the GNU Emacs Lisp Reference Manual.
3@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999 3@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2004
4@c Free Software Foundation, Inc. 4@c Free Software Foundation, Inc.
5@c See the file elisp.texi for copying conditions. 5@c See the file elisp.texi for copying conditions.
6@setfilename ../info/os 6@setfilename ../info/os
@@ -2062,16 +2062,16 @@ Emacs supports saving state by using a hook called
2062@code{emacs-save-session-functions}. Each function in this hook is 2062@code{emacs-save-session-functions}. Each function in this hook is
2063called when the session manager tells Emacs that the window system is 2063called when the session manager tells Emacs that the window system is
2064shutting down. The functions are called with the current buffer set 2064shutting down. The functions are called with the current buffer set
2065to a temporary buffer. Each functions can use @code{insert} to add 2065to a temporary buffer. Each function can use @code{insert} to add
2066Lisp code to this buffer. At the end, Emacs saves the buffer in a 2066Lisp code to this buffer. At the end, Emacs saves the buffer in a
2067file that Emacs will load in order to restart the saved session. 2067file that another Emacs will later load in order to restart the saved session.
2068 2068
2069If a function in @code{emacs-save-session-functions} returns 2069If a function in @code{emacs-save-session-functions} returns
2070non-@code{nil}, Emacs tells the session manager to cancel the 2070non-@code{nil}, Emacs tells the session manager to cancel the
2071shutdown. 2071shutdown.
2072@end defvar 2072@end defvar
2073 2073
2074Here is an example that just inserts some text into *scratch* when 2074Here is an example that just inserts some text into @samp{*scratch*} when
2075Emacs is restarted by the session manager. 2075Emacs is restarted by the session manager.
2076 2076
2077@example 2077@example