diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2016-11-19 14:31:05 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-11-19 14:31:05 -0800 |
commit | c61ee94959ba96b2a327df0684593f7e569e30be (patch) | |
tree | 33e7b6bdb654b45ebeed805f48b1324b2ab038ec /doc/lispref | |
parent | b19e05b13192f72991b65b4b352e09c807fd581c (diff) | |
parent | 4af5981dc75c96e34a27922001106df05ee19e69 (diff) | |
download | emacs-c61ee94959ba96b2a327df0684593f7e569e30be.tar.gz |
Merge from origin/emacs-25
4af5981 Add a comment in generated refcards about the source
ef880a5 ; * etc/refcards/calccard.tex: Remove obsolete comment.
4887e7c js-mode: Fix indent problem after a regexp
e992ac0 Fix sluggish display of symbols in UTF-8 language environment
1fc101b Don't confuse how Texinfo outputs @var with the input
91aa5d1 * doc/lispref/display.texi (Scroll Bars): * doc/lispref/frame...
f758fcd * doc/emacs/cmdargs.texi (Initial Options): Copyedit for --da...
5b0cddd More fixes in copyright notices in etc/refcards/
f994c20 Update copyright text in refcards
9ad2ae7 Fix Outline command names
26c3554 Send text received by bracketed paste to process
db0b58d Correct the statement about programming modes always running ...
78aece4 Improve documentation of 'occur'
eb364fd Do call debugger on failed cl-assert
3ef4ee8 Avoid infloop in python
8da810f Don't refer to obsolete FEATURE-unload-hook
4f478ca Improve documentation of dabbrevs
7272e5d * lisp/chistory.el (list-command-history): Doc fix. (Bug#24890)
89b7482 * lisp/simple.el (set-mark-command): Doc fix. (Bug#24890)
3b199f7 Improve documentation of some Help commands
93d3a0e Fix documentation of yes-or-no prompts
af04919 Fix documentation of partial completion style
ed80184 Fix documentation of the mode line on emacsclient frames
e6be855 Fix description of 'C-z' in User manual
16f7007 Improve and clarify documentation of Outline Mode
31d93aa Add Emacs version number to nt/README.W32
0b6b815 Fix python-mode hideshow regexp
dc152c5 Modernize usage of 'macOS' in doc and comments
84c5343 Prefer comments /* like this */ in C code
bb61e50 * doc/lispref/loading.texi (Autoload): Better link (Bug#24845).
3ef86fd Clarify documentation of face attribute functions
de51d59 ; * nt/README.W32: Minor copyedits.
db436e9 Don't call debug on failed cl-assert
# Conflicts:
# doc/emacs/cmdargs.texi
# etc/NEWS
# etc/PROBLEMS
# lisp/auth-source.el
# lisp/net/tramp-sh.el
Diffstat (limited to 'doc/lispref')
-rw-r--r-- | doc/lispref/control.texi | 2 | ||||
-rw-r--r-- | doc/lispref/display.texi | 15 | ||||
-rw-r--r-- | doc/lispref/frames.texi | 8 | ||||
-rw-r--r-- | doc/lispref/loading.texi | 4 | ||||
-rw-r--r-- | doc/lispref/nonascii.texi | 3 | ||||
-rw-r--r-- | doc/lispref/os.texi | 2 | ||||
-rw-r--r-- | doc/lispref/processes.texi | 2 | ||||
-rw-r--r-- | doc/lispref/text.texi | 2 | ||||
-rw-r--r-- | doc/lispref/tips.texi | 8 | ||||
-rw-r--r-- | doc/lispref/windows.texi | 6 |
10 files changed, 26 insertions, 26 deletions
diff --git a/doc/lispref/control.texi b/doc/lispref/control.texi index 0c0827909a3..947c54f9c35 100644 --- a/doc/lispref/control.texi +++ b/doc/lispref/control.texi @@ -368,7 +368,7 @@ UPattern. For example: @item (app @var{function} @var{upattern}) Matches if @var{function} applied to the value being matched returns a value that matches @var{upattern}. This is like the @code{pred} -UPattern, except that it tests the result against @var{UPattern}, +UPattern, except that it tests the result against @var{upattern}, rather than against a boolean truth value. The @var{function} call can use one of the forms described below. @item (or @var{upattern1} @var{upattern2}@dots{}) diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index d050738d80f..851baa31f30 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -2548,7 +2548,7 @@ modifying the attributes of a named face. This function returns the value of the @var{attribute} attribute for @var{face} on @var{frame}. -If @var{frame} is @code{nil}, that means the selected frame +If @var{frame} is omitted or @code{nil}, that means the selected frame (@pxref{Input Focus}). If @var{frame} is @code{t}, this function returns the value of the specified attribute for newly-created frames (this is normally @code{unspecified}, unless you have specified some @@ -2644,8 +2644,8 @@ created frames. The following commands and functions mostly provide compatibility with old versions of Emacs. They work by calling -@code{set-face-attribute}. Values of @code{t} and @code{nil} for -their @var{frame} argument are handled just like +@code{set-face-attribute}. Values of @code{t} and @code{nil} (or +omitted) for their @var{frame} argument are handled just like @code{set-face-attribute} and @code{face-attribute}. The commands read their arguments using the minibuffer, if called interactively. @@ -2714,7 +2714,8 @@ name used for @var{character}. @defun face-foreground face &optional frame inherit @defunx face-background face &optional frame inherit These functions return the foreground color (or background color, -respectively) of face @var{face}, as a string. +respectively) of face @var{face}, as a string. If the color is +unspecified, they return @code{nil}. @end defun @defun face-stipple face &optional frame inherit @@ -4178,12 +4179,12 @@ bar.) @var{horizontal-type} is either @code{bottom} or @code{nil} (which means no horizontal scroll bar). @end defun -@defun frame-scroll-bar-width &optional Lisp_Object &optional frame +@defun frame-scroll-bar-width &optional frame This function returns the width of vertical scroll bars of @var{frame} in pixels. @end defun -@defun frame-scroll-bar-height &optional Lisp_Object &optional frame +@defun frame-scroll-bar-height &optional frame This function returns the height of horizontal scroll bars of @var{frame} in pixels. @end defun @@ -7155,7 +7156,7 @@ Emacs is displaying the frame using X. Emacs is displaying the frame using native MS-Windows GUI. @item ns Emacs is displaying the frame using the Nextstep interface (used on -GNUstep and Mac OS X). +GNUstep and macOS). @item pc Emacs is displaying the frame using MS-DOS direct screen writes. @item nil diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi index 90f8e3501b2..dc1c524653d 100644 --- a/doc/lispref/frames.texi +++ b/doc/lispref/frames.texi @@ -764,7 +764,7 @@ its size using the @code{height} and @code{width} parameters with sizes and positions. For all of these functions the argument @var{frame} must denote a live frame and defaults to the selected frame. -@defun frame-position &optional Lisp_Object &optional frame +@defun frame-position &optional frame This function returns the outer position (@pxref{Frame Layout}) of @var{frame} in pixels. The value is a cons giving the coordinates of the top left corner of the outer frame of @var{frame} relative to an @@ -772,9 +772,9 @@ origin at the position (0, 0) of the frame's display. On a text terminal frame both values are zero. @end defun -@defun set-frame-position frame X Y -This function sets the outer frame position of @var{frame} to @var{X} -and @var{Y}. The latter arguments specify pixels and normally count +@defun set-frame-position frame x y +This function sets the outer frame position of @var{frame} to @var{x} +and @var{y}. The latter arguments specify pixels and normally count from an origin at the position (0, 0) of @var{frame}'s display. A negative parameter value positions the right edge of the outer frame diff --git a/doc/lispref/loading.texi b/doc/lispref/loading.texi index a73ae596e0d..44ce719bc1f 100644 --- a/doc/lispref/loading.texi +++ b/doc/lispref/loading.texi @@ -610,8 +610,8 @@ and @code{define-global-minor-mode}. @item Other definition types: @code{defcustom}, @code{defgroup}, @code{defclass} -(@pxref{Top,EIEIO,,eieio,EIEIO}), and @code{define-skeleton} (see the -commentary in @file{skeleton.el}). +(@pxref{Top,EIEIO,,eieio,EIEIO}), and @code{define-skeleton} +(@pxref{Top,Autotyping,,autotype,Autotyping}). @end table You can also use a magic comment to execute a form at build time diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi index fd2ce3248fd..9f805c2c1d9 100644 --- a/doc/lispref/nonascii.texi +++ b/doc/lispref/nonascii.texi @@ -1049,8 +1049,7 @@ Unix convention, used on GNU and Unix systems, is to use the linefeed character (also called newline). The DOS convention, used on MS-Windows and MS-DOS systems, is to use a carriage-return and a linefeed at the end of a line. The Mac convention is to use just -carriage-return. (This was the convention used on the Macintosh -system prior to OS X.) +carriage-return. (This was the convention used in Classic Mac OS.) @cindex base coding system @cindex variant coding system diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi index 3312705e167..903bad3b9c5 100644 --- a/doc/lispref/os.texi +++ b/doc/lispref/os.texi @@ -891,7 +891,7 @@ Berkeley BSD and its variants. Cygwin, a Posix layer on top of MS-Windows. @item darwin -Darwin (Mac OS X). +Darwin (macOS). @item gnu The GNU system (using the GNU kernel, which consists of the HURD and Mach). diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi index 87c0b5c7687..21e1429f59d 100644 --- a/doc/lispref/processes.texi +++ b/doc/lispref/processes.texi @@ -648,7 +648,7 @@ I/O, file-name-coding-system}). If @var{coding} is @code{nil}, the default rules for finding the coding system will apply. @xref{Default Coding Systems}. -@item :connection-type @var{TYPE} +@item :connection-type @var{type} Initialize the type of device used to communicate with the subprocess. Possible values are @code{pty} to use a pty, @code{pipe} to use a pipe, or @code{nil} to use the default derived from the value of the diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi index c6a3eb035ad..0da34d14f24 100644 --- a/doc/lispref/text.texi +++ b/doc/lispref/text.texi @@ -4666,7 +4666,7 @@ Return all nodes in @var{dom} that have IDs that match @var{match}, which is a regular expression. @item dom-strings @var{dom} -Return all strings in @var{DOM}. +Return all strings in @var{dom}. @end table diff --git a/doc/lispref/tips.texi b/doc/lispref/tips.texi index a8589df031c..b45e68d0d56 100644 --- a/doc/lispref/tips.texi +++ b/doc/lispref/tips.texi @@ -165,10 +165,10 @@ follow the naming conventions for hooks. @xref{Hooks}. @item @cindex unloading packages, preparing for If loading the file adds functions to hooks, define a function -@code{@var{feature}-unload-hook}, where @var{feature} is the name of -the feature the package provides, and make it undo any such changes. -Using @code{unload-feature} to unload the file will run this function. -@xref{Unloading}. +@code{@var{feature}-unload-function}, where @var{feature} is the name +of the feature the package provides, and make it undo any such +changes. Using @code{unload-feature} to unload the file will run this +function. @xref{Unloading}. @item It is a bad idea to define aliases for the Emacs primitives. Normally diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi index d66a9448e63..2823cc55214 100644 --- a/doc/lispref/windows.texi +++ b/doc/lispref/windows.texi @@ -557,7 +557,7 @@ time @code{window-size-change-functions} was run for the last time on @cindex pixel width of a window @cindex total pixel width of a window -@defun window-pixel-width &optional Lisp_Object &optional window +@defun window-pixel-width &optional window This function returns the width of window @var{window} in pixels. @var{window} must be a valid window and defaults to the selected one. @@ -4469,14 +4469,14 @@ This function returns the pixel edges of @var{window}'s body. Calling the origin of the display screen rather than that of the frame: @defun window-absolute-pixel-edges &optional window -This function returns the pixel coordinates of @var{WINDOW} relative to +This function returns the pixel coordinates of @var{window} relative to an origin at (0, 0) of the display of @var{window}'s frame. Calling @code{(window-absolute-pixel-edges)} is equivalent to calling @code{(window-edges window nil t t)}, see above. @end defun @defun window-absolute-body-pixel-edges &optional window -This function returns the pixel coordinates of @var{WINDOW}'s body +This function returns the pixel coordinates of @var{window}'s body relative to an origin at (0, 0) of the display of @var{window}'s frame. Calling @code{(window-absolute-body-pixel-edges window)} is equivalent to calling @code{(window-edges window t t t)}, see above. |