mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2025-02-03 20:24:29 +00:00
Fix minor Texinfo usage.
This commit is contained in:
parent
7a010076e3
commit
9a8dc0d341
@ -143,9 +143,9 @@ ignored.
|
||||
|
||||
@defvar make-backup-file-name-function
|
||||
@tindex make-backup-file-name-function
|
||||
This variable's value is a function to use for making backups instead of
|
||||
the default @code{make-backup-file-name}. A value of nil gives the
|
||||
default @code{make-backup-file-name} behaviour.
|
||||
This variable's value is a function to use for making backups instead
|
||||
of the default @code{make-backup-file-name}. A value of @code{nil}
|
||||
gives the default @code{make-backup-file-name} behaviour.
|
||||
|
||||
This could be buffer-local to do something special for specific
|
||||
files. If you define it, you may need to change
|
||||
@ -558,9 +558,9 @@ the current buffer is large, the specified timeout is multiplied by a
|
||||
factor that increases as the size increases; for a million-byte
|
||||
buffer, the factor is almost 4.)
|
||||
|
||||
If the value is zero or nil, then auto-saving is not done as a result
|
||||
of idleness, only after a certain number of input events
|
||||
as specified by @code{auto-save-interval}.
|
||||
If the value is zero or @code{nil}, then auto-saving is not done as a
|
||||
result of idleness, only after a certain number of input events as
|
||||
specified by @code{auto-save-interval}.
|
||||
@end defopt
|
||||
|
||||
@defvar auto-save-hook
|
||||
|
@ -1668,14 +1668,15 @@ that means the selected frame (@pxref{Input Focus}).
|
||||
If @var{frame} is @code{t}, the value is the default for
|
||||
@var{face} for new frames.
|
||||
|
||||
If @var{inherit} is nil, only attributes directly defined by
|
||||
If @var{inherit} is @code{nil}, only attributes directly defined by
|
||||
@var{face} are considered, so the return value may be
|
||||
@code{unspecified}, or a relative value. If @var{inherit} is non-nil,
|
||||
@var{face}'s definition of @var{attribute} is merged with the faces
|
||||
specified by its @code{:inherit} attribute; however the return value
|
||||
may still be @code{unspecified} or relative. If @var{inherit} is a
|
||||
face or a list of faces, then the result is further merged with that
|
||||
face (or faces), until it becomes specified and absolute.
|
||||
@code{unspecified}, or a relative value. If @var{inherit} is
|
||||
non-@code{nil}, @var{face}'s definition of @var{attribute} is merged
|
||||
with the faces specified by its @code{:inherit} attribute; however the
|
||||
return value may still be @code{unspecified} or relative. If
|
||||
@var{inherit} is a face or a list of faces, then the result is further
|
||||
merged with that face (or faces), until it becomes specified and
|
||||
absolute.
|
||||
|
||||
To ensure that the return value is always specified and absolute, use
|
||||
a value of @code{default} for @var{inherit}; this will resolve any
|
||||
@ -1790,12 +1791,13 @@ specified, use a value of @code{default} for @var{inherit}.
|
||||
This function returns the name of the background stipple pattern of face
|
||||
@var{face}, or @code{nil} if it doesn't have one.
|
||||
|
||||
If @var{inherit} is nil, only a stipple directly defined by the face
|
||||
is returned. If @var{inherit} is non-nil, any faces specified by its
|
||||
@code{:inherit} attribute are considered as well, and if @var{inherit}
|
||||
is a face or a list of faces, then they are also considered, until a
|
||||
specified stipple is found. To ensure that the return value is always
|
||||
specified, use a value of @code{default} for @var{inherit}.
|
||||
If @var{inherit} is @code{nil}, only a stipple directly defined by the
|
||||
face is returned. If @var{inherit} is non-@code{nil}, any faces
|
||||
specified by its @code{:inherit} attribute are considered as well, and
|
||||
if @var{inherit} is a face or a list of faces, then they are also
|
||||
considered, until a specified stipple is found. To ensure that the
|
||||
return value is always specified, use a value of @code{default} for
|
||||
@var{inherit}.
|
||||
@end defun
|
||||
|
||||
@defun face-font face &optional frame
|
||||
@ -2140,9 +2142,10 @@ The first five elements correspond to face attributes; if you
|
||||
specify these attributes for a face, it will use this font.
|
||||
|
||||
The last three elements give additional information about the font.
|
||||
@var{fixed-p} is non-nil if the font is fixed-pitch. @var{full} is the
|
||||
full name of the font, and @var{registry-and-encoding} is a string
|
||||
giving the registry and encoding of the font.
|
||||
@var{fixed-p} is non-@code{nil} if the font is fixed-pitch.
|
||||
@var{full} is the full name of the font, and
|
||||
@var{registry-and-encoding} is a string giving the registry and
|
||||
encoding of the font.
|
||||
|
||||
The result list is sorted according to the current face font sort order.
|
||||
@end defun
|
||||
@ -2685,9 +2688,9 @@ color from the corners is the background color of the image. Otherwise,
|
||||
@var{bg} must be a list @code{(@var{red} @var{green} @var{blue})}
|
||||
specifying the color to assume for the background of the image.
|
||||
|
||||
If @var{mask} is nil, remove a mask from the image, if it has one. Images
|
||||
in some formats include a mask which can be removed by specifying
|
||||
@code{:mask nil}.
|
||||
If @var{mask} is @code{nil}, remove a mask from the image, if it has
|
||||
one. Images in some formats include a mask which can be removed by
|
||||
specifying @code{:mask nil}.
|
||||
@end table
|
||||
|
||||
@defun image-mask-p spec &optional frame
|
||||
@ -3008,10 +3011,10 @@ This removes only images that were put into @var{buffer} the way
|
||||
@tindex image-size
|
||||
This function returns the size of an image as a pair
|
||||
@w{@code{(@var{width} . @var{height})}}. @var{spec} is an image
|
||||
specification. @var{pixels} non-nil means return sizes measured in
|
||||
pixels, otherwise return sizes measured in canonical character units
|
||||
(fractions of the width/height of the frame's default font).
|
||||
@var{frame} is the frame on which the image will be displayed.
|
||||
specification. @var{pixels} non-@code{nil} means return sizes
|
||||
measured in pixels, otherwise return sizes measured in canonical
|
||||
character units (fractions of the width/height of the frame's default
|
||||
font). @var{frame} is the frame on which the image will be displayed.
|
||||
@var{frame} null or omitted means use the selected frame (@pxref{Input
|
||||
Focus}).
|
||||
@end defun
|
||||
|
@ -1550,7 +1550,7 @@ until the @emph{next} time Edebug is invoked via a new command.
|
||||
@c A new command is not precisely true, but that is close enough -- dan
|
||||
|
||||
@defopt edebug-global-break-condition
|
||||
If non-@code{nil}, an expression to test for at every stop point.
|
||||
If the result is non-nil, then break. Errors are ignored.
|
||||
If non-@code{nil}, an expression to test for at every stop point. If
|
||||
the result is non-@code{nil}, then break. Errors are ignored.
|
||||
@xref{Global Break Condition}.
|
||||
@end defopt
|
||||
|
Loading…
x
Reference in New Issue
Block a user