[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-24 r117139: * lisp/nxml/nxml-mode.el (xml-mode): Onl
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] emacs-24 r117139: * lisp/nxml/nxml-mode.el (xml-mode): Only define this alias once. |
Date: |
Wed, 21 May 2014 20:07:30 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117139
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Wed 2014-05-21 16:07:27 -0400
message:
* lisp/nxml/nxml-mode.el (xml-mode): Only define this alias once.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/nxml/nxml-mode.el
nxmlmode.el-20091113204419-o5vbwnq5f7feedwu-7813
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-05-21 16:35:31 +0000
+++ b/lisp/ChangeLog 2014-05-21 20:07:27 +0000
@@ -1,3 +1,7 @@
+2014-05-21 Glenn Morris <address@hidden>
+
+ * nxml/nxml-mode.el (xml-mode): Only define this alias once.
+
2014-05-21 Eli Zaretskii <address@hidden>
* frame.el (set-frame-font): Doc fix.
=== modified file 'lisp/nxml/nxml-mode.el'
--- a/lisp/nxml/nxml-mode.el 2014-04-16 15:28:26 +0000
+++ b/lisp/nxml/nxml-mode.el 2014-05-21 20:07:27 +0000
@@ -2630,8 +2630,9 @@
(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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-24 r117139: * lisp/nxml/nxml-mode.el (xml-mode): Only define this alias once.,
Glenn Morris <=