From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Mon, 31 May 2021 04:36:23 +0000 (+0200)
Subject: Fix error in xdg-mime-apps-files when XDG_CURRENT_DESKTOP is defined
X-Git-Tag: emacs-28.0.90~2256
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7733076638f5cb427db3b2151ce33f309c08abc3;p=emacs.git

Fix error in xdg-mime-apps-files when XDG_CURRENT_DESKTOP is defined

* lisp/xdg.el (xdg-mime-apps-files): Don't bug out when
XDG_CURRENT_DESKTOP is bound (bug#48748).
---

diff --git a/lisp/xdg.el b/lisp/xdg.el
index 11039499ea9..0bdfd114c48 100644
--- a/lisp/xdg.el
+++ b/lisp/xdg.el
@@ -231,7 +231,7 @@ admin config, and finally system cached associations."
         (desktop (getenv "XDG_CURRENT_DESKTOP"))
         res)
     (when desktop
-      (setq desktop (format "%s-mimeapps.list" desktop)))
+      (setq desktop (list (format "%s-mimeapps.list" desktop))))
     (dolist (name (cons "mimeapps.list" desktop))
       (push (expand-file-name name (xdg-config-home)) res)
       (push (expand-file-name (format "applications/%s" name) (xdg-data-home))