Mercurial > emacs
diff lisp/ChangeLog.8 @ 107617:c5f9e4613394
Merge from mainline.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Sat, 16 Jan 2010 06:57:09 -0500 |
parents | 964aafa9629a |
children | 58c64dad904e |
line wrap: on
line diff
--- a/lisp/ChangeLog.8 Sat Jan 09 11:27:11 2010 -0500 +++ b/lisp/ChangeLog.8 Sat Jan 16 06:57:09 2010 -0500 @@ -6760,7 +6760,7 @@ 1999-01-22 Andrew Innes <andrewi@gnu.org> - * startup.el (command-line): [windows-nt]: Check for existence of + * startup.el (command-line) [windows-nt]: Check for existence of .emacs file so as to notice .emacs.el or .emacs.elc and use them in preference to _emacs. @@ -9994,7 +9994,7 @@ ;; End: Copyright (C) 1999, 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.