aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2008-01-21 22:48:51 +0000
committerJuanma Barranquero2008-01-21 22:48:51 +0000
commit650276d5e69dbc6b1e0ca9ac7ff7f06f12c644e7 (patch)
tree3cd8b7ef07e04853c1e584fa9e7f4f156b898c5b
parent460dadc9a8897506e788d1ea61e018c7090b5844 (diff)
downloademacs-650276d5e69dbc6b1e0ca9ac7ff7f06f12c644e7.tar.gz
emacs-650276d5e69dbc6b1e0ca9ac7ff7f06f12c644e7.zip
*** empty log message ***
-rw-r--r--doc/emacs/ChangeLog5
-rw-r--r--doc/emacs/entering.texi2
2 files changed, 6 insertions, 1 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 282ca6f1d52..fd1ace2e69d 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
12008-01-21 Juanma Barranquero <lekktu@gmail.com>
2
3 * entering.texi (Exiting): Fix typo.
4 Reported by D. E. Evans <sinuhe@gnu.org>.
5
12007-12-31 Martin Rudalics <rudalics@gmx.at> 62007-12-31 Martin Rudalics <rudalics@gmx.at>
2 7
3 * glossary.texi (Glossary): Fix typo. 8 * glossary.texi (Glossary): Fix typo.
diff --git a/doc/emacs/entering.texi b/doc/emacs/entering.texi
index e338a6a8619..3737e4685e3 100644
--- a/doc/emacs/entering.texi
+++ b/doc/emacs/entering.texi
@@ -122,7 +122,7 @@ systems, you can only get back to the shell from which Emacs was run
122 122
123@vindex cannot-suspend 123@vindex cannot-suspend
124 Suspending can fail if you run Emacs under a shell that doesn't 124 Suspending can fail if you run Emacs under a shell that doesn't
125support suspendion of its subjobs, even if the system itself does 125support suspension of its subjobs, even if the system itself does
126support it. In such a case, you can set the variable 126support it. In such a case, you can set the variable
127@code{cannot-suspend} to a non-@code{nil} value to force @kbd{C-z} to 127@code{cannot-suspend} to a non-@code{nil} value to force @kbd{C-z} to
128start an inferior shell. 128start an inferior shell.