* lisp/loadhist.el (read-feature): Get rid of fake feature nil.

[gnu-emacs] / src / ChangeLog.2

diff --git a/src/ChangeLog.2 b/src/ChangeLog.2
index ba61c337efc2a4ed67b6e0be135981ee77a12bd2..64e793c763c043661a4cd6aca9756b185dcce79c 100644 (file)
--- a/src/ChangeLog.2
+++ b/src/ChangeLog.2
@@ -2254,7 +2254,7 @@
        Initialize save_color.
 
        * fileio.c, search.c, sysdep.c, filelock.c, editfns.c, process.c:
-       Delete/replace unused/conditionalised variables
+       Delete/replace unused/conditionalized variables
 
 1987-01-15  Richard M. Stallman  (rms@prep)
 
@@ -2632,7 +2632,7 @@
        * fns.c: Fding requires an arg; pass Qnil.
 
        * m-alliant.h: define TEXT_START as 0x1000.
-       Don't define LIBS_STANDARD; the default (sharable) library
+       Don't define LIBS_STANDARD; the default (shareable) library
        is said to work now.
 
        * alloc.c (mark_object): Now pass address of slot being marked.
@@ -2680,7 +2680,7 @@
 
 1986-12-11  Richard Mlynarik  (mly@prep)
 
-       * emacs.c,  dispnew.c:
+       * emacs.c, dispnew.c:
        Rename inhibit_x_windows inhibit_window_system.
        Understand "-nw" command-line option.
        Reorganize init_display a little to make other window-system
@@ -4220,7 +4220,7 @@
        Increase PURESIZE again (sigh)
 
        * unexec.c (write_segment):
-       Kludgey coercions ("(int)") to get this line to compile:
+       Kludgy coercions ("(int)") to get this line to compile:
          nwrite = (((int) ptr + 128) & ~127) - (int) ptr;
        Also changed incorrect ~128 to ~127.
 
@@ -4771,7 +4771,7 @@
 
 See ChangeLog.1 for earlier changes.
 
-    Copyright (C) 1986-1988, 2001-2011  Free Software Foundation, Inc.
+    Copyright (C) 1986-1988, 2001-2013 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.