From 6e39d3b2b075f7ff982aeb5800aa502994c41db6 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Tue, 3 Nov 2009 15:28:13 +0000 Subject: [PATCH] (define-obsolete-variable-alias): Use dolist, and only put a prop if it is non-nil. --- lisp/ChangeLog | 5 +++++ lisp/emacs-lisp/byte-run.el | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8d211786172..99fc1f1edd0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2009-11-03 Stefan Monnier + + * 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 * menu-bar.el (menu-bar-make-mm-toggle, menu-bar-make-toggle) diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el index a00fdf0e4f5..af3150ffe60 100644 --- a/lisp/emacs-lisp/byte-run.el +++ b/lisp/emacs-lisp/byte-run.el @@ -202,10 +202,10 @@ CURRENT-NAME, if it does not already have them: `(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. -- 2.39.5