diff lisp/ChangeLog.10 @ 107617:c5f9e4613394

Merge from mainline.
author Eli Zaretskii <eliz@gnu.org>
date Sat, 16 Jan 2010 06:57:09 -0500
parents 964aafa9629a
children e6408c088fbc 376148b31b5e
line wrap: on
line diff
--- a/lisp/ChangeLog.10	Sat Jan 09 11:27:11 2010 -0500
+++ b/lisp/ChangeLog.10	Sat Jan 16 06:57:09 2010 -0500
@@ -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.
@@ -23535,7 +23535,7 @@
 ;; End:
 
     Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006,
-      2007, 2008, 2009  Free Software Foundation, Inc.
+      2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.