[nongnu] elpa/xah-fly-keys c005ff846e 2/3: Merge pull request #149 from emiltoacs/fix-open-external

[ELPA Syncer]

branch: elpa/xah-fly-keys
commit c005ff846e724364029a6c4add95e3bfbb836bd2
Merge: df9284fe4f e514802f1b
Author: Xah Lee <xah@xahlee.org>
Commit: GitHub <noreply@github.com>

    Merge pull request #149 from emiltoacs/fix-open-external
    
    fix xdg-open quits too early and kill external app
---
 xah-fly-keys.el | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/xah-fly-keys.el b/xah-fly-keys.el
index 639c1b1a3d..610a634135 100644
--- a/xah-fly-keys.el
+++ b/xah-fly-keys.el
@@ -2680,11 +2680,11 @@ Version: 2020-11-20 2022-04-20"
       (shell-command
        (concat "open -R " (shell-quote-argument $path))))
      ((string-equal system-type "gnu/linux")
-      (let ((process-connection-type nil)
-            ($openFileProgram (if (file-exists-p "/usr/bin/gvfs-open")
-                                 "/usr/bin/gvfs-open"
-                               "/usr/bin/xdg-open")))
-        (start-process "" nil $openFileProgram (shell-quote-argument $path)))
+      (call-process shell-file-name nil nil nil
+                    shell-command-switch
+                    (format "%s %s"
+                            "xdg-open"
+                            (file-name-directory $path)))
       ;; (shell-command "xdg-open .") ;; 2013-02-10 this sometimes froze emacs 
till the folder is closed. eg with nautilus
       ))))
 
@@ -2729,7 +2729,13 @@ Version: 2019-11-04 2021-07-21"
        ((string-equal system-type "darwin")
         (mapc (lambda ($fpath) (shell-command (concat "open " 
(shell-quote-argument $fpath)))) $fileList))
        ((string-equal system-type "gnu/linux")
-        (mapc (lambda ($fpath) (let ((process-connection-type nil)) 
(start-process "" nil "xdg-open" $fpath))) $fileList))
+        (mapc (lambda ($fpath)
+                (call-process shell-file-name nil nil nil
+                              shell-command-switch
+                              (format "%s %s"
+                                      "xdg-open"
+                                      (shell-quote-argument $fpath))))
+              $fileList))
        ((string-equal system-type "berkeley-unix")
         (mapc (lambda ($fpath) (let ((process-connection-type nil)) 
(start-process "" nil "xdg-open" $fpath))) $fileList))))))