Don't use previous underline thickness or position if previous underline type is...

[gnu-emacs] / src / sheap.c

diff --git a/src/sheap.c b/src/sheap.c
index 510a75d47437be34d8703fe5a86d7e47caa600df..972c04c9552ba8eb14f4d76fbc5213281f7a0585 100644 (file)
--- a/src/sheap.c
+++ b/src/sheap.c
@@ -1,14 +1,14 @@
 /* simulate `sbrk' with an array in .bss, for `unexec' support for Cygwin;
    complete rewrite of xemacs Cygwin `unexec' code
 
-   Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2004-2013 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 2, 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
@@ -16,17 +16,16 @@ 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/>.  */
 
 #include <config.h>
 #include <stdio.h>
+
 #include "lisp.h"
 
 #include <unistd.h>
 
-#define STATIC_HEAP_SIZE       (12 * 1024 * 1024)
+#define STATIC_HEAP_SIZE       (13 * 1024 * 1024)
 
 int debug_sheap = 0;
 
@@ -94,6 +93,3 @@ report_sheap_usage (int die_if_pure_storage_exceeded)
           bss_sbrk_ptr - bss_sbrk_buffer, STATIC_HEAP_SIZE);
   message ("%s", buf);
 }
-
-/* arch-tag: 1bc386e8-71c2-4da4-b8b5-c1674a9cf926
-   (do not change this comment) */