diff options
| author | Jan D | 2010-07-01 20:09:28 +0200 |
|---|---|---|
| committer | Jan D | 2010-07-01 20:09:28 +0200 |
| commit | c49d071ad0904c8700dc64fff24abde0ba7d10c4 (patch) | |
| tree | 8ceaf56ec5c2d59e5dca88a044210e74b62b8f89 /src | |
| parent | e4f6153f96ca61bf239a7153f9999c1624d7a924 (diff) | |
| download | emacs-c49d071ad0904c8700dc64fff24abde0ba7d10c4.tar.gz emacs-c49d071ad0904c8700dc64fff24abde0ba7d10c4.zip | |
* window.c (Fwindow_absolute_pixel_edges): Doc fix.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/window.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index ce75b2800b2..2a40d0d75c8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2010-07-01 Jan Djärv <jan.h.d@swipnet.se> | 1 | 2010-07-01 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 2 | ||
| 3 | * window.c (Fwindow_absolute_pixel_edges): Doc fix. | ||
| 4 | |||
| 3 | * window.c (calc_absolute_offset, Fwindow_absolute_pixel_edges) | 5 | * window.c (calc_absolute_offset, Fwindow_absolute_pixel_edges) |
| 4 | (Fwindow_inside_absolute_pixel_edges): New functions (bug#5721). | 6 | (Fwindow_inside_absolute_pixel_edges): New functions (bug#5721). |
| 5 | 7 | ||
diff --git a/src/window.c b/src/window.c index deca842243a..d77c6208693 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -679,7 +679,7 @@ RIGHT is one more than the rightmost x position occupied by WINDOW. | |||
| 679 | BOTTOM is one more than the bottommost y position occupied by WINDOW. | 679 | BOTTOM is one more than the bottommost y position occupied by WINDOW. |
| 680 | The pixel edges include the space used by WINDOW's scroll bar, display | 680 | The pixel edges include the space used by WINDOW's scroll bar, display |
| 681 | margins, fringes, header line, and/or mode line. For the pixel edges | 681 | margins, fringes, header line, and/or mode line. For the pixel edges |
| 682 | of just the text area, use `window-inside-pixel-edges'. */) | 682 | of just the text area, use `window-inside-absolute-pixel-edges'. */) |
| 683 | (window) | 683 | (window) |
| 684 | Lisp_Object window; | 684 | Lisp_Object window; |
| 685 | { | 685 | { |