Run kill-emacs when exiting for display closed or SIGTERM/HUP.

* xsmfns.c (CHDIR_OPT): New define.
(smc_save_yourself_CB): Add CHDIR_OPT to options to use when
restarting emacs.

* xterm.c (x_connection_closed): Call Fkill_emacs instead of
shut_down_emacs.

* emacs.c (USAGE1): Mention --chdir.
(main): Handle --chdir.
(standard_args): Add --chdir.
(fatal_error_signal): Call Fkill_emacs for SIGTERM and SIGHUP (Bug
#5552).

* cmdargs.texi (Initial Options): Mention --chdir.

2 files changed, 13 insertions, 0 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index d2df84e2aae..5c144833e1d 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-02  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * cmdargs.texi (Initial Options): Mention --chdir.
+
 2010-04-21  Jan Djärv  <jan.h.d@swipnet.se>
 
         * frames.texi (Tool Bars): Add tool-bar-style.
diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi
index a139e0eb0f4..ff8e4f84abd 100644
--- a/doc/emacs/cmdargs.texi
+++ b/doc/emacs/cmdargs.texi
@@ -193,6 +193,15 @@ Certain options prevent loading of some of these files or substitute
 other files for them.
 
 @table @samp
+@item -chdir @var{directory}
+@opindex -chdir
+@itemx --chdir=@var{directory}
+@opindex --chdir
+@cindex change Emacs directory
+Change to @var{directory} before doing anything else.  This is mainly used
+by session management in X so that Emacs starts in the same directory as it
+stopped.  This makes desktop saving and restoring easier.
+
 @item -t @var{device}
 @opindex -t
 @itemx --terminal=@var{device}