procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* nxml/nxml-mode.el: Alias xml-mode to nxml-mode.

Browse source 
* 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.
This commit is contained in:
Chong Yidong 2009-09-24 23:22:17 +00:00
parent 0a218d34a2
commit e477ca8496
4 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lisp/ChangeLog
View file

@ -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> 2009-09-24 Alan Mackenzie <acm@muc.de>
* progmodes/cc-cmds.el (c-scan-conditionals): A new function like * progmodes/cc-cmds.el (c-scan-conditionals): A new function like

6
lisp/files.el
View file

@ -2249,7 +2249,7 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\)\\'" . archive-mode)
("\\`/tmp/fol/" . text-mode) ("\\`/tmp/fol/" . text-mode)
("\\.oak\\'" . scheme-mode) ("\\.oak\\'" . scheme-mode)
("\\.sgml?\\'" . sgml-mode) ("\\.sgml?\\'" . sgml-mode)
("\\.x[ms]l\\'" . nxml-mode) ("\\.x[ms]l\\'" . xml-mode)
("\\.dtd\\'" . sgml-mode) ("\\.dtd\\'" . sgml-mode)
("\\.ds\\(ss\\)?l\\'" . dsssl-mode) ("\\.ds\\(ss\\)?l\\'" . dsssl-mode)
("\\.js\\'" . js-mode) ; javascript-mode would be better ("\\.js\\'" . js-mode) ; javascript-mode would be better
@ -2344,7 +2344,7 @@ and `magic-mode-alist', which determines modes based on file contents.")
(widen) (widen)
(goto-char (point-min)) (goto-char (point-min))
(looking-at "<\\?xml \\|<!-- \\|<!DOCTYPE "))) (looking-at "<\\?xml \\|<!-- \\|<!DOCTYPE ")))
(nxml-mode) (xml-mode)
(conf-mode))) (conf-mode)))
(defvar interpreter-mode-alist (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) . html-mode)
("<!DOCTYPE[ \t\r\n]+[Hh][Tt][Mm][Ll]" . html-mode) ("<!DOCTYPE[ \t\r\n]+[Hh][Tt][Mm][Ll]" . html-mode)
;; These two must come after html, because they are more general: ;; These two must come after html, because they are more general:
("<\\?xml " . nxml-mode) ("<\\?xml " . xml-mode)
(,(let* ((incomment-re "\\(?:[^-]\\|-[^-]\\)") (,(let* ((incomment-re "\\(?:[^-]\\|-[^-]\\)")
(comment-re (concat "\\(?:!--" incomment-re "*-->[ \t\r\n]*<\\)"))) (comment-re (concat "\\(?:!--" incomment-re "*-->[ \t\r\n]*<\\)")))
(concat "[ \t\r\n]*<" comment-re "*!DOCTYPE ")) (concat "[ \t\r\n]*<" comment-re "*!DOCTYPE "))

3
lisp/nxml/nxml-mode.el
View file

@ -2652,6 +2652,9 @@ With a prefix argument, inserts the character directly."
(put 'entity-ref 'nxml-friendly-name "entity reference") (put 'entity-ref 'nxml-friendly-name "entity reference")
(put 'char-ref 'nxml-friendly-name "character reference") (put 'char-ref 'nxml-friendly-name "character reference")
;;;###autoload
(defalias 'xml-mode 'nxml-mode)
(provide 'nxml-mode) (provide 'nxml-mode)
;; arch-tag: 8603bc5f-1ef9-4021-b223-322fb2ca708e ;; arch-tag: 8603bc5f-1ef9-4021-b223-322fb2ca708e

5
lisp/textmodes/sgml-mode.el
View file

@ -495,11 +495,6 @@ Do \\[describe-key] on the following bindings to discover what they do.
"\\)\\(" sgml-name-re "\\)\\1") "\\)\\(" sgml-name-re "\\)\\1")
2)))) 2))))
;; Some programs (such as Glade 2) generate XML which has
;; -*- mode: xml -*-.
;;;###autoload
(defalias 'xml-mode 'sgml-mode)
(defun sgml-comment-indent () (defun sgml-comment-indent ()
(if (looking-at "--") comment-column 0)) (if (looking-at "--") comment-column 0))