From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.3 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 1006 invoked from network); 10 Nov 2022 05:47:33 -0000 Received: from zero.zsh.org (94.142.241.90) by inbox.vuxu.org with ESMTPUTF8; 10 Nov 2022 05:47:33 -0000 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20210803; t=1668059253; b=pEzITxU46ijBNR/j9ypS7m7+j0XDylQ4mt6OUcA1QmlKI1qQ5e2oMbgdA72V24Nzs6f7OAPWUk ZsKLL8Cp2hkMtS+iR4IBFPUKifslTuVA9BKIlHn/fb/IHzLyYjwONxRuhTgroujA5ivLcYLowW 7xtPxZkdRJ2f6WC+IEsAvSmGTVmkbQKGYsfd5ueJDBQIjPI/zdKn7c4Mbad/oKwHhv6WTgQISu abH/kde73yjQZJmsktmc7riPzQ1bcK65mc18O2EH5npXm9d1FmY8hixuSw6s7+ziWj1FkEBbFo EiiMMdbadWA/iBgcU4rUXTrQWL9zsqqC93ceTceuvN0bgw==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (mail-ej1-f48.google.com) smtp.remote-ip=209.85.218.48; dkim=pass header.d=brasslantern-com.20210112.gappssmtp.com header.s=20210112 header.a=rsa-sha256; dmarc=none header.from=brasslantern.com; arc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed; d=zsh.org; s=rsa-20210803; t=1668059253; bh=7yoidnUjPT5Oik7DPw+qtVIBwIwIH6PcmyHNT+p6ueg=; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help: List-Id:Sender:Content-Type:To:Subject:Message-ID:Date:From:In-Reply-To: References:MIME-Version:DKIM-Signature:DKIM-Signature; b=LaW89W5yPQ6mpKjzY4EP+hUg2+3jwGmJyyzRPgxocYaZwgpPwaqIJe4Nf8mObsue+JLO8y9lta 02nn4FGU0O9HJWHz49X/XIeWJfcM4x9vyIRXsGBMMAQBY8C5G29srv8eRu/Dys967INHolQiaT G8Ssahm1vbabvdLSpFjsR7d6+8VNmSENZeJRnKjCaC6MLsJo0gKjF6/HVlWlsQobX4hZxMP6LD ycBnQqG6Btdr/ndpw1vxoz9Gi0QwZgIlnQb0/qKOgHdUoD5arhcCYD7/2UVCoM+cJLZnB/NXoV yeb9m25F1Riqqbf14hcUKSRcKcRM7CkEd6l4PjTVFUcXiQ==; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=zsh.org; s=rsa-20210803; h=List-Archive:List-Owner:List-Post:List-Unsubscribe: List-Subscribe:List-Help:List-Id:Sender:Content-Type:To:Subject:Message-ID: Date:From:In-Reply-To:References:MIME-Version:Reply-To:Cc: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID; bh=7bqUyFQQCMJyArg95aayIgLxkhmRkVu9kI58agAQP54=; b=fQ6SGWXycLv2ilf1FUCfDNpszZ ekAQKXHddUiTBB+q6qGOpIWJvTWNhGK4qzuwRqRUUPJxAMcLhqVTPcqPZM5G4o9gHIN3TpOeK+9Fp p2QBr+Y148oAKU8rfLh9HnBnRF5GPVKlx5oEKclRxmcuuZy0+Fx8DKmNa6O5xW1eeT6ij4hkjAPgq +iBHNVqcW5iEpRJgMAvHEwe/biyKd3ukZbpbVfV9d+Mg/7iTDlNZhwORElcYBjdwR/38HXo4X2W+e PKgC5jGmTiVtIXMU9NDi5PHDYdJDcUfvubTe5+fxxf40YtXhAzZJtNq6VruU2DUOuijj8V4DKErTs ZakE4VNw==; Received: by zero.zsh.org with local id 1ot0PU-0002Vj-P2; Thu, 10 Nov 2022 05:47:32 +0000 Authentication-Results: zsh.org; iprev=pass (mail-ej1-f48.google.com) smtp.remote-ip=209.85.218.48; dkim=pass header.d=brasslantern-com.20210112.gappssmtp.com header.s=20210112 header.a=rsa-sha256; dmarc=none header.from=brasslantern.com; arc=none Received: from mail-ej1-f48.google.com ([209.85.218.48]:40950) by zero.zsh.org with esmtps (TLS1.3:TLS_AES_128_GCM_SHA256:128) id 1ot0PD-00028v-1G; Thu, 10 Nov 2022 05:47:16 +0000 Received: by mail-ej1-f48.google.com with SMTP id kt23so2317767ejc.7 for ; Wed, 09 Nov 2022 21:47:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brasslantern-com.20210112.gappssmtp.com; s=20210112; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :from:to:cc:subject:date:message-id:reply-to; bh=7bqUyFQQCMJyArg95aayIgLxkhmRkVu9kI58agAQP54=; b=bE34svD9kYzs+s4CjWsCIZoj5YQhEhEASLCiEF1IvGfqNERouxmPQWiUnQGp5gShBZ rL8holTWdiYdSpo7Nwt/cbO/7ywbWP7EnGjfXCVm3dZ8Fna0TsTiGGrS56W/jz96vOvt z7riIr3/WiK3YV9chC5Ev1mkfKbbcXQT94iMuf7Ofh01LJm91rBEWmCZzRbm3k7fhaC1 zS/SGl/kJIMhjHsAyArfS8altAaW9VvH7p32CqEOirulOg1DRjN1+hkizcFJkjNatO58 u1mpQTBlS78k5zwR0V2rEhq/bu1SkHF91xtJjRJ/ZSMy/3kwy1b7rWjhXnUogeimvlsZ qjhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=7bqUyFQQCMJyArg95aayIgLxkhmRkVu9kI58agAQP54=; b=Cd1N0jAa50hY+1ofHJ7oxB6Xr5m1gaxfY51AxfGsPjCYzsqr5PjNZZWXhdwb141UQ0 j3PFKfetWtBESKjJGs71fq8KLq4aJjvvWXOH/FYA2jlRuc0v4IVLIOko5swtv+ZVq0Zu wt06w/gnjepPi0TYzE394jy7SH/ldQJ/LctVIBKQfKtr0NjrJXEPxMuSoB1q5ECjDZyQ 1bx5TMyDkjTcJ+baQetuvjgw90c4ZbJ5tXdynlNTC4p+NmUnfM8fZsSXj5R/QCALfohm SpZ93yPe+yaR5ibKEMFOGWyxoHkU+I9xBGEgeuUmr7bdV5IRJ4jBiP4IF0AxbxenrC6U A0HQ== X-Gm-Message-State: ACrzQf1fbL5D+LGQeXBVxCBCkI+MuTYw9A1g+1Q/otu26Dm72vss2TVq ShKllj4y+Iyzde+9wfYEAhLLrF+BCC6XE30PFGuQViRx6Q62wg== X-Google-Smtp-Source: AMsMyM6ajDN7yWD06EGktb5z/Am55GBUtOPpNBsh9+LufCPlx6tS3e+Ze+Xv2ouUXN8KZySHnSPp9AXCJa51yw8b8mc= X-Received: by 2002:a17:906:804b:b0:7aa:23ac:608e with SMTP id x11-20020a170906804b00b007aa23ac608emr2236653ejw.450.1668059234650; Wed, 09 Nov 2022 21:47:14 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Bart Schaefer Date: Wed, 9 Nov 2022 21:47:03 -0800 Message-ID: Subject: Re: [PATCH] More ERR_EXIT (was Re: Tests RE behavior of ERR_EXIT) To: Zsh hackers list Content-Type: text/plain; charset="UTF-8" X-Seq: 50929 Archived-At: X-Loop: zsh-workers@zsh.org Errors-To: zsh-workers-owner@zsh.org Precedence: list Precedence: bulk Sender: zsh-workers-request@zsh.org X-no-archive: yes List-Id: List-Help: , List-Subscribe: , List-Unsubscribe: , List-Post: List-Owner: List-Archive: On Wed, Nov 9, 2022 at 9:22 PM Bart Schaefer wrote: > > Grateful for the thorough regression tests in E01options, too. Of course I still missed one detail ... ERR_RETURN only applies inside functions. diff --git a/Src/exec.c b/Src/exec.c index eef40232e..ce0c1f1ad 100644 --- a/Src/exec.c +++ b/Src/exec.c @@ -1442,7 +1442,7 @@ execlist(Estate state, int dont_change_job, int exiting) execsimple(state); else execpline(state, code, ltype, (ltype & Z_END) && exiting); - if (unset(ERRRETURN)) + if (!locallevel || unset(ERRRETURN)) this_noerrexit = noerrexit; state->pc = next; goto sublist_done;