summaryrefslogtreecommitdiff
path: root/lisp/nxml
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2009-09-24 23:22:17 +0000
committerChong Yidong <cyd@stupidchicken.com>2009-09-24 23:22:17 +0000
commite477ca8496f8170d1857ed92b51c27aa5ad22b95 (patch)
treee197743865efca4fdbd2e00ee27300d89b7ec8c3 /lisp/nxml
parent0a218d34a2110a5b3120a50dc089c9275309e419 (diff)
downloademacs-e477ca8496f8170d1857ed92b51c27aa5ad22b95.tar.gz
* 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.
Diffstat (limited to 'lisp/nxml')
-rw-r--r--lisp/nxml/nxml-mode.el3
1 files changed, 3 insertions, 0 deletions
diff --git a/lisp/nxml/nxml-mode.el b/lisp/nxml/nxml-mode.el
index b2ad12b3243..054ec3c9c2c 100644
--- a/lisp/nxml/nxml-mode.el
+++ b/lisp/nxml/nxml-mode.el
@@ -2652,6 +2652,9 @@ With a prefix argument, inserts the character directly."
(put 'entity-ref 'nxml-friendly-name "entity reference")
(put 'char-ref 'nxml-friendly-name "character reference")
+;;;###autoload
+(defalias 'xml-mode 'nxml-mode)
+
(provide 'nxml-mode)
;; arch-tag: 8603bc5f-1ef9-4021-b223-322fb2ca708e