monnier pushed a commit to branch externals/auctex
in repository elpa.
commit b3e28fa148fd1c4eb39dab0dfdb7406920b923af
Author: Tassilo Horn <[email protected]>
Date: Mon Jun 24 09:04:09 2013 +0200
Fix compilation problem due to `dbus-ignore-errors' not being defined.
* tex.el (TeX-evince-dbus-p): Require dbus at compile-time.
---
ChangeLog | 4 ++++
tex.el | 3 +++
2 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d7ece1f..a3bc460 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-06-24 Tassilo Horn <[email protected]>
+
+ * tex.el (TeX-evince-dbus-p): Require dbus at compile-time.
+
2013-06-21 Tassilo Horn <[email protected]>
* tex.el (TeX-evince-dbus-p): Improved DBUS availability check.
diff --git a/tex.el b/tex.el
index 1e82bc1..19da9bf 100644
--- a/tex.el
+++ b/tex.el
@@ -1020,6 +1020,8 @@ The following built-in predicates are available:
:group 'TeX-view
:type '(alist :key-type symbol :value-type (group sexp)))
+;; For `dbus-ignore-errors'.
+(eval-when-compile (require 'dbus nil :no-error))
(defun TeX-evince-dbus-p (&rest options)
"Return non-nil, if evince is installed and accessible via DBUS.
Additional OPTIONS may be given to extend the check. If none are
@@ -1030,6 +1032,7 @@ 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
