# HG changeset patch
# User Nick Roberts <nickrob@snap.net.nz>
# Date 1114143090 0
# Node ID 2b20595aa66d7ea4c33c0dc1e879c9b342d507bc
# Parent  6c517123b411ccadac79fe5c8257e34dac7182e5
*** empty log message ***

diff -r 6c517123b411 -r 2b20595aa66d etc/NEWS
--- a/etc/NEWS	Fri Apr 22 04:09:43 2005 +0000
+++ b/etc/NEWS	Fri Apr 22 04:11:30 2005 +0000
@@ -2850,7 +2850,6 @@
 *** New macro define-obsolete-variable-alias to combine defvaralias and
 make-obsolete-variable.
 
->>>>>>> 1.1157
 ---
 ** easy-mmode-define-global-mode has been renamed to
 define-global-minor-mode.  The old name remains as an alias.
diff -r 6c517123b411 -r 2b20595aa66d lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Apr 22 04:09:43 2005 +0000
+++ b/lisp/ChangeLog	Fri Apr 22 04:11:30 2005 +0000
@@ -1,3 +1,7 @@
+2005-04-22  Nick Roberts  <nickrob@snap.net.nz>
+
+	* emacs-lisp/byte-run.el (define-obsolete-variable-alias): New macro.
+
 2005-04-21  Lute Kamstra  <lute@gnu.org>
 
 	* loadhist.el (unload-feature): Don't remove a function from hooks
diff -r 6c517123b411 -r 2b20595aa66d lispref/ChangeLog
--- a/lispref/ChangeLog	Fri Apr 22 04:09:43 2005 +0000
+++ b/lispref/ChangeLog	Fri Apr 22 04:11:30 2005 +0000
@@ -1,3 +1,8 @@
+2005-04-22  Nick Roberts  <nickrob@snap.net.nz>
+
+	* variables.texi (Variable Aliases): Describe make-obsolete-variable
+	and define-obsolete-variable-alias.
+
 2005-04-22  Kim F. Storm  <storm@cua.dk>
 
 	* symbols.texi (Symbol Plists): Remove safe-get, as get is now safe.