[Emacs-diffs] /srv/bzr/emacs/trunk r106130: * lisp/net/browse-url.el (browse-url-can-use-xdg-open): Support LXDE

[Juri Linkov]

------------------------------------------------------------
revno: 106130
fixes bug(s): http://debbugs.gnu.org/9779
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Wed 2011-10-19 12:10:10 +0300
message:
  * lisp/net/browse-url.el (browse-url-can-use-xdg-open): Support LXDE
  by checking environment variables "DESKTOP_SESSION" and
  "XDG_CURRENT_DESKTOP".
modified:
  lisp/ChangeLog
  lisp/net/browse-url.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-10-19 09:03:39 +0000
+++ b/lisp/ChangeLog    2011-10-19 09:10:10 +0000
@@ -1,5 +1,11 @@
 2011-10-19  Juri Linkov  <address@hidden>
 
+       * net/browse-url.el (browse-url-can-use-xdg-open): Support LXDE
+       by checking environment variables "DESKTOP_SESSION" and
+       "XDG_CURRENT_DESKTOP".  (Bug#9779)
+
+2011-10-19  Juri Linkov  <address@hidden>
+
        * net/browse-url.el (browse-url-browser-function): Add "Chromium".
        (browse-url-chromium-program, browse-url-chromium-arguments):
        New defcustoms.

=== modified file 'lisp/net/browse-url.el'
--- a/lisp/net/browse-url.el    2011-10-19 09:03:39 +0000
+++ b/lisp/net/browse-url.el    2011-10-19 09:10:10 +0000
@@ -48,6 +48,7 @@
 ;; browse-url-generic                 arbitrary
 ;; browse-url-default-windows-browser MS-Windows browser
 ;; browse-url-default-macosx-browser  Mac OS X browser
+;; browse-url-xdg-open                Free Desktop xdg-open on Gnome, KDE, 
Xfce4, LXDE
 ;; browse-url-gnome-moz               GNOME interface to Mozilla
 ;; browse-url-kde                     KDE konqueror (kfm)
 ;; browse-url-elinks                  Elinks      Don't know (tried with 
0.12.GIT)
@@ -943,12 +944,13 @@
    url args))
 
 (defun browse-url-can-use-xdg-open ()
-  "Check if xdg-open can be used, i.e. we are on Gnome, KDE or xfce4."
+  "Check if xdg-open can be used, i.e. we are on Gnome, KDE, Xfce4 or LXDE."
   (and (getenv "DISPLAY")
        (executable-find "xdg-open")
        ;; xdg-open may call gnome-open and that does not wait for its child
        ;; to finish.  This child may then be killed when the parent dies.
-       ;; Use nohup to work around.
+       ;; Use nohup to work around.  See bug#7166, bug#8917, bug#9779 and
+       ;; http://lists.gnu.org/archive/html/emacs-devel/2009-07/msg00279.html
        (executable-find "nohup")
        (or (getenv "GNOME_DESKTOP_SESSION_ID")
           ;; GNOME_DESKTOP_SESSION_ID is deprecated, check on Dbus also.
@@ -966,7 +968,9 @@
                      "/bin/sh" nil nil nil
                      "-c"
                      "xprop -root _DT_SAVE_MODE|grep xfce4"))
-            (error nil)))))
+            (error nil))
+          (member (getenv "DESKTOP_SESSION") '("LXDE" "Lubuntu"))
+          (equal (getenv "XDG_CURRENT_DESKTOP") "LXDE"))))
 
 
 ;;;###autoload