From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Zack Piper Newsgroups: gmane.emacs.devel Subject: [PATCH] Fix (letrec ((ignore))) Date: Fri, 11 Dec 2015 16:11:16 +0000 Message-ID: <20151211161116.GA8923@apertron.net> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="+HP7ph2BbKc20aGI" X-Trace: ger.gmane.org 1449850312 868 80.91.229.3 (11 Dec 2015 16:11:52 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 11 Dec 2015 16:11:52 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Dec 11 17:11:45 2015 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1a7QIE-0006VG-4U for ged-emacs-devel@m.gmane.org; Fri, 11 Dec 2015 17:11:38 +0100 Original-Received: from localhost ([::1]:48324 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a7QID-0007zp-En for ged-emacs-devel@m.gmane.org; Fri, 11 Dec 2015 11:11:37 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57107) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a7QHz-0007zZ-Sk for emacs-devel@gnu.org; Fri, 11 Dec 2015 11:11:24 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a7QHv-0007bG-QH for emacs-devel@gnu.org; Fri, 11 Dec 2015 11:11:23 -0500 Original-Received: from apertron.net ([94.23.236.101]:40740 helo=mail.apertron.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a7QHv-0007aj-Ir for emacs-devel@gnu.org; Fri, 11 Dec 2015 11:11:19 -0500 Original-Received: by mail.apertron.net (Postfix, from userid 30061) id 29CEA64120; Fri, 11 Dec 2015 16:11:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=apertron.net; s=mail; t=1449850278; bh=JyZbKDID7zu9WexEyUztPI8GFSkSchS/8l0yafeJAwA=; h=Date:From:To:Subject; b=L85iODXF2/81jwfNDVM7INOw9vQFHMkwJURZJFkCp6d5/VJytJfvWVKL/8yz+xraZ cbZ0CwxWFffa3D42qGCLVtdn6YpcoCwwoHKrvY8JbEHH7mRUYTQ9axQD6DKoIaojy3 9+8WDSs5PKhkxWFb7lcmwar47WuQ1VwHNrgTMXY8= Original-Received: from apertron.net (xieshaij [127.0.0.1]) by mail.apertron.net (Postfix) with ESMTPS id DE22B64101 for ; Fri, 11 Dec 2015 16:11:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=apertron.net; s=mail; t=1449850277; bh=JyZbKDID7zu9WexEyUztPI8GFSkSchS/8l0yafeJAwA=; h=Date:From:To:Subject; b=C6mzSWtIlCe11AMqAf5INnHKPgpvrQCrli2KAmw0lFUYVjlHKPKUhMvG099ULxlgV V5lFeWTCl96+h81tTZt0xoR2M8y1KJosb/O5tucbVLzOCOX5GrPMS9J6e9HK29bu6+ UM7Uc/LhfhoXWgbyIk+j/330WtpuzNnm7xhcsXDw= Content-Disposition: inline User-Agent: Mutt/1.5.23+113 (34ca1c5fdd45) (2014-03-12) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 94.23.236.101 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:196119 Archived-At: --+HP7ph2BbKc20aGI Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Org mode uses `(letrec ((ignore)) ...)' a few times, this introduces compatibility after the recent setq changed which stopped an odd number of arguments being passed. -- Zack Piper http://apertron.net --+HP7ph2BbKc20aGI Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="0001-Fix-letrec-and-ignore-producing-an-odd-numbered-call.patch" >From df31b93604b28ee9b098280907fb8d5c12710b63 Mon Sep 17 00:00:00 2001 From: Zack Piper Date: Fri, 11 Dec 2015 16:00:37 +0000 Subject: [PATCH] Fix `letrec' and `(ignore)' producing an odd-numbered call to `setq'. Revision 5d93a89e805baa2f29941fd801e48235f6c1a6b6 introduces a change to `setq' where it no longer accepts an odd amount of arguments. Org mode uses `(letrec ((ignore)) ...)' a few times and other packages might do the same. Copyright-paperwork-exempt: yes --- lisp/subr.el | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lisp/subr.el b/lisp/subr.el index 860c14c..e8ba4d8 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -1500,7 +1500,10 @@ letrec ;; making the vars actually unbound during evaluation of the binders). (declare (debug let) (indent 1)) `(let ,(mapcar #'car binders) - ,@(mapcar (lambda (binder) `(setq ,@binder)) binders) + ,@(mapcar (lambda (binder) + (if (second binder) + `(setq ,@binder) + `(setq ,@binder nil))) binders) ,@body)) (defmacro with-wrapper-hook (hook args &rest body) -- 2.6.3 --+HP7ph2BbKc20aGI--