aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorStefan Monnier2012-11-09 15:45:10 -0500
committerStefan Monnier2012-11-09 15:45:10 -0500
commitda03ef8a9d38ef6f059aaeddb8c97dc7e76d3917 (patch)
tree280a4752f68dc4b860575f73bfc7619a85e05afa /lisp
parent6858633a9c9f7e764e017cc5cbf77516729d120b (diff)
downloademacs-da03ef8a9d38ef6f059aaeddb8c97dc7e76d3917.tar.gz
emacs-da03ef8a9d38ef6f059aaeddb8c97dc7e76d3917.zip
* lisp/subr.el (dolist): Don't bind VAR in RESULT.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/subr.el4
2 files changed, 3 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 612cdc33d52..6f10e311eac 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12012-11-09 Stefan Monnier <monnier@iro.umontreal.ca> 12012-11-09 Stefan Monnier <monnier@iro.umontreal.ca>
2 2
3 * subr.el (dolist): Don't bind VAR in RESULT.
4
3 * emacs-lisp/advice.el: Miscellaneous cleanup. Use lexical-binding. 5 * emacs-lisp/advice.el: Miscellaneous cleanup. Use lexical-binding.
4 (fset, documentation): Don't save real def since we don't advise. 6 (fset, documentation): Don't save real def since we don't advise.
5 (ad-do-advised-functions): Remove problematic `result-form'. 7 (ad-do-advised-functions): Remove problematic `result-form'.
diff --git a/lisp/subr.el b/lisp/subr.el
index 9c89bd3e045..0ba932a3efe 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -222,9 +222,7 @@ Then evaluate RESULT to get return value, default nil.
222 (let ((,(car spec) (car ,temp))) 222 (let ((,(car spec) (car ,temp)))
223 ,@body 223 ,@body
224 (setq ,temp (cdr ,temp)))) 224 (setq ,temp (cdr ,temp))))
225 ,@(if (cdr (cdr spec)) 225 ,@(cdr (cdr spec)))
226 ;; FIXME: This let often leads to "unused var" warnings.
227 `((let ((,(car spec) nil)) ,@(cdr (cdr spec))))))
228 `(let ((,temp ,(nth 1 spec)) 226 `(let ((,temp ,(nth 1 spec))
229 ,(car spec)) 227 ,(car spec))
230 (while ,temp 228 (while ,temp