Merge from emacs--devo--0

[gnu-emacs] / src / termopts.h

diff --git a/src/termopts.h b/src/termopts.h
index 5d4059babb0446cefa47738484c65d75d2e78185..5946666654c1b8c836c151e65cbee4be7f54a081 100644 (file)
--- a/src/termopts.h
+++ b/src/termopts.h
@@ -1,12 +1,12 @@
 /* Flags and parameters describing user options for handling the terminal.
-   Copyright (C) 1985, 1986, 1990, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1990, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
@@ -41,5 +41,10 @@ extern int meta_key;
 /* Nonzero means truncate lines in all windows less wide than the frame */
 extern int truncate_partial_width_windows;
 
+/* Nonzero means no need to redraw the entire frame on resuming a suspended
+   Emacs.  This is useful on terminals with multiple pages, where one page is
+   used for Emacs and another for all else. */
+extern int no_redraw_on_reenter;
+
 /* arch-tag: 35d4d284-dc1a-4fff-97fa-0154a21aebdb
    (do not change this comment) */