+2014-05-21 Glenn Morris <rgm@gnu.org>
+
+ * nxml/nxml-mode.el (xml-mode): Only define this alias once.
+
2014-05-21 Eli Zaretskii <eliz@gnu.org>
* frame.el (set-frame-font): Doc fix.
(put 'entity-ref 'nxml-friendly-name "entity reference")
(put 'char-ref 'nxml-friendly-name "character reference")
-;;;###autoload
-(defalias 'xml-mode 'nxml-mode)
+;; Only do this in loaddefs, so that if someone defines a different
+;; alias in .emacs, loading this file afterwards does not clobber it.
+;;;###autoload(defalias 'xml-mode 'nxml-mode)
(provide 'nxml-mode)