aboutsummaryrefslogtreecommitdiffstats
path: root/lispref
diff options
context:
space:
mode:
authorRichard M. Stallman1996-12-20 00:09:23 +0000
committerRichard M. Stallman1996-12-20 00:09:23 +0000
commit9e2b495b7085a76d3d6ea521312d080aa6479965 (patch)
tree4dc81dafa556a21ec36ae794fde5dd02b06e5fcb /lispref
parent6268f00653c5f594251862066f15126bee5f1a2a (diff)
downloademacs-9e2b495b7085a76d3d6ea521312d080aa6479965.tar.gz
emacs-9e2b495b7085a76d3d6ea521312d080aa6479965.zip
Minor cleanups for overfull hboxes.
Diffstat (limited to 'lispref')
-rw-r--r--lispref/commands.texi24
-rw-r--r--lispref/compile.texi6
-rw-r--r--lispref/control.texi8
-rw-r--r--lispref/edebug.texi8
-rw-r--r--lispref/errors.texi3
-rw-r--r--lispref/files.texi26
-rw-r--r--lispref/help.texi2
-rw-r--r--lispref/internals.texi2
-rw-r--r--lispref/loading.texi2
-rw-r--r--lispref/minibuf.texi6
-rw-r--r--lispref/numbers.texi4
-rw-r--r--lispref/objects.texi17
-rw-r--r--lispref/searching.texi5
-rw-r--r--lispref/text.texi4
-rw-r--r--lispref/tips.texi10
-rw-r--r--lispref/windows.texi2
16 files changed, 68 insertions, 61 deletions
diff --git a/lispref/commands.texi b/lispref/commands.texi
index 41db781b586..d8199e27161 100644
--- a/lispref/commands.texi
+++ b/lispref/commands.texi
@@ -553,13 +553,13 @@ part of the prompt.
553@end deffn 553@end deffn
554 554
555@defun interactive-p 555@defun interactive-p
556This function returns @code{t} if the containing function (the one that 556This function returns @code{t} if the containing function (the one whose
557called @code{interactive-p}) was called interactively, with the function 557code includes the call to @code{interactive-p}) was called
558@code{call-interactively}. (It makes no difference whether 558interactively, with the function @code{call-interactively}. (It makes
559@code{call-interactively} was called from Lisp or directly from the 559no difference whether @code{call-interactively} was called from Lisp or
560editor command loop.) If the containing function was called by Lisp 560directly from the editor command loop.) If the containing function was
561evaluation (or with @code{apply} or @code{funcall}), then it was not 561called by Lisp evaluation (or with @code{apply} or @code{funcall}), then
562called interactively. 562it was not called interactively.
563 563
564The most common use of @code{interactive-p} is for deciding whether to 564The most common use of @code{interactive-p} is for deciding whether to
565print an informative message. As a special exception, 565print an informative message. As a special exception,
@@ -2187,8 +2187,8 @@ returned.
2187 2187
2188@defvar current-prefix-arg 2188@defvar current-prefix-arg
2189This variable holds the raw prefix argument for the @emph{current} 2189This variable holds the raw prefix argument for the @emph{current}
2190command. Commands may examine it directly, but the usual way to access 2190command. Commands may examine it directly, but the usual method for
2191it is with @code{(interactive "P")}. 2191accessing it is with @code{(interactive "P")}.
2192@end defvar 2192@end defvar
2193 2193
2194@defvar prefix-arg 2194@defvar prefix-arg
@@ -2197,9 +2197,9 @@ The value of this variable is the raw prefix argument for the
2197the following command work by setting this variable. 2197the following command work by setting this variable.
2198@end defvar 2198@end defvar
2199 2199
2200 Do not call the functions @code{universal-argument}, 2200 Do not call @code{universal-argument}, @code{digit-argument}, or
2201@code{digit-argument}, or @code{negative-argument} unless you intend to 2201@code{negative-argument} unless you intend to let the user enter the
2202let the user enter the prefix argument for the @emph{next} command. 2202prefix argument for the @emph{next} command.
2203 2203
2204@deffn Command universal-argument 2204@deffn Command universal-argument
2205This command reads input and specifies a prefix argument for the 2205This command reads input and specifies a prefix argument for the
diff --git a/lispref/compile.texi b/lispref/compile.texi
index c085634c39b..d43ea51f074 100644
--- a/lispref/compile.texi
+++ b/lispref/compile.texi
@@ -94,9 +94,9 @@ the @code{byte-compile} function. You can compile a whole file with
94@code{byte-compile-file}, or several files with 94@code{byte-compile-file}, or several files with
95@code{byte-recompile-directory} or @code{batch-byte-compile}. 95@code{byte-recompile-directory} or @code{batch-byte-compile}.
96 96
97 When you run the byte compiler, you may get warnings in a buffer 97 The byte compiler produces error messages and warnings about each file
98called @samp{*Compile-Log*}. These report things in your program that 98in a buffer called @samp{*Compile-Log*}. These report things in your
99suggest a problem but are not necessarily erroneous. 99program that suggest a problem but are not necessarily erroneous.
100 100
101@cindex macro compilation 101@cindex macro compilation
102 Be careful when byte-compiling code that uses macros. Macro calls are 102 Be careful when byte-compiling code that uses macros. Macro calls are
diff --git a/lispref/control.texi b/lispref/control.texi
index 1a5e7033c1c..4973599d877 100644
--- a/lispref/control.texi
+++ b/lispref/control.texi
@@ -821,10 +821,10 @@ that are being exited and executes the cleanups of all
821@code{unwind-protect} forms that are exited. Once control arrives at 821@code{unwind-protect} forms that are exited. Once control arrives at
822the handler, the body of the handler is executed. 822the handler, the body of the handler is executed.
823 823
824 After execution of the handler body, execution continues by returning 824 After execution of the handler body, execution returns from the
825from the @code{condition-case} form. Because the protected form is 825@code{condition-case} form. Because the protected form is exited
826exited completely before execution of the handler, the handler cannot 826completely before execution of the handler, the handler cannot resume
827resume execution at the point of the error, nor can it examine variable 827execution at the point of the error, nor can it examine variable
828bindings that were made within the protected form. All it can do is 828bindings that were made within the protected form. All it can do is
829clean up and proceed. 829clean up and proceed.
830 830
diff --git a/lispref/edebug.texi b/lispref/edebug.texi
index 5aec9f96f46..0f95fa9fb0c 100644
--- a/lispref/edebug.texi
+++ b/lispref/edebug.texi
@@ -452,7 +452,7 @@ Set a conditional breakpoint which stops the program only if
452breakpoint is temporary. 452breakpoint is temporary.
453 453
454@item B 454@item B
455Move point to the next breakpoint in the definition 455Move point to the next breakpoint in the current definition
456(@code{edebug-next-breakpoint}). 456(@code{edebug-next-breakpoint}).
457@end table 457@end table
458 458
@@ -505,9 +505,9 @@ evaluating the condition gets an error, execution does not stop.
505 505
506@findex edebug-set-global-break-condition 506@findex edebug-set-global-break-condition
507@vindex edebug-global-break-condition 507@vindex edebug-global-break-condition
508 You can set or edit the condition expression, stored in 508 The condition expression is stored in
509@code{edebug-global-break-condition}, using the @kbd{X} command 509@code{edebug-global-break-condition}. You can specify a new expression
510(@code{edebug-set-global-break-condition}). 510using the @kbd{X} command (@code{edebug-set-global-break-condition}).
511 511
512 The global break condition is the simplest way to find where in your 512 The global break condition is the simplest way to find where in your
513code some event occurs, but it makes code run much more slowly. So you 513code some event occurs, but it makes code run much more slowly. So you
diff --git a/lispref/errors.texi b/lispref/errors.texi
index 36290012285..aa3dde754d6 100644
--- a/lispref/errors.texi
+++ b/lispref/errors.texi
@@ -53,7 +53,8 @@ See @code{/} and @code{%} in @ref{Numbers}.
53@xref{Read Only Buffers}. 53@xref{Read Only Buffers}.
54 54
55@item cyclic-function-indirection 55@item cyclic-function-indirection
56@code{"Symbol's chain of function indirections contains a loop"}@* 56@code{"Symbol's chain of function indirections contains a@*
57loop"}@*
57@xref{Function Indirection}. 58@xref{Function Indirection}.
58 59
59@item end-of-buffer 60@item end-of-buffer
diff --git a/lispref/files.texi b/lispref/files.texi
index 90d022f547e..db196c8f7ee 100644
--- a/lispref/files.texi
+++ b/lispref/files.texi
@@ -1081,9 +1081,9 @@ In the first part of the following example, we list two files,
1081@end group 1081@end group
1082@end example 1082@end example
1083 1083
1084Then we evaluate the form @code{(add-name-to-file "~/lewis/foo" 1084Now we create a hard link, by calling @code{add-name-to-file}, then list
1085"~/lewis/foo2")}. Again we list the files. This shows two names, 1085the files again. This shows two names for one file, @file{foo} and
1086@file{foo} and @file{foo2}. 1086@file{foo2}.
1087 1087
1088@example 1088@example
1089@group 1089@group
@@ -1683,8 +1683,8 @@ The argument @var{partial-filename} must be a file name containing no
1683directory part and no slash. The current buffer's default directory is 1683directory part and no slash. The current buffer's default directory is
1684prepended to @var{directory}, if @var{directory} is not absolute. 1684prepended to @var{directory}, if @var{directory} is not absolute.
1685 1685
1686In the following example, suppose that the current default directory, 1686In the following example, suppose that @file{~rms/lewis} is the current
1687@file{~rms/lewis}, has five files whose names begin with @samp{f}: 1687default directory, and has five files whose names begin with @samp{f}:
1688@file{foo}, @file{file~}, @file{file.c}, @file{file.c.~1~}, and 1688@file{foo}, @file{file~}, @file{file.c}, @file{file.c.~1~}, and
1689@file{file.c.~2~}.@refill 1689@file{file.c.~2~}.@refill
1690 1690
@@ -1948,26 +1948,30 @@ Here are the operations that a magic file name handler gets to handle:
1948@code{delete-file},@* 1948@code{delete-file},@*
1949@code{diff-latest-backup-file}, 1949@code{diff-latest-backup-file},
1950@code{directory-file-name}, 1950@code{directory-file-name},
1951@code{directory-files}, @code{dired-call-process}, 1951@code{directory-files},@*
1952@code{dired-call-process},
1952@code{dired-compress-file}, @code{dired-uncache}, 1953@code{dired-compress-file}, @code{dired-uncache},
1953@code{expand-file-name},@* 1954@code{expand-file-name},@*
1954@code{file-accessible-directory-p}, 1955@code{file-accessible-directory-p},
1955@code{file-attributes}, @code{file-directory-p}, 1956@code{file-attributes}, @code{file-directory-p},@*
1956@code{file-executable-p}, @code{file-exists-p}, @code{file-local-copy}, 1957@code{file-executable-p}, @code{file-exists-p}, @code{file-local-copy},
1957@code{file-modes}, @code{file-name-all-completions}, 1958@code{file-modes}, @code{file-name-all-completions},
1958@code{file-name-as-directory}, @code{file-name-completion}, 1959@code{file-name-as-directory}, @code{file-name-completion},@*
1959@code{file-name-directory}, @code{file-name-nondirectory}, 1960@code{file-name-directory},
1961@code{file-name-nondirectory},
1960@code{file-name-sans-versions}, @code{file-newer-than-file-p}, 1962@code{file-name-sans-versions}, @code{file-newer-than-file-p},
1961@code{file-ownership-preserved-p}, 1963@code{file-ownership-preserved-p},
1962@code{file-readable-p}, @code{file-regular-p}, @code{file-symlink-p}, 1964@code{file-readable-p}, @code{file-regular-p}, @code{file-symlink-p},
1963@code{file-truename}, @code{file-writable-p}, 1965@code{file-truename}, @code{file-writable-p},
1964@code{find-backup-file-name}, 1966@code{find-backup-file-name},
1965@code{get-file-buffer}, 1967@code{get-file-buffer},
1966@code{insert-directory}, @code{insert-file-contents}, 1968@code{insert-directory},@*
1969@code{insert-file-contents},
1967@code{load}, @code{make-directory}, 1970@code{load}, @code{make-directory},
1968@code{make-symbolic-link}, @code{rename-file}, @code{set-file-modes}, 1971@code{make-symbolic-link}, @code{rename-file}, @code{set-file-modes},
1969@code{set-visited-file-modtime}, @code{shell-command}. 1972@code{set-visited-file-modtime}, @code{shell-command}.
1970@code{unhandled-file-name-directory}, @code{vc-registered}, 1973@code{unhandled-file-name-directory},@*
1974@code{vc-registered},
1971@code{verify-visited-file-modtime}, @code{write-region}. 1975@code{verify-visited-file-modtime}, @code{write-region}.
1972 1976
1973Handlers for @code{insert-file-contents} typically need to clear the 1977Handlers for @code{insert-file-contents} typically need to clear the
diff --git a/lispref/help.texi b/lispref/help.texi
index d551a1968bd..5b0b2f993ba 100644
--- a/lispref/help.texi
+++ b/lispref/help.texi
@@ -213,7 +213,7 @@ but provides more information.
213 213
214---------- Buffer: *Help* ---------- 214---------- Buffer: *Help* ----------
215goal-column Option 215goal-column Option
216*Semipermanent goal column for vertical motion, as set by C-x C-n, or nil. 216*Semipermanent goal column for vertical motion, as set by @dots{}
217@end group 217@end group
218@c Do not blithely break or fill these lines. 218@c Do not blithely break or fill these lines.
219@c That makes them incorrect. 219@c That makes them incorrect.
diff --git a/lispref/internals.texi b/lispref/internals.texi
index 6cacc26b85b..48323f79d33 100644
--- a/lispref/internals.texi
+++ b/lispref/internals.texi
@@ -400,7 +400,7 @@ appearance.)
400@smallexample 400@smallexample
401@group 401@group
402DEFUN ("or", For, Sor, 0, UNEVALLED, 0, 402DEFUN ("or", For, Sor, 0, UNEVALLED, 0,
403 "Eval args until one of them yields non-nil, then return that value.\n\ 403 "Eval args until one of them yields non-nil; return that value.\n\
404The remaining args are not evalled at all.\n\ 404The remaining args are not evalled at all.\n\
405@end group 405@end group
406@group 406@group
diff --git a/lispref/loading.texi b/lispref/loading.texi
index 34d90168ae1..29c2480f1f5 100644
--- a/lispref/loading.texi
+++ b/lispref/loading.texi
@@ -474,7 +474,7 @@ the definition for @code{run-prolog} includes the following code:
474 474
475@smallexample 475@smallexample
476(defun run-prolog () 476(defun run-prolog ()
477 "Run an inferior Prolog process, input and output via buffer *prolog*." 477 "Run an inferior Prolog process, with I/O via buffer *prolog*."
478 (interactive) 478 (interactive)
479 (require 'comint) 479 (require 'comint)
480 (switch-to-buffer (make-comint "prolog" prolog-program-name)) 480 (switch-to-buffer (make-comint "prolog" prolog-program-name))
diff --git a/lispref/minibuf.texi b/lispref/minibuf.texi
index 36e976dbcb7..9ff436a8fc1 100644
--- a/lispref/minibuf.texi
+++ b/lispref/minibuf.texi
@@ -861,9 +861,9 @@ Command name?
861If the user types @kbd{forward-c @key{RET}}, then this function returns 861If the user types @kbd{forward-c @key{RET}}, then this function returns
862@code{forward-char}. 862@code{forward-char}.
863 863
864The @code{read-command} function is a simplified interface to the 864The @code{read-command} function is a simplified interface to
865function @code{completing-read}. It uses the variable @code{obarray} so 865@code{completing-read}. It uses the variable @code{obarray} so as to
866as to complete in the set of extant Lisp symbols, and it uses the 866complete in the set of extant Lisp symbols, and it uses the
867@code{commandp} predicate so as to accept only command names: 867@code{commandp} predicate so as to accept only command names:
868 868
869@cindex @code{commandp} example 869@cindex @code{commandp} example
diff --git a/lispref/numbers.texi b/lispref/numbers.texi
index e2077955df5..6189e3da42f 100644
--- a/lispref/numbers.texi
+++ b/lispref/numbers.texi
@@ -103,8 +103,8 @@ complement} notation.)
1031111 1111 1111 1111 1111 1111 1011 1031111 1111 1111 1111 1111 1111 1011
104@end example 104@end example
105 105
106 In this implementation, the largest 28-bit binary integer is the 106 In this implementation, the largest 28-bit binary integer value is
107decimal integer 134,217,727. In binary, it looks like this: 107134,217,727 in decimal. In binary, it looks like this:
108 108
109@example 109@example
1100111 1111 1111 1111 1111 1111 1111 1100111 1111 1111 1111 1111 1111 1111
diff --git a/lispref/objects.texi b/lispref/objects.texi
index dd7a7bb77fe..78412e2c312 100644
--- a/lispref/objects.texi
+++ b/lispref/objects.texi
@@ -1158,9 +1158,10 @@ uniquely).
1158sizes, and contents of the windows in a frame, so you can recreate the 1158sizes, and contents of the windows in a frame, so you can recreate the
1159same arrangement of windows later. 1159same arrangement of windows later.
1160 1160
1161 Window configurations do not have a read syntax. They print as 1161 Window configurations do not have a read syntax; their print syntax
1162@samp{#<window-configuration>}. @xref{Window Configurations}, for a 1162looks like @samp{#<window-configuration>}. @xref{Window
1163description of several functions related to window configurations. 1163Configurations}, for a description of several functions related to
1164window configurations.
1164 1165
1165@node Process Type 1166@node Process Type
1166@subsection Process Type 1167@subsection Process Type
@@ -1427,11 +1428,11 @@ types. In most cases, it is more convenient to use type predicates than
1427 1428
1428@defun type-of object 1429@defun type-of object
1429This function returns a symbol naming the primitive type of 1430This function returns a symbol naming the primitive type of
1430@var{object}. The value is one of @code{symbol}, @code{integer}, 1431@var{object}. The value is one of the symbols @code{symbol},
1431@code{float}, @code{string}, @code{cons}, @code{vector}, @code{marker}, 1432@code{integer}, @code{float}, @code{string}, @code{cons}, @code{vector},
1432@code{overlay}, @code{window}, @code{buffer}, @code{subr}, 1433@code{marker}, @code{overlay}, @code{window}, @code{buffer},
1433@code{compiled-function}, @code{window-configuration}, or 1434@code{subr}, @code{compiled-function}, @code{process}, or
1434@code{process}. 1435@code{window-configuration}.
1435 1436
1436@example 1437@example
1437(type-of 1) 1438(type-of 1)
diff --git a/lispref/searching.texi b/lispref/searching.texi
index 9c8c37e08d3..a9e45998926 100644
--- a/lispref/searching.texi
+++ b/lispref/searching.texi
@@ -370,8 +370,9 @@ is a grouping construct that serves three purposes:
370 370
371@enumerate 371@enumerate
372@item 372@item
373To enclose a set of @samp{\|} alternatives for other operations. 373To enclose a set of @samp{\|} alternatives for other operations. Thus,
374Thus, @samp{\(foo\|bar\)x} matches either @samp{foox} or @samp{barx}. 374the regular expression @samp{\(foo\|bar\)x} matches either @samp{foox}
375or @samp{barx}.
375 376
376@item 377@item
377To enclose an expression for a suffix operator such as @samp{*} to act 378To enclose an expression for a suffix operator such as @samp{*} to act
diff --git a/lispref/text.texi b/lispref/text.texi
index 5802efb4ca9..fb718fa41e1 100644
--- a/lispref/text.texi
+++ b/lispref/text.texi
@@ -1183,7 +1183,7 @@ paragraphs are removed. This function justifies as well as filling when
1183 1183
1184In an interactive call, any prefix argument requests justification. 1184In an interactive call, any prefix argument requests justification.
1185 1185
1186In Adaptive Fill mode, which is enabled by default, 1186In Adaptive Fill mode, which is enabled by default, calling the function
1187@code{fill-region-as-paragraph} on an indented paragraph when there is 1187@code{fill-region-as-paragraph} on an indented paragraph when there is
1188no fill prefix uses the indentation of the second line of the paragraph 1188no fill prefix uses the indentation of the second line of the paragraph
1189as the fill prefix. 1189as the fill prefix.
@@ -1200,7 +1200,7 @@ of justification. It can be @code{left}, @code{right}, @code{full},
1200follow specified justification style (see @code{current-justification}, 1200follow specified justification style (see @code{current-justification},
1201below). @code{nil} means to do full justification. 1201below). @code{nil} means to do full justification.
1202 1202
1203If @var{eop} is non-@code{nil}, that means do left-justification when 1203If @var{eop} is non-@code{nil}, that means do left-justification if
1204@code{current-justification} specifies full justification. This is used 1204@code{current-justification} specifies full justification. This is used
1205for the last line of a paragraph; even if the paragraph as a whole is 1205for the last line of a paragraph; even if the paragraph as a whole is
1206fully justified, the last line should not be. 1206fully justified, the last line should not be.
diff --git a/lispref/tips.texi b/lispref/tips.texi
index 7a10f212153..1d797fb3ef9 100644
--- a/lispref/tips.texi
+++ b/lispref/tips.texi
@@ -450,11 +450,11 @@ single-quotes for those symbols.)
450@item 450@item
451Don't write key sequences directly in documentation strings. Instead, 451Don't write key sequences directly in documentation strings. Instead,
452use the @samp{\\[@dots{}]} construct to stand for them. For example, 452use the @samp{\\[@dots{}]} construct to stand for them. For example,
453instead of writing @samp{C-f}, write @samp{\\[forward-char]}. When 453instead of writing @samp{C-f}, write the construct
454Emacs displays the documentation string, it substitutes whatever key is 454@samp{\\[forward-char]}. When Emacs displays the documentation string,
455currently bound to @code{forward-char}. (This is normally @samp{C-f}, 455it substitutes whatever key is currently bound to @code{forward-char}.
456but it may be some other character if the user has moved key bindings.) 456(This is normally @samp{C-f}, but it may be some other character if the
457@xref{Keys in Documentation}. 457user has moved key bindings.) @xref{Keys in Documentation}.
458 458
459@item 459@item
460In documentation strings for a major mode, you will want to refer to the 460In documentation strings for a major mode, you will want to refer to the
diff --git a/lispref/windows.texi b/lispref/windows.texi
index 5b2c9c9cd6b..36b422d21c7 100644
--- a/lispref/windows.texi
+++ b/lispref/windows.texi
@@ -259,7 +259,7 @@ Here is the complete function definition for it:
259@smallexample 259@smallexample
260@group 260@group
261(defun split-window-vertically (&optional arg) 261(defun split-window-vertically (&optional arg)
262 "Split current window into two windows, one above the other." 262 "Split current window into two windows, @dots{}"
263 (interactive "P") 263 (interactive "P")
264 (split-window nil (and arg (prefix-numeric-value arg)))) 264 (split-window nil (and arg (prefix-numeric-value arg))))
265@end group 265@end group