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

[gnu-emacs] / lisp / ChangeLog.9

diff --git a/lisp/ChangeLog.9 b/lisp/ChangeLog.9
index 5c01f87299430dffd9a78a23ff3e7f46581cbc5b..3d4d7e05b1bcd3f726beb7dff33ebc9f1d503a98 100644 (file)
--- a/lisp/ChangeLog.9
+++ b/lisp/ChangeLog.9
@@ -569,7 +569,7 @@
        Don't bind mouse events or tab/backtab.
        (help-function, help-variable, help-face, help-coding-system)
        (help-input-method, help-character-set, help-back, help-info)
-       (help-customize-variable,  help-function-def, help-variable-def):
+       (help-customize-variable, help-function-def, help-variable-def):
        New button types.
        (help-button-action): New function.
        (describe-function-1): Pass help button-types to
@@ -20671,7 +20671,7 @@
        * term/tty-colors.el (tty-defined-color-alist): Renamed from
        tty-color-alist.
        (tty-color-alist, tty-modify-color-alist): New functions.
-       (tty-color-define,  tty-color-clear, tty-color-approximate)
+       (tty-color-define, tty-color-clear, tty-color-approximate)
        (tty-color-translate, tty-color-by-index, tty-color-desc): Accept an
        optional parameter FRAME.
 
@@ -20692,7 +20692,7 @@ See ChangeLog.8 for earlier changes.
 ;; coding: utf-8
 ;; End:
 
-    Copyright (C) 2000-2011  Free Software Foundation, Inc.
+    Copyright (C) 2000-2011, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.