monnier pushed a commit to branch externals/auctex
in repository elpa.
commit 89c27b4f44865e0e697c65b600521d6299619547
Author: Mosè Giordano <[email protected]>
Date: Fri Jul 11 23:40:49 2014 +0200
Fix some XEmacs compilation issues.
* tex-buf.el (TeX-error-description-error): Make face definition
XEmacs compatible.
(TeX-error-description-tex-said): Ditto.
(TeX-error-description-help): Ditto.
* tex.el (nil): Handle the case of a non-available crm.el with a
`condition-case', instead of using the third argument of
`require', not recognized by XEmacs 21.4.
(and): Check whether dbus support is available before requiring
dbus.el.
---
ChangeLog | 13 +++++++++++++
tex-buf.el | 6 +++---
tex.el | 16 +++++++++++-----
3 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d60d2da..95f0497 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2014-07-11 Mos� Giordano <[email protected]>
+
+ * tex-buf.el (TeX-error-description-error): Make face definition
+ XEmacs compatible.
+ (TeX-error-description-tex-said): Ditto.
+ (TeX-error-description-help): Ditto.
+
+ * tex.el (nil): Handle the case of a non-available crm.el with a
+ `condition-case', instead of using the third argument of
+ `require', not recognized by XEmacs 21.4.
+ (and): Check whether dbus support is available before requiring
+ dbus.el.
+
2014-07-02 Mos� Giordano <[email protected]>
* tex.el (TeX-expand-list): Set
diff --git a/tex-buf.el b/tex-buf.el
index b8785d2..a4eab05 100644
--- a/tex-buf.el
+++ b/tex-buf.el
@@ -1902,7 +1902,7 @@ warning."
(((class color) (min-colors 16) (background light)) :foreground "Red1")
(((class color) (min-colors 16) (background dark)) :foreground "Pink")
(((class color) (min-colors 8)) :foreground "red")
- (t :inverse-video t))
+ (t (:inverse-video t)))
"Face for \"Error\" string in error descriptions.")
(defface TeX-error-description-warning
@@ -1925,11 +1925,11 @@ warning."
:foreground "LightSkyBlue")
(((class color) (min-colors 8))
:foreground "blue" :weight bold)
- (t :inverse-video t :weight bold))
+ (t (:inverse-video t :weight bold)))
"Face for \"TeX said\" string in error descriptions.")
(defface TeX-error-description-help
- '((t :inherit TeX-error-description-tex-said))
+ '((t (:inherit TeX-error-description-tex-said)))
"Face for \"Help\" string in error descriptions.")
(defun TeX-help-error (error output runbuffer type)
diff --git a/tex.el b/tex.el
index 3cb5411..db801d7 100644
--- a/tex.el
+++ b/tex.el
@@ -693,9 +693,13 @@ overlays."
;; (TeX-completing-read-multiple ...))
;;
;; which results in a void-variable error if crm hasn't been loaded before.
-(unless (require 'crm nil t)
- (error "AUCTeX requires crm.el which is included in Emacs and
-edit-utils >= 2.32 for XEmacs."))
+;; XEmacs 21.4 `require' doesn't have the third NOERROR argument, thus we
handle
+;; the file-error signal with a `condition-case' also in GNU Emacs.
+(condition-case nil
+ (require 'crm)
+ (file-error
+ (error "AUCTeX requires crm.el which is included in Emacs and
+edit-utils >= 2.32 for XEmacs.")))
(if (fboundp 'completing-read-multiple)
(defun TeX-completing-read-multiple
@@ -1043,8 +1047,10 @@ 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))
+;; Require dbus at compile time to prevent errors due to `dbus-ignore-errors'
+;; not being defined.
+(eval-when-compile (and (featurep 'dbusbind)
+ (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
