From 0ec1f11554a528e81e9fc7eb2164154bedd532a3 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Wed, 8 Aug 2001 23:39:08 +0000 Subject: [PATCH] Minor cleanups. --- man/calendar.texi | 14 +++++++------- man/cmdargs.texi | 14 +++++++------- man/dired.texi | 10 +++++----- man/display.texi | 10 +++++----- man/fixit.texi | 2 +- man/glossary.texi | 22 +++++++++++----------- man/help.texi | 10 +++++----- man/killing.texi | 34 +++++++++++++++++----------------- 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. @section Scrolling in the Calendar @cindex scrolling in the calendar - The calendar display scrolls automatically through time when you move out -of the visible portion. You can also scroll it manually. Imagine that the -calendar window contains a long strip of paper with the months on it. -Scrolling it means moving the strip so that new months become visible in -the window. + The calendar display scrolls automatically through time when you +move out of the visible portion. You can also scroll it manually. +Imagine that the calendar window contains a long strip of paper with +the months on it. Scrolling the calendar means moving the strip +horizontally, so that new months become visible in the window. @table @kbd @item C-x < @@ -1312,8 +1312,8 @@ Sexp Diary Entries, elisp, The Emacs Lisp Reference Manual}. @cindex appointment notification If you have a diary entry for an appointment, and that diary entry -begins with a recognizable time of day, Emacs can warn you, several -minutes beforehand, that that appointment is pending. Emacs alerts you +begins with a recognizable time of day, Emacs can warn you several +minutes beforehand that that appointment is pending. Emacs alerts you to the appointment by displaying a message in the mode line. @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. Most options specify how to initialize Emacs, or set parameters for the Emacs session. We call them @dfn{initial options}. A few options specify things to do: for example, load libraries, call functions, or -exit Emacs. These are called @dfn{action options}. These and file +terminate Emacs. These are called @dfn{action options}. These and file names together are called @dfn{action arguments}. Emacs processes all the action arguments in the order they are written. @@ -95,7 +95,7 @@ Visit @var{file} using @code{find-file}, then go to line number @item +@var{linenum}:@var{columnnum} @var{file} @opindex +@var{linenum}:@var{columnnum} Visit @var{file} using @code{find-file}, then go to line number -@var{linenum} in it, and move to column number @var{columnnum}. +@var{linenum} and put point at column number @var{columnnum}. @need 3000 @item -l @var{file} @@ -195,10 +195,10 @@ shell scripts, makefiles, and so on. Normally the @samp{-l} option or @samp{-f} option will be used as well, to invoke a Lisp program to do the batch processing. -@samp{-batch} implies @samp{-q} (do not load an init file). It also causes -Emacs to kill itself after all command options have been processed. In -addition, auto-saving is not done except in buffers for which it has been -explicitly requested. +@samp{-batch} implies @samp{-q} (do not load an init file). It also +causes Emacs to exit after processing all the command options. In +addition, it disables auto-saving except in buffers for which it has +been explicitly requested. @item -q @opindex -q @@ -465,7 +465,7 @@ The name of an interpreter used to parse and execute programs run from inside Emacs. @cindex background mode, on @code{xterm} @item TERM -The type of the terminal that Emacs is using. The variable must be +The type of the terminal that Emacs is using. This variable must be set unless Emacs is run in batch mode. On MS-DOS, it defaults to @samp{internal}, which specifies a built-in terminal emulation that 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. @menu * Enter: Dired Enter. How to invoke Dired. -* Navigation: Dired Navigation. How to move in the Dired buffer. +* Navigation: Dired Navigation. Special motion commands in the Dired buffer. * Deletion: Dired Deletion. Deleting files with Dired. * Flagging Many Files:: Flagging files based on their names. * Visit: Dired Visiting. Other file operations through Dired. @@ -93,8 +93,8 @@ buffer includes several directories. @xref{Subdirectory Motion}. @cindex flagging files (in Dired) @cindex deleting files (in Dired) - One of the most frequent uses of Dired is to @dfn{flag} files for -deletion and then delete the files previously flagged. + One of the most frequent uses of Dired is to first @dfn{flag} files for +deletion, then delete the files that were flagged. @table @kbd @item d @@ -197,8 +197,8 @@ is, files whose names begin and end with @samp{#}. @kindex ~ @r{(Dired)} @findex dired-flag-backup-files @kbd{~} (@code{dired-flag-backup-files}) flags for deletion all files -whose names say they are backup files (@pxref{Backup})---that is, whose -names end in @samp{~}. +whose names say they are backup files (@pxref{Backup})---that is, files +whose names end in @samp{~}. @kindex . @r{(Dired)} @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. specifying the face or faces to use for it. The style of display used for any given character is determined by combining the attributes of all the applicable faces specified for that character. Any attribute -that isn't specified by these faces is taken from the default face, +that isn't specified by these faces is taken from the @code{default} face, whose attributes reflect the default settings of the frame itself. Enriched mode, the mode for editing formatted text, includes several @@ -258,7 +258,7 @@ beyond which buffer fontification is suppressed. @vindex font-lock-beginning-of-syntax-function Comment and string fontification (or ``syntactic'' fontification) relies on analysis of the syntactic structure of the buffer text. For -the purposes of speed, some modes, including C mode and Lisp mode, +the sake of speed, some modes, including C mode and Lisp mode, rely on a special convention: an open-parenthesis or open-brace in the leftmost column always defines the @w{beginning} of a defun, and is 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 was in the text that scrolled off the top, it ends up at the new top of the window. - @kbd{M-v} (@code{scroll-down}) with no argument scrolls backward -similarly with overlap. The number of lines of overlap across a -@kbd{C-v} or @kbd{M-v} is controlled by the variable + @kbd{M-v} (@code{scroll-down}) with no argument scrolls backward in +a similar way, also with overlap. The number of lines of overlap +across a @kbd{C-v} or @kbd{M-v} is controlled by the variable @code{next-screen-context-lines}; by default, it is 2. The function keys @key{NEXT} and @key{PRIOR}, or @key{PAGEDOWN} and @key{PAGEUP}, 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, @kbd{C-M-t} (@code{transpose-sexps}) is a similar command for transposing two expressions (@pxref{Expressions}), and @kbd{C-x C-t} (@code{transpose-lines}) exchanges lines. They work like @kbd{M-t} -except in determining the division of the text into syntactic units. +except as regards what units of text they transpose. A numeric argument to a transpose command serves as a repeat count: it 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}. @item Balance Parentheses Emacs can balance parentheses (or other matching delimiters) either -manually or automatically. Manual balancing is done by the commands +manually or automatically. You do manual balancing with the commands to move over parenthetical groupings (@pxref{Moving by Parens}). -Automatic balancing is done by blinking or highlighting the delimiter +Automatic balancing works by blinking or highlighting the delimiter that matches the one you just inserted (@pxref{Matching,,Matching Parens}). @item Balanced Expressions A balanced expression is a syntactically recognizable expression, such -as a symbol, number, string constant, block, parenthesized expression +as a symbol, number, string constant, block, or parenthesized expression in C. @xref{Expressions,Balanced Expressions}. @item Balloon Help @@ -297,7 +297,7 @@ it is interpreted relative to the current buffer's default directory. @item Defun A defun is a major definition at the top level in a program. The name -comes from Lisp, where most such definitions use the construct +`defun' comes from Lisp, where most such definitions use the construct @code{defun}. @xref{Defuns}. @item @key{DEL} @@ -369,11 +369,11 @@ particular delimiter characters to reindent the line or insert one or more newlines in addition to self-insertion. @item End Of Line -End of line is a character or characters which signal the end of a text -line. On GNU and Unix systems, this is a newline (q.v.@:), but other -systems have other conventions. @xref{Coding Systems,end-of-line}. -Emacs can recognize several end-of-line conventions in files and convert -between them. +End of line is a character or a sequence of characters that indicate +the end of a text line. On GNU and Unix systems, this is a newline +(q.v.@:), but other systems have other conventions. @xref{Coding +Systems,end-of-line}. Emacs can recognize several end-of-line +conventions in files and convert between them. @item Environment Variable An environment variable is one of a collection of variables stored by @@ -1065,8 +1065,8 @@ name. @xref{Expressions,Sexps}. @item Simultaneous Editing Simultaneous editing means two users modifying the same file at once. Simultaneous editing, if not detected, can cause one user to lose his -work. Emacs detects all cases of simultaneous editing and warns one -of the users to investigate. +or her work. Emacs detects all cases of simultaneous editing, and +warns one of the users to investigate. @xref{Interlocking,Interlocking,Simultaneous Editing}. @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}. @cindex searching documentation efficiently @cindex looking for a subject in documentation If you are looking for a certain feature, but don't know where -exactly it is documented, and aren't even sure of the name of the +exactly it is documented, and aren't sure of the name of a related command or option, we recommend trying these methods. Usually it is best to start with an apropos command, then try searching the 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. @table @kbd @item C-h a @var{topic} @key{RET} This searches for commands whose names match @var{topic}, which should -be a regular expression (@pxref{Regexps}). Browse the buffer popped -up by Emacs to find what you are looking for. @xref{Apropos}. +be a regular expression (@pxref{Regexps}). Browse the buffer that this +command displays to find what you are looking for. @xref{Apropos}. @item M-x apropos @key{RET} @var{topic} @key{RET} 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. @item C-h I @var{method} @key{RET} Describe an input method (@code{describe-input-method}). @item C-h L @var{language-env} @key{RET} -Display information on the character sets, coding systems and input +Display information on the character sets, coding systems, and input methods used for language environment @var{language-env} (@code{describe-language-environment}). @item C-h C-c @@ -548,7 +548,7 @@ various situations with solutions or workarounds in many cases. @cindex tooltips @cindex balloon help -When a region of text is ``active,'' so that you can select it with + When a region of text is ``active,'' so that you can select it with the mouse or a key like @kbd{RET}, it often has associated help text. Areas of the mode line are examples. This help will normally be 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 @@ ring}, from which it can be retrieved by @dfn{yanking} it. Some systems use the terms ``cutting'' and ``pasting'' for these operations. - The commonest way of moving or copying text within Emacs is to kill it + The most common way of moving or copying text within Emacs is to kill it and later yank it elsewhere in one or more places. This is very safe because Emacs remembers several recent kills, not just the last one. It 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} keys normally do the right things. But in some unusual cases Emacs gets the wrong information from the system. If these keys don't do what they ought to do, you need to tell Emacs which key to use for -@key{DEL}. @xref{DEL Gets Help}, for how to do this. +@key{DEL}. @xref{DEL Doesn't Delete}, for how to do this. @findex normal-erase-is-backspace-mode 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 fit your keyboard. The uniform plan is that the ASCII @key{DEL} character deletes, and the ASCII @key{BS} (backspace) character asks for help (it is the same as @kbd{C-h}). If this is not right for your -keyboard, i.e.@: if you find that the key which ought to delete backwards -enters Help instead, see @ref{DEL Gets Help}. +keyboard, such as if you find that the key which ought to delete backwards +enters Help instead, see @ref{DEL Doesn't Delete}. @kindex M-\ @findex delete-horizontal-space @@ -410,14 +410,14 @@ what's in the ring. As long as no new killing is done, the ``last yank'' pointer remains at the same place in the kill ring, so repeating @kbd{C-y} will yank another copy of the same previous kill. - If you know how many @kbd{M-y} commands it would take to find the text -you want, you can yank that text in one step using @kbd{C-y} with a -numeric argument. @kbd{C-y} with an argument restores the text the -specified number of entries back in the kill ring. Thus, @kbd{C-u 2 -C-y} gets the next-to-the-last block of killed text. It is equivalent -to @kbd{C-y M-y}. @kbd{C-y} with a numeric argument starts counting -from the ``last yank'' pointer, and sets the ``last yank'' pointer to -the entry that it yanks. + If you know how many @kbd{M-y} commands it would take to find the +text you want, you can yank that text in one step using @kbd{C-y} with +a numeric argument. @kbd{C-y} with an argument restores the text from +the specified kill ring entry, counting back from the most recent as +1. Thus, @kbd{C-u 2 C-y} gets the next-to-the-last block of killed +text---it is equivalent to @kbd{C-y M-y}. @kbd{C-y} with a numeric +argument starts counting from the ``last yank'' pointer, and sets the +``last yank'' pointer to the entry that it yanks. @vindex kill-ring-max 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. @table @kbd @item M-x append-to-buffer -Append region to the contents of specified buffer. +Append region to the contents of a specified buffer. @item M-x prepend-to-buffer -Prepend region to the contents of specified buffer. +Prepend region to the contents of a specified buffer. @item M-x copy-to-buffer Copy region into a specified buffer, deleting that buffer's old contents. @item M-x insert-buffer -Insert the contents of specified buffer into current buffer at point. +Insert the contents of a specified buffer into current buffer at point. @item M-x append-to-file -Append region to the contents of specified file, at the end. +Append region to the contents of a specified file, at the end. @end table To accumulate text into a buffer, use @kbd{M-x append-to-buffer}. @@ -483,7 +483,7 @@ copied into it. To retrieve the accumulated text from another buffer, use the command @kbd{M-x insert-buffer}; this too takes @var{buffername} as an argument. It inserts a copy of the whole text in buffer -@var{buffername} into the selected buffer at point, and sets the mark +@var{buffername} into the current buffer at point, and sets the mark after the inserted text. Alternatively, you can select the other buffer for editing, then copy text from it by killing. @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. @xref{Syntax}. The major modes fall into three major groups. The first group -contains Lisp mode (which has several variants), C mode, Fortran mode -and others. These modes are for specific programming languages. The -second group contains Text mode, Nroff mode, SGML mode, @TeX{} mode -and Outline mode. These modes are for normal text, plain or marked -up. The remaining major modes are not intended for use on users' -files; they are used in buffers created for specific purposes by -Emacs, such as Dired mode for buffers made by Dired (@pxref{Dired}), -Mail mode for buffers made by @kbd{C-x m} (@pxref{Sending Mail}), and -Shell mode for buffers used for communicating with an inferior shell -process (@pxref{Interactive Shell}). +contains modes for normal text, either plain or with mark-up. It +includes Text mode, HTML mode, SGML mode, @TeX{} mode and Outline +mode. The second group contains modes for specific programming +languages. These include Lisp mode (which has several variants), C +mode, Fortran mode, and others. The remaining major modes are not +intended for use on users' files; they are used in buffers created for +specific purposes by Emacs, such as Dired mode for buffers made by +Dired (@pxref{Dired}), Mail mode for buffers made by @kbd{C-x m} +(@pxref{Sending Mail}), and Shell mode for buffers used for +communicating with an inferior shell process (@pxref{Interactive +Shell}). Most programming-language major modes specify that only blank lines separate paragraphs. This is to make the paragraph commands useful. -- 2.39.2