From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 11525 invoked by alias); 5 Mar 2017 23:38:54 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 40753 Received: (qmail 246 invoked from network); 5 Mar 2017 23:38:54 -0000 X-Qmail-Scanner-Diagnostics: from out4-smtp.messagingengine.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.99.2/21882. spamassassin: 3.4.1. Clear:RC:0(66.111.4.28):SA:0(-0.7/5.0):. Processed in 1.507731 secs); 05 Mar 2017 23:38:54 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.1 X-Envelope-From: d.s@daniel.shahaf.name X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | Received-SPF: none (ns1.primenet.com.au: domain at daniel.shahaf.name does not designate permitted sender hosts) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= daniel.shahaf.name; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=mesmtp; bh=W94Na8S85C0sOYa a5iPxXOk43RA=; b=ZSASiKSdbkr6iEUEcEOk/ExycHHLUWE3Ea/MdQ4x9Bp1PG0 zx6nrvcq+fVhCgqh8Ei7NOhNCjHFWTdyRUN/y+mbmRbFJpVC5k558Jx6xqbnTnEM sOAri3sy9yvYt57IIGgH5eFzEM8mMuzkSqUB3JhmSNBSWPMeP/hzR+c6w+us= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=smtpout; bh=W94Na8S85C0sOY aa5iPxXOk43RA=; b=Ffv7doPziqunGhit2iNb0Yl//Tn8Dq3RF38eNiBN6QY/Mh rqAqqJnqsqMrR/EPne0tUhIjHPSImsVUWVxKe9/30y+iFKCaZC82fHqF41b4aZwV SEpeEhjPJSUG1MWNDvGUYTiFXr7/lNWarUA7nxoevJzSPjzRwe3RoSCW6WSXw= X-ME-Sender: X-Sasl-enc: xob7iVPhx8AoX9UlAt3fsjvlUMmzhju8OIRyS3ZG/JaR 1488757127 Date: Sun, 5 Mar 2017 23:34:02 +0000 From: Daniel Shahaf To: zsh-workers@zsh.org Subject: Re: [PATCH] Fix 'unset ZLE_RPROMPT_INDENT' not restoring the default behaviour. Message-ID: <20170305233402.GA16547@fujitsu.shahaf.local2> References: <1488752733-31896-1-git-send-email-danielsh@fujitsu.shahaf.local2> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <1488752733-31896-1-git-send-email-danielsh@fujitsu.shahaf.local2> User-Agent: Mutt/1.5.23 (2014-03-12) Daniel Shahaf wrote on Sun, Mar 05, 2017 at 22:25:33 +0000: > +/* Implements gsu_integer.unsetfn for ZLE_RPROMPT_INDENT; see stdunsetfn() */ > + > +static void > +rprompt_indent_unsetfn(Param pm, UNUSED(int exp)) > +{ > + rprompt_indent = 1; /* Keep this in sync with init_term() */ > +} That's wrong: unlike stdunsetfn(), it doesn't add the PM_UNSET bitflag, so ${+ZLE_RPROMPT_INDENT} remains 1 after unsetting. Fix: diff --git a/Src/params.c b/Src/params.c index f01bbfa..798e92c 100644 --- a/Src/params.c +++ b/Src/params.c @@ -131,7 +131,7 @@ mod_export int termflags; /* Forward declaration */ static void -rprompt_indent_unsetfn(Param pm, UNUSED(int exp)); +rprompt_indent_unsetfn(Param pm, int exp); /* Standard methods for get/set/unset pointers in parameters */ @@ -3745,8 +3745,9 @@ zlevarsetfn(Param pm, zlong x) /* Implements gsu_integer.unsetfn for ZLE_RPROMPT_INDENT; see stdunsetfn() */ static void -rprompt_indent_unsetfn(Param pm, UNUSED(int exp)) +rprompt_indent_unsetfn(Param pm, int exp) { + stdunsetfn(pm, exp); rprompt_indent = 1; /* Keep this in sync with init_term() */ }