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@xxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxx>
---
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:
signature.asc
Description: OpenPGP digital signature