diff options
Diffstat (limited to 'doc/emacs')
| -rw-r--r-- | doc/emacs/basic.texi | 16 | ||||
| -rw-r--r-- | doc/emacs/display.texi | 23 | ||||
| -rw-r--r-- | doc/emacs/kmacro.texi | 4 | ||||
| -rw-r--r-- | doc/emacs/mark.texi | 6 | ||||
| -rw-r--r-- | doc/emacs/regs.texi | 4 | ||||
| -rw-r--r-- | doc/emacs/search.texi | 18 | ||||
| -rw-r--r-- | doc/emacs/text.texi | 12 |
7 files changed, 42 insertions, 41 deletions
diff --git a/doc/emacs/basic.texi b/doc/emacs/basic.texi index 86403b7a23d..d0bd46c35fc 100644 --- a/doc/emacs/basic.texi +++ b/doc/emacs/basic.texi @@ -113,13 +113,13 @@ just like digits. Case is ignored. @cindex curved quotes, inserting A few common Unicode characters can be inserted via a command starting with @kbd{C-x 8}. For example, @kbd{C-x 8 [} inserts @t{‘} -which is Unicode code-point @code{U+2018} LEFT SINGLE QUOTATION MARK, +which is Unicode code-point U+2018 @sc{left single quotation mark}, sometimes called a left single ``curved quote'' or ``curly quote''. Similarly, @kbd{C-x 8 ]}, @kbd{C-x 8 @{} and @kbd{C-x 8 @}} insert the curved quotes @t{’}, @t{“} and @t{”}, respectively. Also, a working Alt key acts like @kbd{C-x 8}; e.g., @kbd{A-[} acts like @kbd{C-x 8 [} -and inserts `. To see which characters have @kbd{C-x 8} shorthands, -type @kbd{C-x 8 C-h}. +and inserts @t{‘}. To see which characters have @kbd{C-x 8} +shorthands, type @kbd{C-x 8 C-h}. Alternatively, you can use the command @kbd{C-x 8 @key{RET}} (@code{insert-char}). This prompts for the Unicode name or code-point @@ -146,9 +146,9 @@ the buffer. how many copies of the character to insert (@pxref{Arguments}). In addition, in some contexts, if you type a quotation using grave -accent and apostrophe @t{`like this'}, it is converted to a form +accent and apostrophe @kbd{`like this'}, it is converted to a form @t{‘like this’} using single quotation marks, even without @kbd{C-x 8} -commands. Similarly, typing a quotation @t{``like this''} using +commands. Similarly, typing a quotation @kbd{``like this''} using double grave accent and apostrophe converts it to a form @t{“like this”} using double quotation marks. @xref{Quotation Marks}. @@ -816,9 +816,9 @@ more convenient, and they are documented in that command's documentation string. We use the term @dfn{prefix argument} to emphasize that you type -such arguments before the command, and to distinguish them from -minibuffer arguments (@pxref{Minibuffer}), which are entered after -invoking the command. +such arguments @emph{before} the command, and to distinguish them from +minibuffer arguments (@pxref{Minibuffer}), which are entered +@emph{after} invoking the command. On graphical displays, @kbd{C-0}, @kbd{C-1}, etc.@ act the same as @kbd{M-0}, @kbd{M-1}, etc. diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi index 4985fabd541..b9449f812a2 100644 --- a/doc/emacs/display.texi +++ b/doc/emacs/display.texi @@ -199,12 +199,13 @@ screen lines between point and the top or bottom of the window (@pxref{Auto Scrolling}). You can also give @kbd{C-l} a prefix argument. A plain prefix -argument, @kbd{C-u C-l}, simply recenters point. A positive argument -@var{n} puts point @var{n} lines down from the top of the window. An -argument of zero puts point on the topmost line. A negative argument -@var{-n} puts point @var{n} lines from the bottom of the window. When -given an argument, @kbd{C-l} does not clear the screen or cycle -through different screen positions. +argument, @kbd{C-u C-l}, simply recenters the line showing point. A +positive argument @var{n} moves line showing point @var{n} lines down +from the top of the window. An argument of zero moves point's line to +the top of the window. A negative argument @var{-n} moves point's +line @var{n} lines from the bottom of the window. When given an +argument, @kbd{C-l} does not clear the screen or cycle through +different screen positions. @vindex recenter-redisplay If the variable @code{recenter-redisplay} has a non-@code{nil} @@ -1535,9 +1536,9 @@ a new line, while the tab character (@code{U+0009}) is displayed as a space that extends to the next tab stop column (normally every 8 columns). The number of spaces per tab is controlled by the buffer-local variable @code{tab-width}, which must have an integer -value between 1 and 1000, inclusive. Note that how the tab character -in the buffer is displayed has nothing to do with the definition of -@key{TAB} as a command. +value between 1 and 1000, inclusive. Note that the way the tab +character in the buffer is displayed has nothing to do with the +definition of @key{TAB} as a command. Other @acronym{ASCII} control characters, whose codes are below @code{U+0020} (octal 40, decimal 32), are displayed as a caret @@ -1607,11 +1608,11 @@ curved quotes. You can influence or inhibit this translation by customizing the user option @code{text-quoting-style} (@pxref{Keys in Documentation,,, elisp, The Emacs Lisp Reference Manual}). - If the curved quotes @samp{‘}, @samp{’}, @samp{“}, and @samp{”} are + If the curved quotes @t{‘}, @t{’}, @t{“}, and @t{”} are known to look just like @acronym{ASCII} characters, they are shown with the @code{homoglyph} face. Curved quotes that are known not to be displayable are shown as their @acronym{ASCII} approximations -@samp{`}, @samp{'}, and @samp{"} with the @code{homoglyph} face. +@t{`}, @t{'}, and @t{"} with the @code{homoglyph} face. @node Cursor Display @section Displaying the Cursor diff --git a/doc/emacs/kmacro.texi b/doc/emacs/kmacro.texi index 65387ae783c..3710611c763 100644 --- a/doc/emacs/kmacro.texi +++ b/doc/emacs/kmacro.texi @@ -391,7 +391,7 @@ macro definition is executed. It is up to you to leave point and the text in a state such that the rest of the macro will do what you want. @end table - @kbd{C-u C-x q}, which is @kbd{C-x q} with a numeric argument, + @kbd{C-u C-x q}, which is @kbd{C-x q} with a prefix argument, performs a completely different function. It enters a recursive edit reading input from the keyboard, both when you type it during the definition of the macro, and when it is executed from the macro. During @@ -472,7 +472,7 @@ later with @code{load-file} (@pxref{Lisp Libraries}). If the file you save in is your init file @file{~/.emacs} (@pxref{Init File}) then the macro will be defined each time you run Emacs. - If you give @code{insert-kbd-macro} a numeric argument, it makes + If you give @code{insert-kbd-macro} a prefix argument, it makes additional Lisp code to record the keys (if any) that you have bound to @var{macroname}, so that the macro will be reassigned the same keys when you load the file. diff --git a/doc/emacs/mark.texi b/doc/emacs/mark.texi index 5ffe7264a35..8ad5fc7c9e4 100644 --- a/doc/emacs/mark.texi +++ b/doc/emacs/mark.texi @@ -420,9 +420,9 @@ commands. The default behavior of the mark and region, in which setting the mark activates it and highlights the region, is called Transient Mark mode. This is a minor mode that is enabled by default. It can be -toggled with @kbd{M-x transient-mark-mode}, or with the @samp{Active -Region Highlighting} menu item in the @samp{Options} menu. Turning it -off switches Emacs to an alternative mode of operation: +toggled with @kbd{M-x transient-mark-mode}, or with the +@samp{Highlight Active Region} menu item in the @samp{Options} menu. +Turning it off switches Emacs to an alternative mode of operation: @itemize @bullet @item diff --git a/doc/emacs/regs.texi b/doc/emacs/regs.texi index 1881b49627e..37026946477 100644 --- a/doc/emacs/regs.texi +++ b/doc/emacs/regs.texi @@ -154,7 +154,7 @@ during the collection process, you can use the following setting. @findex insert-register @kbd{C-x r i @var{r}} inserts in the buffer the text from register @var{r}. Normally it leaves point after the text and sets the mark -before, without activating it. With a numeric argument, it instead +before, without activating it. With a prefix argument, it instead puts point before the text and the mark after. @node Rectangle Registers @@ -170,7 +170,7 @@ in the buffer. @kindex C-x r r @item C-x r r @var{r} Copy the region-rectangle into register @var{r} -(@code{copy-rectangle-to-register}). With numeric argument, delete it as +(@code{copy-rectangle-to-register}). With prefix argument, delete it as well. @item C-x r i @var{r} Insert the rectangle stored in register @var{r} (if it contains a diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi index a1c987c1252..c61578bab76 100644 --- a/doc/emacs/search.texi +++ b/doc/emacs/search.texi @@ -847,7 +847,7 @@ Expressions,,, elisp, The Emacs Lisp Reference Manual}, for additional features used mainly in Lisp programs. Regular expressions have a syntax in which a few characters are -special constructs and the rest are @dfn{ordinary}. An ordinary +@dfn{special constructs} and the rest are @dfn{ordinary}. An ordinary character matches that same character and nothing else. The special characters are @samp{$^.*+?[\}. The character @samp{]} is special if it ends a character alternative (see below). The character @samp{-} @@ -1328,14 +1328,14 @@ of its accented cousins like @code{@"a} and @code{@'a}, i.e., the match disregards the diacritics that distinguish these variants. In addition, @code{a} matches other characters that resemble it, or have it as part of their graphical representation, -such as @sc{u+249c parenthesized latin small letter a} and @sc{u+2100 -account of} (which looks like a small @code{a} over @code{c}). +such as U+249C @sc{parenthesized latin small letter a} and U+2100 +@sc{account of} (which looks like a small @code{a} over @code{c}). Similarly, the @acronym{ASCII} double-quote character @code{"} matches all the other variants of double quotes defined by the Unicode standard. Finally, character folding can make a sequence of one or more characters match another sequence of a different length: for -example, the sequence of two characters @code{ff} matches @sc{u+fb00 -latin small ligature ff}. Character sequences that are not identical, +example, the sequence of two characters @code{ff} matches U+FB00 +@sc{latin small ligature ff}. Character sequences that are not identical, but match under character folding are known as @dfn{equivalent character sequences}. @@ -1483,8 +1483,7 @@ multiple digits, and the value of @samp{\@var{d}} is @code{nil} if the @samp{\#} here too stands for the number of already-completed replacements. - Repeating our example to exchange @samp{x} and @samp{y}, we can thus -do it also this way: + For example, we can exchange @samp{x} and @samp{y} this way: @example M-x replace-regexp @key{RET} \(x\)\|y @key{RET} @@ -1661,8 +1660,9 @@ replacement has already been made, @key{DEL} and @key{SPC} are equivalent in this situation; both move to the next occurrence. You can type @kbd{C-r} at this point (see below) to alter the replaced -text. You can also type @kbd{C-x u} to undo the replacement; this exits -the @code{query-replace}, so if you want to do further replacement you +text. You can also undo the replacement with the @code{undo} command +(e.g., type @kbd{C-x u}; @pxref{Undo}); this exits the +@code{query-replace}, so if you want to do further replacement you must use @kbd{C-x @key{ESC} @key{ESC} @key{RET}} to restart (@pxref{Repetition}). diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi index 7892b346d2a..1928240a878 100644 --- a/doc/emacs/text.texi +++ b/doc/emacs/text.texi @@ -428,10 +428,10 @@ using straight apostrophes @t{'like this'} or double-quotes @t{"like this"}. Another common way is the curved quote convention, which uses left and right single or double quotation marks `@t{like this}' or ``@t{like this}''@footnote{ -The curved single quote characters are U+2018 LEFT SINGLE QUOTATION -MARK and U+2018 RIGHT SINGLE QUOTATION MARK; the curved double quotes -are U+201C LEFT DOUBLE QUOTATION MARK and U+201D RIGHT DOUBLE -QUOTATION MARK. On text terminals which cannot display these +The curved single quote characters are U+2018 @sc{left single quotation +mark} and U+2018 @sc{right single quotation mark}; the curved double quotes +are U+201C @sc{left double quotation mark} and U+201D @sc{right double +quotation mark}. On text terminals which cannot display these characters, the Info reader might show them as the typewriter ASCII quote characters. }. In text files, typewriter quotes are simple and @@ -439,8 +439,8 @@ portable; curved quotes are less ambiguous and typically look nicer. @vindex electric-quote-chars Electric Quote mode makes it easier to type curved quotes. As you -type characters it optionally converts @t{`} to ‘, @t{'} to ', -@t{``} to ``, and @t{''} to ''. It's possible to change the +type characters it optionally converts @kbd{`} to @t{‘}, @kbd{'} to @t{’}, +@kbd{``} to @t{“}, and @kbd{''} to @t{”}. It's possible to change the default quotes listed above, by customizing the variable @code{electric-quote-chars}, a list of four characters, where the items correspond to the left single quote, the right single quote, the |