merge from upstream. currently seems to have bitroted and i get segfaults

1 files changed, 4 insertions, 7 deletions

diff --git a/src/ChangeLog.9 b/src/ChangeLog.9
index fc4f2d4ad37..0c39de74a6a 100644
--- a/src/ChangeLog.9
+++ b/src/ChangeLog.9
@@ -12476,9 +12476,9 @@
         * atimer.c (stop_other_atimers): Don't call cancel_atimer because
         that unblocks alarms.
 
-        * alloc.c, bytecode.c, data.c, dispnew.c, ecrt0.c, editfns.c,
-        emacs.c, floatfns.c, fns.c, lread.c, print.c, config.in, lisp.h,
-        Makefile.in: Remove `LISP_FLOAT_TYPE' and `standalone'.
+        * alloc.c, bytecode.c, data.c, dispnew.c, ecrt0.c, editfns.c:
+        * emacs.c, floatfns.c, fns.c, lread.c, print.c, config.in, lisp.h:
+        * Makefile.in: Remove `LISP_FLOAT_TYPE' and `standalone'.
 
         * frame.c (make_frame): Set frame initially to `garbaged'.
 
@@ -13294,8 +13294,7 @@ See ChangeLog.8 for earlier changes.
 ;; coding: utf-8
 ;; End:
 
-    Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-        Free Software Foundation, Inc.
+  Copyright (C) 2001-2011  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -13311,5 +13310,3 @@ See ChangeLog.8 for earlier changes.
 
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; arch-tag: 38875948-6e89-4f08-b0ca-ff328f1e8b72