diff options
| author | Richard M. Stallman | 2001-08-08 23:39:08 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2001-08-08 23:39:08 +0000 |
| commit | 0ec1f11554a528e81e9fc7eb2164154bedd532a3 (patch) | |
| tree | c736394b40d9424d13875e3197addc1507ab7d0f | |
| parent | 17ec59da80b4ff3136647dff126be3c025da8f70 (diff) | |
| download | emacs-0ec1f11554a528e81e9fc7eb2164154bedd532a3.tar.gz emacs-0ec1f11554a528e81e9fc7eb2164154bedd532a3.zip | |
Minor cleanups.
| -rw-r--r-- | man/calendar.texi | 14 | ||||
| -rw-r--r-- | man/cmdargs.texi | 14 | ||||
| -rw-r--r-- | man/dired.texi | 10 | ||||
| -rw-r--r-- | man/display.texi | 10 | ||||
| -rw-r--r-- | man/fixit.texi | 2 | ||||
| -rw-r--r-- | man/glossary.texi | 22 | ||||
| -rw-r--r-- | man/help.texi | 10 | ||||
| -rw-r--r-- | man/killing.texi | 34 | ||||
| -rw-r--r-- | man/major.texi | 21 |
9 files changed, 69 insertions, 68 deletions
diff --git a/man/calendar.texi b/man/calendar.texi index a3e422df823..22fbe5d9889 100644 --- a/man/calendar.texi +++ b/man/calendar.texi | |||
| @@ -210,11 +210,11 @@ then centers the three-month calendar around that month. | |||
| 210 | @section Scrolling in the Calendar | 210 | @section Scrolling in the Calendar |
| 211 | 211 | ||
| 212 | @cindex scrolling in the calendar | 212 | @cindex scrolling in the calendar |
| 213 | The calendar display scrolls automatically through time when you move out | 213 | The calendar display scrolls automatically through time when you |
| 214 | of the visible portion. You can also scroll it manually. Imagine that the | 214 | move out of the visible portion. You can also scroll it manually. |
| 215 | calendar window contains a long strip of paper with the months on it. | 215 | Imagine that the calendar window contains a long strip of paper with |
| 216 | Scrolling it means moving the strip so that new months become visible in | 216 | the months on it. Scrolling the calendar means moving the strip |
| 217 | the window. | 217 | horizontally, so that new months become visible in the window. |
| 218 | 218 | ||
| 219 | @table @kbd | 219 | @table @kbd |
| 220 | @item C-x < | 220 | @item C-x < |
| @@ -1312,8 +1312,8 @@ Sexp Diary Entries, elisp, The Emacs Lisp Reference Manual}. | |||
| 1312 | @cindex appointment notification | 1312 | @cindex appointment notification |
| 1313 | 1313 | ||
| 1314 | If you have a diary entry for an appointment, and that diary entry | 1314 | If you have a diary entry for an appointment, and that diary entry |
| 1315 | begins with a recognizable time of day, Emacs can warn you, several | 1315 | begins with a recognizable time of day, Emacs can warn you several |
| 1316 | minutes beforehand, that that appointment is pending. Emacs alerts you | 1316 | minutes beforehand that that appointment is pending. Emacs alerts you |
| 1317 | to the appointment by displaying a message in the mode line. | 1317 | to the appointment by displaying a message in the mode line. |
| 1318 | 1318 | ||
| 1319 | @vindex diary-hook | 1319 | @vindex diary-hook |
diff --git a/man/cmdargs.texi b/man/cmdargs.texi index d639716c90c..539af5f1485 100644 --- a/man/cmdargs.texi +++ b/man/cmdargs.texi | |||
| @@ -49,7 +49,7 @@ and the tables below always show an equal sign. | |||
| 49 | Most options specify how to initialize Emacs, or set parameters for | 49 | Most options specify how to initialize Emacs, or set parameters for |
| 50 | the Emacs session. We call them @dfn{initial options}. A few options | 50 | the Emacs session. We call them @dfn{initial options}. A few options |
| 51 | specify things to do: for example, load libraries, call functions, or | 51 | specify things to do: for example, load libraries, call functions, or |
| 52 | exit Emacs. These are called @dfn{action options}. These and file | 52 | terminate Emacs. These are called @dfn{action options}. These and file |
| 53 | names together are called @dfn{action arguments}. Emacs processes all | 53 | names together are called @dfn{action arguments}. Emacs processes all |
| 54 | the action arguments in the order they are written. | 54 | the action arguments in the order they are written. |
| 55 | 55 | ||
| @@ -95,7 +95,7 @@ Visit @var{file} using @code{find-file}, then go to line number | |||
| 95 | @item +@var{linenum}:@var{columnnum} @var{file} | 95 | @item +@var{linenum}:@var{columnnum} @var{file} |
| 96 | @opindex +@var{linenum}:@var{columnnum} | 96 | @opindex +@var{linenum}:@var{columnnum} |
| 97 | Visit @var{file} using @code{find-file}, then go to line number | 97 | Visit @var{file} using @code{find-file}, then go to line number |
| 98 | @var{linenum} in it, and move to column number @var{columnnum}. | 98 | @var{linenum} and put point at column number @var{columnnum}. |
| 99 | 99 | ||
| 100 | @need 3000 | 100 | @need 3000 |
| 101 | @item -l @var{file} | 101 | @item -l @var{file} |
| @@ -195,10 +195,10 @@ shell scripts, makefiles, and so on. Normally the @samp{-l} option | |||
| 195 | or @samp{-f} option will be used as well, to invoke a Lisp program | 195 | or @samp{-f} option will be used as well, to invoke a Lisp program |
| 196 | to do the batch processing. | 196 | to do the batch processing. |
| 197 | 197 | ||
| 198 | @samp{-batch} implies @samp{-q} (do not load an init file). It also causes | 198 | @samp{-batch} implies @samp{-q} (do not load an init file). It also |
| 199 | Emacs to kill itself after all command options have been processed. In | 199 | causes Emacs to exit after processing all the command options. In |
| 200 | addition, auto-saving is not done except in buffers for which it has been | 200 | addition, it disables auto-saving except in buffers for which it has |
| 201 | explicitly requested. | 201 | been explicitly requested. |
| 202 | 202 | ||
| 203 | @item -q | 203 | @item -q |
| 204 | @opindex -q | 204 | @opindex -q |
| @@ -465,7 +465,7 @@ The name of an interpreter used to parse and execute programs run from | |||
| 465 | inside Emacs. | 465 | inside Emacs. |
| 466 | @cindex background mode, on @code{xterm} | 466 | @cindex background mode, on @code{xterm} |
| 467 | @item TERM | 467 | @item TERM |
| 468 | The type of the terminal that Emacs is using. The variable must be | 468 | The type of the terminal that Emacs is using. This variable must be |
| 469 | set unless Emacs is run in batch mode. On MS-DOS, it defaults to | 469 | set unless Emacs is run in batch mode. On MS-DOS, it defaults to |
| 470 | @samp{internal}, which specifies a built-in terminal emulation that | 470 | @samp{internal}, which specifies a built-in terminal emulation that |
| 471 | handles the machine's own display. If the value of @env{TERM} indicates | 471 | handles the machine's own display. If the value of @env{TERM} indicates |
diff --git a/man/dired.texi b/man/dired.texi index fb098784273..b817294fbe0 100644 --- a/man/dired.texi +++ b/man/dired.texi | |||
| @@ -24,7 +24,7 @@ files. | |||
| 24 | 24 | ||
| 25 | @menu | 25 | @menu |
| 26 | * Enter: Dired Enter. How to invoke Dired. | 26 | * Enter: Dired Enter. How to invoke Dired. |
| 27 | * Navigation: Dired Navigation. How to move in the Dired buffer. | 27 | * Navigation: Dired Navigation. Special motion commands in the Dired buffer. |
| 28 | * Deletion: Dired Deletion. Deleting files with Dired. | 28 | * Deletion: Dired Deletion. Deleting files with Dired. |
| 29 | * Flagging Many Files:: Flagging files based on their names. | 29 | * Flagging Many Files:: Flagging files based on their names. |
| 30 | * Visit: Dired Visiting. Other file operations through Dired. | 30 | * Visit: Dired Visiting. Other file operations through Dired. |
| @@ -93,8 +93,8 @@ buffer includes several directories. @xref{Subdirectory Motion}. | |||
| 93 | @cindex flagging files (in Dired) | 93 | @cindex flagging files (in Dired) |
| 94 | @cindex deleting files (in Dired) | 94 | @cindex deleting files (in Dired) |
| 95 | 95 | ||
| 96 | One of the most frequent uses of Dired is to @dfn{flag} files for | 96 | One of the most frequent uses of Dired is to first @dfn{flag} files for |
| 97 | deletion and then delete the files previously flagged. | 97 | deletion, then delete the files that were flagged. |
| 98 | 98 | ||
| 99 | @table @kbd | 99 | @table @kbd |
| 100 | @item d | 100 | @item d |
| @@ -197,8 +197,8 @@ is, files whose names begin and end with @samp{#}. | |||
| 197 | @kindex ~ @r{(Dired)} | 197 | @kindex ~ @r{(Dired)} |
| 198 | @findex dired-flag-backup-files | 198 | @findex dired-flag-backup-files |
| 199 | @kbd{~} (@code{dired-flag-backup-files}) flags for deletion all files | 199 | @kbd{~} (@code{dired-flag-backup-files}) flags for deletion all files |
| 200 | whose names say they are backup files (@pxref{Backup})---that is, whose | 200 | whose names say they are backup files (@pxref{Backup})---that is, files |
| 201 | names end in @samp{~}. | 201 | whose names end in @samp{~}. |
| 202 | 202 | ||
| 203 | @kindex . @r{(Dired)} | 203 | @kindex . @r{(Dired)} |
| 204 | @vindex dired-kept-versions | 204 | @vindex dired-kept-versions |
diff --git a/man/display.texi b/man/display.texi index 744dfcb960c..02e9bc0af27 100644 --- a/man/display.texi +++ b/man/display.texi | |||
| @@ -48,7 +48,7 @@ terminal has this capability. | |||
| 48 | specifying the face or faces to use for it. The style of display used | 48 | specifying the face or faces to use for it. The style of display used |
| 49 | for any given character is determined by combining the attributes of | 49 | for any given character is determined by combining the attributes of |
| 50 | all the applicable faces specified for that character. Any attribute | 50 | all the applicable faces specified for that character. Any attribute |
| 51 | that isn't specified by these faces is taken from the default face, | 51 | that isn't specified by these faces is taken from the @code{default} face, |
| 52 | whose attributes reflect the default settings of the frame itself. | 52 | whose attributes reflect the default settings of the frame itself. |
| 53 | 53 | ||
| 54 | Enriched mode, the mode for editing formatted text, includes several | 54 | Enriched mode, the mode for editing formatted text, includes several |
| @@ -258,7 +258,7 @@ beyond which buffer fontification is suppressed. | |||
| 258 | @vindex font-lock-beginning-of-syntax-function | 258 | @vindex font-lock-beginning-of-syntax-function |
| 259 | Comment and string fontification (or ``syntactic'' fontification) | 259 | Comment and string fontification (or ``syntactic'' fontification) |
| 260 | relies on analysis of the syntactic structure of the buffer text. For | 260 | relies on analysis of the syntactic structure of the buffer text. For |
| 261 | the purposes of speed, some modes, including C mode and Lisp mode, | 261 | the sake of speed, some modes, including C mode and Lisp mode, |
| 262 | rely on a special convention: an open-parenthesis or open-brace in the | 262 | rely on a special convention: an open-parenthesis or open-brace in the |
| 263 | leftmost column always defines the @w{beginning} of a defun, and is | 263 | leftmost column always defines the @w{beginning} of a defun, and is |
| 264 | thus always outside any string or comment. (@xref{Left Margin | 264 | thus always outside any string or comment. (@xref{Left Margin |
| @@ -460,9 +460,9 @@ whole windowful of lines that were not previously visible. If point | |||
| 460 | was in the text that scrolled off the top, it ends up at the new top | 460 | was in the text that scrolled off the top, it ends up at the new top |
| 461 | of the window. | 461 | of the window. |
| 462 | 462 | ||
| 463 | @kbd{M-v} (@code{scroll-down}) with no argument scrolls backward | 463 | @kbd{M-v} (@code{scroll-down}) with no argument scrolls backward in |
| 464 | similarly with overlap. The number of lines of overlap across a | 464 | a similar way, also with overlap. The number of lines of overlap |
| 465 | @kbd{C-v} or @kbd{M-v} is controlled by the variable | 465 | across a @kbd{C-v} or @kbd{M-v} is controlled by the variable |
| 466 | @code{next-screen-context-lines}; by default, it is 2. The function | 466 | @code{next-screen-context-lines}; by default, it is 2. The function |
| 467 | keys @key{NEXT} and @key{PRIOR}, or @key{PAGEDOWN} and @key{PAGEUP}, | 467 | keys @key{NEXT} and @key{PRIOR}, or @key{PAGEDOWN} and @key{PAGEUP}, |
| 468 | are equivalent to @kbd{C-v} and @kbd{M-v}. | 468 | are equivalent to @kbd{C-v} and @kbd{M-v}. |
diff --git a/man/fixit.texi b/man/fixit.texi index bbe53f157c8..02f7ed767b6 100644 --- a/man/fixit.texi +++ b/man/fixit.texi | |||
| @@ -106,7 +106,7 @@ punctuation characters between the words do not move. For example, | |||
| 106 | @kbd{C-M-t} (@code{transpose-sexps}) is a similar command for | 106 | @kbd{C-M-t} (@code{transpose-sexps}) is a similar command for |
| 107 | transposing two expressions (@pxref{Expressions}), and @kbd{C-x C-t} | 107 | transposing two expressions (@pxref{Expressions}), and @kbd{C-x C-t} |
| 108 | (@code{transpose-lines}) exchanges lines. They work like @kbd{M-t} | 108 | (@code{transpose-lines}) exchanges lines. They work like @kbd{M-t} |
| 109 | except in determining the division of the text into syntactic units. | 109 | except as regards what units of text they transpose. |
| 110 | 110 | ||
| 111 | A numeric argument to a transpose command serves as a repeat count: it | 111 | A numeric argument to a transpose command serves as a repeat count: it |
| 112 | tells the transpose command to move the character (word, expression, line) | 112 | tells the transpose command to move the character (word, expression, line) |
diff --git a/man/glossary.texi b/man/glossary.texi index 66e8fb9394d..c346d7cb358 100644 --- a/man/glossary.texi +++ b/man/glossary.texi | |||
| @@ -67,15 +67,15 @@ track down or cancel changes you later regret making. @xref{Backup}. | |||
| 67 | 67 | ||
| 68 | @item Balance Parentheses | 68 | @item Balance Parentheses |
| 69 | Emacs can balance parentheses (or other matching delimiters) either | 69 | Emacs can balance parentheses (or other matching delimiters) either |
| 70 | manually or automatically. Manual balancing is done by the commands | 70 | manually or automatically. You do manual balancing with the commands |
| 71 | to move over parenthetical groupings (@pxref{Moving by Parens}). | 71 | to move over parenthetical groupings (@pxref{Moving by Parens}). |
| 72 | Automatic balancing is done by blinking or highlighting the delimiter | 72 | Automatic balancing works by blinking or highlighting the delimiter |
| 73 | that matches the one you just inserted (@pxref{Matching,,Matching | 73 | that matches the one you just inserted (@pxref{Matching,,Matching |
| 74 | Parens}). | 74 | Parens}). |
| 75 | 75 | ||
| 76 | @item Balanced Expressions | 76 | @item Balanced Expressions |
| 77 | A balanced expression is a syntactically recognizable expression, such | 77 | A balanced expression is a syntactically recognizable expression, such |
| 78 | as a symbol, number, string constant, block, parenthesized expression | 78 | as a symbol, number, string constant, block, or parenthesized expression |
| 79 | in C. @xref{Expressions,Balanced Expressions}. | 79 | in C. @xref{Expressions,Balanced Expressions}. |
| 80 | 80 | ||
| 81 | @item Balloon Help | 81 | @item Balloon Help |
| @@ -297,7 +297,7 @@ it is interpreted relative to the current buffer's default directory. | |||
| 297 | 297 | ||
| 298 | @item Defun | 298 | @item Defun |
| 299 | A defun is a major definition at the top level in a program. The name | 299 | A defun is a major definition at the top level in a program. The name |
| 300 | comes from Lisp, where most such definitions use the construct | 300 | `defun' comes from Lisp, where most such definitions use the construct |
| 301 | @code{defun}. @xref{Defuns}. | 301 | @code{defun}. @xref{Defuns}. |
| 302 | 302 | ||
| 303 | @item @key{DEL} | 303 | @item @key{DEL} |
| @@ -369,11 +369,11 @@ particular delimiter characters to reindent the line or insert one or | |||
| 369 | more newlines in addition to self-insertion. | 369 | more newlines in addition to self-insertion. |
| 370 | 370 | ||
| 371 | @item End Of Line | 371 | @item End Of Line |
| 372 | End of line is a character or characters which signal the end of a text | 372 | End of line is a character or a sequence of characters that indicate |
| 373 | line. On GNU and Unix systems, this is a newline (q.v.@:), but other | 373 | the end of a text line. On GNU and Unix systems, this is a newline |
| 374 | systems have other conventions. @xref{Coding Systems,end-of-line}. | 374 | (q.v.@:), but other systems have other conventions. @xref{Coding |
| 375 | Emacs can recognize several end-of-line conventions in files and convert | 375 | Systems,end-of-line}. Emacs can recognize several end-of-line |
| 376 | between them. | 376 | conventions in files and convert between them. |
| 377 | 377 | ||
| 378 | @item Environment Variable | 378 | @item Environment Variable |
| 379 | An environment variable is one of a collection of variables stored by | 379 | An environment variable is one of a collection of variables stored by |
| @@ -1065,8 +1065,8 @@ name. @xref{Expressions,Sexps}. | |||
| 1065 | @item Simultaneous Editing | 1065 | @item Simultaneous Editing |
| 1066 | Simultaneous editing means two users modifying the same file at once. | 1066 | Simultaneous editing means two users modifying the same file at once. |
| 1067 | Simultaneous editing, if not detected, can cause one user to lose his | 1067 | Simultaneous editing, if not detected, can cause one user to lose his |
| 1068 | work. Emacs detects all cases of simultaneous editing and warns one | 1068 | or her work. Emacs detects all cases of simultaneous editing, and |
| 1069 | of the users to investigate. | 1069 | warns one of the users to investigate. |
| 1070 | @xref{Interlocking,Interlocking,Simultaneous Editing}. | 1070 | @xref{Interlocking,Interlocking,Simultaneous Editing}. |
| 1071 | 1071 | ||
| 1072 | @item Speedbar | 1072 | @item Speedbar |
diff --git a/man/help.texi b/man/help.texi index 0bd7b650e1d..ca9e824e061 100644 --- a/man/help.texi +++ b/man/help.texi | |||
| @@ -39,7 +39,7 @@ customization buffers and the like. @xref{Help Mode}. | |||
| 39 | @cindex searching documentation efficiently | 39 | @cindex searching documentation efficiently |
| 40 | @cindex looking for a subject in documentation | 40 | @cindex looking for a subject in documentation |
| 41 | If you are looking for a certain feature, but don't know where | 41 | If you are looking for a certain feature, but don't know where |
| 42 | exactly it is documented, and aren't even sure of the name of the | 42 | exactly it is documented, and aren't sure of the name of a |
| 43 | related command or option, we recommend trying these methods. Usually | 43 | related command or option, we recommend trying these methods. Usually |
| 44 | it is best to start with an apropos command, then try searching the | 44 | it is best to start with an apropos command, then try searching the |
| 45 | manual index, then finally look in the FAQ and the package keywords. | 45 | manual index, then finally look in the FAQ and the package keywords. |
| @@ -47,8 +47,8 @@ manual index, then finally look in the FAQ and the package keywords. | |||
| 47 | @table @kbd | 47 | @table @kbd |
| 48 | @item C-h a @var{topic} @key{RET} | 48 | @item C-h a @var{topic} @key{RET} |
| 49 | This searches for commands whose names match @var{topic}, which should | 49 | This searches for commands whose names match @var{topic}, which should |
| 50 | be a regular expression (@pxref{Regexps}). Browse the buffer popped | 50 | be a regular expression (@pxref{Regexps}). Browse the buffer that this |
| 51 | up by Emacs to find what you are looking for. @xref{Apropos}. | 51 | command displays to find what you are looking for. @xref{Apropos}. |
| 52 | 52 | ||
| 53 | @item M-x apropos @key{RET} @var{topic} @key{RET} | 53 | @item M-x apropos @key{RET} @var{topic} @key{RET} |
| 54 | This works like @kbd{C-h a}, but it also searches for user options and | 54 | This works like @kbd{C-h a}, but it also searches for user options and |
| @@ -158,7 +158,7 @@ Describe the coding systems currently in use. | |||
| 158 | @item C-h I @var{method} @key{RET} | 158 | @item C-h I @var{method} @key{RET} |
| 159 | Describe an input method (@code{describe-input-method}). | 159 | Describe an input method (@code{describe-input-method}). |
| 160 | @item C-h L @var{language-env} @key{RET} | 160 | @item C-h L @var{language-env} @key{RET} |
| 161 | Display information on the character sets, coding systems and input | 161 | Display information on the character sets, coding systems, and input |
| 162 | methods used for language environment @var{language-env} | 162 | methods used for language environment @var{language-env} |
| 163 | (@code{describe-language-environment}). | 163 | (@code{describe-language-environment}). |
| 164 | @item C-h C-c | 164 | @item C-h C-c |
| @@ -548,7 +548,7 @@ various situations with solutions or workarounds in many cases. | |||
| 548 | 548 | ||
| 549 | @cindex tooltips | 549 | @cindex tooltips |
| 550 | @cindex balloon help | 550 | @cindex balloon help |
| 551 | When a region of text is ``active,'' so that you can select it with | 551 | When a region of text is ``active,'' so that you can select it with |
| 552 | the mouse or a key like @kbd{RET}, it often has associated help text. | 552 | the mouse or a key like @kbd{RET}, it often has associated help text. |
| 553 | Areas of the mode line are examples. This help will normally be | 553 | Areas of the mode line are examples. This help will normally be |
| 554 | printed in the echo area when you move point into the active text. In | 554 | printed in the echo area when you move point into the active text. In |
diff --git a/man/killing.texi b/man/killing.texi index 423b875f33a..9607a931bdc 100644 --- a/man/killing.texi +++ b/man/killing.texi | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | ring}, from which it can be retrieved by @dfn{yanking} it. Some systems | 8 | ring}, from which it can be retrieved by @dfn{yanking} it. Some systems |
| 9 | use the terms ``cutting'' and ``pasting'' for these operations. | 9 | use the terms ``cutting'' and ``pasting'' for these operations. |
| 10 | 10 | ||
| 11 | The commonest way of moving or copying text within Emacs is to kill it | 11 | The most common way of moving or copying text within Emacs is to kill it |
| 12 | and later yank it elsewhere in one or more places. This is very safe | 12 | and later yank it elsewhere in one or more places. This is very safe |
| 13 | because Emacs remembers several recent kills, not just the last one. It | 13 | because Emacs remembers several recent kills, not just the last one. It |
| 14 | is versatile, because the many commands for killing syntactic units can | 14 | is versatile, because the many commands for killing syntactic units can |
| @@ -137,7 +137,7 @@ equivalent to @key{DEL}. As a result, @key{BACKSPACE} and/or @key{DELETE} | |||
| 137 | keys normally do the right things. But in some unusual cases Emacs | 137 | keys normally do the right things. But in some unusual cases Emacs |
| 138 | gets the wrong information from the system. If these keys don't do | 138 | gets the wrong information from the system. If these keys don't do |
| 139 | what they ought to do, you need to tell Emacs which key to use for | 139 | what they ought to do, you need to tell Emacs which key to use for |
| 140 | @key{DEL}. @xref{DEL Gets Help}, for how to do this. | 140 | @key{DEL}. @xref{DEL Doesn't Delete}, for how to do this. |
| 141 | 141 | ||
| 142 | @findex normal-erase-is-backspace-mode | 142 | @findex normal-erase-is-backspace-mode |
| 143 | On most text-only terminals, Emacs cannot tell which keys the | 143 | On most text-only terminals, Emacs cannot tell which keys the |
| @@ -145,8 +145,8 @@ keyboard really has, so it follows a uniform plan which may or may not | |||
| 145 | fit your keyboard. The uniform plan is that the ASCII @key{DEL} | 145 | fit your keyboard. The uniform plan is that the ASCII @key{DEL} |
| 146 | character deletes, and the ASCII @key{BS} (backspace) character asks | 146 | character deletes, and the ASCII @key{BS} (backspace) character asks |
| 147 | for help (it is the same as @kbd{C-h}). If this is not right for your | 147 | for help (it is the same as @kbd{C-h}). If this is not right for your |
| 148 | keyboard, i.e.@: if you find that the key which ought to delete backwards | 148 | keyboard, such as if you find that the key which ought to delete backwards |
| 149 | enters Help instead, see @ref{DEL Gets Help}. | 149 | enters Help instead, see @ref{DEL Doesn't Delete}. |
| 150 | 150 | ||
| 151 | @kindex M-\ | 151 | @kindex M-\ |
| 152 | @findex delete-horizontal-space | 152 | @findex delete-horizontal-space |
| @@ -410,14 +410,14 @@ what's in the ring. As long as no new killing is done, the ``last | |||
| 410 | yank'' pointer remains at the same place in the kill ring, so repeating | 410 | yank'' pointer remains at the same place in the kill ring, so repeating |
| 411 | @kbd{C-y} will yank another copy of the same previous kill. | 411 | @kbd{C-y} will yank another copy of the same previous kill. |
| 412 | 412 | ||
| 413 | If you know how many @kbd{M-y} commands it would take to find the text | 413 | If you know how many @kbd{M-y} commands it would take to find the |
| 414 | you want, you can yank that text in one step using @kbd{C-y} with a | 414 | text you want, you can yank that text in one step using @kbd{C-y} with |
| 415 | numeric argument. @kbd{C-y} with an argument restores the text the | 415 | a numeric argument. @kbd{C-y} with an argument restores the text from |
| 416 | specified number of entries back in the kill ring. Thus, @kbd{C-u 2 | 416 | the specified kill ring entry, counting back from the most recent as |
| 417 | C-y} gets the next-to-the-last block of killed text. It is equivalent | 417 | 1. Thus, @kbd{C-u 2 C-y} gets the next-to-the-last block of killed |
| 418 | to @kbd{C-y M-y}. @kbd{C-y} with a numeric argument starts counting | 418 | text---it is equivalent to @kbd{C-y M-y}. @kbd{C-y} with a numeric |
| 419 | from the ``last yank'' pointer, and sets the ``last yank'' pointer to | 419 | argument starts counting from the ``last yank'' pointer, and sets the |
| 420 | the entry that it yanks. | 420 | ``last yank'' pointer to the entry that it yanks. |
| 421 | 421 | ||
| 422 | @vindex kill-ring-max | 422 | @vindex kill-ring-max |
| 423 | The length of the kill ring is controlled by the variable | 423 | The length of the kill ring is controlled by the variable |
| @@ -446,15 +446,15 @@ scattered pieces of text into a buffer or into a file. | |||
| 446 | 446 | ||
| 447 | @table @kbd | 447 | @table @kbd |
| 448 | @item M-x append-to-buffer | 448 | @item M-x append-to-buffer |
| 449 | Append region to the contents of specified buffer. | 449 | Append region to the contents of a specified buffer. |
| 450 | @item M-x prepend-to-buffer | 450 | @item M-x prepend-to-buffer |
| 451 | Prepend region to the contents of specified buffer. | 451 | Prepend region to the contents of a specified buffer. |
| 452 | @item M-x copy-to-buffer | 452 | @item M-x copy-to-buffer |
| 453 | Copy region into a specified buffer, deleting that buffer's old contents. | 453 | Copy region into a specified buffer, deleting that buffer's old contents. |
| 454 | @item M-x insert-buffer | 454 | @item M-x insert-buffer |
| 455 | Insert the contents of specified buffer into current buffer at point. | 455 | Insert the contents of a specified buffer into current buffer at point. |
| 456 | @item M-x append-to-file | 456 | @item M-x append-to-file |
| 457 | Append region to the contents of specified file, at the end. | 457 | Append region to the contents of a specified file, at the end. |
| 458 | @end table | 458 | @end table |
| 459 | 459 | ||
| 460 | To accumulate text into a buffer, use @kbd{M-x append-to-buffer}. | 460 | To accumulate text into a buffer, use @kbd{M-x append-to-buffer}. |
| @@ -483,7 +483,7 @@ copied into it. | |||
| 483 | To retrieve the accumulated text from another buffer, use the | 483 | To retrieve the accumulated text from another buffer, use the |
| 484 | command @kbd{M-x insert-buffer}; this too takes @var{buffername} as an | 484 | command @kbd{M-x insert-buffer}; this too takes @var{buffername} as an |
| 485 | argument. It inserts a copy of the whole text in buffer | 485 | argument. It inserts a copy of the whole text in buffer |
| 486 | @var{buffername} into the selected buffer at point, and sets the mark | 486 | @var{buffername} into the current buffer at point, and sets the mark |
| 487 | after the inserted text. Alternatively, you can select the other | 487 | after the inserted text. Alternatively, you can select the other |
| 488 | buffer for editing, then copy text from it by killing. | 488 | buffer for editing, then copy text from it by killing. |
| 489 | @xref{Buffers}, for background information on buffers. | 489 | @xref{Buffers}, for background information on buffers. |
diff --git a/man/major.texi b/man/major.texi index d9f5039117e..16887fe788a 100644 --- a/man/major.texi +++ b/man/major.texi | |||
| @@ -32,16 +32,17 @@ syntactical properties of characters appearing in the buffer. | |||
| 32 | @xref{Syntax}. | 32 | @xref{Syntax}. |
| 33 | 33 | ||
| 34 | The major modes fall into three major groups. The first group | 34 | The major modes fall into three major groups. The first group |
| 35 | contains Lisp mode (which has several variants), C mode, Fortran mode | 35 | contains modes for normal text, either plain or with mark-up. It |
| 36 | and others. These modes are for specific programming languages. The | 36 | includes Text mode, HTML mode, SGML mode, @TeX{} mode and Outline |
| 37 | second group contains Text mode, Nroff mode, SGML mode, @TeX{} mode | 37 | mode. The second group contains modes for specific programming |
| 38 | and Outline mode. These modes are for normal text, plain or marked | 38 | languages. These include Lisp mode (which has several variants), C |
| 39 | up. The remaining major modes are not intended for use on users' | 39 | mode, Fortran mode, and others. The remaining major modes are not |
| 40 | files; they are used in buffers created for specific purposes by | 40 | intended for use on users' files; they are used in buffers created for |
| 41 | Emacs, such as Dired mode for buffers made by Dired (@pxref{Dired}), | 41 | specific purposes by Emacs, such as Dired mode for buffers made by |
| 42 | Mail mode for buffers made by @kbd{C-x m} (@pxref{Sending Mail}), and | 42 | Dired (@pxref{Dired}), Mail mode for buffers made by @kbd{C-x m} |
| 43 | Shell mode for buffers used for communicating with an inferior shell | 43 | (@pxref{Sending Mail}), and Shell mode for buffers used for |
| 44 | process (@pxref{Interactive Shell}). | 44 | communicating with an inferior shell process (@pxref{Interactive |
| 45 | Shell}). | ||
| 45 | 46 | ||
| 46 | Most programming-language major modes specify that only blank lines | 47 | Most programming-language major modes specify that only blank lines |
| 47 | separate paragraphs. This is to make the paragraph commands useful. | 48 | separate paragraphs. This is to make the paragraph commands useful. |