diff options
| author | Miles Bader | 2007-08-13 13:51:08 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-08-13 13:51:08 +0000 |
| commit | aaf34461ff5804e5cebe163b31e535da72e81d87 (patch) | |
| tree | b096310b459b78e437f08ac0f1f00954840a5db5 /src/window.c | |
| parent | 61d032dfd91b811d59acd7605ac02758be97e912 (diff) | |
| parent | 37cc095b6a175fb5a2fb18fa029eaf3aa3b3fa53 (diff) | |
| download | emacs-aaf34461ff5804e5cebe163b31e535da72e81d87.tar.gz emacs-aaf34461ff5804e5cebe163b31e535da72e81d87.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 846-851)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 88-92)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 242-244)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-31
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/window.c b/src/window.c index cda5eccf082..3db1802a861 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -559,6 +559,15 @@ use (let ((edges (window-edges))) (- (nth 2 edges) (nth 0 edges))). */) | |||
| 559 | return make_number (window_box_text_cols (decode_any_window (window))); | 559 | return make_number (window_box_text_cols (decode_any_window (window))); |
| 560 | } | 560 | } |
| 561 | 561 | ||
| 562 | DEFUN ("window-full-width-p", Fwindow_full_width_p, Swindow_full_width_p, 0, 1, 0, | ||
| 563 | doc: /* Return t if WINDOW is as wide as its frame. | ||
| 564 | WINDOW defaults to the selected window. */) | ||
| 565 | (window) | ||
| 566 | Lisp_Object window; | ||
| 567 | { | ||
| 568 | return WINDOW_FULL_WIDTH_P (decode_any_window (window)) ? Qt : Qnil; | ||
| 569 | } | ||
| 570 | |||
| 562 | DEFUN ("window-hscroll", Fwindow_hscroll, Swindow_hscroll, 0, 1, 0, | 571 | DEFUN ("window-hscroll", Fwindow_hscroll, Swindow_hscroll, 0, 1, 0, |
| 563 | doc: /* Return the number of columns by which WINDOW is scrolled from left margin. | 572 | doc: /* Return the number of columns by which WINDOW is scrolled from left margin. |
| 564 | WINDOW defaults to the selected window. */) | 573 | WINDOW defaults to the selected window. */) |
| @@ -7517,6 +7526,7 @@ The selected frame is the one whose configuration has changed. */); | |||
| 7517 | defsubr (&Swindow_buffer); | 7526 | defsubr (&Swindow_buffer); |
| 7518 | defsubr (&Swindow_height); | 7527 | defsubr (&Swindow_height); |
| 7519 | defsubr (&Swindow_width); | 7528 | defsubr (&Swindow_width); |
| 7529 | defsubr (&Swindow_full_width_p); | ||
| 7520 | defsubr (&Swindow_hscroll); | 7530 | defsubr (&Swindow_hscroll); |
| 7521 | defsubr (&Sset_window_hscroll); | 7531 | defsubr (&Sset_window_hscroll); |
| 7522 | defsubr (&Swindow_redisplay_end_trigger); | 7532 | defsubr (&Swindow_redisplay_end_trigger); |