aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2018-01-31 18:23:17 +0200
committerEli Zaretskii2018-01-31 18:23:17 +0200
commit25c01983afa55c83b8443d51267b7957e5d2c739 (patch)
tree00481122b31705bd910cf168d65007f2c6a7b4f5
parent22922c7c67efdcb42ba4bf35b0ea507cca08f559 (diff)
downloademacs-25c01983afa55c83b8443d51267b7957e5d2c739.tar.gz
emacs-25c01983afa55c83b8443d51267b7957e5d2c739.zip
Another round of manual fixes from proofreading
* doc/emacs/search.texi (Incremental Search) (Nonincremental Search): Mention the menu bar and fix typos. Reported by David Bonnafous <dbonnafo@gmail.com> in emacs-manual-bugs@gnu.org. * doc/emacs/building.texi (Compilation): Improve wording. Suggested by drone <yoorobot@gmail.com> in emacs-manual-bugs@gnu.org. * doc/emacs/kmacro.texi (Basic Keyboard Macro): Clarify text. Suggested by Robert Pluim <rpluim@gmail.com> in emacs-manual-bugs@gnu.org. * doc/emacs/display.texi (Highlight Interactively, Fringes): Improve wording. Suggested by Justin Heyes-Jones <justinhj@gmail.com> in emacs-manual-bugs@gnu.org. * doc/emacs/commands.texi (User Input, Commands): Add missing commas. * doc/emacs/screen.texi (Menu Bar): Mention keyboard keys to navigate menus. Suggested by oldgaro <oldgaro@protonmail.com> in emacs-manual-bugs@gnu.org. * doc/emacs/search.texi (Not Exiting Isearch): Fix a typo. Reported by "Kocken, I.J. (Ilja)" <I.J.Kocken@uu.nl> in emacs-manual-bugs@gnu.org. * doc/emacs/basic.texi (Inserting Text): Mention one more label of RET. Suggested by Francis Wright <f.j.wright@live.co.uk> in emacs-manual-bugs@gnu.org. * doc/emacs/text.texi (Paragraphs): Clarify text. Reported by Marcin Borkowski <mbork@mbork.pl> in emacs-manual-bugs@gnu.org. * doc/emacs/maintaining.texi (Introduction to VC) (Why Version Control?, VCS Merging): Fix typos and section capitalization. Suggested by "R. P. Dillon" <rpdillon@killring.org> in emacs-manual-bugs@gnu.org. * doc/emacs/modes.texi (Major Modes, Choosing Modes): Fix typos. Reported by clemens.radermacher@posteo.de in emacs-manual-bugs@gnu.org.
-rw-r--r--doc/emacs/basic.texi20
-rw-r--r--doc/emacs/building.texi4
-rw-r--r--doc/emacs/commands.texi6
-rw-r--r--doc/emacs/display.texi12
-rw-r--r--doc/emacs/kmacro.texi3
-rw-r--r--doc/emacs/maintaining.texi14
-rw-r--r--doc/emacs/modes.texi15
-rw-r--r--doc/emacs/screen.texi13
-rw-r--r--doc/emacs/search.texi7
-rw-r--r--doc/emacs/text.texi5
10 files changed, 53 insertions, 46 deletions
diff --git a/doc/emacs/basic.texi b/doc/emacs/basic.texi
index edb3d08f68d..55e0145d7d1 100644
--- a/doc/emacs/basic.texi
+++ b/doc/emacs/basic.texi
@@ -45,16 +45,16 @@ forward, so that point remains just after the inserted text.
45@cindex newline 45@cindex newline
46@c @findex electric-indent-just-newline 46@c @findex electric-indent-just-newline
47 To end a line and start a new one, type @key{RET} (@code{newline}). 47 To end a line and start a new one, type @key{RET} (@code{newline}).
48(The @key{RET} key may be labeled @key{Return} or @key{Enter} on your 48(The @key{RET} key may be labeled @key{Return}, or @key{Enter}, or
49keyboard, but we refer to it as @key{RET} in this manual.) This 49with a funny-looking left-pointing arrow on your keyboard, but we
50command inserts a newline character into the buffer, then indents 50refer to it as @key{RET} in this manual.) This command inserts a
51(@pxref{Indentation}) according to the major mode. If point is at the end 51newline character into the buffer, then indents (@pxref{Indentation})
52of the line, the effect is to create a new blank line after it and 52according to the major mode. If point is at the end of the line, the
53indent the new line; if point is in the middle of a line, the line is 53effect is to create a new blank line after it and indent the new line;
54split at that position. To turn off the auto-indentation, you can 54if point is in the middle of a line, the line is split at that
55either disable Electric Indent mode (@pxref{Indent Convenience}) or 55position. To turn off the auto-indentation, you can either disable
56type @kbd{C-j}, which inserts just a newline, without any 56Electric Indent mode (@pxref{Indent Convenience}) or type @kbd{C-j},
57auto-indentation. 57which inserts just a newline, without any auto-indentation.
58 58
59 As we explain later in this manual, you can change the way Emacs 59 As we explain later in this manual, you can change the way Emacs
60handles text insertion by turning on @dfn{minor modes}. For instance, 60handles text insertion by turning on @dfn{minor modes}. For instance,
diff --git a/doc/emacs/building.texi b/doc/emacs/building.texi
index 65669ada50e..f1fc24da6f2 100644
--- a/doc/emacs/building.texi
+++ b/doc/emacs/building.texi
@@ -58,8 +58,8 @@ compile}. This reads a shell command line using the minibuffer, and
58then executes the command by running a shell as a subprocess (or 58then executes the command by running a shell as a subprocess (or
59@dfn{inferior process}) of Emacs. The output is inserted in a buffer 59@dfn{inferior process}) of Emacs. The output is inserted in a buffer
60named @file{*compilation*}. The current buffer's default directory is 60named @file{*compilation*}. The current buffer's default directory is
61used as the working directory for the execution of the command; 61used as the working directory for the execution of the command, so by
62normally, therefore, compilation takes place in this directory. 62default compilation takes place in that directory.
63 63
64@vindex compile-command 64@vindex compile-command
65 The default compilation command is @samp{make -k}, which is usually 65 The default compilation command is @samp{make -k}, which is usually
diff --git a/doc/emacs/commands.texi b/doc/emacs/commands.texi
index 05f4e4be608..2e65bfd3859 100644
--- a/doc/emacs/commands.texi
+++ b/doc/emacs/commands.texi
@@ -48,7 +48,7 @@ are certain characters found on non-English keyboards
48labeled @key{Alt})@footnote{We refer to @key{Alt} as @key{META} for 48labeled @key{Alt})@footnote{We refer to @key{Alt} as @key{META} for
49historical reasons.}. For example, @kbd{Control-a} is entered by 49historical reasons.}. For example, @kbd{Control-a} is entered by
50holding down the @key{Ctrl} key while pressing @kbd{a}; we will refer 50holding down the @key{Ctrl} key while pressing @kbd{a}; we will refer
51to this as @kbd{C-a} for short. Similarly @kbd{@key{META}-a}, or @kbd{M-a} 51to this as @kbd{C-a} for short. Similarly, @kbd{@key{META}-a}, or @kbd{M-a}
52for short, is entered by holding down the @key{Alt} key and pressing 52for short, is entered by holding down the @key{Alt} key and pressing
53@kbd{a}. Modifier keys can also be applied to non-alphanumerical 53@kbd{a}. Modifier keys can also be applied to non-alphanumerical
54characters, e.g., @kbd{C-@key{F1}} or @kbd{M-@key{LEFT}}. 54characters, e.g., @kbd{C-@key{F1}} or @kbd{M-@key{LEFT}}.
@@ -161,8 +161,8 @@ is bound to @code{next-line}. If you rebind @kbd{C-n} to the command
161 161
162 In this manual, we will often speak of keys like @kbd{C-n} as 162 In this manual, we will often speak of keys like @kbd{C-n} as
163commands, even though strictly speaking the key is bound to a command. 163commands, even though strictly speaking the key is bound to a command.
164Usually we state the name of the command which really does the work in 164Usually, we state the name of the command which really does the work
165parentheses after mentioning the key that runs it. For example, we 165in parentheses after mentioning the key that runs it. For example, we
166will say that ``The command @kbd{C-n} (@code{next-line}) moves point 166will say that ``The command @kbd{C-n} (@code{next-line}) moves point
167vertically down'', meaning that the command @code{next-line} moves 167vertically down'', meaning that the command @code{next-line} moves
168vertically down, and the key @kbd{C-n} is normally bound to it. 168vertically down, and the key @kbd{C-n} is normally bound to it.
diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index d338aeeea61..b2a4011b4a7 100644
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -957,7 +957,7 @@ mode for all buffers, use @kbd{M-x global-hi-lock-mode} or place
957 957
958 Hi Lock mode works like Font Lock mode (@pxref{Font Lock}), except 958 Hi Lock mode works like Font Lock mode (@pxref{Font Lock}), except
959that you specify explicitly the regular expressions to highlight. You 959that you specify explicitly the regular expressions to highlight. You
960control them with the commands described below. (The key bindings 960can control them with the following commands. (The key bindings
961below that begin with @kbd{C-x w} are deprecated in favor of the 961below that begin with @kbd{C-x w} are deprecated in favor of the
962global @kbd{M-s h} bindings, and will be removed in some future Emacs 962global @kbd{M-s h} bindings, and will be removed in some future Emacs
963version.) 963version.)
@@ -1087,11 +1087,11 @@ mode's symbol is a member of the list @code{hi-lock-exclude-modes}.
1087 On graphical displays, each Emacs window normally has narrow 1087 On graphical displays, each Emacs window normally has narrow
1088@dfn{fringes} on the left and right edges. The fringes are used to 1088@dfn{fringes} on the left and right edges. The fringes are used to
1089display symbols that provide information about the text in the window. 1089display symbols that provide information about the text in the window.
1090You can type @kbd{M-x fringe-mode} to disable the fringes, or modify 1090You can type @kbd{M-x fringe-mode} to toggle display of the fringes or
1091their width. This command affects fringes in all frames; to modify 1091to modify their width. This command affects fringes in all frames; to
1092fringes on the selected frame only, use @kbd{M-x set-fringe-style}. 1092modify fringes on the selected frame only, use @kbd{M-x
1093You can make your changes to the fringes permanent by customizing the 1093set-fringe-style}. You can make your changes to the fringes permanent
1094variable @code{fringe-mode}. 1094by customizing the variable @code{fringe-mode}.
1095 1095
1096 The most common use of the fringes is to indicate a continuation 1096 The most common use of the fringes is to indicate a continuation
1097line (@pxref{Continuation Lines}). When one line of text is split 1097line (@pxref{Continuation Lines}). When one line of text is split
diff --git a/doc/emacs/kmacro.texi b/doc/emacs/kmacro.texi
index a3426a33a16..c9cef750fb4 100644
--- a/doc/emacs/kmacro.texi
+++ b/doc/emacs/kmacro.texi
@@ -159,7 +159,8 @@ the most recent macro, type @kbd{C-x e}
159defining a macro, the macro is terminated and executed immediately. 159defining a macro, the macro is terminated and executed immediately.
160Immediately after typing @kbd{C-x e}, you can type @key{e} repeatedly 160Immediately after typing @kbd{C-x e}, you can type @key{e} repeatedly
161to immediately repeat the macro one or more times. You can also give 161to immediately repeat the macro one or more times. You can also give
162@kbd{C-x e} a repeat argument, just like @key{F4}. 162@kbd{C-x e} a repeat argument, just like @key{F4} (when it is used to
163execute a macro).
163 164
164 @kbd{C-x )} can be given a repeat count as an argument. This means 165 @kbd{C-x )} can be given a repeat count as an argument. This means
165to repeat the macro right after defining it. The macro definition 166to repeat the macro right after defining it. The macro definition
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index e61c7f90348..158b04c9f2e 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -112,7 +112,7 @@ control operations.
112 112
113 Some uncommon or intricate version control operations, such as 113 Some uncommon or intricate version control operations, such as
114altering repository settings, are not supported in VC@. You should 114altering repository settings, are not supported in VC@. You should
115perform such tasks outside Emacs, e.g., via the command line. 115perform such tasks outside VC, e.g., via the command line.
116 116
117 This section provides a general overview of version control, and 117 This section provides a general overview of version control, and
118describes the version control systems that VC supports. You can skip 118describes the version control systems that VC supports. You can skip
@@ -130,7 +130,7 @@ you want to use.
130@end menu 130@end menu
131 131
132@node Why Version Control? 132@node Why Version Control?
133@subsubsection Understanding the problems it addresses 133@subsubsection Understanding the Problems it Addresses
134 134
135 Version control systems provide you with three important 135 Version control systems provide you with three important
136capabilities: 136capabilities:
@@ -147,10 +147,10 @@ detected and resolved.
147 147
148@item 148@item
149@dfn{History}: the ability to attach historical data to your data, 149@dfn{History}: the ability to attach historical data to your data,
150such as explanatory comments about the intention behind each change to 150such as explanatory comments about the intention behind each change.
151it. Even for a programmer working solo, change histories are an 151Even for a programmer working solo, change histories are an important
152important aid to memory; for a multi-person project, they are a 152aid to memory; for a multi-person project, they are a vitally
153vitally important form of communication among developers. 153important form of communication among developers.
154@end itemize 154@end itemize
155 155
156@node Version Control Systems 156@node Version Control Systems
@@ -272,7 +272,7 @@ or changeset-based; and centralized or decentralized. VC handles all
272these modes of operation, but it cannot hide the differences. 272these modes of operation, but it cannot hide the differences.
273 273
274@node VCS Merging 274@node VCS Merging
275@subsubsection Merge-based vs lock-based Version Control 275@subsubsection Merge-based vs Lock-based Version Control
276 276
277 A version control system typically has some mechanism to coordinate 277 A version control system typically has some mechanism to coordinate
278between users who want to change the same file. There are two ways to 278between users who want to change the same file. There are two ways to
diff --git a/doc/emacs/modes.texi b/doc/emacs/modes.texi
index f0986702d5a..1312a24d985 100644
--- a/doc/emacs/modes.texi
+++ b/doc/emacs/modes.texi
@@ -97,11 +97,12 @@ do something more suitable for the mode. For instance, programming
97language modes bind @key{TAB} to indent the current line according to 97language modes bind @key{TAB} to indent the current line according to
98the rules of the language (@pxref{Indentation}). The keys that are 98the rules of the language (@pxref{Indentation}). The keys that are
99commonly changed are @key{TAB}, @key{DEL}, and @kbd{C-j}. Many modes 99commonly changed are @key{TAB}, @key{DEL}, and @kbd{C-j}. Many modes
100also define special commands of their own, usually bound in the prefix 100also define special commands of their own, usually bound to key
101key @kbd{C-c}. Major modes can also alter user options and variables; 101sequences whose prefix key is @kbd{C-c} (@pxref{Keys}). Major modes
102for instance, programming language modes typically set a buffer-local 102can also alter user options and variables; for instance, programming
103value for the variable @code{comment-start}, which determines how 103language modes typically set a buffer-local value for the variable
104source code comments are delimited (@pxref{Comments}). 104@code{comment-start}, which determines how source code comments are
105delimited (@pxref{Comments}).
105 106
106 To view the documentation for the current major mode, including a 107 To view the documentation for the current major mode, including a
107list of its key bindings, type @kbd{C-h m} (@code{describe-mode}). 108list of its key bindings, type @kbd{C-h m} (@code{describe-mode}).
@@ -437,8 +438,8 @@ a single case-insensitive search through @code{auto-mode-alist}.
437 Finally, if Emacs @emph{still} hasn't found a major mode to use, it 438 Finally, if Emacs @emph{still} hasn't found a major mode to use, it
438compares the text at the start of the buffer to the variable 439compares the text at the start of the buffer to the variable
439@code{magic-fallback-mode-alist}. This variable works like 440@code{magic-fallback-mode-alist}. This variable works like
440@code{magic-mode-alist}, described above, except that is consulted 441@code{magic-mode-alist}, described above, except that it is consulted
441only after @code{auto-mode-alist}. By default, 442only @emph{after} @code{auto-mode-alist}. By default,
442@code{magic-fallback-mode-alist} contains forms that check for image 443@code{magic-fallback-mode-alist} contains forms that check for image
443files, HTML/XML/SGML files, PostScript files, and Unix style Conf 444files, HTML/XML/SGML files, PostScript files, and Unix style Conf
444files. 445files.
diff --git a/doc/emacs/screen.texi b/doc/emacs/screen.texi
index 8dd5e5f9e56..37c082e7caf 100644
--- a/doc/emacs/screen.texi
+++ b/doc/emacs/screen.texi
@@ -309,12 +309,13 @@ way (@pxref{Key Help}).
309@cindex menu bar access using keyboard 309@cindex menu bar access using keyboard
310 Instead of using the mouse, you can also invoke the first menu bar 310 Instead of using the mouse, you can also invoke the first menu bar
311item by pressing @key{F10} (to run the command @code{menu-bar-open}). 311item by pressing @key{F10} (to run the command @code{menu-bar-open}).
312You can then navigate the menus with the arrow keys. To activate a 312You can then navigate the menus with the arrow keys or with @kbd{C-b},
313selected menu item, press @key{RET}; to cancel menu navigation, press 313@kbd{C-f} (left/right), @kbd{C-p}, and @kbd{C-n} (up/down). To
314@kbd{C-g} or @kbd{@key{ESC} @key{ESC} @key{ESC}}. (However, note that 314activate a selected menu item, press @key{RET}; to cancel menu
315when Emacs was built with a GUI toolkit, the menus are drawn and 315navigation, press @kbd{C-g} or @kbd{@key{ESC} @key{ESC} @key{ESC}}.
316controlled by the toolkit, and the key sequences to cancel menu 316(However, note that when Emacs was built with a GUI toolkit, the menus
317navigation might be different from the above description.) 317are drawn and controlled by the toolkit, and the key sequences to
318cancel menu navigation might be different from the above description.)
318 319
319@kindex M-` 320@kindex M-`
320@findex tmm-menubar 321@findex tmm-menubar
diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi
index daaded19294..c7216128cd8 100644
--- a/doc/emacs/search.texi
+++ b/doc/emacs/search.texi
@@ -53,6 +53,9 @@ Incremental search forward (@code{isearch-forward}).
53Incremental search backward (@code{isearch-backward}). 53Incremental search backward (@code{isearch-backward}).
54@end table 54@end table
55 55
56You can also invoke incremental search from the menu bar's
57@samp{Edit->Search} menu.
58
56@menu 59@menu
57* Basic Isearch:: Basic incremental search commands. 60* Basic Isearch:: Basic incremental search commands.
58* Repeat Isearch:: Searching for the same string again. 61* Repeat Isearch:: Searching for the same string again.
@@ -425,7 +428,7 @@ of the keymap @code{isearch-mode-map} (@pxref{Keymaps}).
425@subsection Not Exiting Incremental Search 428@subsection Not Exiting Incremental Search
426 429
427This subsection describes how to control whether typing a command not 430This subsection describes how to control whether typing a command not
428specifically meaningful is searches exits the search before executing 431specifically meaningful in searches exits the search before executing
429the command. It also describes two categories of commands which you 432the command. It also describes two categories of commands which you
430can type without exiting the current incremental search, even though 433can type without exiting the current incremental search, even though
431they are not themselves part of incremental search. 434they are not themselves part of incremental search.
@@ -548,7 +551,7 @@ command for nonincremental search, if the string you specify is empty.
548@key{RET}} does likewise, invoking the nonincremental 551@key{RET}} does likewise, invoking the nonincremental
549backward-searching command. 552backward-searching command.
550 553
551 Nonincremental search can also be invoked form the menu bar's 554 Nonincremental search can also be invoked from the menu bar's
552@samp{Edit->Search} menu. 555@samp{Edit->Search} menu.
553 556
554@findex search-forward 557@findex search-forward
diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi
index e3541a18df3..dd08cd15138 100644
--- a/doc/emacs/text.texi
+++ b/doc/emacs/text.texi
@@ -274,8 +274,9 @@ Put point and mark around this or next paragraph (@code{mark-paragraph}).
274@findex backward-paragraph 274@findex backward-paragraph
275@findex forward-paragraph 275@findex forward-paragraph
276 @kbd{M-@{} (@code{backward-paragraph}) moves to the beginning of the 276 @kbd{M-@{} (@code{backward-paragraph}) moves to the beginning of the
277current or previous paragraph (see below for the definition of a 277current or previous paragraph, depending on where point is when the
278paragraph). @kbd{M-@}} (@code{forward-paragraph}) moves to the end of 278command is invoked (see below for the definition of a paragraph).
279@kbd{M-@}} (@code{forward-paragraph}) similarly moves to the end of
279the current or next paragraph. If there is a blank line before the 280the current or next paragraph. If there is a blank line before the
280paragraph, @kbd{M-@{} moves to the blank line. 281paragraph, @kbd{M-@{} moves to the blank line.
281 282