aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--man/entering.texi29
-rw-r--r--man/fixit.texi22
-rw-r--r--man/regs.texi6
3 files changed, 29 insertions, 28 deletions
diff --git a/man/entering.texi b/man/entering.texi
index 7e1e60501ef..aca33be850b 100644
--- a/man/entering.texi
+++ b/man/entering.texi
@@ -20,7 +20,7 @@ Emacs operates its own X windows. You can begin typing Emacs commands
20as soon as you direct your keyboard input to the Emacs frame. 20as soon as you direct your keyboard input to the Emacs frame.
21 21
22@vindex initial-major-mode 22@vindex initial-major-mode
23 When Emacs starts up, it makes a buffer named @samp{*scratch*}. 23 When Emacs starts up, it creates a buffer named @samp{*scratch*}.
24That's the buffer you start out in. The @samp{*scratch*} buffer uses Lisp 24That's the buffer you start out in. The @samp{*scratch*} buffer uses Lisp
25Interaction mode; you can use it to type Lisp expressions and evaluate 25Interaction mode; you can use it to type Lisp expressions and evaluate
26them, or you can ignore that capability and simply doodle. (You can 26them, or you can ignore that capability and simply doodle. (You can
@@ -106,19 +106,20 @@ failing to support job control properly, but that is a matter of taste.)
106dedicated X windows, @kbd{C-z} has a different meaning. Suspending an 106dedicated X windows, @kbd{C-z} has a different meaning. Suspending an
107application that uses its own X windows is not meaningful or useful. 107application that uses its own X windows is not meaningful or useful.
108Instead, @kbd{C-z} runs the command @code{iconify-or-deiconify-frame}, 108Instead, @kbd{C-z} runs the command @code{iconify-or-deiconify-frame},
109which temporarily closes up the selected Emacs frame (@pxref{Frames}). 109which temporarily iconifies (or ``minimizes'') the selected Emacs
110The way to get back to a shell window is with the window manager. 110frame (@pxref{Frames}). Then you can use the window manager to get
111back to a shell window.
111 112
112@kindex C-x C-c 113@kindex C-x C-c
113@findex save-buffers-kill-emacs 114@findex save-buffers-kill-emacs
114 To kill Emacs, type @kbd{C-x C-c} (@code{save-buffers-kill-emacs}). A 115 To exit and kill Emacs, type @kbd{C-x C-c}
115two-character key is used for this to make it harder to type. This 116(@code{save-buffers-kill-emacs}). A two-character key is used for
116command first offers to save any modified file-visiting buffers. If you 117this to make it harder to type by accident. This command first offers
117do not save them all, it asks for reconfirmation with @kbd{yes} before 118to save any modified file-visiting buffers. If you do not save them
118killing Emacs, since any changes not saved will be lost forever. Also, 119all, it asks for reconfirmation with @kbd{yes} before killing Emacs,
119if any subprocesses are still running, @kbd{C-x C-c} asks for 120since any changes not saved will be lost forever. Also, if any
120confirmation about them, since killing Emacs will kill the subprocesses 121subprocesses are still running, @kbd{C-x C-c} asks for confirmation
121immediately. 122about them, since killing Emacs will also kill the subprocesses.
122 123
123@vindex confirm-kill-emacs 124@vindex confirm-kill-emacs
124 If the value of the variable @code{confirm-kill-emacs} is 125 If the value of the variable @code{confirm-kill-emacs} is
@@ -129,10 +130,10 @@ function to use as the value of @code{confirm-kill-emacs} is the
129function @code{yes-or-no-p}. The default value of 130function @code{yes-or-no-p}. The default value of
130@code{confirm-kill-emacs} is @code{nil}. 131@code{confirm-kill-emacs} is @code{nil}.
131 132
132 There is no way to restart an Emacs session once you have killed it. 133 There is no way to resume an Emacs session once you have killed it.
133You can, however, arrange for Emacs to record certain session 134You can, however, arrange for Emacs to record certain session
134information, such as which files are visited, when you kill it, so that 135information when you kill it, such as which files are visited, so that
135the next time you restart Emacs it will try to visit the same files and 136the next time you start Emacs it will try to visit the same files and
136so on. @xref{Saving Emacs Sessions}. 137so on. @xref{Saving Emacs Sessions}.
137 138
138 The operating system usually listens for certain special characters 139 The operating system usually listens for certain special characters
diff --git a/man/fixit.texi b/man/fixit.texi
index 02f7ed767b6..7671bbb7b08 100644
--- a/man/fixit.texi
+++ b/man/fixit.texi
@@ -81,12 +81,11 @@ given at the end of a line, rather than transposing the last character of
81the line with the newline, which would be useless, @kbd{C-t} transposes the 81the line with the newline, which would be useless, @kbd{C-t} transposes the
82last two characters on the line. So, if you catch your transposition error 82last two characters on the line. So, if you catch your transposition error
83right away, you can fix it with just a @kbd{C-t}. If you don't catch it so 83right away, you can fix it with just a @kbd{C-t}. If you don't catch it so
84fast, you must move the cursor back to between the two transposed 84fast, you must move the cursor back between the two transposed
85characters. If you transposed a space with the last character of the word 85characters before you type @kbd{C-t}. If you transposed a space with
86before it, the word motion commands are a good way of getting there. 86the last character of the word before it, the word motion commands are
87Otherwise, a reverse search (@kbd{C-r}) is often the best way. 87a good way of getting there. Otherwise, a reverse search (@kbd{C-r})
88@xref{Search}. 88is often the best way. @xref{Search}.
89
90 89
91@kindex C-x C-t 90@kindex C-x C-t
92@findex transpose-lines 91@findex transpose-lines
@@ -211,7 +210,7 @@ you various alternatives for what to do about it.
211 To check the entire current buffer, use @kbd{M-x ispell-buffer}. Use 210 To check the entire current buffer, use @kbd{M-x ispell-buffer}. Use
212@kbd{M-x ispell-region} to check just the current region. To check 211@kbd{M-x ispell-region} to check just the current region. To check
213spelling in an email message you are writing, use @kbd{M-x 212spelling in an email message you are writing, use @kbd{M-x
214ispell-message}; that checks the whole buffer, but does not check 213ispell-message}; that command checks the whole buffer, except for
215material that is indented or appears to be cited from other messages. 214material that is indented or appears to be cited from other messages.
216 215
217@findex ispell 216@findex ispell
@@ -223,7 +222,8 @@ spell-checks the current buffer.
223 Each time these commands encounter an incorrect word, they ask you 222 Each time these commands encounter an incorrect word, they ask you
224what to do. They display a list of alternatives, usually including 223what to do. They display a list of alternatives, usually including
225several ``near-misses''---words that are close to the word being 224several ``near-misses''---words that are close to the word being
226checked. Then you must type a character. Here are the valid responses: 225checked. Then you must type a single-character response. Here are
226the valid responses:
227 227
228@table @kbd 228@table @kbd
229@item @key{SPC} 229@item @key{SPC}
@@ -252,7 +252,7 @@ editing session and for this buffer.
252 252
253@item i 253@item i
254Insert this word in your private dictionary file so that Ispell will 254Insert this word in your private dictionary file so that Ispell will
255consider it correct it from now on, even in future sessions. 255consider it correct from now on, even in future sessions.
256 256
257@item u 257@item u
258Insert the lower-case version of this word in your private dic@-tion@-ary 258Insert the lower-case version of this word in your private dic@-tion@-ary
@@ -264,8 +264,8 @@ information.
264 264
265@item l @var{word} @key{RET} 265@item l @var{word} @key{RET}
266Look in the dictionary for words that match @var{word}. These words 266Look in the dictionary for words that match @var{word}. These words
267become the new list of ``near-misses''; you can select one of them to 267become the new list of ``near-misses''; you can select one of them as
268replace with by typing a digit. You can use @samp{*} in @var{word} as a 268the replacement by typing a digit. You can use @samp{*} in @var{word} as a
269wildcard. 269wildcard.
270 270
271@item C-g 271@item C-g
diff --git a/man/regs.texi b/man/regs.texi
index 6052e04a711..40ffb472e6a 100644
--- a/man/regs.texi
+++ b/man/regs.texi
@@ -90,7 +90,7 @@ Insert text from register @var{r} (@code{insert-register}).
90 @kbd{C-x r s @var{r}} stores a copy of the text of the region into 90 @kbd{C-x r s @var{r}} stores a copy of the text of the region into
91the register named @var{r}. @kbd{C-u C-x r s @var{r}}, the same 91the register named @var{r}. @kbd{C-u C-x r s @var{r}}, the same
92command with a numeric argument, deletes the text from the buffer as 92command with a numeric argument, deletes the text from the buffer as
93well. 93well; you can think of this as ``moving'' the region text into the register.
94 94
95 @kbd{C-x r i @var{r}} inserts in the buffer the text from register 95 @kbd{C-x r i @var{r}} inserts in the buffer the text from register
96@var{r}. Normally it leaves point before the text and places the mark 96@var{r}. Normally it leaves point before the text and places the mark
@@ -247,8 +247,8 @@ to the position of the bookmark at the same time.
247 To display a list of all your bookmarks in a separate buffer, type 247 To display a list of all your bookmarks in a separate buffer, type
248@kbd{C-x r l} (@code{list-bookmarks}). If you switch to that buffer, 248@kbd{C-x r l} (@code{list-bookmarks}). If you switch to that buffer,
249you can use it to edit your bookmark definitions or annotate the 249you can use it to edit your bookmark definitions or annotate the
250bookmarks. Type @kbd{C-h m} in that buffer for more information about 250bookmarks. Type @kbd{C-h m} in the bookmark buffer for more
251its special editing commands. 251information about its special editing commands.
252 252
253 When you kill Emacs, Emacs offers to save your bookmark values in your 253 When you kill Emacs, Emacs offers to save your bookmark values in your
254default bookmark file, @file{~/.emacs.bmk}, if you have changed any 254default bookmark file, @file{~/.emacs.bmk}, if you have changed any