diff options
| author | Chong Yidong | 2009-09-24 23:22:17 +0000 |
|---|---|---|
| committer | Chong Yidong | 2009-09-24 23:22:17 +0000 |
| commit | e477ca8496f8170d1857ed92b51c27aa5ad22b95 (patch) | |
| tree | e197743865efca4fdbd2e00ee27300d89b7ec8c3 /lisp/textmodes | |
| parent | 0a218d34a2110a5b3120a50dc089c9275309e419 (diff) | |
| download | emacs-e477ca8496f8170d1857ed92b51c27aa5ad22b95.tar.gz emacs-e477ca8496f8170d1857ed92b51c27aa5ad22b95.zip | |
* 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/textmodes')
| -rw-r--r-- | lisp/textmodes/sgml-mode.el | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el index 9d9dcf3d89a..74cf99bd865 100644 --- a/lisp/textmodes/sgml-mode.el +++ b/lisp/textmodes/sgml-mode.el | |||
| @@ -495,11 +495,6 @@ Do \\[describe-key] on the following bindings to discover what they do. | |||
| 495 | "\\)\\(" sgml-name-re "\\)\\1") | 495 | "\\)\\(" sgml-name-re "\\)\\1") |
| 496 | 2)))) | 496 | 2)))) |
| 497 | 497 | ||
| 498 | ;; Some programs (such as Glade 2) generate XML which has | ||
| 499 | ;; -*- mode: xml -*-. | ||
| 500 | ;;;###autoload | ||
| 501 | (defalias 'xml-mode 'sgml-mode) | ||
| 502 | |||
| 503 | (defun sgml-comment-indent () | 498 | (defun sgml-comment-indent () |
| 504 | (if (looking-at "--") comment-column 0)) | 499 | (if (looking-at "--") comment-column 0)) |
| 505 | 500 | ||