aboutsummaryrefslogtreecommitdiffstats
path: root/src/window.c
diff options
context:
space:
mode:
authorMiles Bader2007-08-13 13:48:35 +0000
committerMiles Bader2007-08-13 13:48:35 +0000
commitb2e6b10fe2d40020a75ab0025af98a4abf339cd2 (patch)
treedb265e5ea93cdc13f8e3b54ed5c7ad2869d50ec9 /src/window.c
parent905350bef3ebc514a418658dd155c1d062664b56 (diff)
parent37cc095b6a175fb5a2fb18fa029eaf3aa3b3fa53 (diff)
downloademacs-b2e6b10fe2d40020a75ab0025af98a4abf339cd2.tar.gz
emacs-b2e6b10fe2d40020a75ab0025af98a4abf339cd2.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--unicode--0--patch-246
Diffstat (limited to 'src/window.c')
-rw-r--r--src/window.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/window.c b/src/window.c
index 06cbf8e5f04..43ea423dd9d 100644
--- a/src/window.c
+++ b/src/window.c
@@ -557,6 +557,15 @@ use (let ((edges (window-edges))) (- (nth 2 edges) (nth 0 edges))). */)
557 return make_number (window_box_text_cols (decode_any_window (window))); 557 return make_number (window_box_text_cols (decode_any_window (window)));
558} 558}
559 559
560DEFUN ("window-full-width-p", Fwindow_full_width_p, Swindow_full_width_p, 0, 1, 0,
561 doc: /* Return t if WINDOW is as wide as its frame.
562WINDOW defaults to the selected window. */)
563 (window)
564 Lisp_Object window;
565{
566 return WINDOW_FULL_WIDTH_P (decode_any_window (window)) ? Qt : Qnil;
567}
568
560DEFUN ("window-hscroll", Fwindow_hscroll, Swindow_hscroll, 0, 1, 0, 569DEFUN ("window-hscroll", Fwindow_hscroll, Swindow_hscroll, 0, 1, 0,
561 doc: /* Return the number of columns by which WINDOW is scrolled from left margin. 570 doc: /* Return the number of columns by which WINDOW is scrolled from left margin.
562WINDOW defaults to the selected window. */) 571WINDOW defaults to the selected window. */)
@@ -7515,6 +7524,7 @@ The selected frame is the one whose configuration has changed. */);
7515 defsubr (&Swindow_buffer); 7524 defsubr (&Swindow_buffer);
7516 defsubr (&Swindow_height); 7525 defsubr (&Swindow_height);
7517 defsubr (&Swindow_width); 7526 defsubr (&Swindow_width);
7527 defsubr (&Swindow_full_width_p);
7518 defsubr (&Swindow_hscroll); 7528 defsubr (&Swindow_hscroll);
7519 defsubr (&Sset_window_hscroll); 7529 defsubr (&Sset_window_hscroll);
7520 defsubr (&Swindow_redisplay_end_trigger); 7530 defsubr (&Swindow_redisplay_end_trigger);