emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r112588: * lisp/emacs-lisp/cl-extra.e


From: Stefan Monnier
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r112588: * lisp/emacs-lisp/cl-extra.el (cl-getf): Return the proper value in
Date: Tue, 14 May 2013 22:00:07 -0400
User-agent: Bazaar (2.6b2)

------------------------------------------------------------
revno: 112588
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=14387
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Tue 2013-05-14 22:00:07 -0400
message:
  * lisp/emacs-lisp/cl-extra.el (cl-getf): Return the proper value in
  the setter.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/cl-extra.el
  lisp/emacs-lisp/cl-loaddefs.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-05-15 00:52:07 +0000
+++ b/lisp/ChangeLog    2013-05-15 02:00:07 +0000
@@ -1,5 +1,8 @@
 2013-05-15  Stefan Monnier  <address@hidden>
 
+       * emacs-lisp/cl-extra.el (cl-getf): Return the proper value in
+       the setter (bug#14387).
+
        * progmodes/f90.el (f90-blocks-re): Include the terminating \> in the
        surrounding group (bug#14402).
 

=== modified file 'lisp/emacs-lisp/cl-extra.el'
--- a/lisp/emacs-lisp/cl-extra.el       2013-01-02 16:13:04 +0000
+++ b/lisp/emacs-lisp/cl-extra.el       2013-05-15 02:00:07 +0000
@@ -597,8 +597,11 @@
                   (macroexp-let2 nil d def
                     (funcall do `(cl-getf ,getter ,k ,d)
                              (lambda (v)
-                               (funcall setter
-                                        `(cl--set-getf ,getter ,k ,v))))))))))
+                               (macroexp-let2 nil val v
+                                 `(progn
+                                    ,(funcall setter
+                                              `(cl--set-getf ,getter ,k ,val))
+                                    ,val))))))))))
   (setplist '--cl-getf-symbol-- plist)
   (or (get '--cl-getf-symbol-- tag)
       ;; Originally we called cl-get here,

=== modified file 'lisp/emacs-lisp/cl-loaddefs.el'
--- a/lisp/emacs-lisp/cl-loaddefs.el    2013-05-10 10:21:19 +0000
+++ b/lisp/emacs-lisp/cl-loaddefs.el    2013-05-15 02:00:07 +0000
@@ -11,7 +11,7 @@
 ;;;;;;  cl--map-overlays cl--map-intervals cl--map-keymap-recursively
 ;;;;;;  cl-notevery cl-notany cl-every cl-some cl-mapcon cl-mapcan
 ;;;;;;  cl-mapl cl-mapc cl-maplist cl-map cl--mapcar-many cl-equalp
-;;;;;;  cl-coerce) "cl-extra" "cl-extra.el" "c5730f2a706cb1efc5fec0a790d3ca72")
+;;;;;;  cl-coerce) "cl-extra" "cl-extra.el" "011111887a1f353218e59e14d0b09c68")
 ;;; Generated autoloads from cl-extra.el
 
 (autoload 'cl-coerce "cl-extra" "\


reply via email to

[Prev in Thread] Current Thread [Next in Thread]