summaryrefslogtreecommitdiff
path: root/src/keyboard.c
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2017-03-19 12:34:04 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2017-03-19 12:34:04 -0700
commitda17b70a997d3b1c38d9f3d7d8ab6c7dab273765 (patch)
tree28c6e45159f45912c6bd3d17de7bf71e85272bfe /src/keyboard.c
parent640335361ccc36945836b5e7de0dbbf984b332e8 (diff)
parenta09473261c8b11243e68d84c5dc2448d65a67e77 (diff)
downloademacs-da17b70a997d3b1c38d9f3d7d8ab6c7dab273765.tar.gz
Merge from origin/emacs-25
a094732 * etc/PROBLEMS: Say that HP-UX cc doesn't work. 1925dd9 Fix duplicate wording in Emacs manual 6de8429 * lisp/paren.el (show-paren--default, show-paren-function): A... 2d671fd Fix wording in Emacs manual a8766a2 Document how to customize input methods 6eb8995 * lisp/net/eww.el (eww-reload): Doc fix. (Bug#25981) aceac95 Fix warning message about native completion (Bug#25984) a314c1f Clarify documentation of 'raise' and 'height' display specs f366f6e Mention problems with GPaste in PROBLEMS 6e788ef ; etc/PROBLEMS: Explain about the python+libedit problem (Bug... 6406618 Fix doc strings in info.el c1ed152 ; * src/keyboard.c (Fposn_at_point): Fix last change. eed9677 Fix doc string of 'posn-at-point' 0d5957e Documentation fix in elisp reference manual
Diffstat (limited to 'src/keyboard.c')
-rw-r--r--src/keyboard.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/keyboard.c b/src/keyboard.c
index ec4dee01720..2e0a813bb08 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -10758,13 +10758,13 @@ The `posn-' functions access elements of such lists. */)
}
DEFUN ("posn-at-point", Fposn_at_point, Sposn_at_point, 0, 2, 0,
- doc: /* Return position information for buffer POS in WINDOW.
+ doc: /* Return position information for buffer position POS in WINDOW.
POS defaults to point in WINDOW; WINDOW defaults to the selected window.
-Return nil if position is not visible in window. Otherwise,
+Return nil if POS is not visible in WINDOW. Otherwise,
the return value is similar to that returned by `event-start' for
a mouse click at the upper left corner of the glyph corresponding
-to the given buffer position:
+to POS:
(WINDOW AREA-OR-POS (X . Y) TIMESTAMP OBJECT POS (COL . ROW)
IMAGE (DX . DY) (WIDTH . HEIGHT))
The `posn-' functions access elements of such lists. */)