diff options
author | Glenn Morris <[email protected]> | 2014-06-14 17:06:30 -0700 |
---|---|---|
committer | Glenn Morris <[email protected]> | 2014-06-14 17:06:30 -0700 |
commit | 90de50e27049ae19492dd9843e50618ea4ed5d14 (patch) | |
tree | 1efdf48fb6243e3f8448465c59dda3eb9db67a0c /doc | |
parent | 799d2f3d87185a51835d0594a89485932d0f4c23 (diff) | |
parent | 27433ff85f21f108e84a6e8966c9461cf66c2015 (diff) |
Merge from emacs-24; up to 2014-06-03T06:51:[email protected]
Diffstat (limited to 'doc')
-rw-r--r-- | doc/lispref/ChangeLog | 5 | ||||
-rw-r--r-- | doc/lispref/commands.texi | 21 |
2 files changed, 16 insertions, 10 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index fd50c2aebd..f7c0d14abb 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,8 @@ +2014-06-15 Eli Zaretskii <[email protected]> + + * commands.texi (Accessing Mouse): Improve the wording of the + posn-col-row documentation. (Bug#17768) + 2014-06-10 Glenn Morris <[email protected]> * Makefile.in (INFO_EXT): Remove and replace by ".info" throughout. diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi index ad1bf80a85..58e903918b 100644 --- a/doc/lispref/commands.texi +++ b/doc/lispref/commands.texi @@ -2053,23 +2053,24 @@ POSITION is assumed to lie in a window text area." @defun posn-col-row position This function returns a cons cell @code{(@var{col} . @var{row})}, containing the estimated column and row corresponding to buffer -position @var{position}. The return value is given in units of the -frame's default character width and height, as computed from the -@var{x} and @var{y} values corresponding to @var{position}. (So, if -the actual characters have non-default sizes, the actual row and -column may differ from these computed values.) +position in @var{position}. The return value is given in units of the +frame's default character width and default line height (including +spacing), as computed from the @var{x} and @var{y} values +corresponding to @var{position}. (So, if the actual characters have +non-default sizes, the actual row and column may differ from these +computed values.) Note that @var{row} is counted from the top of the text area. If the -window possesses a header line (@pxref{Header Lines}), it is -@emph{not} counted as the first line. +window given by @var{position} possesses a header line (@pxref{Header +Lines}), it is @emph{not} included in the @var{row} count. @end defun @defun posn-actual-col-row position Return the actual row and column in @var{position}, as a cons cell @code{(@var{col} . @var{row})}. The values are the actual row and -column numbers in the window. @xref{Click Events}, for details. It -returns @code{nil} if @var{position} does not include actual positions -values. +column numbers in the window given by @var{position}. @xref{Click +Events}, for details. The function returns @code{nil} if +@var{position} does not include actual position values. @end defun @defun posn-string position |