# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1257262093 0
# Node ID 5a494d9d4e4f1d0675cb84d81d1be39a08cd350a
# Parent  a6f26c27084c87ef672838bb8d87991e5d1b3114
(define-obsolete-variable-alias): Use dolist,
and only put a prop if it is non-nil.

diff -r a6f26c27084c -r 5a494d9d4e4f lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Nov 03 07:28:59 2009 +0000
+++ b/lisp/ChangeLog	Tue Nov 03 15:28:13 2009 +0000
@@ -1,3 +1,8 @@
+2009-11-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* emacs-lisp/byte-run.el (define-obsolete-variable-alias): Use dolist,
+	and only put a prop if it is non-nil.
+
 2009-11-03  Juri Linkov  <juri@jurta.org>
 
 	* menu-bar.el (menu-bar-make-mm-toggle, menu-bar-make-toggle)
diff -r a6f26c27084c -r 5a494d9d4e4f lisp/emacs-lisp/byte-run.el
--- a/lisp/emacs-lisp/byte-run.el	Tue Nov 03 07:28:59 2009 +0000
+++ b/lisp/emacs-lisp/byte-run.el	Tue Nov 03 15:28:13 2009 +0000
@@ -202,10 +202,10 @@
   `(progn
      (defvaralias ,obsolete-name ,current-name ,docstring)
      ;; See Bug#4706.
-     (mapc (lambda (prop) (or (get ,current-name prop)
-                              (put ,current-name prop
-                                   (get ,obsolete-name prop))))
-           '(saved-value saved-variable-comment))
+     (dolist (prop '(saved-value saved-variable-comment))
+       (and (get ,obsolete-name prop)
+            (null (get ,current-name prop))
+            (put ,current-name prop (get ,obsolete-name prop))))
      (make-obsolete-variable ,obsolete-name ,current-name ,when)))
 (set-advertised-calling-convention
  ;; New code should always provide the `when' argument.