Add 2011 to FSF/AIST copyright years.

[bpt/emacs.git] / lisp / ChangeLog.13

diff --git a/lisp/ChangeLog.13 b/lisp/ChangeLog.13
index 7d18c57..96fcebd 100644 (file)
--- a/lisp/ChangeLog.13
+++ b/lisp/ChangeLog.13
@@ -958,7 +958,7 @@
        property to t.
 
        * international/mule.el (coding-system-get):
-       Check `ascii-incompatible' for backward compatiblity.
+       Check `ascii-incompatible' for backward compatibility.
        (set-file-name-coding-system): Signal an error for a coding system
        not suitable for file name.
        (set-keyboard-coding-system): Signal an error for a coding system
@@ -6680,8 +6680,9 @@
        buffer if the parent buffer is in vc-dired-mode.
 
 2007-11-23  Mark A. Hershberger  <mah@everybody.org>
+           James Clark  <none@example.com>
 
-       * nxml: Initial merge of nxml.  Kept nxml/char-name subdir for now.
+       * nxml/: Initial merge of nxml.  Kept nxml/char-name subdir for now.
 
 2007-11-23  Juri Linkov  <juri@jurta.org>
 
@@ -7242,7 +7243,7 @@
 
        * subr.el (event-modifiers): Use internal-event-symbol-parse-modifiers.
 
-       * pcvs.el (cvs-revert-if-needed): Ignore `unknown' files, since cvs
+       * pcvs.el (cvs-revert-if-needed): Ignore `unknown' files, since CVS
        did not touch them.
 
 2007-11-15  Jay Belanger  <jay.p.belanger@gmail.com>
@@ -7567,7 +7568,7 @@
        (ediff-setup-windows-plain-merge)
        (ediff-setup-windows-plain-compare, ediff-setup-control-frame)
        (ediff-refresh-control-frame, ediff-get-visible-buffer-window):
-       * ediff-util.el (ediff-setup-keymap, )
+       * ediff-util.el (ediff-setup-keymap)
        (ediff-toggle-wide-display, ediff-toggle-multiframe)
        (ediff-toggle-use-toolbar, ediff-really-quit)
        (ediff-good-frame-under-mouse)
@@ -16693,10 +16694,9 @@ See ChangeLog.12 for earlier changes.
 
 ;; Local Variables:
 ;; coding: utf-8
-;; add-log-time-zone-rule: t
 ;; End:
 
-    Copyright (C) 2007, 2008, 2009  Free Software Foundation, Inc.
+  Copyright (C) 2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -16712,5 +16712,3 @@ See ChangeLog.12 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: 1e8aa93a-fc6c-4ac3-9b10-1f445e1840af