X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/68e7476278a3dc4bd13dab63cc23bc0e671e5525..8510724d46951d651a78424e12b93ccee100c665:/src/termopts.h

diff --git a/src/termopts.h b/src/termopts.h
index 219916c01a..fcb99b5990 100644
--- a/src/termopts.h
+++ b/src/termopts.h
@@ -1,13 +1,13 @@
 /* Flags and parameters describing user options for handling the terminal.
    Copyright (C) 1985, 1986, 1990, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+                 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
-GNU Emacs is free software; you can redistribute it and/or modify
+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 3, or (at your option)
-any later version.
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
 /* Nonzero means flash the screen instead of ringing the bell.  */
@@ -38,8 +36,8 @@ extern int interrupts_deferred;
 /* Terminal has meta key */
 extern int meta_key;
 
-/* Nonzero means truncate lines in all windows less wide than the frame */
-extern int truncate_partial_width_windows;
+/* Defined in xdisp.c */
+extern Lisp_Object Vtruncate_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