diff lisp/ChangeLog @ 105187:064e6af6adba

* nxml/nxml-mode.el: Alias xml-mode to nxml-mode. * textmodes/sgml-mode.el: Remove xml-mode alias. * files.el (auto-mode-alist, conf-mode-maybe) (magic-fallback-mode-alist): Revert 2009-09-18 and 2009-09-21 changes.
author Chong Yidong <cyd@stupidchicken.com>
date Thu, 24 Sep 2009 23:22:17 +0000
parents e2c8e2a49fd5
children 7669aca277d5
line wrap: on
line diff
--- a/lisp/ChangeLog	Thu Sep 24 20:19:58 2009 +0000
+++ b/lisp/ChangeLog	Thu Sep 24 23:22:17 2009 +0000
@@ -1,3 +1,13 @@
+2009-09-24  Chong Yidong  <cyd@stupidchicken.com>
+
+	* nxml/nxml-mode.el: Alias xml-mode to nxml-mode.
+
+	* textmodes/sgml-mode.el: Remove xml-mode alias.
+
+	* files.el (auto-mode-alist, conf-mode-maybe)
+	(magic-fallback-mode-alist): Revert 2009-09-18 and 2009-09-21
+	changes.
+
 2009-09-24  Alan Mackenzie  <acm@muc.de>
 
 	* progmodes/cc-cmds.el (c-scan-conditionals): A new function like