zsh-workers
 help / color / mirror / code / Atom feed
From: Julian Prein <druckdev@protonmail.com>
To: "Lawrence Velázquez" <larryv@zsh.org>
Cc: zsh-workers@zsh.org
Subject: Re: [PATCH] Introduce ZCALC_HISTFILE
Date: Mon, 19 Sep 2022 02:02:18 +0000	[thread overview]
Message-ID: <HG3rZWBATcDNspA7l867GuPw2McMe0kEXhB1zibSvx44l3CcCd0BNWi6JCwG30DqvntGWrTpfbckhIU9yR6cq7rrRWjzIv-WMnvBz8EaQlI=@protonmail.com> (raw)
In-Reply-To: <5af4a81c-1c63-4be2-8c76-8f3162a815b0@www.fastmail.com>


[-- Attachment #1.1: Type: text/plain, Size: 2521 bytes --]

Hi Lawrence,

Thank you for your response!

I originally thought about that too, but in the end decided not to specify it as
I found other sections where `$ZDOTDIR` is mentioned without fallback. It seemed
like more noise that needed.

Anyways, here is the updated patch. Let me know what you think!

Julian


From d3b75e7e2af95b89194f3d4f039df5b1ad1ba9a5 Mon Sep 17 00:00:00 2001
From: Julian Prein <druckdev@protonmail.com>
Date: Sat, 10 Sep 2022 01:10:16 +0200
Subject: [PATCH] Introduce ZCALC_HISTFILE

Make the location of the history file to which zcalc writes customizable
through the introduced variable `$ZCALC_HISTFILE`.

Update the documentation to mention this variable. The updated part used
to differ from the implementation as it did not mention `$ZDOTDIR`.

Signed-off-by: Julian Prein <druckdev@protonmail.com>
---
 Doc/Zsh/contrib.yo   | 7 +++++--
 Functions/Misc/zcalc | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Doc/Zsh/contrib.yo b/Doc/Zsh/contrib.yo
index 0ef59dbc9ca5..96de5aa9bf8f 100644
--- a/Doc/Zsh/contrib.yo
+++ b/Doc/Zsh/contrib.yo
@@ -3972,8 +3972,11 @@ calculation is stored.  For example, the result of the calculation on the
 line preceded by `tt(4> )' is available as tt($4).  The last value
 calculated is available as tt(ans).  Full command line editing, including
 the history of previous calculations, is available; the history is saved in
-the file tt(~/.zcalc_history).  To exit, enter a blank line or type `tt(:q)'
-on its own (`tt(q)' is allowed for historical compatibility).
+the file tt($ZCALC_HISTFILE).  If tt($ZCALC_HISTFILE) is unset,
+tt($ZDOTDIR/.zcalc_history) is used instead, which in turn falls backs to
+tt($HOME/.zcalc_history) if tt($ZDOTDIR) is unset.  To exit, enter a blank
+line or type `tt(:q)' on its own (`tt(q)' is allowed for historical
+compatibility).
 

 A line ending with a single backslash is treated in the same fashion
 as it is in command line editing:  the backslash is removed, the
diff --git a/Functions/Misc/zcalc b/Functions/Misc/zcalc
index 480373345124..397aa3cc1d4e 100644
--- a/Functions/Misc/zcalc
+++ b/Functions/Misc/zcalc
@@ -125,7 +125,7 @@ integer _max_stack _push
 local -a _expressions stack
 

 # We use our own history file with an automatic pop on exit.
-history -ap "${ZDOTDIR:-$HOME}/.zcalc_history"
+history -ap "${ZCALC_HISTFILE:-${ZDOTDIR:-$HOME}/.zcalc_history}"
 

 _forms=( '%2$g' '%.*g' '%.*f' '%.*E' '')
 

-- 

2.25.1

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 249 bytes --]

  reply	other threads:[~2022-09-19  2:02 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-09 23:27 Julian Prein
2022-09-10  0:49 ` Lawrence Velázquez
2022-09-19  2:02   ` Julian Prein [this message]
2022-09-25 17:07     ` Peter Stephenson

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='HG3rZWBATcDNspA7l867GuPw2McMe0kEXhB1zibSvx44l3CcCd0BNWi6JCwG30DqvntGWrTpfbckhIU9yR6cq7rrRWjzIv-WMnvBz8EaQlI=@protonmail.com' \
    --to=druckdev@protonmail.com \
    --cc=larryv@zsh.org \
    --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).