Merge from emacs-24; up to 2012-12-21T07:35:02Z!ueno@gnu.org

[gnu-emacs] / lisp / ChangeLog.13

diff --git a/lisp/ChangeLog.13 b/lisp/ChangeLog.13
index 0b96f4a36ebef93829e20ea4f31cc0fe7ae5a6f0..ea463fc5ae0bef08a378be004b2e7fc873f16e38 100644 (file)
--- a/lisp/ChangeLog.13
+++ b/lisp/ChangeLog.13
@@ -1121,10 +1121,10 @@
        * international/titdic-cnv.el (tit-process-header): Fix embedded
        coding tag.
        (titdic-convert): Bind coding-system-for-write to the coding
-       system specfied in the map file.  Remove `charset' property after
+       system specified in the map file.  Remove `charset' property after
        decoding.
        (miscdic-convert): Bind coding-system-for-write to the coding
-       system specfied for the map file.  Fix LANGUAGE arg to
+       system specified for the map file.  Fix LANGUAGE arg to
        quail-define-package.
        (batch-miscdic-convert): Check if a file is directory or not.
 
@@ -7261,7 +7261,7 @@
        * progmodes/gdb-ui.el (gdb-parent-bptno-enabled): New variable.
        (gdb-breakpoint-regexp, gdb-mouse-toggle-breakpoint-margin)
        (gdb-mouse-toggle-breakpoint-fringe, gdb-delete-breakpoint)
-       (gdb-goto-breakpoint): Generalise for breakpoints with multiple
+       (gdb-goto-breakpoint): Generalize for breakpoints with multiple
        locations.
        (gdb-info-breakpoints-custom, gdb-assembler-custom)
        (gdb-toggle-breakpoint): Update for new gdb-breakpoint-regexp.
@@ -16697,7 +16697,7 @@ See ChangeLog.12 for earlier changes.
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2007-2011  Free Software Foundation, Inc.
+  Copyright (C) 2007-2013 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.