summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Geier <geier@lostpackets.de>2023-05-21 00:05:01 +0200
committerGitHub <noreply@github.com>2023-05-21 00:05:01 +0200
commit9cdff6b942d0aeea7413b6f5cd224e7d9b2dab6a (patch)
tree6f0b7d28628daec055c7c90f870302b991e1b077
parentacd62bc535feb2694636e6875397a471051fd2e4 (diff)
parent15dd3f91012eefce5fe67a758aeae163acca062d (diff)
Merge pull request #1244 from heull001/at-format
Fix for #1243
-rw-r--r--AUTHORS.txt1
-rw-r--r--CHANGELOG.rst7
-rw-r--r--khal/cli.py2
3 files changed, 10 insertions, 0 deletions
diff --git a/AUTHORS.txt b/AUTHORS.txt
index 3fc9a827..c4e0ce28 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -47,3 +47,4 @@ Fred Thomsen - me [at] fredthomsen [dot] net - http://fredthomsen.net
Robin Schubert
Axel Gschaider - axel.gschaider [at] posteo [dot] de
Anuragh - kpanuragh [at] gmail [dot] com
+Henning Ullrich - github {at] henning-ullrich [dot] de
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 8ac74ea7..b2207b3f 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -7,6 +7,13 @@ Package maintainers and users who have to manually update their installation
may want to subscribe to `GitHub's tag feed
<https://github.com/geier/khal/tags.atom>`_.
+
+0.11.2
+======
+not released yet
+
+* FIX khal `at` also uses `event_format` not `agenda_event_format`
+
0.11.1
======
2023-04-23
diff --git a/khal/cli.py b/khal/cli.py
index ef40479c..8b920f57 100644
--- a/khal/cli.py
+++ b/khal/cli.py
@@ -645,6 +645,8 @@ def _get_cli():
'''Print all events at a specific datetime (defaults to now).'''
if not datetime:
datetime = ("now",)
+ if format is None:
+ format = ctx.obj['conf']['view']['event_format']
try:
rows = controllers.khal_list(
build_collection(