comparison 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
comparison
equal deleted inserted replaced
107616:fa5ad3eee9f5 107617:c5f9e4613394
6758 major-mode. 6758 major-mode.
6759 (vc-annotate-mode): Delete variable. 6759 (vc-annotate-mode): Delete variable.
6760 6760
6761 1999-01-22 Andrew Innes <andrewi@gnu.org> 6761 1999-01-22 Andrew Innes <andrewi@gnu.org>
6762 6762
6763 * startup.el (command-line): [windows-nt]: Check for existence of 6763 * startup.el (command-line) [windows-nt]: Check for existence of
6764 .emacs file so as to notice .emacs.el or .emacs.elc and use them 6764 .emacs file so as to notice .emacs.el or .emacs.elc and use them
6765 in preference to _emacs. 6765 in preference to _emacs.
6766 6766
6767 1999-01-22 Dave Love <fx@gnu.org> 6767 1999-01-22 Dave Love <fx@gnu.org>
6768 6768
9992 ;; coding: utf-8 9992 ;; coding: utf-8
9993 ;; add-log-time-zone-rule: t 9993 ;; add-log-time-zone-rule: t
9994 ;; End: 9994 ;; End:
9995 9995
9996 Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 9996 Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006,
9997 2007, 2008, 2009 Free Software Foundation, Inc. 9997 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
9998 9998
9999 This file is part of GNU Emacs. 9999 This file is part of GNU Emacs.
10000 10000
10001 GNU Emacs is free software: you can redistribute it and/or modify 10001 GNU Emacs is free software: you can redistribute it and/or modify
10002 it under the terms of the GNU General Public License as published by 10002 it under the terms of the GNU General Public License as published by