Mercurial > hg > xemacs-beta

comparison src/window.c @ 4959:bd169a24a554

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Ben Wing <ben@xemacs.org>
date Thu, 28 Jan 2010 04:27:30 -0600
parents 19a72041c5ed
children 0d4c9d0f6a8d
comparison
equal deleted inserted replaced
4893:99f2102552d7 4959:bd169a24a554
316 Lisp_Object buf; 316 Lisp_Object buf;
317 317
318 if (print_readably) 318 if (print_readably)
319 printing_unreadable_lcrecord (obj, 0); 319 printing_unreadable_lcrecord (obj, 0);
320 320
321 write_c_string (printcharfun, "#<window"); 321 write_ascstring (printcharfun, "#<window");
322 buf = XWINDOW_BUFFER (obj); 322 buf = XWINDOW_BUFFER (obj);
323 if (EQ (buf, Qt)) 323 if (EQ (buf, Qt))
324 write_c_string (printcharfun, " during creation"); 324 write_ascstring (printcharfun, " during creation");
325 else if (!NILP (buf)) 325 else if (!NILP (buf))
326 { 326 {
327 327
328 Lisp_Object name = XBUFFER (buf)->name; 328 Lisp_Object name = XBUFFER (buf)->name;
329 write_fmt_string_lisp (printcharfun, " on %S", 1, name); 329 write_fmt_string_lisp (printcharfun, " on %S", 1, name);
1046 else 1046 else
1047 return XINT (w->vertical_divider_line_width) == 0 ? 0 : 1; 1047 return XINT (w->vertical_divider_line_width) == 0 ? 0 : 1;
1048 } 1048 }
1049 1049
1050 int 1050 int
1051 window_scrollbar_width (struct window *w) 1051 window_scrollbar_width (struct window * USED_IF_SCROLLBARS (w))
1052 { 1052 {
1053 #ifdef HAVE_SCROLLBARS 1053 #ifdef HAVE_SCROLLBARS
1054 if (!WINDOW_WIN_P (w) 1054 if (!WINDOW_WIN_P (w)
1055 || MINI_WINDOW_P (w) 1055 || MINI_WINDOW_P (w)
1056 || NILP (w->buffer) 1056 || NILP (w->buffer)
1065 } 1065 }
1066 1066
1067 /* Horizontal scrollbars are only active on windows with truncation 1067 /* Horizontal scrollbars are only active on windows with truncation
1068 turned on. */ 1068 turned on. */
1069 int 1069 int
1070 window_scrollbar_height (struct window *w) 1070 window_scrollbar_height (struct window * USED_IF_SCROLLBARS (w))
1071 { 1071 {
1072 #ifdef HAVE_SCROLLBARS 1072 #ifdef HAVE_SCROLLBARS
1073 if (!WINDOW_WIN_P (w) 1073 if (!WINDOW_WIN_P (w)
1074 || MINI_WINDOW_P (w) 1074 || MINI_WINDOW_P (w)
1075 || NILP (w->buffer) 1075 || NILP (w->buffer)
1272 { 1272 {
1273 return window_bottom_window_gutter_height (w); 1273 return window_bottom_window_gutter_height (w);
1274 } 1274 }
1275 1275
1276 static int 1276 static int
1277 window_left_window_gutter_width (struct window *w, int modeline) 1277 window_left_window_gutter_width (struct window *w,
1278 int USED_IF_SCROLLBARS (modeline))
1278 { 1279 {
1279 if (!NILP (w->hchild) || !NILP (w->vchild)) 1280 if (!NILP (w->hchild) || !NILP (w->vchild))
1280 return 0; 1281 return 0;
1281 1282
1282 #ifdef HAVE_SCROLLBARS 1283 #ifdef HAVE_SCROLLBARS
1292 { 1293 {
1293 return window_left_window_gutter_width (w, modeline); 1294 return window_left_window_gutter_width (w, modeline);
1294 } 1295 }
1295 1296
1296 static int 1297 static int
1297 window_right_window_gutter_width (struct window *w, int modeline) 1298 window_right_window_gutter_width (struct window *w,
1299 int USED_IF_SCROLLBARS (modeline))
1298 { 1300 {
1299 int gutter = 0; 1301 int gutter = 0;
1300 1302
1301 if (!NILP (w->hchild) || !NILP (w->vchild)) 1303 if (!NILP (w->hchild) || !NILP (w->vchild))
1302 return 0; 1304 return 0;