emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/auctex b9eddc9 11/28: Really ignore dbus errors


From: Tassilo Horn
Subject: [elpa] externals/auctex b9eddc9 11/28: Really ignore dbus errors
Date: Fri, 07 Aug 2015 15:59:20 +0000

branch: externals/auctex
commit b9eddc93c35e49f089bf00b31d291150cc2c23f7
Author: Tassilo Horn <address@hidden>
Commit: Tassilo Horn <address@hidden>

    Really ignore dbus errors
    
    * tex.el (TeX-evince-dbus-p): Explicitly bind dbus-debug to nil in
    order to really ignore dbus errors with dbus-ignore-errors.
---
 ChangeLog |    5 +++++
 tex.el    |   45 +++++++++++++++++++++++----------------------
 2 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4d1f5b6..2230519 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-06-09  Tassilo Horn  <address@hidden>
+
+       * tex.el (TeX-evince-dbus-p): Explicitly bind dbus-debug to nil in
+       order to really ignore dbus errors with dbus-ignore-errors.
+
 2015-06-05  Arash Esbati  <address@hidden>
 
        * Makefile.in (STYLESRC): Add new style.
diff --git a/tex.el b/tex.el
index 24f0d6d..07fa371 100644
--- a/tex.el
+++ b/tex.el
@@ -1085,28 +1085,29 @@ given, only the minimal requirements needed by backward 
search
 are checked.  If OPTIONS include `:forward', which is currently
 the only option, then additional requirements needed by forward
 search are checked, too."
-  (and (featurep 'dbusbind)
-       (require 'dbus nil :no-error)
-       (dbus-ignore-errors (dbus-get-unique-name :session))
-       (dbus-ping :session "org.gnome.evince.Daemon")
-       (executable-find "evince")
-       (or (not (memq :forward options))
-          (let ((spec (dbus-introspect-get-method
-                       :session "org.gnome.evince.Daemon"
-                       "/org/gnome/evince/Daemon"
-                       "org.gnome.evince.Daemon"
-                       "FindDocument")))
-            ;; FindDocument must exist, and its signature must be (String,
-            ;; Boolean, String).  Evince versions between 2.30 and 2.91.x
-            ;; didn't have the Boolean spawn argument we need to start evince
-            ;; initially.
-            (and spec
-                 (equal '("s" "b" "s")
-                        (delq nil (mapcar (lambda (elem)
-                                            (when (and (listp elem)
-                                                       (eq (car elem) 'arg))
-                                              (cdr (caar (cdr elem)))))
-                                          spec))))))))
+  (let ((dbus-debug nil))
+    (and (featurep 'dbusbind)
+        (require 'dbus nil :no-error)
+        (dbus-ignore-errors (dbus-get-unique-name :session))
+        (dbus-ping :session "org.gnome.evince.Daemon")
+        (executable-find "evince")
+        (or (not (memq :forward options))
+            (let ((spec (dbus-introspect-get-method
+                         :session "org.gnome.evince.Daemon"
+                         "/org/gnome/evince/Daemon"
+                         "org.gnome.evince.Daemon"
+                         "FindDocument")))
+              ;; FindDocument must exist, and its signature must be (String,
+              ;; Boolean, String).  Evince versions between 2.30 and 2.91.x
+              ;; didn't have the Boolean spawn argument we need to start evince
+              ;; initially.
+              (and spec
+                   (equal '("s" "b" "s")
+                          (delq nil (mapcar (lambda (elem)
+                                              (when (and (listp elem)
+                                                         (eq (car elem) 'arg))
+                                                (cdr (caar (cdr elem)))))
+                                            spec)))))))))
 
 (defun TeX-pdf-tools-sync-view ()
   "Focus the focused page/paragraph in `pdf-view-mode'.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]