diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2009-09-24 23:22:17 +0000 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2009-09-24 23:22:17 +0000 |
| commit | e477ca8496f8170d1857ed92b51c27aa5ad22b95 (patch) | |
| tree | e197743865efca4fdbd2e00ee27300d89b7ec8c3 | |
| parent | 0a218d34a2110a5b3120a50dc089c9275309e419 (diff) | |
| download | emacs-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.
| -rw-r--r-- | lisp/ChangeLog | 10 | ||||
| -rw-r--r-- | lisp/files.el | 6 | ||||
| -rw-r--r-- | lisp/nxml/nxml-mode.el | 3 | ||||
| -rw-r--r-- | lisp/textmodes/sgml-mode.el | 5 |
4 files changed, 16 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6d1d6dd6576..669c27f5fce 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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 diff --git a/lisp/files.el b/lisp/files.el index 13f907cd411..9d6218cc4eb 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -2249,7 +2249,7 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\)\\'" . archive-mode) ("\\`/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 @@ and `magic-mode-alist', which determines modes based on file contents.") (widen) (goto-char (point-min)) (looking-at "<\\?xml \\|<!-- \\|<!DOCTYPE "))) - (nxml-mode) + (xml-mode) (conf-mode))) (defvar interpreter-mode-alist @@ -2442,7 +2442,7 @@ If FUNCTION is nil, then it is not called. (That is a way of saying . 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 ")) 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 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. "\\)\\(" 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)) |