Merge from emacs-24; up to 2012-12-30T19:34:25Z!jan.h.d@swipnet.se

[bpt/emacs.git] / src / ChangeLog.1

diff --git a/src/ChangeLog.1 b/src/ChangeLog.1
index 8b4a9af..0d92676 100644 (file)
--- a/src/ChangeLog.1
+++ b/src/ChangeLog.1
@@ -405,7 +405,7 @@
        Copy their own header field a_scovfrl from ohdr.
 
        * unexec.c [COFF]:
-       Round positions of text and and data sections in output file
+       Round positions of text and data sections in output file
        to page boundaries.
 
        * crt0.c: Install version for Encore machines.
@@ -2237,7 +2237,7 @@
 
        * data.c (Fset):
        If Vautoload_queue non-nil, record function and old definition
-       by consing onto Vautoload_qeueue.
+       by consing onto Vautoload_queue.
 
        * fns.c (Fprovide):
        If Vautoload_queue is non-nil, record old value of Vfeatures.
@@ -2375,7 +2375,7 @@
        Often, just return what it returned.
        `error' still never returns to its caller.
 
-       * Signalling Qargs_out_of_range:
+       * Signaling Qargs_out_of_range:
        Use new functions args_out_of_range and args_out_of_range_3
        (in data.c) to do this.
 
@@ -3521,8 +3521,7 @@
        * minibuf.c: Don't allow entry to minibuffer
        while minibuffer is selected.
 
-    Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-       2008, 2009, 2010 Free Software Foundation, Inc.
+    Copyright (C) 1985-1986, 2001-2013 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -3538,5 +3537,3 @@
 
   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: 2d2c1086-b0a5-437c-bc58-fb38ce2e0f9b