Merge branch 'main' into main

We now default to using `~/.cache/waybar-current-task.json` if the `xdg` package is not present.

org-clock-waybar.el

@@ -38,7 +38,7 @@
 
 ;;; Code:
 
-(require 'xdg)
+(require 'xdg nil t)
 (require 'json)
 (require 'org-clock)
 
@@ -47,7 +47,9 @@
   :group 'emacs)
 
 (defcustom org-clock-waybar-filename
-  (expand-file-name "waybar-current-task.json" (xdg-cache-home))
+  (if (fboundp 'xdg-cache-home)
+      (expand-file-name "waybar-current-task.json" (xdg-cache-home))
+    (expand-file-name "~/.cache/waybar-current-task.json"))
   "Name of the file to save task data to."
   :type 'string
   :group 'org-clock-waybar)
@@ -122,7 +124,11 @@ value of `org-clock-waybar-not-clocked-in-text'."
 This function is ought to be used via Emacsclient:
 
 emacsclient --eval '(org-clock-waybar-output-task)'"
-  (org-clock-waybar--get-clocked-task-json))
+  (let* ((output (org-clock-waybar--get-clocked-task-json))
+         (start 0)
+         (end (length output)))
+    (set-text-properties start end nil output)
+    output))
 
 (defun org-clock-waybar-setup ()
   "Setup org-clock-waybar.