diff options
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/nxml/nxml-mode.el | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index df22726d882..a06cc0c1209 100644 --- 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 cd50bce2152..b3ce7aaac25 100644 --- 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) |