aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2014-09-18 20:20:57 +0300
committerEli Zaretskii2014-09-18 20:20:57 +0300
commit41932b21a2f716ec1021485c40331ee9a88a66a3 (patch)
treeb5d22af898cae5580dc7839f6ee846567b887c86 /src
parenta810675374498ff80464e48eeeb39f1854ef37bd (diff)
downloademacs-41932b21a2f716ec1021485c40331ee9a88a66a3.tar.gz
emacs-41932b21a2f716ec1021485c40331ee9a88a66a3.zip
Clarify the doc strings of mouse-position and set-mouse-position.
src/frame.c (Fmouse_position, Fset_mouse_position): Clarify the units in which the position is measured. (Bug#18493)
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog3
-rw-r--r--src/frame.c13
2 files changed, 10 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 880f49e3e89..b442158a828 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
12014-09-18 Eli Zaretskii <eliz@gnu.org> 12014-09-18 Eli Zaretskii <eliz@gnu.org>
2 2
3 * frame.c (Fmouse_position, Fset_mouse_position): Clarify the
4 units in which the position is measured. (Bug#18493)
5
3 * xdisp.c (redisplay_internal): Force redisplay of all windows 6 * xdisp.c (redisplay_internal): Force redisplay of all windows
4 that show a buffer whose narrowing has changed. (Bug#18490) 7 that show a buffer whose narrowing has changed. (Bug#18490)
5 8
diff --git a/src/frame.c b/src/frame.c
index 0c130164352..35fd190ba28 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1524,9 +1524,9 @@ The functions are run with one argument, the frame to be deleted. */)
1524 1524
1525DEFUN ("mouse-position", Fmouse_position, Smouse_position, 0, 0, 0, 1525DEFUN ("mouse-position", Fmouse_position, Smouse_position, 0, 0, 0,
1526 doc: /* Return a list (FRAME X . Y) giving the current mouse frame and position. 1526 doc: /* Return a list (FRAME X . Y) giving the current mouse frame and position.
1527The position is given in character cells, where (0, 0) is the 1527The position is given in canonical character cells, where (0, 0) is the
1528upper-left corner of the frame, X is the horizontal offset, and Y is 1528upper-left corner of the frame, X is the horizontal offset, and Y is the
1529the vertical offset. 1529vertical offset, measured in units of the frame's default character size.
1530If Emacs is running on a mouseless terminal or hasn't been programmed 1530If Emacs is running on a mouseless terminal or hasn't been programmed
1531to read the mouse position, it returns the selected frame for FRAME 1531to read the mouse position, it returns the selected frame for FRAME
1532and nil for X and Y. 1532and nil for X and Y.
@@ -1609,9 +1609,10 @@ Coordinates are relative to the frame, not a window,
1609so the coordinates of the top left character in the frame 1609so the coordinates of the top left character in the frame
1610may be nonzero due to left-hand scroll bars or the menu bar. 1610may be nonzero due to left-hand scroll bars or the menu bar.
1611 1611
1612The position is given in character cells, where (0, 0) is the 1612The position is given in canonical character cells, where (0, 0) is
1613upper-left corner of the frame, X is the horizontal offset, and Y is 1613the upper-left corner of the frame, X is the horizontal offset, and
1614the vertical offset. 1614Y is the vertical offset, measured in units of the frame's default
1615character size.
1615 1616
1616This function is a no-op for an X frame that is not visible. 1617This function is a no-op for an X frame that is not visible.
1617If you have just created a frame, you must wait for it to become visible 1618If you have just created a frame, you must wait for it to become visible