zsh-workers
 help / color / mirror / code / Atom feed
From: Daniel Shahaf <d.s@daniel.shahaf.name>
To: zsh-workers@zsh.org
Subject: Re: [PATCH] Fix 'unset ZLE_RPROMPT_INDENT' not restoring the default behaviour.
Date: Sun, 5 Mar 2017 23:34:02 +0000	[thread overview]
Message-ID: <20170305233402.GA16547@fujitsu.shahaf.local2> (raw)
In-Reply-To: <1488752733-31896-1-git-send-email-danielsh@fujitsu.shahaf.local2>

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() */
 }
 


      reply	other threads:[~2017-03-05 23:38 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-05 22:25 Daniel Shahaf
2017-03-05 23:34 ` Daniel Shahaf [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170305233402.GA16547@fujitsu.shahaf.local2 \
    --to=d.s@daniel.shahaf.name \
    --cc=zsh-workers@zsh.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/zsh/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).