From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stephen Berman Newsgroups: gmane.emacs.devel Subject: Re: member inconsistency? Date: Thu, 28 Jan 2016 23:41:53 +0100 Message-ID: <87oac58gy6.fsf@gmx.net> References: <87twly2iye.fsf@nicolasgoaziou.fr> <871t929f1e.fsf@gmx.net> <83bn85zovm.fsf@gnu.org> <87wpqt8vdv.fsf@gmx.net> <874mdxz6tm.fsf@igel.home> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1454020952 28902 80.91.229.3 (28 Jan 2016 22:42:32 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 28 Jan 2016 22:42:32 +0000 (UTC) Cc: Eli Zaretskii , p.stephani2@gmail.com, mail@nicolasgoaziou.fr, emacs-devel@gnu.org To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jan 28 23:42:22 2016 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 1aOvGf-0007Fp-V0 for ged-emacs-devel@m.gmane.org; Thu, 28 Jan 2016 23:42:22 +0100 Original-Received: from localhost ([::1]:58912 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOvGb-0003KH-N2 for ged-emacs-devel@m.gmane.org; Thu, 28 Jan 2016 17:42:17 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34649) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOvGO-0003K1-Qs for emacs-devel@gnu.org; Thu, 28 Jan 2016 17:42:05 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aOvGJ-0001tm-N3 for emacs-devel@gnu.org; Thu, 28 Jan 2016 17:42:04 -0500 Original-Received: from mout.gmx.net ([212.227.15.18]:59052) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOvGJ-0001tT-DT; Thu, 28 Jan 2016 17:41:59 -0500 Original-Received: from rosalinde ([89.245.82.29]) by mail.gmx.com (mrgmx002) with ESMTPSA (Nemesis) id 0LvENG-1ZxwVl3cp8-010P5c; Thu, 28 Jan 2016 23:41:56 +0100 In-Reply-To: <874mdxz6tm.fsf@igel.home> (Andreas Schwab's message of "Thu, 28 Jan 2016 23:18:29 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-Provags-ID: V03:K0:gV/RpT5QYrUbM0Orzi59Id3HlNQQ/Gt9ZU+yQRJkRbWXXBBIiCO lBWCqVyA+m7lNBpwsrVzgLjJNYMw0bnHn3hXfkTx20UolPceHZcIFJBPj7KUnKIOje7QZ6v T3mfKSLCzcQMh9wsKvO05T/exxbNjEdgte7CeSSs1q7IkPk5uZ+PlsA/P9H6jxfcIZuaqJi fXGkQPEJ60B7DlPZijueQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:SHWYQvxLCFM=:qsKd4m0GgTqyQRUAj2iKPD jD6WV51HZLFJRcaXa3/kNSylLWTPNX6Qqksisw62F/jtxX3nWOISpRuIApnfhL4NBooNzN06g OSVEjoAQCYIdd5NexFxnHZIwl5mMXbASf50iMPvgQAZEZu0RbVnVWi8TrlLo7vKUol0i6YnVv 5F9DrXRdD+dkCEG08xiqRDJOGJd3QJxvUZ/ywqWVHXHme4lmhVQ/+mxyzRQeUACzIrocmdSda SOsxl2n36GQxh92Yo/kQi/BTmUvRMJp4l02fVdWInI/FkpUYRko7twepJaGsgt55AfuWJbiBb gCtkccPjD/7Gz1EkKdiwLfglxz5hi00kqxA9zN5lUEwoHf/dPLbXt08GJ9FNzJnKLoQLFu+CO WDG///oCNdHqnMnZZCXEAOc4A1Le3nApdM3RRNTCfsgpKDY1+P8cKpHH75wmpVwpIKNO3x0cS WS+uyOltNgUgCUDiunDip+F9NpzN+hlRs+MputRl90CikwGtN6ykoIKakY5nYjWZm3mwT8kAc Fjl+eT72PsabKQbd587RvHv5JzGXxLn4JAE80JW6/+TeeOMZY9E61NRDgfoSTTIIboMb5xwnQ dHPqphs4n71o/YJDarp9Leu12VtkGZ7I+UkmQ5Uscg8H/2k52+rG6yfoG3JrbnUQWOrmb2aPJ H25erFGSbLPf9Bed2NH2Cg41yCaB0zUQ/t6yOuUc56aKAOvm4pAyPTkTnWJtqCFViSzAqG22J k+jaAsG6NC7D/gpk2hXFvJr/GBkQJN+Es13dqS0U/reny7Vidz2fles1GSK7fNlrD01adNrO X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.15.18 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:198960 Archived-At: On Thu, 28 Jan 2016 23:18:29 +0100 Andreas Schwab wrote: > Stephen Berman writes: > >> diff --git a/src/fns.c b/src/fns.c >> index 86ad333..17c4a75 100644 >> --- a/src/fns.c >> +++ b/src/fns.c >> @@ -1349,7 +1349,7 @@ The value is actually the tail of LIST whose car is ELT. */) >> (register Lisp_Object elt, Lisp_Object list) >> { >> register Lisp_Object tail; >> - for (tail = list; CONSP (tail); tail = XCDR (tail)) >> + for (tail = list; CONSP (tail) || !NILP (tail); tail = XCDR (tail)) >> { >> register Lisp_Object tem; >> CHECK_LIST_CONS (tail, list); > > The check for CONSP in the loop condition is redundant, that is already > checked by CHECK_LIST_CONS (and the latter was a no-op before). Thanks. So is the following patch ok to commit to emacs-25? diff --git a/src/fns.c b/src/fns.c index 86ad333..b75f0c8 100644 --- a/src/fns.c +++ b/src/fns.c @@ -1349,7 +1349,7 @@ The value is actually the tail of LIST whose car is ELT. */) (register Lisp_Object elt, Lisp_Object list) { register Lisp_Object tail; - for (tail = list; CONSP (tail); tail = XCDR (tail)) + for (tail = list; !NILP (tail); tail = XCDR (tail)) { register Lisp_Object tem; CHECK_LIST_CONS (tail, list); @@ -1397,7 +1397,7 @@ The value is actually the tail of LIST whose car is ELT. */) if (!FLOATP (elt)) return Fmemq (elt, list); - for (tail = list; CONSP (tail); tail = XCDR (tail)) + for (tail = list; !NILP (tail); tail = XCDR (tail)) { register Lisp_Object tem; CHECK_LIST_CONS (tail, list);