mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-11 09:20:51 +00:00
Code Issues Releases Activity

lisp/emacs-lisp/cl-lib.el (cl-pushnew): Don't capture X (bug#11811).

Browse Source
This commit is contained in:
Juanma Barranquero 2012-06-29 01:04:27 +02:00
parent 7d7e0027e7
commit 2badeec4f4
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/ChangeLog
View File

@ -1,3 +1,7 @@
2012-06-28 Juanma Barranquero <lekktu@gmail.com>
* emacs-lisp/cl-lib.el (cl-pushnew): Don't capture X (bug#11811).
2012-06-28 Julien Danjou <julien@danjou.info>
* term.el (term-handle-colors-array): Use a set of new faces to

19
lisp/emacs-lisp/cl-lib.el
View File

@ -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)))