Merge from mainline.

[gnu-emacs] / lisp / ChangeLog.10

diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10
index 8e10927a9d2bf2a01be8afb6bfca875172775285..50b82e13a1598e064ab1d22e2af3caaa9a834259 100644 (file)
--- a/lisp/ChangeLog.10
+++ b/lisp/ChangeLog.10
@@ -1273,7 +1273,7 @@
 
        * emacs-lisp/debug.el (debug): Fix call to message.
 
-2003-06-16  Michael Mauger  <mmaug@yahoo.com>  (tiny change)
+2003-06-16  Michael Mauger  <mmaug@yahoo.com>
 
        * emulation/cua-base.el (cua-mode): Use explicit arg to turn off
        minor modes.
@@ -3492,7 +3492,7 @@
        (Info-display-images-node): New functions for displaying images.
        (Info-select-node): Call Info-display-images-node.
 
-2003-04-25  David Ponce <david.ponce@wanadoo.fr>
+2003-04-25  David Ponce  <david.ponce@wanadoo.fr>
 
        * files.el (file-relative-name): Recognize "c:/foo" as absolute
        file name.
@@ -6773,7 +6773,7 @@
        (ruler-mode-mouse-grab-any-column)
        (ruler-mode-mouse-drag-any-column-iteration)
        (ruler-mode-mouse-drag-any-column): New functions.
-       (ruler-mode-map): [header-line down-mouse-2] Bound to
+       (ruler-mode-map) [header-line down-mouse-2]: Bound to
        `ruler-mode-mouse-grab-any-column' instead of
        `ruler-mode-mouse-set-fill-column'.
        (ruler-mode-ruler-help-echo): Update its value.
@@ -18736,7 +18736,7 @@
        (ctext-post-read-conversion, ctext-pre-write-conversion):
        New functions.
 
-2002-02-21  Jonathan Kamens  <jik@kamens.brookline.ma.us>
+2002-02-21  Jonathan I. Kamens  <jik@kamens.brookline.ma.us>
 
        * vc.el (vc-default-init-version): Update documentation to
        indicate that the backend can override the default init version.
@@ -22919,7 +22919,7 @@
        * startup.el: Document command line option --no-window-system
        instead of --no-windows.
 
-2001-10-30  David Ponce <david.ponce@wanadoo.fr>
+2001-10-30  David Ponce  <david.ponce@wanadoo.fr>
 
        * font-lock.el (java-font-lock-syntactic-face-function): New fun.
        (font-lock-defaults-alist): Use it.
@@ -23535,7 +23535,7 @@ See ChangeLog.9 for earlier changes.
 ;; End:
 
     Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006,
-      2007, 2008  Free Software Foundation, Inc.
+      2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.