* lisp/nxml/nxml-mode.el (xml-mode): Only define this alias once.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index df22726d882d11c912f18263e1065412f8189b5d..a06cc0c1209bd482fd1ac83b0c0a27bac575b705 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+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.

diff --git a/lisp/nxml/nxml-mode.el b/lisp/nxml/nxml-mode.el
index cd50bce21521ff12534b397a3d705d4f0ab346da..b3ce7aaac258d4c59397c781cb6f81e3687a1686 100644 (file)
--- a/lisp/nxml/nxml-mode.el
+++ b/lisp/nxml/nxml-mode.el
@@ -2630,8 +2630,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)
+;; 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)