(HAVE_VFORK): Remove.

[gnu-emacs] / src / window.h

diff --git a/src/window.h b/src/window.h
index aa4b18335ceebdd1bfc6dd194448028c3bb30e83..da72e302110f6549f27e980b8c8c045aaed9582b 100644 (file)
--- a/src/window.h
+++ b/src/window.h
@@ -1,5 +1,6 @@
 /* Window definitions for GNU Emacs.
-   Copyright (C) 1985, 1986, 1993, 1995 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1993, 1995, 1997, 1998, 1999, 2000, 2001
+   Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -132,6 +133,9 @@ struct window
     Lisp_Object optional_new_start;
     /* Number of columns display within the window is scrolled to the left.  */
     Lisp_Object hscroll;
+    /* Minimum hscroll for automatic hscrolling.  This is the value
+       the user has set, by set-window-hscroll for example.  */
+    Lisp_Object min_hscroll;
     /* Number saying how recently window was selected */
     Lisp_Object use_time;
     /* Unique number of window assigned when it was created */
@@ -275,7 +279,7 @@ struct window
 
 /* 1 if W is a minibuffer window.  */
 
-#define MINI_WINDOW_P(W)       (!EQ ((W)->mini_p, Qnil))
+#define MINI_WINDOW_P(W)       (!NILP ((W)->mini_p))
 
 /* Return the window column at which the text in window W starts.
    This is different from the `left' field because it does not include
@@ -365,6 +369,8 @@ EXFUN (Fwindow_hscroll, 1);
 EXFUN (Fset_window_vscroll, 2);
 EXFUN (Fwindow_vscroll, 1);
 EXFUN (Fset_window_margins, 3);
+EXFUN (Fwindow_live_p, 1);
+EXFUN (Fset_window_point, 2);
 extern Lisp_Object make_window P_ ((void));
 extern void delete_window P_ ((Lisp_Object));
 extern Lisp_Object window_from_coordinates P_ ((struct frame *, int, int, int *, int));
@@ -441,4 +447,9 @@ extern void check_frame_size P_ ((struct frame *frame, int *rows, int *cols));
 
 struct glyph *get_phys_cursor_glyph P_ ((struct window *w));
 
+/* Value is non-zero if WINDOW is a live window.  */
+
+#define WINDOW_LIVE_P(WINDOW) \
+     (WINDOWP ((WINDOW)) && !NILP (XWINDOW ((WINDOW))->buffer))
+
 #endif /* not WINDOW_H_INCLUDED */