xemacs-beta: src/window.c comparison

comparison src/window.c @ 173:8eaf7971accc r20-3b13

Import from CVS: tag r20-3b13

author	cvs
date	Mon, 13 Aug 2007 09:49:09 +0200
parents	538048ae2ab8
children	3d6bfa290dbd

comparison

equal deleted inserted replaced

-:a38aed19690b
+:8eaf7971accc
 ((markobj) (window->text_cursor_visible_p));
 /* End cached specifiers. */
 ((markobj) (window->dedicated));
 mark_face_cachels (window->face_cachels, markobj);
 mark_glyph_cachels (window->glyph_cachels, markobj);
-return (Qnil);
+return Qnil;
 }
 static void
 print_window (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
 {
 p->dedicated = Qnil;
 p->windows_changed = 1;
 p->shadow_thickness_changed = 1;
-return (val);
+return val;
 }
 #undef INIT_DISP_VARIABLE
 /*
 * The redisplay structures used to be stored with each window.  While
 if (margin_cwidth > window_cwidth)
 margin_cwidth = window_cwidth;
 /* At the user level the margin is always specified in characters.
 Internally however it is manipulated in terms of pixels. */
-return (margin_cwidth * font_width);
+return margin_cwidth * font_width;
 }
 int
 window_left_margin_width (struct window *w)
 {
 DEFUN ("windowp", Fwindowp, 1, 1, 0, /*
 Return t if OBJ is a window.
 */
 (obj))
 {
-return (WINDOWP (obj) ? Qt : Qnil);
+return WINDOWP (obj) ? Qt : Qnil;
 }
 DEFUN ("window-live-p", Fwindow_live_p, 1, 1, 0, /*
 Return t if OBJ is a window which is currently visible.
 */
 (obj))
 {
-return (WINDOWP (obj) && WINDOW_LIVE_P (XWINDOW (obj)) ? Qt : Qnil);
+return WINDOWP (obj) && WINDOW_LIVE_P (XWINDOW (obj)) ? Qt : Qnil;
 }
 DEFUN ("selected-window", Fselected_window, 0, 1, 0, /*
 Return the window that the cursor now appears in and commands apply to.
 If the optional argument CON-DEV-OR-FRAME is specified and is a frame, return
 DEFUN ("window-minibuffer-p", Fwindow_minibuffer_p, 1, 1, 0, /*
 Return non-nil if WINDOW is a minibuffer window.
 */
 (window))
 {
-return (MINI_WINDOW_P (decode_window (window)) ? Qt : Qnil);
+return MINI_WINDOW_P (decode_window (window)) ? Qt : Qnil;
 }
 DEFUN ("window-first-hchild", Fwindow_first_hchild, 1, 1, 0, /*
 Return the first horizontal child of WINDOW, or nil.
 */
 Return the height of WINDOW in pixels.  Defaults to current window.
 This includes the window's modeline and horizontal scrollbar (if any).
 */
 (window))
 {
-return (make_int (decode_window (window)->pixel_height));
+return make_int (decode_window (window)->pixel_height);
 }
 DEFUN ("window-width", Fwindow_width, 0, 1, 0, /*
 Return the number of display columns in WINDOW.
 This is the width that is usable columns available for text in WINDOW.
 */
 (window))
 {
-return (make_int (window_char_width (decode_window (window), 0)));
+return make_int (window_char_width (decode_window (window), 0));
 }
 DEFUN ("window-pixel-width", Fwindow_pixel_width, 0, 1, 0, /*
 Return the width of WINDOW in pixels.  Defaults to current window.
 */
 (window))
 {
-return (make_int (decode_window (window)->pixel_width));
+return make_int (decode_window (window)->pixel_width);
 }
 DEFUN ("window-hscroll", Fwindow_hscroll, 0, 1, 0, /*
 Return the number of columns by which WINDOW is scrolled from left margin.
 */
 (window))
 {
-return (make_int (decode_window (window)->hscroll));
+return make_int (decode_window (window)->hscroll);
 }
 DEFUN ("set-window-hscroll", Fset_window_hscroll, 2, 2, 0, /*
 Set number of columns WINDOW is scrolled from left margin to NCOL.
 NCOL should be zero or positive.
 return value;
 }
 else
 {
 Bufpos startp = marker_position (w->start[CURRENT_DISP]);
-return (make_int (end_of_last_line (w, startp)));
+return make_int (end_of_last_line (w, startp));
 }
 }
 DEFUN ("set-window-point", Fset_window_point, 2, 2, 0, /*
 Make point value in WINDOW be at position POS in WINDOW's buffer.
 	  w = next_window;
 	}
 }
-if (type == GET_BUFFER_WINDOW_COUNT)
+return type == GET_BUFFER_WINDOW_COUNT ? make_int (count) : best_window;
-return (make_int (count));
-else
-return (best_window);
 }
 #if 0 /* not currently used */
 int
 /* At this point we damn well better have found something. */
 if (NILP (w)) abort ();
 #endif
-return (w);
+return w;
 }
 DEFUN ("get-largest-window", Fget_largest_window, 0, 2, 0, /*
 Return the window largest in area.
 If optional argument FRAME is `visible', search all visible frames.
 #endif
 	}
 else
 	set_frame_selected_window (f, config->current_window);
 }
+else
+old_window_config = Qnil; /* Warning suppression */
 /* Restore the minimum heights recorded in the configuration.  */
 window_min_height = config->min_height;
 window_min_width = config->min_width;

Mercurial > hg > xemacs-beta

comparison src/window.c @ 173:8eaf7971accc r20-3b13