Mercurial > emacs
changeset 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 | d6ddd512e29c |
| children | d59e748dff99 |
| files | lisp/ChangeLog lisp/files.el lisp/nxml/nxml-mode.el lisp/textmodes/sgml-mode.el |
| diffstat | 4 files changed, 16 insertions(+), 8 deletions(-) [+] |
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
--- a/lisp/files.el Thu Sep 24 20:19:58 2009 +0000 +++ b/lisp/files.el Thu Sep 24 23:22:17 2009 +0000 @@ -2249,7 +2249,7 @@ ("\\`/tmp/fol/" . text-mode) ("\\.oak\\'" . scheme-mode) ("\\.sgml?\\'" . sgml-mode) - ("\\.x[ms]l\\'" . nxml-mode) + ("\\.x[ms]l\\'" . xml-mode) ("\\.dtd\\'" . sgml-mode) ("\\.ds\\(ss\\)?l\\'" . dsssl-mode) ("\\.js\\'" . js-mode) ; javascript-mode would be better @@ -2344,7 +2344,7 @@ (widen) (goto-char (point-min)) (looking-at "<\\?xml \\|<!-- \\|<!DOCTYPE "))) - (nxml-mode) + (xml-mode) (conf-mode))) (defvar interpreter-mode-alist @@ -2442,7 +2442,7 @@ . html-mode) ("<!DOCTYPE[ \t\r\n]+[Hh][Tt][Mm][Ll]" . html-mode) ;; These two must come after html, because they are more general: - ("<\\?xml " . nxml-mode) + ("<\\?xml " . xml-mode) (,(let* ((incomment-re "\\(?:[^-]\\|-[^-]\\)") (comment-re (concat "\\(?:!--" incomment-re "*-->[ \t\r\n]*<\\)"))) (concat "[ \t\r\n]*<" comment-re "*!DOCTYPE "))
--- a/lisp/nxml/nxml-mode.el Thu Sep 24 20:19:58 2009 +0000 +++ b/lisp/nxml/nxml-mode.el Thu Sep 24 23:22:17 2009 +0000 @@ -2652,6 +2652,9 @@ (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
--- a/lisp/textmodes/sgml-mode.el Thu Sep 24 20:19:58 2009 +0000 +++ b/lisp/textmodes/sgml-mode.el Thu Sep 24 23:22:17 2009 +0000 @@ -495,11 +495,6 @@ "\\)\\(" sgml-name-re "\\)\\1") 2)))) -;; Some programs (such as Glade 2) generate XML which has -;; -*- mode: xml -*-. -;;;###autoload -(defalias 'xml-mode 'sgml-mode) - (defun sgml-comment-indent () (if (looking-at "--") comment-column 0))