From: Juanma Barranquero Date: Thu, 28 Jun 2012 23:04:27 +0000 (+0200) Subject: lisp/emacs-lisp/cl-lib.el (cl-pushnew): Don't capture X (bug#11811). X-Git-Tag: emacs-24.2.90~1199^2~293 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2badeec4f436028eaf88ea6929f3223e7db38839;p=emacs.git lisp/emacs-lisp/cl-lib.el (cl-pushnew): Don't capture X (bug#11811). --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 26b6c6fd322..e083b628cde 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2012-06-28 Juanma Barranquero + + * emacs-lisp/cl-lib.el (cl-pushnew): Don't capture X (bug#11811). + 2012-06-28 Julien Danjou * term.el (term-handle-colors-array): Use a set of new faces to diff --git a/lisp/emacs-lisp/cl-lib.el b/lisp/emacs-lisp/cl-lib.el index 990e66d91aa..34351e4830f 100644 --- a/lisp/emacs-lisp/cl-lib.el +++ b/lisp/emacs-lisp/cl-lib.el @@ -151,15 +151,16 @@ an element already on the list. [keywordp form]))) (if (symbolp place) (if (null keys) - `(let ((x ,x)) - (if (memql x ,place) - ;; This symbol may later on expand to actual code which then - ;; trigger warnings like "value unused" since cl-pushnew's return - ;; value is rarely used. It should not matter that other - ;; warnings may be silenced, since `place' is used earlier and - ;; should have triggered them already. - (with-no-warnings ,place) - (setq ,place (cons x ,place)))) + (let ((var (make-symbol "--cl-x--"))) + `(let ((,var ,x)) + (if (memql ,var ,place) + ;; This symbol may later on expand to actual code which then + ;; trigger warnings like "value unused" since cl-pushnew's return + ;; value is rarely used. It should not matter that other + ;; warnings may be silenced, since `place' is used earlier and + ;; should have triggered them already. + (with-no-warnings ,place) + (setq ,place (cons ,var ,place))))) (list 'setq place (cl-list* 'cl-adjoin x place keys))) (cl-list* 'cl-callf2 'cl-adjoin x place keys)))